diff --git a/ChangeLog b/ChangeLog
index 13346d43763..229fd1bac85 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,22 @@ Upgrading to any other version or any other database system is abolutely require
 make a Dolibarr upgrade.
 
 
+***** ChangeLog for 4.0 compared to 3.9.* *****
+For users:
+
+For developers:
+
+
+WARNING: 
+
+Dolibarr 4.0 should be compatible with PHP 7 but more feedbacks are still expected to confirm that.
+
+Following changes may create regression for some external modules, but were necessary to make
+Dolibarr better:
+- Method select_type_comptes_financiers() has been renamed into selectTypeOfBankAccount() 
+
+
+
 ***** ChangeLog for 3.9.0 compared to 3.8.* *****
 For users:
 NEW: A new and more modern look for "eldy" theme.
@@ -171,6 +187,109 @@ This is list of hooks modified:
 
 
  
+***** ChangeLog for 3.8.4 compared to 3.8.3 *****
+FIX: #3694
+FIX: #3798 #2519 Cron jobs would never be executed
+FIX: #4155 Search Categories error
+FIX: #4239
+FIX: #4272 Error when trying to print the page "Linked objects" of a Thirdparty
+FIX: #4291 Correctly filter bank card GETPOSTs
+FIX: #4291 Correctly filter external calendar GETPOSTs
+FIX: #4341
+FIX: #4394 Untranslated label in list of expense reports
+FIX: #4414 Supplier invoices use FAC_FORCE_DATE_VALIDATION client invoices property
+FIX: #4418
+FIX: #4425 Missing "VAT" translation in supplier order popup
+FIX: #4434 Weird behaviour when enabling multiprices
+FIX: #4440 Wrong price is filled by Product::fetch into multiprices arrays
+FIX: #4453 SEPA Direct Debit generated XML shows a trailing comma in RmtInf field
+FIX: #4528
+FIX: #4556 desiredstock and seuil_stock_alerte cleared on modify product card
+FIX: #4580
+FIX: #4583 Incorrect call of Categories::containing throws a DoliDB error
+FIX: #4649 Wrong parameters order
+FIX: #4768
+FIX: #4785
+FIX: Add a test to show bugged module with a bad declaration of dictionaries to avoid to see clean module to be breaked.
+FIX: add Croatia into list of country in EEC
+FIX: add missing global def for ttc column
+FIX: ajax error with multicompany module
+FIX: Avoid errors when batch stock is negative
+FIX: bad field in select
+FIX: bad path
+FIX: bad transaction level due to code of situation invoices
+FIX: best sql request
+FIX: bookmark's user change after update if the user hasn't superadmin right
+FIX: call trigger LINEBILL_SUPPLIER_CREATE
+FIX: Can not disabled an opened service line in a contract
+FIX: can't clone event
+FIX: can't send mail to thirdparty contact if no mail defined on thirdparty card
+FIX: Check stock of batch on shippment
+FIX: code corrupting database
+FIX: compatibility with multicompany transversal mode
+FIX: compatibility with multicompany transversal mode and more security issue
+FIX: Contrat card don't consider user permissions to show active/unactive service button
+FIX: CVE CVE-2015-8685
+FIX: Deadlock situation. Can't edit anymore contract. FIX: List of automatic events was not visible.
+FIX: disable main.inc.php hooks
+FIX: do not show warning if account defined
+FIX: don't see the sales representative of anothers entities
+FIX: duration format
+FIX: Correct problem of rights beetween tax and salaries module
+FIX: Email templates not compatible with Multicompany
+FIX: $fileparams is not defined
+FIX: filter by socid if from customer card
+FIX: for avoid conflict with "global $m" in memory.lib.php
+FIX: for avoid division by 0
+FIX: hover css
+FIX: If option to hide automatic ECM is on, dont show menu.
+FIX: if we dont use SUPPLIER_ORDER_USE_HOUR_FOR_DELIVERY_DATE the hour is displayed on pdf
+FIX: Introduce hidden option to disable feature than hangs when too much data
+FIX: ISSUE #4506 : make working the PROPAL_CLONE_ON_CREATE_PAGE hidden constant
+FIX: issue when bank module is disabled FIX: missing entity filter for lines of payment
+FIX: list of leave request was not showing label correctly.
+FIX: MAIN_THIRDPARTY_CREATION_INDIVIDUAL syntax error in name
+FIX: markRate can be 100
+FIX: minor css error (pixel size must have "px"). Compatibility with old behaviour.
+FIX: missing field "label"
+FIX: missing signature and uniformize code between card and script
+FIX: missing traduction
+FIX: missing translation
+FIX: missing translation key
+FIX: nblignes not calculated after hook and hook can't modify this value. Usefull for modules
+FIX: no database structure change is allowed into minor versions
+FIX: no transaction in this place
+FIX: Noway to validate a leave request for some uer even if they have permission for.
+FIX: Option to disable meteo was not set correctly in edit mode
+FIX: $outputlangs is not defined (dolibarr 3.7, 3.8, 3.9)
+FIX: path to copyrighted files
+FIX: php unit to work both with old and new setup
+FIX: Purge of temp files was broken
+FIX: Relative discount decimals are not saved
+FIX: Removed a bugged list. Fixed another one to not count data of previous year.
+FIX: retrieve correct pu_ttc (set by printObjectLine function) like in 3.7
+FIX: search product in customer product prices doesn't work
+FIX: Some filters are lost when paging
+FIX: sql injection #4341
+FIX: sql injection even when code is on several lines
+FIX: sql request and total for time spen for current month
+FIX: Sql syntax error in doc_generic_task_odt
+FIX: Status filter don't work
+FIX: Strict Standards: Only variables should be passed by reference
+FIX: The part added with hidden option MAIN_DOC_USE_TIMING was included with a . instead of -. This make os think it is part of extension instead of file name.
+FIX: The third dashboard don't consider user permissions
+FIX: the view my task must show only task you are assigned to
+FIX: to allow phpunit of migration process for 3.4 to 3.5
+FIX: to allow phpunit of migration process for 3.5 to 3.6
+FIX: userlocaltax
+FIX: view of product image when using old path 
+FIX: size of image uploaded on user.
+FIX: We must ue the "small" size of imge to show on card pages.
+FIX: When we make a direct assignement on a task to a user, we must check he is also assigned to project (and if not assign it)
+FIX: wrong fk_parent_line in credit note with invoiceAvoirWithLines option
+FIX: wrong modelpdf var name
+FIX: wrong object name
+
 ***** ChangeLog for 3.8.3 compared to 3.8.2 *****
 FIX: #3805
 FIX: #3231 [Members] Public subscription page displays GeoIP error
diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl
index db61a84d133..58f1514b632 100755
--- a/build/makepack-dolibarr.pl
+++ b/build/makepack-dolibarr.pl
@@ -1108,6 +1108,14 @@ if ($nboftargetok) {
 			"$DESTI/standard/$FILENAMETGZ.tgz"=>'Dolibarr ERP-CRM',
 			"$DESTI/standard/$FILENAMETGZ.zip"=>'Dolibarr ERP-CRM'
 		);
+		%filestoscanstableasso=(
+			"$DESTI/package_rpm_generic/$FILENAMERPM"=>'package_rpm_generic',
+			"$DESTI/package_debian-ubuntu/${FILENAMEDEB}_all.deb"=>'package_debian-ubuntu',
+			"$DESTI/package_windows/$FILENAMEEXEDOLIWAMP.exe"=>'package_windows',
+			"$DESTI/standard/$FILENAMETGZ.tgz"=>'standard',
+			"$DESTI/standard/$FILENAMETGZ.zip"=>'standard'
+		);
+
 		use POSIX qw/strftime/;
 		foreach my $file (sort keys %filestoscansf)
 		{
@@ -1150,8 +1158,10 @@ if ($nboftargetok) {
 	    		
 	    		if ($target eq 'SF') { 
 	    			$destFolder="$NEWPUBLISH/$filestoscan{$file}/".$MAJOR.'.'.$MINOR.'.'.$BUILD;
-		    		print "Publish file ".$file." to $NEWPUBLISH/".$filestoscan{$file}."/".$MAJOR.'.'.$MINOR.'.'.$BUILD."\n";
 	    		}
+	    		elsif ($target eq 'ASSO' && $NEWPUBLISH =~ /stable/) {
+	    			$destFolder="$NEWPUBLISH/$filestoscanstableasso{$file}";
+	    		} 
 	    		else
 	    		{
 	    			$dirnameonly=$file;
@@ -1159,8 +1169,8 @@ if ($nboftargetok) {
 	    			$filenameonly=$file;
 	    			$filenameonly =~ s/.*\/[^\/]+\/([^\/])+$/$1/;  
 	    			$destFolder="$NEWPUBLISH/$dirnameonly";
-		    		print "Publish file ".$file." to $NEWPUBLISH/".$dirnameonly."\n";
 	    		}
+	    		print "Publish file ".$file." to ".$destFolder."\n";
 
 				# mkdir	   
 				#my $ssh = Net::SSH::Perl->new("frs.sourceforge.net");
diff --git a/dev/initdata/generate-invoice.php b/dev/initdata/generate-invoice.php
index 11d827e0dcf..e7c274040de 100755
--- a/dev/initdata/generate-invoice.php
+++ b/dev/initdata/generate-invoice.php
@@ -90,7 +90,7 @@ $result=0;
 while ($i < GEN_NUMBER_FACTURE && $result >= 0)
 {
 	$i++;
-	$socid = rand(1, $num_socs);
+	$socid = mt_rand(1, $num_socs);
 
 	print "Invoice ".$i." for socid ".$socid;
 
@@ -105,14 +105,14 @@ while ($i < GEN_NUMBER_FACTURE && $result >= 0)
 		$result=$facture->validate($user);
 		if ($result)
 		{
-			$nbp = rand(2, 5);
+			$nbp = mt_rand(2, 5);
 			$xnbp = 0;
 			while ($xnbp < $nbp)
 			{
-				$prodid = rand(1, $num_prods);
+				$prodid = mt_rand(1, $num_prods);
 				$product=new Product($db);
 				$result=$product->fetch($prodids[$prodid]);
-				$result=$facture->addline($product->description, $product->price, rand(1,5), 0, 0, 0, $prodids[$prodid], 0, '', '', 0, 0, '', $product->price_base_type, $product->price_ttc, $product->type);
+				$result=$facture->addline($product->description, $product->price, mt_rand(1,5), 0, 0, 0, $prodids[$prodid], 0, '', '', 0, 0, '', $product->price_base_type, $product->price_ttc, $product->type);
 			    if ($result < 0)
                 {
                     dol_print_error($db,$propal->error);
diff --git a/dev/initdata/generate-order.php b/dev/initdata/generate-order.php
index 082d5428c97..9e96bbd781b 100755
--- a/dev/initdata/generate-order.php
+++ b/dev/initdata/generate-order.php
@@ -165,7 +165,7 @@ for ($s = 0 ; $s < GEN_NUMBER_COMMANDE ; $s++)
     $com = new Commande($db);
 
     $com->socid         = 4;
-    $com->date_commande  = $dates[rand(1, count($dates)-1)];
+    $com->date_commande  = $dates[mt_rand(1, count($dates)-1)];
     $com->note           = 'A comment';
     $com->source         = 1;
     $com->fk_project     = 0;
@@ -179,14 +179,14 @@ for ($s = 0 ; $s < GEN_NUMBER_COMMANDE ; $s++)
 		$result=$com->valid($user);
 		if ($result > 0)
 		{
-            $nbp = rand(2, 5);
+            $nbp = mt_rand(2, 5);
             $xnbp = 0;
             while ($xnbp < $nbp)
             {
-                $prodid = rand(1, $num_prods);
+                $prodid = mt_rand(1, $num_prods);
                 $product=new Product($db);
                 $result=$product->fetch($prodids[$prodid]);
-                $result=$com->addline($product->description, $product->price, rand(1,5), 0, 0, 0, $prodids[$prodid], 0, 0, 0,  $product->price_base_type, $product->price_ttc, '', '', $product->type);
+                $result=$com->addline($product->description, $product->price, mt_rand(1,5), 0, 0, 0, $prodids[$prodid], 0, 0, 0,  $product->price_base_type, $product->price_ttc, '', '', $product->type);
                 if ($result < 0)
                 {
                     dol_print_error($db,$propal->error);
diff --git a/dev/initdata/generate-product.php b/dev/initdata/generate-product.php
index 975fc1ba33d..fbdde96f95a 100755
--- a/dev/initdata/generate-product.php
+++ b/dev/initdata/generate-product.php
@@ -85,12 +85,12 @@ for ($s = 0 ; $s < GEN_NUMBER_PRODUIT ; $s++)
 {
     print "Product ".$s;
     $produit = new Product($db);
-    $produit->type = rand(0,1);
+    $produit->type = mt_rand(0,1);
     $produit->status = 1;
     $produit->ref = ($produit->type?'S':'P').time().$s;
     $produit->label = 'Label '.time().$s;
     $produit->description = 'Description '.time().$s;
-    $produit->price = rand(1,1000);
+    $produit->price = mt_rand(1,1000);
     $produit->tva_tx = "19.6";
     $ret=$produit->create($user);
     if ($ret < 0) print "Error $ret - ".$produit->error."\n";
diff --git a/dev/initdata/generate-proposal.php b/dev/initdata/generate-proposal.php
index 8d413a518c1..071efc0298f 100755
--- a/dev/initdata/generate-proposal.php
+++ b/dev/initdata/generate-proposal.php
@@ -117,7 +117,7 @@ $result=0;
 while ($i < GEN_NUMBER_PROPAL && $result >= 0)
 {
 	$i++;
-	$socid = rand(1, $num_socs);
+	$socid = mt_rand(1, $num_socs);
 	print "Proposal ".$i." for socid ".$socid;
 
 	$soc = new Societe($db);
@@ -140,14 +140,14 @@ while ($i < GEN_NUMBER_PROPAL && $result >= 0)
 	$result=$propal->create($user);
 	if ($result >= 0)
 	{
-		$nbp = rand(2, 5);
+		$nbp = mt_rand(2, 5);
 		$xnbp = 0;
 		while ($xnbp < $nbp)
 		{
-			$prodid = rand(1, $num_prods);
+			$prodid = mt_rand(1, $num_prods);
 			$product=new Product($db);
 			$result=$product->fetch($prodids[$prodid]);
-			$result=$propal->addline($product->description, $product->price, rand(1,5), 0, 0, 0, $prodids[$prodid], 0);
+			$result=$propal->addline($product->description, $product->price, mt_rand(1,5), 0, 0, 0, $prodids[$prodid], 0);
 			if ($result < 0)
 			{
 				dol_print_error($db,$propal->error);
diff --git a/dev/initdata/generate-thirdparty.php b/dev/initdata/generate-thirdparty.php
index d6e9d4c9393..8c3a6e3e86e 100755
--- a/dev/initdata/generate-thirdparty.php
+++ b/dev/initdata/generate-thirdparty.php
@@ -90,30 +90,30 @@ for ($s = 0 ; $s < GEN_NUMBER_SOCIETE ; $s++)
     print "Company $s\n";
     $soc = new Societe($db);
     $soc->name = "Company num ".time()."$s";
-    $soc->town = $listoftown[rand(0, count($listoftown)-1)];
-    $soc->client = rand(1,2);		// Une societe sur 2 est prospect, l'autre client
-    $soc->fournisseur = rand(0,1);	// Une societe sur 2 est fournisseur
+    $soc->town = $listoftown[mt_rand(0, count($listoftown)-1)];
+    $soc->client = mt_rand(1,2);		// Une societe sur 2 est prospect, l'autre client
+    $soc->fournisseur = mt_rand(0,1);	// Une societe sur 2 est fournisseur
     $soc->code_client='CU'.time()."$s";
     $soc->code_fournisseur='SU'.time()."$s";
     $soc->tva_assuj=1;
     $soc->country_id=1;
     $soc->country_code='FR';
 	// Un client sur 3 a une remise de 5%
-    $user_remise=rand(1,3); if ($user_remise==3) $soc->remise_percent=5;
+    $user_remise=mt_rand(1,3); if ($user_remise==3) $soc->remise_percent=5;
 	print "> client=".$soc->client.", fournisseur=".$soc->fournisseur.", remise=".$soc->remise_percent."\n";
     $soc->note_private = 'Company created by the script generate-societe.php';
     $socid = $soc->create();
 
     if ($socid >= 0)
     {
-        $rand = rand(1,4);
+        $rand = mt_rand(1,4);
         print "> Generates $rand contact(s)\n";
         for ($c = 0 ; $c < $rand ; $c++)
         {
             $contact = new Contact($db);
             $contact->socid = $soc->id;
             $contact->lastname = "Lastname".$c;
-            $contact->firstname = $listoflastname[rand(0, count($listoflastname)-1)];
+            $contact->firstname = $listoflastname[mt_rand(0, count($listoflastname)-1)];
             if ( $contact->create($user) )
             {
 
diff --git a/dev/initdemo/initdemo.sh b/dev/initdemo/initdemo.sh
index e8ea47c71b2..10dc671e09d 100755
--- a/dev/initdemo/initdemo.sh
+++ b/dev/initdemo/initdemo.sh
@@ -171,6 +171,8 @@ then
 fi
 #echo "mysql -P$port -u$admin $passwd $base < $mydir/$dumpfile"
 #mysql -P$port -u$admin $passwd $base < $mydir/$dumpfile
+#echo "drop old table"
+echo "drop table llx_accounting_account;" | mysql -P$port -u$admin $passwd $base
 echo "mysql -P$port -u$admin -p***** $base < $mydir/$dumpfile"
 mysql -P$port -u$admin $passwd $base < $mydir/$dumpfile
 export res=$?
diff --git a/dev/skeletons/skeleton_list.php b/dev/skeletons/skeleton_list.php
index 28333b3edee..3c47498c52e 100644
--- a/dev/skeletons/skeleton_list.php
+++ b/dev/skeletons/skeleton_list.php
@@ -322,10 +322,22 @@ if ($resql)
 	// Extra fields
 	if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
 	{
-	   foreach($extrafields->attribute_label as $key => $val) 
-	   {
-			if (! empty($arrayfields["ef.".$key]['checked'])) print '<td class="liste_titre"></td>';
-	   }
+        foreach($extrafields->attribute_label as $key => $val) 
+        {
+            if (! empty($arrayfields["ef.".$key]['checked']))
+            {
+                $align=$extrafields->getAlignFlag($key);
+                $typeofextrafield=$extrafields->attribute_type[$key];
+                print '<td class="liste_titre'.($align?' '.$align:'').'">';
+                if (in_array($typeofextrafield, array('varchar', 'int', 'select')))
+                {
+                   $crit=$val;
+                			$tmpkey=preg_replace('/search_options_/','',$key);
+                			print '<input class="flat" size="4" type="text" name="search_options_'.$tmpkey.'" value="'.dol_escape_htmltag($search_array_options['search_options_'.$tmpkey]).'">';
+                }
+                print '</td>';
+            }
+        }
 	}
     // Fields from hook
 	$parameters=array('arrayfields'=>$arrayfields);
diff --git a/htdocs/accountancy/admin/export.php b/htdocs/accountancy/admin/export.php
index 0dc1798ef57..0b43e99b1d8 100644
--- a/htdocs/accountancy/admin/export.php
+++ b/htdocs/accountancy/admin/export.php
@@ -198,7 +198,8 @@ if (! $conf->use_javascript_ajax) {
 	$listmodelcsv = array (
 			'1' => $langs->trans("Modelcsv_normal"),
 			'2' => $langs->trans("Modelcsv_CEGID"),
-			'3' => $langs->trans("Modelcsv_COALA") 
+			'3' => $langs->trans("Modelcsv_COALA"),
+			'4' => $langs->trans("Modelcsv_bob50") 			
 	);
 	print $form->selectarray("modelcsv", $listmodelcsv, $conf->global->ACCOUNTING_EXPORT_MODELCSV, 0);
 	
diff --git a/htdocs/accountancy/bookkeeping/balance.php b/htdocs/accountancy/bookkeeping/balance.php
index 16027a42af4..3e4b69d6624 100644
--- a/htdocs/accountancy/bookkeeping/balance.php
+++ b/htdocs/accountancy/bookkeeping/balance.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2013-2014 Olivier Geffroy		<jeff@jeffinfo.com>
  * Copyright (C) 2013-2016 Florian Henry		<florian.henry@open-concept.pro>
- * Copyright (C) 2013-2015 Alexandre Spangaro	<aspangaro.dolibarr@gmail.com> 
+ * Copyright (C) 2013-2015 Alexandre Spangaro	<aspangaro.dolibarr@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -106,81 +106,38 @@ if (! empty($search_accountancy_code_end)) {
 if ($action == 'export_csv') {
 	$sep = $conf->global->ACCOUNTING_EXPORT_SEPARATORCSV;
 	$journal = 'bookkepping';
-	
+
 	include DOL_DOCUMENT_ROOT . '/accountancy/tpl/export_journal.tpl.php';
-	
-	$result = $object->fetchAll($sortorder, $sortfield, 0, 0, $filter);
+
+	$result = $object->fetchAllBalance($sortorder, $sortfield, 0, 0, $filter);
 	if ($result < 0) {
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
-	
+
 	foreach ( $object->lines as $line ) {
-		
+
 		if ($conf->global->ACCOUNTING_EXPORT_MODELCSV == 2) {
 			$sep = ";";
-			// Model Cegid Expert Export
-			$date = dol_print_date($line->doc_date, '%d%m%Y');
-			print $date . $sep;
-			print $line->code_journal . $sep;
-			print length_accountg($line->numero_compte) . $sep;
-			print ' ' . $sep;
-			print $line->sens . $sep;
-			print price($line->montant) . $sep;
-			print dol_trunc($line->label_compte, 32) . $sep;
-			print $line->doc_ref . $sep;
-			
-			/*print $line->piece_num . $sep;
-			 print length_accounta($line->code_tiers) . $sep;
-			 print  . $sep;
-			 print price($line->debit) . $sep;
-			 print price($line->credit) . $sep;*/
-			
-			print "\n";
-		} elseif ($conf->global->ACCOUNTING_EXPORT_MODELCSV == 1) {
-			
-			// Std export
-			$date = dol_print_date($line->doc_date, $conf->global->ACCOUNTING_EXPORT_DATE);
-			print $date . $sep;
-			print $line->doc_ref . $sep;
-			print length_accounta($line->numero_compte) . $sep;
-			print length_accountg($line->code_tiers) . $sep;
-			print price($line->debit) . $sep;
-			print price($line->credit) . $sep;
-			
-			/*print $line->piece_num . $sep;
-			 print $line->label_compte . $sep;
-			 print price($line->montant) . $sep;
-			 print $line->sens . $sep;*/
-			print $line->code_journal . $sep;
-			print "\n";
-		} elseif ($conf->global->ACCOUNTING_EXPORT_MODELCSV == 3) {
-			
-			// Coala export
-			$date = dol_print_date($line->doc_date, '%d/%m/%Y');
-			print $date . $sep;
-			print $line->code_journal . $sep;
-			print length_accounta($line->numero_compte) . $sep;
-			print $line->piece_num . $sep;
-			print $line->doc_ref . $sep;
-			print price($line->debit) . $sep;
-			print price($line->credit) . $sep;
-			print 'E' . $sep;
-			print length_accountg($line->code_tiers) . $sep;
-			print "\n";
 		}
+		print length_accountg($line->numero_compte) . $sep;
+		print $line->debit . $sep;
+		print $line->credit . $sep;
+		print $line->debit . $sep;
+		print $line->credit - $line->debit . $sep;
+		print "\n";
 	}
-} 
+}
 
 else {
-	
+
 	$title_page = $langs->trans("AccountBalance") . ' ' . dol_print_date($search_date_start) . '-' . dol_print_date($search_date_end);
-	
+
 	llxHeader('', $title_page);
-	
+
 	/*
 	 * List
 	 */
-	
+
 	$nbtotalofrecords = 0;
 	if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
 		$nbtotalofrecords = $object->fetchAllBalance($sortorder, $sortfield, 0, 0, $filter);
@@ -188,27 +145,27 @@ else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
-	
+
 	$result = $object->fetchAllBalance($sortorder, $sortfield, $limit, $offset, $filter);
 	if ($result < 0) {
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
-	
+
 	print_barre_liste($title_page, $page, $_SERVER["PHP_SELF"], $options, $sortfield, $sortorder, '', $result, $nbtotalofrecords);
-	
+
 	print '<form method="GET" id="searchFormList" action="' . $_SERVER["PHP_SELF"] . '">';
 	print '<div class="tabsAction">' . "\n";
 	print '<div class="inline-block divButAction"><input type="submit" name="button_export_csv" class="butAction" value="' . $langs->trans("Export") . '" /></div>';
-	
+
 	print '</div>';
-	
+
 	print '<div class="liste_titre">';
 	print $langs->trans('DateStart') . ': ';
 	print $form->select_date($search_date_start, 'date_start', 0, 0, 1);
 	print $langs->trans('DateEnd') . ': ';
 	print $form->select_date($search_date_end, 'date_end', 0, 0, 1);
 	print '</div>';
-	
+
 	print '<table class="noborder" width="100%">';
 	print '<tr class="liste_titre">';
 	print_liste_field_titre($langs->trans("Numerocompte"), $_SERVER['PHP_SELF'], "t.numero_compte", "", $options, "", $sortfield, $sortorder);
@@ -217,7 +174,7 @@ else {
 	print_liste_field_titre($langs->trans("Solde"), $_SERVER["PHP_SELF"], "", $options, "", 'width="60" align="center"', $sortfield, $sortorder);
 	print_liste_field_titre($langs->trans("Action"), $_SERVER["PHP_SELF"], "", $options, "", 'width="60" align="center"', $sortfield, $sortorder);
 	print "</tr>\n";
-	
+
 	print '<tr class="liste_titre">';
 	print '<td>';
 	print $langs->trans('From');
@@ -226,32 +183,32 @@ else {
 	print $langs->trans('To');
 	print $formventilation->select_account($search_accountancy_code_end, 'search_accountancy_code_end', 1, array (), 1, 1, '');
 	print '</td>';
-	
+
 	print '<td>&nbsp;</td>';
 	print '<td>&nbsp;</td>';
 	print '<td>&nbsp;</td>';
-	
+
 	print '<td align="right" class="liste_titre">';
 	print '<input type="image" class="liste_titre" src="' . img_picto($langs->trans("Search"), 'search.png', '', '', 1) . '" name="button_search" value="' . dol_escape_htmltag($langs->trans("Search")) . '" title="' . dol_escape_htmltag($langs->trans("Search")) . '">';
 	print '&nbsp;';
 	print '<input type="image" class="liste_titre" src="' . img_picto($langs->trans("Search"), 'searchclear.png', '', '', 1) . '" name="button_removefilter" value="' . dol_escape_htmltag($langs->trans("RemoveFilter")) . '" title="' . dol_escape_htmltag($langs->trans("RemoveFilter")) . '">';
 	print '</td>';
-	
+
 	print '</tr>';
-	
+
 	$var = True;
-	
+
 	$total_debit = 0;
 	$total_credit = 0;
-	
+
 	foreach ( $object->lines as $line ) {
 		$var = ! $var;
-		
+
 		$total_debit += $line->debit;
 		$total_credit += $line->credit;
-		
+
 		print "<tr $bc[$var]>";
-		
+
 		print '<td>' . length_accountg($line->numero_compte) . '</td>';
 		print '<td align="right">' . price($line->debit) . '</td>';
 		print '<td align="right">' . price($line->credit) . '</td>';
@@ -260,7 +217,7 @@ else {
 		print '</td>';
 		print "</tr>\n";
 	}
-	
+
 	print '<tr class="liste_total">';
 	print '<td></td>';
 	print '<td  align="right">';
@@ -272,10 +229,10 @@ else {
 	print '<td align="right">' . price($total_credit - $total_debit) . '</td>';
 	print '<td align="right"></td>';
 	print '</tr>';
-	
+
 	print "</table>";
 	print '</form>';
-	
+
 	llxFooter();
 }
 $db->close();
\ No newline at end of file
diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php
index 387df40122c..515736580f8 100644
--- a/htdocs/accountancy/bookkeeping/list.php
+++ b/htdocs/accountancy/bookkeeping/list.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2013-2016 Olivier Geffroy		<jeff@jeffinfo.com>
  * Copyright (C) 2013-2016 Florian Henry		<florian.henry@open-concept.pro>
- * Copyright (C) 2013-2016 Alexandre Spangaro	<aspangaro.dolibarr@gmail.com> 
+ * Copyright (C) 2013-2016 Alexandre Spangaro	<aspangaro.dolibarr@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -182,9 +182,9 @@ if (! empty($search_mvt_num)) {
  * Action
  */
 if ($action == 'delbookkeeping') {
-	
+
 	$import_key = GETPOST('importkey', 'alpha');
-	
+
 	if (! empty($import_key)) {
 		$result = $object->deleteByImportkey($import_key);
 		if ($result < 0) {
@@ -194,9 +194,9 @@ if ($action == 'delbookkeeping') {
 		exit();
 	}
 } elseif ($action == 'delbookkeepingyearconfirm') {
-	
+
 	$delyear = GETPOST('delyear', 'int');
-	
+
 	if (! empty($delyear)) {
 		$result = $object->deleteByYear($delyear);
 		if ($result < 0) {
@@ -206,34 +206,30 @@ if ($action == 'delbookkeeping') {
 		exit();
 	}
 } elseif ($action == 'delmouvconfirm') {
-	
+
 	$mvt_num = GETPOST('mvt_num', 'int');
-	
+
 	if (! empty($mvt_num)) {
 		$result = $object->deleteMvtNum($mvt_num);
 		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
-		// if (!empty($options)) {
-		// Header("Location: list.php?".urldecode($options));
-		// } else {
 		Header("Location: list.php");
-		// }
 		exit();
 	}
 } elseif ($action == 'export_csv') {
 	$sep = $conf->global->ACCOUNTING_EXPORT_SEPARATORCSV;
 	$journal = 'bookkepping';
-	
+
 	include DOL_DOCUMENT_ROOT . '/accountancy/tpl/export_journal.tpl.php';
-	
+
 	$result = $object->fetchAll($sortorder, $sortfield, 0, 0, $filter);
 	if ($result < 0) {
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
-	
+
 	foreach ( $object->lines as $line ) {
-		
+
 		if ($conf->global->ACCOUNTING_EXPORT_MODELCSV == 2) {
 			$sep = ";";
 			// Model Cegid Expert Export
@@ -246,16 +242,9 @@ if ($action == 'delbookkeeping') {
 			print price($line->montant) . $sep;
 			print dol_trunc($line->label_compte, 32) . $sep;
 			print $line->doc_ref . $sep;
-			
-			/*print $line->piece_num . $sep;
-			 print length_accounta($line->code_tiers) . $sep;
-			 print  . $sep;
-			 print price($line->debit) . $sep;
-			 print price($line->credit) . $sep;*/
-			
 			print "\n";
 		} elseif ($conf->global->ACCOUNTING_EXPORT_MODELCSV == 1) {
-			
+
 			// Std export
 			$date = dol_print_date($line->doc_date, $conf->global->ACCOUNTING_EXPORT_DATE);
 			print $date . $sep;
@@ -264,15 +253,10 @@ if ($action == 'delbookkeeping') {
 			print length_accounta($line->code_tiers) . $sep;
 			print price($line->debit) . $sep;
 			print price($line->credit) . $sep;
-			
-			/*print $line->piece_num . $sep;
-			 print $line->label_compte . $sep;
-			 print price($line->montant) . $sep;
-			 print $line->sens . $sep;*/
 			print $line->code_journal . $sep;
 			print "\n";
 		} elseif ($conf->global->ACCOUNTING_EXPORT_MODELCSV == 3) {
-			
+
 			// Coala export
 			$date = dol_print_date($line->doc_date, '%d/%m/%Y');
 			print $date . $sep;
@@ -285,23 +269,48 @@ if ($action == 'delbookkeeping') {
 			print 'E' . $sep;
 			print length_accountg($line->code_tiers) . $sep;
 			print "\n";
+		} elseif ($conf->global->ACCOUNTING_EXPORT_MODELCSV == 4) {
+
+			// Bob50
+			print $line->piece_num . $sep;
+			$date = dol_print_date($line->doc_date, '%d/%m/%Y');
+			print $date . $sep;
+
+			if (empty($line->code_tiers)) {
+				print 'G' . $sep;
+				print length_accounta($line->numero_compte) . $sep;
+			} else {
+				if (substr($line->numero_compte,0,3)=='411') {
+					print 'C' . $sep;
+				}
+				if (substr($line->numero_compte,0,3)=='401') {
+					print 'F' . $sep;
+				}
+				print length_accountg($line->code_tiers) . $sep;
+
+			}
+
+			print price($line->debit) . $sep;
+			print price($line->credit) . $sep;
+			print dol_trunc($line->label_compte, 32) . $sep;
+			print "\n";
 		}
 	}
-} 
+}
 
 /*
  * View
  */
 else {
-	
+
 	$title_page = $langs->trans("Bookkeeping") . ' ' . dol_print_date($search_date_start) . '-' . dol_print_date($search_date_end);
-	
+
 	llxHeader('', $title_page);
-	
+
 	/*
 	 * List
 	 */
-	
+
 	$nbtotalofrecords = 0;
 	if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
 		$nbtotalofrecords = $object->fetchAll($sortorder, $sortfield, 0, 0, $filter);
@@ -309,78 +318,48 @@ else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
-	
+
 	$result = $object->fetchAll($sortorder, $sortfield, $limit, $offset, $filter);
 	if ($result < 0) {
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
-	
+
 	if ($action == 'delmouv') {
 		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?mvt_num=' . GETPOST('mvt_num'), $langs->trans('DeleteMvt'), $langs->trans('ConfirmDeleteMvt'), 'delmouvconfirm', '', 0, 1);
 		print $formconfirm;
 	}
 	if ($action == 'delbookkeepingyear') {
-		
+
 		$form_question = array ();
 		$delyear = GETPOST('delyear');
-		
+
 		if (empty($delyear)) {
 			$delyear = dol_print_date(dol_now(), '%Y');
 		}
 		$year_array = $formventilation->selectyear_accountancy_bookkepping($delyear, 'delyear', 0, 'array');
-		
+
 		$form_question['delyear'] = array (
 				'name' => 'delyear',
 				'type' => 'select',
 				'label' => $langs->trans('DelYear'),
 				'values' => $year_array,
-				'default' => $delyear 
+				'default' => $delyear
 		);
-		
+
 		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"], $langs->trans('DeleteMvt'), $langs->trans('ConfirmDeleteMvt'), 'delbookkeepingyearconfirm', $form_question, 0, 1);
 		print $formconfirm;
 	}
-	
+
 	print_barre_liste($title_page, $page, $_SERVER["PHP_SELF"], $options, $sortfield, $sortorder, '', $result, $nbtotalofrecords);
-	
-	/*print '<form name="add" action="' . $_SERVER["PHP_SELF"] . '" method="POST">';
-	 print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
-	 print '<input type="hidden" name="action" value="delbookkeeping">';
-	 
-	 print $formventilation->select_bookkeeping_importkey('importkey', GETPOST('importkey'));
-	 
-	 print '<div class="inline-block divButAction"><input type="submit" class="butAction" value="' . $langs->trans("DelBookKeeping") . '" /></div>';
-	 
-	 print '</form>';*/
-	
+
 	print '<form method="GET" id="searchFormList" action="' . $_SERVER["PHP_SELF"] . '">';
 	print '<div class="tabsAction">' . "\n";
 	print '<div class="inline-block divButAction"><input type="submit" name="button_delmvt" class="butAction" value="' . $langs->trans("DelBookKeeping") . '" /></div>';
 	print '<div class="inline-block divButAction"><a class="butAction" href="./card.php?action=create">' . $langs->trans("NewAccountingMvt") . '</a></div>';
-	// print '<a class="butAction" href="' . $_SERVER['PHP_SELF'] . '?action=export_csv">' . $langs->trans("Export") . '</a>';
 	print '<div class="inline-block divButAction"><input type="submit" name="button_export_csv" class="butAction" value="' . $langs->trans("Export") . '" /></div>';
-	
+
 	print '</div>';
-	
-	/*print '<div class="liste_titre">';
-	 print $langs->trans('DateStart') . ': ';
-	 print $form->select_date($search_date_start, 'date_start', 0, 0, 1);
-	 print $langs->trans('DateEnd') . ': ';
-	 print $form->select_date($search_date_end, 'date_end', 0, 0, 1);
-	 print '</div>';
-	 print '<div class="liste_titre">';
-	 print $langs->trans('From') . ' ' . $langs->trans('AccountAccounting') . ': ';
-	 print $formventilation->select_account($search_accountancy_code_start, 'search_accountancy_code_start', 1, array (), 1, 1, '');
-	 print $langs->trans('To') . ' ' . $langs->trans('AccountAccounting') . ': ';
-	 print $formventilation->select_account($search_accountancy_code_end, 'search_accountancy_code_end', 1, array (), 1, 1, '');
-	 print '</div>';
-	 print '<div class="liste_titre">';
-	 print $langs->trans('From') . ' ' . $langs->trans('ThirdPartyAccount') . ': ';
-	 print $formventilation->select_auxaccount($search_accountancy_aux_code_start, 'search_accountancy_aux_code_start', 1);
-	 print $langs->trans('To') . ' ' . $langs->trans('ThirdPartyAccount') . ': ';
-	 print $formventilation->select_auxaccount($search_accountancy_aux_code_end, 'search_accountancy_aux_code_end', 1);
-	 print '</div>';*/
-	
+
 	print '<table class="noborder" width="100%">';
 	print '<tr class="liste_titre">';
 	print_liste_field_titre($langs->trans("NumPiece"), $_SERVER['PHP_SELF'], "t.piece_num", "", $options, "", $sortfield, $sortorder);
@@ -391,12 +370,10 @@ else {
 	print_liste_field_titre($langs->trans("Labelcompte"), $_SERVER['PHP_SELF'], "bk_label_compte", "", $options, "", $sortfield, $sortorder);
 	print_liste_field_titre($langs->trans("Debit"), $_SERVER['PHP_SELF'], "t.debit", "", $options, 'align="right"', $sortfield, $sortorder);
 	print_liste_field_titre($langs->trans("Credit"), $_SERVER['PHP_SELF'], "t.credit", "", $options, 'align="right"', $sortfield, $sortorder);
-	// print_liste_field_titre($langs->trans("Amount"), $_SERVER['PHP_SELF'], "t.montant", "", $options, 'align="center"', $sortfield, $sortorder);
-	// print_liste_field_titre($langs->trans("Sens"), $_SERVER['PHP_SELF'], "t.sens", "", $options, 'align="center"', $sortfield, $sortorder);
 	print_liste_field_titre($langs->trans("Codejournal"), $_SERVER['PHP_SELF'], "t.code_journal", "", $options, 'align="right"', $sortfield, $sortorder);
 	print_liste_field_titre($langs->trans("Action"), $_SERVER["PHP_SELF"], "", $options, "", 'width="60" align="center"', $sortfield, $sortorder);
 	print "</tr>\n";
-	
+
 	print '<tr class="liste_titre">';
 	print '<form action="' . $_SERVER["PHP_SELF"] . '" method="GET">';
 	print '<td><input type="text" name="search_mvt_num" size="6" value="' . $search_mvt_num . '"></td>';
@@ -404,61 +381,52 @@ else {
 	print $langs->trans('From') . ': ';
 	print $form->select_date($search_date_start, 'date_start', 0, 0, 1);
 	print '<br>';
-	print $langs->trans('to') . ': ';
+	print $langs->trans('To') . ': ';
 	print $form->select_date($search_date_end, 'date_end', 0, 0, 1);
-	// print $form->select_date($search_doc_date, 'doc_date', 0, 0, 1);
 	print '</td>';
 	print '<td><input type="text" name="search_doc_ref" size="8" value="' . $search_doc_ref . '"></td>';
 	print '<td>';
-	// print $langs->trans('From') . ' ' . $langs->trans('AccountAccounting') . ': ';
 	print $langs->trans('From');
 	print $formventilation->select_account($search_accountancy_code_start, 'search_accountancy_code_start', 1, array (), 1, 1, '');
-	// print $langs->trans('To') . ' ' . $langs->trans('AccountAccounting') . ': ';
 	print '<br>';
-	print $langs->trans('to');
+	print $langs->trans('To');
 	print $formventilation->select_account($search_accountancy_code_end, 'search_accountancy_code_end', 1, array (), 1, 1, '');
 	print '</td>';
-	// print '<td><input type="text" name="search_accountancy_code" size="8" value="' . $search_accountancy_code . '"></td>';
 	print '<td>';
-	// print $langs->trans('From') . ' ' . $langs->trans('ThirdPartyAccount') . ': ';
 	print $langs->trans('From');
 	print $formventilation->select_auxaccount($search_accountancy_aux_code_start, 'search_accountancy_aux_code_start', 1);
-	// print $langs->trans('To') . ' ' . $langs->trans('ThirdPartyAccount') . ': ';
 	print '<br>';
-	print $langs->trans('to');
+	print $langs->trans('To');
 	print $formventilation->select_auxaccount($search_accountancy_aux_code_end, 'search_accountancy_aux_code_end', 1);
 	print '</td>';
-	// print '<td><input type="text" name="search_accountancy_aux_code" size="8" value="' . $search_accountancy_aux_code . '"></td>';
-	
+
 	print '<td class="liste_titre">';
 	print '<input type="text" size=6 class="flat" name="search_mvt_label" value="' . $search_mvt_label . '"/>';
 	print '</td>';
 	print '<td>&nbsp;</td>';
 	print '<td>&nbsp;</td>';
-	// print '<td>&nbsp;</td>';
-	// print '<td>&nbsp;</td>';
 	print '<td  align="right"><input type="text" name="search_ledger_code" size="3" value="' . $search_ledger_code . '"></td>';
 	print '<td align="right" colspan="2" class="liste_titre">';
 	print '<input type="image" class="liste_titre" src="' . img_picto($langs->trans("Search"), 'search.png', '', '', 1) . '" name="button_search" value="' . dol_escape_htmltag($langs->trans("Search")) . '" title="' . dol_escape_htmltag($langs->trans("Search")) . '">';
 	print '&nbsp;';
 	print '<input type="image" class="liste_titre" src="' . img_picto($langs->trans("Search"), 'searchclear.png', '', '', 1) . '" name="button_removefilter" value="' . dol_escape_htmltag($langs->trans("RemoveFilter")) . '" title="' . dol_escape_htmltag($langs->trans("RemoveFilter")) . '">';
 	print '</td>';
-	
+
 	print '</tr>';
-	
+
 	$var = True;
-	
+
 	$total_debit = 0;
 	$total_credit = 0;
-	
+
 	foreach ( $object->lines as $line ) {
 		$var = ! $var;
-		
+
 		$total_debit += $line->debit;
 		$total_credit += $line->credit;
-		
+
 		print "<tr $bc[$var]>";
-		
+
 		print '<td><a href="./card.php?piece_num=' . $line->piece_num . '">' . $line->piece_num . '</a></td>';
 		print '<td align="center">' . dol_print_date($line->doc_date, 'day') . '</td>';
 		print '<td>' . $line->doc_ref . '</td>';
@@ -467,8 +435,6 @@ else {
 		print '<td>' . $line->label_compte . '</td>';
 		print '<td align="right">' . price($line->debit) . '</td>';
 		print '<td align="right">' . price($line->credit) . '</td>';
-		// print '<td align="right">' . price($line->montant) . '</td>';
-		// print '<td align="center">' . $line->sens . '</td>';
 		print '<td align="right">' . $line->code_journal . '</td>';
 		print '<td align="center">';
 		print '<a href="./card.php?piece_num=' . $line->piece_num . '">' . img_edit() . '</a>&nbsp;';
@@ -476,7 +442,7 @@ else {
 		print '</td>';
 		print "</tr>\n";
 	}
-	
+
 	print '<tr class="liste_total">';
 	print '<td colspan="6"></td>';
 	print '<td  align="right">';
@@ -487,10 +453,10 @@ else {
 	print '</td>';
 	print '<td colspan="2"></td>';
 	print '</tr>';
-	
+
 	print "</table>";
 	print '</form>';
-	
+
 	llxFooter();
 }
 
diff --git a/htdocs/accountancy/bookkeeping/listbyyear.php b/htdocs/accountancy/bookkeeping/listbyyear.php
index dfd52ec0f00..10640c1887a 100644
--- a/htdocs/accountancy/bookkeeping/listbyyear.php
+++ b/htdocs/accountancy/bookkeeping/listbyyear.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2013-2016 Olivier Geffroy		<jeff@jeffinfo.com>
- * Copyright (C) 2013-2016 Alexandre Spangaro	<aspangaro.dolibarr@gmail.com> 
+ * Copyright (C) 2013-2016 Alexandre Spangaro	<aspangaro.dolibarr@gmail.com>
  * Copyright (C) 2013-2016 Florian Henry		<florian.henry@open-concept.pro>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -74,7 +74,6 @@ if (empty($search_date_start)) {
 	$search_date_start = dol_mktime(0, 0, 0, 1, 1, dol_print_date(dol_now(), '%Y'));
 	$search_date_end = dol_mktime(0, 0, 0, 12, 31, dol_print_date(dol_now(), '%Y'));
 }
-
 if ($sortorder == "")
 	$sortorder = "ASC";
 if ($sortfield == "")
@@ -184,13 +183,13 @@ print '</div>';
 print '<div class="liste_titre">';
 print $langs->trans('From') . ' ' . $langs->trans('AccountAccounting') . ': ';
 print $formventilation->select_account($search_numero_compte_start, 'search_numero_compte_start', 1, array (), 1, 1, '');
-print $langs->trans('to') . ' ' . $langs->trans('AccountAccounting') . ': ';
+print $langs->trans('To') . ' ' . $langs->trans('AccountAccounting') . ': ';
 print $formventilation->select_account($search_numero_compte_end, 'search_numero_compte_end', 1, array (), 1, 1, '');
 print '</div>';
 print '<div class="liste_titre">';
 print $langs->trans('From') . ' ' . $langs->trans('ThirdPartyAccount') . ': ';
 print $formventilation->select_auxaccount($search_code_tiers_start, 'search_code_tiers_start', 1);
-print $langs->trans('to') . ' ' . $langs->trans('ThirdPartyAccount') . ': ';
+print $langs->trans('To') . ' ' . $langs->trans('ThirdPartyAccount') . ': ';
 print $formventilation->select_auxaccount($search_code_tiers_end, 'searchcode_tiers_end', 1);
 print '</div>';
 print "<table class=\"noborder\" width=\"100%\">";
@@ -257,9 +256,10 @@ print '<td class="liste_titre" align="center">';
 print '<input type="text" size=3 class="flat" name="search_code_journal" value="' . $search_code_journal . '"/>';
 print '</td>';
 
-print '<td class="liste_titre" align="right">';
-$searchpitco=$form->showFilterAndCheckAddButtons(0);
-print $searchpitco;
+print '<td align="right" colspan="2" class="liste_titre">';
+print '<input type="image" class="liste_titre" src="' . img_picto($langs->trans("Search"), 'search.png', '', '', 1) . '" name="button_search" value="' . dol_escape_htmltag($langs->trans("Search")) . '" title="' . dol_escape_htmltag($langs->trans("Search")) . '">';
+print '&nbsp;';
+print '<input type="image" class="liste_titre" src="' . img_picto($langs->trans("Search"), 'searchclear.png', '', '', 1) . '" name="button_removefilter" value="' . dol_escape_htmltag($langs->trans("RemoveFilter")) . '" title="' . dol_escape_htmltag($langs->trans("RemoveFilter")) . '">';
 print '</td>';
 
 print "</tr>\n";
@@ -268,7 +268,7 @@ $var = True;
 
 foreach ( $object->lines as $line ) {
 	$var = ! $var;
-	
+
 	print "<tr $bc[$var]>";
 	print '<td>' . $line->piece_num . '</td>' . "\n";
 	print '<td>' . $line->doc_type . '</td>' . "\n";
diff --git a/htdocs/accountancy/class/bookkeeping.class.php b/htdocs/accountancy/class/bookkeeping.class.php
index 0015dfbf9e9..f4b478b681e 100644
--- a/htdocs/accountancy/class/bookkeeping.class.php
+++ b/htdocs/accountancy/class/bookkeeping.class.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2007-2012  Laurent Destailleur <eldy@users.sourceforge.net>
  * Copyright (C) 2014       Juanjo Menent       <jmenent@2byte.es>
- * Copyright (C) 2015-*2016 Florian Henry       <florian.henry@open-concept.pro>
+ * Copyright (C) 2015-2016 Florian Henry       <florian.henry@open-concept.pro>
  * Copyright (C) 2015       Raphaël Doursenaud  <rdoursenaud@gpcsolutions.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -1064,6 +1064,7 @@ class BookKeeping extends CommonObject
 		$sql .= " FROM " . MAIN_DB_PREFIX . $this->table_element;
 		$sql .= " WHERE piece_num = " . $piecenum;
 		
+		dol_syslog(get_class($this) . "::" . __METHOD__, LOG_DEBUG);
 		$result = $this->db->query($sql);
 		if ($result) {
 			$obj = $this->db->fetch_object($result);
@@ -1118,7 +1119,7 @@ class BookKeeping extends CommonObject
 		$sql .= " FROM " . MAIN_DB_PREFIX . $this->table_element;
 		$sql .= " WHERE piece_num = " . $piecenum;
 		
-		dol_syslog(get_class($this) . "fetch_all_per_mvt sql=" . $sql, LOG_DEBUG);
+		dol_syslog(get_class($this) . "::" . __METHOD__, LOG_DEBUG);
 		$result = $this->db->query($sql);
 		if ($result) {
 			
@@ -1147,7 +1148,7 @@ class BookKeeping extends CommonObject
 			}
 		} else {
 			$this->error = "Error " . $this->db->lasterror();
-			dol_syslog(get_class($this) . "::fetch_all_per_mvt " . $this->error, LOG_ERR);
+			dol_syslog(get_class($this) . "::" . __METHOD__ . $this->error, LOG_ERR);
 			return - 1;
 		}
 		
diff --git a/htdocs/accountancy/customer/lines.php b/htdocs/accountancy/customer/lines.php
index 7b4d597fc12..471a329e64c 100644
--- a/htdocs/accountancy/customer/lines.php
+++ b/htdocs/accountancy/customer/lines.php
@@ -48,6 +48,8 @@ $search_desc = GETPOST('search_desc', 'alpha');
 $search_amount = GETPOST('search_amount', 'alpha');
 $search_account = GETPOST('search_account', 'alpha');
 $search_vat = GETPOST('search_vat', 'alpha');
+$search_country = GETPOST('search_country', 'alpha');
+$search_tvaintra = GETPOST('search_tvaintra', 'alpha');
 
 // Getpost Order and column and limit page
 $sortfield = GETPOST('sortfield', 'alpha');
@@ -68,7 +70,7 @@ if (! empty($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION)) {
 $offset = $limit * $page;
 
 if (! $sortfield)
-	$sortfield = "f.datef, f.facnumber, l.rowid";
+	$sortfield = "f.datef, f.facnumber, fd.rowid";
 
 if (! $sortorder) {
 	if ($conf->global->ACCOUNTING_LIST_SORT_VENTILATION_DONE > 0) {
@@ -94,6 +96,8 @@ if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both
 	$search_amount = '';
 	$search_account = '';
 	$search_vat = '';
+	$search_country = '';
+	$search_tvaintra = '';
 }
 
 if (is_array($changeaccount) && count($changeaccount) > 0) {
@@ -150,14 +154,27 @@ print '<script type="text/javascript">
 /*
  * Customer Invoice lines
  */
-$sql = "SELECT l.rowid , f.facnumber, f.rowid as facid, l.fk_product, l.description, l.total_ht, l.qty, l.tva_tx, l.fk_code_ventilation, aa.label, aa.account_number,";
-$sql .= " p.rowid as product_id, p.ref as product_ref, p.label as product_label, p.fk_product_type as type";
-$sql .= " FROM " . MAIN_DB_PREFIX . "facture as f";
-$sql .= " , " . MAIN_DB_PREFIX . "accounting_account as aa";
-$sql .= " , " . MAIN_DB_PREFIX . "facturedet as l";
-$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product as p ON p.rowid = l.fk_product";
-$sql .= " WHERE f.rowid = l.fk_facture AND f.fk_statut >= 1 AND l.fk_code_ventilation <> 0 ";
-$sql .= " AND aa.rowid = l.fk_code_ventilation";
+$sql = "SELECT f.rowid, f.facnumber, f.type, f.datef as df, f.ref_client,";
+$sql .= " fd.rowid as fdid, fd.description, fd.product_type, fd.total_ht, fd.total_tva, fd.tva_tx, fd.total_ttc,";
+$sql .= " s.rowid as socid, s.nom as name, s.code_compta, s.code_client,";
+$sql .= " p.rowid as product_id, p.ref as product_ref, p.label as product_label, p.accountancy_code_sell, aa.rowid as fk_compte, aa.account_number, aa.label as label_compte,";
+$sql .= " fd.situation_percent, co.label as country, s.tva_intra";
+$sql .= " FROM " . MAIN_DB_PREFIX . "facturedet as fd";
+$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product as p ON p.rowid = fd.fk_product";
+$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "accounting_account as aa ON aa.rowid = fd.fk_code_ventilation";
+$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "facture as f ON f.rowid = fd.fk_facture";
+$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "societe as s ON s.rowid = f.fk_soc";
+$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "c_country as co ON co.rowid = s.fk_pays ";
+$sql .= " WHERE fd.fk_code_ventilation > 0 ";
+if (! empty($conf->multicompany->enabled)) {
+	$sql .= " AND f.entity IN (" . getEntity("facture", 1) . ")";
+}
+$sql .= " AND f.fk_statut > 0";
+if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
+	$sql .= " AND f.type IN (" . Facture::TYPE_STANDARD . "," . Facture::TYPE_REPLACEMENT . "," . Facture::TYPE_CREDIT_NOTE . "," . Facture::TYPE_SITUATION . ")";
+} else {
+	$sql .= " AND f.type IN (" . Facture::TYPE_STANDARD . "," . Facture::TYPE_STANDARD . "," . Facture::TYPE_CREDIT_NOTE . "," . Facture::TYPE_DEPOSIT . "," . Facture::TYPE_SITUATION . ")";
+}
 if (strlen(trim($search_invoice))) {
 	$sql .= " AND f.facnumber like '%" . $search_invoice . "%'";
 }
@@ -168,16 +185,22 @@ if (strlen(trim($search_label))) {
 	$sql .= " AND p.label like '%" . $search_label . "%'";
 }
 if (strlen(trim($search_desc))) {
-	$sql .= " AND l.description like '%" . $search_desc . "%'";
+	$sql .= " AND fd.description like '%" . $search_desc . "%'";
 }
 if (strlen(trim($search_amount))) {
-	$sql .= " AND l.total_ht like '%" . $search_amount . "%'";
+	$sql .= " AND fd.total_ht like '%" . $search_amount . "%'";
 }
 if (strlen(trim($search_account))) {
 	$sql .= " AND aa.account_number like '%" . $search_account . "%'";
 }
 if (strlen(trim($search_vat))) {
-	$sql .= " AND (l.tva_tx like '" . $search_vat . "%')";
+	$sql .= " AND (fd.tva_tx like '" . $search_vat . "%')";
+}
+if (strlen(trim($search_country))) {
+	$sql .= " AND (co.label like'" . $search_country . "%')";
+}
+if (strlen(trim($search_tvaintra))) {
+	$sql .= " AND (s.tva_intra like'" . $search_tvaintra . "%')";
 }
 if (! empty($conf->multicompany->enabled)) {
 	$sql .= " AND f.entity IN (" . getEntity("facture", 1) . ")";
@@ -201,8 +224,8 @@ if ($result) {
 	$i = 0;
 	
 	$param = "";
-	if ($search_facture)
-		$param .= "&search_facture=" . $search_facture;
+	if ($search_invoice)
+		$param .= "&search_invoice=" . $search_invoice;
 	if ($search_ref)
 		$param .= "&search_ref=" . $search_ref;
 	if ($search_label)
@@ -211,8 +234,13 @@ if ($result) {
 		$param .= "&search_desc=" . $search_desc;
 	if ($search_account)
 		$param .= "&search_account=" . $search_account;
-	if ($filter)
-		$param .= "&filter=" . $filter;
+	if ($search_vat)
+		$param .= "&search_vat=" . $search_vat;
+	if ($search_country)
+		$param .= "&search_country=" . $search_country;
+	if ($search_tvaintra)
+		$param .= "&search_tvaintra=" . $search_tvaintra;
+
 	
 	print_barre_liste($langs->trans("InvoiceLinesDone"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num_lines, $nbtotalofrecords);
 	print '<td align="left"><b>' . $langs->trans("DescVentilDoneCustomer") . '</b></td>';
@@ -228,12 +256,12 @@ if ($result) {
 	print_liste_field_titre($langs->trans("Invoice"), $_SERVER["PHP_SELF"], "f.facnumber", "", $param, '', $sortfield, $sortorder);
 	print_liste_field_titre($langs->trans("Ref"), $_SERVER["PHP_SELF"], "p.ref", "", $param, '', $sortfield, $sortorder);
 	print_liste_field_titre($langs->trans("Label"), $_SERVER["PHP_SELF"], "p.label", "", $param, '', $sortfield, $sortorder);
-	print_liste_field_titre($langs->trans("Description"), $_SERVER["PHP_SELF"], "l.description", "", $param, '', $sortfield, $sortorder);
-	print_liste_field_titre($langs->trans("Amount"), $_SERVER["PHP_SELF"], "l.total_ht", "", $param, 'align="center"', $sortfield, $sortorder);
-	print_liste_field_titre($langs->trans("VATRate"), $_SERVER["PHP_SELF"], "l.tva_tx", "", $param, 'align="center"', $sortfield, $sortorder);
+	print_liste_field_titre($langs->trans("Description"), $_SERVER["PHP_SELF"], "fd.description", "", $param, '', $sortfield, $sortorder);
+	print_liste_field_titre($langs->trans("Amount"), $_SERVER["PHP_SELF"], "fd.total_ht", "", $param, 'align="center"', $sortfield, $sortorder);
+	print_liste_field_titre($langs->trans("VATRate"), $_SERVER["PHP_SELF"], "fd.tva_tx", "", $param, 'align="center"', $sortfield, $sortorder);
 	print_liste_field_titre($langs->trans("Account"), $_SERVER["PHP_SELF"], "aa.account_number", "", $param, 'align="center"', $sortfield, $sortorder);
-	print_liste_field_titre('');
-	print_liste_field_titre('');
+	print_liste_field_titre($langs->trans("Country"), $_SERVER["PHP_SELF"], "co.label", "", $param, 'align="center"', $sortfield, $sortorder);
+	print_liste_field_titre($langs->trans("IntracommunityVATNumber"), $_SERVER["PHP_SELF"], "s.tva_intra", "", $param, 'align="center"', $sortfield, $sortorder);
 	print_liste_field_titre($langs->trans("Ventilate") . '<br><label id="select-all">' . $langs->trans('All') . '</label>/<label id="unselect-all">' . $langs->trans('None') . '</label>', '', '', '', '', 'align="center"');
 	print "</tr>\n";
 	
@@ -243,14 +271,13 @@ if ($result) {
 	print '<td class="liste_titre"><input type="text" class="flat" size="15" name="search_label" value="' . $search_label . '"></td>';
 	print '<td class="liste_titre"><input type="text" class="flat" size="15" name="search_desc" value="' . $search_desc . '"></td>';
 	print '<td class="liste_titre" align="center"><input type="text" class="flat" size="8" name="search_amount" value="' . $search_amount . '"></td>';
-	print '<td class="liste_titre" align="center"><input type="text" class="flat" size="5" name="search_vat" value="' . $search_vat . '">%</td>';
+	print '<td class="liste_titre" align="center">%<input type="text" class="flat" size="5" name="search_vat" value="' . $search_vat . '"></td>';
 	print '<td class="liste_titre" align="center"><input type="text" class="flat" size="15" name="search_account" value="' . $search_account . '"></td>';
-	print '<td class="liste_titre" colspan="2">&nbsp;</td>';
-    print '<td class="liste_titre" align="right">';
-    $searchpitco=$form->showFilterAndCheckAddButtons(0);
-    print $searchpitco;
-    print '</td>';
-	print "</tr>\n";
+	print '<td class="liste_titre" align="center"><input type="text" class="flat" size="15" name="search_country" value="' . $search_country . '"></td>';
+	print '<td class="liste_titre" align="center"><input type="text" class="flat" size="15" name="search_tavintra" value="' . $search_tavintra . '"></td>';
+	print '<td class="liste_titre" align="center"><input type="image" class="liste_titre" name="button_search" src="' . img_picto($langs->trans("Search"), 'search.png', '', '', 1) . '" value="' . dol_escape_htmltag($langs->trans("Search")) . '" title="' . dol_escape_htmltag($langs->trans("Search")) . '">';
+	print '<input type="image" class="liste_titre" name="button_removefilter" src="' . img_picto($langs->trans("Search"), 'searchclear.png', '', '', 1) . '" value="' . dol_escape_htmltag($langs->trans("RemoveFilter")) . '" title="' . dol_escape_htmltag($langs->trans("RemoveFilter")) . '">';
+	print "</td></tr>\n";
 	
 	$facture_static = new Facture($db);
 	$product_static = new Product($db);
@@ -258,7 +285,7 @@ if ($result) {
 	$var = True;
 	while ( $objp = $db->fetch_object($result) ) {
 		$var = ! $var;
-		$codecompta = $objp->account_number . ' ' . $objp->label;
+		$codecompta = $objp->account_number . ' - ' . $objp->label_compte;
 		
 		print "<tr $bc[$var]>";
 		
@@ -282,13 +309,12 @@ if ($result) {
 		print '<td>' . nl2br(dol_trunc($objp->description, 32)) . '</td>';
 		print '<td align="right">' . price($objp->total_ht) . '</td>';
 		print '<td align="center">' . price($objp->tva_tx) . '</td>';
-		print '<td align="center">' . $codecompta . '</td>';
-		print '<td align="right">' . $objp->rowid . '</td>';
-		print '<td align="left"><a href="./card.php?id=' . $objp->rowid . '">';
+		print '<td align="center">' . $codecompta . '<a href="./card.php?id=' . $objp->fdid . '">';
 		print img_edit();
 		print '</a></td>';
-		
-		print '<td align="center"><input type="checkbox" name="changeaccount[]" value="' . $objp->rowid . '"/></td>';
+		print '<td align="right">' . $objp->country .'</td>';
+		print '<td align="center">' . $objp->tva_intra . '</td>';
+		print '<td align="center"><input type="checkbox" name="changeaccount[]" value="' . $objp->fdid . '"/></td>';
 		
 		print "</tr>";
 		$i ++;
diff --git a/htdocs/accountancy/customer/list.php b/htdocs/accountancy/customer/list.php
index a2a1619cb63..438eb30c621 100644
--- a/htdocs/accountancy/customer/list.php
+++ b/htdocs/accountancy/customer/list.php
@@ -1,9 +1,9 @@
 <?php
-/* Copyright (C) 2013-2014 Olivier Geffroy      <jeff@jeffinfo.com>
- * Copyright (C) 2013-2016 Alexandre Spangaro	<aspangaro.dolibarr@gmail.com>
- * Copyright (C) 2014-2015 Ari Elbaz (elarifr)	<github@accedinfo.com>
- * Copyright (C) 2013-2014 Florian Henry		<florian.henry@open-concept.pro>
- * Copyright (C) 2014	   Juanjo Menent		<jmenent@2byte.es>
+/* Copyright (C) 2013-2014	Olivier Geffroy		<jeff@jeffinfo.com>
+ * Copyright (C) 2013-2016	Alexandre Spangaro	<aspangaro.dolibarr@gmail.com>
+ * Copyright (C) 2014-2015	Ari Elbaz (elarifr)	<github@accedinfo.com>
+ * Copyright (C) 2013-2014	Florian Henry		<florian.henry@open-concept.pro>
+ * Copyright (C) 2014	  	Juanjo Menent		<jmenent@2byte.es>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -20,9 +20,9 @@
  */
 
 /**
- * \file htdocs/accountancy/customer/list.php
- * \ingroup Accountancy
- * \brief Ventilation page from customers invoices
+ * \file 		htdocs/accountancy/customer/list.php
+ * \ingroup 	Advanced accountancy
+ * \brief 		Ventilation page from customers invoices
  */
 require '../../main.inc.php';
 
@@ -31,6 +31,7 @@ require_once DOL_DOCUMENT_ROOT . '/compta/facture/class/facture.class.php';
 require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';
 require_once DOL_DOCUMENT_ROOT . '/accountancy/class/html.formventilation.class.php';
 require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingaccount.class.php';
+require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
 
 // Langs
 $langs->load("compta");
@@ -105,7 +106,6 @@ if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) {
 /*
  * View
  */
-
 llxHeader('', $langs->trans("Ventilation"));
 
 print '<script type="text/javascript">
@@ -123,36 +123,38 @@ print '<script type="text/javascript">
 				    });
 			    });
 			});
-			 </script>';
+		</script>';
 
 /*
  * Action
  */
-
 if ($action == 'ventil' && ! empty($btn_ventil)) {
 	print '<div><font color="red">' . $langs->trans("Processing") . '...</font></div>';
 	if (! empty($codeventil) && ! empty($mesCasesCochees)) {
 		print '<div><font color="red">' . count($mesCasesCochees) . ' ' . $langs->trans("SelectedLines") . '</font></div>';
 		$mesCodesVentilChoisis = $codeventil;
 		$cpt = 0;
-		
+
 		foreach ( $mesCasesCochees as $maLigneCochee ) {
 			$maLigneCourante = explode("_", $maLigneCochee);
 			$monId = $maLigneCourante[0];
 			$monNumLigne = $maLigneCourante[1];
 			$monCompte = $mesCodesVentilChoisis[$monNumLigne];
-			
+
 			$sql = " UPDATE " . MAIN_DB_PREFIX . "facturedet";
 			$sql .= " SET fk_code_ventilation = " . $monCompte;
 			$sql .= " WHERE rowid = " . $monId;
-			
+
+			$accountventilated = new AccountingAccount($db);
+			$accountventilated->fetch($monCompte, '');
+
 			dol_syslog("/accountancy/customer/list.php sql=" . $sql, LOG_DEBUG);
 			if ($db->query($sql)) {
-				print '<div><font color="green">' . $langs->trans("Lineofinvoice") . ' ' . $monId . ' ' . $langs->trans("VentilatedinAccount") . ' : ' . $monCompte . '</font></div>';
+				print '<div><font color="green">' . $langs->trans("Lineofinvoice") . ' ' . $monId . ' - ' . $langs->trans("VentilatedinAccount") . ' : ' . length_accountg($accountventilated->account_number) . '</font></div>';
 			} else {
-				print '<div><font color="red">' . $langs->trans("ErrorDB") . ' : ' . $langs->trans("Lineofinvoice") . ' ' . $monId . ' ' . $langs->trans("NotVentilatedinAccount") . ' : ' . $monCompte . '<br/> <pre>' . $sql . '</pre></font></div>';
+				print '<div><font color="red">' . $langs->trans("ErrorDB") . ' : ' . $langs->trans("Lineofinvoice") . ' ' . $monId . ' - ' . $langs->trans("NotVentilatedinAccount") . ' : ' . length_accountg($accountventilated->account_number) . '<br/> <pre>' . $sql . '</pre></font></div>';
 			}
-			
+
 			$cpt ++;
 		}
 	} else {
@@ -164,7 +166,6 @@ if ($action == 'ventil' && ! empty($btn_ventil)) {
 /*
  * Customer Invoice lines
  */
-
 if (! empty($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION)) {
 	$limit = $conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION;
 } else if ($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION <= 0) {
@@ -224,16 +225,13 @@ $result = $db->query($sql);
 if ($result) {
 	$num_lines = $db->num_rows($result);
 	$i = 0;
-	
+
 	print_barre_liste($langs->trans("InvoiceLines"), $page, $_SERVER["PHP_SELF"], "", $sortfield, $sortorder, '', $num_lines);
 	print '<br><b>' . $langs->trans("DescVentilTodoCustomer") . '</b></br>';
-	print_liste_field_titre($langs->trans("Date"), $_SERVER["PHP_SELF"], "f.datef", "", $param, '', $sortfield, $sortorder);
-	print '&nbsp;&nbsp;';
-	print_liste_field_titre($langs->trans("RowId"), $_SERVER["PHP_SELF"], "l.rowid", "", $param, '', $sortfield, $sortorder);
-	
+
 	print '<form action="' . $_SERVER["PHP_SELF"] . '" method="post">' . "\n";
 	print '<input type="hidden" name="action" value="ventil">';
-	
+
 	print '<table class="noborder" width="100%">';
 	print '<tr class="liste_titre">';
 	print_liste_field_titre($langs->trans("Invoice"), $_SERVER["PHP_SELF"], "f.facnumber", "", $param, '', $sortfield, $sortorder);
@@ -247,40 +245,39 @@ if ($result) {
 	print_liste_field_titre('');
 	print_liste_field_titre($langs->trans("Ventilate") . '<br><label id="select-all">' . $langs->trans('All') . '</label>/<label id="unselect-all">' . $langs->trans('None') . '</label>', '', '', '', '', 'align="center"');
 	print '</tr>';
-	
+
 	// We add search filter
-	
 	print '<tr class="liste_titre">';
 	print '<td class="liste_titre"><input type="text" class="flat" size="10" name="search_invoice" value="' . $search_invoice . '"></td>';
 	print '<td class="liste_titre"><input type="text" class="flat" size="15" name="search_ref" value="' . $search_ref . '"></td>';
 	print '<td class="liste_titre"><input type="text" class="flat" size="20" name="search_label" value="' . $search_label . '"></td>';
 	print '<td class="liste_titre"><input type="text" class="flat" size="20" name="search_desc" value="' . $search_desc . '"></td>';
 	print '<td class="liste_titre" align="right"><input type="text" class="flat" size="10" name="search_amount" value="' . $search_amount . '"></td>';
-	print '<td class="liste_titre" align="center"><input type="text" class="flat" size="5" name="search_vat" value="' . $search_vat . '">%</td>';
+	print '<td class="liste_titre" align="center"><input type="text" class="flat" size="3" name="search_vat" value="' . $search_vat . '">%</td>';
 	print '<td align="right" class="liste_titre" colspan="4">';
 	print '<input type="image" class="liste_titre" src="' . img_picto($langs->trans("Search"), 'search.png', '', '', 1) . '" name="button_search" value="' . dol_escape_htmltag($langs->trans("Search")) . '" title="' . dol_escape_htmltag($langs->trans("Search")) . '">';
 	print '&nbsp;';
 	print '<input type="image" class="liste_titre" src="' . img_picto($langs->trans("Search"), 'searchclear.png', '', '', 1) . '" name="button_removefilter" value="' . dol_escape_htmltag($langs->trans("RemoveFilter")) . '" title="' . dol_escape_htmltag($langs->trans("RemoveFilter")) . '">';
 	print '</td>';
 	print '</tr>';
-	
+
 	$facture_static = new Facture($db);
 	$product_static = new Product($db);
 	$form = new Form($db);
-	
+
 	$var = true;
 	while ( $i < min($num_lines, $limit) ) {
 		$objp = $db->fetch_object($result);
 		$var = ! $var;
-		
+
 		$objp->code_sell_l = '';
 		$objp->code_sell_p = '';
 		$objp->aarowid_suggest = '';
 		$code_sell_p_l_differ = '';
-		
+
 		$code_sell_p_notset = '';
 		$objp->aarowid_suggest = $objp->aarowid;
-		
+
 		if (! empty($objp->code_sell)) {
 			$objp->code_sell_p = $objp->code_sell;
 		} else {
@@ -304,9 +301,9 @@ if ($result) {
 		}
 		if ($objp->code_sell_l != $objp->code_sell_p)
 			$code_sell_p_l_differ = 'color:red';
-		
+
 		print "<tr $bc[$var]>";
-		
+
 		// Ref Invoice
 		$facture_static->ref = $objp->facnumber;
 		$facture_static->id = $objp->facid;
@@ -316,14 +313,14 @@ if ($result) {
 		$product_static->id = $objp->product_id;
 		$product_static->type = $objp->type;
 		print '<td>';
-		
+
 		if ($product_static->id)
 			print $product_static->getNomUrl(1);
 		else
 			print '&nbsp;';
-		
+
 		print '</td>';
-		
+
 		print '<td style="' . $code_sell_p_l_differ . '">' . dol_trunc($objp->product_label, 24) . '</td>';
 		$trunclength = defined('ACCOUNTING_LENGTH_DESCRIPTION') ? ACCOUNTING_LENGTH_DESCRIPTION : 32;
 		print '<td style="' . $code_sell_p_l_differ . '">' . nl2br(dol_trunc($objp->description, $trunclength)) . '</td>';
@@ -339,10 +336,10 @@ if ($result) {
 		if ($objp->code_sell_l == $objp->code_sell_p) {
 			print $objp->code_sell_l;
 		} else {
-			print $langs->trans("Purchase") . ' = ' . $objp->code_sell_l . '<br />' . $langs->trans("Sell") . ' = ' . $objp->code_sell_p;
+			print $langs->trans("Buy") . ' = ' . $objp->code_sell_l . '<br />' . $langs->trans("Sell") . ' = ' . $objp->code_sell_p;
 		}
 		print '</td>';
-		
+
 		print '<td align="center">';
 		print $formventilation->select_account($objp->aarowid_suggest, 'codeventil[]', 1);
 		print '</td>';
@@ -353,7 +350,7 @@ if ($result) {
 		print '</tr>';
 		$i ++;
 	}
-	
+
 	print '</table>';
 	print '<br><div align="center"><input type="submit" class="butAction" value="' . $langs->trans("Ventilate") . '" name="ventil"></div>';
 	print '</form>';
diff --git a/htdocs/accountancy/journal/bankjournal.php b/htdocs/accountancy/journal/bankjournal.php
index 4529fe08278..f995b2684ee 100644
--- a/htdocs/accountancy/journal/bankjournal.php
+++ b/htdocs/accountancy/journal/bankjournal.php
@@ -71,7 +71,7 @@ $now = dol_now();
 // Security check
 if ($user->societe_id > 0 && empty($id_bank_account))
 	accessforbidden();
-	
+
 /*
  * View
  */
@@ -122,7 +122,7 @@ $paymentsalstatic = new PaymentSalary($db);
 // Get code of finance journal
 $bank_code_journal = new Account($db);
 $result = $bank_code_journal->fetch($id_bank_account);
-$journal = $bank_code_journal->ref;
+$journal = $bank_code_journal->accountancy_journal;
 
 dol_syslog("accountancy/journal/bankjournal.php", LOG_DEBUG);
 $result = $db->query($sql);
@@ -148,7 +148,7 @@ if ($result) {
 		$tabcompany[$obj->rowid] = array (
 				'id' => $obj->socid,
 				'name' => $obj->name,
-				'code_client' => $obj->code_compta 
+				'code_client' => $obj->code_compta
 		);
 
 		// Controls
@@ -251,7 +251,7 @@ if ($result) {
 		$tabbq[$obj->rowid][$compta_bank] += $obj->amount;
 
 		// if($obj->socid)$tabtp[$obj->rowid][$compta_soc] += $obj->amount;
-		
+
 		$i ++;
 	}
 } else {
@@ -312,14 +312,13 @@ if ($action == 'writebookkeeping') {
 				if ($resultmid) {
 					$objmid = $db->fetch_object($resultmid);
 					$bookkeeping->doc_ref = $objmid->ref_supplier . ' (' . $objmid->ref . ')';
-					;
 				}
 			}
 
 			$result = $bookkeeping->create($user);
 			if ($result < 0) {
 				$error ++;
-				setEventMessages($object->error, $object->errors, 'errors');
+				setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
 			}
 		}
 		// Third party
@@ -388,7 +387,7 @@ if ($action == 'writebookkeeping') {
 				$bookkeeping->code_tiers = $k;
 				$bookkeeping->numero_compte = $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER;
 			} else {
-				
+
 				$bookkeeping->doc_ref = $k;
 				$bookkeeping->numero_compte = $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER;
 			}
@@ -396,7 +395,7 @@ if ($action == 'writebookkeeping') {
 			$result = $bookkeeping->create($user);
 			if ($result < 0) {
 				$error ++;
-				setEventMessages($object->error, $object->errors, 'errors');
+				setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
 			}
 		}
 	}
@@ -414,7 +413,7 @@ if ($action == 'export_csv') {
 	$companystatic = new Client($db);
 
 	// Model Cegid Expert Export
-	if ($conf->global->ACCOUNTING_EXPORT_MODELCSV == 2) 
+	if ($conf->global->ACCOUNTING_EXPORT_MODELCSV == 2)
 	{
 		$sep = ";";
 
@@ -436,7 +435,7 @@ if ($action == 'export_csv') {
 				print ($mt < 0 ? 'C' : 'D') . $sep;
 				print ($mt <= 0 ? price(- $mt) : $mt) . $sep;
 				print $val["type_payment"] . $sep;
-				print $val["ref"] . $sep;
+				print utf8_decode($val["ref"]) . $sep;
 				print "\n";
 			}
 
@@ -455,7 +454,7 @@ if ($action == 'export_csv') {
 						print ($mt < 0 ? 'D' : 'C') . $sep;
 						print ($mt <= 0 ? price(- $mt) : $mt) . $sep;
 						print $val["type_payment"] . $sep;
-						print $val["ref"] . $sep;
+						print utf8_decode($val["ref"]) . $sep;
 						print "\n";
 					}
 				}
@@ -468,7 +467,7 @@ if ($action == 'export_csv') {
 						print ($mt < 0 ? 'D' : 'C') . $sep;
 						print ($mt <= 0 ? price(- $mt) : $mt) . $sep;
 						print $val["type_payment"] . $sep;
-						print $val["ref"] . $sep;
+					print utf8_decode($val["ref"]) . $sep;
 						print "\n";
 					}
 				}
@@ -486,7 +485,12 @@ if ($action == 'export_csv') {
 				print '"' . $date . '"' . $sep;
 				print '"' . $val["type_payment"] . '"' . $sep;
 				print '"' . length_accountg(html_entity_decode($k)) . '"' . $sep;
-				print '"' . $langs->trans("Bank") . '"' . $sep;
+				if ($companystatic->name == '') {
+					print '"' . $langs->trans('Bank') . " - " . utf8_decode($val["ref"]) . '"' . $sep;
+				} else {
+					print '"' . $langs->trans("Bank") . ' - ' . utf8_decode($companystatic->name) . '"' . $sep;
+				}
+				// print '"' . $langs->trans("Bank") . '"' . $sep;
 				print '"' . ($mt >= 0 ? price($mt) : '') . '"' . $sep;
 				print '"' . ($mt < 0 ? price(- $mt) : '') . '"';
 				print "\n";
@@ -499,7 +503,12 @@ if ($action == 'export_csv') {
 						print '"' . $date . '"' . $sep;
 						print '"' . $val["type_payment"] . '"' . $sep;
 						print '"' . length_accounta(html_entity_decode($k)) . '"' . $sep;
-						print '"' . $companystatic->name . '"' . $sep;
+						// print '"' . $companystatic->name . '"' . $sep;
+						if ($companystatic->name == '') {
+							print '"' . $langs->trans('ThirdParty') . " - " . utf8_decode($val["ref"]) . '"' . $sep;
+						} else {
+							print '"' . $langs->trans('ThirdParty') . " - " . utf8_decode($companystatic->name) . '"' . $sep;
+						}
 						print '"' . ($mt < 0 ? price(- $mt) : '') . '"' . $sep;
 						print '"' . ($mt >= 0 ? price($mt) : '') . '"';
 						print "\n";
@@ -510,7 +519,12 @@ if ($action == 'export_csv') {
 					print '"' . $date . '"' . $sep;
 					print '"' . $val["ref"] . '"' . $sep;
 					print '"' . length_accountg($conf->global->ACCOUNTING_ACCOUNT_SUSPENSE) . '"' . $sep;
-					print '"' . $langs->trans("Bank") . '"' . $sep;
+					// print '"' . $langs->trans("Bank") . '"' . $sep;
+					if ($companystatic->name == '') {
+						print '"' . $langs->trans("Bank") . ' - ' . utf8_decode($val["ref"]) . '"' . $sep;
+					} else {
+						print '"' . $langs->trans("Bank") . ' - ' . utf8_decode($companystatic->name) . '"' . $sep;
+					}
 					print '"' . ($mt < 0 ? price(- $mt) : '') . '"' . $sep;
 					print '"' . ($mt >= 0 ? price($mt) : '') . '"';
 					print "\n";
@@ -523,7 +537,7 @@ else {
 	$form = new Form($db);
 
 	llxHeader('', $langs->trans("FinanceJournal"));
-	
+
 	$nom = $langs->trans("FinanceJournal") . ' - ' . $bank_code_journal->getNomUrl(1);
 	$builddate = time();
 	$description = $langs->trans("DescFinanceJournal") . '<br>';
@@ -531,7 +545,7 @@ else {
 
 	$varlink = 'id_account=' . $id_bank_account;
 	report_header($nom, $nomlink, $period, $periodlink, $description, $builddate, $exportlink, array (
-			'action' => '' 
+			'action' => ''
 	), '', $varlink);
 
 	print '<input type="button" class="button" style="float: right;" value="' . $langs->trans("Export") . '" onclick="launch_export();" />';
@@ -573,7 +587,7 @@ else {
 
 	foreach ( $tabpay as $key => $val ) {
 		$date = dol_print_date($db->jdate($val["date"]), 'day');
-		
+
 		if ($val["lib"] == '(SupplierInvoicePayment)') {
 			$reflabel = $langs->trans('SupplierInvoicePayment');
 		}
@@ -587,7 +601,12 @@ else {
 			print "<td>" . $date . "</td>";
 			print "<td>" . $reflabel . "</td>";
 			print "<td>" . length_accountg($k) . "</td>";
-			print "<td>" . $langs->trans('Bank') . "</td>";
+			// print "<td>" . $langs->trans('Bank') . "</td>";
+			if ($val['soclib'] == '') {
+				print "<td>" . $langs->trans('Bank') . " - " . $val["ref"] . "</td>";
+			} else {
+				print "<td>" . $langs->trans("Bank") . " - " . $val['soclib'] . "</td>";
+			}
 			print "<td>" . $val["type_payment"] . "</td>";
 			print "<td align='right'>" . ($mt >= 0 ? price($mt) : '') . "</td>";
 			print "<td align='right'>" . ($mt < 0 ? price(- $mt) : '') . "</td>";
@@ -601,8 +620,18 @@ else {
 					print "<tr " . $bc[$var] . ">";
 					print "<td>" . $date . "</td>";
 					print "<td>" . $val["soclib"] . "</td>";
+					// print "<td>" . length_accounta($k) . "</td>";
+					if (length_accounta($k) == '') {
+						print "<td>" . length_accounta($conf->global->ACCOUNTING_ACCOUNT_TRANSFER_CASH) . "</td>";
+					} else {
 					print "<td>" . length_accounta($k) . "</td>";
-					print "<td>" . $langs->trans('ThirdParty') . " (" . $val['soclib'] . ")</td>";
+					}
+					// print "<td>" . $langs->trans('ThirdParty') . " (" . $val['soclib'] . ")</td>";
+					if ($val['soclib'] == '') {
+						print "<td>" . $langs->trans('ThirdParty') . " - " . $val["ref"] . "</td>";
+					} else {
+						print "<td>" . $langs->trans("ThirdParty") . ' - ' . $val['soclib'] . "</td>";
+					}
 					print "<td>" . $val["type_payment"] . "</td>";
 					print "<td align='right'>" . ($mt < 0 ? price(- $mt) : '') . "</td>";
 					print "<td align='right'>" . ($mt >= 0 ? price($mt) : '') . "</td>";
@@ -615,7 +644,12 @@ else {
 				print "<td>" . $date . "</td>";
 				print "<td>" . $reflabel . "</td>";
 				print "<td>" . length_accountg($conf->global->ACCOUNTING_ACCOUNT_SUSPENSE) . "</td>";
-				print "<td>" . $langs->trans('ThirdParty') . "</td>";
+				// print "<td>" . $langs->trans('ThirdParty') . "</td>";
+				if ($val['soclib'] == '') {
+					print "<td>" . $langs->trans('ThirdParty') . " - " . $val["ref"] . "</td>";
+				} else {
+					print "<td>" . $langs->trans("ThirdParty") . ' - ' . $val['soclib'] . "</td>";
+				}
 				print "<td>&nbsp;</td>";
 				print "<td align='right'>" . ($mt < 0 ? price(- $mt) : '') . "</td>";
 				print "<td align='right'>" . ($mt >= 0 ? price($mt) : '') . "</td>";
diff --git a/htdocs/accountancy/journal/purchasesjournal.php b/htdocs/accountancy/journal/purchasesjournal.php
index 7d9778f72b8..82811598188 100644
--- a/htdocs/accountancy/journal/purchasesjournal.php
+++ b/htdocs/accountancy/journal/purchasesjournal.php
@@ -112,14 +112,14 @@ if ($result) {
 	$num = $db->num_rows($result);
 	// les variables
 	$cptfour = (! empty($conf->global->ACCOUNTING_ACCOUNT_SUPPLIER)) ? $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER : $langs->trans("CodeNotDef");
-	$cpttva = (! empty($conf->global->ACCOUNTING_VAT_SOLD_ACCOUNT)) ? $conf->global->ACCOUNTING_VAT_SOLD_ACCOUNT : $langs->trans("CodeNotDef");
-	
+	$cpttva = (! empty($conf->global->ACCOUNTING_VAT_BUY_ACCOUNT)) ? $conf->global->ACCOUNTING_VAT_BUY_ACCOUNT : $langs->trans("CodeNotDef");
+
 	$tabfac = array ();
 	$tabht = array ();
 	$tabtva = array ();
 	$tabttc = array ();
 	$tabcompany = array ();
-	
+
 	$i = 0;
 	while ( $i < $num ) {
 		$obj = $db->fetch_object($result);
@@ -133,9 +133,13 @@ if ($result) {
 				$compta_prod = (! empty($conf->global->ACCOUNTING_SERVICE_BUY_ACCOUNT)) ? $conf->global->ACCOUNTING_SERVICE_BUY_ACCOUNT : $langs->trans("CodeNotDef");
 		}
 		$compta_tva = (! empty($obj->account_tva) ? $obj->account_tva : $cpttva);
-		
+
 		$tabfac[$obj->rowid]["date"] = $obj->df;
 		$tabfac[$obj->rowid]["ref"] = $obj->ref_supplier . ' (' . $obj->ref . ')';
+		$tabfac[$obj->rowid]["refsologest"] =  $obj->ref ;
+		$tabfac[$obj->rowid]["refsuppliersologest"] =  $obj->ref_supplier ;
+
+
 		$tabfac[$obj->rowid]["type"] = $obj->type;
 		$tabfac[$obj->rowid]["description"] = $obj->description;
 		$tabfac[$obj->rowid]["fk_facturefourndet"] = $obj->fdid;
@@ -145,9 +149,9 @@ if ($result) {
 		$tabcompany[$obj->rowid] = array (
 				'id' => $obj->socid,
 				'name' => $obj->name,
-				'code_fournisseur' => $obj->code_compta_fournisseur 
+				'code_fournisseur' => $obj->code_compta_fournisseur
 		);
-		
+
 		$i ++;
 	}
 } else {
@@ -158,11 +162,11 @@ if ($result) {
 if ($action == 'writebookkeeping') {
 	$now = dol_now();
 	$error = 0;
-	
+
 	foreach ( $tabfac as $key => $val ) {
 		foreach ( $tabttc[$key] as $k => $mt ) {
 			// get compte id and label
-			
+
 			$bookkeeping = new BookKeeping($db);
 			$bookkeeping->doc_date = $val["date"];
 			$bookkeeping->doc_ref = $val["ref"];
@@ -179,14 +183,14 @@ if ($action == 'writebookkeeping') {
 			$bookkeeping->credit = ($mt > 0) ? $mt : 0;
 			$bookkeeping->code_journal = $conf->global->ACCOUNTING_PURCHASE_JOURNAL;
 			$bookkeeping->fk_user_author = $user->id;
-			
+
 			$result = $bookkeeping->create($user);
 			if ($result < 0) {
 				$error ++;
-				setEventMessages($object->error, $object->errors, 'errors');
+				setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
 			}
 		}
-		
+
 		// Product / Service
 		foreach ( $tabht[$key] as $k => $mt ) {
 			if ($mt) {
@@ -209,16 +213,16 @@ if ($action == 'writebookkeeping') {
 					$bookkeeping->credit = ($mt <= 0) ? $mt : 0;
 					$bookkeeping->code_journal = $conf->global->ACCOUNTING_PURCHASE_JOURNAL;
 					$bookkeeping->fk_user_author = $user->id;
-					
+
 					$result = $bookkeeping->create($user);
 					if ($result < 0) {
 						$error ++;
-						setEventMessages($object->error, $object->errors, 'errors');
+						setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
 					}
 				}
 			}
 		}
-		
+
 		// VAT
 		// var_dump($tabtva);
 		foreach ( $tabtva[$key] as $k => $mt ) {
@@ -240,16 +244,16 @@ if ($action == 'writebookkeeping') {
 				$bookkeeping->credit = ($mt <= 0) ? $mt : 0;
 				$bookkeeping->code_journal = $conf->global->ACCOUNTING_PURCHASE_JOURNAL;
 				$bookkeeping->fk_user_author = $user->id;
-				
+
 				$result = $bookkeeping->create($user);
 				if ($result < 0) {
 					$error ++;
-					setEventMessages($object->error, $object->errors, 'errors');
+					setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
 				}
 			}
 		}
 	}
-	
+
 	if (empty($error)) {
 		setEventMessages($langs->trans("GeneralLedgerIsWritten"), null, 'mesgs');
 	}
@@ -265,23 +269,23 @@ $companystatic = new Fournisseur($db);
 if ($action == 'export_csv') {
 	$sep = $conf->global->ACCOUNTING_EXPORT_SEPARATORCSV;
 	$journal = $conf->global->ACCOUNTING_PURCHASE_JOURNAL;
-	
+
 	include DOL_DOCUMENT_ROOT . '/accountancy/tpl/export_journal.tpl.php';
-	
+
 	// Model Cegid Expert Export
-	if ($conf->global->ACCOUNTING_EXPORT_MODELCSV == 2) 
+	if ($conf->global->ACCOUNTING_EXPORT_MODELCSV == 2)
 	{
 		$sep = ";";
-		
+
 		foreach ( $tabfac as $key => $val ) {
 			$date = dol_print_date($db->jdate($val["date"]), '%d%m%Y');
-			
+
 			// Product / Service
 			foreach ( $tabht[$key] as $k => $mt ) {
 				$companystatic->id = $tabcompany[$key]['id'];
 				$companystatic->name = $tabcompany[$key]['name'];
 				$companystatic->client = $tabcompany[$key]['code_client'];
-				
+
 				if ($mt) {
 					print $date . $sep;
 					print $purchase_journal . $sep;
@@ -294,7 +298,7 @@ if ($action == 'export_csv') {
 					print "\n";
 				}
 			}
-			
+
 			// VAT
 			foreach ( $tabtva[$key] as $k => $mt ) {
 				if ($mt) {
@@ -309,7 +313,7 @@ if ($action == 'export_csv') {
 					print "\n";
 				}
 			}
-			
+
 			foreach ( $tabttc[$key] as $k => $mt ) {
 				print $date . $sep;
 				print $purchase_journal . $sep;
@@ -325,12 +329,20 @@ if ($action == 'export_csv') {
 	} else {
 		// Model Classic Export
 		foreach ( $tabfac as $key => $val ) {
+
+			$invoicestatic->id = $key;
+			$invoicestatic->ref = $val["ref"];
+			$invoicestatic->ref = $val["refsologest"];
+			$invoicestatic->refsupplier = $val["refsuppliersologest"];
+			$invoicestatic->type = $val["type"];
+			$invoicestatic->description = html_entity_decode(dol_trunc($val["description"], 32));
+
 			$date = dol_print_date($db->jdate($val["date"]), 'day');
-			
+
 			$companystatic->id = $tabcompany[$key]['id'];
 			$companystatic->name = $tabcompany[$key]['name'];
 			$companystatic->client = $tabcompany[$key]['code_client'];
-			
+
 			// Product / Service
 			foreach ( $tabht[$key] as $k => $mt ) {
 				$accountingaccount = new AccountingAccount($db);
@@ -339,7 +351,8 @@ if ($action == 'export_csv') {
 					print '"' . $date . '"' . $sep;
 					print '"' . $val["ref"] . '"' . $sep;
 					print '"' . length_accountg(html_entity_decode($k)) . '"' . $sep;
-					print '"' . dol_trunc($accountingaccount->label, 32) . '"' . $sep;
+					print '"' . utf8_decode(dol_trunc($companystatic->name,16)).' - ' . $val["refsuppliersologest"] . ' - ' . utf8_decode(dol_trunc($accountingaccount->label, 32)) . '"' . $sep;
+					//print '"' . dol_trunc($accountingaccount->label, 32) . '"' . $sep;
 					print '"' . ($mt >= 0 ? price($mt) : '') . '"' . $sep;
 					print '"' . ($mt < 0 ? price(- $mt) : '') . '"';
 					print "\n";
@@ -351,19 +364,21 @@ if ($action == 'export_csv') {
 					print '"' . $date . '"' . $sep;
 					print '"' . $val["ref"] . '"' . $sep;
 					print '"' . length_accountg(html_entity_decode($k)) . '"' . $sep;
-					print '"' . $langs->trans("VAT") . '"' . $sep;
+					//print '"' . $langs->trans("VAT") . '"' . $sep;
+					print '"' . utf8_decode(dol_trunc($companystatic->name,16)).' - ' . $val["refsuppliersologest"] . ' - ' . $langs->trans("VAT") . '"' . $sep;
 					print '"' . ($mt >= 0 ? price($mt) : '') . '"' . $sep;
 					print '"' . ($mt < 0 ? price(- $mt) : '') . '"';
 					print "\n";
 				}
 			}
-			
+
 			// Third party
 			foreach ( $tabttc[$key] as $k => $mt ) {
 				print '"' . $date . '"' . $sep;
 				print '"' . $val["ref"] . '"' . $sep;
 				print '"' . length_accounta(html_entity_decode($k)) . '"' . $sep;
-				print '"' . utf8_decode($companystatic->name) . '"' . $sep;
+				//print '"' . utf8_decode($companystatic->name) . '"' . $sep;
+				print '"' . utf8_decode(dol_trunc($companystatic->name,16)).' - ' . $val["refsuppliersologest"] . ' - ' . $langs->trans("Code_tiers") . '"' . $sep;
 				print '"' . ($mt < 0 ? price(- $mt) : '') . '"' . $sep;
 				print '"' . ($mt >= 0 ? price($mt) : '') . '"';
 			}
@@ -371,11 +386,11 @@ if ($action == 'export_csv') {
 		}
 	}
 } else {
-	
+
 	llxHeader('', $langs->trans("PurchasesJournal"));
-	
+
 	$form = new Form($db);
-	
+
 	$nom = $langs->trans("PurchasesJournal");
 	$nomlink = '';
 	$periodlink = '';
@@ -387,16 +402,16 @@ if ($action == 'export_csv') {
 	} else {
 		$description .= $langs->trans("DepositsAreIncluded");
 	}
-	
+
 	$period = $form->select_date($date_start, 'date_start', 0, 0, 0, '', 1, 0, 1) . ' - ' . $form->select_date($date_end, 'date_end', 0, 0, 0, '', 1, 0, 1);
 	report_header($nom, $nomlink, $period, $periodlink, $description, $builddate, $exportlink, array (
-			'action' => '' 
+			'action' => ''
 	));
-	
+
 	print '<input type="button" class="button" style="float: right;" value="' . $langs->trans("Export") . '" onclick="launch_export();" />';
-	
+
 	print '<input type="button" class="button" value="' . $langs->trans("WriteBookKeeping") . '" onclick="writebookkeeping();" />';
-	
+
 	print '
 	<script type="text/javascript">
 		function launch_export() {
@@ -410,12 +425,12 @@ if ($action == 'export_csv') {
 		    $("div.fiche div.tabBar form input[name=\"action\"]").val("");
 		}
 	</script>';
-	
+
 	/*
 	 * Show result array
 	 */
 	print '<br><br>';
-	
+
 	$i = 0;
 	print "<table class=\"noborder\" width=\"100%\">";
 	print "<tr class=\"liste_titre\">";
@@ -425,31 +440,39 @@ if ($action == 'export_csv') {
 	print "<td>" . $langs->trans("Account") . "</td>";
 	print "<t><td>" . $langs->trans("Type") . "</td><td align='right'>" . $langs->trans("Debit") . "</td><td align='right'>" . $langs->trans("Credit") . "</td>";
 	print "</tr>\n";
-	
+
 	$var = true;
 	$r = '';
-	
+
 	$invoicestatic = new FactureFournisseur($db);
-	
+
 	foreach ( $tabfac as $key => $val ) {
 		$invoicestatic->id = $key;
 		$invoicestatic->ref = $val["ref"];
+
+		$invoicestatic->ref = $val["refsologest"];
+		$invoicestatic->refsupplier = $val["refsuppliersologest"];
+
+
 		$invoicestatic->type = $val["type"];
 		$invoicestatic->description = html_entity_decode(dol_trunc($val["description"], 32));
-		
+
 		$date = dol_print_date($db->jdate($val["date"]), 'day');
-		
+
 		// Product / Service
 		foreach ( $tabht[$key] as $k => $mt ) {
 			$accountingaccount = new AccountingAccount($db);
 			$accountingaccount->fetch(null, $k);
-			
+
 			if ($mt) {
 				print "<tr " . $bc[$var] . " >";
 				print "<td>" . $date . "</td>";
 				print "<td>" . $invoicestatic->getNomUrl(1) . "</td>";
 				print "<td>" . length_accountg($k) . "</td>";
-				print "<td>" . $accountingaccount->label . "</td>";
+				$companystatic->id = $tabcompany[$key]['id'];
+				$companystatic->name = $tabcompany[$key]['name'];
+				print "<td>" . $companystatic->getNomUrl(0, 'supplier', 16). ' - ' .$invoicestatic->refsupplier .' - '.  $accountingaccount->label .   "</td>";
+				//print "<td>" . $accountingaccount->label . "</td>";
 				print '<td align="right">' . ($mt >= 0 ? price($mt) : '') . "</td>";
 				print '<td align="right">' . ($mt < 0 ? price(- $mt) : '') . "</td>";
 				print "</tr>";
@@ -461,34 +484,36 @@ if ($action == 'export_csv') {
 				print "<tr " . $bc[$var] . " >";
 				print "<td>" . $date . "</td>";
 				print "<td>" . $invoicestatic->getNomUrl(1) . "</td>";
-				print "<td>" . length_accountg($k) . "</td><td>" . $langs->trans("VAT") . "</td>";
+				print "<td>" . length_accountg($k) . "</td>" ;
+				print "<td>" . $companystatic->getNomUrl(0, 'supplier', 16). ' - '.$invoicestatic->refsupplier .' - '. $langs->trans("VAT")  . "</td>";
 				print '<td align="right">' . ($mt >= 0 ? price($mt) : '') . "</td>";
 				print '<td align="right">' . ($mt < 0 ? price(- $mt) : '') . "</td>";
 				print "</tr>";
 			}
 		}
 		print "<tr " . $bc[$var] . ">";
-		
+
 		// Third party
 		foreach ( $tabttc[$key] as $k => $mt ) {
 			print "<td>" . $date . "</td>";
 			print "<td>" . $invoicestatic->getNomUrl(1) . "</td>";
 			$companystatic->id = $tabcompany[$key]['id'];
 			$companystatic->name = $tabcompany[$key]['name'];
-			print "<td>" . length_accounta($k);
-			print "</td><td>" . $langs->trans("ThirdParty");
-			print ' (' . $companystatic->getNomUrl(0, 'supplier', 16) . ')';
-			print "</td>";
+			print "<td>" . length_accounta($k)."</td>";
+			print "<td>" . $companystatic->getNomUrl(0, 'supplier', 16). ' - '.$invoicestatic->refsupplier .' - '. $langs->trans("Code_tiers")."</td>";
+			//print "</td><td>" . $langs->trans("ThirdParty");
+			//print ' (' . $companystatic->getNomUrl(0, 'supplier', 16) . ')';
+			//print "</td>";
 			print '<td align="right">' . ($mt < 0 ? - price(- $mt) : '') . "</td>";
 			print '<td align="right">' . ($mt >= 0 ? price($mt) : '') . "</td>";
 		}
 		print "</tr>";
-		
+
 		$var = ! $var;
 	}
-	
+
 	print "</table>";
-	
+
 	// End of page
 	llxFooter();
 }
diff --git a/htdocs/accountancy/journal/sellsjournal.php b/htdocs/accountancy/journal/sellsjournal.php
index 5166d503b06..8ffb4690dba 100644
--- a/htdocs/accountancy/journal/sellsjournal.php
+++ b/htdocs/accountancy/journal/sellsjournal.php
@@ -40,10 +40,10 @@ require_once DOL_DOCUMENT_ROOT . '/accountancy/class/bookkeeping.class.php';
 require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingaccount.class.php';
 
 // Langs
-$langs->load("commercial");
 $langs->load("compta");
 $langs->load("bills");
 $langs->load("other");
+$langs->load("main");
 $langs->load("accountancy");
 
 $date_startmonth = GETPOST('date_startmonth');
@@ -119,16 +119,16 @@ if ($result) {
 	$tabtva = array ();
 	$tabttc = array ();
 	$tabcompany = array ();
-	
+
 	$num = $db->num_rows($result);
 	$i = 0;
-	
+
 	while ( $i < $num ) {
 		$obj = $db->fetch_object($result);
 		// les variables
 		$cptcli = (! empty($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER)) ? $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER : $langs->trans("CodeNotDef");
 		$compta_soc = (! empty($obj->code_compta)) ? $obj->code_compta : $cptcli;
-		
+
 		$compta_prod = $obj->compte;
 		if (empty($compta_prod)) {
 			if ($obj->product_type == 0)
@@ -138,22 +138,23 @@ if ($result) {
 		}
 		$cpttva = (! empty($conf->global->ACCOUNTING_VAT_SOLD_ACCOUNT)) ? $conf->global->ACCOUNTING_VAT_SOLD_ACCOUNT : $langs->trans("CodeNotDef");
 		$compta_tva = (! empty($obj->account_tva) ? $obj->account_tva : $cpttva);
-		
+
 		// Situation invoices handling
 		$line = new FactureLigne($db);
-		$line->fetch($obj->rowid);
-		$prev_progress = $line->get_prev_progress();
+		$line->fetch($obj->fdid); // id of line
+		$prev_progress = 0;
 		if ($obj->type == Facture::TYPE_SITUATION) {
-			// Avoid divide by 0
+		    // Avoid divide by 0
 			if ($obj->situation_percent == 0) {
 				$situation_ratio = 0;
 			} else {
-				$situation_ratio = ($obj->situation_percent - $prev_progress) / $obj->situation_percent;
+		        $prev_progress = $line->get_prev_progress($obj->rowid);   // id of invoice
+			    $situation_ratio = ($obj->situation_percent - $prev_progress) / $obj->situation_percent;
 			}
 		} else {
 			$situation_ratio = 1;
 		}
-		
+
 		// Invoice lines
 		$tabfac[$obj->rowid]["date"] = $obj->df;
 		$tabfac[$obj->rowid]["ref"] = $obj->facnumber;
@@ -172,9 +173,9 @@ if ($result) {
 		$tabcompany[$obj->rowid] = array (
 				'id' => $obj->socid,
 				'name' => $obj->name,
-				'code_client' => $obj->code_compta 
+				'code_client' => $obj->code_compta
 		);
-		
+
 		$i ++;
 	}
 } else {
@@ -190,7 +191,7 @@ if ($result) {
 if ($action == 'writebookkeeping') {
 	$now = dol_now();
 	$error = 0;
-	
+
 	foreach ( $tabfac as $key => $val ) {
 		foreach ( $tabttc[$key] as $k => $mt ) {
 			$bookkeeping = new BookKeeping($db);
@@ -209,14 +210,14 @@ if ($action == 'writebookkeeping') {
 			$bookkeeping->credit = ($mt < 0) ? $mt : 0;
 			$bookkeeping->code_journal = $conf->global->ACCOUNTING_SELL_JOURNAL;
 			$bookkeeping->fk_user_author = $user->id;
-			
+
 			$result = $bookkeeping->create($user);
 			if ($result < 0) {
 				$error ++;
-				setEventMessages($object->error, $object->errors, 'errors');
+				setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
 			}
 		}
-		
+
 		// Product / Service
 		foreach ( $tabht[$key] as $k => $mt ) {
 			if ($mt) {
@@ -239,16 +240,16 @@ if ($action == 'writebookkeeping') {
 					$bookkeeping->credit = ($mt >= 0) ? $mt : 0;
 					$bookkeeping->code_journal = $conf->global->ACCOUNTING_SELL_JOURNAL;
 					$bookkeeping->fk_user_author = $user->id;
-					
+
 					$result = $bookkeeping->create($user);
 					if ($result < 0) {
 						$error ++;
-						setEventMessages($object->error, $object->errors, 'errors');
+						setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
 					}
 				}
 			}
 		}
-		
+
 		// VAT
 		// var_dump($tabtva);
 		foreach ( $tabtva[$key] as $k => $mt ) {
@@ -269,16 +270,16 @@ if ($action == 'writebookkeeping') {
 				$bookkeeping->credit = ($mt >= 0) ? $mt : 0;
 				$bookkeeping->code_journal = $conf->global->ACCOUNTING_SELL_JOURNAL;
 				$bookkeeping->fk_user_author = $user->id;
-				
+
 				$result = $bookkeeping->create($user);
 				if ($result < 0) {
 					$error ++;
-					setEventMessages($object->error, $object->errors, 'errors');
+					setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
 				}
 			}
 		}
 	}
-	
+
 	if (empty($error)) {
 		setEventMessages($langs->trans("GeneralLedgerIsWritten"), null, 'mesgs');
 	}
@@ -288,23 +289,23 @@ if ($action == 'writebookkeeping') {
 if ($action == 'export_csv') {
 	$sep = $conf->global->ACCOUNTING_EXPORT_SEPARATORCSV;
 	$sell_journal = $conf->global->ACCOUNTING_SELL_JOURNAL;
-	
+
 	include DOL_DOCUMENT_ROOT . '/accountancy/tpl/export_journal.tpl.php';
-	
+
 	$companystatic = new Client($db);
-	
+
 	// Model Cegid Expert Export
-	if ($conf->global->ACCOUNTING_EXPORT_MODELCSV == 2) 
+	if ($conf->global->ACCOUNTING_EXPORT_MODELCSV == 2)
 	{
 		$sep = ";";
-		
+
 		foreach ( $tabfac as $key => $val ) {
 			$companystatic->id = $tabcompany[$key]['id'];
 			$companystatic->name = $tabcompany[$key]['name'];
 			$companystatic->client = $tabcompany[$key]['code_client'];
-			
+
 			$date = dol_print_date($db->jdate($val["date"]), '%d%m%Y');
-			
+
 			foreach ( $tabttc[$key] as $k => $mt ) {
 				print $date . $sep;
 				print $sell_journal . $sep;
@@ -316,7 +317,7 @@ if ($action == 'export_csv') {
 				print $val["ref"];
 				print "\n";
 			}
-			
+
 			// Product / Service
 			foreach ( $tabht[$key] as $k => $mt ) {
 				$accountingaccount_static = new AccountingAccount($db);
@@ -332,7 +333,7 @@ if ($action == 'export_csv') {
 					print "\n";
 				}
 			}
-			
+
 			// TVA
 			foreach ( $tabtva[$key] as $k => $mt ) {
 				if ($mt) {
@@ -354,42 +355,45 @@ if ($action == 'export_csv') {
 			$companystatic->id = $tabcompany[$key]['id'];
 			$companystatic->name = $tabcompany[$key]['name'];
 			$companystatic->client = $tabcompany[$key]['code_client'];
-			
+
 			$date = dol_print_date($db->jdate($val["date"]), 'day');
-			
+
 			foreach ( $tabttc[$key] as $k => $mt ) {
 				print '"' . $date . '"' . $sep;
 				print '"' . $val["ref"] . '"' . $sep;
 				print '"' . length_accounta(html_entity_decode($k)) . '"' . $sep;
-				print '"' . utf8_decode($companystatic->name) . '"' . $sep;
+				print '"' . utf8_decode(dol_trunc($companystatic->name,16)).' - ' . $companystatic->ref_client . ' - ' . $langs->trans("Code_tiers") . '"' . $sep;
+				//print '"' . utf8_decode($companystatic->name) . '"' . $sep;
 				print '"' . ($mt >= 0 ? price($mt) : '') . '"' . $sep;
 				print '"' . ($mt < 0 ? price(- $mt) : '') . '"';
 				print "\n";
 			}
-			
+
 			// Product / Service
 			foreach ( $tabht[$key] as $k => $mt ) {
 				$accountingaccount = new AccountingAccount($db);
 				$accountingaccount->fetch(null, $k);
-				
+
 				if ($mt) {
 					print '"' . $date . '"' . $sep;
 					print '"' . $val["ref"] . '"' . $sep;
 					print '"' . length_accountg(html_entity_decode($k)) . '"' . $sep;
-					print '"' . dol_trunc($accountingaccount->label, 32) . '"' . $sep;
+					print '"' . utf8_decode(dol_trunc($companystatic->name,16)).' - '. utf8_decode ( dol_trunc($accountingaccount->label, 32)) . '"' . $sep;
+					//print '"' . dol_trunc($accountingaccount->label, 32) . '"' . $sep;
 					print '"' . ($mt < 0 ? price(- $mt) : '') . '"' . $sep;
 					print '"' . ($mt >= 0 ? price($mt) : '') . '"';
 					print "\n";
 				}
 			}
-			
+
 			// VAT
 			foreach ( $tabtva[$key] as $k => $mt ) {
 				if ($mt) {
 					print '"' . $date . '"' . $sep;
 					print '"' . $val["ref"] . '"' . $sep;
 					print '"' . length_accountg(html_entity_decode($k)) . '"' . $sep;
-					print '"' . $langs->trans("VAT") . '"' . $sep;
+					print '"' . utf8_decode(dol_trunc($companystatic->name,16)).' - '. $langs->trans("VAT") . '"' . $sep;
+					//print '"' . $langs->trans("VAT") . '"' . $sep;
 					print '"' . ($mt < 0 ? price(- $mt) : '') . '"' . $sep;
 					print '"' . ($mt >= 0 ? price($mt) : '') . '"';
 					print "\n";
@@ -398,11 +402,11 @@ if ($action == 'export_csv') {
 		}
 	}
 } else {
-	
+
 	$form = new Form($db);
-	
+
 	llxHeader('', $langs->trans("SellsJournal"));
-	
+
 	$nom = $langs->trans("SellsJournal");
 	$nomlink = '';
 	$periodlink = '';
@@ -415,13 +419,13 @@ if ($action == 'export_csv') {
 		$description .= $langs->trans("DepositsAreIncluded");
 	$period = $form->select_date($date_start, 'date_start', 0, 0, 0, '', 1, 0, 1) . ' - ' . $form->select_date($date_end, 'date_end', 0, 0, 0, '', 1, 0, 1);
 	report_header($nom, $nomlink, $period, $periodlink, $description, $builddate, $exportlink, array (
-			'action' => '' 
+			'action' => ''
 	));
-	
+
 	print '<input type="button" class="button" style="float: right;" value="' . $langs->trans("Export") . '" onclick="launch_export();" />';
-	
+
 	print '<input type="button" class="button" value="' . $langs->trans("WriteBookKeeping") . '" onclick="writebookkeeping();" />';
-	
+
 	print '
 	<script type="text/javascript">
 		function launch_export() {
@@ -435,12 +439,12 @@ if ($action == 'export_csv') {
 		    $("div.fiche div.tabBar form input[name=\"action\"]").val("");
 		}
 	</script>';
-	
+
 	/*
 	 * Show result array
 	 */
 	print '<br><br>';
-	
+
 	$i = 0;
 	print "<table class=\"noborder\" width=\"100%\">";
 	print "<tr class=\"liste_titre\">";
@@ -451,20 +455,20 @@ if ($action == 'export_csv') {
 	print "<td align='right'>" . $langs->trans("Debit") . "</td>";
 	print "<td align='right'>" . $langs->trans("Credit") . "</td>";
 	print "</tr>\n";
-	
+
 	$var = true;
 	$r = '';
-	
+
 	$invoicestatic = new Facture($db);
 	$companystatic = new Client($db);
-	
+
 	foreach ( $tabfac as $key => $val ) {
 		$invoicestatic->id = $key;
 		$invoicestatic->ref = $val["ref"];
 		$invoicestatic->type = $val["type"];
-		
+
 		$date = dol_print_date($db->jdate($val["date"]), 'day');
-		
+
 		// Third party
 		foreach ( $tabttc[$key] as $k => $mt ) {
 			print "<tr " . $bc[$var] . ">";
@@ -474,30 +478,32 @@ if ($action == 'export_csv') {
 			$companystatic->name = $tabcompany[$key]['name'];
 			$companystatic->client = $tabcompany[$key]['code_client'];
 			print "<td>" . length_accounta($k);
-			print "</td><td>" . $langs->trans("ThirdParty");
-			print ' (' . $companystatic->getNomUrl(0, 'customer', 16) . ')';
+			//print "</td><td>" . $langs->trans("ThirdParty");
+			//print ' (' . $companystatic->getNomUrl(0, 'customer', 16) . ')';
+			print "<td>" . $companystatic->getNomUrl(0, 'customer', 16) . ' - ' . $invoicestatic->ref_client . ' - ' . $langs->trans("Code_tiers"). "</td>";
 			print "</td><td align='right'>" . ($mt >= 0 ? price($mt) : '') . "</td>";
 			print "<td align='right'>" . ($mt < 0 ? price(- $mt) : '') . "</td>";
 		}
 		print "</tr>";
-		
+
 		// Product / Service
 		foreach ( $tabht[$key] as $k => $mt ) {
 			$accountingaccount = new AccountingAccount($db);
 			$accountingaccount->fetch(null, $k);
-			
+
 			if ($mt) {
 				print "<tr " . $bc[$var] . ">";
 				print "<td>" . $date . "</td>";
 				print "<td>" . $invoicestatic->getNomUrl(1) . "</td>";
 				print "<td>" . length_accountg($k) . "</td>";
-				print "<td>" . $accountingaccount->label . "</td>";
+				//print "<td>" . $accountingaccount->label . "</td>";
+				print "<td>" . $companystatic->getNomUrl(0, 'customer', 16). ' - ' . $invoicestatic->ref_client  . ' - ' . utf8_decode ( utf8_decode ( $accountingaccount->label)) . "</td>";
 				print "<td align='right'>" . ($mt < 0 ? price(- $mt) : '') . "</td>";
 				print "<td align='right'>" . ($mt >= 0 ? price($mt) : '') . "</td>";
 				print "</tr>";
 			}
 		}
-		
+
 		// VAT
 		foreach ( $tabtva[$key] as $k => $mt ) {
 			if ($mt) {
@@ -505,18 +511,19 @@ if ($action == 'export_csv') {
 				print "<td>" . $date . "</td>";
 				print "<td>" . $invoicestatic->getNomUrl(1) . "</td>";
 				print "<td>" . length_accountg($k) . "</td>";
-				print "<td>" . $langs->trans("VAT") . "</td>";
+				print "<td>" . $companystatic->getNomUrl(0, 'customer', 16). ' - ' . $invoicestatic->ref_client .' - '. $langs->trans("VAT")  . "</td>";
+				//print "<td>" . $langs->trans("VAT") . "</td>";
 				print "<td align='right'>" . ($mt < 0 ? price(- $mt) : '') . "</td>";
 				print "<td align='right'>" . ($mt >= 0 ? price($mt) : '') . "</td>";
 				print "</tr>";
 			}
 		}
-		
+
 		$var = ! $var;
 	}
-	
+
 	print "</table>";
-	
+
 	// End of page
 	llxFooter();
 }
diff --git a/htdocs/accountancy/supplier/lines.php b/htdocs/accountancy/supplier/lines.php
index 788eaa32e88..ade361fdd51 100644
--- a/htdocs/accountancy/supplier/lines.php
+++ b/htdocs/accountancy/supplier/lines.php
@@ -217,7 +217,7 @@ if ($result) {
 	print '<td class="liste_titre"><input type="text" class="flat" size="15" name="search_label" value="' . $search_label . '"></td>';
 	print '<td class="liste_titre"><input type="text" class="flat" size="15" name="search_desc" value="' . $search_desc . '"></td>';
 	print '<td class="liste_titre" align="center"><input type="text" class="flat" size="8" name="search_amount" value="' . $search_amount . '"></td>';
-	print '<td class="liste_titre" align="center"><input type="text" class="flat" size="5" name="search_vat" value="' . $search_vat . '">%</td>';
+	print '<td class="liste_titre" align="center">%<input type="text" class="flat" size="5" name="search_vat" value="' . $search_vat . '"></td>';
 	print '<td class="liste_titre" align="center"><input type="text" class="flat" size="15" name="search_account" value="' . $search_account . '"></td>';
 	print '<td class="liste_titre" colspan="2">&nbsp;</td>';
     print '<td class="liste_titre" align="right">';
@@ -233,7 +233,7 @@ if ($result) {
 	while ( $i < min($num_lines, $limit) ) {
 		$objp = $db->fetch_object($result);
 		$var = ! $var;
-		$codeCompta = $objp->account_number . ' ' . $objp->label;
+		$codeCompta = $objp->account_number . ' - ' . $objp->label;
 		
 		print "<tr $bc[$var]>";
 		
diff --git a/htdocs/accountancy/supplier/list.php b/htdocs/accountancy/supplier/list.php
index e0f0c390a02..f1b82c9be21 100644
--- a/htdocs/accountancy/supplier/list.php
+++ b/htdocs/accountancy/supplier/list.php
@@ -20,9 +20,9 @@
  */
 
 /**
- * \file htdocs/accountancy/supplier/list.php
- * \ingroup Accountancy
- * \brief Ventilation page from suppliers invoices
+ * \file 		htdocs/accountancy/supplier/list.php
+ * \ingroup 	Advanced accountancy
+ * \brief 		Ventilation page from suppliers invoices
  */
 require '../../main.inc.php';
 
@@ -31,6 +31,7 @@ require_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.facture.class.php';
 require_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.product.class.php';
 require_once DOL_DOCUMENT_ROOT . '/accountancy/class/html.formventilation.class.php';
 require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingaccount.class.php';
+require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
 
 // Langs
 $langs->load("compta");
@@ -128,36 +129,39 @@ print '<script type="text/javascript">
 				    });
 			    });
 			});
-			 </script>';
+		</script>';
+
 /*
  * Action
  */
-
 if ($action == 'ventil' && ! empty($btn_ventil)) {
 	print '<div><font color="red">' . $langs->trans("Processing") . '...</font></div>';
 	if ($_POST['codeventil'] && $_POST["mesCasesCochees"]) {
 		print '<div><font color="red">' . count($_POST["mesCasesCochees"]) . ' ' . $langs->trans("SelectedLines") . '</font></div>';
 		$mesCodesVentilChoisis = $codeventil;
 		$cpt = 0;
-		
+
 		foreach ( $mesCasesCochees as $maLigneCochee ) {
 			// print '<div><font color="red">id selectionnee : '.$monChoix."</font></div>";
 			$maLigneCourante = explode("_", $maLigneCochee);
 			$monId = $maLigneCourante[0];
 			$monNumLigne = $maLigneCourante[1];
 			$monCompte = $mesCodesVentilChoisis[$monNumLigne];
-			
+
 			$sql = " UPDATE " . MAIN_DB_PREFIX . "facture_fourn_det";
 			$sql .= " SET fk_code_ventilation = " . $monCompte;
 			$sql .= " WHERE rowid = " . $monId;
-			
+
+			$accountventilated = new AccountingAccount($db);
+			$accountventilated->fetch($monCompte, '');
+
 			dol_syslog('accountancy/supplier/list.php:: sql=' . $sql, LOG_DEBUG);
 			if ($db->query($sql)) {
-				print '<div><font color="green">' . $langs->trans("Lineofinvoice") . ' ' . $monId . ' ' . $langs->trans("VentilatedinAccount") . ' : ' . $monCompte . '</font></div>';
+				print '<div><font color="green">' . $langs->trans("Lineofinvoice") . ' ' . $monId . ' - ' . $langs->trans("VentilatedinAccount") . ' : ' . length_accountg($accountventilated->account_number) . '</font></div>';
 			} else {
-				print '<div><font color="red">' . $langs->trans("ErrorDB") . ' : ' . $langs->trans("Lineofinvoice") . ' ' . $monId . ' ' . $langs->trans("NotVentilatedinAccount") . ' : ' . $monCompte . '<br/> <pre>' . $sql . '</pre></font></div>';
+				print '<div><font color="red">' . $langs->trans("ErrorDB") . ' : ' . $langs->trans("Lineofinvoice") . ' ' . $monId . ' - ' . $langs->trans("NotVentilatedinAccount") . ' : ' . length_accountg($accountventilated->account_number) . '<br/> <pre>' . $sql . '</pre></font></div>';
 			}
-			
+
 			$cpt ++;
 		}
 	} else {
@@ -169,7 +173,6 @@ if ($action == 'ventil' && ! empty($btn_ventil)) {
 /*
  * Supplier Invoice Lines
  */
-
 if (! empty($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION)) {
 	$limit = $conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION;
 } else if ($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION <= 0) {
@@ -226,15 +229,15 @@ $result = $db->query($sql);
 if ($result) {
 	$num_lines = $db->num_rows($result);
 	$i = 0;
-	
+
 	// TODO : print_barre_liste always use $conf->liste_limit and do not care about custom limit in list...
 	print_barre_liste($langs->trans("InvoiceLines"), $page, $_SERVER["PHP_SELF"], "", $sortfield, $sortorder, '', $num_lines);
-	
+
 	print '<br><b>' . $langs->trans("DescVentilTodoCustomer") . '</b></br>';
-	
+
 	print '<form action="' . $_SERVER["PHP_SELF"] . '" method="post">' . "\n";
 	print '<input type="hidden" name="action" value="ventil">';
-	
+
 	print '<table class="noborder" width="100%">';
 	print '<tr class="liste_titre">';
 	print_liste_field_titre($langs->trans("Invoice"), $_SERVER["PHP_SELF"], "f.ref", "", $param, '', $sortfield, $sortorder);
@@ -248,14 +251,14 @@ if ($result) {
 	print_liste_field_titre('');
 	print_liste_field_titre($langs->trans("Ventilate") . '<br><label id="select-all">' . $langs->trans('All') . '</label>/<label id="unselect-all">' . $langs->trans('None') . '</label>', '', '', '', '', 'align="center"');
 	print "</tr>\n";
-	
+
 	print '<tr class="liste_titre">';
 	print '<td class="liste_titre"><input type="text" class="flat" size="10" name="search_invoice" value="' . $search_invoice . '"></td>';
 	print '<td class="liste_titre"><input type="text" class="flat" size="15" name="search_ref" value="' . $search_ref . '"></td>';
 	print '<td class="liste_titre"><input type="text" class="flat" size="20" name="search_label" value="' . $search_label . '"></td>';
 	print '<td class="liste_titre"><input type="text" class="flat" size="20" name="search_desc" value="' . $search_desc . '"></td>';
 	print '<td class="liste_titre" align="right"><input type="text" class="flat" size="10" name="search_amount" value="' . $search_amount . '"></td>';
-	print '<td class="liste_titre" align="center"><input type="text" class="flat" size="5" name="search_vat" value="' . $search_vat . '">%</td>';
+	print '<td class="liste_titre" align="center"><input type="text" class="flat" size="3" name="search_vat" value="' . $search_vat . '">%</td>';
 	print '<td class="liste_titre" align="center">&nbsp;</td>';
 	print '<td class="liste_titre">&nbsp;</td>';
 	print '<td align="right" colspan="2" class="liste_titre">';
@@ -264,16 +267,16 @@ if ($result) {
 	print '<input type="image" class="liste_titre" src="' . img_picto($langs->trans("Search"), 'searchclear.png', '', '', 1) . '" name="button_removefilter" value="' . dol_escape_htmltag($langs->trans("RemoveFilter")) . '" title="' . dol_escape_htmltag($langs->trans("RemoveFilter")) . '">';
 	print '</td>';
 	print '</tr>';
-	
+
 	$facturefourn_static = new FactureFournisseur($db);
 	$productfourn_static = new ProductFournisseur($db);
 	$form = new Form($db);
-	
+
 	$var = True;
 	while ( $i < min($num_lines, $limit) ) {
 		$objp = $db->fetch_object($result);
 		$var = ! $var;
-		
+
 		// product_type: 0 = service ? 1 = product
 		// if product does not exist we use the value of product_type provided in facturedet to define if this is a product or service
 		// issue : if we change product_type value in product DB it should differ from the value stored in facturedet DB !
@@ -281,9 +284,9 @@ if ($result) {
 		$objp->code_buy_p = '';
 		$objp->aarowid_suggest = '';
 		$code_buy_p_l_differ = '';
-		
+
 		$code_buy_p_notset = '';
-		
+
 		$objp->aarowid_suggest = $objp->aarowid;
 		if (! empty($objp->code_buy)) {
 			$objp->code_buy_p = $objp->code_buy;
@@ -297,7 +300,7 @@ if ($result) {
 				$objp->code_buy_p = (! empty($conf->global->ACCOUNTING_PRODUCT_BUY_ACCOUNT) ? $conf->global->ACCOUNTING_PRODUCT_BUY_ACCOUNT : $langs->trans("CodeNotDef"));
 			}
 		}
-		
+
 		if ($objp->type_l == 1) {
 			$objp->code_buy_l = (! empty($conf->global->ACCOUNTING_SERVICE_BUY_ACCOUNT) ? $conf->global->ACCOUNTING_SERVICE_BUY_ACCOUNT : $langs->trans("CodeNotDef"));
 			if ($objp->aarowid == '')
@@ -307,17 +310,17 @@ if ($result) {
 			if ($objp->aarowid == '')
 				$objp->aarowid_suggest = $aarowid_p;
 		}
-		
+
 		if ($objp->code_buy_l != $objp->code_buy_p)
 			$code_buy_p_l_differ = 'color:red';
 		
 		print "<tr $bc[$var]>";
-		
+
 		// Ref Invoice
 		$facturefourn_static->ref = $objp->ref;
 		$facturefourn_static->id = $objp->facid;
 		print '<td>' . $facturefourn_static->getNomUrl(1) . '</td>';
-		
+
 		// Ref Supplier Invoice
 		$productfourn_static->ref = $objp->product_ref;
 		$productfourn_static->id = $objp->product_id;
@@ -328,23 +331,23 @@ if ($result) {
 		else
 			print '&nbsp;';
 		print '</td>';
-		
+
 		print '<td style="' . $code_buy_p_l_differ . '">' . dol_trunc($objp->product_label, 24) . '</td>';
-		
+
 		// TODO: we should set a user defined value to adjust user square / wide screen size
 		$trunclength = defined('ACCOUNTING_LENGTH_DESCRIPTION') ? ACCOUNTING_LENGTH_DESCRIPTION : 32;
 		print '<td style="' . $code_buy_p_l_differ . '">' . nl2br(dol_trunc($objp->description, $trunclength)) . '</td>';
-		
+
 		print '<td align="right">';
 		print price($objp->price);
 		print '</td>';
-		
+
 		if ($objp->vat_tx_l != $objp->vat_tx_p)
 			$code_vat_differ = 'font-weight:bold; text-decoration:blink; color:red';
 		print '<td style="' . $code_vat_differ . '" align="center">';
 		print price($objp->tva_tx_line);
 		print '</td>';
-		
+
 		print '<td align="center" style="' . $code_buy_p_notset . '">';
 		// if not same kind of product_type stored in product & facturedt we display both account and let user choose
 		if ($objp->code_buy_l == $objp->code_buy_p) {
@@ -353,7 +356,7 @@ if ($result) {
 			print 'lines=' . $objp->code_buy_l . '<br />product=' . $objp->code_buy_p;
 		}
 		print '</td>';
-		
+
 		// Colonne choix du compte
 		print '<td align="center">';
 		print $formventilation->select_account($objp->aarowid_suggest, 'codeventil[]', 1);
@@ -363,11 +366,11 @@ if ($result) {
 		print '<td align="center">';
 		print '<input type="checkbox" name="mesCasesCochees[]" value="' . $objp->rowid . "_" . $i . '"' . ($objp->aarowid ? "checked" : "") . '/>';
 		print '</td>';
-		
+
 		print "</tr>";
 		$i ++;
 	}
-	
+
 	print '</table>';
 	print '<br><div align="center"><input type="submit" class="butAction" value="' . $langs->trans("Ventilate") . '" name="ventil" ></div>';
 	print '</form>';
diff --git a/htdocs/adherents/index.php b/htdocs/adherents/index.php
index 0ef1f4bd62b..8515dc1d2c8 100644
--- a/htdocs/adherents/index.php
+++ b/htdocs/adherents/index.php
@@ -141,7 +141,7 @@ if (count($listofsearchfields))
 	{
 		if ($i == 0) print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
 		print '<tr '.$bc[false].'>';
-		print '<td class="nowrap"><label for="'.$key.'">'.$langs->trans($value["text"]).'</label>:</td><td><input type="text" class="flat" name="'.$key.'" id="'.$key.'" size="18"></td>';
+		print '<td class="nowrap"><label for="'.$key.'">'.$langs->trans($value["text"]).'</label>:</td><td><input type="text" class="flat inputsearch" name="'.$key.'" id="'.$key.'" size="18"></td>';
 		if ($i == 0) print '<td rowspan="'.count($listofsearchfields).'"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td>';
 		print '</tr>';
 		$i++;
diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index ce5abc27416..8ee8b791303 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -405,7 +405,7 @@ $tabhelp[21] = array('code'=>$langs->trans("EnterAnyCode"));
 $tabhelp[22] = array('code'=>$langs->trans("EnterAnyCode"));
 $tabhelp[23] = array();
 $tabhelp[24] = array('code'=>$langs->trans("EnterAnyCode"));
-$tabhelp[25] = array('type_template'=>$langs->trans("TemplateForElement"),'private'=>$langs->trans("TemplateIsVisibleByOwnerOnly"), 'position'=>$langs->trans("PositionIntoComboList"));
+$tabhelp[25] = array('topic'=>$langs->trans('SeeSubstitutionVars'),'content'=>$langs->trans('SeeSubstitutionVars'),'type_template'=>$langs->trans("TemplateForElement"),'private'=>$langs->trans("TemplateIsVisibleByOwnerOnly"), 'position'=>$langs->trans("PositionIntoComboList"));
 $tabhelp[26] = array('code'=>$langs->trans("EnterAnyCode"));
 $tabhelp[27] = array('code'=>$langs->trans("EnterAnyCode"));
 $tabhelp[28] = array('affect'=>$langs->trans("FollowedByACounter"),'delay'=>$langs->trans("MinimumNoticePeriod"), 'newByMonth'=>$langs->trans("NbAddedAutomatically"));
@@ -493,7 +493,7 @@ if ($id == 11)
 }
 if ($id == 25)
 {
-	// We save list of template type Dolibarr can manage. This list can found by a grep into code on "->param['models']"
+	// We save list of template email Dolibarr can manage. This list can found by a grep into code on "->param['models']"
 	$elementList = array();
 	if ($conf->propal->enabled) $elementList['propal_send']=$langs->trans('MailToSendProposal');
 	if ($conf->commande->enabled) $elementList['order_send']=$langs->trans('MailToSendOrder');
@@ -1017,8 +1017,18 @@ if ($id)
         }
         print '</td>';
         print "</tr>";
+        
+        if ($tabname[$id] == MAIN_DB_PREFIX.'c_email_templates')
+        {
+        	print '<tr><td colspan="8">* '.$langs->trans("AvailableVariables").": ";
+        	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
+        	$formmail=new FormMail($db);
+        	$tmp=$formmail->getAvailableSubstitKey('form');
+        	print join(', ', $tmp);
+        	print '</td></tr>';
+        }
 
-        $colspan=count($fieldlist)+2;
+        $colspan=count($fieldlist)+3;
         if ($id == 4) $colspan++;
 
         if (! empty($alabelisused) && $id != 25)  // If there is one label among fields, we show legend of *
@@ -1583,7 +1593,9 @@ function fieldList($fieldlist, $obj='', $tabname='', $context='')
 			if ($context != 'hide')
 			{
 				//print '<textarea cols="3" rows="'.ROWS_2.'" class="flat" name="'.$fieldlist[$field].'">'.(! empty($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:'').'</textarea>';
-				$doleditor = new DolEditor($fieldlist[$field], (! empty($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:''), '', 140, 'dolibarr_mailings', 'In', 0, false, true, ROWS_5, '90%');
+				$okforextended=true;
+				if ($tabname == MAIN_DB_PREFIX.'c_email_templates' && empty($conf->global->FCKEDITOR_ENABLE_MAIL)) $okforextended=false;
+				$doleditor = new DolEditor($fieldlist[$field], (! empty($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:''), '', 140, 'dolibarr_mailings', 'In', 0, false, $okforextended, ROWS_5, '90%');
 				print $doleditor->Create(1);
 			}
 			else print '&nbsp;';
diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php
index 727e9904fef..5265f73e595 100644
--- a/htdocs/comm/index.php
+++ b/htdocs/comm/index.php
@@ -102,7 +102,7 @@ if (! empty($conf->contrat->enabled) && $user->rights->contrat->lire)
 {
     $listofsearchfields['search_contract']=array('text'=>'Contrat');
 }
-// Search contract
+// Search supplier proposal
 if (! empty($conf->supplier_proposal->enabled) && $user->rights->supplier_proposal->lire)
 {
     $listofsearchfields['search_supplier_proposal']=array('text'=>'SupplierProposalShort');
@@ -118,8 +118,8 @@ if (count($listofsearchfields))
 	{
 		if ($i == 0) print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
 		print '<tr '.$bc[false].'>';
-		print '<td class="nowrap"><label for="'.$key.'">'.$langs->trans($value["text"]).'</label>:</td><td><input type="text" class="flat" name="'.$key.'" id="'.$key.'" size="18"></td>';
-		if ($i == 0) print '<td rowspan="'.count($listofsearchfields).'"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td>';
+		print '<td class="nowrap"><label for="'.$key.'">'.$langs->trans($value["text"]).'</label>:</td><td><input type="text" class="flat inputsearch" name="'.$key.'" id="'.$key.'" size="18"></td>';
+		if ($i == 0) print '<td class="noborderbottom" rowspan="'.count($listofsearchfields).'"><input type="submit" value="'.$langs->trans("Search").'" class="button "></td>';
 		print '</tr>';
 		$i++;
 	}
diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php
index b5f33b5f689..9a7d0349f41 100644
--- a/htdocs/comm/mailing/card.php
+++ b/htdocs/comm/mailing/card.php
@@ -32,6 +32,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/comm/mailing/class/mailing.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 
 $langs->load("mails");
@@ -55,27 +56,7 @@ $extralabels=$extrafields->fetch_name_optionals_label($object->table_element);
 $hookmanager->initHooks(array('mailingcard','globalcard'));
 
 // Array of possible substitutions (See also file mailing-send.php that should manage same substitutions)
-$object->substitutionarray=array(
-    '__ID__' => 'IdRecord',
-    '__EMAIL__' => 'EMail',
-    '__LASTNAME__' => 'Lastname',
-    '__FIRSTNAME__' => 'Firstname',
-    '__MAILTOEMAIL__' => 'TagMailtoEmail',
-    '__OTHER1__' => 'Other1',
-    '__OTHER2__' => 'Other2',
-    '__OTHER3__' => 'Other3',
-    '__OTHER4__' => 'Other4',
-    '__OTHER5__' => 'Other5',
-    '__SIGNATURE__' => 'TagSignature',
-    '__CHECK_READ__' => 'TagCheckMail',
-	'__UNSUBSCRIBE__' => 'TagUnsubscribe'
-	//,'__PERSONALIZED__' => 'Personalized'	// Hidden because not used yet
-);
-if (! empty($conf->paypal->enabled) && ! empty($conf->global->PAYPAL_SECURITY_TOKEN))
-{
-	$object->substitutionarray['__SECUREKEYPAYPAL__']='SecureKeyPaypal';
-	if (! empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $object->substitutionarray['__SECUREKEYPAYPAL_MEMBER__']='SecureKeyPaypalUniquePerMember';
-}
+$object->substitutionarray=FormMail::getAvailableSubstitKey('emailing');
 
 $object->substitutionarrayfortest=array(
     '__ID__' => 'TESTIdRecord',
@@ -243,8 +224,18 @@ if (empty($reshook))
 						if (! empty($conf->paypal->enabled) && ! empty($conf->global->PAYPAL_SECURITY_TOKEN))
 						{
 							$substitutionarray['__SECUREKEYPAYPAL__']=dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
+
 							if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $substitutionarray['__SECUREKEYPAYPAL_MEMBER__']=dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
 							else $substitutionarray['__SECUREKEYPAYPAL_MEMBER__']=dol_hash($conf->global->PAYPAL_SECURITY_TOKEN . 'membersubscription' . $obj->source_id, 2);
+
+							if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $substitutionarray['__SECUREKEYPAYPAL_ORDER__']=dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
+							else $substitutionarray['__SECUREKEYPAYPAL_ORDER__']=dol_hash($conf->global->PAYPAL_SECURITY_TOKEN . 'order' . $obj->source_id, 2);
+							
+							if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $substitutionarray['__SECUREKEYPAYPAL_INVOICE__']=dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
+							else $substitutionarray['__SECUREKEYPAYPAL_INVOICE__']=dol_hash($conf->global->PAYPAL_SECURITY_TOKEN . 'invoice' . $obj->source_id, 2);
+							
+							if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $substitutionarray['__SECUREKEYPAYPAL_CONTRACTLINE__']=dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
+							else $substitutionarray['__SECUREKEYPAYPAL_CONTRACTLINE__']=dol_hash($conf->global->PAYPAL_SECURITY_TOKEN . 'contractline' . $obj->source_id, 2);
 						}
 						$substitutionisok=true;
 	                    complete_substitutions_array($substitutionarray, $langs);
diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php
index 7d85567f480..40a654fef0b 100644
--- a/htdocs/comm/propal.php
+++ b/htdocs/comm/propal.php
@@ -1044,6 +1044,19 @@ if (empty($reshook))
 				unset($_POST['product_desc']);
 				unset($_POST['fournprice']);
 				unset($_POST['buying_price']);
+
+				unset($_POST['date_starthour']);
+				unset($_POST['date_startmin']);
+				unset($_POST['date_startsec']);
+				unset($_POST['date_startday']);
+				unset($_POST['date_startmonth']);
+				unset($_POST['date_startyear']);
+				unset($_POST['date_endhour']);
+				unset($_POST['date_endmin']);
+				unset($_POST['date_endsec']);
+				unset($_POST['date_endday']);
+				unset($_POST['date_endmonth']);
+				unset($_POST['date_endyear']);
 			} else {
 				$db->rollback();
 
@@ -2432,13 +2445,8 @@ if ($action == 'create')
 		$formmail->withcancel = 1;
 
 		// Tableau des substitutions
+		$formmail->setSubstitFromObject($object);
 		$formmail->substit['__PROPREF__'] = $object->ref;
-		$formmail->substit['__SIGNATURE__'] = $user->signature;
-		$formmail->substit['__REFCLIENT__'] = $object->ref_client;
-		$formmail->substit['__THIRDPARTY_NAME__'] = $object->thirdparty->name;
-		$formmail->substit['__PROJECT_REF__'] = (is_object($object->projet)?$object->projet->ref:'');
-		$formmail->substit['__PERSONALIZED__'] = '';
-		$formmail->substit['__CONTACTCIVNAME__'] = '';
 
 		// Find the good contact adress
 		$custcontact = '';
diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index 7905af12030..4242a23823c 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -182,7 +182,7 @@ class Propal extends CommonObject
 	 */
 	const STATUS_NOTSIGNED = 3;
 	/**
-	 * Billed quote
+	 * Billed or processed quote
 	 */
 	const STATUS_BILLED = 4;
 
@@ -2565,7 +2565,7 @@ class Propal extends CommonObject
             if ($mode == 'signed') {
 	            $delay_warning=$conf->propal->facturation->warning_delay;
 	            $statut = self::STATUS_SIGNED;
-	            $label = $langs->trans("PropalsToBill");
+	            $label = $langs->trans("PropalsToBill");         // We set here bill but may be billed or ordered
             }
 
 	        $response = new WorkboardResponse();
@@ -2675,7 +2675,7 @@ class Propal extends CommonObject
                 $line->remise_percent=00;
             }
 
-            $prodid = rand(1, $num_prods);
+            $prodid = mt_rand(1, $num_prods);
             $line->fk_product=$prodids[$prodid];
 
             $this->lines[$xnbp]=$line;
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index e63e3b9a5dc..c37a9bb1b33 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -969,6 +969,19 @@ if (empty($reshook))
 				unset($_POST['product_desc']);
 				unset($_POST['fournprice']);
 				unset($_POST['buying_price']);
+
+				unset($_POST['date_starthour']);
+				unset($_POST['date_startmin']);
+				unset($_POST['date_startsec']);
+				unset($_POST['date_startday']);
+				unset($_POST['date_startmonth']);
+				unset($_POST['date_startyear']);
+				unset($_POST['date_endhour']);
+				unset($_POST['date_endmin']);
+				unset($_POST['date_endsec']);
+				unset($_POST['date_endday']);
+				unset($_POST['date_endmonth']);
+				unset($_POST['date_endyear']);
 			} else {
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
@@ -1308,6 +1321,7 @@ if ($action == 'create' && $user->rights->commande->creer)
 
 	$projectid = 0;
 	$remise_absolue = 0;
+
 	$currency_code = $conf->currency;
 	
 	if (! empty($origin) && ! empty($originid)) {
@@ -1320,7 +1334,7 @@ if ($action == 'create' && $user->rights->commande->creer)
 
 		if ($element == 'project') {
 			$projectid = $originid;
-			
+
 			if (!$cond_reglement_id) {
 				$cond_reglement_id = $soc->cond_reglement_id;
 			}
@@ -1656,7 +1670,7 @@ if ($action == 'create' && $user->rights->commande->creer)
 			default:
 				$newclassname = $classname;
 		}
-		
+
 		print '<tr><td>' . $langs->trans($newclassname) . '</td><td colspan="2">' . $objectsrc->getNomUrl(1) . '</td></tr>';
 		print '<tr><td>' . $langs->trans('TotalHT') . '</td><td colspan="2">' . price($objectsrc->total_ht) . '</td></tr>';
 		print '<tr><td>' . $langs->trans('TotalVAT') . '</td><td colspan="2">' . price($objectsrc->total_tva) . "</td></tr>";
@@ -1918,7 +1932,7 @@ if ($action == 'create' && $user->rights->commande->creer)
 
 		/*
 		 *   Commande
-		*/
+		 */
 		$nbrow = 9;
 		if (! empty($conf->projet->enabled))
 			$nbrow ++;
@@ -2037,6 +2051,9 @@ if ($action == 'create' && $user->rights->commande->creer)
 			print '</form>';
 		} else {
 			print $object->date ? dol_print_date($object->date, 'daytext') : '&nbsp;';
+			if ($object->hasDelay() && empty($object->date_livraison)) {
+			    print ' '.img_picto($langs->trans("Late").' : '.$object->showDelay(), "warning");
+			}
 		}
 		print '</td>';
 		print '</tr>';
@@ -2059,6 +2076,9 @@ if ($action == 'create' && $user->rights->commande->creer)
 			print '</form>';
 		} else {
 			print $object->date_livraison ? dol_print_date($object->date_livraison, 'daytext') : '&nbsp;';
+			if ($object->hasDelay() && ! empty($object->date_livraison)) {
+			    print ' '.img_picto($langs->trans("Late").' : '.$object->showDelay(), "warning");
+			}
 		}
 		print '</td>';
 		print '</tr>';
@@ -2586,6 +2606,7 @@ if ($action == 'create' && $user->rights->commande->creer)
 
 			$ref = dol_sanitizeFileName($object->ref);
 			include_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
+			$fileparams = dol_most_recent_file($conf->commande->dir_output . '/' . $ref, preg_quote($ref, '/').'[^\-]+');
 			$file = $fileparams['fullname'];
 
 			// Define output language
@@ -2654,13 +2675,8 @@ if ($action == 'create' && $user->rights->commande->creer)
 			$formmail->withdeliveryreceipt = 1;
 			$formmail->withcancel = 1;
 			// Tableau des substitutions
+			$formmail->setSubstitFromObject($object);
 			$formmail->substit ['__ORDERREF__'] = $object->ref;
-			$formmail->substit ['__SIGNATURE__'] = $user->signature;
-			$formmail->substit ['__REFCLIENT__'] = $object->ref_client;
-			$formmail->substit ['__THIRDPARTY_NAME__'] = $object->thirdparty->name;
-			$formmail->substit ['__PROJECT_REF__'] = (is_object($object->projet)?$object->projet->ref:'');
-			$formmail->substit ['__PERSONALIZED__'] = '';
-			$formmail->substit ['__CONTACTCIVNAME__'] = '';
 
 			$custcontact = '';
 			$contactarr = array();
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 8f8edcf15a3..9eb31ebd608 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -140,10 +140,6 @@ class Commande extends CommonOrder
 	 */
 	var $lines = array();
 
-    // Pour board
-    var $nbtodo;
-    var $nbtodolate;
-
 	// Multicurrency
 	var $fk_multicurrency;
 	var $multicurrency_code;
@@ -3224,7 +3220,7 @@ class Commande extends CommonOrder
                 $line->total_tva=19.6;
                 $line->remise_percent=0;
             }
-            $prodid = rand(1, $num_prods);
+            $prodid = mt_rand(1, $num_prods);
             $line->fk_product=$prodids[$prodid];
 
             $this->lines[$xnbp]=$line;
@@ -3436,6 +3432,22 @@ class Commande extends CommonOrder
 
         return max($this->date_commande, $this->date_livraison) < ($now - $conf->commande->client->warning_delay);
     }
+    
+    /**
+     * Show the customer delayed info
+     *
+     * @return string       Show delayed information
+     */
+    public function showDelay()
+    {
+        global $conf, $langs;
+    
+        if (empty($this->date_livraison)) $text=$langs->trans("OrderDate").' '.dol_print_date($this->date_commande, 'day');
+        else $text=$text=$langs->trans("DeliveryDate").' '.dol_print_date($this->date_livraison, 'day');
+        $text.=' '.($conf->commande->client->warning_delay>0?'+':'-').' '.round(abs($conf->commande->client->warning_delay)/3600/24,1).' '.$langs->trans("days").' < '.$langs->trans("Today");
+            
+        return $text;
+    }
 }
 
 
diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index e5f8a62acb5..91a602c31a6 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -554,7 +554,7 @@ if ($resql)
         // Warning late icon
 		print '<td class="nobordernopadding nowrap">';
 		if ($generic_commande->hasDelay()) {
-			print img_picto($langs->trans("Late"), "warning");
+			print img_picto($langs->trans("Late").' : '.$generic_commande->showDelay(), "warning");
 		}
 		if(!empty($objp->note_private))
 		{
diff --git a/htdocs/commande/orderstoinvoice.php b/htdocs/commande/orderstoinvoice.php
index aeafb1ee67b..ebb9bedca2c 100644
--- a/htdocs/commande/orderstoinvoice.php
+++ b/htdocs/commande/orderstoinvoice.php
@@ -622,8 +622,10 @@ if (($action != 'create' && $action != 'add') || ($action == 'create' && $error)
 		//SEARCH BUTTON
 		print '<td align="right" class="liste_titre">';
 		print '<input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'"  value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
-
+        print '</td>';
+        
 		//ALL/NONE
+		print '<td align="center" class="liste_titre">';
 		if ($conf->use_javascript_ajax) print '<a href="#" id="checkall">'.$langs->trans("All").'</a> / <a href="#" id="checknone">'.$langs->trans("None").'</a>';
 		print '</td>';
 
@@ -697,7 +699,7 @@ if (($action != 'create' && $action != 'add') || ($action == 'create' && $error)
 		/*
 		 * Boutons actions
 		*/
-		print '<br><div class="center"><input type="checkbox" checked name="autocloseorders"> '.$langs->trans("CloseProcessedOrdersAutomatically");
+		print '<br><div class="center"><input type="checkbox" '.(empty($conf->global->INVOICE_CLOSE_ORDERS_OFF_BY_DEFAULT_FORMASSINVOICE)?' checked="checked"':'').' name="autocloseorders"> '.$langs->trans("CloseProcessedOrdersAutomatically");
 		print '<div align="right">';
 		print '<input type="hidden" name="socid" value="'.$socid.'">';
 		print '<input type="hidden" name="action" value="create">';
diff --git a/htdocs/compta/bank/account.php b/htdocs/compta/bank/account.php
index 0973ece78d3..b1bf6cd4270 100644
--- a/htdocs/compta/bank/account.php
+++ b/htdocs/compta/bank/account.php
@@ -5,7 +5,7 @@
  * Copyright (C) 2004      Christophe Combelles <ccomb@free.fr>
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2010-2011 Juanjo Menent        <jmenent@@2byte.es>
- * Copyright (C) 2012-2014 Marcos García        <marcosgdf@gmail.com>
+ * Copyright (C) 2012-2016 Marcos García        <marcosgdf@gmail.com>
  * Copyright (C) 2011-2015 Alexandre Spangaro   <aspangaro.dolibarr@gmail.com>
  * Copyright (C) 2015      Florian Henry	    <florian.henry@open-concept.pro>
  *
@@ -209,29 +209,13 @@ if ($id > 0 || ! empty($ref))
 
 	$result=$object->fetch($id, $ref);
 
-	// Chargement des categories bancaires dans $options
-	$nbcategories=0;
+	// Load bank groups
+	require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/bankcateg.class.php';
+	$bankcateg = new BankCateg($db);
+	$options = array();
 
-	$sql = "SELECT rowid, label";
-	$sql.= " FROM ".MAIN_DB_PREFIX."bank_categ";
-	$sql.= " WHERE entity = ".$conf->entity;
-	$sql.= " ORDER BY label";
-
-	$result = $db->query($sql);
-	if ($result)
-	{
-		$var=True;
-		$num = $db->num_rows($result);
-		$i = 0;
-		$options = '<option value="0" selected>&nbsp;</option>';
-		while ($i < $num)
-		{
-			$obj = $db->fetch_object($result);
-			$options.= '<option value="'.$obj->rowid.'">'.$obj->label.'</option>'."\n";
-			$nbcategories++;
-			$i++;
-		}
-		$db->free($result);
+	foreach ($bankcateg->fetchAll() as $bankcategory) {
+		$options[$bankcategory->id] = $bankcategory->label;
 	}
 
 	// Definition de sql_rech et param
@@ -397,15 +381,11 @@ if ($id > 0 || ! empty($ref))
             }
         }
 
-		if ($object->type != 2 && $object->rappro) 
-		{ 
+		if ($object->canBeConciliated() > 0) {
 			// If not cash account and can be reconciliate
-			if ($user->rights->banque->consolidate) 
-			{
-				print '<a class="butAction" href="'.DOL_URL_ROOT.'/compta/bank/rappro.php?account='.$object->id.($vline?'&amp;vline='.$vline:'').'">'.$langs->trans("Conciliate").'</a>';
-			}
-			else
-			{
+			if ($user->rights->banque->consolidate) {
+				print '<a class="butAction" href="'.DOL_URL_ROOT.'/compta/bank/rappro.php?account='.$object->id.($vline ? '&amp;vline='.$vline : '').'">'.$langs->trans("Conciliate").'</a>';
+			} else {
 				print '<a class="butActionRefused" title="'.$langs->trans("NotEnoughPermissions").'" href="#">'.$langs->trans("Conciliate").'</a>';
 			}
 		}
@@ -489,14 +469,14 @@ if ($id > 0 || ! empty($ref))
 		$form->select_date($dateop,'op',0,0,0,'transaction');
 		print '</td>';
 		print '<td class="nowrap">';
-		$form->select_types_paiements((GETPOST('operation')?GETPOST('operation'):($object->courant == 2 ? 'LIQ' : '')),'operation','1,2',2,1);
+		$form->select_types_paiements((GETPOST('operation')?GETPOST('operation'):($object->courant == Account::TYPE_CASH ? 'LIQ' : '')),'operation','1,2',2,1);
 		print '</td><td>';
 		print '<input name="num_chq" class="flat" type="text" size="4" value="'.GETPOST("num_chq").'"></td>';
 		print '<td colspan="2">';
 		print '<input name="label" class="flat" type="text" size="24"  value="'.GETPOST("label").'">';
-		if ($nbcategories)
-		{
-			print '<br>'.$langs->trans("Rubrique").': <select class="flat" name="cat1">'.$options.'</select>';
+		if ($options) {
+			print '<br>'.$langs->trans("Rubrique").': ';
+			print Form::selectarray('cat1', $options, GETPOST('cat1'), 1);
 		}
 		print '</td>';
 		print '<td align=right><input name="debit" class="flat" type="text" size="4" value="'.GETPOST("debit").'"></td>';
@@ -529,8 +509,11 @@ if ($id > 0 || ! empty($ref))
 	print '<td align="right">'.$langs->trans("Credit").'</td>';
 	print '<td align="right" width="80">'.$langs->trans("BankBalance").'</td>';
 	print '<td align="center" width="60">';
-	if ($object->type != 2 && $object->rappro) print $langs->trans("AccountStatementShort");
-	else print '&nbsp;';
+	if ($object->canBeConciliated() > 0) {
+		print $langs->trans("AccountStatementShort");
+	} else {
+		print '&nbsp;';
+	}
 	print '</td></tr>';
 
 	print '<form action="'.$_SERVER["PHP_SELF"].'?'.$param.'" name="search" method="POST">';
diff --git a/htdocs/compta/bank/card.php b/htdocs/compta/bank/card.php
index cccf16f0467..b33b0438552 100644
--- a/htdocs/compta/bank/card.php
+++ b/htdocs/compta/bank/card.php
@@ -286,13 +286,13 @@ if ($action == 'create')
 	// Type
 	print '<tr><td class="fieldrequired">'.$langs->trans("AccountType").'</td>';
 	print '<td colspan="3">';
-	$formbank->select_type_comptes_financiers(isset($_POST["type"])?$_POST["type"]:1,"type");
+	$formbank->selectTypeOfBankAccount(isset($_POST["type"])?$_POST["type"]:1,"type");
 	print '</td></tr>';
 
 	// Currency
 	print '<tr><td class="fieldrequired">'.$langs->trans("Currency").'</td>';
 	print '<td colspan="3">';
-	$selectedcode=$account->account_currency_code;
+	$selectedcode=$account->currency_code;
 	if (! $selectedcode) $selectedcode=$conf->currency;
 	print $form->selectCurrency((isset($_POST["account_currency_code"])?$_POST["account_currency_code"]:$selectedcode), 'account_currency_code');
 	//print $langs->trans("Currency".$conf->currency);
@@ -302,7 +302,7 @@ if ($action == 'create')
 	// Status
     print '<tr><td class="fieldrequired">'.$langs->trans("Status").'</td>';
     print '<td colspan="3">';
-    print $form->selectarray("clos",array(0=>$account->status[0],1=>$account->status[1]),(isset($_POST["clos"])?$_POST["clos"]:$account->clos));
+    print $form->selectarray("clos", $account->status,(isset($_POST["clos"])?$_POST["clos"]:$account->clos));
     print '</td></tr>';
 
     // Country
@@ -369,10 +369,10 @@ if ($action == 'create')
 	print '</td></tr>';
 
 	print '<tr><td>'.$langs->trans("BalanceMinimalAllowed").'</td>';
-	print '<td colspan="3"><input size="12" type="text" class="flat" name="account_min_allowed" value="'.($_POST["account_min_allowed"]?$_POST["account_min_allowed"]:$account->account_min_allowed).'"></td></tr>';
+	print '<td colspan="3"><input size="12" type="text" class="flat" name="account_min_allowed" value="'.($_POST["account_min_allowed"]?$_POST["account_min_allowed"]:$account->min_allowed).'"></td></tr>';
 
 	print '<tr><td>'.$langs->trans("BalanceMinimalDesired").'</td>';
-	print '<td colspan="3"><input size="12" type="text" class="flat" name="account_min_desired" value="'.($_POST["account_min_desired"]?$_POST["account_min_desired"]:$account->account_min_desired).'"></td></tr>';
+	print '<td colspan="3"><input size="12" type="text" class="flat" name="account_min_desired" value="'.($_POST["account_min_desired"]?$_POST["account_min_desired"]:$account->min_desired).'"></td></tr>';
 
 	print '</table>';
 	print '<br>';
@@ -583,7 +583,7 @@ else
 		// Currency
 		print '<tr><td>'.$langs->trans("Currency").'</td>';
 		print '<td colspan="3">';
-		$selectedcode=$account->account_currency_code;
+		$selectedcode=$account->currency_code;
 		if (! $selectedcode) $selectedcode=$conf->currency;
 		print $langs->trans("Currency".$selectedcode);
 		print '</td></tr>';
@@ -643,7 +643,7 @@ else
 
 		print '<br>';
 
-		if ($account->type == 0 || $account->type == 1)
+		if ($account->type == Account::TYPE_SAVINGS || $account->type == Account::TYPE_CURRENT)
 		{
 			print '<table class="border" width="100%">';
 
@@ -843,7 +843,7 @@ else
         // Type
         print '<tr><td class="fieldrequired">'.$langs->trans("AccountType").'</td>';
         print '<td colspan="3">';
-		$formbank->select_type_comptes_financiers((isset($_POST["type"])?$_POST["type"]:$account->type),"type");
+		$formbank->selectTypeOfBankAccount((isset($_POST["type"])?$_POST["type"]:$account->type),"type");
         print '</td></tr>';
 
 		// Currency
@@ -851,7 +851,7 @@ else
 		print '<input type="hidden" value="'.$account->currency_code.'">';
 		print '</td>';
 		print '<td colspan="3">';
-		$selectedcode=$account->account_currency_code;
+		$selectedcode=$account->currency_code;
 		if (! $selectedcode) $selectedcode=$conf->currency;
 		print $form->selectCurrency((isset($_POST["account_currency_code"])?$_POST["account_currency_code"]:$selectedcode), 'account_currency_code');
 		//print $langs->trans("Currency".$conf->currency);
@@ -861,7 +861,7 @@ else
 		// Status
         print '<tr><td class="fieldrequired">'.$langs->trans("Status").'</td>';
         print '<td colspan="3">';
-        print $form->selectarray("clos",array(0=>$account->status[0],1=>$account->status[1]),(isset($_POST["clos"])?$_POST["clos"]:$account->clos));
+        print $form->selectarray("clos", $account->status,(isset($_POST["clos"])?$_POST["clos"]:$account->clos));
         print '</td></tr>';
 
 		// Country
@@ -895,7 +895,7 @@ else
         $conciliate=$account->canBeConciliated();
         if ($conciliate == -2) print $langs->trans("No").' ('.$langs->trans("CashAccount").')';
         else if ($conciliate == -3) print $langs->trans("No").' ('.$langs->trans("Closed").')';
-        else print '<input type="checkbox" class="flat" name="norappro"'.($account->rappro?'':' checked').'"> '.$langs->trans("DisableConciliation");
+        else print '<input type="checkbox" class="flat" name="norappro"'.(($conciliate > 0)?'':' checked="checked"').'"> '.$langs->trans("DisableConciliation");
         print '</td></tr>';
 
         // Balance
diff --git a/htdocs/compta/bank/categ.php b/htdocs/compta/bank/categ.php
index 1d9da7f9f59..48e8e738fef 100644
--- a/htdocs/compta/bank/categ.php
+++ b/htdocs/compta/bank/categ.php
@@ -4,6 +4,7 @@
  * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2013      Charles-Fr BENKE     <charles.fr@benke.fr>
  * Copyright (C) 2015      Jean-François Ferry	<jfefe@aternatik.fr>
+ * Copyright (C) 2016      Marcos García        <marcosgdf@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -27,6 +28,7 @@
 
 require('../../main.inc.php');
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/bankcateg.class.php';
 
 $langs->load("banks");
 $langs->load("categories");
@@ -36,70 +38,39 @@ $action=GETPOST('action');
 if (!$user->rights->banque->configurer)
   accessforbidden();
 
-
+$bankcateg = new BankCateg($db);
+$categid = GETPOST('categid');
+$label = GETPOST("label");
 
 /*
  * Add category
  */
 if (GETPOST('add'))
 {
-	if (GETPOST("label"))
-	{
-		$sql = "INSERT INTO ".MAIN_DB_PREFIX."bank_categ (";
-		$sql.= "label";
-		$sql.= ", entity";
-		$sql.= ") VALUES (";
-		$sql.= "'".$db->escape(GETPOST("label"))."'";
-		$sql.= ", ".$conf->entity;
-		$sql.= ")";
-
-		$result = $db->query($sql);
-		if (!$result)
-		{
-			dol_print_error($db);
-		}
+	if ($label) {
+		$bankcateg = new BankCateg($db);
+		$bankcateg->label = GETPOST('label');
+		$bankcateg->create($user);
 	}
 }
 
-/*
- * Update category
- */
-if (GETPOST('update'))
-{
-	if (GETPOST("label"))
-	{
-		$sql = "UPDATE ".MAIN_DB_PREFIX."bank_categ ";
-		$sql.= "set label='".$db->escape(GETPOST("label"))."'";
-		$sql.= " WHERE rowid = '".GETPOST('categid')."'";
-		$sql.= " AND entity = ".$conf->entity;
+if ($categid) {
+	$bankcateg = new BankCateg($db);
 
-		$result = $db->query($sql);
-		if (!$result)
-		{
-			dol_print_error($db);
+	if ($bankcateg->fetch($categid) > 0) {
+
+		//Update category
+		if (GETPOST('update') && $label) {
+
+			$bankcateg->label = $label;
+			$bankcateg->update($user);
+		}
+		//Delete category
+		if ($action == 'delete') {
+			$bankcateg->delete($user);
 		}
 	}
 }
-/*
-* Action suppression catégorie
-*/
-if ($action == 'delete')
-{
-	if (GETPOST('categid'))
-	{
-		$sql = "DELETE FROM ".MAIN_DB_PREFIX."bank_categ";
-		$sql.= " WHERE rowid = '".GETPOST('categid')."'";
-		$sql.= " AND entity = ".$conf->entity;
-
-		$result = $db->query($sql);
-		if (!$result)
-		{
-			dol_print_error($db);
-		}
-	}
-}
-
-
 
 /*
  * View
@@ -174,5 +145,3 @@ if ($action != 'edit')
 print '</table></form>';
 
 llxFooter();
-
-$db->close();
diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index a5e108a2c96..bad817d7a21 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -139,7 +139,19 @@ class Account extends CommonObject
     public $state_code;
     public $state;
 
-    public $type_lib=array();
+	/**
+	 * Variable containing all account types with their respective translated label.
+	 * Defined in __construct
+	 * @var array
+	 */
+    public $type_lib = array();
+
+	/**
+	 * Variable containing all account statuses with their respective translated label.
+	 * Defined in __construct
+	 * @var array
+	 */
+	public $status = array();
 
     /**
      * Accountancy code
@@ -154,6 +166,13 @@ class Account extends CommonObject
      */
     public $currency_code;
 
+    /**
+     * Currency code
+     * @var string
+     * @deprecated Use currency_code instead
+     */
+    public $account_currency_code;
+
     /**
      * Authorized minimum balance
      * @var float
@@ -205,7 +224,6 @@ class Account extends CommonObject
 
         $this->db = $db;
 
-        $this->clos = 0;
         $this->solde = 0;
 
         $this->type_lib = array(
@@ -231,7 +249,7 @@ class Account extends CommonObject
         global $conf;
 
         if (empty($this->rappro)) return -1;
-        if ($this->courant == 2 && empty($conf->global->BANK_CAN_RECONCILIATE_CASHACCOUNT)) return -2;
+        if ($this->courant == Account::TYPE_CASH && empty($conf->global->BANK_CAN_RECONCILIATE_CASHACCOUNT)) return -2;
         if ($this->clos) return -3;
         return 1;
     }
@@ -347,7 +365,7 @@ class Account extends CommonObject
      *  @param	string		$banque			Bank of cheque writer
      *  @return	int							Rowid of added entry, <0 if KO
      */
-    function addline($date, $oper, $label, $amount, $num_chq, $categorie, $user, $emetteur='',$banque='')
+    function addline($date, $oper, $label, $amount, $num_chq, $categorie, User $user, $emetteur='',$banque='')
     {
 	    // Deprecatîon warning
 	    if (is_numeric($oper)) {
@@ -388,7 +406,7 @@ class Account extends CommonObject
             $this->error="this->rowid not defined";
             return -2;
         }
-        if ($this->courant == 2 && $oper != 'LIQ')
+        if ($this->courant == Account::TYPE_CASH && $oper != 'LIQ')
         {
             $this->error="ErrorCashAccountAcceptsOnlyCashMoney";
             return -3;
@@ -398,63 +416,55 @@ class Account extends CommonObject
 
         $datev = $date;
 
-        $sql = "INSERT INTO ".MAIN_DB_PREFIX."bank (";
-        $sql.= "datec";
-        $sql.= ", dateo";
-        $sql.= ", datev";
-        $sql.= ", label";
-        $sql.= ", amount";
-        $sql.= ", fk_user_author";
-        $sql.= ", num_chq";
-        $sql.= ", fk_account";
-        $sql.= ", fk_type";
-        $sql.= ",emetteur,banque";
-        $sql.= ") VALUES (";
-        $sql.= "'".$this->db->idate($now)."'";
-        $sql.= ", '".$this->db->idate($date)."'";
-        $sql.= ", '".$this->db->idate($datev)."'";
-        $sql.= ", '".$this->db->escape($label)."'";
-        $sql.= ", ".price2num($amount);
-        $sql.= ", '".$user->id."'";
-        $sql.= ", ".($num_chq?"'".$num_chq."'":"null");
-        $sql.= ", '".$this->rowid."'";
-        $sql.= ", '".$oper."'";
-        $sql.= ", ".($emetteur?"'".$this->db->escape($emetteur)."'":"null");
-        $sql.= ", ".($banque?"'".$this->db->escape($banque)."'":"null");
-        $sql.= ")";
+		$accline = new AccountLine($this->db);
+		$accline->datec = $now;
+		$accline->dateo = $date;
+		$accline->datev = $datev;
+		$accline->label = $label;
+		$accline->amount = $amount;
+		$accline->fk_user_author = $user->id;
+		$accline->fk_account = $this->rowid;
+		$accline->fk_type = $oper;
 
-        dol_syslog(get_class($this)."::addline", LOG_DEBUG);
-        if ($this->db->query($sql))
-        {
-            $rowid = $this->db->last_insert_id(MAIN_DB_PREFIX."bank");
-            if ($categorie)
-            {
-                $sql = "INSERT INTO ".MAIN_DB_PREFIX."bank_class (";
-                $sql.= "lineid";
-                $sql.= ", fk_categ";
-                $sql.= ") VALUES (";
-                $sql.= "'".$rowid."'";
-                $sql.= ", '".$categorie."'";
-                $sql.= ")";
+		if ($num_chq) {
+			$accline->num_chq = $num_chq;
+		}
 
-                $result = $this->db->query($sql);
-                if (! $result)
-                {
-                    $this->db->rollback();
-                    $this->error=$this->db->error();
-                    return -3;
-                }
-            }
-            $this->db->commit();
-            return $rowid;
-        }
-        else
-        {
-            $this->error=$this->db->lasterror();
-            $this->db->rollback();
-            return -2;
-        }
-    }
+		if ($emetteur) {
+			$accline->emetteur = $emetteur;
+		}
+
+		if ($banque) {
+			$accline->bank_chq = $banque;
+		}
+
+		if ($accline->insert() > 0) {
+
+			if ($categorie) {
+				$sql = "INSERT INTO ".MAIN_DB_PREFIX."bank_class (";
+				$sql .= "lineid";
+				$sql .= ", fk_categ";
+				$sql .= ") VALUES (";
+				$sql .= "'".$accline->id."'";
+				$sql .= ", '".$categorie."'";
+				$sql .= ")";
+
+				$result = $this->db->query($sql);
+				if (!$result) {
+					$this->db->rollback();
+					$this->error = $this->db->error();
+					return -3;
+				}
+			}
+
+			$this->db->commit();
+			return $accline->id;
+		} else {
+			$this->error = $this->db->lasterror();
+			$this->db->rollback();
+			return -2;
+		}
+	}
 
     /**
      *  Create bank account into database
@@ -462,7 +472,7 @@ class Account extends CommonObject
      *  @param	User	$user		Object user making creation
      *  @return int        			< 0 if KO, > 0 if OK
      */
-    function create($user='')
+    function create(User $user = null)
     {
         global $langs,$conf, $hookmanager;
 
@@ -556,32 +566,18 @@ class Account extends CommonObject
             $result=$this->update();
             if ($result > 0)
             {
-                $sql = "INSERT INTO ".MAIN_DB_PREFIX."bank (";
-                $sql.= "datec";
-                $sql.= ", label";
-                $sql.= ", amount";
-                $sql.= ", fk_account";
-                $sql.= ", datev";
-                $sql.= ", dateo";
-                $sql.= ", fk_type";
-                $sql.= ", rappro";
-                $sql.= ") VALUES (";
-                $sql.= "'".$this->db->idate($now)."'";
-                $sql.= ", '(".$langs->trans("InitialBankBalance").")'";
-                $sql.= ", ".price2num($this->solde);
-                $sql.= ", '".$this->id."'";
-                $sql.= ", '".$this->db->idate($this->date_solde)."'";
-                $sql.= ", '".$this->db->idate($this->date_solde)."'";
-                $sql.= ", 'SOLD'";
-                $sql.= ", 0";		// Not conciliated by default
-                $sql.= ")";
+				$accline = new AccountLine($this->db);
+				$accline->datec = $this->db->idate($now);
+				$accline->label = '('.$langs->trans("InitialBankBalance").')';
+				$accline->amount = price2num($this->solde);
+				$accline->fk_account = $this->id;
+				$accline->datev = $this->db->idate($this->date_solde);
+				$accline->dateo = $this->db->idate($this->date_solde);
+				$accline->fk_type = 'SOLD';
 
-                $resql=$this->db->query($sql);
-                if (! $resql)
-                {
-                    $this->error=$this->db->lasterror();
-                    return -3;
-                }
+				if ($accline->insert() < 0) {
+					return -3;
+				}
 
                 // Actions on extra fields (by external module or standard code)
                 $hookmanager->initHooks(array('bankdao'));
@@ -622,7 +618,7 @@ class Account extends CommonObject
      *    	@param	User	$user       Object user making action
      *		@return	int					<0 si ko, >0 si ok
      */
-    function update($user='')
+    function update(User $user = null)
     {
         global $langs,$conf, $hookmanager;
 
@@ -720,7 +716,7 @@ class Account extends CommonObject
      *    	@param	User	$user       Object user making update
      *		@return	int					<0 if KO, >0 if OK
      */
-    function update_bban($user='')
+    function update_bban(User $user = null)
     {
         global $conf,$langs;
 
@@ -812,7 +808,7 @@ class Account extends CommonObject
                 $obj = $this->db->fetch_object($result);
 
                 $this->id            = $obj->rowid;
-                $this->rowid         = $obj->rowid;		// deprecated
+                $this->rowid         = $obj->rowid;
                 $this->ref           = $obj->ref;
                 $this->label         = $obj->label;
                 $this->type          = $obj->courant;
@@ -878,7 +874,7 @@ class Account extends CommonObject
      *	@param	User	$user	User deleting
      *  @return int             <0 if KO, >0 if OK
      */
-    function delete($user='')
+    function delete(User $user = null)
     {
         global $conf;
 
@@ -928,42 +924,32 @@ class Account extends CommonObject
      *    @param    int		$mode          	0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
      *    @return   string        			Libelle du statut
      */
-    function LibStatut($statut,$mode=0)
-    {
-        global $langs;
-        $langs->load('banks');
+	function LibStatut($statut, $mode = 0)
+	{
+		global $langs;
+		$langs->load('banks');
 
-        if ($mode == 0)
-        {
-            if ($statut==0) return $langs->trans("StatusAccountOpened");
-            if ($statut==1) return $langs->trans("StatusAccountClosed");
-        }
-        if ($mode == 1)
-        {
-            if ($statut==0) return $langs->trans("StatusAccountOpened");
-            if ($statut==1) return $langs->trans("StatusAccountClosed");
-        }
-        if ($mode == 2)
-        {
-            if ($statut==0) return img_picto($langs->trans("StatusAccountOpened"),'statut4').' '.$langs->trans("StatusAccountOpened");
-            if ($statut==1) return img_picto($langs->trans("StatusAccountClosed"),'statut5').' '.$langs->trans("StatusAccountClosed");
-        }
-        if ($mode == 3)
-        {
-            if ($statut==0) return img_picto($langs->trans("StatusAccountOpened"),'statut4');
-            if ($statut==1) return img_picto($langs->trans("StatusAccountClosed"),'statut5');
-        }
-        if ($mode == 4)
-        {
-            if ($statut==0) return img_picto($langs->trans("StatusAccountOpened"),'statut4').' '.$langs->trans("StatusAccountOpened");
-            if ($statut==1) return img_picto($langs->trans("StatusAccountClosed"),'statut5').' '.$langs->trans("StatusAccountClosed");
-        }
-        if ($mode == 5)
-        {
-            if ($statut==0) return $langs->trans("StatusAccountOpened").' '.img_picto($langs->trans("StatusAccountOpened"),'statut4');
-            if ($statut==1) return $langs->trans("StatusAccountClosed").' '.img_picto($langs->trans("StatusAccountClosed"),'statut5');
-        }
-    }
+		if ($statut == self::STATUS_OPEN) {
+			$label = $langs->trans("StatusAccountOpened");
+			$picto = img_picto($label, 'statut4');
+		} else {
+			$label = $langs->trans("StatusAccountClosed");
+			$picto = img_picto($label, 'statut5');
+		}
+
+		if ($mode == 2) {
+			return $picto.' '.$label;
+		} elseif ($mode == 3) {
+			return $picto;
+		} elseif ($mode == 4) {
+			return $picto.' '.$label;
+		} elseif ($mode == 5) {
+			return $label.' '.$picto;
+		}
+
+		//There is no short mode for this label
+		return $label;
+	}
 
 
     /**
@@ -1034,7 +1020,7 @@ class Account extends CommonObject
      *		@param	int		$filteraccountid	To get info for a particular account id
      *      @return WorkboardResponse|int 		<0 if KO, WorkboardResponse if OK
      */
-    function load_board($user,$filteraccountid=0)
+    function load_board(User $user, $filteraccountid = 0)
     {
         global $conf, $langs;
 
@@ -1082,6 +1068,34 @@ class Account extends CommonObject
     }
 
 
+    /**
+     *      Load indicators for dashboard (this->nbtodo and this->nbtodolate)
+     *
+     *      @return int     Nb of account we can reconciliate
+     */
+    public static function countAccountToReconcile()
+    {
+        global $db, $conf, $langs;
+    
+        if ($user->societe_id) return 0;   // protection pour eviter appel par utilisateur externe
+    
+        $nb=0;
+        
+        $sql = "SELECT COUNT(ba.rowid) as nb";
+        $sql.= " FROM ".MAIN_DB_PREFIX."bank_account as ba";
+        $sql.= " WHERE ba.rappro > 0 and ba.clos = 0";
+        if (empty($conf->global->BANK_CAN_RECONCILIATE_CASHACCOUNT)) $sql.= " AND ba.courant != 2";
+        $resql=$db->query($sql);
+        if ($resql)
+        {
+            $obj = $db->fetch_object($resql);
+            $nb = $obj->nb;
+        }
+        else dol_print_error($db);
+
+        return $nb;
+    }
+        
     /**
      *    	Return clicable name (with picto eventually)
      *
@@ -1229,8 +1243,8 @@ class Account extends CommonObject
         $this->ref             = 'MBA';
         $this->label           = 'My Bank account';
         $this->bank            = 'MyBank';
-        $this->courant         = 1;
-        $this->clos            = 0;
+        $this->courant         = Account::TYPE_CURRENT;
+        $this->clos            = Account::STATUS_OPEN;
         $this->code_banque     = '123';
         $this->code_guichet    = '456';
         $this->number          = 'ABC12345';
@@ -1280,13 +1294,14 @@ class AccountLine extends CommonObject
     var $fk_account;            // Id of bank account
     var $bank_account_label;    // Label of bank account
 
+    public $emetteur;
 
     /**
      *  Constructor
      *
      *  @param	DoliDB	$db		Database handler
      */
-    function __construct($db)
+    function __construct(DoliDB $db)
     {
         $this->db = $db;
     }
@@ -1348,7 +1363,7 @@ class AccountLine extends CommonObject
                 $this->num_releve		= $obj->num_releve;
 
                 $this->num_chq			= $obj->num_chq;
-                $this->bank_chq			= $obj->bank_chq;
+                $this->bank_chq			= $obj->banque;
                 $this->fk_bordereau		= $obj->fk_bordereau;
 
                 $this->fk_account		= $obj->fk_account;
@@ -1366,6 +1381,52 @@ class AccountLine extends CommonObject
         }
     }
 
+	/**
+	 * Inserts a transaction to a bank account
+	 *
+	 * @return int <0 if KO, rowid of the line if OK
+	 */
+	public function insert()
+	{
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX."bank (";
+		$sql .= "datec";
+		$sql .= ", dateo";
+		$sql .= ", datev";
+		$sql .= ", label";
+		$sql .= ", amount";
+		$sql .= ", fk_user_author";
+		$sql .= ", num_chq";
+		$sql .= ", fk_account";
+		$sql .= ", fk_type";
+		$sql .= ",emetteur,banque";
+		$sql .= ", rappro";
+		$sql .= ") VALUES (";
+		$sql .= "'".$this->db->idate($this->datec)."'";
+		$sql .= ", '".$this->db->idate($this->dateo)."'";
+		$sql .= ", '".$this->db->idate($this->datev)."'";
+		$sql .= ", '".$this->db->escape($this->label)."'";
+		$sql .= ", ".price2num($this->amount);
+		$sql .= ", '".$this->fk_user_author."'";
+		$sql .= ", ".($this->num_chq ? "'".$this->num_chq."'" : "null");
+		$sql .= ", '".$this->fk_account."'";
+		$sql .= ", '".$this->db->escape($this->fk_type)."'";
+		$sql .= ", ".($this->emetteur ? "'".$this->db->escape($this->emetteur)."'" : "null");
+		$sql .= ", ".($this->bank_chq ? "'".$this->db->escape($this->bank_chq)."'" : "null");
+		$sql .= ", ".(int) $this->rappro;
+		$sql .= ")";
+
+		dol_syslog(get_class($this)."::insert", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+
+		if (!$resql) {
+			$this->error = $this->db->lasterror();
+			return -1;
+		}
+
+		$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.'bank');
+
+		return $this->id;
+	}
 
     /**
      *      Delete transaction bank line record
@@ -1373,7 +1434,7 @@ class AccountLine extends CommonObject
      *		@param	User	$user	User object that delete
      *      @return	int 			<0 if KO, >0 if OK
      */
-    function delete($user=null)
+    function delete(User $user = null)
     {
         $nbko=0;
 
@@ -1422,7 +1483,7 @@ class AccountLine extends CommonObject
      *		@param	User	$user	User object that delete
      *      @return	int 			<0 if KO, >0 if OK
      */
-    function delete_urls($user=null)
+    function delete_urls(User $user = null)
     {
         $nbko=0;
 
@@ -1460,7 +1521,7 @@ class AccountLine extends CommonObject
      *		@param 	int		$notrigger		0=Disable all triggers
      *		@return	int						<0 if KO, >0 if OK
      */
-    function update($user,$notrigger=0)
+    function update(User $user, $notrigger = 0)
     {
         $this->db->begin();
 
@@ -1493,7 +1554,7 @@ class AccountLine extends CommonObject
      *		@param 	int		$cat		Category id
      *		@return	int					<0 if KO, >0 if OK
      */
-    function update_conciliation($user,$cat)
+    function update_conciliation(User $user, $cat)
     {
         $this->db->begin();
 
diff --git a/htdocs/compta/bank/class/bankcateg.class.php b/htdocs/compta/bank/class/bankcateg.class.php
index 5004d13caf1..7487e4a9f48 100644
--- a/htdocs/compta/bank/class/bankcateg.class.php
+++ b/htdocs/compta/bank/class/bankcateg.class.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2008 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2009 Regis Houssin        <regis.houssin@capnetworks.com>
+ * Copyright (C) 2016 Marcos García        <marcosgdf@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -17,346 +18,294 @@
  */
 
 /**
- *      \file       compta/bank/class/bankcateg.class.php
- *      \ingroup    banque
- *      \brief      This file is CRUD class file (Create/Read/Update/Delete) for bank categories
- *		\author		Laurent Destailleur
+ * \file       compta/bank/class/bankcateg.class.php
+ * \ingroup    bank
+ * \brief      This file is CRUD class file (Create/Read/Update/Delete) for bank categories
  */
 
-// Put here all includes required by your class file
-//require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
-//require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
-//require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
-
-
 /**
- *	Class to manage bank categories
+ *    Class to manage bank categories
  */
 class BankCateg // extends CommonObject
 {
-    //public $element='bank_categ';			//!< Id that identify managed objects
-    //public $table_element='bank_categ';	//!< Name of table without prefix where object is stored
+	//public $element='bank_categ';			//!< Id that identify managed objects
+	//public $table_element='bank_categ';	//!< Name of table without prefix where object is stored
 
-    var $id;
-    var $label;
+	public $id;
+	public $label;
 
 
-    /**
-     *	Constructor
-     *
-     *  @param		DoliDB		$db      Database handler
-     */
-    function __construct($db)
-    {
-        $this->db = $db;
-        return 1;
-    }
+	/**
+	 * Constructor
+	 *
+	 * @param DoliDB $db Database handler
+	 */
+	public function __construct(DoliDB $db)
+	{
+		$this->db = $db;
+	}
 
 
-    /**
-     *  Create in database
-     *
-     *  @param	User	$user        	User that create
-     *  @param  int		$notrigger	    0=launch triggers after, 1=disable triggers
-     *  @return int         			<0 if KO, Id of created object if OK
-     */
-    function create($user, $notrigger=0)
-    {
-        global $conf, $langs;
-        $error=0;
+	/**
+	 *  Create in database
+	 *
+	 * @param  User $user User that create
+	 * @param  int $notrigger 0=launch triggers after, 1=disable triggers
+	 * @return int <0 if KO, Id of created object if OK
+	 */
+	public function create(User $user, $notrigger = 0)
+	{
+		global $conf;
 
-        // Clean parameters
-        if (isset($this->label)) $this->label=trim($this->label);
+		$error = 0;
 
-        // Check parameters
-        // Put here code to add control on parameters values
+		// Clean parameters
+		if (isset($this->label)) {
+			$this->label = trim($this->label);
+		}
 
-        // Insert request
-        $sql = "INSERT INTO ".MAIN_DB_PREFIX."bank_categ (";
-        $sql.= "label";
-        $sql.= ", entity";
-        $sql.= ") VALUES (";
-        $sql.= " ".(! isset($this->label)?'NULL':"'".$this->db->escape($this->label)."'")."";
-        $sql.= ", ".$conf->entity;
-        $sql.= ")";
+		// Insert request
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX."bank_categ (";
+		$sql .= "label";
+		$sql .= ", entity";
+		$sql .= ") VALUES (";
+		$sql .= " ".(!isset($this->label) ? 'NULL' : "'".$this->db->escape($this->label)."'")."";
+		$sql .= ", ".$conf->entity;
+		$sql .= ")";
 
-        $this->db->begin();
+		$this->db->begin();
 
-        dol_syslog(get_class($this)."::create", LOG_DEBUG);
-        $resql=$this->db->query($sql);
-        if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+		dol_syslog(get_class($this)."::create", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if (!$resql) {
+			$error++;
+			$this->errors[] = "Error ".$this->db->lasterror();
+		}
 
-        if (! $error)
-        {
-            $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."bank_categ");
+		if (!$error) {
+			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."bank_categ");
+		}
 
-            if (! $notrigger)
-            {
-                // Uncomment this and change MYOBJECT to your own tag if you
-                // want this action call a trigger.
-
-                //// Call triggers
-                //include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-                //$interface=new Interfaces($this->db);
-                //$result=$interface->run_triggers('MYOBJECT_CREATE',$this,$user,$langs,$conf);
-                //if ($result < 0) { $error++; $this->errors=$interface->errors; }
-                //// End call triggers
-            }
-        }
-
-        // Commit or rollback
-        if ($error)
-        {
-            foreach($this->errors as $errmsg)
-            {
-                dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
-                $this->error.=($this->error?', '.$errmsg:$errmsg);
-            }
-            $this->db->rollback();
-            return -1*$error;
-        }
-        else
-        {
-            $this->db->commit();
-            return $this->id;
-        }
-    }
+		// Commit or rollback
+		if ($error) {
+			foreach ($this->errors as $errmsg) {
+				dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
+				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
+			}
+			$this->db->rollback();
+			return -1 * $error;
+		} else {
+			$this->db->commit();
+			return $this->id;
+		}
+	}
 
 
-    /**
-     *  Load object in memory from database
-     *
-     *  @param	int		$id         Id object
-     *  @return int         		<0 if KO, >0 if OK
-     */
-    function fetch($id)
-    {
-        global $langs,$conf;
+	/**
+	 * Load object in memory from database
+	 *
+	 * @param  int $id Id object
+	 * @return int <0 if KO, >0 if OK
+	 */
+	public function fetch($id)
+	{
+		global $conf;
 
-        $sql = "SELECT";
-        $sql.= " t.rowid,";
-        $sql.= " t.label";
-        $sql.= " FROM ".MAIN_DB_PREFIX."bank_categ as t";
-        $sql.= " WHERE t.rowid = ".$id;
-        $sql.= " AND t.entity = ".$conf->entity;
+		$sql = "SELECT";
+		$sql .= " t.rowid,";
+		$sql .= " t.label";
+		$sql .= " FROM ".MAIN_DB_PREFIX."bank_categ as t";
+		$sql .= " WHERE t.rowid = ".$id;
+		$sql .= " AND t.entity = ".$conf->entity;
 
-        dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
-        $resql=$this->db->query($sql);
-        if ($resql)
-        {
-            if ($this->db->num_rows($resql))
-            {
-                $obj = $this->db->fetch_object($resql);
+		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			if ($this->db->num_rows($resql)) {
+				$obj = $this->db->fetch_object($resql);
 
-                $this->id    = $obj->rowid;
-                $this->label = $obj->label;
-            }
-            $this->db->free($resql);
+				$this->id = $obj->rowid;
+				$this->label = $obj->label;
+			}
+			$this->db->free($resql);
 
-            return 1;
-        }
-        else
-        {
-            $this->error="Error ".$this->db->lasterror();
-            return -1;
-        }
-    }
+			return 1;
+		} else {
+			$this->error = "Error ".$this->db->lasterror();
+			return -1;
+		}
+	}
 
+	/**
+	 * Update database
+	 *
+	 * @param  User $user User that modify
+	 * @param  int $notrigger 0=launch triggers after, 1=disable triggers
+	 * @return int                    <0 if KO, >0 if OK
+	 */
+	public function update(User $user = null, $notrigger = 0)
+	{
+		global $conf;
+		$error = 0;
 
-    /**
-     *  Update database
-     *
-     *  @param	User	$user        	User that modify
-     *  @param  int		$notrigger	    0=launch triggers after, 1=disable triggers
-     *  @return int         			<0 if KO, >0 if OK
-     */
-    function update($user=null, $notrigger=0)
-    {
-        global $conf, $langs;
-        $error=0;
+		// Clean parameters
+		if (isset($this->label)) {
+			$this->label = trim($this->label);
+		}
 
-        // Clean parameters
-        if (isset($this->label)) $this->label=trim($this->label);
+		// Check parameters
+		// Put here code to add control on parameters values
 
-        // Check parameters
-        // Put here code to add control on parameters values
+		// Update request
+		$sql = "UPDATE ".MAIN_DB_PREFIX."bank_categ SET";
+		$sql .= " label=".(isset($this->label) ? "'".$this->db->escape($this->label)."'" : "null")."";
+		$sql .= " WHERE rowid=".$this->id;
+		$sql .= " AND entity = ".$conf->entity;
 
-        // Update request
-        $sql = "UPDATE ".MAIN_DB_PREFIX."bank_categ SET";
-        $sql.= " label=".(isset($this->label)?"'".$this->db->escape($this->label)."'":"null")."";
-        $sql.= " WHERE rowid=".$this->id;
-        $sql.= " AND entity = ".$conf->entity;
+		$this->db->begin();
 
-        $this->db->begin();
+		dol_syslog(get_class($this)."::update", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if (!$resql) {
+			$error++;
+			$this->errors[] = "Error ".$this->db->lasterror();
+		}
 
-        dol_syslog(get_class($this)."::update", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+		// Commit or rollback
+		if ($error) {
+			foreach ($this->errors as $errmsg) {
+				dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
+				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
+			}
+			$this->db->rollback();
+			return -1 * $error;
+		} else {
+			$this->db->commit();
+			return 1;
+		}
+	}
 
-        if (! $error)
-        {
-            if (! $notrigger)
-            {
-                // Uncomment this and change MYOBJECT to your own tag if you
-                // want this action call a trigger.
+	/**
+	 * Delete object in database
+	 *
+	 * @param  User $user User that delete
+	 * @param  int $notrigger 0=launch triggers after, 1=disable triggers
+	 * @return int <0 if KO, >0 if OK
+	 */
+	public function delete(User $user, $notrigger = 0)
+	{
+		global $conf;
+		$error = 0;
 
-                //// Call triggers
-                //include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-                //$interface=new Interfaces($this->db);
-                //$result=$interface->run_triggers('MYOBJECT_MODIFY',$this,$user,$langs,$conf);
-                //if ($result < 0) { $error++; $this->errors=$interface->errors; }
-                //// End call triggers
-            }
-        }
+		$sql = "DELETE FROM ".MAIN_DB_PREFIX."bank_categ";
+		$sql .= " WHERE rowid=".$this->id;
+		$sql .= " AND entity = ".$conf->entity;
 
-        // Commit or rollback
-        if ($error)
-        {
-            foreach($this->errors as $errmsg)
-            {
-                dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
-                $this->error.=($this->error?', '.$errmsg:$errmsg);
-            }
-            $this->db->rollback();
-            return -1*$error;
-        }
-        else
-        {
-            $this->db->commit();
-            return 1;
-        }
-    }
+		$this->db->begin();
 
+		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if (!$resql) {
+			$error++;
+			$this->errors[] = "Error ".$this->db->lasterror();
+		}
 
-    /**
-     *  Delete object in database
-     *
-     *	@param	User	$user        	User that delete
-     *  @param  int		$notrigger	    0=launch triggers after, 1=disable triggers
-     *	@return	int						<0 if KO, >0 if OK
-     */
-    function delete($user, $notrigger=0)
-    {
-        global $conf, $langs;
-        $error=0;
+		// Commit or rollback
+		if ($error) {
+			foreach ($this->errors as $errmsg) {
+				dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
+				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
+			}
+			$this->db->rollback();
+			return -1 * $error;
+		} else {
+			$this->db->commit();
+			return 1;
+		}
+	}
 
-        $sql = "DELETE FROM ".MAIN_DB_PREFIX."bank_categ";
-        $sql.= " WHERE rowid=".$this->id;
-        $sql.= " AND entity = ".$conf->entity;
+	/**
+	 * Load an object from its id and create a new one in database
+	 *
+	 * @param  int $fromid Id of object to clone
+	 * @return int New id of clone
+	 */
+	public function createFromClone($fromid)
+	{
+		global $user;
 
-        $this->db->begin();
+		$error = 0;
 
-        dol_syslog(get_class($this)."::delete", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
-
-        if (! $error)
-        {
-            if (! $notrigger)
-            {
-                // Uncomment this and change MYOBJECT to your own tag if you
-                // want this action call a trigger.
-
-                //// Call triggers
-                //include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-                //$interface=new Interfaces($this->db);
-                //$result=$interface->run_triggers('MYOBJECT_DELETE',$this,$user,$langs,$conf);
-                //if ($result < 0) { $error++; $this->errors=$interface->errors; }
-                //// End call triggers
-            }
-        }
-
-        // Commit or rollback
-        if ($error)
-        {
-            foreach($this->errors as $errmsg)
-            {
-                dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
-                $this->error.=($this->error?', '.$errmsg:$errmsg);
-            }
-            $this->db->rollback();
-            return -1*$error;
-        }
-        else
-        {
-            $this->db->commit();
-            return 1;
-        }
-    }
-
-
-
-    /**
-     *	Load an object from its id and create a new one in database
-     *
-     *	@param	int		$fromid     		Id of object to clone
-     * 	@return	int							New id of clone
-     */
-    function createFromClone($fromid)
-    {
-        global $user,$langs;
-
-        $error=0;
-
-        $object=new BankCateg($this->db);
+		$object = new BankCateg($this->db);
 
 		$object->context['createfromclone'] = 'createfromclone';
 
 		$this->db->begin();
 
-        // Load source object
-        $object->fetch($fromid);
-        $object->id=0;
-        $object->statut=0;
+		// Load source object
+		$object->fetch($fromid);
+		$object->id = 0;
+		$object->statut = 0;
 
-        // Clear fields
-        // ...
+		// Create clone
+		$result = $object->create($user);
 
-        // Create clone
-        $result=$object->create($user);
+		// Other options
+		if ($result < 0) {
+			$this->error = $object->error;
+			$error++;
+		}
 
-        // Other options
-        if ($result < 0)
-        {
-            $this->error=$object->error;
-            $error++;
-        }
+		unset($object->context['createfromclone']);
 
-        if (! $error)
-        {
+		// End
+		if (!$error) {
+			$this->db->commit();
+			return $object->id;
+		} else {
+			$this->db->rollback();
+			return -1;
+		}
+	}
 
+	/**
+	 * Returns all bank categories
+	 *
+	 * @return BankCateg[]
+	 */
+	public function fetchAll()
+	{
+		global $conf;
 
+		$return = array();
 
-        }
+		$sql = "SELECT rowid, label FROM ".MAIN_DB_PREFIX."bank_categ WHERE entity = ".$conf->entity." ORDER BY label";
+		$resql = $this->db->query($sql);
 
-        unset($object->context['createfromclone']);
+		if ($resql) {
+			while ($obj = $this->db->fetch_object($resql)) {
+				$tmp = new BankCateg($this->db);
+				$tmp->id = $obj->rowid;
+				$tmp->label = $obj->label;
 
-        // End
-        if (! $error)
-        {
-            $this->db->commit();
-            return $object->id;
-        }
-        else
-        {
-            $this->db->rollback();
-            return -1;
-        }
-    }
+				$return[] = $tmp;
+			}
+		}
 
+		return $return;
+	}
 
-    /**
-     *  Initialise an instance with random values.
-     *  Used to build previews or test instances.
-     *	id must be 0 if object instance is a specimen.
-     *
-     *  @return	void
-     */
-    function initAsSpecimen()
-    {
-        $this->id=0;
-
-        $this->label='';
-    }
+	/**
+	 * Initialise an instance with random values.
+	 * Used to build previews or test instances.
+	 * id must be 0 if object instance is a specimen.
+	 *
+	 * @return void
+	 */
+	public function initAsSpecimen()
+	{
+		$this->id = 0;
+		$this->label = '';
+	}
 
 }
diff --git a/htdocs/compta/bank/ligne.php b/htdocs/compta/bank/ligne.php
index 13b65f0baf1..a17614238be 100644
--- a/htdocs/compta/bank/ligne.php
+++ b/htdocs/compta/bank/ligne.php
@@ -6,6 +6,7 @@
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2015      Alexandre Spangaro	<aspangaro.dolibarr@gmail.com>
  * Copyright (C) 2015      Jean-François Ferry	<jfefe@aternatik.fr>
+ * Copyright (C) 2016      Marcos García        <marcosgdf@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -102,7 +103,7 @@ if ($user->rights->banque->modifier && $action == "update")
 	$ac = new Account($db);
 	$ac->fetch($id);
 
-	if ($ac->courant == 2 && $_POST['value'] != 'LIQ')
+	if ($ac->courant == Account::TYPE_CASH && $_POST['value'] != 'LIQ')
 	{
 		setEventMessages($langs->trans("ErrorCashAccountAcceptsOnlyCashMoney"), null, 'errors');
 		$error++;
@@ -205,24 +206,13 @@ $form = new Form($db);
 
 llxHeader();
 
-// The list of categories is initialized
-$sql = "SELECT rowid, label";
-$sql.= " FROM ".MAIN_DB_PREFIX."bank_categ";
-$sql.= " ORDER BY label";
-$result = $db->query($sql);
-if ($result)
-{
-    $var=True;
-    $num = $db->num_rows($result);
-    $i = 0;
-    $options = "<option value=\"0\" selected>&nbsp;</option>";
-    while ($i < $num)
-    {
-        $obj = $db->fetch_object($result);
-        $options .= "<option value=\"$obj->rowid\">$obj->label</option>\n";
-        $i++;
-    }
-    $db->free($result);
+// Load bank groups
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/bankcateg.class.php';
+$bankcateg = new BankCateg($db);
+$options = array();
+
+foreach ($bankcateg->fetchAll() as $bankcategory) {
+    $options[$bankcategory->id] = $bankcategory->label;
 }
 
 $var=false;
@@ -620,7 +610,7 @@ print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre"><td>'.$langs->trans("Rubriques").'</td><td colspan="2">';
 if ($user->rights->banque->modifier)
 {
-    print '<select class="flat" name="cat1">'.$options.'</select>&nbsp;';
+    print Form::selectarray('cat1', $options, '', 1).' ';
     print '<input type="submit" class="button" value="'.$langs->trans("Add").'"></td>';
 }
 print '</tr>';
diff --git a/htdocs/compta/bank/rappro.php b/htdocs/compta/bank/rappro.php
index 11cd92cdbbc..ec9420b4587 100644
--- a/htdocs/compta/bank/rappro.php
+++ b/htdocs/compta/bank/rappro.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2004-2015 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2010	   Juanjo Menent	    <jmenent@2byte.es>
  * Copyright (C) 2015      Jean-François Ferry	<jfefe@aternatik.fr>
+ * Copyright (C) 2016      Marcos García        <marcosgdf@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -111,28 +112,13 @@ if ($action == 'del')
     }
 }
 
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/bankcateg.class.php';
+$bankcateg = new BankCateg($db);
+$options = array();
 
-// Load bank groups
-$sql = "SELECT rowid, label FROM ".MAIN_DB_PREFIX."bank_categ ORDER BY label";
-$resql = $db->query($sql);
-$options="";
-if ($resql)
-{
-    $var=True;
-    $num = $db->num_rows($resql);
-    if ($num > 0) $options .= '<option value="0"'.(GETPOST('cat')?'':' selected').'>&nbsp;</option>';
-    $i = 0;
-    while ($i < $num)
-    {
-        $obj = $db->fetch_object($resql);
-        $options .= '<option value="'.$obj->rowid.'"'.(GETPOST('cat')==$obj->rowid?' selected':'').'>'.$obj->label.'</option>'."\n";
-        $i++;
-    }
-    $db->free($resql);
-    //print $options;
+foreach ($bankcateg->fetchAll() as $bankcategory) {
+	$options[$bankcategory->id] = $bankcategory->label;
 }
-else dol_print_error($db);
-
 
 /*
  * View
@@ -236,10 +222,11 @@ if ($resql)
     print '<strong>'.$langs->trans("InputReceiptNumber").'</strong>: ';
     print '<input class="flat" name="num_releve" type="text" value="'.(GETPOST('num_releve')?GETPOST('num_releve'):'').'" size="10">';  // The only default value is value we just entered
     print '<br>';
-    if ($options)
-    {
-        print $langs->trans("EventualyAddCategory").': <select class="flat" name="cat">'.$options.'</select><br>';
-    }
+	if ($options) {
+		print $langs->trans("EventualyAddCategory").': ';
+		print Form::selectarray('cat', $options, GETPOST('cat'), 1);
+		print '<br>';
+	}
     print '<br>'.$langs->trans("ThenCheckLinesAndConciliate").' "'.$langs->trans("Conciliate").'"<br>';
 
     print '<br>';
@@ -440,14 +427,6 @@ if ($resql)
 
             print '<td align="center" class="nowrap">';
             print '<input class="flat" name="rowid['.$objp->rowid.']" type="checkbox" value="'.$objp->rowid.'" size="1"'.(! empty($_POST['rowid'][$objp->rowid])?' checked':'').'>';
-//             print '<input class="flat" name="num_releve" type="text" value="'.$objp->num_releve.'" size="8">';
-//             print ' &nbsp; ';
-//             print "<input class=\"button\" type=\"submit\" value=\"".$langs->trans("Conciliate")."\">";
-//             if ($options)
-//             {
-//                 print "<br><select class=\"flat\" name=\"cat\">$options";
-//                 print "</select>";
-//             }
             print "</td>";
         }
         else
diff --git a/htdocs/compta/bank/releve.php b/htdocs/compta/bank/releve.php
index 43587cfa6a0..8ef53f26203 100644
--- a/htdocs/compta/bank/releve.php
+++ b/htdocs/compta/bank/releve.php
@@ -143,16 +143,12 @@ if (empty($num))
 		dol_fiche_end();
 
 		print '<div class="tabsAction">';
-		
-		if ($object->type != 2 && $object->rappro) 
-		{ 
+
+		if ($object->canBeConciliated() > 0) {
 			// If not cash account and can be reconciliate
-			if ($user->rights->banque->consolidate) 
-			{
-				print '<a class="butAction" href="'.DOL_URL_ROOT.'/compta/bank/rappro.php?account='.$object->id.($vline?'&amp;vline='.$vline:'').'">'.$langs->trans("Conciliate").'</a>';
-			}
-			else
-			{
+			if ($user->rights->banque->consolidate) {
+				print '<a class="butAction" href="'.DOL_URL_ROOT.'/compta/bank/rappro.php?account='.$object->id.($vline ? '&amp;vline='.$vline : '').'">'.$langs->trans("Conciliate").'</a>';
+			} else {
 				print '<a class="butActionRefused" title="'.$langs->trans("NotEnoughPermissions").'" href="#">'.$langs->trans("Conciliate").'</a>';
 			}
 		}
diff --git a/htdocs/compta/bank/virement.php b/htdocs/compta/bank/virement.php
index 1a3294a2f15..146ed4759c4 100644
--- a/htdocs/compta/bank/virement.php
+++ b/htdocs/compta/bank/virement.php
@@ -93,7 +93,7 @@ if ($action == 'add')
 			// By default, electronic transfert from bank to bank
 			$typefrom='PRE';
 			$typeto='VIR';
-			if ($accountto->courant == 2 || $accountfrom->courant == 2)
+			if ($accountto->courant == Account::TYPE_CASH || $accountfrom->courant == Account::TYPE_CASH)
 			{
 				// This is transfert of change
 				$typefrom='LIQ';
diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index 2fcdfb7f6a0..7298eb18135 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -783,10 +783,17 @@ if (empty($reshook))
 	                $facture_source = new Facture($db); // fetch origin object
 	                if ($facture_source->fetch($object->fk_facture_source)>0)
 	                {
+	                	$fk_parent_line = 0;
 
 	                    foreach($facture_source->lines as $line)
 	                    {
+	                    	// Reset fk_parent_line for no child products and special product
+	                    	if (($line->product_type != 9 && empty($line->fk_parent_line)) || $line->product_type == 9) {
+	                    		$fk_parent_line = 0;
+	                    	}
+
 	                        $line->fk_facture = $object->id;
+	                        $line->fk_parent_line = $fk_parent_line;
 
 	                        $line->subprice =-$line->subprice; // invert price for object
 	                        $line->pa_ht = -$line->pa_ht;
@@ -796,9 +803,14 @@ if (empty($reshook))
 	                        $line->total_localtax1=-$line->total_localtax1;
 	                        $line->total_localtax2=-$line->total_localtax2;
 
-	                        $line->insert();
+	                        $result = $line->insert();
 
 	                        $object->lines[] = $line; // insert new line in current object
+
+	                        // Defined the new fk_parent_line
+	                        if ($result > 0 && $line->product_type == 9) {
+	                        	$fk_parent_line = $result;
+	                        }
 	                    }
 
 	                    $object->update_price(1);
@@ -1594,7 +1606,7 @@ if (empty($reshook))
 
 		$line = new FactureLigne($db);
 		$line->fetch(GETPOST('lineid'));
-		$percent = $line->get_prev_progress();
+		$percent = $line->get_prev_progress($object->id);
 
 		if (GETPOST('progress') < $percent)
 		{
@@ -1712,7 +1724,7 @@ if (empty($reshook))
 		{
 			foreach ($object->lines as $line)
 			{
-				$percent = $line->get_prev_progress();
+				$percent = $line->get_prev_progress($object->id);
 				if (GETPOST('all_progress') < $percent) {
 					$mesg = '<div class="warning">' . $langs->trans("CantBeLessThanMinPercent") . '</div>';
 					$result = -1;
@@ -1911,7 +1923,7 @@ if ($action == 'create')
 
 		if ($element == 'project') {
 			$projectid = $originid;
-			
+
 			if (!$cond_reglement_id) {
 				$cond_reglement_id = $soc->cond_reglement_id;
 			}
@@ -1924,7 +1936,7 @@ if ($action == 'create')
 			if (!$dateinvoice) {
 				// Do not set 0 here (0 for a date is 1970)
 				$dateinvoice = (empty($dateinvoice)?(empty($conf->global->MAIN_AUTOFILL_DATE)?-1:''):$dateinvoice);
-			}			
+			}
 		} else {
 			// For compatibility
 			if ($element == 'order' || $element == 'commande') {
@@ -2667,7 +2679,7 @@ else if ($id > 0 || ! empty($ref))
 			$qualified_for_stock_change = $object->hasProductsOrServices(1);
 		}
 
-		if ($object->type != Facture::TYPE_DEPOSIT && ! empty($conf->global->STOCK_CALCULATE_ON_BILL) && $qualified_for_stock_change && $object->statut >= 1) 
+		if ($object->type != Facture::TYPE_DEPOSIT && ! empty($conf->global->STOCK_CALCULATE_ON_BILL) && $qualified_for_stock_change && $object->statut >= 1)
 		{
 			$langs->load("stocks");
 			require_once DOL_DOCUMENT_ROOT . '/product/class/html.formproduct.class.php';
@@ -2858,7 +2870,7 @@ else if ($id > 0 || ! empty($ref))
 	}
 
 	// Clone confirmation
-	if ($action == 'clone') 
+	if ($action == 'clone')
 	{
 		// Create an array for form
 		$formquestion = array(
@@ -2869,7 +2881,7 @@ else if ($id > 0 || ! empty($ref))
 		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?facid=' . $object->id, $langs->trans('CloneInvoice'), $langs->trans('ConfirmCloneInvoice', $object->ref), 'confirm_clone', $formquestion, 'yes', 1);
 	}
 
-	if (! $formconfirm) 
+	if (! $formconfirm)
 	{
 		$parameters = array('lineid' => $lineid);
 		$reshook = $hookmanager->executeHooks('formConfirm', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
@@ -3818,14 +3830,14 @@ else if ($id > 0 || ! empty($ref))
 		                                                                                          // modified by hook
 		if (empty($reshook)) {
 			// Editer une facture deja validee, sans paiement effectue et pas exporte en compta
-			if ($object->statut == 1) 
+			if ($object->statut == 1)
 			{
 				// On verifie si les lignes de factures ont ete exportees en compta et/ou ventilees
 				$ventilExportCompta = $object->getVentilExportCompta();
 
-				if ($resteapayer == $object->total_ttc && empty($object->paye) && $ventilExportCompta == 0) 
+				if ($resteapayer == $object->total_ttc && empty($object->paye) && $ventilExportCompta == 0)
 				{
-					if (! $objectidnext) 
+					if (! $objectidnext && $object->is_last_in_cycle())
 					{
 					    if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->facture->creer))
        						|| (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->facture->invoice_advance->unvalidate)))
@@ -4150,14 +4162,8 @@ else if ($id > 0 || ! empty($ref))
 		$formmail->withdeliveryreceipt = 1;
 		$formmail->withcancel = 1;
 		// Tableau des substitutions
-		$formmail->substit['__REF__'] = $object->ref;
-		$formmail->substit['__SIGNATURE__'] = $user->signature;
-		$formmail->substit['__REFCLIENT__'] = $object->ref_client;
-		$formmail->substit['__THIRDPARTY_NAME__'] = $object->thirdparty->name;
-		$formmail->substit['__PROJECT_REF__'] = (is_object($object->projet)?$object->projet->ref:'');
-		$formmail->substit['__PROJECT_NAME__'] = (is_object($object->projet)?$object->projet->title:'');
-		$formmail->substit['__PERSONALIZED__'] = '';
-		$formmail->substit['__CONTACTCIVNAME__'] = '';
+		$formmail->setSubstitFromObject($object);
+		$formmail->substit['__INVREF__'] = $object->ref;
 
 		// Find the good contact adress
 		$custcontact = '';
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 95356149622..f5aadddeaf9 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -3566,7 +3566,7 @@ class Facture extends CommonInvoice
 				$line->remise_percent=0;
 				if ($xnbp == 1)        // Qty is negative (product line)
 				{
-					$prodid = rand(1, $num_prods);
+					$prodid = mt_rand(1, $num_prods);
 					$line->fk_product=$prodids[$prodid];
 					$line->qty=-1;
 					$line->total_ht=-100;
@@ -3583,7 +3583,7 @@ class Facture extends CommonInvoice
 				}
 				else if ($xnbp == 3)    // Discount is 50% (product line)
 				{
-					$prodid = rand(1, $num_prods);
+					$prodid = mt_rand(1, $num_prods);
 					$line->fk_product=$prodids[$prodid];
 					$line->total_ht=50;
 					$line->total_ttc=59.8;
@@ -3592,7 +3592,7 @@ class Facture extends CommonInvoice
 				}
 				else    // (product line)
 				{
-					$prodid = rand(1, $num_prods);
+					$prodid = mt_rand(1, $num_prods);
 					$line->fk_product=$prodids[$prodid];
 					$line->total_ht=100;
 					$line->total_ttc=119.6;
@@ -3621,7 +3621,7 @@ class Facture extends CommonInvoice
 			$line->total_ht=0;
 			$line->total_ttc=0;    // 90 * 1.196
 			$line->total_tva=0;
-			$prodid = rand(1, $num_prods);
+			$prodid = mt_rand(1, $num_prods);
 			$line->fk_product=$prodids[$prodid];
 
 			$this->lines[$xnbp]=$line;
@@ -4533,15 +4533,22 @@ class FactureLigne extends CommonInvoiceLine
 	}
 
 	/**
-	 * Returns situation_percent of the previous line
+	 * Returns situation_percent of the previous line.
+	 * Warning: If invoice is a replacement invoice, this->fk_prev_id is id of the replaced line. 
 	 *
-	 * @return int >= 0
+	 * @param  int     $invoiceid      Invoice id
+	 * @return int                     >= 0
 	 */
-	function get_prev_progress()
+	function get_prev_progress($invoiceid)
 	{
 		if (is_null($this->fk_prev_id) || empty($this->fk_prev_id) || $this->fk_prev_id == "") {
 			return 0;
 		} else {
+		    // If invoice is a not a situation invoice, this->fk_prev_id is used for something else
+            $tmpinvoice=new Facture($this->db);
+            $tmpinvoice->fetch($invoiceid);
+            if ($tmpinvoice->type != Facture::TYPE_SITUATION) return 0;
+
 			$sql = 'SELECT situation_percent FROM ' . MAIN_DB_PREFIX . 'facturedet WHERE rowid=' . $this->fk_prev_id;
 			$resql = $this->db->query($sql);
 			if ($resql && $resql->num_rows > 0) {
diff --git a/htdocs/compta/facture/fiche-rec.php b/htdocs/compta/facture/fiche-rec.php
index 81eeed8a5b9..e833c0629b3 100644
--- a/htdocs/compta/facture/fiche-rec.php
+++ b/htdocs/compta/facture/fiche-rec.php
@@ -1027,7 +1027,7 @@ else
             
 	        print_barre_liste($langs->trans("RepeatableInvoices"),$page,$_SERVER['PHP_SELF'],$param,$sortfield,$sortorder,'',$num,$nbtotalofrecord,'title_accountancy.png',0,'','',$limit);
 
-			print $langs->trans("ToCreateAPredefinedInvoice").'<br><br>';
+			print $langs->trans("ToCreateAPredefinedInvoice", $langs->transnoentitiesnoconv("ChangeIntoRepeatableInvoice")).'<br><br>';
 
 			$i = 0;
 			print '<table class="noborder" width="100%">';
diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index c7bc789c6f4..d227d127f69 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -61,6 +61,7 @@ $ref=GETPOST('ref','alpha');
 $socid=GETPOST('socid','int');
 $action=GETPOST('action','alpha');
 $massaction=GETPOST('massaction','alpha');
+$show_files=GETPOST('show_files','int');
 $confirm=GETPOST('confirm','alpha');
 $lineid=GETPOST('lineid','int');
 $userid=GETPOST('userid','int');
@@ -131,7 +132,8 @@ if (empty($user->socid)) $fieldstosearchall["f.note_private"]="NotePrivate";
  */
 
 if (GETPOST('cancel')) { $action='list'; $massaction=''; }
-
+if (! GETPOST('confirmmassaction')) { $massaction=''; }
+    
 $parameters=array('socid'=>$socid);
 $reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
@@ -533,8 +535,8 @@ if (empty($reshook))
 	    $upload_dir = $diroutputpdf;
 	    $file = $upload_dir . '/' . GETPOST('file');
 	    $ret=dol_delete_file($file);
-	    if ($ret) setEventMessages($langs->trans("FileWasRemoved", GETPOST('urlfile')), null, 'mesgs');
-	    else setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), null, 'errors');
+	    if ($ret) setEventMessages($langs->trans("FileWasRemoved", GETPOST('file')), null, 'mesgs');
+	    else setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('file')), null, 'errors');
 	    $action='';
 	}
 	
@@ -714,6 +716,7 @@ if ($resql)
     if ($search_montant_ttc != '') $param.='&search_montant_ttc='.$search_montant_ttc;
 	if ($search_status != '') $param.='&search_status='.$search_status;
 	if ($search_paymentmode > 0) $param.='search_paymentmode='.$search_paymentmode;
+    if ($show_files)         $param.='&show_files=' .$show_files;
 	$param.=(! empty($option)?"&amp;option=".$option:"");
 	
 	$massactionbutton=$form->selectMassAction('', $massaction == 'presend' ? array() : array('presend'=>$langs->trans("SendByMail"), 'builddoc'=>$langs->trans("PDFMerge")));
@@ -1055,7 +1058,7 @@ if ($resql)
     print "</form>\n";
     $db->free($resql);
     
-    if ($massaction == 'builddoc' || $action == 'remove_file')
+    if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files)
     {
         /*
          * Show list of available documents
@@ -1067,10 +1070,16 @@ if ($resql)
         $genallowed=$user->rights->facture->lire;
         $delallowed=$user->rights->facture->lire;
     
-        print '<br>';
-        // We disable multilang because we concat already existing pdf.
-        $formfile->show_documents('unpaid','',$filedir,$urlsource,0,$delallowed,'',1,1,0,48,1,$param,$langs->trans("PDFMerge"),'');
-    }    
+        print '<br><a name="show_files"></a>';
+        $paramwithoutshowfiles=preg_replace('/show_files=1&?/','',$param);
+        $title=$langs->trans("MassFilesArea").' <a href="'.$_SERVER["PHP_SELF"].'?'.$paramwithoutshowfiles.'">('.$langs->trans("Hide").')</a>';
+        
+        $formfile->show_documents('massfilesarea','',$filedir,$urlsource,0,$delallowed,'',1,1,0,48,1,$param,$title,'');
+    }
+    else
+    {
+        print '<br><a name="show_files"></a><a href="'.$_SERVER["PHP_SELF"].'?show_files=1'.$param.'#show_files">'.$langs->trans("ShowTempMassFilesArea").'</a>';
+    }
 }
 else
 {
diff --git a/htdocs/compta/facture/mergepdftool.php b/htdocs/compta/facture/mergepdftool.php
deleted file mode 100644
index 043a45a0861..00000000000
--- a/htdocs/compta/facture/mergepdftool.php
+++ /dev/null
@@ -1,1031 +0,0 @@
-<?php
-/* Copyright (C) 2002-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004      Eric Seigne          <eric.seigne@ryxeo.com>
- * Copyright (C) 2004-2015 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
- * Copyright (C) 2012      Cédric Salvador      <csalvador@gpcsolutions.fr>
- * Copyright (C) 2014      Raphaël Doursenaud   <rdoursenaud@gpcsolutions.fr>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Note: Page can be call with param mode=sendremind to bring feature to send
- * remind by emails.
- */
-
-/**
- *		\file       htdocs/compta/facture/mergepdftool.php
- *		\ingroup    facture
- *		\brief      Page to list and build doc of selected invoices
- */
-
-require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
-require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
-require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
-
-$langs->load("mails");
-$langs->load("bills");
-
-$id = (GETPOST('facid','int') ? GETPOST('facid','int') : GETPOST('id','int'));
-$action = GETPOST('action','alpha');
-$option = GETPOST('option');
-$mode=GETPOST('mode');
-$builddoc_generatebutton=GETPOST('builddoc_generatebutton');
-$month = GETPOST("month","int");
-$year = GETPOST("year","int");
-$filter = GETPOST("filtre");
-if (GETPOST('button_search') || GETPOST('button_search.x') || GETPOST('button_search_x'))
-{
-	$filter=GETPOST('filtre',2);
-	//if ($filter != 'payed:0') $option='';
-}
-if ($option == 'late') $filter = 'paye:0';
-if ($option == 'unpaidall') $filter = 'paye:0';
-if ($mode == 'sendmassremind' && $filter == '') $filter = 'paye:0';
-if ($filter == '') $filter = 'paye:0';
-
-$search_user = GETPOST('search_user','int');
-$search_sale = GETPOST('search_sale','int');
-
-// Security check
-if ($user->societe_id) $socid=$user->societe_id;
-$result = restrictedArea($user,'facture',$id,'');
-
-$diroutputpdf=$conf->facture->dir_output . '/unpaid/temp';
-if (! $user->rights->societe->client->voir || $socid) $diroutputpdf.='/private/'.$user->id;	// If user has no permission to see all, output dir is specific to user
-
-$resultmasssend='';
-if (GETPOST('buttonsendremind')) 
-{
-	$action='presend';
-	$mode='sendmassremind';
-}
-
-if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter"))		// Both test must be present to be compatible with all browsers
-{
-	$search_ref="";
-	$search_ref_supplier="";
-	$search_user = "";
-	$search_sale = "";
-	$search_label="";
-	$search_company="";
-	$search_amount_no_tax="";
-	$search_amount_all_tax="";
-	$year="";
-	$month="";
-	$filter="";
-	$option="";
-}
-
-
-
-/*
- * Action
- */
-
-// Send remind email
-if ($action == 'presend' && GETPOST('cancel'))
-{
-	$action='';
-	if (GETPOST('models')=='facture_relance') $mode='sendmassremind';	// If we made a cancel from submit email form, this means we must be into mode=sendmassremind
-}
-
-if ($action == 'presend' && GETPOST('sendmail'))
-{
-	if (GETPOST('models')=='facture_relance') $mode='sendmassremind';	// If we made a cancel from submit email form, this means we must be into mode=sendmassremind
-
-	if (!isset($user->email))
-	{
-		$error++;
-		setEventMessages($langs->trans("NoSenderEmailDefined"), null, 'warnings');
-	}
-
-	$countToSend = count($_POST['toSend']);
-	if (empty($countToSend))
-	{
-		$error++;
-		setEventMessages($langs->trans("InvoiceNotChecked"), null, 'warnings');
-	}
-
-	if (! $error)
-	{
-		$nbsent = 0;
-		$nbignored = 0;
-
-		$arrayofinvoices=GETPOST('toSend','array');
-		
-		$thirdparty=new Societe($db);
-		$invoicetmp=new Facture($db);
-		$listofinvoicesid=array();
-		$listofinvoicesthirdparties=array();
-		$listofinvoicesref=array();
-		foreach($arrayofinvoices as $invoiceid)
-		{
-			$invoicetmp=new Facture($db);	// must create new instance because instance is saved into $listofinvoicesref array for future use
-			$result=$invoicetmp->fetch($invoiceid);
-			if ($result > 0) 
-			{
-				$listoinvoicesid[$invoiceid]=$invoiceid;
-				$thirdpartyid=$invoicetmp->fk_soc?$invoicetmp->fk_soc:$invoicetmp->socid;
-				$listofinvoicesthirdparties[$thirdpartyid]=$thirdpartyid;
-				$listofinvoicesref[$thirdpartyid][$invoiceid]=$invoicetmp;
-			}
-		}
-		//var_dump($listofinvoicesref);exit;
-		
-		foreach ($listofinvoicesthirdparties as $thirdpartyid)
-		{
-			$result = $thirdparty->fetch($thirdpartyid);
-			if ($result < 0) 
-			{
-				dol_print_error($db);
-				exit;
-			}
-			
-			// Define recipient $sendto and $sendtocc
-			if (trim($_POST['sendto']))
-			{
-				// Recipient is provided into free text
-				$sendto = trim($_POST['sendto']);
-				$sendtoid = 0;
-			}
-			elseif ($_POST['receiver'] != '-1')
-			{
-				// Recipient was provided from combo list
-				if ($_POST['receiver'] == 'thirdparty') // Id of third party
-				{
-					$sendto = $thirdparty->email;
-					$sendtoid = 0;
-				}
-				else	// Id du contact
-				{
-					$sendto = $thirdparty->contact_get_property((int) $_POST['receiver'],'email');
-					$sendtoid = $_POST['receiver'];
-				}
-			}
-			if (trim($_POST['sendtocc']))
-			{
-				$sendtocc = trim($_POST['sendtocc']);
-			}
-			elseif ($_POST['receivercc'] != '-1')
-			{
-				// Recipient was provided from combo list
-				if ($_POST['receivercc'] == 'thirdparty')	// Id of third party
-				{
-					$sendtocc = $thirdparty->email;
-				}
-				else	// Id du contact
-				{
-					$sendtocc = $thirdparty->contact_get_property((int) $_POST['receivercc'],'email');
-				}
-			}
-			
-			//var_dump($listofinvoicesref[$thirdpartyid]);
-			
-			$attachedfiles=array('paths'=>array(), 'names'=>array(), 'mimes'=>array());
-			$listofqualifiedinvoice=array();
-			$listofqualifiedref=array();
-			foreach($listofinvoicesref[$thirdpartyid] as $invoiceid => $invoice)
-			{
-				//var_dump($invoice);
-				$object = $invoice;
-				//$object = new Facture($db);
-				//$result = $object->fetch();
-				//var_dump($thirdpartyid.' - '.$invoiceid.' - '.$object->statut);
-				
-				if ($object->statut != Facture::STATUS_VALIDATED)
-				{
-					$nbignored++;
-					continue; // Payment done or started or canceled
-				}
-
-				// Read document
-				// TODO Use future field $object->fullpathdoc to know where is stored default file
-				// TODO If not defined, use $object->modelpdf (or defaut invoice config) to know what is template to use to regenerate doc.
-				$filename=dol_sanitizeFileName($object->ref).'.pdf';
-				$filedir=$conf->facture->dir_output . '/' . dol_sanitizeFileName($object->ref);
-				$file = $filedir . '/' . $filename;
-				$mime = 'application/pdf';
-
-				if (dol_is_file($file))
-				{
-					if (empty($sendto)) 	// For the case, no recipient were set (multi thirdparties send)
-					{
-						$object->fetch_thirdparty();
-						$sendto = $object->thirdparty->email;
-					}
-
-					if (empty($sendto)) 
-					{
-						$nbignored++;
-						continue;
-					}
-
-					if (dol_strlen($sendto))
-					{
-						// Create form object
-						$attachedfiles=array(
-								'paths'=>array_merge($attachedfiles['paths'],array($file)), 
-								'names'=>array_merge($attachedfiles['names'],array($filename)), 
-								'mimes'=>array_merge($attachedfiles['mimes'],array($mime))
-						);
-					}
-
-					$listofqualifiedinvoice[$invoiceid]=$invoice;
-					$listofqualifiedref[$invoiceid]=$invoice->ref;
-				}
-				else
-				{  
-					$nbignored++;
-					$langs->load("other");
-					$resultmasssend.='<div class="error">'.$langs->trans('ErrorCantReadFile',$file).'</div>';
-					dol_syslog('Failed to read file: '.$file, LOG_WARNING);
-					continue;
-				}
-				
-				//var_dump($listofqualifiedref);
-			}
-
-			if (count($listofqualifiedinvoice) > 0)
-			{
-				$langs->load("commercial");
-				$from = $user->getFullName($langs) . ' <' . $user->email .'>';
-				$replyto = $from;
-				$subject = GETPOST('subject');
-				$message = GETPOST('message');
-				$sendtocc = GETPOST('sentocc');
-				$sendtobcc = (empty($conf->global->MAIN_MAIL_AUTOCOPY_INVOICE_TO)?'':$conf->global->MAIN_MAIL_AUTOCOPY_INVOICE_TO);
-	
-				$substitutionarray=array(
-					'__ID__' => join(', ',array_keys($listofqualifiedinvoice)),
-					'__EMAIL__' => $thirdparty->email,
-					'__CHECK_READ__' => '<img src="'.DOL_MAIN_URL_ROOT.'/public/emailing/mailing-read.php?tag='.$thirdparty->tag.'&securitykey='.urlencode($conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY).'" width="1" height="1" style="width:1px;height:1px" border="0"/>',
-					//'__LASTNAME__' => $obj2->lastname,
-					//'__FIRSTNAME__' => $obj2->firstname,
-					'__FACREF__' => join(', ',$listofqualifiedref),            // For backward compatibility
-				    '__REF__' => join(', ',$listofqualifiedref),
-					'__REFCLIENT__' => $thirdparty->name
-				);
-
-				$subject=make_substitutions($subject, $substitutionarray);
-				$message=make_substitutions($message, $substitutionarray);
-
-				$filepath = $attachedfiles['paths'];
-				$filename = $attachedfiles['names'];
-				$mimetype = $attachedfiles['mimes'];
-				
-				//var_dump($filepath);
-				
-				// Send mail
-				require_once(DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php');
-				$mailfile = new CMailFile($subject,$sendto,$from,$message,$filepath,$mimetype,$filename,$sendtocc,$sendtobcc,$deliveryreceipt,-1);
-				if ($mailfile->error)
-				{
-					$resultmasssend.='<div class="error">'.$mailfile->error.'</div>';
-				}
-				else
-				{
-					$result=$mailfile->sendfile();
-					if ($result)
-					{
-						$resultmasssend.=$langs->trans('MailSuccessfulySent',$mailfile->getValidAddress($from,2),$mailfile->getValidAddress($sendto,2));		// Must not contain "
-
-						$error=0;
-
-						foreach($listofqualifiedinvoice as $invid => $object)
-						{
-							$actiontypecode='AC_FAC';
-							$actionmsg=$langs->transnoentities('MailSentBy').' '.$from.' '.$langs->transnoentities('To').' '.$sendto;
-							if ($message)
-							{
-								if ($sendtocc) $actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('Bcc') . ": " . $sendtocc);
-								$actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('MailTopic') . ": " . $subject);
-								$actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('TextUsedInTheMessageBody') . ":");
-								$actionmsg = dol_concatdesc($actionmsg, $message);
-							}
-							
-							// Initialisation donnees
-							$object->sendtoid		= 0;
-							$object->actiontypecode	= $actiontypecode;
-							$object->actionmsg		= $actionmsg;  // Long text
-							$object->actionmsg2		= $actionmsg2; // Short text
-							$object->fk_element		= $invid;
-							$object->elementtype	= $invoice->element;
-	
-							// Appel des triggers
-							include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php");
-							$interface=new Interfaces($db);
-							$result=$interface->run_triggers('BILL_SENTBYMAIL',$object,$user,$langs,$conf);
-							if ($result < 0) { $error++; $this->errors=$interface->errors; }
-							// Fin appel triggers
-	
-							if (! $error)
-							{
-								$resultmasssend.=$langs->trans("MailSent").': '.$sendto."<br>\n";
-							}
-							else
-							{
-								dol_print_error($db);
-							}
-							$nbsent++;
-						}
-					}
-					else
-					{
-						$langs->load("other");
-						if ($mailfile->error)
-						{
-							$resultmasssend.=$langs->trans('ErrorFailedToSendMail',$from,$sendto);
-							$resultmasssend.='<br><div class="error">'.$mailfile->error.'</div>';
-						}
-						else
-						{
-							$resultmasssend.='<div class="warning">No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS</div>';
-						}
-					}
-				}
-			}
-		}
-
-		if ($nbsent)
-		{
-			$action='';	// Do not show form post if there was at least one successfull sent
-			setEventMessages($nbsent. '/'.$countToSend.' '.$langs->trans("RemindSent"), null, 'mesgs');
-		}
-		else
-		{
-			setEventMessages($langs->trans("NoRemindSent"), null, 'warnings');  // May be object has no generated PDF file
-		}
-	}
-}
-
-
-if ($action == "builddoc" && $user->rights->facture->lire && ! GETPOST('button_search') && !empty($builddoc_generatebutton))
-{
-	if (is_array($_POST['toGenerate']))
-	{
-	    $arrayofinclusion=array();
-	    foreach($_POST['toGenerate'] as $tmppdf) $arrayofinclusion[]=preg_quote($tmppdf.'.pdf','/');
-		$factures = dol_dir_list($conf->facture->dir_output,'all',1,implode('|',$arrayofinclusion),'\.meta$|\.png','date',SORT_DESC,0,true);
-
-		// liste les fichiers
-		$files = array();
-		foreach($_POST['toGenerate'] as $basename)
-		{
-			foreach($factures as $facture)
-			{
-				if (strstr($facture["name"],$basename))
-				{
-					$files[] = $conf->facture->dir_output.'/'.$basename.'/'.$facture["name"];
-				}
-			}
-		}
-
-        // Define output language (Here it is not used because we do only merging existing PDF)
-        $outputlangs = $langs;
-        $newlang='';
-        if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id')) $newlang=GETPOST('lang_id');
-        if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->client->default_lang;
-        if (! empty($newlang))
-        {
-            $outputlangs = new Translate("",$conf);
-            $outputlangs->setDefaultLang($newlang);
-        }
-
-        // Create empty PDF
-        $pdf=pdf_getInstance();
-        if (class_exists('TCPDF'))
-        {
-            $pdf->setPrintHeader(false);
-            $pdf->setPrintFooter(false);
-        }
-        $pdf->SetFont(pdf_getPDFFont($outputlangs));
-
-        if (! empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
-
-		// Add all others
-		foreach($files as $file)
-		{
-			// Charge un document PDF depuis un fichier.
-			$pagecount = $pdf->setSourceFile($file);
-			for ($i = 1; $i <= $pagecount; $i++)
-			{
-				$tplidx = $pdf->importPage($i);
-				$s = $pdf->getTemplatesize($tplidx);
-				$pdf->AddPage($s['h'] > $s['w'] ? 'P' : 'L');
-				$pdf->useTemplate($tplidx);
-			}
-		}
-
-		// Create output dir if not exists
-		dol_mkdir($diroutputpdf);
-
-		// Save merged file
-		$filename=strtolower(dol_sanitizeFileName($langs->transnoentities("Invoices")));
-		if ($filter=='paye:0')
-		{
-			if ($option=='late') $filename.='_'.strtolower(dol_sanitizeFileName($langs->transnoentities("Unpaid"))).'_'.strtolower(dol_sanitizeFileName($langs->transnoentities("Late")));
-			else $filename.='_'.strtolower(dol_sanitizeFileName($langs->transnoentities("Unpaid")));
-		}
-		if ($year) $filename.='_'.$year;
-		if ($month) $filename.='_'.$month;
-		if ($pagecount)
-		{
-			$now=dol_now();
-			$file=$diroutputpdf.'/'.$filename.'_'.dol_print_date($now,'dayhourlog').'.pdf';
-			$pdf->Output($file,'F');
-			if (! empty($conf->global->MAIN_UMASK))
-			@chmod($file, octdec($conf->global->MAIN_UMASK));
-
-			$langs->load("exports");
-			setEventMessages($langs->trans('FileSuccessfullyBuilt',$filename.'_'.dol_print_date($now,'dayhourlog')), null, 'mesgs');
-		}
-		else
-		{
-			setEventMessages($langs->trans('NoPDFAvailableForDocGenAmongChecked'), null, 'errors');
-		}
-	}
-	else
-	{
-		setEventMessages($langs->trans('InvoiceNotChecked'), null, 'warnings');
-	}
-}
-
-// Remove file
-if ($action == 'remove_file')
-{
-	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-
-	$langs->load("other");
-	$upload_dir = $diroutputpdf;
-	$file = $upload_dir . '/' . GETPOST('file');
-	$ret=dol_delete_file($file);
-	if ($ret) setEventMessages($langs->trans("FileWasRemoved", GETPOST('urlfile')), null, 'mesgs');
-	else setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), null, 'errors');
-	$action='';
-}
-
-
-
-/*
- * View
- */
-
-$form = new Form($db);
-$formfile = new FormFile($db);
-$formother = new FormOther($db);
-
-$title=$langs->trans("MergingPDFTool");
-
-llxHeader('',$title);
-
-?>
-<script type="text/javascript">
-$(document).ready(function() {
-	$("#checkall").click(function() {
-		$(".checkformerge").prop('checked', true);
-	});
-	$("#checknone").click(function() {
-		$(".checkformerge").prop('checked', false);
-	});
-	$("#checkallsend").click(function() {
-		$(".checkforsend").prop('checked', true);
-	});
-	$("#checknonesend").click(function() {
-		$(".checkforsend").prop('checked', false);
-	});
-});
-</script>
-<?php
-
-$now=dol_now();
-
-$search_ref = GETPOST("search_ref");
-$search_refcustomer=GETPOST('search_refcustomer');
-$search_societe = GETPOST("search_societe");
-$search_paymentmode = GETPOST("search_paymentmode");
-$search_montant_ht = GETPOST("search_montant_ht");
-$search_montant_ttc = GETPOST("search_montant_ttc");
-$late = GETPOST("late");
-
-// Do we click on purge search criteria ?
-if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both test are required to be compatible with all browsers
-{
-    $search_ref='';
-    $search_refcustomer='';
-    $search_societe='';
-    $search_paymentmode='';
-    $search_montant_ht='';
-    $search_montant_ttc='';
-}
-
-$sortfield = GETPOST("sortfield",'alpha');
-$sortorder = GETPOST("sortorder",'alpha');
-$page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
-$offset = $conf->liste_limit * $page;
-$pageprev = $page - 1;
-$pagenext = $page + 1;
-if (! $sortfield) $sortfield="f.date_lim_reglement";
-if (! $sortorder) $sortorder="ASC";
-
-$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
-
-$sql = "SELECT s.nom as name, s.rowid as socid, s.email";
-$sql.= ", f.rowid as facid, f.facnumber, f.ref_client, f.increment, f.total as total_ht, f.tva as total_tva, f.total_ttc, f.localtax1, f.localtax2, f.revenuestamp";
-$sql.= ", f.datef as df, f.date_lim_reglement as datelimite";
-$sql.= ", f.paye as paye, f.fk_statut, f.type, f.fk_mode_reglement";
-$sql.= ", sum(pf.amount) as am";
-if (! $user->rights->societe->client->voir && ! $socid) $sql .= ", sc.fk_soc, sc.fk_user ";
-$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
-if (! $user->rights->societe->client->voir && ! $socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-$sql.= ",".MAIN_DB_PREFIX."facture as f";
-$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf ON f.rowid=pf.fk_facture ";
-// We'll need this table joined to the select in order to filter by sale
-if ($search_sale > 0 || (! $user->rights->societe->client->voir && ! $socid)) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-if ($search_user > 0)
-{
-    $sql.=", ".MAIN_DB_PREFIX."element_contact as ec";
-    $sql.=", ".MAIN_DB_PREFIX."c_type_contact as tc";
-}
-$sql.= " WHERE f.fk_soc = s.rowid";
-$sql.= " AND f.entity = ".$conf->entity;
-$sql.= " AND f.type IN (0,1,3,5)";
-if ($filter == 'paye:0') $sql.= " AND f.fk_statut = 1";
-//$sql.= " AND f.paye = 0";
-if ($option == 'late') $sql.=" AND f.date_lim_reglement < '".$db->idate(dol_now() - $conf->facture->client->warning_delay)."'";
-if (! $user->rights->societe->client->voir && ! $socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-if (! empty($socid)) $sql .= " AND s.rowid = ".$socid;
-if ($filter && $filter != -1)		// GETPOST('filtre') may be a string
-{
-	$filtrearr = explode(",", $filter);
-	foreach ($filtrearr as $fil)
-	{
-		$filt = explode(":", $fil);
-		$sql .= " AND " . $filt[0] . " = " . $filt[1];
-	}
-}
-if ($search_ref)         $sql .= " AND f.facnumber LIKE '%".$db->escape($search_ref)."%'";
-if ($search_refcustomer) $sql .= " AND f.ref_client LIKE '%".$db->escape($search_refcustomer)."%'";
-if ($search_societe)     $sql .= " AND s.nom LIKE '%".$db->escape($search_societe)."%'";
-if ($search_paymentmode) $sql .= " AND f.fk_mode_reglement = ".$search_paymentmode."";
-if ($search_montant_ht)  $sql .= " AND f.total = '".$db->escape($search_montant_ht)."'";
-if ($search_montant_ttc) $sql .= " AND f.total_ttc = '".$db->escape($search_montant_ttc)."'";
-if (GETPOST('sf_ref'))   $sql .= " AND f.facnumber LIKE '%".$db->escape(GETPOST('sf_ref'))."%'";
-if ($month > 0)
-{
-	if ($year > 0)
-	$sql.= " AND f.datef BETWEEN '".$db->idate(dol_get_first_day($year,$month,false))."' AND '".$db->idate(dol_get_last_day($year,$month,false))."'";
-	else
-	$sql.= " AND date_format(f.datef, '%m') = '$month'";
-}
-else if ($year > 0)
-{
-	$sql.= " AND f.datef BETWEEN '".$db->idate(dol_get_first_day($year,1,false))."' AND '".$db->idate(dol_get_last_day($year,12,false))."'";
-}
-if ($search_sale > 0) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$search_sale;
-if ($search_user > 0)
-{
-    $sql.= " AND ec.fk_c_type_contact = tc.rowid AND tc.element='facture' AND tc.source='internal' AND ec.element_id = f.rowid AND ec.fk_socpeople = ".$search_user;
-}
-$sql.= " GROUP BY s.nom, s.rowid, s.email, f.rowid, f.facnumber, f.ref_client, f.increment, f.total, f.tva, f.total_ttc, f.localtax1, f.localtax2, f.revenuestamp,";
-$sql.= " f.datef, f.date_lim_reglement, f.paye, f.fk_statut, f.type, f.fk_mode_reglement";
-if (! $user->rights->societe->client->voir && ! $socid) $sql .= ", sc.fk_soc, sc.fk_user ";
-$sql.= " ORDER BY ";
-$listfield=explode(',',$sortfield);
-foreach ($listfield as $key => $value) $sql.=$listfield[$key]." ".$sortorder.",";
-$sql.= " f.facnumber DESC";
-//print $sql;
-//$sql .= $db->plimit($limit+1,$offset);
-
-$resql = $db->query($sql);
-if ($resql)
-{
-	$num = $db->num_rows($resql);
-
-	if (! empty($socid))
-	{
-		$soc = new Societe($db);
-		$soc->fetch($socid);
-	}
-
-	$param="";
-	$param.=(! empty($socid)?"&amp;socid=".$socid:"");
-	if ($search_ref)         $param.='&amp;search_ref='.urlencode($search_ref);
-   	if ($search_refcustomer) $param.='&amp;search_ref='.urlencode($search_refcustomer);
-	if ($search_societe)     $param.='&amp;search_societe='.urlencode($search_societe);
-	if ($search_societe)     $param.='&amp;search_paymentmode='.urlencode($search_paymentmode);
-	if ($search_montant_ht)  $param.='&amp;search_montant_ht='.urlencode($search_montant_ht);
-	if ($search_montant_ttc) $param.='&amp;search_montant_ttc='.urlencode($search_montant_ttc);
-	if ($late)               $param.='&amp;late='.urlencode($late);
-	if ($mode)               $param.='&amp;mode='.urlencode($mode);
-	$urlsource=$_SERVER['PHP_SELF'].'?sortfield='.$sortfield.'&sortorder='.$sortorder;
-	$urlsource.=str_replace('&amp;','&',$param);
-
-	//$titre=(! empty($socid)?$langs->trans("BillsCustomersUnpaidForCompany",$soc->name):$langs->trans("BillsCustomersUnpaid"));
-	$titre=(! empty($socid)?$langs->trans("BillsCustomersForCompany",$soc->name):$langs->trans("BillsCustomers"));
-	if ($option == 'late') $titre.=' ('.$langs->trans("Late").')';
-	//else $titre.=' ('.$langs->trans("All").')';
-
-	$link='';
-	//if (empty($option) || $option == 'late') $link.=($link?' - ':'').'<a href="'.$_SERVER["PHP_SELF"].'?option=unpaidall'.$param.'">'.$langs->trans("ShowUnpaidAll").'</a>';
-	//if (empty($option) || $option == 'unpaidall') $link.=($link?' - ':'').'<a href="'.$_SERVER["PHP_SELF"].'?option=late'.$param.'">'.$langs->trans("ShowUnpaidLateOnly").'</a>';
-
-	$param.=(! empty($option)?"&amp;option=".$option:"");
-
-	print load_fiche_titre($titre,$link);
-	//print_barre_liste($titre,$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',0);	// We don't want pagination on this page
-
-	$arrayofinvoices=GETPOST('toSend','array');
-	if ($action == 'presend' && count($arrayofinvoices) == 0 && ! GETPOST('cancel')) 
-	{
-		setEventMessages($langs->trans("InvoiceNotChecked"), null, 'errors');
-		$action='list';
-		$mode='sendmassremind';
-	}
-	else 
-	{
-		$invoicetmp=new Facture($db);
-		$listofinvoicesid=array();
-		$listofinvoicesthirdparties=array();
-		$listofinvoicesref=array();
-		foreach($arrayofinvoices as $invoiceid)
-		{
-			$result=$invoicetmp->fetch($invoiceid);
-			if ($result > 0) 
-			{
-				$listofinvoicesid[$invoiceid]=$invoiceid;
-				$thirdpartyid=$invoicetmp->fk_soc?$invoicetmp->fk_soc:$invoicetmp->socid;
-				$listofinvoicesthirdparties[$thirdpartyid]=$thirdpartyid;
-				$listofinvoicesref[$thirdpartyid][$invoiceid]=$invoicetmp->ref;
-			}
-		}
-	}
-	print '<form id="form_unpaid" method="POST" action="'.$_SERVER["PHP_SELF"].'?sortfield='. $sortfield .'&sortorder='. $sortorder .'">';
-
-	if (GETPOST('modelselected')) {
-		$action = 'presend';
-	}
-	if (! empty($mode) && $action == 'presend')
-	{
-		include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
-		$formmail = new FormMail($db);
-
-		dol_fiche_head(null, '', $langs->trans("SendRemind"));
-
-		$topicmail="MailTopicSendRemindUnpaidInvoices";
-		$modelmail="facture_relance";
-
-		// Cree l'objet formulaire mail
-		include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
-		$formmail = new FormMail($db);
-		$formmail->withform=-1;
-		$formmail->fromtype = 'user';
-		$formmail->fromid   = $user->id;
-		$formmail->fromname = $user->getFullName($langs);
-		$formmail->frommail = $user->email;
-		if (! empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 1))	// If bit 1 is set
-		{
-			$formmail->trackid='inv'.$object->id;
-		}
-		if (! empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 2))	// If bit 2 is set
-		{
-			include DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-			$formmail->frommail=dolAddEmailTrackId($formmail->frommail, 'inv'.$object->id);
-		}		
-		$formmail->withfrom=1;
-		$liste=$langs->trans("AllRecipientSelectedForRemind");
-		if (count($listofinvoicesthirdparties) == 1)
-		{
-			$liste=array();
-			$thirdpartyid=array_shift($listofinvoicesthirdparties);
-   			$soc=new Societe($db);
-    		$soc->fetch($thirdpartyid);
-        	foreach ($soc->thirdparty_and_contact_email_array(1) as $key=>$value)
-        	{
-        		$liste[$key]=$value;
-        	}
-			$formmail->withtoreadonly=0;
-		}
-		else
-		{
-			$formmail->withtoreadonly=1;
-		}
-		$formmail->withto=$liste;
-		$formmail->withtofree=0;
-		$formmail->withtocc=1;
-		$formmail->withtoccc=$conf->global->MAIN_EMAIL_USECCC;
-		$formmail->withtopic=$langs->transnoentities($topicmail, '__REF__', '__REFCLIENT__');
-		$formmail->withfile=$langs->trans("OnlyPDFattachmentSupported");
-		$formmail->withbody=1;
-		$formmail->withdeliveryreceipt=1;
-		$formmail->withcancel=1;
-		// Tableau des substitutions
-		//$formmail->substit['__REF__']='';
-		$formmail->substit['__SIGNATURE__']=$user->signature;
-		//$formmail->substit['__REFCLIENT__']='';
-		$formmail->substit['__PERSONALIZED__']='';
-		$formmail->substit['__CONTACTCIVNAME__']='';
-
-		// Tableau des parametres complementaires du post
-		$formmail->param['action']=$action;
-		$formmail->param['models']=$modelmail;
-		$formmail->param['models_id']=GETPOST('modelmailselected','int');
-		$formmail->param['facid']=join(',',$arrayofinvoices);
-		$formmail->param['returnurl']=$_SERVER["PHP_SELF"].'?id='.$object->id;
-
-		print $formmail->get_form();
-        
-        dol_fiche_end();
-	}
-
-	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-	print '<input type="hidden" name="mode" value="'.$mode.'">';
-	if ($late) print '<input type="hidden" name="late" value="'.dol_escape_htmltag($late).'">';
-
-	if ($resultmasssend)
-	{
-		print '<br><strong>'.$langs->trans("ResultOfMassSending").':</strong><br>'."\n";
-		print $langs->trans("Selected").': '.$countToSend."\n<br>";
-		print $langs->trans("Ignored").': '.$nbignored."\n<br>";
-		print $langs->trans("Sent").': '.$nbsent."\n<br>";
-		//print $resultmasssend;
-		print '<br>';
-	}
-
-	$i = 0;
-
- 	// If the user can view prospects other than his'
-    $moreforfilter='';
- 	if ($user->rights->societe->client->voir || $socid)
- 	{
- 		$langs->load("commercial");
- 		$moreforfilter.='<div class="divsearchfield">';
- 		$moreforfilter.=$langs->trans('ThirdPartiesOfSaleRepresentative'). ': ';
-		$moreforfilter.=$formother->select_salesrepresentatives($search_sale,'search_sale',$user, 0, 1, 'maxwidth300');
-	 	$moreforfilter.='</div>';
- 	}
-    // If the user can view prospects other than his'
-    if ($user->rights->societe->client->voir || $socid)
-    {
-        $moreforfilter.='<div class="divsearchfield">';
-        $moreforfilter.=$langs->trans('LinkedToSpecificUsers'). ': ';
-        $moreforfilter.=$form->select_dolusers($search_user, 'search_user', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
-        $moreforfilter.='</div>';
-    }
-    if (! empty($moreforfilter))
-    {
-        print '<div class="liste_titre liste_titre_bydiv centpercent">';
-        print $moreforfilter;
-        $parameters=array();
-        $reshook=$hookmanager->executeHooks('printFieldPreListTitle',$parameters);    // Note that $action and $object may have been modified by hook
-        print $hookmanager->resPrint;
-        print '</div>';
-    }
-
-    print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">';
-    
-    print '<tr class="liste_titre">';
-	print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"f.facnumber","",$param,"",$sortfield,$sortorder);
-    print_liste_field_titre($langs->trans('RefCustomer'),$_SERVER["PHP_SELF"],'f.ref_client','',$param,'',$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("Date"),$_SERVER["PHP_SELF"],"f.datef","",$param,'align="center"',$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("DateDue"),$_SERVER["PHP_SELF"],"f.date_lim_reglement","",$param,'align="center"',$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("ThirdParty"),$_SERVER["PHP_SELF"],"s.nom","",$param,"",$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("PaymentMode"),$_SERVER["PHP_SELF"],"f.fk_mode_reglement","",$param,"",$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("AmountHT"),$_SERVER["PHP_SELF"],"f.total","",$param,'align="right"',$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("Taxes"),$_SERVER["PHP_SELF"],"f.tva","",$param,'align="right"',$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("AmountTTC"),$_SERVER["PHP_SELF"],"f.total_ttc","",$param,'align="right"',$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("Received"),$_SERVER["PHP_SELF"],"am","",$param,'align="right"',$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("Rest"),$_SERVER["PHP_SELF"],"","",$param,'align="right"',$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"fk_statut,paye,am","",$param,'align="right"',$sortfield,$sortorder);
-	print_liste_field_titre('',$_SERVER["PHP_SELF"],"","",$param,'align="center"',$sortfield,$sortorder);
-	print "</tr>\n";
-
-	// Lignes des champs de filtre
-	print '<tr class="liste_titre">';
-	// Ref
-	print '<td class="liste_titre">';
-	print '<input class="flat" size="10" type="text" name="search_ref" value="'.$search_ref.'"></td>';
-    print '<td class="liste_titre">';
-    print '<input class="flat" size="6" type="text" name="search_refcustomer" value="'.$search_refcustomer.'">';
-    print '</td>';
-	print '<td class="liste_titre" align="center">';
-	print '<input class="flat" type="text" size="1" maxlength="2" name="month" value="'.$month.'">';
-	$syear = $year;
-	$formother->select_year($syear?$syear:-1,'year',1, 20, 5);
-	print '</td>';
-	// Late
-	print '<td class="liste_titre" align="center">';
-	print '<input type="checkbox" name="option" value="late"'.($option == 'late'?' checked':'').'> '.$langs->trans("Late");
-	print '</td>';
-	print '<td class="liste_titre" align="left"><input class="flat" type="text" size="10" name="search_societe" value="'.dol_escape_htmltag($search_societe).'"></td>';
-	print '<td class="liste_titre" align="left">';
-	$form->select_types_paiements($search_paymentmode, 'search_paymentmode', '', 0, 0, 1);
-	print '</td>';
-	print '<td class="liste_titre" align="right"><input class="flat" type="text" size="8" name="search_montant_ht" value="'.dol_escape_htmltag($search_montant_ht).'"></td>';
-	print '<td class="liste_titre">&nbsp;</td>';
-	print '<td class="liste_titre" align="right"><input class="flat" type="text" size="8" name="search_montant_ttc" value="'.dol_escape_htmltag($search_montant_ttc).'"></td>';
-	print '<td class="liste_titre">&nbsp;</td>';
-	print '<td class="liste_titre">&nbsp;</td>';
-	print '<td class="liste_titre" align="right">';
-	$liststatus=array('paye:0'=>$langs->trans("Unpaid"), 'paye:1'=>$langs->trans("Paid"));
-	print $form->selectarray('filtre', $liststatus, $filter, 1);
-	print '</td>';
-	print '<td class="liste_titre" align="center">';
-	$searchpitco=$form->showFilterAndCheckAddButtons(1, empty($mode)?'checkformerge':'checkforsend');
-	print $searchpitco;
-	print '</td>';
-	print "</tr>\n";
-
-	if ($num > 0)
-	{
-		$var=true;
-		$total_ht=0;
-		$total_tva=0;
-		$total_ttc=0;
-		$total_paid=0;
-
-		$facturestatic=new Facture($db);
-
-		while ($i < $num)
-		{
-			$objp = $db->fetch_object($resql);
-			$date_limit=$db->jdate($objp->datelimite);
-
-			$var=!$var;
-
-			print "<tr ".$bc[$var].">";
-			$classname = "impayee";
-
-			print '<td class="nowrap">';
-
-			$facturestatic->id=$objp->facid;
-			$facturestatic->ref=$objp->facnumber;
-			$facturestatic->type=$objp->type;
-			$facturestatic->statut=$objp->fk_statut;
-			$facturestatic->date_lim_reglement= $db->jdate($objp->datelimite);
-
-			print '<table class="nobordernopadding"><tr class="nocellnopadd">';
-
-			// Ref
-			print '<td class="nobordernopadding nowrap">';
-			print $facturestatic->getNomUrl(1);
-			print '</td>';
-
-			// Warning picto
-			print '<td width="20" class="nobordernopadding nowrap">';
-			if ($facturestatic->hasDelay()) {
-				print img_warning($langs->trans("Late"));
-			}
-			print '</td>';
-
-			// PDF Picto
-			print '<td width="16" align="right" class="nobordernopadding hideonsmartphone">';
-            $filename=dol_sanitizeFileName($objp->facnumber);
-			$filedir=$conf->facture->dir_output . '/' . dol_sanitizeFileName($objp->facnumber);
-			print $formfile->getDocumentsLink($facturestatic->element, $filename, $filedir);
-            print '</td>';
-
-			print '</tr></table>';
-
-			print "</td>\n";
-
-			// Customer ref
-			print '<td class="nowrap">';
-			print $objp->ref_client;
-			print '</td>';
-
-			print '<td class="nowrap" align="center">'.dol_print_date($db->jdate($objp->df),'day').'</td>'."\n";
-			print '<td class="nowrap" align="center">'.dol_print_date($db->jdate($objp->datelimite),'day').'</td>'."\n";
-
-            print '<td>';
-            $thirdparty=new Societe($db);
-            $thirdparty->id=$objp->socid;
-            $thirdparty->name=$objp->name;
-            $thirdparty->client=$objp->client;
-            $thirdparty->code_client=$objp->code_client;
-            print $thirdparty->getNomUrl(1,'customer');
-            print '</td>';
-
-            // Payment mode
-            print '<td>';
-            $form->form_modes_reglement($_SERVER['PHP_SELF'], $objp->fk_mode_reglement, 'none', '', -1);
-            print '</td>';
-
-
-			print '<td align="right">'.price($objp->total_ht).'</td>';
-			print '<td align="right">'.price($objp->total_tva);
-			$tx1=price2num($objp->localtax1);
-			$tx2=price2num($objp->localtax2);
-			$revenuestamp=price2num($objp->revenuestamp);
-			if (! empty($tx1) || ! empty($tx2) || ! empty($revenuestamp)) print '+'.price($tx1 + $tx2 + $revenuestamp);
-			print '</td>';
-			print '<td align="right">'.price($objp->total_ttc).'</td>';
-			print '<td align="right">';
-			$cn=$facturestatic->getSumCreditNotesUsed();
-			$dep=$facturestatic->getSumDepositsUsed();
-			if (! empty($objp->am)) print price($objp->am);
-			if (! empty($objp->am) && ! empty($cn)) print '+';
-			if (! empty($cn)) print price($cn);
-			if (! empty($dep)) print price(-$dep);
-			print '</td>';
-
-			// Remain to receive
-			print '<td align="right">'.(((! empty($objp->total_ttc) || ! empty($objp->am) || ! empty($cn) || ! empty($dep)) && ($objp->total_ttc - $objp->am - $cn - $dep)) ? price($objp->total_ttc - $objp->am - $cn - $dep):'&nbsp;').'</td>';
-
-			// Status of invoice
-			print '<td align="right" class="nowrap">';
-			print $facturestatic->LibStatut($objp->paye,$objp->fk_statut,5,$objp->am);
-			print '</td>';
-
-			if (empty($mode))
-			{
-				// Checkbox to merge
-				print '<td align="center">';
-				if (! empty($formfile->infofiles['extensions']['pdf']))
-					print '<input id="cb'.$objp->facid.'" class="flat checkformerge" type="checkbox" name="toGenerate[]" value="'.$objp->facnumber.'">';
-				print '</td>' ;
-			}
-			else
-			{
-				// Checkbox to send remind
-				print '<td class="nowrap" align="center">';
-				$selected=0;
-				if (in_array($objp->facid, $arrayofinvoices)) $selected=1;
-				if ($objp->email) print '<input class="flat checkforsend" type="checkbox" name="toSend[]" value="'.$objp->facid.'"'.($selected?' checked="checked"':'').'>';
-				else print img_picto($langs->trans("NoEMail"), 'warning.png');
-				print '</td>' ;
-			}
-
-			print "</tr>\n";
-			$total_ht+=$objp->total_ht;
-			$total_tva+=($objp->total_tva + $tx1 + $tx2 + $revenuestamp);
-			$total_ttc+=$objp->total_ttc;
-			$total_paid+=$objp->am + $cn + $dep;
-
-			$i++;
-		}
-
-		print '<tr class="liste_total">';
-		print '<td colspan="6" align="left">'.$langs->trans("Total").'</td>';
-		print '<td align="right"><b>'.price($total_ht).'</b></td>';
-		print '<td align="right"><b>'.price($total_tva).'</b></td>';
-		print '<td align="right"><b>'.price($total_ttc).'</b></td>';
-		print '<td align="right"><b>'.price($total_paid).'</b></td>';
-		print '<td align="right"><b>'.price($total_ttc - $total_paid).'</b></td>';
-		print '<td align="center">&nbsp;</td>';
-		print '<td align="center">&nbsp;</td>';
-		print "</tr>\n";
-	}
-
-	print "</table>";
-
-
-	if (empty($mode))
-	{
-		/*
-		 * Show list of available documents
-		 */
-		$filedir=$diroutputpdf;
-		$genallowed=$user->rights->facture->lire;
-		$delallowed=$user->rights->facture->lire;
-
-		print '<br>';
-		// We disable multilang because we concat already existing pdf.
-		$formfile->show_documents('unpaid','',$filedir,$urlsource,$genallowed,$delallowed,'',1,1,0,48,1,$param,$langs->trans("PDFMerge"),$langs->trans("PDFMerge"));
-	}
-	else
-	{
-		if ($action != 'presend')
-		{
-			print '<div class="tabsAction">';
-			print '<input type="submit" class="butAction" name="buttonsendremind" value="'.dol_escape_htmltag($langs->trans("SendRemind")).'">';
-			print '</div>';
-			print '<br>';
-		}
-	}
-
-	print '</form>';
-
-	$db->free($resql);
-}
-else dol_print_error($db,'');
-
-
-llxFooter();
-$db->close();
diff --git a/htdocs/compta/facture/prelevement.php b/htdocs/compta/facture/prelevement.php
index 47abb50fb8b..00254b7440f 100644
--- a/htdocs/compta/facture/prelevement.php
+++ b/htdocs/compta/facture/prelevement.php
@@ -454,7 +454,7 @@ if ($object->id > 0)
 
 
 	/*
-	 * Withdrawal request
+	 * Withdrawal opened requests
 	 */
 
 	$sql = "SELECT pfd.rowid, pfd.traite, pfd.date_demande as date_demande";
@@ -564,6 +564,8 @@ if ($object->id > 0)
 		dol_print_error($db);
 	}
 
+	// Closed requests
+	
 	$sql = "SELECT pfd.rowid, pfd.traite, pfd.date_demande,";
 	$sql.= " pfd.date_traite, pfd.fk_prelevement_bons, pfd.amount,";
 	$sql.= " pb.ref,";
diff --git a/htdocs/compta/hrm.php b/htdocs/compta/hrm.php
index 08ca07b04c5..3f1b77a6697 100644
--- a/htdocs/compta/hrm.php
+++ b/htdocs/compta/hrm.php
@@ -97,7 +97,7 @@ if (count($listofsearchfields))
 	{
 		if ($i == 0) print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
 		print '<tr '.$bc[false].'>';
-		print '<td class="nowrap"><label for="'.$key.'">'.$langs->trans($value["text"]).'</label>:</td><td><input type="text" class="flat" name="'.$key.'" id="'.$key.'" size="18"></td>';
+		print '<td class="nowrap"><label for="'.$key.'">'.$langs->trans($value["text"]).'</label>:</td><td><input type="text" class="flat inputsearch" name="'.$key.'" id="'.$key.'" size="18"></td>';
 		if ($i == 0) print '<td rowspan="'.count($listofsearchfields).'"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td>';
 		print '</tr>';
 		$i++;
diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php
index 855a04d2f39..4d5de55e384 100644
--- a/htdocs/compta/index.php
+++ b/htdocs/compta/index.php
@@ -116,7 +116,7 @@ if (count($listofsearchfields))
 	{
 		if ($i == 0) print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
 		print '<tr '.$bc[false].'>';
-		print '<td class="nowrap"><label for="'.$key.'">'.$langs->trans($value["text"]).'</label>:</td><td><input type="text" class="flat" name="'.$key.'" id="'.$key.'" size="14"></td>';
+		print '<td class="nowrap"><label for="'.$key.'">'.$langs->trans($value["text"]).'</label>:</td><td><input type="text" class="flat inputsearch" name="'.$key.'" id="'.$key.'" size="14"></td>';
 		if ($i == 0) print '<td rowspan="'.count($listofsearchfields).'"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td>';
 		print '</tr>';
 		$i++;
diff --git a/htdocs/compta/journal/sellsjournal.php b/htdocs/compta/journal/sellsjournal.php
index cddbdcaa064..0cbd5068077 100644
--- a/htdocs/compta/journal/sellsjournal.php
+++ b/htdocs/compta/journal/sellsjournal.php
@@ -166,14 +166,15 @@ if ($result)
 
 		// Situation invoices handling
 		$line = new FactureLigne($db);
-		$line->fetch($obj->id);
-		$prev_progress = $line->get_prev_progress();
+		$line->fetch($obj->id);   // id of line
+		$prev_progress = 0;
 		if ($obj->type==Facture::TYPE_SITUATION) {
 			// Avoid divide by 0
 			if ($obj->situation_percent == 0) { 
 				$situation_ratio = 0;
 			} else {
-				$situation_ratio = ($obj->situation_percent - $prev_progress) / $obj->situation_percent;
+		        $prev_progress = $line->get_prev_progress($obj->rowid);   // id on invoice
+			    $situation_ratio = ($obj->situation_percent - $prev_progress) / $obj->situation_percent;
 			}
 		} else {
 			$situation_ratio = 1;
diff --git a/htdocs/compta/localtax/card.php b/htdocs/compta/localtax/card.php
index aded1c6aa1f..566a2ff53cc 100644
--- a/htdocs/compta/localtax/card.php
+++ b/htdocs/compta/localtax/card.php
@@ -77,7 +77,7 @@ if ($_POST["action"] == 'add' && $_POST["cancel"] <> $langs->trans("Cancel"))
     else
     {
         $db->rollback();
-        $mesg='<div class="error">'.$localtax->error.'</div>';
+        setEventMessages($localtax->error, $localtax->errors, 'errors');
         $_GET["action"]="create";
     }
 }
@@ -112,18 +112,19 @@ if ($_GET["action"] == 'delete')
 			{
 				$localtax->error=$accountline->error;
 				$db->rollback();
-				$mesg='<div class="error">'.$localtax->error.'</div>';
+				setEventMessages($localtax->error, $localtax->errors, 'errors');
 			}
 	    }
 	    else
 	    {
 	        $db->rollback();
-	        $mesg='<div class="error">'.$localtax->error.'</div>';
+	        setEventMessages($localtax->error, $localtax->errors, 'errors');
 	    }
 	}
 	else
 	{
-        $mesg='<div class="error">Error try do delete a line linked to a conciliated bank transaction</div>';
+        $mesg='Error try do delete a line linked to a conciliated bank transaction';
+        setEventMessages($mesg, null, 'errors');
 	}
 }
 
diff --git a/htdocs/compta/prelevement/create.php b/htdocs/compta/prelevement/create.php
index 7fd5cb10483..c2607d5b83d 100644
--- a/htdocs/compta/prelevement/create.php
+++ b/htdocs/compta/prelevement/create.php
@@ -65,11 +65,13 @@ if ($action == 'create')
     $result=$bprev->create($conf->global->PRELEVEMENT_CODE_BANQUE, $conf->global->PRELEVEMENT_CODE_GUICHET);
     if ($result < 0)
     {
-        $mesg='<div class="error">'.$bprev->error.'</div>';
+    	setEventMessages($bprev->error, $bprev->errors, 'errors');
     }
     if ($result == 0)
     {
-        $mesg='<div class="error">'.$langs->trans("NoInvoiceCouldBeWithdrawed").'</div>';
+    	$mesg='';
+        $mesg=$langs->trans("NoInvoiceCouldBeWithdrawed");
+        setEventMessages($mesg, null, 'errors');
         foreach($bprev->invoice_in_error as $key => $val)
         {
         	$mesg.=$val."<br>\n";
diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index 9e8b1de5d07..395e484075d 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -2147,7 +2147,7 @@ class Contrat extends CommonObject
 			$line->total_ht=90;
 			$line->total_ttc=107.64;	// 90 * 1.196
 			$line->total_tva=17.64;
-			$prodid = rand(1, $num_prods);
+			$prodid = mt_rand(1, $num_prods);
 			$line->fk_product=$prodids[$prodid];
 			$this->lines[$xnbp]=$line;
 			$xnbp++;
diff --git a/htdocs/core/class/CMailFile.class.php b/htdocs/core/class/CMailFile.class.php
index 39d28b55311..5fb15ef1ec1 100644
--- a/htdocs/core/class/CMailFile.class.php
+++ b/htdocs/core/class/CMailFile.class.php
@@ -103,8 +103,9 @@ class CMailFile
 	 *	@param 	string	$errors_to      	 Email for errors-to
 	 *	@param	string	$css                 Css option
 	 *	@param	string	$trackid             Tracking string
+	 *  @param  string  $moreinheader        More in header (for phpmail only for the moment)
 	 */
-	function __construct($subject,$to,$from,$msg,$filename_list=array(),$mimetype_list=array(),$mimefilename_list=array(),$addr_cc="",$addr_bcc="",$deliveryreceipt=0,$msgishtml=0,$errors_to='',$css='',$trackid='')
+	function __construct($subject,$to,$from,$msg,$filename_list=array(),$mimetype_list=array(),$mimefilename_list=array(),$addr_cc="",$addr_bcc="",$deliveryreceipt=0,$msgishtml=0,$errors_to='',$css='',$trackid='',$moreinheader='')
 	{
 		global $conf;
 
@@ -199,7 +200,8 @@ class CMailFile
 			$this->deliveryreceipt = $deliveryreceipt;
 			$this->trackid = $trackid;
 			$smtp_headers = $this->write_smtpheaders();
-
+            if (! empty($moreinheader)) $smtp_headers.=$moreinheader;
+            
 			// Define mime_headers
 			$mime_headers = $this->write_mimeheaders($filename_list, $mimefilename_list);
 
@@ -259,7 +261,7 @@ class CMailFile
 			$smtps->setFrom($this->getValidAddress($from,0,1));
 			$smtps->setTrackId($trackid);
 			$smtps->setReplyTo($this->getValidAddress($from,0,1));   // Set property with this->smtps->setReplyTo after constructor if you want to use another value than the From
-			
+					
 			if (! empty($this->html))
 			{
 				if (!empty($css))
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index be3452f10dc..c5c2f334171 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -4326,8 +4326,8 @@ class Form
             $syear = '';
             $smonth = '';
             $sday = '';
-            $shour = '';
-            $smin = '';
+            $shour = !isset($conf->global->MAIN_DEFAULT_DATE_HOUR) ? '' : $conf->global->MAIN_DEFAULT_DATE_HOUR;
+            $smin = !isset($conf->global->MAIN_DEFAULT_DATE_MIN) ? '' : $conf->global->MAIN_DEFAULT_DATE_MIN;
         }
 
         $usecalendar='combo';
diff --git a/htdocs/core/class/html.formbank.class.php b/htdocs/core/class/html.formbank.class.php
index ad74b465f27..450441cf54c 100644
--- a/htdocs/core/class/html.formbank.class.php
+++ b/htdocs/core/class/html.formbank.class.php
@@ -49,32 +49,11 @@ class FormBank
      *  @param  string	$htmlname        Nom champ formulaire
      *  @return	void
      */
-    function select_type_comptes_financiers($selected=1,$htmlname='type')
+    public function selectTypeOfBankAccount($selected = Account::TYPE_CURRENT, $htmlname = 'type')
     {
-        global $langs;
-        $langs->load("banks");
+        $account = new Account($this->db);
 
-        $type_available=array(0,1,2);
-
-        print '<select id="select'.$htmlname.'" class="flat" name="'.$htmlname.'">';
-        $num = count($type_available);
-        $i = 0;
-        if ($num)
-        {
-            while ($i < $num)
-            {
-                if ($selected == $type_available[$i])
-                {
-                    print '<option value="'.$type_available[$i].'" selected>'.$langs->trans("BankType".$type_available[$i]).'</option>';
-                }
-                else
-                {
-                    print '<option value="'.$type_available[$i].'">'.$langs->trans("BankType".$type_available[$i]).'</option>';
-                }
-                $i++;
-            }
-        }
-        print '</select>';
+        print Form::selectarray($htmlname, $account->type_lib, $selected);
     }
 
 }
diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index 1226d3b35ba..339ba9c6b5e 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -109,7 +109,10 @@ class FormFile
 
             $max=$conf->global->MAIN_UPLOAD_DOC;		// En Kb
             $maxphp=@ini_get('upload_max_filesize');	// En inconnu
+            if (preg_match('/k$/i',$maxphp)) $maxphp=$maxphp*1;
             if (preg_match('/m$/i',$maxphp)) $maxphp=$maxphp*1024;
+            if (preg_match('/g$/i',$maxphp)) $maxphp=$maxphp*1024*1024;
+            if (preg_match('/t$/i',$maxphp)) $maxphp=$maxphp*1024*1024*1024;
             // Now $max and $maxphp are in Kb
             if ($maxphp > 0) $max=min($max,$maxphp);
 
@@ -796,6 +799,7 @@ class FormFile
 			// Show list of existing files
 			if (empty($useinecm)) print load_fiche_titre($title?$title:$langs->trans("AttachedFiles"));
 			if (empty($url)) $url=$_SERVER["PHP_SELF"];
+			print '<!-- html.formfile::list_of_documents -->'."\n";
 			print '<table width="100%" class="'.($useinecm?'nobordernopadding':'liste').'">';
 			print '<tr class="liste_titre">';
 			print_liste_field_titre($langs->trans("Documents2"),$url,"name","",$param,'align="left"',$sortfield,$sortorder);
@@ -829,10 +833,9 @@ class FormFile
 	                {
 	                    $relativepath=preg_replace('/^.*\/produit\//','',$file['path']).'/';
 	                }
-					
 					$var=!$var;
 					print '<tr '.$bc[$var].'>';
-					print '<td>';
+					print '<td class="tdoverflow">';
 					//print "XX".$file['name'];	//$file['name'] must be utf8
 					print '<a data-ajax="false" href="'.DOL_URL_ROOT.'/document.php?modulepart='.$modulepart;
 					if ($forcedownload) print '&attachment=1';
@@ -849,11 +852,12 @@ class FormFile
 
 					print img_mime($file['name'],$file['name'].' ('.dol_print_size($file['size'],0,0).')').' ';
 					if ($showrelpart == 1) print $relativepath;
-					print dol_trunc($file['name'],$maxlength,'middle');
+					//print dol_trunc($file['name'],$maxlength,'middle');
+					print $file['name'];
 					print '</a>';
 					print "</td>\n";
-					print '<td align="right">'.dol_print_size($file['size'],1,1).'</td>';
-					print '<td align="center">'.dol_print_date($file['date'],"dayhour","tzuser").'</td>';
+					print '<td align="right" width="80px">'.dol_print_size($file['size'],1,1).'</td>';
+					print '<td align="center" width="130px">'.dol_print_date($file['date'],"dayhour","tzuser").'</td>';
 					// Preview
 					if (empty($useinecm))
 					{
@@ -871,7 +875,7 @@ class FormFile
 					}
 					// Delete or view link
 					// ($param must start with &)
-					print '<td align="right">';
+					print '<td class="valignmiddle right" width="50px">';
 					if ($useinecm)     print '<a href="'.DOL_URL_ROOT.'/ecm/docfile.php?urlfile='.urlencode($file['name']).$param.'" class="editfilelink" rel="'.urlencode($file['name']).'">'.img_view().'</a> &nbsp; ';
 					else
 					{
diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index 8e7064d1893..9d540a37bb6 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -657,9 +657,10 @@ class FormMail extends Form
 
         			$langs->load('paypal');
 
+        			// Set the paypal message and url link into __PERSONALIZED__ key
         			if ($this->param["models"]=='order_send')
         			{
-        				$url=getPaypalPaymentUrl(0,'order',$this->substit['__ORDERREF__']);
+        				$url=getPaypalPaymentUrl(0,'order',$this->substit['__ORDERREF__']?$this->substit['__ORDERREF__']:$this->substit['__REF__']);
         				$this->substit['__PERSONALIZED__']=str_replace('\n',"\n",$langs->transnoentitiesnoconv("PredefinedMailContentLink",$url));
         			}
         			if ($this->param["models"]=='facture_send')
@@ -908,8 +909,94 @@ class FormMail extends Form
 			return -1;
 		}
 	}
+	
+	
+	
+	/**
+	 * Set substit array from object
+	 * 
+	 * @param	Object	$object		Object to use
+	 * @return	void
+	 */
+	function setSubstitFromObject($object)
+	{
+		$this->substit['__REF__'] = $object->ref;
+		$this->substit['__SIGNATURE__'] = $user->signature;
+		$this->substit['__REFCLIENT__'] = $object->ref_client;
+		$this->substit['__THIRDPARTY_NAME__'] = $object->thirdparty->name;
+		$this->substit['__PROJECT_REF__'] = (is_object($object->projet)?$object->projet->ref:'');
+		$this->substit['__PROJECT_NAME__'] = (is_object($object->projet)?$object->projet->title:'');
+		$this->substit['__PERSONALIZED__'] = '';
+		$this->substit['__CONTACTCIVNAME__'] = '';	// Will be replace just before sending
+	}
+	
+	/**
+	 * Set substit array from object
+	 * 
+	 * @param	string	$mode		'form' or 'emailing'
+	 * @return	void
+	 */
+	function getAvailableSubstitKey($mode='form')
+	{
+		global $conf;
+		
+		$vars=array();
+		
+		if ($mode == 'form')
+		{
+			$vars=array(
+				'__REF__', 
+				'__REFCLIENT__', 
+				'__THIRDPARTY_NAME__', 
+				'__PROJECT_REF__', 
+				'__PROJECT_NAME__',
+				'__CONTACTCIVNAME__',
+				'__PERSONALIZED__',			// Paypal link will be added here in form mode
+				'__SIGNATURE__', 
+			);
+		}
+		if ($mode == 'emailing')
+		{
+			// For mass emailing, we have different keys
+			$vars=array(
+			    '__ID__' => 'IdRecord',
+			    '__EMAIL__' => 'EMail',
+			    '__LASTNAME__' => 'Lastname',
+			    '__FIRSTNAME__' => 'Firstname',
+			    '__MAILTOEMAIL__' => 'TagMailtoEmail',
+			    '__OTHER1__' => 'Other1',
+			    '__OTHER2__' => 'Other2',
+			    '__OTHER3__' => 'Other3',
+			    '__OTHER4__' => 'Other4',
+			    '__OTHER5__' => 'Other5',
+			    '__SIGNATURE__' => 'TagSignature',
+			    '__CHECK_READ__' => 'TagCheckMail',
+				'__UNSUBSCRIBE__' => 'TagUnsubscribe'
+				//,'__PERSONALIZED__' => 'Personalized'	// Hidden because not used yet in mass emailing
+			);
+			if (! empty($conf->paypal->enabled) && ! empty($conf->global->PAYPAL_SECURITY_TOKEN))
+			{
+				$vars['__SECUREKEYPAYPAL__']='SecureKeyPaypal';
+				if (! empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE))
+				{
+					if ($conf->adherent->enabled) $vars['__SECUREKEYPAYPAL_MEMBER__']='SecureKeyPaypalUniquePerMember';
+					if ($conf->facture->enabled) $vars['__SECUREKEYPAYPAL_INVOICE__']='SecureKeyPaypalUniquePerInvoice';
+					if ($conf->commande->enabled) $vars['__SECUREKEYPAYPAL_ORDER__']='SecureKeyPaypalUniquePerOrder';
+					if ($conf->contrat->enabled) $vars['__SECUREKEYPAYPAL_CONTRACTLINE__']='SecureKeyPaypalUniquePerContractLine';
+				}
+			}
+			else 
+			{
+				$vars['__SECUREKEYPAYPAL__']='';
+				$vars['__SECUREKEYPAYPAL_MEMBER__']='';
+			}
+		}
+		return $vars;
+	}
+
 }
 
+
 /**
  * ModelMail
  */
diff --git a/htdocs/core/class/html.formsupplier_proposal.class.php b/htdocs/core/class/html.formsupplier_proposal.class.php
index d317778e1a0..ed8781731a0 100644
--- a/htdocs/core/class/html.formsupplier_proposal.class.php
+++ b/htdocs/core/class/html.formsupplier_proposal.class.php
@@ -84,7 +84,7 @@ class FormSupplierProposal
                     }
                     else
                     {
-                        $conv_to_new_code=array('PR_DRAFT'=>'Draft','PR_OPEN'=>'Opened','PR_CLOSED'=>'Closed','PR_SIGNED'=>'Signed','PR_NOTSIGNED'=>'NotSigned','PR_FAC'=>'Billed');
+                        $conv_to_new_code=array('PR_DRAFT'=>'Draft','PR_OPEN'=>'Opened','PR_CLOSED'=>'Closed','PR_SIGNED'=>'Signed','PR_NOTSIGNED'=>'NotSigned','PR_FAC'=>'Closed');
                         if (! empty($conv_to_new_code[$obj->code])) $key=$conv_to_new_code[$obj->code];
                         print ($langs->trans("PropalStatus".$key.($short?'Short':''))!="PropalStatus".$key.($short?'Short':''))?$langs->trans("PropalStatus".$key.($short?'Short':'')):$obj->label;
                     }
diff --git a/htdocs/core/lib/admin.lib.php b/htdocs/core/lib/admin.lib.php
index 2661919722d..5c6b9613c17 100644
--- a/htdocs/core/lib/admin.lib.php
+++ b/htdocs/core/lib/admin.lib.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2008-2011  Laurent Destailleur     <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2012  Regis Houssin           <regis.houssin@capnetworks.com>
+ * Copyright (C) 2005-2016  Regis Houssin           <regis.houssin@capnetworks.com>
  * Copyright (C) 2012       J. Fernando Lagrange    <fernando@demo-tic.org>
  * Copyright (C) 2015       Raphaël Doursenaud      <rdoursenaud@gpcsolutions.fr>
  *
@@ -62,12 +62,16 @@ function versioncompare($versionarray1,$versionarray2)
     {
         $operande1=isset($versionarray1[$level])?$versionarray1[$level]:0;
         $operande2=isset($versionarray2[$level])?$versionarray2[$level]:0;
-        if (preg_match('/alpha|dev/i',$operande1)) $operande1=-3;
-        if (preg_match('/alpha|dev/i',$operande2)) $operande2=-3;
-        if (preg_match('/beta/i',$operande1)) $operande1=-2;
-        if (preg_match('/beta/i',$operande2)) $operande2=-2;
-        if (preg_match('/rc/i',$operande1)) $operande1=-1;
-        if (preg_match('/rc/i',$operande2)) $operande2=-1;
+        if (preg_match('/alpha|dev/i',$operande1)) $operande1=-5;
+        if (preg_match('/alpha|dev/i',$operande2)) $operande2=-5;
+        if (preg_match('/beta$/i',$operande1)) $operande1=-4;
+        if (preg_match('/beta$/i',$operande2)) $operande2=-4;
+        if (preg_match('/beta([0-9])+/i',$operande1)) $operande1=-3;
+        if (preg_match('/beta([0-9])+/i',$operande2)) $operande2=-3;
+        if (preg_match('/rc$/i',$operande1)) $operande1=-2;
+        if (preg_match('/rc$/i',$operande2)) $operande2=-2;
+        if (preg_match('/rc([0-9])+/i',$operande1)) $operande1=-1;
+        if (preg_match('/rc([0-9])+/i',$operande2)) $operande2=-1;
         $level++;
         //print 'level '.$level.' '.$operande1.'-'.$operande2.'<br>';
         if ($operande1 < $operande2) { $ret = -$level; break; }
@@ -591,7 +595,7 @@ function listOfSessions()
                     $sessValues = file_get_contents($fullpath);	// get raw session data
                     // Example of possible value
                     //$sessValues = 'newtoken|s:32:"1239f7a0c4b899200fe9ca5ea394f307";dol_loginmesg|s:0:"";newtoken|s:32:"1236457104f7ae0f328c2928973f3cb5";dol_loginmesg|s:0:"";token|s:32:"123615ad8d650c5cc4199b9a1a76783f";dol_login|s:5:"admin";dol_authmode|s:8:"dolibarr";dol_tz|s:1:"1";dol_tz_string|s:13:"Europe/Berlin";dol_dst|i:0;dol_dst_observed|s:1:"1";dol_dst_first|s:0:"";dol_dst_second|s:0:"";dol_screenwidth|s:4:"1920";dol_screenheight|s:3:"971";dol_company|s:12:"MyBigCompany";dol_entity|i:1;mainmenu|s:4:"home";leftmenuopened|s:10:"admintools";idmenu|s:0:"";leftmenu|s:10:"admintools";';
-                    
+
                     if (preg_match('/dol_login/i',$sessValues) && // limit to dolibarr session
                         (preg_match('/dol_entity\|i:'.$conf->entity.';/i',$sessValues) || preg_match('/dol_entity\|s:([0-9]+):"'.$conf->entity.'"/i',$sessValues)) && // limit to current entity
                     preg_match('/dol_company\|s:([0-9]+):"('.$conf->global->MAIN_INFO_SOCIETE_NOM.')"/i',$sessValues)) // limit to company name
diff --git a/htdocs/core/lib/bank.lib.php b/htdocs/core/lib/bank.lib.php
index 3c5d57fdaf6..ceb8a87bb30 100644
--- a/htdocs/core/lib/bank.lib.php
+++ b/htdocs/core/lib/bank.lib.php
@@ -64,7 +64,7 @@ function bank_prepare_head(Account $object)
     $head[$h][2] = 'graph';
     $h++;
 
-    if ($object->courant != 2)
+    if ($object->courant != Account::TYPE_CASH)
     {
     	$head[$h][0] = DOL_URL_ROOT."/compta/bank/releve.php?account=".$object->id;
 	    $head[$h][1] = $langs->trans("AccountStatements");
diff --git a/htdocs/core/lib/contract.lib.php b/htdocs/core/lib/contract.lib.php
index dea00188689..2d328ea7097 100644
--- a/htdocs/core/lib/contract.lib.php
+++ b/htdocs/core/lib/contract.lib.php
@@ -42,8 +42,10 @@ function contract_prepare_head(Contrat $object)
 
 	if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
 	{
-		$head[$h][0] = DOL_URL_ROOT.'/contrat/contact.php?id='.$object->id;
+	    $nbContact = count($object->liste_contact(-1,'internal')) + count($object->liste_contact(-1,'external'));
+	    $head[$h][0] = DOL_URL_ROOT.'/contrat/contact.php?id='.$object->id;
 		$head[$h][1] = $langs->trans("ContactsAddresses");
+		if ($nbContact > 0) $head[$h][1].= ' <span class="badge">'.$nbContact.'</span>';
 		$head[$h][2] = 'contact';
 		$h++;
 	}
diff --git a/htdocs/core/lib/fichinter.lib.php b/htdocs/core/lib/fichinter.lib.php
index a6f68800dc4..162aca37c8a 100644
--- a/htdocs/core/lib/fichinter.lib.php
+++ b/htdocs/core/lib/fichinter.lib.php
@@ -45,8 +45,10 @@ function fichinter_prepare_head($object)
 
 	if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
 	{
-		$head[$h][0] = DOL_URL_ROOT.'/fichinter/contact.php?id='.$object->id;
+	    $nbContact = count($object->liste_contact(-1,'internal')) + count($object->liste_contact(-1,'external'));
+	    $head[$h][0] = DOL_URL_ROOT.'/fichinter/contact.php?id='.$object->id;
 		$head[$h][1] = $langs->trans('InterventionContact');
+		if ($nbContact > 0) $head[$h][1].= ' <span class="badge">'.$nbContact.'</span>';
 		$head[$h][2] = 'contact';
 		$h++;
 	}
diff --git a/htdocs/core/lib/fourn.lib.php b/htdocs/core/lib/fourn.lib.php
index 85b30064d0b..4b6f0b7e7d1 100644
--- a/htdocs/core/lib/fourn.lib.php
+++ b/htdocs/core/lib/fourn.lib.php
@@ -45,8 +45,10 @@ function facturefourn_prepare_head($object)
 
 	if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
 	{
-		$head[$h][0] = DOL_URL_ROOT.'/fourn/facture/contact.php?facid='.$object->id;
+	    $nbContact = count($object->liste_contact(-1,'internal')) + count($object->liste_contact(-1,'external'));
+	    $head[$h][0] = DOL_URL_ROOT.'/fourn/facture/contact.php?facid='.$object->id;
 		$head[$h][1] = $langs->trans('ContactsAddresses');
+		if ($nbContact > 0) $head[$h][1].= ' <span class="badge">'.$nbContact.'</span>';
 		$head[$h][2] = 'contact';
 		$h++;
 	}
@@ -119,8 +121,10 @@ function ordersupplier_prepare_head($object)
 
 	if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
 	{
-		$head[$h][0] = DOL_URL_ROOT.'/fourn/commande/contact.php?id='.$object->id;
+	    $nbContact = count($object->liste_contact(-1,'internal')) + count($object->liste_contact(-1,'external'));
+	    $head[$h][0] = DOL_URL_ROOT.'/fourn/commande/contact.php?id='.$object->id;
 		$head[$h][1] = $langs->trans('ContactsAddresses');
+		if ($nbContact > 0) $head[$h][1].= ' <span class="badge">'.$nbContact.'</span>';
 		$head[$h][2] = 'contact';
 		$h++;
 	}
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 3b5923536d7..ed39c6b45ef 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -630,14 +630,14 @@ function dol_syslog($message, $level = LOG_INFO, $ident = 0, $suffixinfilename='
 		if ($level > $conf->global->SYSLOG_LEVEL) return;
 
 		// If adding log inside HTML page is required
-		if (! empty($_REQUEST['logtohtml']) && ! empty($conf->global->MAIN_LOGTOHTML))
+		if (! empty($_REQUEST['logtohtml']) && (! empty($conf->global->MAIN_ENABLE_LOG_TO_HTML) || ! empty($conf->global->MAIN_LOGTOHTML)))   // MAIN_LOGTOHTML kept for backward compatibility
 		{
 			$conf->logbuffer[] = dol_print_date(time(),"%Y-%m-%d %H:%M:%S")." ".$message;
 		}
 
-		//TODO: Remove this. MAIN_ENABLE_LOG_HTML should be deprecated and use a log handler dedicated to HTML output
+		//TODO: Remove this. MAIN_ENABLE_LOG_INLINE_HTML should be deprecated and use a log handler dedicated to HTML output
 		// If enable html log tag enabled and url parameter log defined, we show output log on HTML comments
-		if (! empty($conf->global->MAIN_ENABLE_LOG_HTML) && ! empty($_GET["log"]))
+		if (! empty($conf->global->MAIN_ENABLE_LOG_INLINE_HTML) && ! empty($_GET["log"]))
 		{
 			print "\n\n<!-- Log start\n";
 			print $message."\n";
@@ -3418,9 +3418,10 @@ function price2num($amount,$rounding='',$alreadysqlnb=0)
  * @param   int         $unit           Unit of dimension (0, -3, ...)
  * @param   string      $type           'weight', 'volume', ...
  * @param   Translate   $outputlangs    Translate language object
+ * @param   int         $round          -1 = non rounding, x = number of decimal
  * @return  string                      String to show dimensions
  */
-function showDimensionInBestUnit($dimension, $unit, $type, $outputlangs)
+function showDimensionInBestUnit($dimension, $unit, $type, $outputlangs, $round=-1)
 {
     require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
     
@@ -3445,7 +3446,7 @@ function showDimensionInBestUnit($dimension, $unit, $type, $outputlangs)
         $unit = $unit + 3;
     }
     
-    $ret=price($dimension, 0, $outputlangs, 0, 0).' '.measuring_units_string($unit, $type);
+    $ret=price($dimension, 0, $outputlangs, 0, 0, $round).' '.measuring_units_string($unit, $type);
     
     return $ret;
 }
@@ -5395,7 +5396,7 @@ function dol_set_focus($selector)
 function dol_getmypid()
 {
     if (! function_exists('getmypid')) {
-        return rand(1,32768);
+        return mt_rand(1,32768);
     } else {
         return getmypid();
     }
diff --git a/htdocs/core/lib/invoice.lib.php b/htdocs/core/lib/invoice.lib.php
index c2b465bfa2d..f947caf5609 100644
--- a/htdocs/core/lib/invoice.lib.php
+++ b/htdocs/core/lib/invoice.lib.php
@@ -45,8 +45,10 @@ function facture_prepare_head($object)
 
 	if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
 	{
-		$head[$h][0] = DOL_URL_ROOT.'/compta/facture/contact.php?facid='.$object->id;
+	    $nbContact = count($object->liste_contact(-1,'internal')) + count($object->liste_contact(-1,'external'));
+	    $head[$h][0] = DOL_URL_ROOT.'/compta/facture/contact.php?facid='.$object->id;
 		$head[$h][1] = $langs->trans('ContactsAddresses');
+		if ($nbContact > 0) $head[$h][1].= ' <span class="badge">'.$nbContact.'</span>';
 		$head[$h][2] = 'contact';
 		$h++;
 	}
@@ -62,8 +64,20 @@ function facture_prepare_head($object)
 	//if ($fac->mode_reglement_code == 'PRE')
 	if (! empty($conf->prelevement->enabled))
 	{
+	    $nbStandingOrders=0;
+	    $sql = "SELECT COUNT(pfd.rowid) as nb";
+	    $sql .= " FROM ".MAIN_DB_PREFIX."prelevement_facture_demande as pfd";
+	    $sql .= " WHERE pfd.fk_facture = ".$object->id;
+        $resql=$db->query($sql);
+        if ($resql) 
+        {
+            $obj=$db->fetch_object($resql);
+            if ($obj) $nbStandingOrders = $obj->nb;
+        }
+        else dol_print_error($db);
 		$head[$h][0] = DOL_URL_ROOT.'/compta/facture/prelevement.php?facid='.$object->id;
 		$head[$h][1] = $langs->trans('StandingOrders');
+		if ($nbStandingOrders > 0) $head[$h][1].= ' <span class="badge">'.$nbStandingOrders.'</span>';
 		$head[$h][2] = 'standingorders';
 		$h++;
 	}
diff --git a/htdocs/core/lib/order.lib.php b/htdocs/core/lib/order.lib.php
index 9539cb7cd64..1458f37fdce 100644
--- a/htdocs/core/lib/order.lib.php
+++ b/htdocs/core/lib/order.lib.php
@@ -70,8 +70,10 @@ function commande_prepare_head(Commande $object)
 
 	if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
 	{
-		$head[$h][0] = DOL_URL_ROOT.'/commande/contact.php?id='.$object->id;
+	    $nbContact = count($object->liste_contact(-1,'internal')) + count($object->liste_contact(-1,'external'));
+	    $head[$h][0] = DOL_URL_ROOT.'/commande/contact.php?id='.$object->id;
 		$head[$h][1] = $langs->trans('ContactsAddresses');
+		if ($nbContact > 0) $head[$h][1].= ' <span class="badge">'.$nbContact.'</span>';
 		$head[$h][2] = 'contact';
 		$h++;
 	}
diff --git a/htdocs/core/lib/propal.lib.php b/htdocs/core/lib/propal.lib.php
index 7674f0780dd..0beff079bce 100644
--- a/htdocs/core/lib/propal.lib.php
+++ b/htdocs/core/lib/propal.lib.php
@@ -64,8 +64,10 @@ function propal_prepare_head($object)
 
 	if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
 	{
+	    $nbContact = count($object->liste_contact(-1,'internal')) + count($object->liste_contact(-1,'external'));
 		$head[$h][0] = DOL_URL_ROOT.'/comm/propal/contact.php?id='.$object->id;
 		$head[$h][1] = $langs->trans('ContactsAddresses');
+		if ($nbContact > 0) $head[$h][1].= ' <span class="badge">'.$nbContact.'</span>';
 		$head[$h][2] = 'contact';
 		$h++;
 	}
diff --git a/htdocs/core/menus/init_menu_auguria.sql b/htdocs/core/menus/init_menu_auguria.sql
index b578168cd24..0c154e031d8 100644
--- a/htdocs/core/menus/init_menu_auguria.sql
+++ b/htdocs/core/menus/init_menu_auguria.sql
@@ -184,7 +184,6 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left
 
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->facture->enabled', __HANDLER__, 'left', 1704__+MAX_llx_menu__, 'accountancy', '', 1700__+MAX_llx_menu__, '/compta/paiement/list.php?leftmenu=customers_bills', 'Payments', 1, 'bills', '$user->rights->facture->lire', '', 2, 6, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->facture->enabled', __HANDLER__, 'left', 1710__+MAX_llx_menu__, 'accountancy', '', 1704__+MAX_llx_menu__, '/compta/paiement/rapport.php?leftmenu=customers_bills', 'Reportings', 2, 'bills', '$user->rights->facture->lire', '', 2, 1, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->facture->enabled', __HANDLER__, 'left', 1703__+MAX_llx_menu__, 'accountancy', '', 1700__+MAX_llx_menu__, '/compta/facture/mergepdftool.php?action=facturer&amp;leftmenu=customers_bills', 'MergingPDFTool', 1, 'bills', '$user->rights->facture->lire', '', 2, 7, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->facture->enabled', __HANDLER__, 'left', 1714__+MAX_llx_menu__, 'accountancy', '', 1700__+MAX_llx_menu__, '/compta/facture/stats/index.php?leftmenu=customers_bills', 'Statistics', 1, 'bills', '$user->rights->facture->lire', '', 2, 8, __ENTITY__);
 -- Accountancy - Orders to bill
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->commande->enabled', __HANDLER__, 'left', 1900__+MAX_llx_menu__, 'accountancy', 'orders', 6__+MAX_llx_menu__, '/commande/list.php?leftmenu=orders&amp;viewstatut=3', 'MenuOrdersToBill', 0, 'orders', '$user->rights->commande->lire', '', 0, 3, __ENTITY__);
diff --git a/htdocs/core/menus/standard/auguria.lib.php b/htdocs/core/menus/standard/auguria.lib.php
index a24a2d32baa..cbd4b035c4e 100644
--- a/htdocs/core/menus/standard/auguria.lib.php
+++ b/htdocs/core/menus/standard/auguria.lib.php
@@ -281,7 +281,7 @@ function print_left_auguria_menu($db,$menu_array_before,$menu_array_after,&$tabM
 			{
 				$objp = $db->fetch_object($resql);
 				$newmenu->add('/compta/bank/card.php?id='.$objp->rowid,$objp->label,1,$user->rights->banque->lire);
-				if ($objp->rappro && $objp->courant != 2 && empty($objp->clos))  // If not cash account and not closed and can be reconciliate
+				if ($objp->rappro && $objp->courant != Account::TYPE_CASH && empty($objp->clos))  // If not cash account and not closed and can be reconciliate
 				{
 					$newmenu->add('/compta/bank/rappro.php?account='.$objp->rowid,$langs->trans("Conciliate"),2,$user->rights->banque->consolidate);
 				}
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index a849d9ac40a..c12209f2f14 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -802,8 +802,6 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 				$newmenu->add("/compta/paiement/rapport.php",$langs->trans("Reportings"),2,$user->rights->facture->lire);
 
 				$newmenu->add("/compta/facture/stats/index.php", $langs->trans("Statistics"),1,$user->rights->facture->lire);
-
-				$newmenu->add("/compta/facture/mergepdftool.php",$langs->trans("MergingPDFTool"),1,$user->rights->facture->lire);
 			}
 
 			// Suppliers invoices
@@ -1342,7 +1340,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 				{
 					$objp = $db->fetch_object($resql);
 					$newmenu->add('/compta/bank/card.php?id='.$objp->rowid,$objp->label,1,$user->rights->banque->lire);
-					if ($objp->rappro && $objp->courant != 2 && empty($objp->clos))  // If not cash account and not closed and can be reconciliate
+					if ($objp->rappro && $objp->courant != Account::TYPE_CASH && empty($objp->clos))  // If not cash account and not closed and can be reconciliate
 					{
 						$newmenu->add('/compta/bank/rappro.php?account='.$objp->rowid,$langs->trans("Conciliate"),2,$user->rights->banque->consolidate);
 					}
diff --git a/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php b/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
index 305b7e18161..b6d4df5657f 100644
--- a/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
+++ b/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
@@ -240,7 +240,9 @@ class doc_generic_order_odt extends ModelePDFCommandes
 				$newfileformat=substr($newfile, strrpos($newfile, '.')+1);
 				if ( ! empty($conf->global->MAIN_DOC_USE_TIMING))
 				{
-					$filename=$newfiletmp.'.'.dol_print_date(dol_now(),'%Y%m%d%H%M%S').'.'.$newfileformat;
+				    $format=$conf->global->MAIN_DOC_USE_TIMING;
+				    if ($format == '1') $format='%Y%m%d%H%M%S';
+					$filename=$newfiletmp.'-'.dol_print_date(dol_now(),$format).'.'.$newfileformat;
 				}
 				else
 				{
diff --git a/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php b/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
index 01d341ba39d..a2ddb144e6d 100644
--- a/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
+++ b/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
@@ -241,7 +241,9 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 				$newfileformat=substr($newfile, strrpos($newfile, '.')+1);
 				if ( ! empty($conf->global->MAIN_DOC_USE_TIMING))
 				{
-					$filename=$newfiletmp.'.'.dol_print_date(dol_now(),'%Y%m%d%H%M%S').'.'.$newfileformat;
+				    $format=$conf->global->MAIN_DOC_USE_TIMING;
+				    if ($format == '1') $format='%Y%m%d%H%M%S';
+					$filename=$newfiletmp.'-'.dol_print_date(dol_now(),$format).'.'.$newfileformat;
 				}
 				else
 				{
diff --git a/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php b/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
index 062812fb811..58da00607b8 100644
--- a/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
+++ b/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
@@ -451,7 +451,7 @@ class pdf_rouget extends ModelePdfExpedition
 					$voltxt='';
 					if ($object->lines[$i]->fk_product_type == 0 && $object->lines[$i]->volume) 
 					{
-					    $voltxt=$object->lines[$i]->volume*$object->lines[$i]->qty_shipped.' '.measuring_units_string($object->lines[$i]->volume_units,"volume");
+					    $voltxt=$object->lines[$i]->volume*$object->lines[$i]->qty_shipped.' '.measuring_units_string($object->lines[$i]->volume_units?$object->lines[$i]->volume_units:0,"volume");
 					}
 					
 					$pdf->MultiCell(($this->posxqtyordered - $this->posxweightvol), 3, $weighttxt.(($weighttxt && $voltxt)?', ':'').$voltxt,'','C');
diff --git a/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php b/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
index f316fae00c7..6065de505c6 100644
--- a/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
+++ b/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
@@ -241,7 +241,9 @@ class doc_generic_invoice_odt extends ModelePDFFactures
 				$newfileformat=substr($newfile, strrpos($newfile, '.')+1);
 				if ( ! empty($conf->global->MAIN_DOC_USE_TIMING))
 				{
-					$filename=$newfiletmp.'.'.dol_print_date(dol_now(),'%Y%m%d%H%M%S').'.'.$newfileformat;
+				    $format=$conf->global->MAIN_DOC_USE_TIMING;
+				    if ($format == '1') $format='%Y%m%d%H%M%S';
+					$filename=$newfiletmp.'-'.dol_print_date(dol_now(),$format).'.'.$newfileformat;
 				}
 				else
 				{
diff --git a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
index 0c535ef0b22..25ce63a087f 100644
--- a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
@@ -166,7 +166,7 @@ class pdf_crabe extends ModelePDFFactures
 	function write_file($object,$outputlangs,$srctemplatepath='',$hidedetails=0,$hidedesc=0,$hideref=0)
 	{
 		global $user,$langs,$conf,$mysoc,$db,$hookmanager;
-
+		
 		if (! is_object($outputlangs)) $outputlangs=$langs;
 		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
 		if (! empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output='ISO-8859-1';
@@ -539,7 +539,7 @@ class pdf_crabe extends ModelePDFFactures
 					$pdf->MultiCell($this->page_largeur-$this->marge_droite-$this->postotalht, 3, $total_excl_tax, 0, 'R', 0);
 
 					// Collecte des totaux par valeur de tva dans $this->tva["taux"]=total_tva
-					$prev_progress = $object->lines[$i]->get_prev_progress();
+					$prev_progress = $object->lines[$i]->get_prev_progress($object->id);
 					if ($prev_progress > 0) // Compute progress from previous situation
 					{
 						if ($conf->multicurrency->enabled && $object->multicurrency_tx != 1) $tvaligne = $object->lines[$i]->multicurrency_total_tva * ($object->lines[$i]->situation_percent - $prev_progress) / $object->lines[$i]->situation_percent;
@@ -548,6 +548,7 @@ class pdf_crabe extends ModelePDFFactures
 						if ($conf->multicurrency->enabled && $object->multicurrency_tx != 1) $tvaligne=$object->lines[$i]->multicurrency_total_tva;
 						else $tvaligne=$object->lines[$i]->total_tva;
 					}
+					
 					$localtax1ligne=$object->lines[$i]->total_localtax1;
 					$localtax2ligne=$object->lines[$i]->total_localtax2;
 					$localtax1_rate=$object->lines[$i]->localtax1_tx;
@@ -1106,7 +1107,8 @@ class pdf_crabe extends ModelePDFFactures
 							}
 						}
 					}
-				//}
+
+                //}
 				// VAT
 				foreach($this->tva as $tvakey => $tvaval)
 				{
diff --git a/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php b/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
index 6061ec8f548..3ea28a1bd81 100644
--- a/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
+++ b/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
@@ -450,7 +450,9 @@ class doc_generic_project_odt extends ModelePDFProjects
 				$newfileformat=substr($newfile, strrpos($newfile, '.')+1);
 				if ( ! empty($conf->global->MAIN_DOC_USE_TIMING))
 				{
-					$filename=$newfiletmp.'.'.dol_print_date(dol_now(),'%Y%m%d%H%M%S').'.'.$newfileformat;
+				    $format=$conf->global->MAIN_DOC_USE_TIMING;
+				    if ($format == '1') $format='%Y%m%d%H%M%S';
+					$filename=$newfiletmp.'-'.dol_print_date(dol_now(),$format).'.'.$newfileformat;
 				}
 				else
 				{
diff --git a/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php b/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
index 93246f9e7f6..f651c56e028 100644
--- a/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
+++ b/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
@@ -274,7 +274,9 @@ class doc_generic_proposal_odt extends ModelePDFPropales
 				$newfileformat=substr($newfile, strrpos($newfile, '.')+1);
 				if ( ! empty($conf->global->MAIN_DOC_USE_TIMING))
 				{
-					$filename=$newfiletmp.'.'.dol_print_date(dol_now(),'%Y%m%d%H%M%S').'.'.$newfileformat;
+				    $format=$conf->global->MAIN_DOC_USE_TIMING;
+				    if ($format == '1') $format='%Y%m%d%H%M%S';
+					$filename=$newfiletmp.'-'.dol_print_date(dol_now(),$format).'.'.$newfileformat;
 				}
 				else
 				{
diff --git a/htdocs/core/modules/propale/doc/pdf_azur.modules.php b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
index 20c1abff49c..d05b164a6ec 100644
--- a/htdocs/core/modules/propale/doc/pdf_azur.modules.php
+++ b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
@@ -686,21 +686,39 @@ class pdf_azur extends ModelePDFPropales
 							if (count($filetomerge->lines) > 0) {
 								foreach ( $filetomerge->lines as $linefile ) {
 									if (! empty($linefile->id) && ! empty($linefile->file_name)) {
-										if (! empty($conf->product->enabled))
-											$filetomerge_dir = $conf->product->multidir_output[$entity_product_file] . '/' . dol_sanitizeFileName($line->product_ref);
-										elseif (! empty($conf->service->enabled))
-											$filetomerge_dir = $conf->service->multidir_output[$entity_product_file] . '/' . dol_sanitizeFileName($line->product_ref);
+
+
+										if (! empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO))
+										{
+											if (! empty($conf->product->enabled)) {
+												$filetomerge_dir = $conf->product->multidir_output[$entity_product_file] . '/' . get_exdir($product->id,2,0,0,$product,'product') . $product->id ."/photos";
+											} elseif (! empty($conf->service->enabled)) {
+												$filetomerge_dir = $conf->service->multidir_output[$entity_product_file] . '/' . get_exdir($product->id,2,0,0,$product,'product') . $product->id ."/photos";
+											}
+										}
+										else
+										{
+											if (! empty($conf->product->enabled)) {
+												$filetomerge_dir = $conf->product->multidir_output[$entity_product_file] . '/' . get_exdir(0,0,0,0,$product,'product') . dol_sanitizeFileName($product->ref);
+											} elseif (! empty($conf->service->enabled)) {
+												$filetomerge_dir = $conf->service->multidir_output[$entity_product_file] . '/' . get_exdir(0,0,0,0,$product,'product') . dol_sanitizeFileName($product->ref);
+											}
+										}
 
 										dol_syslog(get_class($this) . ':: upload_dir=' . $filetomerge_dir, LOG_DEBUG);
 
 										$infile = $filetomerge_dir . '/' . $linefile->file_name;
-										if (is_file($infile)) {
+										if (file_exists($infile) && is_readable($infile)) {
 											$pagecount = $pdf->setSourceFile($infile);
 											for($i = 1; $i <= $pagecount; $i ++) {
-												$tplidx = $pdf->ImportPage($i);
-												$s = $pdf->getTemplatesize($tplidx);
-												$pdf->AddPage($s['h'] > $s['w'] ? 'P' : 'L');
-												$pdf->useTemplate($tplidx);
+												$tplIdx = $pdf->importPage(1);
+												if ($tplIdx!==false) {
+													$s = $pdf->getTemplatesize($tplIdx);
+													$pdf->AddPage($s['h'] > $s['w'] ? 'P' : 'L');
+													$pdf->useTemplate($tplIdx);
+												} else {
+													setEventMessages(null, array($infile.' cannot be added, probably protected PDF'),'warnings');
+												}
 											}
 										}
 									}
@@ -710,10 +728,6 @@ class pdf_azur extends ModelePDFPropales
 					}
 				}
 
-				//exit;
-
-
-
 				$pdf->Close();
 
 				$pdf->Output($file,'F');
diff --git a/htdocs/core/modules/security/generate/modGeneratePassPerso.class.php b/htdocs/core/modules/security/generate/modGeneratePassPerso.class.php
index 7440a357ea8..af08ae53392 100644
--- a/htdocs/core/modules/security/generate/modGeneratePassPerso.class.php
+++ b/htdocs/core/modules/security/generate/modGeneratePassPerso.class.php
@@ -134,19 +134,19 @@ class modGeneratePassPerso extends ModeleGenPassword
 	{
 		$pass = "";
 		for($i=0; $i<$this->NbMaj; $i++){ // Y
-			$pass .= $this->Maj[rand(0,strlen($this->Maj) - 1)];
+			$pass .= $this->Maj[mt_rand(0,strlen($this->Maj) - 1)];
 		}
 
 		for($i=0; $i<$this->NbNum; $i++){ // X
-			$pass .= $this->Nb[rand(0,strlen($this->Nb) - 1)];
+			$pass .= $this->Nb[mt_rand(0,strlen($this->Nb) - 1)];
 		}
 
 		for($i=0; $i<$this->NbSpe; $i++){ // @
-			$pass .= $this->Spe[rand(0,strlen($this->Spe) - 1)];
+			$pass .= $this->Spe[mt_rand(0,strlen($this->Spe) - 1)];
 		}
 
 		for($i=strlen($pass);$i<$this->length2; $i++){ // y
-			$pass .= $this->All[rand(0,strlen($this->All) -1)];
+			$pass .= $this->All[mt_rand(0,strlen($this->All) -1)];
 		}
 
 		$pass = str_shuffle($pass);
diff --git a/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php b/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
index cabc0b2b50c..3c66bd5f11d 100644
--- a/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
+++ b/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
@@ -209,9 +209,15 @@ class doc_generic_odt extends ModeleThirdPartyDoc
 				$newfiletmp=preg_replace('/modele_/i','',$newfiletmp);
 				// Get extension (ods or odt)
 				$newfileformat=substr($newfile, strrpos($newfile, '.')+1);
+				if ( ! empty($conf->global->MAIN_DOC_USE_OBJECT_THIRDPARTY_NAME))
+				{
+				    $newfiletmp = dol_sanitizeFileName(dol_string_nospecial($object->name)).'-'.$newfiletmp;
+				}
 				if ( ! empty($conf->global->MAIN_DOC_USE_TIMING))
 				{
-					$filename=$newfiletmp.'.'.dol_print_date(dol_now(),'%Y%m%d%H%M%S').'.'.$newfileformat;
+				    $format=$conf->global->MAIN_DOC_USE_TIMING;
+				    if ($format == '1') $format='%Y%m%d%H%M%S';
+					$filename=$newfiletmp.'-'.dol_print_date(dol_now(),$format).'.'.$newfileformat;
 				}
 				else
 				{
diff --git a/htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php b/htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php
index b5377be8e59..ab906617b07 100644
--- a/htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php
+++ b/htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php
@@ -274,7 +274,9 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
 				$newfileformat=substr($newfile, strrpos($newfile, '.')+1);
 				if ( ! empty($conf->global->MAIN_DOC_USE_TIMING))
 				{
-					$filename=$newfiletmp.'.'.dol_print_date(dol_now(),'%Y%m%d%H%M%S').'.'.$newfileformat;
+				    $format=$conf->global->MAIN_DOC_USE_TIMING;
+				    if ($format == '1') $format='%Y%m%d%H%M%S';
+					$filename=$newfiletmp.'-'.dol_print_date(dol_now(),$format).'.'.$newfileformat;
 				}
 				else
 				{
diff --git a/htdocs/core/modules/supplier_proposal/mod_supplier_proposal_marbre.php b/htdocs/core/modules/supplier_proposal/mod_supplier_proposal_marbre.php
index 9d07dd19514..07d027a68dd 100644
--- a/htdocs/core/modules/supplier_proposal/mod_supplier_proposal_marbre.php
+++ b/htdocs/core/modules/supplier_proposal/mod_supplier_proposal_marbre.php
@@ -32,7 +32,7 @@ require_once DOL_DOCUMENT_ROOT .'/core/modules/supplier_proposal/modules_supplie
 class mod_supplier_proposal_marbre extends ModeleNumRefSupplierProposal
 {
 	var $version='dolibarr';		// 'development', 'experimental', 'dolibarr'
-	var $prefix='DF';
+	var $prefix='RQ';               // RQ = Request for quotation
 	var $error='';
 	var $nom = "Marbre";
 
diff --git a/htdocs/core/tpl/objectline_create.tpl.php b/htdocs/core/tpl/objectline_create.tpl.php
index ba1f037370e..39de2604a0d 100644
--- a/htdocs/core/tpl/objectline_create.tpl.php
+++ b/htdocs/core/tpl/objectline_create.tpl.php
@@ -392,7 +392,25 @@ if ((! empty($conf->service->enabled) || ($object->element == 'contrat')) && $da
 		echo $form->select_date($date_start,'date_start',empty($conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE)?0:1,empty($conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE)?0:1,1,"addproduct",1,0,1);
 		echo ' '.$langs->trans('to').' ';
 		echo $form->select_date($date_end,'date_end',empty($conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE)?0:1,empty($conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE)?0:1,1,"addproduct",1,0,1);
+	};
+	print '<script type="text/javascript">';
+	if (!$date_start) {
+		if (isset($conf->global->MAIN_DEFAULT_DATE_START_HOUR)) {
+			print 'jQuery("#date_starthour").val("'.$conf->global->MAIN_DEFAULT_DATE_START_HOUR.'");';
+		}
+		if (isset($conf->global->MAIN_DEFAULT_DATE_START_MIN)) {
+			print 'jQuery("#date_startmin").val("'.$conf->global->MAIN_DEFAULT_DATE_START_MIN.'");';
+		}
 	}
+	if (!$date_end) {
+		if (isset($conf->global->MAIN_DEFAULT_DATE_END_HOUR)) {
+			print 'jQuery("#date_endhour").val("'.$conf->global->MAIN_DEFAULT_DATE_END_HOUR.'");';
+		}
+		if (isset($conf->global->MAIN_DEFAULT_DATE_END_MIN)) {
+			print 'jQuery("#date_endmin").val("'.$conf->global->MAIN_DEFAULT_DATE_END_MIN.'");';
+		}
+	}
+	print '</script>'
 	?>
 	</td>
 	</tr>
diff --git a/htdocs/core/tpl/objectline_edit.tpl.php b/htdocs/core/tpl/objectline_edit.tpl.php
index e62679f030b..a88f1bc210c 100644
--- a/htdocs/core/tpl/objectline_edit.tpl.php
+++ b/htdocs/core/tpl/objectline_edit.tpl.php
@@ -229,6 +229,24 @@ $coldisplay=-1; // We remove first td
 	echo $form->select_date($line->date_start,'date_start',$hourmin,$hourmin,$line->date_start?0:1,"updateligne",1,0,1);
 	echo ' '.$langs->trans('to').' ';
 	echo $form->select_date($line->date_end,'date_end',$hourmin,$hourmin,$line->date_end?0:1,"updateligne",1,0,1);
+	print '<script type="text/javascript">';
+	if (!$line->date_start) {
+		if (isset($conf->global->MAIN_DEFAULT_DATE_START_HOUR)) {
+			print 'jQuery("#date_starthour").val("'.$conf->global->MAIN_DEFAULT_DATE_START_HOUR.'");';
+		}
+		if (isset($conf->global->MAIN_DEFAULT_DATE_START_MIN)) {
+			print 'jQuery("#date_startmin").val("'.$conf->global->MAIN_DEFAULT_DATE_START_MIN.'");';
+		}
+	}
+	if (!$line->date_end) {
+		if (isset($conf->global->MAIN_DEFAULT_DATE_END_HOUR)) {
+			print 'jQuery("#date_endhour").val("'.$conf->global->MAIN_DEFAULT_DATE_END_HOUR.'");';
+		}
+		if (isset($conf->global->MAIN_DEFAULT_DATE_END_MIN)) {
+			print 'jQuery("#date_endmin").val("'.$conf->global->MAIN_DEFAULT_DATE_END_MIN.'");';
+		}
+	}
+	print '</script>'
 	?>
 	</td>
 </tr>
diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index e51841ed499..4c71256baf3 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -1895,10 +1895,8 @@ else if ($id || $ref)
 		$formmail->withdeliveryreceipt=1;
 		$formmail->withcancel=1;
 		// Tableau des substitutions
+		$formmail->setSubstitFromObject($object);
 		$formmail->substit['__SHIPPINGREF__']=$object->ref;
-		$formmail->substit['__SIGNATURE__']=$user->signature;
-		$formmail->substit['__PERSONALIZED__']='';
-		$formmail->substit['__CONTACTCIVNAME__']='';
 
 		//Find the good contact adress
 		//Find the good contact adress
diff --git a/htdocs/expedition/shipment.php b/htdocs/expedition/shipment.php
index c7de7ee207a..66f9582cfc0 100644
--- a/htdocs/expedition/shipment.php
+++ b/htdocs/expedition/shipment.php
@@ -265,7 +265,12 @@ if ($id > 0 || ! empty($ref))
 
 		// Date
 		print '<tr><td>'.$langs->trans('Date').'</td>';
-		print '<td colspan="2">'.dol_print_date($commande->date,'daytext').'</td>';
+		print '<td colspan="2">';
+		print dol_print_date($commande->date,'daytext');
+		if ($commande->hasDelay() && empty($commande->date_livraison)) {
+		    print ' '.img_picto($langs->trans("Late").' : '.$commande->showDelay(), "warning");
+		}
+		print '</td>';
 		print '</tr>';
 
 		// Delivery date planned
@@ -289,6 +294,9 @@ if ($id > 0 || ! empty($ref))
 		else
 		{
 			print dol_print_date($commande->date_livraison,'daytext');
+			if ($commande->hasDelay() && ! empty($commande->date_livraison)) {
+			    print ' '.img_picto($langs->trans("Late").' : '.$commande->showDelay(), "warning");
+			}
 		}
 		print '</td>';
 		// Note on several rows
diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php
index 8d164adaa41..9ca25527b1c 100644
--- a/htdocs/fichinter/card.php
+++ b/htdocs/fichinter/card.php
@@ -117,17 +117,20 @@ if (empty($reshook))
 
 		if ($result >= 0)
 		{
-			// Define output language
-			$outputlangs = $langs;
-			$newlang='';
-			if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','alpha')) $newlang=GETPOST('lang_id','alpha');
-			if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->client->default_lang;
-			if (! empty($newlang))
+			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
 			{
-				$outputlangs = new Translate("",$conf);
-				$outputlangs->setDefaultLang($newlang);
+				// Define output language
+				$outputlangs = $langs;
+				$newlang='';
+				if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','alpha')) $newlang=GETPOST('lang_id','alpha');
+				if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->client->default_lang;
+				if (! empty($newlang))
+				{
+					$outputlangs = new Translate("",$conf);
+					$outputlangs->setDefaultLang($newlang);
+				}
+				$result=fichinter_create($db, $object, (!GETPOST('model','alpha'))?$object->modelpdf:GETPOST('model','alpha'), $outputlangs);
 			}
-			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) $result=fichinter_create($db, $object, GETPOST('model','alpha'), $outputlangs);
 
 			header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
 			exit;
@@ -143,17 +146,20 @@ if (empty($reshook))
 		$result = $object->setDraft($user);
 		if ($result >= 0)
 		{
-			// Define output language
-			$outputlangs = $langs;
-			$newlang='';
-			if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','alpha')) $newlang=GETPOST('lang_id','alpha');
-			if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->client->default_lang;
-			if (! empty($newlang))
+			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
 			{
-				$outputlangs = new Translate("",$conf);
-				$outputlangs->setDefaultLang($newlang);
+				// Define output language
+				$outputlangs = $langs;
+				$newlang='';
+				if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','alpha')) $newlang=GETPOST('lang_id','alpha');
+				if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->client->default_lang;
+				if (! empty($newlang))
+				{
+					$outputlangs = new Translate("",$conf);
+					$outputlangs->setDefaultLang($newlang);
+				}
+				$result=fichinter_create($db, $object, (!GETPOST('model','alpha'))?$object->modelpdf:GETPOST('model','alpha'), $outputlangs);
 			}
-			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) $result=fichinter_create($db, $object, (!GETPOST('model','alpha'))?$object->model:GETPOST('model','apha'), $outputlangs);
 
 			header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
 			exit;
@@ -1866,10 +1872,8 @@ else if ($id > 0 || ! empty($ref))
 		$formmail->withcancel=1;
 
 		// Tableau des substitutions
+		$formmail->setSubstitFromObject($object);
 		$formmail->substit['__FICHINTERREF__']=$object->ref;
-		$formmail->substit['__SIGNATURE__']=$user->signature;
-		$formmail->substit['__PERSONALIZED__']='';
-		$formmail->substit['__CONTACTCIVNAME__']='';
 
 		//Find the good contact adress
 		$custcontact='';
diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index a6bfef7427b..95870df027e 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -1692,7 +1692,7 @@ class FactureFournisseur extends CommonInvoice
     			$line->remise_percent=0;
 			}
 
-			$prodid = rand(1, $num_prods);
+			$prodid = mt_rand(1, $num_prods);
             $line->fk_product=$prodids[$prodid];
             $line->product_type=0;
 
diff --git a/htdocs/fourn/class/fournisseur.product.class.php b/htdocs/fourn/class/fournisseur.product.class.php
index 63b3e833a4c..857544aa1bc 100644
--- a/htdocs/fourn/class/fournisseur.product.class.php
+++ b/htdocs/fourn/class/fournisseur.product.class.php
@@ -1,10 +1,13 @@
 <?php
 /* Copyright (C) 2005		Rodolphe Quiedeville	<rodolphe@quiedeville.org>
- * Copyright (C) 2006-2011	Laurent Destailleur		<eldy@users.sourceforge.net>
- * Copyright (C) 2009-2014	Regis Houssin			<regis.houssin@capnetworks.com>
- * Copyright (C) 2011		Juanjo Menent			<jmenent@2byte.es>
- * Copyright (C) 2012		Christophe Battarel		<christophe.battarel@altairis.fr>
- * Copyright (C) 2015       Marcos García           <marcosgdf@gmail.com>
+ * Copyright (C) 2006-2011	Laurent Destailleur	<eldy@users.sourceforge.net>
+ * Copyright (C) 2009-2014	Regis Houssin		<regis.houssin@capnetworks.com>
+ * Copyright (C) 2011		Juanjo Menent		<jmenent@2byte.es>
+ * Copyright (C) 2012		Christophe Battarel	<christophe.battarel@altairis.fr>
+ * Copyright (C) 2015		Marcos García           <marcosgdf@gmail.com>
+ * Copyright (C) 2016		Charlie Benke           <charlie@patas-monkey.com>
+ 
+ status
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -439,6 +442,7 @@ class ProductFournisseur extends Product
         $sql.= ", ".MAIN_DB_PREFIX."societe as s";
         $sql.= " WHERE pfp.entity IN (".getEntity('product', 1).")";
         $sql.= " AND pfp.fk_soc = s.rowid";
+        $sql.= " AND s.status=1"; // only enabled company selected
         $sql.= " AND pfp.fk_product = ".$prodid;
         if (empty($sortfield)) $sql.= " ORDER BY s.nom, pfp.quantity, pfp.price";
         else $sql.= $this->db->order($sortfield,$sortorder);
@@ -545,6 +549,7 @@ class ProductFournisseur extends Product
         $sql.= " WHERE s.entity IN (".getEntity('societe', 1).")";
         $sql.= " AND pfp.fk_product = ".$prodid;
         $sql.= " AND pfp.fk_soc = s.rowid";
+        $sql.= " AND s.status = 1"; // only enabled society
         if ($qty > 0) $sql.= " AND pfp.quantity <= ".$qty;
 
         dol_syslog(get_class($this)."::find_min_price_product_fournisseur", LOG_DEBUG);
diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index 922e0d61d38..6c7d3ef1b35 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -563,6 +563,19 @@ if (empty($reshook))
 	    unset($localtax1_tx);
 	    unset($localtax2_tx);
 
+		unset($_POST['date_starthour']);
+		unset($_POST['date_startmin']);
+		unset($_POST['date_startsec']);
+		unset($_POST['date_startday']);
+		unset($_POST['date_startmonth']);
+		unset($_POST['date_startyear']);
+		unset($_POST['date_endhour']);
+		unset($_POST['date_endmin']);
+		unset($_POST['date_endsec']);
+		unset($_POST['date_endday']);
+		unset($_POST['date_endmonth']);
+		unset($_POST['date_endyear']);
+
 	    if ($result	>= 0)
 	    {
 	        // Define output language
@@ -2468,13 +2481,9 @@ elseif (! empty($object->id))
 
 		$object->fetch_projet();
 		// Tableau des substitutions
-		$formmail->substit['__ORDERREF__']=$object->ref;
-		$formmail->substit['__ORDERSUPPLIERREF__']=$object->ref_supplier;
-		$formmail->substit['__THIRDPARTY_NAME__'] = $object->thirdparty->name;
-		$formmail->substit['__PROJECT_REF__'] = (is_object($object->projet)?$object->projet->ref:'');
-		$formmail->substit['__SIGNATURE__']=$user->signature;
-		$formmail->substit['__PERSONALIZED__']='';
-		$formmail->substit['__CONTACTCIVNAME__']='';
+		$formmail->setSubstitFromObject($object);
+		$formmail->substit['__ORDERSUPPLIERREF__']=$object->ref_supplier;	// For backward compatibility
+		$formmail->substit['__SUPPLIERORDERREF__']=$object->ref_supplier;
 
 		//Find the good contact adress
 		$custcontact='';
@@ -2755,6 +2764,11 @@ elseif (! empty($object->id))
 						print '</a>';
 					}
 				}
+				// Create event
+				if ($conf->agenda->enabled && ! empty($conf->global->MAIN_ADD_EVENT_ON_ELEMENT_CARD)) 	// Add hidden condition because this is not a "workflow" action so should appears somewhere else on page.
+				{
+					print '<div class="inline-block divButAction"><a class="butAction" href="' . DOL_URL_ROOT . '/comm/action/card.php?action=create&amp;origin=' . $object->element . '&amp;originid=' . $object->id . '&amp;socid=' . $object->socid . '">' . $langs->trans("AddAction") . '</a></div>';
+				}
 
 				// Modify
 				if ($object->statut == 1)
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index e23f8cf8dbc..5dad9e2f706 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -620,6 +620,19 @@ if (empty($reshook))
 	        if ($result >= 0)
 	        {
 	            unset($_POST['label']);
+				unset($_POST['date_starthour']);
+				unset($_POST['date_startmin']);
+				unset($_POST['date_startsec']);
+				unset($_POST['date_startday']);
+				unset($_POST['date_startmonth']);
+				unset($_POST['date_startyear']);
+				unset($_POST['date_endhour']);
+				unset($_POST['date_endmin']);
+				unset($_POST['date_endsec']);
+				unset($_POST['date_endday']);
+				unset($_POST['date_endmonth']);
+				unset($_POST['date_endyear']);
+
 	            $db->commit();
 	        }
 	        else
@@ -1709,12 +1722,6 @@ else
             if ($objectref == 'PROV')
             {
                 $savdate=$object->date;
-                if (! empty($conf->global->FAC_FORCE_DATE_VALIDATION))
-                {
-                    $object->date=dol_now();
-                    //TODO: Possibly will have to control payment information into suppliers
-                    //$object->date_lim_reglement=$object->calculate_date_lim_reglement();
-                }
                 $numref = $object->getNextNumRef($societe);
             }
             else
@@ -2321,6 +2328,12 @@ else
 	                    }
 	                }
 	            }
+				
+				// Create event
+				if ($conf->agenda->enabled && ! empty($conf->global->MAIN_ADD_EVENT_ON_ELEMENT_CARD)) 	// Add hidden condition because this is not a "workflow" action so should appears somewhere else on page.
+				{
+					print '<div class="inline-block divButAction"><a class="butAction" href="' . DOL_URL_ROOT . '/comm/action/card.php?action=create&amp;origin=' . $object->element . '&amp;originid=' . $object->id . '&amp;socid=' . $object->socid . '">' . $langs->trans("AddAction") . '</a></div>';
+				}
 	
 	            // Clone
 	            if ($action != 'edit' && $user->rights->fournisseur->facture->creer)
@@ -2455,11 +2468,9 @@ else
             $formmail->withbody=1;
             $formmail->withdeliveryreceipt=1;
             $formmail->withcancel=1;
-            // Tableau des substitutions
-            $formmail->substit['__REF__']=$object->ref;
-            $formmail->substit['__SIGNATURE__']=$user->signature;
-            $formmail->substit['__PERSONALIZED__']='';
-            $formmail->substit['__CONTACTCIVNAME__']='';
+			// Tableau des substitutions
+			$formmail->setSubstitFromObject($object);
+            $formmail->substit['__SUPPLIERINVREF__']=$object->ref;
 
             //Find the good contact adress
             $custcontact='';
diff --git a/htdocs/holiday/card.php b/htdocs/holiday/card.php
index 59c920c26ca..8cae9592033 100644
--- a/htdocs/holiday/card.php
+++ b/htdocs/holiday/card.php
@@ -1,9 +1,9 @@
 <?php
-/* Copyright (C) 2011	   Dimitri Mouillard	<dmouillard@teclib.com>
- * Copyright (C) 2012-2015 Laurent Destailleur	<eldy@users.sourceforge.net>
- * Copyright (C) 2012	   Regis Houssin		<regis.houssin@capnetworks.com>
- * Copyright (C) 2013	   Juanjo Menent		<jmenent@2byte.es>
- * Copyright (C) 2014	   Ferran Marcet		<fmarcet@2byte.es>
+/* Copyright (C) 2011		Dimitri Mouillard	<dmouillard@teclib.com>
+ * Copyright (C) 2012-2015	Laurent Destailleur	<eldy@users.sourceforge.net>
+ * Copyright (C) 2012-2016	Regis Houssin		<regis.houssin@capnetworks.com>
+ * Copyright (C) 2013		Juanjo Menent		<jmenent@2byte.es>
+ * Copyright (C) 2014		Ferran Marcet		<fmarcet@2byte.es>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -91,23 +91,23 @@ if ($action == 'create')
 	        $error++;
 	        $action='create';
 	    }
-	    
+
 	    // If no start date
 	    if (empty($date_debut))
 	    {
-	        header('Location: card.php?action=request&error=nodatedebut');
+	        header('Location: '.$_SERVER["PHP_SELF"].'?action=request&error=nodatedebut');
 	        exit;
 	    }
 	    // If no end date
 	    if (empty($date_fin))
 	    {
-	        header('Location: card.php?action=request&error=nodatefin');
+	        header('Location: '.$_SERVER["PHP_SELF"].'?action=request&error=nodatefin');
 	        exit;
 	    }
 	    // If start date after end date
 	    if ($date_debut > $date_fin)
 	    {
-	        header('Location: card.php?action=request&error=datefin');
+	        header('Location: '.$_SERVER["PHP_SELF"].'?action=request&error=datefin');
 	        exit;
 	    }
 
@@ -115,15 +115,15 @@ if ($action == 'create')
 	    $verifCP = $cp->verifDateHolidayCP($userID, $date_debut, $date_fin, $halfday);
 	    if (! $verifCP)
 	    {
-	        header('Location: card.php?action=request&error=alreadyCP');
+	        header('Location: '.$_SERVER["PHP_SELF"].'?action=request&error=alreadyCP');
 	        exit;
 	    }
 
-	    // If there is no Business Days within request 
+	    // If there is no Business Days within request
 	    $nbopenedday=num_open_day($date_debut_gmt, $date_fin_gmt, 0, 1, $halfday);
 	    if($nbopenedday < 0.5)
 	    {
-	        header('Location: card.php?action=request&error=DureeHoliday');
+	        header('Location: '.$_SERVER["PHP_SELF"].'?action=request&error=DureeHoliday');
 	        exit;
 	    }
 
@@ -137,7 +137,7 @@ if ($action == 'create')
 	    $result = 0;
 
 	    $result = 0;
-	    
+
 	    if (! $error)
 	    {
     	    $cp->fk_user = $userid;
@@ -147,16 +147,16 @@ if ($action == 'create')
     	    $cp->fk_validator = $valideur;
     		$cp->halfday = $halfday;
     		$cp->fk_type = $type;
-    
+
     		$result = $cp->create($user);
 	    }
-	    
+
 	    // If no SQL error we redirect to the request card
 	    if (! $error && $result > 0)
 	    {
 			$db->commit();
 
-	    	header('Location: card.php?id='.$result);
+	    	header('Location: '.$_SERVER["PHP_SELF"].'?id='.$cp->id);
 	        exit;
 	    }
 	    else
@@ -179,15 +179,15 @@ if ($action == 'update')
 	else if ($starthalfday == 'afternoon') $halfday=-1;
 	else if ($endhalfday == 'morning') $halfday=1;
 
-    // If no right to modify a request 
+    // If no right to modify a request
     if (! $user->rights->holiday->write)
     {
-        header('Location: card.php?action=request&error=CantUpdate');
+        header('Location: '.$_SERVER["PHP_SELF"].'?action=request&error=CantUpdate');
         exit;
     }
 
     $cp = new Holiday($db);
-    $cp->fetch($_POST['holiday_id']);
+    $cp->fetch($id);
 
 	$canedit=(($user->id == $cp->fk_user && $user->rights->holiday->write) || ($user->id != $cp->fk_user && $user->rights->holiday->write_all));
 
@@ -202,25 +202,25 @@ if ($action == 'update')
 
             // If no start date
             if (empty($_POST['date_debut_'])) {
-                header('Location: card.php?id='.$_POST['holiday_id'].'&action=edit&error=nodatedebut');
+                header('Location: '.$_SERVER["PHP_SELF"].'?id='.$cp->id.'&action=edit&error=nodatedebut');
                 exit;
             }
 
             // If no end date
             if (empty($_POST['date_fin_'])) {
-                header('Location: card.php?id='.$_POST['holiday_id'].'&action=edit&error=nodatefin');
+                header('Location: '.$_SERVER["PHP_SELF"].'?id='.$cp->id.'&action=edit&error=nodatefin');
                 exit;
             }
 
             // If start date after end date
             if ($date_debut > $date_fin) {
-                header('Location: card.php?id='.$_POST['holiday_id'].'&action=edit&error=datefin');
+                header('Location: '.$_SERVER["PHP_SELF"].'?id='.$cp->id.'&action=edit&error=datefin');
                 exit;
             }
 
             // If no validator designated
             if ($valideur < 1) {
-                header('Location: card.php?id='.$_POST['holiday_id'].'&action=edit&error=Valideur');
+                header('Location: '.$_SERVER["PHP_SELF"].'?id='.$cp->id.'&action=edit&error=Valideur');
                 exit;
             }
 
@@ -228,7 +228,7 @@ if ($action == 'update')
             $nbopenedday=num_open_day($date_debut_gmt, $date_fin_gmt, 0, 1, $halfday);
             if ($nbopenedday < 0.5)
             {
-                header('Location: card.php?id='.$_POST['holiday_id'].'&action=edit&error=DureeHoliday');
+                header('Location: '.$_SERVER["PHP_SELF"].'?id='.$cp->id.'&action=edit&error=DureeHoliday');
                 exit;
             }
 
@@ -242,18 +242,18 @@ if ($action == 'update')
 			$verif = $cp->update($user->id);
             if ($verif > 0)
             {
-                header('Location: card.php?id='.$_POST['holiday_id']);
+                header('Location: '.$_SERVER["PHP_SELF"].'?id='.$cp->id);
                 exit;
             }
             else
            {
                 // Otherwise we display the request form with the SQL error message
-                header('Location: card.php?id='.$_POST['holiday_id'].'&action=edit&error=SQL_Create&msg='.$cp->error);
+                header('Location: '.$_SERVER["PHP_SELF"].'?id='.$cp->id.'&action=edit&error=SQL_Create&msg='.$cp->error);
                 exit;
             }
         }
     } else {
-        header('Location: card.php?id='.$_POST['holiday_id']);
+        header('Location: '.$_SERVER["PHP_SELF"].'?id='.$cp->id);
         exit;
     }
 }
@@ -276,7 +276,7 @@ if ($action == 'confirm_delete' && GETPOST('confirm') == 'yes' && $user->rights-
 		// Si l'utilisateur à le droit de lire cette demande, il peut la supprimer
 		if ($canedit)
 		{
-			$result=$cp->delete($id);
+			$result=$cp->delete($cp->id);
 		}
 		else
 		{
@@ -303,7 +303,7 @@ if ($action == 'confirm_send')
     $cp->fetch($id);
 
     $canedit=(($user->id == $cp->fk_user && $user->rights->holiday->write) || ($user->id != $cp->fk_user && $user->rights->holiday->write_all));
-    
+
     // Si brouillon et créateur
     if($cp->statut == 1 && $canedit)
     {
@@ -321,7 +321,7 @@ if ($action == 'confirm_send')
 
             if (!$emailTo)
             {
-                header('Location: card.php?id='.$_GET['id']);
+                header('Location: '.$_SERVER["PHP_SELF"].'?id='.$cp->id);
                 exit;
             }
 
@@ -370,7 +370,7 @@ if ($action == 'confirm_send')
             $message.= "\n";
             $message.= "- ".$langs->transnoentitiesnoconv("Name")." : ".dolGetFirstLastname($expediteur->firstname, $expediteur->lastname)."\n";
             $message.= "- ".$langs->transnoentitiesnoconv("Period")." : ".dol_print_date($cp->date_debut,'day')." ".$langs->transnoentitiesnoconv("To")." ".dol_print_date($cp->date_fin,'day')."\n";
-            $message.= "- ".$langs->transnoentitiesnoconv("Link")." : ".$dolibarr_main_url_root."/holiday/card.php?id=".$cp->rowid."\n\n";
+            $message.= "- ".$langs->transnoentitiesnoconv("Link")." : ".$dolibarr_main_url_root."/holiday/card.php?id=".$cp->id."\n\n";
             $message.= "\n";
 
             $mail = new CMailFile($subject,$emailTo,$emailFrom,$message);
@@ -380,16 +380,16 @@ if ($action == 'confirm_send')
 
             if (!$result)
             {
-                header('Location: card.php?id='.$_GET['id'].'&error=mail&error_content='.$mail->error);
+                header('Location: '.$_SERVER["PHP_SELF"].'?id='.$cp->id.'&error=mail&error_content='.$mail->error);
                 exit;
             }
-            header('Location: card.php?id='.$_GET['id']);
+            header('Location: '.$_SERVER["PHP_SELF"].'?id='.$cp->id);
             exit;
         }
         else
         {
             // Sinon on affiche le formulaire de demande avec le message d'erreur SQL
-            header('Location: card.php?id='.$_GET['id'].'&error=SQL_Create&msg='.$cp->error);
+            header('Location: '.$_SERVER["PHP_SELF"].'?id='.$cp->id.'&error=SQL_Create&msg='.$cp->error);
             exit;
         }
     }
@@ -433,7 +433,7 @@ if ($action == 'confirm_valid')
 
             if (!$emailTo)
             {
-                header('Location: card.php?id='.$_GET['id']);
+                header('Location: '.$_SERVER["PHP_SELF"].'?id='.$cp->id);
                 exit;
             }
 
@@ -455,7 +455,7 @@ if ($action == 'confirm_valid')
 
             $message.= "- ".$langs->transnoentitiesnoconv("ValidatedBy")." : ".dolGetFirstLastname($expediteur->firstname, $expediteur->lastname)."\n";
 
-            $message.= "- ".$langs->transnoentitiesnoconv("Link")." : ".$dolibarr_main_url_root."/holiday/card.php?id=".$cp->rowid."\n\n";
+            $message.= "- ".$langs->transnoentitiesnoconv("Link")." : ".$dolibarr_main_url_root."/holiday/card.php?id=".$cp->id."\n\n";
             $message.= "\n";
 
             $mail = new CMailFile($subject,$emailTo,$emailFrom,$message);
@@ -464,15 +464,15 @@ if ($action == 'confirm_valid')
             $result=$mail->sendfile();
 
             if(!$result) {
-                header('Location: card.php?id='.$_GET['id'].'&error=mail&error_content='.$mail->error);
+                header('Location: '.$_SERVER["PHP_SELF"].'?id='.$cp->id.'&error=mail&error_content='.$mail->error);
                 exit;
             }
 
-            header('Location: card.php?id='.$_GET['id']);
+            header('Location: '.$_SERVER["PHP_SELF"].'?id='.$cp->id);
             exit;
         } else {
             // Sinon on affiche le formulaire de demande avec le message d'erreur SQL
-            header('Location: card.php?id='.$_GET['id'].'&error=SQL_Create&msg='.$cp->error);
+            header('Location: '.$_SERVER["PHP_SELF"].'?id='.$cp->id.'&error=SQL_Create&msg='.$cp->error);
             exit;
         }
 
@@ -485,7 +485,7 @@ if ($action == 'confirm_refuse')
     if (! empty($_POST['detail_refuse']))
     {
         $cp = new Holiday($db);
-        $cp->fetch($_GET['id']);
+        $cp->fetch($id);
 
         // Si statut en attente de validation et valideur = utilisateur
         if ($cp->statut == 2 && $user->id == $cp->fk_validator)
@@ -507,7 +507,7 @@ if ($action == 'confirm_refuse')
 
                 if (!$emailTo)
                 {
-                    header('Location: card.php?id='.$_GET['id']);
+                    header('Location: '.$_SERVER["PHP_SELF"].'?id='.$cp->id);
                     exit;
                 }
 
@@ -530,7 +530,7 @@ if ($action == 'confirm_refuse')
 
 	            $message.= "- ".$langs->transnoentitiesnoconv("ModifiedBy")." : ".dolGetFirstLastname($expediteur->firstname, $expediteur->lastname)."\n";
 
-	            $message.= "- ".$langs->transnoentitiesnoconv("Link")." : ".$dolibarr_main_url_root."/holiday/card.php?id=".$cp->rowid."\n\n";
+	            $message.= "- ".$langs->transnoentitiesnoconv("Link")." : ".$dolibarr_main_url_root."/holiday/card.php?id=".$cp->id."\n\n";
                 $message.= "\n";
 
                 $mail = new CMailFile($subject,$emailTo,$emailFrom,$message);
@@ -539,22 +539,22 @@ if ($action == 'confirm_refuse')
                 $result=$mail->sendfile();
 
                 if(!$result) {
-                    header('Location: card.php?id='.$_GET['id'].'&error=mail&error_content='.$mail->error);
+                    header('Location: '.$_SERVER["PHP_SELF"].'?id='.$cp->id.'&error=mail&error_content='.$mail->error);
                     exit;
                 }
 
-                header('Location: card.php?id='.$_GET['id']);
+                header('Location: '.$_SERVER["PHP_SELF"].'?id='.$cp->id);
                 exit;
             } else {
                 // Sinon on affiche le formulaire de demande avec le message d'erreur SQL
-                header('Location: card.php?id='.$_GET['id'].'&error=SQL_Create&msg='.$cp->error);
+                header('Location: '.$_SERVER["PHP_SELF"].'?id='.$cp->id.'&error=SQL_Create&msg='.$cp->error);
                 exit;
             }
 
         }
 
     } else {
-        header('Location: card.php?id='.$_GET['id'].'&error=NoMotifRefuse');
+        header('Location: '.$_SERVER["PHP_SELF"].'?id='.$cp->id.'&error=NoMotifRefuse');
         exit;
     }
 }
@@ -563,7 +563,7 @@ if ($action == 'confirm_refuse')
 if ($action == 'confirm_cancel' && GETPOST('confirm') == 'yes')
 {
     $cp = new Holiday($db);
-    $cp->fetch($_GET['id']);
+    $cp->fetch($id);
 
     // Si statut en attente de validation et valideur = utilisateur
     if (($cp->statut == 2 || $cp->statut == 3) && ($user->id == $cp->fk_validator || $user->id == $cp->fk_user))
@@ -616,7 +616,7 @@ if ($action == 'confirm_cancel' && GETPOST('confirm') == 'yes')
 
             if (!$emailTo)
             {
-                header('Location: card.php?id='.$_GET['id']);
+                header('Location: '.$_SERVER["PHP_SELF"].'?id='.$cp->id);
                 exit;
             }
 
@@ -638,7 +638,7 @@ if ($action == 'confirm_cancel' && GETPOST('confirm') == 'yes')
             $message.= $langs->transnoentities("HolidaysCanceledBody", dol_print_date($cp->date_debut,'day'), dol_print_date($cp->date_fin,'day'))."\n";
             $message.= "- ".$langs->transnoentitiesnoconv("ModifiedBy")." : ".dolGetFirstLastname($expediteur->firstname, $expediteur->lastname)."\n";
 
-            $message.= "- ".$langs->transnoentitiesnoconv("Link")." : ".$dolibarr_main_url_root."/holiday/card.php?id=".$cp->rowid."\n\n";
+            $message.= "- ".$langs->transnoentitiesnoconv("Link")." : ".$dolibarr_main_url_root."/holiday/card.php?id=".$cp->id."\n\n";
             $message.= "\n";
 
             $mail = new CMailFile($subject,$emailTo,$emailFrom,$message);
@@ -648,17 +648,17 @@ if ($action == 'confirm_cancel' && GETPOST('confirm') == 'yes')
 
             if(!$result)
             {
-                header('Location: card.php?id='.$_GET['id'].'&error=mail&error_content='.$mail->error);
+                header('Location: '.$_SERVER["PHP_SELF"].'?id='.$cp->id.'&error=mail&error_content='.$mail->error);
                 exit;
             }
 
-            header('Location: card.php?id='.$_GET['id']);
+            header('Location: '.$_SERVER["PHP_SELF"].'?id='.$cp->id);
             exit;
         }
         else
         {
             // Sinon on affiche le formulaire de demande avec le message d'erreur SQL
-            header('Location: card.php?id='.$_GET['id'].'&error=SQL_Create&msg='.$cp->error);
+            header('Location: '.$_SERVER["PHP_SELF"].'?id='.$cp->id.'&error=SQL_Create&msg='.$cp->error);
             exit;
         }
 
@@ -852,13 +852,8 @@ if (empty($id) || $action == 'add' || $action == 'request' || $action == 'create
         // Approved by
         print '<tr>';
         print '<td class="fieldrequired">'.$langs->trans("ReviewedByCP").'</td>';
-        $validator = new UserGroup($db);
-        $excludefilter=$user->admin?'':'u.rowid <> '.$user->id;
-        $valideurobjects = $validator->listUsersForGroup($excludefilter);
-        $valideurarray = array();
-        foreach($valideurobjects as $val) $valideurarray[$val->id]=$val->id;
         print '<td>';
-        print $form->select_dolusers((GETPOST('valideur')>0?GETPOST('valideur'):$user->fk_user), "valideur", 1, "", 0, $valideurarray, 0, 0, 0, 0, '', 0, '', '', 1);	// By default, hierarchical parent
+        print $form->select_dolusers((GETPOST('valideur')>0?GETPOST('valideur'):$user->fk_user), "valideur", 1, ($user->admin ? '' : array($user->id)), 0, '', 0, 0, 0, 0, '', 0, '', '', 1);	// By default, hierarchical parent
         print '</td>';
         print '</tr>';
 
@@ -952,35 +947,35 @@ else
             {
                 if ($action == 'delete')
                 {
-                    if($user->rights->holiday->delete)
+                    if ($user->rights->holiday->delete)
                     {
-                        print $form->formconfirm("card.php?id=".$id,$langs->trans("TitleDeleteCP"),$langs->trans("ConfirmDeleteCP"),"confirm_delete", '', 0, 1);
+                        print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$cp->id,$langs->trans("TitleDeleteCP"),$langs->trans("ConfirmDeleteCP"),"confirm_delete", '', 0, 1);
                     }
                 }
 
                 // Si envoi en validation
                 if ($action == 'sendToValidate' && $cp->statut == 1)
                 {
-                    print $form->formconfirm("card.php?id=".$id,$langs->trans("TitleToValidCP"),$langs->trans("ConfirmToValidCP"),"confirm_send", '', 1, 1);
+                    print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$cp->id,$langs->trans("TitleToValidCP"),$langs->trans("ConfirmToValidCP"),"confirm_send", '', 1, 1);
                 }
 
                 // Si validation de la demande
                 if ($action == 'valid')
                 {
-                    print $form->formconfirm("card.php?id=".$id,$langs->trans("TitleValidCP"),$langs->trans("ConfirmValidCP"),"confirm_valid", '', 1, 1);
+                    print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$cp->id,$langs->trans("TitleValidCP"),$langs->trans("ConfirmValidCP"),"confirm_valid", '', 1, 1);
                 }
 
                 // Si refus de la demande
                 if ($action == 'refuse')
                 {
                     $array_input = array(array('type'=>"text",'label'=> $langs->trans('DetailRefusCP'),'name'=>"detail_refuse",'size'=>"50",'value'=>""));
-                    print $form->formconfirm("card.php?id=".$id."&action=confirm_refuse", $langs->trans("TitleRefuseCP"), $langs->trans('ConfirmRefuseCP'), "confirm_refuse", $array_input, 1, 0);
+                    print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$cp->id."&action=confirm_refuse", $langs->trans("TitleRefuseCP"), $langs->trans('ConfirmRefuseCP'), "confirm_refuse", $array_input, 1, 0);
                 }
 
                 // Si annulation de la demande
                 if ($action == 'cancel')
                 {
-                    print $form->formconfirm("card.php?id=".$id,$langs->trans("TitleCancelCP"),$langs->trans("ConfirmCancelCP"),"confirm_cancel", '', 1, 1);
+                    print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$cp->id,$langs->trans("TitleCancelCP"),$langs->trans("ConfirmCancelCP"),"confirm_cancel", '', 1, 1);
                 }
 
                 $head=holiday_prepare_head($cp);
@@ -989,13 +984,13 @@ else
                 if ($action == 'edit' && $cp->statut == 1)
                 {
                     $edit = true;
-                    print '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$id.'">'."\n";
+                    print '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$cp->id.'">'."\n";
                     print '<input type="hidden" name="action" value="update"/>'."\n";
-                    print '<input type="hidden" name="holiday_id" value="'.$id.'" />'."\n";
+                    print '<input type="hidden" name="id" value="'.$cp->id.'" />'."\n";
                 }
 
                 dol_fiche_head($head,'card',$langs->trans("CPTitreMenu"),0,'holiday');
-                
+
                 print '<table class="border" width="100%">';
                 print '<tbody>';
 
@@ -1132,15 +1127,8 @@ else
                 } else {
                     print '<tr>';
                     print '<td width="50%">'.$langs->trans('ReviewedByCP').'</td>';
-
-			        $validator = new UserGroup($db);
-			        $excludefilter=$user->admin?'':'u.rowid <> '.$user->id;
-			        $valideurobjects = $validator->listUsersForGroup($excludefilter);
-			        $valideurarray = array();
-			        foreach($valideurobjects as $val) $valideurarray[$val->id]=$val->id;
-
                     print '<td>';
-        			print $form->select_dolusers($user->fk_user, "valideur", 1, "", 0, $valideurarray);	// By default, hierarchical parent
+        			print $form->select_dolusers($cp->fk_user, "valideur", 1, ($user->admin ? '' : array($user->id)));	// By default, hierarchical parent
                     print '</td>';
                     print '</tr>';
                 }
@@ -1149,19 +1137,19 @@ else
                 print '<td>'.$langs->trans('DateCreateCP').'</td>';
                 print '<td>'.dol_print_date($cp->date_create,'dayhour').'</td>';
                 print '</tr>';
-                if($cp->statut == 3) {
+                if ($cp->statut == 3) {
                     print '<tr>';
                     print '<td>'.$langs->trans('DateValidCP').'</td>';
                     print '<td>'.dol_print_date($cp->date_valid,'dayhour').'</td>';
                     print '</tr>';
                 }
-                if($cp->statut == 4) {
+                if ($cp->statut == 4) {
                     print '<tr>';
                     print '<td>'.$langs->trans('DateCancelCP').'</td>';
                     print '<td>'.dol_print_date($cp->date_cancel,'dayhour').'</td>';
                     print '</tr>';
                 }
-                if($cp->statut == 5) {
+                if ($cp->statut == 5) {
                     print '<tr>';
                     print '<td>'.$langs->trans('DateRefusCP').'</td>';
                     print '<td>'.dol_print_date($cp->date_refuse,'dayhour').'</td>';
@@ -1171,7 +1159,7 @@ else
                 print '</table>';
 
                 dol_fiche_end();
-                
+
                 if ($action == 'edit' && $cp->statut == 1)
                 {
                     print '<div align="center">';
@@ -1192,26 +1180,26 @@ else
                     // Boutons d'actions
                     if ($canedit && $cp->statut == 1)
                     {
-                        print '<a href="card.php?id='.$_GET['id'].'&action=edit" class="butAction">'.$langs->trans("EditCP").'</a>';
+                        print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$cp->id.'&action=edit" class="butAction">'.$langs->trans("EditCP").'</a>';
                     }
                     if ($canedit && $cp->statut == 1)
                     {
-                        print '<a href="card.php?id='.$_GET['id'].'&action=sendToValidate" class="butAction">'.$langs->trans("Validate").'</a>';
+                        print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$cp->id.'&action=sendToValidate" class="butAction">'.$langs->trans("Validate").'</a>';
                     }
                     if ($user->rights->holiday->delete && $cp->statut == 1)	// If draft
                     {
-                    	print '<a href="card.php?id='.$_GET['id'].'&action=delete" class="butActionDelete">'.$langs->trans("DeleteCP").'</a>';
+                    	print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$cp->id.'&action=delete" class="butActionDelete">'.$langs->trans("DeleteCP").'</a>';
                     }
 
                     if ($user->id == $cp->fk_validator && $cp->statut == 2)
                     {
-                        print '<a href="card.php?id='.$_GET['id'].'&action=valid" class="butAction">'.$langs->trans("Approve").'</a>';
-                        print '<a href="card.php?id='.$_GET['id'].'&action=refuse" class="butAction">'.$langs->trans("ActionRefuseCP").'</a>';
+                        print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$cp->id.'&action=valid" class="butAction">'.$langs->trans("Approve").'</a>';
+                        print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$cp->id.'&action=refuse" class="butAction">'.$langs->trans("ActionRefuseCP").'</a>';
                     }
 
                     if (($user->id == $cp->fk_validator || $user->id == $cp->fk_user) && ($cp->statut == 2 || $cp->statut == 3))	// Status validated or approved
                     {
-                    	if (($cp->date_debut > dol_now()) || $user->admin) print '<a href="card.php?id='.$_GET['id'].'&action=cancel" class="butAction">'.$langs->trans("ActionCancelCP").'</a>';
+                    	if (($cp->date_debut > dol_now()) || $user->admin) print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$cp->id.'&action=cancel" class="butAction">'.$langs->trans("ActionCancelCP").'</a>';
                     	else print '<a href="#" class="butActionRefused" title="'.$langs->trans("HolidayStarted").'">'.$langs->trans("ActionCancelCP").'</a>';
                     }
 
diff --git a/htdocs/holiday/class/holiday.class.php b/htdocs/holiday/class/holiday.class.php
index 1d1c624aa4c..4e5706f94c6 100644
--- a/htdocs/holiday/class/holiday.class.php
+++ b/htdocs/holiday/class/holiday.class.php
@@ -1,8 +1,8 @@
 <?php
-/* Copyright (C) 2011	   Dimitri Mouillard	<dmouillard@teclib.com>
- * Copyright (C) 2012-2014 Laurent Destailleur	<eldy@users.sourceforge.net>
- * Copyright (C) 2012	   Regis Houssin		<regis.houssin@capnetworks.com>
- * Copyright (C) 2013      Florian Henry        <florian.henry@open-concept.pro>
+/* Copyright (C) 2011		Dimitri Mouillard	<dmouillard@teclib.com>
+ * Copyright (C) 2012-2014	Laurent Destailleur	<eldy@users.sourceforge.net>
+ * Copyright (C) 2012-2016	Regis Houssin		<regis.houssin@capnetworks.com>
+ * Copyright (C) 2013		Florian Henry		<florian.henry@open-concept.pro>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -35,7 +35,7 @@ class Holiday extends CommonObject
 	public $table_element='holiday';
 	protected $isnolinkedbythird = 1;     // No field fk_soc
 	protected $ismultientitymanaged = 0;	// 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
-	
+
 	/**
 	 * @deprecated
 	 * @see id
@@ -161,7 +161,7 @@ class Holiday extends CommonObject
 
         if (! $error)
         {
-            $this->rowid = $this->db->last_insert_id(MAIN_DB_PREFIX."holiday");
+            $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."holiday");
         }
 
         // Commit or rollback
@@ -178,7 +178,7 @@ class Holiday extends CommonObject
         else
         {
             $this->db->commit();
-            return $this->rowid;
+            return $this->id;
         }
     }
 
@@ -301,7 +301,8 @@ class Holiday extends CommonObject
         $sql.= " ua.firstname as validator_firstname";
 
         $sql.= " FROM ".MAIN_DB_PREFIX."holiday as cp, ".MAIN_DB_PREFIX."user as uu, ".MAIN_DB_PREFIX."user as ua";
-		$sql.= " WHERE cp.fk_user = uu.rowid AND cp.fk_validator = ua.rowid "; // Hack pour la recherche sur le tableau
+        $sql.= " WHERE cp.entity IN (".getEntity('holiday', 1).")";
+		$sql.= " AND cp.fk_user = uu.rowid AND cp.fk_validator = ua.rowid "; // Hack pour la recherche sur le tableau
         $sql.= " AND cp.fk_user = '".$user_id."'";
 
         // Filtre de séléction
@@ -413,7 +414,8 @@ class Holiday extends CommonObject
         $sql.= " ua.firstname as validator_firstname";
 
         $sql.= " FROM ".MAIN_DB_PREFIX."holiday as cp, ".MAIN_DB_PREFIX."user as uu, ".MAIN_DB_PREFIX."user as ua";
-        $sql.= " WHERE cp.fk_user = uu.rowid AND cp.fk_validator = ua.rowid "; // Hack pour la recherche sur le tableau
+        $sql.= " WHERE cp.entity IN (".getEntity('holiday', 1).")";
+        $sql.= " AND cp.fk_user = uu.rowid AND cp.fk_validator = ua.rowid "; // Hack pour la recherche sur le tableau
 
         // Filtrage de séléction
         if(!empty($filter)) {
@@ -560,7 +562,7 @@ class Holiday extends CommonObject
             $sql.= " detail_refuse = NULL";
         }
 
-        $sql.= " WHERE rowid= '".$this->rowid."'";
+        $sql.= " WHERE rowid= '".$this->id."'";
 
         $this->db->begin();
 
@@ -607,7 +609,7 @@ class Holiday extends CommonObject
         $error=0;
 
         $sql = "DELETE FROM ".MAIN_DB_PREFIX."holiday";
-        $sql.= " WHERE rowid=".$this->rowid;
+        $sql.= " WHERE rowid=".$this->id;
 
         $this->db->begin();
 
@@ -1112,16 +1114,29 @@ class Holiday extends CommonObject
      */
     function fetchUsers($stringlist=true,$type=true)
     {
+    	global $conf;
+
         // Si vrai donc pour user Dolibarr
         if ($stringlist)
         {
-            if($type)
+            if ($type)
             {
                 // Si utilisateur de Dolibarr
 
                 $sql = "SELECT u.rowid";
                 $sql.= " FROM ".MAIN_DB_PREFIX."user as u";
-                $sql.= " WHERE statut > 0";
+
+                if (! empty($conf->multicompany->enabled) && ! empty($conf->multicompany->transverse_mode))
+                {
+                	$sql.= ", ".MAIN_DB_PREFIX."usergroup_user as ug";
+                	$sql.= " WHERE (ug.fk_user = u.rowid";
+                	$sql.= " AND ug.entity = ".$conf->entity.")";
+                	$sql.= " OR u.admin = 1";
+                }
+                else
+                	$sql.= " WHERE u.entity IN (0,".$conf->entity.")";
+
+                $sql.= " AND u.statut > 0";
 
                 dol_syslog(get_class($this)."::fetchUsers", LOG_DEBUG);
                 $resql=$this->db->query($sql);
@@ -1138,7 +1153,7 @@ class Holiday extends CommonObject
                     {
                         $obj = $this->db->fetch_object($resql);
 
-                        if($i == 0) {
+                        if ($i == 0) {
                             $stringlist.= $obj->rowid;
                         } else {
                             $stringlist.= ', '.$obj->rowid;
@@ -1158,7 +1173,7 @@ class Holiday extends CommonObject
 
             }
             else
-           {
+            {
            		// We want only list of user id
                 $sql = "SELECT DISTINCT cpu.fk_user";
                 $sql.= " FROM ".MAIN_DB_PREFIX."holiday_users as cpu";
@@ -1199,14 +1214,25 @@ class Holiday extends CommonObject
 
         }
         else
-       { // Si faux donc user Congés Payés
+        { // Si faux donc user Congés Payés
 
             // List for Dolibarr users
             if ($type)
             {
                 $sql = "SELECT u.rowid, u.lastname, u.firstname";
                 $sql.= " FROM ".MAIN_DB_PREFIX."user as u";
-                $sql.= " WHERE statut > 0";
+
+                if (! empty($conf->multicompany->enabled) && ! empty($conf->multicompany->transverse_mode))
+                {
+                	$sql.= ", ".MAIN_DB_PREFIX."usergroup_user as ug";
+                	$sql.= " WHERE (ug.fk_user = u.rowid";
+                	$sql.= " AND ug.entity = ".$conf->entity.")";
+                	$sql.= " OR u.admin = 1";
+                }
+                else
+                	$sql.= " WHERE u.entity IN (0,".$conf->entity.")";
+
+                $sql.= " AND u.statut > 0";
 
                 dol_syslog(get_class($this)."::fetchUsers", LOG_DEBUG);
                 $resql=$this->db->query($sql);
diff --git a/htdocs/holiday/define_holiday.php b/htdocs/holiday/define_holiday.php
index 71d286348e8..c181036a0da 100644
--- a/htdocs/holiday/define_holiday.php
+++ b/htdocs/holiday/define_holiday.php
@@ -1,7 +1,8 @@
 <?php
-/* Copyright (C) 2007-2015 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2011      Dimitri Mouillard <dmouillard@teclib.com>
- * Copyright (C) 2013      Marcos García <marcosgdf@gmail.com>
+/* Copyright (C) 2007-2015	Laurent Destailleur	<eldy@users.sourceforge.net>
+ * Copyright (C) 2011		Dimitri Mouillard	<dmouillard@teclib.com>
+ * Copyright (C) 2013		Marcos García		<marcosgdf@gmail.com>
+ * Copyright (C) 2016		Regis Houssin		<regis.houssin@capnetworks.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -132,7 +133,7 @@ elseif($action == 'add_event')
         $new_holiday = $nb_holiday + $add_holiday;
 
         // add event to existing types of vacation
-        foreach ($typeleaves as $key => $leave) 
+        foreach ($typeleaves as $key => $leave)
         {
         	$vacationTypeID = $leave['rowid'];
 
@@ -160,7 +161,7 @@ print load_fiche_titre($langs->trans('MenuConfCP'), '', 'title_hrm.png');
 
 print '<div class="info">'.$langs->trans('LastUpdateCP').': '."\n";
 $lastUpdate = $holiday->getConfCP('lastUpdate');
-if ($lastUpdate) 
+if ($lastUpdate)
 {
     $monthLastUpdate = $lastUpdate[4].$lastUpdate[5];
     $yearLastUpdate = $lastUpdate[0].$lastUpdate[1].$lastUpdate[2].$lastUpdate[3];
@@ -215,7 +216,7 @@ else
 {
     print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">'."\n";
     print '<input type="hidden" name="action" value="update" />';
-    
+
     print '<table class="noborder" width="100%;">';
     print "<tr class=\"liste_titre\">";
     print '<td width="55%">'.$langs->trans('Employee').'</td>';
@@ -233,12 +234,12 @@ else
     print '<td width="20%" style="text-align:center">'.$langs->trans('Note').'</td>';
     print '<td></td>';
     print '</tr>';
-    
-    
+
+
     foreach($listUsers as $users)
     {
         $var=!$var;
-    
+
         print '<tr '.$bc[$var].' style="height: 20px;">';
         print '<td>';
         $userstatic->id=$users['rowid'];
@@ -246,7 +247,7 @@ else
         $userstatic->firstname=$users['firstname'];
         print $userstatic->getNomUrl(1);
         print '</td>';
-    
+
         if (count($typeleaves))
         {
         	foreach($typeleaves as $key => $val)
@@ -261,17 +262,17 @@ else
         }
         else
         {
-            print '<td></td>';   
+            print '<td></td>';
         }
         print '<td style="text-align:center"><input type="text" value="" name="note_holiday['.$users['rowid'].']" size="30"/></td>';
         print '<td><input type="submit" name="update_cp['.$users['rowid'].']" value="'.dol_escape_htmltag($langs->trans("Update")).'" class="button"/></td>'."\n";
         print '</tr>';
-    
+
         $i++;
     }
-    
+
     print '</table>';
-    
+
     print '</form>';
 }
 
diff --git a/htdocs/holiday/list.php b/htdocs/holiday/list.php
index 3e74c7e14f5..46883f11a26 100644
--- a/htdocs/holiday/list.php
+++ b/htdocs/holiday/list.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2011	   Dimitri Mouillard	<dmouillard@teclib.com>
  * Copyright (C) 2013-2015 Laurent Destailleur	<eldy@users.sourceforge.net>
- * Copyright (C) 2012	   Regis Houssin		<regis.houssin@capnetworks.com>
+ * Copyright (C) 2012-2016 Regis Houssin		<regis.houssin@capnetworks.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -232,16 +232,16 @@ if ($id > 0)
 	$title = $langs->trans("User");
 	$linkback = '<a href="'.DOL_URL_ROOT.'/user/index.php">'.$langs->trans("BackToList").'</a>';
 	$head = user_prepare_head($fuser);
-	
+
 	dol_fiche_head($head, 'paidholidays', $title, 0, 'user');
 
     dol_banner_tab($fuser,'id',$linkback,$user->rights->user->user->lire || $user->admin);
-    
-    
+
+
     print '<div class="underbanner clearboth"></div>';
-    
+
     print '<br>';
-    
+
 }
 else
 {
@@ -283,7 +283,7 @@ if ($sall)
     foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val);
     print $langs->trans("FilterOnInto", $sall) . join(', ',$fieldstosearchall);
 }
-    
+
 print '<table class="noborder" width="100%;">';
 print "<tr class=\"liste_titre\">";
 print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"cp.rowid","",'','',$sortfield,$sortorder);
diff --git a/htdocs/includes/ccampbell/chromephp/ChromePhp.php b/htdocs/includes/ccampbell/chromephp/ChromePhp.php
old mode 100755
new mode 100644
diff --git a/htdocs/includes/mobiledetect/mobiledetectlib/tests/BasicsTest.php b/htdocs/includes/mobiledetect/mobiledetectlib/tests/BasicsTest.php
old mode 100755
new mode 100644
diff --git a/htdocs/includes/tecnickcom/tcpdf/tools/tcpdf_addfont.php b/htdocs/includes/tecnickcom/tcpdf/tools/tcpdf_addfont.php
old mode 100755
new mode 100644
diff --git a/htdocs/index.php b/htdocs/index.php
index 9f186ec1bf7..3fa01b5cc98 100644
--- a/htdocs/index.php
+++ b/htdocs/index.php
@@ -170,6 +170,7 @@ if (empty($user->societe_id))
 	    ! empty($conf->contrat->enabled) && $user->rights->contrat->activer,
 		! empty($conf->supplier_order->enabled) && $user->rights->fournisseur->commande->lire && empty($conf->global->SOCIETE_DISABLE_SUPPLIERS_ORDERS_STATS),
 		! empty($conf->supplier_invoice->enabled) && $user->rights->fournisseur->facture->lire && empty($conf->global->SOCIETE_DISABLE_SUPPLIERS_INVOICES_STATS),
+		! empty($conf->supplier_proposal->enabled) && $user->rights->supplier_proposal->lire && empty($conf->global->SOCIETE_DISABLE_SUPPLIERS_PROPOSAL_STATS),
 	    ! empty($conf->expensereport->enabled) && $user->rights->expensereport->lire,
 	    ! empty($conf->projet->enabled) && $user->rights->projet->lire
 	    );
@@ -188,6 +189,7 @@ if (empty($user->societe_id))
     	    DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php",
     	    DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.commande.class.php",
     	    DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.facture.class.php",
+    	    DOL_DOCUMENT_ROOT."/supplier_proposal/class/supplier_proposal.class.php",
 	        DOL_DOCUMENT_ROOT."/expensereport/class/expensereport.class.php",
             DOL_DOCUMENT_ROOT."/projet/class/project.class.php" 
 	    );
@@ -205,7 +207,8 @@ if (empty($user->societe_id))
 	                   'Contrat',
 	                   'CommandeFournisseur',
 	                   'FactureFournisseur',
-					   'ExpenseReport',
+            	       'SupplierProposal',
+	                   'ExpenseReport',
 	                   'Project'
 	    );
 	    // Cle array returned by the method load_state_board for each line
@@ -222,7 +225,8 @@ if (empty($user->societe_id))
 	                'Contracts',
 	                'supplier_orders',
 	                'supplier_invoices',
-					'expensereports',
+	                'askprice',
+	                'expensereports',
 	                'projects'
 	    );
 	    // Dashboard Icon lines
@@ -239,6 +243,7 @@ if (empty($user->societe_id))
 	                 'order',
 	                 'order',
 	                 'bill',
+	                 'propal',
 					 'trip',
 	                 'project'
 	    );
@@ -255,7 +260,8 @@ if (empty($user->societe_id))
 	                  "BillsCustomers",
 	                  "Contracts",
 	                  "SuppliersOrders",
-	                  "SuppliersInvoices",
+                      "SuppliersInvoices",
+	                  "SupplierProposalShort",
 					  "ExpenseReports",
 	                  "Projects"
 	    );
@@ -273,7 +279,8 @@ if (empty($user->societe_id))
     	    DOL_URL_ROOT.'/compta/facture/list.php?mainmenu=accountancy',
     	    DOL_URL_ROOT.'/contrat/list.php',
     	    DOL_URL_ROOT.'/fourn/commande/list.php',
-    	    DOL_URL_ROOT.'/fourn/facture/list.php',
+	        DOL_URL_ROOT.'/fourn/facture/list.php',
+	        DOL_URL_ROOT.'/supplier_proposal/list.php',
     		DOL_URL_ROOT.'/expensereport/list.php?mainmenu=hrm',
 	        DOL_URL_ROOT.'/projet/list.php?mainmenu=project'
 	    );
@@ -287,7 +294,8 @@ if (empty($user->societe_id))
 	                    "produts",
 	                    "propal",
 	                    "orders",
-	                    "bills",
+            	        "bills",
+            	        "supplier_proposal",
 						"contracts",
 						"trips",
 	                    "projects"
@@ -387,9 +395,19 @@ if (! empty($conf->propal->enabled) && $user->rights->propale->lire)
 {
     include_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
     $board=new Propal($db);
-	$dashboardlines[] = $board->load_board($user,"opened");
-	// Number of commercial proposals CLOSED signed (billed)
-	$dashboardlines[] = $board->load_board($user,"signed");
+    $dashboardlines[] = $board->load_board($user,"opened");
+    // Number of commercial proposals CLOSED signed (billed)
+    $dashboardlines[] = $board->load_board($user,"signed");
+}
+
+// Number of commercial proposals opened (expired)
+if (! empty($conf->supplier_proposal->enabled) && $user->rights->supplier_proposal->lire)
+{
+    include_once DOL_DOCUMENT_ROOT.'/supplier_proposal/class/supplier_proposal.class.php';
+    $board=new SupplierProposal($db);
+    $dashboardlines[] = $board->load_board($user,"opened");
+    // Number of commercial proposals CLOSED signed (billed)
+    $dashboardlines[] = $board->load_board($user,"signed");
 }
 
 // Number of customer orders a deal
@@ -438,7 +456,11 @@ if (! empty($conf->banque->enabled) && $user->rights->banque->lire && ! $user->s
 {
     include_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
     $board=new Account($db);
-	$dashboardlines[] = $board->load_board($user);
+    $nb = $board::countAccountToReconcile();
+    if ($nb > 0)
+    {
+        $dashboardlines[] = $board->load_board($user);
+    }
 }
 
 // Number of cheque to send
@@ -519,7 +541,7 @@ foreach($valid_dashboardlines as $board)
     
     if ($showweather)
     {
-        $boxwork.='<td class="nohover hideonsmartphone" rowspan="'.$rowspan.'" width="80" style="border-left: 1px solid #DDDDDD" align="center">';
+        $boxwork.='<td class="nohover hideonsmartphone noborderbottom" rowspan="'.$rowspan.'" width="80" style="border-left: 1px solid #DDDDDD" align="center">';
         $text='';
         if ($totallate > 0) $text=$langs->transnoentitiesnoconv("WarningYouHaveAtLeastOneTaskLate").' ('.$langs->transnoentitiesnoconv("NActionsLate",$totallate).')';
         $options='height="64px"';
diff --git a/htdocs/install/inc.php b/htdocs/install/inc.php
index 408b7555d5b..1fa6189df67 100644
--- a/htdocs/install/inc.php
+++ b/htdocs/install/inc.php
@@ -127,7 +127,7 @@ if (! defined('DONOTLOADCONF') && file_exists($conffile) && filesize($conffile)
         $includeconferror='ErrorBadFormatForConfFile';
     }
 }
-$conf->global->MAIN_LOGTOHTML = 1;
+$conf->global->MAIN_ENABLE_LOG_TO_HTML = 1;
 
 // Define prefix
 if (! isset($dolibarr_main_db_prefix) || ! $dolibarr_main_db_prefix) $dolibarr_main_db_prefix='llx_';
diff --git a/htdocs/install/mysql/data/llx_const.sql b/htdocs/install/mysql/data/llx_const.sql
index ae452f85bf8..d6286c8e120 100644
--- a/htdocs/install/mysql/data/llx_const.sql
+++ b/htdocs/install/mysql/data/llx_const.sql
@@ -35,6 +35,7 @@ insert into llx_const (name, value, type, note, visible, entity) values ('MAIN_N
 insert into llx_const (name, value, type, note, visible, entity) values ('MAIN_FEATURES_LEVEL','0','chaine','Level of features to show: -1=stable+deprecated, 0=stable only (default), 1=stable+experimental, 2=stable+experimental+development',1,0);
 insert into llx_const (name, value, type, note, visible, entity) values ('MAIN_LOGTOHTML','0','chaine','If this constants is defined, it is possible to have logs inside pages by adding the parameter &logtohtml=1',1,0);
 insert into llx_const (name, value, type, note, visible, entity) values ('MAILING_LIMIT_SENDBYWEB','25','chaine','Number of targets to defined packet size when sending mass email',1,0);
+insert into llx_const (name, value, type, note, visible, entity) values ('MAIN_ENABLE_LOG_TO_HTML','0','chaine','If this option is set to 1, it is possible to see log output at end of HTML sources by adding paramater logtohtml=1 on URL',1,0);
 
 -- Hidden and common to all entities
 insert into llx_const (name, value, type, note, visible, entity) values ('SYSLOG_HANDLERS','["mod_syslog_file"]','chaine','Which logger to use',0,0);
diff --git a/htdocs/install/mysql/migration/3.7.0-3.8.0.sql b/htdocs/install/mysql/migration/3.7.0-3.8.0.sql
index 2c0a788e446..068fbc753cb 100755
--- a/htdocs/install/mysql/migration/3.7.0-3.8.0.sql
+++ b/htdocs/install/mysql/migration/3.7.0-3.8.0.sql
@@ -797,3 +797,17 @@ ALTER TABLE llx_societe_remise_except MODIFY COLUMN description text NOT NULL;
 update llx_opensurvey_sondage set format = 'D' where format = 'D+';
 update llx_opensurvey_sondage set format = 'A' where format = 'A+';
 
+
+--Deal with holidays_user that do not have rowid
+-- Disabled: too dangerous patch. rowid is a primary key. How is it possible to have no rowid ?
+--CREATE TABLE llx_holiday_users_tmp
+--(
+--	rowid       integer NOT NULL AUTO_INCREMENT PRIMARY KEY,
+--	fk_user     integer NOT NULL,
+--	fk_type     integer NOT NULL,
+--	nb_holiday  real NOT NULL DEFAULT '0'
+--) ENGINE=innodb;
+--INSERT INTO llx_holiday_users_tmp(fk_user,fk_type,nb_holiday) SELECT fk_user,fk_type,nb_holiday FROM llx_holiday_users;
+--DROP TABLE llx_holiday_users;
+--ALTER TABLE llx_holiday_users_tmp RENAME TO llx_holiday_users;
+
diff --git a/htdocs/install/mysql/migration/3.8.0-3.9.0.sql b/htdocs/install/mysql/migration/3.8.0-3.9.0.sql
index b6be65f725c..9d77a87fd7c 100644
--- a/htdocs/install/mysql/migration/3.8.0-3.9.0.sql
+++ b/htdocs/install/mysql/migration/3.8.0-3.9.0.sql
@@ -22,6 +22,9 @@
 -- -- VMYSQL4.1 DELETE FROM llx_usergroup_user      WHERE fk_usergroup NOT IN (SELECT rowid from llx_usergroup);
 
 
+insert into llx_const (name, value, type, note, visible, entity) values ('MAIN_ENABLE_LOG_TO_HTML','0','chaine','If this option is set to 1, it is possible to see log output at end of HTML sources by adding paramater logtohtml=1 on URL',1,0);
+
+
 -- Was done into a 3.8 fix, so we must do it also in 3.9 
 ALTER TABLE llx_don ADD COLUMN fk_country integer NOT NULL DEFAULT 0 after country;
 
@@ -593,6 +596,7 @@ ALTER TABLE llx_accounting_bookkeeping MODIFY COLUMN doc_ref varchar(300) NOT NU
 
 ALTER TABLE llx_holiday ADD COLUMN tms timestamp;
 ALTER TABLE llx_holiday ADD COLUMN entity integer DEFAULT 1 NOT NULL;
+ALTER TABLE llx_holiday ADD INDEX idx_holiday_entity (entity);
 
 -- Fix Argentina provences
 INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2326', 2305, '', 0, 'MISIONES', 'Misiones', 1);
diff --git a/htdocs/install/mysql/migration/3.9.0-4.0.0.sql b/htdocs/install/mysql/migration/3.9.0-4.0.0.sql
index b91c50fd05d..c30a3da50f0 100644
--- a/htdocs/install/mysql/migration/3.9.0-4.0.0.sql
+++ b/htdocs/install/mysql/migration/3.9.0-4.0.0.sql
@@ -322,3 +322,4 @@ ALTER TABLE llx_expensereport_det ADD COLUMN multicurrency_total_ttc double(24,8
 
 ALTER TABLE llx_product_lang ADD COLUMN import_key varchar(14) DEFAULT NULL;
 
+ALTER TABLE llx_actioncomm MODIFY COLUMN elementtype varchar(255) DEFAULT NULL;
\ No newline at end of file
diff --git a/htdocs/install/mysql/migration/repair.sql b/htdocs/install/mysql/migration/repair.sql
index dbb2ee0b7df..eab10d78383 100755
--- a/htdocs/install/mysql/migration/repair.sql
+++ b/htdocs/install/mysql/migration/repair.sql
@@ -236,3 +236,8 @@ delete from llx_commande_fournisseur_dispatch where fk_commandefourndet = 0 or f
 delete from llx_menu where menu_handler = 'smartphone';
 
 
+-- Detect bad consistency between duraction_effective of a task and sum of time of tasks
+-- select pt.rowid, pt.duration_effective, SUM(ptt.task_duration) as y from llx_projet_task as pt, llx_projet_task_time as ptt where ptt.fk_task = pt.rowid group by pt.rowid, pt.duration_effective having pt.duration_effective <> y;
+update llx_projet_task as pt set pt.duration_effective = (select SUM(ptt.task_duration) as y from llx_projet_task_time as ptt where ptt.fk_task = pt.rowid) where pt.duration_effective <> (select SUM(ptt.task_duration) as y from llx_projet_task_time as ptt where ptt.fk_task = pt.rowid)
+ 
+
diff --git a/htdocs/install/mysql/tables/llx_actioncomm.sql b/htdocs/install/mysql/tables/llx_actioncomm.sql
index b2f0ecc6920..48b96aee95a 100644
--- a/htdocs/install/mysql/tables/llx_actioncomm.sql
+++ b/htdocs/install/mysql/tables/llx_actioncomm.sql
@@ -69,7 +69,7 @@ create table llx_actioncomm
   recurdateend      datetime,
      
   fk_element		integer DEFAULT NULL,
-  elementtype		varchar(32) DEFAULT NULL
+  elementtype		varchar(255) DEFAULT NULL
 
 )ENGINE=innodb;
 
diff --git a/htdocs/install/mysql/tables/llx_holiday.key.sql b/htdocs/install/mysql/tables/llx_holiday.key.sql
index 8c66d2d80d4..9a1a6ae49e3 100644
--- a/htdocs/install/mysql/tables/llx_holiday.key.sql
+++ b/htdocs/install/mysql/tables/llx_holiday.key.sql
@@ -1,5 +1,6 @@
 -- ===================================================================
--- Copyright (C) 2012      Laurent Destailleur  <eldy@users.sourceforge.net>
+-- Copyright (C) 2012	Laurent Destailleur	<eldy@users.sourceforge.net>
+-- Copyright (C) 2016	Regis Houssin		<regis.houssin@capnetworks.com>
 --
 -- This program is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
@@ -16,6 +17,7 @@
 --
 -- ===================================================================
 
+ALTER TABLE llx_holiday ADD INDEX idx_holiday_entity (entity);
 ALTER TABLE llx_holiday ADD INDEX idx_holiday_fk_user (fk_user);
 ALTER TABLE llx_holiday ADD INDEX idx_holiday_fk_user_create (fk_user_create);
 ALTER TABLE llx_holiday ADD INDEX idx_holiday_date_create (date_create);
diff --git a/htdocs/install/mysql/tables/llx_holiday_users.sql b/htdocs/install/mysql/tables/llx_holiday_users.sql
index 5aa1c3fc061..00ac2715458 100644
--- a/htdocs/install/mysql/tables/llx_holiday_users.sql
+++ b/htdocs/install/mysql/tables/llx_holiday_users.sql
@@ -21,5 +21,4 @@ CREATE TABLE llx_holiday_users
 	fk_user     integer NOT NULL,
 	fk_type     integer NOT NULL,
 	nb_holiday   real NOT NULL DEFAULT '0'
-) 
-ENGINE=innodb;
\ No newline at end of file
+) ENGINE=innodb;
\ No newline at end of file
diff --git a/htdocs/install/step1.php b/htdocs/install/step1.php
index e8bb030ed81..70f1f3422ea 100644
--- a/htdocs/install/step1.php
+++ b/htdocs/install/step1.php
@@ -431,10 +431,10 @@ if (! $error && $db->connected && $action == "set")
     $main_db_prefix = (! empty($db_prefix) ? $db_prefix : 'llx_');
 
     // Force https
-    $main_force_https = ((GETPOST("main_force_https") && (GETPOST("main_force_https") == "on" || GETPOST("main_force_https") == 1)) ? '1' : '0');
+    $main_force_https = ((GETPOST("main_force_https") && (GETPOST("main_force_https") == "on" || GETPOST("main_force_https") == '1')) ? '1' : '0');
 
     // Use alternative directory
-    $main_use_alt_dir = ((GETPOST("main_use_alt_dir") && (GETPOST("main_use_alt_dir") == "on" || GETPOST("main_use_alt_dir") == 1)) ? '' : '//');
+    $main_use_alt_dir = ((GETPOST("main_use_alt_dir") && (GETPOST("main_use_alt_dir") == "off" || GETPOST("main_use_alt_dir") == '0')) ? '//' : '');
 
     // Alternative root directory name
     $main_alt_dir_name = ((GETPOST("main_alt_dir_name") && GETPOST("main_alt_dir_name") != '') ? GETPOST("main_alt_dir_name") : 'custom');
@@ -455,8 +455,8 @@ if (! $error && $db->connected && $action == "set")
     }
 
     // Write main.inc.php and master.inc.php into documents/custom dir
-    $error+=write_main_file($main_data_dir.'/custom/main.inc.php',$main_dir);
-    $error+=write_master_file($main_data_dir.'/custom/master.inc.php',$main_dir);
+    //$error+=write_main_file($main_data_dir.'/custom/main.inc.php',$main_dir);
+    //$error+=write_master_file($main_data_dir.'/custom/master.inc.php',$main_dir);
 
     // Create database and admin user database
     if (! $error)
@@ -859,6 +859,9 @@ function write_conf_file($conffile)
 		fputs($fp, '// Specific settings');
         fputs($fp,"\n");
 
+        fputs($fp, '//$dolibarr_main_demo=\'autologin,autopass\';');
+        fputs($fp,"\n");
+
         fputs($fp, '$dolibarr_main_prod=\'0\';');
         fputs($fp,"\n");
 
diff --git a/htdocs/langs/ar_SA/admin.lang b/htdocs/langs/ar_SA/admin.lang
index d07d6aade76..ee353b1e5b2 100644
--- a/htdocs/langs/ar_SA/admin.lang
+++ b/htdocs/langs/ar_SA/admin.lang
@@ -282,6 +282,7 @@ ModuleSetup=إعداد وحدة
 ModulesSetup=نمائط الإعداد
 ModuleFamilyBase=نظام
 ModuleFamilyCrm=إدارة علاقات العملاء (CRM)
+ModuleFamilySrm=Supplier Relation Management (SRM)
 ModuleFamilyProducts=إدارة المنتجات (PM)
 ModuleFamilyHr=إدارة الموارد البشرية (HR)
 ModuleFamilyProjects=مشاريع / العمل التعاوني
@@ -587,6 +588,7 @@ Permission38=منتجات التصدير
 Permission41=مشاريع القراءة والمهام (مشروع مشترك ومشاريع انا اتصال ل). كما يمكن أن يدخل الوقت المستهلك في المهام الموكلة (الجدول الزمني)
 Permission42=إنشاء / تعديل مشاريع تعديل مهام بلدي المشاريع
 Permission44=حذف مشاريع
+Permission45=Export projects
 Permission61=قراءة التدخلات
 Permission62=إنشاء / تعديل التدخلات
 Permission64=حذف التدخلات
@@ -640,6 +642,7 @@ Permission162=إنشاء / تعديل العقود / الاشتراكات
 Permission163=تفعيل خدمة / الاشتراك عقد
 Permission164=تعطيل خدمة / الاشتراك عقد
 Permission165=حذف العقود / الاشتراكات
+Permission167=Export contracts
 Permission171=قراءة الرحلات والنفقات (لك والمرؤوسين لديك)
 Permission172=إنشاء / تعديل الرحلات والمصاريف
 Permission173=حذف الرحلات والمصاريف
@@ -788,6 +791,7 @@ Permission2403=قراءة الأعمال (أو أحداث المهام) آخري
 Permission2411=الإجراءات قراءة (أحداث أو المهام) للاخرين
 Permission2412=إنشاء / تعديل الإجراءات (أحداث أو المهام) للاخرين
 Permission2413=حذف الإجراءات (أحداث أو المهام) للاخرين
+Permission2414=Export actions/tasks of others
 Permission2501=قراءة وثائق
 Permission2502=تقديم وثائق أو حذف
 Permission2503=تقديم وثائق أو حذف
@@ -1713,3 +1717,4 @@ ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP و CRM%s هو متاح. 
 MultiPriceRuleDesc=عندما خيار "مستوى العديد من الأسعار لكل المنتجات / الخدمات" في وضع التشغيل، يمكنك تحديد أسعار مختلفة (واحد لكل مستوى الأسعار) لكل منتج. لتوفير الوقت، يمكنك الدخول هنا حكم أن يكون السعر لكل مستوى autocalculated وفقا لسعر المستوى الأول، لذلك سيكون لديك للدخول الثمن الوحيد للمستوى الأول على كل منتج. هذه الصفحة هي هنا لتوفر لك الوقت ويمكن أن تكون مفيدة فقط إذا كانت الأسعار الخاص لكل LEVE قريبة إلى المستوى الأول. يمكنك تجاهل هذه الصفحة في معظم الحالات.
 ModelModulesProduct=Templates for product documents
 ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
+SeeSubstitutionVars=See * note for list of possible substitution variables
diff --git a/htdocs/langs/ar_SA/bills.lang b/htdocs/langs/ar_SA/bills.lang
index 8ac3a431786..bc3676a2b63 100644
--- a/htdocs/langs/ar_SA/bills.lang
+++ b/htdocs/langs/ar_SA/bills.lang
@@ -219,6 +219,7 @@ RemainderToBill=تبقى لمشروع قانون
 SendBillByMail=ارسال الفاتورة عن طريق البريد الإلكتروني
 SendReminderBillByMail=إرسال تذكرة عن طريق البريد الإلكتروني
 RelatedCommercialProposals=المقترحات المتعلقة التجارية
+RelatedRecurringCustomerInvoices=Related recurring customer invoices
 MenuToValid=لصحيحة
 DateMaxPayment=قبل استحقاق الدفع
 DateEcheance=الحد من الموعد المقرر
@@ -319,7 +320,6 @@ toolTipFrequency=Examples:<br /><b>Set 7 / day</b>: give a new invoice every 7 d
 NextDateToExecution=Date for next invoice generation
 DateLastGeneration=Date of last generation
 MaxPeriodNumber=Max nb of invoice generation
-RestPeriodNumber=Rest period number
 NbOfGenerationDone=Nb of invoice generation already done
 InvoiceAutoValidate=Automatically validate invoice
 GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
@@ -471,3 +471,7 @@ PDFCrevetteSituationInvoiceLine=Situation N°%s : Inv. N°%s on %s
 TotalSituationInvoice=Total situation
 invoiceLineProgressError=Invoice line progress can't be egal or upper the next invoice line
 updatePriceNextInvoiceErrorUpdateline=Error : update price on invoice line : %s
+ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
+ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
+ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
+
diff --git a/htdocs/langs/ar_SA/boxes.lang b/htdocs/langs/ar_SA/boxes.lang
index a356d8ed94b..51edccd6461 100644
--- a/htdocs/langs/ar_SA/boxes.lang
+++ b/htdocs/langs/ar_SA/boxes.lang
@@ -60,8 +60,8 @@ BoxTitleLastContracts=العقود %s الماضية
 BoxTitleLastModifiedDonations=أخر  %s التبرعات تعديل
 BoxTitleLastModifiedExpenses=أخر  %s  تقارير النفقات المعدلة
 BoxGlobalActivity=النشاط العالمي (الفواتير والمقترحات والطلبات)
-BoxGoodCustomers=Good Customers
-BoxTitleGoodCustomers=%s Good Customers
+BoxGoodCustomers=Good customers
+BoxTitleGoodCustomers=%s Good customers
 FailedToRefreshDataInfoNotUpToDate=فشل لتحديث تدفق RSS. تاريخ آخر تحديث ناجحا:٪ الصورة
 LastRefreshDate=تاريخ آخر تحديث
 NoRecordedBookmarks=أية إشارات محددة.
diff --git a/htdocs/langs/ar_SA/companies.lang b/htdocs/langs/ar_SA/companies.lang
index f6f39963c5c..d1fdeae5118 100644
--- a/htdocs/langs/ar_SA/companies.lang
+++ b/htdocs/langs/ar_SA/companies.lang
@@ -202,7 +202,7 @@ ProfId3IN=معرف البروفيسور 3
 ProfId4IN=معرف البروفيسور 4
 ProfId5IN=الأستاذ رقم 5
 ProfId6IN=-
-ProfId1LU=Id. prof. 1 (RCS)
+ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
 ProfId2LU=Id. prof. 2 (Business permit)
 ProfId3LU=-
 ProfId4LU=-
@@ -317,10 +317,12 @@ ShowContact=وتظهر الاتصال
 ContactsAllShort=جميع (بدون فلتر)
 ContactType=نوع الاتصال
 ContactForOrders=أوامر اتصال
+ContactForOrdersOrShipments=Order's or shipment's contact
 ContactForProposals=مقترحات اتصال
 ContactForContracts=عقود اتصال
 ContactForInvoices=فواتير اتصال
 NoContactForAnyOrder=هذا الاتصال ليس من أجل أي اتصال
+NoContactForAnyOrderOrShipment=This contact is not a contact for any order or shipment
 NoContactForAnyProposal=هذا الاتصال ليست على اتصال في أي اقتراح التجارية
 NoContactForAnyContract=هذا الاتصال ليس أي عقد للاتصال
 NoContactForAnyInvoice=هذا الاتصال ليست على اتصال في أي فاتورة
@@ -438,3 +440,6 @@ MergeThirdparties=دمج أطراف ثالثة
 ConfirmMergeThirdparties=هل أنت متأكد أنك تريد دمج هذا الطرف الثالث في واحدة الحالي؟ كل الكائنات المرتبطة (الفواتير وأوامر، ...) سيتم نقلها إلى طرف ثالث الحالي لذلك سوف تكون قادرة على حذف واحد مكرر.
 ThirdpartiesMergeSuccess=تم دمج Thirdparties
 ErrorThirdpartiesMerge=كان هناك خطأ عند حذف thirdparties. يرجى التحقق من السجل. وقد عادت التغييرات.
+SaleRepresentativeLogin=Login of sale representative
+SaleRepresentativeFirstname=Firstname of sale representative
+SaleRepresentativeLastname=Lastname of sale representative
diff --git a/htdocs/langs/ar_SA/errors.lang b/htdocs/langs/ar_SA/errors.lang
index 2885fa8356c..ffd7c67d882 100644
--- a/htdocs/langs/ar_SA/errors.lang
+++ b/htdocs/langs/ar_SA/errors.lang
@@ -172,6 +172,8 @@ ErrorMandatoryParametersNotProvided=معيار إلزامي (ق) لم تقدم
 ErrorOppStatusRequiredIfAmount=قمت بتعيين المبلغ المقدر لهذه الفرصة / الرصاص. لذلك يجب عليك أيضا إدخال مكانتها
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=سيئة تعريف القائمة صفيف في الوحدة واصف (القيمة سيئة لfk_menu مفتاح)
 ErrorSavingChanges=وقد ocurred لخطأ عند حفظ التغييرات
+ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
+ErrorFileMustHaveFormat=File must have format %s
 
 # Warnings
 WarningPasswordSetWithNoAccount=تم تعيين كلمة مرور لهذا العضو. ومع ذلك، تم إنشاء أي حساب المستخدم. لذلك يتم تخزين كلمة المرور هذه ولكن لا يمكن استخدامها للدخول إلى Dolibarr. ويمكن استخدامه من قبل وحدة / واجهة خارجية ولكن إذا كنت لا تحتاج إلى تعريف أي تسجيل دخول أو كلمة المرور لأحد أفراد، يمكنك تعطيل خيار "إدارة تسجيل دخول لكل عضو" من إعداد وحدة الأعضاء. إذا كنت بحاجة إلى إدارة تسجيل الدخول ولكن لا تحتاج إلى أي كلمة المرور، يمكنك الحفاظ على هذا الحقل فارغا لتجنب هذا التحذير. ملاحظة: يمكن أيضا أن تستخدم البريد الإلكتروني لتسجيل الدخول إذا تم ربط عضو إلى المستخدم.
diff --git a/htdocs/langs/ar_SA/exports.lang b/htdocs/langs/ar_SA/exports.lang
index 815af8970e3..c6afca6be48 100644
--- a/htdocs/langs/ar_SA/exports.lang
+++ b/htdocs/langs/ar_SA/exports.lang
@@ -128,6 +128,10 @@ SpecialCode=رمز خاص
 ExportStringFilter=٪٪ يسمح استبدال حرف واحد أو أكثر في النص
 ExportDateFilter=YYYY، YYYYMM، YYYYMMDD: فلاتر لسنة واحدة / شهر / يوم <br> YYYY + YYYY، YYYYMM + YYYYMM، YYYYMMDD + YYYYMMDD: مرشحات على مجموعة من سنوات / أشهر / أيام <br> > YYYY،> YYYYMM،> YYYYMMDD: مرشحات على جميع السنوات / أشهر / يوما التالية <br> <YYYY، <YYYYMM، <YYYYMMDD: مرشحات على جميع السنوات / أشهر / يوما السابقة
 ExportNumericFilter=مرشحات "NNNNN من حيث القيمة واحد <br> مرشحات "NNNNN + NNNNN" على مجموعة من القيم <br> '> NNNNN' المرشحات من قبل انخفاض القيم <br> '> NNNNN' المرشحات بالقيم العليا
+ImportFromLine=Import starting from line number
+EndAtLineNb=End at line number
+SetThisValueTo2ToExcludeFirstLine=For example, set this value to 3 to exclude the 2 first lines
+KeepEmptyToGoToEndOfFile=Keep this field empty to go up to the end of file
 ## filters
 SelectFilterFields=إذا كنت ترغب في تصفية على بعض القيم، قيم الإدخال فقط هنا.
 FilterableFields=الحقول تصفيتها
diff --git a/htdocs/langs/ar_SA/main.lang b/htdocs/langs/ar_SA/main.lang
index f9196297cc6..8c3bdbde5ea 100644
--- a/htdocs/langs/ar_SA/main.lang
+++ b/htdocs/langs/ar_SA/main.lang
@@ -25,6 +25,7 @@ FormatDateHourTextShort=%d %b %Y %H:%M
 FormatDateHourText=%d %B %Y %H:%M
 DatabaseConnection=اتصال قاعدة البيانات
 NoTemplateDefined=No template defined for this email type
+AvailableVariables=Available substitution variables
 NoTranslation=لا يوجد ترجمة
 NoRecordFound=لا يوجد سجلات
 NoError=لا خطأ
diff --git a/htdocs/langs/ar_SA/orders.lang b/htdocs/langs/ar_SA/orders.lang
index 3e25da97039..aadc59da12e 100644
--- a/htdocs/langs/ar_SA/orders.lang
+++ b/htdocs/langs/ar_SA/orders.lang
@@ -32,6 +32,7 @@ StatusOrderSent=شحنة في عملية
 StatusOrderOnProcessShort=أمر
 StatusOrderProcessedShort=تجهيز
 StatusOrderDelivered=تم التوصيل
+StatusOrderDeliveredShort=Delivered
 StatusOrderToBillShort=على مشروع قانون
 StatusOrderToBill2Short=على مشروع قانون
 StatusOrderApprovedShort=وافق
diff --git a/htdocs/langs/ar_SA/products.lang b/htdocs/langs/ar_SA/products.lang
index 582c71fb6a2..07aa6d9fa9a 100644
--- a/htdocs/langs/ar_SA/products.lang
+++ b/htdocs/langs/ar_SA/products.lang
@@ -45,10 +45,6 @@ LastProducts=آخر المنتجات
 CardProduct0=منتجات البطاقات
 CardProduct1=بطاقة الخدمة
 CardContract=عقد بطاقة
-Warehouse=مخزن
-Warehouses=المستودعات
-WarehouseOpened=مستودع مفتوح
-WarehouseClosed=مخزن مغلق
 Stock=الأسهم
 Stocks=الاسهم
 Movement=الحركة
@@ -318,3 +314,11 @@ WarningSelectOneDocument=يرجى تحديد وثيقة واحدة على الأ
 DefaultUnitToShow=Unit
 NbOfQtyInProposals=Qty in proposals
 ClinkOnALinkOfColumn=Click on a link of column %s to get a detailed view...
+TranslatedLabel=Translated label
+TranslatedDescription=Translated description
+TranslatedNote=Translated notes
+ProductWeight=Weight for 1 product
+ProductVolume=Volume for 1 product
+WeightUnits=Weight unit
+VolumeUnits=Volume unit
+SizeUnits=Size unit
diff --git a/htdocs/langs/ar_SA/projects.lang b/htdocs/langs/ar_SA/projects.lang
index d39d5e63eee..bdd7967374a 100644
--- a/htdocs/langs/ar_SA/projects.lang
+++ b/htdocs/langs/ar_SA/projects.lang
@@ -74,6 +74,9 @@ Progress=تقدم
 ProgressDeclared=أعلن التقدم
 ProgressCalculated=تقدم تحسب
 Time=وقت
+ListOfTasks=List of tasks
+GoToListOfTimeConsumed=Go to list of time consumed
+GoToListOfTasks=Go to list of tasks
 ListProposalsAssociatedProject=قائمة المقترحات التجارية المرتبطة بالمشروع.
 ListOrdersAssociatedProject=قائمة الزبائن المرتبطة بالمشروع.
 ListInvoicesAssociatedProject=قائمة العملاء والفواتير المرتبطة بالمشروع
@@ -198,3 +201,4 @@ OppStatusNEGO=Negociation
 OppStatusPENDING=بانتظار
 OppStatusWIN=فاز
 OppStatusLOST=ضائع
+Budget=Budget
diff --git a/htdocs/langs/ar_SA/sendings.lang b/htdocs/langs/ar_SA/sendings.lang
index 810ae36a11b..1cae23d2b13 100644
--- a/htdocs/langs/ar_SA/sendings.lang
+++ b/htdocs/langs/ar_SA/sendings.lang
@@ -70,6 +70,8 @@ ProductQtyInSuppliersOrdersRunning=كمية المنتج إلى أوامر ال
 ProductQtyInShipmentAlreadySent=كمية المنتج من فتح النظام العميل ارسلت بالفعل
 ProductQtyInSuppliersShipmentAlreadyRecevied=كمية المنتج من فتح المورد النظام وردت بالفعل
 NoProductToShipFoundIntoStock=لا يوجد منتج للسفينة وجدت في <b>مستودع٪ الصورة.</b> الأسهم الصحيح أو العودة إلى اختيار مستودع آخر.
+WeightVolShort=Weight/Vol.
+ValidateOrderFirstBeforeShipment=You must first validate the order before being able to make shipments.
 
 # Sending methods
 SendingMethodCATCH=القبض على العملاء
diff --git a/htdocs/langs/ar_SA/supplier_proposal.lang b/htdocs/langs/ar_SA/supplier_proposal.lang
index 66c89f5237c..eb31714c244 100644
--- a/htdocs/langs/ar_SA/supplier_proposal.lang
+++ b/htdocs/langs/ar_SA/supplier_proposal.lang
@@ -58,3 +58,5 @@ DefaultModelSupplierProposalCreate=إنشاء نموذج افتراضي
 DefaultModelSupplierProposalToBill=القالب الافتراضي عند إغلاق طلب السعر (مقبول)
 DefaultModelSupplierProposalClosed=القالب الافتراضي عند إغلاق طلب السعر (رفض)
 ListOfSupplierProposal=قائمة الطلبات اقتراح المورد
+SupplierProposalsToClose=Supplier proposals to close
+SupplierProposalsToProcess=Supplier proposals to process
diff --git a/htdocs/langs/bg_BG/accountancy.lang b/htdocs/langs/bg_BG/accountancy.lang
index eb87905874f..a1f4944a052 100644
--- a/htdocs/langs/bg_BG/accountancy.lang
+++ b/htdocs/langs/bg_BG/accountancy.lang
@@ -1,22 +1,22 @@
 # Dolibarr language file - en_US - Accounting Expert
-ACCOUNTING_EXPORT_SEPARATORCSV=Column separator for export file
-ACCOUNTING_EXPORT_DATE=Date format for export file
-ACCOUNTING_EXPORT_PIECE=Export the number of piece
-ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=Export with global account
-ACCOUNTING_EXPORT_LABEL=Export the label
-ACCOUNTING_EXPORT_AMOUNT=Export the amount
+ACCOUNTING_EXPORT_SEPARATORCSV=Разделител за колона за експорт на файл
+ACCOUNTING_EXPORT_DATE=Формат на дата за експорт на файл
+ACCOUNTING_EXPORT_PIECE=Експортирай номера от частта
+ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=Експортирай глобалния акаунт
+ACCOUNTING_EXPORT_LABEL=Експортирай етикета
+ACCOUNTING_EXPORT_AMOUNT=Експортирай количеството
 ACCOUNTING_EXPORT_DEVISE=Export the devise
-Selectformat=Select the format for the file
-ACCOUNTING_EXPORT_PREFIX_SPEC=Specify the prefix for the file name
+Selectformat=Избери формата за файла
+ACCOUNTING_EXPORT_PREFIX_SPEC=Уточнете префикса за името на файла
 
 Accounting=Accounting
-Globalparameters=Global parameters
+Globalparameters=Глобални параметри
 Menuaccount=Accounting accounts
 Menuthirdpartyaccount=Thirdparty accounts
 MenuTools=Инструменти
 
 ConfigAccountingExpert=Configuration of the module accounting expert
-Journaux=Journals
+Journaux=Журнали
 JournalFinancial=Financial journals
 Exports=Exports
 Export=Export
@@ -104,7 +104,7 @@ Code_tiers=Трета страна
 Labelcompte=Етикет на сметка
 Sens=Sens
 Codejournal=Дневник
-NumPiece=Piece number
+NumPiece=Номер на част
 
 DelBookKeeping=Delete the records of the general ledger
 
diff --git a/htdocs/langs/bg_BG/admin.lang b/htdocs/langs/bg_BG/admin.lang
index 9b1d7e2ab12..56f6977a442 100644
--- a/htdocs/langs/bg_BG/admin.lang
+++ b/htdocs/langs/bg_BG/admin.lang
@@ -154,7 +154,7 @@ Purge=Изчистване
 PurgeAreaDesc=Тази страница ви позволява да изтриете всички файлове, които са построени или съхраняват от Dolibarr (временни файлове, или всички файлове в <b>%s</b> директория). Използването на тази функция не е необходимо. Тя е предвидена за потребители, чиито Dolibarr се хоства от доставчик, който не предлага разрешения за изтриване на файлове, построени от уеб сървъра.
 PurgeDeleteLogFile=Изтриване на влезете файлове <b>%s,</b> определени за Syslog модул (без риск от загуба на данни)
 PurgeDeleteTemporaryFiles=Изтриване на всички временни файлове (без риск от загуба на данни)
-PurgeDeleteTemporaryFilesShort=Delete temporary files
+PurgeDeleteTemporaryFilesShort=Изтрий временните файлове
 PurgeDeleteAllFilesInDocumentsDir=Изтриване на всички файлове в директорията <b>%s.</b> Временни файлове, но също така и резервната база данни сметища, файлове, прикрепени към елементи (контрагенти, фактури, ...) и качени в модул ECM ще бъдат изтрити.
 PurgeRunNow=Изчистване сега
 PurgeNothingToDelete=Директория или файл да изтриете.
@@ -282,6 +282,7 @@ ModuleSetup=Настройки на модул
 ModulesSetup=Настройки на модули
 ModuleFamilyBase=Система
 ModuleFamilyCrm=Управление на Връзки с клиенти (CRM)
+ModuleFamilySrm=Supplier Relation Management (SRM)
 ModuleFamilyProducts=Управление на продукти
 ModuleFamilyHr=Управление на човешките ресурси
 ModuleFamilyProjects=Проекти / съвместна работа
@@ -394,8 +395,8 @@ ExtrafieldLink=Link to an object
 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
 ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
 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>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<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>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<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
+ExtrafieldParamHelpsellist=Листа с параметри е от таблицата<br>Синтаксис: table_name:label_field:id_field::filter<br>Пример : c_typent:libelle:id::filter<br><br>филтъра може да бъде просто тест (напр. активен=1) за да покаже само активната стойност<br>Вие също може да използвате $ID$ във филтър, който е в настоящото id от текущия обект<br>За да направите ИЗБОР в филтъра $SEL$<br>ако желаете да филтрирате допълнителните полета използвайте синтаксиса  extra.fieldcode=... (където полето код е кодана допълнителното поле)<br><br>Реда на подреждането зависи от другите :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
+ExtrafieldParamHelpchkbxlst=Листа с параметри е от таблицата<br>Синтаксис: table_name:label_field:id_field::filter<br>Пример : c_typent:libelle:id::filter<br><br>филтъра може да бъде просто тест (напр. активен=1) за да покаже само активната стойност<br>Вие също може да използвате $ID$ във филтър, който е в настоящото id от текущия обект<br>За да направите ИЗБОР в филтъра $SEL$<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
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Example : Societe:societe/class/societe.class.php
 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>
@@ -417,7 +418,7 @@ ConfirmEraseAllCurrentBarCode=Are you sure you want to erase all current barcode
 AllBarcodeReset=All barcode values have been removed
 NoBarcodeNumberingTemplateDefined=No numbering barcode template enabled into barcode module setup.
 NoRecordWithoutBarcodeDefined=No record with no barcode value defined.
-EnableFileCache=Enable file cache
+EnableFileCache=Пусни кеширането на файла
 
 # Modules
 Module0Name=Потребители и групи
@@ -587,6 +588,7 @@ Permission38=Износ на продукти
 Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
 Permission42=Създаване / промяна на проекти (общи проекти и проекти съм се с нас за)
 Permission44=Изтриване на проекти (общи проекти и проекти съм се с нас за)
+Permission45=Export projects
 Permission61=Прочети интервенции
 Permission62=Създаване / промяна на интервенции
 Permission64=Изтриване на интервенции
@@ -640,6 +642,7 @@ Permission162=Create/modify contracts/subscriptions
 Permission163=Activate a service/subscription of a contract
 Permission164=Disable a service/subscription of a contract
 Permission165=Delete contracts/subscriptions
+Permission167=Export contracts
 Permission171=Read trips and expenses (yours and your subordinates)
 Permission172=Create/modify trips and expenses
 Permission173=Delete trips and expenses
@@ -788,6 +791,7 @@ Permission2403=Изтрий действия (събития или задачи
 Permission2411=Прочетете действия (събития или задачи) на другите
 Permission2412=Създаване / промяна действия (събития или задачи) на другите
 Permission2413=Изтрий действия (събития или задачи) на другите
+Permission2414=Export actions/tasks of others
 Permission2501=/ Изтегляне документи
 Permission2502=Изтегляне на документи
 Permission2503=Изпращане или изтриване на документи
@@ -1091,7 +1095,7 @@ SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail dire
 TranslationSetup=Конфигурация на превода
 TranslationDesc=Езика на интерфейса може да бъде променен:<br> * Глобално от менюто <strong>Начало - Настройки - Екран</strong> <br> * Само за потребителя от таба <strong>Изглед</strong> в картата на потребителя (кликнете върху потребителското име в горната част на екрана).
 TranslationOverwriteDesc=You can also overwrite some value by completing/editing the following table. You must use for "%s" the language code, for "%s" the key found into file langs/xx_XX/somefile.lang and "%s" the new value you want to use as new translation.
-TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
+TotalNumberOfActivatedModules=Общ брой на активираните модули: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=Трябва да даде възможност на най-малко 1 модул
 ClassNotFoundIntoPathWarning=Class %s not found into PHP path
 YesInSummer=Yes in summer
@@ -1641,7 +1645,7 @@ CloseFiscalYear=Close fiscal year
 DeleteFiscalYear=Delete fiscal year
 ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ?
 AlwaysEditable=Can always be edited
-IsHidden=Is not visible
+IsHidden=Не е видим
 MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
 NbMajMin=Minimum number of uppercase characters
 NbNumMin=Minimum number of numeric characters
@@ -1669,8 +1673,8 @@ InstallModuleFromWebHasBeenDisabledByFile=Install of external module from applic
 ConfFileMuseContainCustom=Installing an external module from application save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to have option<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
 HighlightLinesColor=Цвят за подчертаване на линията, когато мишката мине отгоре (оставете празно за без подчертаване)
-TextTitleColor=Color of page title
-LinkColor=Color of links
+TextTitleColor=Цвят на заглавието на страницата
+LinkColor=Цвят на връзките
 PressF5AfterChangingThis=Press F5 on keyboard after changing this value to have it effective
 NotSupportedByAllThemes=Will works with eldy theme but is not supported by all themes
 BackgroundColor=Background color
@@ -1713,3 +1717,4 @@ ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s is available. Ve
 MultiPriceRuleDesc=Когато опция "Няколко нива за цени на продукт/услуга" е активирана, можете да определите различни цени (по една на ниво) за всеки продукт. За да спестите време, можете да въведете правило тук да имате цена за всяко ниво автоматично изчислена спрямо цената на първо ниво, така ще трябва да въведете само цена за първо ниво на всеки продукт. Тази страница, за да пести времето ви и може да бъде полезна само ако вашите цени за всяко ниво са относителни спрямо първото ниво. Можете да игнорирате тази страница в повечето случаи.
 ModelModulesProduct=Templates for product documents
 ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
+SeeSubstitutionVars=See * note for list of possible substitution variables
diff --git a/htdocs/langs/bg_BG/bills.lang b/htdocs/langs/bg_BG/bills.lang
index ba75fdbbd0f..824d1911f64 100644
--- a/htdocs/langs/bg_BG/bills.lang
+++ b/htdocs/langs/bg_BG/bills.lang
@@ -219,6 +219,7 @@ RemainderToBill=Напомняне за фактуриране
 SendBillByMail=Изпращане на фактура по имейл
 SendReminderBillByMail=Изпращане на напомняне по имейл
 RelatedCommercialProposals=Свързани търговски предложения
+RelatedRecurringCustomerInvoices=Related recurring customer invoices
 MenuToValid=За валидни
 DateMaxPayment=Дължимо плащане преди
 DateEcheance=Лимит за дължимо плащане
@@ -319,7 +320,6 @@ toolTipFrequency=Examples:<br /><b>Set 7 / day</b>: give a new invoice every 7 d
 NextDateToExecution=Date for next invoice generation
 DateLastGeneration=Date of last generation
 MaxPeriodNumber=Max nb of invoice generation
-RestPeriodNumber=Rest period number
 NbOfGenerationDone=Nb of invoice generation already done
 InvoiceAutoValidate=Automatically validate invoice
 GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
@@ -471,3 +471,7 @@ PDFCrevetteSituationInvoiceLine=Situation N°%s : Inv. N°%s on %s
 TotalSituationInvoice=Total situation
 invoiceLineProgressError=Invoice line progress can't be egal or upper the next invoice line
 updatePriceNextInvoiceErrorUpdateline=Error : update price on invoice line : %s
+ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
+ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
+ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
+
diff --git a/htdocs/langs/bg_BG/boxes.lang b/htdocs/langs/bg_BG/boxes.lang
index 6462171bad6..14788969aa8 100644
--- a/htdocs/langs/bg_BG/boxes.lang
+++ b/htdocs/langs/bg_BG/boxes.lang
@@ -60,8 +60,8 @@ BoxTitleLastContracts=Последните %s договори
 BoxTitleLastModifiedDonations=Последните %s променени дарения
 BoxTitleLastModifiedExpenses=Last %s modified expense reports
 BoxGlobalActivity=Обща активност (фактури, предложения, поръчки)
-BoxGoodCustomers=Good Customers
-BoxTitleGoodCustomers=%s Good Customers
+BoxGoodCustomers=Good customers
+BoxTitleGoodCustomers=%s Good customers
 FailedToRefreshDataInfoNotUpToDate=Неуспешно опресняване на RSS поток. Последното успешно опресняване е на дата: %s
 LastRefreshDate=Последна промяна дата
 NoRecordedBookmarks=Няма дефинирани отметки.
diff --git a/htdocs/langs/bg_BG/companies.lang b/htdocs/langs/bg_BG/companies.lang
index 4914c4e326e..4b2300bf400 100644
--- a/htdocs/langs/bg_BG/companies.lang
+++ b/htdocs/langs/bg_BG/companies.lang
@@ -202,7 +202,7 @@ ProfId3IN=Prof Id 3 (SRVC TAX)
 ProfId4IN=Prof Id 4
 ProfId5IN=Prof Id 5
 ProfId6IN=-
-ProfId1LU=Id. prof. 1 (RCS)
+ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
 ProfId2LU=Id. prof. 2 (Business permit)
 ProfId3LU=-
 ProfId4LU=-
@@ -317,10 +317,12 @@ ShowContact=Покажи контакт
 ContactsAllShort=Всички (без филтър)
 ContactType=Тип на контакт
 ContactForOrders=Контакт за поръчката
+ContactForOrdersOrShipments=Order's or shipment's contact
 ContactForProposals=Контакт за предложение
 ContactForContracts=Контакт за договор
 ContactForInvoices=Контакт за фактура
 NoContactForAnyOrder=Този контакт не е контакт за поръчка
+NoContactForAnyOrderOrShipment=This contact is not a contact for any order or shipment
 NoContactForAnyProposal=Този контакт не е контакт за търговско предложение
 NoContactForAnyContract=Този контакт не е контакт за договор
 NoContactForAnyInvoice=Този контакт не е контакт за фактура
@@ -438,3 +440,6 @@ MergeThirdparties=Сливане на контрагенти
 ConfirmMergeThirdparties=Сигурни ли сте че искате да слеете този контрагент в текущия? Всички свързани обекти (фактури, поръчки, ...) ще бъдат преместени към текущия контрагент.
 ThirdpartiesMergeSuccess=Контрагентите бяха обединени
 ErrorThirdpartiesMerge=Има грешка при изтриването на контрагентите. Моля проверете системните записи. Промените са възвърнати.
+SaleRepresentativeLogin=Login of sale representative
+SaleRepresentativeFirstname=Firstname of sale representative
+SaleRepresentativeLastname=Lastname of sale representative
diff --git a/htdocs/langs/bg_BG/errors.lang b/htdocs/langs/bg_BG/errors.lang
index cc5d37245da..a56f4cf0fc3 100644
--- a/htdocs/langs/bg_BG/errors.lang
+++ b/htdocs/langs/bg_BG/errors.lang
@@ -172,6 +172,8 @@ ErrorMandatoryParametersNotProvided=Задължителен параметър(
 ErrorOppStatusRequiredIfAmount=You set an estimated amount for this opportunity/lead. So you must also enter its status
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
 ErrorSavingChanges=An error has ocurred when saving the changes
+ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
+ErrorFileMustHaveFormat=File must have format %s
 
 # Warnings
 WarningPasswordSetWithNoAccount=Парола е зададено за този член. Обаче, няма създаден потребителски акаунт. Следователно тази парола е записана, но не може да бъде използвана за влизане в Dolibarr. Може да бъде използвана от външен модул/интерфейс, но ако нямате нужда да определите нито потребителско име нито парола за член, можете да деактивирате тази опция. Ако имате нужда да управлявате потребителско име, но нямата нужда от парола, можете да оставите това поле празно, за да избегнете това предупреждение. Забележка: Имейл също може да бъде използван като потребителско име ако члена с свързан към потребител.
diff --git a/htdocs/langs/bg_BG/exports.lang b/htdocs/langs/bg_BG/exports.lang
index 4557f3bbd2f..e27db96c9b3 100644
--- a/htdocs/langs/bg_BG/exports.lang
+++ b/htdocs/langs/bg_BG/exports.lang
@@ -128,6 +128,10 @@ SpecialCode=Специален код
 ExportStringFilter=%% позволява заместването на един или повече знаци в текста
 ExportDateFilter=YYYY, YYYYMM, YYYYMMDD : filters by one year/month/day<br>YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD : filters over a range of years/months/days<br> > YYYY, > YYYYMM, > YYYYMMDD : filters on all following years/months/days<br> < YYYY, < YYYYMM, < YYYYMMDD : filters on all previous years/months/days
 ExportNumericFilter='NNNNN' filters by one value<br>'NNNNN+NNNNN' filters over a range of values<br>'&gt;NNNNN' filters by lower values<br>'&gt;NNNNN' filters by higher values
+ImportFromLine=Import starting from line number
+EndAtLineNb=End at line number
+SetThisValueTo2ToExcludeFirstLine=For example, set this value to 3 to exclude the 2 first lines
+KeepEmptyToGoToEndOfFile=Keep this field empty to go up to the end of file
 ## filters
 SelectFilterFields=Ако желаете на филтрирате по някои стойности, просто въведете стойностите тук.
 FilterableFields=Полета подлежащи на филтриране
diff --git a/htdocs/langs/bg_BG/install.lang b/htdocs/langs/bg_BG/install.lang
index be72c9f4515..215ae34ccc5 100644
--- a/htdocs/langs/bg_BG/install.lang
+++ b/htdocs/langs/bg_BG/install.lang
@@ -23,78 +23,78 @@ ErrorPHPDoesNotSupportUTF8=Вашата PHP инсталация не поддъ
 ErrorDirDoesNotExists=Директорията %s не съществува.
 ErrorGoBackAndCorrectParameters=Върни се назад и коригирайте грешните параметри.
 ErrorWrongValueForParameter=Може да сте въвели грешна стойност за параметър '%s'.
-ErrorFailedToCreateDatabase=Неуспешно създаване на '%s' база данни.
+ErrorFailedToCreateDatabase=Неуспешно създаване на базата данни '%s'.
 ErrorFailedToConnectToDatabase=Неуспешна връзка с база данни '%s'.
-ErrorDatabaseVersionTooLow=Версията на база данни (%s) е твърде стара. Версия %s или по-висока е нужна.
-ErrorPHPVersionTooLow=PHP версия твърде стар. Версия %s се изисква.
-WarningPHPVersionTooLow=PHP версия твърде стар. Версия %s или повече се очаква. Тази версия би трябвало да позволи инсталиране, но не се поддържа.
-ErrorConnectedButDatabaseNotFound=Връзка към сървъра успешен, но &quot;%s&quot; база данни не е намерен.
+ErrorDatabaseVersionTooLow=Версията на базата данни (%s) е твърде стара. Изисква се версия %s или по-нова.
+ErrorPHPVersionTooLow=Версията на PHP е твърде стара. Изисква се версия %s.
+WarningPHPVersionTooLow=Версията на PHP е твърде стара. Очаква се версия %s или по-нова. Тази версия би трябвало да позволи инсталиране, но не се поддържа.
+ErrorConnectedButDatabaseNotFound=Свързването към сървъра е успешено, но базата данни '%s' не е открита.
 ErrorDatabaseAlreadyExists=Базата данни %s вече съществува.
-IfDatabaseNotExistsGoBackAndUncheckCreate=Ако базата данни не съществува, върнете се назад и проверете опцията &quot;Създаване на база данни&quot;.
-IfDatabaseExistsGoBackAndCheckCreate=Ако базата данни вече съществува, върнете се обратно и махнете отметката &quot;Създаване на база от данни&quot;.
-WarningBrowserTooOld=Е твърде стара версия на браузъра. Надстроите браузъра си до последната версия на Firefox, Chrome или Opera се лекува много.
+IfDatabaseNotExistsGoBackAndUncheckCreate=Ако базата данни не съществува, върнете се назад и проверете опцията "Създаване на база данни".
+IfDatabaseExistsGoBackAndCheckCreate=Ако базата данни вече съществува, върнете се обратно и махнете отметката на "Създаване на база данни".
+WarningBrowserTooOld=Твърде стара версия на браузъра. Надстройването на браузъра ви до последната версия на Firefox, Chrome или Opera е силно препоръчително.
 PHPVersion=Версия на PHP
-YouCanContinue=Можете да продължите ...
-License=Използването на лиценз
-ConfigurationFile=Конфигурационният файл
+YouCanContinue=Може да продължите..
+License=Лиценз за използване
+ConfigurationFile=Конфигурационен файл
 WebPagesDirectory=Директорията, в която се съхраняват уеб страници
-DocumentsDirectory=Директория за съхраняване качили и генерирани документи
-URLRoot=URL Root
+DocumentsDirectory=Директория за съхраняване качени и генерирани документи
+URLRoot=URL корен
 ForceHttps=Принудително сигурни връзки (HTTPS)
-CheckToForceHttps=Изберете тази опция, за да принуди сигурни връзки (HTTPS). <br> Това означава, че уеб сървърът е конфигуриран с SSL сертификат.
-DolibarrDatabase=Dolibarr База данни
+CheckToForceHttps=Изберете тази опция, за принудително сигурни връзки (HTTPS). <br> Това означава, че уеб сървърът е конфигуриран с SSL сертификат.
+DolibarrDatabase=База данни на Dolibarr
 DatabaseChoice=Избор на база данни
 DatabaseType=Тип на базата данни
 DriverType=Тип драйвер
 Server=Сървър
-ServerAddressDescription=Име или IP адрес на сървъра на базата данни, обикновено &quot;Localhost&quot;, когато сървъра на базата данни се хоства на същия сървър от уеб сървър
-ServerPortDescription=База данни на порта на сървъра. Дръжте празна, ако са неизвестни.
+ServerAddressDescription=Име или IP адрес на сървъра на базата данни, обикновено 'localhost', когато сървъра на базата данни се хоства на същия сървър като уеб сървъра
+ServerPortDescription=Порт на сървъра на базата данни. Оставете празно ако е неизвестно.
 DatabaseServer=Сървър на базата данни
 DatabaseName=Име на базата данни
-DatabasePrefix=Таблицата база данни префикс
-AdminLogin=Влез за база данни Dolibarr собственик.
-PasswordAgain=Повтори парола за втори път
-AdminPassword=Парола за база данни Dolibarr собственик.
+DatabasePrefix=Префикс на таблиците
+AdminLogin=Идентифициране на собственика на базата данни на Dolibarr.
+PasswordAgain=Въведете паролата отново
+AdminPassword=Парола на собственика на базата данни на Dolibarr.
 CreateDatabase=Създаване на база данни
 CreateUser=Създаване на собственик
-DatabaseSuperUserAccess=Сървъра на база данни - достъп Суперпотребител
-CheckToCreateDatabase=Отметка в квадратчето, ако базата данни не съществува и трябва да бъде създаден. <br> В този случай, трябва да попълните потребителско име / парола за за суперпотребител сметка в долната част на тази страница.
-CheckToCreateUser=Отметка в квадратчето, ако собственик на базата данни не съществува и трябва да бъде създаден. <br> В този случай, трябва да изберете потребителско име и парола и да попълните име / парола за суперпотребител сметка в долната част на тази страница. Ако това поле не е отметнато, собственик на база данни и пароли трябва да съществува.
-DatabaseRootLoginDescription=Вход на потребителя е разрешено да създавате нови бази данни или нови потребители, безполезна, ако вашата база данни и потребителско име база данни вече съществува (като, когато сте домакин на уеб доставчик на хостинг услуги).
-KeepEmptyIfNoPassword=Оставете празно, ако потребителят не разполага с парола (да се избягва този)
-SaveConfigurationFile=Запиши стойности
-ConfigurationSaving=Запазване на конфигурационния файл
-ServerConnection=Връзката със сървъра
-DatabaseCreation=Създаването на база данни
+DatabaseSuperUserAccess=Сървър на базата данни - Достъп супер потребител
+CheckToCreateDatabase=Отметнете ако базата данни не съществува и трябва да бъде създадена. <br> В този случай, трябва да попълните потребителско име/парола за профил на суперпотребител в долната част на тази страница.
+CheckToCreateUser=Отметнете ако собственика на базата данни не съществува и трябва да бъде създаден. <br> В този случай, трябва да изберете потребителско име и парола за него и да попълните име/парола за профил на суперпотребител в долната част на тази страница. Ако това поле не е отметнато, собственика на базата данни и неговите пароли трябва да съществуват.
+DatabaseRootLoginDescription=Идентифицирането на потребителя му позволява да създава нови бази данни или нови потребители, задължително ако вашата база данни или нейния собственик вече не съществуват.
+KeepEmptyIfNoPassword=Оставете празно, ако потребителят няма парола (избягвайте това)
+SaveConfigurationFile=Регистрация на конфигурационния файл
+ConfigurationSaving=Записване на конфигурационния файл
+ServerConnection=Свързване със сървъра
+DatabaseCreation=Създаване на база данни
 UserCreation=Създаване на потребител
-CreateDatabaseObjects=Database обекти създаването
-ReferenceDataLoading=Референтен данни натоварване
-TablesAndPrimaryKeysCreation=Маси и първични ключове за създаване на
-CreateTableAndPrimaryKey=Създаване на таблица %s
-CreateOtherKeysForTable=Създаване на чужди ключове и индекси за трапезни %s
-OtherKeysCreation=Чужди ключове и създаване на индекси
-FunctionsCreation=Функции създаването
-AdminAccountCreation=Създаване на администратор вход
-PleaseTypePassword=Моля въведете парола, празни пароли не са позволени!
-PleaseTypeALogin=Моля, въведете вход!
-PasswordsMismatch=Паролите се различава, моля опитайте отново!
-SetupEnd=Край на настройките
-SystemIsInstalled=Инсталацията е завършена.
+CreateDatabaseObjects=Създаване на обекти в базата данни
+ReferenceDataLoading=Зареждане на референтни данни
+TablesAndPrimaryKeysCreation=Създаване на таблици и първични ключове
+CreateTableAndPrimaryKey=Създаване на таблицата %s
+CreateOtherKeysForTable=Създаване на чужди ключове и индекси за таблицата %s
+OtherKeysCreation=Създаване на чужди ключове и индекси
+FunctionsCreation=Създаване на функции
+AdminAccountCreation=Създаване на администраторски профил
+PleaseTypePassword=Моля, въведете парола, празни пароли не са позволени!
+PleaseTypeALogin=Моля, въведете име!
+PasswordsMismatch=Паролите не съвпадат, опитайте отново!
+SetupEnd=Край на настройкате
+SystemIsInstalled=Инсталирането завърши.
 SystemIsUpgraded=Dolibarr е обновен успешно.
-YouNeedToPersonalizeSetup=Трябва да конфигурирате Dolibarr според вашите нужди (външен вид, функции, ...). За да направите това, моля последвайте линка по-долу:
-AdminLoginCreatedSuccessfuly=<b>&quot;%s&quot;</b> dolibarr администратор вход, създаден успешно.
+YouNeedToPersonalizeSetup=Трябва да конфигурирате Dolibarr според вашите нужди (външен вид, функции, ...). За да направите това, моля последвайте връзката по-долу:
+AdminLoginCreatedSuccessfuly=Администраторския профил за Dolibarr '<b>%s</b>' е създаден успешно.
 GoToDolibarr=Отиди на Dolibarr
-GoToSetupArea=Отиди на Dolibarr (Настройки)
-MigrationNotFinished=Версия на базата данни не е напълно актуална, така че ще трябва отново да стартирате процеса на надграждане.
-GoToUpgradePage=Отидете отново на страницата за обновяване
-WithNoSlashAtTheEnd=Без наклонена черта &quot;/&quot; в края
-DirectoryRecommendation=Се recommanded да използвате директория извън директорията на своите уеб страници.
+GoToSetupArea=Отиди на Dolibarr (област за настройка)
+MigrationNotFinished=Версията на вашата база данни не е напълно актуална, така че ще трябва отново да стартирате процеса на надграждане.
+GoToUpgradePage=Отидете отново на страницата за надграждане
+WithNoSlashAtTheEnd=Без наклонена черта "/" в края
+DirectoryRecommendation=Препоръчва се да използвате директория извън директорията на своите уеб страници.
 LoginAlreadyExists=Вече съществува
-DolibarrAdminLogin=Dolibarr администраторски вход
-AdminLoginAlreadyExists=<b>&quot;%s</b> dolibarr администраторски акаунт вече съществува. Върни се обратно, ако искате да създадете друга.
-WarningRemoveInstallDir=Внимание, от съображения за сигурност, след инсталиране или надграждане е пълна, за да се избегне използването инсталирате инструменти отново, трябва да добавите файл наречен <b>install.lock</b> в документа Dolibarr директория, за да се избегнат злоупотребите от него.
-ThisPHPDoesNotSupportTypeBase=Тази система PHP не поддържа интерфейс за достъп до %s тип база от данни
-FunctionNotAvailableInThisPHP=Не е наличен за тази PHP
+DolibarrAdminLogin=Администраторски вход в Dolibarr
+AdminLoginAlreadyExists=Администраторския профил за Dolibarr '<b>%s</b>' вече съществува. Върнете се назад, ако искате да създадете друг.
+WarningRemoveInstallDir=Внимание, от съображения за сигурност, след като ведъж инсталирането или надграждането завърши, за да се избегне ново използване на инструментите за инсталиране, трябва да добавите файл наречен <b>install.lock</b> в директорията с документи на Dolibarr, за да се избегне злонамерена употреба.
+ThisPHPDoesNotSupportTypeBase=Тази PHP система не поддържа интерфейс за достъп до бази данни от тип %s
+FunctionNotAvailableInThisPHP=Не е наличено за това PHP
 MigrateScript=Скрипт за миграция
 ChoosedMigrateScript=Изберете скрипт за миграция
 DataMigration=Миграция на данните
@@ -102,106 +102,106 @@ DatabaseMigration=Миграция на структурата на базата
 ProcessMigrateScript=Скрипта обработва
 ChooseYourSetupMode=Изберете режим на настройка и кликнете върху "Начало"...
 FreshInstall=Нова инсталация
-FreshInstallDesc=Използвайте този режим, ако това е Вашето първо инсталиране. Ако това не е така, този режим може да поправи непълна предишна инсталация, но ако искате да надградите вашата версия, изберете режим "Обновяване".
-Upgrade=Обновяване
+FreshInstallDesc=Използвайте този режим, ако това е вашето първо инсталиране. Ако това не е така, този режим може да поправи непълна предишна инсталация, но ако искате да надградите вашата версия, изберете режим "Надграждане".
+Upgrade=Надграждане
 UpgradeDesc=Използвайте този режим, ако желаете да замените старите файлове на Dolibarr с файлове от по-нова версия. Това ще обнови вашата база данни и данни.
 Start=Начало
-InstallNotAllowed=Настройка не разрешено от <b>conf.php</b> разрешения
-YouMustCreateWithPermission=Трябва да създадете файлове %s и права за писане върху нея за уеб сървъра по време на процеса на инсталиране.
+InstallNotAllowed=Настройката не разрешена поради правата на файла <b>conf.php</b>
+YouMustCreateWithPermission=Трябва да създадете файл %s и да настроите права за запис в него от уеб сървъра по време на процеса на инсталиране.
 CorrectProblemAndReloadPage=Моля, коригирайте проблема и натиснете F5, за да презаредите страницата.
-AlreadyDone=Вече са мигрирали
-DatabaseVersion=Версия на Базата данни
+AlreadyDone=Вече мигрирахте
+DatabaseVersion=Версия на базата данни
 ServerVersion=Версия на сървъра на базата данни
-YouMustCreateItAndAllowServerToWrite=Трябва да създадете тази директория и да позволите на уеб сървъра да пише в нея.
+YouMustCreateItAndAllowServerToWrite=Трябва да създадете тази директория и да позволите на уеб сървъра да записва в нея.
 CharsetChoice=Избор на знаците
 CharacterSetClient=Набор от символи, използвани за генерираните HTML уеб страници
-CharacterSetClientComment=Изберете набор от знаци за уеб дисплей. <br/> Default предлагания набор от символи е един от вашата база данни.
-DBSortingCollation=За символи сортиране
-DBSortingCollationComment=Изберете кода на страницата, която определя подреждане характер, използван от база данни. Този параметър се нарича &quot;съпоставяне&quot; от някои бази данни. <br/> Този параметър не може да бъде определена, ако базата данни вече съществува.
-CharacterSetDatabase=Набор от знаци за база данни
-CharacterSetDatabaseComment=Изберете набор от символи, издирван за създаването на базата данни. <br/> Този параметър не може да бъде определена, ако базата данни вече съществува.
-YouAskDatabaseCreationSoDolibarrNeedToConnect=Ви помолим да създадете база данни <b>%s,</b> но за това, Dolibarr трябва да се свържете на сървъра <b>%s</b> с супер потребителски разрешения <b>%s.</b>
-YouAskLoginCreationSoDolibarrNeedToConnect=Ви помолим да създадете вход база данни <b>%s,</b> но за това, Dolibarr трябва да се свържете на сървъра <b>%s</b> с супер потребителски разрешения <b>%s.</b>
-BecauseConnectionFailedParametersMayBeWrong=Тъй като свързването е неуспешно, хост или супер параметри на потребителите трябва да бъде погрешно.
-OrphelinsPaymentsDetectedByMethod=Сираците плащане открити по метода на %s
-RemoveItManuallyAndPressF5ToContinue=Извадете го ръчно и натиснете F5, за да продължите.
-KeepDefaultValuesWamp=Можете да използвате настройка Dolibarr програма от DoliWamp, така че стойности, предложени тук вече са оптимизирани. Ги промените, само ако знаете какво правите.
-KeepDefaultValuesDeb=Можете да използвате съветника от настройката Dolibarr Linux пакет (Ubuntu, Debian, Fedora ...), така че стойностите, предложени тук вече са оптимизирани. Само паролата на собственика на базата данни, за да се създаде, трябва да бъде завършена. Промяна на други параметри, само ако знаете какво правите.
-KeepDefaultValuesMamp=Можете да използвате настройка Dolibarr програма от DoliMamp, така че стойности, предложени тук вече са оптимизирани. Ги промените, само ако знаете какво правите.
-KeepDefaultValuesProxmox=Можете да използвате съветника от настройката Dolibarr виртуална Proxmox уред, така че стойностите, предложени тук вече са оптимизирани. Ги промените, само ако знаете какво правите.
+CharacterSetClientComment=Изберете кодиране, което искате за показване на страници. <br/> Кодирането, предложено по подразбиране е едно от вашата база данни.
+DBSortingCollation=Ред за сортиране на символи
+DBSortingCollationComment=Изберете кода на страницата, която определя сортиране на символите, използвано от базата данни. Този параметър се нарича 'collation' от някои бази данни. <br/> Този параметър не може да бъде дефиниран, ако базата данни вече съществува.
+CharacterSetDatabase=Набор от символи за базата данни
+CharacterSetDatabaseComment=Изберете набор от символи, търсен за създаването на базата данни. <br/> Този параметър не може да бъде дефиниран, ако базата данни вече съществува.
+YouAskDatabaseCreationSoDolibarrNeedToConnect=Искате да създадете база данни <b>%s</b>, но за това Dolibarr трябва да се свърже със сървъра <b>%s</b> чрез супер потребителя <b>%s</b>.
+YouAskLoginCreationSoDolibarrNeedToConnect=Искате да създадете вход за база данни <b>%s</b>, но за това Dolibarr трябва да се свърже със сървъра <b>%s</b> чрез супер потребителя <b>%s</b>.
+BecauseConnectionFailedParametersMayBeWrong=Тъй като свързването е неуспешно, хоста или параметрите на супер потребителя трябва да са грешни.
+OrphelinsPaymentsDetectedByMethod=Orphans плащане е открито по метода %s
+RemoveItManuallyAndPressF5ToContinue=Премахнете го ръчно и натиснете F5, за да продължите.
+KeepDefaultValuesWamp=Вие използвате помощника за настройка на Dolibarr от DoliWamp, така че стойностите, предложени тук вече са оптимизирани. Променете ги само ако знаете какво правите.
+KeepDefaultValuesDeb=Вие използвате помощника за настройка на Dolibarr от пакет за Linux (Ubuntu, Debian, Fedora ...), така че стойностите, предложени тук вече са оптимизирани. Само създаването на парола на собственика на базата данни трябва да бъде завършена. Променяйте други параметри, само ако знаете какво правите.
+KeepDefaultValuesMamp=Вие използвате помощника за настройка на Dolibarr от DoliMamp, така че стойностите, предложени тук вече са оптимизирани. Променете ги само ако знаете какво правите.
+KeepDefaultValuesProxmox=Вие използвате помощника за настройка на Dolibarr от Proxmox виртуална машина, така че стойностите, предложени тук вече са оптимизирани. Променете ги само ако знаете какво правите.
 FieldRenamed=Полето е преименувано
-IfLoginDoesNotExistsCheckCreateUser=Ако вход не съществува все още, трябва да проверите опцията &quot;Създаване на потребител&quot;
-ErrorConnection=Server <b>&quot;%s&quot;,</b> името на базата данни <b>&quot;%s&quot;,</b> вход <b>&quot;%s&quot;</b> или парола на базата данни може да бъде погрешно или PHP версия на програмата клиент може да бъде твърде стар в сравнение с база данни версия.
-InstallChoiceRecommanded=Препоръчва се избор да инсталирате версия <b>%s</b> от текущата ви версия <b>%s</b>
-InstallChoiceSuggested=<b>Инсталиране на избор, предложени от инсталатора.</b>
-MigrateIsDoneStepByStep=Насочени версия (%s) има разлика от няколко версии, за да инсталирате съветника ще се върне, за да предложи следващата миграция след това ще бъдат завършени.
-CheckThatDatabasenameIsCorrect=Уверете се, че името на базата данни <b>&quot;%s&quot;</b> е вярно.
-IfAlreadyExistsCheckOption=Ако това име е вярна и тази база данни все още не съществува, трябва да проверите опцията &quot;Създаване на база данни&quot;.
-OpenBaseDir=PHP openbasedir параметър
-YouAskToCreateDatabaseSoRootRequired=Отметка в квадратчето &quot;Създаване на база данни&quot;. За тази цел, трябва да въведете потребителско име / парола суперпотребител (дъното на формата).
-YouAskToCreateDatabaseUserSoRootRequired=Отметка в квадратчето &quot;Създаване на собственика на базата данни&quot;. За тази цел, трябва да въведете потребителско име / парола суперпотребител (дъното на формата).
-NextStepMightLastALongTime=Текущата стъпка може да продължи няколко минути. Моля, изчакайте до следващия екран се показва напълно, преди да продължите.
-MigrationCustomerOrderShipping=Мигриране доставка за поръчки от клиенти съхранение
-MigrationShippingDelivery=Upgrade storage of shipping
-MigrationShippingDelivery2=Upgrade storage of shipping 2
+IfLoginDoesNotExistsCheckCreateUser=Ако все още не съществува вписване, трябва да проверите опцията "Създаване на потребител"
+ErrorConnection=Сървър "<b>%s</b>", име на база данни "<b>%s</b>", потребител "<b>%s</b>", или парола на базата данни може да са грешни или версията на PHP клиента може да е твърде стара, сравнена с версията на базата данни.
+InstallChoiceRecommanded=Препоръчителен избор е да инсталирате версия <b>%s</b> от вашата текуща версия <b>%s</b>
+InstallChoiceSuggested=<b>Избор за инсталиране, предложен от инсталатора</b>.
+MigrateIsDoneStepByStep=Целевата версия (%s) има празнина от няколко версии, така че помощника ще препоръча следваща миграция, след като тази завърши.
+CheckThatDatabasenameIsCorrect=Уверете се, че името на базата данни "<b>%s</b>" е правилно.
+IfAlreadyExistsCheckOption=Ако това име е вярно и тази база данни все още не съществува, трябва да проверите опцията "Създаване на база данни".
+OpenBaseDir=Параметър PHP openbasedir
+YouAskToCreateDatabaseSoRootRequired=Отметнахте "Създаване на база данни". За тази цел, трябва да въведете потребителско име/парола на супер потребител (най-долу на формата).
+YouAskToCreateDatabaseUserSoRootRequired=Отметнахте "Създаване на собственик на базата данни". За тази цел, трябва да въведете потребителско име/парола на супер потребител (най-долу на формата).
+NextStepMightLastALongTime=Текущата стъпка може да продължи няколко минути. Моля, изчакайте докато следващия екран се покаже напълно, преди да продължите.
+MigrationCustomerOrderShipping=Мигриране на хранилище за пратки на поръчки от клиенти
+MigrationShippingDelivery=Надграждане на хранилище на доставки
+MigrationShippingDelivery2=Надграждане на хранилище на доставки 2
 MigrationFinished=Миграцията завърши
-LastStepDesc=<strong>Последна стъпка:</strong> Определете тук потребителско име и парола, планирате да използвате, за да се свържете с софтуер. Не губят, тъй като това е акаунт за администриране на всички останали.
+LastStepDesc=<strong>Последна стъпка</strong>: Определете тук потребителско име и парола, които планирате да използвате, за да се свързвате със софтуера. Не ги губете, тъй като това е профил за администриране на всички останали.
 ActivateModule=Активиране на модул %s
 ShowEditTechnicalParameters=Натиснете тук за да покажете/редактирате параметрите за напреднали (експертен режим)
-WarningUpgrade=Внимание:\nНаправили ли сте резервно копие на базата данни първо?\nТова е много препоръчително: например, поради някой бъгове в системите за база данни (например mysql версия 5.5.40/41/42/43), част от информация или таблици може да бъде изгубени по-време на този процес, за това е много препоръчително да имате пълен dump на вашата база данни преди започването на миграцията.\n\nКликнете OK за започване на миграционния процес...
-ErrorDatabaseVersionForbiddenForMigration=Вашата база данни е с версия %s. Тя има критически бъг, причинявайки загуба на информация ако направите структурна промяна на вашата база данни, подобна е задължителна при миграционния процес. Поради тази причина, миграцията не ще бъде позволена, докато не обновите вашата база данни до по висока оправена версия (списък на познати бъгави версии: %s)
+WarningUpgrade=Внимание:\nНаправихте ли резервно копие на базата данни първо?\nТова е силно препоръчително: например, поради някой бъгове в системите на базата данни (например mysql версия 5.5.40/41/42/43), част от информацията или таблиците може да бъдат изгубени по-време на този процес, за това е много препоръчително да имате пълен dump на вашата база данни преди започването на миграцията.\n\nКликнете OK за започване на миграционния процес...
+ErrorDatabaseVersionForbiddenForMigration=Вашата база данни е с версия %s. Тя има критичен бъг, причинявайки загуба на информация ако направите структурна промяна на вашата база данни, а подобна е задължителна при миграционния процес. Поради тази причина, миграцията не е позволена, докато не обновите вашата база данни до по-нова коригирана версия (списък на познати версии с бъгове: %s)
 
 #########
 # upgrade
-MigrationFixData=Решете denormalized данни
-MigrationOrder=Миграция на данни за поръчки на клиента
-MigrationSupplierOrder=Миграция на данни за поръчки на доставчика
-MigrationProposal=Миграция на данни за търговски предложения
-MigrationInvoice=Миграция на данни за фактури на клиента
-MigrationContract=Миграция на данни за сключване на договори
-MigrationSuccessfullUpdate=Обновяването е успешно
+MigrationFixData=Корекция на denormalized данни
+MigrationOrder=Миграция на данни за поръчки от клиенти
+MigrationSupplierOrder=Миграция на данни за поръчки към доставчик
+MigrationProposal=Миграция на данни за оферти
+MigrationInvoice=Миграция на данни за фактури за клиенти
+MigrationContract=Миграция на данни за договори
+MigrationSuccessfullUpdate=Надграждането е успешно
 MigrationUpdateFailed=Неуспешен процес на надграждане
-MigrationRelationshipTables=Миграцията на данни за отношенията таблици (%s)
-MigrationPaymentsUpdate=Плащане данни корекция
-MigrationPaymentsNumberToUpdate=%s плащане (ия), за да се актуализира
-MigrationProcessPaymentUpdate=Актуализиране на плащане (ия) %s
-MigrationPaymentsNothingToUpdate=Няма повече неща за вършене
+MigrationRelationshipTables=Миграция на данни за свързани таблици (%s)
+MigrationPaymentsUpdate=Корекция на данни за плащане
+MigrationPaymentsNumberToUpdate=%s плащания за актуализиране
+MigrationProcessPaymentUpdate=Актуализиране на плащания %s
+MigrationPaymentsNothingToUpdate=Няма повече задачи
 MigrationPaymentsNothingUpdatable=Няма повече плащания, които могат да бъдат коригирани
-MigrationContractsUpdate=Договор данни корекция
+MigrationContractsUpdate=Корекция на данни в договор
 MigrationContractsNumberToUpdate=%s договор(и) за актуализиране
-MigrationContractsLineCreation=Създаване на договора линия за %s договор изх
-MigrationContractsNothingToUpdate=Няма повече неща за вършене
-MigrationContractsFieldDontExist=Поле fk_facture не съществува вече. Какво да правя.
-MigrationContractsEmptyDatesUpdate=Договор празна дата корекция
-MigrationContractsEmptyDatesUpdateSuccess=Направи успешно Договор за корекция emtpy дата
-MigrationContractsEmptyDatesNothingToUpdate=Няма договор е празна дата, за да се коригира
-MigrationContractsEmptyCreationDatesNothingToUpdate=Не дата за създаването на договор, за да се коригира
-MigrationContractsInvalidDatesUpdate=Неправилна стойност за корекция дата договор
-MigrationContractsInvalidDateFix=Правилно %s договора (дата на договора = %s, като се започне обслужване дата мин. = %s)
+MigrationContractsLineCreation=Създаване на ред в договор с реф. %s
+MigrationContractsNothingToUpdate=Няма повече задачи
+MigrationContractsFieldDontExist=Полето fk_facture вече не съществува. Нищо не може да се направи.
+MigrationContractsEmptyDatesUpdate=Корекция на празна дата в договор
+MigrationContractsEmptyDatesUpdateSuccess=Успешна корекция на празна дата
+MigrationContractsEmptyDatesNothingToUpdate=Няма празна дата на договор за коригиране
+MigrationContractsEmptyCreationDatesNothingToUpdate=Няма дата за създаване на договор за коригиране
+MigrationContractsInvalidDatesUpdate=Корекция на неправилни дати на договор
+MigrationContractsInvalidDateFix=Корекция на договор %s (Дата на договора=%s, Начална дата на услуга мин.=%s)
 MigrationContractsInvalidDatesNumber=%s променени договори
-MigrationContractsInvalidDatesNothingToUpdate=Няма дата с лош стойност да се коригира
-MigrationContractsIncoherentCreationDateUpdate=Bad стойност на поръчката корекция дата на създаване
-MigrationContractsIncoherentCreationDateUpdateSuccess=Bad стойност на поръчката корекция дата на създаване направи succesfuly
-MigrationContractsIncoherentCreationDateNothingToUpdate=Не е лошо стойност за дата на договор за създаването, за да се коригира
-MigrationReopeningContracts=Open договор затворен от грешки
-MigrationReopenThisContract=Повторно договор %s
-MigrationReopenedContractsNumber=%s договори промяна
-MigrationReopeningContractsNothingToUpdate=Няма затворен договор, за да отворите
-MigrationBankTransfertsUpdate=Актуализиране на връзките между банков превод и банков превод
-MigrationBankTransfertsNothingToUpdate=Всички връзки са към днешна дата
-MigrationShipmentOrderMatching=Sendings получаване актуализация
-MigrationDeliveryOrderMatching=Актуализация обратна разписка
-MigrationDeliveryDetail=Доставка актуализация
-MigrationStockDetail=Актуализиране на стойността на акциите на продукти
-MigrationMenusDetail=Актуализиране на динамични таблици менюта
+MigrationContractsInvalidDatesNothingToUpdate=Няма дата с лоша стойност за коригиране
+MigrationContractsIncoherentCreationDateUpdate=Лоша стойност за дата на създаване на договор
+MigrationContractsIncoherentCreationDateUpdateSuccess=ОК
+MigrationContractsIncoherentCreationDateNothingToUpdate=Няма лоши стойности за дата на създаване на договор за коригиране
+MigrationReopeningContracts=Отворен договор затворен по грешка
+MigrationReopenThisContract=Ново отваряне на договор %s
+MigrationReopenedContractsNumber=%s договори са променени
+MigrationReopeningContractsNothingToUpdate=Няма затворен договор за отваряне
+MigrationBankTransfertsUpdate=Актуализиране на връзките между банкова транзакция и банков превод
+MigrationBankTransfertsNothingToUpdate=Всички връзки са актуални
+MigrationShipmentOrderMatching=Актуализация на експедиционни бележки
+MigrationDeliveryOrderMatching=Актуализация на обратни разписки
+MigrationDeliveryDetail=Актуализация на доставката
+MigrationStockDetail=Актуализиране на наличната стойност на продукти
+MigrationMenusDetail=Актуализиране на таблици за динамични менюта
 MigrationDeliveryAddress=Актуализиране на адрес за доставка на пратки,
-MigrationProjectTaskActors=Миграция на данни за llx_projet_task_actors маса
-MigrationProjectUserResp=Data Migration поле fk_user_resp на llx_projet llx_element_contact
+MigrationProjectTaskActors=Миграция на данни за таблицата llx_projet_task_actors
+MigrationProjectUserResp=Миграция на полето fk_user_resp на llx_projet llx_element_contact
 MigrationProjectTaskTime=Актуализация на времето, прекарано в секунда
-MigrationActioncommElement=Актуализиране на данни за действия
-MigrationPaymentMode=Миграция на данни за плащане режим
+MigrationActioncommElement=Актуализиране на данните за действия
+MigrationPaymentMode=Миграция на данни за начин на плащане
 MigrationCategorieAssociation=Миграция на категории
-MigrationEvents=Migration of events to add event owner into assignement table
-MigrationReloadModule=Презареждане на модул %s
-ShowNotAvailableOptions=Показване на не наличните опции
-HideNotAvailableOptions=Скриване на не наличните опции
+MigrationEvents=Миграция на събития за добавяне на собственик на събитие в таблицата за възлагане
+MigrationReloadModule=Презареждане на модула %s
+ShowNotAvailableOptions=Показване на недостъпните опции
+HideNotAvailableOptions=Скриване на недостъпните опции
diff --git a/htdocs/langs/bg_BG/main.lang b/htdocs/langs/bg_BG/main.lang
index 7549ef4b08e..cf10b736f94 100644
--- a/htdocs/langs/bg_BG/main.lang
+++ b/htdocs/langs/bg_BG/main.lang
@@ -25,6 +25,7 @@ FormatDateHourTextShort=%d %b %Y, %H:%M
 FormatDateHourText=%d %B %Y, %H:%M
 DatabaseConnection=Свързване с базата данни
 NoTemplateDefined=No template defined for this email type
+AvailableVariables=Available substitution variables
 NoTranslation=Няма превод
 NoRecordFound=Няма открити записи
 NoError=Няма грешка
diff --git a/htdocs/langs/bg_BG/orders.lang b/htdocs/langs/bg_BG/orders.lang
index 65fe5799ab3..6d7b5345698 100644
--- a/htdocs/langs/bg_BG/orders.lang
+++ b/htdocs/langs/bg_BG/orders.lang
@@ -32,6 +32,7 @@ StatusOrderSent=Доставка в процес
 StatusOrderOnProcessShort=Поръчано
 StatusOrderProcessedShort=Обработен
 StatusOrderDelivered=Доставени
+StatusOrderDeliveredShort=Delivered
 StatusOrderToBillShort=За плащане
 StatusOrderToBill2Short=На Бил
 StatusOrderApprovedShort=Одобрен
diff --git a/htdocs/langs/bg_BG/products.lang b/htdocs/langs/bg_BG/products.lang
index c7df6127b9b..c44055537be 100644
--- a/htdocs/langs/bg_BG/products.lang
+++ b/htdocs/langs/bg_BG/products.lang
@@ -45,10 +45,6 @@ LastProducts=Последни продукти
 CardProduct0=Карта на продукт
 CardProduct1=Карта на услуга
 CardContract=Карта на контакт
-Warehouse=Склад
-Warehouses=Складове
-WarehouseOpened=Складът е отворен
-WarehouseClosed=Склада е затворен
 Stock=Наличност
 Stocks=Наличности
 Movement=Движение
@@ -318,3 +314,11 @@ WarningSelectOneDocument=Моля изберете поне един докум
 DefaultUnitToShow=Unit
 NbOfQtyInProposals=Qty in proposals
 ClinkOnALinkOfColumn=Click on a link of column %s to get a detailed view...
+TranslatedLabel=Translated label
+TranslatedDescription=Translated description
+TranslatedNote=Translated notes
+ProductWeight=Weight for 1 product
+ProductVolume=Volume for 1 product
+WeightUnits=Weight unit
+VolumeUnits=Volume unit
+SizeUnits=Size unit
diff --git a/htdocs/langs/bg_BG/projects.lang b/htdocs/langs/bg_BG/projects.lang
index 4ce66f0ac14..968b6de99a6 100644
--- a/htdocs/langs/bg_BG/projects.lang
+++ b/htdocs/langs/bg_BG/projects.lang
@@ -74,6 +74,9 @@ Progress=Напредък
 ProgressDeclared=Деклариране прогрес
 ProgressCalculated=Изчислен прогрес
 Time=Време
+ListOfTasks=List of tasks
+GoToListOfTimeConsumed=Go to list of time consumed
+GoToListOfTasks=Go to list of tasks
 ListProposalsAssociatedProject=Списък на търговските предложения, свързани с проекта
 ListOrdersAssociatedProject=Списък на клиентски поръчки, свързани с проекта
 ListInvoicesAssociatedProject=Списък на фактури на клиентите, свързани с проекта
@@ -198,3 +201,4 @@ OppStatusNEGO=Уговаряне
 OppStatusPENDING=Pending
 OppStatusWIN=Won
 OppStatusLOST=Lost
+Budget=Budget
diff --git a/htdocs/langs/bg_BG/sendings.lang b/htdocs/langs/bg_BG/sendings.lang
index b8341e27712..6f16906802b 100644
--- a/htdocs/langs/bg_BG/sendings.lang
+++ b/htdocs/langs/bg_BG/sendings.lang
@@ -70,6 +70,8 @@ ProductQtyInSuppliersOrdersRunning=Количество на продукт в 
 ProductQtyInShipmentAlreadySent=Количество на продукт от отворени клиентски поръчки, които вече са изпратени
 ProductQtyInSuppliersShipmentAlreadyRecevied=Количество на продукт от отворени поръчки към доставчик, които вече са получени
 NoProductToShipFoundIntoStock=Няма намерен продукт за изпращане в склад <b>%s</b>. Поправете стоковата и се върнете обратно, за да изберете друг склад.
+WeightVolShort=Weight/Vol.
+ValidateOrderFirstBeforeShipment=You must first validate the order before being able to make shipments.
 
 # Sending methods
 SendingMethodCATCH=Улов от клиента
diff --git a/htdocs/langs/bg_BG/supplier_proposal.lang b/htdocs/langs/bg_BG/supplier_proposal.lang
index 0d9cfa97677..64e43927dfc 100644
--- a/htdocs/langs/bg_BG/supplier_proposal.lang
+++ b/htdocs/langs/bg_BG/supplier_proposal.lang
@@ -58,3 +58,5 @@ DefaultModelSupplierProposalCreate=Създаване на модел по по
 DefaultModelSupplierProposalToBill=Шаблон по подразбиране, когато се затваря запитване за цена (прието)
 DefaultModelSupplierProposalClosed=Шаблон по подразбиране, когато се затваря запитване за цена (отказано)
 ListOfSupplierProposal=Списък на запитвания за цени към доставчици
+SupplierProposalsToClose=Supplier proposals to close
+SupplierProposalsToProcess=Supplier proposals to process
diff --git a/htdocs/langs/bn_BD/admin.lang b/htdocs/langs/bn_BD/admin.lang
index deca56bf2c1..c83ce1dba12 100644
--- a/htdocs/langs/bn_BD/admin.lang
+++ b/htdocs/langs/bn_BD/admin.lang
@@ -282,6 +282,7 @@ ModuleSetup=Module setup
 ModulesSetup=Modules setup
 ModuleFamilyBase=System
 ModuleFamilyCrm=Customer Relation Management (CRM)
+ModuleFamilySrm=Supplier Relation Management (SRM)
 ModuleFamilyProducts=Products Management (PM)
 ModuleFamilyHr=Human Resource Management (HR)
 ModuleFamilyProjects=Projects/Collaborative work
@@ -587,6 +588,7 @@ Permission38=Export products
 Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
 Permission42=Create/modify projects (shared project and projects i'm contact for)
 Permission44=Delete projects (shared project and projects i'm contact for)
+Permission45=Export projects
 Permission61=Read interventions
 Permission62=Create/modify interventions
 Permission64=Delete interventions
@@ -640,6 +642,7 @@ Permission162=Create/modify contracts/subscriptions
 Permission163=Activate a service/subscription of a contract
 Permission164=Disable a service/subscription of a contract
 Permission165=Delete contracts/subscriptions
+Permission167=Export contracts
 Permission171=Read trips and expenses (yours and your subordinates)
 Permission172=Create/modify trips and expenses
 Permission173=Delete trips and expenses
@@ -788,6 +791,7 @@ Permission2403=Delete actions (events or tasks) linked to his account
 Permission2411=Read actions (events or tasks) of others
 Permission2412=Create/modify actions (events or tasks) of others
 Permission2413=Delete actions (events or tasks) of others
+Permission2414=Export actions/tasks of others
 Permission2501=Read/Download documents
 Permission2502=Download documents
 Permission2503=Submit or delete documents
@@ -1713,3 +1717,4 @@ ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s is available. Ve
 MultiPriceRuleDesc=When option "Several level of prices per product/service" is on, you can define different prices (one per price level) for each product. To save you time, you can enter here rule to have price for each level autocalculated according to price of first level, so you will have to enter only price for first level on each product. This page is here to save you time and can be usefull only if your prices for each leve are relative to first level. You can ignore this page in most cases.
 ModelModulesProduct=Templates for product documents
 ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
+SeeSubstitutionVars=See * note for list of possible substitution variables
diff --git a/htdocs/langs/bn_BD/bills.lang b/htdocs/langs/bn_BD/bills.lang
index e67ad0ade2d..790a146ee98 100644
--- a/htdocs/langs/bn_BD/bills.lang
+++ b/htdocs/langs/bn_BD/bills.lang
@@ -219,6 +219,7 @@ RemainderToBill=Remainder to bill
 SendBillByMail=Send invoice by email
 SendReminderBillByMail=Send reminder by email
 RelatedCommercialProposals=Related commercial proposals
+RelatedRecurringCustomerInvoices=Related recurring customer invoices
 MenuToValid=To valid
 DateMaxPayment=Payment due before
 DateEcheance=Due date limit
@@ -319,7 +320,6 @@ toolTipFrequency=Examples:<br /><b>Set 7 / day</b>: give a new invoice every 7 d
 NextDateToExecution=Date for next invoice generation
 DateLastGeneration=Date of last generation
 MaxPeriodNumber=Max nb of invoice generation
-RestPeriodNumber=Rest period number
 NbOfGenerationDone=Nb of invoice generation already done
 InvoiceAutoValidate=Automatically validate invoice
 GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
@@ -471,3 +471,7 @@ PDFCrevetteSituationInvoiceLine=Situation N°%s : Inv. N°%s on %s
 TotalSituationInvoice=Total situation
 invoiceLineProgressError=Invoice line progress can't be egal or upper the next invoice line
 updatePriceNextInvoiceErrorUpdateline=Error : update price on invoice line : %s
+ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
+ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
+ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
+
diff --git a/htdocs/langs/bn_BD/boxes.lang b/htdocs/langs/bn_BD/boxes.lang
index 57bfc174ec5..7619a335b61 100644
--- a/htdocs/langs/bn_BD/boxes.lang
+++ b/htdocs/langs/bn_BD/boxes.lang
@@ -60,8 +60,8 @@ BoxTitleLastContracts=Last %s contracts
 BoxTitleLastModifiedDonations=Last %s modified donations
 BoxTitleLastModifiedExpenses=Last %s modified expense reports
 BoxGlobalActivity=Global activity (invoices, proposals, orders)
-BoxGoodCustomers=Good Customers
-BoxTitleGoodCustomers=%s Good Customers
+BoxGoodCustomers=Good customers
+BoxTitleGoodCustomers=%s Good customers
 FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Last successfull refresh date: %s
 LastRefreshDate=Last refresh date
 NoRecordedBookmarks=No bookmarks defined.
diff --git a/htdocs/langs/bn_BD/companies.lang b/htdocs/langs/bn_BD/companies.lang
index 588867b1f2f..fe967d3252f 100644
--- a/htdocs/langs/bn_BD/companies.lang
+++ b/htdocs/langs/bn_BD/companies.lang
@@ -202,7 +202,7 @@ ProfId3IN=Prof Id 3 (SRVC TAX)
 ProfId4IN=Prof Id 4
 ProfId5IN=Prof Id 5
 ProfId6IN=-
-ProfId1LU=Id. prof. 1 (RCS)
+ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
 ProfId2LU=Id. prof. 2 (Business permit)
 ProfId3LU=-
 ProfId4LU=-
@@ -317,10 +317,12 @@ ShowContact=Show contact
 ContactsAllShort=All (No filter)
 ContactType=Contact type
 ContactForOrders=Order's contact
+ContactForOrdersOrShipments=Order's or shipment's contact
 ContactForProposals=Proposal's contact
 ContactForContracts=Contract's contact
 ContactForInvoices=Invoice's contact
 NoContactForAnyOrder=This contact is not a contact for any order
+NoContactForAnyOrderOrShipment=This contact is not a contact for any order or shipment
 NoContactForAnyProposal=This contact is not a contact for any commercial proposal
 NoContactForAnyContract=This contact is not a contact for any contract
 NoContactForAnyInvoice=This contact is not a contact for any invoice
@@ -438,3 +440,6 @@ MergeThirdparties=Merge third parties
 ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one ? All linked objects (invoices, orders, ...) will be moved to current third party so you will be able to delete the duplicate one.
 ThirdpartiesMergeSuccess=Thirdparties have been merged
 ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
+SaleRepresentativeLogin=Login of sale representative
+SaleRepresentativeFirstname=Firstname of sale representative
+SaleRepresentativeLastname=Lastname of sale representative
diff --git a/htdocs/langs/bn_BD/errors.lang b/htdocs/langs/bn_BD/errors.lang
index 718b3e8413f..fa7804ce355 100644
--- a/htdocs/langs/bn_BD/errors.lang
+++ b/htdocs/langs/bn_BD/errors.lang
@@ -172,6 +172,8 @@ ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
 ErrorOppStatusRequiredIfAmount=You set an estimated amount for this opportunity/lead. So you must also enter its status
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
 ErrorSavingChanges=An error has ocurred when saving the changes
+ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
+ErrorFileMustHaveFormat=File must have format %s
 
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
diff --git a/htdocs/langs/bn_BD/exports.lang b/htdocs/langs/bn_BD/exports.lang
index 03c87b28bcf..1a490ea647d 100644
--- a/htdocs/langs/bn_BD/exports.lang
+++ b/htdocs/langs/bn_BD/exports.lang
@@ -128,6 +128,10 @@ SpecialCode=Special code
 ExportStringFilter=%% allows replacing one or more characters in the text
 ExportDateFilter=YYYY, YYYYMM, YYYYMMDD : filters by one year/month/day<br>YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD : filters over a range of years/months/days<br> > YYYY, > YYYYMM, > YYYYMMDD : filters on all following years/months/days<br> < YYYY, < YYYYMM, < YYYYMMDD : filters on all previous years/months/days
 ExportNumericFilter='NNNNN' filters by one value<br>'NNNNN+NNNNN' filters over a range of values<br>'&gt;NNNNN' filters by lower values<br>'&gt;NNNNN' filters by higher values
+ImportFromLine=Import starting from line number
+EndAtLineNb=End at line number
+SetThisValueTo2ToExcludeFirstLine=For example, set this value to 3 to exclude the 2 first lines
+KeepEmptyToGoToEndOfFile=Keep this field empty to go up to the end of file
 ## filters
 SelectFilterFields=If you want to filter on some values, just input values here.
 FilterableFields=Filterable Fields
diff --git a/htdocs/langs/bn_BD/main.lang b/htdocs/langs/bn_BD/main.lang
index abc26865694..3bead553dd0 100644
--- a/htdocs/langs/bn_BD/main.lang
+++ b/htdocs/langs/bn_BD/main.lang
@@ -25,6 +25,7 @@ FormatDateHourTextShort=%b %d, %Y, %I:%M %p
 FormatDateHourText=%B %d, %Y, %I:%M %p
 DatabaseConnection=Database connection
 NoTemplateDefined=No template defined for this email type
+AvailableVariables=Available substitution variables
 NoTranslation=No translation
 NoRecordFound=No record found
 NoError=No error
diff --git a/htdocs/langs/bn_BD/orders.lang b/htdocs/langs/bn_BD/orders.lang
index c0bfc3ccce3..33cd265b07f 100644
--- a/htdocs/langs/bn_BD/orders.lang
+++ b/htdocs/langs/bn_BD/orders.lang
@@ -32,6 +32,7 @@ StatusOrderSent=Shipment in process
 StatusOrderOnProcessShort=Ordered
 StatusOrderProcessedShort=Processed
 StatusOrderDelivered=Delivered
+StatusOrderDeliveredShort=Delivered
 StatusOrderToBillShort=Delivered
 StatusOrderToBill2Short=To bill
 StatusOrderApprovedShort=Approved
diff --git a/htdocs/langs/bn_BD/products.lang b/htdocs/langs/bn_BD/products.lang
index 5118e77c22b..27e8130e762 100644
--- a/htdocs/langs/bn_BD/products.lang
+++ b/htdocs/langs/bn_BD/products.lang
@@ -45,10 +45,6 @@ LastProducts=Last products
 CardProduct0=Product card
 CardProduct1=Service card
 CardContract=Contract card
-Warehouse=Warehouse
-Warehouses=Warehouses
-WarehouseOpened=Warehouse open
-WarehouseClosed=Warehouse closed
 Stock=Stock
 Stocks=Stocks
 Movement=Movement
@@ -318,3 +314,11 @@ WarningSelectOneDocument=Please select at least one document
 DefaultUnitToShow=Unit
 NbOfQtyInProposals=Qty in proposals
 ClinkOnALinkOfColumn=Click on a link of column %s to get a detailed view...
+TranslatedLabel=Translated label
+TranslatedDescription=Translated description
+TranslatedNote=Translated notes
+ProductWeight=Weight for 1 product
+ProductVolume=Volume for 1 product
+WeightUnits=Weight unit
+VolumeUnits=Volume unit
+SizeUnits=Size unit
diff --git a/htdocs/langs/bn_BD/projects.lang b/htdocs/langs/bn_BD/projects.lang
index 59f4ec5af51..b4a21befd80 100644
--- a/htdocs/langs/bn_BD/projects.lang
+++ b/htdocs/langs/bn_BD/projects.lang
@@ -74,6 +74,9 @@ Progress=Progress
 ProgressDeclared=Declared progress
 ProgressCalculated=Calculated progress
 Time=Time
+ListOfTasks=List of tasks
+GoToListOfTimeConsumed=Go to list of time consumed
+GoToListOfTasks=Go to list of tasks
 ListProposalsAssociatedProject=List of the commercial proposals associated with the project
 ListOrdersAssociatedProject=List of customer's orders associated with the project
 ListInvoicesAssociatedProject=List of customer's invoices associated with the project
@@ -198,3 +201,4 @@ OppStatusNEGO=Negociation
 OppStatusPENDING=Pending
 OppStatusWIN=Won
 OppStatusLOST=Lost
+Budget=Budget
diff --git a/htdocs/langs/bn_BD/sendings.lang b/htdocs/langs/bn_BD/sendings.lang
index fb7b9c08868..97f57e1d3c7 100644
--- a/htdocs/langs/bn_BD/sendings.lang
+++ b/htdocs/langs/bn_BD/sendings.lang
@@ -70,6 +70,8 @@ ProductQtyInSuppliersOrdersRunning=Product quantity into opened suppliers orders
 ProductQtyInShipmentAlreadySent=Product quantity from opened customer order already sent
 ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from opened supplier order already received
 NoProductToShipFoundIntoStock=No product to ship found into warehouse <b>%s</b>. Correct stock or go back to choose another warehouse.
+WeightVolShort=Weight/Vol.
+ValidateOrderFirstBeforeShipment=You must first validate the order before being able to make shipments.
 
 # Sending methods
 SendingMethodCATCH=Catch by customer
diff --git a/htdocs/langs/bn_BD/supplier_proposal.lang b/htdocs/langs/bn_BD/supplier_proposal.lang
index 1a1bdc4df16..e37ced1b38f 100644
--- a/htdocs/langs/bn_BD/supplier_proposal.lang
+++ b/htdocs/langs/bn_BD/supplier_proposal.lang
@@ -58,3 +58,5 @@ DefaultModelSupplierProposalCreate=Default model creation
 DefaultModelSupplierProposalToBill=Default template when closing a price request (accepted)
 DefaultModelSupplierProposalClosed=Default template when closing a price request (refused)
 ListOfSupplierProposal=List of supplier proposal requests
+SupplierProposalsToClose=Supplier proposals to close
+SupplierProposalsToProcess=Supplier proposals to process
diff --git a/htdocs/langs/bs_BA/admin.lang b/htdocs/langs/bs_BA/admin.lang
index 4baec526e4b..bd071220643 100644
--- a/htdocs/langs/bs_BA/admin.lang
+++ b/htdocs/langs/bs_BA/admin.lang
@@ -282,6 +282,7 @@ ModuleSetup=Postavke modula
 ModulesSetup=Postavke modula
 ModuleFamilyBase=System
 ModuleFamilyCrm=Customer Relation Management (CRM)
+ModuleFamilySrm=Supplier Relation Management (SRM)
 ModuleFamilyProducts=Products Management (PM)
 ModuleFamilyHr=Human Resource Management (HR)
 ModuleFamilyProjects=Projects/Collaborative work
@@ -587,6 +588,7 @@ Permission38=Export products
 Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
 Permission42=Create/modify projects (shared project and projects i'm contact for)
 Permission44=Delete projects (shared project and projects i'm contact for)
+Permission45=Export projects
 Permission61=Read interventions
 Permission62=Create/modify interventions
 Permission64=Delete interventions
@@ -640,6 +642,7 @@ Permission162=Create/modify contracts/subscriptions
 Permission163=Activate a service/subscription of a contract
 Permission164=Disable a service/subscription of a contract
 Permission165=Delete contracts/subscriptions
+Permission167=Export contracts
 Permission171=Read trips and expenses (yours and your subordinates)
 Permission172=Create/modify trips and expenses
 Permission173=Delete trips and expenses
@@ -788,6 +791,7 @@ Permission2403=Delete actions (events or tasks) linked to his account
 Permission2411=Read actions (events or tasks) of others
 Permission2412=Create/modify actions (events or tasks) of others
 Permission2413=Delete actions (events or tasks) of others
+Permission2414=Export actions/tasks of others
 Permission2501=Read/Download documents
 Permission2502=Download documents
 Permission2503=Submit or delete documents
@@ -1713,3 +1717,4 @@ ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s is available. Ve
 MultiPriceRuleDesc=When option "Several level of prices per product/service" is on, you can define different prices (one per price level) for each product. To save you time, you can enter here rule to have price for each level autocalculated according to price of first level, so you will have to enter only price for first level on each product. This page is here to save you time and can be usefull only if your prices for each leve are relative to first level. You can ignore this page in most cases.
 ModelModulesProduct=Templates for product documents
 ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
+SeeSubstitutionVars=See * note for list of possible substitution variables
diff --git a/htdocs/langs/bs_BA/bills.lang b/htdocs/langs/bs_BA/bills.lang
index fbb137b5a51..0bab631005c 100644
--- a/htdocs/langs/bs_BA/bills.lang
+++ b/htdocs/langs/bs_BA/bills.lang
@@ -219,6 +219,7 @@ RemainderToBill=Ostatak za naplatiti
 SendBillByMail=Pošalji fakturu na e-mail
 SendReminderBillByMail=Pošalji opomenu na e-mail
 RelatedCommercialProposals=Vezani poslovni prijedlozi
+RelatedRecurringCustomerInvoices=Related recurring customer invoices
 MenuToValid=Za važeći
 DateMaxPayment=Rok plaćanja do
 DateEcheance=Datum isteka roka za plaćanje
@@ -319,7 +320,6 @@ toolTipFrequency=Examples:<br /><b>Set 7 / day</b>: give a new invoice every 7 d
 NextDateToExecution=Date for next invoice generation
 DateLastGeneration=Date of last generation
 MaxPeriodNumber=Max nb of invoice generation
-RestPeriodNumber=Rest period number
 NbOfGenerationDone=Nb of invoice generation already done
 InvoiceAutoValidate=Automatically validate invoice
 GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
@@ -471,3 +471,7 @@ PDFCrevetteSituationInvoiceLine=Situation N°%s : Inv. N°%s on %s
 TotalSituationInvoice=Total situation
 invoiceLineProgressError=Invoice line progress can't be egal or upper the next invoice line
 updatePriceNextInvoiceErrorUpdateline=Error : update price on invoice line : %s
+ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
+ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
+ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
+
diff --git a/htdocs/langs/bs_BA/boxes.lang b/htdocs/langs/bs_BA/boxes.lang
index 85a59dd9e17..78af4d174e3 100644
--- a/htdocs/langs/bs_BA/boxes.lang
+++ b/htdocs/langs/bs_BA/boxes.lang
@@ -60,8 +60,8 @@ BoxTitleLastContracts=Zadnjih %s ugovora
 BoxTitleLastModifiedDonations=Zadnjih %s izmijenjenih donacija
 BoxTitleLastModifiedExpenses=Last %s modified expense reports
 BoxGlobalActivity=Globalne aktivnosti (fakture, prijedlozi, narudžbe)
-BoxGoodCustomers=Good Customers
-BoxTitleGoodCustomers=%s Good Customers
+BoxGoodCustomers=Good customers
+BoxTitleGoodCustomers=%s Good customers
 FailedToRefreshDataInfoNotUpToDate=Neuspjelo osvježavanje RSS protoka. Datum zadnjeg uspješnog osvježavanja: %s
 LastRefreshDate=Zadnji datum osvježavanja
 NoRecordedBookmarks=Nema definisanih bookmark-a.
diff --git a/htdocs/langs/bs_BA/companies.lang b/htdocs/langs/bs_BA/companies.lang
index a942b8c5864..149d0227f63 100644
--- a/htdocs/langs/bs_BA/companies.lang
+++ b/htdocs/langs/bs_BA/companies.lang
@@ -202,7 +202,7 @@ ProfId3IN=Prof Id 3 (SRVC TAX)
 ProfId4IN=Prof Id 4
 ProfId5IN=Prof Id 5
 ProfId6IN=-
-ProfId1LU=Id. prof. 1 (RCS)
+ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
 ProfId2LU=Id. prof. 2 (Business permit)
 ProfId3LU=-
 ProfId4LU=-
@@ -317,10 +317,12 @@ ShowContact=Prikaži kontakt
 ContactsAllShort=Svi (bez filtera)
 ContactType=Tip kontakta
 ContactForOrders=Kontakt narudžbe
+ContactForOrdersOrShipments=Order's or shipment's contact
 ContactForProposals=Kontakt prijedloga
 ContactForContracts=Kontakt ugovora
 ContactForInvoices=Kontakt fakture
 NoContactForAnyOrder=Ovaj kontakt nije kontakt za bilo koju narudžbu
+NoContactForAnyOrderOrShipment=This contact is not a contact for any order or shipment
 NoContactForAnyProposal=Ovaj kontakt nije kontakt za bilo koji poslovni prijedlog
 NoContactForAnyContract=Ovaj kontakt nije kontakt za bilo koji ugovor
 NoContactForAnyInvoice=Ovaj kontakt nije kontakt za bilo koju fakturu
@@ -438,3 +440,6 @@ MergeThirdparties=Merge third parties
 ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one ? All linked objects (invoices, orders, ...) will be moved to current third party so you will be able to delete the duplicate one.
 ThirdpartiesMergeSuccess=Thirdparties have been merged
 ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
+SaleRepresentativeLogin=Login of sale representative
+SaleRepresentativeFirstname=Firstname of sale representative
+SaleRepresentativeLastname=Lastname of sale representative
diff --git a/htdocs/langs/bs_BA/errors.lang b/htdocs/langs/bs_BA/errors.lang
index 718b3e8413f..fa7804ce355 100644
--- a/htdocs/langs/bs_BA/errors.lang
+++ b/htdocs/langs/bs_BA/errors.lang
@@ -172,6 +172,8 @@ ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
 ErrorOppStatusRequiredIfAmount=You set an estimated amount for this opportunity/lead. So you must also enter its status
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
 ErrorSavingChanges=An error has ocurred when saving the changes
+ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
+ErrorFileMustHaveFormat=File must have format %s
 
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
diff --git a/htdocs/langs/bs_BA/exports.lang b/htdocs/langs/bs_BA/exports.lang
index 03c87b28bcf..1a490ea647d 100644
--- a/htdocs/langs/bs_BA/exports.lang
+++ b/htdocs/langs/bs_BA/exports.lang
@@ -128,6 +128,10 @@ SpecialCode=Special code
 ExportStringFilter=%% allows replacing one or more characters in the text
 ExportDateFilter=YYYY, YYYYMM, YYYYMMDD : filters by one year/month/day<br>YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD : filters over a range of years/months/days<br> > YYYY, > YYYYMM, > YYYYMMDD : filters on all following years/months/days<br> < YYYY, < YYYYMM, < YYYYMMDD : filters on all previous years/months/days
 ExportNumericFilter='NNNNN' filters by one value<br>'NNNNN+NNNNN' filters over a range of values<br>'&gt;NNNNN' filters by lower values<br>'&gt;NNNNN' filters by higher values
+ImportFromLine=Import starting from line number
+EndAtLineNb=End at line number
+SetThisValueTo2ToExcludeFirstLine=For example, set this value to 3 to exclude the 2 first lines
+KeepEmptyToGoToEndOfFile=Keep this field empty to go up to the end of file
 ## filters
 SelectFilterFields=If you want to filter on some values, just input values here.
 FilterableFields=Filterable Fields
diff --git a/htdocs/langs/bs_BA/main.lang b/htdocs/langs/bs_BA/main.lang
index d7622933cff..2da856363b0 100644
--- a/htdocs/langs/bs_BA/main.lang
+++ b/htdocs/langs/bs_BA/main.lang
@@ -25,6 +25,7 @@ FormatDateHourTextShort=%b %d, %Y, %I:%M %p
 FormatDateHourText=%B %d, %Y, %I:%M %p
 DatabaseConnection=Database connection
 NoTemplateDefined=No template defined for this email type
+AvailableVariables=Available substitution variables
 NoTranslation=No translation
 NoRecordFound=No record found
 NoError=No error
diff --git a/htdocs/langs/bs_BA/orders.lang b/htdocs/langs/bs_BA/orders.lang
index c0bfc3ccce3..33cd265b07f 100644
--- a/htdocs/langs/bs_BA/orders.lang
+++ b/htdocs/langs/bs_BA/orders.lang
@@ -32,6 +32,7 @@ StatusOrderSent=Shipment in process
 StatusOrderOnProcessShort=Ordered
 StatusOrderProcessedShort=Processed
 StatusOrderDelivered=Delivered
+StatusOrderDeliveredShort=Delivered
 StatusOrderToBillShort=Delivered
 StatusOrderToBill2Short=To bill
 StatusOrderApprovedShort=Approved
diff --git a/htdocs/langs/bs_BA/products.lang b/htdocs/langs/bs_BA/products.lang
index e9d62a6044c..53018955c3a 100644
--- a/htdocs/langs/bs_BA/products.lang
+++ b/htdocs/langs/bs_BA/products.lang
@@ -45,10 +45,6 @@ LastProducts=Last products
 CardProduct0=Product card
 CardProduct1=Service card
 CardContract=Contract card
-Warehouse=Warehouse
-Warehouses=Warehouses
-WarehouseOpened=Warehouse open
-WarehouseClosed=Warehouse closed
 Stock=Stock
 Stocks=Stocks
 Movement=Movement
@@ -318,3 +314,11 @@ WarningSelectOneDocument=Please select at least one document
 DefaultUnitToShow=Unit
 NbOfQtyInProposals=Qty in proposals
 ClinkOnALinkOfColumn=Click on a link of column %s to get a detailed view...
+TranslatedLabel=Translated label
+TranslatedDescription=Translated description
+TranslatedNote=Translated notes
+ProductWeight=Weight for 1 product
+ProductVolume=Volume for 1 product
+WeightUnits=Weight unit
+VolumeUnits=Volume unit
+SizeUnits=Size unit
diff --git a/htdocs/langs/bs_BA/projects.lang b/htdocs/langs/bs_BA/projects.lang
index 9dc4d9e9eb2..0b25f6ea67a 100644
--- a/htdocs/langs/bs_BA/projects.lang
+++ b/htdocs/langs/bs_BA/projects.lang
@@ -74,6 +74,9 @@ Progress=Napredak
 ProgressDeclared=Declared progress
 ProgressCalculated=Calculated progress
 Time=Vrijeme
+ListOfTasks=List of tasks
+GoToListOfTimeConsumed=Go to list of time consumed
+GoToListOfTasks=Go to list of tasks
 ListProposalsAssociatedProject=Lista poslovnih prijedloga u vezi s projektom
 ListOrdersAssociatedProject=Lista narudžbi kupca u vezi s projektom
 ListInvoicesAssociatedProject=Lista faktura kupca u vezi s projektom
@@ -198,3 +201,4 @@ OppStatusNEGO=Negociation
 OppStatusPENDING=Pending
 OppStatusWIN=Won
 OppStatusLOST=Lost
+Budget=Budget
diff --git a/htdocs/langs/bs_BA/sendings.lang b/htdocs/langs/bs_BA/sendings.lang
index 2d96407d3fb..08126e59912 100644
--- a/htdocs/langs/bs_BA/sendings.lang
+++ b/htdocs/langs/bs_BA/sendings.lang
@@ -70,6 +70,8 @@ ProductQtyInSuppliersOrdersRunning=Product quantity into opened suppliers orders
 ProductQtyInShipmentAlreadySent=Product quantity from opened customer order already sent
 ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from opened supplier order already received
 NoProductToShipFoundIntoStock=No product to ship found into warehouse <b>%s</b>. Correct stock or go back to choose another warehouse.
+WeightVolShort=Weight/Vol.
+ValidateOrderFirstBeforeShipment=You must first validate the order before being able to make shipments.
 
 # Sending methods
 SendingMethodCATCH=Catch by customer
diff --git a/htdocs/langs/bs_BA/supplier_proposal.lang b/htdocs/langs/bs_BA/supplier_proposal.lang
index 1a1bdc4df16..e37ced1b38f 100644
--- a/htdocs/langs/bs_BA/supplier_proposal.lang
+++ b/htdocs/langs/bs_BA/supplier_proposal.lang
@@ -58,3 +58,5 @@ DefaultModelSupplierProposalCreate=Default model creation
 DefaultModelSupplierProposalToBill=Default template when closing a price request (accepted)
 DefaultModelSupplierProposalClosed=Default template when closing a price request (refused)
 ListOfSupplierProposal=List of supplier proposal requests
+SupplierProposalsToClose=Supplier proposals to close
+SupplierProposalsToProcess=Supplier proposals to process
diff --git a/htdocs/langs/ca_ES/accountancy.lang b/htdocs/langs/ca_ES/accountancy.lang
index e94cf78fdbb..13cbd256669 100644
--- a/htdocs/langs/ca_ES/accountancy.lang
+++ b/htdocs/langs/ca_ES/accountancy.lang
@@ -47,7 +47,7 @@ UpdateAccount=Modificació d'un compte comptable
 UpdateMvts=Modificació d'un moviment
 WriteBookKeeping=Registre de comptabilitat en el llibre major
 Bookkeeping=Llibre major
-AccountBalance=Account balance
+AccountBalance=Compte saldo
 
 AccountingVentilation=Desglossament de comptabilitat
 AccountingVentilationSupplier=Desglossament de comptabilitat de proveïdor
diff --git a/htdocs/langs/ca_ES/admin.lang b/htdocs/langs/ca_ES/admin.lang
index 3dc8b373900..40fcdf57a45 100644
--- a/htdocs/langs/ca_ES/admin.lang
+++ b/htdocs/langs/ca_ES/admin.lang
@@ -147,7 +147,7 @@ MenusEditorDesc=L'editor de menús permet definir entrades personalitzades en el
 MenuForUsers=Menú per als usuaris
 LangFile=arxiu .lang
 System=Sistema
-SystemInfo=Info. sistema
+SystemInfo=Informació del sistema
 SystemToolsArea=Àrea utilitats del sistema
 SystemToolsAreaDesc=Aquesta àrea ofereix diverses funcions d'administració. Utilitzeu el menú per triar la funcionalitat cercada.
 Purge=Purga
@@ -282,11 +282,12 @@ ModuleSetup=Configuració del mòdul
 ModulesSetup=Configuració dels mòduls
 ModuleFamilyBase=Sistema
 ModuleFamilyCrm=Gestió client (CRM)
+ModuleFamilySrm=Gestió de seguiment de proveïdors (SRM)
 ModuleFamilyProducts=Gestió de productes (PM)
 ModuleFamilyHr=Gestió de recursos humans (HR)
 ModuleFamilyProjects=Projectes/Treball cooperatiu
 ModuleFamilyOther=Altre
-ModuleFamilyTechnic=Mòduls eines o Sistema
+ModuleFamilyTechnic=Utilitats multi-mòduls
 ModuleFamilyExperimental=Mòduls experimentals
 ModuleFamilyFinancial=Mòduls financers (Comptabilitat/tresoreria)
 ModuleFamilyECM=Gestió Electrònica de Documents (GED)
@@ -376,7 +377,7 @@ PriceBaseTypeToChange=Canviar el preu on la referència de base és
 MassConvert=Convertir massivament
 String=Cadena
 TextLong=Text llarg
-Int=numèric enter
+Int=Enter
 Float=Decimal
 DateAndTime=Data i hora
 Unique=Unic
@@ -495,7 +496,7 @@ Module400Desc=Gestió de projectes, oportunitats o clients potencials. A continu
 Module410Name=Webcalendar
 Module410Desc=Interface amb el calendari webcalendar
 Module500Name=Pagaments especials
-Module500Desc=Gestió de despeses especials (impostos, impostos socials o fiscals, dividends)
+Module500Desc=Gestió de despeses especials (impostos varis, dividends)
 Module510Name=Sous
 Module510Desc=Gestió dels salaris dels empleats i pagaments
 Module520Name=Préstec
@@ -562,7 +563,7 @@ Module54000Desc=L'impressió directa (sense obrir els documents) utilitza l'inte
 Module55000Name=Enquesta o votació
 Module55000Desc=Mòdul per crear enquestes o votacions online (com Doodle, Studs, ...)
 Module59000Name=Marges
-Module59000Desc=Mòdul per gestionar els marges de benefici
+Module59000Desc=Mòdul per gestionar els marges
 Module60000Name=Comissions
 Module60000Desc=Mòdul per gestionar les comissions
 Permission11=Consulta factures de client
@@ -587,6 +588,7 @@ Permission38=Exportar productes
 Permission41=Consulta projectes i tasques (els projectes compartits i els projectes en que sóc el contacte). També pots entrar els temps consumits en tasques asignades (timesheet)
 Permission42=Crear/modificar projectes i tasques (compartits o és contacte)
 Permission44=Eliminar projectes i tasques (compartits o és contacte)
+Permission45=Export projects
 Permission61=Consulta intervencions
 Permission62=Crea/modifica intervencions
 Permission64=Elimina intervencions
@@ -605,10 +607,10 @@ Permission86=Envia comandes de clients
 Permission87=Tancar comandes de clients
 Permission88=Anul·lar comandes de clients
 Permission89=Eliminar comandes de clients
-Permission91=Consulta impostos socials o fiscals i IVA
-Permission92=Crea/modifica impostos socials o fiscals i IVA
-Permission93=Elimina impostos socials o fiscals i IVA
-Permission94=Exporta els impostos socials o fiscals
+Permission91=Consulta d'IVA i impostos varis
+Permission92=Crea/modifica IVA i impostos varis
+Permission93=Elimina IVA i impostos varis
+Permission94=Exporta els impostos varis
 Permission95=Consulta informes
 Permission101=Consulta expedicions
 Permission102=Crear/modificar expedicions
@@ -640,6 +642,7 @@ Permission162=Crear/Modificar contractes/subscripcions
 Permission163=Activar un servei/subscripció d'un contracte
 Permission164=Desactivar un servei/subscripció d'un contracte
 Permission165=Eliminar contractes/subscripcions
+Permission167=Export contracts
 Permission171=Consulta viatges i despeses (propis i subordinats)
 Permission172=Crear/modificar desplaçaments i despeses
 Permission173=Eliminar desplaçaments i despeses
@@ -788,6 +791,7 @@ Permission2403=Modificar accions (esdeveniments o tasques) vinculades al seu com
 Permission2411=Eliminar accions (esdeveniments o tasques) d'altres
 Permission2412=Crear/eliminar accions (esdeveniments o tasques) d'altres
 Permission2413=Canviar accions (esdeveniments o tasques) d'altres
+Permission2414=Export actions/tasks of others
 Permission2501=Consultar/Recuperar documents
 Permission2502=Recuperar documents
 Permission2503=Enviar o eliminar documents
@@ -800,7 +804,7 @@ Permission50202=Importar les transaccions
 Permission54001=Imprimir
 Permission55001=Llegir enquestes
 Permission55002=Crear/modificar enquestes
-Permission59001=Llegir marges comercials
+Permission59001=Consulta marges comercials
 Permission59002=Definir marges comercials
 Permission59003=Consulta qualsevol marge de l'usuari
 DictionaryCompanyType=Tipus de tercers
@@ -812,7 +816,7 @@ DictionaryCountry=Països
 DictionaryCurrency=Monedes
 DictionaryCivility=Títol cortesia
 DictionaryActions=Tipus d'esdeveniments de l'agenda
-DictionarySocialContributions=Tipus d'impostos socials o fiscals
+DictionarySocialContributions=Tipus d'impostos varis
 DictionaryVAT=Taxa d'IVA (Impost sobre vendes als EEUU)
 DictionaryRevenueStamp=Imports de segells fiscals
 DictionaryPaymentConditions=Condicions de pagament
@@ -873,7 +877,7 @@ CalcLocaltax2=Compres
 CalcLocaltax2Desc=Els informes es basen en el total de les compres
 CalcLocaltax3=Vendes
 CalcLocaltax3Desc=Els informes es basen en el total de les vendes
-LabelUsedByDefault=Etiqueta que s'utilitzarà si no es troba traducció per aquest codi
+LabelUsedByDefault=Etiqueta utilitzada per defecte si no es troba cap traducció per aquest codi
 LabelOnDocuments=Etiqueta sobre documents
 NbOfDays=Nº de dies
 AtEndOfMonth=A final de mes
@@ -1010,7 +1014,7 @@ ToActivateModule=Per activar els mòduls, aneu a l'àrea de Configuració (Inici
 SessionTimeOut=Timeout de sesions
 SessionExplanation=Assegura que el període de sessions no expirarà abans d'aquest moment. Tanmateix, la gestió del període de sessions de PHP no garanteix que el període de sessions expirar després d'aquest període: Aquest serà el cas si un sistema de neteja del cau de sessions és actiu. <br>Nota: Sense mecanisme especial, el mecanisme intern per netejar el període de sessions de PHP tots els accessos <b>%s /%s</b>, però només al voltant de l'accés d'altres períodes de sessions.
 TriggersAvailable=Triggers disponibles
-TriggersDesc=Els triggers són arxius que, une vegada dipositats a la carpeta <b>htdocs/core/triggers</b>, modifiquen el comportament del workflow d'Dolibarr. Realitzen accions suplementàries, desencadenades pels esdeveniments Dolibarr (creació d'empresa, validació factura, tancament de contracte, etc).
+TriggersDesc=Els triggers són arxius que modifiquen el comportament del fluxe de treball de Dolibarr un cop s'han copiat a la carpeta <b>htdocs/core/triggers</b>. Realitzen noves accions activades pels esdeveniments de Dolibarr (creació d'empresa, validació factura, ...).
 TriggerDisabledByName=Triggers d'aquest arxiu desactivador pel sufix <b>-NORUN</b> en el nom de l'arxiu.
 TriggerDisabledAsModuleDisabled=Triggers d'aquest arxiu desactivats ja que el mòdul <b>%s</b> no està activat.
 TriggerAlwaysActive=Triggers d'aquest arxiu sempre actius, ja que els mòduls Dolibarr relacionats estan activats
@@ -1081,8 +1085,8 @@ ExtraFieldsSupplierInvoices=Atributs complementaris (factures)
 ExtraFieldsProject=Atributs complementaris (projectes)
 ExtraFieldsProjectTask=Atributs complementaris (tasques)
 ExtraFieldHasWrongValue=L'atribut %s té un valor no valid
-AlphaNumOnlyCharsAndNoSpace=només carateres alfanumèrics sense espais
-AlphaNumOnlyLowerCharsAndNoSpace=només alfanumèrics i caràcters en minúscula sense espai
+AlphaNumOnlyCharsAndNoSpace=només caràcters alfanumèrics sense espai
+AlphaNumOnlyLowerCharsAndNoSpace=només caràcters alfanumèrics i en minúscula sense espai
 SendingMailSetup=Configuració de l'enviament per mail
 SendmailOptionNotComplete=Atenció, en alguns sistemes Linux, amb aquest mètode d'enviament, per poder enviar mails en nom seu, la configuració de sendmail ha de contenir l'opció <b>-ba</b> (paràmetre <b>mail.force_extra_parameters</b> a l'arxiu <b>php.ini</b>). Si alguns dels seus destinataris no reben els seus missatges, proveu de modificar aquest paràmetre PHP amb <b>mail.force_extra_parameters =-ba </b>.
 PathToDocuments=Rutes d'accés a documents
@@ -1519,13 +1523,13 @@ DetailId=Identificador del menú
 DetailMenuHandler=Nom del gestor de menús
 DetailMenuModule=Nom del mòdul si l'entrada del menú és resultant d'un mòdul
 DetailType=Tipus de menú (superior o esquerre)
-DetailTitre=Etiqueta de menú
+DetailTitre=Etiqueta de menú o codi d'etiqueta per traducció
 DetailMainmenu=Grup al qual pertany (obsolet)
 DetailUrl=URL de la pàgina cap a la qual el menú apunta
 DetailLeftmenu=Condició de visualització o no (obsolet)
 DetailEnabled=Condició de mostrar o no
 DetailRight=Condició de visualització completa o vidrossa
-DetailLangs=Arxiu langs per a la traducció del títol
+DetailLangs=Nom del fitxer Lang pel codi d'etiqueta de traducció
 DetailUser=Intern / Extern / Tots
 Target=Objectiu
 DetailTarget=Objectiu
@@ -1535,7 +1539,7 @@ DeleteMenu=Eliminar entrada de menú
 ConfirmDeleteMenu=Esteu segur que voleu eliminar l'entrada de menú <b>%s</b> ?
 FailedToInitializeMenu=Error al inicialitzar el menú
 ##### Tax #####
-TaxSetup=Impostos, impostos socials o fiscals i configuració de mòdul de dividends
+TaxSetup=Configuració del mòdul d'impostos varis i dividends
 OptionVatMode=Opció de càrrega d'IVA
 OptionVATDefault=Efectiu
 OptionVATDebitOption=Dèbit
@@ -1666,7 +1670,7 @@ BackupDumpWizard=Asistent per crear una copia de seguretat de la base de dades
 SomethingMakeInstallFromWebNotPossible=No és possible la instal·lació de mòduls externs des de la interfície web per la següent raó:
 SomethingMakeInstallFromWebNotPossible2=Per aquesta raó, explicarem aquí els passos del procés d'actualització manual que pot realitzar un usuari amb privilegis
 InstallModuleFromWebHasBeenDisabledByFile=La instal·lació de mòduls externs des de l'aplicació es troba desactivada per l'administrador. Ha de requerir que elimini l'arxiu <strong>%s</strong> per habilitar aquesta funció
-ConfFileMuseContainCustom=Installing an external module from application save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to have option<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
+ConfFileMuseContainCustom=Instal·lant un mòdul extern de l'aplicació desa els fitxers del mòdul en el directori <strong>%s</strong>. Per tenir aquest directori processat per Dolibarr, has de configurar el teu  <strong>conf/conf.php</strong> per tenir l'opció <br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Remarca línies de la taula quan el ratolí passi per sobre
 HighlightLinesColor=Remarca el color de la línia quan el ratolí hi passa per sobre (deixa-ho buit per a no remarcar)
 TextTitleColor=Color de títol de pàgina
@@ -1712,4 +1716,5 @@ ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s està disponible. La v
 ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s està disponible. La versió %s és una versió de manteniment que només conté correcció d'errors. Recomanem a tothom que utilitzi una versió anterior que s'actualitzi a aquesta. Com qualsevol versió de manteniment, no hi ha noves característiques ni canvis d'estructures de dades en aquesta versió. Es pot descarregar des de la secció de descàrregues del portal http://www.dolibarr.org (subdirectori de versions estables). Pots llegir el <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> per veure la llista completa dels canvis.
 MultiPriceRuleDesc=Quan l'opció "Varis nivells de preus per producte/servei" està activada, pots definir diferents preus (un preu per nivell) per cada producte. Per estalviar temps, pots entrar una regla per tenir preu per cada nivell autocalculat d'acord al preu del primer nivell, així només hauràs d'introduir el preu del primer nivell de cada producte. Aquesta pàgina està aqui per estalviar temps i pot ser útil només si els teus preus per cada nivell son relatius al primer nivell. Pots ignorar aquesta pàgina en la majoria dels casos.
 ModelModulesProduct=Plantilles per documents de productes
-ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
+ToGenerateCodeDefineAutomaticRuleFirst=Per poder generar codis automàticament, primer has de definir un responsable de autodefinir els números del codi de barres.
+SeeSubstitutionVars=See * note for list of possible substitution variables
diff --git a/htdocs/langs/ca_ES/banks.lang b/htdocs/langs/ca_ES/banks.lang
index 0b30e547a78..e480f7e68b2 100644
--- a/htdocs/langs/ca_ES/banks.lang
+++ b/htdocs/langs/ca_ES/banks.lang
@@ -113,7 +113,7 @@ CustomerInvoicePayment=Cobrament a client
 CustomerInvoicePaymentBack=Reemborsament a client
 SupplierInvoicePayment=Pagament a proveïdor
 WithdrawalPayment=Cobrament de domiciliació
-SocialContributionPayment=Impost de pagament social/fiscal
+SocialContributionPayment=Pagament d'impostos varis
 FinancialAccountJournal=Diari de tresoreria del compte
 BankTransfer=Transferència bancària
 BankTransfers=Transferències bancàries
@@ -152,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=Selecciona l'estat del compte bancari relacionat amb la conciliació. Utilitzeu un valor numèric que es pugui ordenar: AAAAMM o AAAAMMDD
+InputReceiptNumber=Selecciona l'estat del compte bancari relacionat amb la conciliació. Utilitza un valor numèric que es pugui ordenar: AAAAMM o AAAAMMDD
 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
diff --git a/htdocs/langs/ca_ES/bills.lang b/htdocs/langs/ca_ES/bills.lang
index a80818313e5..7dadefcb6bd 100644
--- a/htdocs/langs/ca_ES/bills.lang
+++ b/htdocs/langs/ca_ES/bills.lang
@@ -58,7 +58,7 @@ Payment=Pagament
 PaymentBack=Reembossament
 Payments=Pagaments
 PaymentsBack=Reembossaments
-paymentInInvoiceCurrency=in invoices currency
+paymentInInvoiceCurrency=en divisa de factures
 PaidBack=Reemborsat
 DeletePayment=Eliminar el pagament
 ConfirmDeletePayment=Esteu segur de voler eliminar aquest pagament?
@@ -142,8 +142,8 @@ BillFrom=Emissor
 BillTo=Enviar a
 ActionsOnBill=Eventos sobre la factura
 RecurringInvoiceTemplate=Factura recurrent
-NoQualifiedRecurringInvoiceTemplateFound=No recurring template invoice qualified for generation.
-FoundXQualifiedRecurringInvoiceTemplate=Found %s recurring template invoice(s) qualified for generation.
+NoQualifiedRecurringInvoiceTemplateFound=No s'ha qualificat cap plantilla de factura recurrent per generar-se.
+FoundXQualifiedRecurringInvoiceTemplate=S'ha trobat la plantilla de factura/es recurrent %s qualificada per generar-se.
 NotARecurringInvoiceTemplate=No és una plantilla de factura recurrent
 NewBill=Nova factura
 LastBills=Les %s últimes factures
@@ -186,7 +186,7 @@ NumberOfBills=Nº de factures
 NumberOfBillsByMonth=Nº de factures per mes
 AmountOfBills=Import de les factures
 AmountOfBillsByMonthHT=Import de les factures per mes (Sense IVA)
-ShowSocialContribution=Mostra l'impost social
+ShowSocialContribution=Mostra els impostos varis
 ShowBill=Veure factura
 ShowInvoice=Veure factura
 ShowInvoiceReplace=Veure factura rectificativa
@@ -219,6 +219,7 @@ RemainderToBill=Queda per facturar
 SendBillByMail=Envia factura per e-mail
 SendReminderBillByMail=Envia recordatori per e-mail
 RelatedCommercialProposals=Pressupostos relacionats
+RelatedRecurringCustomerInvoices=Related recurring customer invoices
 MenuToValid=A validar
 DateMaxPayment=Data límit de pagament
 DateEcheance=Data venciment
@@ -278,7 +279,7 @@ BillAddress=Direcció de facturació
 HelpEscompte=Un <b>descompte</b> és un descompte acordat sobre una factura donada, a un client que va realitzar el seu pagament molt abans del venciment.
 HelpAbandonBadCustomer=Aquest import es va abandonar (client jutjat com morós) i es considera com una pèrdua excepcional.
 HelpAbandonOther=Aquest import es va abandonar ja que es tractava d'un error de facturació (mala introducció de dades, factura substituïda per una altra).
-IdSocialContribution=Id. pagament d'impost social
+IdSocialContribution=Id. pagament d'impost varis
 PaymentId=ID pagament
 PaymentRef=Ref. pagament
 InvoiceId=Id factura
@@ -315,15 +316,14 @@ ListOfNextSituationInvoices=Llista de següents situacions de factures
 FrequencyPer_d=Cada %s dies
 FrequencyPer_m=Cada %s mesos
 FrequencyPer_y=Cada %s anys
-toolTipFrequency=Examples:<br /><b>Set 7 / day</b>: give a new invoice every 7 days<br /><b>Set 3 / month</b>: give a new invoice every 3 month
+toolTipFrequency=Exemples:<br /><b>Defineix 7 / dia</b>: dona una nova factura cada 7 dies<br /><b>Defineix 3 / mes</b>: dona una nova factura cada 3 mesos
 NextDateToExecution=Data de la propera generació de factures
 DateLastGeneration=Data de l'última generació
 MaxPeriodNumber=Nº màxim de generació de factures
-RestPeriodNumber=Rest period number
-NbOfGenerationDone=Nb of invoice generation already done
+NbOfGenerationDone=Nº de generació de factura ja realitzat
 InvoiceAutoValidate=Valida la factura automàticament
 GeneratedFromRecurringInvoice=Generat des de la plantilla de factura recurrent %s
-DateIsNotEnough=Date not yet reached
+DateIsNotEnough=La data encara no ha arribat
 InvoiceGeneratedFromTemplate=La factura %s s'ha generat des de la plantilla de factura recurrent %s
 # PaymentConditions
 PaymentConditionShortRECEP=A la recepció
@@ -429,7 +429,7 @@ AllCompletelyPayedInvoiceWillBeClosed=Totes les factures amb una resta a pagar 0
 ToMakePayment=Pagar
 ToMakePaymentBack=Reemborsar
 ListOfYourUnpaidInvoices=Llistat de factures impagades
-NoteListOfYourUnpaidInvoices=Nota: Aquest llistat inclou només els tercers dels que vostè és comercial.
+NoteListOfYourUnpaidInvoices=Nota: Aquest llistat només conté factures de tercers que tens enllaçats com a agent comercial.
 RevenueStamp=Timbre fiscal
 YouMustCreateInvoiceFromThird=Aquesta opció només està disponible quan es crea la factura des de la pestanya "client" des de tercers
 PDFCrabeDescription=Model de factura complet (model recomanat per defecte)
@@ -438,11 +438,11 @@ TerreNumRefModelDesc1=Retorna el nombre sota el format %syymm-nnnn per a les fac
 MarsNumRefModelDesc1=Retorna el nombre sota el format %syymm-nnnn per a les factures, %syymm-nnnn per a les factures rectificatives, %syymm-nnnn per a les factures de dipòsit i %syymm-nnnn pels abonaments  on yy és l'any, mm el mes i nnnn un comptador seqüencial sense ruptura i sense retorn a 0
 TerreNumRefModelError=Ja hi ha una factura amb $syymm i no és compatible amb aquest model de seqüència. Elimineu o renómbrela per poder activar aquest mòdul
 ##### Types de contacts #####
-TypeContact_facture_internal_SALESREPFOLL=Responsable seguiment factura a client
+TypeContact_facture_internal_SALESREPFOLL=Agent comercial del seguiment factura a client
 TypeContact_facture_external_BILLING=Contacte client facturació
 TypeContact_facture_external_SHIPPING=Contacte client entregues
 TypeContact_facture_external_SERVICE=Contacte client serveis
-TypeContact_invoice_supplier_internal_SALESREPFOLL=Responsable seguiment factures de proveïdor
+TypeContact_invoice_supplier_internal_SALESREPFOLL=Agent comercial seguiment factures de proveïdor
 TypeContact_invoice_supplier_external_BILLING=Contacte proveïdor facturació
 TypeContact_invoice_supplier_external_SHIPPING=Contacte proveïdor entregues
 TypeContact_invoice_supplier_external_SERVICE=Contacte proveïdor serveis
@@ -471,3 +471,7 @@ PDFCrevetteSituationInvoiceLine=Situació N°%s : Inv. N°%s en %s
 TotalSituationInvoice=Total situació
 invoiceLineProgressError=El progrés de la línia de factura no pot ser igual o superior a la següent línia de factura
 updatePriceNextInvoiceErrorUpdateline=Error : actualització de preu en línia de factura : %s
+ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
+ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
+ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
+
diff --git a/htdocs/langs/ca_ES/boxes.lang b/htdocs/langs/ca_ES/boxes.lang
index 1dbd87afade..3b37662c0b8 100644
--- a/htdocs/langs/ca_ES/boxes.lang
+++ b/htdocs/langs/ca_ES/boxes.lang
@@ -61,7 +61,7 @@ BoxTitleLastModifiedDonations=Les %s últimes donacions modificades
 BoxTitleLastModifiedExpenses=Els %s últims informes de despeses modificats
 BoxGlobalActivity=Activitat global
 BoxGoodCustomers=Bons clients
-BoxTitleGoodCustomers=%s bons clients
+BoxTitleGoodCustomers=% bons clients
 FailedToRefreshDataInfoNotUpToDate=Error en el refresc del flux RSS. Data de l'últim refresc :%s
 LastRefreshDate=Data de l'última actualització
 NoRecordedBookmarks=No hi ha marcadors personals.
diff --git a/htdocs/langs/ca_ES/commercial.lang b/htdocs/langs/ca_ES/commercial.lang
index 1bb5ef75453..785ecdafa57 100644
--- a/htdocs/langs/ca_ES/commercial.lang
+++ b/htdocs/langs/ca_ES/commercial.lang
@@ -23,14 +23,14 @@ TaskRDVWith=Cita amb %s
 ShowTask=Veure tasca
 ShowAction=Veure esdeveniment
 ActionsReport=Informe d'esdeveniments
-ThirdPartiesOfSaleRepresentative=Tercers on el representant de vendes és
-SalesRepresentative=Comercial
-SalesRepresentatives=Comercials
-SalesRepresentativeFollowUp=Comercial (seguiment)
-SalesRepresentativeSignature=Comercial (firma)
+ThirdPartiesOfSaleRepresentative=Tercers amb agent comercial
+SalesRepresentative=Agent comercial
+SalesRepresentatives=Agents comercials
+SalesRepresentativeFollowUp=Agent comercial (seguiment)
+SalesRepresentativeSignature=Agent comercial (firma)
 CommercialInterlocutor=Interlocutor comercial
 ErrorWrongCode=Codi incorrecte
-NoSalesRepresentativeAffected=Cap comercial afectat
+NoSalesRepresentativeAffected=Sense agent comercial assignat
 ShowCustomer=Veure client
 ShowProspect=Veure clients potencials
 ListOfProspects=Llista de clients potencials
@@ -87,7 +87,7 @@ ActionAC_AUTO=Esdeveniments creats automàticament
 Stats=Estadístiques de venda
 CAOrder=Volum de vendes (Comandes validades)
 FromTo=de %s a %s
-MargeOrder=Marges (Comandes validades)
+MargeOrder=Marges (comandes validades)
 RecapAnnee=Recapitulació de l'any
 NoData=No hi ha dades
 StatusProsp=Estat del pressupost
diff --git a/htdocs/langs/ca_ES/companies.lang b/htdocs/langs/ca_ES/companies.lang
index c244c748a2f..f603ff2db22 100644
--- a/htdocs/langs/ca_ES/companies.lang
+++ b/htdocs/langs/ca_ES/companies.lang
@@ -202,7 +202,7 @@ ProfId3IN=CNAE
 ProfId4IN=Id prof. 4
 ProfId5IN=Id prof. 5
 ProfId6IN=-
-ProfId1LU=CIF/NIF (RCS)
+ProfId1LU=CIF/NIF (R.C.S. Luxembourg)
 ProfId2LU=Núm. seguretat social (Business permit)
 ProfId3LU=-
 ProfId4LU=-
@@ -317,13 +317,15 @@ ShowContact=Mostrar contacte
 ContactsAllShort=Tots (sense filtre)
 ContactType=Tipus de contacte
 ContactForOrders=Contacte de comandes
+ContactForOrdersOrShipments=Contacte de la comanda o enviament
 ContactForProposals=Contacte de pressupostos
 ContactForContracts=Contacte de contracte
 ContactForInvoices=Contacte de factures
 NoContactForAnyOrder=Aquest contacte no és contacte de cap comanda
+NoContactForAnyOrderOrShipment=Aquest contacte no és un contacte per cap comanda o enviament
 NoContactForAnyProposal=Aquest contacte no és contacte de cap pressupost
 NoContactForAnyContract=Aquest contacte no és contacte de cap contracte
-NoContactForAnyInvoice=Este contacte no és contacte de cap factura
+NoContactForAnyInvoice=Aquest contacte no és contacte de cap factura
 NewContact=Nou contacte
 NewContactAddress=Nou contacte/adreça
 LastContacts=Ultims contactes
@@ -392,7 +394,7 @@ ExportDataset_company_2=Contactes de tercers i atributs
 ImportDataset_company_1=Tercers (empreses/entitats/persones físiques) i propietats
 ImportDataset_company_2=Contactes/Adreces (de tercers o no) i atributs
 ImportDataset_company_3=Comptes bancaris
-ImportDataset_company_4=Tercers/Comercials (afecta als usuaris representants de vendes a empreses)
+ImportDataset_company_4=Tercers/Agents comercials (afecta als usuaris agents comercials en empreses)
 PriceLevel=Nivell de preus
 DeliveriesAddress=Adreça(es) d'enviament
 DeliveryAddress=Adreça d'enviament
@@ -407,7 +409,7 @@ SupplierCategory=Categoria de proveïdor
 JuridicalStatus200=Independent
 DeleteFile=Elimina el fitxer
 ConfirmDeleteFile=Esteu segur de voler eliminar aquest fitxer?
-AllocateCommercial=Assignar un comercial
+AllocateCommercial=Assignat a l'agent comercial
 SelectCountry=Seleccionar un país
 SelectCompany=Selecionar un tercer
 Organization=Organisme
@@ -438,3 +440,6 @@ MergeThirdparties=Fusionar tercers
 ConfirmMergeThirdparties=Estàs segur que vols fusionar aquest tercer amb l'actual? Tots els objectes relacionats (factures, comandes, ...) serán mogudes al tercer actual i el duplicat serà esborrat.
 ThirdpartiesMergeSuccess=Els tercers han sigut fusionats
 ErrorThirdpartiesMerge=Hi ha hagut un error mentre s'esborraven els tercers. Per favor, revisa el log. Els canvis han sigut revertits.
+SaleRepresentativeLogin=Nom d'usuari de l'agent comercial
+SaleRepresentativeFirstname=Nom de l'agent comercial
+SaleRepresentativeLastname=Cognoms de l'agent comercial
diff --git a/htdocs/langs/ca_ES/compta.lang b/htdocs/langs/ca_ES/compta.lang
index 5d33828d6ee..dcd21b13d72 100644
--- a/htdocs/langs/ca_ES/compta.lang
+++ b/htdocs/langs/ca_ES/compta.lang
@@ -56,23 +56,23 @@ VATCollected=IVA recuperat
 ToPay=A pagar
 ToGet=A tornar
 SpecialExpensesArea=Àrea per tots els pagaments especials
-TaxAndDividendsArea=Impostos de vendes, contribucions en impostos socials/fiscals i àrea de dividends.
-SocialContribution=Impost socials o fiscals
-SocialContributions=Impostos socials o fiscals
+TaxAndDividendsArea=Impostos de vendes, contribucions en impostos varis i àrea de dividends
+SocialContribution=Impost varis
+SocialContributions=Impostos varis
 MenuSpecialExpenses=Pagaments especials
 MenuTaxAndDividends=Impostos i càrregues
 MenuSalaries=Salaris
-MenuSocialContributions=Impost social/fiscal
-MenuNewSocialContribution=Nou impost social
-NewSocialContribution=Nou impost social/fiscal
-ContributionsToPay=Impostos socials/fiscals a pagar
+MenuSocialContributions=Impostos varis
+MenuNewSocialContribution=Nou impost varis
+NewSocialContribution=Nou impost varis
+ContributionsToPay=Impostos varis a pagar
 AccountancyTreasuryArea=Àrea comptabilitat/tresoreria
 AccountancySetup=Configuració comptabilitat
 NewPayment=Nou pagament
 Payments=Pagaments
 PaymentCustomerInvoice=Cobrament factura a client
 PaymentSupplierInvoice=Pagament factura de proveïdor
-PaymentSocialContribution=Pagament d'impost social/fiscal
+PaymentSocialContribution=Pagament d'impost varis
 PaymentVat=Pagament IVA
 PaymentSalary=Pagament salario
 ListPayment=Llistat de pagaments
@@ -98,7 +98,7 @@ VATPayment=Pagament IVA
 VATPayments=Pagaments IVA
 VATRefund=Devolució de l'IVA
 Refund=Devolució
-SocialContributionsPayments=Pagaments d'impostos socials/fiscals
+SocialContributionsPayments=Pagaments d'impostos varis
 ShowVatPayment=Veure pagaments IVA
 TotalToPay=Total a pagar
 TotalVATReceived=Total IVA percebut
@@ -125,11 +125,11 @@ NewCheckDepositOn=Crear nova remesa al compte: %s
 NoWaitingChecks=No hi ha xecs en espera d'ingressar.
 DateChequeReceived=Data recepció del xec
 NbOfCheques=N º de xecs
-PaySocialContribution=Pagar un impost social/fiscal
-ConfirmPaySocialContribution=Esteu segur de voler classificar aquest impost social o fiscal com a pagat?
-DeleteSocialContribution=Elimina un pagament d'impost social o fiscal
-ConfirmDeleteSocialContribution=Esteu segur de voler eliminar el pagament d'aquest impost social/fiscal?
-ExportDataset_tax_1=Impostos socials i fiscals i pagaments
+PaySocialContribution=Pagar un impost varis
+ConfirmPaySocialContribution=Esteu segur de voler classificar aquest impost varis com a pagat?
+DeleteSocialContribution=Elimina un pagament d'impost varis
+ConfirmDeleteSocialContribution=Esteu segur de voler eliminar el pagament d'aquest impost varis?
+ExportDataset_tax_1=Impostos varis i pagaments
 CalcModeVATDebt=Mode d'<b>%sIVA sobre comptabilitat de compromís%s </b>.
 CalcModeVATEngagement=Mode d'<b>%sIVA sobre ingressos-despeses%s</b>.
 CalcModeDebt=Mode <b>%sReclamacions-Deutes%s</b> anomenada <b>Comptabilitad de compromís</b>.
@@ -212,8 +212,8 @@ ACCOUNTING_VAT_BUY_ACCOUNT=Codi comptable per defecte per IVA recuperat (IVA en
 ACCOUNTING_VAT_PAY_ACCOUNT=Codi comptable per defecte per l'IVA soportat
 ACCOUNTING_ACCOUNT_CUSTOMER=Compte comptable per defecte per a clients
 ACCOUNTING_ACCOUNT_SUPPLIER=Compte comptable per defecte per a proveïdors
-CloneTax=Duplica un impost social/fiscal
-ConfirmCloneTax=Confirma la duplicació del pagament de l'impost social/fiscal
+CloneTax=Duplica un impost varis
+ConfirmCloneTax=Confirma la duplicació del pagament de l'impost varis
 CloneTaxForNextMonth=Clonar-la pel pròxim mes
 SimpleReport=Informe simple
 AddExtraReport=Informes extra
diff --git a/htdocs/langs/ca_ES/contracts.lang b/htdocs/langs/ca_ES/contracts.lang
index 4dbebd8277f..f66b431b6df 100644
--- a/htdocs/langs/ca_ES/contracts.lang
+++ b/htdocs/langs/ca_ES/contracts.lang
@@ -93,14 +93,14 @@ NoExpiredServices=Sense serveis actius expirats
 ListOfServicesToExpireWithDuration=Llistat de serveis actius a expirar en %s dies
 ListOfServicesToExpireWithDurationNeg=Llistat de serveis expirats més de %s dies
 ListOfServicesToExpire=Llistat de serveis actius a expirar
-NoteListOfYourExpiredServices=Aquest llistat conté només els serveis de contractes de tercers dels que vostè és comercial
+NoteListOfYourExpiredServices=Aquest llistat només conté els serveis de contractes de tercers que tens enllaçats com a agent comercial
 StandardContractsTemplate=Plantilla de contracte Standard
 ContactNameAndSignature=Per %s, nom i signatura:
 OnlyLinesWithTypeServiceAreUsed=Només les línies amb tipus "Servei" seran clonades.
 
 ##### Types de contacts #####
-TypeContact_contrat_internal_SALESREPSIGN=Comercial signant del contracte
-TypeContact_contrat_internal_SALESREPFOLL=Comercial seguiment del contracte
+TypeContact_contrat_internal_SALESREPSIGN=Agent comercial signant del contracte
+TypeContact_contrat_internal_SALESREPFOLL=Agent comercial del seguiment del contracte
 TypeContact_contrat_external_BILLING=Contacte client de facturació
 TypeContact_contrat_external_CUSTOMER=Contacte client seguiment
 TypeContact_contrat_external_SALESREPSIGN=Contacte client signant del contracte
diff --git a/htdocs/langs/ca_ES/cron.lang b/htdocs/langs/ca_ES/cron.lang
index 9075e32fe9d..300ad4a666e 100644
--- a/htdocs/langs/ca_ES/cron.lang
+++ b/htdocs/langs/ca_ES/cron.lang
@@ -16,7 +16,7 @@ KeyForCronAccess=Codi de seguretat per a la URL de llançament de tasques autom
 FileToLaunchCronJobs=Ordre per llançar les tasques automàtiques
 CronExplainHowToRunUnix=A entorns Unix s'ha d'utilitzar la següent entrada crontab per executar la comanda cada 5 minuts
 CronExplainHowToRunWin=En entorns Microsoft (tm) Windows, pot utilitzar l'eina 'tareas programadas' per executar la comanda cada 5 minuts
-CronMethodDoesNotExists=Class %s does not contains any method %s
+CronMethodDoesNotExists=La classe %s no conté cap mètode %s
 # Menu
 CronJobs=Tasques programades
 CronListActive=Tasques programades habilitades
@@ -91,4 +91,4 @@ CronCannotLoadClass=impossible carregar la classe %s de l'objecte %s
 UseMenuModuleToolsToAddCronJobs=Anar a "inici - Utilitats mòduls - Llista de tasques Cron" per veure i editar tasques programades
 TaskDisabled=Tasca desactivada
 MakeLocalDatabaseDumpShort=Còpia de seguretat de la base de dades local
-MakeLocalDatabaseDump=Create a local database dump
+MakeLocalDatabaseDump=Crea un bolcat de base de dades local
diff --git a/htdocs/langs/ca_ES/deliveries.lang b/htdocs/langs/ca_ES/deliveries.lang
index 5fec50bf2b3..42b66265478 100644
--- a/htdocs/langs/ca_ES/deliveries.lang
+++ b/htdocs/langs/ca_ES/deliveries.lang
@@ -8,7 +8,7 @@ DeliveryDate=Data de lliurament
 DeliveryDateShort=Data lliurament
 CreateDeliveryOrder=Generar nota de recepció
 DeliveryStateSaved=Estat d'enviament desat
-QtyDelivered=Cant. enviada
+QtyDelivered=Qtat. entregada
 SetDeliveryDate=Indica la data de lliurament
 ValidateDeliveryReceipt=Validar el rebut de lliurament
 ValidateDeliveryReceiptConfirm=Estàs segur de voler validar aquest rebut de lliurament?
diff --git a/htdocs/langs/ca_ES/ecm.lang b/htdocs/langs/ca_ES/ecm.lang
index 18f1e9d011a..9f1d94fcae8 100644
--- a/htdocs/langs/ca_ES/ecm.lang
+++ b/htdocs/langs/ca_ES/ecm.lang
@@ -34,7 +34,7 @@ ECMSearchByEntity=Cercar per objecte
 ECMSectionOfDocuments=Carpetes de documents
 ECMTypeManual=Manual
 ECMTypeAuto=Automàtic
-ECMDocsBySocialContributions=Documents relacionats als impostos socials o fiscals
+ECMDocsBySocialContributions=Documents relacionats als impostos varis
 ECMDocsByThirdParties=Documents associats a tercers
 ECMDocsByProposals=Documents associats a pressupostos
 ECMDocsByOrders=Documents associats a comandes
diff --git a/htdocs/langs/ca_ES/errors.lang b/htdocs/langs/ca_ES/errors.lang
index 8e98847ddb4..8e9bd3dffb7 100644
--- a/htdocs/langs/ca_ES/errors.lang
+++ b/htdocs/langs/ca_ES/errors.lang
@@ -166,12 +166,14 @@ ErrorGlobalVariableUpdater2=Falta el paràmetre '%s'
 ErrorGlobalVariableUpdater3=No s'han trobat les dades sol·licitades
 ErrorGlobalVariableUpdater4=El client SOAP ha fallat amb l'error '%s'
 ErrorGlobalVariableUpdater5=Sense variable global seleccionada
-ErrorFieldMustBeANumeric=El camp <b>%s</b> ha de contenir un valor numèric
+ErrorFieldMustBeANumeric=El camp <b>%s</b> ha de ser un valor numèric
 ErrorFieldMustBeAnInteger=El camp <b>%s</b> ha de ser un enter
 ErrorMandatoryParametersNotProvided=Paràmetre/s obligatori/s no definits
 ErrorOppStatusRequiredIfAmount=S'estableix una quantitat estimada per aquesta oportunitat/prospecte. Així que també has d'introduir el seu estat
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Definició incorrecta del menú Array en el descriptor del mòdul (valor incorrecte per a la clau fk_menu)
 ErrorSavingChanges=Hi ha hagut un error al salvar els canvis
+ErrorWarehouseRequiredIntoShipmentLine=El magatzem és obligatori en la línia a enviar
+ErrorFileMustHaveFormat=El fitxer té format %s
 
 # Warnings
 WarningPasswordSetWithNoAccount=S'ha indicat una contrasenya per aquest soci. En canvi, no s'ha creat cap compte d'usuari, de manera que aquesta contrasenya s'ha desat però no pot ser utilitzada per entrar a Dolibarr. Es pot utilitzar per un mòdul/interfície extern, però si no cal definir cap usuari i contrasenya per un soci, pots deshabilitar la opció "Gestiona l'entrada per tots els socis" des de la configuració del mòdul Socis. Si necessites gestionar una entrada sense contrasenya, pots mantenir aquest camp buit i permetre aquest avís. Nota: El correu electrònic es pot utilitzar per entrar si el soci està enllaçat a un usuarí
diff --git a/htdocs/langs/ca_ES/exports.lang b/htdocs/langs/ca_ES/exports.lang
index 6461b498244..41719e7a75b 100644
--- a/htdocs/langs/ca_ES/exports.lang
+++ b/htdocs/langs/ca_ES/exports.lang
@@ -128,6 +128,10 @@ SpecialCode=Codi especial
 ExportStringFilter=%% Permet la substitució d'un o mes caràcters en el text
 ExportDateFilter=AAAA, AAAAMM, AAAAMMDD: filtres per any/mes/dia<br>AAAA+AAAA, AAAAMM+AAAAMM, AAAAMMDD+AAAAMMDD: filtres sobre una gamma d'anys/mes/dia<br> > AAAA, > AAAAMM, > AAAAMMDD: filtres en tots els següents anys/mesos/dia<br> < AAAA, < AAAAMM, < AAAAMMDD: filtres en tots els anys/mes/dia anteriors
 ExportNumericFilter=Filtres 'NNNNN' per un valor<br>Filtres 'NNNNN+NNNN' més d'un rang de valors<br> '&gt; NNNNN' filtres per valors més baixos <br> '&gt; NNNNN' filtres pels valors més alts
+ImportFromLine=Importa començant des del número de línia
+EndAtLineNb=Final en el número de línia
+SetThisValueTo2ToExcludeFirstLine=Per exemple, defineix aquest valor a 3 per excloure les 2 primeres línies
+KeepEmptyToGoToEndOfFile=Deixa aquest camp buit per anar al final del fitxer
 ## filters
 SelectFilterFields=Si vol aplicar un filtre sobre alguns valors, introduïu-los aquí.
 FilterableFields=Camps filtrables
diff --git a/htdocs/langs/ca_ES/install.lang b/htdocs/langs/ca_ES/install.lang
index 2a53a2f3cd1..1c83e6f7d5d 100644
--- a/htdocs/langs/ca_ES/install.lang
+++ b/htdocs/langs/ca_ES/install.lang
@@ -79,7 +79,7 @@ PleaseTypePassword=Indiqui una contrasenya, no s'accepten les contrasenyes buide
 PleaseTypeALogin=Indiqui un usuari!
 PasswordsMismatch=Les contrasenyes no coincideixen, torni a intentar-ho!
 SetupEnd=Fi de la configuració
-SystemIsInstalled=S'està instal·lant el seu sistema
+SystemIsInstalled=La instal·lació s'ha finalitzat.
 SystemIsUpgraded=S'ha actualitzat Dolibarr correctament.
 YouNeedToPersonalizeSetup=Ara ha de configurar Dolibarr segons les seves necessitats (Elecció de l'aparença, de les funcionalitats, etc). Per això, feu clic en el següent link:
 AdminLoginCreatedSuccessfuly=Creació del compte gestor Dolibarr '<b>%s </b>' realitzat.
diff --git a/htdocs/langs/ca_ES/interventions.lang b/htdocs/langs/ca_ES/interventions.lang
index be237dd29b6..904368be9c5 100644
--- a/htdocs/langs/ca_ES/interventions.lang
+++ b/htdocs/langs/ca_ES/interventions.lang
@@ -9,7 +9,7 @@ EditIntervention=Editar
 ActionsOnFicheInter=Esdeveniments sobre l'intervenció
 LastInterventions=Les %s últimes intervencions
 AllInterventions=Totes les intervencions
-CreateDraftIntervention=Crear esborrany
+CreateDraftIntervention=Crea esborrany
 CustomerDoesNotHavePrefix=El client no té prefix de definit
 InterventionContact=Contacte intervenció
 DeleteIntervention=Eliminar intervenció
@@ -40,10 +40,10 @@ InterventionSentByEMail=Intervenció %s enviada per email
 InterventionDeletedInDolibarr=Intevenció %s eliminada
 SearchAnIntervention=Cerca una intervenció
 InterventionsArea=Àrea d'intervencions
-DraftFichinter=Intervencions en esborrany
+DraftFichinter=Intervencions esborrany
 LastModifiedInterventions=Les %s últimes intervencions modificades
 ##### Types de contacts #####
-TypeContact_fichinter_internal_INTERREPFOLL=Responsable seguiment de la intervenció
+TypeContact_fichinter_internal_INTERREPFOLL=Responsable del seguiment de la intervenció
 TypeContact_fichinter_internal_INTERVENING=Interventor
 TypeContact_fichinter_external_BILLING=Contacte client facturació intevenció
 TypeContact_fichinter_external_CUSTOMER=Contacte client seguiment intervenció
diff --git a/htdocs/langs/ca_ES/mails.lang b/htdocs/langs/ca_ES/mails.lang
index afc8d718fcb..0660cf609be 100644
--- a/htdocs/langs/ca_ES/mails.lang
+++ b/htdocs/langs/ca_ES/mails.lang
@@ -47,7 +47,7 @@ MailingSuccessfullyValidated=E-mailing validat correctament
 MailUnsubcribe=Desubscriure
 Unsuscribe=Desubscriure
 MailingStatusNotContact=No contactar
-MailingStatusReadAndUnsubscribe=Read and unsubscribe
+MailingStatusReadAndUnsubscribe=Llegeix i dóna de baixa
 ErrorMailRecipientIsEmpty=L'adreça del destinatari és buida
 WarningNoEMailsAdded=Cap nou e-mail a afegir a la llista destinataris.
 ConfirmValidMailing=Confirmeu la validació del E-Mailing?
diff --git a/htdocs/langs/ca_ES/main.lang b/htdocs/langs/ca_ES/main.lang
index 8d43817eb61..4b7ccb8f225 100644
--- a/htdocs/langs/ca_ES/main.lang
+++ b/htdocs/langs/ca_ES/main.lang
@@ -25,6 +25,7 @@ FormatDateHourTextShort=%d %b %Y %H:%M
 FormatDateHourText=%d %B %Y %H:%M
 DatabaseConnection=Connexió a la base de dades
 NoTemplateDefined=Aquest tipus d'email no té plantilla definida
+AvailableVariables=Available substitution variables
 NoTranslation=Sense traducció
 NoRecordFound=No s'han trobat registres
 NoError=Cap error
@@ -59,7 +60,7 @@ ErrorSomeErrorWereFoundRollbackIsDone=S'han trobat alguns errors. Modificacions
 ErrorConfigParameterNotDefined=El paràmetre <b>%s</b> no està definit en el fitxer de configuració Dolibarr <b>conf.php</b>.
 ErrorCantLoadUserFromDolibarrDatabase=Impossible trobar l'usuari <b>%s</b> a la base de dades Dolibarr.
 ErrorNoVATRateDefinedForSellerCountry=Error, cap tipus d'IVA definit per al país '%s'.
-ErrorNoSocialContributionForSellerCountry=Error, cap tipus d'impost social definit per al país '%s'.
+ErrorNoSocialContributionForSellerCountry=Error, cap tipus d'impost varis definit per al país '%s'.
 ErrorFailedToSaveFile=Error, el registre del fitxer ha fallat.
 NotAuthorized=No està autoritzat per fer-ho.
 SetDate=Indica la data
@@ -311,7 +312,7 @@ UnitPriceHT=Preu base
 UnitPriceTTC=Preu unitari total
 PriceU=P.U.
 PriceUHT=P.U.
-PriceUHTCurrency=U.P (currency)
+PriceUHTCurrency=U.P (moneda)
 SupplierProposalUHT=Preu Unitari sol·licitat
 PriceUTTC=Preu unitari (IVA inclòs)
 Amount=Import
@@ -322,9 +323,9 @@ AmountTTCShort=Import
 AmountHT=Base imponible
 AmountTTC=Import total
 AmountVAT=Import IVA
-MulticurrencyAmountHT=Amount (net of tax), original currency
-MulticurrencyAmountTTC=Amount (inc. of tax), original currency
-MulticurrencyAmountVAT=Amount tax, original currency
+MulticurrencyAmountHT=Base imposable, moneda original
+MulticurrencyAmountTTC=Import total, moneda original
+MulticurrencyAmountVAT=Import IVA, moneda original
 AmountLT1=Import Impost 2
 AmountLT2=Import Impost 3
 AmountLT1ES=Import RE
@@ -339,7 +340,7 @@ Percentage=Percentatge
 Total=Total
 SubTotal=Subtotal
 TotalHTShort=Import
-TotalHTShortCurrency=Total (net in currency)
+TotalHTShortCurrency=Import (en divisa)
 TotalTTCShort=Total
 TotalHT=Base imponible
 TotalHTforthispage=Base imposable a la pagina
@@ -462,7 +463,7 @@ Datas=Dades
 None=Res
 NoneF=Ninguna
 Late=Retard
-LateDesc=Delay to define if a record is late or not depends on your setup. Ask your admin to change delay from menu Home - Setup - Alerts.
+LateDesc=El retard que defineix si un registre arriba tard o no depèn de la configuració. Pregunti al seu administrador per canviar de retard des del menú Inici - Configuració - Alertes.
 Photo=Foto
 Photos=Fotos
 AddPhoto=Afegir foto
@@ -539,7 +540,7 @@ AmountInCurrency=Imports visualitzats en %s
 Example=Exemple
 Examples=Exemples
 NoExample=Sense exemple
-FindBug=Assenyalar un bug
+FindBug=Avisa d'un error
 NbOfThirdParties=Número de tercers
 NbOfCustomers=Nombre de clients
 NbOfLines=Números de línies
@@ -696,13 +697,13 @@ ByMonthYear=Per mes/any
 ByYear=Per any
 ByMonth=Per mes
 ByDay=Per dia
-BySalesRepresentative=Per comercial
+BySalesRepresentative=Per agent comercial
 LinkedToSpecificUsers=Enllaçat a un contacte d'usuari particular
 DeleteAFile=Eliminació d'arxiu
 ConfirmDeleteAFile=Confirme l'eliminació de l'arxiu
 NoResults=Cap resultat
 AdminTools=Utilitats d'administració
-SystemTools=Utilitats sistema
+SystemTools=Utilitats del sistema
 ModulesSystemTools=Utilitats mòduls
 Test=Prova
 Element=Element
@@ -740,8 +741,8 @@ Hello=Hola
 Sincerely=Sincerament
 DeleteLine=Elimina la línia
 ConfirmDeleteLine=Esteu segur de voler eliminar aquesta línia ?
-NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked records
-TooManyRecordForMassAction=Too many records selected for mass action. Such action are restriced to a list of %s records.
+NoPDFAvailableForDocGenAmongChecked=No hi havia PDF disponibles per la generació de document entre els registres validats.
+TooManyRecordForMassAction=S'ha seleccionat massa registres per l'acció massiva. Cada acció està restringida a una llista de %s registres.
 # Week day
 Monday=Dilluns
 Tuesday=Dimarts
diff --git a/htdocs/langs/ca_ES/margins.lang b/htdocs/langs/ca_ES/margins.lang
index f9c3cad1e03..0c700360415 100644
--- a/htdocs/langs/ca_ES/margins.lang
+++ b/htdocs/langs/ca_ES/margins.lang
@@ -12,11 +12,11 @@ DisplayMarkRates=Mostrar els marges sobre venda
 InputPrice=Introduir un preu
 margin=Gestió de marges
 margesSetup=Configuració de la gestió de marges
-MarginDetails=Detalls de marges realitzats
+MarginDetails=Detalls de marges
 ProductMargins=Marges per producte
 CustomerMargins=Marges per client
-SalesRepresentativeMargins=Marges per comercial
-UserMargins=Marges de l'usuari
+SalesRepresentativeMargins=Marges per agent comercial
+UserMargins=Marges per usuari
 ProductService=Producte o servei
 AllProducts=Tots els productes i serveis
 ChooseProduct/Service=Tria el producte o servei
@@ -43,7 +43,7 @@ BuyingCost=Costos
 UnitCharges=Càrrega unitària
 Charges=Càrreges
 AgentContactType=Tipus de contacte comissionat
-AgentContactTypeDetails=Indica quin tipus de contacte (enllaçat a les factures) serà l'utilitzat per l'informe de marges d'agents comercials.
-rateMustBeNumeric=El marge té que ser un valor numèric
+AgentContactTypeDetails=Indica quin tipus de contacte (enllaçat a les factures) serà l'utilitzat per l'informe de marges per agent comercial
+rateMustBeNumeric=El marge ha de ser un valor numèric
 markRateShouldBeLesserThan100=El marge té que ser menor que 100
 ShowMarginInfos=Mostrar info de marges
diff --git a/htdocs/langs/ca_ES/members.lang b/htdocs/langs/ca_ES/members.lang
index 71f960ad52c..383a971f717 100644
--- a/htdocs/langs/ca_ES/members.lang
+++ b/htdocs/langs/ca_ES/members.lang
@@ -120,7 +120,7 @@ LastSubscriptionsModified=Les %s últimes afiliacions modificades
 AttributeName=Nom de l'atribut
 String=Cadena
 Text=Text llarg
-Int=Numèric
+Int=Enter
 DateAndTime=Data i hora
 PublicMemberCard=Fitxa pública de soci
 MemberNotOrNoMoreExpectedToSubscribe=No sotmesa a cotització
diff --git a/htdocs/langs/ca_ES/orders.lang b/htdocs/langs/ca_ES/orders.lang
index 7dd746bd66b..deda9dc0951 100644
--- a/htdocs/langs/ca_ES/orders.lang
+++ b/htdocs/langs/ca_ES/orders.lang
@@ -15,8 +15,8 @@ MakeOrder=Realitzar comanda
 SupplierOrder=Comanda a proveïdor
 SuppliersOrders=Comandes a proveïdors
 SuppliersOrdersRunning=Comandes a proveïdors en curs
-CustomerOrder=Comada de client
-CustomersOrders=Comades de client
+CustomerOrder=Comanda de client
+CustomersOrders=Comandes de client
 CustomersOrdersRunning=Comandes de clients en curs
 CustomersOrdersAndOrdersLines=Comandes de clients i línies de comanda
 OrdersToValid=Comandes de client per validar
@@ -32,6 +32,7 @@ StatusOrderSent=Enviament en curs
 StatusOrderOnProcessShort=Comanda
 StatusOrderProcessedShort=Processada
 StatusOrderDelivered=Entregada
+StatusOrderDeliveredShort=Entregada
 StatusOrderToBillShort=Emès
 StatusOrderToBill2Short=A facturar
 StatusOrderApprovedShort=Aprovada
@@ -54,7 +55,7 @@ StatusOrderBilled=Facturat
 StatusOrderReceivedPartially=Rebuda parcialment
 StatusOrderReceivedAll=Rebuda
 ShippingExist=Existeix una expedició
-ProductQtyInDraft=Cantitats a comandes esborrany
+ProductQtyInDraft=Quantitat de producte en comandes esborrany
 ProductQtyInDraftOrWaitingApproved=Quantitats en comandes esborrany o aprovades, però no realitzades
 DraftOrWaitingApproved=Esborrany o aprovat encara no controlat
 DraftOrWaitingShipped=Esborrany o validada encara no expedida
@@ -110,7 +111,7 @@ ClassifyShipped=Classificar enviat
 ClassifyBilled=Classificar facturat
 ComptaCard=Fitxa comptable
 DraftOrders=Comandes esborrany
-DraftSuppliersOrders=Comandes a proveïdors en esborrany
+DraftSuppliersOrders=Comandes a proveïdors esborrany
 RelatedOrders=Comandes relacionades
 RelatedCustomerOrders=Comandes de client relacionades
 RelatedSupplierOrders=Comandes de proveïdor relacionades
@@ -133,13 +134,13 @@ DispatchSupplierOrder=Recepció de la comanda a proveïdor %s
 FirstApprovalAlreadyDone=Primera aprovació realitzada
 SecondApprovalAlreadyDone=Segona aprovació realitzada
 ##### Types de contacts #####
-TypeContact_commande_internal_SALESREPFOLL=Responsable seguiment comanda client
-TypeContact_commande_internal_SHIPPING=Responsable enviament comanda client
+TypeContact_commande_internal_SALESREPFOLL=Agent comercial del seguiment comanda de client
+TypeContact_commande_internal_SHIPPING=Responsable del seguiment de l'enviament
 TypeContact_commande_external_BILLING=Contacte client facturació comanda
 TypeContact_commande_external_SHIPPING=Contacte client lliurament comanda
 TypeContact_commande_external_CUSTOMER=Contacte client seguiment comanda
-TypeContact_order_supplier_internal_SALESREPFOLL=Responsable seguiment comanda a proveïdor
-TypeContact_order_supplier_internal_SHIPPING=Responsable recepció comanda a proveïdor
+TypeContact_order_supplier_internal_SALESREPFOLL=Responsable del seguiment comanda a proveïdor
+TypeContact_order_supplier_internal_SHIPPING=Responsable del seguiment de la recepció
 TypeContact_order_supplier_external_BILLING=Contacte proveïdor facturació comanda
 TypeContact_order_supplier_external_SHIPPING=Contacte proveïdor lliurament comanda
 TypeContact_order_supplier_external_CUSTOMER=Contacte proveïdor seguiment comanda
diff --git a/htdocs/langs/ca_ES/products.lang b/htdocs/langs/ca_ES/products.lang
index 7a2100e8046..33174ef3b75 100644
--- a/htdocs/langs/ca_ES/products.lang
+++ b/htdocs/langs/ca_ES/products.lang
@@ -45,10 +45,6 @@ LastProducts=Últims productes
 CardProduct0=Fitxa producte
 CardProduct1=Fitxa servei
 CardContract=Fitxa contrate
-Warehouse=Magatzem
-Warehouses=Magatzems
-WarehouseOpened=Magatzem obert
-WarehouseClosed=Magatzem tancat
 Stock=Stock
 Stocks=Stocks
 Movement=Moviment
@@ -247,7 +243,7 @@ Building=Fabricació
 Build=Fabricar
 BuildIt=Llançar la fabricació
 BuildindListInfo=Nombre de productes manufacturables en magatzem, si s'indica zero no es fabriquen
-QtyNeed=Afectat
+QtyNeed=Qtat.
 UnitPmp=Preu Compra Unitari
 CostPmpHT=Cost de compra
 ProductUsedForBuild=Auto consumit per producció
@@ -295,7 +291,7 @@ ComposedProductIncDecStock=Incrementar/Disminueix estoc en canviar el seu pare
 ComposedProduct=Sub-producte
 MinSupplierPrice=Preu mínim de proveïdor
 DynamicPriceConfiguration=Configuració de preu dinàmic
-DynamicPriceDesc=On product card, with this module enabled, you should be able to set mathematic functions to calculate Customer or Supplier prices. Such function can use all mathematic operators, some constants and variables. You can set here the variables you want to be able and if the variable need an automatic update, the external URL to use to ask Dolibarr to update automaticaly the value.
+DynamicPriceDesc=En la fitxa de producte, amb aquest mòdul activat, podràs definir funcions matemàtiques per calcular els preus de Client o Proveïdor. Cada funció pot utilitzar tots els operadors matemàtics, algunes constants i variables. Pots definir aquí les variables que vulgui i si la variable necessita una actualització automàtica, la URL externa a utilitzar per demanar a Dolibarr la actualització automàtica del valor.
 AddVariable=Afegeix variable
 AddUpdater=Afegeix actualitzador
 GlobalVariables=Variables globals
@@ -317,4 +313,12 @@ DefaultPriceRealPriceMayDependOnCustomer=Preu per defecte, el preu real depén d
 WarningSelectOneDocument=Selecciona com a mínim un document
 DefaultUnitToShow=Unitat
 NbOfQtyInProposals=Qtat. en pressupostos
-ClinkOnALinkOfColumn=Click on a link of column %s to get a detailed view...
+ClinkOnALinkOfColumn=Fes clic en l'enllaç de columna %s per aconseguir una vista detallada...
+TranslatedLabel=Etiqueta traduïda
+TranslatedDescription=Descripció traduïda
+TranslatedNote=Notes traduïdes
+ProductWeight=Weight for 1 product
+ProductVolume=Volume for 1 product
+WeightUnits=Unitat de pes
+VolumeUnits=Volume unit
+SizeUnits=Unitat de tamany
diff --git a/htdocs/langs/ca_ES/projects.lang b/htdocs/langs/ca_ES/projects.lang
index 58e142f4fcb..5c2f18593cb 100644
--- a/htdocs/langs/ca_ES/projects.lang
+++ b/htdocs/langs/ca_ES/projects.lang
@@ -9,11 +9,11 @@ ProjectsArea=Àrea de projectes
 ProjectStatus=Estat el projecte
 SharedProject=Projecte compartit
 PrivateProject=Contactes del projecte
-MyProjectsDesc=Aquesta vista projecte es limita als projectes en què vostè és un contacte afectat (qualsevol tipus).
+MyProjectsDesc=Aquesta vista està limitada als projectes en que estàs com a contacte afectat (per a qualsevol tipus).
 ProjectsPublicDesc=Aquesta vista mostra tots els projectes en els que vostè té dret a tenir visibilitat.
 ProjectsPublicTaskDesc=Aquesta vista mostra tots els projectes als que té dret a visualitzar
 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).
+MyTasksDesc=Aquesta vista està limitada als projectes o tasques en que estàs com a contacte afectat  (per a qualsevol tipus).
 OnlyOpenedProject=Només visibles els projectes oberts (els projectes en estat d'esborrany o tancats no són visibles)
 ClosedProjectsAreHidden=Els projectes tancats no són visibles.
 TasksPublicDesc=Aquesta vista mostra tots els projectes i tasques en els que vostè té dret a tenir visibilitat.
@@ -74,6 +74,9 @@ Progress=Progressió
 ProgressDeclared=Progressió declarada
 ProgressCalculated=Progressió calculada
 Time=Temps
+ListOfTasks=List of tasks
+GoToListOfTimeConsumed=Go to list of time consumed
+GoToListOfTasks=Go to list of tasks
 ListProposalsAssociatedProject=Llistat de pressupostos associats al projecte
 ListOrdersAssociatedProject=Llistat de comandes associades al projecte
 ListInvoicesAssociatedProject=Llistat de factures associades al projecte
@@ -198,3 +201,4 @@ OppStatusNEGO=Negociació
 OppStatusPENDING=Pendent
 OppStatusWIN=Guanyat
 OppStatusLOST=Perdut
+Budget=Budget
diff --git a/htdocs/langs/ca_ES/propal.lang b/htdocs/langs/ca_ES/propal.lang
index 851b5e7ff4b..dc25d46f152 100644
--- a/htdocs/langs/ca_ES/propal.lang
+++ b/htdocs/langs/ca_ES/propal.lang
@@ -4,7 +4,7 @@ Proposal=Pressupost
 ProposalShort=Pressupost
 ProposalsDraft=Pressupostos esborrany
 ProposalDraft=Pressupost esborrany
-ProposalsOpened=Obre pressupostos
+ProposalsOpened=Pressupostos oberts
 Prop=Pressupostos
 CommercialProposal=Pressupost
 CommercialProposals=Pressupostos
@@ -31,7 +31,7 @@ NumberOfProposalsByMonth=Número per mes
 AmountOfProposalsByMonthHT=Import per mes (Sense IVA)
 NbOfProposals=Número pressupostos
 ShowPropal=Veure pressupost
-PropalsDraft=Esborrany
+PropalsDraft=Esborranys
 PropalsOpened=Actiu
 PropalsNotBilled=No facturats
 PropalStatusDraft=Esborrany (a validar)
@@ -92,7 +92,7 @@ AvailabilityTypeAV_2W=2 setmanes
 AvailabilityTypeAV_3W=3 setmanes
 AvailabilityTypeAV_1M=1 mes
 ##### Types de contacts #####
-TypeContact_propal_internal_SALESREPFOLL=Comercial seguiment pressupost
+TypeContact_propal_internal_SALESREPFOLL=Agent comercial del seguiment del pressupost
 TypeContact_propal_external_BILLING=Contacte client de facturació pressupost
 TypeContact_propal_external_CUSTOMER=Contacte client seguiment pressupost
 # Document models
diff --git a/htdocs/langs/ca_ES/sendings.lang b/htdocs/langs/ca_ES/sendings.lang
index 985eb69936f..5ee28e43a23 100644
--- a/htdocs/langs/ca_ES/sendings.lang
+++ b/htdocs/langs/ca_ES/sendings.lang
@@ -70,6 +70,8 @@ ProductQtyInSuppliersOrdersRunning=Quantitat de comandes a proveïdors obertes
 ProductQtyInShipmentAlreadySent=Quantitat de productes de comandes de client obertes i enviades
 ProductQtyInSuppliersShipmentAlreadyRecevied=Quantitat de comandes a proveïdors ja rebudes
 NoProductToShipFoundIntoStock=No s'ha trobat el producte per enviar en el magatzem <b>%s</b>. Corregeix l'estoc o torna enrera per triar un altre magatzem.
+WeightVolShort=Weight/Vol.
+ValidateOrderFirstBeforeShipment=You must first validate the order before being able to make shipments.
 
 # Sending methods
 SendingMethodCATCH=Recollit pel client
diff --git a/htdocs/langs/ca_ES/supplier_proposal.lang b/htdocs/langs/ca_ES/supplier_proposal.lang
index 04da2e626c8..2f13341be7b 100644
--- a/htdocs/langs/ca_ES/supplier_proposal.lang
+++ b/htdocs/langs/ca_ES/supplier_proposal.lang
@@ -6,7 +6,7 @@ SupplierProposalNew=Nova petició
 CommRequest=Petició de preu
 CommRequests=Peticions de preu
 SearchRequest=Busca una petició
-DraftRequests=Peticions en esborrany
+DraftRequests=Peticions esborrany
 SupplierProposalsDraft=Pressupost de proveïdor esborrany
 LastModifiedRequests=Les %s últimes peticions de preu modificades
 RequestsOpened=Obre una petició de preu
@@ -58,3 +58,5 @@ DefaultModelSupplierProposalCreate=Model de creació per defecte
 DefaultModelSupplierProposalToBill=Model per defecte en tancar una petició de preu (acceptada)
 DefaultModelSupplierProposalClosed=Model per defecte en tancar una petició de preu (rebutjada)
 ListOfSupplierProposal=Llistat de peticions de preu a proveïdor
+SupplierProposalsToClose=Supplier proposals to close
+SupplierProposalsToProcess=Supplier proposals to process
diff --git a/htdocs/langs/cs_CZ/admin.lang b/htdocs/langs/cs_CZ/admin.lang
index 7a0ef99ecf3..b9e073f5c84 100644
--- a/htdocs/langs/cs_CZ/admin.lang
+++ b/htdocs/langs/cs_CZ/admin.lang
@@ -282,6 +282,7 @@ ModuleSetup=Nastavení modulu
 ModulesSetup=Nastavení modulů
 ModuleFamilyBase=Systém
 ModuleFamilyCrm=Řízení vztahů se zákazníky (CRM)
+ModuleFamilySrm=Supplier Relation Management (SRM)
 ModuleFamilyProducts=Products Management (PM)
 ModuleFamilyHr=Human Resource Management (HR)
 ModuleFamilyProjects=Projekty / Týmové práce
@@ -587,6 +588,7 @@ Permission38=Export produktů
 Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
 Permission42=Vytvořit / upravit projektů (společné projekty, projekt a já jsem kontakt pro)
 Permission44=Odstranit projektů (společné projekty, projekt a já jsem kontakt pro)
+Permission45=Export projects
 Permission61=Přečtěte intervence
 Permission62=Vytvořit / upravit zásahy
 Permission64=Odstranit intervence
@@ -640,6 +642,7 @@ Permission162=Create/modify contracts/subscriptions
 Permission163=Aktivace služby / předplatné smlouvy
 Permission164=Zakázat servisní / předplatné smlouvy
 Permission165=Smazat zakázky / předplatné
+Permission167=Export contracts
 Permission171=Read trips and expenses (yours and your subordinates)
 Permission172=Vytvořit / upravit výlety a výdaje
 Permission173=Odstranění výlety a výdaje
@@ -788,6 +791,7 @@ Permission2403=Odstranit akce (události nebo úkoly) které souvisí s jeho ú
 Permission2411=Přečtěte akce (události nebo úkoly) a další
 Permission2412=Vytvořit / upravit akce (události nebo úkoly) dalších
 Permission2413=Odstranit akce (události nebo úkoly) dalších
+Permission2414=Export actions/tasks of others
 Permission2501=Čtení / Dokumenty ke stažení
 Permission2502=Dokumenty ke stažení
 Permission2503=Vložte nebo odstraňovat dokumenty
@@ -1713,3 +1717,4 @@ ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s is available. Ve
 MultiPriceRuleDesc=When option "Several level of prices per product/service" is on, you can define different prices (one per price level) for each product. To save you time, you can enter here rule to have price for each level autocalculated according to price of first level, so you will have to enter only price for first level on each product. This page is here to save you time and can be usefull only if your prices for each leve are relative to first level. You can ignore this page in most cases.
 ModelModulesProduct=Templates for product documents
 ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
+SeeSubstitutionVars=See * note for list of possible substitution variables
diff --git a/htdocs/langs/cs_CZ/bills.lang b/htdocs/langs/cs_CZ/bills.lang
index a2251967476..ff97e8f8b65 100644
--- a/htdocs/langs/cs_CZ/bills.lang
+++ b/htdocs/langs/cs_CZ/bills.lang
@@ -219,6 +219,7 @@ RemainderToBill=Zbývající část k placení
 SendBillByMail=Poslat e-mailem fakturu
 SendReminderBillByMail=Poslat upozornění e-mailem
 RelatedCommercialProposals=Související obchodní návrhy
+RelatedRecurringCustomerInvoices=Related recurring customer invoices
 MenuToValid=Platné
 DateMaxPayment=Platba musí proběhnout do
 DateEcheance=Omezení data splatnosti
@@ -319,7 +320,6 @@ toolTipFrequency=Examples:<br /><b>Set 7 / day</b>: give a new invoice every 7 d
 NextDateToExecution=Date for next invoice generation
 DateLastGeneration=Date of last generation
 MaxPeriodNumber=Max nb of invoice generation
-RestPeriodNumber=Rest period number
 NbOfGenerationDone=Nb of invoice generation already done
 InvoiceAutoValidate=Automatically validate invoice
 GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
@@ -471,3 +471,7 @@ PDFCrevetteSituationInvoiceLine=Situation N°%s : Inv. N°%s on %s
 TotalSituationInvoice=Total situation
 invoiceLineProgressError=Invoice line progress can't be egal or upper the next invoice line
 updatePriceNextInvoiceErrorUpdateline=Error : update price on invoice line : %s
+ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
+ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
+ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
+
diff --git a/htdocs/langs/cs_CZ/boxes.lang b/htdocs/langs/cs_CZ/boxes.lang
index 701ed71a9f4..207628dd265 100644
--- a/htdocs/langs/cs_CZ/boxes.lang
+++ b/htdocs/langs/cs_CZ/boxes.lang
@@ -60,8 +60,8 @@ BoxTitleLastContracts=Poslední %s smlouvy
 BoxTitleLastModifiedDonations=Poslední %s upravené dary
 BoxTitleLastModifiedExpenses=Last %s modified expense reports
 BoxGlobalActivity=Globální aktivita (faktury, návrhy, objednávky)
-BoxGoodCustomers=Good Customers
-BoxTitleGoodCustomers=%s Good Customers
+BoxGoodCustomers=Good customers
+BoxTitleGoodCustomers=%s Good customers
 FailedToRefreshDataInfoNotUpToDate=Nepodařilo se obnovit RSS zdroj. Poslední úspěšný refresh dne: %s
 LastRefreshDate=Poslední obnovovací data
 NoRecordedBookmarks=Nejsou definované žádné záložky.
diff --git a/htdocs/langs/cs_CZ/companies.lang b/htdocs/langs/cs_CZ/companies.lang
index c95615a3681..89170285998 100644
--- a/htdocs/langs/cs_CZ/companies.lang
+++ b/htdocs/langs/cs_CZ/companies.lang
@@ -202,7 +202,7 @@ ProfId3IN=Prof Id 3 (SRVC TAX)
 ProfId4IN=Prof Id 4
 ProfId5IN=Prof Id 5
 ProfId6IN=-
-ProfId1LU=Id. prof. 1 (RCS)
+ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
 ProfId2LU=Id. prof. 2 (Business permit)
 ProfId3LU=-
 ProfId4LU=-
@@ -317,10 +317,12 @@ ShowContact=Zobrazit kontakt
 ContactsAllShort=Vše (Bez filtru)
 ContactType=Typ kontaktu
 ContactForOrders=Kontakt objednávky
+ContactForOrdersOrShipments=Order's or shipment's contact
 ContactForProposals=Kontakt nabídky
 ContactForContracts=Kontakt smlouvy
 ContactForInvoices=Kontakt fakturace
 NoContactForAnyOrder=Tento kontakt není přiřazen k žádné objednávce
+NoContactForAnyOrderOrShipment=This contact is not a contact for any order or shipment
 NoContactForAnyProposal=Tento kontakt není přiřazen k žádné obchodní nabídce
 NoContactForAnyContract=Tento kontakt není přiřazen k žádné smlouvě
 NoContactForAnyInvoice=Tento kontakt není přiřazen k žádné faktuře
@@ -438,3 +440,6 @@ MergeThirdparties=Merge third parties
 ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one ? All linked objects (invoices, orders, ...) will be moved to current third party so you will be able to delete the duplicate one.
 ThirdpartiesMergeSuccess=Třetí strany  byly sloučeny
 ErrorThirdpartiesMerge=Došlo k chybě při mazání třetích stran. Zkontrolujte log soubor. Změny byly vráceny.
+SaleRepresentativeLogin=Login of sale representative
+SaleRepresentativeFirstname=Firstname of sale representative
+SaleRepresentativeLastname=Lastname of sale representative
diff --git a/htdocs/langs/cs_CZ/errors.lang b/htdocs/langs/cs_CZ/errors.lang
index ba19de1f167..3787b98620b 100644
--- a/htdocs/langs/cs_CZ/errors.lang
+++ b/htdocs/langs/cs_CZ/errors.lang
@@ -172,6 +172,8 @@ ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
 ErrorOppStatusRequiredIfAmount=You set an estimated amount for this opportunity/lead. So you must also enter its status
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
 ErrorSavingChanges=An error has ocurred when saving the changes
+ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
+ErrorFileMustHaveFormat=File must have format %s
 
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
diff --git a/htdocs/langs/cs_CZ/exports.lang b/htdocs/langs/cs_CZ/exports.lang
index c0430e439d9..1a02fcd0aeb 100644
--- a/htdocs/langs/cs_CZ/exports.lang
+++ b/htdocs/langs/cs_CZ/exports.lang
@@ -128,6 +128,10 @@ SpecialCode=Special code
 ExportStringFilter=%% allows replacing one or more characters in the text
 ExportDateFilter=YYYY, YYYYMM, YYYYMMDD : filters by one year/month/day<br>YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD : filters over a range of years/months/days<br> > YYYY, > YYYYMM, > YYYYMMDD : filters on all following years/months/days<br> < YYYY, < YYYYMM, < YYYYMMDD : filters on all previous years/months/days
 ExportNumericFilter='NNNNN' filters by one value<br>'NNNNN+NNNNN' filters over a range of values<br>'&gt;NNNNN' filters by lower values<br>'&gt;NNNNN' filters by higher values
+ImportFromLine=Import starting from line number
+EndAtLineNb=End at line number
+SetThisValueTo2ToExcludeFirstLine=For example, set this value to 3 to exclude the 2 first lines
+KeepEmptyToGoToEndOfFile=Keep this field empty to go up to the end of file
 ## filters
 SelectFilterFields=Chcete-li filtrovat některé hodnoty, stačí zadat hodnoty zde.
 FilterableFields=Filterable Fields
diff --git a/htdocs/langs/cs_CZ/main.lang b/htdocs/langs/cs_CZ/main.lang
index 1fb1d3998ae..b16d77609b7 100644
--- a/htdocs/langs/cs_CZ/main.lang
+++ b/htdocs/langs/cs_CZ/main.lang
@@ -25,6 +25,7 @@ FormatDateHourTextShort=%b %d, %Y, %I:%M %p
 FormatDateHourText=%B %d, %Y, %I:%M %p
 DatabaseConnection=Připojení k databázi
 NoTemplateDefined=No template defined for this email type
+AvailableVariables=Available substitution variables
 NoTranslation=Překlad není
 NoRecordFound=Nebyl nalezen žádný záznam
 NoError=Žádná chyba
diff --git a/htdocs/langs/cs_CZ/orders.lang b/htdocs/langs/cs_CZ/orders.lang
index 2789e7af434..5c45389b56e 100644
--- a/htdocs/langs/cs_CZ/orders.lang
+++ b/htdocs/langs/cs_CZ/orders.lang
@@ -32,6 +32,7 @@ StatusOrderSent=Přeprava v procesu
 StatusOrderOnProcessShort=Objednáno
 StatusOrderProcessedShort=Zpracované
 StatusOrderDelivered=Dodáno
+StatusOrderDeliveredShort=Delivered
 StatusOrderToBillShort=Dodává se
 StatusOrderToBill2Short=K účtu
 StatusOrderApprovedShort=Schválený
diff --git a/htdocs/langs/cs_CZ/products.lang b/htdocs/langs/cs_CZ/products.lang
index 6c4ac112271..76f12be68e6 100644
--- a/htdocs/langs/cs_CZ/products.lang
+++ b/htdocs/langs/cs_CZ/products.lang
@@ -45,10 +45,6 @@ LastProducts=Nejnovější produkty
 CardProduct0=Karta produktu
 CardProduct1=Servisní karta
 CardContract=Karta smluv
-Warehouse=Sklad
-Warehouses=Sklady
-WarehouseOpened=Otevřené sklady
-WarehouseClosed=Uzavřené sklady
 Stock=Zásoba
 Stocks=Zásoby
 Movement=Pohyb
@@ -318,3 +314,11 @@ WarningSelectOneDocument=Please select at least one document
 DefaultUnitToShow=Unit
 NbOfQtyInProposals=Qty in proposals
 ClinkOnALinkOfColumn=Click on a link of column %s to get a detailed view...
+TranslatedLabel=Translated label
+TranslatedDescription=Translated description
+TranslatedNote=Translated notes
+ProductWeight=Weight for 1 product
+ProductVolume=Volume for 1 product
+WeightUnits=Weight unit
+VolumeUnits=Volume unit
+SizeUnits=Size unit
diff --git a/htdocs/langs/cs_CZ/projects.lang b/htdocs/langs/cs_CZ/projects.lang
index 8a1a3bedffb..14b67dbb918 100644
--- a/htdocs/langs/cs_CZ/projects.lang
+++ b/htdocs/langs/cs_CZ/projects.lang
@@ -74,6 +74,9 @@ Progress=Progres
 ProgressDeclared=Hlášený progres
 ProgressCalculated=Vypočítaný progres
 Time=Čas
+ListOfTasks=List of tasks
+GoToListOfTimeConsumed=Go to list of time consumed
+GoToListOfTasks=Go to list of tasks
 ListProposalsAssociatedProject=Seznam obchodních návrhů spojených s projektem
 ListOrdersAssociatedProject=Seznam zákaznických objednávek související s projektem
 ListInvoicesAssociatedProject=Seznam zákaznických faktur souvisejících s projektem
@@ -198,3 +201,4 @@ OppStatusNEGO=Negociation
 OppStatusPENDING=Pending
 OppStatusWIN=Won
 OppStatusLOST=Lost
+Budget=Budget
diff --git a/htdocs/langs/cs_CZ/sendings.lang b/htdocs/langs/cs_CZ/sendings.lang
index 4cf09fdf162..61d9bfc48c1 100644
--- a/htdocs/langs/cs_CZ/sendings.lang
+++ b/htdocs/langs/cs_CZ/sendings.lang
@@ -70,6 +70,8 @@ ProductQtyInSuppliersOrdersRunning=Množství výrobku do otevřených dodavatel
 ProductQtyInShipmentAlreadySent=Množství již odeslaných produktů z objednávek zákazníka
 ProductQtyInSuppliersShipmentAlreadyRecevied=Množství již dodaných produktů z otevřených dodavatelských objednávek
 NoProductToShipFoundIntoStock=No product to ship found into warehouse <b>%s</b>. Correct stock or go back to choose another warehouse.
+WeightVolShort=Weight/Vol.
+ValidateOrderFirstBeforeShipment=You must first validate the order before being able to make shipments.
 
 # Sending methods
 SendingMethodCATCH=Chytit zákazníka
diff --git a/htdocs/langs/cs_CZ/supplier_proposal.lang b/htdocs/langs/cs_CZ/supplier_proposal.lang
index 1a1bdc4df16..e37ced1b38f 100644
--- a/htdocs/langs/cs_CZ/supplier_proposal.lang
+++ b/htdocs/langs/cs_CZ/supplier_proposal.lang
@@ -58,3 +58,5 @@ DefaultModelSupplierProposalCreate=Default model creation
 DefaultModelSupplierProposalToBill=Default template when closing a price request (accepted)
 DefaultModelSupplierProposalClosed=Default template when closing a price request (refused)
 ListOfSupplierProposal=List of supplier proposal requests
+SupplierProposalsToClose=Supplier proposals to close
+SupplierProposalsToProcess=Supplier proposals to process
diff --git a/htdocs/langs/da_DK/admin.lang b/htdocs/langs/da_DK/admin.lang
index e9bf96d4aaf..80456585cc8 100644
--- a/htdocs/langs/da_DK/admin.lang
+++ b/htdocs/langs/da_DK/admin.lang
@@ -282,6 +282,7 @@ ModuleSetup=Modul setup
 ModulesSetup=Moduler setup
 ModuleFamilyBase=System
 ModuleFamilyCrm=Kunden ressource Management (CRM)
+ModuleFamilySrm=Supplier Relation Management (SRM)
 ModuleFamilyProducts=Products Management (PM)
 ModuleFamilyHr=Human Resource Management (HR)
 ModuleFamilyProjects=Projekter / samarbejde
@@ -587,6 +588,7 @@ Permission38=Eksportere produkter
 Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
 Permission42=Opret / ændre projekter, redigere opgaver for mine projekter
 Permission44=Slet projekter
+Permission45=Export projects
 Permission61=Læs interventioner
 Permission62=Opret / ændre interventioner
 Permission64=Slet interventioner
@@ -640,6 +642,7 @@ Permission162=Create/modify contracts/subscriptions
 Permission163=Activate a service/subscription of a contract
 Permission164=Disable a service/subscription of a contract
 Permission165=Delete contracts/subscriptions
+Permission167=Export contracts
 Permission171=Read trips and expenses (yours and your subordinates)
 Permission172=Create/modify trips and expenses
 Permission173=Delete trips and expenses
@@ -788,6 +791,7 @@ Permission2403=Læs aktioner (begivenheder eller opgaver) af andre
 Permission2411=Læs aktioner (begivenheder eller opgaver) andres
 Permission2412=Opret / ændre handlinger (begivenheder eller opgaver) andres
 Permission2413=Slet handlinger (events eller opgaver) andres
+Permission2414=Export actions/tasks of others
 Permission2501=Læse dokumenter
 Permission2502=Indsend eller slette dokumenter
 Permission2503=Indsend eller slette dokumenter
@@ -1713,3 +1717,4 @@ ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s is available. Ve
 MultiPriceRuleDesc=When option "Several level of prices per product/service" is on, you can define different prices (one per price level) for each product. To save you time, you can enter here rule to have price for each level autocalculated according to price of first level, so you will have to enter only price for first level on each product. This page is here to save you time and can be usefull only if your prices for each leve are relative to first level. You can ignore this page in most cases.
 ModelModulesProduct=Templates for product documents
 ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
+SeeSubstitutionVars=See * note for list of possible substitution variables
diff --git a/htdocs/langs/da_DK/bills.lang b/htdocs/langs/da_DK/bills.lang
index 0a00712b611..59a7e3a149f 100644
--- a/htdocs/langs/da_DK/bills.lang
+++ b/htdocs/langs/da_DK/bills.lang
@@ -219,6 +219,7 @@ RemainderToBill=Restbeløb, der regningen
 SendBillByMail=Send faktura via e-mail
 SendReminderBillByMail=Send påmindelse via e-mail
 RelatedCommercialProposals=Relaterede kommercielle forslag
+RelatedRecurringCustomerInvoices=Related recurring customer invoices
 MenuToValid=På gyldige
 DateMaxPayment=Betaling, før
 DateEcheance=Forfaldsdag grænse
@@ -319,7 +320,6 @@ toolTipFrequency=Examples:<br /><b>Set 7 / day</b>: give a new invoice every 7 d
 NextDateToExecution=Date for next invoice generation
 DateLastGeneration=Date of last generation
 MaxPeriodNumber=Max nb of invoice generation
-RestPeriodNumber=Rest period number
 NbOfGenerationDone=Nb of invoice generation already done
 InvoiceAutoValidate=Automatically validate invoice
 GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
@@ -471,3 +471,7 @@ PDFCrevetteSituationInvoiceLine=Situation N°%s : Inv. N°%s on %s
 TotalSituationInvoice=Total situation
 invoiceLineProgressError=Invoice line progress can't be egal or upper the next invoice line
 updatePriceNextInvoiceErrorUpdateline=Error : update price on invoice line : %s
+ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
+ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
+ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
+
diff --git a/htdocs/langs/da_DK/boxes.lang b/htdocs/langs/da_DK/boxes.lang
index 7a5312c757b..994fd20e111 100644
--- a/htdocs/langs/da_DK/boxes.lang
+++ b/htdocs/langs/da_DK/boxes.lang
@@ -60,8 +60,8 @@ BoxTitleLastContracts=Sidste %s kontrakter
 BoxTitleLastModifiedDonations=Sidste %s ændret donationer
 BoxTitleLastModifiedExpenses=Last %s modified expense reports
 BoxGlobalActivity=Global activity (invoices, proposals, orders)
-BoxGoodCustomers=Good Customers
-BoxTitleGoodCustomers=%s Good Customers
+BoxGoodCustomers=Good customers
+BoxTitleGoodCustomers=%s Good customers
 FailedToRefreshDataInfoNotUpToDate=Det lykkedes ikke at opdatere RSS flux. Seneste vellykkede opdatere dato: %s
 LastRefreshDate=Sidst opdateret dato
 NoRecordedBookmarks=No bookmarks defined. Click <a href=Nr. bogmærker defineret. Klik <a href="%s">her</a> for at tilføje bogmærker.
diff --git a/htdocs/langs/da_DK/companies.lang b/htdocs/langs/da_DK/companies.lang
index bbf71e02fd7..00fc1a12099 100644
--- a/htdocs/langs/da_DK/companies.lang
+++ b/htdocs/langs/da_DK/companies.lang
@@ -202,7 +202,7 @@ ProfId3IN=Prof Id 3
 ProfId4IN=Prof Id 4
 ProfId5IN=Prof Id 5
 ProfId6IN=-
-ProfId1LU=Id. prof. 1 (RCS)
+ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
 ProfId2LU=Id. prof. 2 (Business permit)
 ProfId3LU=-
 ProfId4LU=-
@@ -317,10 +317,12 @@ ShowContact=Vis kontakt
 ContactsAllShort=Alle (nr. filter)
 ContactType=Kontakt type
 ContactForOrders=Orders »kontakt
+ContactForOrdersOrShipments=Order's or shipment's contact
 ContactForProposals=Forslag 'kontakt
 ContactForContracts=Kontrakter »kontakt
 ContactForInvoices=Faktura 'kontakt
 NoContactForAnyOrder=Denne kontakt er ikke kontakt til vilkårlig rækkefølge
+NoContactForAnyOrderOrShipment=This contact is not a contact for any order or shipment
 NoContactForAnyProposal=Denne kontakt er ikke en kontakt til noget kommercielt forslag
 NoContactForAnyContract=Denne kontakt er ikke en kontakt til en kontrakt
 NoContactForAnyInvoice=Denne kontakt er ikke en kontakt til en faktura
@@ -438,3 +440,6 @@ MergeThirdparties=Merge third parties
 ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one ? All linked objects (invoices, orders, ...) will be moved to current third party so you will be able to delete the duplicate one.
 ThirdpartiesMergeSuccess=Thirdparties have been merged
 ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
+SaleRepresentativeLogin=Login of sale representative
+SaleRepresentativeFirstname=Firstname of sale representative
+SaleRepresentativeLastname=Lastname of sale representative
diff --git a/htdocs/langs/da_DK/errors.lang b/htdocs/langs/da_DK/errors.lang
index f3e5559ada6..86992ba8e18 100644
--- a/htdocs/langs/da_DK/errors.lang
+++ b/htdocs/langs/da_DK/errors.lang
@@ -172,6 +172,8 @@ ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
 ErrorOppStatusRequiredIfAmount=You set an estimated amount for this opportunity/lead. So you must also enter its status
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
 ErrorSavingChanges=An error has ocurred when saving the changes
+ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
+ErrorFileMustHaveFormat=File must have format %s
 
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
diff --git a/htdocs/langs/da_DK/exports.lang b/htdocs/langs/da_DK/exports.lang
index 001b3e027c2..c66ce36e748 100644
--- a/htdocs/langs/da_DK/exports.lang
+++ b/htdocs/langs/da_DK/exports.lang
@@ -128,6 +128,10 @@ SpecialCode=Special code
 ExportStringFilter=%% allows replacing one or more characters in the text
 ExportDateFilter=YYYY, YYYYMM, YYYYMMDD : filters by one year/month/day<br>YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD : filters over a range of years/months/days<br> > YYYY, > YYYYMM, > YYYYMMDD : filters on all following years/months/days<br> < YYYY, < YYYYMM, < YYYYMMDD : filters on all previous years/months/days
 ExportNumericFilter='NNNNN' filters by one value<br>'NNNNN+NNNNN' filters over a range of values<br>'&gt;NNNNN' filters by lower values<br>'&gt;NNNNN' filters by higher values
+ImportFromLine=Import starting from line number
+EndAtLineNb=End at line number
+SetThisValueTo2ToExcludeFirstLine=For example, set this value to 3 to exclude the 2 first lines
+KeepEmptyToGoToEndOfFile=Keep this field empty to go up to the end of file
 ## filters
 SelectFilterFields=If you want to filter on some values, just input values here.
 FilterableFields=Filterable Fields
diff --git a/htdocs/langs/da_DK/main.lang b/htdocs/langs/da_DK/main.lang
index 3393124d792..bc04a927271 100644
--- a/htdocs/langs/da_DK/main.lang
+++ b/htdocs/langs/da_DK/main.lang
@@ -25,6 +25,7 @@ FormatDateHourTextShort=%d %b %Y %H:%M
 FormatDateHourText=%d %B %Y %H:%M
 DatabaseConnection=Database forbindelse
 NoTemplateDefined=No template defined for this email type
+AvailableVariables=Available substitution variables
 NoTranslation=Ingen oversættelse
 NoRecordFound=Ingen poster fundet
 NoError=Ingen fejl
diff --git a/htdocs/langs/da_DK/orders.lang b/htdocs/langs/da_DK/orders.lang
index 49a2b8b8af3..4c07810fd2d 100644
--- a/htdocs/langs/da_DK/orders.lang
+++ b/htdocs/langs/da_DK/orders.lang
@@ -32,6 +32,7 @@ StatusOrderSent=Shipment in process
 StatusOrderOnProcessShort=Ordered
 StatusOrderProcessedShort=Forarbejdede
 StatusOrderDelivered=Delivered
+StatusOrderDeliveredShort=Delivered
 StatusOrderToBillShort=Til lovforslag
 StatusOrderToBill2Short=Til lovforslag
 StatusOrderApprovedShort=Godkendt
diff --git a/htdocs/langs/da_DK/products.lang b/htdocs/langs/da_DK/products.lang
index efdce7c16a1..84c09d6bed5 100644
--- a/htdocs/langs/da_DK/products.lang
+++ b/htdocs/langs/da_DK/products.lang
@@ -45,10 +45,6 @@ LastProducts=Seneste produkter
 CardProduct0=Produkt-kortet
 CardProduct1=Service kortet
 CardContract=Kontrakt-kortet
-Warehouse=Warehouse
-Warehouses=Lager
-WarehouseOpened=Warehouse open
-WarehouseClosed=Warehouse lukket
 Stock=Stock
 Stocks=Lagre
 Movement=Bevægelighed
@@ -318,3 +314,11 @@ WarningSelectOneDocument=Please select at least one document
 DefaultUnitToShow=Unit
 NbOfQtyInProposals=Qty in proposals
 ClinkOnALinkOfColumn=Click on a link of column %s to get a detailed view...
+TranslatedLabel=Translated label
+TranslatedDescription=Translated description
+TranslatedNote=Translated notes
+ProductWeight=Weight for 1 product
+ProductVolume=Volume for 1 product
+WeightUnits=Weight unit
+VolumeUnits=Volume unit
+SizeUnits=Size unit
diff --git a/htdocs/langs/da_DK/projects.lang b/htdocs/langs/da_DK/projects.lang
index 0962584a2f9..0c7ed16673b 100644
--- a/htdocs/langs/da_DK/projects.lang
+++ b/htdocs/langs/da_DK/projects.lang
@@ -74,6 +74,9 @@ Progress=Fremskridt
 ProgressDeclared=Declared progress
 ProgressCalculated=Calculated progress
 Time=Tid
+ListOfTasks=List of tasks
+GoToListOfTimeConsumed=Go to list of time consumed
+GoToListOfTasks=Go to list of tasks
 ListProposalsAssociatedProject=Lister over de kommercielle forslag er forbundet med projektet
 ListOrdersAssociatedProject=Lister over de ordrer, er forbundet med projektet
 ListInvoicesAssociatedProject=Lister over de fakturaer forbundet med projektet
@@ -198,3 +201,4 @@ OppStatusNEGO=Negociation
 OppStatusPENDING=Pending
 OppStatusWIN=Won
 OppStatusLOST=Lost
+Budget=Budget
diff --git a/htdocs/langs/da_DK/sendings.lang b/htdocs/langs/da_DK/sendings.lang
index 69402fe6379..5545eccf468 100644
--- a/htdocs/langs/da_DK/sendings.lang
+++ b/htdocs/langs/da_DK/sendings.lang
@@ -70,6 +70,8 @@ ProductQtyInSuppliersOrdersRunning=Product quantity into opened suppliers orders
 ProductQtyInShipmentAlreadySent=Product quantity from opened customer order already sent
 ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from opened supplier order already received
 NoProductToShipFoundIntoStock=No product to ship found into warehouse <b>%s</b>. Correct stock or go back to choose another warehouse.
+WeightVolShort=Weight/Vol.
+ValidateOrderFirstBeforeShipment=You must first validate the order before being able to make shipments.
 
 # Sending methods
 SendingMethodCATCH=Fangst af kunden
diff --git a/htdocs/langs/da_DK/supplier_proposal.lang b/htdocs/langs/da_DK/supplier_proposal.lang
index 1a1bdc4df16..e37ced1b38f 100644
--- a/htdocs/langs/da_DK/supplier_proposal.lang
+++ b/htdocs/langs/da_DK/supplier_proposal.lang
@@ -58,3 +58,5 @@ DefaultModelSupplierProposalCreate=Default model creation
 DefaultModelSupplierProposalToBill=Default template when closing a price request (accepted)
 DefaultModelSupplierProposalClosed=Default template when closing a price request (refused)
 ListOfSupplierProposal=List of supplier proposal requests
+SupplierProposalsToClose=Supplier proposals to close
+SupplierProposalsToProcess=Supplier proposals to process
diff --git a/htdocs/langs/de_AT/admin.lang b/htdocs/langs/de_AT/admin.lang
index 1f868cc1f69..56c89f6ab57 100644
--- a/htdocs/langs/de_AT/admin.lang
+++ b/htdocs/langs/de_AT/admin.lang
@@ -110,6 +110,7 @@ DelaysBeforeWarning=Benachrichtigungsverzögerungen
 DelaysOfToleranceBeforeWarning=Verspätungstoleranz vor Benachrichtigungen
 Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=Verzögerungstoleranz (in Tagen) vor  Benachrichtigung über zu aktivierende Services
 Delays_MAIN_DELAY_RUNNING_SERVICES=Verzögerungstoleranz (in Tagen) vor Benachrichtigung zu überfälligen Services
+TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
 DocumentModelOdt=Erstellen von Dokumentvorlagen im OpenDocuments-Format (.odt-Dateien für OpenOffice, KOffice, TextEdit, ...)
 WatermarkOnDraftInvoices=Wasserzeichen auf Rechnungsentwürfen (alle, falls leer)
 WatermarkOnDraftProposal=Wasserzeichen für Angebotsentwürfe (alle, falls leer)
diff --git a/htdocs/langs/de_AT/cron.lang b/htdocs/langs/de_AT/cron.lang
new file mode 100644
index 00000000000..d8953584e61
--- /dev/null
+++ b/htdocs/langs/de_AT/cron.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - cron
+CronDtLastLaunch=Start date of last execution
+CronDtLastResult=End date of last execution
diff --git a/htdocs/langs/de_AT/projects.lang b/htdocs/langs/de_AT/projects.lang
index 82efd9e0087..c609e4f2eac 100644
--- a/htdocs/langs/de_AT/projects.lang
+++ b/htdocs/langs/de_AT/projects.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - Source file is en_US - projects
+ProjectsArea=Projects Area
 PrivateProject=Projektansprechpartner
 MyProjectsDesc=Diese Ansicht ist auf Projekte beschränkt, zu denen Sie als Kontakt definiert sind (unabhängig vom Typ).
 ProjectsPublicDesc=Diese Ansicht zeigt alle für Sie sichtbaren Projekte.
diff --git a/htdocs/langs/de_CH/admin.lang b/htdocs/langs/de_CH/admin.lang
index 8d40f13d9bf..75d73bb978e 100644
--- a/htdocs/langs/de_CH/admin.lang
+++ b/htdocs/langs/de_CH/admin.lang
@@ -30,6 +30,7 @@ GenericMaskCodes2=<b>{cccc}</b>  den Kunden-Code mit n Zeichen<br><b>{cccc000}</
 GenericMaskCodes4a=<u>Beispiel auf der 99. %s des Dritten thecompany Geschehen 2007-01-31:</u> <br>
 GenericMaskCodes4b=<u>Beispiel für Dritte erstellt am 2007-03-01:</u> <br>
 UMaskExplanation=Über diesen Parameter können Sie die standardmässigen Dateiberechtigungen für vom System erzeugte/verwaltete Inhalte festlegen. <br>Erforderlich ist ein Oktalwert (0666 bedeutet z.B. Lesen und Schreiben für alle). <br>Auf Windows-Umgebungen haben diese Einstellungen keinen Effekt.
+DescWeather=Die folgenden Diagramme werden auf der Übersicht Startseite angezeigt, wenn die entsprechenden Toleranzwerte erreicht werden:
 HideAnyVATInformationOnPDF=Unterdrücken aller MwSt.-Informationen auf dem generierten PDF
 OldVATRates=Alter MwSt. Satz
 NewVATRates=Neuer MwSt. Satz
@@ -93,6 +94,7 @@ ExtraFieldsSupplierOrdersLines=Ergänzende Attribute (in Bestellungszeile)
 ExtraFieldsThirdParties=Ergänzende Attribute (Geschäftspartner)
 AlphaNumOnlyCharsAndNoSpace=nur alphanumericals Zeichen ohne Leerzeichen
 SendmailOptionNotComplete=Achtung, auf einigen Linux-Systemen, E-Mails von Ihrem E-Mail zu senden, sendmail Ausführung Setup muss conatins Option-ba (Parameter mail.force_extra_parameters in Ihre php.ini-Datei). Wenn einige Empfänger niemals E-Mails erhalten, versuchen, diese Parameter mit PHP mail.force_extra_parameters =-ba) zu bearbeiten.
+TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
 AddRefInList=Darstellung Kunden- /Lieferanten- Nr. in Listen (Listbox oder ComboBox) und die meisten von Hyperlinks. Third parties will appears with name "CC12345 - SC45678 - The big company coorp", instead of "The big company coorp".
 UserGroupSetup=Benutzer- und Gruppeneinstellunen
 CompanyCodeChecker=Modul für Geschäftspartner-Code-Erstellung (Kunden oder Lieferanten)
diff --git a/htdocs/langs/de_CH/projects.lang b/htdocs/langs/de_CH/projects.lang
index 93b67d5fa2d..0809b682e5b 100644
--- a/htdocs/langs/de_CH/projects.lang
+++ b/htdocs/langs/de_CH/projects.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - Source file is en_US - projects
+ProjectsArea=Projects Area
 MyTasksDesc=Diese Ansicht ist für Sie beschränkt auf Projekte oder Aufgaben, bei welchen Sie als Ansprechpartner eingetragen sind.
 OnlyOpenedProject=Nur offene Projekte sind sichtbar. (Projekte im Entwurf- oder Geschlossenstatus sind nicht sichtbar)
 AllTaskVisibleButEditIfYouAreAssigned=Alle Aufgaben dieser Projekte sind sichtbar, aber sie können nur auf ihnen zugewiesenen Aufgaben Zeit erfassen. Weisen sie sich dei Aufgabe zu, wenn sie Zeit erfassen möchten.
diff --git a/htdocs/langs/de_DE/accountancy.lang b/htdocs/langs/de_DE/accountancy.lang
index b7a5c659fca..e99a4f4ffef 100644
--- a/htdocs/langs/de_DE/accountancy.lang
+++ b/htdocs/langs/de_DE/accountancy.lang
@@ -6,7 +6,7 @@ ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=Mit globalem Konto exportieren
 ACCOUNTING_EXPORT_LABEL=Export the label
 ACCOUNTING_EXPORT_AMOUNT=Betrag exportieren
 ACCOUNTING_EXPORT_DEVISE=Währungskurs exportieren
-Selectformat=Select the format for the file
+Selectformat=Wählen Sie das Format für die Datei
 ACCOUNTING_EXPORT_PREFIX_SPEC=Präfix für den Dateinamen angeben
 
 Accounting=Buchhaltung
@@ -34,7 +34,7 @@ AccountAccounting=Buchhaltungskonto
 AccountAccountingSuggest=Buchhaltungskontovorschlag
 Ventilation=Aufteilung
 
-MenuAccountancy=Accountancy
+MenuAccountancy=Buchhaltung
 CustomersVentilation=Aufteilung Kunden
 SuppliersVentilation=Aufteilung Lieferanten
 TradeMargin=Handelsspanne
@@ -47,7 +47,7 @@ UpdateAccount=Änderung eines Bilanzkontos
 UpdateMvts=Lagerbewegung ändern
 WriteBookKeeping=Konten ins Hauptbuch übernehmen
 Bookkeeping=Hauptbuch
-AccountBalance=Account balance
+AccountBalance=Saldo Sachkonto
 
 AccountingVentilation=Überblick Rechnungswesen
 AccountingVentilationSupplier=Abbau von Buchhaltungs-Lieferanten
@@ -104,7 +104,7 @@ Code_tiers=Partner
 Labelcompte=Konto-Beschriftung
 Sens=Zweck
 Codejournal=Journal
-NumPiece=Piece number
+NumPiece=Teilenummer
 
 DelBookKeeping=Löschen Sie die Einträge des Hauptbuchs
 
@@ -167,7 +167,7 @@ Type=Feldtyp
 Param=zusätzliche Parameter
 EnabledProduct=in Produkt
 EnabledTiers=In Partner
-EnabledVat=In VAT
+EnabledVat=in Steuer
 
 ## Tools - Init accounting account on product / service
 InitAccountancy=Rechnungswesen initialisieren
diff --git a/htdocs/langs/de_DE/admin.lang b/htdocs/langs/de_DE/admin.lang
index 5e503bd41f0..afec9a4a5e9 100644
--- a/htdocs/langs/de_DE/admin.lang
+++ b/htdocs/langs/de_DE/admin.lang
@@ -154,7 +154,7 @@ Purge=Säubern
 PurgeAreaDesc=Hier können Sie alle vom System erzeugten und gespeicherten Dateien löschen (temporäre Dateien oder alle Dateien im Verzeichnis <b>%s</b>). Diese Funktion ist nicht erforderlich und richtet sich vorwiegend an Benutzer ohne Zugriff auf das Dateisystem des Webservers (z.B. Hostingpakete)
 PurgeDeleteLogFile=Löschen der Protokolldatei <b>%s</b> des Systemprotokollmoduls (kein Risiko des Datenverlusts)
 PurgeDeleteTemporaryFiles=Alle temporären Dateien löschen (kein Datenverlustrisiko)
-PurgeDeleteTemporaryFilesShort=Delete temporary files
+PurgeDeleteTemporaryFilesShort=temporäre Dateien löschen
 PurgeDeleteAllFilesInDocumentsDir=Alle Dateien im Verzeichnis <b>%s</b> löschen. Dies beinhaltet temporäre Dateien ebenso wie Datenbanksicherungen, Dokumente (Partner, Rechnungen, ...) und alle Inhalte des ECM-Moduls.
 PurgeRunNow=Jetzt bereinigen
 PurgeNothingToDelete=Keine zu löschenden Verzeichnisse oder Dateien
@@ -282,6 +282,7 @@ ModuleSetup=Moduleinstellung
 ModulesSetup=Moduleinstellungen
 ModuleFamilyBase=System
 ModuleFamilyCrm=Kundenverwaltung (CRM)
+ModuleFamilySrm=Lieferantenmanagement (SRM)
 ModuleFamilyProducts=Produktverwaltung (WW)
 ModuleFamilyHr=Personalverwaltung (PM)
 ModuleFamilyProjects=Projektverwaltung/Zusammenarbeit
@@ -345,7 +346,7 @@ ExampleOfDirectoriesForModelGen=Beispiele für Syntax:<br>c:\\mydir<br>/Home/myd
 FollowingSubstitutionKeysCanBeUsed=<br>Lesen Sie die Wiki Dokumentation um zu wissen, wie Sie Ihre odt Dokumentenvorlage erstellen, bevor Sie diese in den Kategorien speichern:
 FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
 FirstnameNamePosition=Reihenfolge von Vor- und Nachname
-DescWeather=Die folgenden Diagramme werden auf der Übersicht Startseite angezeigt, wenn die entsprechenden Toleranzwerte erreicht werden:
+DescWeather=Die folgenden Diagramme werden auf der Startseite angezeigt, wenn die entsprechenden Toleranzwerte erreicht werden:
 KeyForWebServicesAccess=Schlüssel um Web Services (Parameter "dolibarrkey" in webservices) zu benützen
 TestSubmitForm=Formular Eingabeüberprüfung
 ThisForceAlsoTheme=Bei Verwendung dieser Menü-Verwaltung wird die eigene Layout-Vorlage verwendet unabhängig von der Layout Einstellung des Benutzers. Auch wenn diese Menü-Verwaltung für Smartphones ausgelegt ist kann er nicht auf allen Smartphones angezeigt werden. Verwenden Sie eine andere Menü-Verwaltung, wenn Sie Probleme bemerken.
@@ -587,6 +588,7 @@ Permission38=Produkte exportieren
 Permission41=Projekte und Aufgaben lesen (Geteilte Projekte und Projekte in denen ich Kontakt bin).  Es kann auch Zeitaufwand auf zugewiesenen Aufgaben gebucht werden.
 Permission42=Projekte/Aufgaben erstellen/bearbeiten (Meine)
 Permission44=Projekte und Aufgaben löschen (gemeinsame Projekte und Projekte in welchen ich Ansprechpartner bin)
+Permission45=Export projects
 Permission61=Serviceaufträge ansehen
 Permission62=Serviceaufträge erstellen/bearbeiten
 Permission64=Serviceaufträge löschen
@@ -640,6 +642,7 @@ Permission162=Verträge/Abonnements erstellen/bearbeiten
 Permission163=Service/Abonnement in einem Vertrag aktivieren
 Permission164=Service/Abonnement in einem Vertrag deaktivieren
 Permission165=Verträge/Abonnement löschen
+Permission167=Export contracts
 Permission171=Reise- und Spesenabrechnung einsehen (Eigene und von Untergebenen)
 Permission172=Reise- und Spesenabrechnung erstellen/ändern
 Permission173=Reise- und Spesenabrechnung verwerfen
@@ -788,6 +791,7 @@ Permission2403=Ereignisse  (Termine/Aufgaben) in Verbindung mit eigenem Konto l
 Permission2411=Ereignisse (Termine/Aufgaben) Anderer einsehen
 Permission2412=Ereignisse (Termine/Aufgaben) Anderer erstellen/bearbeiten
 Permission2413=Ereignisse (Termine/Aufgaben) Anderer löschen
+Permission2414=Export actions/tasks of others
 Permission2501=Dokumente herunterladen oder einsehen
 Permission2502=Dokumente herunterladen
 Permission2503=Dokumente bestätigen oder löschen
@@ -1091,7 +1095,7 @@ SendmailOptionMayHurtBuggedMTA=Feature-Mails mit der Methode "PHP mail direkt" s
 TranslationSetup=Übersetzungseinstellungen
 TranslationDesc=Wahl der Sprache auf dem Bildschirm sichtbar verändert werden kann: <br> * Weltweit aus dem Menü <strong>Start - Einstellungen - Anzeige</strong> <br> * Für die Benutzer nur von <strong>Benutzer-Registerkarte Anzeige</strong> von Benutzer-Karte (klicken Sie auf Login-Bildschirm auf der Oberseite).
 TranslationOverwriteDesc=Sie können also einige Werte durch Vervollständigen/Editieren der folgenden Tabelle überschreiben. Sie müssen für "%s" den Sprachcode, für "%s" den Schlüssel aus der Datei langs/xx_XX/datei.lang und "%s" für den neuen Wert, den Sie in der Übersetzung verwenden wollen.
-TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
+TotalNumberOfActivatedModules=Anzahl aktivierterter Module: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=Sie müssen mindestens 1 Modul aktivieren
 ClassNotFoundIntoPathWarning=Klasse %s nicht innerhalb PHP-Pfad gefunden
 YesInSummer=Ja im Sommer
@@ -1641,7 +1645,7 @@ CloseFiscalYear=Fiskalisches Jahr schließen
 DeleteFiscalYear=Fiskalisches Jahr löschen
 ConfirmDeleteFiscalYear=Möchten Sie dieses fiskalische Jahr wirklich löschen?
 AlwaysEditable=kann immer bearbeitet werden
-IsHidden=Is not visible
+IsHidden=ist nicht sichtbar
 MAIN_APPLICATION_TITLE=Erzwinge sichtbaren Anwendungsnamen (Warnung: Setzen Ihres eigenen Namen hier, kann Autofill Login-Funktion abbrechen, wenn Sie DoliDroid Anwendung nutzen)
 NbMajMin=Mindestanzahl Großbuchstaben
 NbNumMin=Mindestanzahl Ziffern
@@ -1666,7 +1670,7 @@ BackupDumpWizard=Assistenten zum erstellen der Datenbank-Backup Dump-Datei
 SomethingMakeInstallFromWebNotPossible=Die Installation von dem externen Modul ist aus folgenden Gründen vom Web-Interface nicht möglich:
 SomethingMakeInstallFromWebNotPossible2=Aus diesem Grund wird die Prozess hier beschriebenen Upgrade ist nur manuelle Schritte ein privilegierter Benutzer tun kann.
 InstallModuleFromWebHasBeenDisabledByFile=Installieren von externen Modul aus der Anwendung wurde von Ihrem Administrator deaktiviert. \nSie müssen ihn bitten, die Datei<strong>%s</strong> zu entfernen, um diese Funktion zu ermöglichen.
-ConfFileMuseContainCustom=Installing an external module from application save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to have option<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
+ConfFileMuseContainCustom=Zur Installation eines externen Modul speichern Sie die Modul-Dateien in Verzeichnis <strong>%s</strong>. Damit Dolibarr dieses Verzeichnis verarbeitet, müssen Sie in der Datei <strong>conf/conf.php</strong> die Optionen<br><strong>$dolibarr_main_url_root_alt="/custom"</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong> aktivieren.
 HighlightLinesOnMouseHover=Zeilen hervorheben bei Mouseover
 HighlightLinesColor=Farbe der Zeile hervorheben, wenn die Maus darüberfährt (leer lassen, um den Effekt zu deaktivieren)
 TextTitleColor=Farbe des Seitenkopfs
@@ -1711,5 +1715,6 @@ TitleExampleForMaintenanceRelease=Beispielnachricht, die Sie nutzen können, um
 ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s ist verfügbar. Version %s ist eine Hauptversion mit vielen neuen Features für Benutzer und Entwickler. Sie können die Version aus dem Downloadbereich des Portals http://www.dolibarr.org laden (Unterverzeichnis stabile Versionen). Lesen Sie die komplette Liste der <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">Änderungen</a>.
 ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s ist verfügbar. Version %s ist ein Wartungsupdate mit vielen Fehlerbereinigungen. Wir empfehlen jedem auf diese Version zu wechseln. Wie bei jedem Wartungsupdate sind keinen neuen Features oder Änderungen in den Datenstrukturen enthalten. Sie können die Version aus dem Downloadbereich des Portals http://www.dolibarr.org laden (Unterverzeichnis stabile Versionen). Lesen Sie die komplette Liste der <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">Änderungen</a>.
 MultiPriceRuleDesc=Wenn die Option "mehrere Preisebenen pro Artikel/Dienstleistung" aktiviert ist, können Sie verschiedene Preis (einen pro Ebene) für jeden artikel definieren. Um Zeit zu sparen, können Sie eine Regel anlegen, mit der der Preis pro Ebene automatisch anhand des Preise in der ersten Ebene kalkuliert wird, so dass Sie nur einen Preis in der ersten Ebene eingeben müssen. Diese Seite kann Ihnen nur Zeit sparen und nützlich sein, wenn die Preise anderer Ebenen vom Preis der ersten Ebene abhängig sind. Ansonsten können Sie diese Seite ignorieren.
-ModelModulesProduct=Templates for product documents
-ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
+ModelModulesProduct=Vorlagen für Produktdokumente
+ToGenerateCodeDefineAutomaticRuleFirst=Um Barcode automatisch zu erstellen, müssen Sie zuerst einen Manager definieren, der die Barcode-Nummern erstellt.
+SeeSubstitutionVars=See * note for list of possible substitution variables
diff --git a/htdocs/langs/de_DE/bills.lang b/htdocs/langs/de_DE/bills.lang
index 1a7402d1e5c..bf351a64151 100644
--- a/htdocs/langs/de_DE/bills.lang
+++ b/htdocs/langs/de_DE/bills.lang
@@ -58,7 +58,7 @@ Payment=Zahlung
 PaymentBack=Rückzahlung
 Payments=Zahlungen
 PaymentsBack=Rückzahlungen
-paymentInInvoiceCurrency=in invoices currency
+paymentInInvoiceCurrency=in Rechnungswährung
 PaidBack=Zurück bezahlt
 DeletePayment=Lösche Zahlung
 ConfirmDeletePayment=Möchten Sie diese Zahlung wirklich löschen?
@@ -107,7 +107,7 @@ EnterPaymentDueToCustomer=Kundenzahlung fällig stellen
 DisabledBecauseRemainderToPayIsZero=Deaktiviert, da Zahlungserinnerung auf null steht
 PriceBase=Preis
 BillStatus=Rechnung Status
-StatusOfGeneratedInvoices=Status of generated invoices
+StatusOfGeneratedInvoices=Status der erstellten Rechnungen
 BillStatusDraft=Entwurf (freizugeben)
 BillStatusPaid=Bezahlt
 BillStatusPaidBackOrConverted=Bezahlt oder in Rabatt umgewandelt
@@ -141,10 +141,10 @@ ErrorCantCancelIfReplacementInvoiceNotValidated=Fehler: Sie können keine Rechnu
 BillFrom=Von
 BillTo=An
 ActionsOnBill=Ereignisse zu dieser Rechnung
-RecurringInvoiceTemplate=Recurring invoice
-NoQualifiedRecurringInvoiceTemplateFound=No recurring template invoice qualified for generation.
-FoundXQualifiedRecurringInvoiceTemplate=Found %s recurring template invoice(s) qualified for generation.
-NotARecurringInvoiceTemplate=Not a recurring template invoice
+RecurringInvoiceTemplate=wiederkehrende Rechnung
+NoQualifiedRecurringInvoiceTemplateFound=Keine Vorlagen zur Erstellung von wiederkehrende Rechnungen gefunden.
+FoundXQualifiedRecurringInvoiceTemplate=Es wurden %s Vorlagen zur Erstellung von wiederkehrende Rechnung(en) gefunden.
+NotARecurringInvoiceTemplate=keine Vorlage für wiederkehrende Rechnung
 NewBill=Neue Rechnung
 LastBills=%s neueste Rechnungen
 LastCustomersBills=%s neueste Kundenrechnungen
@@ -205,7 +205,7 @@ Rest=Ausstehend
 AmountExpected=Höhe der Forderung
 ExcessReceived=Erhaltener Überschuss
 EscompteOffered=Rabatt angeboten (Skonto)
-EscompteOfferedShort=Discount
+EscompteOfferedShort=Rabatt
 SendBillRef=Einreichung der Rechnung %s
 SendReminderBillRef=Einreichung von Rechnung %s (Erinnerung)
 StandingOrders=Lastschriftverfahren
@@ -219,6 +219,7 @@ RemainderToBill=Zu verrechnender Restbetrag
 SendBillByMail=Rechnung per E-Mail versenden
 SendReminderBillByMail=Erinnerung per E-Mail versenden
 RelatedCommercialProposals=Verknüpfte Angebote
+RelatedRecurringCustomerInvoices=Related recurring customer invoices
 MenuToValid=Zur Freigabe
 DateMaxPayment=Zahlung fällig bis
 DateEcheance=Zahlungsfrist (Limit)
@@ -312,19 +313,18 @@ AmountPaymentDistributedOnInvoice=Zahlungsbetrag verteilt auf Rechnung
 PaymentNote=Zahlungshinweis
 ListOfPreviousSituationInvoices=Liste der vorherigen Fortschrittsrechnungen
 ListOfNextSituationInvoices=Liste der nächsten Fortschrittsrechnungen
-FrequencyPer_d=Every %s days
-FrequencyPer_m=Every %s months
-FrequencyPer_y=Every %s years
-toolTipFrequency=Examples:<br /><b>Set 7 / day</b>: give a new invoice every 7 days<br /><b>Set 3 / month</b>: give a new invoice every 3 month
-NextDateToExecution=Date for next invoice generation
-DateLastGeneration=Date of last generation
-MaxPeriodNumber=Max nb of invoice generation
-RestPeriodNumber=Rest period number
-NbOfGenerationDone=Nb of invoice generation already done
-InvoiceAutoValidate=Automatically validate invoice
-GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
-DateIsNotEnough=Date not yet reached
-InvoiceGeneratedFromTemplate=Invoice %s generated from recurring template invoice %s
+FrequencyPer_d=jeden %s Tag
+FrequencyPer_m=Jeden %s Monat
+FrequencyPer_y=Jedes %s Jahr
+toolTipFrequency=Beispiele:<br /><b>Einstellung 7 / Tag</b>: erstellt alle 7 Tage eine neue Rechnung<br /><b>Einstellung 3 / Monat</b>: erstellt alle 3 Monate eine neue Rechnung
+NextDateToExecution=Datum der nächsten Rechnungserstellung
+DateLastGeneration=Datum der letzten Rechnungserstellung
+MaxPeriodNumber=max. Anzahl an Rechnungen
+NbOfGenerationDone=Anzahl bisher erstellter Rechnungen
+InvoiceAutoValidate=Bestätige Rechnung automatisch
+GeneratedFromRecurringInvoice=Erstelle wiederkehrende Rechnung %s aus Vorlage
+DateIsNotEnough=Datum noch nicht erreicht
+InvoiceGeneratedFromTemplate=Rechnung %s erstellt aus Vorlage für wiederkehrende Rechnung %s
 # PaymentConditions
 PaymentConditionShortRECEP=Prompt
 PaymentConditionRECEP=Sofort nach Erhalt
@@ -471,3 +471,7 @@ PDFCrevetteSituationInvoiceLine=Fortschritt Nr. %s: Rechnung Nr. %s nach %s
 TotalSituationInvoice=Gesamtsituation
 invoiceLineProgressError=Fortschritt der Rechnungsposition kann nicht kleiner oder höher sein als der Status der nächsten Rechnungsposition
 updatePriceNextInvoiceErrorUpdateline=Fehler: Preis der Rechnungsposition %s aktualisieren
+ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
+ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
+ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
+
diff --git a/htdocs/langs/de_DE/boxes.lang b/htdocs/langs/de_DE/boxes.lang
index 63d229685e6..31eba32e359 100644
--- a/htdocs/langs/de_DE/boxes.lang
+++ b/htdocs/langs/de_DE/boxes.lang
@@ -60,8 +60,8 @@ BoxTitleLastContracts=%s zuletzt bearbeitete Verträge
 BoxTitleLastModifiedDonations=Zuletzt geändert %s Spenden
 BoxTitleLastModifiedExpenses=Zuletzt %s geänderte Spesenabrechnungen
 BoxGlobalActivity=Globale Aktivität (Rechnungen, Angebote, Aufträge)
-BoxGoodCustomers=Good Customers
-BoxTitleGoodCustomers=%s Good Customers
+BoxGoodCustomers=Gute Kunden
+BoxTitleGoodCustomers=%s gute Kunden
 FailedToRefreshDataInfoNotUpToDate=Fehler beim RSS-Abruf. Letzte erfolgreiche Aktualisierung: %s
 LastRefreshDate=Letztes Aktualisierungsdatum
 NoRecordedBookmarks=Keine Lesezeichen gesetzt. Klicken Sie <a href="%s">hier</a>, um ein Lesezeichen zu setzen.
@@ -97,4 +97,4 @@ ForCustomersInvoices=Kundenrechnungen
 ForCustomersOrders=Kundenaufträge
 ForProposals=Angebote
 LastXMonthRolling=Die letzten %s Monate gleitend
-ChooseBoxToAdd=Add a box to your dashboard...
+ChooseBoxToAdd=Box zur Startseite hinzufügen
diff --git a/htdocs/langs/de_DE/companies.lang b/htdocs/langs/de_DE/companies.lang
index 29b7d549b29..b316a3152a9 100644
--- a/htdocs/langs/de_DE/companies.lang
+++ b/htdocs/langs/de_DE/companies.lang
@@ -202,12 +202,12 @@ ProfId3IN=Prof Id 3
 ProfId4IN=Prof Id 4
 ProfId5IN=Prof Id 5
 ProfId6IN=-
-ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
-ProfId2LU=Id. prof. 2 (Niederlassungsgenehmigung)
+ProfId1LU=ID. prof. 1 (R.C.S. Luxemburg)
+ProfId2LU=Id. prof. 2 (Geschäftserlaubnis)
 ProfId3LU=-
 ProfId4LU=-
 ProfId5LU=-
-ProfId6LU=-
+ProfId6LU=--
 ProfId1MA=Id prof. 1 (R.C.)
 ProfId2MA=Id prof. 2 (Patente)
 ProfId3MA=Id prof. 3 (I.F.)
@@ -317,10 +317,12 @@ ShowContact=Zeige Kontaktangaben
 ContactsAllShort=Alle (Kein Filter)
 ContactType=Kontaktart
 ContactForOrders=Bestellungskontakt
+ContactForOrdersOrShipments=Kontakt für den Auftrag oder die Lieferung
 ContactForProposals=Angebotskontakt 
 ContactForContracts=Vertragskontakt
 ContactForInvoices=Rechnungskontakt
 NoContactForAnyOrder=Kein Kontakt für Bestellungen definiert
+NoContactForAnyOrderOrShipment=Dieser Kontakt kann nicht für Aufträge oder Lieferungen verwendet werden.
 NoContactForAnyProposal=Kein Kontakt für Angebote definiert
 NoContactForAnyContract=Kein Kontakt für Verträge definiert
 NoContactForAnyInvoice=Kein Kontakt für Rechnungen definiert
@@ -438,3 +440,6 @@ MergeThirdparties=Partner zusammenlegen
 ConfirmMergeThirdparties=Sind Sie sicher, dass Sie diesen Partner mit dem aktuellen Partner zusammenlegenwollen? Alle verknüpften Objekte (Rechnungen, Bestellungen, ...) werden in den aktuellen Partner verschoben, so dass Sie das Duplikat löschen können.
 ThirdpartiesMergeSuccess=Partner wurden zusammengelegt
 ErrorThirdpartiesMerge=Es gab einen Fehler beim Löschen des Partners. Bitte überprüfen Sie das Protokoll. Änderungen wurden rückgängig gemacht.
+SaleRepresentativeLogin=Anmeldung des Vertriebsmitarbeiters
+SaleRepresentativeFirstname=Vorname des Vertriebsmitarbeiters
+SaleRepresentativeLastname=Nachname des Vertriebsmitarbeiters
diff --git a/htdocs/langs/de_DE/compta.lang b/htdocs/langs/de_DE/compta.lang
index 2aa4e5848c1..065d80e13b5 100644
--- a/htdocs/langs/de_DE/compta.lang
+++ b/htdocs/langs/de_DE/compta.lang
@@ -221,4 +221,4 @@ OtherCountriesCustomersReport=Bericht Ausländische Kunden
 BasedOnTwoFirstLettersOfVATNumberBeingDifferentFromYourCompanyCountry=Basierend auf den ersten beiden Buchstaben der Mehrwertsteuernummer die unterschiedlich ist, wie Ihr eigener Unternehmens Ländercode.
 SameCountryCustomersWithVAT=Nationale Kunden berichten
 BasedOnTwoFirstLettersOfVATNumberBeingTheSameAsYourCompanyCountry=Basierend auf den ersten beiden Buchstaben der Mehrwertsteuernummer die gleiche ist wie Ihr eigener Unternehmens Ländercode.
-LinkedFichinter=Link to an intervention
+LinkedFichinter=mit Serviceauftrag verbinden
diff --git a/htdocs/langs/de_DE/cron.lang b/htdocs/langs/de_DE/cron.lang
index a3fa030ab21..c42e322ce89 100644
--- a/htdocs/langs/de_DE/cron.lang
+++ b/htdocs/langs/de_DE/cron.lang
@@ -16,7 +16,7 @@ KeyForCronAccess=Sicherheitsschlüssel für URL zum Starten von Cronjobs
 FileToLaunchCronJobs=Kommandozeile zum Starten von Cronjobs
 CronExplainHowToRunUnix=In Unix-Umgebung sollten Sie die folgenden crontab-Eintrag verwenden, um die Befehlszeile alle 5 Minuten ausführen
 CronExplainHowToRunWin=In Microsoft(tm) Windows Umgebungen kannst Du die Aufgabenplanung benutzen um die Kommandozeile jede 5 Minuten aufzurufen
-CronMethodDoesNotExists=Class %s does not contains any method %s
+CronMethodDoesNotExists=Klasse %s enthält keine Methode %s
 # Menu
 CronJobs=Geplante Jobs
 CronListActive=Liste der aktivierten/geplanten Jobs
@@ -40,8 +40,8 @@ CronNone=Keine
 CronDtStart=nicht vor
 CronDtEnd=nicht nach
 CronDtNextLaunch=Nächste Ausführung
-CronDtLastLaunch=Start date of last execution
-CronDtLastResult=End date of last execution
+CronDtLastLaunch=Startdatum letzte Ausführung
+CronDtLastResult=Schlussdatum letzte Ausführung
 CronFrequency=Frequenz
 CronClass=Klasse
 CronMethod=Methode
@@ -90,5 +90,5 @@ CronMenu=Cron
 CronCannotLoadClass=Kann Klasse %s oder Object %s nicht laden
 UseMenuModuleToolsToAddCronJobs=Öffnen Sie das Menü "Start - Module Werkzeuge - Cronjob Liste" auf um geplante Skript-Aufgaben zu sehen und zu verändern.
 TaskDisabled=Job deaktiviert
-MakeLocalDatabaseDumpShort=Local database backup
-MakeLocalDatabaseDump=Create a local database dump
+MakeLocalDatabaseDumpShort=lokales Datenbankbackup
+MakeLocalDatabaseDump=erstelle einen lokalen Datenbankdump
diff --git a/htdocs/langs/de_DE/errors.lang b/htdocs/langs/de_DE/errors.lang
index 3d11896be9f..531372aa98a 100644
--- a/htdocs/langs/de_DE/errors.lang
+++ b/htdocs/langs/de_DE/errors.lang
@@ -172,6 +172,8 @@ ErrorMandatoryParametersNotProvided=Erforderliche(r) Parameter wird nicht angebo
 ErrorOppStatusRequiredIfAmount=Sie legen einen geschätzten Betrag für diese Verkaufschance/Lead erfasst. Deshalb müssen Sie auch den Status eingeben
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Falsche Definition von Menü Array in  Module Descriptor (falscher Wert für den Key  fk_menu)
 ErrorSavingChanges=Beim Speichern der Änderungen trat ein Fehler auf
+ErrorWarehouseRequiredIntoShipmentLine=Lager in der Zeile ist für die Lieferung notwendig
+ErrorFileMustHaveFormat=Die Datei muss das Format %s haben.
 
 # Warnings
 WarningPasswordSetWithNoAccount=Es wurde ein Passwort für dieses Mitglied vergeben, aber kein Benutzer erstellt. Das Passwort wird gespeichert, aber kann nicht für die Anmeldung an Dolibarr verwendet werden. Es kann von einem externen Modul/einer Schnittstelle verwendet werden, aber wenn Sie kein Login oder Passwort für dieses Mitglied definiert müssen, können Sie die Option "Login für jedes Mitglied verwalten" in den Mitgliedseinstellungen deaktivieren. Wenn Sie ein Login aber kein Passwort benötige, lassen Sie dieses Feld leer, um diese Meldung zu deaktivieren. Anmerkung: Die E-Mail-Adresse kann auch zur Anmeldung verwendet werden, wenn das Mitglied mit einem Benutzer verbunden wird.
diff --git a/htdocs/langs/de_DE/exports.lang b/htdocs/langs/de_DE/exports.lang
index bd9be37376b..34b80f514b9 100644
--- a/htdocs/langs/de_DE/exports.lang
+++ b/htdocs/langs/de_DE/exports.lang
@@ -128,6 +128,10 @@ SpecialCode=Spezialcode
 ExportStringFilter=%% erlaubt die Ersetzung eines oder mehrerer Zeichen im Text
 ExportDateFilter='YYYY' 'YYYYMM' 'YYYYMMDD': filtert nach einem Jahr/Monat/Tag<br>'YYYY+YYYY' 'YYYYMM+YYYYMM' 'YYYYMMDD+YYYYMMDD': filtert über einen Bereich von Jahren/Monaten/Tagen<br>'>YYYY' '>YYYYMM' '>YYYYMMDD': filtert auf die folgenden Jahre/Monate/Tage<br>'<YYYY' '<YYYYMM' '<YYYYMMDD': filtert auf die vorhergehenden Jahre/Monate/Tage
 ExportNumericFilter='NNNNN' filtert genau einen Wert<br>'NNNNN+NNNNN' filtert einen Wertebereich<br>'&gt;NNNNN' filtert nach kleineren Werten<br>'&gt;NNNNN' filtert nach größeren Werten
+ImportFromLine=Import beginnen bei Zeile
+EndAtLineNb=Ende bei Zeile
+SetThisValueTo2ToExcludeFirstLine=Setzen Sie beispielsweise den Wert auf 3, um die ersten beiden Zeilen auszuschliessen.
+KeepEmptyToGoToEndOfFile=Dieses Feld leer lassen, um die Datei bis zum Ende zu bearbeiten.
 ## filters
 SelectFilterFields=Wenn Sie nach bestimmten Werten filtern wollen, geben Sie diese Werte hier ein.
 FilterableFields=filtrierbare Felder
diff --git a/htdocs/langs/de_DE/languages.lang b/htdocs/langs/de_DE/languages.lang
index 79043aaa548..2627f94ee1a 100644
--- a/htdocs/langs/de_DE/languages.lang
+++ b/htdocs/langs/de_DE/languages.lang
@@ -32,7 +32,7 @@ Language_es_MX=Spanisch (Mexiko)
 Language_es_PY=Spanisch (Paraguay)
 Language_es_PE=Spanisch (Peru)
 Language_es_PR=Spanisch (Puerto Rico)
-Language_es_VE=Spanish (Venezuela)
+Language_es_VE=Spanisch (Venezuela)
 Language_et_EE=Estnisch
 Language_eu_ES=Baskisch
 Language_fa_IR=Persisch
diff --git a/htdocs/langs/de_DE/mails.lang b/htdocs/langs/de_DE/mails.lang
index 35eca94cb4c..b8c0d31e9a4 100644
--- a/htdocs/langs/de_DE/mails.lang
+++ b/htdocs/langs/de_DE/mails.lang
@@ -47,7 +47,7 @@ MailingSuccessfullyValidated=E-Mail erfolgreich überprüft
 MailUnsubcribe=Abmelden
 Unsuscribe=Abmelden
 MailingStatusNotContact=Nicht mehr kontaktieren
-MailingStatusReadAndUnsubscribe=Read and unsubscribe
+MailingStatusReadAndUnsubscribe=Lesen und abmelden
 ErrorMailRecipientIsEmpty=Das Empfängerfeld ist leer
 WarningNoEMailsAdded=Keine neuen E-Mail-Adressen für das Hinzufügen zur Empfängerliste.
 ConfirmValidMailing=Möchten Sie diese E-Mail-Kampagne wirklich freigeben?
diff --git a/htdocs/langs/de_DE/main.lang b/htdocs/langs/de_DE/main.lang
index 3fc77207e73..7b9c24a6a00 100644
--- a/htdocs/langs/de_DE/main.lang
+++ b/htdocs/langs/de_DE/main.lang
@@ -25,6 +25,7 @@ FormatDateHourTextShort=%d %b %Y %H:%M
 FormatDateHourText=%d %B %Y %H:%M
 DatabaseConnection=Datenbankverbindung
 NoTemplateDefined=Für diesen Email-Typ ist keine Vorlage eingetragen
+AvailableVariables=Available substitution variables
 NoTranslation=Keine Übersetzung
 NoRecordFound=Keinen Eintrag gefunden
 NoError=kein Fehler
@@ -311,7 +312,7 @@ UnitPriceHT=Stückpreis (netto)
 UnitPriceTTC=Stückpreis (brutto)
 PriceU=VP
 PriceUHT=VP (netto)
-PriceUHTCurrency=U.P (currency)
+PriceUHTCurrency=Nettopreis (Währung)
 SupplierProposalUHT=Nettopreis anfordern
 PriceUTTC=E.P. (inkl. Steuern)
 Amount=Betrag
@@ -322,9 +323,9 @@ AmountTTCShort=Bruttobetrag
 AmountHT=Betrag (exkl. USt.)
 AmountTTC=Bruttobetrag
 AmountVAT=USt.-Betrag
-MulticurrencyAmountHT=Amount (net of tax), original currency
-MulticurrencyAmountTTC=Amount (inc. of tax), original currency
-MulticurrencyAmountVAT=Amount tax, original currency
+MulticurrencyAmountHT=Betrag (Netto), Originalwährung
+MulticurrencyAmountTTC=Betrag (Brutto), Originalwährung
+MulticurrencyAmountVAT=Steuerbetrag, Originalwährung
 AmountLT1=USt.-Betrag 2
 AmountLT2=USt.-Betrag 3
 AmountLT1ES=RE Betrag
@@ -339,7 +340,7 @@ Percentage=Prozentangabe
 Total=Gesamt
 SubTotal=Zwischensumme
 TotalHTShort=Nettosumme
-TotalHTShortCurrency=Total (net in currency)
+TotalHTShortCurrency=Summe (Netto in Währung)
 TotalTTCShort=Gesamtbetrag (inkl. USt.)
 TotalHT=Gesamtpreis
 TotalHTforthispage=Gesamtpreis für diese Seite
@@ -462,7 +463,7 @@ Datas=Daten
 None=Keine
 NoneF=Keine
 Late=Verspätet
-LateDesc=Delay to define if a record is late or not depends on your setup. Ask your admin to change delay from menu Home - Setup - Alerts.
+LateDesc=Verzögerung, die definiert, ob ein Datensatz spät ist oder nicht von der Einrichtung abhängig ist. Fragen Sie den Administrator, die Verzögerung im Menü Startseite - Einrichtung - Alarme
 Photo=Bild
 Photos=Bilder
 AddPhoto=Bild hinzufügen
@@ -545,7 +546,7 @@ NbOfCustomers=Anzahl der Kunden
 NbOfLines=Anzahl der Positionen
 NbOfObjects=Anzahl der Objekte
 NbOfReferers=Anzahl Verknüpfungen
-NbOfObjectReferers=Number of refering objects
+NbOfObjectReferers=Anzahl bezugnehmender Objekte
 Referers=Verknüpfte Objekte
 TotalQuantity=Gesamtmenge
 DateFromTo=Von %s bis %s
@@ -701,14 +702,14 @@ LinkedToSpecificUsers=Mit Kontakt verknüpft
 DeleteAFile=Datei löschen
 ConfirmDeleteAFile=Sind Sie sicher dass Sie diese Datei löschen möchten?
 NoResults=Keine Ergebnisse
-AdminTools=Admin tools
+AdminTools=Administratorwerkzeuge
 SystemTools=Systemwerkzeuge
 ModulesSystemTools=Module Hilfsprogramme
 Test=Testen
 Element=Element
 NoPhotoYet=Noch keine Bilder verfügbar
 HomeDashboard=Startseite Übersicht
-Dashboard=Start
+Dashboard=Startseite
 Deductible=absetzbar
 from=von
 toward=zu
@@ -740,8 +741,8 @@ Hello=Hallo
 Sincerely=Mit freundlichen Grüßen
 DeleteLine=Zeile löschen
 ConfirmDeleteLine=Möchten Sie diese Zeile wirklich löschen?
-NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked records
-TooManyRecordForMassAction=Too many records selected for mass action. Such action are restriced to a list of %s records.
+NoPDFAvailableForDocGenAmongChecked=In den selektierten Datensätzen war kein PDF zur Erstellung der Dokumente vorhanden.
+TooManyRecordForMassAction=Es wurden zu viele Datensätze für das Massenupdate selektiert. Es können nur %s Datensätze verarbeitet werden.
 # Week day
 Monday=Montag
 Tuesday=Dienstag
diff --git a/htdocs/langs/de_DE/orders.lang b/htdocs/langs/de_DE/orders.lang
index 154d413d85e..0c9ce4b64af 100644
--- a/htdocs/langs/de_DE/orders.lang
+++ b/htdocs/langs/de_DE/orders.lang
@@ -32,6 +32,7 @@ StatusOrderSent=Versand in Bearbeitung
 StatusOrderOnProcessShort=Bestellt
 StatusOrderProcessedShort=Bearbeitet
 StatusOrderDelivered=Geliefert
+StatusOrderDeliveredShort=Geliefert
 StatusOrderToBillShort=Zu verrechnen
 StatusOrderToBill2Short=Zu verrechnen
 StatusOrderApprovedShort=genehmigt
diff --git a/htdocs/langs/de_DE/products.lang b/htdocs/langs/de_DE/products.lang
index 4f84f795317..171252e9815 100644
--- a/htdocs/langs/de_DE/products.lang
+++ b/htdocs/langs/de_DE/products.lang
@@ -45,10 +45,6 @@ LastProducts=Neueste Produkte
 CardProduct0=Produkt - Karte
 CardProduct1=Leistungs-Karte
 CardContract=Verträge
-Warehouse=Warenlager
-Warehouses=Warenlager
-WarehouseOpened=Warenlager aktiv
-WarehouseClosed=Lager geschlossen
 Stock=Warenbestand
 Stocks=Warenbestände
 Movement=Lagerbewegung
@@ -295,11 +291,11 @@ ComposedProductIncDecStock=Erhöhen/verringern Lagerbestand  bei verknüpften Pr
 ComposedProduct=Teilprodukt
 MinSupplierPrice=Minimaler Einkaufspreis
 DynamicPriceConfiguration=Dynamische Preis Konfiguration
-DynamicPriceDesc=On product card, with this module enabled, you should be able to set mathematic functions to calculate Customer or Supplier prices. Such function can use all mathematic operators, some constants and variables. You can set here the variables you want to be able and if the variable need an automatic update, the external URL to use to ask Dolibarr to update automaticaly the value.
-AddVariable=Add Variable
-AddUpdater=Add Updater
+DynamicPriceDesc=Wenn dieses Modul aktiviert ist, können Sie auf der Produktekarte mathematische Funktionen nutzen, um Kunden- oder Lieferantenpreise zu berechnen. Sie können dazu alle mathematische Funktionen und einige Konstanten und Variablen nutzen. Sie können einer Variable eine externe URL mitgeben, mit der der Wert der Variablen automatisch aktualisiert werden kann.
+AddVariable=Variable hinzufügen
+AddUpdater=Updater hinzufügen
 GlobalVariables=Globale Variablen
-VariableToUpdate=Variable to update
+VariableToUpdate=Variable, die aktualisiert wird
 GlobalVariableUpdaters=Globale Variablen aktualisieren
 GlobalVariableUpdaterType0=JSON Daten
 GlobalVariableUpdaterHelp0=Analysiert JSON-Daten von angegebener URL, VALUE gibt den Speicherort des entsprechenden Wertes,
@@ -317,4 +313,12 @@ DefaultPriceRealPriceMayDependOnCustomer=Standardpreis, echter Preis kann vom Ku
 WarningSelectOneDocument=Bitte wählen Sie mindestens ein Dokument aus
 DefaultUnitToShow=Einheit
 NbOfQtyInProposals=Stückzahl in Angeboten
-ClinkOnALinkOfColumn=Click on a link of column %s to get a detailed view...
+ClinkOnALinkOfColumn=Klicken Sie auf einen Link in Spalte %s zur detaillierten Anzeige
+TranslatedLabel=Übersetztes Label
+TranslatedDescription=Übersetzte Beschreibung
+TranslatedNote=Übersetzte Notizen
+ProductWeight=Weight for 1 product
+ProductVolume=Volume for 1 product
+WeightUnits=Einheit Gewicht
+VolumeUnits=Volume unit
+SizeUnits=Einheit Größe
diff --git a/htdocs/langs/de_DE/projects.lang b/htdocs/langs/de_DE/projects.lang
index bfc5a0281b8..15fc4080190 100644
--- a/htdocs/langs/de_DE/projects.lang
+++ b/htdocs/langs/de_DE/projects.lang
@@ -5,7 +5,7 @@ ProjectId=Projekt-ID
 ProjectLabel=Project label
 Project=Projekt
 Projects=Projekte
-ProjectsArea=Projects Area
+ProjectsArea=Projektübersicht
 ProjectStatus=Projekt Status
 SharedProject=Jeder
 PrivateProject=Kontakte zum Projekt
@@ -20,7 +20,7 @@ TasksPublicDesc=Diese Ansicht ist beschränkt auf Projekt und Aufgaben bei welch
 TasksDesc=Diese Ansicht zeigt alle Projekte und Aufgaben (Ihre Benutzerberechtigungen berechtigt Sie alles zu sehen).
 AllTaskVisibleButEditIfYouAreAssigned=Alle Aufgaben dieser Projekte sind sichtbar, aber sie können nur auf ihnen zugewiesenen Aufgaben Zeit erfassen. Weisen sie sich die Aufgabe zu, wenn sie Zeit erfassen möchten.
 OnlyYourTaskAreVisible=Nur ihnen zugewiesene Aufgaben sind sichtbar. Weisen sie sich die Aufgabe zu, wenn sie Zeit auf der Aufgabe erfassen möchten.
-ProjectsArea=Projects Area
+ProjectsArea=Projektübersicht
 NewProject=Neues Projekt
 AddProject=Projekt erstellen
 DeleteAProject=Löschen eines Projekts
@@ -68,12 +68,15 @@ Activities=Aufgaben/Tätigkeiten
 MyActivity=Meine Tätigkeit
 MyActivities=Meine Aufgaben/Tätigkeiten
 MyProjects=Meine Projekte
-MyProjectsArea=My projects Area
+MyProjectsArea=Meine Projekte
 DurationEffective=Effektivdauer
 Progress=Fortschritt
 ProgressDeclared=Angegebener Fortschritt
 ProgressCalculated=Kalkulierter Fortschritt
 Time=Zeitaufwand
+ListOfTasks=List of tasks
+GoToListOfTimeConsumed=Go to list of time consumed
+GoToListOfTasks=Go to list of tasks
 ListProposalsAssociatedProject=Liste Angebote, die mit diesem Projekt verknüpft sind
 ListOrdersAssociatedProject=Liste Aufträge, die mit diesem Projekt verknüpft sind
 ListInvoicesAssociatedProject=Liste Rechnungen,  die mit diesem Projekt verknüpft sind
@@ -185,9 +188,9 @@ TaskAssignedToEnterTime=Aufgabe zugewiesen. Eingabe der Zeit zu diese Aufgabe so
 IdTaskTime=ID Zeit Aufgabe
 YouCanCompleteRef=Wenn Sie das Projektkürzel mit Informationen versehen wollen (um es als Suchfilter zu benutzen), wird empfohlen, ein Minuszeichen zur Trennung einzufügen. Die automatische Numerierung funktioniert für die zukünftigen Projekte normal, z.B. %s-ABC. Sie können auch Suchschlüssel im Label benutzen.
 OpenedProjectsByThirdparties=Offene Projekte nach Partner
-OnlyOpportunitiesShort=Only opportunities
-OpenedOpportunitiesShort=Opened opportunities
-NotAnOpportunityShort=Not an opportunity
+OnlyOpportunitiesShort=nur Verkaufschancen
+OpenedOpportunitiesShort=geöffnete Verkaufschancen
+NotAnOpportunityShort=keine Verkaufschance
 OpportunityTotalAmount=Verkaufschancen Gesamtbetrag
 OpportunityPonderatedAmount=Verkaufschancen geschätzter Betrag
 OpportunityPonderatedAmountDesc=Betrag der Verkaufschance gewichtet nach Wahrscheinlichkeit
@@ -198,3 +201,4 @@ OppStatusNEGO=Verhandlung
 OppStatusPENDING=Anstehend
 OppStatusWIN=Gewonnen
 OppStatusLOST=Verloren
+Budget=Budget
diff --git a/htdocs/langs/de_DE/receiptprinter.lang b/htdocs/langs/de_DE/receiptprinter.lang
index e06aa5e4337..310a8b13b3e 100644
--- a/htdocs/langs/de_DE/receiptprinter.lang
+++ b/htdocs/langs/de_DE/receiptprinter.lang
@@ -1,10 +1,10 @@
 # Dolibarr language file - Source file is en_US - receiptprinter
-ReceiptPrinterSetup=Setup of module ReceiptPrinter
+ReceiptPrinterSetup=Einrichtung des Moduls Quittungsdrucker
 PrinterAdded=Drucker %s zugefügt
 PrinterUpdated=Drucker %s geändert
 PrinterDeleted=Drucker %s gelöscht
 TestSentToPrinter=Sende Test zu Drucker %s
-ReceiptPrinter=Receipt printers
+ReceiptPrinter=Quittungsdrucker
 ReceiptPrinterDesc=Druckereinrichtung
 ReceiptPrinterTemplateDesc=Einrichtung von Vorlagen
 ReceiptPrinterTypeDesc=Beschreibung des Typs des Quittungsdruckers
diff --git a/htdocs/langs/de_DE/sendings.lang b/htdocs/langs/de_DE/sendings.lang
index a914500facb..7c866b727ca 100644
--- a/htdocs/langs/de_DE/sendings.lang
+++ b/htdocs/langs/de_DE/sendings.lang
@@ -70,6 +70,8 @@ ProductQtyInSuppliersOrdersRunning=Produktmenge in geöffneter Lieferantenbestel
 ProductQtyInShipmentAlreadySent=Produktmenge von offenem Kundenauftrag bereits geliefert
 ProductQtyInSuppliersShipmentAlreadyRecevied=Produktmenge aus Lieferantenbestellung bereits erhalten
 NoProductToShipFoundIntoStock=Kein Artikel zum Versenden gefunden im Lager <b>%s</b>. Korrigieren Sie den Lagerbestand oder wählen Sie ein anderes Lager.
+WeightVolShort=Weight/Vol.
+ValidateOrderFirstBeforeShipment=You must first validate the order before being able to make shipments.
 
 # Sending methods
 SendingMethodCATCH=Abholung durch Kunden
diff --git a/htdocs/langs/de_DE/stocks.lang b/htdocs/langs/de_DE/stocks.lang
index 02ececd6bef..c4bf921180a 100644
--- a/htdocs/langs/de_DE/stocks.lang
+++ b/htdocs/langs/de_DE/stocks.lang
@@ -34,8 +34,8 @@ LastMovements=Letzte Bewegungen
 Units=Einheiten
 Unit=Einheit
 StockCorrection=Lagerstandsanpassung
-StockTransfer=Transfer stock
-MassStockTransferShort=Mass stock transfer
+StockTransfer=Bestand umbuchen
+MassStockTransferShort=Massen-Bestandsumbuchung
 StockMovement=Lagerbewegung
 StockMovements=Lagerbewegungen
 LabelMovement=Lagerbewegungs-Etikett
diff --git a/htdocs/langs/de_DE/supplier_proposal.lang b/htdocs/langs/de_DE/supplier_proposal.lang
index 71126bdf2f8..c07573f1d70 100644
--- a/htdocs/langs/de_DE/supplier_proposal.lang
+++ b/htdocs/langs/de_DE/supplier_proposal.lang
@@ -7,7 +7,7 @@ CommRequest=Preisanfrage
 CommRequests=Preisanfragen
 SearchRequest=Anfrage suchen
 DraftRequests=Anfrage erstellen
-SupplierProposalsDraft=Draft supplier proposals
+SupplierProposalsDraft=Entwurf Lieferantenanfrage
 LastModifiedRequests=letzten %s geänderte Preisanfragen
 RequestsOpened=offene Preisanfragen
 SupplierProposalArea=Bereich Lieferantenangebote
@@ -58,3 +58,5 @@ DefaultModelSupplierProposalCreate=Erstellung eines Standard-Modells
 DefaultModelSupplierProposalToBill=Standardvorlage wenn eine Preisanfrage geschlossen wird (angenommen)
 DefaultModelSupplierProposalClosed=Standardvorlage wenn eine Preisanfrage geschlossen wird (abgelehnt)
 ListOfSupplierProposal=Liste von Angebotsanfragen für Lieferanten
+SupplierProposalsToClose=Supplier proposals to close
+SupplierProposalsToProcess=Supplier proposals to process
diff --git a/htdocs/langs/de_DE/users.lang b/htdocs/langs/de_DE/users.lang
index 05ac893d499..d9a214aa6f3 100644
--- a/htdocs/langs/de_DE/users.lang
+++ b/htdocs/langs/de_DE/users.lang
@@ -122,4 +122,4 @@ LoginUsingOpenID=Verwende OpenID für Anmeldung
 WeeklyHours=Wochenstunden
 ColorUser=Benutzerfarbe
 DisabledInMonoUserMode=Deaktiviert im Wartungsmodus
-UserAccountancyCode=User accountancy code
+UserAccountancyCode=Buchhaltungscode Benutzer
diff --git a/htdocs/langs/el_GR/accountancy.lang b/htdocs/langs/el_GR/accountancy.lang
index 54539e8a563..6f1e4650370 100644
--- a/htdocs/langs/el_GR/accountancy.lang
+++ b/htdocs/langs/el_GR/accountancy.lang
@@ -156,14 +156,14 @@ GeneralLedgerIsWritten=Operations are written in the general ledger
 MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
 
 ##Export Journal Feature
-ExportFormat=Format of Export
+ExportFormat=Τύπος εξαγωγής
 Prefixname=Prefix of export File
-Separate=Export separator
+Separate=Διαχωριστικό εξαγωγής
 Textframe=Frame of text value
 Headercol=Colname in header of file
-Fieldname=Name of Field
-Headername=Name in header
-Type=Type of fields
+Fieldname=Όνομα πεδίου
+Headername=Όνομα στην επικεφαλίδα
+Type=Τύπος πεδίων
 Param=Additionnal parameters
 EnabledProduct=In Product
 EnabledTiers=In third party
@@ -172,8 +172,8 @@ EnabledVat=In VAT
 ## Tools - Init accounting account on product / service
 InitAccountancy=Init accountancy
 InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accountancy account defined for sales and purchases. Check before that setup of module accountancy is complete.
-Options=Options
-OptionModeProductSell=Mode sales
-OptionModeProductBuy=Mode purchases
+Options=Επιλογές
+OptionModeProductSell=Κατάσταση πωλήσεων
+OptionModeProductBuy=Κατάσταση αγορών
 OptionModeProductSellDesc=Show all products with no accounting account defined for sales.
 OptionModeProductBuyDesc=Show all products with no accounting account defined for purchases.
diff --git a/htdocs/langs/el_GR/admin.lang b/htdocs/langs/el_GR/admin.lang
index 6b74139bacf..a8c8efcdfc8 100644
--- a/htdocs/langs/el_GR/admin.lang
+++ b/htdocs/langs/el_GR/admin.lang
@@ -10,7 +10,7 @@ VersionUnknown=Άγνωστη
 VersionRecommanded=Προτεινόμενη
 FileCheck=Files Integrity
 FilesMissing=Missing Files
-FilesUpdated=Updated Files
+FilesUpdated=Ενημερωμένα αρχεία
 FileCheckDolibarr=Check Dolibarr Files Integrity
 XmlNotFound=Xml File of Dolibarr Integrity Not Found
 SessionId=ID Συνόδου
@@ -154,7 +154,7 @@ Purge=Εκκαθάριση
 PurgeAreaDesc=Αυτή η σελίδα σας επιτρέπει να διαγράψετε όλα τα αρχεία που κατασκευάζονται ή αποθηκεύονται από Dolibarr (προσωρινά αρχεία ή όλα τα αρχεία σε <b>%s </ b> directory).  Η χρήση αυτής της λειτουργίας δεν είναι απαραίτητη.  Παρέχεται για χρήστες των οποίων το Dolibarr φιλοξενείται από πάροχο, που δεν προσφέρει δικαίωμα διαγραφής αρχείων που κατασκευάστηκαν από τον web server.
 PurgeDeleteLogFile=Διαγραφή αρχείου καταγραφής <b>%s</b> που ορίζεται για τη μονάδα syslog (δεν υπάρχει κίνδυνος απώλειας δεδομένων)
 PurgeDeleteTemporaryFiles=Διαγραφή όλων των προσωρινών αρχείων (ΔΕΝ υπάρχει κίνδυνος απώλειας δεδομένων)
-PurgeDeleteTemporaryFilesShort=Delete temporary files
+PurgeDeleteTemporaryFilesShort=Διαγραφή προσωρινών αρχείων
 PurgeDeleteAllFilesInDocumentsDir=Διαγραφή όλων των αρχείων στον κατάλογο <b>%s</b>.  Προσωρινά αρχεία αλλά και βάση δεδομένων αντιγράφων ασφαλείας κάδου απορριμάτων, αρχεία που συνδέονται με τα στοιχεία (ΠΕΛ./ΠΡΟΜ., τιμολόγια, ...) και μεταφορτώνονται στη μονάδα ECM θα διαγραφούν.
 PurgeRunNow=Διαγραφή τώρα
 PurgeNothingToDelete=Δεν υπάρχει κατάλογος ή αρχείο για διαγραφή.
@@ -282,8 +282,9 @@ ModuleSetup=Διαχείριση Αρθρώματος
 ModulesSetup=Διαχείριση Αρθρωμάτων
 ModuleFamilyBase=Σύστημα
 ModuleFamilyCrm=Customer Relation Management (CRM)
-ModuleFamilyProducts=Products Management (PM)
-ModuleFamilyHr=Human Resource Management (HR)
+ModuleFamilySrm=Supplier Relation Management (SRM)
+ModuleFamilyProducts=Διαχείριση προϊόντων 
+ModuleFamilyHr=Διαχείριση ανθρώπινων πόρων
 ModuleFamilyProjects=Projects/Συμμετοχικές εργασίες
 ModuleFamilyOther=Άλλο
 ModuleFamilyTechnic=Εργαλεία πολλαπλών modules
@@ -299,7 +300,7 @@ ThisIsProcessToFollow=Αυτό έχει ρυθμιστεί για να επεξ
 ThisIsAlternativeProcessToFollow=This is an alternative setup to process:
 StepNb=Βήμα %s
 FindPackageFromWebSite=Βρείτε ένα πακέτο που να παρέχει την λειτουργία που επιθυμείτε (για παράδειγμα στο επίσημο %s).
-DownloadPackageFromWebSite=Download package (for example from official web site %s).
+DownloadPackageFromWebSite=Λήψη πακέτου (για παράδειγμα από την επίσημη ιστοσελίδα %s).
 UnpackPackageInDolibarrRoot=Unpack package file into Dolibarr server directory dedicated to external modules: <b>%s</b>
 SetupIsReadyForUse=Η εγκατάσταση τελείωσε και το Dolibarr είναι έτοιμο να χρησιμοποιηθεί με αυτό το νέο στοιχείο.
 NotExistsDirect=Ο εναλλακτικός ριζικός φάκελος δεν έχει ρυθμιστεί.<br>
@@ -330,7 +331,7 @@ UMaskExplanation=Αυτή η παράμετρος σας επιτρέπει να
 SeeWikiForAllTeam=Ρίξτε μια ματιά στην σελίδα wiki για μια πλήρη λίστα όλων των actors και της οργάνωσής τους
 UseACacheDelay= Καθυστέρηση για την τοποθέτηση απόκρισης εξαγωγής στην προσωρινή μνήμη σε δευτερόλεπτα (0 ή άδεια για μη χρήση προσωρινής μνήμης)
 DisableLinkToHelpCenter=Αποκρύψτε τον σύνδεσμο "<b>Αναζητήστε βοήθεια ή υποστήριξη</b>" στην σελίδα σύνδεσης
-DisableLinkToHelp=Hide link to online help "<b>%s</b>"
+DisableLinkToHelp=Απόκρυψη του συνδέσμου online βοήθεια "<b>%s</b>"
 AddCRIfTooLong=Δεν υπάρχει αυτόματη αναδίπλωση κειμένου.  Αν η γραμμή σας δεν χωράει στην σελίδα των εγγράφων επειδή είναι πολύ μεγάλη, θα πρέπει να προσθέσετε μόνοι σας χαρακτήρες αλλαγής γραμμής carriage return στην περιοχή κειμένου.
 ModuleDisabled=Απενεργοποιημένο Άρθρωμα
 ModuleDisabledSoNoEvent=Το module είναι απενεργοποιημένο και έτσι δεν έχει δημιουργηθεί τέτοιο γεγονός
@@ -353,7 +354,7 @@ ThemeDir=Φάκελος skins
 ConnectionTimeout=Λήξη σύνδεσης
 ResponseTimeout=Λήξη χρόνου αναμονής απάντησης
 SmsTestMessage=Δοκιμαστικό μήνυμα από __PHONEFROM__ να __PHONETO__
-ModuleMustBeEnabledFirst=Module <b>%s</b> must be enabled first if you need this feature.
+ModuleMustBeEnabledFirst=Το άρθρωμα <b>%s</b> πρέπει να ενεργοποιηθεί πρώτα εάν χρειάζεστε συτή τη λειτουργία.
 SecurityToken=Security Token
 NoSmsEngine=Δεν υπάρχει πρόγραμμα αποστολής SMS διαθέσιμο. Τα προγράμματα αποστολής SMS δεν εγκαθίστανται με την διανομή από προεπιλογή (επειδή εξαρτώνται από εξωτερικούς προμηθευτές) αλλά μπορείτε να βρείτε κάποια διαθέσιμα προγράμματα στο %s
 PDF=PDF
@@ -498,13 +499,13 @@ Module500Name=Special expenses
 Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
 Module510Name=Μισθοί
 Module510Desc=Διαχείριση υπαλλήλων, μισθών και πληρωμών
-Module520Name=Loan
-Module520Desc=Management of loans
+Module520Name=Δάνειο
+Module520Desc=Διαχείριση δανείων
 Module600Name=Notifications
 Module600Desc=Send EMail notifications (triggered by some business events) to third-party contacts (setup defined on each thirdparty) or fixed emails
 Module700Name=Δωρεές
 Module700Desc=Donation management
-Module770Name=Expense reports
+Module770Name=Αναφορές εξόδων
 Module770Desc=Management and claim expense reports (transportation, meal, ...)
 Module1120Name=Supplier commercial proposal
 Module1120Desc=Request supplier commercial proposal and prices
@@ -512,7 +513,7 @@ Module1200Name=Mantis
 Module1200Desc=Mantis integration
 Module1400Name=Accounting
 Module1400Desc=Accounting management (double parties)
-Module1520Name=Document Generation
+Module1520Name=Δημιουργία εγγράφων
 Module1520Desc=Mass mail document generation
 Module1780Name=Ετικέτες/Κατηγορίες
 Module1780Desc=Δημιουργήστε ετικέτες/κατηγορίες (προϊόντα, πελάτες, προμηθευτές, επαφές ή μέλη)
@@ -540,7 +541,7 @@ Module2900Desc=GeoIP Maxmind conversions capabilities
 Module3100Name=Skype
 Module3100Desc=Add a Skype button into card of users / third parties / contacts / members
 Module4000Name=HRM
-Module4000Desc=Human resources management
+Module4000Desc=Διαχείριση ανθρώπινου δυναμικού
 Module5000Name=Multi-company
 Module5000Desc=Allows you to manage multiple companies
 Module6000Name=Ροή εργασίας
@@ -587,6 +588,7 @@ Permission38=Export products
 Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
 Permission42=Create/modify projects (shared project and projects i'm contact for)
 Permission44=Delete projects (shared project and projects i'm contact for)
+Permission45=Export projects
 Permission61=Read interventions
 Permission62=Create/modify interventions
 Permission64=Delete interventions
@@ -640,6 +642,7 @@ Permission162=Δημιουργία/τροποποίηση συμβολαίων/
 Permission163=Ενεργοποίηση υπηρεσίας/συνδρομής ενός συμβολαίου
 Permission164=Απενεργοποίηση υπηρεσίας/συνδρομής ενός συμβολαίου
 Permission165=Διαγραφή συμβολαίων/συνδρομών
+Permission167=Export contracts
 Permission171=Read trips and expenses (yours and your subordinates)
 Permission172=Δημιουργία/τροποποίηση ταξίδια και έξοδα
 Permission173=Διαγραφή ταξιδιών και εξόδων
@@ -722,11 +725,11 @@ Permission510=Διαβάστε τους μισθούς
 Permission512=Δημιουργία/Τροποποίηση μισθών
 Permission514=Διαγραφή μισθών
 Permission517=Εξαγωγή μισθών
-Permission520=Read Loans
-Permission522=Create/modify loans
-Permission524=Delete loans
-Permission525=Access loan calculator
-Permission527=Export loans
+Permission520=Ανάγνωση δανείων
+Permission522=Δημιουργία/μεταβολή δανείων
+Permission524=Διαγραφή δανείων
+Permission525=Πρόσβαση στον υπολογιστή δανείου
+Permission527=Εξαγωγή δανείων
 Permission531=Read services
 Permission532=Create/modify services
 Permission534=Delete services
@@ -788,6 +791,7 @@ Permission2403=Delete actions (events or tasks) linked to his account
 Permission2411=Read actions (events or tasks) of others
 Permission2412=Create/modify actions (events or tasks) of others
 Permission2413=Delete actions (events or tasks) of others
+Permission2414=Export actions/tasks of others
 Permission2501=Read/Download documents
 Permission2502=Download documents
 Permission2503=Υποβολή ή να διαγράψετε τα έγγραφα
@@ -829,7 +833,7 @@ DictionarySource=Προέλευση των προτάσεων/παραγγελι
 DictionaryAccountancyplan=Λογιστικό σχέδιο
 DictionaryAccountancysystem=Μοντέλα λογιστικού σχεδίου
 DictionaryEMailTemplates=Πρότυπα email
-DictionaryUnits=Units
+DictionaryUnits=Μονάδες
 DictionaryProspectStatus=Prospection status
 DictionaryHolidayTypes=Type of leaves
 DictionaryOpportunityStatus=Opportunity status for project/lead
@@ -867,11 +871,11 @@ LocalTax2IsNotUsedDescES= By default the proposed IRPF is 0. End of rule.
 LocalTax2IsUsedExampleES= In Spain, freelancers and independent professionals who provide services and companies who have chosen the tax system of modules.
 LocalTax2IsNotUsedExampleES= In Spain they are bussines not subject to tax system of modules.
 CalcLocaltax=Reports on local taxes
-CalcLocaltax1=Sales - Purchases
+CalcLocaltax1=Πωλήσεις - Αγορές
 CalcLocaltax1Desc=Local Taxes reports are calculated with the difference between localtaxes sales and localtaxes purchases
-CalcLocaltax2=Purchases
+CalcLocaltax2=Αγορές
 CalcLocaltax2Desc=Local Taxes reports are the total of localtaxes purchases
-CalcLocaltax3=Sales
+CalcLocaltax3=Πωλήσεις
 CalcLocaltax3Desc=Local Taxes reports are the total of localtaxes sales
 LabelUsedByDefault=Label used by default if no translation can be found for code
 LabelOnDocuments=Ετικέτα στα έγγραφα
@@ -932,7 +936,7 @@ DefaultMenuSmartphoneManager=Smartphone menu manager
 Skin=Θέμα
 DefaultSkin=Προκαθορισμένο Θέμα
 MaxSizeList=Max length for list
-DefaultMaxSizeList=Default max length for lists
+DefaultMaxSizeList=Προεπιλεγμένο μέγιστο μέγεθος για λίστες
 DefaultMaxSizeShortList=Default max length for short lists (ie in customer card)
 MessageOfDay=Μήνυμα της ημέρας
 MessageLogin=Μήνυμα σελίδας εισόδου
@@ -949,7 +953,7 @@ CompanyZip=Τ.Κ.
 CompanyTown=Πόλη
 CompanyCountry=Χώρα
 CompanyCurrency=Βασικό Νόμισμα
-CompanyObject=Object of the company
+CompanyObject=Αντικείμενο της εταιρίας
 Logo=Logo
 DoNotShow=Απόκρυψη
 DoNotSuggestPaymentMode=Χωρίς πρόταση πληρωμής
@@ -1114,7 +1118,7 @@ GetBarCode=Πάρτε barcode
 EmptyNumRefModelDesc=Ο κώδικας είναι δωρεάν. Αυτός ο κώδικας μπορεί να τροποποιηθεί ανά πάσα στιγμή.
 ##### Module password generation
 PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: 8 characters containing shared numbers and characters in lowercase.
-PasswordGenerationNone=Do not suggest any generated password. Password must be typed in manually.
+PasswordGenerationNone=Να μην προτείνεται η δημιουργία κωδικού. Ο κωδικός πρέπει να πληκτρολογηθεί με το χέρι.
 PasswordGenerationPerso=Return a password according to your personally defined configuration.
 SetupPerso=According to your configuration
 PasswordPatternDesc=Password pattern description
@@ -1362,7 +1366,7 @@ LDAPFieldCountry=Country
 LDAPFieldCountryExample=Example : c
 LDAPFieldDescription=Description
 LDAPFieldDescriptionExample=Example : description
-LDAPFieldNotePublic=Public Note
+LDAPFieldNotePublic=Δημόσια σημείωση
 LDAPFieldNotePublicExample=Example : publicnote
 LDAPFieldGroupMembers= Group members
 LDAPFieldGroupMembersExample= Example : uniqueMember
@@ -1421,7 +1425,7 @@ SetDefaultBarcodeTypeThirdParties=Default barcode type to use for third parties
 UseUnits=Define a unit of measure for Quantity during order, proposal or invoice lines edition
 ProductCodeChecker= Module for product code generation and checking (product or service)
 ProductOtherConf= Product / Service configuration
-IsNotADir=is not a directory!
+IsNotADir=δεν είναι κατάλογος
 ##### Syslog #####
 SyslogSetup=Logs module setup
 SyslogOutput=Logs outputs
@@ -1533,7 +1537,7 @@ DetailLevel=Level (-1:top menu, 0:header menu, >0 menu and sub menu)
 ModifMenu=Menu change
 DeleteMenu=Delete menu entry
 ConfirmDeleteMenu=Are you sure you want to delete menu entry <b>%s</b> ?
-FailedToInitializeMenu=Failed to initialize menu
+FailedToInitializeMenu=Αποτυχία προετοιμασίας μενού
 ##### Tax #####
 TaxSetup=Taxes, social or fiscal taxes and dividends module setup
 OptionVatMode=VAT due
@@ -1641,7 +1645,7 @@ CloseFiscalYear=Κλείσιμο οικονομικού έτους
 DeleteFiscalYear=Διαγραφή οικονομικού έτους
 ConfirmDeleteFiscalYear=Είστε σίγουροι ότι θέλετε να διαγράψετε αυτό το οικονομικό έτος;
 AlwaysEditable=Μπορεί πάντα να επεξεργαστή
-IsHidden=Is not visible
+IsHidden=Δεν είναι ορατό
 MAIN_APPLICATION_TITLE=Αναγκαστικό ορατό όνομα της εφαρμογής (προειδοποίηση: η ρύθμιση του δικού σας ονόματος μπορεί να δημιουργήσει πρόβλημα στη λειτουργία Αυτόματης συμπλήρωσης σύνδεσης όταν χρησιμοποιείτε το DoliDroid εφαρμογή για κινητά)
 NbMajMin=Ελάχιστος αριθμός κεφαλαίων χαρακτήρων
 NbNumMin=Ελάχιστος αριθμός αριθμητικών χαρακτήρων
@@ -1673,23 +1677,23 @@ TextTitleColor=Color of page title
 LinkColor=Color of links
 PressF5AfterChangingThis=Press F5 on keyboard after changing this value to have it effective
 NotSupportedByAllThemes=Will works with eldy theme but is not supported by all themes
-BackgroundColor=Background color
-TopMenuBackgroundColor=Background color for Top menu
-LeftMenuBackgroundColor=Background color for Left menu
-BackgroundTableTitleColor=Background color for Table title line
-BackgroundTableLineOddColor=Background color for odd table lines
-BackgroundTableLineEvenColor=Background color for even table lines
+BackgroundColor=Χρώμα φόντου
+TopMenuBackgroundColor=Χρώμα φόντου για το επάνω μενού
+LeftMenuBackgroundColor=Χρώμα φόντου για το αριστερό μενού
+BackgroundTableTitleColor=Χρώμα φόντου για τη γραμμή επικεφαλίδας του πίνακα
+BackgroundTableLineOddColor=Χρώμα φόντου για τις περιττές (μονές) γραμμές του πίνακα
+BackgroundTableLineEvenColor=Χρώμα φόντου για τις άρτιες (ζυγές) γραμμές του πίνακα
 MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)
 NbAddedAutomatically=Number of days added to counters of users (automatically) each month
 EnterAnyCode=This field contains a reference to identify line. Enter any value of your choice, but without special characters.
 UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For exemple: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
-PositionIntoComboList=Position of line into combo lists
+PositionIntoComboList=Θέση γραμμής σε σύνθετο πλαίσιο
 SellTaxRate=Sale tax rate
 RecuperableOnly=Yes for VAT "Non Perçue Récupérable" dedicated for some state in France. Keep value to "No" in all other cases.
 UrlTrackingDesc=If the provider or transport service offer a page or web site to check status of your shipping, you can enter it here. You can use the key {TRACKID} into URL parameters so the system will replace it with value of tracking number user entered into shipment card.
 OpportunityPercent=When you create an opportunity, you will defined an estimated amount of project/lead. According to status of opportunity, this amount may be multiplicated by this rate to evaluate global amount all your opportunities may generate. Value is percent (between 0 and 100).
 TemplateForElement=This template record is dedicated to which element
-TypeOfTemplate=Type of template
+TypeOfTemplate=Τύπος πρότυπου
 TemplateIsVisibleByOwnerOnly=Template is visible by owner only
 FixTZ=TimeZone fix
 FillFixTZOnlyIfRequired=Example: +2 (fill only if problem experienced)
@@ -1713,3 +1717,4 @@ ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s is available. Ve
 MultiPriceRuleDesc=When option "Several level of prices per product/service" is on, you can define different prices (one per price level) for each product. To save you time, you can enter here rule to have price for each level autocalculated according to price of first level, so you will have to enter only price for first level on each product. This page is here to save you time and can be usefull only if your prices for each leve are relative to first level. You can ignore this page in most cases.
 ModelModulesProduct=Templates for product documents
 ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
+SeeSubstitutionVars=See * note for list of possible substitution variables
diff --git a/htdocs/langs/el_GR/agenda.lang b/htdocs/langs/el_GR/agenda.lang
index 387c78c3100..3427e8440e5 100644
--- a/htdocs/langs/el_GR/agenda.lang
+++ b/htdocs/langs/el_GR/agenda.lang
@@ -35,9 +35,9 @@ AllActions= Όλες οι ενέργειες/εργασίες
 ViewCal=Μηνιαία προβολή
 ViewDay=Προβολή ημέρας
 ViewWeek=Προβολή εβδομάδας
-ViewYear=Year view
+ViewYear=Προβολή ανά έτος
 ViewPerUser=Προβολή ανά χρήστη
-ViewPerType=Per type view
+ViewPerType=Προβολή ανά τύπο
 ViewWithPredefinedFilters= Εμφάνιση με προκαθορισμένα φίλτρα
 AutoActions= Αυτόματη συμπλήρωση ημερολογίου
 AgendaAutoActionDesc= Εδώ ορίζετε γεγονότα για το οποία θέλετε το  Dolibarr να δημιουργεί αυτόματα μια ενέργεια στην ατζέντα. Αν τίποτα δεν είναι τσεκαρισμένο (προεπιλογή), τότε, μόνο χειροκίνητες ενέργειες θα συμπεριληφθούν στην ατζέντα.
diff --git a/htdocs/langs/el_GR/bills.lang b/htdocs/langs/el_GR/bills.lang
index 29f40e2f562..0e03f017d5c 100644
--- a/htdocs/langs/el_GR/bills.lang
+++ b/htdocs/langs/el_GR/bills.lang
@@ -74,8 +74,8 @@ PaymentsAlreadyDone=Ιστορικό Πληρωμών
 PaymentsBackAlreadyDone=Payments back already done
 PaymentRule=Κανόνας Πληρωμής
 PaymentMode=Τρόπος Πληρωμής
-IdPaymentMode=Payment type (id)
-LabelPaymentMode=Payment type (label)
+IdPaymentMode=Τύπος πληρωμής (κωδ)
+LabelPaymentMode=Τύπος πληρωμής (ετικέτα)
 PaymentModeShort=Τρόπος πληρωμής
 PaymentTerm=Όρος πληρωμής
 PaymentConditions=Όροι πληρωμής
@@ -192,7 +192,7 @@ ShowInvoice=Εμφάνιση τιμολογίου
 ShowInvoiceReplace=Εμφάνιση τιμολογίου αντικατάστασης
 ShowInvoiceAvoir=Εμφάνιση πιστωτικού τιμολογίου
 ShowInvoiceDeposit=Εμφάνιση τιμολογίου κατάθεσης
-ShowInvoiceSituation=Show situation invoice
+ShowInvoiceSituation=Εμφάνιση κατάστασης τιμολογίου
 ShowPayment=Εμφάνιση πληρωμής
 AlreadyPaid=Ήδη πληρωμένο
 AlreadyPaidBack=Already paid back
@@ -205,7 +205,7 @@ Rest=Εκκρεμής
 AmountExpected=Ποσό που ζητήθηκε
 ExcessReceived=Περίσσεια που λήφθηκε
 EscompteOffered=Discount offered (payment before term)
-EscompteOfferedShort=Discount
+EscompteOfferedShort=Έκπτωση
 SendBillRef=Υποβολή των τιμολογίων %s
 SendReminderBillRef=Υποβολή των τιμολογίων %s (υπενθύμιση)
 StandingOrders=Πάγιες Εντολές
@@ -219,6 +219,7 @@ RemainderToBill=Υπόλοιπο προς χρέωση
 SendBillByMail=Αποστολή τιμολογίου με email
 SendReminderBillByMail=Αποστολή υπενθύμισης με email
 RelatedCommercialProposals=Related commercial proposals
+RelatedRecurringCustomerInvoices=Related recurring customer invoices
 MenuToValid=Προς επικύρωση
 DateMaxPayment=Πληρωμή πριν από
 DateEcheance=Καταληκτική Ημερομηνία
@@ -319,7 +320,6 @@ toolTipFrequency=Examples:<br /><b>Set 7 / day</b>: give a new invoice every 7 d
 NextDateToExecution=Date for next invoice generation
 DateLastGeneration=Date of last generation
 MaxPeriodNumber=Max nb of invoice generation
-RestPeriodNumber=Rest period number
 NbOfGenerationDone=Nb of invoice generation already done
 InvoiceAutoValidate=Automatically validate invoice
 GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
@@ -359,8 +359,8 @@ PaymentTypeTIP=Διατραπεζική πληρωμή
 PaymentTypeShortTIP=Διατραπεζική πληρωμή
 PaymentTypeVAD=On line πληρωμή
 PaymentTypeShortVAD=On line πληρωμή
-PaymentTypeTRA=Traite
-PaymentTypeShortTRA=Traite
+PaymentTypeTRA=Συνθήκη
+PaymentTypeShortTRA=Τύπος πληρωμής (κωδ)
 PaymentTypeFAC=Παράγοντας
 PaymentTypeShortFAC=Παράγοντας
 BankDetails=Πληροφορίες τράπεζας
@@ -471,3 +471,7 @@ PDFCrevetteSituationInvoiceLine=Situation N°%s : Inv. N°%s on %s
 TotalSituationInvoice=Total situation
 invoiceLineProgressError=Invoice line progress can't be egal or upper the next invoice line
 updatePriceNextInvoiceErrorUpdateline=Error : update price on invoice line : %s
+ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
+ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
+ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
+
diff --git a/htdocs/langs/el_GR/boxes.lang b/htdocs/langs/el_GR/boxes.lang
index e1fa2fe8010..9f3d9278524 100644
--- a/htdocs/langs/el_GR/boxes.lang
+++ b/htdocs/langs/el_GR/boxes.lang
@@ -60,8 +60,8 @@ BoxTitleLastContracts=Τα %s πιο πρόσφατα συμβόλαια
 BoxTitleLastModifiedDonations=Οι τελευταίες %s τροποποιημένες δωρεές
 BoxTitleLastModifiedExpenses=Τελευταία %s τροποποιημένη έκθεση εξόδων
 BoxGlobalActivity=Η γενική δραστηριότητα για (τιμολόγια, προσφορές, παραγγελίες)
-BoxGoodCustomers=Good Customers
-BoxTitleGoodCustomers=%s Good Customers
+BoxGoodCustomers=Good customers
+BoxTitleGoodCustomers=%s Good customers
 FailedToRefreshDataInfoNotUpToDate=Αποτυχία ανανέωσης RSS ροής. Τελευταία ημερομηνία επιτυχημένης ανανέωσης: %s
 LastRefreshDate=Τελευταία ημερομηνία ανανέωσης
 NoRecordedBookmarks=Δεν υπάρχουν σελιδοδείκτες που ορίζονται. Κάντε κλικ <a href="%s">εδώ</a> για να προσθέσετε σελιδοδείκτες.
diff --git a/htdocs/langs/el_GR/categories.lang b/htdocs/langs/el_GR/categories.lang
index 6d4c6016526..a3d6b590c56 100644
--- a/htdocs/langs/el_GR/categories.lang
+++ b/htdocs/langs/el_GR/categories.lang
@@ -30,20 +30,20 @@ CreateThisCat=Δημιουργήστε αυτήν την Ετικέτα/Κατη
 ValidateFields=Επικύρωση πεδίων
 NoSubCat=Καμία υποκατηγορία.
 SubCatOf=Υποκατηγορία
-FoundCats=Found tags/categories
-FoundCatsForName=Tags/categories found for the name :
-FoundSubCatsIn=Subcategories found in the tag/category
-ErrSameCatSelected=You selected the same tag/category several times
-ErrForgotCat=You forgot to choose the tag/category
+FoundCats=Εύρεση ετικετών/κατηγοριών
+FoundCatsForName=Ετικέτες/κατηγορίες που βρέθηκαν για το όνομα:
+FoundSubCatsIn=Υποκατηγορίες που βρέθηκαν στην ετικέτα/κατηγορία
+ErrSameCatSelected=Επιλέξατε την ίδια ετικέτα/κατηγορία αρκετές φορές
+ErrForgotCat=Ξεχάσατε να επιλέξετε ετικέτα/κατηγορία
 ErrForgotField=Δεν ενημερώσατε τα πεδία
 ErrCatAlreadyExists=Αυτό το όνομα χρησιμοποιείται ήδη
-AddProductToCat=Add this product to a tag/category?
-ImpossibleAddCat=Impossible to add the tag/category
-ImpossibleAssociateCategory=Impossible to associate the tag/category to
+AddProductToCat=Προσθήκη αυτού του προϊόντος σε ετικέτα/κατηγορία;
+ImpossibleAddCat=Αδύνατη η προσθήκη της ετικέτας/κατηγορίας
+ImpossibleAssociateCategory=Αδύνατη η σύνδεση της ετικέτας/κατηγορίας
 WasAddedSuccessfully=<b>%s</b> προστέθηκε με επιτυχία.
-ObjectAlreadyLinkedToCategory=Element is already linked to this tag/category.
-CategorySuccessfullyCreated=This tag/category %s has been added successfully.
-ProductIsInCategories=Product/service is linked to following tags/categories
+ObjectAlreadyLinkedToCategory=Το στοιχείο έχει ήδη συνδεθεί με αυτή την ετικέτα/κατηγορία
+CategorySuccessfullyCreated=Αυτή η ετικέτα/κατηγορία έχει ήδη προστεθεί επιτυχώς
+ProductIsInCategories=Το προϊόν/υπηρεσία έχει ήδη συνδεθεί με τις παρακάτω ετικέτες/κατηγορίες
 SupplierIsInCategories=Third party is linked to following suppliers tags/categories
 CompanyIsInCustomersCategories=This third party is linked to following customers/prospects tags/categories
 CompanyIsInSuppliersCategories=This third party is linked to following suppliers tags/categories
@@ -65,21 +65,21 @@ ContentsVisibleByAll=Τα περιεχόμενα θα είναι ορατά απ
 ContentsVisibleByAllShort=Περιεχόμενα ορατά από όλους
 ContentsNotVisibleByAllShort=Περιεχόμενα μη ορατά από όλους
 CategoriesTree=Tags/categories tree
-DeleteCategory=Delete tag/category
-ConfirmDeleteCategory=Are you sure you want to delete this tag/category ?
-RemoveFromCategory=Remove link with tag/category
+DeleteCategory=Διαγραφή ετικέτας/κατηγορίας
+ConfirmDeleteCategory=Είστε σίγουροι ότι θέλετε να διαγράψετε αυτή την ετικέτα/κατηγορία;
+RemoveFromCategory=Αφαίρεση σύνδεσης με ετικέτα/κατηγορία;
 RemoveFromCategoryConfirm=Are you sure you want to unlink the transaction from the tag/category ?
-NoCategoriesDefined=No tag/category defined
-SuppliersCategoryShort=Suppliers tag/category
-CustomersCategoryShort=Customers tag/category
-ProductsCategoryShort=Products tag/category
-MembersCategoryShort=Members tag/category
-SuppliersCategoriesShort=Suppliers tags/categories
-CustomersCategoriesShort=Customers tags/categories
+NoCategoriesDefined=Δεν ορίστηκε ετικέτα/κατηγορία
+SuppliersCategoryShort=Προμηθευτές ετικέτα/κατηγορία
+CustomersCategoryShort=Πελάτες ετικέτα/κατηγορία
+ProductsCategoryShort=Προϊόντα ετικέτα/κατηγορία
+MembersCategoryShort=Μέλη ετικέτα/κατηγορία
+SuppliersCategoriesShort=Προμηθευτές ετικέτες/κατ
+CustomersCategoriesShort=Πελάτες ετικέτες/κατ
 ProspectsCategoriesShort=Prospects tags/categories
 CustomersProspectsCategoriesShort=Κατηγορίες Πελατών/Προοπτ
-ProductsCategoriesShort=Products tags/categories
-MembersCategoriesShort=Members tags/categories
+ProductsCategoriesShort=Προϊόντα ετικέτες/κατ
+MembersCategoriesShort=Μέλη ετικέτες/κατ
 ContactCategoriesShort=Contacts tags/categories
 ThisCategoryHasNoProduct=Αυτή η κατηγορία δεν περιέχει κανένα προϊόν.
 ThisCategoryHasNoSupplier=Αυτή η κατηγορία δεν περιέχει κανένα προμηθευτή.
@@ -89,22 +89,22 @@ ThisCategoryHasNoContact=Αυτή η κατηγορία δεν περιέχει
 AssignedToCustomer=Ανατέθηκε σε πελάτη
 AssignedToTheCustomer=Έχει ανατεθεί σε πελάτη
 InternalCategory=Εσωτερική Κατηγορία
-CategoryContents=Tag/category contents
-CategId=Tag/category id
-CatSupList=List of supplier tags/categories
-CatCusList=List of customer/prospect tags/categories
-CatProdList=List of products tags/categories
-CatMemberList=List of members tags/categories
+CategoryContents=Ετικέτα/κατηγορία περιεχόμενα
+CategId=Ετικέτα/κατηγορία id
+CatSupList=Λίστα προμηθευτή ετικέτες/κατηγορίες
+CatCusList=Λίστα πελάτη/προοπτικής ετικέτες/κατηγορίες
+CatProdList=Λίστα προϊόντων ετικέτες/κατηγορίες
+CatMemberList=Λίστα μελών ετικέτες/κατηγορίες
 CatContactList=List of contact tags/categories
-CatSupLinks=Links between suppliers and tags/categories
+CatSupLinks=Σύνδεση μεταξύ προμηθευτών και ετικετών/κατηγοριών
 CatCusLinks=Links between customers/prospects and tags/categories
 CatProdLinks=Links between products/services and tags/categories
 CatMemberLinks=Links between members and tags/categories
-DeleteFromCat=Remove from tags/category
+DeleteFromCat=Αφαίρεση αυτής της ετικέτας/κατηγορίας
 DeletePicture=Διαγραφή εικόνας
 ConfirmDeletePicture=Επιβεβαιώστε τη διαγραφή εικόνας
 ExtraFieldsCategories=Συμπληρωματικά χαρακτηριστικά
-CategoriesSetup=Tags/categories setup
+CategoriesSetup=Ρύθμιση ετικετών/κατηγοριών
 CategorieRecursiv=Link with parent tag/category automatically
 CategorieRecursivHelp=Εάν είναι ενεργοποιημένο, το προϊόν θα συνδέεται επίσης με γονική κατηγορία κατά την προσθήκη σε μια υποκατηγορία
 AddProductServiceIntoCategory=Προσθέστε το ακόλουθο προϊόν/υπηρεσία
diff --git a/htdocs/langs/el_GR/commercial.lang b/htdocs/langs/el_GR/commercial.lang
index 1798b985ed4..c7ecf9b194a 100644
--- a/htdocs/langs/el_GR/commercial.lang
+++ b/htdocs/langs/el_GR/commercial.lang
@@ -7,9 +7,9 @@ Customer=Πελάτης
 Customers=Πελάτες
 Prospect=Προοπτική
 Prospects=Προοπτικές
-DeleteAction=Delete an event
-NewAction=New event
-AddAction=Create event
+DeleteAction=Διαγραφή ενός συμβάντος
+NewAction=Νέο συμβάν
+AddAction=Δημιουργία συμβάντος
 AddAnAction=Create an event
 AddActionRendezVous=Δημιουργήστε μια εκδήλωση ραντεβού
 Rendez-Vous=Συναντήσεις
diff --git a/htdocs/langs/el_GR/companies.lang b/htdocs/langs/el_GR/companies.lang
index 88becf4ed5e..10c0eb70e56 100644
--- a/htdocs/langs/el_GR/companies.lang
+++ b/htdocs/langs/el_GR/companies.lang
@@ -202,7 +202,7 @@ ProfId3IN=Prof Id 3
 ProfId4IN=Prof Id 4
 ProfId5IN=Καθ ID 5
 ProfId6IN=-
-ProfId1LU=Id. prof. 1 (RCS)
+ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
 ProfId2LU=Id. prof. 2 (Business permit)
 ProfId3LU=-
 ProfId4LU=-
@@ -317,10 +317,12 @@ ShowContact=Εμφάνιση Προσώπου Επικοινωνίας
 ContactsAllShort=Όλα (Χωρίς Φίλτρο)
 ContactType=Τύπος αντιπροσώπου επικοινωνίας
 ContactForOrders=Αντιπρόσωπος επικοινωνίας για παραγγελία
+ContactForOrdersOrShipments=Order's or shipment's contact
 ContactForProposals=Αντιπρόσωπος επικοινωνίας για πρόταση
 ContactForContracts=Αντιπρόσωπος επικοινωνίας για συμβόλαιο
 ContactForInvoices=Αντιπρόσωπος επικοινωνίας για τιμολόγιο
 NoContactForAnyOrder=Αυτός ο αντιπρόσωπος δεν αντιστοιχεί σε καμία παραγγελία
+NoContactForAnyOrderOrShipment=This contact is not a contact for any order or shipment
 NoContactForAnyProposal=Αυτός ο αντιπρόσωπος δεν αντιστοιχεί σε καμία εμπορική πρόταση
 NoContactForAnyContract=Αυτός ο αντιπρόσωπος δεν αντιστοιχεί σε  κανένα συμβόλαιο
 NoContactForAnyInvoice=Αυτός ο αντιπρόσωπος δεν αντιστοιχεί σε  κανένα τιμολόγιο
@@ -438,3 +440,6 @@ MergeThirdparties=Συγχώνευση  Πελ./Προμ.
 ConfirmMergeThirdparties=Είστε σίγουροι ότι θέλετε να συγχωνεύσετε το Πελ./Προμ. στην τρέχουσα; Όλα τα συνδεδεμένα αντικείμενα (τιμολόγια, παραγγελίες, ...) θα μεταφερθεί στο τωρινό Πελ./Προμ., έτσι θα είστε σε θέση να διαγράψετε το διπλότυπο.
 ThirdpartiesMergeSuccess= Πελ./Προμ. έχουν συγχωνευθεί
 ErrorThirdpartiesMerge=Υπήρξε ένα σφάλμα κατά τη διαγραφή των Πελ./Προμ.. Παρακαλώ ελέγξτε το αρχείο καταγραφής. Αλλαγές έχουν επανέλθει.
+SaleRepresentativeLogin=Login of sale representative
+SaleRepresentativeFirstname=Firstname of sale representative
+SaleRepresentativeLastname=Lastname of sale representative
diff --git a/htdocs/langs/el_GR/compta.lang b/htdocs/langs/el_GR/compta.lang
index d67621b73aa..63f147f5caa 100644
--- a/htdocs/langs/el_GR/compta.lang
+++ b/htdocs/langs/el_GR/compta.lang
@@ -207,7 +207,7 @@ CalculationRuleDescSupplier=According to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Αναφορά του κύκλου εργασιών ανά προϊόν, όταν χρησιμοποιείτε <b>ταμειακή λογιστική</b> η λειτουργία δεν είναι σχετική. Η αναφορά αυτή είναι διαθέσιμη μόνο όταν χρησιμοποιείτε <b>λογιστική δέσμευση</b> τρόπος (ανατρέξτε τη Ρύθμιση του module λογιστικής).
 CalculationMode=Τρόπο υπολογισμού
 AccountancyJournal=Λογιστικος Κωδικός περιοδικό
-ACCOUNTING_VAT_SOLD_ACCOUNT=Default accountancy code for collecting VAT (VAT on sales)
+ACCOUNTING_VAT_SOLD_ACCOUNT=Προεπιλεγμένος κωδικός λογιστικής για τη συλλογή ΦΠΑ (ΦΠΑ πωλήσεων)
 ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for recovered VAT (VAT on purchases)
 ACCOUNTING_VAT_PAY_ACCOUNT=Default accountancy code for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Κωδικός Λογιστικής από προεπιλογή για πελάτες
diff --git a/htdocs/langs/el_GR/contracts.lang b/htdocs/langs/el_GR/contracts.lang
index bbfd0696ad9..7860bb1df2e 100644
--- a/htdocs/langs/el_GR/contracts.lang
+++ b/htdocs/langs/el_GR/contracts.lang
@@ -22,7 +22,7 @@ Contracts=Συμβόλαια
 ContractsSubscriptions=Contracts/Subscriptions
 ContractsAndLine=Συμβόλαια και η γραμμή των συμβολαίων
 Contract=Συμβόλαιο
-ContractLine=Contract line
+ContractLine=Γραμμή επαφής
 Closing=Closing
 NoContracts=Κανένα Συμβόλαιο
 MenuServices=Υπηρεσίες
diff --git a/htdocs/langs/el_GR/cron.lang b/htdocs/langs/el_GR/cron.lang
index 3b2a2aec1ee..9f54ca584e7 100644
--- a/htdocs/langs/el_GR/cron.lang
+++ b/htdocs/langs/el_GR/cron.lang
@@ -6,8 +6,8 @@ CronAboutPage = Σχετικά με τη σελίδα Cron
 # Right
 Permission23101 = Read Scheduled job
 Permission23102 = Create/update Scheduled job
-Permission23103 = Delete Scheduled job
-Permission23104 = Execute Scheduled job
+Permission23103 = Διαγραφή προγραμματισμένης εργασίας
+Permission23104 = Εκτέλεση προγραμματισμένης εργασίας
 # Admin
 CronSetup= Προγραμματισμένη ρύθμιση διαχείρισης των εργασιών
 URLToLaunchCronJobs=URL για να ελέγξετε και να ξεκινήσει μια περιοδική εργασία, εφόσον απαιτείται
@@ -19,7 +19,7 @@ CronExplainHowToRunWin=Σε Microsoft (tm) Windows περιβάλλον μπορ
 CronMethodDoesNotExists=Class %s does not contains any method %s
 # Menu
 CronJobs=Προγραμματισμένες εργασίες
-CronListActive=List of enabled/scheduled jobs
+CronListActive=Λίστα ενεργών/προγραμματισμένων εργασών
 CronListInactive=Λίστα με τις απενεργοποιημένες εργασίες
 EnabledAndDisabled=Enabled and disabled
 # Page list
@@ -28,21 +28,21 @@ CronLastOutput=Τελευταία εκτέλεση εξόδου
 CronLastResult=Τελευταίος κωδικός αποτελέσματος
 CronListOfCronJobs=Κατάλογος προγραμματισμένων εργασιών
 CronCommand=Εντολή
-CronList=Scheduled jobs
-CronDelete=Delete scheduled jobs
-CronConfirmDelete=Are you sure you want to delete these scheduled jobs ?
-CronExecute=Launch scheduled jobs
+CronList=Προγραμματισμένες εργασίες
+CronDelete=Διαγραφή προγραμματισμένων εργασιών
+CronConfirmDelete=Είστε σίγουροι ότι θέλετε να διαγράψετε αυτές τις προγραμματισμένες εργασίες;
+CronExecute=Εκτέλεση προγραμματισμένων εργασιών
 CronConfirmExecute=Are you sure you want to execute these scheduled jobs now ?
 CronInfo=Scheduled job module allow to execute job that have been planned
-CronWaitingJobs=Waiting jobs
+CronWaitingJobs=Εργασίες σε αναμονή
 CronTask=Εργασία
 CronNone=Καμία
-CronDtStart=Not before
-CronDtEnd=Not after
+CronDtStart=Όχι πριν
+CronDtEnd=Όχι μετά
 CronDtNextLaunch=Επόμενη εκτέλεση
-CronDtLastLaunch=Start date of last execution
+CronDtLastLaunch=Ημερομηνία έναρξης ή εκτέλεσης
 CronDtLastResult=End date of last execution
-CronFrequency=Frequency
+CronFrequency=Συχνότητα
 CronClass=Class
 CronMethod=Μέθοδος
 CronModule=Module
@@ -59,7 +59,7 @@ CronEach=Κάθε
 JobFinished=Ξεκίνησε και τελείωσε
 #Page card
 CronAdd= Προσθήκη εργασίας
-CronHourStart= Start hour and date of job
+CronHourStart= Ώρα και ημερομηνία έναρξης της εργασίας
 CronEvery=Execute job each
 CronObject=Instance/Object to create
 CronArgs=Παράμετροι
@@ -79,11 +79,11 @@ CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of
 CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
 CronCommandHelp=Γραμμή εντολών του συστήματος προς εκτέλεση.
 CronCreateJob=Create new Scheduled Job
-CronFrom=From
+CronFrom=Από
 # Info
 CronInfoPage=Πληροφορίες
 # Common
-CronType=Job type
+CronType=Είδος εργασίας
 CronType_method=Καλέστε τη μέθοδο της κατηγορίας Dolibarr
 CronType_command=Εντολή Shell
 CronMenu=Μενού
diff --git a/htdocs/langs/el_GR/errors.lang b/htdocs/langs/el_GR/errors.lang
index 3b20c43b699..0ea62114ecd 100644
--- a/htdocs/langs/el_GR/errors.lang
+++ b/htdocs/langs/el_GR/errors.lang
@@ -172,6 +172,8 @@ ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
 ErrorOppStatusRequiredIfAmount=You set an estimated amount for this opportunity/lead. So you must also enter its status
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
 ErrorSavingChanges=An error has ocurred when saving the changes
+ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
+ErrorFileMustHaveFormat=File must have format %s
 
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
diff --git a/htdocs/langs/el_GR/exports.lang b/htdocs/langs/el_GR/exports.lang
index 7073a7e7736..927215a5865 100644
--- a/htdocs/langs/el_GR/exports.lang
+++ b/htdocs/langs/el_GR/exports.lang
@@ -128,6 +128,10 @@ SpecialCode=Ειδικός κωδικός
 ExportStringFilter=%% επιτρέπει την αντικατάσταση ενός ή περισσότερων χαρακτήρων στο κείμενο του
 ExportDateFilter=YYYY, YYYYMM, YYYYMMDD : φίλτρα ανά ένα έτος/μήνα/ημέρα<br>YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD : φίλτρα για μια σειρά ετών/μηνών/ημερών<br> > YYYY, > YYYYMM, > YYYYMMDD : φίλτρα για όλα τα επόμενα έτη/μήνες/ ημέρες<br> < YYYY, < YYYYMM, < YYYYMMDD : φίλτρα για όλα τα προηγούμενα έτη/μήνες/ημέρες
 ExportNumericFilter='NNNNN' φίλτρα από μία τιμή<br>'NNNNN+NNNNN' φίλτρα σε ένα εύρος τιμών<br>'&gt;NNNNN' φίλτρα από τις χαμηλότερες τιμές<br>'&gt;NNNNN' φίλτρα από τις υψηλότερες τιμές
+ImportFromLine=Import starting from line number
+EndAtLineNb=End at line number
+SetThisValueTo2ToExcludeFirstLine=For example, set this value to 3 to exclude the 2 first lines
+KeepEmptyToGoToEndOfFile=Keep this field empty to go up to the end of file
 ## filters
 SelectFilterFields=Αν θέλετε να φιλτράρετε ορισμένες τιμές, απλά εισάγετε τις τιμές εδώ.
 FilterableFields=Διηθήσιμα Πεδία
diff --git a/htdocs/langs/el_GR/loan.lang b/htdocs/langs/el_GR/loan.lang
index cc7f19037aa..5e57e792a70 100644
--- a/htdocs/langs/el_GR/loan.lang
+++ b/htdocs/langs/el_GR/loan.lang
@@ -1,22 +1,22 @@
 # Dolibarr language file - Source file is en_US - loan
-Loan=Loan
-Loans=Loans
-NewLoan=New Loan
-ShowLoan=Show Loan
-PaymentLoan=Loan payment
-ShowLoanPayment=Show Loan Payment
-Capital=Capital
-Insurance=Insurance
-Interest=Interest
-Nbterms=Number of terms
-LoanAccountancyCapitalCode=Accountancy code capital
-LoanAccountancyInsuranceCode=Accountancy code insurance
-LoanAccountancyInterestCode=Accountancy code interest
-LoanPayment=Loan payment
-ConfirmDeleteLoan=Confirm deleting this loan
-LoanDeleted=Loan Deleted Successfully
+Loan=Δάνειο
+Loans=Δάνεια
+NewLoan=Νέο δάνειο
+ShowLoan=Εμφάνιση Δανείου
+PaymentLoan=Πληρωμή δανείων
+ShowLoanPayment=Εμφάνιση Πληρωμής Δανείου
+Capital=Κεφάλαιο Κίνησης
+Insurance=Ασφάλεια Αυτοκινήτου
+Interest=Χρεωστικοί Τόκοι
+Nbterms=Αριθμός των όρων
+LoanAccountancyCapitalCode=Κωδικός Λογιστικής κεφαλαίου
+LoanAccountancyInsuranceCode=Κωδικός Λογιστικής ασφάλισης
+LoanAccountancyInterestCode=Κωδικός Λογιστικής χρεωστικών τόκων
+LoanPayment=Πληρωμή δανείων
+ConfirmDeleteLoan=Επιβεβαίωση διαγραφής δανείου
+LoanDeleted=Το Δάνειο διαγράφηκε με επιτυχία
 ConfirmPayLoan=Confirm classify paid this loan
-LoanPaid=Loan Paid
+LoanPaid=Πληρωμή δανείου
 ErrorLoanCapital=Loan amount has to be numeric and greater than zero.
 ErrorLoanLength=Loan length has to be numeric and greater than zero.
 ErrorLoanInterest=Annual interest has to be numeric and greater than zero.
@@ -40,8 +40,8 @@ MonthlyPaymentDesc=The montly payment is figured out using the following formula
 AmortizationPaymentDesc=The <a href="#amortization">amortization</a> breaks down how much of your monthly payment goes towards the bank's interest, and how much goes into paying off the principal of your loan.
 AmountFinanced=Amount Financed
 AmortizationMonthlyPaymentOverYears=Amortization For Monthly Payment: <b>%s</b> over %s years
-Totalsforyear=Totals for year
-MonthlyPayment=Monthly Payment
+Totalsforyear=Συνολικά για το έτος
+MonthlyPayment=Μηνιαίες πληρωμές
 LoanCalcDesc=This <b>mortgage calculator</b> can be used to figure out monthly payments of a home mortgage loan, based on the home's sale price, the term of the loan desired, buyer's down payment percentage, and the loan's interest rate.<br> This calculator factors in PMI (Private Mortgage Insurance) for loans where less than 20% is put as a down payment. Also taken into consideration are the town property taxes, and their effect on the total monthly mortgage payment.<br>
 GoToInterest=%s will go towards INTEREST
 GoToPrincipal=%s will go towards PRINCIPAL
diff --git a/htdocs/langs/el_GR/main.lang b/htdocs/langs/el_GR/main.lang
index a6d4b778251..034c383194f 100644
--- a/htdocs/langs/el_GR/main.lang
+++ b/htdocs/langs/el_GR/main.lang
@@ -24,12 +24,13 @@ FormatDateHourSecShort=%d/%m/%Y %H:%M:%S
 FormatDateHourTextShort=%d %b %Y %H:%M
 FormatDateHourText=%d %B %Y %H:%M
 DatabaseConnection=Σύνδεση Βάσης Δεδομένων
-NoTemplateDefined=No template defined for this email type
+NoTemplateDefined=Δεν υπάρχει καθορισμένο πρότυπο γι' αυτόν τον τύπο email
+AvailableVariables=Available substitution variables
 NoTranslation=Δεν μεταφράστηκε
 NoRecordFound=Δεν υπάρχουν καταχωρημένα στοιχεία
 NoError=Κανένα Σφάλμα
 Error=Σφάλμα
-Errors=Errors
+Errors=Λάθη
 ErrorFieldRequired=Το πεδίο '%s' απαιτείται
 ErrorFieldFormat=Τπ πεδίο '%s' δεν έχει σωστή τιμή
 ErrorFileDoesNotExists=Το αρχείο %s δεν υπάρχει
@@ -61,7 +62,7 @@ ErrorCantLoadUserFromDolibarrDatabase=Αποτυχία εύρεσης του χ
 ErrorNoVATRateDefinedForSellerCountry=Σφάλμα, δεν ορίστηκαν ποσοστά φόρων για την χώρα  '%s'.
 ErrorNoSocialContributionForSellerCountry=Σφάλμα, καμία κοινωνική εισφορά / φόροι ορίζονται για τη χώρα '%s'.
 ErrorFailedToSaveFile=Σφάλμα, αποτυχία αποθήκευσης αρχείου
-NotAuthorized=You are not authorized to do that.
+NotAuthorized=Δεν έχετε εξουσιοδότηση για να το πραγματοποιήσετε
 SetDate=Ορισμός ημερομηνίας
 SelectDate=Επιλέξτε μια ημερομηνία
 SeeAlso=Δείτε επίσης %s
@@ -106,7 +107,7 @@ NotePrivate=Σημειώσεις (προσωπικές)
 PrecisionUnitIsLimitedToXDecimals=Το Dolibarr ρυθμίστηκε να περιορίζει την ακρίβεια των τιμών σε <b>%s</b> δεκαδικά ψηφία.
 DoTest=Δοκιμή
 ToFilter=Φίλτρο
-NoFilter=No filter
+NoFilter=Χωρίς φίλτρο
 WarningYouHaveAtLeastOneTaskLate=Προειδοποίηση!! Έχετε τουλάχιστον ένα στοιχείο που υπερβαίνει το όριο καθυστερήσης.
 yes=ναι
 Yes=Ναι
@@ -133,7 +134,7 @@ Disable=Απενεργοποίηση
 Disabled=Ανενεργή
 Add=Προσθήκη
 AddLink=Προσθήκη συνδέσμου
-RemoveLink=Remove link
+RemoveLink=Αφαίρεση συνδέσμου
 Update=Ανανέωση
 AddActionToDo=Προσθήκη ενέργειες που πρέπει να γίνει
 AddActionDone=Προσθήκη ολοκλήρωσης ενέργειας
@@ -230,7 +231,7 @@ Now=Τώρα
 HourStart=Έναρξη ωρών
 Date=Ημερομηνία
 DateAndHour=Ημερομηνία και ώρα
-DateToday=Today's date
+DateToday=Σημερινή ημερομηνία
 DateReference=Reference date
 DateStart=Ημερομηνία Έναρξης
 DateEnd=Ημερομηνία Τέλους
@@ -397,7 +398,7 @@ NActions=%s ενέργειες
 NActionsLate=%s καθυστερ.
 RequestAlreadyDone=Η αίτηση έχει ήδη καταγραφεί
 Filter=Φίλτρο
-FilterOnInto=Search criteria '<strong>%s</strong>' into fields %s
+FilterOnInto=Κριτήρια αναζήτησης '<strong>%s</strong>' σε πεδίο
 RemoveFilter=Αφαίρεση φίλτρου
 ChartGenerated=Το γράφημα δημιουργήθηκε
 ChartNotGenerated=Το γράφημα δεν δημιουργήθηκε
@@ -448,7 +449,7 @@ General=Γενικά
 Size=Μέγεθος
 Received=Παραλήφθηκε
 Paid=Πληρωμές
-Topic=Subject
+Topic=Αντικείμενο
 ByCompanies=Ανά στοιχείο
 ByUsers=Ανά χρήστη
 Links=Σύνδεσμοι
@@ -701,7 +702,7 @@ LinkedToSpecificUsers=Συνδέεται με μια συγκεκριμένη ε
 DeleteAFile=Διαγραφή ενός αρχείου
 ConfirmDeleteAFile=Είστε σίγουροι ότι θέλετε να διαγράψετε το αρχείο
 NoResults=Δεν υπάρχουν αποτελέσματα
-AdminTools=Admin tools
+AdminTools=Εργαλεία διαχειριστή
 SystemTools=Εργαλεία συστήματος
 ModulesSystemTools=Modules tools
 Test=Δοκιμή
@@ -726,7 +727,7 @@ PublicUrl=Δημόσια URL
 AddBox=Προσθήκη πεδίου
 SelectElementAndClickRefresh=Επιλέξτε ένα στοιχείο και κάντε κλικ στο κουμπί Ανανέωση
 PrintFile=Εκτύπωση του αρχείου %s
-ShowTransaction=Show transaction on bank account
+ShowTransaction=Εμφάνιση συναλλαγής στον τραπεζικό λογαριασμό
 GoIntoSetupToChangeLogo=Πηγαίνετε Αρχική - Ρυθμίσεις - Εταιρία να αλλάξει το λογότυπο ή πηγαίνετε Αρχική - Ρυθμίσεις - Προβολή για απόκρυψη.
 Deny=Άρνηση
 Denied=Άρνηση
@@ -736,10 +737,10 @@ Genderman=Άνδρας
 Genderwoman=Γυναίκα
 ViewList=Προβολή λίστας
 Mandatory=Υποχρεωτικό
-Hello=Hello
+Hello=Χαίρετε
 Sincerely=Sincerely
-DeleteLine=Delete line
-ConfirmDeleteLine=Are you sure you want to delete this line ?
+DeleteLine=Διαγραφή γραμμής
+ConfirmDeleteLine=Είστε σίγουροι ότι θέλετε να διαγράψετε αυτή τη γραμμή;
 NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked records
 TooManyRecordForMassAction=Too many records selected for mass action. Such action are restriced to a list of %s records.
 # Week day
@@ -774,23 +775,23 @@ ShortSunday=Κ
 SelectMailModel=Επιλογή προτύπου email
 SetRef=Set ref
 Select2ResultFoundUseArrows=
-Select2NotFound=No result found
-Select2Enter=Enter
-Select2MoreCharacters=or more characters
-Select2LoadingMoreResults=Loading more results...
-Select2SearchInProgress=Search in progress...
+Select2NotFound=Δεν υπάρχουν αποτελέσματα
+Select2Enter=Εισαγωγή
+Select2MoreCharacters=ή περισσότερους χαρακτήρες
+Select2LoadingMoreResults=Φόρτωση περισσότερων αποτελεσμάτων
+Select2SearchInProgress=Αναζήτηση σε εξέλιξη
 SearchIntoThirdparties=Thirdparties
-SearchIntoContacts=Contacts
-SearchIntoMembers=Members
-SearchIntoUsers=Users
+SearchIntoContacts=Επαφές
+SearchIntoMembers=Μέλη
+SearchIntoUsers=Χρήστες
 SearchIntoProductsOrServices=Products or services
-SearchIntoProjects=Projects
-SearchIntoCustomerInvoices=Customer invoices
-SearchIntoSupplierInvoices=Supplier invoices
-SearchIntoCustomerOrders=Customer orders
-SearchIntoSupplierOrders=Supplier orders
+SearchIntoProjects=Έργα
+SearchIntoCustomerInvoices=Τιμολόγια πελατών
+SearchIntoSupplierInvoices=Τιμολόγια προμηθευτών
+SearchIntoCustomerOrders=Παραγγελίες πελατών
+SearchIntoSupplierOrders=Παραγγελίες προμηθευτών
 SearchIntoCustomerProposals=Customer proposals
 SearchIntoSupplierProposals=Supplier proposals
-SearchIntoInterventions=Interventions
-SearchIntoContracts=Contracts
-SearchIntoExpenseReports=Expense reports
+SearchIntoInterventions=Παρεμβάσεις
+SearchIntoContracts=Συμβόλαια
+SearchIntoExpenseReports=Αναφορές εξόδων
diff --git a/htdocs/langs/el_GR/orders.lang b/htdocs/langs/el_GR/orders.lang
index aa6e68bafe9..5f0882586c3 100644
--- a/htdocs/langs/el_GR/orders.lang
+++ b/htdocs/langs/el_GR/orders.lang
@@ -16,11 +16,11 @@ SupplierOrder=Παραγγελία Προμηθευτή
 SuppliersOrders=Παραγγελίας Προμηθευτών
 SuppliersOrdersRunning=Τρέχουσες παραγγελίες προμηθευτών
 CustomerOrder=Παραγγελία πελάτη
-CustomersOrders=Customer orders
-CustomersOrdersRunning=Current customer orders
+CustomersOrders=Παραγγελίες πελατών
+CustomersOrdersRunning=Τρέχουσες παραγγελίες πελατών
 CustomersOrdersAndOrdersLines=Customer orders and order lines
-OrdersToValid=Customer orders to validate
-OrdersToBill=Customer orders delivered
+OrdersToValid=Παραγγελίες πελάτη προς επιβεβαίωση
+OrdersToBill=Παραγγελίες πελάτη που έχουν παραδοθεί
 OrdersInProcess=Customer orders in process
 OrdersToProcess=Customer orders to process
 SuppliersOrdersToProcess=Supplier orders to process
@@ -31,7 +31,8 @@ StatusOrderSentShort=Αποστολή στη διαδικασία
 StatusOrderSent=Αποστολή σε εξέλιξη
 StatusOrderOnProcessShort=Παραγγέλθηκε
 StatusOrderProcessedShort=Ολοκληρωμένη
-StatusOrderDelivered=Delivered
+StatusOrderDelivered=Παραδόθηκε
+StatusOrderDeliveredShort=Παραδόθηκε
 StatusOrderToBillShort=Για πληρωμή
 StatusOrderToBill2Short=Προς τιμολόγηση
 StatusOrderApprovedShort=Εγγεκριμένη
@@ -79,7 +80,7 @@ AddToOtherOrders=Προσθήκη στις άλλες παραγγελίες
 AddToDraftOrders=Προσθήκη στο σχέδιο παραγγελιας
 ShowOrder=Εμφανιση παραγγελίας
 OrdersOpened=Orders to process
-NoOpenedOrders=No open orders
+NoOpenedOrders=Δεν υπάρχουν εκκρεμείς παραγγελίες
 NoOtherOpenedOrders=No other open orders
 NoDraftOrders=Δεν υπάρχουν προσχέδια παραγγελιών
 NoOrder=No order
diff --git a/htdocs/langs/el_GR/other.lang b/htdocs/langs/el_GR/other.lang
index 25f2ea8e880..08fc2cb384c 100644
--- a/htdocs/langs/el_GR/other.lang
+++ b/htdocs/langs/el_GR/other.lang
@@ -240,6 +240,6 @@ NewExport=New export
 ExternalSites=External sites
 WebsiteSetup=Setup of module website
 WEBSITE_PAGEURL=URL of page
-WEBSITE_TITLE=Title
-WEBSITE_DESCRIPTION=Description
-WEBSITE_KEYWORDS=Keywords
+WEBSITE_TITLE=Τίτλος
+WEBSITE_DESCRIPTION=Περιγραφή
+WEBSITE_KEYWORDS=Λέξεις κλειδιά
diff --git a/htdocs/langs/el_GR/paypal.lang b/htdocs/langs/el_GR/paypal.lang
index a41d76eb3dd..9cd5dcfa744 100644
--- a/htdocs/langs/el_GR/paypal.lang
+++ b/htdocs/langs/el_GR/paypal.lang
@@ -28,5 +28,5 @@ SetExpressCheckoutAPICallFailed=SetExpressCheckout API call failed.
 DoExpressCheckoutPaymentAPICallFailed=DoExpressCheckoutPayment API call failed.
 DetailedErrorMessage=Detailed Error Message
 ShortErrorMessage=Short Error Message
-ErrorCode=Error Code
+ErrorCode=Λάθος κωδικός
 ErrorSeverityCode=Error Severity Code
diff --git a/htdocs/langs/el_GR/printing.lang b/htdocs/langs/el_GR/printing.lang
index 72421b06f21..dc33cadbeef 100644
--- a/htdocs/langs/el_GR/printing.lang
+++ b/htdocs/langs/el_GR/printing.lang
@@ -3,8 +3,8 @@ Module64000Name=Άμεση εκτύπωση
 Module64000Desc=Ενεργοποίηση άμεσης εκτύπωσης
 PrintingSetup=Ρύθμιση του συστήματος για την άμεση εκτύπωση
 PrintingDesc=Το module αυτό προσθέτει ένα κουμπί Εκτύπωσης για να στείλετε έγγραφα απευθείας σε έναν εκτυπωτή (χωρίς να ανοίξετε το έγγραφο με μια εφαρμογή).
-MenuDirectPrinting=Direct Printing
-DirectPrint=Direct print
+MenuDirectPrinting=Direct Printing jobs
+DirectPrint=Απευθείας εκτύπωση
 ModuleDriverSetup=Ρύθμιση Module οδήγησης
 PrintingDriverDesc=Διαμόρφωση μεταβλητών για τον οδηγό εκτύπωσης.
 ListDrivers=Λίστα οδηγών
@@ -18,6 +18,13 @@ TestDriver=Test
 TargetedPrinter=Στοχευμένη εκτύπωση
 UserConf=Ρύθμισης ανά χρήστη
 PRINTGCP=Google Cloud Print
+PRINTGCP_INFO=Google OAuth API setup
+PRINTGCP_AUTHLINK=Authentication
+PRINTGCP_TOKEN_ACCESS=Google Cloud Print OAuth Token
+PRINTGCP_TOKEN_REFRESH=Token Refresh Present
+PRINTGCP_TOKEN_EXPIRED=Token Expired
+PRINTGCP_TOKEN_EXPIRE_AT=Token expire at
+PRINTGCP_DELETE_TOKEN=Delete saved token
 PrintGCPDesc=Αυτό το πρόγραμμα οδήγησης επιτρέπει να στείλετε έγγραφα απευθείας σε έναν εκτυπωτή του Google Cloud Print.
 PrintingDriverDescprintgcp=Διαμόρφωση των μεταβλητών για τον οδηγό εκτύπωσης του Google Cloud Print.
 PrintTestDescprintgcp=Λίστα εκτυπωτών στο Google Cloud Print.
@@ -74,3 +81,6 @@ STATE_IPP_none=Καμία
 MEDIA_IPP_stationery=Γραφική ύλη
 MEDIA_IPP_thermal=Θερμικός
 IPP_COLOR_print-black=Ασπρόμαυρος Εκτυπωτής
+DirectPrintingJobsDesc=This page lists printing jobs found for available printers.
+GoogleAuthNotConfigured=Google OAuth setup not done. Enable module OAuth and set a Google ID/Secret.
+GoogleAuthConfigured=Google OAuth credentials found into setup of module OAuth.
diff --git a/htdocs/langs/el_GR/products.lang b/htdocs/langs/el_GR/products.lang
index d3fc0fa6ed7..b71e9454375 100644
--- a/htdocs/langs/el_GR/products.lang
+++ b/htdocs/langs/el_GR/products.lang
@@ -45,10 +45,6 @@ LastProducts=Τελευταία Προϊόντα
 CardProduct0=Κάρτα Προϊόντος
 CardProduct1=Κάρτα Υπηρεσίας
 CardContract=Κάρτα Επαφής
-Warehouse=Αποθήκη
-Warehouses=Αποθήκες
-WarehouseOpened=Αποθήκη ανοιχτή
-WarehouseClosed=Η αποθήκη έκλεισε
 Stock=Απόθεμα
 Stocks=Αποθέματα
 Movement=Κίνηση
@@ -298,7 +294,7 @@ DynamicPriceConfiguration=Dynamic price configuration
 DynamicPriceDesc=On product card, with this module enabled, you should be able to set mathematic functions to calculate Customer or Supplier prices. Such function can use all mathematic operators, some constants and variables. You can set here the variables you want to be able and if the variable need an automatic update, the external URL to use to ask Dolibarr to update automaticaly the value.
 AddVariable=Add Variable
 AddUpdater=Add Updater
-GlobalVariables=Global variables
+GlobalVariables=Καθολικές μεταβλητές
 VariableToUpdate=Variable to update
 GlobalVariableUpdaters=Global variable updaters
 GlobalVariableUpdaterType0=JSON data
@@ -308,7 +304,7 @@ GlobalVariableUpdaterType1=WebService data
 GlobalVariableUpdaterHelp1=Parses WebService data from specified URL, NS specifies the namespace, VALUE specifies the location of relevant value, DATA should contain the data to send and METHOD is the calling WS method
 GlobalVariableUpdaterHelpFormat1=format is {"URL": "http://example.com/urlofws", "VALUE": "array,targetvalue", "NS": "http://example.com/urlofns", "METHOD": "myWSMethod", "DATA": {"your": "data, "to": "send"}}
 UpdateInterval=Update interval (minutes)
-LastUpdated=Last updated
+LastUpdated=Τελευταία ενημέρωση
 CorrectlyUpdated=Correctly updated
 PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
 PropalMergePdfProductChooseFile=Select PDF files
@@ -318,3 +314,11 @@ WarningSelectOneDocument=Please select at least one document
 DefaultUnitToShow=Μονάδα
 NbOfQtyInProposals=Qty in proposals
 ClinkOnALinkOfColumn=Click on a link of column %s to get a detailed view...
+TranslatedLabel=Translated label
+TranslatedDescription=Translated description
+TranslatedNote=Μεταφρασμένες σημειώσεις
+ProductWeight=Weight for 1 product
+ProductVolume=Volume for 1 product
+WeightUnits=Μονάδα βάρους
+VolumeUnits=Volume unit
+SizeUnits=Μονάδα μεγέθους
diff --git a/htdocs/langs/el_GR/projects.lang b/htdocs/langs/el_GR/projects.lang
index 84427b795f2..ca94f30c54e 100644
--- a/htdocs/langs/el_GR/projects.lang
+++ b/htdocs/langs/el_GR/projects.lang
@@ -74,6 +74,9 @@ Progress=Πρόοδος
 ProgressDeclared=Χαρακτηρίστηκε σε εξέλιξη
 ProgressCalculated=Υπολογιζόμενη πρόοδος
 Time=Χρόνος
+ListOfTasks=List of tasks
+GoToListOfTimeConsumed=Go to list of time consumed
+GoToListOfTasks=Go to list of tasks
 ListProposalsAssociatedProject=Κατάλογος των εμπορικών προτάσεων που σχετίζονται με το έργο
 ListOrdersAssociatedProject=Κατάλογος των ενταλμάτων του πελάτη που σχετίζονται με το έργο
 ListInvoicesAssociatedProject=Κατάλογος των τιμολογίων των πελατών που συνδέονται με το έργο
@@ -171,9 +174,9 @@ TasksWithThisUserAsContact=Tasks assigned to this user
 ResourceNotAssignedToProject=Not assigned to project
 ResourceNotAssignedToTask=Not assigned to task
 ResourceNotAssignedToTheTask=Not assigned to the task
-AssignTaskToMe=Assign task to me
-AssignTask=Assign
-ProjectOverview=Overview
+AssignTaskToMe=Ανάθεση εργασίας σε εμένα
+AssignTask=Ανάθεση
+ProjectOverview=Επισκόπηση
 ManageTasks=Use projects to follow tasks and time
 ManageOpportunitiesStatus=Use projects to follow leads/opportinuties
 ProjectNbProjectByMonth=Nb of created projects by month
@@ -198,3 +201,4 @@ OppStatusNEGO=Negociation
 OppStatusPENDING=Pending
 OppStatusWIN=Won
 OppStatusLOST=Lost
+Budget=Budget
diff --git a/htdocs/langs/el_GR/propal.lang b/htdocs/langs/el_GR/propal.lang
index 3832a39b38f..1ce8990a2ee 100644
--- a/htdocs/langs/el_GR/propal.lang
+++ b/htdocs/langs/el_GR/propal.lang
@@ -32,7 +32,7 @@ AmountOfProposalsByMonthHT=Ποσό ανά μήνα (μετά από φόρου
 NbOfProposals=Αριθμός Προσφορών
 ShowPropal=Εμφάνιση Προσφοράς
 PropalsDraft=Σχέδιο
-PropalsOpened=Open
+PropalsOpened=Άνοιγμα
 PropalsNotBilled=Κλειστή δεν τιμολογείται
 PropalStatusDraft=Προσχέδιο (χρειάζεται επικύρωση)
 PropalStatusValidated=Επικυρωμένη (η Προσφορά είναι ανοιχτή)
@@ -43,7 +43,7 @@ PropalStatusNotSigned=Δεν έχει υπογραφεί (κλειστό)
 PropalStatusBilled=Χρεώνεται
 PropalStatusDraftShort=Προσχέδιο
 PropalStatusValidatedShort=Επικυρώθηκε
-PropalStatusOpenedShort=Open
+PropalStatusOpenedShort=Άνοιγμα
 PropalStatusClosedShort=Κλειστό
 PropalStatusSignedShort=Υπογραφή
 PropalStatusNotSignedShort=Δεν έχει υπογραφεί
diff --git a/htdocs/langs/el_GR/receiptprinter.lang b/htdocs/langs/el_GR/receiptprinter.lang
index 7b52f072eaf..855bf4b7d86 100644
--- a/htdocs/langs/el_GR/receiptprinter.lang
+++ b/htdocs/langs/el_GR/receiptprinter.lang
@@ -12,10 +12,10 @@ ReceiptPrinterProfileDesc=Description of Receipt Printer's Profile
 ListPrinters=List of Printers
 SetupReceiptTemplate=Template Setup
 CONNECTOR_DUMMY=Dummy Printer
-CONNECTOR_NETWORK_PRINT=Network Printer
-CONNECTOR_FILE_PRINT=Local Printer
-CONNECTOR_WINDOWS_PRINT=Local Windows Printer
-CONNECTOR_DUMMY_HELP=Fake Printer for test, does nothing
+CONNECTOR_NETWORK_PRINT=Δικτυακός εκτυπωτής
+CONNECTOR_FILE_PRINT=Τοπικός εκτυπωτής
+CONNECTOR_WINDOWS_PRINT=Τοπικός εκτυπωτής Windows
+CONNECTOR_DUMMY_HELP=Εικονικός εκτυπωτής για ελέγχους, δεν κάνει τίποτα
 CONNECTOR_NETWORK_PRINT_HELP=10.x.x.x:9100
 CONNECTOR_FILE_PRINT_HELP=/dev/usb/lp0, /dev/usb/lp1
 CONNECTOR_WINDOWS_PRINT_HELP=LPT1, COM1, smb://FooUser:secret@computername/workgroup/Receipt Printer
@@ -29,44 +29,44 @@ PROFILE_SIMPLE_HELP=Simple Profile No Graphics
 PROFILE_EPOSTEP_HELP=Epos Tep Profile Help
 PROFILE_P822D_HELP=P822D Profile No Graphics
 PROFILE_STAR_HELP=Star Profile
-DOL_ALIGN_LEFT=Left align text
-DOL_ALIGN_CENTER=Center text
-DOL_ALIGN_RIGHT=Right align text
-DOL_USE_FONT_A=Use font A of printer
-DOL_USE_FONT_B=Use font B of printer
-DOL_USE_FONT_C=Use font C of printer
-DOL_BOLD=Text Bold
-/DOL_BOLD=End of Text Bold
-DOL_DOUBLE_HEIGHT=Text double height
-/DOL_DOUBLE_HEIGHT=End of Text double height
-DOL_DOUBLE_WIDTH=Text double width
-/DOL_DOUBLE_WIDTH=End of Text double width
-DOL_UNDERLINE=Underline text
-/DOL_UNDERLINE=End of Underline text
-DOL_UNDERLINE_2DOTS=Underline with double line
-/DOL_UNDERLINE_2DOTS=End of Underline with double line
+DOL_ALIGN_LEFT=Αριστερή στοίχιση κειμένου
+DOL_ALIGN_CENTER=Στοίχιση κειμένου στο κέντρο
+DOL_ALIGN_RIGHT=Στοίχιση κειμένου δεξιά
+DOL_USE_FONT_A=Χρησιμοποίηση γραμματοσειράς Α στον εκτυπωτή
+DOL_USE_FONT_B=Χρησιμοποίηση γραμματοσειράς Β στον εκτυπωτή
+DOL_USE_FONT_C=Χρησιμοποίηση γραμματοσειράς Γ στον εκτυπωτή
+DOL_BOLD=Έντονο κείμενο
+/DOL_BOLD=Τέλος έντονου κειμένου
+DOL_DOUBLE_HEIGHT=Κείμενο με διπλάσιο ύψος
+/DOL_DOUBLE_HEIGHT=Τέλος κειμένου με διπλάσιο ύψος
+DOL_DOUBLE_WIDTH=Κείμενο με διπλάσιο πλάτος
+/DOL_DOUBLE_WIDTH=Τέλος κειμένου με διπλάσιο πλάτος
+DOL_UNDERLINE=Υπογραμμισμένο κείμενο
+/DOL_UNDERLINE=Τέλος υπογραμμισμένου κειμένου
+DOL_UNDERLINE_2DOTS=διπλή υπογράμμιση
+/DOL_UNDERLINE_2DOTS=Τέλος διπλής υπογράμισης
 DOL_EMPHASIZED=Emphasized text
 /DOL_EMPHASIZED=End of Emphasized text
 DOL_SWITCH_COLORS=Print in white on black
 /DOL_SWITCH_COLORS=End of Print in white on black
-DOL_PRINT_BARCODE=Print barcode
+DOL_PRINT_BARCODE=Εκτύπωση barcode
 DOL_PRINT_BARCODE_CUSTOMER_ID=Print barcode customer id
 DOL_SET_PRINT_WIDTH_57=Ticket print width of 57mm
 DOL_CUT_PAPER_FULL=Cut ticket completely
 DOL_CUT_PAPER_PARTIAL=Cut ticket partially
 DOL_OPEN_DRAWER=Open cash drawer
 DOL_ACTIVATE_BUZZER=Activate buzzer
-DOL_PRINT_QRCODE=Print QR Code
+DOL_PRINT_QRCODE=Εκτύπωση QR 
 DOL_PRINT_DATE=Print date AAAA-MM-DD
 DOL_PRINT_DATE_TIME=Print date and time AAAA-MM-DD HH:MM:SS
-DOL_PRINT_YEAR=Print Year
-DOL_PRINT_MONTH_LETTERS=Print month in letters (example : november)
-DOL_PRINT_MONTH=Print month number
-DOL_PRINT_DAY=Print day number
-DOL_PRINT_DAY_LETTERS=Print day number
+DOL_PRINT_YEAR=Εκτύπωση έτους
+DOL_PRINT_MONTH_LETTERS=Εκτύπωση μήνα ολογράφως (πχ Νοέμβριος)
+DOL_PRINT_MONTH=Εκτύπωση αριθμού μήνα
+DOL_PRINT_DAY=Εκτύπωση αριθμού ημέρας
+DOL_PRINT_DAY_LETTERS=Εκτύπωση αριθμού ημέρας
 DOL_PRINT_TABLE=Print table number (for restaurant, bar...)
 DOL_PRINT_CUTLERY=Print number of cutlery (for restaurant)
-DOL_PRINT_PAYMENT=Print payment method
+DOL_PRINT_PAYMENT=Εκτύπωση τρόπου πληρωμής
 DOL_PRINT_LOGO=Print logo stored on printer. Example : 32|32
 DOL_PRINT_LOGO_OLD=Print logo stored on printer. Must be followed by logo code. For old printers.
 DOL_PRINT_ORDER_LINES=Print order lines
diff --git a/htdocs/langs/el_GR/sendings.lang b/htdocs/langs/el_GR/sendings.lang
index 48ae66d0ece..58d267e3a60 100644
--- a/htdocs/langs/el_GR/sendings.lang
+++ b/htdocs/langs/el_GR/sendings.lang
@@ -5,7 +5,7 @@ Sendings=Αποστολές
 AllSendings=Όλες οι αποστολές
 Shipment=Αποστολή
 Shipments=Αποστολές
-ShowSending=Show Shipments
+ShowSending=Εμφάνιση μεταφορικών
 Receivings=Delivery Receipts
 SendingsArea=Περιοχή αποστολών 
 ListOfSendings=Κατάλογος των αποστολών
@@ -26,8 +26,8 @@ QtyToShip=Ποσότητα προς αποστολή
 QtyReceived=Ποσότητα παραλαβής
 KeepToShip=Αναμένει για αποστολή
 OtherSendingsForSameOrder=Άλλες αποστολές για αυτό το σκοπό
-DateSending=Shipping date
-DateSendingShort=Shipping date
+DateSending=Ημερομηνία αποστολής
+DateSendingShort=Ημερομηνία αποστολής
 SendingsForSameOrder=Αποστολές για αυτό το σκοπό
 SendingsAndReceivingForSameOrder=Αποστολές και παραλαβές για αυτό το σκοπό
 SendingsToValidate=Αποστολές για επικύρωση
@@ -53,7 +53,7 @@ DocumentModelSimple=Απλό μοντέλο έγγραφο
 DocumentModelMerou=Mérou A5 μοντέλο
 WarningNoQtyLeftToSend=Προσοχή, δεν υπάρχουν είδη που περιμένουν να σταλούν.
 StatsOnShipmentsOnlyValidated=Στατιστικά στοιχεία σχετικά με τις μεταφορές που πραγματοποιούνται μόνο επικυρωμένες. Χρησιμοποιείστε Ημερομηνία είναι η ημερομηνία της επικύρωσης της αποστολής (προγραμματισμένη ημερομηνία παράδοσης δεν είναι πάντα γνωστή).
-DateDeliveryPlanned=Planned date of delivery
+DateDeliveryPlanned=Προγραμματισμένη ημερομηνία παράδοσης
 DateReceived=Παράδοση Ημερομηνία παραλαβής
 SendShippingByEMail=Στείλτε αποστολή με e-mail
 SendShippingRef=Υποβολή της αποστολής %s
@@ -70,6 +70,8 @@ ProductQtyInSuppliersOrdersRunning=Ποσότητα προϊόντων σε αν
 ProductQtyInShipmentAlreadySent=Product quantity from opened customer order already sent
 ProductQtyInSuppliersShipmentAlreadyRecevied=Ποσότητα προϊόντων από ανοιγμένες παραγγελίες του προμηθευτή που έχουν ήδη ληφθεί
 NoProductToShipFoundIntoStock=No product to ship found into warehouse <b>%s</b>. Correct stock or go back to choose another warehouse.
+WeightVolShort=Weight/Vol.
+ValidateOrderFirstBeforeShipment=You must first validate the order before being able to make shipments.
 
 # Sending methods
 SendingMethodCATCH=Πιάσε τον πελάτη
diff --git a/htdocs/langs/el_GR/stocks.lang b/htdocs/langs/el_GR/stocks.lang
index 176f679d3f2..6645e9c11a6 100644
--- a/htdocs/langs/el_GR/stocks.lang
+++ b/htdocs/langs/el_GR/stocks.lang
@@ -97,7 +97,7 @@ SelectWarehouseForStockIncrease=Επιλέξτε αποθήκη που θα χρ
 NoStockAction=No stock action
 LastWaitingSupplierOrders=Orders waiting for receptions
 DesiredStock=Desired minimum stock
-DesiredMaxStock=Desired maximum stock
+DesiredMaxStock=Επιθυμητό μέγιστο απόθεμα
 StockToBuy=Για να παραγγείλετε
 Replenishment=Αναπλήρωση
 ReplenishmentOrders=Αναπλήρωση παραγγελίων
diff --git a/htdocs/langs/el_GR/supplier_proposal.lang b/htdocs/langs/el_GR/supplier_proposal.lang
index 1a1bdc4df16..68576040f44 100644
--- a/htdocs/langs/el_GR/supplier_proposal.lang
+++ b/htdocs/langs/el_GR/supplier_proposal.lang
@@ -2,7 +2,7 @@
 SupplierProposal=Supplier commercial proposals
 supplier_proposalDESC=Manage price requests to suppliers
 SupplierProposalShort=Supplier proposals
-SupplierProposalNew=New request
+SupplierProposalNew=Νέο αίτημα
 CommRequest=Price request
 CommRequests=Price requests
 SearchRequest=Find a request
@@ -14,7 +14,7 @@ SupplierProposalArea=Supplier proposals area
 SupplierProposalShort=Supplier proposals
 SupplierProposals=Supplier proposals
 NewAskPrice=New price request
-NewAsk=New request
+NewAsk=Νέο αίτημα
 ShowSupplierProposal=Show price request
 AddSupplierProposal=Create a price request
 SupplierProposalRefFourn=Supplier ref
@@ -26,19 +26,19 @@ DateAsk=Date of request
 DeleteAsk=Delete request
 ValidateAsk=Validate request
 AddAsk=Create a request
-SupplierProposalDraft=Drafts
-SupplierProposalOpened=Open
-SupplierProposalStatusDraft=Draft (needs to be validated)
+SupplierProposalDraft=Πρόχειρα
+SupplierProposalOpened=Άνοιγμα
+SupplierProposalStatusDraft=Πρόχειρο (Χρειάζεται επικύρωση)
 SupplierProposalStatusValidated=Validated (request is open)
 SupplierProposalStatusOpened=Validated (request is open)
-SupplierProposalStatusClosed=Closed
+SupplierProposalStatusClosed=Κλειστό
 SupplierProposalStatusSigned=Accepted
 SupplierProposalStatusNotSigned=Refused
 SupplierProposalStatusBilled=Billed
 SupplierProposalStatusDraftShort=Draft
 SupplierProposalStatusValidatedShort=Validated
-SupplierProposalStatusOpenedShort=Open
-SupplierProposalStatusClosedShort=Closed
+SupplierProposalStatusOpenedShort=Άνοιγμα
+SupplierProposalStatusClosedShort=Κλειστό
 SupplierProposalStatusSignedShort=Accepted
 SupplierProposalStatusNotSignedShort=Refused
 SupplierProposalStatusBilledShort=Billed
@@ -58,3 +58,5 @@ DefaultModelSupplierProposalCreate=Default model creation
 DefaultModelSupplierProposalToBill=Default template when closing a price request (accepted)
 DefaultModelSupplierProposalClosed=Default template when closing a price request (refused)
 ListOfSupplierProposal=List of supplier proposal requests
+SupplierProposalsToClose=Supplier proposals to close
+SupplierProposalsToProcess=Supplier proposals to process
diff --git a/htdocs/langs/el_GR/trips.lang b/htdocs/langs/el_GR/trips.lang
index bf51ac41832..c8f2c4247d3 100644
--- a/htdocs/langs/el_GR/trips.lang
+++ b/htdocs/langs/el_GR/trips.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - trips
 ExpenseReport=Expense report
-ExpenseReports=Expense reports
+ExpenseReports=Αναφορές εξόδων
 Trip=Αναφορά εξόδων
 Trips=Αναφορές εξόδων
 TripsAndExpenses=Αναφορές εξόδων
@@ -25,8 +25,8 @@ ExpenseReportWaitingForApproval=A new expense report has been submitted for appr
 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
+TripSociete=Πληροφορίες εταιρίας
+TripSalarie=Πληροφορίες χρήστη
 TripNDF=Informations expense report
 PDFStandardExpenseReports=Standard template to generate a PDF document for expense report
 ExpenseReportLine=Expense report line
@@ -34,12 +34,12 @@ TF_OTHER=Άλλο
 TF_TRIP=Transportation
 TF_LUNCH=Γεύμα
 TF_METRO=Metro
-TF_TRAIN=Train
-TF_BUS=Bus
+TF_TRAIN=Τρένο
+TF_BUS=Λεωφορείο
 TF_CAR=Όχημα
 TF_PEAGE=Διόδια
 TF_ESSENCE=Καύσιμα
-TF_HOTEL=Hotel
+TF_HOTEL=Ξενοδοχείο
 TF_TAXI=Taxi
 
 ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
@@ -59,8 +59,8 @@ AUTHORPAIEMENT=Paid by
 REFUSEUR=Denied by
 CANCEL_USER=Deleted by
 
-MOTIF_REFUS=Reason
-MOTIF_CANCEL=Reason
+MOTIF_REFUS=Αιτία
+MOTIF_CANCEL=Αιτία
 
 DATE_REFUS=Deny date
 DATE_SAVE=Validation date
@@ -73,7 +73,7 @@ BROUILLONNER=Reopen
 SendToValid=Sent on approval
 ModifyInfoGen=Edit
 ValidateAndSubmit=Validate and submit for approval
-ValidatedWaitingApproval=Validated (waiting for approval)
+ValidatedWaitingApproval=Επικύρωση (αναμονή για έγκριση)
 
 NOT_VALIDATOR=You are not allowed to approve this expense report
 NOT_AUTHOR=You are not the author of this expense report. Operation cancelled.
@@ -88,7 +88,7 @@ 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 ?
+ConfirmCancelTrip=Είστε σίγουροι ότι θέλετε να ακυρώσετε αυτή την αναφορά εξόδων
 
 BrouillonnerTrip=Move back expense report to status "Draft"
 ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ?
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 814279635e8..536e8a3c771 100755
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -588,6 +588,7 @@ Permission38=Export products
 Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
 Permission42=Create/modify projects (shared project and projects i'm contact for)
 Permission44=Delete projects (shared project and projects i'm contact for)
+Permission45=Export projects
 Permission61=Read interventions
 Permission62=Create/modify interventions
 Permission64=Delete interventions
@@ -641,6 +642,7 @@ Permission162=Create/modify contracts/subscriptions
 Permission163=Activate a service/subscription of a contract
 Permission164=Disable a service/subscription of a contract
 Permission165=Delete contracts/subscriptions
+Permission167=Export contracts
 Permission171=Read trips and expenses (yours and your subordinates) 
 Permission172=Create/modify trips and expenses
 Permission173=Delete trips and expenses
@@ -789,6 +791,7 @@ Permission2403=Delete actions (events or tasks) linked to his account
 Permission2411=Read actions (events or tasks) of others
 Permission2412=Create/modify actions (events or tasks) of others
 Permission2413=Delete actions (events or tasks) of others
+Permission2414=Export actions/tasks of others
 Permission2501=Read/Download documents
 Permission2502=Download documents
 Permission2503=Submit or delete documents
@@ -1713,4 +1716,5 @@ ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version
 ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s is available. Version %s is a maintenance version, so it contains only fixes of bugs. We recommend everybody using an older version to upgrade to this one. As any maintenance release, no new features, nor data structure change is present into this version. You can download it from the download area of http://www.dolibarr.org portal (subdirectory Stable versions). You can read <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> for complete list of changes.
 MultiPriceRuleDesc=When option "Several level of prices per product/service" is on, you can define different prices (one per price level) for each product. To save you time, you can enter here rule to have price for each level autocalculated according to price of first level, so you will have to enter only price for first level on each product. This page is here to save you time and can be usefull only if your prices for each leve are relative to first level. You can ignore this page in most cases.
 ModelModulesProduct=Templates for product documents
-ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
\ No newline at end of file
+ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
+SeeSubstitutionVars=See * note for list of possible substitution variables
\ No newline at end of file
diff --git a/htdocs/langs/en_US/compta.lang b/htdocs/langs/en_US/compta.lang
index 964a7c30678..8f8b8dfe8e3 100644
--- a/htdocs/langs/en_US/compta.lang
+++ b/htdocs/langs/en_US/compta.lang
@@ -198,7 +198,7 @@ InvoiceDispatched=Dispatched invoices
 AccountancyDashboard=Accountancy summary
 ByProductsAndServices=By products and services
 RefExt=External ref
-ToCreateAPredefinedInvoice=To create a predefined invoice, create a standard invoice then, without validating it, click onto button "Convert to predefined invoice".
+ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click onto button "%s".
 LinkedOrder=Link to order
 Mode1=Method 1
 Mode2=Method 2
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index e5f7e54e191..36aa814dc57 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -25,6 +25,7 @@ FormatDateHourTextShort=%b %d, %Y, %I:%M %p
 FormatDateHourText=%B %d, %Y, %I:%M %p
 DatabaseConnection=Database connection
 NoTemplateDefined=No template defined for this email type
+AvailableVariables=Available substitution variables
 NoTranslation=No translation
 NoRecordFound=No record found
 NoError=No error
@@ -742,6 +743,9 @@ DeleteLine=Delete line
 ConfirmDeleteLine=Are you sure you want to delete this line ?
 NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked records
 TooManyRecordForMassAction=Too many records selected for mass action. Such action are restriced to a list of %s records.
+MassFilesArea=Area for files built by mass actions
+HideTempMassFilesArea=Hide area of files built by mass actions
+ShowTempMassFilesArea=Show area of files built by mass actions
 # Week day
 Monday=Monday
 Tuesday=Tuesday
diff --git a/htdocs/langs/en_US/other.lang b/htdocs/langs/en_US/other.lang
index 5ead485f23a..eb9628aa4c0 100644
--- a/htdocs/langs/en_US/other.lang
+++ b/htdocs/langs/en_US/other.lang
@@ -203,6 +203,7 @@ YouMustClickToChange=You must however first click on the following link to valid
 ForgetIfNothing=If you didn't request this change, just forget this email. Your credentials are kept safe.
 IfAmountHigherThan=If amount higher than <strong>%s</strong>
 SourcesRepository=Repository for sources
+Chart=Chart
 
 ##### Calendar common #####
 AddCalendarEntry=Add entry in calendar %s
diff --git a/htdocs/langs/en_US/projects.lang b/htdocs/langs/en_US/projects.lang
index 168d47bd60b..607b28d9f06 100644
--- a/htdocs/langs/en_US/projects.lang
+++ b/htdocs/langs/en_US/projects.lang
@@ -80,7 +80,7 @@ GoToListOfTasks=Go to list of tasks
 ListProposalsAssociatedProject=List of the commercial proposals associated with the project
 ListOrdersAssociatedProject=List of customer's orders associated with the project
 ListInvoicesAssociatedProject=List of customer's invoices associated with the project
-ListPredefinedInvoicesAssociatedProject=List of customer's predefined invoices associated with project
+ListPredefinedInvoicesAssociatedProject=List of customer's template invoices associated with project
 ListSupplierOrdersAssociatedProject=List of supplier's orders associated with the project
 ListSupplierInvoicesAssociatedProject=List of supplier's invoices associated with the project
 ListContractAssociatedProject=List of contracts associated with the project
diff --git a/htdocs/langs/en_US/supplier_proposal.lang b/htdocs/langs/en_US/supplier_proposal.lang
index 69f765391ff..3d12ad57612 100644
--- a/htdocs/langs/en_US/supplier_proposal.lang
+++ b/htdocs/langs/en_US/supplier_proposal.lang
@@ -58,3 +58,5 @@ DefaultModelSupplierProposalCreate=Default model creation
 DefaultModelSupplierProposalToBill=Default template when closing a price request (accepted)
 DefaultModelSupplierProposalClosed=Default template when closing a price request (refused)
 ListOfSupplierProposal=List of supplier proposal requests
+SupplierProposalsToClose=Supplier proposals to close
+SupplierProposalsToProcess=Supplier proposals to process
\ No newline at end of file
diff --git a/htdocs/langs/es_AR/admin.lang b/htdocs/langs/es_AR/admin.lang
index 1c53b65c99c..61b7d006abf 100644
--- a/htdocs/langs/es_AR/admin.lang
+++ b/htdocs/langs/es_AR/admin.lang
@@ -2,3 +2,4 @@
 AntiVirusCommandExample=Example for ClamWin: c:\\Progra~1\\ClamWin\\bin\\clamscan.exe<br>Example for ClamAv: /usr/bin/clamscan
 AntiVirusParamExample=Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
 ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
+TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
diff --git a/htdocs/langs/es_AR/cron.lang b/htdocs/langs/es_AR/cron.lang
new file mode 100644
index 00000000000..d8953584e61
--- /dev/null
+++ b/htdocs/langs/es_AR/cron.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - cron
+CronDtLastLaunch=Start date of last execution
+CronDtLastResult=End date of last execution
diff --git a/htdocs/langs/es_AR/projects.lang b/htdocs/langs/es_AR/projects.lang
index 3a53dd52c2d..1aaa958bd19 100644
--- a/htdocs/langs/es_AR/projects.lang
+++ b/htdocs/langs/es_AR/projects.lang
@@ -1,2 +1,3 @@
 # Dolibarr language file - Source file is en_US - projects
+ProjectsArea=Projects Area
 OpportunityPonderatedAmountDesc=Opportunities amount weighted with probability
diff --git a/htdocs/langs/es_BO/admin.lang b/htdocs/langs/es_BO/admin.lang
index 1c53b65c99c..61b7d006abf 100644
--- a/htdocs/langs/es_BO/admin.lang
+++ b/htdocs/langs/es_BO/admin.lang
@@ -2,3 +2,4 @@
 AntiVirusCommandExample=Example for ClamWin: c:\\Progra~1\\ClamWin\\bin\\clamscan.exe<br>Example for ClamAv: /usr/bin/clamscan
 AntiVirusParamExample=Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
 ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
+TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
diff --git a/htdocs/langs/es_BO/cron.lang b/htdocs/langs/es_BO/cron.lang
new file mode 100644
index 00000000000..d8953584e61
--- /dev/null
+++ b/htdocs/langs/es_BO/cron.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - cron
+CronDtLastLaunch=Start date of last execution
+CronDtLastResult=End date of last execution
diff --git a/htdocs/langs/es_BO/projects.lang b/htdocs/langs/es_BO/projects.lang
index 3a53dd52c2d..1aaa958bd19 100644
--- a/htdocs/langs/es_BO/projects.lang
+++ b/htdocs/langs/es_BO/projects.lang
@@ -1,2 +1,3 @@
 # Dolibarr language file - Source file is en_US - projects
+ProjectsArea=Projects Area
 OpportunityPonderatedAmountDesc=Opportunities amount weighted with probability
diff --git a/htdocs/langs/es_CL/admin.lang b/htdocs/langs/es_CL/admin.lang
index 29043c1f828..6b4e390567f 100644
--- a/htdocs/langs/es_CL/admin.lang
+++ b/htdocs/langs/es_CL/admin.lang
@@ -17,6 +17,7 @@ DictionaryAccountancyplan=Gráfico de cuentas
 VATIsUsedDesc=El tipo de IVA propuesto por defecto en las creaciones de cotizaciones, facturas, pedidos, etc. Responde a la siguiente regla:<br>Si el vendedor no está sujeto a IVA, IVA por defecto=0. Final de regla.<br>Si el país del vendedor= país del comprador entonces IVA por defecto=IVA del producto vendido. Final de regla.<br>Si vendedor y comprador residen en la Comunidad Europea y el bien vendido= nuevo medio de transportes (auto, barco, avión), IVA por defecto=0 (el IVA debe ser pagado por comprador a la hacienda pública de su país y no al vendedor). Final de regla<br>Si vendedor y comprador residen en la Comunidad Europea y comprador= particular o empresa sin NIF intracomunitario entonces IVA por defecto=IVA del producto vendido. Final de regla.<br>Si vendedor y comprador residen en la Comunidad Europea y comprador= empresa con NIF intracomunitario entonces IVA por defecto=0. Final de regla.<br>Si no, IVA propuesto por defecto=0. Final de regla.<br>
 Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Tolerancia de retraso antes de la alerta (en días) sobre cotizaciones a cerrar
 Delays_MAIN_DELAY_PROPALS_TO_BILL=Tolerancia de retraso antes de la alerta (en días) sobre cotizaciones no facturadas
+TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
 WebCalAddEventOnStatusPropal=Añadir evento en el calendario en el cambio de estado de las cotizaciones
 PropalSetup=Configuración del módulo Cotizaciones
 ProposalsNumberingModules=Módulos de numeración de cotizaciones
diff --git a/htdocs/langs/es_CL/cron.lang b/htdocs/langs/es_CL/cron.lang
new file mode 100644
index 00000000000..d8953584e61
--- /dev/null
+++ b/htdocs/langs/es_CL/cron.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - cron
+CronDtLastLaunch=Start date of last execution
+CronDtLastResult=End date of last execution
diff --git a/htdocs/langs/es_CL/projects.lang b/htdocs/langs/es_CL/projects.lang
index 64918dbdbae..5b20381c927 100644
--- a/htdocs/langs/es_CL/projects.lang
+++ b/htdocs/langs/es_CL/projects.lang
@@ -1,3 +1,4 @@
 # Dolibarr language file - Source file is en_US - projects
+ProjectsArea=Projects Area
 ListProposalsAssociatedProject=Listado de cotizaciones asociadas al proyecto
 OpportunityPonderatedAmountDesc=Opportunities amount weighted with probability
diff --git a/htdocs/langs/es_CO/admin.lang b/htdocs/langs/es_CO/admin.lang
index 1c53b65c99c..61b7d006abf 100644
--- a/htdocs/langs/es_CO/admin.lang
+++ b/htdocs/langs/es_CO/admin.lang
@@ -2,3 +2,4 @@
 AntiVirusCommandExample=Example for ClamWin: c:\\Progra~1\\ClamWin\\bin\\clamscan.exe<br>Example for ClamAv: /usr/bin/clamscan
 AntiVirusParamExample=Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
 ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
+TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
diff --git a/htdocs/langs/es_CO/companies.lang b/htdocs/langs/es_CO/companies.lang
index 991d9bdc7a9..e4fceb69d98 100644
--- a/htdocs/langs/es_CO/companies.lang
+++ b/htdocs/langs/es_CO/companies.lang
@@ -16,6 +16,8 @@ ProfId3CO=CIIU
 VATIntra=NIT
 VATIntraShort=NIT
 VATIntraVeryShort=NIT
+CompanyHasAbsoluteDiscount=Este cliente tiene <b>%s %s</b> descuentos disponibles (descuentos, anticipos...)
+CompanyHasCreditNote=Este cliente tiene <b>%s %s</b> anticipos disponibles
 NoContactForAnyProposal=Este contacto no es contacto de ningúna cotización
 VATIntraCheckDesc=El link <b>%s</b> permite consultar al servicio RUES el NIT. Se requiere acceso a internet para que el servicio funcione
 VATIntraCheckURL=http://www.rues.org.co/RUES_Web/Consultas#tabs-3
diff --git a/htdocs/langs/es_CO/cron.lang b/htdocs/langs/es_CO/cron.lang
new file mode 100644
index 00000000000..d8953584e61
--- /dev/null
+++ b/htdocs/langs/es_CO/cron.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - cron
+CronDtLastLaunch=Start date of last execution
+CronDtLastResult=End date of last execution
diff --git a/htdocs/langs/es_CO/main.lang b/htdocs/langs/es_CO/main.lang
index 2255088affa..7f72d1b1ba5 100644
--- a/htdocs/langs/es_CO/main.lang
+++ b/htdocs/langs/es_CO/main.lang
@@ -35,6 +35,7 @@ UseLocalTax=Incluir impuestos
 CommercialProposalsShort=Cotizaciones
 RequestAlreadyDone=La solicitud ya ha sido procesada
 December=diciembre
+FindBug=Señalar un bug
 NbOfReferers=Número de remitentes
 Currency=Moneda
 SelectElementAndClickRefresh=Seleccione un elemento y haga clic en Actualizar
diff --git a/htdocs/langs/es_CO/projects.lang b/htdocs/langs/es_CO/projects.lang
index 3a53dd52c2d..1aaa958bd19 100644
--- a/htdocs/langs/es_CO/projects.lang
+++ b/htdocs/langs/es_CO/projects.lang
@@ -1,2 +1,3 @@
 # Dolibarr language file - Source file is en_US - projects
+ProjectsArea=Projects Area
 OpportunityPonderatedAmountDesc=Opportunities amount weighted with probability
diff --git a/htdocs/langs/es_DO/admin.lang b/htdocs/langs/es_DO/admin.lang
index 6e4943b17e7..7e4622992da 100644
--- a/htdocs/langs/es_DO/admin.lang
+++ b/htdocs/langs/es_DO/admin.lang
@@ -18,6 +18,7 @@ LocalTax1IsUsedDesc=Uso de un 2º tipo de impuesto (Distinto del ITBIS)
 LocalTax1IsNotUsedDesc=No usar un 2º tipo de impuesto (Distinto del ITBIS)
 UnitPriceOfProduct=Precio unitario sin ITBIS de un producto
 ShowVATIntaInAddress=Ocultar el identificador ITBIS en las direcciones de los documentos
+TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
 OptionVatMode=Opción de carga de ITBIS
 OptionVatDefaultDesc=La carga del ITBIS es: <br>-en el envío de los bienes (en la práctica se usa la fecha de la factura)<br>-sobre el pago por los servicios
 OptionVatDebitOptionDesc=La carga del ITBIS es: <br>-en el envío de los bienes (en la práctica se usa la fecha de la factura)<br>-sobre la facturación de los servicios
diff --git a/htdocs/langs/es_DO/cron.lang b/htdocs/langs/es_DO/cron.lang
new file mode 100644
index 00000000000..d8953584e61
--- /dev/null
+++ b/htdocs/langs/es_DO/cron.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - cron
+CronDtLastLaunch=Start date of last execution
+CronDtLastResult=End date of last execution
diff --git a/htdocs/langs/es_DO/projects.lang b/htdocs/langs/es_DO/projects.lang
index 3a53dd52c2d..1aaa958bd19 100644
--- a/htdocs/langs/es_DO/projects.lang
+++ b/htdocs/langs/es_DO/projects.lang
@@ -1,2 +1,3 @@
 # Dolibarr language file - Source file is en_US - projects
+ProjectsArea=Projects Area
 OpportunityPonderatedAmountDesc=Opportunities amount weighted with probability
diff --git a/htdocs/langs/es_ES/accountancy.lang b/htdocs/langs/es_ES/accountancy.lang
index f57118d93b9..3211921bac1 100644
--- a/htdocs/langs/es_ES/accountancy.lang
+++ b/htdocs/langs/es_ES/accountancy.lang
@@ -34,7 +34,7 @@ AccountAccounting=Cuenta contable
 AccountAccountingSuggest=Accounting account suggest
 Ventilation=Contabilizar
 
-MenuAccountancy=Accountancy
+MenuAccountancy=Contabilidad
 CustomersVentilation=Contabilizar clientes
 SuppliersVentilation=Contabilizar proveedores
 TradeMargin=Margen de beneficio
@@ -47,7 +47,7 @@ UpdateAccount=Modificar una cuenta contable
 UpdateMvts=Modificar un movimiento
 WriteBookKeeping=Registrar los asientos en el libro mayor
 Bookkeeping=Libro Mayor
-AccountBalance=Account balance
+AccountBalance=Saldo de la cuenta
 
 AccountingVentilation=Descuadre contabilidad
 AccountingVentilationSupplier=Contablilización compras
@@ -104,7 +104,7 @@ Code_tiers=Tercero
 Labelcompte=Descripción
 Sens=Sentido
 Codejournal=Diario
-NumPiece=Piece number
+NumPiece=Apunte
 
 DelBookKeeping=Eliminar los registros del Diario Mayor
 
@@ -167,7 +167,7 @@ Type=Tipos de campos
 Param=Parámetros adicionales
 EnabledProduct=En producto
 EnabledTiers=En el tercero
-EnabledVat=In VAT
+EnabledVat=Sujeto a IVA
 
 ## Tools - Init accounting account on product / service
 InitAccountancy=Iniciar contabilidad
diff --git a/htdocs/langs/es_ES/admin.lang b/htdocs/langs/es_ES/admin.lang
index 3223320d657..a87388c4cb9 100644
--- a/htdocs/langs/es_ES/admin.lang
+++ b/htdocs/langs/es_ES/admin.lang
@@ -154,7 +154,7 @@ Purge=Purga
 PurgeAreaDesc=Esta página le permite eliminar todos los archivos creados o guardados por Dolibarr (archivos temporales o todos los archivos del directorio <b>%s</b>). El uso de esta función no es necesaria. Se proporciona para los usuarios que albergan a Dolibarr en un servidor que no ofrece los permisos de eliminación de archivos salvaguardados por el servidor Web.
 PurgeDeleteLogFile=Borrar el archivo log <b>%s</b> definido por el módulo Syslog (no hay riesgo de pérdida de datos)
 PurgeDeleteTemporaryFiles=Eliminar todos los archivos temporales (sin riesgo de perdida de datos)
-PurgeDeleteTemporaryFilesShort=Delete temporary files
+PurgeDeleteTemporaryFilesShort=Eliminar archivos temporales
 PurgeDeleteAllFilesInDocumentsDir=Eliminar todos los archivos del directorio <b>%s</b>. Archivos temporales y archivos adjuntados a elementos (terceros, facturas, etc.) serán eliminados.
 PurgeRunNow=Purgar
 PurgeNothingToDelete=Ningún directorio a eliminar
@@ -281,7 +281,8 @@ SubmitTranslation=Si la traducción de este idioma no está completa o si encuen
 ModuleSetup=Configuración del módulo
 ModulesSetup=Configuración de los módulos
 ModuleFamilyBase=Sistema
-ModuleFamilyCrm=Gestión cliente (CRM)
+ModuleFamilyCrm=Gestión de Relaciones con Clientes (CRM)
+ModuleFamilySrm=Gestión de Relaciones con Proveedores (SRM)
 ModuleFamilyProducts=Gestión de productos (PM)
 ModuleFamilyHr=Gestión de recursos humanos (HR)
 ModuleFamilyProjects=Proyectos/Trabajo cooperativo
@@ -587,6 +588,7 @@ Permission38=Exportar productos
 Permission41=Leer proyectos y tareas (proyectos compartidos y proyectos de los que soy contacto). También puede introducir tiempos consumidos en tareas asignadas.
 Permission42=Crear/modificar proyectos y tareas (compartidos o soy contacto)
 Permission44=Eliminar proyectos y tareas (compartidos o soy contacto)
+Permission45=Export projects
 Permission61=Consultar intervenciones
 Permission62=Crear/modificar intervenciones
 Permission64=Eliminar intervenciones
@@ -640,6 +642,7 @@ Permission162=Crear/modificar contratos/suscripciones
 Permission163=Activar un servicio/suscripción de un contrato
 Permission164=Desactivar un servicio/suscripcion de un contrato
 Permission165=Eliminar contratos/suscripciones
+Permission167=Export contracts
 Permission171=Leer gastos (suyos y subordinados)
 Permission172=Crear/modificar honorarios
 Permission173=Eliminar honorarios
@@ -788,6 +791,7 @@ Permission2403=Modificar acciones (eventos o tareas) vinculadas a su cuenta
 Permission2411=Leer acciones (eventos o tareas) de otros
 Permission2412=Crear/modificar acciones (eventos o tareas) de otros
 Permission2413=Eliminar acciones (eventos o tareas) de otros
+Permission2414=Export actions/tasks of others
 Permission2501=Consultar/Recuperar documentos
 Permission2502=Recuperar documentos
 Permission2503=Enviar o eliminar documentos
@@ -1641,7 +1645,7 @@ CloseFiscalYear=Cerrar año fiscal
 DeleteFiscalYear=Eliminar año fiscal
 ConfirmDeleteFiscalYear=¿Está seguro de querer eliminar este año fiscal?
 AlwaysEditable=Puede editarse siempre
-IsHidden=Is not visible
+IsHidden=No es visible
 MAIN_APPLICATION_TITLE=Forzar visibilidad del nombre de aplicación (advertencia: indicar su propio nombre aquí puede romper la característica de relleno automático de inicio de sesión al utilizar la aplicación móvil DoliDroid)
 NbMajMin=Número mínimo de caracteres en mayúsculas
 NbNumMin=Número mínimo de caracteres numéricos
@@ -1666,7 +1670,7 @@ BackupDumpWizard=Asistente para crear una copia de seguridad de la base de datos
 SomethingMakeInstallFromWebNotPossible=No es posible la instalación de módulos externos desde la interfaz web por la siguiente razón:
 SomethingMakeInstallFromWebNotPossible2=Por esta razón, explicaremos aquí los pasos del proceso de actualización manual que puede realizar un usuario con privilegios. 
 InstallModuleFromWebHasBeenDisabledByFile=La instalación de módulos externos desde la aplicación se encuentra desactivada por el administrador. Debe requerirle que elimine el archivo <strong>%s</strong> para habilitar esta funcionalidad.
-ConfFileMuseContainCustom=Installing an external module from application save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to have option<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
+ConfFileMuseContainCustom=Instalar un módulo externo desde la aplicación guarda los archivos del módulo en el directorio <strong>%s</strong>. Para permitir a Dolibarr el procesamiento de dicho directorio, debe configurar su <strong>conf/conf.php</strong> para tener la opción<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Resaltar líneas de los listados cuando el ratón pasa por encima de ellas
 HighlightLinesColor=Resalta el color de la línea cuando el ratón pasa por encima (mantener vacío para no resaltar)
 TextTitleColor=Color para la página de título
@@ -1711,5 +1715,6 @@ TitleExampleForMaintenanceRelease=Ejemplo de mensaje que puede usar para anuncia
 ExampleOfNewsMessageForMajorRelease=Disponible ERP/CRM Dolibarr %s. La versión %s es una versión mayor con un montón de nuevas características para los usuarios y desarrolladores. Se puede descargar desde la sección de descargas del portal http://www.dolibarr.org  (subdirectorio versiones estables). Puede leer <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> para ver la lista completa de los cambios.
 ExampleOfNewsMessageForMaintenanceRelease=Disponible ERP/CRM Dolibarr %s. La versión %s es una versión de mantenimiento, por lo que sólo contiene correcciones de errores. Recomendamos a todo el mundo que use una versión anterior que actualice a esta. Como cualquier versión de mantenimiento, no hay novedades. Se puede descargar desde la sección de descargas del portal http://www.dolibarr.org (subdirectorio versiones estables subdirectorio). Puede leer <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> para ver la lista completa de los cambios.
 MultiPriceRuleDesc=Cuando la opción "Varios niveles de precios por producto/servicio" está activada, puede definir diferentes precios (uno por nivel de precios) para cada producto. Para ahorrar tiempo, puede ingresar aquí una regla para autocalcular cada nivel de acuerdo con el precio del primer nivel, por lo que tendrá que introducir sólo el precio para el primer nivel de cada producto. Esta página le sirve para ahorrar tiempo y puede serle muy útil si sus precios para cada nivel son relativos al primer nivel. Puede pasar por alto esta página en la mayoría de los casos.
-ModelModulesProduct=Templates for product documents
-ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
+ModelModulesProduct=Plantillas de documentos de productos
+ToGenerateCodeDefineAutomaticRuleFirst=Para poder generar códigos automáticamente, primero debe indicar un gestor para autogenerar códigos de barras
+SeeSubstitutionVars=See * note for list of possible substitution variables
diff --git a/htdocs/langs/es_ES/bills.lang b/htdocs/langs/es_ES/bills.lang
index 1688c0f846a..15c1dbb7647 100644
--- a/htdocs/langs/es_ES/bills.lang
+++ b/htdocs/langs/es_ES/bills.lang
@@ -58,7 +58,7 @@ Payment=Pago
 PaymentBack=Reembolso
 Payments=Pagos
 PaymentsBack=Reembolsos
-paymentInInvoiceCurrency=in invoices currency
+paymentInInvoiceCurrency=en la divisa de las facturas
 PaidBack=Reembolsado
 DeletePayment=Eliminar el pago
 ConfirmDeletePayment=¿Está seguro de querer eliminar este pago?
@@ -107,7 +107,7 @@ EnterPaymentDueToCustomer=Realizar pago de abonos al cliente
 DisabledBecauseRemainderToPayIsZero=Desactivado ya que el resto a pagar es 0
 PriceBase=Precio base
 BillStatus=Estado de la factura
-StatusOfGeneratedInvoices=Status of generated invoices
+StatusOfGeneratedInvoices=Estado de las facturas generadas
 BillStatusDraft=Borrador (a validar)
 BillStatusPaid=Pagada
 BillStatusPaidBackOrConverted=Reembolsada o convertida en reducción
@@ -141,10 +141,10 @@ ErrorCantCancelIfReplacementInvoiceNotValidated=Error, no es posible cancelar un
 BillFrom=Emisor
 BillTo=Enviar a
 ActionsOnBill=Eventos sobre la factura
-RecurringInvoiceTemplate=Recurring invoice
-NoQualifiedRecurringInvoiceTemplateFound=No recurring template invoice qualified for generation.
-FoundXQualifiedRecurringInvoiceTemplate=Found %s recurring template invoice(s) qualified for generation.
-NotARecurringInvoiceTemplate=Not a recurring template invoice
+RecurringInvoiceTemplate=Factura recurrente
+NoQualifiedRecurringInvoiceTemplateFound=Sin plantilla de factura recurrente apta para la generación
+FoundXQualifiedRecurringInvoiceTemplate=Encontradas %s plantilllas de facturas recurrentes aptas para la generación
+NotARecurringInvoiceTemplate=No es una plantilla de factura recurrente
 NewBill=Nueva factura
 LastBills=Las %s últimas facturas
 LastCustomersBills=Las %s últimas facturas a clientes
@@ -205,7 +205,7 @@ Rest=Pendiente
 AmountExpected=Importe reclamado
 ExcessReceived=Recibido en exceso
 EscompteOffered=Descuento (Pronto pago)
-EscompteOfferedShort=Discount
+EscompteOfferedShort=Descuento
 SendBillRef=Envío de la factura %s
 SendReminderBillRef=Envío de la factura %s (recordatorio)
 StandingOrders=Domiciliaciones
@@ -219,6 +219,7 @@ RemainderToBill=Queda por facturar
 SendBillByMail=Enviar la factura por E-Mail
 SendReminderBillByMail=Enviar un recordatorio por E-Mail
 RelatedCommercialProposals=Presupuestos asociados
+RelatedRecurringCustomerInvoices=Related recurring customer invoices
 MenuToValid=A validar
 DateMaxPayment=Fecha límite de pago
 DateEcheance=Fecha vencimiento
@@ -294,7 +295,7 @@ InvoiceNotChecked=Ninguna factura está seleccionada
 CloneInvoice=Clonar factura
 ConfirmCloneInvoice=¿Está seguro de querer clonar esta factura?
 DisabledBecauseReplacedInvoice=Acción desactivada porque es una factura reemplazada
-DescTaxAndDividendsArea=Esta área muestra un resumen de todos los pagos realizados en gastos especiales. Solamente se incluyen los registros del año fijado
+DescTaxAndDividendsArea=Este área muestra un resumen de todos los pagos realizados en gastos especiales. Solamente se incluyen los registros del año seleccionado.
 NbOfPayments=Nº de pagos
 SplitDiscount=Dividir el dto. en dos
 ConfirmSplitDiscount=¿Está seguro de querer dividir el descuento de <b>%s</b> %s en 2 descuentos más pequeños?
@@ -312,19 +313,18 @@ AmountPaymentDistributedOnInvoice=Importe del pago distribuido en la factura
 PaymentNote=Nota del pago
 ListOfPreviousSituationInvoices=Listado de facturas de situación previas
 ListOfNextSituationInvoices=Listado de las próximas facturas de situación
-FrequencyPer_d=Every %s days
-FrequencyPer_m=Every %s months
-FrequencyPer_y=Every %s years
-toolTipFrequency=Examples:<br /><b>Set 7 / day</b>: give a new invoice every 7 days<br /><b>Set 3 / month</b>: give a new invoice every 3 month
-NextDateToExecution=Date for next invoice generation
-DateLastGeneration=Date of last generation
-MaxPeriodNumber=Max nb of invoice generation
-RestPeriodNumber=Rest period number
-NbOfGenerationDone=Nb of invoice generation already done
-InvoiceAutoValidate=Automatically validate invoice
-GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
-DateIsNotEnough=Date not yet reached
-InvoiceGeneratedFromTemplate=Invoice %s generated from recurring template invoice %s
+FrequencyPer_d=Cada %s días
+FrequencyPer_m=Cada %s meses
+FrequencyPer_y=Cada %s años
+toolTipFrequency=Ejemplos:<br /><b>Indicar 7 / día</b>: da una nueva factura cada 7 días<br /><b>Indicar 3 / mes</b>: da una nueva factura cada 3 meses
+NextDateToExecution=Fecha para la generación de la próxima factura
+DateLastGeneration=Fecha de la última generación
+MaxPeriodNumber=Nº máximo de facturas a generar
+NbOfGenerationDone=Nº de facturas ya generadas
+InvoiceAutoValidate=Validar automáticamente la factura
+GeneratedFromRecurringInvoice=Generado desde la plantilla de facturas recurrentes %s
+DateIsNotEnough=Todavía no se ha alcanzado la fecha
+InvoiceGeneratedFromTemplate=Factura %s generada desde la plantilla de factura recurrente %s
 # PaymentConditions
 PaymentConditionShortRECEP=A la recepción
 PaymentConditionRECEP=A la recepción de la factura
@@ -471,3 +471,7 @@ PDFCrevetteSituationInvoiceLine=Situación nº %s : Fact. nº %s de %s
 TotalSituationInvoice=Total situación
 invoiceLineProgressError=La línea de avance de factura no puede ser  igual o superior  a la próxima línea de factura
 updatePriceNextInvoiceErrorUpdateline=Error: Actualización de precio en línea de factura: %s
+ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
+ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
+ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
+
diff --git a/htdocs/langs/es_ES/compta.lang b/htdocs/langs/es_ES/compta.lang
index 1dc77b513cd..c74a8d979aa 100644
--- a/htdocs/langs/es_ES/compta.lang
+++ b/htdocs/langs/es_ES/compta.lang
@@ -55,7 +55,7 @@ LT1SupplierES=Compras RE
 VATCollected=IVA recuperado
 ToPay=A pagar
 ToGet=A devolver
-SpecialExpensesArea=Area para todos los pagos especiales
+SpecialExpensesArea=Área de pagos especiales
 TaxAndDividendsArea=Área impuestos a las ventas, sociales, fiscales y dividendos
 SocialContribution=Impuestos sociales o fiscales
 SocialContributions=Impuestos sociales o fiscales
@@ -221,4 +221,4 @@ OtherCountriesCustomersReport=Informe de clientes extranjeros
 BasedOnTwoFirstLettersOfVATNumberBeingDifferentFromYourCompanyCountry=Basado en que las dos primeras letras del IVA intracomunitario sea diferente al de el código de país de su empresa
 SameCountryCustomersWithVAT=Informe de clientes nacionales
 BasedOnTwoFirstLettersOfVATNumberBeingTheSameAsYourCompanyCountry=Basado en que las dos primeras letras del IVA intracomunitario sean las mismas que el código de país de su empresa
-LinkedFichinter=Link to an intervention
+LinkedFichinter=Enlazar a una intervención
diff --git a/htdocs/langs/es_ES/errors.lang b/htdocs/langs/es_ES/errors.lang
index 0c93b63ce09..0be1c8bc910 100644
--- a/htdocs/langs/es_ES/errors.lang
+++ b/htdocs/langs/es_ES/errors.lang
@@ -172,6 +172,8 @@ ErrorMandatoryParametersNotProvided=Los parámetro(s) obligatorio(s) no están t
 ErrorOppStatusRequiredIfAmount=Ha indicado un importe estimado para esta oportunidad/lead. Debe indicar también su estado
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Definición incorrecta de la matriz de menú en el descriptor del módulo (valor incorrecto para la clave fk_menu)
 ErrorSavingChanges=Ha ocurrido un error al guardar los cambios
+ErrorWarehouseRequiredIntoShipmentLine=El almacén es obligatorio en la línea a enviar
+ErrorFileMustHaveFormat=El archivo debe tener el formato %s
 
 # Warnings
 WarningPasswordSetWithNoAccount=Se fijó una contraseña para este miembro. Sin embargo, no se ha creado ninguna cuenta de usuario. Así que esta contraseña no se puede utilizar para acceder a Dolibarr. Puede ser utilizada por un módulo/interfaz externo, pero si no necesitar definir accesos de un miembro, puede desactivar la opción "Administrar un inicio de sesión para cada miembro" en la configuración del módulo miembros. Si necesita administrar un inicio de sesión, pero no necesita ninguna contraseña, puede dejar este campo vacío para evitar esta advertencia. Nota: También puede usarse el correo electrónico como inicio de sesión si el miembro está vinculada a un usuario.
diff --git a/htdocs/langs/es_ES/exports.lang b/htdocs/langs/es_ES/exports.lang
index 0a97db2fa2f..82a9575339a 100644
--- a/htdocs/langs/es_ES/exports.lang
+++ b/htdocs/langs/es_ES/exports.lang
@@ -90,7 +90,7 @@ SelectAtLeastOneField=Bascular al menos un campo origen en la columna de campos
 SelectFormat=Seleccione este formato de archivo de importación
 RunImportFile=Lanzar la importación
 NowClickToRunTheImport=Compruebe los resultados de la simulación. Si todo está bien, inicie la importación definitiva.
-DataLoadedWithId=All data will be loaded with the following import id: <b>%s</b>
+DataLoadedWithId=Todos los datos han sido cargados con el siguiente id de importación: <b>%s</b>
 ErrorMissingMandatoryValue=Dato obligatorio no indicado en el archivo fuente, campo número <b>%s</b>.
 TooMuchErrors=Todavía hay <b>%s</b> líneas con error, pero su visualización ha sido limitada.
 TooMuchWarnings=Todavía hay <b>%s</b> líneas con warnings, pero su visualización ha sido limitada.
@@ -128,9 +128,13 @@ SpecialCode=Código especial
 ExportStringFilter=%% permite reemplazar uno o más carácteres en el texto
 ExportDateFilter=YYYY, YYYYMM, YYYYMMDD : filtros por un año/mes/día<br>YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD : filtros entre un rango de años/meses/días<br> > YYYY, > YYYYMM, > YYYYMMDD : filtros en todos los años/meses/días siguientes <br> < YYYY, < YYYYMM, < YYYYMMDD : filtros en todos los años/meses/días anteriores 
 ExportNumericFilter='NNNNN' filtros para un valor<br>'NNNNN+NNNNN' filtros sobre un rango de valores<br>'&gt;NNNNN' filtros para valores menores<br>'&gt;NNNNN' filtros para valores mayores
+ImportFromLine=Empezar la importación desde la línea nº
+EndAtLineNb=Terminar en la línea nº
+SetThisValueTo2ToExcludeFirstLine=Por ejemplo, indicar 3 para excluir las 2 primeras líneas
+KeepEmptyToGoToEndOfFile=Dejar este campo vacío para llegar al final del archivo
 ## filters
 SelectFilterFields=Si quiere aplicar un filtro sobre algunos valores, introdúzcalos aquí.
-FilterableFields=Filterable Fields
+FilterableFields=Campos filtrables
 FilteredFields=Campos filtrados
 FilteredFieldsValues=Valores de filtros
 FormatControlRule=Regla formato de control
diff --git a/htdocs/langs/es_ES/languages.lang b/htdocs/langs/es_ES/languages.lang
index 0351b200f58..6d610174781 100644
--- a/htdocs/langs/es_ES/languages.lang
+++ b/htdocs/langs/es_ES/languages.lang
@@ -32,7 +32,7 @@ Language_es_MX=Español (México)
 Language_es_PY=Español (Paraguay)
 Language_es_PE=Español (Perú)
 Language_es_PR=Español (Puerto Rico)
-Language_es_VE=Spanish (Venezuela)
+Language_es_VE=Español (Venezuela)
 Language_et_EE=Estonio
 Language_eu_ES=Vasco
 Language_fa_IR=Persa
diff --git a/htdocs/langs/es_ES/mails.lang b/htdocs/langs/es_ES/mails.lang
index 8744ab61ed6..d889657aa76 100644
--- a/htdocs/langs/es_ES/mails.lang
+++ b/htdocs/langs/es_ES/mails.lang
@@ -47,7 +47,7 @@ MailingSuccessfullyValidated=E-mailing validado correctamente
 MailUnsubcribe=Desuscribe
 Unsuscribe=Desuscribe
 MailingStatusNotContact=No contactar
-MailingStatusReadAndUnsubscribe=Read and unsubscribe
+MailingStatusReadAndUnsubscribe=Leído y desubscrito
 ErrorMailRecipientIsEmpty=La dirección del destinatario está vacía
 WarningNoEMailsAdded=Ningún nuevo E-Mailing a añadir a la lista destinatarios.
 ConfirmValidMailing=¿Confirma la validación del E-Mailing?
diff --git a/htdocs/langs/es_ES/main.lang b/htdocs/langs/es_ES/main.lang
index d1ca7e599d6..243cc19c7fe 100644
--- a/htdocs/langs/es_ES/main.lang
+++ b/htdocs/langs/es_ES/main.lang
@@ -25,6 +25,7 @@ FormatDateHourTextShort=%d %b %Y %H:%M
 FormatDateHourText=%d %B %Y %H:%M
 DatabaseConnection=Conexión a la base de datos
 NoTemplateDefined=Sin plantilla definida para este tipo de e-mail
+AvailableVariables=Available substitution variables
 NoTranslation=Sin traducción
 NoRecordFound=No se han encontrado registros
 NoError=Ningún error
@@ -311,7 +312,7 @@ UnitPriceHT=Precio base
 UnitPriceTTC=Precio unitario total
 PriceU=P.U.
 PriceUHT=P.U.
-PriceUHTCurrency=U.P (currency)
+PriceUHTCurrency=P.U. (divisa)
 SupplierProposalUHT=P.U. neto solicitado
 PriceUTTC=P.U. (i.i.)
 Amount=Importe
@@ -322,9 +323,9 @@ AmountTTCShort=Importe
 AmountHT=Base imponible
 AmountTTC=Importe total
 AmountVAT=Importe IVA
-MulticurrencyAmountHT=Amount (net of tax), original currency
-MulticurrencyAmountTTC=Amount (inc. of tax), original currency
-MulticurrencyAmountVAT=Amount tax, original currency
+MulticurrencyAmountHT=Base imponible, divisa original
+MulticurrencyAmountTTC=Total, divisa original
+MulticurrencyAmountVAT=Importe IVA, divisa original
 AmountLT1=Importe Impuesto 2
 AmountLT2=Importe Impuesto 3
 AmountLT1ES=Importe RE
@@ -339,7 +340,7 @@ Percentage=Porcentaje
 Total=Total
 SubTotal=Subtotal
 TotalHTShort=Importe
-TotalHTShortCurrency=Total (net in currency)
+TotalHTShortCurrency=Total (divisa)
 TotalTTCShort=Total
 TotalHT=Base imponible
 TotalHTforthispage=Total (base imponible) de esta página
@@ -462,7 +463,7 @@ Datas=Datos
 None=Nada
 NoneF=Ninguna
 Late=Retraso
-LateDesc=Delay to define if a record is late or not depends on your setup. Ask your admin to change delay from menu Home - Setup - Alerts.
+LateDesc=El retraso que indica si un registro lleva retraso o no depende de la configuración. Pregunte a su administrador para cambiar el retraso desde el menú Inicio - Configuración - Alertas.
 Photo=Foto
 Photos=Fotos
 AddPhoto=Añadir foto
@@ -539,13 +540,13 @@ AmountInCurrency=Importes visualizados en %s
 Example=Ejemplo
 Examples=Ejemplos
 NoExample=Sin ejemplo
-FindBug=Señalar un bug
+FindBug=Reportar un error
 NbOfThirdParties=Número de terceros
 NbOfCustomers=Numero de clientes
 NbOfLines=Números de líneas
 NbOfObjects=Número de objetos
 NbOfReferers=Consumición
-NbOfObjectReferers=Number of refering objects
+NbOfObjectReferers=Número de referencias
 Referers=Objetos vinculados
 TotalQuantity=Cantidad total
 DateFromTo=De %s a %s
@@ -701,7 +702,7 @@ LinkedToSpecificUsers=Enlazado a un contacto de usuario particular
 DeleteAFile=Eliminación de archivo
 ConfirmDeleteAFile=Confirme la eliminación del archivo
 NoResults=Ningún resultado
-AdminTools=Admin tools
+AdminTools=Utilidades administración
 SystemTools=Utilidades sistema
 ModulesSystemTools=Utilidades módulos
 Test=Prueba
@@ -740,8 +741,8 @@ Hello=Hola
 Sincerely=Atentamente
 DeleteLine=Eliminación de línea
 ConfirmDeleteLine=¿Está seguro de querer eliminar esta línea?
-NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked records
-TooManyRecordForMassAction=Too many records selected for mass action. Such action are restriced to a list of %s records.
+NoPDFAvailableForDocGenAmongChecked=Sin PDF disponibles para la generación de documentos entre los registros seleccionados
+TooManyRecordForMassAction=Demasiados registros seleccionados para la acción masiva. La acción se encuentra restringida a %s registros
 # Week day
 Monday=Lunes
 Tuesday=Martes
diff --git a/htdocs/langs/es_ES/orders.lang b/htdocs/langs/es_ES/orders.lang
index 1755f5018ff..85fb31e2f2f 100644
--- a/htdocs/langs/es_ES/orders.lang
+++ b/htdocs/langs/es_ES/orders.lang
@@ -32,6 +32,7 @@ StatusOrderSent=Envío en curso
 StatusOrderOnProcessShort=Pedido
 StatusOrderProcessedShort=Procesado
 StatusOrderDelivered=Emitido
+StatusOrderDeliveredShort=Enviado
 StatusOrderToBillShort=Emitido
 StatusOrderToBill2Short=A facturar
 StatusOrderApprovedShort=Aprobado
diff --git a/htdocs/langs/es_ES/products.lang b/htdocs/langs/es_ES/products.lang
index fee15fb7b5d..501f29964eb 100644
--- a/htdocs/langs/es_ES/products.lang
+++ b/htdocs/langs/es_ES/products.lang
@@ -45,10 +45,6 @@ LastProducts=Ultimos productos
 CardProduct0=Ficha producto
 CardProduct1=Ficha servicio
 CardContract=Ficha contrato
-Warehouse=Almacén
-Warehouses=Almacenes
-WarehouseOpened=Almacén abierto
-WarehouseClosed=Almacén cerrado
 Stock=Stock
 Stocks=Stocks
 Movement=Movimiento
@@ -295,11 +291,11 @@ ComposedProductIncDecStock=Incrementar/Decrementar stock al cambiar su padre
 ComposedProduct=Sub-producto
 MinSupplierPrice=Precio mínimo de proveedor
 DynamicPriceConfiguration=Configuración de precio dinámico
-DynamicPriceDesc=On product card, with this module enabled, you should be able to set mathematic functions to calculate Customer or Supplier prices. Such function can use all mathematic operators, some constants and variables. You can set here the variables you want to be able and if the variable need an automatic update, the external URL to use to ask Dolibarr to update automaticaly the value.
-AddVariable=Add Variable
-AddUpdater=Add Updater
+DynamicPriceDesc=Con este módulo activado, en la ficha del producto,  debe ser capaz de establecer funciones matemáticas para calcular los precios a cliente o de proveedor. Puede utilizar todos los operadores matemáticos, algunas constantes y variables. Puede establecer aquí las variables que desee usar y si la variable necesita una actualización automática, la dirección URL externa a usar para actualizar automáticamente el valor.
+AddVariable=Añadir variable
+AddUpdater=Añadir Actualizador
 GlobalVariables=Variables globales
-VariableToUpdate=Variable to update
+VariableToUpdate=Variable a actualizar
 GlobalVariableUpdaters=Actualizaciones de variables globales
 GlobalVariableUpdaterType0=datos JSON
 GlobalVariableUpdaterHelp0=Analiza datos JSON desde la URL especificada, el valor especifica la ubicación de valor relevante,
@@ -317,4 +313,12 @@ DefaultPriceRealPriceMayDependOnCustomer=Precio por defecto, el precio real pued
 WarningSelectOneDocument=Seleccione al menos un documento
 DefaultUnitToShow=Unidad
 NbOfQtyInProposals=Cant. en presupuestos
-ClinkOnALinkOfColumn=Click on a link of column %s to get a detailed view...
+ClinkOnALinkOfColumn=Clic en el enlace de la columna %s para obtener una vista detallada...
+TranslatedLabel=Traducción de la etiqueta
+TranslatedDescription=Traducción de la descripción
+TranslatedNote=Traducción de las notas
+ProductWeight=Weight for 1 product
+ProductVolume=Volume for 1 product
+WeightUnits=Peso unitario
+VolumeUnits=Volume unit
+SizeUnits=Tamaño unitario
diff --git a/htdocs/langs/es_ES/projects.lang b/htdocs/langs/es_ES/projects.lang
index 0c68fbd1cf5..b0965bd080c 100644
--- a/htdocs/langs/es_ES/projects.lang
+++ b/htdocs/langs/es_ES/projects.lang
@@ -5,7 +5,7 @@ ProjectId=Id proyecto
 ProjectLabel=Etiqueta proyecto
 Project=Proyecto
 Projects=Proyectos
-ProjectsArea=Projects Area
+ProjectsArea=Área Proyectos
 ProjectStatus=Estado del proyecto
 SharedProject=Proyecto compartido
 PrivateProject=Contactos del proyecto
@@ -20,7 +20,7 @@ TasksPublicDesc=Esta vista muestra todos los proyectos y tareas en los que usted
 TasksDesc=Esta vista muestra todos los proyectos y tareas (sus permisos de usuario le permiten tener una visión completa).
 AllTaskVisibleButEditIfYouAreAssigned=Todas las tareas de este proyectos son visibles, pero solo puede indicar tiempos en las tareas que tenga asignadas. Asignese  tareas si desea indicar tiempos en ellas.
 OnlyYourTaskAreVisible=Sólo puede ver tareas que le son asignadas. Asignese tareas si desea indicar tiempos en ellas.
-ProjectsArea=Projects Area
+ProjectsArea=Área Proyectos
 NewProject=Nuevo proyecto
 AddProject=Crear proyecto
 DeleteAProject=Eliminar un proyecto
@@ -68,12 +68,15 @@ Activities=Tareas/actividades
 MyActivity=Mi actividad
 MyActivities=Mis tareas/actividades
 MyProjects=Mis proyectos
-MyProjectsArea=My projects Area
+MyProjectsArea=Mi Área de proyectos
 DurationEffective=Duración efectiva
 Progress=Progresión
 ProgressDeclared=Progresión declarada
 ProgressCalculated=Progresión calculada
 Time=Tiempo
+ListOfTasks=List of tasks
+GoToListOfTimeConsumed=Go to list of time consumed
+GoToListOfTasks=Go to list of tasks
 ListProposalsAssociatedProject=Listado de presupuestos asociados al proyecto
 ListOrdersAssociatedProject=Listado de pedidos asociados al proyecto
 ListInvoicesAssociatedProject=Listado de facturas asociadas al proyecto
@@ -185,9 +188,9 @@ TaskAssignedToEnterTime=Tarea asignada. Debería poder introducir tiempos en est
 IdTaskTime=Id
 YouCanCompleteRef=Si quiere completar la referencia con alguna información (para usarla como filtros de búsqueda), se recomienda añadir un caracter - como separación, por lo que la numeración automática seguirá funcionando correctamente para los próximos proyectos. Por ejemplo %s-ABC. También puede preferir añadir claves de búsqueda en la etiqueta.
 OpenedProjectsByThirdparties=Proyectos abiertos de terceros
-OnlyOpportunitiesShort=Only opportunities
-OpenedOpportunitiesShort=Opened opportunities
-NotAnOpportunityShort=Not an opportunity
+OnlyOpportunitiesShort=Solamente oportunidades
+OpenedOpportunitiesShort=Oportunidades abiertas
+NotAnOpportunityShort=No es una oportunidad
 OpportunityTotalAmount=Importe total oportunidades
 OpportunityPonderatedAmount=Importe medio oportunidades
 OpportunityPonderatedAmountDesc=Importe ponderado oportunidades con probabilidad
@@ -198,4 +201,4 @@ OppStatusNEGO=Negociación
 OppStatusPENDING=Pendiente
 OppStatusWIN=Ganado
 OppStatusLOST=Perdido
-Budget=Presupuesto
+Budget=Budget
diff --git a/htdocs/langs/es_ES/receiptprinter.lang b/htdocs/langs/es_ES/receiptprinter.lang
index 66e7bfefb1b..9039f9e0723 100644
--- a/htdocs/langs/es_ES/receiptprinter.lang
+++ b/htdocs/langs/es_ES/receiptprinter.lang
@@ -1,10 +1,10 @@
 # Dolibarr language file - Source file is en_US - receiptprinter
-ReceiptPrinterSetup=Setup of module ReceiptPrinter
+ReceiptPrinterSetup=Configuración del módulo impresora de tickets
 PrinterAdded=Impresora %s añadida
 PrinterUpdated=Impresora %s actualizada
 PrinterDeleted=Impresora %s eliminada
 TestSentToPrinter=Enviar prueba a la impresora %s
-ReceiptPrinter=Receipt printers
+ReceiptPrinter=Impresora de tickets
 ReceiptPrinterDesc=Configuración de impresoras
 ReceiptPrinterTemplateDesc=Configuración de plantillas
 ReceiptPrinterTypeDesc=Descripción del tipo de impresora de tickets
diff --git a/htdocs/langs/es_ES/sendings.lang b/htdocs/langs/es_ES/sendings.lang
index 7c4144a4a80..da9293764a4 100644
--- a/htdocs/langs/es_ES/sendings.lang
+++ b/htdocs/langs/es_ES/sendings.lang
@@ -70,6 +70,8 @@ ProductQtyInSuppliersOrdersRunning=Cantidad en pedidos a proveedores abiertos
 ProductQtyInShipmentAlreadySent=Ya ha sido enviada la cantidad del producto del pedido de cliente abierto
 ProductQtyInSuppliersShipmentAlreadyRecevied=Cantidad en pedidos a proveedores ya recibidos
 NoProductToShipFoundIntoStock=Sin stock disponible en el almacén <b>%s</b>. Corrija el stock o vuelva atrás para seleccionar otro almacén.
+WeightVolShort=Weight/Vol.
+ValidateOrderFirstBeforeShipment=You must first validate the order before being able to make shipments.
 
 # Sending methods
 SendingMethodCATCH=Recogido por el cliente
diff --git a/htdocs/langs/es_ES/stocks.lang b/htdocs/langs/es_ES/stocks.lang
index d497e86f569..7967b8b461a 100644
--- a/htdocs/langs/es_ES/stocks.lang
+++ b/htdocs/langs/es_ES/stocks.lang
@@ -34,8 +34,8 @@ LastMovements=Últimos movimientos
 Units=Unidades
 Unit=Unidad
 StockCorrection=Corrección stock
-StockTransfer=Transfer stock
-MassStockTransferShort=Mass stock transfer
+StockTransfer=Transferir stock
+MassStockTransferShort=Transferencia de stock en masa
 StockMovement=Movimiento de stock
 StockMovements=Movimientos de stock
 LabelMovement=Etiqueta del movimiento
diff --git a/htdocs/langs/es_ES/supplier_proposal.lang b/htdocs/langs/es_ES/supplier_proposal.lang
index 245aa6593f1..35f847e534a 100644
--- a/htdocs/langs/es_ES/supplier_proposal.lang
+++ b/htdocs/langs/es_ES/supplier_proposal.lang
@@ -7,7 +7,7 @@ CommRequest=Presupuesto
 CommRequests=Presupuestos
 SearchRequest=Buscar un presupuesto
 DraftRequests=Presupuestos borrador
-SupplierProposalsDraft=Draft supplier proposals
+SupplierProposalsDraft=Presupuestos de proveedor borrador
 LastModifiedRequests=Los %s últimos presupuestos modificados
 RequestsOpened=Presupuestos abiertos
 SupplierProposalArea=Área presupuestos de proveedores
@@ -58,3 +58,5 @@ DefaultModelSupplierProposalCreate=Modelo por defecto
 DefaultModelSupplierProposalToBill=Modelo por defecto al cerrar un presupuesto (aceptado)
 DefaultModelSupplierProposalClosed=Modelo por defecto al cerrar un presupuesto (rechazado)
 ListOfSupplierProposal=Listado de presupuestos de proveedores
+SupplierProposalsToClose=Supplier proposals to close
+SupplierProposalsToProcess=Supplier proposals to process
diff --git a/htdocs/langs/es_ES/users.lang b/htdocs/langs/es_ES/users.lang
index 4567ed67375..6a99034ce99 100644
--- a/htdocs/langs/es_ES/users.lang
+++ b/htdocs/langs/es_ES/users.lang
@@ -122,4 +122,4 @@ LoginUsingOpenID=Usar OpenID para iniciar sesión
 WeeklyHours=Horas semanales
 ColorUser=Color para el usuario
 DisabledInMonoUserMode=Desactivado en modo mantenimiento
-UserAccountancyCode=User accountancy code
+UserAccountancyCode=Código contable usuario
diff --git a/htdocs/langs/es_MX/admin.lang b/htdocs/langs/es_MX/admin.lang
index 29810d2d9d6..d732f668bb6 100644
--- a/htdocs/langs/es_MX/admin.lang
+++ b/htdocs/langs/es_MX/admin.lang
@@ -70,5 +70,6 @@ DictionaryCanton=Estado/Provincia
 Upgrade=Actualizar
 MenuCompanySetup=Empresa/Fundación
 CompanyName=Nombre
+TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
 EmptyNumRefModelDesc=El código es libre. Este código puede ser modificado en cualquier momento.
 LDAPFieldFirstName=Nombre(s)
diff --git a/htdocs/langs/es_MX/projects.lang b/htdocs/langs/es_MX/projects.lang
index 5e14c200b38..3f2eb552a9a 100644
--- a/htdocs/langs/es_MX/projects.lang
+++ b/htdocs/langs/es_MX/projects.lang
@@ -1,3 +1,4 @@
 # Dolibarr language file - Source file is en_US - projects
+ProjectsArea=Projects Area
 ProjectReferers=Refiriéndose objetos
 OpportunityPonderatedAmountDesc=Opportunities amount weighted with probability
diff --git a/htdocs/langs/es_PE/admin.lang b/htdocs/langs/es_PE/admin.lang
index 75aff423366..e02984c803e 100644
--- a/htdocs/langs/es_PE/admin.lang
+++ b/htdocs/langs/es_PE/admin.lang
@@ -10,6 +10,7 @@ VATManagement=Gestión IGV
 VATIsUsedDesc=El tipo de IGV propuesto por defecto en las creaciones de presupuestos, facturas, pedidos, etc. Responde a la siguiente regla:<br>Si el vendedor no está sujeto a IVU, IVU por defecto=0. Final de regla.<br>Si el país del vendedor= país del comprador entonces IVU por defecto=IVU del producto vendido. Final de regla.<br>Si vendedor y comprador residen en la Comunidad Europea y el bien vendido= nuevo medio de transportes (auto, barco, avión), IVU por defecto=0 (el IVU debe ser pagado por comprador a la hacienda pública de su país y no al vendedor). Final de regla<br>Si vendedor y comprador residen en la Comunidad Europea y comprador= particular o empresa sin NIF intracomunitario entonces IVU por defecto=IVU del producto vendido. Final de regla.<br>Si vendedor y comprador residen en la Comunidad Europea y comprador= empresa con NIF intracomunitario entonces IVU por defecto=0. Final de regla.<br>Si no, IVU propuesto por defecto=0. Final de regla.<br>
 VATIsNotUsedDesc=El tipo de IGV propuesto por defecto es 0. Este es el caso de asociaciones, particulares o algunas pequeñas sociedades.
 UnitPriceOfProduct=Precio unitario sin IGV de un producto
+TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
 OptionVatMode=Opción de carga de IGV
 OptionVatDefaultDesc=La carga del IGV es: <br>-en el envío de los bienes (en la práctica se usa la fecha de la factura)<br>-sobre el pago por los servicios
 OptionVatDebitOptionDesc=La carga del IGV es: <br>-en el envío de los bienes (en la práctica se usa la fecha de la factura)<br>-sobre la facturación de los servicios
diff --git a/htdocs/langs/es_PE/cron.lang b/htdocs/langs/es_PE/cron.lang
new file mode 100644
index 00000000000..d8953584e61
--- /dev/null
+++ b/htdocs/langs/es_PE/cron.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - cron
+CronDtLastLaunch=Start date of last execution
+CronDtLastResult=End date of last execution
diff --git a/htdocs/langs/es_PE/projects.lang b/htdocs/langs/es_PE/projects.lang
index 3a53dd52c2d..1aaa958bd19 100644
--- a/htdocs/langs/es_PE/projects.lang
+++ b/htdocs/langs/es_PE/projects.lang
@@ -1,2 +1,3 @@
 # Dolibarr language file - Source file is en_US - projects
+ProjectsArea=Projects Area
 OpportunityPonderatedAmountDesc=Opportunities amount weighted with probability
diff --git a/htdocs/langs/es_PY/admin.lang b/htdocs/langs/es_PY/admin.lang
index 1c53b65c99c..61b7d006abf 100644
--- a/htdocs/langs/es_PY/admin.lang
+++ b/htdocs/langs/es_PY/admin.lang
@@ -2,3 +2,4 @@
 AntiVirusCommandExample=Example for ClamWin: c:\\Progra~1\\ClamWin\\bin\\clamscan.exe<br>Example for ClamAv: /usr/bin/clamscan
 AntiVirusParamExample=Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
 ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
+TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
diff --git a/htdocs/langs/es_PY/cron.lang b/htdocs/langs/es_PY/cron.lang
new file mode 100644
index 00000000000..d8953584e61
--- /dev/null
+++ b/htdocs/langs/es_PY/cron.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - cron
+CronDtLastLaunch=Start date of last execution
+CronDtLastResult=End date of last execution
diff --git a/htdocs/langs/es_PY/projects.lang b/htdocs/langs/es_PY/projects.lang
index 3a53dd52c2d..1aaa958bd19 100644
--- a/htdocs/langs/es_PY/projects.lang
+++ b/htdocs/langs/es_PY/projects.lang
@@ -1,2 +1,3 @@
 # Dolibarr language file - Source file is en_US - projects
+ProjectsArea=Projects Area
 OpportunityPonderatedAmountDesc=Opportunities amount weighted with probability
diff --git a/htdocs/langs/es_VE/admin.lang b/htdocs/langs/es_VE/admin.lang
index 8a4a5ddc0d5..24b2c4ab445 100644
--- a/htdocs/langs/es_VE/admin.lang
+++ b/htdocs/langs/es_VE/admin.lang
@@ -1,3 +1,5 @@
 # Dolibarr language file - Source file is en_US - admin
 DelaiedFullListToSelectCompany=Esperar a que presione una tecla antes de cargar el contenido de los terceros en el combo (Esto puede incrementar el rendimiento si tiene un gran número de terceros)
 DelaiedFullListToSelectContact=Esperar a que presione una tecla antes de cargar el contenido de los contactos en el combo (Esto puede incrementar el rendimiento si tiene un gran número de contactos)
+ModuleFamilyCrm=Gestión cliente (CRM)
+TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
diff --git a/htdocs/langs/es_VE/bills.lang b/htdocs/langs/es_VE/bills.lang
index d77c9645954..e69ac08a063 100644
--- a/htdocs/langs/es_VE/bills.lang
+++ b/htdocs/langs/es_VE/bills.lang
@@ -1,6 +1,7 @@
 # Dolibarr language file - Source file is en_US - bills
 BillsCustomer=Facturas a clientes
 ErrorVATIntraNotConfigured=IVA aún no configurado
+DescTaxAndDividendsArea=Esta área muestra un resumen de todos los pagos realizados en gastos especiales. Solamente se incluyen los registros del año fijado
 IntracommunityVATNumber=Número de IVA
 VATIsNotUsedForInvoice=-
 LawApplicationPart1=-
diff --git a/htdocs/langs/es_VE/companies.lang b/htdocs/langs/es_VE/companies.lang
index f0e1cff3a34..d80ee021ea6 100644
--- a/htdocs/langs/es_VE/companies.lang
+++ b/htdocs/langs/es_VE/companies.lang
@@ -15,6 +15,8 @@ ProfId3MX=-
 VATIntra=RIF
 VATIntraShort=RIF
 VATIntraVeryShort=RIF
+CompanyHasAbsoluteDiscount=Este cliente tiene <b>%s %s</b> descuentos disponibles (descuentos, anticipos...)
+CompanyHasCreditNote=Este cliente tiene <b>%s %s</b> anticipos disponibles
 VATIntraCheckDesc=El link <b>%s</b> permite consultar al SENIAT el RIF. Se requiere acceso a internet para que el servicio funcione
 VATIntraCheckURL=http://contribuyente.seniat.gob.ve/BuscaRif/BuscaRif.jsp
 VATIntraCheckableOnEUSite=Verificar en la web del SENIAT
diff --git a/htdocs/langs/es_VE/cron.lang b/htdocs/langs/es_VE/cron.lang
new file mode 100644
index 00000000000..d8953584e61
--- /dev/null
+++ b/htdocs/langs/es_VE/cron.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - cron
+CronDtLastLaunch=Start date of last execution
+CronDtLastResult=End date of last execution
diff --git a/htdocs/langs/es_VE/main.lang b/htdocs/langs/es_VE/main.lang
index 2414a5f77c2..8fbb0d24663 100644
--- a/htdocs/langs/es_VE/main.lang
+++ b/htdocs/langs/es_VE/main.lang
@@ -25,4 +25,5 @@ TotalLT1ES=Total retenido
 TotalLT2ES=Total ISLR
 LT1ES=Retención
 LT2ES=ISLR
+FindBug=Señalar un bug
 NbOfReferers=Número de referidos
diff --git a/htdocs/langs/es_VE/projects.lang b/htdocs/langs/es_VE/projects.lang
index a9637d43781..c5c96b23307 100644
--- a/htdocs/langs/es_VE/projects.lang
+++ b/htdocs/langs/es_VE/projects.lang
@@ -1,3 +1,4 @@
 # Dolibarr language file - Source file is en_US - projects
+ProjectsArea=Projects Area
 DocumentModelBaleine=Plantilla de informe tareas del Proyecto
 OpportunityPonderatedAmountDesc=Opportunities amount weighted with probability
diff --git a/htdocs/langs/et_EE/admin.lang b/htdocs/langs/et_EE/admin.lang
index f894270eab1..5af30d0caf8 100644
--- a/htdocs/langs/et_EE/admin.lang
+++ b/htdocs/langs/et_EE/admin.lang
@@ -282,6 +282,7 @@ ModuleSetup=Moodulite seadistamine
 ModulesSetup=Moodulite seadistamine
 ModuleFamilyBase=Süsteem
 ModuleFamilyCrm=Kliendihaldus (CRM)
+ModuleFamilySrm=Supplier Relation Management (SRM)
 ModuleFamilyProducts=Products Management (PM)
 ModuleFamilyHr=Human Resource Management (HR)
 ModuleFamilyProjects=Projektid/koostöö
@@ -587,6 +588,7 @@ Permission38=Toodete eksport
 Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
 Permission42=Projektide loomine/muutmine (jagatud projektid ja projektid, mille kontaktiks on kasutaja)
 Permission44=Projektide kustutamine (jagatud projekt ja projektid, mille kontaktiks on kasutaja)
+Permission45=Export projects
 Permission61=Sekkumiste vaatamine
 Permission62=Sekkumiste loomine/muutmine
 Permission64=Sekkumiste kustutamine
@@ -640,6 +642,7 @@ Permission162=Create/modify contracts/subscriptions
 Permission163=Activate a service/subscription of a contract
 Permission164=Disable a service/subscription of a contract
 Permission165=Delete contracts/subscriptions
+Permission167=Export contracts
 Permission171=Read trips and expenses (yours and your subordinates)
 Permission172=Create/modify trips and expenses
 Permission173=Delete trips and expenses
@@ -788,6 +791,7 @@ Permission2403=Oma kontoga seotud juhtumite (tegevuste või ülesannete) kustuta
 Permission2411=Teiste kontodega seotud juhtumite (tegevuste või ülesannete) vaatamine
 Permission2412=Teiste kontodega seotud juhtumite (tegevuste või ülesannete) loomine/muutmine
 Permission2413=Teiste kontodega seotud juhtumite (tegevuste või ülesannete) kustutamine
+Permission2414=Export actions/tasks of others
 Permission2501=Dokumentide vaatamine/alla laadimine
 Permission2502=Dokumentide alla laadimine
 Permission2503=Dokumentide üles laadimine või kustutamine
@@ -1713,3 +1717,4 @@ ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s is available. Ve
 MultiPriceRuleDesc=When option "Several level of prices per product/service" is on, you can define different prices (one per price level) for each product. To save you time, you can enter here rule to have price for each level autocalculated according to price of first level, so you will have to enter only price for first level on each product. This page is here to save you time and can be usefull only if your prices for each leve are relative to first level. You can ignore this page in most cases.
 ModelModulesProduct=Templates for product documents
 ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
+SeeSubstitutionVars=See * note for list of possible substitution variables
diff --git a/htdocs/langs/et_EE/bills.lang b/htdocs/langs/et_EE/bills.lang
index 234eccab73a..4ce662dba8a 100644
--- a/htdocs/langs/et_EE/bills.lang
+++ b/htdocs/langs/et_EE/bills.lang
@@ -219,6 +219,7 @@ RemainderToBill=Ülejääk, mille eest arve esitada
 SendBillByMail=Saada arve e-posti teel
 SendReminderBillByMail=Saada meeldetuletus e-posti teel
 RelatedCommercialProposals=Seotud pakkumised
+RelatedRecurringCustomerInvoices=Related recurring customer invoices
 MenuToValid=Kehtivatele
 DateMaxPayment=Maksed enne
 DateEcheance=Maksetähtaja piir
@@ -319,7 +320,6 @@ toolTipFrequency=Examples:<br /><b>Set 7 / day</b>: give a new invoice every 7 d
 NextDateToExecution=Date for next invoice generation
 DateLastGeneration=Date of last generation
 MaxPeriodNumber=Max nb of invoice generation
-RestPeriodNumber=Rest period number
 NbOfGenerationDone=Nb of invoice generation already done
 InvoiceAutoValidate=Automatically validate invoice
 GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
@@ -471,3 +471,7 @@ PDFCrevetteSituationInvoiceLine=Situation N°%s : Inv. N°%s on %s
 TotalSituationInvoice=Total situation
 invoiceLineProgressError=Invoice line progress can't be egal or upper the next invoice line
 updatePriceNextInvoiceErrorUpdateline=Error : update price on invoice line : %s
+ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
+ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
+ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
+
diff --git a/htdocs/langs/et_EE/boxes.lang b/htdocs/langs/et_EE/boxes.lang
index df925fd547d..597e527bbb2 100644
--- a/htdocs/langs/et_EE/boxes.lang
+++ b/htdocs/langs/et_EE/boxes.lang
@@ -60,8 +60,8 @@ BoxTitleLastContracts=Viimased %s lepingut
 BoxTitleLastModifiedDonations=Viimased %s muudetud annetust
 BoxTitleLastModifiedExpenses=Last %s modified expense reports
 BoxGlobalActivity=Üldine tegevus (arved, pakkumised, tellimused)
-BoxGoodCustomers=Good Customers
-BoxTitleGoodCustomers=%s Good Customers
+BoxGoodCustomers=Good customers
+BoxTitleGoodCustomers=%s Good customers
 FailedToRefreshDataInfoNotUpToDate=Ei suutnud RSS voogu värskendada. Viimane värskendamise kuupäev: %s
 LastRefreshDate=Viimane värskendamise kuupäev
 NoRecordedBookmarks=Järjehoidjaid pole määratletud.
diff --git a/htdocs/langs/et_EE/companies.lang b/htdocs/langs/et_EE/companies.lang
index f6254d8922b..ce6b027e398 100644
--- a/htdocs/langs/et_EE/companies.lang
+++ b/htdocs/langs/et_EE/companies.lang
@@ -202,7 +202,7 @@ ProfId3IN=Prof Id 3 (SRVC TAX)
 ProfId4IN=Prof Id 4
 ProfId5IN=Prof Id 5
 ProfId6IN=-
-ProfId1LU=Id. prof. 1 (RCS)
+ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
 ProfId2LU=Id. prof. 2 (Business permit)
 ProfId3LU=-
 ProfId4LU=-
@@ -317,10 +317,12 @@ ShowContact=Näita kontakti
 ContactsAllShort=Kõik (filtrita)
 ContactType=Kontakti liik
 ContactForOrders=Tellimuse kontakt
+ContactForOrdersOrShipments=Order's or shipment's contact
 ContactForProposals=Pakkumise kontakt
 ContactForContracts=Lepingu kontakt
 ContactForInvoices=Arve kontakt
 NoContactForAnyOrder=See kontakt ei ole ühegi tellimusega seotud
+NoContactForAnyOrderOrShipment=This contact is not a contact for any order or shipment
 NoContactForAnyProposal=See kontakt ei ole ühegi pakkumisega seotud
 NoContactForAnyContract=See kontakt ei ole ühegi lepinguga seotud
 NoContactForAnyInvoice=See kontakt ei ole ühegi arvega seotud
@@ -438,3 +440,6 @@ MergeThirdparties=Merge third parties
 ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one ? All linked objects (invoices, orders, ...) will be moved to current third party so you will be able to delete the duplicate one.
 ThirdpartiesMergeSuccess=Thirdparties have been merged
 ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
+SaleRepresentativeLogin=Login of sale representative
+SaleRepresentativeFirstname=Firstname of sale representative
+SaleRepresentativeLastname=Lastname of sale representative
diff --git a/htdocs/langs/et_EE/errors.lang b/htdocs/langs/et_EE/errors.lang
index 147bb97545c..5b5bd22d1c0 100644
--- a/htdocs/langs/et_EE/errors.lang
+++ b/htdocs/langs/et_EE/errors.lang
@@ -172,6 +172,8 @@ ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
 ErrorOppStatusRequiredIfAmount=You set an estimated amount for this opportunity/lead. So you must also enter its status
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
 ErrorSavingChanges=An error has ocurred when saving the changes
+ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
+ErrorFileMustHaveFormat=File must have format %s
 
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
diff --git a/htdocs/langs/et_EE/exports.lang b/htdocs/langs/et_EE/exports.lang
index 8b10422b38e..2beb74eb97b 100644
--- a/htdocs/langs/et_EE/exports.lang
+++ b/htdocs/langs/et_EE/exports.lang
@@ -128,6 +128,10 @@ SpecialCode=Erikood
 ExportStringFilter=%% allows replacing one or more characters in the text
 ExportDateFilter=YYYY, YYYYMM, YYYYMMDD : filters by one year/month/day<br>YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD : filters over a range of years/months/days<br> > YYYY, > YYYYMM, > YYYYMMDD : filters on all following years/months/days<br> < YYYY, < YYYYMM, < YYYYMMDD : filters on all previous years/months/days
 ExportNumericFilter='NNNNN' filters by one value<br>'NNNNN+NNNNN' filters over a range of values<br>'&gt;NNNNN' filters by lower values<br>'&gt;NNNNN' filters by higher values
+ImportFromLine=Import starting from line number
+EndAtLineNb=End at line number
+SetThisValueTo2ToExcludeFirstLine=For example, set this value to 3 to exclude the 2 first lines
+KeepEmptyToGoToEndOfFile=Keep this field empty to go up to the end of file
 ## filters
 SelectFilterFields=Kui soovid mõnede väärtuste põhjal filtreerida, siis sisesta nad siia.
 FilterableFields=Filterable Fields
diff --git a/htdocs/langs/et_EE/main.lang b/htdocs/langs/et_EE/main.lang
index 2c997be43ac..e5e564256f6 100644
--- a/htdocs/langs/et_EE/main.lang
+++ b/htdocs/langs/et_EE/main.lang
@@ -25,6 +25,7 @@ FormatDateHourTextShort=%d. %b %Y. %I:%M %p
 FormatDateHourText=%d. %b %Y. %I:%M %p
 DatabaseConnection=Andmebaasi ühendus
 NoTemplateDefined=No template defined for this email type
+AvailableVariables=Available substitution variables
 NoTranslation=Tõlge puudub
 NoRecordFound=Kirjet ei leitud
 NoError=Vigu ei tekkinud
diff --git a/htdocs/langs/et_EE/orders.lang b/htdocs/langs/et_EE/orders.lang
index a25c9780fee..7871f7f214e 100644
--- a/htdocs/langs/et_EE/orders.lang
+++ b/htdocs/langs/et_EE/orders.lang
@@ -32,6 +32,7 @@ StatusOrderSent=Saatmine töötlemisel
 StatusOrderOnProcessShort=Ordered
 StatusOrderProcessedShort=Töödeldud
 StatusOrderDelivered=Delivered
+StatusOrderDeliveredShort=Delivered
 StatusOrderToBillShort=Saadetud
 StatusOrderToBill2Short=Arve esitada
 StatusOrderApprovedShort=Heaks kiidetud
diff --git a/htdocs/langs/et_EE/products.lang b/htdocs/langs/et_EE/products.lang
index ab969f9c690..01e2c7d759c 100644
--- a/htdocs/langs/et_EE/products.lang
+++ b/htdocs/langs/et_EE/products.lang
@@ -45,10 +45,6 @@ LastProducts=Viimased tooted
 CardProduct0=Toote kaart
 CardProduct1=Teenuse kaart
 CardContract=Lepingu kaart
-Warehouse=Ladu
-Warehouses=Laod
-WarehouseOpened=Warehouse open
-WarehouseClosed=Ladu suletud
 Stock=Laojääk
 Stocks=Laojäägid
 Movement=Liikumine
@@ -318,3 +314,11 @@ WarningSelectOneDocument=Please select at least one document
 DefaultUnitToShow=Unit
 NbOfQtyInProposals=Qty in proposals
 ClinkOnALinkOfColumn=Click on a link of column %s to get a detailed view...
+TranslatedLabel=Translated label
+TranslatedDescription=Translated description
+TranslatedNote=Translated notes
+ProductWeight=Weight for 1 product
+ProductVolume=Volume for 1 product
+WeightUnits=Weight unit
+VolumeUnits=Volume unit
+SizeUnits=Size unit
diff --git a/htdocs/langs/et_EE/projects.lang b/htdocs/langs/et_EE/projects.lang
index 80c9cd8f57b..7c53e51f80d 100644
--- a/htdocs/langs/et_EE/projects.lang
+++ b/htdocs/langs/et_EE/projects.lang
@@ -74,6 +74,9 @@ Progress=Progress
 ProgressDeclared=Deklareeritud progress
 ProgressCalculated=Arvutatud progress
 Time=Aeg
+ListOfTasks=List of tasks
+GoToListOfTimeConsumed=Go to list of time consumed
+GoToListOfTasks=Go to list of tasks
 ListProposalsAssociatedProject=Antud projektiga seotud pakkumised
 ListOrdersAssociatedProject=Antud projektiga seotud müügitellimuste nimekiri
 ListInvoicesAssociatedProject=Antud projektiga seotud müügiarvete nimekiri
@@ -198,3 +201,4 @@ OppStatusNEGO=Negociation
 OppStatusPENDING=Pending
 OppStatusWIN=Won
 OppStatusLOST=Lost
+Budget=Budget
diff --git a/htdocs/langs/et_EE/sendings.lang b/htdocs/langs/et_EE/sendings.lang
index def802c2684..bee3eb0eb3b 100644
--- a/htdocs/langs/et_EE/sendings.lang
+++ b/htdocs/langs/et_EE/sendings.lang
@@ -70,6 +70,8 @@ ProductQtyInSuppliersOrdersRunning=Product quantity into opened suppliers orders
 ProductQtyInShipmentAlreadySent=Product quantity from opened customer order already sent
 ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from opened supplier order already received
 NoProductToShipFoundIntoStock=No product to ship found into warehouse <b>%s</b>. Correct stock or go back to choose another warehouse.
+WeightVolShort=Weight/Vol.
+ValidateOrderFirstBeforeShipment=You must first validate the order before being able to make shipments.
 
 # Sending methods
 SendingMethodCATCH=Kliendi saak
diff --git a/htdocs/langs/et_EE/supplier_proposal.lang b/htdocs/langs/et_EE/supplier_proposal.lang
index 1a1bdc4df16..e37ced1b38f 100644
--- a/htdocs/langs/et_EE/supplier_proposal.lang
+++ b/htdocs/langs/et_EE/supplier_proposal.lang
@@ -58,3 +58,5 @@ DefaultModelSupplierProposalCreate=Default model creation
 DefaultModelSupplierProposalToBill=Default template when closing a price request (accepted)
 DefaultModelSupplierProposalClosed=Default template when closing a price request (refused)
 ListOfSupplierProposal=List of supplier proposal requests
+SupplierProposalsToClose=Supplier proposals to close
+SupplierProposalsToProcess=Supplier proposals to process
diff --git a/htdocs/langs/eu_ES/admin.lang b/htdocs/langs/eu_ES/admin.lang
index 69ea02cbf58..ff95d658f67 100644
--- a/htdocs/langs/eu_ES/admin.lang
+++ b/htdocs/langs/eu_ES/admin.lang
@@ -282,6 +282,7 @@ ModuleSetup=Moduluaren konfigurazioa
 ModulesSetup=Moduluen konfigurazioa
 ModuleFamilyBase=Sistema
 ModuleFamilyCrm=Customer Relation Management (CRM)
+ModuleFamilySrm=Supplier Relation Management (SRM)
 ModuleFamilyProducts=Products Management (PM)
 ModuleFamilyHr=Human Resource Management (HR)
 ModuleFamilyProjects=Proiektuak/Lan-taldeak
@@ -587,6 +588,7 @@ Permission38=Produktuak esportatu
 Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
 Permission42=Create/modify projects (shared project and projects i'm contact for)
 Permission44=Delete projects (shared project and projects i'm contact for)
+Permission45=Export projects
 Permission61=Read interventions
 Permission62=Create/modify interventions
 Permission64=Delete interventions
@@ -640,6 +642,7 @@ Permission162=Create/modify contracts/subscriptions
 Permission163=Activate a service/subscription of a contract
 Permission164=Disable a service/subscription of a contract
 Permission165=Delete contracts/subscriptions
+Permission167=Export contracts
 Permission171=Read trips and expenses (yours and your subordinates)
 Permission172=Create/modify trips and expenses
 Permission173=Delete trips and expenses
@@ -788,6 +791,7 @@ Permission2403=Delete actions (events or tasks) linked to his account
 Permission2411=Read actions (events or tasks) of others
 Permission2412=Create/modify actions (events or tasks) of others
 Permission2413=Delete actions (events or tasks) of others
+Permission2414=Export actions/tasks of others
 Permission2501=Dokumentuak ikusi/jaitsi
 Permission2502=Dokumentuak jaitsi
 Permission2503=Dokumentuak bidali edo ezabatzea
@@ -1713,3 +1717,4 @@ ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s is available. Ve
 MultiPriceRuleDesc=When option "Several level of prices per product/service" is on, you can define different prices (one per price level) for each product. To save you time, you can enter here rule to have price for each level autocalculated according to price of first level, so you will have to enter only price for first level on each product. This page is here to save you time and can be usefull only if your prices for each leve are relative to first level. You can ignore this page in most cases.
 ModelModulesProduct=Templates for product documents
 ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
+SeeSubstitutionVars=See * note for list of possible substitution variables
diff --git a/htdocs/langs/eu_ES/bills.lang b/htdocs/langs/eu_ES/bills.lang
index 39799cc2f1c..b8484172194 100644
--- a/htdocs/langs/eu_ES/bills.lang
+++ b/htdocs/langs/eu_ES/bills.lang
@@ -219,6 +219,7 @@ RemainderToBill=Remainder to bill
 SendBillByMail=Send invoice by email
 SendReminderBillByMail=Send reminder by email
 RelatedCommercialProposals=Related commercial proposals
+RelatedRecurringCustomerInvoices=Related recurring customer invoices
 MenuToValid=To valid
 DateMaxPayment=Payment due before
 DateEcheance=Due date limit
@@ -319,7 +320,6 @@ toolTipFrequency=Examples:<br /><b>Set 7 / day</b>: give a new invoice every 7 d
 NextDateToExecution=Date for next invoice generation
 DateLastGeneration=Date of last generation
 MaxPeriodNumber=Max nb of invoice generation
-RestPeriodNumber=Rest period number
 NbOfGenerationDone=Nb of invoice generation already done
 InvoiceAutoValidate=Automatically validate invoice
 GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
@@ -471,3 +471,7 @@ PDFCrevetteSituationInvoiceLine=Situation N°%s : Inv. N°%s on %s
 TotalSituationInvoice=Total situation
 invoiceLineProgressError=Invoice line progress can't be egal or upper the next invoice line
 updatePriceNextInvoiceErrorUpdateline=Error : update price on invoice line : %s
+ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
+ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
+ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
+
diff --git a/htdocs/langs/eu_ES/boxes.lang b/htdocs/langs/eu_ES/boxes.lang
index 57bfc174ec5..7619a335b61 100644
--- a/htdocs/langs/eu_ES/boxes.lang
+++ b/htdocs/langs/eu_ES/boxes.lang
@@ -60,8 +60,8 @@ BoxTitleLastContracts=Last %s contracts
 BoxTitleLastModifiedDonations=Last %s modified donations
 BoxTitleLastModifiedExpenses=Last %s modified expense reports
 BoxGlobalActivity=Global activity (invoices, proposals, orders)
-BoxGoodCustomers=Good Customers
-BoxTitleGoodCustomers=%s Good Customers
+BoxGoodCustomers=Good customers
+BoxTitleGoodCustomers=%s Good customers
 FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Last successfull refresh date: %s
 LastRefreshDate=Last refresh date
 NoRecordedBookmarks=No bookmarks defined.
diff --git a/htdocs/langs/eu_ES/companies.lang b/htdocs/langs/eu_ES/companies.lang
index 238f5999e18..b5e366ead66 100644
--- a/htdocs/langs/eu_ES/companies.lang
+++ b/htdocs/langs/eu_ES/companies.lang
@@ -202,7 +202,7 @@ ProfId3IN=Prof Id 3 (SRVC TAX)
 ProfId4IN=Prof Id 4
 ProfId5IN=Prof Id 5
 ProfId6IN=-
-ProfId1LU=Id. prof. 1 (RCS)
+ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
 ProfId2LU=Id. prof. 2 (Business permit)
 ProfId3LU=-
 ProfId4LU=-
@@ -317,10 +317,12 @@ ShowContact=Show contact
 ContactsAllShort=All (No filter)
 ContactType=Contact type
 ContactForOrders=Order's contact
+ContactForOrdersOrShipments=Order's or shipment's contact
 ContactForProposals=Proposal's contact
 ContactForContracts=Contract's contact
 ContactForInvoices=Invoice's contact
 NoContactForAnyOrder=This contact is not a contact for any order
+NoContactForAnyOrderOrShipment=This contact is not a contact for any order or shipment
 NoContactForAnyProposal=This contact is not a contact for any commercial proposal
 NoContactForAnyContract=This contact is not a contact for any contract
 NoContactForAnyInvoice=This contact is not a contact for any invoice
@@ -438,3 +440,6 @@ MergeThirdparties=Merge third parties
 ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one ? All linked objects (invoices, orders, ...) will be moved to current third party so you will be able to delete the duplicate one.
 ThirdpartiesMergeSuccess=Thirdparties have been merged
 ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
+SaleRepresentativeLogin=Login of sale representative
+SaleRepresentativeFirstname=Firstname of sale representative
+SaleRepresentativeLastname=Lastname of sale representative
diff --git a/htdocs/langs/eu_ES/errors.lang b/htdocs/langs/eu_ES/errors.lang
index 718b3e8413f..fa7804ce355 100644
--- a/htdocs/langs/eu_ES/errors.lang
+++ b/htdocs/langs/eu_ES/errors.lang
@@ -172,6 +172,8 @@ ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
 ErrorOppStatusRequiredIfAmount=You set an estimated amount for this opportunity/lead. So you must also enter its status
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
 ErrorSavingChanges=An error has ocurred when saving the changes
+ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
+ErrorFileMustHaveFormat=File must have format %s
 
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
diff --git a/htdocs/langs/eu_ES/exports.lang b/htdocs/langs/eu_ES/exports.lang
index 03c87b28bcf..1a490ea647d 100644
--- a/htdocs/langs/eu_ES/exports.lang
+++ b/htdocs/langs/eu_ES/exports.lang
@@ -128,6 +128,10 @@ SpecialCode=Special code
 ExportStringFilter=%% allows replacing one or more characters in the text
 ExportDateFilter=YYYY, YYYYMM, YYYYMMDD : filters by one year/month/day<br>YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD : filters over a range of years/months/days<br> > YYYY, > YYYYMM, > YYYYMMDD : filters on all following years/months/days<br> < YYYY, < YYYYMM, < YYYYMMDD : filters on all previous years/months/days
 ExportNumericFilter='NNNNN' filters by one value<br>'NNNNN+NNNNN' filters over a range of values<br>'&gt;NNNNN' filters by lower values<br>'&gt;NNNNN' filters by higher values
+ImportFromLine=Import starting from line number
+EndAtLineNb=End at line number
+SetThisValueTo2ToExcludeFirstLine=For example, set this value to 3 to exclude the 2 first lines
+KeepEmptyToGoToEndOfFile=Keep this field empty to go up to the end of file
 ## filters
 SelectFilterFields=If you want to filter on some values, just input values here.
 FilterableFields=Filterable Fields
diff --git a/htdocs/langs/eu_ES/main.lang b/htdocs/langs/eu_ES/main.lang
index 323fbfc0b2b..bb8f6e4b91b 100644
--- a/htdocs/langs/eu_ES/main.lang
+++ b/htdocs/langs/eu_ES/main.lang
@@ -25,6 +25,7 @@ FormatDateHourTextShort=%b %d, %Y, %I:%M %p
 FormatDateHourText=%B %d, %Y, %I:%M %p
 DatabaseConnection=Database connection
 NoTemplateDefined=No template defined for this email type
+AvailableVariables=Available substitution variables
 NoTranslation=No translation
 NoRecordFound=No record found
 NoError=No error
diff --git a/htdocs/langs/eu_ES/orders.lang b/htdocs/langs/eu_ES/orders.lang
index c0bfc3ccce3..33cd265b07f 100644
--- a/htdocs/langs/eu_ES/orders.lang
+++ b/htdocs/langs/eu_ES/orders.lang
@@ -32,6 +32,7 @@ StatusOrderSent=Shipment in process
 StatusOrderOnProcessShort=Ordered
 StatusOrderProcessedShort=Processed
 StatusOrderDelivered=Delivered
+StatusOrderDeliveredShort=Delivered
 StatusOrderToBillShort=Delivered
 StatusOrderToBill2Short=To bill
 StatusOrderApprovedShort=Approved
diff --git a/htdocs/langs/eu_ES/products.lang b/htdocs/langs/eu_ES/products.lang
index 5118e77c22b..27e8130e762 100644
--- a/htdocs/langs/eu_ES/products.lang
+++ b/htdocs/langs/eu_ES/products.lang
@@ -45,10 +45,6 @@ LastProducts=Last products
 CardProduct0=Product card
 CardProduct1=Service card
 CardContract=Contract card
-Warehouse=Warehouse
-Warehouses=Warehouses
-WarehouseOpened=Warehouse open
-WarehouseClosed=Warehouse closed
 Stock=Stock
 Stocks=Stocks
 Movement=Movement
@@ -318,3 +314,11 @@ WarningSelectOneDocument=Please select at least one document
 DefaultUnitToShow=Unit
 NbOfQtyInProposals=Qty in proposals
 ClinkOnALinkOfColumn=Click on a link of column %s to get a detailed view...
+TranslatedLabel=Translated label
+TranslatedDescription=Translated description
+TranslatedNote=Translated notes
+ProductWeight=Weight for 1 product
+ProductVolume=Volume for 1 product
+WeightUnits=Weight unit
+VolumeUnits=Volume unit
+SizeUnits=Size unit
diff --git a/htdocs/langs/eu_ES/projects.lang b/htdocs/langs/eu_ES/projects.lang
index 59f4ec5af51..b4a21befd80 100644
--- a/htdocs/langs/eu_ES/projects.lang
+++ b/htdocs/langs/eu_ES/projects.lang
@@ -74,6 +74,9 @@ Progress=Progress
 ProgressDeclared=Declared progress
 ProgressCalculated=Calculated progress
 Time=Time
+ListOfTasks=List of tasks
+GoToListOfTimeConsumed=Go to list of time consumed
+GoToListOfTasks=Go to list of tasks
 ListProposalsAssociatedProject=List of the commercial proposals associated with the project
 ListOrdersAssociatedProject=List of customer's orders associated with the project
 ListInvoicesAssociatedProject=List of customer's invoices associated with the project
@@ -198,3 +201,4 @@ OppStatusNEGO=Negociation
 OppStatusPENDING=Pending
 OppStatusWIN=Won
 OppStatusLOST=Lost
+Budget=Budget
diff --git a/htdocs/langs/eu_ES/sendings.lang b/htdocs/langs/eu_ES/sendings.lang
index fb7b9c08868..97f57e1d3c7 100644
--- a/htdocs/langs/eu_ES/sendings.lang
+++ b/htdocs/langs/eu_ES/sendings.lang
@@ -70,6 +70,8 @@ ProductQtyInSuppliersOrdersRunning=Product quantity into opened suppliers orders
 ProductQtyInShipmentAlreadySent=Product quantity from opened customer order already sent
 ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from opened supplier order already received
 NoProductToShipFoundIntoStock=No product to ship found into warehouse <b>%s</b>. Correct stock or go back to choose another warehouse.
+WeightVolShort=Weight/Vol.
+ValidateOrderFirstBeforeShipment=You must first validate the order before being able to make shipments.
 
 # Sending methods
 SendingMethodCATCH=Catch by customer
diff --git a/htdocs/langs/eu_ES/supplier_proposal.lang b/htdocs/langs/eu_ES/supplier_proposal.lang
index 1a1bdc4df16..e37ced1b38f 100644
--- a/htdocs/langs/eu_ES/supplier_proposal.lang
+++ b/htdocs/langs/eu_ES/supplier_proposal.lang
@@ -58,3 +58,5 @@ DefaultModelSupplierProposalCreate=Default model creation
 DefaultModelSupplierProposalToBill=Default template when closing a price request (accepted)
 DefaultModelSupplierProposalClosed=Default template when closing a price request (refused)
 ListOfSupplierProposal=List of supplier proposal requests
+SupplierProposalsToClose=Supplier proposals to close
+SupplierProposalsToProcess=Supplier proposals to process
diff --git a/htdocs/langs/fa_IR/admin.lang b/htdocs/langs/fa_IR/admin.lang
index 04439b56c1a..7326b2892a2 100644
--- a/htdocs/langs/fa_IR/admin.lang
+++ b/htdocs/langs/fa_IR/admin.lang
@@ -282,6 +282,7 @@ ModuleSetup=ماژول راه اندازی
 ModulesSetup=راه اندازی ماژول ها
 ModuleFamilyBase=سیستم
 ModuleFamilyCrm=مدیریت ارتباط با مشتری (CRM)
+ModuleFamilySrm=Supplier Relation Management (SRM)
 ModuleFamilyProducts=Products Management (PM)
 ModuleFamilyHr=Human Resource Management (HR)
 ModuleFamilyProjects=پروژه ها / کار مشارکتی
@@ -587,6 +588,7 @@ Permission38=محصولات صادراتی
 Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
 Permission42=ایجاد / تغییر پروژه (پروژه مشترک و پروژه های I تماس با هستم)
 Permission44=حذف پروژه (پروژه مشترک و پروژه های I تماس با هستم)
+Permission45=Export projects
 Permission61=خوانده شده مداخله
 Permission62=ایجاد / تغییر مداخلات
 Permission64=حذف مداخلات
@@ -640,6 +642,7 @@ Permission162=Create/modify contracts/subscriptions
 Permission163=Activate a service/subscription of a contract
 Permission164=Disable a service/subscription of a contract
 Permission165=Delete contracts/subscriptions
+Permission167=Export contracts
 Permission171=Read trips and expenses (yours and your subordinates)
 Permission172=Create/modify trips and expenses
 Permission173=Delete trips and expenses
@@ -788,6 +791,7 @@ Permission2403=حذف اقدامات (رویدادها و وظایف) مرتبط
 Permission2411=دفعات بازدید: اقدامات (رویدادها و وظایف) از دیگران
 Permission2412=ایجاد / اصلاح اعمال (رویدادها و وظایف) از دیگران
 Permission2413=حذف اقدامات (رویدادها و وظایف) از دیگران
+Permission2414=Export actions/tasks of others
 Permission2501=خوانده شده / دانلود اسناد
 Permission2502=دانلود اسناد
 Permission2503=ثبت کردن و یا حذف اسناد
@@ -1713,3 +1717,4 @@ ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s is available. Ve
 MultiPriceRuleDesc=When option "Several level of prices per product/service" is on, you can define different prices (one per price level) for each product. To save you time, you can enter here rule to have price for each level autocalculated according to price of first level, so you will have to enter only price for first level on each product. This page is here to save you time and can be usefull only if your prices for each leve are relative to first level. You can ignore this page in most cases.
 ModelModulesProduct=Templates for product documents
 ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
+SeeSubstitutionVars=See * note for list of possible substitution variables
diff --git a/htdocs/langs/fa_IR/bills.lang b/htdocs/langs/fa_IR/bills.lang
index d57737760cc..9184ee8a819 100644
--- a/htdocs/langs/fa_IR/bills.lang
+++ b/htdocs/langs/fa_IR/bills.lang
@@ -219,6 +219,7 @@ RemainderToBill=باقی مانده به لایحه
 SendBillByMail=ارسال صورتحساب از طریق ایمیل
 SendReminderBillByMail=ارسال یادآور شده توسط ایمیل
 RelatedCommercialProposals=طرح تجاری مرتبط
+RelatedRecurringCustomerInvoices=Related recurring customer invoices
 MenuToValid=به معتبر
 DateMaxPayment=پرداخت به دلیل قبل از
 DateEcheance=حد موعد مقرر
@@ -319,7 +320,6 @@ toolTipFrequency=Examples:<br /><b>Set 7 / day</b>: give a new invoice every 7 d
 NextDateToExecution=Date for next invoice generation
 DateLastGeneration=Date of last generation
 MaxPeriodNumber=Max nb of invoice generation
-RestPeriodNumber=Rest period number
 NbOfGenerationDone=Nb of invoice generation already done
 InvoiceAutoValidate=Automatically validate invoice
 GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
@@ -471,3 +471,7 @@ PDFCrevetteSituationInvoiceLine=Situation N°%s : Inv. N°%s on %s
 TotalSituationInvoice=Total situation
 invoiceLineProgressError=Invoice line progress can't be egal or upper the next invoice line
 updatePriceNextInvoiceErrorUpdateline=Error : update price on invoice line : %s
+ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
+ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
+ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
+
diff --git a/htdocs/langs/fa_IR/boxes.lang b/htdocs/langs/fa_IR/boxes.lang
index 28a1061d93e..4609e8bee9a 100644
--- a/htdocs/langs/fa_IR/boxes.lang
+++ b/htdocs/langs/fa_IR/boxes.lang
@@ -60,8 +60,8 @@ BoxTitleLastContracts=تاریخ و زمان آخرین٪ s در قرارداد
 BoxTitleLastModifiedDonations=تاریخ و زمان آخرین٪ بازدید کنندگان کمک های مالی اصلاح شده
 BoxTitleLastModifiedExpenses=Last %s modified expense reports
 BoxGlobalActivity=فعالیت های جهانی (فاکتورها، پیشنهادات، سفارشات)
-BoxGoodCustomers=Good Customers
-BoxTitleGoodCustomers=%s Good Customers
+BoxGoodCustomers=Good customers
+BoxTitleGoodCustomers=%s Good customers
 FailedToRefreshDataInfoNotUpToDate=به روز کردن شار RSS شکست خورده است. آخرین تاریخ تازه کردن موفق:٪ s را
 LastRefreshDate=آخرین تاریخ تازه کردن
 NoRecordedBookmarks=بدون بوک مارک ها تعریف شده است.
diff --git a/htdocs/langs/fa_IR/companies.lang b/htdocs/langs/fa_IR/companies.lang
index 35fdd9a76db..8d15f2c58a1 100644
--- a/htdocs/langs/fa_IR/companies.lang
+++ b/htdocs/langs/fa_IR/companies.lang
@@ -202,7 +202,7 @@ ProfId3IN=پروفسور کد 3 (TAX SRVC)
 ProfId4IN=پروفسور کد 4
 ProfId5IN=پروفسور کد 5
 ProfId6IN=-
-ProfId1LU=Id. prof. 1 (RCS)
+ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
 ProfId2LU=Id. prof. 2 (Business permit)
 ProfId3LU=-
 ProfId4LU=-
@@ -317,10 +317,12 @@ ShowContact=نمایش تماس
 ContactsAllShort=همه (بدون فیلتر)
 ContactType=تماس با نوع
 ContactForOrders=تماس با سفارش
+ContactForOrdersOrShipments=Order's or shipment's contact
 ContactForProposals=تماس پیشنهاد را
 ContactForContracts=تماس قرارداد را
 ContactForInvoices=تماس با فاکتور را
 NoContactForAnyOrder=این تماس یک تماس برای هر سفارش نمی
+NoContactForAnyOrderOrShipment=This contact is not a contact for any order or shipment
 NoContactForAnyProposal=این تماس یک تماس برای هر پیشنهاد تجاری
 NoContactForAnyContract=این تماس یک تماس برای هر قرارداد
 NoContactForAnyInvoice=این تماس یک تماس برای هر فاکتور نمی
@@ -438,3 +440,6 @@ MergeThirdparties=Merge third parties
 ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one ? All linked objects (invoices, orders, ...) will be moved to current third party so you will be able to delete the duplicate one.
 ThirdpartiesMergeSuccess=Thirdparties have been merged
 ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
+SaleRepresentativeLogin=Login of sale representative
+SaleRepresentativeFirstname=Firstname of sale representative
+SaleRepresentativeLastname=Lastname of sale representative
diff --git a/htdocs/langs/fa_IR/errors.lang b/htdocs/langs/fa_IR/errors.lang
index 8b8b28dce4c..41f304153a2 100644
--- a/htdocs/langs/fa_IR/errors.lang
+++ b/htdocs/langs/fa_IR/errors.lang
@@ -172,6 +172,8 @@ ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
 ErrorOppStatusRequiredIfAmount=You set an estimated amount for this opportunity/lead. So you must also enter its status
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
 ErrorSavingChanges=An error has ocurred when saving the changes
+ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
+ErrorFileMustHaveFormat=File must have format %s
 
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
diff --git a/htdocs/langs/fa_IR/exports.lang b/htdocs/langs/fa_IR/exports.lang
index 84df8451c49..f50f3fb2adc 100644
--- a/htdocs/langs/fa_IR/exports.lang
+++ b/htdocs/langs/fa_IR/exports.lang
@@ -128,6 +128,10 @@ SpecialCode=کد ویژه
 ExportStringFilter=٪٪ اجازه می دهد تا به جای یک یا چند کاراکتر در متن
 ExportDateFilter=YYYY, YYYYMM, YYYYMMDD : filters by one year/month/day<br>YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD : filters over a range of years/months/days<br> > YYYY, > YYYYMM, > YYYYMMDD : filters on all following years/months/days<br> < YYYY, < YYYYMM, < YYYYMMDD : filters on all previous years/months/days
 ExportNumericFilter=فیلتر 'NNNNN توسط یک ارزش <br> فیلتر 'NNNNN + NNNNN' بیش از یک طیف وسیعی از مقادیر <br> '> NNNNN' فیلتر شده توسط مقادیر پایین تر <br> '> NNNNN' فیلتر شده توسط ارزش بالاتر
+ImportFromLine=Import starting from line number
+EndAtLineNb=End at line number
+SetThisValueTo2ToExcludeFirstLine=For example, set this value to 3 to exclude the 2 first lines
+KeepEmptyToGoToEndOfFile=Keep this field empty to go up to the end of file
 ## filters
 SelectFilterFields=اگر می خواهید برای فیلتر کردن در برخی از ارزش ها، فقط مقادیر ورودی در اینجا.
 FilterableFields=Filterable Fields
diff --git a/htdocs/langs/fa_IR/main.lang b/htdocs/langs/fa_IR/main.lang
index 10f8259c0ac..24eac4d03cd 100644
--- a/htdocs/langs/fa_IR/main.lang
+++ b/htdocs/langs/fa_IR/main.lang
@@ -25,6 +25,7 @@ FormatDateHourTextShort=%b %d %Y %I:%M %p
 FormatDateHourText=%B %d %Y %H:%M %p
 DatabaseConnection=اتصال به پایگاه داده
 NoTemplateDefined=No template defined for this email type
+AvailableVariables=Available substitution variables
 NoTranslation=بدون ترجمه
 NoRecordFound=هیچ سابقه ای پیدا نشد
 NoError=بدون خطا
diff --git a/htdocs/langs/fa_IR/orders.lang b/htdocs/langs/fa_IR/orders.lang
index c58a758c474..5fe072a6767 100644
--- a/htdocs/langs/fa_IR/orders.lang
+++ b/htdocs/langs/fa_IR/orders.lang
@@ -32,6 +32,7 @@ StatusOrderSent=حمل و نقل در فرایند
 StatusOrderOnProcessShort=Ordered
 StatusOrderProcessedShort=پردازش
 StatusOrderDelivered=Delivered
+StatusOrderDeliveredShort=Delivered
 StatusOrderToBillShort=تحویل
 StatusOrderToBill2Short=به بیل
 StatusOrderApprovedShort=تایید شده
diff --git a/htdocs/langs/fa_IR/products.lang b/htdocs/langs/fa_IR/products.lang
index de5525023f3..28305a9a887 100644
--- a/htdocs/langs/fa_IR/products.lang
+++ b/htdocs/langs/fa_IR/products.lang
@@ -45,10 +45,6 @@ LastProducts=آخرین محصولات
 CardProduct0=کارت
 CardProduct1=کارت خدمات
 CardContract=کارت قرارداد
-Warehouse=مخزن
-Warehouses=ساختمان و ذخیره سازی
-WarehouseOpened=Warehouse open
-WarehouseClosed=انبار بسته شده
 Stock=موجودی
 Stocks=سهام
 Movement=جنبش
@@ -318,3 +314,11 @@ WarningSelectOneDocument=Please select at least one document
 DefaultUnitToShow=Unit
 NbOfQtyInProposals=Qty in proposals
 ClinkOnALinkOfColumn=Click on a link of column %s to get a detailed view...
+TranslatedLabel=Translated label
+TranslatedDescription=Translated description
+TranslatedNote=Translated notes
+ProductWeight=Weight for 1 product
+ProductVolume=Volume for 1 product
+WeightUnits=Weight unit
+VolumeUnits=Volume unit
+SizeUnits=Size unit
diff --git a/htdocs/langs/fa_IR/projects.lang b/htdocs/langs/fa_IR/projects.lang
index ff7fd2f4256..8846fde35c4 100644
--- a/htdocs/langs/fa_IR/projects.lang
+++ b/htdocs/langs/fa_IR/projects.lang
@@ -74,6 +74,9 @@ Progress=پیشرفت
 ProgressDeclared=پیشرفت اعلام کرد
 ProgressCalculated=پیشرفت محاسبه شده
 Time=زمان
+ListOfTasks=List of tasks
+GoToListOfTimeConsumed=Go to list of time consumed
+GoToListOfTasks=Go to list of tasks
 ListProposalsAssociatedProject=فهرست طرح تجاری مرتبط با پروژه
 ListOrdersAssociatedProject=لیست سفارشات مشتری در ارتباط با پروژه
 ListInvoicesAssociatedProject=فهرست فاکتورها مشتری در ارتباط با پروژه
@@ -198,3 +201,4 @@ OppStatusNEGO=Negociation
 OppStatusPENDING=Pending
 OppStatusWIN=Won
 OppStatusLOST=Lost
+Budget=Budget
diff --git a/htdocs/langs/fa_IR/sendings.lang b/htdocs/langs/fa_IR/sendings.lang
index 1cc7e3bd237..9f9db4de309 100644
--- a/htdocs/langs/fa_IR/sendings.lang
+++ b/htdocs/langs/fa_IR/sendings.lang
@@ -70,6 +70,8 @@ ProductQtyInSuppliersOrdersRunning=Product quantity into opened suppliers orders
 ProductQtyInShipmentAlreadySent=Product quantity from opened customer order already sent
 ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from opened supplier order already received
 NoProductToShipFoundIntoStock=No product to ship found into warehouse <b>%s</b>. Correct stock or go back to choose another warehouse.
+WeightVolShort=Weight/Vol.
+ValidateOrderFirstBeforeShipment=You must first validate the order before being able to make shipments.
 
 # Sending methods
 SendingMethodCATCH=گرفتن توسط مشتری
diff --git a/htdocs/langs/fa_IR/supplier_proposal.lang b/htdocs/langs/fa_IR/supplier_proposal.lang
index 1a1bdc4df16..e37ced1b38f 100644
--- a/htdocs/langs/fa_IR/supplier_proposal.lang
+++ b/htdocs/langs/fa_IR/supplier_proposal.lang
@@ -58,3 +58,5 @@ DefaultModelSupplierProposalCreate=Default model creation
 DefaultModelSupplierProposalToBill=Default template when closing a price request (accepted)
 DefaultModelSupplierProposalClosed=Default template when closing a price request (refused)
 ListOfSupplierProposal=List of supplier proposal requests
+SupplierProposalsToClose=Supplier proposals to close
+SupplierProposalsToProcess=Supplier proposals to process
diff --git a/htdocs/langs/fi_FI/admin.lang b/htdocs/langs/fi_FI/admin.lang
index b5162e3dd27..bc95052e5ca 100644
--- a/htdocs/langs/fi_FI/admin.lang
+++ b/htdocs/langs/fi_FI/admin.lang
@@ -282,6 +282,7 @@ ModuleSetup=Moduuli setup
 ModulesSetup=Moduulit setup
 ModuleFamilyBase=System
 ModuleFamilyCrm=Asiakas Ressource Management (CRM)
+ModuleFamilySrm=Supplier Relation Management (SRM)
 ModuleFamilyProducts=Products Management (PM)
 ModuleFamilyHr=Human Resource Management (HR)
 ModuleFamilyProjects=Projektit / Yhteistyöhankkeet työn
@@ -587,6 +588,7 @@ Permission38=Vientituotteen
 Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
 Permission42=Luoda / muuttaa hankkeita, muokata tehtäviä minun hankkeiden
 Permission44=Poista hankkeiden
+Permission45=Export projects
 Permission61=Lue interventioiden
 Permission62=Luoda / muuttaa interventioiden
 Permission64=Poista interventioiden
@@ -640,6 +642,7 @@ Permission162=Create/modify contracts/subscriptions
 Permission163=Activate a service/subscription of a contract
 Permission164=Disable a service/subscription of a contract
 Permission165=Delete contracts/subscriptions
+Permission167=Export contracts
 Permission171=Read trips and expenses (yours and your subordinates)
 Permission172=Create/modify trips and expenses
 Permission173=Delete trips and expenses
@@ -788,6 +791,7 @@ Permission2403=Lue toimet (tapahtumat tai tehtävät) muiden
 Permission2411=Lue toimet (tapahtumien tai tehtävien) muiden
 Permission2412=Luo / Muokkaa toimet (tapahtumien tai tehtävien) muiden
 Permission2413=Poista toimet (tapahtumien tai tehtävien) muiden
+Permission2414=Export actions/tasks of others
 Permission2501=Lue asiakirjat
 Permission2502=Lähetä tai poistaa asiakirjoja
 Permission2503=Lähetä tai poistaa asiakirjoja
@@ -1713,3 +1717,4 @@ ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s is available. Ve
 MultiPriceRuleDesc=When option "Several level of prices per product/service" is on, you can define different prices (one per price level) for each product. To save you time, you can enter here rule to have price for each level autocalculated according to price of first level, so you will have to enter only price for first level on each product. This page is here to save you time and can be usefull only if your prices for each leve are relative to first level. You can ignore this page in most cases.
 ModelModulesProduct=Templates for product documents
 ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
+SeeSubstitutionVars=See * note for list of possible substitution variables
diff --git a/htdocs/langs/fi_FI/bills.lang b/htdocs/langs/fi_FI/bills.lang
index 80aebee368f..f811cfb61f0 100644
--- a/htdocs/langs/fi_FI/bills.lang
+++ b/htdocs/langs/fi_FI/bills.lang
@@ -219,6 +219,7 @@ RemainderToBill=Jäävä bill
 SendBillByMail=Lähetä lasku sähköpostitse
 SendReminderBillByMail=Lähettää muistutuksen sähköpostilla
 RelatedCommercialProposals=Liittyvien kaupallisten ehdotuksia
+RelatedRecurringCustomerInvoices=Related recurring customer invoices
 MenuToValid=Kelvollisiin
 DateMaxPayment=Maksettava ennen
 DateEcheance=Eräpäivä raja
@@ -319,7 +320,6 @@ toolTipFrequency=Examples:<br /><b>Set 7 / day</b>: give a new invoice every 7 d
 NextDateToExecution=Date for next invoice generation
 DateLastGeneration=Date of last generation
 MaxPeriodNumber=Max nb of invoice generation
-RestPeriodNumber=Rest period number
 NbOfGenerationDone=Nb of invoice generation already done
 InvoiceAutoValidate=Automatically validate invoice
 GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
@@ -471,3 +471,7 @@ PDFCrevetteSituationInvoiceLine=Situation N°%s : Inv. N°%s on %s
 TotalSituationInvoice=Total situation
 invoiceLineProgressError=Invoice line progress can't be egal or upper the next invoice line
 updatePriceNextInvoiceErrorUpdateline=Error : update price on invoice line : %s
+ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
+ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
+ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
+
diff --git a/htdocs/langs/fi_FI/boxes.lang b/htdocs/langs/fi_FI/boxes.lang
index f0999b61c12..77300203a05 100644
--- a/htdocs/langs/fi_FI/boxes.lang
+++ b/htdocs/langs/fi_FI/boxes.lang
@@ -60,8 +60,8 @@ BoxTitleLastContracts=Viimeisimmät %s sopimukset
 BoxTitleLastModifiedDonations=Viimeisimmät %s muokatut lahjoitukset
 BoxTitleLastModifiedExpenses=Last %s modified expense reports
 BoxGlobalActivity=Yleisaktiviteetit (laskut, ehdotukset, tilaukset)
-BoxGoodCustomers=Good Customers
-BoxTitleGoodCustomers=%s Good Customers
+BoxGoodCustomers=Good customers
+BoxTitleGoodCustomers=%s Good customers
 FailedToRefreshDataInfoNotUpToDate=RSS päivitys epäonnistui. Viimeisin onnistunut päivityksen päivämäärä: %s
 LastRefreshDate=Viimeisin päivitys
 NoRecordedBookmarks=Kirjanmerkkejä ei ole määritelty.
diff --git a/htdocs/langs/fi_FI/companies.lang b/htdocs/langs/fi_FI/companies.lang
index 05bedc40afc..3b4718cc54b 100644
--- a/htdocs/langs/fi_FI/companies.lang
+++ b/htdocs/langs/fi_FI/companies.lang
@@ -202,7 +202,7 @@ ProfId3IN=Prof Id 3
 ProfId4IN=Prof Id 4
 ProfId5IN=Prof Id 5
 ProfId6IN=-
-ProfId1LU=Id. prof. 1 (RCS)
+ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
 ProfId2LU=Id. prof. 2 (Business permit)
 ProfId3LU=-
 ProfId4LU=-
@@ -317,10 +317,12 @@ ShowContact=Näytä yhteystiedot
 ContactsAllShort=Kaikki (N: o suodatin)
 ContactType=Yhteystiedot tyyppi
 ContactForOrders=Tilaukset yhteystiedot
+ContactForOrdersOrShipments=Order's or shipment's contact
 ContactForProposals=Ehdotukset yhteystiedot
 ContactForContracts=Sopimukset yhteystiedot
 ContactForInvoices=Laskut yhteystiedot
 NoContactForAnyOrder=Tämä yhteyshenkilö ei ole yhteyttä mihinkään jotta
+NoContactForAnyOrderOrShipment=This contact is not a contact for any order or shipment
 NoContactForAnyProposal=Tämä yhteys ei ole yhteyttä mihinkään kaupalliseen ehdotus
 NoContactForAnyContract=Tämä yhteys ei ole yhteyttä mihinkään sopimukseen
 NoContactForAnyInvoice=Tämä yhteys ei ole yhteyttä mihinkään lasku
@@ -438,3 +440,6 @@ MergeThirdparties=Merge third parties
 ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one ? All linked objects (invoices, orders, ...) will be moved to current third party so you will be able to delete the duplicate one.
 ThirdpartiesMergeSuccess=Thirdparties have been merged
 ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
+SaleRepresentativeLogin=Login of sale representative
+SaleRepresentativeFirstname=Firstname of sale representative
+SaleRepresentativeLastname=Lastname of sale representative
diff --git a/htdocs/langs/fi_FI/errors.lang b/htdocs/langs/fi_FI/errors.lang
index 211ca873a46..2048bbc50da 100644
--- a/htdocs/langs/fi_FI/errors.lang
+++ b/htdocs/langs/fi_FI/errors.lang
@@ -172,6 +172,8 @@ ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
 ErrorOppStatusRequiredIfAmount=You set an estimated amount for this opportunity/lead. So you must also enter its status
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
 ErrorSavingChanges=An error has ocurred when saving the changes
+ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
+ErrorFileMustHaveFormat=File must have format %s
 
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
diff --git a/htdocs/langs/fi_FI/exports.lang b/htdocs/langs/fi_FI/exports.lang
index beeae48e9c3..3301528dd14 100644
--- a/htdocs/langs/fi_FI/exports.lang
+++ b/htdocs/langs/fi_FI/exports.lang
@@ -128,6 +128,10 @@ SpecialCode=Special code
 ExportStringFilter=%% allows replacing one or more characters in the text
 ExportDateFilter=YYYY, YYYYMM, YYYYMMDD : filters by one year/month/day<br>YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD : filters over a range of years/months/days<br> > YYYY, > YYYYMM, > YYYYMMDD : filters on all following years/months/days<br> < YYYY, < YYYYMM, < YYYYMMDD : filters on all previous years/months/days
 ExportNumericFilter='NNNNN' filters by one value<br>'NNNNN+NNNNN' filters over a range of values<br>'&gt;NNNNN' filters by lower values<br>'&gt;NNNNN' filters by higher values
+ImportFromLine=Import starting from line number
+EndAtLineNb=End at line number
+SetThisValueTo2ToExcludeFirstLine=For example, set this value to 3 to exclude the 2 first lines
+KeepEmptyToGoToEndOfFile=Keep this field empty to go up to the end of file
 ## filters
 SelectFilterFields=If you want to filter on some values, just input values here.
 FilterableFields=Filterable Fields
diff --git a/htdocs/langs/fi_FI/main.lang b/htdocs/langs/fi_FI/main.lang
index 176794c582f..33771c311d4 100644
--- a/htdocs/langs/fi_FI/main.lang
+++ b/htdocs/langs/fi_FI/main.lang
@@ -25,6 +25,7 @@ FormatDateHourTextShort=%d. %b %Y %H.%M
 FormatDateHourText=%d. %B %Y %H.%M
 DatabaseConnection=Tietokantayhteys
 NoTemplateDefined=No template defined for this email type
+AvailableVariables=Available substitution variables
 NoTranslation=Ei käännöstä
 NoRecordFound=Tietueita ei löytynyt
 NoError=Ei virheitä
diff --git a/htdocs/langs/fi_FI/orders.lang b/htdocs/langs/fi_FI/orders.lang
index b00e1b8fa8d..af7833735de 100644
--- a/htdocs/langs/fi_FI/orders.lang
+++ b/htdocs/langs/fi_FI/orders.lang
@@ -32,6 +32,7 @@ StatusOrderSent=Shipment in process
 StatusOrderOnProcessShort=Ordered
 StatusOrderProcessedShort=Jalostettu
 StatusOrderDelivered=Delivered
+StatusOrderDeliveredShort=Delivered
 StatusOrderToBillShort=Bill
 StatusOrderToBill2Short=Bill
 StatusOrderApprovedShort=Hyväksyttiin
diff --git a/htdocs/langs/fi_FI/products.lang b/htdocs/langs/fi_FI/products.lang
index dc8451ffc06..bdcac8d9dc9 100644
--- a/htdocs/langs/fi_FI/products.lang
+++ b/htdocs/langs/fi_FI/products.lang
@@ -45,10 +45,6 @@ LastProducts=Uusimmat tuotteet
 CardProduct0=Tuote-kortti
 CardProduct1=Palvelukortti
 CardContract=Sopimus-kortti
-Warehouse=Varasto
-Warehouses=Varastot
-WarehouseOpened=Warehouse open
-WarehouseClosed=Varasto suljettu
 Stock=Kanta
 Stocks=Varastot
 Movement=Movement
@@ -318,3 +314,11 @@ WarningSelectOneDocument=Please select at least one document
 DefaultUnitToShow=Unit
 NbOfQtyInProposals=Qty in proposals
 ClinkOnALinkOfColumn=Click on a link of column %s to get a detailed view...
+TranslatedLabel=Translated label
+TranslatedDescription=Translated description
+TranslatedNote=Translated notes
+ProductWeight=Weight for 1 product
+ProductVolume=Volume for 1 product
+WeightUnits=Weight unit
+VolumeUnits=Volume unit
+SizeUnits=Size unit
diff --git a/htdocs/langs/fi_FI/projects.lang b/htdocs/langs/fi_FI/projects.lang
index bb539c3611e..fea93953f69 100644
--- a/htdocs/langs/fi_FI/projects.lang
+++ b/htdocs/langs/fi_FI/projects.lang
@@ -74,6 +74,9 @@ Progress=Edistyminen
 ProgressDeclared=Declared progress
 ProgressCalculated=Calculated progress
 Time=Aika
+ListOfTasks=List of tasks
+GoToListOfTimeConsumed=Go to list of time consumed
+GoToListOfTasks=Go to list of tasks
 ListProposalsAssociatedProject=Luettelot kaupallisen ehdotuksia hankkeeseen liittyvät
 ListOrdersAssociatedProject=Luettelot tilausten hankkeeseen liittyvät
 ListInvoicesAssociatedProject=Luettelot laskut liittyvät hankkeen
@@ -198,3 +201,4 @@ OppStatusNEGO=Negociation
 OppStatusPENDING=Pending
 OppStatusWIN=Won
 OppStatusLOST=Lost
+Budget=Budget
diff --git a/htdocs/langs/fi_FI/sendings.lang b/htdocs/langs/fi_FI/sendings.lang
index 0573278ffb3..bca682a3d59 100644
--- a/htdocs/langs/fi_FI/sendings.lang
+++ b/htdocs/langs/fi_FI/sendings.lang
@@ -70,6 +70,8 @@ ProductQtyInSuppliersOrdersRunning=Product quantity into opened suppliers orders
 ProductQtyInShipmentAlreadySent=Product quantity from opened customer order already sent
 ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from opened supplier order already received
 NoProductToShipFoundIntoStock=No product to ship found into warehouse <b>%s</b>. Correct stock or go back to choose another warehouse.
+WeightVolShort=Weight/Vol.
+ValidateOrderFirstBeforeShipment=You must first validate the order before being able to make shipments.
 
 # Sending methods
 SendingMethodCATCH=Saalis asiakas
diff --git a/htdocs/langs/fi_FI/supplier_proposal.lang b/htdocs/langs/fi_FI/supplier_proposal.lang
index 1a1bdc4df16..e37ced1b38f 100644
--- a/htdocs/langs/fi_FI/supplier_proposal.lang
+++ b/htdocs/langs/fi_FI/supplier_proposal.lang
@@ -58,3 +58,5 @@ DefaultModelSupplierProposalCreate=Default model creation
 DefaultModelSupplierProposalToBill=Default template when closing a price request (accepted)
 DefaultModelSupplierProposalClosed=Default template when closing a price request (refused)
 ListOfSupplierProposal=List of supplier proposal requests
+SupplierProposalsToClose=Supplier proposals to close
+SupplierProposalsToProcess=Supplier proposals to process
diff --git a/htdocs/langs/fr_BE/cron.lang b/htdocs/langs/fr_BE/cron.lang
new file mode 100644
index 00000000000..d8953584e61
--- /dev/null
+++ b/htdocs/langs/fr_BE/cron.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - cron
+CronDtLastLaunch=Start date of last execution
+CronDtLastResult=End date of last execution
diff --git a/htdocs/langs/fr_CA/accountancy.lang b/htdocs/langs/fr_CA/accountancy.lang
index 4a851f31c28..d26f18aaab9 100644
--- a/htdocs/langs/fr_CA/accountancy.lang
+++ b/htdocs/langs/fr_CA/accountancy.lang
@@ -1,2 +1,38 @@
 # Dolibarr language file - Source file is en_US - accountancy
-EnabledProduct=In Product
+ACCOUNTING_EXPORT_SEPARATORCSV=Séparateur de colonne pour le fichier export
+ACCOUNTING_EXPORT_DATE=Format de date pour le fichier export
+ACCOUNTING_EXPORT_PIECE=Exporter le nombre de pièces
+ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=Exporter avec compte global
+ACCOUNTING_EXPORT_LABEL=Exporter la désignation
+Selectformat=Sélectionner le format de date pour le fichier
+ACCOUNTING_EXPORT_PREFIX_SPEC=Spécifiez le préfixe du nom de fichier
+Accounting=Compte
+AccountAccountingSuggest=Compte comptable suggéré
+AccountBalance=Solde du compte
+CAHTF=Total achats fournisseur avant taxes
+InvoiceLines=Lignes de factures à ventiler
+IntoAccount=Ventiler dans le compte de la comptabilité
+ACCOUNTING_LENGTH_DESCRIPTION=Longueur pour l'affichage des produits et services description dans les listes (valeur conseillée = 50 )
+ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Longueur pour l'affichage des produits et services compte formulaire de description dans les listes (valeur conseillée = 50 )
+ACCOUNTING_EXPENSEREPORT_JOURNAL=Note de frais
+FinanceJournal=Journal des finances
+DescFinanceJournal=Journal de banque comprenant tous les types de règlements autres que espèce\t
+NumMvts=Nombre de mouvement
+TotalVente=Chiffre d'affaires total avant taxes
+MvtNotCorrectlyBalanced=Le mouvement n'est pas correctement équilibré. Crédit = %s. Débit = %s
+GeneralLedgerIsWritten=Les opérations sont écrites dans le grand livre général
+ExportFormat=Format d'exportation
+Prefixname=Préfixe du fichier exporté
+Separate=Séparateur d'export
+Headercol=Nom de colonne dans l'entête du fichier
+Fieldname=Nom du champs
+Headername=Nom de l'entête
+EnabledProduct=En produits
+EnabledTiers=En tiers
+EnabledVat=En TPS/TVH
+InitAccountancy=Compabilité initiale
+InitAccountancyDesc=Cette page peut être utilisée pour initialiser un compte comptable sur les produits et services qui ne disposent pas de compte comptable défini pour les ventes et les achats . Vérifiez avant que l'installation du module de comptabilité est terminée.
+OptionModeProductSell=Mode de ventes
+OptionModeProductBuy=Mode d'achats
+OptionModeProductSellDesc=Voir tous les produits sans compte comptable défini pour les ventes.
+OptionModeProductBuyDesc=Voir tous les produits sans compte comptable défini pour les achats.
diff --git a/htdocs/langs/fr_CA/admin.lang b/htdocs/langs/fr_CA/admin.lang
index c8598b437d2..08ac656d477 100644
--- a/htdocs/langs/fr_CA/admin.lang
+++ b/htdocs/langs/fr_CA/admin.lang
@@ -3,46 +3,130 @@ FilesUpdated=Mettre à jour les fichiers
 Fiscalyear=Année fiscale
 InstrucToEncodePass=Pour chiffrer le mot de passe de la base dans le fichier de configuration <b>conf.php</b>, remplacer la ligne<br><b>$dolibarr_main_db_pass="...";</b><br>par<br><b>$dolibarr_main_db_pass="crypted:%s";</b>
 InstrucToClearPass=Pour avoir le mot de passe de la base décodé (en clair) dans le fichier de configuration <b>conf.php</b>, remplacer dans ce fichier la ligne<br><b>$dolibarr_main_db_pass="crypted:..."</b><br>par<br><b>$dolibarr_main_db_pass="%s"</b>
+SubmitTranslationENUS=Si la traduction de cette langue est incomplète ou vous trouvez des erreurs , vous pouvez corriger cela en modifiant les fichiers dans le répertoire <b> langs/%s </b> et soumettre les fichiers modifiés sur dolibarr.org/forum ou pour les développeurs sur github.com/Dolibarr/dolibarr.
+SubmitTranslation=Si la traduction de cette langue est incomplète ou vous trouvez des erreur , vous pouvez corriger cela en modifiant les fichiers dans le répertoire <b>langs/%s</b> et soumettre votre changement à www.transifex.com/dolibarr-association/dolibarr/
+ModuleFamilyProducts=Gestion des produits
+ModuleFamilyHr=Gestion des ressources humaines (GRH)
+ModuleFamilyPortal=Site internet et autres applications frontales
+ModuleFamilyInterface=Interfaces avec les systèmes externes
 DownloadPackageFromWebSite=Télécharger le package %s.
 UnpackPackageInDolibarrRoot=Décompresser le paquet dans le répertoire dédié aux modules externes : <b>%s</b>
 YouCanSubmitFile=Sélectionner le module :
-HideAnyVATInformationOnPDF=Cacher toutes les informations en rapport avec la TVA (TPS) sur les PDF générés
-OldVATRates=Ancien taux de TVA (TPS)
-NewVATRates=Nouveau taux de TVA (TPS)
-LocalTaxDesc=Certains pays appliquent 2 voire 3 taux sur chaque ligne de facture. Si c'est le cas, choisissez le type du deuxième et troisième taux et sa valeur. Les types possibles sont:<br>1 : taxe locale sur les produits et services hors tva (la taxe locale est calculée sur le montant hors taxe)<br>2 : taxe locale sur les produits et services avant tva (TPS) (la taxe locale est appliquée sur le montant + tva (TPS))<br>3 : taxe locale uniquement sur les produits hors tva (TPS) (la taxe locale est calculée sur le montant hors taxe)<br>4 : taxe locale uniquement sur les produits avant tva(TPS) (la taxe locale est calculée sur le montant + tva)<br>5 : taxe locale uniquement sur les services hors tva (la taxe locale est calculée sur le montant hors taxe)<br>6 : taxe locale uniquement sur les service avant tva (la taxe locale est calculée sur le montant + tva)
+DisableLinkToHelp=Masquer lien vers l'aide en ligne "<b>%s</b>"
+ListOfDirectoriesForModelGenODT=Liste des répertoires contenant des fichiers de modèles avec le format OpenDocument . <br><br> Mettez ici le chemin complet des répertoires .<br>Ajouter un retour chariot entre répertoire eah.<br> Pour ajouter un répertoire du module de GED , ajouter ici<b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br><br> Fichiers dans ces répertoires doit se terminer par <b>.odt</b> or <b>.ods</b>.
+HideAnyVATInformationOnPDF=Cacher toutes les informations en rapport avec la TPS/TVH sur les PDF générés
+PlaceCustomerAddressToIsoLocation=Utilisez french standard position (La Poste) pour le client position d'adresse
+OldVATRates=Ancien taux de TPS/TVH
+NewVATRates=Nouveau taux de TPS/TVH
+ExtrafieldParamHelpsellist=La liste vient d'une table<br>Syntaxe: nom_de_table:nom_de_champ:id_champ::filtre<br>Exemple : c_typent:libelle:id::filter<br><br>filter peux être un test simple (exemple active=1 pour ne proposer que les valeur active)<br>si vous voulez faire un filtre sur des attributs supplémentaires, utilisez la syntax extra.champ=... (où champ est la code de l'attribut supplémentaire)<br><br>Pour que la liste soit dépendante d'une autre :<br>c_typent:libelle:id:code_liste_parent|colonne_parent:filter
+ExtrafieldParamHelpchkbxlst=La liste vient d'une table<br>Syntaxe: nom_de_table:nom_de_champ:id_champ::filtre<br>Exemple : c_typent:libelle:id::filter<br><br>filter peux être un test simple (exemple active=1 pour ne proposer que les valeur active)<br>si vous voulez faire un filtre sur des attributs supplémentaires, utilisez la syntax extra.champ=... (où champ est la code de l'attribut supplémentaire)<br><br>Pour que la liste soit dépendante d'une autre :<br>c_typent:libelle:id:code_liste_parent|colonne_parent:filter
+ExtrafieldParamHelplink=Les paramètres doivent être ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Exemple : Societe:societe/class/societe.class.php
+LocalTaxDesc=Certains pays appliquent 2 voire 3 taux sur chaque ligne de facture. Si c'est le cas, choisissez le type du deuxième et troisième taux et sa valeur. Les types possibles sont:<br>1 : taxe locale sur les produits et services hors TPS/TVH (la taxe locale est calculée sur le montant hors taxe)<br>2 : taxe locale sur les produits et services avant TPS/TVH (la taxe locale est appliquée sur le montant + TPS/TVH)<br>3 : taxe locale uniquement sur les produits hors TPS/TVH (la taxe locale est calculée sur le montant hors taxe)<br>4 : taxe locale uniquement sur les produits avant TPS/TVH (la taxe locale est calculée sur le montant + TPS/TVH)<br>5 : taxe locale uniquement sur les services hors TPS/TVH (la taxe locale est calculée sur le montant hors taxe)<br>6 : taxe locale uniquement sur les service avant TPS/TVH (la taxe locale est calculée sur le montant + TPS/TVH)
+EnableFileCache=Activer le cache de fichiers
 Module75Name=Notes de frais et déplacements
 Module500Name=Dépenses spéciales (taxes, charges, dividendes)
 Module500Desc=Gestion des dépenses spéciales comme les taxes, charges sociales et dividendes
+Module600Desc=Envoyer des notifications par courriel (déclenchées par certains événements d'affaires) aux contacts tiers (configuration définie sur chaque tiers) ou des courriels fixes
 Module770Name=Note de frais
+Module2600Name=services API / Web ( serveur SOAP )
 Module2600Desc=Active le serveur de Web Services de Dolibarr
+Module2610Name=services API / Web ( serveur REST )
+Module2610Desc=Activer le serveur REST de services API de les services
+Module2660Name=WebServices appel ( client SOAP )
+Module2660Desc=Activer le client Dolibarr de services Web (peut être utilisé pour pousser les données / demandes de serveurs externes . Fournisseur commandes prises en charge seulement pour le moment )
+Module3100Desc=Ajouter un bouton Skype dans la carte des utilisateurs / tiers / contacts / membres
+Module4000Name=Gestion des ressources humaines
+Module4000Desc=Ressources humaines
 Module20000Name=Gestion des demandes de congès
 Module20000Desc=Déclaration et suivi des congès des employés
 Module39000Name=Lot/Série du produit
+Module55000Name=Sondage, enquête ou vote
+Module55000Desc=Module pour faire des sondages en ligne, des enquêtes ou des votes (comme Doodle , Studs , Rdvz , ... )
 Permission41=Consulter les projets et tâches (partagés ou dont je suis contact)
-Permission91=Consulter les charges et la TVA (TPS)
-Permission92=Créer/modifier les charges et la TVA (TPS)
-Permission93=Supprimer les charges et la TVA (TPS)
+Permission91=Consulter les charges et la TPS/TVH
+Permission92=Créer/modifier les charges et la TPS/TVH
+Permission93=Supprimer les charges et la TPS/TVH
 Permission94=Exporter les charges
 Permission141=Consulter tous les projets et tâches (y compris privés dont je ne suis pas contact)
 Permission144=Supprimer tous les projets et tâches (y compris privés dont je ne suis pas contact)
+Permission171=Lire les déplacements et les dépenses (le vôtre et vos subordonnés )
+Permission771=Lire les rapports de dépenses (le vôtre et vos subordonnés )
+Permission20001=Lire les demandes de congé  (le vôtre et vos subordonnés)
+Permission20002=Créer / modifier les demandes de congé
+Permission20004=Lire toutes les demandes de congé (même utilisateur non subordonnés)
+Permission20005=Créer / modifier les demandes de congé pour tout le monde
+Permission20006=Administration des demandes de congé (balance de configuration et de mise à jour )
+DictionaryCanton=État / Province
 DictionarySocialContributions=Types de charges sociales
-DictionaryVAT=Taux de TVA (TPS) ou de Taxes de Ventes
-VATManagement=Gestion TVA (TPS)
-VATIsUsedDesc=Le taux de TVA (TPS) proposé par défaut lors de la création de proposition commerciale, facture, commande, etc... répond à la règle standard suivante :<br>Si vendeur non assujetti à TVA, TVA par défaut=0. Fin de règle.<br>Si le (pays vendeur= pays acheteur) alors TVA par défaut=TVA du produit vendu. Fin de règle.<br>Si vendeur et acheteur dans Communauté européenne et bien vendu= moyen de transport neuf (auto, bateau, avion), TVA par défaut=0 (La TVA doit être payée par acheteur au centre d'impôts de son pays et non au vendeur). Fin de règle.<br>Si vendeur et acheteur dans Communauté européenne et acheteur= particulier alors TVA par défaut=TVA du produit vendu (TVA pays vendeur si < seuil du pays et si  avant 01/01/2015, TVA pays acheteur après le 01/01/2015). Fin de règle.<br>Si vendeur et acheteur dans Communauté européenne et acheteur= entreprise alors TVA par défaut=0. Fin de règle.<br>Sinon TVA proposée par défaut=0. Fin de règle.<br>
-VATIsNotUsedDesc=Le taux de TVA (TPS) proposé par défaut est 0. C'est le cas d'associations, particuliers ou certaines petites sociétés.
-LocalTax1IsUsedDesc=Utilisation d'un 2ème type taxe (autre que TVA (TPS))
-LocalTax1IsNotUsedDesc=Pas d'utilisation de 2ème type taxe (autre que TVA (TPS))
-LocalTax2IsUsedDesc=Utilisation d'un 3ème type taxe (autre que TVA(TPS))
-LocalTax2IsNotUsedDesc=Pas d'utilisation de 3ème type taxe (autre que TVA(TPS))
+DictionaryVAT=Taux de TPS/TVH ou de Taxes de Ventes
+DictionaryHolidayTypes=Type de feuilles
+DictionaryOpportunityStatus=État d'opportunité pour le projet/chef de file
+VATManagement=Gestion TPS/TVH
+VATIsUsedDesc=Le taux de TPS/TVH proposé par défaut lors de la création de proposition commerciale, facture, commande, etc... répond à la règle standard suivante :<br>Si vendeur non assujetti à TPS/TVH, TPS/TVH par défaut=0. Fin de règle.<br>Si le (pays vendeur= pays acheteur) alors TPS/TVH par défaut=TPS/TVH du produit vendu. Fin de règle.<br>Si vendeur et acheteur dans Communauté européenne et bien vendu= moyen de transport neuf (auto, bateau, avion), TPS/TVH par défaut=0 (La TPS/TVH doit être payée par acheteur au centre d'impôts de son pays et non au vendeur). Fin de règle.<br>Si vendeur et acheteur dans Communauté européenne et acheteur= particulier alors TPS/TVH par défaut=TPS/TVH du produit vendu (TPS/TVH pays vendeur si < seuil du pays et si  avant 01/01/2015, TPS/TVH pays acheteur après le 01/01/2015). Fin de règle.<br>Si vendeur et acheteur dans Communauté européenne et acheteur= entreprise alors TPS/TVH par défaut=0. Fin de règle.<br>Sinon TPS/TVH proposée par défaut=0. Fin de règle.<br>
+VATIsNotUsedDesc=Le taux de TPS/TVH proposé par défaut est 0. C'est le cas d'associations, particuliers ou certaines petites sociétés.
+LocalTax1IsUsedDesc=Utilisation d'un 2ème type taxe (autre que TPS/TVH)
+LocalTax1IsNotUsedDesc=Pas d'utilisation de 2ème type taxe (autre que TPS/TVH)
+LocalTax2IsUsedDesc=Utilisation d'un 3ème type taxe  (autre que TPS/TVH)
+LocalTax2IsNotUsedDesc=Pas d'utilisation de 3ème type taxe  (autre que TPS/TVH)
+DefaultMaxSizeList=Longueur maximale des listes
+DefaultMaxSizeShortList=Longueur maximale par défaut des listes
+CompanyObject=Objet de la compagnie
 ShowBugTrackLink=Afficher le lien "Signaler un défaut"
+Delays_MAIN_DELAY_EXPENSEREPORTS=Tolérance de retard (en jours) avant alerte pour les rapports de dépenses à approuver
+InfoDatabase=Infos base de donnée
+DeprecatedModules=Module obsolète
 MAIN_ROUNDING_RULE_TOT=Taille du pas des arrondis (pour les très rares pays qui arrondissent sur une autre base que la base 10)
-TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
+UnitPriceOfProduct=Prix unitaire (no tax) d'un produit
+TotalPriceAfterRounding=Prix total (no tax/TPS/TVH/tx incl.) après arrondis
+BackupDesc2=Enregistrer le contenu du répertoire de documents (<b>%s</b>) qui contient tous les fichiers téléchargés et générés ( Donc, il inclut tous les fichiers de sauvegarde générés à l'étape 1).
+TotalNumberOfActivatedModules=Nombre total de modules de fonction activés : <b>%s</b> / <b>%s</b>
 OnlyFollowingModulesAreOpenedToExternalUsers=Remarque, seuls les modules suivants sont ouverts aux utilisateurs externes (quelles que soient les permissions de ces utilisateurs) :
+PasswordGenerationNone=Aucune suggestion de mot de passe généré . Le mot de passe doit être saisi manuellement.
+PasswordGenerationPerso=Retour un mot de passe en fonction de votre configuration personnellement défini.
+PasswordPatternDesc=Description du modèle de mot de passe
+HRMSetup=Configuration du module de GRH
 NotificationsDesc=La fonction des notifications par emails permet d'envoyer automatiquement un email, lors de certains événements Dolibarr. La cible des notifications peut être défini:<br>* par contacts de tiers (clients, prospects ou fournisseurs), contact par contact.<br>* ou en positionnant un email en paramètre global sur la page de configuration du module Notification.
+AllowCreditNoteWithoutRelatedInvoice=Permettre de créer unenote de crédit sans facture correspondante
+PaymentsNumberingModule=Modèles de numérotation des paiements
+AddShippingDateAbility=Possibilité de déterminer une date de livraison
+AddDeliveryAddressAbility=Possibilité de sélectionner une adresse de livraison
+SupplierProposalSetup=Configuration du module de ​​demande de prix des fournisseurs
+SupplierProposalNumberingModules=Modèles de numérotation des demandes de prix des fournisseurs
+SupplierProposalPDFModules=Modèles des documents des demandes de prix des fournisseurs
+FreeLegalTextOnSupplierProposal=Texte libre sur les demandes de prix fournisseurs
+WatermarkOnDraftSupplierProposal=Filigrane sur le projet de prix demande des fournisseurs (si aucun laisser vide)
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Demandez compte bancaire de destination pour les demandes de prix
+WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Demandez une source d'entrepôt pour l'ordre
 ShippableOrderIconInList=Ajouter un icône dans la liste des commandes qui indique si la commande est expédiable.
+ContractsAndServices=Liste de contracts et services
+MergePropalProductCard=Activez dans le produit/service, l'option onglet de fichiers attachés pour fusionner le produit PDF le document à la proposition PDF azur si le produit/service est dans la proposition
+UseMaskOnClone=Utiliser le produit suivant ref quand nous dupliquer un produit %s (disponible si masque configuré )
+UseUnits=Définir une unité de mesure pour la quantité lors de la commande, l'édition de la proposition ou les lignes de facture
+IsNotADir=n'est pas un répertoire
+BarcodeDescDATAMATRIX=Codebarre de type Datamatrix
+BarcodeDescQRCODE=Codebarre de type QRcode
+SendingsAbility=Fiches d'expédition de soutien pour les livraisons aux clients
+FailedToInitializeMenu=Impossible d'initialiser le menu
 TaxSetup=Configuration du module Taxes, charges sociales et dividendes
-YourCompanyDoesNotUseVAT=Votre institution est configurée comme non assujettie à la TVA (TPS) (Accueil - Configuration - Société/Institution), aussi il n'y a aucune option sur la gestion TVA à paramétrer.
+OptionVatMode=TPS/TVH due
+OptionVatDefaultDesc=TPS/TVH sur encaissement, l'exigibilité de la TPS/TVH est:<br>- sur livraison pour les biens (en pratique on utilise la date de facturation)<br>- sur paiement pour les services
+OptionVatDebitOptionDesc=TPS/TVH sur débit, l'exigibilité de la TPS/TVH est:<br>- sur livraison pour les biens (en pratique on utilise la date de facturation)<br>- sur facturation (débit) pour les services
+SummaryOfVatExigibilityUsedByDefault=Moment d'exigibilité par défaut de la TPS/TVH pour l'option choisie:
+YourCompanyDoesNotUseVAT=Votre institution est configurée comme non assujettie à la TPS/TVH (Accueil - Configuration - Société/Institution), aussi il n'y a aucune option sur la gestion TPS/TVH à paramétrer.
 AGENDA_USE_EVENT_TYPE=Utilisez les types des évenements (administrable dans Configuration -> Dictionnaires -> Liste des types d'évenements de l'agenda)
+AGENDA_USE_EVENT_TYPE_DEFAULT=Réglez automatiquement cette valeur par défaut pour le type d'événement dans en événement de lors de la création »
+ClickToDialDesc=Ce module permet de faire des numéros de téléphone cliquable . Un clic sur cette icône fera appel à rendre votre téléphone pour appeler le numéro de téléphone . Cela peut être utilisé pour appeler un système de Dolibarr du centre d'appels qui peut appeler le numéro de téléphone sur un système SIP par exemple.
+ClickToDialUseTelLink=Utilisez juste un lien "tel: " sur les numéros de téléphone
+ClickToDialUseTelLinkDesc=Utilisez cette méthode si vos utilisateurs ont un softphone ou une interface de logiciel installé sur un même ordinateur que le navigateur , et a appelé lorsque vous cliquez sur un lien dans votre navigateur qui commencent par "tel: " . Si vous avez besoin d'une solution de serveur complet (pas besoin d'installation locale du logiciel ) , vous devez définir ce "Non" et remplir champ suivant.
+ApiSetup=Configuration du module API
+ApiDesc=En activant ce module , Dolibarr devenir un serveur REST pour fournir des services Web divers .
+KeyForApiAccess=Clé pour utiliser l'API (paramètre "api_key")
+ApiProductionMode=Activer le mode de production (active l'utilisation d'un cache pour la gestion des services )
+ApiEndPointIs=Vous pouvez accéder à l'API à url
+ApiExporerIs=Vous pouvez explorer l'API à url
+OnlyActiveElementsAreExposed=Seuls les éléments de modules activés sont exposés
+ApiKey=Clé API
+ECMAutoTree =Voir également le dossier de l'arborescence automatique et le document
 FiscalYears=Années fiscales
 FiscalYear=Année fiscale
 FiscalYearCard=Fiche année fiscale
@@ -53,3 +137,44 @@ CloseFiscalYear=Fermer année fiscale
 DeleteFiscalYear=Effacer année fiscale
 ConfirmDeleteFiscalYear=Êtes-vous sûr de vouloir supprimer cette année fiscale ?
 SalariesSetup=Configuration du module salariés
+ConfFileMuseContainCustom=Installation d'un module externe de l'application enregistrer les fichiers de module dans le répertoire <strong>%s</strong> . Pour avoir ce répertoire traité par Dolibarr , vous devez configurer votre <strong>conf/conf.php</strong> pour avoir option<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
+HighlightLinesOnMouseHover=Mettez en surbrillance les lignes de table lorsque déplacement de la souris passe au-dessus
+HighlightLinesColor=Mettez en surbrillance la couleur de la ligne lorsque la souris passe au-dessus (gardez vide pour ne pas mettre en évidence)
+TextTitleColor=Couleur de la page titre
+PressF5AfterChangingThis=Appuyez sur F5 pour rafraichir la valeur modifiée
+NotSupportedByAllThemes=Nous travaillons avec le thème eldy mais il n'est pas pris en charge par tous les thèmes
+TopMenuBackgroundColor=Couleur de fond du menu haut
+LeftMenuBackgroundColor=Couleur de fond gauche
+BackgroundTableTitleColor=Couleur de fond pour le tableau ligne de titre
+BackgroundTableLineOddColor=Couleur de fond pour les lignes impaires
+BackgroundTableLineEvenColor=Couleur de fond même pour les lignes de table
+MinimumNoticePeriod=Période minimale de préavis  (Votre demande de congé doit être fait avant ce délai)
+NbAddedAutomatically=Nombre de jours ajoutés aux compteurs d'utilisateurs (automatiquement) chaque mois
+EnterAnyCode=Ce champ contient une référence pour identifier la ligne. Entrez une valeur de votre choix, mais sans caractères spéciaux.
+UnicodeCurrency=Saisissez ici entre accolades , liste de nombre d'octets qui représentent le symbole monétaire . Pour exemple : pour $ , entrez [ 36 ] - pour le Brésil réel R $ [ 82,36 ] - pour € , entrez [ 8364 ]
+PositionIntoComboList=Position de la ligne dans les listes déroulantes
+SellTaxRate=Taxes de vente
+RecuperableOnly=Oui à la TPS/TVH " Non Perçue Récupérable " dédié pour quelques état en France. Gardez la valeur à «Non» dans tous les autres cas.
+UrlTrackingDesc=Si le fournisseur ou le service de transport offrent une page ou un site Web pour vérifier l'état de votre expédition, vous pouvez entrer ici. Vous pouvez utiliser la touche {TrackID} dans les paramètres d'URL afin que le système sera remplacé par la valeur de l'utilisateur du numéro de suivi est entré dans la carte de l'expédition .
+OpportunityPercent=Lorsque vous créez une opportunité , vous défini un montant estimatif de projet / plomb. Selon le statut des chances , ce montant peut être multiplier par ce taux pour évaluer le montant global toutes vos possibilités peuvent générer. La valeur est pour cent ( entre 0 et 100 ) .
+TemplateForElement=Ce gabarit est dédié à cet élément
+TypeOfTemplate=Type de thèmes
+TemplateIsVisibleByOwnerOnly=Thème visible par propriétaire seulement
+FillFixTZOnlyIfRequired=Exemple: +2 (remplir seulement si le problème est connu)
+ExpectedChecksum=Somme attendue
+CurrentChecksum=Somme actuel
+MailToSendProposal=Envoyer la proposition au client
+MailToSendOrder=Envoyer la commande au client
+MailToSendInvoice=Envoyer la facture au client
+MailToSendShipment=Envoyer l'expédition
+MailToSendIntervention=Envoyer l'intervention
+MailToSendSupplierRequestForQuotation=Pour envoyer demande de devis au fournisseur
+MailToSendSupplierOrder=Envoyer la commande fournisseur
+MailToSendSupplierInvoice=Envoyer la facture fournisseur
+MailToThirdparty=Envoyer un courriel de la page Tiers
+ByDefaultInList=Afficher par défaut sur la liste vue
+TitleExampleForMajorRelease=Exemple de message que vous pouvez utiliser pour annoncer cette version majeure ( se sentir libre de l'utiliser sur vos sites web )
+TitleExampleForMaintenanceRelease=Exemple de message que vous pouvez utiliser pour annoncer cette version de maintenance ( se sentir libre de l'utiliser sur vos sites web )
+ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s est disponible . Version %s est une version majeure avec beaucoup de nouvelles fonctionnalités pour les utilisateurs et les développeurs. Vous pouvez le télécharger à partir de la zone de téléchargement de http://www.dolibarr.org portail (versions sous-répertoire Stable ) . Vous pouvez lire <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a>pour la liste complète des changements .
+ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s est disponible. Version %s est une version de maintenance , de sorte qu'il ne contient que des corrections de bugs. Nous vous recommandons tout le monde en utilisant une version plus ancienne mise à niveau vers celui-ci. Comme toute version de maintenance , pas de nouvelles fonctionnalités , ni le changement de structure de données est présent dans cette version . Vous pouvez le télécharger à partir de la zone de téléchargement de http://www.dolibarr.org portail (versions sous-répertoire Stable ) . Vous pouvez lire <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> pour la liste complète des changements .
+MultiPriceRuleDesc=Lorsque l'option " Plusieurs niveaux de prix par produit / service " est activée, vous pouvez définir des prix différents (un par niveau de prix ) pour chaque produit . Pour gagner du temps , vous pouvez entrer ici la règle pour avoir le prix pour chaque niveau autocalculated en fonction du prix du premier niveau , de sorte que vous devrez entrer seulement le prix pour le premier niveau sur chaque produit . Cette page est ici pour gagner du temps et peut être utile que si vos prix pour chaque leve sont liés à premier niveau . Vous pouvez ignorer cette page dans la plupart des cas .
diff --git a/htdocs/langs/fr_CA/agenda.lang b/htdocs/langs/fr_CA/agenda.lang
index 915dcce8276..d567bdcb61d 100644
--- a/htdocs/langs/fr_CA/agenda.lang
+++ b/htdocs/langs/fr_CA/agenda.lang
@@ -1,5 +1,12 @@
 # Dolibarr language file - Source file is en_US - agenda
+OrderDeliveredInDolibarr=Commande %s classée Délivrée
 ShippingSentByEMail=Bon expédition %s envoyé par EMail
 InterventionSentByEMail=Intervention %s envoyée par EMail
 AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> pour restreindre aux écévements associés au projet <b>PROJECT_ID</b>.
 ExportDataset_event1=Liste évênements de l'agenda
+VisibleTimeRange=Plage d'heures visibles
+VisibleDaysRange=Plage de jours visibles
+CloneAction=Dupliquer événement
+ConfirmCloneEvent=Etes-vous sûr de vouloir dupliquer l'événement <b>%s</b> ?
+RepeatEvent=Répéter événement
+DateStartPlusOne=Date de début +1 heure
diff --git a/htdocs/langs/fr_CA/banks.lang b/htdocs/langs/fr_CA/banks.lang
index fcad965d319..fe66ce3fd11 100644
--- a/htdocs/langs/fr_CA/banks.lang
+++ b/htdocs/langs/fr_CA/banks.lang
@@ -1,3 +1,8 @@
 # Dolibarr language file - Source file is en_US - banks
 OnlyOpenedAccount=Uniquement comptes ouverts
 SocialContributionPayment=Règlement charge sociale
+RejectCheck=Chèque renvoyé
+ConfirmRejectCheck=Etes-vous sûr que vous voulez marquer ce chèque comme rejeté ?
+RejectCheckDate=Date à laquelle le chèque a été retourné
+CheckRejected=Chèque renvoyé
+CheckRejectedAndInvoicesReopened=Chèques retournés et factures rouvertes
diff --git a/htdocs/langs/fr_CA/bills.lang b/htdocs/langs/fr_CA/bills.lang
index 7688d7d07dc..9f15cbe2914 100644
--- a/htdocs/langs/fr_CA/bills.lang
+++ b/htdocs/langs/fr_CA/bills.lang
@@ -1,7 +1,21 @@
 # Dolibarr language file - Source file is en_US - bills
+CreateCreditNote=Créer avoir
+AmountOfBillsByMonthHT=Montant de factures par mois (no tax.)
 ShowSocialContribution=Afficher charge sociale
 EscompteOffered=Escompte (règlement avant échéance)
+EscompteOfferedShort=Remise
 AddGlobalDiscount=Créer ligne de déduction
 IdSocialContribution=Id charge sociale
+PaymentRef=Règlement référence
+AmountPaymentDistributedOnInvoice=Montant du paiement distribué sur la facture
+PaymentNote=Note de règlement
+PaymentTypeTIP=Paiement interbanque
+PaymentTypeShortTIP=Paiement interbanque
+ChequeMaker=Émetteur du chèque/transfert
+PaymentByChequeOrderedTo=Règlement (tx incl.) par chèque à l'ordre de %s envoyé à
+PaymentByChequeOrderedToShort=Règlement (tx incl.) par chèque à l'ordre de
+DepositId=Identifiant de dépot
 ClosePaidInvoicesAutomatically=Classer "Payées" touts les factures standards ou de remplacements ayant un reste à payer nul
+MarsNumRefModelDesc1=Numéro de retour avec le format %syymm-nnnn pour les factures standards %syymm-nnnn pour les factures de remplacement , %syymm-nnnn pour les factures de dépôt et %syymm-nnnn pour les notes de crédit où yy année, mm le mois et nnnn est une séquence sans casse et pas de retour à 0
+SituationAmount=Montant de facture de situation (no tax.)
 NoSituations=Pas de point de situation ouvert
diff --git a/htdocs/langs/fr_CA/boxes.lang b/htdocs/langs/fr_CA/boxes.lang
index 89af24da64d..77f2157836b 100644
--- a/htdocs/langs/fr_CA/boxes.lang
+++ b/htdocs/langs/fr_CA/boxes.lang
@@ -2,3 +2,4 @@
 BoxCurrentAccounts=Soldes Comptes ouverts
 BoxTitleLastCustomersOrProspects=Les %s derniers prospects
 BoxTitleCurrentAccounts=Soldes des comptes ouverts
+BoxTitleLastModifiedExpenses=Les dernier %s rapports de dépenses modifiées
diff --git a/htdocs/langs/fr_CA/cashdesk.lang b/htdocs/langs/fr_CA/cashdesk.lang
index 512559fbf32..764c55aba25 100644
--- a/htdocs/langs/fr_CA/cashdesk.lang
+++ b/htdocs/langs/fr_CA/cashdesk.lang
@@ -1,2 +1,3 @@
 # Dolibarr language file - Source file is en_US - cashdesk
 NoVAT=Pas de TVA (TAXE) pour cette vente
+DolibarrReceiptPrinter=Imprimante de reçu Dolibarr
diff --git a/htdocs/langs/fr_CA/categories.lang b/htdocs/langs/fr_CA/categories.lang
index e90b2884ba4..93305706d59 100644
--- a/htdocs/langs/fr_CA/categories.lang
+++ b/htdocs/langs/fr_CA/categories.lang
@@ -10,3 +10,4 @@ ContactIsInCategories=Ce contact appartient aux tags/catégories suivant(e)s
 CompanyHasNoCategory=Ce tiers n'appartient à aucun tag/catégorie
 ClassifyInCategory=Classer dans le(a) tag/catégorie
 MembersCategoryShort=Tags/catégories de membres
+ProspectsCategoriesShort=Prospects tags/catégories
diff --git a/htdocs/langs/fr_CA/commercial.lang b/htdocs/langs/fr_CA/commercial.lang
index dac000d90be..b2f630b9bf6 100644
--- a/htdocs/langs/fr_CA/commercial.lang
+++ b/htdocs/langs/fr_CA/commercial.lang
@@ -1,2 +1,4 @@
 # Dolibarr language file - Source file is en_US - commercial
+DeleteAction=Supprimer l'événement
+NewAction=Nouvel événement
 ActionAC_OTH_AUTO=Autre (evênements insérés automatiquement)
diff --git a/htdocs/langs/fr_CA/companies.lang b/htdocs/langs/fr_CA/companies.lang
index bf49d3870ee..39c253a2657 100644
--- a/htdocs/langs/fr_CA/companies.lang
+++ b/htdocs/langs/fr_CA/companies.lang
@@ -1,7 +1,23 @@
 # Dolibarr language file - Source file is en_US - companies
-VATIsUsed=Assujetti à la TVA (TPS)
-VATIsNotUsed=Non assujetti à la TVA (TPS)
-VATIntra=Numéro de TVA (TPS)
-VATIntraShort=Num. TVA (TPS)
-VATIntraVeryShort=N° TVA (TPS)
+AliasNames=Nom de l'alias (commercial, marque, ... )
+AliasNameShort=Nom de l'alias
+State=États/Provinces
+StateShort=États
+PhoneShort=Téléphone
+VATIsUsed=Assujetti à la TPS/TVH
+VATIsNotUsed=Non assujetti à la TPS/TVH
+LocalTax1IsUsed=Assujeti à la TVQ
+LocalTax2IsUsed=Assujeti à une troisième taxe
+ProfId6Short=TVQ
+ProfId6=TVQ
+VATIntra=Numéro de TPS/TVH
+VATIntraShort=TPS/TVH
+VATIntraVeryShort=TPS/TVH
+ImportDataset_company_4=Tiers/ventes représentatives (ventes représentatives affectées aux utilisateurs aux entreprises )
+ProductsIntoElements=Liste des produits/services en %s
 SearchThirdparty=Rechercher tiers
+MergeOriginThirdparty=Dupliquer tiers (tiers que vous souhaitez supprimer)
+MergeThirdparties=Fusionner des tiers
+ConfirmMergeThirdparties=Etes-vous sûr de vouloir fusionner ce tiers dans l'actuel ? Tous les objets liés (factures, commandes, ...) seront déplacés à un tiers en cours de sorte que vous serez en mesure de supprimer le doublon.
+ThirdpartiesMergeSuccess=Les tiers ont été fusionnées
+ErrorThirdpartiesMerge=Il y avait une erreur lors de la suppression des les tiers. S'il vous plaît vérifier le journal. Des modifications ont été annulées.
diff --git a/htdocs/langs/fr_CA/compta.lang b/htdocs/langs/fr_CA/compta.lang
index 5badb3a4c7b..bac8328196f 100644
--- a/htdocs/langs/fr_CA/compta.lang
+++ b/htdocs/langs/fr_CA/compta.lang
@@ -1,13 +1,15 @@
 # Dolibarr language file - Source file is en_US - compta
-VATToPay=TVA(TPS) ventes
-VATReceived=TVA(TPS) collectée
-VATToCollect=TVA (TPS)achats
-VATSummary=Balance de TVA (TPS)
+AmountHTVATRealReceived=no tax. collectée
+AmountHTVATRealPaid=no tax. payé
+VATToPay=TPS/TVH ventes
+VATReceived=TPS/TVH collectée
+VATToCollect=TPS/TVH achats
+VATSummary=Balance de TPS/TVH
 LT1SummaryES=Balance RE (TVQ)
-VATPaid=TVA (TPS) payée
+VATPaid=TPS/TVH payée
 LT1PaidES=RE (TVQ) Payé
 LT1CustomerES=RE (TVQ) ventes
-VATCollected=TVA (TPS) récupérée
+VATCollected=TPS/TVH récupérée
 TaxAndDividendsArea=Espace taxes, charges sociales et dividendes
 SocialContribution=Charge sociale
 SocialContributions=Charges sociales
@@ -15,33 +17,33 @@ MenuSocialContributions=Charges sociales
 NewSocialContribution=Nouvelle charge sociale
 ContributionsToPay=Charges à payer
 PaymentSocialContribution=Règlement charge sociale
-PaymentVat=Règlement TVA (TPS)
-NewVATPayment=Nouveau règlement de TVA (TPS)
+PaymentVat=Règlement TPS/TVH
+NewVATPayment=Nouveau règlement de TPS/TVH
 newLT1PaymentES=Nouveau règlement de RE (TVQ)
 LT1PaymentES=Règlement RE (TVQ)
 LT1PaymentsES=Règlements RE (TVQ)
-VATPayment=Règlement TVA (TPS)
-VATPayments=Règlements TVA (TPS)
+VATPayment=Règlement TPS/TVH
+VATPayments=Règlements TPS/TVH
 SocialContributionsPayments=Règlements charges sociales
-ShowVatPayment=Affiche paiement TVA (TPS)
-TotalVATReceived=Total TVA(TPS) perçue
+ShowVatPayment=Affiche paiement TPS/TVH
+TotalVATReceived=Total TPS/TVH perçue
 PaySocialContribution=Payer une charge sociale
 ConfirmPaySocialContribution=Êtes-vous sûr de vouloir classer cette charge sociale à payée ?
 DeleteSocialContribution=Effacer charge sociale
 ConfirmDeleteSocialContribution=Êtes-vous sûr de vouloir supprimer cette charge sociale ?
 ExportDataset_tax_1=Charges sociales et paiements
-CalcModeVATDebt=Mode <b>%sTVA (TPS) sur débit%s</b>.
-CalcModeVATEngagement=Mode <b>%sTVA (TPS) sur encaissement%s</b>.
+CalcModeVATDebt=Mode <b>%sTPS/TVH sur débit%s</b>.
+CalcModeVATEngagement=Mode <b>%s TPS/TVH sur encaissement%s</b>.
 LT1ReportByCustomersInInputOutputModeES=Rapport par tiers des RE (TVA)
-VATReportByCustomersInDueDebtMode=Rapport par client des TVA (TPS) collectées et payées
-VATReportByQuartersInInputOutputMode=Rapport par taux des TVA (TPS) collectées et payées
+VATReportByCustomersInDueDebtMode=Rapport par client des TPS/TVH collectées et payées
+VATReportByQuartersInInputOutputMode=Rapport par taux des TPS/TVH collectées et payées
 LT1ReportByQuartersInInputOutputMode=Rapport par taux de RE (TVQ)
-VATReportByQuartersInDueDebtMode=Rapport par taux des TVA (TPS) collectées et payées
+VATReportByQuartersInDueDebtMode=Rapport par taux des TPS/TVH collectées et payées
 LT1ReportByQuartersInDueDebtMode=Rapport par taux de RE (TVQ)
 RulesVATInServices=- Pour les services, le rapport inclut les TVA TAXES) des règlements effectivement reçus ou émis en se basant sur la date du règlement.
 RulesVATInProducts=- Pour les biens matériels, il inclut les TVA(TAXES) des factures en se basant sur la date de facture.
 RulesVATDueServices=- Pour les services, le rapport inclut les TVA TAXES) des factures dues, payées ou non en se basant sur la date de facture.
 RulesVATDueProducts=- Pour les biens matériels, il inclut les TVA TAXES) des factures en se basant sur la date de facture.
-CalculationRuleDesc=Pour calculer le total de TVA (TPS), il existe 2 modes:<br>Le mode 1 consiste à arrondir la tva (TPS) de chaque ligne et à sommer cet arrondi.<br>Le mode 2 consiste à sommer la tva de chaque ligne puis à l'arrondir.<br>Les résultats peuvent différer de quelques centimes. Le mode par défaut est le mode <b>%s</b>.
+CalculationRuleDesc=Pour calculer le total de TPS/TVH, il existe 2 modes:<br>Le mode 1 consiste à arrondir la TPS/TVH de chaque ligne et à sommer cet arrondi.<br>Le mode 2 consiste à sommer la TPS/TVH de chaque ligne puis à l'arrondir.<br>Les résultats peuvent différer de quelques centimes. Le mode par défaut est le mode <b>%s</b>.
 CloneTax=Cloner une charge sociale
 ConfirmCloneTax=Confirmer le clonage de la charge sociale
diff --git a/htdocs/langs/fr_CA/contracts.lang b/htdocs/langs/fr_CA/contracts.lang
new file mode 100644
index 00000000000..1c4de4ea90a
--- /dev/null
+++ b/htdocs/langs/fr_CA/contracts.lang
@@ -0,0 +1,4 @@
+# Dolibarr language file - Source file is en_US - contracts
+ContractCard=Carte du contrat
+ContractStatusValidated=Validée
+ServiceStatusClosed=Fermées
diff --git a/htdocs/langs/fr_CA/cron.lang b/htdocs/langs/fr_CA/cron.lang
new file mode 100644
index 00000000000..d8953584e61
--- /dev/null
+++ b/htdocs/langs/fr_CA/cron.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - cron
+CronDtLastLaunch=Start date of last execution
+CronDtLastResult=End date of last execution
diff --git a/htdocs/langs/fr_CA/donations.lang b/htdocs/langs/fr_CA/donations.lang
new file mode 100644
index 00000000000..5519da52f06
--- /dev/null
+++ b/htdocs/langs/fr_CA/donations.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - donations
+DonationStatusPromiseNotValidatedShort=Brouillon
diff --git a/htdocs/langs/fr_CA/errors.lang b/htdocs/langs/fr_CA/errors.lang
new file mode 100644
index 00000000000..396e8ea9894
--- /dev/null
+++ b/htdocs/langs/fr_CA/errors.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - errors
+ErrorQtyTooLowForThisSupplier=Quantité trop faible pour ce fournisseur ou pas de prix défini sur ce produit pour ce fournisseur
diff --git a/htdocs/langs/fr_CA/holiday.lang b/htdocs/langs/fr_CA/holiday.lang
new file mode 100644
index 00000000000..6c841b2c1a4
--- /dev/null
+++ b/htdocs/langs/fr_CA/holiday.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - holiday
+HRM=Gestion des ressources humaines
diff --git a/htdocs/langs/fr_CA/install.lang b/htdocs/langs/fr_CA/install.lang
new file mode 100644
index 00000000000..6cfce2c80c3
--- /dev/null
+++ b/htdocs/langs/fr_CA/install.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - install
+WarningUpgrade=Attention:\nEst-ce que votre exécuter une sauvegarde de base de données en premier?\nIl est fortement conseillé: par exemple, en raison de quelques bugs dans les systèmes de bases de données ( pour la version exemple mysql 5.5.40 / 41 /42/ 43) , certaines données ou tables peuvent être perdues au cours de ce processus , il est donc fortement conseillé d'avoir un vidage complet de votre base de données avant de commencer migration.\n\n\nCliquez sur OK pour lancer le processus de migration ...
+MigrationReloadModule=Recharger module %s
diff --git a/htdocs/langs/fr_CA/interventions.lang b/htdocs/langs/fr_CA/interventions.lang
new file mode 100644
index 00000000000..46f819f49f0
--- /dev/null
+++ b/htdocs/langs/fr_CA/interventions.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - interventions
+StatusInterInvoiced=Facturées
diff --git a/htdocs/langs/fr_CA/mails.lang b/htdocs/langs/fr_CA/mails.lang
new file mode 100644
index 00000000000..71ecef377dd
--- /dev/null
+++ b/htdocs/langs/fr_CA/mails.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - mails
+MailingStatusValidated=Validée
diff --git a/htdocs/langs/fr_CA/main.lang b/htdocs/langs/fr_CA/main.lang
index cdb2d5c4e00..79001b63dfd 100644
--- a/htdocs/langs/fr_CA/main.lang
+++ b/htdocs/langs/fr_CA/main.lang
@@ -21,16 +21,32 @@ FormatDateHourTextShort=%d %b %Y %H:%M
 FormatDateHourText=%d %B %Y %H:%M
 DatabaseConnection=Connexion à la base de donnée
 ErrorNoSocialContributionForSellerCountry=Erreur, aucun type de charges défini pour le pays '%s'.
+UnitPriceHT=Prix unitaire (no tax.)
+UnitPriceTTC=Prix unitaire tx incl.
 PriceUHT=Prix
-PriceUTTC=P.U. TTC
-AmountVAT=Montant TPS
+PriceUTTC=P.U. (tx incl.)
+AmountHTShort=Montant (no tax.)
+AmountTTCShort=Montant (tx incl.)
+AmountHT=Montant (no tax.)
+AmountTTC=Montant (tx incl.)
+AmountVAT=Montant TPS/TVH
 AmountLT1=Montant TVQ
+PriceQtyHT=Prix pour la quantité (no tax.)
+PriceQtyMinHT=Prix quantité min. (no tax.)
+PriceQtyTTC=Prix pour la quantité (tx incl.)
+PriceQtyMinTTC=Prix quantité min. (tx incl.)
+TotalHTShort=Total (no tax.)
+TotalTTCShort=Total (tx incl.)
 TotalHT=Sous-total
+TotalHTforthispage=Montant (no tax.) pour la page
 TotalTTC=Total
-TotalVAT=Total TPS
+TotalTTCToYourCredit=Total (tx incl.) à votre crédit
+TotalVAT=Total TPS/TVH
 TotalLT1=Total TVQ
-VAT=TPS
+HT=no tax.
+TTC=tx incl.
+VAT=TPS/TVH
 VATs=Taxes de vente
-VATRate=Taux TPS
+VATRate=Taux TPS/TVH
 Approved=Approuver
 SelectMailModel=Choisir modèle de courriel
diff --git a/htdocs/langs/fr_CA/margins.lang b/htdocs/langs/fr_CA/margins.lang
index f93f8ff712c..7c7fec2d4fd 100644
--- a/htdocs/langs/fr_CA/margins.lang
+++ b/htdocs/langs/fr_CA/margins.lang
@@ -1,3 +1,4 @@
 # Dolibarr language file - Source file is en_US - margins
+ProductService=Produit et service
 MARGIN_TYPE_DETAILS=Raw margin : Selling price - Buying price<br>Net margin : Selling price - Cost price
 MarginTypeDesc=* Margin on best buying price = Selling price - Best supplier price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best supplier price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best supplier price if WAP not yet defined
diff --git a/htdocs/langs/fr_CA/members.lang b/htdocs/langs/fr_CA/members.lang
new file mode 100644
index 00000000000..669910b69ec
--- /dev/null
+++ b/htdocs/langs/fr_CA/members.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - members
+MemberStatusActiveShort=Validée
diff --git a/htdocs/langs/fr_CA/orders.lang b/htdocs/langs/fr_CA/orders.lang
new file mode 100644
index 00000000000..fb38f38845e
--- /dev/null
+++ b/htdocs/langs/fr_CA/orders.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - orders
+StatusOrderBilledShort=Facturées
+StatusOrderBilled=Facturées
diff --git a/htdocs/langs/fr_CA/products.lang b/htdocs/langs/fr_CA/products.lang
new file mode 100644
index 00000000000..ef832ae6b0d
--- /dev/null
+++ b/htdocs/langs/fr_CA/products.lang
@@ -0,0 +1,40 @@
+# Dolibarr language file - Source file is en_US - products
+ProductRef=Référence produit
+ProductLabel=Désignation du produit
+ProductServiceCard=Carte du produits/services
+ProductId=Identification du produit/service
+ProductCode=Code du produit
+ServiceCode=Code du service
+ProductAccountancyBuyCode=Code comptable (achat)
+ProductAccountancySellCode=Code comptable (vente)
+ProductOrService=Produit et service
+ProductsAndServices=Produits et services
+ProductsOrServices=Produits ou services
+ProductsAndServicesOnSell=Produits et services pour la vente ou à l'achat
+ProductsAndServicesNotOnSell=Produits et services non destinés à la vente
+ProductsAndServicesStatistics=Statistiques des produits et services
+ProductsStatistics=Statistiques des produits
+ProductsOnSell=Produit à la vente ou à l'achat
+ProductsNotOnSell=Produit non destiné à la vente et non à l'achat
+ServicesOnSell=Produit à la vente ou à l'achat
+ServicesNotOnSell=Les services non destinés à la vente
+LastRecorded=Derniers produits/services sur ventes enregistrées
+LastRecordedProductsAndServices=Dernier %s produits/services enregistrés
+LastModifiedProductsAndServices=Dernier %s produits/services modifiés
+LastRecordedProducts=Dernier %s produits enregistrés
+LastRecordedServices=Dernière %s services enregistrés
+CardProduct0=Carte du produit
+CardProduct1=Carte du service
+CardContract=Carte du contrat
+OnSell=À vendre
+OnBuy=À acheter
+NotOnSell=Pas à vendre
+ProductStatusOnSell=À vendre
+ProductStatusNotOnSell=Pas à vendre
+ProductStatusOnSellShort=À vendre
+ProductStatusNotOnSellShort=Pas à vendre
+ProductStatusOnBuy=À acheter
+ProductStatusNotOnBuy=Pas à acheter
+ProductStatusOnBuyShort=À acheter
+ProductStatusNotOnBuyShort=Pas à acheter
+ContractStatusClosed=Fermées
diff --git a/htdocs/langs/fr_CA/propal.lang b/htdocs/langs/fr_CA/propal.lang
index 90b012fd6f9..deb13011873 100644
--- a/htdocs/langs/fr_CA/propal.lang
+++ b/htdocs/langs/fr_CA/propal.lang
@@ -1,2 +1,37 @@
 # Dolibarr language file - Source file is en_US - propal
+DeleteProp=Supprimer la proposition commerciale
+ValidateProp=Valider la proposition commerciale
+ConfirmDeleteProp=Êtes-vous sûr de vouloir supprimer cette proposition commerciale ?
+ConfirmValidateProp=Êtes-vous sûr de vouloir valider cette proposition commerciale sous le nom <b>%s</b> ?
+LastPropals=Dernière %s propositions
+LastClosedProposals=Dernière %s propositions fermées
+LastModifiedProposals=Dernière %s propositions modifiées
+AllPropals=Toutes les propositions
+SearchAProposal=Rechercher une proposition
+NoProposal=Pas de propositions
+PropalsOpened=Ouverte
+PropalsNotBilled=Fermée non facturée
+PropalStatusClosed=Fermées
+PropalStatusNotSigned=Non signée (close)
+RefProposal=Référence de la proposition commerciale
+SendPropalByMail=Envoyer proposition commerciale par courriel
+ErrorCantOpenDir=Impossible d'ouvrir le dossier
+DateEndPropal=Date de validité se terminant
 CloseAs=Set status to
+BuildBill=Construire facture
+ErrorPropalNotFound=Pas de proposition %s trouvées
+Estimate=Estimé :
+EstimateShort=Estimé
+AddToDraftProposals=Ajouter un brouillon de proposition
+NoDraftProposals=Pas de brouillons de propositions
+CopyPropalFrom=Créer proposition commerciale en copiant proposition existante
+DefaultProposalDurationValidity=Durée de validité par défaut de la proposition commerciale (en jours)
+UseCustomerContactAsPropalRecipientIfExist=\n
+ClonePropal=Dupliquer proposition commerciale
+ConfirmClonePropal=Etes-vous sûr de vouloir dupliquer la proposition commerciale <b>%s</b> ?
+ConfirmReOpenProp=Etes-vous sûr que vous voulez rouvrir la proposition commerciale <b>%s</b> ?
+ProposalsAndProposalsLines=Proposition commerciale et des lignes
+ProposalLine=ligne de proposition
+AvailabilityPeriod=Délai de disponibilité
+SetAvailability=Indiquer le délai de disponibilité
+AvailabilityTypeAV_NOW=Immédiatement
diff --git a/htdocs/langs/fr_CA/resource.lang b/htdocs/langs/fr_CA/resource.lang
new file mode 100644
index 00000000000..e0c54e7a2f4
--- /dev/null
+++ b/htdocs/langs/fr_CA/resource.lang
@@ -0,0 +1,21 @@
+# Dolibarr language file - Source file is en_US - resource
+MenuResourcePlanning=Planification des ressources
+DeleteResource=Supprimer ressource
+ConfirmDeleteResourceElement=Confirmer la suppression de la ressource pour cet élément
+NoResourceInDatabase=Aucune ressource dans la base.
+ResourcePageIndex=Liste de ressources
+ResourceSingular=Ressource
+ResourceCard=Carte de ressources
+ResourcesLinkedToElement=Des ressources liées à l'élément
+ShowResource=Affichez la ressource
+ShowResourcePlanning=Afficher la planification des ressources
+GotoDate=Aller à la date
+ResourceElementPage=Élément ressources
+ResourceCreatedWithSuccess=Ressources créées avec succès
+RessourceLineSuccessfullyDeleted=Ligne de ressources supprimée
+RessourceLineSuccessfullyUpdated=Ligne de ressources mis à jour avec succès
+ResourceLinkedWithSuccess=Ressources liées à la réussite
+TitleResourceCard=Carte de ressources
+ConfirmDeleteResource=Confirmer pour supprimer cette ressource
+DictionaryResourceType=Types de ressources
+SelectResource=Sélectionnez la ressource
diff --git a/htdocs/langs/fr_CA/salaries.lang b/htdocs/langs/fr_CA/salaries.lang
new file mode 100644
index 00000000000..27a8cbd717b
--- /dev/null
+++ b/htdocs/langs/fr_CA/salaries.lang
@@ -0,0 +1,12 @@
+# Dolibarr language file - Source file is en_US - salaries
+SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Code comptable pour les charges financières
+Salary=Salaires
+NewSalaryPayment=Nouveau paiement de salaire
+SalaryPayment=Paiement Salaire
+SalariesPayments=Paiements salaires
+ShowSalaryPayment=Afficher paiement de salaires
+THM=Prix moyen horaire
+TJM=Prix moyen journalier
+CurrentSalary=Salaire actuel
+THMDescription=Cette valeur peut être utilisée pour calculer le coût du temps consommé sur un projet entré par les utilisateurs si le projet de module est utilisé
+TJMDescription=Cette valeur est actuellement à titre d'information seulement et ne sert pas à tout calcul
diff --git a/htdocs/langs/fr_CA/sendings.lang b/htdocs/langs/fr_CA/sendings.lang
new file mode 100644
index 00000000000..a36c88189e1
--- /dev/null
+++ b/htdocs/langs/fr_CA/sendings.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - sendings
+DateDeliveryPlanned=Date de livraison prévue
diff --git a/htdocs/langs/fr_CA/sms.lang b/htdocs/langs/fr_CA/sms.lang
new file mode 100644
index 00000000000..82c8a7fb0dd
--- /dev/null
+++ b/htdocs/langs/fr_CA/sms.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - sms
+SmsStatusValidated=Validée
diff --git a/htdocs/langs/fr_CA/supplier_proposal.lang b/htdocs/langs/fr_CA/supplier_proposal.lang
new file mode 100644
index 00000000000..b672a451236
--- /dev/null
+++ b/htdocs/langs/fr_CA/supplier_proposal.lang
@@ -0,0 +1,9 @@
+# Dolibarr language file - Source file is en_US - supplier_proposal
+SupplierProposalDraft=Brouillon
+SupplierProposalOpened=Ouverte
+SupplierProposalStatusClosed=Fermées
+SupplierProposalStatusBilled=Facturées
+SupplierProposalStatusValidatedShort=Validée
+SupplierProposalStatusOpenedShort=Ouverte
+SupplierProposalStatusClosedShort=Fermées
+SupplierProposalStatusBilledShort=Facturées
diff --git a/htdocs/langs/fr_CA/suppliers.lang b/htdocs/langs/fr_CA/suppliers.lang
new file mode 100644
index 00000000000..9f910713917
--- /dev/null
+++ b/htdocs/langs/fr_CA/suppliers.lang
@@ -0,0 +1,31 @@
+# Dolibarr language file - Source file is en_US - suppliers
+SupplierRemoved=Supprimer fournisseur
+SuppliersInvoice=Factures fournisseurs
+ListOfSuppliers=Liste fournisseurs
+BuyingPriceMin=Prix minimum d'achat
+BuyingPriceMinShort=Prix min. d'achat
+TotalBuyingPriceMin=Total de sous-produits par prix d'achat
+SomeSubProductHaveNoPrices=Certains sous-produits n'ont pas de prix défini
+AddSupplierPrice=Ajouter prix du fournisseur
+ChangeSupplierPrice=Changer le prix de fournisseur
+ErrorSupplierCountryIsNotDefined=Le pays pour ce fournisseur n'est pas défini. Veuillez premièrement corriger cet élément.
+ProductHasAlreadyReferenceInThisSupplier=Ce produit a déjà une référence dans ce fournisseur
+ReferenceSupplierIsAlreadyAssociatedWithAProduct=Ce fournisseur de référence est déjà associé à une référence : %s
+NoRecordedSuppliers=Aucun fournisseurs enregistrés
+SupplierPayment=Règlement fournisseur
+Availability=Disponible
+ExportDataset_fournisseur_1=Liste des factures des fournisseurs et des lignes de facturation
+ExportDataset_fournisseur_2=Factures des fournisseurs et paiements
+ExportDataset_fournisseur_3=Commandes fournisseurs et les lignes de commande
+ApproveThisOrder=Approuver cette commande
+ConfirmApproveThisOrder=Êtes-vous sûr de vouloir approuver la commande <b>%s</b> ?
+ConfirmDenyingThisOrder=Êtes-vous sûr de vouloir refuser la commande <b>%s</b> ?
+ConfirmCancelThisOrder=Êtes-vous sûr de vouloir annuler la commande <b>%s</b> ?
+AddCustomerOrder=Créer une commande client
+AddCustomerInvoice=Créer une facture client
+ListOfSupplierProductForSupplier=Liste des produits et des prix pour le fournisseur <b>%s</b>
+NoneOrBatchFileNeverRan=Aucun ou lot <b>%s</b> consulté récemment
+SentToSuppliers=Envoyer aux fournisseurs
+MenuOrdersSupplierToBill=Commandes de fournisseur à facturer
+DescNbDaysToDelivery=Délai de livraison maximum pour les produits de cette commande
+UseDoubleApproval=Utilisez la double approbation lorsque montant (no tax.) est supérieur (La deuxième approbation peut être fait par tout utilisateur avec la permission dédié. Réglez à 0 si pas de double approbation nécessaire)
diff --git a/htdocs/langs/fr_CA/users.lang b/htdocs/langs/fr_CA/users.lang
new file mode 100644
index 00000000000..d14a44cb855
--- /dev/null
+++ b/htdocs/langs/fr_CA/users.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - users
+AdministratorDescEntity=Administrateur (pour cette compagnie)
+MenuMyUserCard=Ma carte d'utilisateur
diff --git a/htdocs/langs/fr_CA/workflow.lang b/htdocs/langs/fr_CA/workflow.lang
new file mode 100644
index 00000000000..785a361bd24
--- /dev/null
+++ b/htdocs/langs/fr_CA/workflow.lang
@@ -0,0 +1,10 @@
+# Dolibarr language file - Source file is en_US - workflow
+WorkflowSetup=Configuration du module de workflow
+WorkflowDesc=Ce module est conçu pour modifier le comportement des actions automatiques en application. Par défaut, le workflow est ouvert (vous pouvez faire les choses dans l'ordre que vous voulez) . Vous pouvez activer les actions automatiques qui vous intéressent .
+ThereIsNoWorkflowToModify=Il n'y a pas de modification de flux de travail disponibles avec les modules activés .
+descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Créer automatiquement une commande client après une proposition commerciale est signée
+descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Créer automatiquement une facture client après une proposition commerciale est signée
+descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Créer automatiquement une facture client après un contrat est validé
+descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classez proposition source liée à bec lors de la commande du client est réglé sur payé
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classez commande client source liée(s) à bec lorsque la facture client est réglé sur payé
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classez ordre lié source de client(s) à bec lorsque la facture client est validée
diff --git a/htdocs/langs/fr_CH/cron.lang b/htdocs/langs/fr_CH/cron.lang
new file mode 100644
index 00000000000..d8953584e61
--- /dev/null
+++ b/htdocs/langs/fr_CH/cron.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - cron
+CronDtLastLaunch=Start date of last execution
+CronDtLastResult=End date of last execution
diff --git a/htdocs/langs/fr_FR/accountancy.lang b/htdocs/langs/fr_FR/accountancy.lang
index acf24fc9a36..6fa3949d4e5 100644
--- a/htdocs/langs/fr_FR/accountancy.lang
+++ b/htdocs/langs/fr_FR/accountancy.lang
@@ -34,7 +34,7 @@ AccountAccounting=Compte comptable
 AccountAccountingSuggest=Suggestion du compte
 Ventilation=Ventilation
 
-MenuAccountancy=Accountancy
+MenuAccountancy=Comptabilité
 CustomersVentilation=Ventilation clients
 SuppliersVentilation=Ventilation fournisseurs
 TradeMargin=Marge commerciale
@@ -47,7 +47,7 @@ UpdateAccount=Modification de compte comptable
 UpdateMvts=Modification de mouvements
 WriteBookKeeping=Enregistrer les écritures dans le grand livre
 Bookkeeping=Grand livre
-AccountBalance=Account balance
+AccountBalance=Balance des comptes
 
 AccountingVentilation=Ventilation comptable
 AccountingVentilationSupplier=Ventilation comptable client
@@ -104,7 +104,7 @@ Code_tiers=Tiers
 Labelcompte=Libellé du compte
 Sens=Sens
 Codejournal=Journal
-NumPiece=Piece number
+NumPiece=Numéro de pièce
 
 DelBookKeeping=Supprimer les écritures du grand livre
 
@@ -166,14 +166,14 @@ Headername=Nom en-tête
 Type=Type de champs
 Param=Paramètres Supplémentaires
 EnabledProduct=Dans produit
-EnabledTiers=In third party
-EnabledVat=In VAT
+EnabledTiers=Dans le compte de tiers
+EnabledVat=Dans le compte TVA
 
 ## Tools - Init accounting account on product / service
-InitAccountancy=Init accountancy
-InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accountancy account defined for sales and purchases. Check before that setup of module accountancy is complete.
+InitAccountancy=Initialisation comptabilité
+InitAccountancyDesc=Cette page peut être utilisée pour initialiser un compte comptable sur les produits et services qui n'ont pas de compte comptable défini pour les ventes et les achats. Vérifiez avant que l'installation du module comptabilité avancée est complète. 
 Options=Options
-OptionModeProductSell=Mode sales
-OptionModeProductBuy=Mode purchases
-OptionModeProductSellDesc=Show all products with no accounting account defined for sales.
-OptionModeProductBuyDesc=Show all products with no accounting account defined for purchases.
+OptionModeProductSell=Mode ventes
+OptionModeProductBuy=Modes achats
+OptionModeProductSellDesc=Afficher tous les produits/services n'ayant pas de compte comptable défini pour les ventes.
+OptionModeProductBuyDesc=Afficher tous les produits/services n'ayant pas de compte comptable défini pour les achats.
diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang
index 333be2ad4fc..fc5161014c0 100644
--- a/htdocs/langs/fr_FR/admin.lang
+++ b/htdocs/langs/fr_FR/admin.lang
@@ -282,7 +282,7 @@ ModuleSetup=Configuration du module
 ModulesSetup=Configuration des modules
 ModuleFamilyBase=Système
 ModuleFamilyCrm=Gestion de la relation client (GRC)
-ModuleFamilySrm=Supplier Relation Management (SRM)
+ModuleFamilySrm=Gestion de la relation fournisseur (SRM)
 ModuleFamilyProducts=Gestion des Produits/Services (PM)
 ModuleFamilyHr=Gestion des Ressources Humaines (RH)
 ModuleFamilyProjects=Projets/Travail collaboratif
@@ -588,6 +588,7 @@ Permission38=Exporter les produits
 Permission41=Lire les projets et les tâches (projets publiques et projets dont je suis contact). Peut également entrer le temps consommé sur les tâches assignées (feuille de temps)
 Permission42=Créer/modifier les projets et tâches (partagés ou dont je suis contact)
 Permission44=Supprimer les projets et tâches (partagés ou dont je suis contact)
+Permission45=Export projects
 Permission61=Consulter les interventions
 Permission62=Créer/modifier les interventions
 Permission64=Supprimer les interventions
@@ -641,6 +642,7 @@ Permission162=Créer/modifier les contrats/abonnements
 Permission163=Activer un service/abonnement
 Permission164=Désactiver un service/abonnements
 Permission165=Supprimer les contrats/abonnements
+Permission167=Export contracts
 Permission171=Lire les notes de frais (les vôtres et celles de vos subordonnés)
 Permission172=Créer/modifier les notes de frais / déplacements
 Permission173=Supprimer les notes de frais / déplacements
@@ -778,7 +780,7 @@ Permission20002=Créer/modifier vos demandes de congé
 Permission20003=Supprimer les demandes de congé
 Permission20004=Lire toutes les demandes de congé (même celle des utilisateurs non subordonnés)
 Permission20005=Créer/modifier les congés pour tout le monde
-Permission20006=Administration des demandes de congès (configuration et mise à jour du solde)
+Permission20006=Administration des demandes de congés (configuration et mise à jour du solde)
 Permission23001=Voir les travaux planifiés
 Permission23002=Créer/Modifier des travaux planifiées
 Permission23003=Effacer travail planifié
@@ -789,6 +791,7 @@ Permission2403=Supprimer les actions (événements ou tâches) liées à son com
 Permission2411=Lire les actions (événements ou tâches) des autres
 Permission2412=Créer/modifier les actions (événements ou tâches) pour les autres
 Permission2413=Supprimer les actions (événements ou tâches) pour les autres
+Permission2414=Export actions/tasks of others
 Permission2501=Lire/récupérer les documents
 Permission2502=Récupérer les documents
 Permission2503=Soumettre ou supprimer des documents
@@ -991,7 +994,7 @@ InfoDolibarr=Infos Dolibarr
 InfoBrowser=Infos navigateur
 InfoOS=Infos OS
 InfoWebServer=Infos web server
-InfoDatabase=Infos base de donnée
+InfoDatabase=Infos base de données
 InfoPHP=Infos PHP
 InfoPerf=Infos performances
 BrowserName=Nom du navigateur
@@ -1199,8 +1202,8 @@ ProposalsNumberingModules=Modèles de numérotation des propositions commerciale
 ProposalsPDFModules=Modèles de documents de propositions commerciales
 ClassifiedInvoiced=Classer facturée
 HideTreadedPropal=Cacher les propositions commerciales traitées de la liste
-AddShippingDateAbility=Possibilité de déterminer une date de livraison
-AddDeliveryAddressAbility=Possibilité de sélectionner une adresse de livraison
+AddShippingDateAbility=Possibilité de déterminer une date d'expédition
+AddDeliveryAddressAbility=Possibilité de sélectionner une date de livraison
 UseOptionLineIfNoQuantity=Une ligne de produit/service ayant une quantité nulle est considérée comme une option
 FreeLegalTextOnProposal=Mention complémentaire sur les propositions commerciales
 WatermarkOnDraftProposal=Filigrane sur les brouillons de propositions commerciales (aucun si vide)
@@ -1713,4 +1716,5 @@ ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s est disponible. La ver
 ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s est disponible. La version %s est une version de maintanance, aussi elle ne contient que des correctifs de bugs. Nous recommandons tout personne utilisant une version plus ancienne de migrer sur celle-ci. En tant que version de maintenance, aucune nouvelle fonctionnalité n'est ajouté, ni modification de format de données. Vous pouvez télécharger cette version à partir de la zone de téléchargement du portail http://www.dolibarr.org (sous-répertoire "Versions stables"). Vous pouvez lire le <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> pour la liste complète des changements.
 MultiPriceRuleDesc=Quand l'option « Plusieurs niveaux de prix par produit/service» est activée, vous pouvez définir différents prix (un par niveau de prix) pour chaque produits. Pour sauver du temps, vous pouvez entrer ici une règle pour avoir un prix pour chaque niveau calculé automatiquement. Cette page est ici pour sauver du temps et peut être utile si vos prix pour chaque niveaux sont relatif au premier niveau. Vous pouvez ignorer cette page dans la plupart des cas
 ModelModulesProduct=Modèles des documents de produits
-ToGenerateCodeDefineAutomaticRuleFirst=Pour pouvoir générer automatiquement des codes, vous devez d'abord définir un gestionnaire pour définir automatiquement le numéro du codebar.
+ToGenerateCodeDefineAutomaticRuleFirst=Pour pouvoir générer automatiquement des codes, vous devez d'abord définir un gestionnaire pour définir automatiquement le numéro du code-barre.
+SeeSubstitutionVars=See * note for list of possible substitution variables
diff --git a/htdocs/langs/fr_FR/agenda.lang b/htdocs/langs/fr_FR/agenda.lang
index b42ef84146e..e18889194ef 100644
--- a/htdocs/langs/fr_FR/agenda.lang
+++ b/htdocs/langs/fr_FR/agenda.lang
@@ -50,7 +50,7 @@ InvoiceValidatedInDolibarrFromPos=Facture %s validée depuis le Point de Vente
 InvoiceBackToDraftInDolibarr=Facture %s repassée en brouillon
 InvoiceDeleteDolibarr=Facture %s supprimée
 OrderValidatedInDolibarr=Commande %s validée
-OrderDeliveredInDolibarr=Commande %s classée Délivrée
+OrderDeliveredInDolibarr=Commande %s classée Livrée
 OrderCanceledInDolibarr=Commande %s annulée
 OrderBilledInDolibarr=Commande %s classée Facturée
 OrderApprovedInDolibarr=Commande %s approuvée
diff --git a/htdocs/langs/fr_FR/bills.lang b/htdocs/langs/fr_FR/bills.lang
index 6da3a13b738..0bc912e77d3 100644
--- a/htdocs/langs/fr_FR/bills.lang
+++ b/htdocs/langs/fr_FR/bills.lang
@@ -107,7 +107,7 @@ EnterPaymentDueToCustomer=Saisie d'un remboursement d'un avoir client
 DisabledBecauseRemainderToPayIsZero=Désactivé car reste à payer est nul
 PriceBase=Base du prix
 BillStatus=État de la facture
-StatusOfGeneratedInvoices=Status of generated invoices
+StatusOfGeneratedInvoices=Statut des factures générées
 BillStatusDraft=Brouillon (à valider)
 BillStatusPaid=Payée
 BillStatusPaidBackOrConverted=Remboursé ou converti en réduction
@@ -141,10 +141,10 @@ ErrorCantCancelIfReplacementInvoiceNotValidated=Erreur, il n'est pas possible d'
 BillFrom=Émetteur
 BillTo=Adressé à
 ActionsOnBill=Événements sur la facture
-RecurringInvoiceTemplate=Recurring invoice
-NoQualifiedRecurringInvoiceTemplateFound=No recurring template invoice qualified for generation.
-FoundXQualifiedRecurringInvoiceTemplate=Found %s recurring template invoice(s) qualified for generation.
-NotARecurringInvoiceTemplate=Not a recurring template invoice
+RecurringInvoiceTemplate=Facture récurrente
+NoQualifiedRecurringInvoiceTemplateFound=Pas de facture récurrente qualifiée pour la génération
+FoundXQualifiedRecurringInvoiceTemplate=%s facture(s) récurrente(s) qualifiées pour la génération
+NotARecurringInvoiceTemplate=Pas une facture récurrente
 NewBill=Nouvelle facture
 LastBills=Les %s dernières factures
 LastCustomersBills=Les %s dernières factures clients
@@ -219,6 +219,7 @@ RemainderToBill=Reste à facturer
 SendBillByMail=Envoyer la facture par email
 SendReminderBillByMail=Envoyer une relance par email
 RelatedCommercialProposals=Propositions commerciales associées
+RelatedRecurringCustomerInvoices=Related recurring customer invoices
 MenuToValid=A valider
 DateMaxPayment=Date limite règlement
 DateEcheance=Date échéance
@@ -310,21 +311,20 @@ WarningBillExist=Attention, une ou plusieurs factures existent déjà
 MergingPDFTool=Outil de fusion de PDF
 AmountPaymentDistributedOnInvoice=Montant paiement affecté à la facture
 PaymentNote=Note du paiement
-ListOfPreviousSituationInvoices=List of previous situation invoices
-ListOfNextSituationInvoices=List of next situation invoices
-FrequencyPer_d=Every %s days
-FrequencyPer_m=Every %s months
-FrequencyPer_y=Every %s years
+ListOfPreviousSituationInvoices=Liste des factures de situation précédentes
+ListOfNextSituationInvoices=Liste des factures de situation suivantes
+FrequencyPer_d=Tous les %s jour(s)
+FrequencyPer_m=Tous les %s mois
+FrequencyPer_y=Tout les %s an(s)
 toolTipFrequency=Examples:<br /><b>Set 7 / day</b>: give a new invoice every 7 days<br /><b>Set 3 / month</b>: give a new invoice every 3 month
-NextDateToExecution=Date for next invoice generation
-DateLastGeneration=Date of last generation
-MaxPeriodNumber=Max nb of invoice generation
-RestPeriodNumber=Rest period number
-NbOfGenerationDone=Nb of invoice generation already done
-InvoiceAutoValidate=Automatically validate invoice
-GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
-DateIsNotEnough=Date not yet reached
-InvoiceGeneratedFromTemplate=Invoice %s generated from recurring template invoice %s
+NextDateToExecution=Date pour la prochaine génération de facture
+DateLastGeneration=Date de la dernière génération
+MaxPeriodNumber=Nombre maximum de génération
+NbOfGenerationDone=Nombre de génération déjà réalisées
+InvoiceAutoValidate=Valider la facture automatiquement
+GeneratedFromRecurringInvoice=Généré depuis la facture modèle récurrente %s
+DateIsNotEnough=Date pas encore atteinte
+InvoiceGeneratedFromTemplate=Facture %s généré depuis la facture modèle récurrente %s
 # PaymentConditions
 PaymentConditionShortRECEP=À réception
 PaymentConditionRECEP=À réception de facture
@@ -421,7 +421,7 @@ Reported=Différé
 DisabledBecausePayments=Non disponible car il existe des paiements
 CantRemovePaymentWithOneInvoicePaid=Suppression impossible quand il existe au moins une facture classée payée.
 ExpectedToPay=Paiement attendu
-CantRemoveConciliatedPayment=Can't remove conciliated payment
+CantRemoveConciliatedPayment=Suppression d'un paiement rapproché impossible
 PayedByThisPayment=Règlé par ce paiement
 ClosePaidInvoicesAutomatically=Classer "Payées" les factures standards ou de remplacements ayant un reste à payer nul 
 ClosePaidCreditNotesAutomatically=Classer automatiquement à "Payé" les factures avoirs entièrement remboursées.
@@ -433,7 +433,7 @@ NoteListOfYourUnpaidInvoices=Remarque: Cette liste ne contient que les factures
 RevenueStamp=Timbre fiscal
 YouMustCreateInvoiceFromThird=Cette option n'est disponible que lorsqu'on accède à la création de facture depuis l'onglet "Client" d'un Tiers.
 PDFCrabeDescription=Modèle de facture PDF complet (modèle recommandé par défaut)
-PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for invoice situation
+PDFCrevetteDescription=Modèle de facture PDF Crevette (modèle complet pour les factures de situation)
 TerreNumRefModelDesc1=Renvoie le numéro sous la forme %syymm-nnnn pour les factures et factures de remplacement, %syymm-nnnn pour les avoirs et %syymm-nnnn pour les acomptes où yy est l'année, mm le mois et nnnn un compteur séquentiel sans rupture et sans remise à 0
 MarsNumRefModelDesc1=Renvoie le numéro sous la forme %syymm-nnnn pour les factures, %syymm-nnnn pour les factures de remplacement, %syymm-nnnn pour les acomptes et %syymm-nnnn pour les avoirs où yy est l'année, mm le mois et nnnn un compteur séquentiel sans rupture et sans remise à 0
 TerreNumRefModelError=Une facture commençant par $syymm existe déjà et est incompatible avec cet modèle de numérotation. Supprimez-la ou renommez-la pour activer ce module.
@@ -466,8 +466,12 @@ InvoiceSituationLast=Dernière facture
 PDFCrevetteSituationNumber=Situation N°%s
 PDFCrevetteSituationInvoiceLineDecompte=Situation invoice - COUNT
 PDFCrevetteSituationInvoiceTitle=Facture de situation
-PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for invoice situation
+PDFCrevetteDescription=Modèle de facture PDF Crevette (modèle complet pour les factures de situation)
 PDFCrevetteSituationInvoiceLine=Situation N°%s : Inv. N°%s on %s
 TotalSituationInvoice=Total situation
 invoiceLineProgressError=Invoice line progress can't be egal or upper the next invoice line
-updatePriceNextInvoiceErrorUpdateline=Error : update price on invoice line : %s
+updatePriceNextInvoiceErrorUpdateline=Erreur: mise à jour du prix sur la ligne de facture : %s
+ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
+ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
+ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
+
diff --git a/htdocs/langs/fr_FR/boxes.lang b/htdocs/langs/fr_FR/boxes.lang
index b19d51dfbd3..8c3ece753ae 100644
--- a/htdocs/langs/fr_FR/boxes.lang
+++ b/htdocs/langs/fr_FR/boxes.lang
@@ -60,8 +60,8 @@ BoxTitleLastContracts=Les %s derniers contrats
 BoxTitleLastModifiedDonations=Les %s derniers dons modifiés
 BoxTitleLastModifiedExpenses=Les %s dernières notes de frais modifiées
 BoxGlobalActivity=Activité globale (factures, propositions, commandes)
-BoxGoodCustomers=Good customers
-BoxTitleGoodCustomers=%s Good customers
+BoxGoodCustomers=Bons clients
+BoxTitleGoodCustomers=%s bons clients
 FailedToRefreshDataInfoNotUpToDate=Échec du rafraichissement du flux RSS. Date du dernier rafraichissement : %s
 LastRefreshDate=Date dernier rafraichissement
 NoRecordedBookmarks=Pas de marques-pages personnels.
@@ -97,4 +97,4 @@ ForCustomersInvoices=Factures clients
 ForCustomersOrders=Commandes clients
 ForProposals=Propositions commerciales
 LastXMonthRolling=Les %s derniers mois tournant
-ChooseBoxToAdd=Add a box to your dashboard...
+ChooseBoxToAdd=Ajouter une boîte au tableau de bord
diff --git a/htdocs/langs/fr_FR/companies.lang b/htdocs/langs/fr_FR/companies.lang
index 28188642d59..bdf503511ce 100644
--- a/htdocs/langs/fr_FR/companies.lang
+++ b/htdocs/langs/fr_FR/companies.lang
@@ -440,3 +440,6 @@ MergeThirdparties=Fursion de tiers
 ConfirmMergeThirdparties=Etes-vous sûr que vous voulez fusionner ce tiers dans l'actuel ? Tous les objets liés (factures, commandes, ...) seront déplacés sur le tiers en cours de sorte que vous serez en mesure de supprimer le doublon.
 ThirdpartiesMergeSuccess=Les tiers ont été fusionnés
 ErrorThirdpartiesMerge=Il y a eu une erreur lors de la suppression du tiers. Aucune modification n'a été enregistrée.
+SaleRepresentativeLogin=Login du commercial
+SaleRepresentativeFirstname=Prénom du commercial
+SaleRepresentativeLastname=Nom du commercial
diff --git a/htdocs/langs/fr_FR/compta.lang b/htdocs/langs/fr_FR/compta.lang
index 96cc123c2c6..85b6aaa4f9b 100644
--- a/htdocs/langs/fr_FR/compta.lang
+++ b/htdocs/langs/fr_FR/compta.lang
@@ -155,7 +155,7 @@ DepositsAreNotIncluded=- Les factures d'acomptes ne sont pas incluses
 DepositsAreIncluded=- Les factures d'acomptes sont incluses
 LT2ReportByCustomersInInputOutputModeES=Rapport par client des IRPF
 LT1ReportByCustomersInInputOutputModeES=Rapport par tiers des RE
-VATReport=VAT report
+VATReport=Rapport TVA
 VATReportByCustomersInInputOutputMode=Rapport par client des TVA collectées et payées
 VATReportByCustomersInDueDebtMode=Rapport par client des TVA collectées et payées
 VATReportByQuartersInInputOutputMode=Rapport par taux des TVA collectées et payées
@@ -221,4 +221,4 @@ OtherCountriesCustomersReport=Rapport client étranger
 BasedOnTwoFirstLettersOfVATNumberBeingDifferentFromYourCompanyCountry=Basé sur les deux premières lettres du numéro de TVA étant différent du code de pays de votre propre entreprise
 SameCountryCustomersWithVAT=Rapport clients nationaux
 BasedOnTwoFirstLettersOfVATNumberBeingTheSameAsYourCompanyCountry=Basé sur les deux premières lettres du numéro de TVA étant les mêmes que le code pays de votre propre entreprise
-LinkedFichinter=Lier à une intervention
+LinkedFichinter=Lié à une intervention
diff --git a/htdocs/langs/fr_FR/cron.lang b/htdocs/langs/fr_FR/cron.lang
index 9e39df83ccf..e44bee937fd 100644
--- a/htdocs/langs/fr_FR/cron.lang
+++ b/htdocs/langs/fr_FR/cron.lang
@@ -16,7 +16,7 @@ KeyForCronAccess=Clé de sécurité pour l'URL de lancement des travaux programm
 FileToLaunchCronJobs=Commande pour lancer les travaux programmés actifs
 CronExplainHowToRunUnix=Sur un environnement Unix vous pouvez utiliser l'entrée suivante en crontab pour exécuter la ligne de commande toutes les 5 minutes
 CronExplainHowToRunWin=Sur un environement Microsoft(tm) Windows vous pouvez utiliser le planificateur de tache pour lancer cette commande toute les 5 minutes.
-CronMethodDoesNotExists=Class %s does not contains any method %s
+CronMethodDoesNotExists=La classe %s ne contient aucune méthode %s
 # Menu
 CronJobs=Travaux programmés
 CronListActive=Liste des travaux activés/planifiés
@@ -40,8 +40,8 @@ CronNone=Aucun(e)
 CronDtStart=Pas avant
 CronDtEnd=Pas après
 CronDtNextLaunch=Prochaine exécution
-CronDtLastLaunch=Start date of last execution
-CronDtLastResult=End date of last execution
+CronDtLastLaunch=Date démarrage dernière exécution
+CronDtLastResult=Date de fin dernière exécution
 CronFrequency=Fréquence
 CronClass=Classe
 CronMethod=Méthode
@@ -90,5 +90,5 @@ CronMenu=Cron
 CronCannotLoadClass=Impossible de charger la classe %s ou l'objet %s
 UseMenuModuleToolsToAddCronJobs=Aller dans le menu "Accueil - Outils modules - Liste des travaux" pour voir et éditer les travaux planifiés.
 TaskDisabled=Travail non programmé
-MakeLocalDatabaseDumpShort=Local database backup
-MakeLocalDatabaseDump=Create a local database dump
+MakeLocalDatabaseDumpShort=Sauvegarde locale de base
+MakeLocalDatabaseDump=Créer une sauvegarde locale de la base
diff --git a/htdocs/langs/fr_FR/deliveries.lang b/htdocs/langs/fr_FR/deliveries.lang
index 1823770a1d7..a2deba11965 100644
--- a/htdocs/langs/fr_FR/deliveries.lang
+++ b/htdocs/langs/fr_FR/deliveries.lang
@@ -9,7 +9,7 @@ DeliveryDateShort=Date réc.
 CreateDeliveryOrder=Générer bon de réception
 DeliveryStateSaved=Le statut de livraison est enregistré
 QtyDelivered=Qté livrée
-SetDeliveryDate=Définir la date de livraison
+SetDeliveryDate=Définir la date d'expédition
 ValidateDeliveryReceipt=Valider le bon de livraison
 ValidateDeliveryReceiptConfirm=Êtes-vous sûr de vouloir valider ce bon de livraison ?
 DeleteDeliveryReceipt=Supprimer le bon de livraison
diff --git a/htdocs/langs/fr_FR/errors.lang b/htdocs/langs/fr_FR/errors.lang
index 4c4e934ffff..af0aa24f06f 100644
--- a/htdocs/langs/fr_FR/errors.lang
+++ b/htdocs/langs/fr_FR/errors.lang
@@ -172,8 +172,8 @@ ErrorMandatoryParametersNotProvided=Paramètre(s) obligatoire(s) non fournis
 ErrorOppStatusRequiredIfAmount=Vous avez fixé un montant estimé pour cette opportunité/affaire. Aussi, vous devez également entrer son statut
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Mauvaise définition du tableau Menu dans le descripteur de module (mauvaise valeur pour la clé fk_menu)
 ErrorSavingChanges=Une erreur est survenue lors de la sauvegarde des modifications
-ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
-ErrorFileMustHaveFormat=File must have format %s
+ErrorWarehouseRequiredIntoShipmentLine=L'entrepôt est requis sur la ligne de l'expédition
+ErrorFileMustHaveFormat=Le fichier doit avoir le format %s
 
 # Warnings
 WarningPasswordSetWithNoAccount=Un mot de passe a été fixé pour cet adhérent. Cependant, aucun compte d'utilisateur n'a été créé. Donc, ce mot de passe est stocké, mais ne peut être utilisé pour accéder à Dolibarr. Il peut être utilisé par un module/interface externe, mais si vous n'avez pas besoin de définir ni login ni mot de passe pour un adhérent, vous pouvez désactiver l'option «Gérer un login pour chaque adhérent" depuis la configuration du module Adhérents. Si vous avez besoin de gérer un login, mais pas de mot de passe, vous pouvez laisser ce champ vide pour éviter cet avertissement. Remarque: L'email peut également être utilisé comme login si l'adhérent est lié à un utilisateur.
diff --git a/htdocs/langs/fr_FR/exports.lang b/htdocs/langs/fr_FR/exports.lang
index 44be3ccbe50..28b87031f17 100644
--- a/htdocs/langs/fr_FR/exports.lang
+++ b/htdocs/langs/fr_FR/exports.lang
@@ -128,10 +128,10 @@ SpecialCode=Code spécial
 ExportStringFilter=%% permet de remplacer 1 ou plusieurs caractères dans le texte
 ExportDateFilter=AAAA, AAAAMM, AAAAMMJJ: filtre pour une année/mois/jour<br>AAAA+AAAA, AAAAMM+AAAAMM, AAAAMMJJ+AAAAMMJJ: filtre pour une plage année/mois/jour<br> > AAAA, > AAAAMM, > AAAAMMJJ': filtre pour une date supérieure à une année/mois/jour donné<br> < AAAA, < AAAAMM, < AAAAMMJJ: filtre pour une date inférieure à une année/mois/jour donné
 ExportNumericFilter='NNNNN' filtres sur une valeur<br>'NNNNN+NNNNN' filtres sur une place de valeurs<br>'&gt;NNNNN' filtres sur les valeurs plus petites<br>'&gt;NNNNN' filtres sur les valeurs plus grandes
-ImportFromLine=Import starting from line number
-EndAtLineNb=End at line number
-SetThisValueTo2ToExcludeFirstLine=For example, set this value to 3 to exclude the 2 first lines
-KeepEmptyToGoToEndOfFile=Keep this field empty to go up to the end of file
+ImportFromLine=Début d'import à la ligne numéro
+EndAtLineNb=Fin à la ligne numéro
+SetThisValueTo2ToExcludeFirstLine=Par exemple, positionnez cette valeur à 3 pour exclure les 2 premières lignes
+KeepEmptyToGoToEndOfFile=Laissez ce champ vide pour aller jusqu'à la fin du fichier
 ## filters
 SelectFilterFields=Si vous voulez filtrer sur certaines valeurs, saisissez ces valeurs.
 FilterableFields=Champs filtrables
diff --git a/htdocs/langs/fr_FR/main.lang b/htdocs/langs/fr_FR/main.lang
index fbd66fb9623..1b8885bee93 100644
--- a/htdocs/langs/fr_FR/main.lang
+++ b/htdocs/langs/fr_FR/main.lang
@@ -25,6 +25,7 @@ FormatDateHourTextShort=%d %b %Y %H:%M
 FormatDateHourText=%d %B %Y %H:%M
 DatabaseConnection=Connexion à la base
 NoTemplateDefined=Pas de modèle défini pour ce type d'email
+AvailableVariables=Available substitution variables
 NoTranslation=Pas de traduction
 NoRecordFound=Aucun enregistrement trouvé
 NoError=Aucune erreur
diff --git a/htdocs/langs/fr_FR/oauth.lang b/htdocs/langs/fr_FR/oauth.lang
index dd15e3c882e..c0cbb9a370c 100644
--- a/htdocs/langs/fr_FR/oauth.lang
+++ b/htdocs/langs/fr_FR/oauth.lang
@@ -1,14 +1,14 @@
 # Dolibarr language file - Source file is en_US - oauth
 ConfigOAuth=Configuration OAuth
-NoAccessToken=No access token saved into local database
-HasAccessToken=A token was generated and saved into local database
-NewTokenStored=Token received ans saved
-ToCheckDeleteTokenOnProvider=To check/delete authorization saved by %s OAuth provider
-TokenDeleted=Token deleted
-RequestAccess=Click here to request/renew access and receive a new token to save
-DeleteAccess=Click here to delete token
-UseTheFollowingUrlAsRedirectURI=Use the following URL as the Redirect URI when creating your credential on your OAuth provider:
-ListOfSupportedOauthProviders=Enter here credential provided by your OAuth2 provider. Only supported OAuth2 providers are visible here. This setup may be used by other modules that need OAuth2 authentication.
-OAUTH_GOOGLE_NAME=Api Google
-OAUTH_GOOGLE_ID=Api Google Id
-OAUTH_GOOGLE_SECRET=Api Google Secret
+NoAccessToken=Aucun jeton d'accès sauvegardé dans la base de donnée locale
+HasAccessToken=Un jeton a été généré et sauvegardé dans la base de donnée locale
+NewTokenStored=Jeton reçu et sauvegardé
+ToCheckDeleteTokenOnProvider=Pour vérifier/effacer l'autorisation sauvegardée par le fournisseur OAuth %s
+TokenDeleted=Jeton effacé
+RequestAccess=Cliquez ici pour demander/renouveler un accès et recevoir un nouveau jeton à sauvegarder
+DeleteAccess=Cliquez ici pour effacer le jeton
+UseTheFollowingUrlAsRedirectURI=Utilisez l'URL suivante comme URI de redirection quand vous créez un crédit avec votre fournisseur OAuth :
+ListOfSupportedOauthProviders=Saisissez ici le crédit fourni par votre fournisseur OAuth2. Seuls les fournisseurs OAuth2 supportés sont visibles ici. Ce paramétrage est potentiellement utilisé par d'autres modules qui nécessitent une authentification OAuth2.
+OAUTH_GOOGLE_NAME=API Google
+OAUTH_GOOGLE_ID=ID API Google
+OAUTH_GOOGLE_SECRET=API Google Secrète
diff --git a/htdocs/langs/fr_FR/orders.lang b/htdocs/langs/fr_FR/orders.lang
index 41e5dfc312e..5a64882c582 100644
--- a/htdocs/langs/fr_FR/orders.lang
+++ b/htdocs/langs/fr_FR/orders.lang
@@ -32,7 +32,8 @@ StatusOrderSent=Envoi en cours
 StatusOrderOnProcessShort=Commandé
 StatusOrderProcessedShort=Traitée
 StatusOrderDelivered=Livrée
-StatusOrderToBillShort=Délivrée
+StatusOrderDeliveredShort=Livrée
+StatusOrderToBillShort=Livré
 StatusOrderToBill2Short=À facturer
 StatusOrderApprovedShort=Approuvée
 StatusOrderRefusedShort=Refusée
@@ -46,7 +47,7 @@ StatusOrderValidated=Validée
 StatusOrderOnProcess=Commandé - en attente de réception
 StatusOrderOnProcessWithValidation=Commandé - en attente de réception ou validation
 StatusOrderProcessed=Traitée
-StatusOrderToBill=Délivrée
+StatusOrderToBill=Livrée
 StatusOrderToBill2=À facturer
 StatusOrderApproved=Approuvée
 StatusOrderRefused=Refusée
@@ -58,7 +59,7 @@ ProductQtyInDraft=Quantité de produit en commandes brouillons
 ProductQtyInDraftOrWaitingApproved=Quantité de produit en commandes brouillons ou approuvées, mais pas encore passées
 DraftOrWaitingApproved=Brouillon ou approuvée pas encore commandée
 DraftOrWaitingShipped=Brouillon ou validée pas encore expédiée
-MenuOrdersToBill=Commandes délivrées
+MenuOrdersToBill=Commandes livrées
 MenuOrdersToBill2=Commandes facturables
 SearchOrder=Rechercher une commande
 SearchACustomerOrder=Rechercher une commande client
@@ -106,7 +107,7 @@ ConfirmUnvalidateOrder=Êtes-vous sûr de vouloir restaurer la commande <b>%s</b
 ConfirmCancelOrder=Êtes-vous sûr de vouloir annuler cette commande ?
 ConfirmMakeOrder=Êtes-vous sûr de vouloir confirmer cette commande en date du <b>%s</b> ?
 GenerateBill=Facturer
-ClassifyShipped=Classer délivrée
+ClassifyShipped=Classer livrée
 ClassifyBilled=Classer facturée
 ComptaCard=Fiche compta
 DraftOrders=Commandes brouillons
diff --git a/htdocs/langs/fr_FR/products.lang b/htdocs/langs/fr_FR/products.lang
index f8514e725b3..db3cf0da952 100644
--- a/htdocs/langs/fr_FR/products.lang
+++ b/htdocs/langs/fr_FR/products.lang
@@ -45,10 +45,6 @@ LastProducts=Derniers produits
 CardProduct0=Fiche produit
 CardProduct1=Fiche service
 CardContract=Fiche contrat
-Warehouse=Entrepôt
-Warehouses=Entrepôts
-WarehouseOpened=Entrepôt ouvert
-WarehouseClosed=Entrepôt fermé
 Stock=Stock
 Stocks=Stocks
 Movement=Mouvement
@@ -209,7 +205,7 @@ s=s
 hour=heure
 h=h
 day=jour
-d=ré
+d=j
 kilogram=kilogramme
 kg=Kg
 gram=gramme
@@ -255,7 +251,7 @@ ProductBuilded=Fabrication terminée
 ProductsMultiPrice=Prix produits pour chaque niveau de prix
 ProductsOrServiceMultiPrice=Prix clients (des produits ou services, multi-prix)
 ProductSellByQuarterHT=Chiffre d'affaires trimestriel des produits hors taxes
-ServiceSellByQuarterHT=Chiffre d'affaire trimestriel des services hors taxes
+ServiceSellByQuarterHT=Chiffre d'affaires trimestriel des services hors taxes
 Quarter1=1er trimestre
 Quarter2=2eme trimestre
 Quarter3=3eme trimestre
@@ -295,11 +291,11 @@ ComposedProductIncDecStock=Augmenter/Réduire le stock sur changement du stock d
 ComposedProduct=Sous-produits
 MinSupplierPrice=Prix minimum fournisseur
 DynamicPriceConfiguration=Configuration du prix dynamique
-DynamicPriceDesc=On product card, with this module enabled, you should be able to set mathematic functions to calculate Customer or Supplier prices. Such function can use all mathematic operators, some constants and variables. You can set here the variables you want to be able and if the variable need an automatic update, the external URL to use to ask Dolibarr to update automaticaly the value.
-AddVariable=Add Variable
-AddUpdater=Add Updater
+DynamicPriceDesc=En activant ce module, vous serez en mesure de positionner des fonctions mathématiques pour calculer les prix Client ou Fournisseur dans la fiche produit. Ces fonctions peuvent utiliser tous les opérateurs mathématiques, des constantes et des variables. Vous pouvez positionner ici les variables que vous voulez, et si elles nécessitent une mise à jour automatique, l'URL externe à utiliser pour demander à Dolibarr de mettre à jour automatiquement leur valeur.
+AddVariable=Ajouter une Variable
+AddUpdater=Ajouter URL de mise à jour
 GlobalVariables=Variables globales
-VariableToUpdate=Variable to update
+VariableToUpdate=Variable à mettre à jour
 GlobalVariableUpdaters=Mis à jour variable globale
 GlobalVariableUpdaterType0=Données JSON
 GlobalVariableUpdaterHelp0=Analyse les données JSON depuis l'URL spécifiée, VALUE indique l'emplacement de la valeur pertinente,
@@ -317,7 +313,12 @@ DefaultPriceRealPriceMayDependOnCustomer=Prix ​​par défaut, le prix réel p
 WarningSelectOneDocument=Sélectionnez au moins un document
 DefaultUnitToShow=Unité
 NbOfQtyInProposals=Qté en propositions
-ClinkOnALinkOfColumn=Click on a link of column %s to get a detailed view...
-TranslatedLabel=Translated label
-TranslatedDescription=Translated description
-TranslatedNote=Translated notes
+ClinkOnALinkOfColumn=Cliquez sur un lien de la colonne %s pour obtenir une vue détaillée...
+TranslatedLabel=Titre traduit
+TranslatedDescription=Description traduite
+TranslatedNote=Notes traduites
+ProductWeight=Weight for 1 product
+ProductVolume=Volume for 1 product
+WeightUnits=Unité de poids
+VolumeUnits=Volume unit
+SizeUnits=Unité de taille
diff --git a/htdocs/langs/fr_FR/projects.lang b/htdocs/langs/fr_FR/projects.lang
index 13bc1fc4765..b95fbb3cd56 100644
--- a/htdocs/langs/fr_FR/projects.lang
+++ b/htdocs/langs/fr_FR/projects.lang
@@ -74,6 +74,9 @@ Progress=Progression
 ProgressDeclared=Progression déclarée
 ProgressCalculated=Progression calculée
 Time=Temps
+ListOfTasks=List of tasks
+GoToListOfTimeConsumed=Go to list of time consumed
+GoToListOfTasks=Go to list of tasks
 ListProposalsAssociatedProject=Liste des propositions commerciales associées au projet
 ListOrdersAssociatedProject=Liste des commandes clients associées au projet
 ListInvoicesAssociatedProject=Liste des factures clients associées au projet
@@ -198,4 +201,4 @@ OppStatusNEGO=Négociation
 OppStatusPENDING=En attente
 OppStatusWIN=Gagné
 OppStatusLOST=Perdu
-Budget=Budget
\ No newline at end of file
+Budget=Budget
diff --git a/htdocs/langs/fr_FR/receiptprinter.lang b/htdocs/langs/fr_FR/receiptprinter.lang
index e4ce287659e..42a443a558d 100644
--- a/htdocs/langs/fr_FR/receiptprinter.lang
+++ b/htdocs/langs/fr_FR/receiptprinter.lang
@@ -1,10 +1,10 @@
 # Dolibarr language file - Source file is en_US - receiptprinter
-ReceiptPrinterSetup=Setup of module ReceiptPrinter
+ReceiptPrinterSetup=Configuration du module Imprimante Ticket
 PrinterAdded=Imprimante %s ajoutée
 PrinterUpdated=Imprimante %s mis à jour
 PrinterDeleted=Imprimante %s supprimée
 TestSentToPrinter=Test envoyé à l'imprimante %s
-ReceiptPrinter=Receipt printers
+ReceiptPrinter=Imprimantes Tickets
 ReceiptPrinterDesc=Setup of printers
 ReceiptPrinterTemplateDesc=Setup of Templates
 ReceiptPrinterTypeDesc=Description of Receipt Printer's type
@@ -41,7 +41,7 @@ DOL_DOUBLE_HEIGHT=Texte double hauteur
 /DOL_DOUBLE_HEIGHT=End of Text double height
 DOL_DOUBLE_WIDTH=Text double width
 /DOL_DOUBLE_WIDTH=End of Text double width
-DOL_UNDERLINE=Underline text
+DOL_UNDERLINE=Texte souligné
 /DOL_UNDERLINE=End of Underline text
 DOL_UNDERLINE_2DOTS=Underline with double line
 /DOL_UNDERLINE_2DOTS=End of Underline with double line
@@ -59,7 +59,7 @@ DOL_ACTIVATE_BUZZER=Activate buzzer
 DOL_PRINT_QRCODE=Print QR Code
 DOL_PRINT_DATE=Print date AAAA-MM-DD
 DOL_PRINT_DATE_TIME=Print date and time AAAA-MM-DD HH:MM:SS
-DOL_PRINT_YEAR=Print Year
+DOL_PRINT_YEAR=Imprimer l'année
 DOL_PRINT_MONTH_LETTERS=Print month in letters (example : november)
 DOL_PRINT_MONTH=Print month number
 DOL_PRINT_DAY=Print day number
@@ -75,17 +75,17 @@ DOL_PRINT_ORDER_LOCAL_TAX=Print order local tax
 DOL_PRINT_ORDER_TOTAL=Print order total
 DOL_PRINT_ORDER_NUMBER=Print order number
 DOL_PRINT_ORDER_NUMBER_UNIQUE=Print order number after validation
-DOL_PRINT_CUSTOMER_FIRSTNAME=Print customer firstname
-DOL_PRINT_CUSTOMER_LASTNAME=Print customer name
-DOL_PRINT_CUSTOMER_MAIL=Print customer mail
-DOL_PRINT_CUSTOMER_PHONE=Print customer phone
-DOL_PRINT_CUSTOMER_MOBILE=Print customer mobile
-DOL_PRINT_CUSTOMER_SKYPE=Print customer skype
-DOL_PRINT_CUSTOMER_TAX_NUMBER=Print customer VAT number
-DOL_PRINT_CUSTOMER_ACCOUNT_BALANCE=Print customer account balance
-DOL_PRINT_VENDOR_LASTNAME=Print vendor name
+DOL_PRINT_CUSTOMER_FIRSTNAME=Afficher prénom vendeur
+DOL_PRINT_CUSTOMER_LASTNAME=Imprimer nom du client
+DOL_PRINT_CUSTOMER_MAIL=Imprimer email du client
+DOL_PRINT_CUSTOMER_PHONE=Imprimer téléphone du client
+DOL_PRINT_CUSTOMER_MOBILE=Imprimer portable du client
+DOL_PRINT_CUSTOMER_SKYPE=Imprimer le skype du client
+DOL_PRINT_CUSTOMER_TAX_NUMBER=Imprimer le numéro de TVA du client
+DOL_PRINT_CUSTOMER_ACCOUNT_BALANCE=Imprimer la situation du client
+DOL_PRINT_VENDOR_LASTNAME=Afficher nom vendeur
 DOL_PRINT_VENDOR_FIRSTNAME=Print vendor firstname
-DOL_PRINT_VENDOR_MAIL=Print vendor mail
+DOL_PRINT_VENDOR_MAIL=Afficher email vendeur
 DOL_PRINT_CUSTOMER_POINTS=Print customer points
 DOL_PRINT_ORDER_POINTS=Print number of points for this order
 DOL_PRINT_IF_CUSTOMER=Print the line IF a customer is affected to the order
diff --git a/htdocs/langs/fr_FR/sendings.lang b/htdocs/langs/fr_FR/sendings.lang
index 02d7ede6a4e..ee6ee57b453 100644
--- a/htdocs/langs/fr_FR/sendings.lang
+++ b/htdocs/langs/fr_FR/sendings.lang
@@ -10,7 +10,7 @@ Receivings=Bons de réceptions
 SendingsArea=Espace expéditions
 ListOfSendings=Liste des expéditions
 SendingMethod=Méthode d'expédition
-SendingReceipt=Bordereau de livraison
+SendingReceipt=Bordereau d'expédition
 LastSendings=Les %s dernières expéditions
 SearchASending=Rechercher expédition
 StatisticsOfSendings=Statistiques des expéditions
@@ -51,8 +51,8 @@ GenericTransport=Transporteur générique
 Enlevement=Enlèvement sur place par le client
 DocumentModelSimple=Modèle simple
 DocumentModelMerou=Modèle Merou A5
-WarningNoQtyLeftToSend=Alerte, aucun produit en attente de livraison.
-StatsOnShipmentsOnlyValidated=Statistiques effectuées sur les expéditions validées uniquement. La date prise en compte est la date de validation (la date de prévision d'expédition n'étant pas toujours renseignée).
+WarningNoQtyLeftToSend=Alerte, aucun produit en attente d'expédition.
+StatsOnShipmentsOnlyValidated=Statistiques effectuées sur les expéditions validées uniquement. La date prise en compte est la date de validation (la date de prévision de livraison n'étant pas toujours renseignée).
 DateDeliveryPlanned=Date prévue de livraison
 DateReceived=Date de réception réelle
 SendShippingByEMail=Envoyer bon d'expédition par email
@@ -70,6 +70,8 @@ ProductQtyInSuppliersOrdersRunning=Quantité de produit en commandes fournisseur
 ProductQtyInShipmentAlreadySent=Quantité du produit parmi les commandes clients déjà envoyées
 ProductQtyInSuppliersShipmentAlreadyRecevied=Quantité de produit déjà reçu en commandes fournisseur ouvertes
 NoProductToShipFoundIntoStock=Aucun produit à expédier n'a été trouver dans l'entrepôt <b>%s</b>. Corrigez l'inventaire ou retourner choisir un autre entrepôt.
+WeightVolShort=Weight/Vol.
+ValidateOrderFirstBeforeShipment=You must first validate the order before being able to make shipments.
 
 # Sending methods
 SendingMethodCATCH=Enlèvement par le client
diff --git a/htdocs/langs/fr_FR/supplier_proposal.lang b/htdocs/langs/fr_FR/supplier_proposal.lang
index cf28a391457..bc67d936646 100644
--- a/htdocs/langs/fr_FR/supplier_proposal.lang
+++ b/htdocs/langs/fr_FR/supplier_proposal.lang
@@ -7,7 +7,7 @@ CommRequest=Demande de prix
 CommRequests=Demandes de prix
 SearchRequest=Rechercher une demande
 DraftRequests=Demandes brouillons
-SupplierProposalsDraft=Draft supplier proposals
+SupplierProposalsDraft=Propositions de fournisseur brouillon
 LastModifiedRequests=Les %s dernières demandes de prix modifiées
 RequestsOpened=Demandes de prix ouvertes
 SupplierProposalArea=Zone des propositions de fournisseurs
@@ -49,7 +49,7 @@ ConfirmCloneAsk=Êtes-vous sûr de vouloir cloner la demande de prix <b>%s</b> ?
 ConfirmReOpenAsk=Êtes-vous sûr de vouloir réouvrir la demande de prix <b>%s</b> ?
 SendAskByMail=Envoyer demande de prix par email
 SendAskRef=Envoi de la demande de prix %s
-SupplierProposalCard=Carte de demande
+SupplierProposalCard=Fiche demande
 ConfirmDeleteAsk=Êtes-vous sûr de vouloir effacer cette demande de prix <b>%s</b> ?
 ActionsOnSupplierProposal=Evénements sur demande de prix
 DocModelAuroreDescription=Modèle de demande de prix fournisseur complet (logo…)
@@ -58,3 +58,5 @@ DefaultModelSupplierProposalCreate=Création d'un modèle par défaut
 DefaultModelSupplierProposalToBill=Modèle par défaut lors de la fermeture d'une demande de prix (accepté)
 DefaultModelSupplierProposalClosed=Modèle par défaut lors de la fermeture d'une demande de prix (refusé)
 ListOfSupplierProposal=Liste des demandes de propositions de fournisseur
+SupplierProposalsToClose=Supplier proposals to close
+SupplierProposalsToProcess=Supplier proposals to process
diff --git a/htdocs/langs/he_IL/admin.lang b/htdocs/langs/he_IL/admin.lang
index 1b80178604b..4c5e8e0e0a2 100644
--- a/htdocs/langs/he_IL/admin.lang
+++ b/htdocs/langs/he_IL/admin.lang
@@ -282,6 +282,7 @@ ModuleSetup=מודול ההתקנה
 ModulesSetup=מודולים ההתקנה
 ModuleFamilyBase=מערכת
 ModuleFamilyCrm=קשרי לקוחות (CRM)
+ModuleFamilySrm=Supplier Relation Management (SRM)
 ModuleFamilyProducts=Products Management (PM)
 ModuleFamilyHr=Human Resource Management (HR)
 ModuleFamilyProjects=פרויקטים / עבודה שיתופית
@@ -587,6 +588,7 @@ Permission38=ייצוא מוצרים
 Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
 Permission42=צור / לשנות פרויקטים (פרויקט משותף פרויקטים אני לפנות לקבלת)
 Permission44=מחק פרויקטים (פרויקט משותף פרויקטים אני לפנות לקבלת)
+Permission45=Export projects
 Permission61=לקרוא התערבויות
 Permission62=צור / לשנות התערבויות
 Permission64=מחק התערבויות
@@ -640,6 +642,7 @@ Permission162=Create/modify contracts/subscriptions
 Permission163=Activate a service/subscription of a contract
 Permission164=Disable a service/subscription of a contract
 Permission165=Delete contracts/subscriptions
+Permission167=Export contracts
 Permission171=Read trips and expenses (yours and your subordinates)
 Permission172=Create/modify trips and expenses
 Permission173=Delete trips and expenses
@@ -788,6 +791,7 @@ Permission2403=מחק פעולות או משימות (אירועים) מקושר
 Permission2411=קרא פעולות או משימות (אירועים) של אחרים
 Permission2412=ליצור / לשנות את פעולות או משימות (אירועים) של אחרים
 Permission2413=מחק פעולות או משימות (אירועים) של אחרים
+Permission2414=Export actions/tasks of others
 Permission2501=קריאה / מסמכים להורדה
 Permission2502=הורד מסמכים
 Permission2503=שלח או למחוק מסמכים
@@ -1713,3 +1717,4 @@ ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s is available. Ve
 MultiPriceRuleDesc=When option "Several level of prices per product/service" is on, you can define different prices (one per price level) for each product. To save you time, you can enter here rule to have price for each level autocalculated according to price of first level, so you will have to enter only price for first level on each product. This page is here to save you time and can be usefull only if your prices for each leve are relative to first level. You can ignore this page in most cases.
 ModelModulesProduct=Templates for product documents
 ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
+SeeSubstitutionVars=See * note for list of possible substitution variables
diff --git a/htdocs/langs/he_IL/bills.lang b/htdocs/langs/he_IL/bills.lang
index 78d2c5248a0..23d9cedf7f7 100644
--- a/htdocs/langs/he_IL/bills.lang
+++ b/htdocs/langs/he_IL/bills.lang
@@ -219,6 +219,7 @@ RemainderToBill=Remainder to bill
 SendBillByMail=Send invoice by email
 SendReminderBillByMail=Send reminder by email
 RelatedCommercialProposals=Related commercial proposals
+RelatedRecurringCustomerInvoices=Related recurring customer invoices
 MenuToValid=To valid
 DateMaxPayment=Payment due before
 DateEcheance=Due date limit
@@ -319,7 +320,6 @@ toolTipFrequency=Examples:<br /><b>Set 7 / day</b>: give a new invoice every 7 d
 NextDateToExecution=Date for next invoice generation
 DateLastGeneration=Date of last generation
 MaxPeriodNumber=Max nb of invoice generation
-RestPeriodNumber=Rest period number
 NbOfGenerationDone=Nb of invoice generation already done
 InvoiceAutoValidate=Automatically validate invoice
 GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
@@ -471,3 +471,7 @@ PDFCrevetteSituationInvoiceLine=Situation N°%s : Inv. N°%s on %s
 TotalSituationInvoice=Total situation
 invoiceLineProgressError=Invoice line progress can't be egal or upper the next invoice line
 updatePriceNextInvoiceErrorUpdateline=Error : update price on invoice line : %s
+ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
+ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
+ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
+
diff --git a/htdocs/langs/he_IL/boxes.lang b/htdocs/langs/he_IL/boxes.lang
index 757bd6048da..822207c520d 100644
--- a/htdocs/langs/he_IL/boxes.lang
+++ b/htdocs/langs/he_IL/boxes.lang
@@ -60,8 +60,8 @@ BoxTitleLastContracts=Last %s contracts
 BoxTitleLastModifiedDonations=Last %s modified donations
 BoxTitleLastModifiedExpenses=Last %s modified expense reports
 BoxGlobalActivity=Global activity (invoices, proposals, orders)
-BoxGoodCustomers=Good Customers
-BoxTitleGoodCustomers=%s Good Customers
+BoxGoodCustomers=Good customers
+BoxTitleGoodCustomers=%s Good customers
 FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Last successfull refresh date: %s
 LastRefreshDate=Last refresh date
 NoRecordedBookmarks=No bookmarks defined.
diff --git a/htdocs/langs/he_IL/companies.lang b/htdocs/langs/he_IL/companies.lang
index 18f364fc620..4ec2fbbd255 100644
--- a/htdocs/langs/he_IL/companies.lang
+++ b/htdocs/langs/he_IL/companies.lang
@@ -202,7 +202,7 @@ ProfId3IN=Prof Id 3 (SRVC TAX)
 ProfId4IN=Prof Id 4
 ProfId5IN=Prof Id 5
 ProfId6IN=-
-ProfId1LU=Id. prof. 1 (RCS)
+ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
 ProfId2LU=Id. prof. 2 (Business permit)
 ProfId3LU=-
 ProfId4LU=-
@@ -317,10 +317,12 @@ ShowContact=Show contact
 ContactsAllShort=All (No filter)
 ContactType=Contact type
 ContactForOrders=Order's contact
+ContactForOrdersOrShipments=Order's or shipment's contact
 ContactForProposals=Proposal's contact
 ContactForContracts=Contract's contact
 ContactForInvoices=Invoice's contact
 NoContactForAnyOrder=This contact is not a contact for any order
+NoContactForAnyOrderOrShipment=This contact is not a contact for any order or shipment
 NoContactForAnyProposal=This contact is not a contact for any commercial proposal
 NoContactForAnyContract=This contact is not a contact for any contract
 NoContactForAnyInvoice=This contact is not a contact for any invoice
@@ -438,3 +440,6 @@ MergeThirdparties=Merge third parties
 ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one ? All linked objects (invoices, orders, ...) will be moved to current third party so you will be able to delete the duplicate one.
 ThirdpartiesMergeSuccess=Thirdparties have been merged
 ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
+SaleRepresentativeLogin=Login of sale representative
+SaleRepresentativeFirstname=Firstname of sale representative
+SaleRepresentativeLastname=Lastname of sale representative
diff --git a/htdocs/langs/he_IL/errors.lang b/htdocs/langs/he_IL/errors.lang
index 718b3e8413f..fa7804ce355 100644
--- a/htdocs/langs/he_IL/errors.lang
+++ b/htdocs/langs/he_IL/errors.lang
@@ -172,6 +172,8 @@ ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
 ErrorOppStatusRequiredIfAmount=You set an estimated amount for this opportunity/lead. So you must also enter its status
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
 ErrorSavingChanges=An error has ocurred when saving the changes
+ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
+ErrorFileMustHaveFormat=File must have format %s
 
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
diff --git a/htdocs/langs/he_IL/exports.lang b/htdocs/langs/he_IL/exports.lang
index 98cb43e4720..90f4fba8ee2 100644
--- a/htdocs/langs/he_IL/exports.lang
+++ b/htdocs/langs/he_IL/exports.lang
@@ -128,6 +128,10 @@ SpecialCode=Special code
 ExportStringFilter=%% allows replacing one or more characters in the text
 ExportDateFilter=YYYY, YYYYMM, YYYYMMDD : filters by one year/month/day<br>YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD : filters over a range of years/months/days<br> > YYYY, > YYYYMM, > YYYYMMDD : filters on all following years/months/days<br> < YYYY, < YYYYMM, < YYYYMMDD : filters on all previous years/months/days
 ExportNumericFilter='NNNNN' filters by one value<br>'NNNNN+NNNNN' filters over a range of values<br>'&gt;NNNNN' filters by lower values<br>'&gt;NNNNN' filters by higher values
+ImportFromLine=Import starting from line number
+EndAtLineNb=End at line number
+SetThisValueTo2ToExcludeFirstLine=For example, set this value to 3 to exclude the 2 first lines
+KeepEmptyToGoToEndOfFile=Keep this field empty to go up to the end of file
 ## filters
 SelectFilterFields=If you want to filter on some values, just input values here.
 FilterableFields=Filterable Fields
diff --git a/htdocs/langs/he_IL/main.lang b/htdocs/langs/he_IL/main.lang
index 8d642ec68cf..8735815550b 100644
--- a/htdocs/langs/he_IL/main.lang
+++ b/htdocs/langs/he_IL/main.lang
@@ -25,6 +25,7 @@ FormatDateHourTextShort=%b %d, %Y, %I:%M %p
 FormatDateHourText=%B %d, %Y, %I:%M %p
 DatabaseConnection=Database connection
 NoTemplateDefined=No template defined for this email type
+AvailableVariables=Available substitution variables
 NoTranslation=No translation
 NoRecordFound=No record found
 NoError=No error
diff --git a/htdocs/langs/he_IL/orders.lang b/htdocs/langs/he_IL/orders.lang
index 5b56dca3616..96c20d71254 100644
--- a/htdocs/langs/he_IL/orders.lang
+++ b/htdocs/langs/he_IL/orders.lang
@@ -32,6 +32,7 @@ StatusOrderSent=Shipment in process
 StatusOrderOnProcessShort=Ordered
 StatusOrderProcessedShort=Processed
 StatusOrderDelivered=Delivered
+StatusOrderDeliveredShort=Delivered
 StatusOrderToBillShort=Delivered
 StatusOrderToBill2Short=To bill
 StatusOrderApprovedShort=Approved
diff --git a/htdocs/langs/he_IL/products.lang b/htdocs/langs/he_IL/products.lang
index cdf3054c26d..205140ff51f 100644
--- a/htdocs/langs/he_IL/products.lang
+++ b/htdocs/langs/he_IL/products.lang
@@ -45,10 +45,6 @@ LastProducts=Last products
 CardProduct0=Product card
 CardProduct1=Service card
 CardContract=Contract card
-Warehouse=Warehouse
-Warehouses=Warehouses
-WarehouseOpened=Warehouse open
-WarehouseClosed=Warehouse closed
 Stock=Stock
 Stocks=מניות
 Movement=Movement
@@ -318,3 +314,11 @@ WarningSelectOneDocument=Please select at least one document
 DefaultUnitToShow=Unit
 NbOfQtyInProposals=Qty in proposals
 ClinkOnALinkOfColumn=Click on a link of column %s to get a detailed view...
+TranslatedLabel=Translated label
+TranslatedDescription=Translated description
+TranslatedNote=Translated notes
+ProductWeight=Weight for 1 product
+ProductVolume=Volume for 1 product
+WeightUnits=Weight unit
+VolumeUnits=Volume unit
+SizeUnits=Size unit
diff --git a/htdocs/langs/he_IL/projects.lang b/htdocs/langs/he_IL/projects.lang
index a68a72e500b..fb939aef169 100644
--- a/htdocs/langs/he_IL/projects.lang
+++ b/htdocs/langs/he_IL/projects.lang
@@ -74,6 +74,9 @@ Progress=Progress
 ProgressDeclared=Declared progress
 ProgressCalculated=Calculated progress
 Time=Time
+ListOfTasks=List of tasks
+GoToListOfTimeConsumed=Go to list of time consumed
+GoToListOfTasks=Go to list of tasks
 ListProposalsAssociatedProject=List of the commercial proposals associated with the project
 ListOrdersAssociatedProject=List of customer's orders associated with the project
 ListInvoicesAssociatedProject=List of customer's invoices associated with the project
@@ -198,3 +201,4 @@ OppStatusNEGO=Negociation
 OppStatusPENDING=Pending
 OppStatusWIN=Won
 OppStatusLOST=Lost
+Budget=Budget
diff --git a/htdocs/langs/he_IL/sendings.lang b/htdocs/langs/he_IL/sendings.lang
index c499762b0bb..4af108df46b 100644
--- a/htdocs/langs/he_IL/sendings.lang
+++ b/htdocs/langs/he_IL/sendings.lang
@@ -70,6 +70,8 @@ ProductQtyInSuppliersOrdersRunning=Product quantity into opened suppliers orders
 ProductQtyInShipmentAlreadySent=Product quantity from opened customer order already sent
 ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from opened supplier order already received
 NoProductToShipFoundIntoStock=No product to ship found into warehouse <b>%s</b>. Correct stock or go back to choose another warehouse.
+WeightVolShort=Weight/Vol.
+ValidateOrderFirstBeforeShipment=You must first validate the order before being able to make shipments.
 
 # Sending methods
 SendingMethodCATCH=Catch by customer
diff --git a/htdocs/langs/he_IL/supplier_proposal.lang b/htdocs/langs/he_IL/supplier_proposal.lang
index 1a1bdc4df16..e37ced1b38f 100644
--- a/htdocs/langs/he_IL/supplier_proposal.lang
+++ b/htdocs/langs/he_IL/supplier_proposal.lang
@@ -58,3 +58,5 @@ DefaultModelSupplierProposalCreate=Default model creation
 DefaultModelSupplierProposalToBill=Default template when closing a price request (accepted)
 DefaultModelSupplierProposalClosed=Default template when closing a price request (refused)
 ListOfSupplierProposal=List of supplier proposal requests
+SupplierProposalsToClose=Supplier proposals to close
+SupplierProposalsToProcess=Supplier proposals to process
diff --git a/htdocs/langs/hr_HR/admin.lang b/htdocs/langs/hr_HR/admin.lang
index e9ea05f18c8..1406c9e27c1 100644
--- a/htdocs/langs/hr_HR/admin.lang
+++ b/htdocs/langs/hr_HR/admin.lang
@@ -282,6 +282,7 @@ ModuleSetup=Module setup
 ModulesSetup=Modules setup
 ModuleFamilyBase=System
 ModuleFamilyCrm=Customer Relation Management (CRM)
+ModuleFamilySrm=Supplier Relation Management (SRM)
 ModuleFamilyProducts=Products Management (PM)
 ModuleFamilyHr=Human Resource Management (HR)
 ModuleFamilyProjects=Projects/Collaborative work
@@ -587,6 +588,7 @@ Permission38=Export products
 Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
 Permission42=Create/modify projects (shared project and projects i'm contact for)
 Permission44=Delete projects (shared project and projects i'm contact for)
+Permission45=Export projects
 Permission61=Read interventions
 Permission62=Create/modify interventions
 Permission64=Delete interventions
@@ -640,6 +642,7 @@ Permission162=Create/modify contracts/subscriptions
 Permission163=Activate a service/subscription of a contract
 Permission164=Disable a service/subscription of a contract
 Permission165=Delete contracts/subscriptions
+Permission167=Export contracts
 Permission171=Read trips and expenses (yours and your subordinates)
 Permission172=Create/modify trips and expenses
 Permission173=Delete trips and expenses
@@ -788,6 +791,7 @@ Permission2403=Delete actions (events or tasks) linked to his account
 Permission2411=Read actions (events or tasks) of others
 Permission2412=Create/modify actions (events or tasks) of others
 Permission2413=Delete actions (events or tasks) of others
+Permission2414=Export actions/tasks of others
 Permission2501=Read/Download documents
 Permission2502=Download documents
 Permission2503=Submit or delete documents
@@ -1713,3 +1717,4 @@ ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s is available. Ve
 MultiPriceRuleDesc=When option "Several level of prices per product/service" is on, you can define different prices (one per price level) for each product. To save you time, you can enter here rule to have price for each level autocalculated according to price of first level, so you will have to enter only price for first level on each product. This page is here to save you time and can be usefull only if your prices for each leve are relative to first level. You can ignore this page in most cases.
 ModelModulesProduct=Templates for product documents
 ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
+SeeSubstitutionVars=See * note for list of possible substitution variables
diff --git a/htdocs/langs/hr_HR/bills.lang b/htdocs/langs/hr_HR/bills.lang
index a01e7c730a0..8451f6e8b57 100644
--- a/htdocs/langs/hr_HR/bills.lang
+++ b/htdocs/langs/hr_HR/bills.lang
@@ -219,6 +219,7 @@ RemainderToBill=Podsjetnik za naplatu
 SendBillByMail=Pošalji račun e-poštom
 SendReminderBillByMail=Pošalji odsjetnik e-poštom
 RelatedCommercialProposals=Povezane ponude
+RelatedRecurringCustomerInvoices=Related recurring customer invoices
 MenuToValid=Za ovjeru
 DateMaxPayment=Plaćanje do
 DateEcheance=Dospijeće plaćanja
@@ -319,7 +320,6 @@ toolTipFrequency=Examples:<br /><b>Set 7 / day</b>: give a new invoice every 7 d
 NextDateToExecution=Date for next invoice generation
 DateLastGeneration=Date of last generation
 MaxPeriodNumber=Max nb of invoice generation
-RestPeriodNumber=Rest period number
 NbOfGenerationDone=Nb of invoice generation already done
 InvoiceAutoValidate=Automatically validate invoice
 GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
@@ -471,3 +471,7 @@ PDFCrevetteSituationInvoiceLine=Situation N°%s : Inv. N°%s on %s
 TotalSituationInvoice=Total situation
 invoiceLineProgressError=Invoice line progress can't be egal or upper the next invoice line
 updatePriceNextInvoiceErrorUpdateline=Error : update price on invoice line : %s
+ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
+ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
+ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
+
diff --git a/htdocs/langs/hr_HR/boxes.lang b/htdocs/langs/hr_HR/boxes.lang
index 447b1032242..2057f59d33b 100644
--- a/htdocs/langs/hr_HR/boxes.lang
+++ b/htdocs/langs/hr_HR/boxes.lang
@@ -60,8 +60,8 @@ BoxTitleLastContracts=Prošlogodišnji% s ugovorima
 BoxTitleLastModifiedDonations=Prošlogodišnji% s modificirani donacije
 BoxTitleLastModifiedExpenses=Last %s modified expense reports
 BoxGlobalActivity=Globalna aktivnost (računi, prijedlozi, nalozi)
-BoxGoodCustomers=Good Customers
-BoxTitleGoodCustomers=%s Good Customers
+BoxGoodCustomers=Good customers
+BoxTitleGoodCustomers=%s Good customers
 FailedToRefreshDataInfoNotUpToDate=Nisam uspio osvježiti RSS tok. Zadnja uspješna datum osvježavanja:% s
 LastRefreshDate=Posljednji dan osvježavanja
 NoRecordedBookmarks=Nema oznaka definirana.
diff --git a/htdocs/langs/hr_HR/companies.lang b/htdocs/langs/hr_HR/companies.lang
index bab15c2603a..29692f7e855 100644
--- a/htdocs/langs/hr_HR/companies.lang
+++ b/htdocs/langs/hr_HR/companies.lang
@@ -202,7 +202,7 @@ ProfId3IN=Prof Id 3 (SRVC TAX)
 ProfId4IN=Prof Id 4
 ProfId5IN=Prof Id 5
 ProfId6IN=-
-ProfId1LU=Id. prof. 1 (RCS)
+ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
 ProfId2LU=Id. prof. 2 (Business permit)
 ProfId3LU=-
 ProfId4LU=-
@@ -317,10 +317,12 @@ ShowContact=Prikaži kontakt
 ContactsAllShort=Sve(bez filtera)
 ContactType=Tip kontakta
 ContactForOrders=Order's contact
+ContactForOrdersOrShipments=Order's or shipment's contact
 ContactForProposals=Proposal's contact
 ContactForContracts=Contract's contact
 ContactForInvoices=Invoice's contact
 NoContactForAnyOrder=This contact is not a contact for any order
+NoContactForAnyOrderOrShipment=This contact is not a contact for any order or shipment
 NoContactForAnyProposal=This contact is not a contact for any commercial proposal
 NoContactForAnyContract=This contact is not a contact for any contract
 NoContactForAnyInvoice=This contact is not a contact for any invoice
@@ -438,3 +440,6 @@ MergeThirdparties=Merge third parties
 ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one ? All linked objects (invoices, orders, ...) will be moved to current third party so you will be able to delete the duplicate one.
 ThirdpartiesMergeSuccess=Thirdparties have been merged
 ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
+SaleRepresentativeLogin=Login of sale representative
+SaleRepresentativeFirstname=Firstname of sale representative
+SaleRepresentativeLastname=Lastname of sale representative
diff --git a/htdocs/langs/hr_HR/errors.lang b/htdocs/langs/hr_HR/errors.lang
index 718b3e8413f..fa7804ce355 100644
--- a/htdocs/langs/hr_HR/errors.lang
+++ b/htdocs/langs/hr_HR/errors.lang
@@ -172,6 +172,8 @@ ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
 ErrorOppStatusRequiredIfAmount=You set an estimated amount for this opportunity/lead. So you must also enter its status
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
 ErrorSavingChanges=An error has ocurred when saving the changes
+ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
+ErrorFileMustHaveFormat=File must have format %s
 
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
diff --git a/htdocs/langs/hr_HR/exports.lang b/htdocs/langs/hr_HR/exports.lang
index 03c87b28bcf..1a490ea647d 100644
--- a/htdocs/langs/hr_HR/exports.lang
+++ b/htdocs/langs/hr_HR/exports.lang
@@ -128,6 +128,10 @@ SpecialCode=Special code
 ExportStringFilter=%% allows replacing one or more characters in the text
 ExportDateFilter=YYYY, YYYYMM, YYYYMMDD : filters by one year/month/day<br>YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD : filters over a range of years/months/days<br> > YYYY, > YYYYMM, > YYYYMMDD : filters on all following years/months/days<br> < YYYY, < YYYYMM, < YYYYMMDD : filters on all previous years/months/days
 ExportNumericFilter='NNNNN' filters by one value<br>'NNNNN+NNNNN' filters over a range of values<br>'&gt;NNNNN' filters by lower values<br>'&gt;NNNNN' filters by higher values
+ImportFromLine=Import starting from line number
+EndAtLineNb=End at line number
+SetThisValueTo2ToExcludeFirstLine=For example, set this value to 3 to exclude the 2 first lines
+KeepEmptyToGoToEndOfFile=Keep this field empty to go up to the end of file
 ## filters
 SelectFilterFields=If you want to filter on some values, just input values here.
 FilterableFields=Filterable Fields
diff --git a/htdocs/langs/hr_HR/main.lang b/htdocs/langs/hr_HR/main.lang
index 4f0f03cdd6c..400dd6e783b 100644
--- a/htdocs/langs/hr_HR/main.lang
+++ b/htdocs/langs/hr_HR/main.lang
@@ -25,6 +25,7 @@ FormatDateHourTextShort=%b %d, %Y, %I:%M %p
 FormatDateHourText=%B %d, %Y, %I:%M %p
 DatabaseConnection=Database connection
 NoTemplateDefined=No template defined for this email type
+AvailableVariables=Available substitution variables
 NoTranslation=Bez prijevoda
 NoRecordFound=Nema pronađenih bilješki
 NoError=Bez greške
diff --git a/htdocs/langs/hr_HR/orders.lang b/htdocs/langs/hr_HR/orders.lang
index f63f6a6f0fe..5fd0b6d125e 100644
--- a/htdocs/langs/hr_HR/orders.lang
+++ b/htdocs/langs/hr_HR/orders.lang
@@ -32,6 +32,7 @@ StatusOrderSent=Dostava u tijeku
 StatusOrderOnProcessShort=Ordered
 StatusOrderProcessedShort=Processed
 StatusOrderDelivered=Delivered
+StatusOrderDeliveredShort=Delivered
 StatusOrderToBillShort=Dostavljeno
 StatusOrderToBill2Short=Za poslat račun
 StatusOrderApprovedShort=Odobreno
diff --git a/htdocs/langs/hr_HR/products.lang b/htdocs/langs/hr_HR/products.lang
index 39824fca592..f74ed6427f6 100644
--- a/htdocs/langs/hr_HR/products.lang
+++ b/htdocs/langs/hr_HR/products.lang
@@ -45,10 +45,6 @@ LastProducts=Zadnji proizvodi
 CardProduct0=Kartica proizvoda
 CardProduct1=Kartica usluga
 CardContract=Kartica ugovora
-Warehouse=Skladište
-Warehouses=Skladišta
-WarehouseOpened=Warehouse open
-WarehouseClosed=Zatvoreno skladište
 Stock=Zaliha
 Stocks=Zalihe
 Movement=Kretanje
@@ -318,3 +314,11 @@ WarningSelectOneDocument=Please select at least one document
 DefaultUnitToShow=Unit
 NbOfQtyInProposals=Qty in proposals
 ClinkOnALinkOfColumn=Click on a link of column %s to get a detailed view...
+TranslatedLabel=Translated label
+TranslatedDescription=Translated description
+TranslatedNote=Translated notes
+ProductWeight=Weight for 1 product
+ProductVolume=Volume for 1 product
+WeightUnits=Weight unit
+VolumeUnits=Volume unit
+SizeUnits=Size unit
diff --git a/htdocs/langs/hr_HR/projects.lang b/htdocs/langs/hr_HR/projects.lang
index b1bac4988f3..7dae3662584 100644
--- a/htdocs/langs/hr_HR/projects.lang
+++ b/htdocs/langs/hr_HR/projects.lang
@@ -74,6 +74,9 @@ Progress=Progress
 ProgressDeclared=Declared progress
 ProgressCalculated=Calculated progress
 Time=Time
+ListOfTasks=List of tasks
+GoToListOfTimeConsumed=Go to list of time consumed
+GoToListOfTasks=Go to list of tasks
 ListProposalsAssociatedProject=List of the commercial proposals associated with the project
 ListOrdersAssociatedProject=List of customer's orders associated with the project
 ListInvoicesAssociatedProject=List of customer's invoices associated with the project
@@ -198,3 +201,4 @@ OppStatusNEGO=Negociation
 OppStatusPENDING=Pending
 OppStatusWIN=Won
 OppStatusLOST=Lost
+Budget=Budget
diff --git a/htdocs/langs/hr_HR/sendings.lang b/htdocs/langs/hr_HR/sendings.lang
index bc6e07b704b..9d304938bc4 100644
--- a/htdocs/langs/hr_HR/sendings.lang
+++ b/htdocs/langs/hr_HR/sendings.lang
@@ -70,6 +70,8 @@ ProductQtyInSuppliersOrdersRunning=Product quantity into opened suppliers orders
 ProductQtyInShipmentAlreadySent=Product quantity from opened customer order already sent
 ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from opened supplier order already received
 NoProductToShipFoundIntoStock=No product to ship found into warehouse <b>%s</b>. Correct stock or go back to choose another warehouse.
+WeightVolShort=Weight/Vol.
+ValidateOrderFirstBeforeShipment=You must first validate the order before being able to make shipments.
 
 # Sending methods
 SendingMethodCATCH=Catch by customer
diff --git a/htdocs/langs/hr_HR/supplier_proposal.lang b/htdocs/langs/hr_HR/supplier_proposal.lang
index 1a1bdc4df16..e37ced1b38f 100644
--- a/htdocs/langs/hr_HR/supplier_proposal.lang
+++ b/htdocs/langs/hr_HR/supplier_proposal.lang
@@ -58,3 +58,5 @@ DefaultModelSupplierProposalCreate=Default model creation
 DefaultModelSupplierProposalToBill=Default template when closing a price request (accepted)
 DefaultModelSupplierProposalClosed=Default template when closing a price request (refused)
 ListOfSupplierProposal=List of supplier proposal requests
+SupplierProposalsToClose=Supplier proposals to close
+SupplierProposalsToProcess=Supplier proposals to process
diff --git a/htdocs/langs/hu_HU/admin.lang b/htdocs/langs/hu_HU/admin.lang
index dbfa734d24e..97c06e1a0ae 100644
--- a/htdocs/langs/hu_HU/admin.lang
+++ b/htdocs/langs/hu_HU/admin.lang
@@ -282,6 +282,7 @@ ModuleSetup=Modul telepítés
 ModulesSetup=Modulok beállítása
 ModuleFamilyBase=Rendszer
 ModuleFamilyCrm=Ügyfél kapcsolat kezelés (CRM)
+ModuleFamilySrm=Supplier Relation Management (SRM)
 ModuleFamilyProducts=Products Management (PM)
 ModuleFamilyHr=Human Resource Management (HR)
 ModuleFamilyProjects=Projektek / kollaboratív munkát
@@ -587,6 +588,7 @@ Permission38=Export termékek
 Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
 Permission42=Létrehozza / módosítja projektek (közös projekt és a projektek vagyok contact)
 Permission44=Törlés projektek (közös projekt és a projektek vagyok contact)
+Permission45=Export projects
 Permission61=Olvassa beavatkozások
 Permission62=Létrehozza / módosítja beavatkozások
 Permission64=Törlés beavatkozások
@@ -640,6 +642,7 @@ Permission162=Create/modify contracts/subscriptions
 Permission163=Activate a service/subscription of a contract
 Permission164=Disable a service/subscription of a contract
 Permission165=Delete contracts/subscriptions
+Permission167=Export contracts
 Permission171=Read trips and expenses (yours and your subordinates)
 Permission172=Create/modify trips and expenses
 Permission173=Delete trips and expenses
@@ -788,6 +791,7 @@ Permission2403=Törlés tevékenységek (rendezvények, vagy feladatok) kapcsol
 Permission2411=Olvassa tevékenységek (rendezvények, vagy feladatok) mások
 Permission2412=Létrehozza / módosítja tevékenységek (rendezvények, vagy feladatok) mások
 Permission2413=Törlés tevékenységek (rendezvények, vagy feladatok) mások
+Permission2414=Export actions/tasks of others
 Permission2501=Olvasás / Dokumentumok letöltése
 Permission2502=Dokumentumok letöltése
 Permission2503=Beküldése vagy törlése dokumentumok
@@ -1713,3 +1717,4 @@ ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s is available. Ve
 MultiPriceRuleDesc=When option "Several level of prices per product/service" is on, you can define different prices (one per price level) for each product. To save you time, you can enter here rule to have price for each level autocalculated according to price of first level, so you will have to enter only price for first level on each product. This page is here to save you time and can be usefull only if your prices for each leve are relative to first level. You can ignore this page in most cases.
 ModelModulesProduct=Templates for product documents
 ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
+SeeSubstitutionVars=See * note for list of possible substitution variables
diff --git a/htdocs/langs/hu_HU/bills.lang b/htdocs/langs/hu_HU/bills.lang
index 47fa367dbe8..6b6a60cbeb9 100644
--- a/htdocs/langs/hu_HU/bills.lang
+++ b/htdocs/langs/hu_HU/bills.lang
@@ -219,6 +219,7 @@ RemainderToBill=Fennmaradó Bill
 SendBillByMail=Küldés e-mailben számlát
 SendReminderBillByMail=Küldés e-mailben emlékeztető
 RelatedCommercialProposals=Kapcsolódó üzleti ajánlatot
+RelatedRecurringCustomerInvoices=Related recurring customer invoices
 MenuToValid=Ahhoz, hogy érvényes
 DateMaxPayment=Esedékes kifizetés előtt
 DateEcheance=Esedékesség határ
@@ -319,7 +320,6 @@ toolTipFrequency=Examples:<br /><b>Set 7 / day</b>: give a new invoice every 7 d
 NextDateToExecution=Date for next invoice generation
 DateLastGeneration=Date of last generation
 MaxPeriodNumber=Max nb of invoice generation
-RestPeriodNumber=Rest period number
 NbOfGenerationDone=Nb of invoice generation already done
 InvoiceAutoValidate=Automatically validate invoice
 GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
@@ -471,3 +471,7 @@ PDFCrevetteSituationInvoiceLine=Situation N°%s : Inv. N°%s on %s
 TotalSituationInvoice=Total situation
 invoiceLineProgressError=Invoice line progress can't be egal or upper the next invoice line
 updatePriceNextInvoiceErrorUpdateline=Error : update price on invoice line : %s
+ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
+ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
+ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
+
diff --git a/htdocs/langs/hu_HU/boxes.lang b/htdocs/langs/hu_HU/boxes.lang
index a517a14eec3..21f5acf123e 100644
--- a/htdocs/langs/hu_HU/boxes.lang
+++ b/htdocs/langs/hu_HU/boxes.lang
@@ -60,8 +60,8 @@ BoxTitleLastContracts=Utolsó %s szerzősédesk
 BoxTitleLastModifiedDonations=Utolsó módosítás adományok %s
 BoxTitleLastModifiedExpenses=Last %s modified expense reports
 BoxGlobalActivity=Global activity (invoices, proposals, orders)
-BoxGoodCustomers=Good Customers
-BoxTitleGoodCustomers=%s Good Customers
+BoxGoodCustomers=Good customers
+BoxTitleGoodCustomers=%s Good customers
 FailedToRefreshDataInfoNotUpToDate=Nem sikerült az RSS-t frissíteni. Az utolsó sikeres frissítés: %s
 LastRefreshDate=Utolsó frissítés
 NoRecordedBookmarks=Nincs könyvjezlő. Kattintson <a href="%s">ide</a> könyvjelző hozzáadásához.
diff --git a/htdocs/langs/hu_HU/companies.lang b/htdocs/langs/hu_HU/companies.lang
index 56cbf2a678a..3f4eaa82313 100644
--- a/htdocs/langs/hu_HU/companies.lang
+++ b/htdocs/langs/hu_HU/companies.lang
@@ -202,7 +202,7 @@ ProfId3IN=Szakma ID 3 (SRVC TAX)
 ProfId4IN=Szakma Id 4
 ProfId5IN=Szakma Id 5
 ProfId6IN=-
-ProfId1LU=Id. prof. 1 (RCS)
+ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
 ProfId2LU=Id. prof. 2 (Business permit)
 ProfId3LU=-
 ProfId4LU=-
@@ -317,10 +317,12 @@ ShowContact=Kapcsolat mutatása
 ContactsAllShort=Minden (nincs szűrő)
 ContactType=Kapcsolat típusa
 ContactForOrders=Megrendelés kapcsolattartó
+ContactForOrdersOrShipments=Order's or shipment's contact
 ContactForProposals=Jelentkező kapcsolattartó
 ContactForContracts=Szerződéses kapcsolattartó
 ContactForInvoices=Számla kapcsolattartó
 NoContactForAnyOrder=Egyetlen megrdelésben sem kapcsolattartó
+NoContactForAnyOrderOrShipment=This contact is not a contact for any order or shipment
 NoContactForAnyProposal=Nem kapcsolattartó egyik kereskedelmi javaslatnál sem
 NoContactForAnyContract=Nem kapcsolattartó egyetlen szerződésnél sem
 NoContactForAnyInvoice=Nem kapcsolattartó egyik számlánál sem
@@ -438,3 +440,6 @@ MergeThirdparties=Partnerek egyesítése
 ConfirmMergeThirdparties=Biztos hogy egyesíteni szeretnéd ezt a partnert az aktuális partnerrel? Minden kapcsolt objektum (számlák, megrendelések, ...) átkerülnek a jelenlegi partnerhez, így a másik törölhetővé válik.
 ThirdpartiesMergeSuccess=Partnerek egyesítése megtörtént
 ErrorThirdpartiesMerge=Hiba történt a partner törlésekor. Ellenőrizd a log-ban. A változtatás visszavonva.
+SaleRepresentativeLogin=Login of sale representative
+SaleRepresentativeFirstname=Firstname of sale representative
+SaleRepresentativeLastname=Lastname of sale representative
diff --git a/htdocs/langs/hu_HU/errors.lang b/htdocs/langs/hu_HU/errors.lang
index 94245304c39..2caa1ea3fe6 100644
--- a/htdocs/langs/hu_HU/errors.lang
+++ b/htdocs/langs/hu_HU/errors.lang
@@ -172,6 +172,8 @@ ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
 ErrorOppStatusRequiredIfAmount=You set an estimated amount for this opportunity/lead. So you must also enter its status
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
 ErrorSavingChanges=An error has ocurred when saving the changes
+ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
+ErrorFileMustHaveFormat=File must have format %s
 
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
diff --git a/htdocs/langs/hu_HU/exports.lang b/htdocs/langs/hu_HU/exports.lang
index 23c3fc6d87d..7a80d3c7aae 100644
--- a/htdocs/langs/hu_HU/exports.lang
+++ b/htdocs/langs/hu_HU/exports.lang
@@ -128,6 +128,10 @@ SpecialCode=Special code
 ExportStringFilter=%% allows replacing one or more characters in the text
 ExportDateFilter=YYYY, YYYYMM, YYYYMMDD : filters by one year/month/day<br>YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD : filters over a range of years/months/days<br> > YYYY, > YYYYMM, > YYYYMMDD : filters on all following years/months/days<br> < YYYY, < YYYYMM, < YYYYMMDD : filters on all previous years/months/days
 ExportNumericFilter='NNNNN' filters by one value<br>'NNNNN+NNNNN' filters over a range of values<br>'&gt;NNNNN' filters by lower values<br>'&gt;NNNNN' filters by higher values
+ImportFromLine=Import starting from line number
+EndAtLineNb=End at line number
+SetThisValueTo2ToExcludeFirstLine=For example, set this value to 3 to exclude the 2 first lines
+KeepEmptyToGoToEndOfFile=Keep this field empty to go up to the end of file
 ## filters
 SelectFilterFields=If you want to filter on some values, just input values here.
 FilterableFields=Filterable Fields
diff --git a/htdocs/langs/hu_HU/main.lang b/htdocs/langs/hu_HU/main.lang
index 0b5ade5c845..c4ea594ed9f 100644
--- a/htdocs/langs/hu_HU/main.lang
+++ b/htdocs/langs/hu_HU/main.lang
@@ -8,12 +8,12 @@ FONTFORPDF=helvetica
 FONTSIZEFORPDF=10
 SeparatorDecimal=,
 SeparatorThousand=Space
-FormatDateShort=%d/%m/%Y
-FormatDateShortInput=%d/%m/%Y
-FormatDateShortJava=dd/MM/yyyy
-FormatDateShortJavaInput=dd/MM/yyyy
-FormatDateShortJQuery=dd/mm/yy
-FormatDateShortJQueryInput=dd/mm/yy
+FormatDateShort=%m/%d/%Y
+FormatDateShortInput=%m/%d/%Y
+FormatDateShortJava=MM/dd/yyyy
+FormatDateShortJavaInput=MM/dd/yyyy
+FormatDateShortJQuery=mm/dd/yy
+FormatDateShortJQueryInput=mm/dd/yy
 FormatHourShortJQuery=HH:MI
 FormatHourShort=%I:%M %p
 FormatHourShortDuration=%H:%M
@@ -25,12 +25,13 @@ FormatDateHourTextShort=%b %d, %Y, %I:%M %p
 FormatDateHourText=%B %d, %Y, %I:%M %p
 DatabaseConnection=Adatbási Kapcsolat
 NoTemplateDefined=No template defined for this email type
+AvailableVariables=Available substitution variables
 NoTranslation=Nincs fordítás
-NoRecordFound=A rekord nem található
+NoRecordFound=Rekord nem található
 NoError=Nincs hiba
 Error=Hiba
 Errors=Errors
-ErrorFieldRequired='%s' mezső szükséges
+ErrorFieldRequired='%s' mező szükséges
 ErrorFieldFormat='%s' mezőnek rossz az értéke
 ErrorFileDoesNotExists=%s fájl nem létezik
 ErrorFailedToOpenFile=Nem sikerült a %s fájlt megnyitni
@@ -76,11 +77,11 @@ GoToHelpPage=Segítség olvasása
 RecordSaved=Rekord elmentve
 RecordDeleted=Record deleted
 LevelOfFeature=Funkciók szintje
-NotDefined=Nincs definiálva
-DefinedAndHasThisValue=Meghatározva és érétke
-IsNotDefined=nincs definiálva
-DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr authentication mode is setup to <b>%s</b> in configuration file <b>conf.php</b>.<br>This means that password database is extern to Dolibarr, so changing this field may have no effects.
-Administrator=Adminisztrátor
+NotDefined=Nem meghatározott
+DefinedAndHasThisValue=Meghatározva és érétke ehhez
+IsNotDefined=nincs meghatározva
+DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr hitelesítési mód beélítva ehhez <b>%s</b> a <b>conf.php</b> beállító fájlban.<br>Ez azt jelenti, hogy ez a jelszó adatbázis Dolibarr rendszertől független, így ennek a mezönek a megváltoztatása nem befolyásoló.
+Administrator=Rendszergazda
 Undefined=Nincs definiálva
 PasswordForgotten=Elfelejtett jelszó?
 SeeAbove=Lásd feljebb
@@ -88,7 +89,7 @@ HomeArea=Nyitólap
 LastConnexion=Utolsó kapocslódás
 PreviousConnexion=Előző kapcsolódás
 ConnectedOnMultiCompany=Entitáson kapcsolódva
-ConnectedSince=Kapcslódva
+ConnectedSince=Kapcslódás kezdete
 AuthenticationMode=Hitelesitési mód
 RequestedUrl=A kért URL
 DatabaseTypeManager=Adatbázis tipus kezelő
@@ -101,13 +102,13 @@ InformationToHelpDiagnose=Ez olyan iformáció ami a diagnosztikát segítheti
 MoreInformation=További információ
 TechnicalInformation=Technical information
 TechnicalID=Technical ID
-NotePublic=Megjegyzés (publikus)
+NotePublic=Megjegyzés (nyilvános)
 NotePrivate=Megjegyzés (privát)
-PrecisionUnitIsLimitedToXDecimals=Dolibarr was setup to limit precision of unit prices to <b>%s</b> decimals.
+PrecisionUnitIsLimitedToXDecimals=Dolibarr beállított pontossági határral az egység árakhoz <b>%s</b> decimálisokkal.
 DoTest=Teszt
 ToFilter=Szűrő
 NoFilter=No filter
-WarningYouHaveAtLeastOneTaskLate=Warning, you have at least one element that has exceeded the tolerance delay.
+WarningYouHaveAtLeastOneTaskLate=Figyelem, legalább egy eleme van ami túllépte a tűrés késleltetést.
 yes=igen
 Yes=Igen
 no=nem
@@ -127,9 +128,9 @@ Activate=Aktivál
 Activated=Aktiválva
 Closed=Zárva
 Closed2=Zárva
-Enabled=Enabled
+Enabled=Bekapcsolt
 Deprecated=Deprecated
-Disable=Engedélyezve
+Disable=Letilt
 Disabled=Kikapcsolva
 Add=Hozzáadás
 AddLink=Link hozzáadása
@@ -144,7 +145,7 @@ ConfirmSendCardByMail=Biztos el akarja küldeni ez a kártyát?
 Delete=Törlés
 Remove=Eltávolitás
 Resiliate=Szerződés felbontása
-Cancel=Megszakítás
+Cancel=Mégse
 Modify=Módosítás
 Edit=Szerkesztés
 Validate=Hitelesítés
@@ -156,14 +157,14 @@ TestConnection=Kapcsolat tesztelése
 ToClone=Klónozás
 ConfirmClone=Válasszon adatot a klónozáshoz:
 NoCloneOptionsSpecified=Nincs klónozandó adat meghatározva.
-Of=A
+Of=birtokában
 Go=Go
 Run=Run
 CopyOf=Másloata
 Show=Mutat
 ShowCardHere=Kártyát mutat
-Search=Keresés
-SearchOf=Keresés
+Search=Keres
+SearchOf=Keres
 Valid=Hiteles
 Approve=Jóváhagy
 Disapprove=Disapprove
@@ -201,7 +202,7 @@ Note=Megjegyzés
 CurrentNote=Jelenlegi megjegyzés
 Title=Cím
 Label=Felirat
-RefOrLabel=Ref. vagy Felirat
+RefOrLabel=Hiv. vagy Felirat
 Info=Napló
 Family=Család
 Description=Leírás
@@ -209,7 +210,7 @@ Designation=Megnevezés
 Model=Modell
 DefaultModel=Alapértelmezett modell
 Action=Cselekvés
-About=Róla
+About=Névjegy
 Number=Szám
 NumberByMonth=Szám hónap szerint
 AmountByMonth=Összeg havonta
@@ -224,7 +225,7 @@ Setup=Beállítás
 Alert=Figyelmeztetés
 Previous=Előző
 Next=Következő
-Cards=Kártáy
+Cards=Kártyák
 Card=Kártya
 Now=Most
 HourStart=Start hour
@@ -232,15 +233,15 @@ Date=Dátum
 DateAndHour=Date and hour
 DateToday=Today's date
 DateReference=Reference date
-DateStart=Kezdés
-DateEnd=Végzés
+DateStart=Kezdő dátum
+DateEnd=Befejező dátum
 DateCreation=Létrehozás dátuma
 DateCreationShort=Creat. date
 DateModification=Szerkesztés dátuma
 DateModificationShort=Szerk. dátuma
 DateLastModification=Utolsó szerkesztés dátuma
 DateValidation=Hitelesítés dátuma
-DateClosing=Zárás dátuma
+DateClosing=Lezárás dátuma
 DateDue=Határidő
 DateValue=Érték dátuma
 DateValueShort=Érték dátuma
@@ -250,9 +251,9 @@ DateLimit=Dátum korlást
 DateRequest=Kérés dátuma
 DateProcess=Feldolgozás dátuma
 DatePlanShort=Dátum terv
-DateRealShort=dátuma real.
+DateRealShort=Tényleges dátum.
 DateBuild=Jelentés készítés dátuma
-DatePayment=Folyósításának időpontja
+DatePayment=Fizetés időpontja
 DateApprove=Approving date
 DateApprove2=Approving date (second approval)
 DurationYear=év
@@ -283,7 +284,7 @@ Yesterday=Tegnap
 Tomorrow=Holnap
 Morning=Morning
 Afternoon=Afternoon
-Quadri=Quadri
+Quadri=Negyed
 MonthOfDay=Nap hónapja
 HourShort=Ó
 MinuteShort=mn
@@ -298,7 +299,7 @@ b=b.
 Kb=Kb
 Mb=Mb
 Gb=Gb
-Tb=Tuberkulózis
+Tb=Tb
 Cut=Kivágás
 Copy=Másolás
 Paste=Beillesztés
diff --git a/htdocs/langs/hu_HU/orders.lang b/htdocs/langs/hu_HU/orders.lang
index 3fe217929bb..b76a8fb7eec 100644
--- a/htdocs/langs/hu_HU/orders.lang
+++ b/htdocs/langs/hu_HU/orders.lang
@@ -32,6 +32,7 @@ StatusOrderSent=Shipment in process
 StatusOrderOnProcessShort=Ordered
 StatusOrderProcessedShort=Feldolgozott
 StatusOrderDelivered=Delivered
+StatusOrderDeliveredShort=Delivered
 StatusOrderToBillShort=Bill
 StatusOrderToBill2Short=Bill
 StatusOrderApprovedShort=Jóváhagyott
diff --git a/htdocs/langs/hu_HU/products.lang b/htdocs/langs/hu_HU/products.lang
index 64138027771..fff429e693f 100644
--- a/htdocs/langs/hu_HU/products.lang
+++ b/htdocs/langs/hu_HU/products.lang
@@ -45,10 +45,6 @@ LastProducts=Utolsó termékek
 CardProduct0=Termék kártya
 CardProduct1=Szolgáltatás kártya
 CardContract=Szerződés kártya
-Warehouse=Raktár
-Warehouses=Raktárak
-WarehouseOpened=Raktár nyitva
-WarehouseClosed=Raktár zárva
 Stock=Részvény
 Stocks=Részvények
 Movement=Mozgás
@@ -318,3 +314,11 @@ WarningSelectOneDocument=Please select at least one document
 DefaultUnitToShow=Unit
 NbOfQtyInProposals=Qty in proposals
 ClinkOnALinkOfColumn=Click on a link of column %s to get a detailed view...
+TranslatedLabel=Translated label
+TranslatedDescription=Translated description
+TranslatedNote=Translated notes
+ProductWeight=Weight for 1 product
+ProductVolume=Volume for 1 product
+WeightUnits=Weight unit
+VolumeUnits=Volume unit
+SizeUnits=Size unit
diff --git a/htdocs/langs/hu_HU/projects.lang b/htdocs/langs/hu_HU/projects.lang
index 293bab677d5..9ab8ab13b05 100644
--- a/htdocs/langs/hu_HU/projects.lang
+++ b/htdocs/langs/hu_HU/projects.lang
@@ -74,6 +74,9 @@ Progress=Haladás
 ProgressDeclared=Declared progress
 ProgressCalculated=Calculated progress
 Time=Idő
+ListOfTasks=List of tasks
+GoToListOfTimeConsumed=Go to list of time consumed
+GoToListOfTasks=Go to list of tasks
 ListProposalsAssociatedProject=A projekthez tartozó kereskedelmi ajánlatok listája
 ListOrdersAssociatedProject=A projekthez tartozó ügyfél megrendelések listája
 ListInvoicesAssociatedProject=A projekthez tartozó ügyfél számlák listája
@@ -198,3 +201,4 @@ OppStatusNEGO=Negociation
 OppStatusPENDING=Pending
 OppStatusWIN=Won
 OppStatusLOST=Lost
+Budget=Budget
diff --git a/htdocs/langs/hu_HU/sendings.lang b/htdocs/langs/hu_HU/sendings.lang
index fbc45805c86..7ba0da15568 100644
--- a/htdocs/langs/hu_HU/sendings.lang
+++ b/htdocs/langs/hu_HU/sendings.lang
@@ -70,6 +70,8 @@ ProductQtyInSuppliersOrdersRunning=Product quantity into opened suppliers orders
 ProductQtyInShipmentAlreadySent=Product quantity from opened customer order already sent
 ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from opened supplier order already received
 NoProductToShipFoundIntoStock=No product to ship found into warehouse <b>%s</b>. Correct stock or go back to choose another warehouse.
+WeightVolShort=Weight/Vol.
+ValidateOrderFirstBeforeShipment=You must first validate the order before being able to make shipments.
 
 # Sending methods
 SendingMethodCATCH=Ügyfél fogád
diff --git a/htdocs/langs/hu_HU/supplier_proposal.lang b/htdocs/langs/hu_HU/supplier_proposal.lang
index b457c493701..1d6e009f4db 100644
--- a/htdocs/langs/hu_HU/supplier_proposal.lang
+++ b/htdocs/langs/hu_HU/supplier_proposal.lang
@@ -58,3 +58,5 @@ DefaultModelSupplierProposalCreate=Default model creation
 DefaultModelSupplierProposalToBill=Default template when closing a price request (accepted)
 DefaultModelSupplierProposalClosed=Default template when closing a price request (refused)
 ListOfSupplierProposal=List of supplier proposal requests
+SupplierProposalsToClose=Supplier proposals to close
+SupplierProposalsToProcess=Supplier proposals to process
diff --git a/htdocs/langs/id_ID/admin.lang b/htdocs/langs/id_ID/admin.lang
index 6d776477bae..17979b8f6c3 100644
--- a/htdocs/langs/id_ID/admin.lang
+++ b/htdocs/langs/id_ID/admin.lang
@@ -282,6 +282,7 @@ ModuleSetup=Setup Modul
 ModulesSetup=Setup Modul-Modul
 ModuleFamilyBase=Sistem
 ModuleFamilyCrm=Customer Relation Management (CRM)
+ModuleFamilySrm=Supplier Relation Management (SRM)
 ModuleFamilyProducts=Products Management (PM)
 ModuleFamilyHr=Human Resource Management (HR)
 ModuleFamilyProjects=Projects/Collaborative work
@@ -587,6 +588,7 @@ Permission38=Export products
 Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
 Permission42=Create/modify projects (shared project and projects i'm contact for)
 Permission44=Delete projects (shared project and projects i'm contact for)
+Permission45=Export projects
 Permission61=Read interventions
 Permission62=Create/modify interventions
 Permission64=Delete interventions
@@ -640,6 +642,7 @@ Permission162=Create/modify contracts/subscriptions
 Permission163=Activate a service/subscription of a contract
 Permission164=Disable a service/subscription of a contract
 Permission165=Delete contracts/subscriptions
+Permission167=Export contracts
 Permission171=Read trips and expenses (yours and your subordinates)
 Permission172=Create/modify trips and expenses
 Permission173=Delete trips and expenses
@@ -788,6 +791,7 @@ Permission2403=Delete actions (events or tasks) linked to his account
 Permission2411=Read actions (events or tasks) of others
 Permission2412=Create/modify actions (events or tasks) of others
 Permission2413=Delete actions (events or tasks) of others
+Permission2414=Export actions/tasks of others
 Permission2501=Read/Download documents
 Permission2502=Download documents
 Permission2503=Submit or delete documents
@@ -1713,3 +1717,4 @@ ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s is available. Ve
 MultiPriceRuleDesc=When option "Several level of prices per product/service" is on, you can define different prices (one per price level) for each product. To save you time, you can enter here rule to have price for each level autocalculated according to price of first level, so you will have to enter only price for first level on each product. This page is here to save you time and can be usefull only if your prices for each leve are relative to first level. You can ignore this page in most cases.
 ModelModulesProduct=Templates for product documents
 ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
+SeeSubstitutionVars=See * note for list of possible substitution variables
diff --git a/htdocs/langs/id_ID/bills.lang b/htdocs/langs/id_ID/bills.lang
index f46c285705a..4b054af9e74 100644
--- a/htdocs/langs/id_ID/bills.lang
+++ b/htdocs/langs/id_ID/bills.lang
@@ -219,6 +219,7 @@ RemainderToBill=Remainder to bill
 SendBillByMail=Send invoice by email
 SendReminderBillByMail=Send reminder by email
 RelatedCommercialProposals=Related commercial proposals
+RelatedRecurringCustomerInvoices=Related recurring customer invoices
 MenuToValid=To valid
 DateMaxPayment=Payment due before
 DateEcheance=Due date limit
@@ -319,7 +320,6 @@ toolTipFrequency=Examples:<br /><b>Set 7 / day</b>: give a new invoice every 7 d
 NextDateToExecution=Date for next invoice generation
 DateLastGeneration=Date of last generation
 MaxPeriodNumber=Max nb of invoice generation
-RestPeriodNumber=Rest period number
 NbOfGenerationDone=Nb of invoice generation already done
 InvoiceAutoValidate=Automatically validate invoice
 GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
@@ -471,3 +471,7 @@ PDFCrevetteSituationInvoiceLine=Situation N°%s : Inv. N°%s on %s
 TotalSituationInvoice=Total situation
 invoiceLineProgressError=Invoice line progress can't be egal or upper the next invoice line
 updatePriceNextInvoiceErrorUpdateline=Error : update price on invoice line : %s
+ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
+ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
+ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
+
diff --git a/htdocs/langs/id_ID/boxes.lang b/htdocs/langs/id_ID/boxes.lang
index 57bfc174ec5..7619a335b61 100644
--- a/htdocs/langs/id_ID/boxes.lang
+++ b/htdocs/langs/id_ID/boxes.lang
@@ -60,8 +60,8 @@ BoxTitleLastContracts=Last %s contracts
 BoxTitleLastModifiedDonations=Last %s modified donations
 BoxTitleLastModifiedExpenses=Last %s modified expense reports
 BoxGlobalActivity=Global activity (invoices, proposals, orders)
-BoxGoodCustomers=Good Customers
-BoxTitleGoodCustomers=%s Good Customers
+BoxGoodCustomers=Good customers
+BoxTitleGoodCustomers=%s Good customers
 FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Last successfull refresh date: %s
 LastRefreshDate=Last refresh date
 NoRecordedBookmarks=No bookmarks defined.
diff --git a/htdocs/langs/id_ID/companies.lang b/htdocs/langs/id_ID/companies.lang
index 6b8d15fd751..26621de3b1b 100644
--- a/htdocs/langs/id_ID/companies.lang
+++ b/htdocs/langs/id_ID/companies.lang
@@ -202,7 +202,7 @@ ProfId3IN=Prof Id 3 (SRVC TAX)
 ProfId4IN=Prof Id 4
 ProfId5IN=Prof Id 5
 ProfId6IN=-
-ProfId1LU=Id. prof. 1 (RCS)
+ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
 ProfId2LU=Id. prof. 2 (Business permit)
 ProfId3LU=-
 ProfId4LU=-
@@ -317,10 +317,12 @@ ShowContact=Show contact
 ContactsAllShort=All (No filter)
 ContactType=Contact type
 ContactForOrders=Order's contact
+ContactForOrdersOrShipments=Order's or shipment's contact
 ContactForProposals=Proposal's contact
 ContactForContracts=Contract's contact
 ContactForInvoices=Invoice's contact
 NoContactForAnyOrder=This contact is not a contact for any order
+NoContactForAnyOrderOrShipment=This contact is not a contact for any order or shipment
 NoContactForAnyProposal=This contact is not a contact for any commercial proposal
 NoContactForAnyContract=This contact is not a contact for any contract
 NoContactForAnyInvoice=This contact is not a contact for any invoice
@@ -438,3 +440,6 @@ MergeThirdparties=Merge third parties
 ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one ? All linked objects (invoices, orders, ...) will be moved to current third party so you will be able to delete the duplicate one.
 ThirdpartiesMergeSuccess=Thirdparties have been merged
 ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
+SaleRepresentativeLogin=Login of sale representative
+SaleRepresentativeFirstname=Firstname of sale representative
+SaleRepresentativeLastname=Lastname of sale representative
diff --git a/htdocs/langs/id_ID/errors.lang b/htdocs/langs/id_ID/errors.lang
index 718b3e8413f..fa7804ce355 100644
--- a/htdocs/langs/id_ID/errors.lang
+++ b/htdocs/langs/id_ID/errors.lang
@@ -172,6 +172,8 @@ ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
 ErrorOppStatusRequiredIfAmount=You set an estimated amount for this opportunity/lead. So you must also enter its status
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
 ErrorSavingChanges=An error has ocurred when saving the changes
+ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
+ErrorFileMustHaveFormat=File must have format %s
 
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
diff --git a/htdocs/langs/id_ID/exports.lang b/htdocs/langs/id_ID/exports.lang
index 57c9371da44..8172a6d0bfc 100644
--- a/htdocs/langs/id_ID/exports.lang
+++ b/htdocs/langs/id_ID/exports.lang
@@ -128,6 +128,10 @@ SpecialCode=Special code
 ExportStringFilter=%% allows replacing one or more characters in the text
 ExportDateFilter=YYYY, YYYYMM, YYYYMMDD : filters by one year/month/day<br>YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD : filters over a range of years/months/days<br> > YYYY, > YYYYMM, > YYYYMMDD : filters on all following years/months/days<br> < YYYY, < YYYYMM, < YYYYMMDD : filters on all previous years/months/days
 ExportNumericFilter='NNNNN' filters by one value<br>'NNNNN+NNNNN' filters over a range of values<br>'&gt;NNNNN' filters by lower values<br>'&gt;NNNNN' filters by higher values
+ImportFromLine=Import starting from line number
+EndAtLineNb=End at line number
+SetThisValueTo2ToExcludeFirstLine=For example, set this value to 3 to exclude the 2 first lines
+KeepEmptyToGoToEndOfFile=Keep this field empty to go up to the end of file
 ## filters
 SelectFilterFields=If you want to filter on some values, just input values here.
 FilterableFields=Filterable Fields
diff --git a/htdocs/langs/id_ID/main.lang b/htdocs/langs/id_ID/main.lang
index 286f0ab17b9..17a37d643b4 100644
--- a/htdocs/langs/id_ID/main.lang
+++ b/htdocs/langs/id_ID/main.lang
@@ -25,6 +25,7 @@ FormatDateHourTextShort=%b %d, %Y, %I:%M %p
 FormatDateHourText=%B %d, %Y, %I:%M %p
 DatabaseConnection=Database connection
 NoTemplateDefined=No template defined for this email type
+AvailableVariables=Available substitution variables
 NoTranslation=No translation
 NoRecordFound=No record found
 NoError=No error
diff --git a/htdocs/langs/id_ID/orders.lang b/htdocs/langs/id_ID/orders.lang
index c0bfc3ccce3..33cd265b07f 100644
--- a/htdocs/langs/id_ID/orders.lang
+++ b/htdocs/langs/id_ID/orders.lang
@@ -32,6 +32,7 @@ StatusOrderSent=Shipment in process
 StatusOrderOnProcessShort=Ordered
 StatusOrderProcessedShort=Processed
 StatusOrderDelivered=Delivered
+StatusOrderDeliveredShort=Delivered
 StatusOrderToBillShort=Delivered
 StatusOrderToBill2Short=To bill
 StatusOrderApprovedShort=Approved
diff --git a/htdocs/langs/id_ID/products.lang b/htdocs/langs/id_ID/products.lang
index 304fc66821b..5aaf0cf131a 100644
--- a/htdocs/langs/id_ID/products.lang
+++ b/htdocs/langs/id_ID/products.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - products
-ProductRef=Product ref.
-ProductLabel=Product label
+ProductRef=Item ref.
+ProductLabel=Item label
 ProductLabelTranslated=Translated product label
 ProductDescriptionTranslated=Translated product description
 ProductNoteTranslated=Translated product note
@@ -45,10 +45,6 @@ LastProducts=Last products
 CardProduct0=Product card
 CardProduct1=Service card
 CardContract=Contract card
-Warehouse=Warehouse
-Warehouses=Warehouses
-WarehouseOpened=Warehouse open
-WarehouseClosed=Warehouse closed
 Stock=Stock
 Stocks=Stocks
 Movement=Movement
@@ -318,3 +314,11 @@ WarningSelectOneDocument=Please select at least one document
 DefaultUnitToShow=Unit
 NbOfQtyInProposals=Qty in proposals
 ClinkOnALinkOfColumn=Click on a link of column %s to get a detailed view...
+TranslatedLabel=Translated label
+TranslatedDescription=Translated description
+TranslatedNote=Translated notes
+ProductWeight=Weight for 1 product
+ProductVolume=Volume for 1 product
+WeightUnits=Weight unit
+VolumeUnits=Volume unit
+SizeUnits=Size unit
diff --git a/htdocs/langs/id_ID/projects.lang b/htdocs/langs/id_ID/projects.lang
index 44820da002f..83a284cc58c 100644
--- a/htdocs/langs/id_ID/projects.lang
+++ b/htdocs/langs/id_ID/projects.lang
@@ -74,6 +74,9 @@ Progress=Progress
 ProgressDeclared=Declared progress
 ProgressCalculated=Calculated progress
 Time=Time
+ListOfTasks=List of tasks
+GoToListOfTimeConsumed=Go to list of time consumed
+GoToListOfTasks=Go to list of tasks
 ListProposalsAssociatedProject=List of the commercial proposals associated with the project
 ListOrdersAssociatedProject=List of customer's orders associated with the project
 ListInvoicesAssociatedProject=List of customer's invoices associated with the project
@@ -198,3 +201,4 @@ OppStatusNEGO=Negociation
 OppStatusPENDING=Pending
 OppStatusWIN=Won
 OppStatusLOST=Lost
+Budget=Budget
diff --git a/htdocs/langs/id_ID/sendings.lang b/htdocs/langs/id_ID/sendings.lang
index fb7b9c08868..97f57e1d3c7 100644
--- a/htdocs/langs/id_ID/sendings.lang
+++ b/htdocs/langs/id_ID/sendings.lang
@@ -70,6 +70,8 @@ ProductQtyInSuppliersOrdersRunning=Product quantity into opened suppliers orders
 ProductQtyInShipmentAlreadySent=Product quantity from opened customer order already sent
 ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from opened supplier order already received
 NoProductToShipFoundIntoStock=No product to ship found into warehouse <b>%s</b>. Correct stock or go back to choose another warehouse.
+WeightVolShort=Weight/Vol.
+ValidateOrderFirstBeforeShipment=You must first validate the order before being able to make shipments.
 
 # Sending methods
 SendingMethodCATCH=Catch by customer
diff --git a/htdocs/langs/id_ID/supplier_proposal.lang b/htdocs/langs/id_ID/supplier_proposal.lang
index 1a1bdc4df16..e37ced1b38f 100644
--- a/htdocs/langs/id_ID/supplier_proposal.lang
+++ b/htdocs/langs/id_ID/supplier_proposal.lang
@@ -58,3 +58,5 @@ DefaultModelSupplierProposalCreate=Default model creation
 DefaultModelSupplierProposalToBill=Default template when closing a price request (accepted)
 DefaultModelSupplierProposalClosed=Default template when closing a price request (refused)
 ListOfSupplierProposal=List of supplier proposal requests
+SupplierProposalsToClose=Supplier proposals to close
+SupplierProposalsToProcess=Supplier proposals to process
diff --git a/htdocs/langs/is_IS/admin.lang b/htdocs/langs/is_IS/admin.lang
index 37a80482244..e12eb490575 100644
--- a/htdocs/langs/is_IS/admin.lang
+++ b/htdocs/langs/is_IS/admin.lang
@@ -282,6 +282,7 @@ ModuleSetup=Module skipulag
 ModulesSetup=Modules skipulag
 ModuleFamilyBase=Kerfi
 ModuleFamilyCrm=Viðskiptavinur Tengsl Stjórnun (CRM)
+ModuleFamilySrm=Supplier Relation Management (SRM)
 ModuleFamilyProducts=Products Management (PM)
 ModuleFamilyHr=Human Resource Management (HR)
 ModuleFamilyProjects=Verkefni / samvinna vinna
@@ -587,6 +588,7 @@ Permission38=Útflutningur vöru
 Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
 Permission42=Búa til / breyta verkefnum (sameiginleg verkefni og verkefnum sem ég hef samband vegna)
 Permission44=Eyða verkefni (sameiginleg verkefni og verkefnum sem ég hef samband vegna)
+Permission45=Export projects
 Permission61=Lesa inngrip
 Permission62=Búa til / breyta inngrip
 Permission64=Eyða inngrip
@@ -640,6 +642,7 @@ Permission162=Create/modify contracts/subscriptions
 Permission163=Activate a service/subscription of a contract
 Permission164=Disable a service/subscription of a contract
 Permission165=Delete contracts/subscriptions
+Permission167=Export contracts
 Permission171=Read trips and expenses (yours and your subordinates)
 Permission172=Create/modify trips and expenses
 Permission173=Delete trips and expenses
@@ -788,6 +791,7 @@ Permission2403=Eyða aðgerða (atburðum eða verkefni) tengd reikningnum hans
 Permission2411=Lesa aðgerða (atburðum eða verkefni) annarra
 Permission2412=Búa til / breyta aðgerðum (atburðum eða verkefni) annarra
 Permission2413=Eyða aðgerða (atburðum eða verkefni) annarra
+Permission2414=Export actions/tasks of others
 Permission2501=Lesa skjal
 Permission2502=Sendu inn eða eyða gögnum
 Permission2503=Senda eða eyða skjölum
@@ -1713,3 +1717,4 @@ ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s is available. Ve
 MultiPriceRuleDesc=When option "Several level of prices per product/service" is on, you can define different prices (one per price level) for each product. To save you time, you can enter here rule to have price for each level autocalculated according to price of first level, so you will have to enter only price for first level on each product. This page is here to save you time and can be usefull only if your prices for each leve are relative to first level. You can ignore this page in most cases.
 ModelModulesProduct=Templates for product documents
 ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
+SeeSubstitutionVars=See * note for list of possible substitution variables
diff --git a/htdocs/langs/is_IS/bills.lang b/htdocs/langs/is_IS/bills.lang
index f17e0f3f672..7b5c996267b 100644
--- a/htdocs/langs/is_IS/bills.lang
+++ b/htdocs/langs/is_IS/bills.lang
@@ -219,6 +219,7 @@ RemainderToBill=Afgangurinn við reikning
 SendBillByMail=Senda reikning með tölvupósti
 SendReminderBillByMail=Senda áminningu í tölvupósti
 RelatedCommercialProposals=Svipaðir auglýsing tillögur
+RelatedRecurringCustomerInvoices=Related recurring customer invoices
 MenuToValid=Til að gilt
 DateMaxPayment=Greiðsla vegna áður
 DateEcheance=Gjalddagi takmörk
@@ -319,7 +320,6 @@ toolTipFrequency=Examples:<br /><b>Set 7 / day</b>: give a new invoice every 7 d
 NextDateToExecution=Date for next invoice generation
 DateLastGeneration=Date of last generation
 MaxPeriodNumber=Max nb of invoice generation
-RestPeriodNumber=Rest period number
 NbOfGenerationDone=Nb of invoice generation already done
 InvoiceAutoValidate=Automatically validate invoice
 GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
@@ -471,3 +471,7 @@ PDFCrevetteSituationInvoiceLine=Situation N°%s : Inv. N°%s on %s
 TotalSituationInvoice=Total situation
 invoiceLineProgressError=Invoice line progress can't be egal or upper the next invoice line
 updatePriceNextInvoiceErrorUpdateline=Error : update price on invoice line : %s
+ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
+ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
+ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
+
diff --git a/htdocs/langs/is_IS/boxes.lang b/htdocs/langs/is_IS/boxes.lang
index d70de3308be..6fea6a0bbfd 100644
--- a/htdocs/langs/is_IS/boxes.lang
+++ b/htdocs/langs/is_IS/boxes.lang
@@ -60,8 +60,8 @@ BoxTitleLastContracts=Last %s  samninga
 BoxTitleLastModifiedDonations=Síðustu %s breytt framlög
 BoxTitleLastModifiedExpenses=Last %s modified expense reports
 BoxGlobalActivity=Global activity (invoices, proposals, orders)
-BoxGoodCustomers=Good Customers
-BoxTitleGoodCustomers=%s Good Customers
+BoxGoodCustomers=Good customers
+BoxTitleGoodCustomers=%s Good customers
 FailedToRefreshDataInfoNotUpToDate=Ekki tókst að hressa RSS hreyfingu. Síðast vel hressa dagsetning: %s
 LastRefreshDate=Síðast endurnýjað dagsetningu
 NoRecordedBookmarks=Engin bókamerki skilgreind. Smelltu <a href="%s">hér</a> til að bæta við bókamerki.
diff --git a/htdocs/langs/is_IS/companies.lang b/htdocs/langs/is_IS/companies.lang
index 6f632531e6d..11d34d01a9e 100644
--- a/htdocs/langs/is_IS/companies.lang
+++ b/htdocs/langs/is_IS/companies.lang
@@ -202,7 +202,7 @@ ProfId3IN=Prof Id 3
 ProfId4IN=Prof Id 4
 ProfId5IN=Prof Id 5
 ProfId6IN=-
-ProfId1LU=Id. prof. 1 (RCS)
+ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
 ProfId2LU=Id. prof. 2 (Business permit)
 ProfId3LU=-
 ProfId4LU=-
@@ -317,10 +317,12 @@ ShowContact=Show samband
 ContactsAllShort=Öll (síu)
 ContactType=Hafðu tegund
 ContactForOrders=Panta's samband
+ContactForOrdersOrShipments=Order's or shipment's contact
 ContactForProposals=Tillögunnar samband
 ContactForContracts=Samningur's samband
 ContactForInvoices=Invoice's samband
 NoContactForAnyOrder=Þessi tengiliður er ekki við tengilið fyrir hvaða röð
+NoContactForAnyOrderOrShipment=This contact is not a contact for any order or shipment
 NoContactForAnyProposal=Þessi tengiliður er ekki við tengilið fyrir hvaða auglýsing tillögu
 NoContactForAnyContract=Þessi tengiliður er ekki við tengilið fyrir samningi
 NoContactForAnyInvoice=Þessi tengiliður er ekki við tengilið fyrir reikning
@@ -438,3 +440,6 @@ MergeThirdparties=Merge third parties
 ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one ? All linked objects (invoices, orders, ...) will be moved to current third party so you will be able to delete the duplicate one.
 ThirdpartiesMergeSuccess=Thirdparties have been merged
 ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
+SaleRepresentativeLogin=Login of sale representative
+SaleRepresentativeFirstname=Firstname of sale representative
+SaleRepresentativeLastname=Lastname of sale representative
diff --git a/htdocs/langs/is_IS/errors.lang b/htdocs/langs/is_IS/errors.lang
index 21d56f69187..1341bbc14ed 100644
--- a/htdocs/langs/is_IS/errors.lang
+++ b/htdocs/langs/is_IS/errors.lang
@@ -172,6 +172,8 @@ ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
 ErrorOppStatusRequiredIfAmount=You set an estimated amount for this opportunity/lead. So you must also enter its status
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
 ErrorSavingChanges=An error has ocurred when saving the changes
+ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
+ErrorFileMustHaveFormat=File must have format %s
 
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
diff --git a/htdocs/langs/is_IS/exports.lang b/htdocs/langs/is_IS/exports.lang
index e6ce67baede..29bd5158282 100644
--- a/htdocs/langs/is_IS/exports.lang
+++ b/htdocs/langs/is_IS/exports.lang
@@ -128,6 +128,10 @@ SpecialCode=Special code
 ExportStringFilter=%% allows replacing one or more characters in the text
 ExportDateFilter=YYYY, YYYYMM, YYYYMMDD : filters by one year/month/day<br>YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD : filters over a range of years/months/days<br> > YYYY, > YYYYMM, > YYYYMMDD : filters on all following years/months/days<br> < YYYY, < YYYYMM, < YYYYMMDD : filters on all previous years/months/days
 ExportNumericFilter='NNNNN' filters by one value<br>'NNNNN+NNNNN' filters over a range of values<br>'&gt;NNNNN' filters by lower values<br>'&gt;NNNNN' filters by higher values
+ImportFromLine=Import starting from line number
+EndAtLineNb=End at line number
+SetThisValueTo2ToExcludeFirstLine=For example, set this value to 3 to exclude the 2 first lines
+KeepEmptyToGoToEndOfFile=Keep this field empty to go up to the end of file
 ## filters
 SelectFilterFields=If you want to filter on some values, just input values here.
 FilterableFields=Filterable Fields
diff --git a/htdocs/langs/is_IS/main.lang b/htdocs/langs/is_IS/main.lang
index 9d570bc63d2..41449212a03 100644
--- a/htdocs/langs/is_IS/main.lang
+++ b/htdocs/langs/is_IS/main.lang
@@ -25,6 +25,7 @@ FormatDateHourTextShort=%d %b %Y %H:%M
 FormatDateHourText=%d %B %Y %H:%M
 DatabaseConnection=Tengingin við gagnagrunninn
 NoTemplateDefined=No template defined for this email type
+AvailableVariables=Available substitution variables
 NoTranslation=No translation
 NoRecordFound=No record found
 NoError=Engin villa
diff --git a/htdocs/langs/is_IS/orders.lang b/htdocs/langs/is_IS/orders.lang
index d285c0fe104..30940c561de 100644
--- a/htdocs/langs/is_IS/orders.lang
+++ b/htdocs/langs/is_IS/orders.lang
@@ -32,6 +32,7 @@ StatusOrderSent=Shipment in process
 StatusOrderOnProcessShort=Ordered
 StatusOrderProcessedShort=Afgreitt
 StatusOrderDelivered=Delivered
+StatusOrderDeliveredShort=Delivered
 StatusOrderToBillShort=Við reikning
 StatusOrderToBill2Short=Við reikning
 StatusOrderApprovedShort=Samþykkt
diff --git a/htdocs/langs/is_IS/products.lang b/htdocs/langs/is_IS/products.lang
index 490088aee9e..2a00bf6c298 100644
--- a/htdocs/langs/is_IS/products.lang
+++ b/htdocs/langs/is_IS/products.lang
@@ -45,10 +45,6 @@ LastProducts=Síðasta vörur
 CardProduct0=Vara-kort
 CardProduct1=Þjónusta kort
 CardContract=Samningur kort
-Warehouse=Lager
-Warehouses=Vöruhús
-WarehouseOpened=Warehouse open
-WarehouseClosed=Lager lokaður
 Stock=Stock
 Stocks=Verðbréf
 Movement=Hreyfing
@@ -318,3 +314,11 @@ WarningSelectOneDocument=Please select at least one document
 DefaultUnitToShow=Unit
 NbOfQtyInProposals=Qty in proposals
 ClinkOnALinkOfColumn=Click on a link of column %s to get a detailed view...
+TranslatedLabel=Translated label
+TranslatedDescription=Translated description
+TranslatedNote=Translated notes
+ProductWeight=Weight for 1 product
+ProductVolume=Volume for 1 product
+WeightUnits=Weight unit
+VolumeUnits=Volume unit
+SizeUnits=Size unit
diff --git a/htdocs/langs/is_IS/projects.lang b/htdocs/langs/is_IS/projects.lang
index ac4e9d1c318..d41a345caf3 100644
--- a/htdocs/langs/is_IS/projects.lang
+++ b/htdocs/langs/is_IS/projects.lang
@@ -74,6 +74,9 @@ Progress=Framfarir
 ProgressDeclared=Declared progress
 ProgressCalculated=Calculated progress
 Time=Tími
+ListOfTasks=List of tasks
+GoToListOfTimeConsumed=Go to list of time consumed
+GoToListOfTasks=Go to list of tasks
 ListProposalsAssociatedProject=Listi yfir auglýsing tillögum í tengslum við verkefnið
 ListOrdersAssociatedProject=Listi yfir pantanir viðskiptavina í tengslum við verkefnið
 ListInvoicesAssociatedProject=Listi yfir reikninga viðskiptavinar í tengslum við verkefnið
@@ -198,3 +201,4 @@ OppStatusNEGO=Negociation
 OppStatusPENDING=Pending
 OppStatusWIN=Won
 OppStatusLOST=Lost
+Budget=Budget
diff --git a/htdocs/langs/is_IS/sendings.lang b/htdocs/langs/is_IS/sendings.lang
index 69fbea92dea..8670daae1ed 100644
--- a/htdocs/langs/is_IS/sendings.lang
+++ b/htdocs/langs/is_IS/sendings.lang
@@ -70,6 +70,8 @@ ProductQtyInSuppliersOrdersRunning=Product quantity into opened suppliers orders
 ProductQtyInShipmentAlreadySent=Product quantity from opened customer order already sent
 ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from opened supplier order already received
 NoProductToShipFoundIntoStock=No product to ship found into warehouse <b>%s</b>. Correct stock or go back to choose another warehouse.
+WeightVolShort=Weight/Vol.
+ValidateOrderFirstBeforeShipment=You must first validate the order before being able to make shipments.
 
 # Sending methods
 SendingMethodCATCH=Afli eftir viðskiptavina
diff --git a/htdocs/langs/is_IS/supplier_proposal.lang b/htdocs/langs/is_IS/supplier_proposal.lang
index 1a1bdc4df16..e37ced1b38f 100644
--- a/htdocs/langs/is_IS/supplier_proposal.lang
+++ b/htdocs/langs/is_IS/supplier_proposal.lang
@@ -58,3 +58,5 @@ DefaultModelSupplierProposalCreate=Default model creation
 DefaultModelSupplierProposalToBill=Default template when closing a price request (accepted)
 DefaultModelSupplierProposalClosed=Default template when closing a price request (refused)
 ListOfSupplierProposal=List of supplier proposal requests
+SupplierProposalsToClose=Supplier proposals to close
+SupplierProposalsToProcess=Supplier proposals to process
diff --git a/htdocs/langs/it_IT/accountancy.lang b/htdocs/langs/it_IT/accountancy.lang
index 3379b829a0f..bca2013d5ea 100644
--- a/htdocs/langs/it_IT/accountancy.lang
+++ b/htdocs/langs/it_IT/accountancy.lang
@@ -172,7 +172,7 @@ EnabledVat=In VAT
 ## Tools - Init accounting account on product / service
 InitAccountancy=Init accountancy
 InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accountancy account defined for sales and purchases. Check before that setup of module accountancy is complete.
-Options=Options
+Options=Opzioni
 OptionModeProductSell=Mode sales
 OptionModeProductBuy=Mode purchases
 OptionModeProductSellDesc=Show all products with no accounting account defined for sales.
diff --git a/htdocs/langs/it_IT/admin.lang b/htdocs/langs/it_IT/admin.lang
index b22c15bcb67..ee19d9a6b93 100644
--- a/htdocs/langs/it_IT/admin.lang
+++ b/htdocs/langs/it_IT/admin.lang
@@ -282,6 +282,7 @@ ModuleSetup=Impostazioni modulo
 ModulesSetup=Impostazioni moduli
 ModuleFamilyBase=Sistema
 ModuleFamilyCrm=Client Resource Management (CRM)
+ModuleFamilySrm=Supplier Relation Management (SRM)
 ModuleFamilyProducts=Gestione dei prodotti (PM)
 ModuleFamilyHr=Gestione delle risorse umane (HR)
 ModuleFamilyProjects=Progetti/collaborazioni
@@ -587,6 +588,7 @@ Permission38=Esportare prodotti
 Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
 Permission42=Creare/modificare progetti
 Permission44=Eliminare progetti
+Permission45=Export projects
 Permission61=Vedere gli interventi
 Permission62=Creare/modificare gli interventi
 Permission64=Eliminare interventi
@@ -640,6 +642,7 @@ Permission162=Crea/modifica contratti/abbonamenti
 Permission163=Attiva un servizio/sottoscrizione di un contratto
 Permission164=Disable a service/subscription of a contract
 Permission165=Elimina contratti / abbonamenti
+Permission167=Export contracts
 Permission171=Read trips and expenses (yours and your subordinates)
 Permission172=Crea/modifica nota spese
 Permission173=Elimina nota spese
@@ -788,6 +791,7 @@ Permission2403=Cancellare azioni (eventi o compiti) personali
 Permission2411=Vedere azioni (eventi o compiti) altrui
 Permission2412=Creare/modificare azioni (eventi o compiti) di altri
 Permission2413=Cancellare azioni (eventi o compiti) di altri
+Permission2414=Export actions/tasks of others
 Permission2501=Vedere/scaricare documenti
 Permission2502=Caricare o cancellare  documenti
 Permission2503=Proporre o cancellare documenti
@@ -1713,3 +1717,4 @@ ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s is available. Ve
 MultiPriceRuleDesc=When option "Several level of prices per product/service" is on, you can define different prices (one per price level) for each product. To save you time, you can enter here rule to have price for each level autocalculated according to price of first level, so you will have to enter only price for first level on each product. This page is here to save you time and can be usefull only if your prices for each leve are relative to first level. You can ignore this page in most cases.
 ModelModulesProduct=Templates for product documents
 ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
+SeeSubstitutionVars=See * note for list of possible substitution variables
diff --git a/htdocs/langs/it_IT/agenda.lang b/htdocs/langs/it_IT/agenda.lang
index 3aaa0a6c8fe..2966f82838a 100644
--- a/htdocs/langs/it_IT/agenda.lang
+++ b/htdocs/langs/it_IT/agenda.lang
@@ -35,9 +35,9 @@ AllActions= Tutte i compiti/azioni
 ViewCal=Vista mensile
 ViewDay=Vista giornaliera
 ViewWeek=Vista settimanale
-ViewYear=Year view
+ViewYear=Vista annuale
 ViewPerUser=Visualizzazione per utente
-ViewPerType=Per type view
+ViewPerType=Visualizza per tipo
 ViewWithPredefinedFilters= Vista con filtri predefiniti
 AutoActions= Riempimento automatico
 AgendaAutoActionDesc= Definire qui gli eventi che devono essere creati automaticamente da Dolibarr. Se non è selezionato nulla (impostazione predefinita), nel calendario saranno visualizzate solo azioni inserite manualmente.
@@ -92,17 +92,17 @@ ExtSiteUrlAgenda=URL per accedere al file ICal
 ExtSiteNoLabel=Nessuna descrizione
 WorkingTimeRange=Intervallo di tempo di lavoro
 WorkingDaysRange=Intervallo di giorni di lavoro
-VisibleTimeRange=Visible time range
-VisibleDaysRange=Visible days range
+VisibleTimeRange=Filtro orari visibili
+VisibleDaysRange=Filtro giorni visibili
 AddEvent=Crea evento
 MyAvailability=Mie disponibilità
 ActionType=Tipo di evento
 DateActionBegin=Data di inizio evento
 CloneAction=Clona evento
-ConfirmCloneEvent=Are you sure you want to clone the event <b>%s</b> ?
-RepeatEvent=Repeat event
-EveryWeek=Every week
+ConfirmCloneEvent=Sei sicuro di voler clonare l'evento <b>%s</b>?
+RepeatEvent=Ripeti evento
+EveryWeek=Ogni settimana
 EveryMonth=Ogni mese
-DayOfMonth=Day of month
-DayOfWeek=Day of week
-DateStartPlusOne=Date start + 1 hour
+DayOfMonth=Giorno del mese
+DayOfWeek=Giorno della settimana
+DateStartPlusOne=Data inizio +1 ora
diff --git a/htdocs/langs/it_IT/banks.lang b/htdocs/langs/it_IT/banks.lang
index 8846cbd9a28..04700f933c6 100644
--- a/htdocs/langs/it_IT/banks.lang
+++ b/htdocs/langs/it_IT/banks.lang
@@ -113,7 +113,7 @@ CustomerInvoicePayment=Pagamento fattura attiva
 CustomerInvoicePaymentBack=Rimborso cliente
 SupplierInvoicePayment=Pagamento fattura fornitore
 WithdrawalPayment=Ritiro pagamento
-SocialContributionPayment=Social/fiscal tax payment
+SocialContributionPayment=Pagamento delle imposte sociali/fiscali
 FinancialAccountJournal=Diario del conto finanziario
 BankTransfer=Bonifico bancario
 BankTransfers=Bonifici e giroconti
@@ -165,8 +165,8 @@ DeleteARib=Cancella il BAN
 ConfirmDeleteRib=Vuoi davvero cancellare questo BAN?
 StartDate=Data di inizio
 EndDate=Data di fine
-RejectCheck=Check returned
-ConfirmRejectCheck=Are you sure you want to mark this check as rejected ?
-RejectCheckDate=Date the check was returned
-CheckRejected=Check returned
-CheckRejectedAndInvoicesReopened=Check returned and invoices reopened
+RejectCheck=Assegno restituito
+ConfirmRejectCheck=Sei sicuro di voler segnare questo assegno come rifiutato?
+RejectCheckDate=Data di restituzione dell'assegno
+CheckRejected=Assegno restituito
+CheckRejectedAndInvoicesReopened=Assegno restituito e fatture riaperte
diff --git a/htdocs/langs/it_IT/bills.lang b/htdocs/langs/it_IT/bills.lang
index f8a960391e9..2e6987616f4 100644
--- a/htdocs/langs/it_IT/bills.lang
+++ b/htdocs/langs/it_IT/bills.lang
@@ -219,6 +219,7 @@ RemainderToBill=Restante da fatturare
 SendBillByMail=Invia fattura via email
 SendReminderBillByMail=Inviare promemoria via email
 RelatedCommercialProposals=Proposte commerciali correlate
+RelatedRecurringCustomerInvoices=Related recurring customer invoices
 MenuToValid=Da validare
 DateMaxPayment=Termine ultimo per il pagamento
 DateEcheance=Data di scadenza
@@ -319,7 +320,6 @@ toolTipFrequency=Examples:<br /><b>Set 7 / day</b>: give a new invoice every 7 d
 NextDateToExecution=Date for next invoice generation
 DateLastGeneration=Date of last generation
 MaxPeriodNumber=Max nb of invoice generation
-RestPeriodNumber=Rest period number
 NbOfGenerationDone=Nb of invoice generation already done
 InvoiceAutoValidate=Automatically validate invoice
 GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
@@ -471,3 +471,7 @@ PDFCrevetteSituationInvoiceLine=Situation N°%s : Inv. N°%s on %s
 TotalSituationInvoice=Total situation
 invoiceLineProgressError=Invoice line progress can't be egal or upper the next invoice line
 updatePriceNextInvoiceErrorUpdateline=Error : update price on invoice line : %s
+ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
+ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
+ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
+
diff --git a/htdocs/langs/it_IT/boxes.lang b/htdocs/langs/it_IT/boxes.lang
index ca03e45c3d8..98ed6ea3b29 100644
--- a/htdocs/langs/it_IT/boxes.lang
+++ b/htdocs/langs/it_IT/boxes.lang
@@ -58,10 +58,10 @@ BoxLastExpiredServices=%s contatti più vecchi con servizi scaduti ancora attivi
 BoxTitleLastActionsToDo=Ultime %s azioni da fare
 BoxTitleLastContracts=Ultimi %s contratti
 BoxTitleLastModifiedDonations=Ultime %s donazioni modificate
-BoxTitleLastModifiedExpenses=Last %s modified expense reports
+BoxTitleLastModifiedExpenses=Ultime %s note spese modificate
 BoxGlobalActivity=Attività generale (fatture, proposte, ordini)
-BoxGoodCustomers=Good Customers
-BoxTitleGoodCustomers=%s Good Customers
+BoxGoodCustomers=Good customers
+BoxTitleGoodCustomers=%s Good customers
 FailedToRefreshDataInfoNotUpToDate=Impossibile aggiornare il feed RSS. Ultimo aggiornamento riuscito: %s
 LastRefreshDate=Data dell'ultimo aggiornamento
 NoRecordedBookmarks=Nessun segnalibro presente
diff --git a/htdocs/langs/it_IT/commercial.lang b/htdocs/langs/it_IT/commercial.lang
index acfd53201a5..525dd8d1194 100644
--- a/htdocs/langs/it_IT/commercial.lang
+++ b/htdocs/langs/it_IT/commercial.lang
@@ -7,13 +7,13 @@ Customer=Cliente
 Customers=Clienti
 Prospect=Cliente potenziale
 Prospects=Clienti potenziali
-DeleteAction=Delete an event
-NewAction=New event
-AddAction=Create event
-AddAnAction=Create an event
+DeleteAction=Elimina un evento
+NewAction=Nuovo evento
+AddAction=Crea evento
+AddAnAction=Crea un evento
 AddActionRendezVous=Crea un appuntamento
 Rendez-Vous=Appuntantamenti
-ConfirmDeleteAction=Are you sure you want to delete this event ?
+ConfirmDeleteAction=Sei sicuro di voler eliminare questo evento?
 CardAction=Scheda Azione/compito
 PercentDone=Percentuale di completamento
 ActionOnCompany=Azione per la società
@@ -94,4 +94,4 @@ StatusProsp=Stato del cliente potenziale
 DraftPropals=Bozze di proposte commerciali
 SearchPropal=Cerca una proposta commerciale
 CommercialDashboard=Riassunto commerciale
-NoLimit=No limit
+NoLimit=Nessun limite
diff --git a/htdocs/langs/it_IT/companies.lang b/htdocs/langs/it_IT/companies.lang
index 832c673726b..bf29ac06d7e 100644
--- a/htdocs/langs/it_IT/companies.lang
+++ b/htdocs/langs/it_IT/companies.lang
@@ -30,8 +30,8 @@ ThirdPartyContact=Contatto soggetto terzo
 StatusContactValidated=Stato del contatto/indirizzo
 Company=Società
 CompanyName=Ragione Sociale
-AliasNames=Alias name (commercial, trademark, ...)
-AliasNameShort=Alias name
+AliasNames=Pseudonimo (commerciale, marchio, ...)
+AliasNameShort=Pseudonimo
 Companies=Società
 CountryIsInEEC=Paese appartenente alla Comunità Economica Europea
 ThirdPartyName=Nome soggetto terzo
@@ -69,7 +69,7 @@ Country=Paese
 CountryCode=Codice del paese
 CountryId=Id paese
 Phone=Telefono
-PhoneShort=Phone
+PhoneShort=Telefono
 Skype=Skype
 Call=Chiamata
 Chat=Chat
@@ -202,7 +202,7 @@ ProfId3IN=-
 ProfId4IN=-
 ProfId5IN=-
 ProfId6IN=-
-ProfId1LU=Id. prof. 1 (RCS)
+ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
 ProfId2LU=Id. prof. 2 (Business permit)
 ProfId3LU=-
 ProfId4LU=-
@@ -292,8 +292,8 @@ PersonalInformations=Dati personali
 AccountancyCode=Codice contabile
 CustomerCode=Codice cliente
 SupplierCode=Codice fornitore
-CustomerCodeShort=Customer code
-SupplierCodeShort=Supplier code
+CustomerCodeShort=Codice cliente
+SupplierCodeShort=Codice fornitore
 CustomerAccount=Conto cliente
 SupplierAccount=Conto fornitore
 CustomerCodeDesc=Codice cliente, univoco
@@ -312,15 +312,17 @@ ListOfCustomersContacts=Elenco dei contatti dei clienti
 ListOfSuppliersContacts=Elenco dei contatti dei fornitori
 ListOfCompanies=Elenco delle società
 ListOfThirdParties=Elenco dei soggetti terzi
-ShowCompany=Show thirdparty
+ShowCompany=Mostra soggetto terzo
 ShowContact=Mostra contatti
 ContactsAllShort=Tutti (Nessun filtro)
 ContactType=Tipo di contatto
 ContactForOrders=Contatto per gli ordini
+ContactForOrdersOrShipments=Contatto per ordini o spedizioni
 ContactForProposals=Contatto per le proposte commerciali
 ContactForContracts=Contatto per i contratti
 ContactForInvoices=Contatto per le fatture
 NoContactForAnyOrder=Questo contatto non è il contatto di nessun ordine
+NoContactForAnyOrderOrShipment=Questo contatto non è il contatto di nessun ordine o spedizione
 NoContactForAnyProposal=Questo contatto non è il contatto di nessuna proposta commerciale
 NoContactForAnyContract=Questo contatto non è il contatto di nessun contratto
 NoContactForAnyInvoice=Questo contatto non è il contatto di nessuna fattura
@@ -348,7 +350,7 @@ ProspectLevel=Liv. cliente potenziale
 ContactPrivate=Privato
 ContactPublic=Condiviso
 ContactVisibility=Visibilità
-ContactOthers=Other
+ContactOthers=Altro
 OthersNotLinkedToThirdParty=Altri, non associati ad un soggetto terzo
 ProspectStatus=Stato cliente potenziale
 PL_NONE=Zero
@@ -424,17 +426,20 @@ UniqueThirdParties=Totale soggetti terzi
 InActivity=In attività
 ActivityCeased=Cessata attività
 ActivityStateFilter=Stato attività
-ProductsIntoElements=List of products/services into %s
+ProductsIntoElements=Elenco dei prodotti/servizi in %s
 CurrentOutstandingBill=Fatture scadute
 OutstandingBill=Max. fattura in sospeso
 OutstandingBillReached=Raggiunto il massimo numero di fatture scadute
 MonkeyNumRefModelDesc=Restituisce un numero con formato %syymm-nnnn per codice cliente e %syymm-nnnn per il fornitore, in cui yy è  l'anno, mm è il mese e nnnn è una sequenza progressiva che non ritorna a 0.
 LeopardNumRefModelDesc=Codice cliente/fornitore libero. Questo codice può essere modificato in qualsiasi momento.
 ManagingDirectors=Nome Manager(s) (CEO, direttore, presidente...)
-SearchThirdparty=Search third party
+SearchThirdparty=Cerca soggetto terzo
 SearchContact=Cerca contatto
-MergeOriginThirdparty=Duplicate third party (third party you want to delete)
-MergeThirdparties=Merge third parties
-ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one ? All linked objects (invoices, orders, ...) will be moved to current third party so you will be able to delete the duplicate one.
-ThirdpartiesMergeSuccess=Thirdparties have been merged
-ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
+MergeOriginThirdparty=Duplica soggetto terzo (soggetto terzo che stai eliminando)
+MergeThirdparties=Unisci soggetti terzi
+ConfirmMergeThirdparties=Sei sicuro di voler unire questa terza parte con quella attuale ? Tutti gli oggetti collegati ( fatture , ordini , ... ) verranno spostati al soggetto terzo attuale in di poter eliminare quelli duplicati.
+ThirdpartiesMergeSuccess=I soggetti terzi sono stati uniti
+ErrorThirdpartiesMerge=Si è verificato un errore durante l'eliminazione dei soggetti terzi. Per ulteriori dettagli controlla il log. Le modifiche sono state annullate.
+SaleRepresentativeLogin=Login of sale representative
+SaleRepresentativeFirstname=Firstname of sale representative
+SaleRepresentativeLastname=Lastname of sale representative
diff --git a/htdocs/langs/it_IT/compta.lang b/htdocs/langs/it_IT/compta.lang
index 0bc8e62306f..beb7884c986 100644
--- a/htdocs/langs/it_IT/compta.lang
+++ b/htdocs/langs/it_IT/compta.lang
@@ -72,7 +72,7 @@ NewPayment=Nuovo pagamento
 Payments=Pagamenti
 PaymentCustomerInvoice=Pagamento fattura attiva
 PaymentSupplierInvoice=Pagamento fattura fornitori
-PaymentSocialContribution=Social/fiscal tax payment
+PaymentSocialContribution=Pagamento delle imposte sociali/fiscali
 PaymentVat=Pagamento IVA
 PaymentSalary=Pagamento stipendio
 ListPayment=Elenco dei pagamenti
diff --git a/htdocs/langs/it_IT/contracts.lang b/htdocs/langs/it_IT/contracts.lang
index 677b307cc85..98650b058fe 100644
--- a/htdocs/langs/it_IT/contracts.lang
+++ b/htdocs/langs/it_IT/contracts.lang
@@ -19,11 +19,11 @@ ServiceStatusLateShort=Scaduto
 ServiceStatusClosed=Chiuso
 ServicesLegend=Legenda servizi
 Contracts=Contratti
-ContractsSubscriptions=Contracts/Subscriptions
+ContractsSubscriptions=Contratto/sottoscrizione
 ContractsAndLine=Contratti e righe di contratto
 Contract=Contratto
-ContractLine=Contract line
-Closing=Closing
+ContractLine=Riga di contratto
+Closing=In chiusura
 NoContracts=Nessun contratto
 MenuServices=Servizi
 MenuInactiveServices=Servizi non attivi
@@ -31,7 +31,7 @@ MenuRunningServices=Servizi in esecuzione
 MenuExpiredServices=Servizi scaduti
 MenuClosedServices=Servizi chiusi
 NewContract=Nuovo contratto
-NewContractSubscription=New contract/subscription
+NewContractSubscription=Nuovo contratto/sottoscrizione
 AddContract=Crea contratto
 SearchAContract=Ricerca di un contratto
 DeleteAContract=Eliminazione di un contratto
diff --git a/htdocs/langs/it_IT/ecm.lang b/htdocs/langs/it_IT/ecm.lang
index c3a7ff67f90..8d03ceb4c1c 100644
--- a/htdocs/langs/it_IT/ecm.lang
+++ b/htdocs/langs/it_IT/ecm.lang
@@ -34,7 +34,7 @@ ECMSearchByEntity=Ricerca per oggetto
 ECMSectionOfDocuments=Directory dei documenti
 ECMTypeManual=Manuale
 ECMTypeAuto=Automatico
-ECMDocsBySocialContributions=Documents linked to social or fiscal taxes
+ECMDocsBySocialContributions=Documenti collegati a tasse fiscali o sociali
 ECMDocsByThirdParties=Documenti collegati a soggetti terzi
 ECMDocsByProposals=Documenti collegati alle proposte
 ECMDocsByOrders=Documenti collegati agli ordini clienti
diff --git a/htdocs/langs/it_IT/errors.lang b/htdocs/langs/it_IT/errors.lang
index 36deb66e239..a0c3fc26b9d 100644
--- a/htdocs/langs/it_IT/errors.lang
+++ b/htdocs/langs/it_IT/errors.lang
@@ -172,6 +172,8 @@ ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
 ErrorOppStatusRequiredIfAmount=You set an estimated amount for this opportunity/lead. So you must also enter its status
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
 ErrorSavingChanges=An error has ocurred when saving the changes
+ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
+ErrorFileMustHaveFormat=File must have format %s
 
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
diff --git a/htdocs/langs/it_IT/exports.lang b/htdocs/langs/it_IT/exports.lang
index 8d888cc7933..7081c6471f4 100644
--- a/htdocs/langs/it_IT/exports.lang
+++ b/htdocs/langs/it_IT/exports.lang
@@ -128,6 +128,10 @@ SpecialCode=Codice speciale
 ExportStringFilter=%% permette di sostituire uno o più caratteri nel testo
 ExportDateFilter=YYYY, YYYYMM, YYYYMMDD : filtra per un anno/mese/giorno<br>YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD : filtra con un intervallo di anni/mesi/giorni<br> > YYYY, > YYYYMM, > YYYYMMDD : filtra sui seguenti anni/mesi/giorni<br> < YYYY, < YYYYMM, < YYYYMMDD : filtra su tutti i precedenti anni/mesi/giorni
 ExportNumericFilter='NNNNN' filtra per un solo valore<br>'NNNNN+NNNNN' filtra su un range di valori<br>'&gt;NNNNN' filtra per valori inferiori<br>'&gt;NNNNN' filtra per valori superiori
+ImportFromLine=Import starting from line number
+EndAtLineNb=End at line number
+SetThisValueTo2ToExcludeFirstLine=For example, set this value to 3 to exclude the 2 first lines
+KeepEmptyToGoToEndOfFile=Keep this field empty to go up to the end of file
 ## filters
 SelectFilterFields=Se vuoi filtrare su qualche valore, inserisci qui il valore.
 FilterableFields=Filterable Fields
diff --git a/htdocs/langs/it_IT/install.lang b/htdocs/langs/it_IT/install.lang
index cba6ec690d3..7c9e16f6c10 100644
--- a/htdocs/langs/it_IT/install.lang
+++ b/htdocs/langs/it_IT/install.lang
@@ -148,7 +148,7 @@ MigrationFinished=Migrazione completata
 LastStepDesc=<strong>Ultimo passo:</strong> Indicare qui login e password che si prevede di utilizzare per la connessione al software. Non dimenticare questi dati perché è l'unico account in grado di amminsitrare tutti gli altri.
 ActivateModule=Attiva modulo %s
 ShowEditTechnicalParameters=Clicca qui per mostrare/modificare i parametri avanzati (modalità esperti)
-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/41/42/43), 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...
+WarningUpgrade=Attenzione:\nHai eseguito il backup del database prima?\nQuesto è fortemente consigliato: per esempio, a causa di qualche bug nel sistema del database (per es. versione mysql 5.5.40/41/42/43), qualche dato o tabella potrebbe essere persa durante il processo, quindi è fortemente raccomandato di avere un copia completa del database prima di procedere con la migrazione.\n\nClicca OK per iniziare il processo di migrazione...
 ErrorDatabaseVersionForbiddenForMigration=La tua versione del database è %s. Essa soffre di un bug critico se si cambia la struttura del database, come è richiesto dal processo di migrazione. Per questa ragione non sarà consentita la migrazione fino a quando non verrà aggiornato il database a una versione stabile più recente (elenco delle versioni probleematiche: %s)
 
 #########
@@ -202,6 +202,6 @@ MigrationActioncommElement=Aggiornare i dati sulle azioni
 MigrationPaymentMode=Migrazione dei dati delle modalità di pagamento
 MigrationCategorieAssociation=Migrazione delle categorie
 MigrationEvents=Migrazione degli eventi per aggiungere i proprietari nella tabella degli utilizzatori assegnati
-MigrationReloadModule=Reload module %s
+MigrationReloadModule=Ricarica modulo %s
 ShowNotAvailableOptions=Mostra opzioni non disponibili
 HideNotAvailableOptions=Nascondi opzioni non disponibili
diff --git a/htdocs/langs/it_IT/main.lang b/htdocs/langs/it_IT/main.lang
index 5d42802e08e..506c457ce59 100644
--- a/htdocs/langs/it_IT/main.lang
+++ b/htdocs/langs/it_IT/main.lang
@@ -25,6 +25,7 @@ FormatDateHourTextShort=%d %b %Y %H.%M
 FormatDateHourText=%d %B %Y %H:%M
 DatabaseConnection=Connessione al database
 NoTemplateDefined=No template defined for this email type
+AvailableVariables=Available substitution variables
 NoTranslation=Nessuna traduzione
 NoRecordFound=Nessun risultato trovato
 NoError=Nessun errore
@@ -106,7 +107,7 @@ NotePrivate=Nota (privata)
 PrecisionUnitIsLimitedToXDecimals=Dolibarr è stato configurato per limitare la precisione dei prezzi unitari a <b>%s</b> decimali.
 DoTest=Verifica
 ToFilter=Filtrare
-NoFilter=No filter
+NoFilter=Nessun filtro
 WarningYouHaveAtLeastOneTaskLate=Attenzione, avete almeno un elemento che ha superato la tolleranza di ritardo.
 yes=sì
 Yes=Sì
diff --git a/htdocs/langs/it_IT/members.lang b/htdocs/langs/it_IT/members.lang
index f6a704de88e..30dd021e379 100644
--- a/htdocs/langs/it_IT/members.lang
+++ b/htdocs/langs/it_IT/members.lang
@@ -198,8 +198,8 @@ Entreprises=Imprese
 DOLIBARRFOUNDATION_PAYMENT_FORM=Per effettuare il pagamento dell'adesione tramite bonifico bancario, vedi <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a>.<br/>Per pagare con carta di credito o Paypal, clicca sul pulsante in fondo a questa pagina.<br/>
 ByProperties=Per natura
 MembersStatisticsByProperties=Statistiche dei membri per natura
-MembersByNature=This screen show you statistics on members by nature.
-MembersByRegion=This screen show you statistics on members by region.
+MembersByNature=Questa schermata mostra le statistiche dei membri per natura
+MembersByRegion=Questa schermata mostra le statistiche dei membri per regione
 VATToUseForSubscriptions=Aliquota IVA in uso per le sottoscrizioni
 NoVatOnSubscription=Nessuna IVA per gli abbonamenti
 MEMBER_PAYONLINE_SENDEMAIL=Email di avviso quando Dolibarr riceve la conferma della validazione di un pagamento per adesione
diff --git a/htdocs/langs/it_IT/orders.lang b/htdocs/langs/it_IT/orders.lang
index 1764f98701f..17734b07ccf 100644
--- a/htdocs/langs/it_IT/orders.lang
+++ b/htdocs/langs/it_IT/orders.lang
@@ -32,6 +32,7 @@ StatusOrderSent=Spedizione in corso
 StatusOrderOnProcessShort=Ordinato
 StatusOrderProcessedShort=Lavorato
 StatusOrderDelivered=Spedito
+StatusOrderDeliveredShort=Delivered
 StatusOrderToBillShort=Spedito
 StatusOrderToBill2Short=Da fatturare
 StatusOrderApprovedShort=Approvato
diff --git a/htdocs/langs/it_IT/products.lang b/htdocs/langs/it_IT/products.lang
index 3ddf0e3208f..f41dd27435c 100644
--- a/htdocs/langs/it_IT/products.lang
+++ b/htdocs/langs/it_IT/products.lang
@@ -45,10 +45,6 @@ LastProducts=Ultimi prodotti
 CardProduct0=Scheda prodotto
 CardProduct1=Scheda servizio
 CardContract=Scheda contratto
-Warehouse=Magazzino
-Warehouses=Magazzini
-WarehouseOpened=Magazzino aperto
-WarehouseClosed=Magazzino chiuso
 Stock=Scorte
 Stocks=Scorte
 Movement=Movimento
@@ -318,3 +314,11 @@ WarningSelectOneDocument=Seleziona almeno un documento
 DefaultUnitToShow=Unit
 NbOfQtyInProposals=Qty in proposals
 ClinkOnALinkOfColumn=Click on a link of column %s to get a detailed view...
+TranslatedLabel=Translated label
+TranslatedDescription=Translated description
+TranslatedNote=Translated notes
+ProductWeight=Weight for 1 product
+ProductVolume=Volume for 1 product
+WeightUnits=Weight unit
+VolumeUnits=Volume unit
+SizeUnits=Size unit
diff --git a/htdocs/langs/it_IT/projects.lang b/htdocs/langs/it_IT/projects.lang
index 1dd9b375f8d..9954fb68fd2 100644
--- a/htdocs/langs/it_IT/projects.lang
+++ b/htdocs/langs/it_IT/projects.lang
@@ -74,6 +74,9 @@ Progress=Avanzamento
 ProgressDeclared=Avanzamento dichiarato
 ProgressCalculated=Avanzamento calcolato
 Time=Tempo
+ListOfTasks=List of tasks
+GoToListOfTimeConsumed=Go to list of time consumed
+GoToListOfTasks=Go to list of tasks
 ListProposalsAssociatedProject=Elenco delle proposte commerciali associate al progetto
 ListOrdersAssociatedProject=Elenco degli ordini associati al progetto
 ListInvoicesAssociatedProject=Elenco delle fatture attive associate al progetto
@@ -198,3 +201,4 @@ OppStatusNEGO=Negoziazione
 OppStatusPENDING=In attesa
 OppStatusWIN=Vinto
 OppStatusLOST=Perso
+Budget=Budget
diff --git a/htdocs/langs/it_IT/sendings.lang b/htdocs/langs/it_IT/sendings.lang
index 77283f135bb..12dffe4e6b0 100644
--- a/htdocs/langs/it_IT/sendings.lang
+++ b/htdocs/langs/it_IT/sendings.lang
@@ -70,6 +70,8 @@ ProductQtyInSuppliersOrdersRunning=Product quantity into opened suppliers orders
 ProductQtyInShipmentAlreadySent=Product quantity from opened customer order already sent
 ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from opened supplier order already received
 NoProductToShipFoundIntoStock=Nessun prodotto da spedire presente all'interno del magazzino <b>%s</b>
+WeightVolShort=Weight/Vol.
+ValidateOrderFirstBeforeShipment=You must first validate the order before being able to make shipments.
 
 # Sending methods
 SendingMethodCATCH=Ritiro da parte del Cliente
diff --git a/htdocs/langs/it_IT/sms.lang b/htdocs/langs/it_IT/sms.lang
index 339c49cc362..52549681062 100644
--- a/htdocs/langs/it_IT/sms.lang
+++ b/htdocs/langs/it_IT/sms.lang
@@ -49,6 +49,6 @@ SendSms=Invia SMS
 SmsInfoCharRemain=Numero di caratteri rimanenti
 SmsInfoNumero= (formato internazionale, per esempio: +393499701761)
 DelayBeforeSending=Ritardo prima dell'invio (minuti)
-SmsNoPossibleSenderFound=No sender available. Check setup of your SMS provider.
+SmsNoPossibleSenderFound=Nessun mittente disponibile. Controlla le impostazioni del tuo provider SMS.
 SmsNoPossibleRecipientFound=Nessun destinatario disponibile. Controllare le impostazioni del provider SMS.
 
diff --git a/htdocs/langs/it_IT/supplier_proposal.lang b/htdocs/langs/it_IT/supplier_proposal.lang
index 76af6ef06fb..f7642e2c48d 100644
--- a/htdocs/langs/it_IT/supplier_proposal.lang
+++ b/htdocs/langs/it_IT/supplier_proposal.lang
@@ -58,3 +58,5 @@ DefaultModelSupplierProposalCreate=Default model creation
 DefaultModelSupplierProposalToBill=Default template when closing a price request (accepted)
 DefaultModelSupplierProposalClosed=Default template when closing a price request (refused)
 ListOfSupplierProposal=List of supplier proposal requests
+SupplierProposalsToClose=Supplier proposals to close
+SupplierProposalsToProcess=Supplier proposals to process
diff --git a/htdocs/langs/ja_JP/admin.lang b/htdocs/langs/ja_JP/admin.lang
index 6eefe716d7e..d7cf36d7a31 100644
--- a/htdocs/langs/ja_JP/admin.lang
+++ b/htdocs/langs/ja_JP/admin.lang
@@ -282,6 +282,7 @@ ModuleSetup=モジュールのセットアップ
 ModulesSetup=モジュールのセットアップ
 ModuleFamilyBase=システム
 ModuleFamilyCrm=顧客関係管理（CRM）
+ModuleFamilySrm=Supplier Relation Management (SRM)
 ModuleFamilyProducts=Products Management (PM)
 ModuleFamilyHr=Human Resource Management (HR)
 ModuleFamilyProjects=プロジェクト/共同作業
@@ -587,6 +588,7 @@ Permission38=輸出製品
 Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
 Permission42=プロジェクトを（私が連絡している共有プロジェクトとプロジェクト）を作成/変更
 Permission44=（私が連絡している共有プロジェクトとプロジェクト）のプロジェクトを削除します。
+Permission45=Export projects
 Permission61=介入を読む
 Permission62=介入を作成/変更
 Permission64=介入を削除します。
@@ -640,6 +642,7 @@ Permission162=Create/modify contracts/subscriptions
 Permission163=Activate a service/subscription of a contract
 Permission164=Disable a service/subscription of a contract
 Permission165=Delete contracts/subscriptions
+Permission167=Export contracts
 Permission171=Read trips and expenses (yours and your subordinates)
 Permission172=Create/modify trips and expenses
 Permission173=Delete trips and expenses
@@ -788,6 +791,7 @@ Permission2403=自分のアカウントにリンクされたアクション（
 Permission2411=他のアクション（イベントまたはタスク）を読む
 Permission2412=他のアクション（イベントまたはタスク）を作成/変更
 Permission2413=他のアクション（イベントまたはタスク）を削除
+Permission2414=Export actions/tasks of others
 Permission2501=ドキュメントを読む/ダウンロード
 Permission2502=ドキュメントをダウンロードする
 Permission2503=書類の提出または削除
@@ -1713,3 +1717,4 @@ ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s is available. Ve
 MultiPriceRuleDesc=When option "Several level of prices per product/service" is on, you can define different prices (one per price level) for each product. To save you time, you can enter here rule to have price for each level autocalculated according to price of first level, so you will have to enter only price for first level on each product. This page is here to save you time and can be usefull only if your prices for each leve are relative to first level. You can ignore this page in most cases.
 ModelModulesProduct=Templates for product documents
 ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
+SeeSubstitutionVars=See * note for list of possible substitution variables
diff --git a/htdocs/langs/ja_JP/bills.lang b/htdocs/langs/ja_JP/bills.lang
index 81faae7c54f..ae0dabcf92b 100644
--- a/htdocs/langs/ja_JP/bills.lang
+++ b/htdocs/langs/ja_JP/bills.lang
@@ -219,6 +219,7 @@ RemainderToBill=法案に残り
 SendBillByMail=電子メールで請求書を送付
 SendReminderBillByMail=電子メールでリマインダを送信
 RelatedCommercialProposals=関連する商業的な提案
+RelatedRecurringCustomerInvoices=Related recurring customer invoices
 MenuToValid=有効に
 DateMaxPayment=前のためお支払い
 DateEcheance=期日制限
@@ -319,7 +320,6 @@ toolTipFrequency=Examples:<br /><b>Set 7 / day</b>: give a new invoice every 7 d
 NextDateToExecution=Date for next invoice generation
 DateLastGeneration=Date of last generation
 MaxPeriodNumber=Max nb of invoice generation
-RestPeriodNumber=Rest period number
 NbOfGenerationDone=Nb of invoice generation already done
 InvoiceAutoValidate=Automatically validate invoice
 GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
@@ -471,3 +471,7 @@ PDFCrevetteSituationInvoiceLine=Situation N°%s : Inv. N°%s on %s
 TotalSituationInvoice=Total situation
 invoiceLineProgressError=Invoice line progress can't be egal or upper the next invoice line
 updatePriceNextInvoiceErrorUpdateline=Error : update price on invoice line : %s
+ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
+ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
+ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
+
diff --git a/htdocs/langs/ja_JP/boxes.lang b/htdocs/langs/ja_JP/boxes.lang
index 2774f0478b7..84fd8e82da2 100644
--- a/htdocs/langs/ja_JP/boxes.lang
+++ b/htdocs/langs/ja_JP/boxes.lang
@@ -60,8 +60,8 @@ BoxTitleLastContracts=最後%s契約
 BoxTitleLastModifiedDonations=最後%sは寄付を変更
 BoxTitleLastModifiedExpenses=Last %s modified expense reports
 BoxGlobalActivity=Global activity (invoices, proposals, orders)
-BoxGoodCustomers=Good Customers
-BoxTitleGoodCustomers=%s Good Customers
+BoxGoodCustomers=Good customers
+BoxTitleGoodCustomers=%s Good customers
 FailedToRefreshDataInfoNotUpToDate=リフレッシュRSSフラックスに失敗しました。最後に成功し、リフレッシュした日：%s
 LastRefreshDate=最後の更新日
 NoRecordedBookmarks=ブックマークが定義されていません。
diff --git a/htdocs/langs/ja_JP/companies.lang b/htdocs/langs/ja_JP/companies.lang
index 3acbd85bca7..123e0c96be4 100644
--- a/htdocs/langs/ja_JP/companies.lang
+++ b/htdocs/langs/ja_JP/companies.lang
@@ -202,7 +202,7 @@ ProfId3IN=教授はID 3（SRVC税込）
 ProfId4IN=教授はID 4
 ProfId5IN=教授はID 5
 ProfId6IN=-
-ProfId1LU=Id. prof. 1 (RCS)
+ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
 ProfId2LU=Id. prof. 2 (Business permit)
 ProfId3LU=-
 ProfId4LU=-
@@ -317,10 +317,12 @@ ShowContact=連絡先を表示する
 ContactsAllShort=すべて（フィルタなし）
 ContactType=コンタクトタイプ
 ContactForOrders=注文のお問い合わせ
+ContactForOrdersOrShipments=Order's or shipment's contact
 ContactForProposals=提案者の連絡先
 ContactForContracts=契約者の連絡先
 ContactForInvoices=請求書の連絡先
 NoContactForAnyOrder=この連絡先は任意の順序のための接触はありません
+NoContactForAnyOrderOrShipment=This contact is not a contact for any order or shipment
 NoContactForAnyProposal=この連絡先は、任意の商業的な提案のための接触はありません
 NoContactForAnyContract=この接触は、いかなる契約の連絡はありません
 NoContactForAnyInvoice=この連絡先は、任意の請求書の連絡はありません
@@ -438,3 +440,6 @@ MergeThirdparties=Merge third parties
 ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one ? All linked objects (invoices, orders, ...) will be moved to current third party so you will be able to delete the duplicate one.
 ThirdpartiesMergeSuccess=Thirdparties have been merged
 ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
+SaleRepresentativeLogin=Login of sale representative
+SaleRepresentativeFirstname=Firstname of sale representative
+SaleRepresentativeLastname=Lastname of sale representative
diff --git a/htdocs/langs/ja_JP/errors.lang b/htdocs/langs/ja_JP/errors.lang
index 26cfc5813d7..3ea5f4d6555 100644
--- a/htdocs/langs/ja_JP/errors.lang
+++ b/htdocs/langs/ja_JP/errors.lang
@@ -172,6 +172,8 @@ ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
 ErrorOppStatusRequiredIfAmount=You set an estimated amount for this opportunity/lead. So you must also enter its status
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
 ErrorSavingChanges=An error has ocurred when saving the changes
+ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
+ErrorFileMustHaveFormat=File must have format %s
 
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
diff --git a/htdocs/langs/ja_JP/exports.lang b/htdocs/langs/ja_JP/exports.lang
index 19663c26f18..c9ad13f7b75 100644
--- a/htdocs/langs/ja_JP/exports.lang
+++ b/htdocs/langs/ja_JP/exports.lang
@@ -128,6 +128,10 @@ SpecialCode=Special code
 ExportStringFilter=%% allows replacing one or more characters in the text
 ExportDateFilter=YYYY, YYYYMM, YYYYMMDD : filters by one year/month/day<br>YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD : filters over a range of years/months/days<br> > YYYY, > YYYYMM, > YYYYMMDD : filters on all following years/months/days<br> < YYYY, < YYYYMM, < YYYYMMDD : filters on all previous years/months/days
 ExportNumericFilter='NNNNN' filters by one value<br>'NNNNN+NNNNN' filters over a range of values<br>'&gt;NNNNN' filters by lower values<br>'&gt;NNNNN' filters by higher values
+ImportFromLine=Import starting from line number
+EndAtLineNb=End at line number
+SetThisValueTo2ToExcludeFirstLine=For example, set this value to 3 to exclude the 2 first lines
+KeepEmptyToGoToEndOfFile=Keep this field empty to go up to the end of file
 ## filters
 SelectFilterFields=If you want to filter on some values, just input values here.
 FilterableFields=Filterable Fields
diff --git a/htdocs/langs/ja_JP/main.lang b/htdocs/langs/ja_JP/main.lang
index edeeb11563c..41c1432cd84 100644
--- a/htdocs/langs/ja_JP/main.lang
+++ b/htdocs/langs/ja_JP/main.lang
@@ -25,6 +25,7 @@ FormatDateHourTextShort=%b %d, %Y, %I:%M %p
 FormatDateHourText=%B %d, %Y, %I:%M %p
 DatabaseConnection=データベース接続
 NoTemplateDefined=No template defined for this email type
+AvailableVariables=Available substitution variables
 NoTranslation=No translation
 NoRecordFound=No record found
 NoError=エラーなし
diff --git a/htdocs/langs/ja_JP/orders.lang b/htdocs/langs/ja_JP/orders.lang
index 0ffe4a488bc..4187cf3db3f 100644
--- a/htdocs/langs/ja_JP/orders.lang
+++ b/htdocs/langs/ja_JP/orders.lang
@@ -32,6 +32,7 @@ StatusOrderSent=Shipment in process
 StatusOrderOnProcessShort=Ordered
 StatusOrderProcessedShort=処理
 StatusOrderDelivered=Delivered
+StatusOrderDeliveredShort=Delivered
 StatusOrderToBillShort=請求する
 StatusOrderToBill2Short=請求する
 StatusOrderApprovedShort=承認された
diff --git a/htdocs/langs/ja_JP/products.lang b/htdocs/langs/ja_JP/products.lang
index 2589def906c..32941509a4e 100644
--- a/htdocs/langs/ja_JP/products.lang
+++ b/htdocs/langs/ja_JP/products.lang
@@ -45,10 +45,6 @@ LastProducts=最後の製品
 CardProduct0=プロダクトカード
 CardProduct1=サービスカード
 CardContract=契約カード
-Warehouse=倉庫
-Warehouses=倉庫
-WarehouseOpened=Warehouse open
-WarehouseClosed=倉庫は閉じた
 Stock=株式
 Stocks=ストック
 Movement=運動
@@ -318,3 +314,11 @@ WarningSelectOneDocument=Please select at least one document
 DefaultUnitToShow=Unit
 NbOfQtyInProposals=Qty in proposals
 ClinkOnALinkOfColumn=Click on a link of column %s to get a detailed view...
+TranslatedLabel=Translated label
+TranslatedDescription=Translated description
+TranslatedNote=Translated notes
+ProductWeight=Weight for 1 product
+ProductVolume=Volume for 1 product
+WeightUnits=Weight unit
+VolumeUnits=Volume unit
+SizeUnits=Size unit
diff --git a/htdocs/langs/ja_JP/projects.lang b/htdocs/langs/ja_JP/projects.lang
index e28f9ba30d4..0384f9f9d6d 100644
--- a/htdocs/langs/ja_JP/projects.lang
+++ b/htdocs/langs/ja_JP/projects.lang
@@ -74,6 +74,9 @@ Progress=進捗
 ProgressDeclared=Declared progress
 ProgressCalculated=Calculated progress
 Time=時間
+ListOfTasks=List of tasks
+GoToListOfTimeConsumed=Go to list of time consumed
+GoToListOfTasks=Go to list of tasks
 ListProposalsAssociatedProject=プロジェクトに関連付けられている商用の提案のリスト
 ListOrdersAssociatedProject=プロジェクトに関連付けられた顧客の注文のリスト
 ListInvoicesAssociatedProject=プロジェクトに関連付けられた顧客の請求書の一覧
@@ -198,3 +201,4 @@ OppStatusNEGO=Negociation
 OppStatusPENDING=Pending
 OppStatusWIN=Won
 OppStatusLOST=Lost
+Budget=Budget
diff --git a/htdocs/langs/ja_JP/sendings.lang b/htdocs/langs/ja_JP/sendings.lang
index efdc4ffc764..ccac9f3e2d0 100644
--- a/htdocs/langs/ja_JP/sendings.lang
+++ b/htdocs/langs/ja_JP/sendings.lang
@@ -70,6 +70,8 @@ ProductQtyInSuppliersOrdersRunning=Product quantity into opened suppliers orders
 ProductQtyInShipmentAlreadySent=Product quantity from opened customer order already sent
 ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from opened supplier order already received
 NoProductToShipFoundIntoStock=No product to ship found into warehouse <b>%s</b>. Correct stock or go back to choose another warehouse.
+WeightVolShort=Weight/Vol.
+ValidateOrderFirstBeforeShipment=You must first validate the order before being able to make shipments.
 
 # Sending methods
 SendingMethodCATCH=顧客がキャッチ
diff --git a/htdocs/langs/ja_JP/supplier_proposal.lang b/htdocs/langs/ja_JP/supplier_proposal.lang
index 1a1bdc4df16..e37ced1b38f 100644
--- a/htdocs/langs/ja_JP/supplier_proposal.lang
+++ b/htdocs/langs/ja_JP/supplier_proposal.lang
@@ -58,3 +58,5 @@ DefaultModelSupplierProposalCreate=Default model creation
 DefaultModelSupplierProposalToBill=Default template when closing a price request (accepted)
 DefaultModelSupplierProposalClosed=Default template when closing a price request (refused)
 ListOfSupplierProposal=List of supplier proposal requests
+SupplierProposalsToClose=Supplier proposals to close
+SupplierProposalsToProcess=Supplier proposals to process
diff --git a/htdocs/langs/ka_GE/admin.lang b/htdocs/langs/ka_GE/admin.lang
index deca56bf2c1..c83ce1dba12 100644
--- a/htdocs/langs/ka_GE/admin.lang
+++ b/htdocs/langs/ka_GE/admin.lang
@@ -282,6 +282,7 @@ ModuleSetup=Module setup
 ModulesSetup=Modules setup
 ModuleFamilyBase=System
 ModuleFamilyCrm=Customer Relation Management (CRM)
+ModuleFamilySrm=Supplier Relation Management (SRM)
 ModuleFamilyProducts=Products Management (PM)
 ModuleFamilyHr=Human Resource Management (HR)
 ModuleFamilyProjects=Projects/Collaborative work
@@ -587,6 +588,7 @@ Permission38=Export products
 Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
 Permission42=Create/modify projects (shared project and projects i'm contact for)
 Permission44=Delete projects (shared project and projects i'm contact for)
+Permission45=Export projects
 Permission61=Read interventions
 Permission62=Create/modify interventions
 Permission64=Delete interventions
@@ -640,6 +642,7 @@ Permission162=Create/modify contracts/subscriptions
 Permission163=Activate a service/subscription of a contract
 Permission164=Disable a service/subscription of a contract
 Permission165=Delete contracts/subscriptions
+Permission167=Export contracts
 Permission171=Read trips and expenses (yours and your subordinates)
 Permission172=Create/modify trips and expenses
 Permission173=Delete trips and expenses
@@ -788,6 +791,7 @@ Permission2403=Delete actions (events or tasks) linked to his account
 Permission2411=Read actions (events or tasks) of others
 Permission2412=Create/modify actions (events or tasks) of others
 Permission2413=Delete actions (events or tasks) of others
+Permission2414=Export actions/tasks of others
 Permission2501=Read/Download documents
 Permission2502=Download documents
 Permission2503=Submit or delete documents
@@ -1713,3 +1717,4 @@ ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s is available. Ve
 MultiPriceRuleDesc=When option "Several level of prices per product/service" is on, you can define different prices (one per price level) for each product. To save you time, you can enter here rule to have price for each level autocalculated according to price of first level, so you will have to enter only price for first level on each product. This page is here to save you time and can be usefull only if your prices for each leve are relative to first level. You can ignore this page in most cases.
 ModelModulesProduct=Templates for product documents
 ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
+SeeSubstitutionVars=See * note for list of possible substitution variables
diff --git a/htdocs/langs/ka_GE/bills.lang b/htdocs/langs/ka_GE/bills.lang
index e67ad0ade2d..790a146ee98 100644
--- a/htdocs/langs/ka_GE/bills.lang
+++ b/htdocs/langs/ka_GE/bills.lang
@@ -219,6 +219,7 @@ RemainderToBill=Remainder to bill
 SendBillByMail=Send invoice by email
 SendReminderBillByMail=Send reminder by email
 RelatedCommercialProposals=Related commercial proposals
+RelatedRecurringCustomerInvoices=Related recurring customer invoices
 MenuToValid=To valid
 DateMaxPayment=Payment due before
 DateEcheance=Due date limit
@@ -319,7 +320,6 @@ toolTipFrequency=Examples:<br /><b>Set 7 / day</b>: give a new invoice every 7 d
 NextDateToExecution=Date for next invoice generation
 DateLastGeneration=Date of last generation
 MaxPeriodNumber=Max nb of invoice generation
-RestPeriodNumber=Rest period number
 NbOfGenerationDone=Nb of invoice generation already done
 InvoiceAutoValidate=Automatically validate invoice
 GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
@@ -471,3 +471,7 @@ PDFCrevetteSituationInvoiceLine=Situation N°%s : Inv. N°%s on %s
 TotalSituationInvoice=Total situation
 invoiceLineProgressError=Invoice line progress can't be egal or upper the next invoice line
 updatePriceNextInvoiceErrorUpdateline=Error : update price on invoice line : %s
+ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
+ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
+ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
+
diff --git a/htdocs/langs/ka_GE/boxes.lang b/htdocs/langs/ka_GE/boxes.lang
index 57bfc174ec5..7619a335b61 100644
--- a/htdocs/langs/ka_GE/boxes.lang
+++ b/htdocs/langs/ka_GE/boxes.lang
@@ -60,8 +60,8 @@ BoxTitleLastContracts=Last %s contracts
 BoxTitleLastModifiedDonations=Last %s modified donations
 BoxTitleLastModifiedExpenses=Last %s modified expense reports
 BoxGlobalActivity=Global activity (invoices, proposals, orders)
-BoxGoodCustomers=Good Customers
-BoxTitleGoodCustomers=%s Good Customers
+BoxGoodCustomers=Good customers
+BoxTitleGoodCustomers=%s Good customers
 FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Last successfull refresh date: %s
 LastRefreshDate=Last refresh date
 NoRecordedBookmarks=No bookmarks defined.
diff --git a/htdocs/langs/ka_GE/companies.lang b/htdocs/langs/ka_GE/companies.lang
index 588867b1f2f..fe967d3252f 100644
--- a/htdocs/langs/ka_GE/companies.lang
+++ b/htdocs/langs/ka_GE/companies.lang
@@ -202,7 +202,7 @@ ProfId3IN=Prof Id 3 (SRVC TAX)
 ProfId4IN=Prof Id 4
 ProfId5IN=Prof Id 5
 ProfId6IN=-
-ProfId1LU=Id. prof. 1 (RCS)
+ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
 ProfId2LU=Id. prof. 2 (Business permit)
 ProfId3LU=-
 ProfId4LU=-
@@ -317,10 +317,12 @@ ShowContact=Show contact
 ContactsAllShort=All (No filter)
 ContactType=Contact type
 ContactForOrders=Order's contact
+ContactForOrdersOrShipments=Order's or shipment's contact
 ContactForProposals=Proposal's contact
 ContactForContracts=Contract's contact
 ContactForInvoices=Invoice's contact
 NoContactForAnyOrder=This contact is not a contact for any order
+NoContactForAnyOrderOrShipment=This contact is not a contact for any order or shipment
 NoContactForAnyProposal=This contact is not a contact for any commercial proposal
 NoContactForAnyContract=This contact is not a contact for any contract
 NoContactForAnyInvoice=This contact is not a contact for any invoice
@@ -438,3 +440,6 @@ MergeThirdparties=Merge third parties
 ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one ? All linked objects (invoices, orders, ...) will be moved to current third party so you will be able to delete the duplicate one.
 ThirdpartiesMergeSuccess=Thirdparties have been merged
 ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
+SaleRepresentativeLogin=Login of sale representative
+SaleRepresentativeFirstname=Firstname of sale representative
+SaleRepresentativeLastname=Lastname of sale representative
diff --git a/htdocs/langs/ka_GE/errors.lang b/htdocs/langs/ka_GE/errors.lang
index 718b3e8413f..fa7804ce355 100644
--- a/htdocs/langs/ka_GE/errors.lang
+++ b/htdocs/langs/ka_GE/errors.lang
@@ -172,6 +172,8 @@ ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
 ErrorOppStatusRequiredIfAmount=You set an estimated amount for this opportunity/lead. So you must also enter its status
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
 ErrorSavingChanges=An error has ocurred when saving the changes
+ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
+ErrorFileMustHaveFormat=File must have format %s
 
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
diff --git a/htdocs/langs/ka_GE/exports.lang b/htdocs/langs/ka_GE/exports.lang
index 03c87b28bcf..1a490ea647d 100644
--- a/htdocs/langs/ka_GE/exports.lang
+++ b/htdocs/langs/ka_GE/exports.lang
@@ -128,6 +128,10 @@ SpecialCode=Special code
 ExportStringFilter=%% allows replacing one or more characters in the text
 ExportDateFilter=YYYY, YYYYMM, YYYYMMDD : filters by one year/month/day<br>YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD : filters over a range of years/months/days<br> > YYYY, > YYYYMM, > YYYYMMDD : filters on all following years/months/days<br> < YYYY, < YYYYMM, < YYYYMMDD : filters on all previous years/months/days
 ExportNumericFilter='NNNNN' filters by one value<br>'NNNNN+NNNNN' filters over a range of values<br>'&gt;NNNNN' filters by lower values<br>'&gt;NNNNN' filters by higher values
+ImportFromLine=Import starting from line number
+EndAtLineNb=End at line number
+SetThisValueTo2ToExcludeFirstLine=For example, set this value to 3 to exclude the 2 first lines
+KeepEmptyToGoToEndOfFile=Keep this field empty to go up to the end of file
 ## filters
 SelectFilterFields=If you want to filter on some values, just input values here.
 FilterableFields=Filterable Fields
diff --git a/htdocs/langs/ka_GE/main.lang b/htdocs/langs/ka_GE/main.lang
index abc26865694..3bead553dd0 100644
--- a/htdocs/langs/ka_GE/main.lang
+++ b/htdocs/langs/ka_GE/main.lang
@@ -25,6 +25,7 @@ FormatDateHourTextShort=%b %d, %Y, %I:%M %p
 FormatDateHourText=%B %d, %Y, %I:%M %p
 DatabaseConnection=Database connection
 NoTemplateDefined=No template defined for this email type
+AvailableVariables=Available substitution variables
 NoTranslation=No translation
 NoRecordFound=No record found
 NoError=No error
diff --git a/htdocs/langs/ka_GE/orders.lang b/htdocs/langs/ka_GE/orders.lang
index c0bfc3ccce3..33cd265b07f 100644
--- a/htdocs/langs/ka_GE/orders.lang
+++ b/htdocs/langs/ka_GE/orders.lang
@@ -32,6 +32,7 @@ StatusOrderSent=Shipment in process
 StatusOrderOnProcessShort=Ordered
 StatusOrderProcessedShort=Processed
 StatusOrderDelivered=Delivered
+StatusOrderDeliveredShort=Delivered
 StatusOrderToBillShort=Delivered
 StatusOrderToBill2Short=To bill
 StatusOrderApprovedShort=Approved
diff --git a/htdocs/langs/ka_GE/products.lang b/htdocs/langs/ka_GE/products.lang
index 5118e77c22b..27e8130e762 100644
--- a/htdocs/langs/ka_GE/products.lang
+++ b/htdocs/langs/ka_GE/products.lang
@@ -45,10 +45,6 @@ LastProducts=Last products
 CardProduct0=Product card
 CardProduct1=Service card
 CardContract=Contract card
-Warehouse=Warehouse
-Warehouses=Warehouses
-WarehouseOpened=Warehouse open
-WarehouseClosed=Warehouse closed
 Stock=Stock
 Stocks=Stocks
 Movement=Movement
@@ -318,3 +314,11 @@ WarningSelectOneDocument=Please select at least one document
 DefaultUnitToShow=Unit
 NbOfQtyInProposals=Qty in proposals
 ClinkOnALinkOfColumn=Click on a link of column %s to get a detailed view...
+TranslatedLabel=Translated label
+TranslatedDescription=Translated description
+TranslatedNote=Translated notes
+ProductWeight=Weight for 1 product
+ProductVolume=Volume for 1 product
+WeightUnits=Weight unit
+VolumeUnits=Volume unit
+SizeUnits=Size unit
diff --git a/htdocs/langs/ka_GE/projects.lang b/htdocs/langs/ka_GE/projects.lang
index 59f4ec5af51..b4a21befd80 100644
--- a/htdocs/langs/ka_GE/projects.lang
+++ b/htdocs/langs/ka_GE/projects.lang
@@ -74,6 +74,9 @@ Progress=Progress
 ProgressDeclared=Declared progress
 ProgressCalculated=Calculated progress
 Time=Time
+ListOfTasks=List of tasks
+GoToListOfTimeConsumed=Go to list of time consumed
+GoToListOfTasks=Go to list of tasks
 ListProposalsAssociatedProject=List of the commercial proposals associated with the project
 ListOrdersAssociatedProject=List of customer's orders associated with the project
 ListInvoicesAssociatedProject=List of customer's invoices associated with the project
@@ -198,3 +201,4 @@ OppStatusNEGO=Negociation
 OppStatusPENDING=Pending
 OppStatusWIN=Won
 OppStatusLOST=Lost
+Budget=Budget
diff --git a/htdocs/langs/ka_GE/sendings.lang b/htdocs/langs/ka_GE/sendings.lang
index fb7b9c08868..97f57e1d3c7 100644
--- a/htdocs/langs/ka_GE/sendings.lang
+++ b/htdocs/langs/ka_GE/sendings.lang
@@ -70,6 +70,8 @@ ProductQtyInSuppliersOrdersRunning=Product quantity into opened suppliers orders
 ProductQtyInShipmentAlreadySent=Product quantity from opened customer order already sent
 ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from opened supplier order already received
 NoProductToShipFoundIntoStock=No product to ship found into warehouse <b>%s</b>. Correct stock or go back to choose another warehouse.
+WeightVolShort=Weight/Vol.
+ValidateOrderFirstBeforeShipment=You must first validate the order before being able to make shipments.
 
 # Sending methods
 SendingMethodCATCH=Catch by customer
diff --git a/htdocs/langs/ka_GE/supplier_proposal.lang b/htdocs/langs/ka_GE/supplier_proposal.lang
index 1a1bdc4df16..e37ced1b38f 100644
--- a/htdocs/langs/ka_GE/supplier_proposal.lang
+++ b/htdocs/langs/ka_GE/supplier_proposal.lang
@@ -58,3 +58,5 @@ DefaultModelSupplierProposalCreate=Default model creation
 DefaultModelSupplierProposalToBill=Default template when closing a price request (accepted)
 DefaultModelSupplierProposalClosed=Default template when closing a price request (refused)
 ListOfSupplierProposal=List of supplier proposal requests
+SupplierProposalsToClose=Supplier proposals to close
+SupplierProposalsToProcess=Supplier proposals to process
diff --git a/htdocs/langs/kn_IN/admin.lang b/htdocs/langs/kn_IN/admin.lang
index deca56bf2c1..c83ce1dba12 100644
--- a/htdocs/langs/kn_IN/admin.lang
+++ b/htdocs/langs/kn_IN/admin.lang
@@ -282,6 +282,7 @@ ModuleSetup=Module setup
 ModulesSetup=Modules setup
 ModuleFamilyBase=System
 ModuleFamilyCrm=Customer Relation Management (CRM)
+ModuleFamilySrm=Supplier Relation Management (SRM)
 ModuleFamilyProducts=Products Management (PM)
 ModuleFamilyHr=Human Resource Management (HR)
 ModuleFamilyProjects=Projects/Collaborative work
@@ -587,6 +588,7 @@ Permission38=Export products
 Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
 Permission42=Create/modify projects (shared project and projects i'm contact for)
 Permission44=Delete projects (shared project and projects i'm contact for)
+Permission45=Export projects
 Permission61=Read interventions
 Permission62=Create/modify interventions
 Permission64=Delete interventions
@@ -640,6 +642,7 @@ Permission162=Create/modify contracts/subscriptions
 Permission163=Activate a service/subscription of a contract
 Permission164=Disable a service/subscription of a contract
 Permission165=Delete contracts/subscriptions
+Permission167=Export contracts
 Permission171=Read trips and expenses (yours and your subordinates)
 Permission172=Create/modify trips and expenses
 Permission173=Delete trips and expenses
@@ -788,6 +791,7 @@ Permission2403=Delete actions (events or tasks) linked to his account
 Permission2411=Read actions (events or tasks) of others
 Permission2412=Create/modify actions (events or tasks) of others
 Permission2413=Delete actions (events or tasks) of others
+Permission2414=Export actions/tasks of others
 Permission2501=Read/Download documents
 Permission2502=Download documents
 Permission2503=Submit or delete documents
@@ -1713,3 +1717,4 @@ ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s is available. Ve
 MultiPriceRuleDesc=When option "Several level of prices per product/service" is on, you can define different prices (one per price level) for each product. To save you time, you can enter here rule to have price for each level autocalculated according to price of first level, so you will have to enter only price for first level on each product. This page is here to save you time and can be usefull only if your prices for each leve are relative to first level. You can ignore this page in most cases.
 ModelModulesProduct=Templates for product documents
 ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
+SeeSubstitutionVars=See * note for list of possible substitution variables
diff --git a/htdocs/langs/kn_IN/bills.lang b/htdocs/langs/kn_IN/bills.lang
index e67ad0ade2d..790a146ee98 100644
--- a/htdocs/langs/kn_IN/bills.lang
+++ b/htdocs/langs/kn_IN/bills.lang
@@ -219,6 +219,7 @@ RemainderToBill=Remainder to bill
 SendBillByMail=Send invoice by email
 SendReminderBillByMail=Send reminder by email
 RelatedCommercialProposals=Related commercial proposals
+RelatedRecurringCustomerInvoices=Related recurring customer invoices
 MenuToValid=To valid
 DateMaxPayment=Payment due before
 DateEcheance=Due date limit
@@ -319,7 +320,6 @@ toolTipFrequency=Examples:<br /><b>Set 7 / day</b>: give a new invoice every 7 d
 NextDateToExecution=Date for next invoice generation
 DateLastGeneration=Date of last generation
 MaxPeriodNumber=Max nb of invoice generation
-RestPeriodNumber=Rest period number
 NbOfGenerationDone=Nb of invoice generation already done
 InvoiceAutoValidate=Automatically validate invoice
 GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
@@ -471,3 +471,7 @@ PDFCrevetteSituationInvoiceLine=Situation N°%s : Inv. N°%s on %s
 TotalSituationInvoice=Total situation
 invoiceLineProgressError=Invoice line progress can't be egal or upper the next invoice line
 updatePriceNextInvoiceErrorUpdateline=Error : update price on invoice line : %s
+ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
+ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
+ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
+
diff --git a/htdocs/langs/kn_IN/boxes.lang b/htdocs/langs/kn_IN/boxes.lang
index 57bfc174ec5..7619a335b61 100644
--- a/htdocs/langs/kn_IN/boxes.lang
+++ b/htdocs/langs/kn_IN/boxes.lang
@@ -60,8 +60,8 @@ BoxTitleLastContracts=Last %s contracts
 BoxTitleLastModifiedDonations=Last %s modified donations
 BoxTitleLastModifiedExpenses=Last %s modified expense reports
 BoxGlobalActivity=Global activity (invoices, proposals, orders)
-BoxGoodCustomers=Good Customers
-BoxTitleGoodCustomers=%s Good Customers
+BoxGoodCustomers=Good customers
+BoxTitleGoodCustomers=%s Good customers
 FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Last successfull refresh date: %s
 LastRefreshDate=Last refresh date
 NoRecordedBookmarks=No bookmarks defined.
diff --git a/htdocs/langs/kn_IN/companies.lang b/htdocs/langs/kn_IN/companies.lang
index 0a85c176b11..d44185aea90 100644
--- a/htdocs/langs/kn_IN/companies.lang
+++ b/htdocs/langs/kn_IN/companies.lang
@@ -202,7 +202,7 @@ ProfId3IN=ವೃತ್ತಿಪರ ಗುರುತಿನ ಸಂಖ್ಯೆ 3 (S
 ProfId4IN=Prof Id 4
 ProfId5IN=Prof Id 5
 ProfId6IN=-
-ProfId1LU=Id. prof. 1 (RCS)
+ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
 ProfId2LU=Id. prof. 2 (Business permit)
 ProfId3LU=-
 ProfId4LU=-
@@ -317,10 +317,12 @@ ShowContact=ಸಂಪರ್ಕವನ್ನು ತೋರಿಸಿ
 ContactsAllShort=ಎಲ್ಲಾ (ಸೋಸಿಲ್ಲದ)
 ContactType=ಸಂಪರ್ಕದ ಮಾದರಿ
 ContactForOrders=ಆರ್ಡರ್ ಸಂಪರ್ಕ
+ContactForOrdersOrShipments=Order's or shipment's contact
 ContactForProposals=ಪ್ರಸ್ತಾಪದ ಸಂಪರ್ಕ
 ContactForContracts=ಗುತ್ತಿಗೆಯ ಸಂಪರ್ಕ
 ContactForInvoices=ಸರಕುಪಟ್ಟಿ ಸಂಪರ್ಕ
 NoContactForAnyOrder=ಈ ಸಂಪರ್ಕ ಯಾವುದೇ ಆರ್ಡರ್-ಗಾಗಿ ಅಲ್ಲ.
+NoContactForAnyOrderOrShipment=This contact is not a contact for any order or shipment
 NoContactForAnyProposal=ಈ ಸಂಪರ್ಕ ಯಾವುದೇ ವಾಣಿಜ್ಯ ಪ್ರಸ್ತಾವನೆಗಾಗಿ ಅಲ್ಲ.
 NoContactForAnyContract=ಈ ಸಂಪರ್ಕ ಯಾವುದೇ ಗುತ್ತಿಗೆಯಗಾಗಿ ಅಲ್ಲ.
 NoContactForAnyInvoice=ಈ ಸಂಪರ್ಕ ಯಾವುದೇ ಸರಕುಪಟ್ಟಿಗಾಗಿ ಅಲ್ಲ.
@@ -438,3 +440,6 @@ MergeThirdparties=Merge third parties
 ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one ? All linked objects (invoices, orders, ...) will be moved to current third party so you will be able to delete the duplicate one.
 ThirdpartiesMergeSuccess=Thirdparties have been merged
 ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
+SaleRepresentativeLogin=Login of sale representative
+SaleRepresentativeFirstname=Firstname of sale representative
+SaleRepresentativeLastname=Lastname of sale representative
diff --git a/htdocs/langs/kn_IN/errors.lang b/htdocs/langs/kn_IN/errors.lang
index 718b3e8413f..fa7804ce355 100644
--- a/htdocs/langs/kn_IN/errors.lang
+++ b/htdocs/langs/kn_IN/errors.lang
@@ -172,6 +172,8 @@ ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
 ErrorOppStatusRequiredIfAmount=You set an estimated amount for this opportunity/lead. So you must also enter its status
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
 ErrorSavingChanges=An error has ocurred when saving the changes
+ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
+ErrorFileMustHaveFormat=File must have format %s
 
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
diff --git a/htdocs/langs/kn_IN/exports.lang b/htdocs/langs/kn_IN/exports.lang
index 03c87b28bcf..1a490ea647d 100644
--- a/htdocs/langs/kn_IN/exports.lang
+++ b/htdocs/langs/kn_IN/exports.lang
@@ -128,6 +128,10 @@ SpecialCode=Special code
 ExportStringFilter=%% allows replacing one or more characters in the text
 ExportDateFilter=YYYY, YYYYMM, YYYYMMDD : filters by one year/month/day<br>YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD : filters over a range of years/months/days<br> > YYYY, > YYYYMM, > YYYYMMDD : filters on all following years/months/days<br> < YYYY, < YYYYMM, < YYYYMMDD : filters on all previous years/months/days
 ExportNumericFilter='NNNNN' filters by one value<br>'NNNNN+NNNNN' filters over a range of values<br>'&gt;NNNNN' filters by lower values<br>'&gt;NNNNN' filters by higher values
+ImportFromLine=Import starting from line number
+EndAtLineNb=End at line number
+SetThisValueTo2ToExcludeFirstLine=For example, set this value to 3 to exclude the 2 first lines
+KeepEmptyToGoToEndOfFile=Keep this field empty to go up to the end of file
 ## filters
 SelectFilterFields=If you want to filter on some values, just input values here.
 FilterableFields=Filterable Fields
diff --git a/htdocs/langs/kn_IN/main.lang b/htdocs/langs/kn_IN/main.lang
index abc26865694..3bead553dd0 100644
--- a/htdocs/langs/kn_IN/main.lang
+++ b/htdocs/langs/kn_IN/main.lang
@@ -25,6 +25,7 @@ FormatDateHourTextShort=%b %d, %Y, %I:%M %p
 FormatDateHourText=%B %d, %Y, %I:%M %p
 DatabaseConnection=Database connection
 NoTemplateDefined=No template defined for this email type
+AvailableVariables=Available substitution variables
 NoTranslation=No translation
 NoRecordFound=No record found
 NoError=No error
diff --git a/htdocs/langs/kn_IN/orders.lang b/htdocs/langs/kn_IN/orders.lang
index c0bfc3ccce3..33cd265b07f 100644
--- a/htdocs/langs/kn_IN/orders.lang
+++ b/htdocs/langs/kn_IN/orders.lang
@@ -32,6 +32,7 @@ StatusOrderSent=Shipment in process
 StatusOrderOnProcessShort=Ordered
 StatusOrderProcessedShort=Processed
 StatusOrderDelivered=Delivered
+StatusOrderDeliveredShort=Delivered
 StatusOrderToBillShort=Delivered
 StatusOrderToBill2Short=To bill
 StatusOrderApprovedShort=Approved
diff --git a/htdocs/langs/kn_IN/products.lang b/htdocs/langs/kn_IN/products.lang
index 5118e77c22b..27e8130e762 100644
--- a/htdocs/langs/kn_IN/products.lang
+++ b/htdocs/langs/kn_IN/products.lang
@@ -45,10 +45,6 @@ LastProducts=Last products
 CardProduct0=Product card
 CardProduct1=Service card
 CardContract=Contract card
-Warehouse=Warehouse
-Warehouses=Warehouses
-WarehouseOpened=Warehouse open
-WarehouseClosed=Warehouse closed
 Stock=Stock
 Stocks=Stocks
 Movement=Movement
@@ -318,3 +314,11 @@ WarningSelectOneDocument=Please select at least one document
 DefaultUnitToShow=Unit
 NbOfQtyInProposals=Qty in proposals
 ClinkOnALinkOfColumn=Click on a link of column %s to get a detailed view...
+TranslatedLabel=Translated label
+TranslatedDescription=Translated description
+TranslatedNote=Translated notes
+ProductWeight=Weight for 1 product
+ProductVolume=Volume for 1 product
+WeightUnits=Weight unit
+VolumeUnits=Volume unit
+SizeUnits=Size unit
diff --git a/htdocs/langs/kn_IN/projects.lang b/htdocs/langs/kn_IN/projects.lang
index 59f4ec5af51..b4a21befd80 100644
--- a/htdocs/langs/kn_IN/projects.lang
+++ b/htdocs/langs/kn_IN/projects.lang
@@ -74,6 +74,9 @@ Progress=Progress
 ProgressDeclared=Declared progress
 ProgressCalculated=Calculated progress
 Time=Time
+ListOfTasks=List of tasks
+GoToListOfTimeConsumed=Go to list of time consumed
+GoToListOfTasks=Go to list of tasks
 ListProposalsAssociatedProject=List of the commercial proposals associated with the project
 ListOrdersAssociatedProject=List of customer's orders associated with the project
 ListInvoicesAssociatedProject=List of customer's invoices associated with the project
@@ -198,3 +201,4 @@ OppStatusNEGO=Negociation
 OppStatusPENDING=Pending
 OppStatusWIN=Won
 OppStatusLOST=Lost
+Budget=Budget
diff --git a/htdocs/langs/kn_IN/sendings.lang b/htdocs/langs/kn_IN/sendings.lang
index fb7b9c08868..97f57e1d3c7 100644
--- a/htdocs/langs/kn_IN/sendings.lang
+++ b/htdocs/langs/kn_IN/sendings.lang
@@ -70,6 +70,8 @@ ProductQtyInSuppliersOrdersRunning=Product quantity into opened suppliers orders
 ProductQtyInShipmentAlreadySent=Product quantity from opened customer order already sent
 ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from opened supplier order already received
 NoProductToShipFoundIntoStock=No product to ship found into warehouse <b>%s</b>. Correct stock or go back to choose another warehouse.
+WeightVolShort=Weight/Vol.
+ValidateOrderFirstBeforeShipment=You must first validate the order before being able to make shipments.
 
 # Sending methods
 SendingMethodCATCH=Catch by customer
diff --git a/htdocs/langs/kn_IN/supplier_proposal.lang b/htdocs/langs/kn_IN/supplier_proposal.lang
index 1a1bdc4df16..e37ced1b38f 100644
--- a/htdocs/langs/kn_IN/supplier_proposal.lang
+++ b/htdocs/langs/kn_IN/supplier_proposal.lang
@@ -58,3 +58,5 @@ DefaultModelSupplierProposalCreate=Default model creation
 DefaultModelSupplierProposalToBill=Default template when closing a price request (accepted)
 DefaultModelSupplierProposalClosed=Default template when closing a price request (refused)
 ListOfSupplierProposal=List of supplier proposal requests
+SupplierProposalsToClose=Supplier proposals to close
+SupplierProposalsToProcess=Supplier proposals to process
diff --git a/htdocs/langs/ko_KR/admin.lang b/htdocs/langs/ko_KR/admin.lang
index 08e2d715e21..930f02ac2d0 100644
--- a/htdocs/langs/ko_KR/admin.lang
+++ b/htdocs/langs/ko_KR/admin.lang
@@ -282,6 +282,7 @@ ModuleSetup=Module setup
 ModulesSetup=Modules setup
 ModuleFamilyBase=System
 ModuleFamilyCrm=Customer Relation Management (CRM)
+ModuleFamilySrm=Supplier Relation Management (SRM)
 ModuleFamilyProducts=Products Management (PM)
 ModuleFamilyHr=Human Resource Management (HR)
 ModuleFamilyProjects=Projects/Collaborative work
@@ -587,6 +588,7 @@ Permission38=Export products
 Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
 Permission42=Create/modify projects (shared project and projects i'm contact for)
 Permission44=Delete projects (shared project and projects i'm contact for)
+Permission45=Export projects
 Permission61=Read interventions
 Permission62=Create/modify interventions
 Permission64=Delete interventions
@@ -640,6 +642,7 @@ Permission162=Create/modify contracts/subscriptions
 Permission163=Activate a service/subscription of a contract
 Permission164=Disable a service/subscription of a contract
 Permission165=Delete contracts/subscriptions
+Permission167=Export contracts
 Permission171=Read trips and expenses (yours and your subordinates)
 Permission172=Create/modify trips and expenses
 Permission173=Delete trips and expenses
@@ -788,6 +791,7 @@ Permission2403=Delete actions (events or tasks) linked to his account
 Permission2411=Read actions (events or tasks) of others
 Permission2412=Create/modify actions (events or tasks) of others
 Permission2413=Delete actions (events or tasks) of others
+Permission2414=Export actions/tasks of others
 Permission2501=Read/Download documents
 Permission2502=Download documents
 Permission2503=Submit or delete documents
@@ -1713,3 +1717,4 @@ ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s is available. Ve
 MultiPriceRuleDesc=When option "Several level of prices per product/service" is on, you can define different prices (one per price level) for each product. To save you time, you can enter here rule to have price for each level autocalculated according to price of first level, so you will have to enter only price for first level on each product. This page is here to save you time and can be usefull only if your prices for each leve are relative to first level. You can ignore this page in most cases.
 ModelModulesProduct=Templates for product documents
 ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
+SeeSubstitutionVars=See * note for list of possible substitution variables
diff --git a/htdocs/langs/ko_KR/bills.lang b/htdocs/langs/ko_KR/bills.lang
index e67ad0ade2d..790a146ee98 100644
--- a/htdocs/langs/ko_KR/bills.lang
+++ b/htdocs/langs/ko_KR/bills.lang
@@ -219,6 +219,7 @@ RemainderToBill=Remainder to bill
 SendBillByMail=Send invoice by email
 SendReminderBillByMail=Send reminder by email
 RelatedCommercialProposals=Related commercial proposals
+RelatedRecurringCustomerInvoices=Related recurring customer invoices
 MenuToValid=To valid
 DateMaxPayment=Payment due before
 DateEcheance=Due date limit
@@ -319,7 +320,6 @@ toolTipFrequency=Examples:<br /><b>Set 7 / day</b>: give a new invoice every 7 d
 NextDateToExecution=Date for next invoice generation
 DateLastGeneration=Date of last generation
 MaxPeriodNumber=Max nb of invoice generation
-RestPeriodNumber=Rest period number
 NbOfGenerationDone=Nb of invoice generation already done
 InvoiceAutoValidate=Automatically validate invoice
 GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
@@ -471,3 +471,7 @@ PDFCrevetteSituationInvoiceLine=Situation N°%s : Inv. N°%s on %s
 TotalSituationInvoice=Total situation
 invoiceLineProgressError=Invoice line progress can't be egal or upper the next invoice line
 updatePriceNextInvoiceErrorUpdateline=Error : update price on invoice line : %s
+ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
+ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
+ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
+
diff --git a/htdocs/langs/ko_KR/boxes.lang b/htdocs/langs/ko_KR/boxes.lang
index 57bfc174ec5..7619a335b61 100644
--- a/htdocs/langs/ko_KR/boxes.lang
+++ b/htdocs/langs/ko_KR/boxes.lang
@@ -60,8 +60,8 @@ BoxTitleLastContracts=Last %s contracts
 BoxTitleLastModifiedDonations=Last %s modified donations
 BoxTitleLastModifiedExpenses=Last %s modified expense reports
 BoxGlobalActivity=Global activity (invoices, proposals, orders)
-BoxGoodCustomers=Good Customers
-BoxTitleGoodCustomers=%s Good Customers
+BoxGoodCustomers=Good customers
+BoxTitleGoodCustomers=%s Good customers
 FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Last successfull refresh date: %s
 LastRefreshDate=Last refresh date
 NoRecordedBookmarks=No bookmarks defined.
diff --git a/htdocs/langs/ko_KR/companies.lang b/htdocs/langs/ko_KR/companies.lang
index 588867b1f2f..fe967d3252f 100644
--- a/htdocs/langs/ko_KR/companies.lang
+++ b/htdocs/langs/ko_KR/companies.lang
@@ -202,7 +202,7 @@ ProfId3IN=Prof Id 3 (SRVC TAX)
 ProfId4IN=Prof Id 4
 ProfId5IN=Prof Id 5
 ProfId6IN=-
-ProfId1LU=Id. prof. 1 (RCS)
+ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
 ProfId2LU=Id. prof. 2 (Business permit)
 ProfId3LU=-
 ProfId4LU=-
@@ -317,10 +317,12 @@ ShowContact=Show contact
 ContactsAllShort=All (No filter)
 ContactType=Contact type
 ContactForOrders=Order's contact
+ContactForOrdersOrShipments=Order's or shipment's contact
 ContactForProposals=Proposal's contact
 ContactForContracts=Contract's contact
 ContactForInvoices=Invoice's contact
 NoContactForAnyOrder=This contact is not a contact for any order
+NoContactForAnyOrderOrShipment=This contact is not a contact for any order or shipment
 NoContactForAnyProposal=This contact is not a contact for any commercial proposal
 NoContactForAnyContract=This contact is not a contact for any contract
 NoContactForAnyInvoice=This contact is not a contact for any invoice
@@ -438,3 +440,6 @@ MergeThirdparties=Merge third parties
 ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one ? All linked objects (invoices, orders, ...) will be moved to current third party so you will be able to delete the duplicate one.
 ThirdpartiesMergeSuccess=Thirdparties have been merged
 ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
+SaleRepresentativeLogin=Login of sale representative
+SaleRepresentativeFirstname=Firstname of sale representative
+SaleRepresentativeLastname=Lastname of sale representative
diff --git a/htdocs/langs/ko_KR/errors.lang b/htdocs/langs/ko_KR/errors.lang
index 718b3e8413f..fa7804ce355 100644
--- a/htdocs/langs/ko_KR/errors.lang
+++ b/htdocs/langs/ko_KR/errors.lang
@@ -172,6 +172,8 @@ ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
 ErrorOppStatusRequiredIfAmount=You set an estimated amount for this opportunity/lead. So you must also enter its status
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
 ErrorSavingChanges=An error has ocurred when saving the changes
+ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
+ErrorFileMustHaveFormat=File must have format %s
 
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
diff --git a/htdocs/langs/ko_KR/exports.lang b/htdocs/langs/ko_KR/exports.lang
index dc65c3f39ae..ce410be837d 100644
--- a/htdocs/langs/ko_KR/exports.lang
+++ b/htdocs/langs/ko_KR/exports.lang
@@ -128,6 +128,10 @@ SpecialCode=Special code
 ExportStringFilter=%% allows replacing one or more characters in the text
 ExportDateFilter=YYYY, YYYYMM, YYYYMMDD : filters by one year/month/day<br>YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD : filters over a range of years/months/days<br> > YYYY, > YYYYMM, > YYYYMMDD : filters on all following years/months/days<br> < YYYY, < YYYYMM, < YYYYMMDD : filters on all previous years/months/days
 ExportNumericFilter='NNNNN' filters by one value<br>'NNNNN+NNNNN' filters over a range of values<br>'&gt;NNNNN' filters by lower values<br>'&gt;NNNNN' filters by higher values
+ImportFromLine=Import starting from line number
+EndAtLineNb=End at line number
+SetThisValueTo2ToExcludeFirstLine=For example, set this value to 3 to exclude the 2 first lines
+KeepEmptyToGoToEndOfFile=Keep this field empty to go up to the end of file
 ## filters
 SelectFilterFields=If you want to filter on some values, just input values here.
 FilterableFields=Filterable Fields
diff --git a/htdocs/langs/ko_KR/main.lang b/htdocs/langs/ko_KR/main.lang
index d5306246da3..de0aa6eefc1 100644
--- a/htdocs/langs/ko_KR/main.lang
+++ b/htdocs/langs/ko_KR/main.lang
@@ -25,6 +25,7 @@ FormatDateHourTextShort=%b %d, %Y, %I:%M %p
 FormatDateHourText=%B %d, %Y, %I:%M %p
 DatabaseConnection=데이타베이스 연결
 NoTemplateDefined=No template defined for this email type
+AvailableVariables=Available substitution variables
 NoTranslation=번역 없음
 NoRecordFound=No record found
 NoError=오류 없음
diff --git a/htdocs/langs/ko_KR/orders.lang b/htdocs/langs/ko_KR/orders.lang
index c0bfc3ccce3..33cd265b07f 100644
--- a/htdocs/langs/ko_KR/orders.lang
+++ b/htdocs/langs/ko_KR/orders.lang
@@ -32,6 +32,7 @@ StatusOrderSent=Shipment in process
 StatusOrderOnProcessShort=Ordered
 StatusOrderProcessedShort=Processed
 StatusOrderDelivered=Delivered
+StatusOrderDeliveredShort=Delivered
 StatusOrderToBillShort=Delivered
 StatusOrderToBill2Short=To bill
 StatusOrderApprovedShort=Approved
diff --git a/htdocs/langs/ko_KR/products.lang b/htdocs/langs/ko_KR/products.lang
index 5118e77c22b..27e8130e762 100644
--- a/htdocs/langs/ko_KR/products.lang
+++ b/htdocs/langs/ko_KR/products.lang
@@ -45,10 +45,6 @@ LastProducts=Last products
 CardProduct0=Product card
 CardProduct1=Service card
 CardContract=Contract card
-Warehouse=Warehouse
-Warehouses=Warehouses
-WarehouseOpened=Warehouse open
-WarehouseClosed=Warehouse closed
 Stock=Stock
 Stocks=Stocks
 Movement=Movement
@@ -318,3 +314,11 @@ WarningSelectOneDocument=Please select at least one document
 DefaultUnitToShow=Unit
 NbOfQtyInProposals=Qty in proposals
 ClinkOnALinkOfColumn=Click on a link of column %s to get a detailed view...
+TranslatedLabel=Translated label
+TranslatedDescription=Translated description
+TranslatedNote=Translated notes
+ProductWeight=Weight for 1 product
+ProductVolume=Volume for 1 product
+WeightUnits=Weight unit
+VolumeUnits=Volume unit
+SizeUnits=Size unit
diff --git a/htdocs/langs/ko_KR/projects.lang b/htdocs/langs/ko_KR/projects.lang
index 59f4ec5af51..b4a21befd80 100644
--- a/htdocs/langs/ko_KR/projects.lang
+++ b/htdocs/langs/ko_KR/projects.lang
@@ -74,6 +74,9 @@ Progress=Progress
 ProgressDeclared=Declared progress
 ProgressCalculated=Calculated progress
 Time=Time
+ListOfTasks=List of tasks
+GoToListOfTimeConsumed=Go to list of time consumed
+GoToListOfTasks=Go to list of tasks
 ListProposalsAssociatedProject=List of the commercial proposals associated with the project
 ListOrdersAssociatedProject=List of customer's orders associated with the project
 ListInvoicesAssociatedProject=List of customer's invoices associated with the project
@@ -198,3 +201,4 @@ OppStatusNEGO=Negociation
 OppStatusPENDING=Pending
 OppStatusWIN=Won
 OppStatusLOST=Lost
+Budget=Budget
diff --git a/htdocs/langs/ko_KR/sendings.lang b/htdocs/langs/ko_KR/sendings.lang
index fb7b9c08868..97f57e1d3c7 100644
--- a/htdocs/langs/ko_KR/sendings.lang
+++ b/htdocs/langs/ko_KR/sendings.lang
@@ -70,6 +70,8 @@ ProductQtyInSuppliersOrdersRunning=Product quantity into opened suppliers orders
 ProductQtyInShipmentAlreadySent=Product quantity from opened customer order already sent
 ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from opened supplier order already received
 NoProductToShipFoundIntoStock=No product to ship found into warehouse <b>%s</b>. Correct stock or go back to choose another warehouse.
+WeightVolShort=Weight/Vol.
+ValidateOrderFirstBeforeShipment=You must first validate the order before being able to make shipments.
 
 # Sending methods
 SendingMethodCATCH=Catch by customer
diff --git a/htdocs/langs/ko_KR/supplier_proposal.lang b/htdocs/langs/ko_KR/supplier_proposal.lang
index 1a1bdc4df16..e37ced1b38f 100644
--- a/htdocs/langs/ko_KR/supplier_proposal.lang
+++ b/htdocs/langs/ko_KR/supplier_proposal.lang
@@ -58,3 +58,5 @@ DefaultModelSupplierProposalCreate=Default model creation
 DefaultModelSupplierProposalToBill=Default template when closing a price request (accepted)
 DefaultModelSupplierProposalClosed=Default template when closing a price request (refused)
 ListOfSupplierProposal=List of supplier proposal requests
+SupplierProposalsToClose=Supplier proposals to close
+SupplierProposalsToProcess=Supplier proposals to process
diff --git a/htdocs/langs/lo_LA/admin.lang b/htdocs/langs/lo_LA/admin.lang
index e550446a5b7..f5ae4608c89 100644
--- a/htdocs/langs/lo_LA/admin.lang
+++ b/htdocs/langs/lo_LA/admin.lang
@@ -282,6 +282,7 @@ ModuleSetup=Module setup
 ModulesSetup=Modules setup
 ModuleFamilyBase=System
 ModuleFamilyCrm=Customer Relation Management (CRM)
+ModuleFamilySrm=Supplier Relation Management (SRM)
 ModuleFamilyProducts=Products Management (PM)
 ModuleFamilyHr=Human Resource Management (HR)
 ModuleFamilyProjects=Projects/Collaborative work
@@ -587,6 +588,7 @@ Permission38=Export products
 Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
 Permission42=Create/modify projects (shared project and projects i'm contact for)
 Permission44=Delete projects (shared project and projects i'm contact for)
+Permission45=Export projects
 Permission61=Read interventions
 Permission62=Create/modify interventions
 Permission64=Delete interventions
@@ -640,6 +642,7 @@ Permission162=Create/modify contracts/subscriptions
 Permission163=Activate a service/subscription of a contract
 Permission164=Disable a service/subscription of a contract
 Permission165=Delete contracts/subscriptions
+Permission167=Export contracts
 Permission171=Read trips and expenses (yours and your subordinates)
 Permission172=Create/modify trips and expenses
 Permission173=Delete trips and expenses
@@ -788,6 +791,7 @@ Permission2403=Delete actions (events or tasks) linked to his account
 Permission2411=Read actions (events or tasks) of others
 Permission2412=Create/modify actions (events or tasks) of others
 Permission2413=Delete actions (events or tasks) of others
+Permission2414=Export actions/tasks of others
 Permission2501=Read/Download documents
 Permission2502=Download documents
 Permission2503=Submit or delete documents
@@ -1713,3 +1717,4 @@ ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s is available. Ve
 MultiPriceRuleDesc=When option "Several level of prices per product/service" is on, you can define different prices (one per price level) for each product. To save you time, you can enter here rule to have price for each level autocalculated according to price of first level, so you will have to enter only price for first level on each product. This page is here to save you time and can be usefull only if your prices for each leve are relative to first level. You can ignore this page in most cases.
 ModelModulesProduct=Templates for product documents
 ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
+SeeSubstitutionVars=See * note for list of possible substitution variables
diff --git a/htdocs/langs/lo_LA/bills.lang b/htdocs/langs/lo_LA/bills.lang
index e67ad0ade2d..790a146ee98 100644
--- a/htdocs/langs/lo_LA/bills.lang
+++ b/htdocs/langs/lo_LA/bills.lang
@@ -219,6 +219,7 @@ RemainderToBill=Remainder to bill
 SendBillByMail=Send invoice by email
 SendReminderBillByMail=Send reminder by email
 RelatedCommercialProposals=Related commercial proposals
+RelatedRecurringCustomerInvoices=Related recurring customer invoices
 MenuToValid=To valid
 DateMaxPayment=Payment due before
 DateEcheance=Due date limit
@@ -319,7 +320,6 @@ toolTipFrequency=Examples:<br /><b>Set 7 / day</b>: give a new invoice every 7 d
 NextDateToExecution=Date for next invoice generation
 DateLastGeneration=Date of last generation
 MaxPeriodNumber=Max nb of invoice generation
-RestPeriodNumber=Rest period number
 NbOfGenerationDone=Nb of invoice generation already done
 InvoiceAutoValidate=Automatically validate invoice
 GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
@@ -471,3 +471,7 @@ PDFCrevetteSituationInvoiceLine=Situation N°%s : Inv. N°%s on %s
 TotalSituationInvoice=Total situation
 invoiceLineProgressError=Invoice line progress can't be egal or upper the next invoice line
 updatePriceNextInvoiceErrorUpdateline=Error : update price on invoice line : %s
+ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
+ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
+ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
+
diff --git a/htdocs/langs/lo_LA/boxes.lang b/htdocs/langs/lo_LA/boxes.lang
index 57bfc174ec5..7619a335b61 100644
--- a/htdocs/langs/lo_LA/boxes.lang
+++ b/htdocs/langs/lo_LA/boxes.lang
@@ -60,8 +60,8 @@ BoxTitleLastContracts=Last %s contracts
 BoxTitleLastModifiedDonations=Last %s modified donations
 BoxTitleLastModifiedExpenses=Last %s modified expense reports
 BoxGlobalActivity=Global activity (invoices, proposals, orders)
-BoxGoodCustomers=Good Customers
-BoxTitleGoodCustomers=%s Good Customers
+BoxGoodCustomers=Good customers
+BoxTitleGoodCustomers=%s Good customers
 FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Last successfull refresh date: %s
 LastRefreshDate=Last refresh date
 NoRecordedBookmarks=No bookmarks defined.
diff --git a/htdocs/langs/lo_LA/companies.lang b/htdocs/langs/lo_LA/companies.lang
index 588867b1f2f..fe967d3252f 100644
--- a/htdocs/langs/lo_LA/companies.lang
+++ b/htdocs/langs/lo_LA/companies.lang
@@ -202,7 +202,7 @@ ProfId3IN=Prof Id 3 (SRVC TAX)
 ProfId4IN=Prof Id 4
 ProfId5IN=Prof Id 5
 ProfId6IN=-
-ProfId1LU=Id. prof. 1 (RCS)
+ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
 ProfId2LU=Id. prof. 2 (Business permit)
 ProfId3LU=-
 ProfId4LU=-
@@ -317,10 +317,12 @@ ShowContact=Show contact
 ContactsAllShort=All (No filter)
 ContactType=Contact type
 ContactForOrders=Order's contact
+ContactForOrdersOrShipments=Order's or shipment's contact
 ContactForProposals=Proposal's contact
 ContactForContracts=Contract's contact
 ContactForInvoices=Invoice's contact
 NoContactForAnyOrder=This contact is not a contact for any order
+NoContactForAnyOrderOrShipment=This contact is not a contact for any order or shipment
 NoContactForAnyProposal=This contact is not a contact for any commercial proposal
 NoContactForAnyContract=This contact is not a contact for any contract
 NoContactForAnyInvoice=This contact is not a contact for any invoice
@@ -438,3 +440,6 @@ MergeThirdparties=Merge third parties
 ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one ? All linked objects (invoices, orders, ...) will be moved to current third party so you will be able to delete the duplicate one.
 ThirdpartiesMergeSuccess=Thirdparties have been merged
 ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
+SaleRepresentativeLogin=Login of sale representative
+SaleRepresentativeFirstname=Firstname of sale representative
+SaleRepresentativeLastname=Lastname of sale representative
diff --git a/htdocs/langs/lo_LA/errors.lang b/htdocs/langs/lo_LA/errors.lang
index 718b3e8413f..fa7804ce355 100644
--- a/htdocs/langs/lo_LA/errors.lang
+++ b/htdocs/langs/lo_LA/errors.lang
@@ -172,6 +172,8 @@ ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
 ErrorOppStatusRequiredIfAmount=You set an estimated amount for this opportunity/lead. So you must also enter its status
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
 ErrorSavingChanges=An error has ocurred when saving the changes
+ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
+ErrorFileMustHaveFormat=File must have format %s
 
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
diff --git a/htdocs/langs/lo_LA/exports.lang b/htdocs/langs/lo_LA/exports.lang
index 03c87b28bcf..1a490ea647d 100644
--- a/htdocs/langs/lo_LA/exports.lang
+++ b/htdocs/langs/lo_LA/exports.lang
@@ -128,6 +128,10 @@ SpecialCode=Special code
 ExportStringFilter=%% allows replacing one or more characters in the text
 ExportDateFilter=YYYY, YYYYMM, YYYYMMDD : filters by one year/month/day<br>YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD : filters over a range of years/months/days<br> > YYYY, > YYYYMM, > YYYYMMDD : filters on all following years/months/days<br> < YYYY, < YYYYMM, < YYYYMMDD : filters on all previous years/months/days
 ExportNumericFilter='NNNNN' filters by one value<br>'NNNNN+NNNNN' filters over a range of values<br>'&gt;NNNNN' filters by lower values<br>'&gt;NNNNN' filters by higher values
+ImportFromLine=Import starting from line number
+EndAtLineNb=End at line number
+SetThisValueTo2ToExcludeFirstLine=For example, set this value to 3 to exclude the 2 first lines
+KeepEmptyToGoToEndOfFile=Keep this field empty to go up to the end of file
 ## filters
 SelectFilterFields=If you want to filter on some values, just input values here.
 FilterableFields=Filterable Fields
diff --git a/htdocs/langs/lo_LA/main.lang b/htdocs/langs/lo_LA/main.lang
index fd68e63ae1c..09e5c515b48 100644
--- a/htdocs/langs/lo_LA/main.lang
+++ b/htdocs/langs/lo_LA/main.lang
@@ -25,6 +25,7 @@ FormatDateHourTextShort=%b %d, %Y, %I:%M %p
 FormatDateHourText=%B %d, %Y, %I:%M %p
 DatabaseConnection=Database connection
 NoTemplateDefined=No template defined for this email type
+AvailableVariables=Available substitution variables
 NoTranslation=No translation
 NoRecordFound=No record found
 NoError=No error
diff --git a/htdocs/langs/lo_LA/orders.lang b/htdocs/langs/lo_LA/orders.lang
index c0bfc3ccce3..33cd265b07f 100644
--- a/htdocs/langs/lo_LA/orders.lang
+++ b/htdocs/langs/lo_LA/orders.lang
@@ -32,6 +32,7 @@ StatusOrderSent=Shipment in process
 StatusOrderOnProcessShort=Ordered
 StatusOrderProcessedShort=Processed
 StatusOrderDelivered=Delivered
+StatusOrderDeliveredShort=Delivered
 StatusOrderToBillShort=Delivered
 StatusOrderToBill2Short=To bill
 StatusOrderApprovedShort=Approved
diff --git a/htdocs/langs/lo_LA/products.lang b/htdocs/langs/lo_LA/products.lang
index 3ba3e7dd3bf..e56f0f72117 100644
--- a/htdocs/langs/lo_LA/products.lang
+++ b/htdocs/langs/lo_LA/products.lang
@@ -45,10 +45,6 @@ LastProducts=Last products
 CardProduct0=Product card
 CardProduct1=Service card
 CardContract=Contract card
-Warehouse=Warehouse
-Warehouses=Warehouses
-WarehouseOpened=Warehouse open
-WarehouseClosed=Warehouse closed
 Stock=Stock
 Stocks=Stocks
 Movement=Movement
@@ -318,3 +314,11 @@ WarningSelectOneDocument=Please select at least one document
 DefaultUnitToShow=Unit
 NbOfQtyInProposals=Qty in proposals
 ClinkOnALinkOfColumn=Click on a link of column %s to get a detailed view...
+TranslatedLabel=Translated label
+TranslatedDescription=Translated description
+TranslatedNote=Translated notes
+ProductWeight=Weight for 1 product
+ProductVolume=Volume for 1 product
+WeightUnits=Weight unit
+VolumeUnits=Volume unit
+SizeUnits=Size unit
diff --git a/htdocs/langs/lo_LA/projects.lang b/htdocs/langs/lo_LA/projects.lang
index a0101882980..56cc02c9e82 100644
--- a/htdocs/langs/lo_LA/projects.lang
+++ b/htdocs/langs/lo_LA/projects.lang
@@ -74,6 +74,9 @@ Progress=Progress
 ProgressDeclared=Declared progress
 ProgressCalculated=Calculated progress
 Time=Time
+ListOfTasks=List of tasks
+GoToListOfTimeConsumed=Go to list of time consumed
+GoToListOfTasks=Go to list of tasks
 ListProposalsAssociatedProject=List of the commercial proposals associated with the project
 ListOrdersAssociatedProject=List of customer's orders associated with the project
 ListInvoicesAssociatedProject=List of customer's invoices associated with the project
@@ -198,3 +201,4 @@ OppStatusNEGO=Negociation
 OppStatusPENDING=Pending
 OppStatusWIN=Won
 OppStatusLOST=Lost
+Budget=Budget
diff --git a/htdocs/langs/lo_LA/sendings.lang b/htdocs/langs/lo_LA/sendings.lang
index fb7b9c08868..97f57e1d3c7 100644
--- a/htdocs/langs/lo_LA/sendings.lang
+++ b/htdocs/langs/lo_LA/sendings.lang
@@ -70,6 +70,8 @@ ProductQtyInSuppliersOrdersRunning=Product quantity into opened suppliers orders
 ProductQtyInShipmentAlreadySent=Product quantity from opened customer order already sent
 ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from opened supplier order already received
 NoProductToShipFoundIntoStock=No product to ship found into warehouse <b>%s</b>. Correct stock or go back to choose another warehouse.
+WeightVolShort=Weight/Vol.
+ValidateOrderFirstBeforeShipment=You must first validate the order before being able to make shipments.
 
 # Sending methods
 SendingMethodCATCH=Catch by customer
diff --git a/htdocs/langs/lo_LA/supplier_proposal.lang b/htdocs/langs/lo_LA/supplier_proposal.lang
index 1a1bdc4df16..e37ced1b38f 100644
--- a/htdocs/langs/lo_LA/supplier_proposal.lang
+++ b/htdocs/langs/lo_LA/supplier_proposal.lang
@@ -58,3 +58,5 @@ DefaultModelSupplierProposalCreate=Default model creation
 DefaultModelSupplierProposalToBill=Default template when closing a price request (accepted)
 DefaultModelSupplierProposalClosed=Default template when closing a price request (refused)
 ListOfSupplierProposal=List of supplier proposal requests
+SupplierProposalsToClose=Supplier proposals to close
+SupplierProposalsToProcess=Supplier proposals to process
diff --git a/htdocs/langs/lt_LT/admin.lang b/htdocs/langs/lt_LT/admin.lang
index e7e06c220eb..e6435ee2504 100644
--- a/htdocs/langs/lt_LT/admin.lang
+++ b/htdocs/langs/lt_LT/admin.lang
@@ -282,6 +282,7 @@ ModuleSetup=Modulio nuostatos
 ModulesSetup=Moduliai nuostatos
 ModuleFamilyBase=Sistema
 ModuleFamilyCrm=Ryšių su klientais valdymas (CRM)
+ModuleFamilySrm=Supplier Relation Management (SRM)
 ModuleFamilyProducts=Products Management (PM)
 ModuleFamilyHr=Human Resource Management (HR)
 ModuleFamilyProjects=Projektai/Bendradarbiavimas
@@ -587,6 +588,7 @@ Permission38=Eksportuoti produktus
 Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
 Permission42=Sukurti/keisti projektus (bendrus projektus ir projektus, apie kuriuos kalbama)
 Permission44=Ištrinti projektus (bendrus projektus ir projektus, apie kuriuos kalbama)
+Permission45=Export projects
 Permission61=Skaityti intervencijas
 Permission62=Sukurti/keisti intervencijas
 Permission64=Ištrinti intervencijas
@@ -640,6 +642,7 @@ Permission162=Sukurti / keisti sutartis / pasirašymus
 Permission163=Aktyvuoti sutarties aptarnavimą / pasirašymą
 Permission164=Išjungti sutarties aptarnavimą / pasirašymą
 Permission165=Panaikinti sutartis / pasirašymus
+Permission167=Export contracts
 Permission171=Read trips and expenses (yours and your subordinates)
 Permission172=sukurti / keisti komandiruotes ir išlaidas
 Permission173=Panaikinti komandiruotes ir išlaidas
@@ -788,6 +791,7 @@ Permission2403=Ištrinti veiksmus (įvykius ar užduotis), susijusius su jų są
 Permission2411=Skaityti kitų veiksmus (įvykius ar užduotis)
 Permission2412=Sukurti/keisti kitų veiksmus (įvykius ar užduotis)
 Permission2413=Ištrinti kitų veiksmus (įvykius ar užduotis)
+Permission2414=Export actions/tasks of others
 Permission2501=Skaityti/parsisiųsti dokumentus
 Permission2502=Parsisiųsti dokumentai
 Permission2503=Pateikti arba ištrinti dokumentus
@@ -1713,3 +1717,4 @@ ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s is available. Ve
 MultiPriceRuleDesc=When option "Several level of prices per product/service" is on, you can define different prices (one per price level) for each product. To save you time, you can enter here rule to have price for each level autocalculated according to price of first level, so you will have to enter only price for first level on each product. This page is here to save you time and can be usefull only if your prices for each leve are relative to first level. You can ignore this page in most cases.
 ModelModulesProduct=Templates for product documents
 ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
+SeeSubstitutionVars=See * note for list of possible substitution variables
diff --git a/htdocs/langs/lt_LT/bills.lang b/htdocs/langs/lt_LT/bills.lang
index 82a9dc81046..82105ec941d 100644
--- a/htdocs/langs/lt_LT/bills.lang
+++ b/htdocs/langs/lt_LT/bills.lang
@@ -219,6 +219,7 @@ RemainderToBill=Pateikti sąskatą likučiui
 SendBillByMail=Siųsti sąskaitą-faktūrą e-paštu
 SendReminderBillByMail=Siųsti priminimą e-paštu
 RelatedCommercialProposals=Susiję komerciniai pasiūlymai
+RelatedRecurringCustomerInvoices=Related recurring customer invoices
 MenuToValid=Įteisinti
 DateMaxPayment=Mokėjimas apmokėtinas prieš
 DateEcheance=Numatytas datos apribojimas
@@ -319,7 +320,6 @@ toolTipFrequency=Examples:<br /><b>Set 7 / day</b>: give a new invoice every 7 d
 NextDateToExecution=Date for next invoice generation
 DateLastGeneration=Date of last generation
 MaxPeriodNumber=Max nb of invoice generation
-RestPeriodNumber=Rest period number
 NbOfGenerationDone=Nb of invoice generation already done
 InvoiceAutoValidate=Automatically validate invoice
 GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
@@ -471,3 +471,7 @@ PDFCrevetteSituationInvoiceLine=Situation N°%s : Inv. N°%s on %s
 TotalSituationInvoice=Total situation
 invoiceLineProgressError=Invoice line progress can't be egal or upper the next invoice line
 updatePriceNextInvoiceErrorUpdateline=Error : update price on invoice line : %s
+ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
+ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
+ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
+
diff --git a/htdocs/langs/lt_LT/boxes.lang b/htdocs/langs/lt_LT/boxes.lang
index c89c364d27b..37fbc14bfb6 100644
--- a/htdocs/langs/lt_LT/boxes.lang
+++ b/htdocs/langs/lt_LT/boxes.lang
@@ -60,8 +60,8 @@ BoxTitleLastContracts=Paskutinės %s sutartys
 BoxTitleLastModifiedDonations=Paskutinės %s pakeistos aukos
 BoxTitleLastModifiedExpenses=Last %s modified expense reports
 BoxGlobalActivity=Visuminė veikla (sąskaitos-faktūros, pasiūlymai, užsakymai)
-BoxGoodCustomers=Good Customers
-BoxTitleGoodCustomers=%s Good Customers
+BoxGoodCustomers=Good customers
+BoxTitleGoodCustomers=%s Good customers
 FailedToRefreshDataInfoNotUpToDate=Nepavyko atnaujinti RSS srauto. Paskutinio sėkmingo atnaujinimo data: %s
 LastRefreshDate=Paskutinio atnaujinimo data
 NoRecordedBookmarks=Nėra apibrėžtų žymeklių
diff --git a/htdocs/langs/lt_LT/companies.lang b/htdocs/langs/lt_LT/companies.lang
index aab3c34277d..424156ac36e 100644
--- a/htdocs/langs/lt_LT/companies.lang
+++ b/htdocs/langs/lt_LT/companies.lang
@@ -202,7 +202,7 @@ ProfId3IN=Prof ID 3 (SRVC TAX)
 ProfId4IN=Prof ID 4
 ProfId5IN=Prof ID 5
 ProfId6IN=-
-ProfId1LU=Id. prof. 1 (RCS)
+ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
 ProfId2LU=Id. prof. 2 (Business permit)
 ProfId3LU=-
 ProfId4LU=-
@@ -317,10 +317,12 @@ ShowContact=Rodyti kontaktus
 ContactsAllShort=Visi (nėra filtro)
 ContactType=Kontakto tipas
 ContactForOrders=Užsakymo kontaktai
+ContactForOrdersOrShipments=Order's or shipment's contact
 ContactForProposals=Pasiūlymo kontaktai
 ContactForContracts=Sutarties kontaktai
 ContactForInvoices=Sąskaitos-faktūros kontaktai
 NoContactForAnyOrder=Šis kontaktas nėra kontaktas bet kuriam užsakymui
+NoContactForAnyOrderOrShipment=This contact is not a contact for any order or shipment
 NoContactForAnyProposal=Šis kontaktas nėra kontaktas bet kuriam komerciniam pasiūlymui
 NoContactForAnyContract=Šis kontaktas nėra kontaktas bet kuriai sutarčiai
 NoContactForAnyInvoice=Šis kontaktas nėra kontaktas bet kuriai sąskaitai-faktūrai
@@ -438,3 +440,6 @@ MergeThirdparties=Sujungti trečiąsias šalis
 ConfirmMergeThirdparties=Ar tikrai norite sujungti šią trečią šalį su dabartine ? Visi susiję objektai (sąskaitos faktūros, užsakymai, ...) bus perkelti į dabartinę trečiąją šalį, todėl jūs galėsite ištrinti pasikartojančius.
 ThirdpartiesMergeSuccess=Trečiosios šalys buvo sujungtos
 ErrorThirdpartiesMerge=Ištrinanat trečiąją šalį įvyko klaida. Prašome patikrinti žurnalą. Pakeitimai buvo panaikinti.
+SaleRepresentativeLogin=Login of sale representative
+SaleRepresentativeFirstname=Firstname of sale representative
+SaleRepresentativeLastname=Lastname of sale representative
diff --git a/htdocs/langs/lt_LT/errors.lang b/htdocs/langs/lt_LT/errors.lang
index 11af94c6978..25d550396fd 100644
--- a/htdocs/langs/lt_LT/errors.lang
+++ b/htdocs/langs/lt_LT/errors.lang
@@ -172,6 +172,8 @@ ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
 ErrorOppStatusRequiredIfAmount=You set an estimated amount for this opportunity/lead. So you must also enter its status
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
 ErrorSavingChanges=An error has ocurred when saving the changes
+ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
+ErrorFileMustHaveFormat=File must have format %s
 
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
diff --git a/htdocs/langs/lt_LT/exports.lang b/htdocs/langs/lt_LT/exports.lang
index 8a8689a75e2..6ef580f7835 100644
--- a/htdocs/langs/lt_LT/exports.lang
+++ b/htdocs/langs/lt_LT/exports.lang
@@ -128,6 +128,10 @@ SpecialCode=Specialusis kodas
 ExportStringFilter=%% leidžia pakeisti vieną ar daugiau simbolių tekste
 ExportDateFilter=YYYY, YYYYMM, YYYYMMDD : filtruoja paeiliui metai/mėnuo/diena<br>YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD : filtruoja diapazone metai/mėnesiai/dienos<br> > YYYY, > YYYYMM, > YYYYMMDD : filtruoja visus sekančius metai/mėnesiai/dienos<br> < YYYY, < YYYYMM, < YYYYMMDD : filtruoja visus ankstesnius metai/mėnesiai/dienos
 ExportNumericFilter='NNNNN' filtruos pagal vieną reikšmę<br>'NNNNN+NNNNN' filtruos diapazono reikšmes<br>'&gt;NNNNN' filtruos mažesnes reikšmes<br>'&gt;NNNNN' filtruos didesnes reikšmes.
+ImportFromLine=Import starting from line number
+EndAtLineNb=End at line number
+SetThisValueTo2ToExcludeFirstLine=For example, set this value to 3 to exclude the 2 first lines
+KeepEmptyToGoToEndOfFile=Keep this field empty to go up to the end of file
 ## filters
 SelectFilterFields=Jei norite filtruoti pagal kai kokias reikšmes, įveskite reikšmes čia.
 FilterableFields=Filterable Fields
diff --git a/htdocs/langs/lt_LT/main.lang b/htdocs/langs/lt_LT/main.lang
index e323530081d..e67e2fe0349 100644
--- a/htdocs/langs/lt_LT/main.lang
+++ b/htdocs/langs/lt_LT/main.lang
@@ -25,6 +25,7 @@ FormatDateHourTextShort=%b %d, %Y, %I:%M %p
 FormatDateHourText=%B %d, %Y, %I:%M %p
 DatabaseConnection=Prisijungimas prie duomenų bazės
 NoTemplateDefined=No template defined for this email type
+AvailableVariables=Available substitution variables
 NoTranslation=Nėra vertimo
 NoRecordFound=Įrašų nerasta
 NoError=Klaidos nėra
diff --git a/htdocs/langs/lt_LT/orders.lang b/htdocs/langs/lt_LT/orders.lang
index 97b770f025e..e24a77e3a5d 100644
--- a/htdocs/langs/lt_LT/orders.lang
+++ b/htdocs/langs/lt_LT/orders.lang
@@ -32,6 +32,7 @@ StatusOrderSent=Gabenimas vykdomas
 StatusOrderOnProcessShort=Užsakyta
 StatusOrderProcessedShort=Apdorotas
 StatusOrderDelivered=Delivered
+StatusOrderDeliveredShort=Delivered
 StatusOrderToBillShort=Pristatyta
 StatusOrderToBill2Short=Pateikti sąskaitą-faktūrą
 StatusOrderApprovedShort=Patvirtinta
diff --git a/htdocs/langs/lt_LT/products.lang b/htdocs/langs/lt_LT/products.lang
index 4cc8704f345..542bd6a3b96 100644
--- a/htdocs/langs/lt_LT/products.lang
+++ b/htdocs/langs/lt_LT/products.lang
@@ -25,15 +25,15 @@ ProductAccountancySellCode=Apskaitos kodas (parduoti)
 ProductOrService=Produktas ar Paslauga
 ProductsAndServices=Produktai ir Paslaugos
 ProductsOrServices=Produktai ar Paslaugos
-ProductsAndServicesOnSell=Products and Services for sale or for purchase
-ProductsAndServicesNotOnSell=Products and Services not for sale
+ProductsAndServicesOnSell=Produktai ir Paslaugos pardavimui arba pirkimui
+ProductsAndServicesNotOnSell=Produktai ir Paslaugos nepardavimui
 ProductsAndServicesStatistics=Produktų ir paslaugų statistika
 ProductsStatistics=Produktų statistika
-ProductsOnSell=Product for sale or for purchase
-ProductsNotOnSell=Product not for sale and not for purchase
+ProductsOnSell=Produktas pardavimui arba pirkimui
+ProductsNotOnSell=Produktas ne pardavimui ir ne pirkimui
 ProductsOnSellAndOnBuy=Products for sale and for purchase
-ServicesOnSell=Services for sale or for purchase
-ServicesNotOnSell=Services not for sale
+ServicesOnSell=Paslaugos pardavimui arba pirkimui
+ServicesNotOnSell=Paslaugos ne pardavimui
 ServicesOnSellAndOnBuy=Services for sale and for purchase
 InternalRef=Vidinė nuoroda
 LastRecorded=Naujausi produktai / paslaugos įregistruoti pardavimuose
@@ -45,10 +45,6 @@ LastProducts=Naujausi produktai
 CardProduct0=Produkto kortelė
 CardProduct1=Paslaugos kortelė
 CardContract=Sutarties kortelė
-Warehouse=Sandėlis
-Warehouses=Sandėliai
-WarehouseOpened=Warehouse open
-WarehouseClosed=Sandėlis uždarytas
 Stock=Atsarga
 Stocks=Atsargos
 Movement=Judėjimas
@@ -79,17 +75,17 @@ CurrentPrice=Dabartinė kaina
 CostPriceDescription=This price (net of tax) can be used to store the average amount this product cost to your company. It may be any price you calculate yourself, for example from the average buying price plus average production and distribution cost.
 CostPriceUsage=In a future version, this value could be used for margin calculation.
 NewPrice=Nauja kaina
-MinPrice=Min. selling price
+MinPrice=Minimali pardavimo kaina
 MinPriceHT=Min. selling price (net of tax)
 MinPriceTTC=Min. selling price (inc. tax)
 CantBeLessThanMinPrice=Pardavimo kaina negali būti mažesnė už minimalią leidžiamą šiam produktui (%s be mokesčių). Šis pranešimas taip pat gali pasirodyti, jei įvedate per labai didelę nuolaidą.
 ContractStatus=Sutarties būklė
 ContractStatusClosed=Uždarytas
-ContractStatusRunning=Ongoing
+ContractStatusRunning=Tebevykstantis
 ContractStatusExpired=Pasibaigęs
-ContractStatusOnHold=On hold
-ContractStatusToRun=Make ongoing
-ContractNotRunning=This contract is not ongoing
+ContractStatusOnHold=Laikomas
+ContractStatusToRun=Padaryti tebevykstančiu
+ContractNotRunning=Šis kontaktas nėra tebevykstantis
 ErrorProductAlreadyExists=Produktas su nuoroda %s jau egzistuoja.
 ErrorProductBadRefOrLabel=Neteisinga nuorodos ar etiketės reikšmė
 ErrorProductClone=Iškilo problema bandant klonuoti produktą ar paslaugą.
@@ -123,7 +119,7 @@ BarcodeValue=Brūkšninio kodo reikšmė
 NoteNotVisibleOnBill=Pastaba (nematoma ant sąskaitų-faktūrų, pasiūlymų ...)
 CreateCopy=Sukurti kopiją
 ServiceLimitedDuration=Jei produktas yra paslauga su ribota trukme:
-MultiPricesAbility=Several level of prices per product/service
+MultiPricesAbility=Atskiras produkto/paslaugos kainų lygis
 MultiPricesNumPrices=Kainų skaičius
 MultiPriceLevelsName=Kainų kategorijos
 AssociatedProductsAbility=Activate the package feature
@@ -318,3 +314,11 @@ WarningSelectOneDocument=Please select at least one document
 DefaultUnitToShow=Unit
 NbOfQtyInProposals=Qty in proposals
 ClinkOnALinkOfColumn=Click on a link of column %s to get a detailed view...
+TranslatedLabel=Translated label
+TranslatedDescription=Translated description
+TranslatedNote=Translated notes
+ProductWeight=Weight for 1 product
+ProductVolume=Volume for 1 product
+WeightUnits=Weight unit
+VolumeUnits=Volume unit
+SizeUnits=Size unit
diff --git a/htdocs/langs/lt_LT/projects.lang b/htdocs/langs/lt_LT/projects.lang
index 4051bee1307..6398f58b129 100644
--- a/htdocs/langs/lt_LT/projects.lang
+++ b/htdocs/langs/lt_LT/projects.lang
@@ -74,6 +74,9 @@ Progress=Pažanga
 ProgressDeclared=Paskelbta pažanga
 ProgressCalculated=Apskaičiuota pažanga
 Time=Laikas
+ListOfTasks=List of tasks
+GoToListOfTimeConsumed=Go to list of time consumed
+GoToListOfTasks=Go to list of tasks
 ListProposalsAssociatedProject=Komercinių pasiūlymų, susijusių su projektu, sąrašas
 ListOrdersAssociatedProject=Kliento užsakymų, susijusių su projektu, sąrašas
 ListInvoicesAssociatedProject=Kliento sąskaitų-faktūrų, susijusių su projektu, sąrašas
@@ -198,3 +201,4 @@ OppStatusNEGO=Negociation
 OppStatusPENDING=Pending
 OppStatusWIN=Won
 OppStatusLOST=Lost
+Budget=Budget
diff --git a/htdocs/langs/lt_LT/sendings.lang b/htdocs/langs/lt_LT/sendings.lang
index f11f9e128a5..81096367f44 100644
--- a/htdocs/langs/lt_LT/sendings.lang
+++ b/htdocs/langs/lt_LT/sendings.lang
@@ -70,6 +70,8 @@ ProductQtyInSuppliersOrdersRunning=Product quantity into opened suppliers orders
 ProductQtyInShipmentAlreadySent=Product quantity from opened customer order already sent
 ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from opened supplier order already received
 NoProductToShipFoundIntoStock=No product to ship found into warehouse <b>%s</b>. Correct stock or go back to choose another warehouse.
+WeightVolShort=Weight/Vol.
+ValidateOrderFirstBeforeShipment=You must first validate the order before being able to make shipments.
 
 # Sending methods
 SendingMethodCATCH=Kliento pagautė
diff --git a/htdocs/langs/lt_LT/supplier_proposal.lang b/htdocs/langs/lt_LT/supplier_proposal.lang
index 1a1bdc4df16..e37ced1b38f 100644
--- a/htdocs/langs/lt_LT/supplier_proposal.lang
+++ b/htdocs/langs/lt_LT/supplier_proposal.lang
@@ -58,3 +58,5 @@ DefaultModelSupplierProposalCreate=Default model creation
 DefaultModelSupplierProposalToBill=Default template when closing a price request (accepted)
 DefaultModelSupplierProposalClosed=Default template when closing a price request (refused)
 ListOfSupplierProposal=List of supplier proposal requests
+SupplierProposalsToClose=Supplier proposals to close
+SupplierProposalsToProcess=Supplier proposals to process
diff --git a/htdocs/langs/lt_LT/trips.lang b/htdocs/langs/lt_LT/trips.lang
index 7230ba19e59..b7c8e9c49a0 100644
--- a/htdocs/langs/lt_LT/trips.lang
+++ b/htdocs/langs/lt_LT/trips.lang
@@ -7,9 +7,9 @@ TripsAndExpenses=Išlaidų ataskaitos
 TripsAndExpensesStatistics=Išlaidų ataskaitų statistika
 TripCard=Išlaidų ataskaitos kortelė
 AddTrip=Sukurti išlaidų ataskaitą
-ListOfTrips=List of expense reports
+ListOfTrips=Išlaidų ataskaitų sąrašas
 ListOfFees=Įmokų sąrašas
-ShowTrip=Show expense report
+ShowTrip=Rodyti išlaidų ataskaitą
 NewTrip=Nauja išlaidų ataskaita
 CompanyVisited=Aplankyta įmonė/organizacija
 Kilometers=Kilometrų
@@ -31,7 +31,7 @@ TripNDF=Informacijos išlaidų ataskaiata
 PDFStandardExpenseReports=Standartinis šablonas PDF dokumento išlaidų ataskaitoje generavimui
 ExpenseReportLine=Išlaidų ataskaitos eilutė
 TF_OTHER=Kitas
-TF_TRIP=Transportation
+TF_TRIP=Transportas
 TF_LUNCH=Pietūs
 TF_METRO=Metro
 TF_TRAIN=Traukinys
@@ -39,7 +39,7 @@ TF_BUS=Autobusas
 TF_CAR=Automobilis
 TF_PEAGE=Mokamas
 TF_ESSENCE=Kuras
-TF_HOTEL=Hotel
+TF_HOTEL=Viešbutis
 TF_TAXI=Taksi
 
 ErrorDoubleDeclaration=Jūs deklaravote kitą išlaidų ataskaitą panašiame laiko periode.
@@ -52,12 +52,12 @@ Date_DEBUT=Laikotarpio pradžia
 Date_FIN=Laikotarpio pabaiga
 ModePaiement=Mokėjimo būdas
 
-VALIDATOR=User responsible for approval
+VALIDATOR=Vartotojas atsakingas už patvirtinimą
 VALIDOR=Patvirtinta
 AUTHOR=Įrašyta
-AUTHORPAIEMENT=Paid by
+AUTHORPAIEMENT=Apmokėtas kieno
 REFUSEUR=Atmesta
-CANCEL_USER=Deleted by
+CANCEL_USER=Ištrintas kieno
 
 MOTIF_REFUS=Priežastis
 MOTIF_CANCEL=Priežastis
@@ -70,10 +70,10 @@ DATE_PAIEMENT=Mokėjimo data
 
 TO_PAID=Mokėti
 BROUILLONNER=Atidaryti iš naujo
-SendToValid=Sent on approval
+SendToValid=Išsiųstas patvirtinimui
 ModifyInfoGen=Redaguoti
 ValidateAndSubmit=Įvertinti ir pateikti tvirtinimui
-ValidatedWaitingApproval=Validated (waiting for approval)
+ValidatedWaitingApproval=Pripažintas (laukia patvirtinimo)
 
 NOT_VALIDATOR=Jums neleidžiama patvirtinti šią išlaidų ataskaitą
 NOT_AUTHOR=Jūs nesate šios išlaidų ataskaitos autorius. Operacija nutraukta.
@@ -90,14 +90,14 @@ ConfirmPaidTrip=Ar tikrai norite pakeisti šios išlaidų ataskaitos būklę į
 CancelTrip=Nutraukti išlaidų ataskaitą
 ConfirmCancelTrip=Ar tikrai norite nutraukti šią išlaidų ataskaitą ?
 
-BrouillonnerTrip=Move back expense report to status "Draft"
+BrouillonnerTrip=Grąžinti išlaidų ataskaitos būklę į "Projektas"
 ConfirmBrouillonnerTrip=Ar tikrai norite grąžinti šios išlaidų ataskaitos būklę į "Projektas" ?
 
 SaveTrip=Patvirtinti išlaidų ataskaitą
 ConfirmSaveTrip=Ar tikrai norite patvirtinti šią išlaidų ataskaitą ?
 
 NoTripsToExportCSV=Už šį laikotarpį nėra išlaidų ataskaitų eksportui
-ExpenseReportPayment=Expense report payment
+ExpenseReportPayment=Išlaidų apmokėjimų ataskaita
 
-ExpenseReportsToApprove=Expense reports to approve
-ExpenseReportsToPay=Expense reports to pay
+ExpenseReportsToApprove=Išlaidų ataskaitos patvirtinimui
+ExpenseReportsToPay=Apmokėti išlaidų ataskaitą
diff --git a/htdocs/langs/lv_LV/admin.lang b/htdocs/langs/lv_LV/admin.lang
index f34c9d71991..8451c1cd35f 100644
--- a/htdocs/langs/lv_LV/admin.lang
+++ b/htdocs/langs/lv_LV/admin.lang
@@ -282,6 +282,7 @@ ModuleSetup=Moduļa iestatīšana
 ModulesSetup=Moduļu iestatīšana
 ModuleFamilyBase=Sistēma
 ModuleFamilyCrm=Klientu pārvaldība (CRM)
+ModuleFamilySrm=Supplier Relation Management (SRM)
 ModuleFamilyProducts=Produktu Pārvaldība (PP)
 ModuleFamilyHr=Darbinieku resursu pārvaldība (DRP)
 ModuleFamilyProjects=Projekti / Sadarbības darbi
@@ -587,6 +588,7 @@ Permission38=Eksportēt produktus
 Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
 Permission42=Izveidot / mainīt projektus (dalīta projekts un projektu es esmu kontaktpersonai)
 Permission44=Dzēst projektus (dalīta projekts un projektu es esmu kontaktpersonai)
+Permission45=Export projects
 Permission61=Lasīt intervences
 Permission62=Izveidot / mainīt intervences
 Permission64=Dzēst intervences
@@ -640,6 +642,7 @@ Permission162=Izveidot/labot līgumus/subscriptions
 Permission163=Activate a service/subscription of a contract
 Permission164=Disable a service/subscription of a contract
 Permission165=Dzēst līgumus/subscriptions
+Permission167=Export contracts
 Permission171=Read trips and expenses (yours and your subordinates)
 Permission172=Izveidot/labot ceļojumu un izdevumus
 Permission173=Dzēst ceļojumus un izdevumus
@@ -788,6 +791,7 @@ Permission2403=Dzēst darbības (pasākumi vai uzdevumi), kas saistīti ar viņa
 Permission2411=Lasīt darbības (pasākumi vai uzdevumi) par citiem
 Permission2412=Izveidot / mainīt darbības (pasākumi vai uzdevumi), kas citiem
 Permission2413=Dzēst darbības (pasākumi vai uzdevumi), kas citiem
+Permission2414=Export actions/tasks of others
 Permission2501=Skatīt/Lejupielādēt dokumentus
 Permission2502=Lejupielādēt dokumentu
 Permission2503=Pievienot vai dzēst dokumentus
@@ -1713,3 +1717,4 @@ ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s is available. Ve
 MultiPriceRuleDesc=When option "Several level of prices per product/service" is on, you can define different prices (one per price level) for each product. To save you time, you can enter here rule to have price for each level autocalculated according to price of first level, so you will have to enter only price for first level on each product. This page is here to save you time and can be usefull only if your prices for each leve are relative to first level. You can ignore this page in most cases.
 ModelModulesProduct=Templates for product documents
 ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
+SeeSubstitutionVars=See * note for list of possible substitution variables
diff --git a/htdocs/langs/lv_LV/bills.lang b/htdocs/langs/lv_LV/bills.lang
index 79d2d4b5592..cf056e02fdd 100644
--- a/htdocs/langs/lv_LV/bills.lang
+++ b/htdocs/langs/lv_LV/bills.lang
@@ -219,6 +219,7 @@ RemainderToBill=Jāsamaksā vēl
 SendBillByMail=Nosūtīt rēķinu pa e-pastu
 SendReminderBillByMail=Sūtīt atgādinājumu pa e-pastu
 RelatedCommercialProposals=Saistītie tirdzniecības priekšlikumi
+RelatedRecurringCustomerInvoices=Related recurring customer invoices
 MenuToValid=Lai derīgs
 DateMaxPayment=Maksājums jāveic līdz
 DateEcheance=Izpildes datums
@@ -319,7 +320,6 @@ toolTipFrequency=Examples:<br /><b>Set 7 / day</b>: give a new invoice every 7 d
 NextDateToExecution=Date for next invoice generation
 DateLastGeneration=Date of last generation
 MaxPeriodNumber=Max nb of invoice generation
-RestPeriodNumber=Rest period number
 NbOfGenerationDone=Nb of invoice generation already done
 InvoiceAutoValidate=Automatically validate invoice
 GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
@@ -471,3 +471,7 @@ PDFCrevetteSituationInvoiceLine=Situation N°%s : Inv. N°%s on %s
 TotalSituationInvoice=Total situation
 invoiceLineProgressError=Invoice line progress can't be egal or upper the next invoice line
 updatePriceNextInvoiceErrorUpdateline=Error : update price on invoice line : %s
+ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
+ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
+ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
+
diff --git a/htdocs/langs/lv_LV/boxes.lang b/htdocs/langs/lv_LV/boxes.lang
index 15f5cebe4ad..703441f2616 100644
--- a/htdocs/langs/lv_LV/boxes.lang
+++ b/htdocs/langs/lv_LV/boxes.lang
@@ -60,8 +60,8 @@ BoxTitleLastContracts=Pēdējie %s līgumi
 BoxTitleLastModifiedDonations=Pēdējie %s labotie ziedojumi
 BoxTitleLastModifiedExpenses=Last %s modified expense reports
 BoxGlobalActivity=Global darbība (pavadzīmes, priekšlikumi, rīkojumi)
-BoxGoodCustomers=Good Customers
-BoxTitleGoodCustomers=%s Good Customers
+BoxGoodCustomers=Good customers
+BoxTitleGoodCustomers=%s Good customers
 FailedToRefreshDataInfoNotUpToDate=Neizdevās atsvaidzināt RSS plūsmas. Pēdējās veiksmīgs atsvaidzināt datums: %s
 LastRefreshDate=Pēdējais atjaunošanas datums
 NoRecordedBookmarks=Nav definētas grāmatzīmes.
diff --git a/htdocs/langs/lv_LV/companies.lang b/htdocs/langs/lv_LV/companies.lang
index 23702353303..4cb5e890230 100644
--- a/htdocs/langs/lv_LV/companies.lang
+++ b/htdocs/langs/lv_LV/companies.lang
@@ -202,7 +202,7 @@ ProfId3IN=Prof Id 3 (SRVC TAX)
 ProfId4IN=Prof Id 4
 ProfId5IN=Prof Id 5
 ProfId6IN=-
-ProfId1LU=Id. prof. 1 (RCS)
+ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
 ProfId2LU=Id. prof. 2 (Business permit)
 ProfId3LU=-
 ProfId4LU=-
@@ -317,10 +317,12 @@ ShowContact=Rādīt kontaktu
 ContactsAllShort=Visi (Bez filtra)
 ContactType=Kontakta veids
 ContactForOrders=Pasutījumu kontakti
+ContactForOrdersOrShipments=Order's or shipment's contact
 ContactForProposals=Piedāvājumu  kontakti
 ContactForContracts=Līgumu kontakti
 ContactForInvoices=Rēķinu kontakti
 NoContactForAnyOrder=Šis kontakts ir ne kontaktu, lai jebkurā secībā
+NoContactForAnyOrderOrShipment=This contact is not a contact for any order or shipment
 NoContactForAnyProposal=Šis kontakts ir ne kontaktu par jebkuru komerciālu priekšlikumu
 NoContactForAnyContract=Šis kontakts nav neviena līguma kontaktpersona
 NoContactForAnyInvoice=Šis kontakts nav neviena rēķina kontaktpersona
@@ -438,3 +440,6 @@ MergeThirdparties=Merge third parties
 ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one ? All linked objects (invoices, orders, ...) will be moved to current third party so you will be able to delete the duplicate one.
 ThirdpartiesMergeSuccess=Thirdparties have been merged
 ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
+SaleRepresentativeLogin=Login of sale representative
+SaleRepresentativeFirstname=Firstname of sale representative
+SaleRepresentativeLastname=Lastname of sale representative
diff --git a/htdocs/langs/lv_LV/errors.lang b/htdocs/langs/lv_LV/errors.lang
index af93b5cba28..372f621e5d8 100644
--- a/htdocs/langs/lv_LV/errors.lang
+++ b/htdocs/langs/lv_LV/errors.lang
@@ -172,6 +172,8 @@ ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
 ErrorOppStatusRequiredIfAmount=You set an estimated amount for this opportunity/lead. So you must also enter its status
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
 ErrorSavingChanges=Kļūda saglabājot izmaiņas
+ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
+ErrorFileMustHaveFormat=File must have format %s
 
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
diff --git a/htdocs/langs/lv_LV/exports.lang b/htdocs/langs/lv_LV/exports.lang
index 82e3f3fe2e7..4900b2c0dd9 100644
--- a/htdocs/langs/lv_LV/exports.lang
+++ b/htdocs/langs/lv_LV/exports.lang
@@ -67,7 +67,7 @@ SourceFileFormat=Avota faila formāts
 FieldsInSourceFile=Lauki avota failā
 FieldsInTargetDatabase=Mērķa lauki Dolibarr datu bāzē (treknrakstā = obligāti)
 Field=Lauks
-NoFields=No lauki
+NoFields=Nav lauki
 MoveField=Pārvietot lauka kolonnas numurs %s
 ExampleOfImportFile=Importa_faila_piemers
 SaveImportProfile=Saglabāt šo importa profilu
@@ -91,7 +91,7 @@ SelectFormat=Izvēlieties šo importa failu formātu
 RunImportFile=Uzsākt faila importu
 NowClickToRunTheImport=Pārbaudiet rezultātu importa simulāciju. Ja viss ir ok, sākt galīgo importu.
 DataLoadedWithId=All data will be loaded with the following import id: <b>%s</b>
-ErrorMissingMandatoryValue=Obligātie dati ir tukšs avota failu lauka <b>%s.</b>
+ErrorMissingMandatoryValue=Obligātie dati ir tukši avota failu laukā <b>%s.</b>
 TooMuchErrors=Joprojām <b>%s</b> citu avotu līnijas ar kļūdām, taču izlaide ir bijusi ierobežota.
 TooMuchWarnings=Joprojām <b>%s</b> citu avotu līnijas ar brīdinājumiem, taču izlaide ir bijusi ierobežota.
 EmptyLine=Tukšas līnijas (tiks izmesti)
@@ -128,6 +128,10 @@ SpecialCode=Speciāls kods
 ExportStringFilter=%% allows replacing one or more characters in the text
 ExportDateFilter=YYYY, YYYYMM, YYYYMMDD : filters by one year/month/day<br>YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD : filters over a range of years/months/days<br> > YYYY, > YYYYMM, > YYYYMMDD : filters on all following years/months/days<br> < YYYY, < YYYYMM, < YYYYMMDD : filters on all previous years/months/days
 ExportNumericFilter='NNNNN' filters by one value<br>'NNNNN+NNNNN' filters over a range of values<br>'&gt;NNNNN' filters by lower values<br>'&gt;NNNNN' filters by higher values
+ImportFromLine=Import starting from line number
+EndAtLineNb=End at line number
+SetThisValueTo2ToExcludeFirstLine=For example, set this value to 3 to exclude the 2 first lines
+KeepEmptyToGoToEndOfFile=Keep this field empty to go up to the end of file
 ## filters
 SelectFilterFields=Ja jūs vēlaties filtrēt dažas vērtības, vienkārši ievadi vērtības šeit.
 FilterableFields=Filterable Fields
diff --git a/htdocs/langs/lv_LV/main.lang b/htdocs/langs/lv_LV/main.lang
index 2ed75fca774..04e26fec343 100644
--- a/htdocs/langs/lv_LV/main.lang
+++ b/htdocs/langs/lv_LV/main.lang
@@ -25,6 +25,7 @@ FormatDateHourTextShort=%b %d, %Y, %I:%M %p
 FormatDateHourText=%B %d, %Y, %I:%M %p
 DatabaseConnection=Savienojums ar datubāzi
 NoTemplateDefined=No template defined for this email type
+AvailableVariables=Available substitution variables
 NoTranslation=Nav iztulkots
 NoRecordFound=Nav atrasti ieraksti
 NoError=Nav kļūdu
diff --git a/htdocs/langs/lv_LV/orders.lang b/htdocs/langs/lv_LV/orders.lang
index 84f1d77ba80..0fe65b25f0f 100644
--- a/htdocs/langs/lv_LV/orders.lang
+++ b/htdocs/langs/lv_LV/orders.lang
@@ -32,6 +32,7 @@ StatusOrderSent=Sūtījuma procesā
 StatusOrderOnProcessShort=Pasūtīts
 StatusOrderProcessedShort=Apstrādāti
 StatusOrderDelivered=Piegādāts
+StatusOrderDeliveredShort=Delivered
 StatusOrderToBillShort=Pasludināts
 StatusOrderToBill2Short=Lai likumprojektu
 StatusOrderApprovedShort=Apstiprināts
diff --git a/htdocs/langs/lv_LV/products.lang b/htdocs/langs/lv_LV/products.lang
index 11d04c87efc..ac200ab9be1 100644
--- a/htdocs/langs/lv_LV/products.lang
+++ b/htdocs/langs/lv_LV/products.lang
@@ -45,10 +45,6 @@ LastProducts=Pēdējie produkti
 CardProduct0=Produkta kartiņa
 CardProduct1=Paikalpojuma kartiņa
 CardContract=Līguma kartiņa
-Warehouse=Noliktava
-Warehouses=Noliktavas
-WarehouseOpened=Noliktava atvērta
-WarehouseClosed=Noliktava slēgta
 Stock=Krājums
 Stocks=Krājumi
 Movement=Pārvietošana
@@ -318,3 +314,11 @@ WarningSelectOneDocument=Please select at least one document
 DefaultUnitToShow=Unit
 NbOfQtyInProposals=Qty in proposals
 ClinkOnALinkOfColumn=Click on a link of column %s to get a detailed view...
+TranslatedLabel=Translated label
+TranslatedDescription=Translated description
+TranslatedNote=Translated notes
+ProductWeight=Weight for 1 product
+ProductVolume=Volume for 1 product
+WeightUnits=Weight unit
+VolumeUnits=Volume unit
+SizeUnits=Size unit
diff --git a/htdocs/langs/lv_LV/projects.lang b/htdocs/langs/lv_LV/projects.lang
index 61f44de697d..d04ece7b84f 100644
--- a/htdocs/langs/lv_LV/projects.lang
+++ b/htdocs/langs/lv_LV/projects.lang
@@ -74,6 +74,9 @@ Progress=Progress
 ProgressDeclared=Deklarētais progress
 ProgressCalculated=Aprēķinātais progress
 Time=Laiks
+ListOfTasks=List of tasks
+GoToListOfTimeConsumed=Go to list of time consumed
+GoToListOfTasks=Go to list of tasks
 ListProposalsAssociatedProject=Saraksts tirdzniecības priekšlikumiem saistībā ar projektu
 ListOrdersAssociatedProject=Saraksts klienta pasūtījumu saistīts ar projektu
 ListInvoicesAssociatedProject=Saraksts klienta rēķinu ar projektu saistītās
@@ -198,3 +201,4 @@ OppStatusNEGO=Negociation
 OppStatusPENDING=Pending
 OppStatusWIN=Won
 OppStatusLOST=Lost
+Budget=Budget
diff --git a/htdocs/langs/lv_LV/sendings.lang b/htdocs/langs/lv_LV/sendings.lang
index b16fe119daa..571a2ab37ad 100644
--- a/htdocs/langs/lv_LV/sendings.lang
+++ b/htdocs/langs/lv_LV/sendings.lang
@@ -70,6 +70,8 @@ ProductQtyInSuppliersOrdersRunning=Product quantity into opened suppliers orders
 ProductQtyInShipmentAlreadySent=Product quantity from opened customer order already sent
 ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from opened supplier order already received
 NoProductToShipFoundIntoStock=No product to ship found into warehouse <b>%s</b>. Correct stock or go back to choose another warehouse.
+WeightVolShort=Weight/Vol.
+ValidateOrderFirstBeforeShipment=You must first validate the order before being able to make shipments.
 
 # Sending methods
 SendingMethodCATCH=Nozvejas klienta
diff --git a/htdocs/langs/lv_LV/supplier_proposal.lang b/htdocs/langs/lv_LV/supplier_proposal.lang
index 1cf9277b0d7..ecbc0eb29cc 100644
--- a/htdocs/langs/lv_LV/supplier_proposal.lang
+++ b/htdocs/langs/lv_LV/supplier_proposal.lang
@@ -58,3 +58,5 @@ DefaultModelSupplierProposalCreate=Default model creation
 DefaultModelSupplierProposalToBill=Default template when closing a price request (accepted)
 DefaultModelSupplierProposalClosed=Default template when closing a price request (refused)
 ListOfSupplierProposal=List of supplier proposal requests
+SupplierProposalsToClose=Supplier proposals to close
+SupplierProposalsToProcess=Supplier proposals to process
diff --git a/htdocs/langs/mk_MK/admin.lang b/htdocs/langs/mk_MK/admin.lang
index deca56bf2c1..c83ce1dba12 100644
--- a/htdocs/langs/mk_MK/admin.lang
+++ b/htdocs/langs/mk_MK/admin.lang
@@ -282,6 +282,7 @@ ModuleSetup=Module setup
 ModulesSetup=Modules setup
 ModuleFamilyBase=System
 ModuleFamilyCrm=Customer Relation Management (CRM)
+ModuleFamilySrm=Supplier Relation Management (SRM)
 ModuleFamilyProducts=Products Management (PM)
 ModuleFamilyHr=Human Resource Management (HR)
 ModuleFamilyProjects=Projects/Collaborative work
@@ -587,6 +588,7 @@ Permission38=Export products
 Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
 Permission42=Create/modify projects (shared project and projects i'm contact for)
 Permission44=Delete projects (shared project and projects i'm contact for)
+Permission45=Export projects
 Permission61=Read interventions
 Permission62=Create/modify interventions
 Permission64=Delete interventions
@@ -640,6 +642,7 @@ Permission162=Create/modify contracts/subscriptions
 Permission163=Activate a service/subscription of a contract
 Permission164=Disable a service/subscription of a contract
 Permission165=Delete contracts/subscriptions
+Permission167=Export contracts
 Permission171=Read trips and expenses (yours and your subordinates)
 Permission172=Create/modify trips and expenses
 Permission173=Delete trips and expenses
@@ -788,6 +791,7 @@ Permission2403=Delete actions (events or tasks) linked to his account
 Permission2411=Read actions (events or tasks) of others
 Permission2412=Create/modify actions (events or tasks) of others
 Permission2413=Delete actions (events or tasks) of others
+Permission2414=Export actions/tasks of others
 Permission2501=Read/Download documents
 Permission2502=Download documents
 Permission2503=Submit or delete documents
@@ -1713,3 +1717,4 @@ ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s is available. Ve
 MultiPriceRuleDesc=When option "Several level of prices per product/service" is on, you can define different prices (one per price level) for each product. To save you time, you can enter here rule to have price for each level autocalculated according to price of first level, so you will have to enter only price for first level on each product. This page is here to save you time and can be usefull only if your prices for each leve are relative to first level. You can ignore this page in most cases.
 ModelModulesProduct=Templates for product documents
 ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
+SeeSubstitutionVars=See * note for list of possible substitution variables
diff --git a/htdocs/langs/mk_MK/bills.lang b/htdocs/langs/mk_MK/bills.lang
index e67ad0ade2d..790a146ee98 100644
--- a/htdocs/langs/mk_MK/bills.lang
+++ b/htdocs/langs/mk_MK/bills.lang
@@ -219,6 +219,7 @@ RemainderToBill=Remainder to bill
 SendBillByMail=Send invoice by email
 SendReminderBillByMail=Send reminder by email
 RelatedCommercialProposals=Related commercial proposals
+RelatedRecurringCustomerInvoices=Related recurring customer invoices
 MenuToValid=To valid
 DateMaxPayment=Payment due before
 DateEcheance=Due date limit
@@ -319,7 +320,6 @@ toolTipFrequency=Examples:<br /><b>Set 7 / day</b>: give a new invoice every 7 d
 NextDateToExecution=Date for next invoice generation
 DateLastGeneration=Date of last generation
 MaxPeriodNumber=Max nb of invoice generation
-RestPeriodNumber=Rest period number
 NbOfGenerationDone=Nb of invoice generation already done
 InvoiceAutoValidate=Automatically validate invoice
 GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
@@ -471,3 +471,7 @@ PDFCrevetteSituationInvoiceLine=Situation N°%s : Inv. N°%s on %s
 TotalSituationInvoice=Total situation
 invoiceLineProgressError=Invoice line progress can't be egal or upper the next invoice line
 updatePriceNextInvoiceErrorUpdateline=Error : update price on invoice line : %s
+ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
+ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
+ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
+
diff --git a/htdocs/langs/mk_MK/boxes.lang b/htdocs/langs/mk_MK/boxes.lang
index 57bfc174ec5..7619a335b61 100644
--- a/htdocs/langs/mk_MK/boxes.lang
+++ b/htdocs/langs/mk_MK/boxes.lang
@@ -60,8 +60,8 @@ BoxTitleLastContracts=Last %s contracts
 BoxTitleLastModifiedDonations=Last %s modified donations
 BoxTitleLastModifiedExpenses=Last %s modified expense reports
 BoxGlobalActivity=Global activity (invoices, proposals, orders)
-BoxGoodCustomers=Good Customers
-BoxTitleGoodCustomers=%s Good Customers
+BoxGoodCustomers=Good customers
+BoxTitleGoodCustomers=%s Good customers
 FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Last successfull refresh date: %s
 LastRefreshDate=Last refresh date
 NoRecordedBookmarks=No bookmarks defined.
diff --git a/htdocs/langs/mk_MK/companies.lang b/htdocs/langs/mk_MK/companies.lang
index 588867b1f2f..fe967d3252f 100644
--- a/htdocs/langs/mk_MK/companies.lang
+++ b/htdocs/langs/mk_MK/companies.lang
@@ -202,7 +202,7 @@ ProfId3IN=Prof Id 3 (SRVC TAX)
 ProfId4IN=Prof Id 4
 ProfId5IN=Prof Id 5
 ProfId6IN=-
-ProfId1LU=Id. prof. 1 (RCS)
+ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
 ProfId2LU=Id. prof. 2 (Business permit)
 ProfId3LU=-
 ProfId4LU=-
@@ -317,10 +317,12 @@ ShowContact=Show contact
 ContactsAllShort=All (No filter)
 ContactType=Contact type
 ContactForOrders=Order's contact
+ContactForOrdersOrShipments=Order's or shipment's contact
 ContactForProposals=Proposal's contact
 ContactForContracts=Contract's contact
 ContactForInvoices=Invoice's contact
 NoContactForAnyOrder=This contact is not a contact for any order
+NoContactForAnyOrderOrShipment=This contact is not a contact for any order or shipment
 NoContactForAnyProposal=This contact is not a contact for any commercial proposal
 NoContactForAnyContract=This contact is not a contact for any contract
 NoContactForAnyInvoice=This contact is not a contact for any invoice
@@ -438,3 +440,6 @@ MergeThirdparties=Merge third parties
 ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one ? All linked objects (invoices, orders, ...) will be moved to current third party so you will be able to delete the duplicate one.
 ThirdpartiesMergeSuccess=Thirdparties have been merged
 ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
+SaleRepresentativeLogin=Login of sale representative
+SaleRepresentativeFirstname=Firstname of sale representative
+SaleRepresentativeLastname=Lastname of sale representative
diff --git a/htdocs/langs/mk_MK/errors.lang b/htdocs/langs/mk_MK/errors.lang
index 718b3e8413f..fa7804ce355 100644
--- a/htdocs/langs/mk_MK/errors.lang
+++ b/htdocs/langs/mk_MK/errors.lang
@@ -172,6 +172,8 @@ ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
 ErrorOppStatusRequiredIfAmount=You set an estimated amount for this opportunity/lead. So you must also enter its status
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
 ErrorSavingChanges=An error has ocurred when saving the changes
+ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
+ErrorFileMustHaveFormat=File must have format %s
 
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
diff --git a/htdocs/langs/mk_MK/exports.lang b/htdocs/langs/mk_MK/exports.lang
index 03c87b28bcf..1a490ea647d 100644
--- a/htdocs/langs/mk_MK/exports.lang
+++ b/htdocs/langs/mk_MK/exports.lang
@@ -128,6 +128,10 @@ SpecialCode=Special code
 ExportStringFilter=%% allows replacing one or more characters in the text
 ExportDateFilter=YYYY, YYYYMM, YYYYMMDD : filters by one year/month/day<br>YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD : filters over a range of years/months/days<br> > YYYY, > YYYYMM, > YYYYMMDD : filters on all following years/months/days<br> < YYYY, < YYYYMM, < YYYYMMDD : filters on all previous years/months/days
 ExportNumericFilter='NNNNN' filters by one value<br>'NNNNN+NNNNN' filters over a range of values<br>'&gt;NNNNN' filters by lower values<br>'&gt;NNNNN' filters by higher values
+ImportFromLine=Import starting from line number
+EndAtLineNb=End at line number
+SetThisValueTo2ToExcludeFirstLine=For example, set this value to 3 to exclude the 2 first lines
+KeepEmptyToGoToEndOfFile=Keep this field empty to go up to the end of file
 ## filters
 SelectFilterFields=If you want to filter on some values, just input values here.
 FilterableFields=Filterable Fields
diff --git a/htdocs/langs/mk_MK/main.lang b/htdocs/langs/mk_MK/main.lang
index 4cb72254e8d..33eab8c49e1 100644
--- a/htdocs/langs/mk_MK/main.lang
+++ b/htdocs/langs/mk_MK/main.lang
@@ -25,6 +25,7 @@ FormatDateHourTextShort=%b %d, %Y, %I:%M %p
 FormatDateHourText=%B %d, %Y, %I:%M %p
 DatabaseConnection=Database connection
 NoTemplateDefined=No template defined for this email type
+AvailableVariables=Available substitution variables
 NoTranslation=No translation
 NoRecordFound=No record found
 NoError=No error
diff --git a/htdocs/langs/mk_MK/orders.lang b/htdocs/langs/mk_MK/orders.lang
index c0bfc3ccce3..33cd265b07f 100644
--- a/htdocs/langs/mk_MK/orders.lang
+++ b/htdocs/langs/mk_MK/orders.lang
@@ -32,6 +32,7 @@ StatusOrderSent=Shipment in process
 StatusOrderOnProcessShort=Ordered
 StatusOrderProcessedShort=Processed
 StatusOrderDelivered=Delivered
+StatusOrderDeliveredShort=Delivered
 StatusOrderToBillShort=Delivered
 StatusOrderToBill2Short=To bill
 StatusOrderApprovedShort=Approved
diff --git a/htdocs/langs/mk_MK/products.lang b/htdocs/langs/mk_MK/products.lang
index 5118e77c22b..27e8130e762 100644
--- a/htdocs/langs/mk_MK/products.lang
+++ b/htdocs/langs/mk_MK/products.lang
@@ -45,10 +45,6 @@ LastProducts=Last products
 CardProduct0=Product card
 CardProduct1=Service card
 CardContract=Contract card
-Warehouse=Warehouse
-Warehouses=Warehouses
-WarehouseOpened=Warehouse open
-WarehouseClosed=Warehouse closed
 Stock=Stock
 Stocks=Stocks
 Movement=Movement
@@ -318,3 +314,11 @@ WarningSelectOneDocument=Please select at least one document
 DefaultUnitToShow=Unit
 NbOfQtyInProposals=Qty in proposals
 ClinkOnALinkOfColumn=Click on a link of column %s to get a detailed view...
+TranslatedLabel=Translated label
+TranslatedDescription=Translated description
+TranslatedNote=Translated notes
+ProductWeight=Weight for 1 product
+ProductVolume=Volume for 1 product
+WeightUnits=Weight unit
+VolumeUnits=Volume unit
+SizeUnits=Size unit
diff --git a/htdocs/langs/mk_MK/projects.lang b/htdocs/langs/mk_MK/projects.lang
index 59f4ec5af51..b4a21befd80 100644
--- a/htdocs/langs/mk_MK/projects.lang
+++ b/htdocs/langs/mk_MK/projects.lang
@@ -74,6 +74,9 @@ Progress=Progress
 ProgressDeclared=Declared progress
 ProgressCalculated=Calculated progress
 Time=Time
+ListOfTasks=List of tasks
+GoToListOfTimeConsumed=Go to list of time consumed
+GoToListOfTasks=Go to list of tasks
 ListProposalsAssociatedProject=List of the commercial proposals associated with the project
 ListOrdersAssociatedProject=List of customer's orders associated with the project
 ListInvoicesAssociatedProject=List of customer's invoices associated with the project
@@ -198,3 +201,4 @@ OppStatusNEGO=Negociation
 OppStatusPENDING=Pending
 OppStatusWIN=Won
 OppStatusLOST=Lost
+Budget=Budget
diff --git a/htdocs/langs/mk_MK/sendings.lang b/htdocs/langs/mk_MK/sendings.lang
index fb7b9c08868..97f57e1d3c7 100644
--- a/htdocs/langs/mk_MK/sendings.lang
+++ b/htdocs/langs/mk_MK/sendings.lang
@@ -70,6 +70,8 @@ ProductQtyInSuppliersOrdersRunning=Product quantity into opened suppliers orders
 ProductQtyInShipmentAlreadySent=Product quantity from opened customer order already sent
 ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from opened supplier order already received
 NoProductToShipFoundIntoStock=No product to ship found into warehouse <b>%s</b>. Correct stock or go back to choose another warehouse.
+WeightVolShort=Weight/Vol.
+ValidateOrderFirstBeforeShipment=You must first validate the order before being able to make shipments.
 
 # Sending methods
 SendingMethodCATCH=Catch by customer
diff --git a/htdocs/langs/mk_MK/supplier_proposal.lang b/htdocs/langs/mk_MK/supplier_proposal.lang
index 1a1bdc4df16..e37ced1b38f 100644
--- a/htdocs/langs/mk_MK/supplier_proposal.lang
+++ b/htdocs/langs/mk_MK/supplier_proposal.lang
@@ -58,3 +58,5 @@ DefaultModelSupplierProposalCreate=Default model creation
 DefaultModelSupplierProposalToBill=Default template when closing a price request (accepted)
 DefaultModelSupplierProposalClosed=Default template when closing a price request (refused)
 ListOfSupplierProposal=List of supplier proposal requests
+SupplierProposalsToClose=Supplier proposals to close
+SupplierProposalsToProcess=Supplier proposals to process
diff --git a/htdocs/langs/nb_NO/accountancy.lang b/htdocs/langs/nb_NO/accountancy.lang
index 97c27076745..46c48d41f9a 100644
--- a/htdocs/langs/nb_NO/accountancy.lang
+++ b/htdocs/langs/nb_NO/accountancy.lang
@@ -2,10 +2,10 @@
 ACCOUNTING_EXPORT_SEPARATORCSV=Kolonneseparator for eksportfil
 ACCOUNTING_EXPORT_DATE=Datoformat for eksportfil
 ACCOUNTING_EXPORT_PIECE=Eksporter antall enheter
-ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=Export with global account
+ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=Eksporter med hovedkonto
 ACCOUNTING_EXPORT_LABEL=Eksporter etikett
 ACCOUNTING_EXPORT_AMOUNT=Eksporter beløp
-ACCOUNTING_EXPORT_DEVISE=Export the devise
+ACCOUNTING_EXPORT_DEVISE=Eksporter valuta
 Selectformat=Velg filformat
 ACCOUNTING_EXPORT_PREFIX_SPEC=Velg prefiks for filnavnet
 
@@ -21,22 +21,22 @@ JournalFinancial=Finasielle journaler
 Exports=Eksporter
 Export=Eksport
 Modelcsv=Eksportmodell
-OptionsDeactivatedForThisExportModel=For this export model, options are deactivated
+OptionsDeactivatedForThisExportModel=For denne eksportmodellen er opsjoner deaktivert
 Selectmodelcsv=Velg eksportmodell
 Modelcsv_normal=Klassisk eksport
-Modelcsv_CEGID=Export towards CEGID Expert
-BackToChartofaccounts=Return chart of accounts
+Modelcsv_CEGID=Eksport mot CEGID Expert
+BackToChartofaccounts=Returner kontotabell
 
-Definechartofaccounts=Define a chart of accounts
-Selectchartofaccounts=Select a chart of accounts
-Addanaccount=Add an accounting account
+Definechartofaccounts=Definer en kontotabell
+Selectchartofaccounts=Velg kontotabell
+Addanaccount=Legg til regnskapskonto
 AccountAccounting=Regnskapskonto
-AccountAccountingSuggest=Accounting account suggest
-Ventilation=Breakdown
+AccountAccountingSuggest=Forslag til regnskapskonto
+Ventilation=Fordeling
 
-MenuAccountancy=Accountancy
-CustomersVentilation=Breakdown customers
-SuppliersVentilation=Breakdown suppliers
+MenuAccountancy=Regnskap
+CustomersVentilation=Fordeling Kunder
+SuppliersVentilation=Fordeling Leverandører
 TradeMargin=Fortjenestemargin
 Reports=Rapporter
 ByCustomerInvoice=Etter kundefakturaer
@@ -45,113 +45,113 @@ Create=Opprett
 CreateMvts=Opprett bevegelse
 UpdateAccount=Endring av reknskapskonto
 UpdateMvts=Endring av bevegelse
-WriteBookKeeping=Record accounts in general ledger
+WriteBookKeeping=Kontoposter i hovedboken
 Bookkeeping=Hovedbok
-AccountBalance=Account balance
+AccountBalance=Kontobalanse
 
 AccountingVentilation=Regnskapsmessig fordelingen
-AccountingVentilationSupplier=Breakdown accounting supplier
-AccountingVentilationCustomer=Breakdown accounting customer
+AccountingVentilationSupplier=Regnskapsfordeling Leverandør
+AccountingVentilationCustomer=Regskapsfordeling Kunde
 
-CAHTF=Total purchase supplier before tax
+CAHTF=Totalt leverandørkjøp eks. MVA
 InvoiceLines=Fakturalinjer som skal ventileres
 InvoiceLinesDone=Ventilerte fakturalinjer
 IntoAccount=Ventiler regnskapskontoen
 
 Ventilate=Ventiler
-VentilationAuto=Automatic breakdown
+VentilationAuto=Automatisk fordeling
 
 Processing=Behandler
 EndProcessing=Behandling ferdig
-AnyLineVentilate=Any lines to ventilate
+AnyLineVentilate=Ingen linjer å ventilere
 SelectedLines=Valgte linjer
 Lineofinvoice=Fakturalinje
-VentilatedinAccount=Ventilated successfully in the accounting account
-NotVentilatedinAccount=Not ventilated in the accounting account
+VentilatedinAccount=Vellykket ventilering i regnskapskonto
+NotVentilatedinAccount=Ikke ventilert i regnskapskonto
 
 ACCOUNTING_SEPARATORCSV=Kolonneseparator for exportfil
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50)
-ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements
-ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "Breakdown" by the most recent elements
+ACCOUNTING_LIMIT_LIST_VENTILATION=Antall elementer for ventilering viset per side (maks anbefalt: 50)
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begynn sortering av ventilering "Må ventileres" etter de nyeste elementene
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begynn sortering av fordelingssidene "Fordeling" etter de nyeste elementene
 
-AccountLength=Length of the accounting accounts shown in Dolibarr
-AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software.
-ACCOUNTING_LENGTH_DESCRIPTION=Length for displaying product & services description in listings (Best = 50)
-ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Length for displaying product & services account description form in listings (Best = 50)
-ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounts
-ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounts
+AccountLength=Lengde på regskapskontoer i Dolibarr
+AccountLengthDesc=Funksjon for å simulere lengde på regnskapskonto ved å erstatte mellomrom med tallet null. Denne funksjonen påvirker bare skjermen, det endrer ikke de regnskapskontoene som er registrert i Dolibarr. For eksport, er denne funksjonen nødvendig for å være kompatibel med enkelte programvarer.
+ACCOUNTING_LENGTH_DESCRIPTION=Lengde for visning av varer- og tjenesterbeskrivelser i lister (Anbefalt = 50)
+ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Lengde for visning av varer- og tjenesters kontobeskrivelser i lister (Anbefalt = 50)
+ACCOUNTING_LENGTH_GACCOUNT=Lengde på generelle kontoer
+ACCOUNTING_LENGTH_AACCOUNT=Lengde på tredjeparts-kontoer
 
 ACCOUNTING_SELL_JOURNAL=Salgsjournal
 ACCOUNTING_PURCHASE_JOURNAL=Innkjøpsjournal
 ACCOUNTING_MISCELLANEOUS_JOURNAL=Diverseprotokoll
-ACCOUNTING_EXPENSEREPORT_JOURNAL=Expense report journal
-ACCOUNTING_SOCIAL_JOURNAL=Social journal
+ACCOUNTING_EXPENSEREPORT_JOURNAL=Utgiftsjournal
+ACCOUNTING_SOCIAL_JOURNAL=Sosialjournal
 
-ACCOUNTING_ACCOUNT_TRANSFER_CASH=Account of transfer
-ACCOUNTING_ACCOUNT_SUSPENSE=Account of wait
+ACCOUNTING_ACCOUNT_TRANSFER_CASH=Overføring av regnskapskonto
+ACCOUNTING_ACCOUNT_SUSPENSE=Regnskapskonto på vent
 
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet)
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet)
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet)
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet)
+ACCOUNTING_PRODUCT_BUY_ACCOUNT=Standard regnskapskonto for kjøpte varer (hvis den ikke er definert på varekortet)
+ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Standard regnskapskonto for solgte varer (hvis den ikke er definert på varekortet)
+ACCOUNTING_SERVICE_BUY_ACCOUNT=Standard regnskapskonto for kjøpte tjenseter (hvis den ikke er definert på tjenestekortet)
+ACCOUNTING_SERVICE_SOLD_ACCOUNT=Standard regnskapskonto for solgte tjenester (hvis den ikke er definert på tjenestekortet)
 
 Doctype=Dokumenttype
 Docdate=Dato
 Docref=Referanse
 Numerocompte=Konto
 Code_tiers=Tredjepart
-Labelcompte=Label account
-Sens=Sens
+Labelcompte=Kontoetikett
+Sens=som betyr
 Codejournal=Journal
-NumPiece=Piece number
+NumPiece=Del nummer
 
-DelBookKeeping=Delete the records of the general ledger
+DelBookKeeping=Slett postene i hovedboken
 
 DescSellsJournal=Salgsjournal
 DescPurchasesJournal=Innkjøpsjournal
 FinanceJournal=Finansjournal
-DescFinanceJournal=Finance journal including all the types of payments by bank account
+DescFinanceJournal=Finansjournal med alle typer betalinger etter bankkonto
 
-CashPayment=Cash Payment
+CashPayment=Kontantbetaling
 
-SupplierInvoicePayment=Payment of invoice supplier
-CustomerInvoicePayment=Payment of invoice customer
+SupplierInvoicePayment=Betaling av leverandørfaktura
+CustomerInvoicePayment=Betaling av kundefaktura
 
-ThirdPartyAccount=Thirdparty account
+ThirdPartyAccount=Tredjepart-konto
 
-NewAccountingMvt=New movement
-NumMvts=Number of movement
-ListeMvts=List of the movement
-ErrorDebitCredit=Debit and Credit cannot have a value at the same time
+NewAccountingMvt=Ny bevegelse
+NumMvts=Antall bevegelser
+ListeMvts=Liste over bevegelser
+ErrorDebitCredit=Debet og kredit kan ikke ha en verdi samtidig
 
-ReportThirdParty=List thirdparty account
-DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts
+ReportThirdParty=Liste over tredjeparts-kontoer
+DescThirdPartyReport=Liste over kunder og leverandører og deres regnskapskontoer
 
-ListAccounts=List of the accounting accounts
+ListAccounts=Liste over regnskapskontoer
 
-Pcgversion=Version of the plan
-Pcgtype=Class of account
-Pcgsubtype=Under class of account
-Accountparent=Root of the account
+Pcgversion=Versjon av plan
+Pcgtype=Kontoklasse
+Pcgsubtype=Underklasse av konto
+Accountparent=Rot/base-kontoer
 
-DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers
+DescVentilCustomer=Viser den årlige økonomiske fordelingen av kundefakturaer
 TotalVente=Total omsetning før skatt
 TotalMarge=Total salgsmargin
-DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account
-DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account
-ChangeAccount=Change the accounting account for lines selected by the account:
+DescVentilDoneCustomer=Liste over kundefakturalinjer og tilhørende regnskapskonto
+DescVentilTodoCustomer=Ventiler kundefakturalinjer med tildelt regnskapskonto
+ChangeAccount=Endre regnskapskonto for valgte linjer
 Vide=-
-DescVentilSupplier=Consult here the annual breakdown accounting of your invoices suppliers
-DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account
-DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
+DescVentilSupplier=Kontroller årlig fordeling for leverandørfakturaer
+DescVentilTodoSupplier=Ventiler leverandørfakturalinjer med regnskapskonto
+DescVentilDoneSupplier=Liste over leverandørfakturalinjer og tilhørende regnskapskonto
 
-ValidateHistory=Validate Automatically
+ValidateHistory=Automatisk validering
 
-ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
+ErrorAccountancyCodeIsAlreadyUse=Feil, du kan ikke slette denne regnskapskontoen fordi den er i bruk
 MvtNotCorrectlyBalanced=Bevegelse er ikke korrekt balansert. Kredit=%s. Debet=%s
-FicheVentilation=Breakdown card
-GeneralLedgerIsWritten=Operations are written in the general ledger
+FicheVentilation=Ventilasjonskort
+GeneralLedgerIsWritten=Transaksjonene ble registrert i hovedboken
 
 MvtNotCorrectlyBalanced=Bevegelse er ikke korrekt balansert. Kredit=%s. Debet=%s
 
@@ -159,21 +159,21 @@ MvtNotCorrectlyBalanced=Bevegelse er ikke korrekt balansert. Kredit=%s. Debet=%s
 ExportFormat=Eksportformat
 Prefixname=Prefiks for ekportfil
 Separate=Eksportseparator
-Textframe=Frame of text value
+Textframe=Verdi for tekstramme
 Headercol=Kolonnenavn i filheading
 Fieldname=Feltnavn
 Headername=Overskrift
 Type=Felttyper
 Param=Tilleggsparametre
-EnabledProduct=In Product
-EnabledTiers=In third party
-EnabledVat=In VAT
+EnabledProduct=I varen
+EnabledTiers=I tredjepart
+EnabledVat=I MVA
 
 ## Tools - Init accounting account on product / service
-InitAccountancy=Init accountancy
-InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accountancy account defined for sales and purchases. Check before that setup of module accountancy is complete.
-Options=Options
-OptionModeProductSell=Mode sales
-OptionModeProductBuy=Mode purchases
-OptionModeProductSellDesc=Show all products with no accounting account defined for sales.
-OptionModeProductBuyDesc=Show all products with no accounting account defined for purchases.
+InitAccountancy=Initier regnskap
+InitAccountancyDesc=Denne siden kan brukes til å initialisere en regnskapskonto for produkter og tjenester som ikke har regnskap konto definert for salg og kjøp. Sjekk først at oppsett av  regnskapsmodulen er komplett.
+Options=Innstillinger
+OptionModeProductSell=Salgsmodus
+OptionModeProductBuy=Innkjøpsmodus
+OptionModeProductSellDesc=Vis alle produkter for salg uten regnskapskonto
+OptionModeProductBuyDesc=Vis alle produkter for innkjøp uten regnskapskonto
diff --git a/htdocs/langs/nb_NO/admin.lang b/htdocs/langs/nb_NO/admin.lang
index fc8913e3e9a..7a09ddf6658 100644
--- a/htdocs/langs/nb_NO/admin.lang
+++ b/htdocs/langs/nb_NO/admin.lang
@@ -154,7 +154,7 @@ Purge=Utrenskning
 PurgeAreaDesc=Denne siden lar deg slette alle filer opprettet eller lagret av Dolibarr (midlertidige filer eller alle filer i mappen <b>%s</b>). Normalt er det ikke nødvendig å bruke denne funksjonen. Den er laget for brukere som har Dolibarr installert på en delt server, og hvor man ikke har tilgang til å slette filer opprettet av webserveren.
 PurgeDeleteLogFile=Slett loggfil <b>%s</b> definert for Syslog-modul (ingen risiko for å miste data)
 PurgeDeleteTemporaryFiles=Slett alle midlertidige filer (medfører ingen risiko for å miste data)
-PurgeDeleteTemporaryFilesShort=Delete temporary files
+PurgeDeleteTemporaryFilesShort=Slett temporære filer
 PurgeDeleteAllFilesInDocumentsDir=Slett alle filer i mappen <b>%s</b>. Dette vil slette midlertidige filer, database sikkerhetskopier og filer som er lastet opp som vedlegg til elementer (tredjeparter, fakturaer osv. ). Alle filer lastet opp i ECM-modulen vil bli slettet.
 PurgeRunNow=Start utrenskning
 PurgeNothingToDelete=Ingen mapper eller filer å slette.
@@ -282,6 +282,7 @@ ModuleSetup=Modulinnstillinger
 ModulesSetup=Modulinnstillinger
 ModuleFamilyBase=System
 ModuleFamilyCrm=Kunderelasjonshåndtering (CRM)
+ModuleFamilySrm=Supplier Relation Management (SRM)
 ModuleFamilyProducts=Products Management/Varehåndtering (PM)
 ModuleFamilyHr=Human Resource Management (HRM)
 ModuleFamilyProjects=Prosjekter/Samarbeid
@@ -587,6 +588,7 @@ Permission38=Eksporter varer
 Permission41=Les prosjekter og oppgaver (delte prosjekter og de jeg er kontakt for). Her kan du også legge inn tidsbruk på tildelte oppgaver (timelister)
 Permission42=Opprett/endre prosjekter(delte og de jeg er kontakt for)
 Permission44=Slett prosjekter (delte og mine egne)
+Permission45=Export projects
 Permission61=Vis intervensjoner
 Permission62=Opprett/endre intervensjoner
 Permission64=Slett intervensjoner
@@ -640,6 +642,7 @@ Permission162=Opprett/endre kontrakter/abonnementer
 Permission163=Aktiver en tjeneste/abonnement i en kontrakt
 Permission164=Deaktiver en tjeneste/abonnement i en kontrakt
 Permission165=Slett kontrakter/abonnementer
+Permission167=Export contracts
 Permission171=Les reiser og utgifter (dine og underordnedes)
 Permission172=Opprett/endre reiser og utgifter
 Permission173=Slett reiser og utgifter
@@ -788,6 +791,7 @@ Permission2403=Slett hendelser (hendelser og oppgaver) relatert til egen brukerk
 Permission2411=Les handlinger (hendelser eller oppgaver) av andre
 Permission2412=Opprett/endre handlinger (hendelser eller oppgaver) for andre
 Permission2413=Slett handlinger (hendelser eller oppgaver) for andre
+Permission2414=Export actions/tasks of others
 Permission2501=Vise/last ned dokumenter
 Permission2502=Last ned dokumenter
 Permission2503=Send eller slett dokumenter
@@ -1091,7 +1095,7 @@ SendmailOptionMayHurtBuggedMTA=Funksjonen for å sende e-post ved hjelp av metod
 TranslationSetup=Konfigurasjon de la traduction
 TranslationDesc=Valg av språk som er synlig på skjermen kan endres: <br> * Globalt fra menyen <strong>Hjem - Setup - Display</strong> <br> * For brukeren bare fra kategorien <strong>Bruker visning</strong> av brukerkort (klikk på innlogging på toppen av skjermen).
 TranslationOverwriteDesc=Du kan også endre verdier ved å fylle ut/endre følgende tabell. Du må bruke "%s" for språk-kode, "%s" for kilde i filen langs/xx_XX/språk.lang og "%s" for ny oversettelse.
-TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
+TotalNumberOfActivatedModules=Totalt antall aktiverte moduler: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=Du må minst aktivere en modul
 ClassNotFoundIntoPathWarning=Klasse %s ikke funnet i PHP banen
 YesInSummer=Ja i sommer
@@ -1641,7 +1645,7 @@ CloseFiscalYear=Lukk regnskapsår
 DeleteFiscalYear=Slett regnskapsår
 ConfirmDeleteFiscalYear=Er du sikker på at du vil slette dette regnskapsåret?
 AlwaysEditable=Kan alltid endres
-IsHidden=Is not visible
+IsHidden=Er ikke synlig
 MAIN_APPLICATION_TITLE=Tving synlig navn på program (advarsel: Å sette ditt eget navn her kan fjerne autofyll logginn-funksjonen når du bruker DoliDroid mobilapplikasjon)
 NbMajMin=Minste antall store bokstaver
 NbNumMin=Minste antall numeriske tegn
@@ -1666,7 +1670,7 @@ BackupDumpWizard=Veiviser for å bygge database-backup dumpfil
 SomethingMakeInstallFromWebNotPossible=Installasjon av ekstern modul er ikke mulig fra webgrensesnittet på grunn av:
 SomethingMakeInstallFromWebNotPossible2=På grunn av dette, er prosessen for å oppgradere beskrevet her, bare manuelle trinn en privilegert bruker kan gjøre.
 InstallModuleFromWebHasBeenDisabledByFile=Administrator har deaktivert muligheten for å installere eksterne moduler. Administrator må fjerne filen <strong>%s</strong> for å tillate dette.
-ConfFileMuseContainCustom=Installing an external module from application save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to have option<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
+ConfFileMuseContainCustom=For å installere en ekstern modul, må du lagre filene i mappen <strong>%s</strong>. For at Dolibarr skal kunne behandle denne katalogen, må du først endre <strong>conf/conf.php</strong> til <br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Fremhev tabellinjer når musen flyttes over
 HighlightLinesColor=Uthev fargen på linjen når musen føres over (holdes tom for ingen uthevning)
 TextTitleColor=Farge på sidetittel
@@ -1711,5 +1715,6 @@ TitleExampleForMaintenanceRelease=Eksempel på beskjed du kan bruke for å annon
 ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s er tilgjengelig. Versjon %s er en større utgivelse med mange nye funksjoner både for brukere og utviklere. Du kan hente den fra nedlastningsområdet http://www.dolibarr.org portal (undermappe: Stable versions). Du kan lese <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> for en komplett liste over forandringer som er gjort.
 ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s er tilgjengelig. Versjon %s er en vedlikeholdsversjon, så den inneholder bare bugreparasjoner. Vi anbefaler alle som bruker en eldre versjon om å oppgradere til denne. Som i alle vedlikeholdsversjoner, er det ingen nye funksjoner eller strukturendringer i denne versjonen. Du hente den fra nedlastningsområdet http://www.dolibarr.org portal (underkatalog: Stable versions). Du kan lese <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> for en komplett liste over endringer som er gjort.
 MultiPriceRuleDesc=Når alternativet "Flere prisnivået per vare/tjeneste" er på, kan du definere forskjellige priser (ett pr prisnivå) for hvert produkt. For å spare tid, kan du lage en regel som gir pris for hvert nivå autokalkulert i forhold til prisen på første nivå, slik at du bar legger inn en pris for hvert produkt. Denne siden er laget for å spare tid og kan være nyttig hvis prisene for hvert nivå står i forhold til første nivå. Du kan ignorere denne siden i de fleste tilfeller.
-ModelModulesProduct=Templates for product documents
-ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
+ModelModulesProduct=Maler for produkt-dokumenter
+ToGenerateCodeDefineAutomaticRuleFirst=For å være i stand til å generere automatiske koder, må du først definere program for å automatisk definere strekkodenummer.
+SeeSubstitutionVars=See * note for list of possible substitution variables
diff --git a/htdocs/langs/nb_NO/bills.lang b/htdocs/langs/nb_NO/bills.lang
index 4d3dc2dad5f..98999e88545 100644
--- a/htdocs/langs/nb_NO/bills.lang
+++ b/htdocs/langs/nb_NO/bills.lang
@@ -58,7 +58,7 @@ Payment=Betaling
 PaymentBack=Tilbakebetaling
 Payments=Betalinger
 PaymentsBack=Tilbakebetaling
-paymentInInvoiceCurrency=in invoices currency
+paymentInInvoiceCurrency=i faktura-valuta
 PaidBack=Tilbakebetalt
 DeletePayment=Slett betaling
 ConfirmDeletePayment=Er du sikker på at du vil slette denne betalingen?
@@ -107,7 +107,7 @@ EnterPaymentDueToCustomer=Lag purring til kunde
 DisabledBecauseRemainderToPayIsZero=Slått av fordi restbeløpet er null
 PriceBase=Prisgrunnlag
 BillStatus=Fakturastatus
-StatusOfGeneratedInvoices=Status of generated invoices
+StatusOfGeneratedInvoices=Status for genererte fakturaer
 BillStatusDraft=Kladd (må valideres)
 BillStatusPaid=Betalt
 BillStatusPaidBackOrConverted=Betalt eller konvertert til rabatt
@@ -141,10 +141,10 @@ ErrorCantCancelIfReplacementInvoiceNotValidated=Feil: Kan ikke kansellere en fak
 BillFrom=Fra
 BillTo=Til
 ActionsOnBill=Handlinger på faktura
-RecurringInvoiceTemplate=Recurring invoice
-NoQualifiedRecurringInvoiceTemplateFound=No recurring template invoice qualified for generation.
-FoundXQualifiedRecurringInvoiceTemplate=Found %s recurring template invoice(s) qualified for generation.
-NotARecurringInvoiceTemplate=Not a recurring template invoice
+RecurringInvoiceTemplate=Gjentagende faktura
+NoQualifiedRecurringInvoiceTemplateFound=Ingen gjentagende-fakturamal kvalifisert for generering
+FoundXQualifiedRecurringInvoiceTemplate=Fant %s gjentagende-fakturamal(er) kvalifisert for generering.
+NotARecurringInvoiceTemplate=Ikke en mal for gjentagende faktura
 NewBill=Ny faktura
 LastBills=Siste %s fakturaer
 LastCustomersBills=Siste %s kundefakturaer
@@ -205,7 +205,7 @@ Rest=Venter
 AmountExpected=Beløp purret
 ExcessReceived=Overskytende
 EscompteOffered=Rabatt innrømmet (betalt før forfall)
-EscompteOfferedShort=Discount
+EscompteOfferedShort=Rabatt
 SendBillRef=Innsendelse av faktura %s
 SendReminderBillRef=Innsendelse av faktura %s (påminnelse)
 StandingOrders=Faste ordre
@@ -219,6 +219,7 @@ RemainderToBill=Resterende til fakturering
 SendBillByMail=Send faktura med e-post
 SendReminderBillByMail=Send påminnelse med e-post
 RelatedCommercialProposals=Relaterte tilbud
+RelatedRecurringCustomerInvoices=Related recurring customer invoices
 MenuToValid=Til validering
 DateMaxPayment=Forfallsdato
 DateEcheance=Forfallsdato
@@ -308,23 +309,22 @@ RelatedSupplierInvoices=Relaterte leverandørfakturaer
 LatestRelatedBill=Siste tilknyttede faktura
 WarningBillExist=Advarsel: en eller flere fakturaer finnes allerede
 MergingPDFTool=Verktøy for fletting av PDF 
-AmountPaymentDistributedOnInvoice=Payment amount distributed on invoice
+AmountPaymentDistributedOnInvoice=Beløp fordelt på faktura
 PaymentNote=Betalingsnotat
 ListOfPreviousSituationInvoices=Liste over tidligere delfakturaer
 ListOfNextSituationInvoices=Liste over kommende delfakturaer
-FrequencyPer_d=Every %s days
-FrequencyPer_m=Every %s months
-FrequencyPer_y=Every %s years
-toolTipFrequency=Examples:<br /><b>Set 7 / day</b>: give a new invoice every 7 days<br /><b>Set 3 / month</b>: give a new invoice every 3 month
-NextDateToExecution=Date for next invoice generation
-DateLastGeneration=Date of last generation
-MaxPeriodNumber=Max nb of invoice generation
-RestPeriodNumber=Rest period number
-NbOfGenerationDone=Nb of invoice generation already done
-InvoiceAutoValidate=Automatically validate invoice
-GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
-DateIsNotEnough=Date not yet reached
-InvoiceGeneratedFromTemplate=Invoice %s generated from recurring template invoice %s
+FrequencyPer_d=Hver %s dag
+FrequencyPer_m=Hver %s måned
+FrequencyPer_y=Hver %s år
+toolTipFrequency=Eksempler:<br /><b>Sett 7 / dag</b>: gir en ny faktura hver 7. dag<br /><b>Sett 3 / måned</b>: gir en ny faktura hver 3. måned
+NextDateToExecution=Dato for neste fakturagenerering
+DateLastGeneration=Dato for forrige generering
+MaxPeriodNumber=Maks ant for fakturagenerering
+NbOfGenerationDone=Ant. fakturaer som allerede er generert
+InvoiceAutoValidate=Valider faktura automatisk
+GeneratedFromRecurringInvoice=Generert fra gjentagende-fakturamal %s
+DateIsNotEnough=Dato ikke nådd enda
+InvoiceGeneratedFromTemplate=Faktura %s generert fra gjentagende-fakturamal %s
 # PaymentConditions
 PaymentConditionShortRECEP=Kontant
 PaymentConditionRECEP=Kontant
@@ -421,7 +421,7 @@ Reported=Forsinket
 DisabledBecausePayments=Ikke mulig siden det er noen betalinger
 CantRemovePaymentWithOneInvoicePaid=Kan ikke fjerne betalingen siden det er minst en faktura som er klassifisert som betalt
 ExpectedToPay=Forventet innbetaling
-CantRemoveConciliatedPayment=Can't remove conciliated payment
+CantRemoveConciliatedPayment=Kan ikke fjerne avtalt beløp
 PayedByThisPayment=Betales av denne innbetalingen
 ClosePaidInvoicesAutomatically=Klassifiser alle fakturaer (alle typer) som betalt
 ClosePaidCreditNotesAutomatically=Klassifiser alle fakturaer som betalt
@@ -469,5 +469,9 @@ PDFCrevetteSituationInvoiceTitle=Delfaktura
 PDFCrevetteDescription=PDF fakturamal Crevette.En komplett mal for delfaktura
 PDFCrevetteSituationInvoiceLine=Del N°%s : Fakt. N°%s på %s
 TotalSituationInvoice=Totalt deler
-invoiceLineProgressError=Invoice line progress can't be egal or upper the next invoice line
+invoiceLineProgressError=Fakturalinje progresjon kan ikke være lik eller høyere enn neste fakturalinje
 updatePriceNextInvoiceErrorUpdateline=Feil: oppdater pris på fakturalinje: %s
+ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
+ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
+ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
+
diff --git a/htdocs/langs/nb_NO/boxes.lang b/htdocs/langs/nb_NO/boxes.lang
index ad11e57c441..314fa88f5fd 100644
--- a/htdocs/langs/nb_NO/boxes.lang
+++ b/htdocs/langs/nb_NO/boxes.lang
@@ -60,8 +60,8 @@ BoxTitleLastContracts=Siste %s kontrakter
 BoxTitleLastModifiedDonations=Siste %s endrede donasjoner
 BoxTitleLastModifiedExpenses=Siste %s endrede utgiftsrapporter
 BoxGlobalActivity=Global aktivitet (fakturaer, tilbud, ordrer)
-BoxGoodCustomers=Good Customers
-BoxTitleGoodCustomers=%s Good Customers
+BoxGoodCustomers=Gode kunder
+BoxTitleGoodCustomers=%s gode kunder
 FailedToRefreshDataInfoNotUpToDate=Klarte ikke å oppdatere RSS-strøm. Siste vellykkede oppdatering: %s
 LastRefreshDate=Siste oppdateringsdato
 NoRecordedBookmarks=Ingen bokmerker definert. Trykk <a href="%s">her</a> for å legge til bokmerker.
@@ -97,4 +97,4 @@ ForCustomersInvoices=Kundens fakturaer
 ForCustomersOrders=Kundeordrer
 ForProposals=Tilbud
 LastXMonthRolling=Rullering av de siste %s måneder
-ChooseBoxToAdd=Add a box to your dashboard...
+ChooseBoxToAdd=Legg til en boks i ditt kontrollpanel...
diff --git a/htdocs/langs/nb_NO/companies.lang b/htdocs/langs/nb_NO/companies.lang
index 97a19148e93..4eaeffa0dfb 100644
--- a/htdocs/langs/nb_NO/companies.lang
+++ b/htdocs/langs/nb_NO/companies.lang
@@ -202,8 +202,8 @@ ProfId3IN=Prof ID 3 (SRVC TAX)
 ProfId4IN=Prof ID 4
 ProfId5IN=Prof Id 5
 ProfId6IN=-
-ProfId1LU=Id. prof. 1 (RCS)
-ProfId2LU=Id. prof. 2 (Business permit)
+ProfId1LU=Prof. ID 1 (R.C.S Luxembourg)
+ProfId2LU=Prof. ID (Forretningslisens)
 ProfId3LU=-
 ProfId4LU=-
 ProfId5LU=-
@@ -317,10 +317,12 @@ ShowContact=Vis kontaktperson
 ContactsAllShort=Alle (ingen filter)
 ContactType=Kontaktperson type
 ContactForOrders=Ordrekontakt
+ContactForOrdersOrShipments=Ordre- eller leveransekontakt
 ContactForProposals=Tilbudskontakt
 ContactForContracts=Kontraktkontakt
 ContactForInvoices=Fakturakontakt
 NoContactForAnyOrder=Kontaktpersonen er ikke tilknyttet noen ordre
+NoContactForAnyOrderOrShipment=Denne kontakten er ikke kontakt for noen ordre eller leveranser
 NoContactForAnyProposal=Kontaktpersonen er ikke tilknyttet noen tilbud
 NoContactForAnyContract=Kontaktpersonen er ikke tilknyttet noen kontrakt
 NoContactForAnyInvoice=Kontaktpersonen er ikke tilknyttet noen faktura
@@ -438,3 +440,6 @@ MergeThirdparties=Flett tredjeparter
 ConfirmMergeThirdparties=Er du sikker på at du vil flette denne tredjeparten inn i nåværende? Alle relaterte objekter (fakturaer, ordre, mm) vil bli flyttet til nåværende, slik at du kan slette den dupliserte.
 ThirdpartiesMergeSuccess=Tredjepartene er blitt flettet
 ErrorThirdpartiesMerge=Det oppsto en feil under sletting av tredjeparter. Sjekk i loggen. Endringene ble reversert
+SaleRepresentativeLogin=Innlogging for salgsrepresentant
+SaleRepresentativeFirstname=Fornavn til salgsrepresentant
+SaleRepresentativeLastname=Etternavn til salgsrepresentant
diff --git a/htdocs/langs/nb_NO/compta.lang b/htdocs/langs/nb_NO/compta.lang
index d4cc2e0ff2a..17a7acef4b4 100644
--- a/htdocs/langs/nb_NO/compta.lang
+++ b/htdocs/langs/nb_NO/compta.lang
@@ -221,4 +221,4 @@ OtherCountriesCustomersReport=Rapport over utenlandske kunder
 BasedOnTwoFirstLettersOfVATNumberBeingDifferentFromYourCompanyCountry=Basert på de at to første bokstavene i MVA-nummeret er ulik ditt eget selskaps landskode
 SameCountryCustomersWithVAT=Rapport over nasjonale kunder
 BasedOnTwoFirstLettersOfVATNumberBeingTheSameAsYourCompanyCountry=Basert på de at to første bokstavene i MVA-nummeret er det samme som ditt eget selskaps landskode
-LinkedFichinter=Link to an intervention
+LinkedFichinter=Knytt til en intervensjon
diff --git a/htdocs/langs/nb_NO/cron.lang b/htdocs/langs/nb_NO/cron.lang
index 3a213ad80e9..1c3b9ece964 100644
--- a/htdocs/langs/nb_NO/cron.lang
+++ b/htdocs/langs/nb_NO/cron.lang
@@ -16,7 +16,7 @@ KeyForCronAccess=Sikkerhetsnøkkel for URL for å starte cronjobber
 FileToLaunchCronJobs=Kommandolinje for å starte cronjobber
 CronExplainHowToRunUnix=I Unix-miljøer bør du bruke følgende crontab-oppføring for å kjøre kommandolinje hvert 5. minutt
 CronExplainHowToRunWin=I Microsoft(tm) Windows-miljø kan du bruke planlagte oppgaver-verktøyet for å kjøre kommandolinje hvert 5. minutt
-CronMethodDoesNotExists=Class %s does not contains any method %s
+CronMethodDoesNotExists=Klasse %s inneholder ingen metode %s
 # Menu
 CronJobs=Planlagte jobber
 CronListActive=Liste over aktiverte/planlagte jobber
@@ -40,8 +40,8 @@ CronNone=Ingen
 CronDtStart=Ikke før
 CronDtEnd=Ikke etter
 CronDtNextLaunch=Neste kjøring
-CronDtLastLaunch=Start date of last execution
-CronDtLastResult=End date of last execution
+CronDtLastLaunch=Startdato for forrige kjøring
+CronDtLastResult=Sluttdato for forrige kjøring
 CronFrequency=Frekvens
 CronClass=Klasse
 CronMethod=Metode
@@ -90,5 +90,5 @@ CronMenu=Cron
 CronCannotLoadClass=Kan ikke laste klasse %s eller objekt %s
 UseMenuModuleToolsToAddCronJobs=Gå til meny "Hjem - Modulverktøy - Jobbliste" for å se på og endre planlagte jobber.
 TaskDisabled=Jobb deaktivert
-MakeLocalDatabaseDumpShort=Local database backup
-MakeLocalDatabaseDump=Create a local database dump
+MakeLocalDatabaseDumpShort=Backup av lokal database
+MakeLocalDatabaseDump=Opprett lokal databasedump
diff --git a/htdocs/langs/nb_NO/errors.lang b/htdocs/langs/nb_NO/errors.lang
index 9168a5f9b92..3710c487c0b 100644
--- a/htdocs/langs/nb_NO/errors.lang
+++ b/htdocs/langs/nb_NO/errors.lang
@@ -172,6 +172,8 @@ ErrorMandatoryParametersNotProvided=Obligatorisk(e) parametre ikke angitt
 ErrorOppStatusRequiredIfAmount=Sett inn et estimert beløp for denne muligheten. Status må også settes
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
 ErrorSavingChanges=En feil oppsto under lagring av endringer
+ErrorWarehouseRequiredIntoShipmentLine=Lager er obligatorisk for å kunne levere
+ErrorFileMustHaveFormat=Filen må ha formatet %s
 
 # Warnings
 WarningPasswordSetWithNoAccount=Et passord ble satt for dette medlemmet, men ingen brukerkonto ble opprettet. Det fører til at passordet ikke kan benyttes for å logge inn på Dolibarr. Det kan brukes av en ekstern modul/grensesnitt, men hvis du ikke trenger å definere noen innlogging eller passord for et medlem, kan du deaktivere alternativet "opprett en pålogging for hvert medlem" fra medlemsmodul-oppsettet. Hvis du trenger å administrere en pålogging, men ikke trenger noe passord, kan du holde dette feltet tomt for å unngå denne advarselen. Merk: E-post kan også brukes som en pålogging dersom medlemmet er knyttet til en bruker.
diff --git a/htdocs/langs/nb_NO/exports.lang b/htdocs/langs/nb_NO/exports.lang
index ece9bea0263..2286990de9e 100644
--- a/htdocs/langs/nb_NO/exports.lang
+++ b/htdocs/langs/nb_NO/exports.lang
@@ -90,7 +90,7 @@ SelectAtLeastOneField=Bytt minst ett kildefelt i kolonnen av felt som skal ekspo
 SelectFormat=Velg dette filformatet for import
 RunImportFile=Kjør importfil
 NowClickToRunTheImport=Sjekk resultatet av importsimuleringen. Hvis alt er ok, kan du starte import.
-DataLoadedWithId=All data will be loaded with the following import id: <b>%s</b>
+DataLoadedWithId=Alle data vil bli lastet med følgende import-ID: <b>%s</b>
 ErrorMissingMandatoryValue=Obligatorisk data er tomt i kildefilen for feltet <b>%s.</b>
 TooMuchErrors=Det er fortsatt <b>%s</b> andre kildelinjer med feil, og importen har vært begrenset.
 TooMuchWarnings=Det er fortsatt <b>%s</b> andre kildelinjer med advarsler, og importen har vært begrenset.
@@ -128,9 +128,13 @@ SpecialCode=Spesialkode
 ExportStringFilter=%% tillater at at en eller flere karakterer i teksten kan erstattes
 ExportDateFilter=ÅÅÅÅ, ÅÅÅÅMM, ÅÅÅÅMMDD : filtrert etter år/måned/dag<br>ÅÅÅÅ+ÅÅÅÅ, ÅÅÅÅMM+ÅÅÅÅMM, ÅÅÅÅMMDD+ÅÅÅÅMMDD: filtrerer en tidsperiode<br> > ÅÅÅÅ, > ÅÅÅÅMM, > ÅÅÅÅMMDD: filteret velger alle påfølgende år<br> < ÅÅÅÅ, < ÅÅÅÅMM, < ÅÅÅÅMMDD: filteret velger alle foregående år
 ExportNumericFilter='NNNNN' filtrer etter en verdi<br>'NNNNN+NNNNN' filtrerer etter verdirekke<br>'&gt;NNNNN' filtrerer etter synkende verdier<br>'&gt;NNNNN' filtrerer etter stigende verdier
+ImportFromLine=Import starter fra linjenummer
+EndAtLineNb=Slutter på linjenummer
+SetThisValueTo2ToExcludeFirstLine=For eksempel, sett denne verdien til 3 for å eksludere de 2 første linjene
+KeepEmptyToGoToEndOfFile=Hold dette feltet tomt for å få med alt til slutten av filen
 ## filters
 SelectFilterFields=Hvis du vil filtrere etter noen verdier, kan du endre dem her
-FilterableFields=Filterable Fields
+FilterableFields=Filtrerbare felt
 FilteredFields=Filtrerte felt
 FilteredFieldsValues=Filterverdi
 FormatControlRule=Format kontrollregel
diff --git a/htdocs/langs/nb_NO/languages.lang b/htdocs/langs/nb_NO/languages.lang
index 24050e88558..1cbe6e62955 100644
--- a/htdocs/langs/nb_NO/languages.lang
+++ b/htdocs/langs/nb_NO/languages.lang
@@ -32,7 +32,7 @@ Language_es_MX=Spansk (Mexico)
 Language_es_PY=Spansk (Paraguay)
 Language_es_PE=Spansk (Peru)
 Language_es_PR=Spansk (Puerto Rico)
-Language_es_VE=Spanish (Venezuela)
+Language_es_VE=Spansk (Venezuela)
 Language_et_EE=Estonsk
 Language_eu_ES=Baskisk
 Language_fa_IR=Persisk
diff --git a/htdocs/langs/nb_NO/mails.lang b/htdocs/langs/nb_NO/mails.lang
index ae8d9a3afc0..ebc0b31a7ca 100644
--- a/htdocs/langs/nb_NO/mails.lang
+++ b/htdocs/langs/nb_NO/mails.lang
@@ -47,7 +47,7 @@ MailingSuccessfullyValidated=Utsendelse validert
 MailUnsubcribe=Avmelding
 Unsuscribe=Avmelding
 MailingStatusNotContact=Skal ikke kontaktes flere ganger
-MailingStatusReadAndUnsubscribe=Read and unsubscribe
+MailingStatusReadAndUnsubscribe=Les og meld ut
 ErrorMailRecipientIsEmpty=E-postmottager er ikke oppgitt
 WarningNoEMailsAdded=Ingen ny e-postadresse å legge til mottagerlisten.
 ConfirmValidMailing=Er du sikker på at du vil validere utsendelsen?
diff --git a/htdocs/langs/nb_NO/main.lang b/htdocs/langs/nb_NO/main.lang
index 5235d2182fa..90ed80b0da2 100644
--- a/htdocs/langs/nb_NO/main.lang
+++ b/htdocs/langs/nb_NO/main.lang
@@ -25,6 +25,7 @@ FormatDateHourTextShort=%d. %b %Y %H:%M
 FormatDateHourText=%d. %B %Y %H:%M
 DatabaseConnection=Databasetilkobling
 NoTemplateDefined=Ingen maler er opprettet for denne epost-typen
+AvailableVariables=Available substitution variables
 NoTranslation=Ingen oversettelse
 NoRecordFound=Ingen post funnet
 NoError=Ingen feil
@@ -311,7 +312,7 @@ UnitPriceHT=Enhetspris (netto)
 UnitPriceTTC=Enhetspris
 PriceU=Pris
 PriceUHT=Pris (netto)
-PriceUHTCurrency=U.P (currency)
+PriceUHTCurrency=U.P (valuta)
 SupplierProposalUHT=U.P. net forespurt
 PriceUTTC=U.P. (inkl. avgift)
 Amount=Beløp
@@ -322,9 +323,9 @@ AmountTTCShort=Beløp (inkl. MVA)
 AmountHT=Beløp (eksl. MVA)
 AmountTTC=Beløp (inkl. MVA)
 AmountVAT=MVA beløp
-MulticurrencyAmountHT=Amount (net of tax), original currency
-MulticurrencyAmountTTC=Amount (inc. of tax), original currency
-MulticurrencyAmountVAT=Amount tax, original currency
+MulticurrencyAmountHT=Beløp (eks. MVA), original valuta
+MulticurrencyAmountTTC=Beløp (ink. MVA), original valuta
+MulticurrencyAmountVAT=MVA-beløp, original valuta
 AmountLT1=Beløp MVA 2
 AmountLT2=Beløp MVA 3
 AmountLT1ES=Beløp RE
@@ -339,7 +340,7 @@ Percentage=Prosent
 Total=Totalt
 SubTotal=Subtotal
 TotalHTShort=Totalt (netto)
-TotalHTShortCurrency=Total (net in currency)
+TotalHTShortCurrency=Total (netto i valuta)
 TotalTTCShort=Totalt (inkl. MVA)
 TotalHT=Totalt (eksl. MVA)
 TotalHTforthispage=Totalt (eks. MVA) for denne siden
@@ -462,7 +463,7 @@ Datas=Data
 None=Ingen
 NoneF=Ingen
 Late=Forsinket
-LateDesc=Delay to define if a record is late or not depends on your setup. Ask your admin to change delay from menu Home - Setup - Alerts.
+LateDesc=Forsinkelse for å bestemme om en post er forsinket eller ikke bestemmes i oppsettet. Kontakt Admin for å endre dette i Hjem - Oppsett - Varslinger.
 Photo=Bilde
 Photos=Bilder
 AddPhoto=Legg til bilde
@@ -545,7 +546,7 @@ NbOfCustomers=Antall kunder
 NbOfLines=Antall linjer
 NbOfObjects=Antall objekter
 NbOfReferers=Antall referanser
-NbOfObjectReferers=Number of refering objects
+NbOfObjectReferers=Antall refererende objekter
 Referers=Henvisende objekter
 TotalQuantity=Total mengde
 DateFromTo=Fra %s til %s
@@ -701,7 +702,7 @@ LinkedToSpecificUsers=Knyttet til en bestemt brukerkontakt
 DeleteAFile=Slett en fil
 ConfirmDeleteAFile=Er du sikker på at du vil slette filen
 NoResults=Ingen resultater
-AdminTools=Admin tools
+AdminTools=Administrative verktøy
 SystemTools=Systemverktøy
 ModulesSystemTools=Modulverktøy
 Test=Test
@@ -740,8 +741,8 @@ Hello=Hei
 Sincerely=Med vennlig hilsen
 DeleteLine=Slett linje
 ConfirmDeleteLine=Er du sikker på at du vil slette denne linjen?
-NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked records
-TooManyRecordForMassAction=Too many records selected for mass action. Such action are restriced to a list of %s records.
+NoPDFAvailableForDocGenAmongChecked=Ingen PDF-generering var tilgjengelig for avkryssede dokumenter
+TooManyRecordForMassAction=For mange poster valg for massehandling. Maksimum tillat er %s poster
 # Week day
 Monday=Mandag
 Tuesday=Tirsdag
diff --git a/htdocs/langs/nb_NO/orders.lang b/htdocs/langs/nb_NO/orders.lang
index 95c017d403d..4b9cbbc361f 100644
--- a/htdocs/langs/nb_NO/orders.lang
+++ b/htdocs/langs/nb_NO/orders.lang
@@ -32,6 +32,7 @@ StatusOrderSent=Under transport
 StatusOrderOnProcessShort=Bestilt
 StatusOrderProcessedShort=Behandlet
 StatusOrderDelivered=Levert
+StatusOrderDeliveredShort=Levert
 StatusOrderToBillShort=Levert
 StatusOrderToBill2Short=Til fakturering
 StatusOrderApprovedShort=Godkjent
diff --git a/htdocs/langs/nb_NO/products.lang b/htdocs/langs/nb_NO/products.lang
index 8941e97765e..447207d8e3a 100644
--- a/htdocs/langs/nb_NO/products.lang
+++ b/htdocs/langs/nb_NO/products.lang
@@ -45,10 +45,6 @@ LastProducts=Siste varer
 CardProduct0=Varekort
 CardProduct1=Tjenestekort
 CardContract=Kontraktkort
-Warehouse=Lager
-Warehouses=Lagere
-WarehouseOpened=Lager åpent
-WarehouseClosed=Lager lukket
 Stock=Beholdning
 Stocks=Beholdninger
 Movement=Bevegelse
@@ -295,11 +291,11 @@ ComposedProductIncDecStock=Øk/minsk beholdning ved overordnet endring
 ComposedProduct=Sub-vare
 MinSupplierPrice=Minste leverandørpris
 DynamicPriceConfiguration=Dynamisk pris-konfigurering
-DynamicPriceDesc=On product card, with this module enabled, you should be able to set mathematic functions to calculate Customer or Supplier prices. Such function can use all mathematic operators, some constants and variables. You can set here the variables you want to be able and if the variable need an automatic update, the external URL to use to ask Dolibarr to update automaticaly the value.
-AddVariable=Add Variable
-AddUpdater=Add Updater
+DynamicPriceDesc=På produktkort , med denne modulen aktivert, vil du kunne sette matematiske funksjoner for å beregne kunde- eller leverandørpriser. En slik funksjon kan bruke alle matematiske operatorer , noen konstanter og variabler. Du kan legge inn de variablene du ønsker, og hvis variablene trenger automatisk oppdatering, mot en ekstern nettadresse, kan Dolibarr utføre dette.
+AddVariable=Legg til variabel
+AddUpdater=Velg oppdaterer
 GlobalVariables=Globale variabler
-VariableToUpdate=Variable to update
+VariableToUpdate=Variabel å oppdatere
 GlobalVariableUpdaters=Oppdatering av globale variabler
 GlobalVariableUpdaterType0=JSON data
 GlobalVariableUpdaterHelp0=Parser JSON data fra angitt URL, VALUE spesifiserer lokasjonen til relevant verdi.
@@ -317,4 +313,12 @@ DefaultPriceRealPriceMayDependOnCustomer=Standardpris, virkelig pris avhenger av
 WarningSelectOneDocument=Velg minst ett dokument
 DefaultUnitToShow=Enhet
 NbOfQtyInProposals=Antall i tilbud
-ClinkOnALinkOfColumn=Click on a link of column %s to get a detailed view...
+ClinkOnALinkOfColumn=Klikk på en link i kolonnen %s for detaljert visning...
+TranslatedLabel=Oversatt etikett
+TranslatedDescription=Oversatt beskrivelse
+TranslatedNote=Oversatte notater
+ProductWeight=Weight for 1 product
+ProductVolume=Volume for 1 product
+WeightUnits=Vektenhet
+VolumeUnits=Volume unit
+SizeUnits=Størrelseenhet
diff --git a/htdocs/langs/nb_NO/projects.lang b/htdocs/langs/nb_NO/projects.lang
index 37315060ba2..c57648d77d1 100644
--- a/htdocs/langs/nb_NO/projects.lang
+++ b/htdocs/langs/nb_NO/projects.lang
@@ -5,7 +5,7 @@ ProjectId=Prosjekt-ID
 ProjectLabel=Prosjektetikett
 Project=Prosjekt
 Projects=Prosjekter
-ProjectsArea=Projects Area
+ProjectsArea=Prosjektområde
 ProjectStatus=Prosjektstatus
 SharedProject=Alle
 PrivateProject=Kontaktpersoner for prosjektet
@@ -20,7 +20,7 @@ TasksPublicDesc=Denne visningen presenterer alle prosjekter og oppgaver du har l
 TasksDesc=Denne visningen presenterer alle prosjekter og oppgaver (dine brukertillatelser gir deg tillatelse til å vise alt).
 AllTaskVisibleButEditIfYouAreAssigned=Alle oppgaver for et slikt prosjekt er synlige, men du kan angi tid bare for oppgaven du er tildelt. Tildel oppgaven til deg hvis du ønsker å legge inn tid på den.
 OnlyYourTaskAreVisible=Kun oppgaver tildelt deg er synlige
-ProjectsArea=Projects Area
+ProjectsArea=Prosjektområde
 NewProject=Nytt prosjekt
 AddProject=Opprett prosjekt
 DeleteAProject=Slett et prosjekt
@@ -68,12 +68,15 @@ Activities=Oppgaver/aktiviteter
 MyActivity=Min aktivitet
 MyActivities=Mine oppgaver/aktiviteter
 MyProjects=Mine prosjekter
-MyProjectsArea=My projects Area
+MyProjectsArea=Område for mine prosjekt
 DurationEffective=Effektiv varighet
 Progress=Progresjon
 ProgressDeclared=Erklært progresjon
 ProgressCalculated=Kalkulert progresjon
 Time=Tid
+ListOfTasks=List of tasks
+GoToListOfTimeConsumed=Go to list of time consumed
+GoToListOfTasks=Go to list of tasks
 ListProposalsAssociatedProject=Oversikt over tilbud relatert til dette prosjektet
 ListOrdersAssociatedProject=Oversikt over ordre relatert til dette prosjektet
 ListInvoicesAssociatedProject=Oversikt over fakturaer relatert til dette prosjektet
@@ -185,9 +188,9 @@ TaskAssignedToEnterTime=Oppgave tildelt. Tidsbruk kan legges til
 IdTaskTime=Oppgave-tid ID
 YouCanCompleteRef=Hvis du ønsker å fullføre referansen med litt informasjon (for å bruke det som søkefiltre), er det anbefalt å legge til et - tegn for å skille den, så den automatiske nummereringen fortsatt vil fungere korrekt for neste prosjekt. For eksempel %s-ABC. Du kan også legge søkenøkler til etiketter.
 OpenedProjectsByThirdparties=Prosjekter åpnet av tredjeparter
-OnlyOpportunitiesShort=Only opportunities
-OpenedOpportunitiesShort=Opened opportunities
-NotAnOpportunityShort=Not an opportunity
+OnlyOpportunitiesShort=Kun muligheter
+OpenedOpportunitiesShort=Åpne muligheter
+NotAnOpportunityShort=Ikke en mulighet
 OpportunityTotalAmount=Totalbeløp på muligheter
 OpportunityPonderatedAmount=Gjennomsnittsbeløp på muligheter
 OpportunityPonderatedAmountDesc=Muligheter - beløp vektet med sannsynlighet
@@ -198,3 +201,4 @@ OppStatusNEGO=Forhandling
 OppStatusPENDING=Venter
 OppStatusWIN=Vunnet
 OppStatusLOST=Tapt
+Budget=Budget
diff --git a/htdocs/langs/nb_NO/receiptprinter.lang b/htdocs/langs/nb_NO/receiptprinter.lang
index 4f3e03aaa48..556c8571276 100644
--- a/htdocs/langs/nb_NO/receiptprinter.lang
+++ b/htdocs/langs/nb_NO/receiptprinter.lang
@@ -1,10 +1,10 @@
 # Dolibarr language file - Source file is en_US - receiptprinter
-ReceiptPrinterSetup=Setup of module ReceiptPrinter
+ReceiptPrinterSetup=Oppsett av modulen Printere
 PrinterAdded=Skriver %s lagt til
 PrinterUpdated=Skriver %s oppdater
 PrinterDeleted=Skriver %s slettet
 TestSentToPrinter=Test sendt til skriver %s
-ReceiptPrinter=Receipt printers
+ReceiptPrinter=Printere
 ReceiptPrinterDesc=Skriveroppsett
 ReceiptPrinterTemplateDesc=Oppsett av maler
 ReceiptPrinterTypeDesc=Beskrivelse av skrivertype
diff --git a/htdocs/langs/nb_NO/sendings.lang b/htdocs/langs/nb_NO/sendings.lang
index 211e81f51b6..4993e6d7e93 100644
--- a/htdocs/langs/nb_NO/sendings.lang
+++ b/htdocs/langs/nb_NO/sendings.lang
@@ -70,6 +70,8 @@ ProductQtyInSuppliersOrdersRunning=Varekvantum i åpnede leverandørordre
 ProductQtyInShipmentAlreadySent=Varekvantum i åpnede kundeordre som er sendt
 ProductQtyInSuppliersShipmentAlreadyRecevied=Varekvantum i åpnede leverandørordre som er mottatt
 NoProductToShipFoundIntoStock=Ingen varer for utsendelse funnet på lager <b>%s</b>. Korriger varebeholdning eller gå tilbake for å velge et annet lager.
+WeightVolShort=Weight/Vol.
+ValidateOrderFirstBeforeShipment=You must first validate the order before being able to make shipments.
 
 # Sending methods
 SendingMethodCATCH=Hentet av kunde
diff --git a/htdocs/langs/nb_NO/stocks.lang b/htdocs/langs/nb_NO/stocks.lang
index 91c2a10451e..ad7c314bd61 100644
--- a/htdocs/langs/nb_NO/stocks.lang
+++ b/htdocs/langs/nb_NO/stocks.lang
@@ -34,8 +34,8 @@ LastMovements=Siste bevegelser
 Units=Enheter
 Unit=Enhet
 StockCorrection=Korriger lagerbeholdning
-StockTransfer=Transfer stock
-MassStockTransferShort=Mass stock transfer
+StockTransfer=Overfør lagerbeholdning
+MassStockTransferShort=Masse-lageroverføring
 StockMovement=Lagerbevegelse
 StockMovements=Lagerbevegelser
 LabelMovement=Bevegelse-etikett
diff --git a/htdocs/langs/nb_NO/supplier_proposal.lang b/htdocs/langs/nb_NO/supplier_proposal.lang
index 3320b64bbbe..7677ea935a2 100644
--- a/htdocs/langs/nb_NO/supplier_proposal.lang
+++ b/htdocs/langs/nb_NO/supplier_proposal.lang
@@ -7,7 +7,7 @@ CommRequest=Prisforespørsel
 CommRequests=Prisforespørsel
 SearchRequest=Finn en forspørsel
 DraftRequests=Forespørsel-kladder
-SupplierProposalsDraft=Draft supplier proposals
+SupplierProposalsDraft=Leverandørtilbud-maler
 LastModifiedRequests=Siste %s modifiserte prisforespørsler
 RequestsOpened=Åpne prisforespørsler
 SupplierProposalArea=Område for leverandørtilbud
@@ -58,3 +58,5 @@ DefaultModelSupplierProposalCreate=Standardmodell for opprettelse
 DefaultModelSupplierProposalToBill=Standardmal når prisforespørsel lukkes (akkseptert)
 DefaultModelSupplierProposalClosed=Default template when closing a price request (avvist)
 ListOfSupplierProposal=Liste over prisforespørsler hos leverandører
+SupplierProposalsToClose=Supplier proposals to close
+SupplierProposalsToProcess=Supplier proposals to process
diff --git a/htdocs/langs/nb_NO/users.lang b/htdocs/langs/nb_NO/users.lang
index 83ede89dec9..fef6610c5c7 100644
--- a/htdocs/langs/nb_NO/users.lang
+++ b/htdocs/langs/nb_NO/users.lang
@@ -122,4 +122,4 @@ LoginUsingOpenID=Bruk OpenID til å logge inn
 WeeklyHours=Uketimer
 ColorUser=Farge på bruker
 DisabledInMonoUserMode=Deaktivert i vedlikeholds-modus
-UserAccountancyCode=User accountancy code
+UserAccountancyCode=Regnskapskonto for bruker
diff --git a/htdocs/langs/nl_NL/admin.lang b/htdocs/langs/nl_NL/admin.lang
index e37f6bd3914..f3f362698ae 100644
--- a/htdocs/langs/nl_NL/admin.lang
+++ b/htdocs/langs/nl_NL/admin.lang
@@ -282,6 +282,7 @@ ModuleSetup=Module-instellingen
 ModulesSetup=Instellingen van modules
 ModuleFamilyBase=Systeem
 ModuleFamilyCrm=Customer Relation Management (CRM)
+ModuleFamilySrm=Supplier Relation Management (SRM)
 ModuleFamilyProducts=Products Management (PM)
 ModuleFamilyHr=Human Resource Management (HR)
 ModuleFamilyProjects=Projecten / Samenwerkingen
@@ -587,6 +588,7 @@ Permission38=Export producten
 Permission41=Lees projecten en taken (gedeeld project en project waarvan ik contactpersoon ben). Kan ook de gebruikte tijd invoeren op toegewezen taken (rooster).
 Permission42=Creëer / wijzig projecten (Gedeelde projecten en projecten waarvoor ik de contactpersoon ben)
 Permission44=Verwijder projecten (Gedeelde projecten en projecten waarvoor ik de contactpersoon ben)
+Permission45=Export projects
 Permission61=Bekijk interventies
 Permission62=Creëer / wijzig interventies
 Permission64=Verwijder interventies
@@ -640,6 +642,7 @@ Permission162=Creëren/aanpassen contracten/abonnementen
 Permission163=Een dienst/abonnement van een contract activeren
 Permission164=Een dienst/abonnement van een contract uitschakelen
 Permission165=Verwijderen contracten/abonnementen
+Permission167=Export contracts
 Permission171=Lees onkostennota's (eigen en uw ondergeschikten)
 Permission172=Creëren / bewerken reis- en onkosten
 Permission173=Verwijder reis- en onkosten
@@ -788,6 +791,7 @@ Permission2403=Bekijk acties (gebeurtenissen of taken) van anderen
 Permission2411=Inzien van acties (gebeurtenissen of taken) van anderen
 Permission2412=Creëer/delete acties (gebeurtenissen of taken) van anderen
 Permission2413=Wijzig acties (gebeurtenissen of taken) van anderen
+Permission2414=Export actions/tasks of others
 Permission2501=Inzien van documenten
 Permission2502=Uploaden of verwijderen van documenten
 Permission2503=In te dienen of te verwijderen documenten
@@ -1713,3 +1717,4 @@ ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s is available. Ve
 MultiPriceRuleDesc=When option "Several level of prices per product/service" is on, you can define different prices (one per price level) for each product. To save you time, you can enter here rule to have price for each level autocalculated according to price of first level, so you will have to enter only price for first level on each product. This page is here to save you time and can be usefull only if your prices for each leve are relative to first level. You can ignore this page in most cases.
 ModelModulesProduct=Templates for product documents
 ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
+SeeSubstitutionVars=See * note for list of possible substitution variables
diff --git a/htdocs/langs/nl_NL/bills.lang b/htdocs/langs/nl_NL/bills.lang
index c0df0c14ad4..2c6cd6fd075 100644
--- a/htdocs/langs/nl_NL/bills.lang
+++ b/htdocs/langs/nl_NL/bills.lang
@@ -219,6 +219,7 @@ RemainderToBill=Rest naar factuur
 SendBillByMail=Stuur de factuur per e-mail
 SendReminderBillByMail=Stuur herinnering per e-mail
 RelatedCommercialProposals=Gerelateerde offertes
+RelatedRecurringCustomerInvoices=Related recurring customer invoices
 MenuToValid=Valideer
 DateMaxPayment=Betaling vóór
 DateEcheance=Vervaldatum
@@ -319,7 +320,6 @@ toolTipFrequency=Examples:<br /><b>Set 7 / day</b>: give a new invoice every 7 d
 NextDateToExecution=Date for next invoice generation
 DateLastGeneration=Date of last generation
 MaxPeriodNumber=Max nb of invoice generation
-RestPeriodNumber=Rest period number
 NbOfGenerationDone=Nb of invoice generation already done
 InvoiceAutoValidate=Automatically validate invoice
 GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
@@ -471,3 +471,7 @@ PDFCrevetteSituationInvoiceLine=Situation N°%s : Inv. N°%s on %s
 TotalSituationInvoice=Total situation
 invoiceLineProgressError=Invoice line progress can't be egal or upper the next invoice line
 updatePriceNextInvoiceErrorUpdateline=Error : update price on invoice line : %s
+ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
+ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
+ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
+
diff --git a/htdocs/langs/nl_NL/boxes.lang b/htdocs/langs/nl_NL/boxes.lang
index f07541a3dc9..204069ffbee 100644
--- a/htdocs/langs/nl_NL/boxes.lang
+++ b/htdocs/langs/nl_NL/boxes.lang
@@ -60,8 +60,8 @@ BoxTitleLastContracts=Laatste %s contracten
 BoxTitleLastModifiedDonations=Laatst gewijzigd %s donaties
 BoxTitleLastModifiedExpenses=Laatste %s bewerkte onkostendeclaratie
 BoxGlobalActivity=Globale activiteit (facturen, offertes, bestellingen)
-BoxGoodCustomers=Good Customers
-BoxTitleGoodCustomers=%s Good Customers
+BoxGoodCustomers=Good customers
+BoxTitleGoodCustomers=%s Good customers
 FailedToRefreshDataInfoNotUpToDate=Bijwerken van de RSS feed is mislukt. Laatste succesvolle bijwerkingsdatum: %s
 LastRefreshDate=Laatste bijwerkingsdatum
 NoRecordedBookmarks=Geen weblinks ingesteld. Klik <a href="%s">weblinks</a> aan om deze toe te voegen.
diff --git a/htdocs/langs/nl_NL/companies.lang b/htdocs/langs/nl_NL/companies.lang
index aec04f92738..45bd496121c 100644
--- a/htdocs/langs/nl_NL/companies.lang
+++ b/htdocs/langs/nl_NL/companies.lang
@@ -202,7 +202,7 @@ ProfId3IN=Prof Id 3
 ProfId4IN=Prof Id 4
 ProfId5IN=Prof-id 5
 ProfId6IN=-
-ProfId1LU=Id. prof. 1 (RCS)
+ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
 ProfId2LU=Id. prof. 2 (Business permit)
 ProfId3LU=-
 ProfId4LU=-
@@ -317,10 +317,12 @@ ShowContact=Toon contactpersoon
 ContactsAllShort=Alle (Geen filter)
 ContactType=Type contactpersoon
 ContactForOrders=Opdrachtencontactpersoon
+ContactForOrdersOrShipments=Order's or shipment's contact
 ContactForProposals=Offertecontactpersoon
 ContactForContracts=Contractencontactpersoon
 ContactForInvoices=Facturencontactpersoon
 NoContactForAnyOrder=Deze contactpersoon is geen contactpersoon voor enige opdracht
+NoContactForAnyOrderOrShipment=This contact is not a contact for any order or shipment
 NoContactForAnyProposal=Deze contactpersoon is geen contactpersoon voor enige offerte
 NoContactForAnyContract=Deze contactpersoon is geen contactpersoon voor enig contract
 NoContactForAnyInvoice=Deze contactpersoon is geen contactpersoon voor enige factuur
@@ -438,3 +440,6 @@ MergeThirdparties=Samenvoegen third parties
 ConfirmMergeThirdparties=Weet u zeker dat u de third party wilt samenvoegen met de huidige? Alle gelinkte objecten (Facturen, Bestellingen. ...) worden verplaatst naar huidige third party zodat u de duplicaat kunt verwijderen.
 ThirdpartiesMergeSuccess=Third parties zijn samengevoegd
 ErrorThirdpartiesMerge=Er is iets fout gegaan tijdens verwijderen third parties. Check de log. Veranderingen zijn teruggedraaid.
+SaleRepresentativeLogin=Login of sale representative
+SaleRepresentativeFirstname=Firstname of sale representative
+SaleRepresentativeLastname=Lastname of sale representative
diff --git a/htdocs/langs/nl_NL/errors.lang b/htdocs/langs/nl_NL/errors.lang
index 59acdc4befd..53120ae63ee 100644
--- a/htdocs/langs/nl_NL/errors.lang
+++ b/htdocs/langs/nl_NL/errors.lang
@@ -172,6 +172,8 @@ ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
 ErrorOppStatusRequiredIfAmount=You set an estimated amount for this opportunity/lead. So you must also enter its status
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
 ErrorSavingChanges=An error has ocurred when saving the changes
+ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
+ErrorFileMustHaveFormat=File must have format %s
 
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
diff --git a/htdocs/langs/nl_NL/exports.lang b/htdocs/langs/nl_NL/exports.lang
index 1e61b37ef5c..779c91f08fd 100644
--- a/htdocs/langs/nl_NL/exports.lang
+++ b/htdocs/langs/nl_NL/exports.lang
@@ -128,6 +128,10 @@ SpecialCode=Speciale code
 ExportStringFilter=%% laat het vervangen toe van één of meer tekens in de tekst
 ExportDateFilter=YYYY, YYYYMM, YYYYMMDD : filtert met één jaar/maand/dag<br>YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD: filtert over een reeks van jaren/maanden/dagen<br> > YYYY,> YYYYMM, > YYYYMMDD: filtert op alle volgende jaren/maanden/dagen <br> < YYYY, <YYYYMM, < YYYYMMDD: filtert op alle voorgaande jaren/maanden/dagen
 ExportNumericFilter='NNNNN' filtert door één waarde<br>'NNNNN+NNNNN' filtert over een bereik van waarden<br> '&gt;NNNNN' filtert door lagere waarden <br>'&gt;NNNNN' filtert door hogere waarden
+ImportFromLine=Import starting from line number
+EndAtLineNb=End at line number
+SetThisValueTo2ToExcludeFirstLine=For example, set this value to 3 to exclude the 2 first lines
+KeepEmptyToGoToEndOfFile=Keep this field empty to go up to the end of file
 ## filters
 SelectFilterFields=Vul hier de waarden in waarop je wil filteren.
 FilterableFields=Filterable Fields
diff --git a/htdocs/langs/nl_NL/main.lang b/htdocs/langs/nl_NL/main.lang
index 3059788ed2a..4bad72014b1 100644
--- a/htdocs/langs/nl_NL/main.lang
+++ b/htdocs/langs/nl_NL/main.lang
@@ -25,6 +25,7 @@ FormatDateHourTextShort=%d %b %Y %H:%M
 FormatDateHourText=%d %B %Y %H:%M
 DatabaseConnection=Databaseverbinding
 NoTemplateDefined=No template defined for this email type
+AvailableVariables=Available substitution variables
 NoTranslation=Geen vertaling
 NoRecordFound=Geen record gevonden
 NoError=Geen fout
diff --git a/htdocs/langs/nl_NL/orders.lang b/htdocs/langs/nl_NL/orders.lang
index 9726b8da21d..05920c41afd 100644
--- a/htdocs/langs/nl_NL/orders.lang
+++ b/htdocs/langs/nl_NL/orders.lang
@@ -32,6 +32,7 @@ StatusOrderSent=In verzending
 StatusOrderOnProcessShort=Besteld
 StatusOrderProcessedShort=Verwerkt
 StatusOrderDelivered=Delivered
+StatusOrderDeliveredShort=Delivered
 StatusOrderToBillShort=Te factureren
 StatusOrderToBill2Short=Te factureren
 StatusOrderApprovedShort=Goedgekeurd
diff --git a/htdocs/langs/nl_NL/products.lang b/htdocs/langs/nl_NL/products.lang
index acdd3e7c936..ba3b36b7eea 100644
--- a/htdocs/langs/nl_NL/products.lang
+++ b/htdocs/langs/nl_NL/products.lang
@@ -45,10 +45,6 @@ LastProducts=Laatste producten
 CardProduct0=Productdetails
 CardProduct1=Dienstdetails
 CardContract=Contractdetails
-Warehouse=Magazijn
-Warehouses=Magazijnen
-WarehouseOpened=Warehouse open
-WarehouseClosed=Magazijn gesloten
 Stock=Voorraad
 Stocks=Voorraden
 Movement=Mutatie
@@ -318,3 +314,11 @@ WarningSelectOneDocument=Please select at least one document
 DefaultUnitToShow=Unit
 NbOfQtyInProposals=Qty in proposals
 ClinkOnALinkOfColumn=Click on a link of column %s to get a detailed view...
+TranslatedLabel=Translated label
+TranslatedDescription=Translated description
+TranslatedNote=Translated notes
+ProductWeight=Weight for 1 product
+ProductVolume=Volume for 1 product
+WeightUnits=Weight unit
+VolumeUnits=Volume unit
+SizeUnits=Size unit
diff --git a/htdocs/langs/nl_NL/projects.lang b/htdocs/langs/nl_NL/projects.lang
index dd210b1124d..93514bd4108 100644
--- a/htdocs/langs/nl_NL/projects.lang
+++ b/htdocs/langs/nl_NL/projects.lang
@@ -74,6 +74,9 @@ Progress=Voortgang
 ProgressDeclared=Ingegeven voorgang
 ProgressCalculated=Berekende voorgang
 Time=Tijd
+ListOfTasks=List of tasks
+GoToListOfTimeConsumed=Go to list of time consumed
+GoToListOfTasks=Go to list of tasks
 ListProposalsAssociatedProject=Lijst van aan het project verbonden offertes
 ListOrdersAssociatedProject=Lijst van aan het project verbonden afnemersopdrachten
 ListInvoicesAssociatedProject=Lijst van aan het project verbonden facturen
@@ -198,3 +201,4 @@ OppStatusNEGO=Negociation
 OppStatusPENDING=Pending
 OppStatusWIN=Won
 OppStatusLOST=Lost
+Budget=Budget
diff --git a/htdocs/langs/nl_NL/sendings.lang b/htdocs/langs/nl_NL/sendings.lang
index 2d927f30b6d..929c706514a 100644
--- a/htdocs/langs/nl_NL/sendings.lang
+++ b/htdocs/langs/nl_NL/sendings.lang
@@ -70,6 +70,8 @@ ProductQtyInSuppliersOrdersRunning=Hoeveelheid producten in geopende leverancier
 ProductQtyInShipmentAlreadySent=Product quantity from opened customer order already sent
 ProductQtyInSuppliersShipmentAlreadyRecevied=Hoeveelheid producte uit geopende leverancier bestelling reeds ontvangen
 NoProductToShipFoundIntoStock=No product to ship found into warehouse <b>%s</b>. Correct stock or go back to choose another warehouse.
+WeightVolShort=Weight/Vol.
+ValidateOrderFirstBeforeShipment=You must first validate the order before being able to make shipments.
 
 # Sending methods
 SendingMethodCATCH=Afhalen door de afnemer
diff --git a/htdocs/langs/nl_NL/supplier_proposal.lang b/htdocs/langs/nl_NL/supplier_proposal.lang
index 1a1bdc4df16..e37ced1b38f 100644
--- a/htdocs/langs/nl_NL/supplier_proposal.lang
+++ b/htdocs/langs/nl_NL/supplier_proposal.lang
@@ -58,3 +58,5 @@ DefaultModelSupplierProposalCreate=Default model creation
 DefaultModelSupplierProposalToBill=Default template when closing a price request (accepted)
 DefaultModelSupplierProposalClosed=Default template when closing a price request (refused)
 ListOfSupplierProposal=List of supplier proposal requests
+SupplierProposalsToClose=Supplier proposals to close
+SupplierProposalsToProcess=Supplier proposals to process
diff --git a/htdocs/langs/pl_PL/admin.lang b/htdocs/langs/pl_PL/admin.lang
index 85b9d49ba3c..2240d8cf6c4 100644
--- a/htdocs/langs/pl_PL/admin.lang
+++ b/htdocs/langs/pl_PL/admin.lang
@@ -282,6 +282,7 @@ ModuleSetup=Moduł konfiguracji
 ModulesSetup=Moduły konfiguracji
 ModuleFamilyBase=System
 ModuleFamilyCrm=Zarządzanie relacjami z klientem (CRM)
+ModuleFamilySrm=Supplier Relation Management (SRM)
 ModuleFamilyProducts=Zarządzanie produktami
 ModuleFamilyHr=Zarządzanie zasobami ludzkimi
 ModuleFamilyProjects=Projekty / Praca zespołowa
@@ -587,6 +588,7 @@ Permission38=Eksport produktów
 Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
 Permission42=Tworzenie / modyfikacja projektów (projekty współdzielone oraz projekty, w których biorę udział)
 Permission44=Usuwanie projektów (projekty współdzielone oraz projekty, w których biorę udział)
+Permission45=Export projects
 Permission61=Czytaj interwencje
 Permission62=Tworzenie / modyfikacja interwencji
 Permission64=Usuwanie interwencji
@@ -640,6 +642,7 @@ Permission162=Tworzenie / modyfikacja umowy / subskrypcji
 Permission163=Aktywacja usługi / subskrypcji umowy
 Permission164=Wyłączanie usługi / subskrypcji umowy
 Permission165=Usuń umowy / subskrypcje
+Permission167=Export contracts
 Permission171=Read trips and expenses (yours and your subordinates)
 Permission172=Tworzenie / modyfikacja wyjazdów i kosztów
 Permission173=Usuń wyjazdy i wydatki
@@ -788,6 +791,7 @@ Permission2403=Usuwanie działań (zdarzeń lub zadań) związanych z jego konte
 Permission2411=Czytaj działania (zdarzenia lub zadania) innych osób
 Permission2412=Tworzenie / modyfikacja działań (zdarzeń lub zadań) innych osób
 Permission2413=Usuwanie działań (zdarzeń lub zadań) innych osób
+Permission2414=Export actions/tasks of others
 Permission2501=Czytaj / Pobierz dokumenty
 Permission2502=Pobierz dokumenty
 Permission2503=Potwierdź lub usuń dokumenty
@@ -1713,3 +1717,4 @@ ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP i CRM% s jest dostępna.
 MultiPriceRuleDesc=Gdy opcja "Kilka poziom cen na produkt / usługę" jest włączone, można zdefiniować różne ceny (jeden na poziomie cen) dla każdego produktu. Aby zaoszczędzić czas, można wprowadzić tutaj rządzić mieć cenę każdego poziomu autocalculated według ceny pierwszym poziomie, więc trzeba będzie wprowadzić tylko cenę za pierwszego poziomu na każdym produkcie. Ta strona jest tutaj, aby zaoszczędzić czas i może być przydatne tylko wtedy, jeśli ceny każdego poziomó są w stosunku do pierwszego poziomu. Można zignorować tę stronę w większości przypadków.
 ModelModulesProduct=Templates for product documents
 ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
+SeeSubstitutionVars=See * note for list of possible substitution variables
diff --git a/htdocs/langs/pl_PL/bills.lang b/htdocs/langs/pl_PL/bills.lang
index fb986b94ace..a788772aba0 100644
--- a/htdocs/langs/pl_PL/bills.lang
+++ b/htdocs/langs/pl_PL/bills.lang
@@ -219,6 +219,7 @@ RemainderToBill=Pozostająca do rachunku
 SendBillByMail=Wyślij fakturę pocztą e-mail
 SendReminderBillByMail=Wyślij przypomnienie pocztą e-mail
 RelatedCommercialProposals=Podobne oferty handlowe
+RelatedRecurringCustomerInvoices=Related recurring customer invoices
 MenuToValid=Do ważnych
 DateMaxPayment=Płatności należne przed
 DateEcheance=Ze względu terminu
@@ -319,7 +320,6 @@ toolTipFrequency=Examples:<br /><b>Set 7 / day</b>: give a new invoice every 7 d
 NextDateToExecution=Date for next invoice generation
 DateLastGeneration=Date of last generation
 MaxPeriodNumber=Max nb of invoice generation
-RestPeriodNumber=Rest period number
 NbOfGenerationDone=Nb of invoice generation already done
 InvoiceAutoValidate=Automatically validate invoice
 GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
@@ -471,3 +471,7 @@ PDFCrevetteSituationInvoiceLine=Situation N°%s : Inv. N°%s on %s
 TotalSituationInvoice=Total situation
 invoiceLineProgressError=Invoice line progress can't be egal or upper the next invoice line
 updatePriceNextInvoiceErrorUpdateline=Error : update price on invoice line : %s
+ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
+ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
+ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
+
diff --git a/htdocs/langs/pl_PL/boxes.lang b/htdocs/langs/pl_PL/boxes.lang
index 1c2d929367c..4a444418409 100644
--- a/htdocs/langs/pl_PL/boxes.lang
+++ b/htdocs/langs/pl_PL/boxes.lang
@@ -60,8 +60,8 @@ BoxTitleLastContracts=Ostatni %s kontrakt
 BoxTitleLastModifiedDonations=Ostatnich %s modyfikowanch darowizn
 BoxTitleLastModifiedExpenses=Ostatnie %s modyfikowane raporty kosztów
 BoxGlobalActivity=Globalna aktywność (faktury, wnioski, zamówienia)
-BoxGoodCustomers=Good Customers
-BoxTitleGoodCustomers=%s Good Customers
+BoxGoodCustomers=Good customers
+BoxTitleGoodCustomers=%s Good customers
 FailedToRefreshDataInfoNotUpToDate=Nie można odświeżyć RSS. Ostatnie udane odświeżenie dnia: %s
 LastRefreshDate=Ostatnia data odświeżania
 NoRecordedBookmarks=Brak zdefiniowanych zakładek
diff --git a/htdocs/langs/pl_PL/companies.lang b/htdocs/langs/pl_PL/companies.lang
index 7a5fae3b733..61c0243a5c6 100644
--- a/htdocs/langs/pl_PL/companies.lang
+++ b/htdocs/langs/pl_PL/companies.lang
@@ -202,7 +202,7 @@ ProfId3IN=Prof ID 3
 ProfId4IN=Prof ID 4
 ProfId5IN=Prof ID 5
 ProfId6IN=-
-ProfId1LU=Id. prof. 1 (RCS)
+ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
 ProfId2LU=Id. prof. 2 (Business permit)
 ProfId3LU=-
 ProfId4LU=-
@@ -317,10 +317,12 @@ ShowContact=Pokaż kontakt
 ContactsAllShort=Wszystkie (bez filtra)
 ContactType=Typ kontaktu
 ContactForOrders=Kontakt dla zamówienia
+ContactForOrdersOrShipments=Order's or shipment's contact
 ContactForProposals=Kontakt dla oferty
 ContactForContracts=Kontakt dla kontraktu
 ContactForInvoices=Kontakt dla faktury
 NoContactForAnyOrder=Ten kontakt nie jest kontaktem dla żadnego zamówienia
+NoContactForAnyOrderOrShipment=This contact is not a contact for any order or shipment
 NoContactForAnyProposal=Ten kontakt nie jest kontaktem dla żadnej oferty handlowej
 NoContactForAnyContract=Ten kontakt nie jest kontaktem dla żadnego kontraktu
 NoContactForAnyInvoice=Ten kontakt nie jest kontaktem dla żadnej faktury
@@ -438,3 +440,6 @@ MergeThirdparties=Scal kontrahentów
 ConfirmMergeThirdparties=Czy na pewno chcesz się połączyć kontrahenta do obecnego? Wszystkie powiązane obiekty (faktury, zamówienia, ...) zostaną przeniesione do aktualnej osoby, dzięki czemu będą w stanie usunąć duplikaty jednego z kontrahentów.
 ThirdpartiesMergeSuccess=Kontrahenci zostali scaleni
 ErrorThirdpartiesMerge=Wystąpił błąd podczas usuwania kontrahenta. Sprawdź logi. Zmiany zostały cofnięte.
+SaleRepresentativeLogin=Login of sale representative
+SaleRepresentativeFirstname=Firstname of sale representative
+SaleRepresentativeLastname=Lastname of sale representative
diff --git a/htdocs/langs/pl_PL/errors.lang b/htdocs/langs/pl_PL/errors.lang
index 0757f7048a3..fc427dcfd97 100644
--- a/htdocs/langs/pl_PL/errors.lang
+++ b/htdocs/langs/pl_PL/errors.lang
@@ -172,6 +172,8 @@ ErrorMandatoryParametersNotProvided=Obowiązkowe parametr (y) nie przewidziane
 ErrorOppStatusRequiredIfAmount=Możesz ustawić szacunkową kwotę za możliwość / ołowiu. Więc należy także wprowadzić swój status
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad definicja tablicy w menu modułu deskryptora (zły stosunek jakości do kluczowego fk_menu)
 ErrorSavingChanges=Wystąpił błąd podczas zapisywania zmian
+ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
+ErrorFileMustHaveFormat=File must have format %s
 
 # Warnings
 WarningPasswordSetWithNoAccount=Hasło zostało ustawione dla tego użytkownika. Jednakże nie Konto użytkownika zostało utworzone. Więc to hasło jest przechowywane, ale nie mogą być używane do logowania do Dolibarr. Może być stosowany przez zewnętrzny moduł / interfejsu, ale jeśli nie trzeba definiować dowolną logowania ani hasła do członka, można wyłączyć opcję "Zarządzaj login dla każdego członka" od konfiguracji modułu użytkownika. Jeśli potrzebujesz zarządzać logowanie, ale nie wymagają hasła, możesz zachować to pole puste, aby uniknąć tego ostrzeżenia. Uwaga: E może być również stosowany jako login, jeśli element jest połączony do użytkownika.
diff --git a/htdocs/langs/pl_PL/exports.lang b/htdocs/langs/pl_PL/exports.lang
index bae1ad6f185..447f5d85218 100644
--- a/htdocs/langs/pl_PL/exports.lang
+++ b/htdocs/langs/pl_PL/exports.lang
@@ -128,6 +128,10 @@ SpecialCode=Specjalny kod
 ExportStringFilter=%% Umożliwia zastąpienie jednego lub więcej znaków w tekście
 ExportDateFilter=YYYY, RRRRMM, RRRRMMDD: filtry o rok / miesiąc / dzień <br> RR + YYYY, RRRRMM + RRRRMM, RRRRMMDD + RRRRMMDD: Filtry ponad szeregu lat / miesięcy / dni <br> > YYYY> RRRRMM,> yyyymmdd: filtry na wszystkich kolejnych lat / miesięcy / dni <br> <YYYY, <RRRRMM, <yyyymmdd: filtry na wszystkich poprzednich rok / miesiąc / dzień
 ExportNumericFilter=Filtry "NNNNN 'o jeden wartości <br> Filtry "NNNNN + NNNNN" ponad zakres wartości <br> "> NNNNN" filtry według niższej wartości <br> "> NNNNN" filtry według wyższych wartości
+ImportFromLine=Import starting from line number
+EndAtLineNb=End at line number
+SetThisValueTo2ToExcludeFirstLine=For example, set this value to 3 to exclude the 2 first lines
+KeepEmptyToGoToEndOfFile=Keep this field empty to go up to the end of file
 ## filters
 SelectFilterFields=Jeśli chcesz filtrować niektóre wartości, wartości po prostu wejść tutaj.
 FilterableFields=Pola do filtrowania
diff --git a/htdocs/langs/pl_PL/main.lang b/htdocs/langs/pl_PL/main.lang
index 3426e710f47..72aba5c6e99 100644
--- a/htdocs/langs/pl_PL/main.lang
+++ b/htdocs/langs/pl_PL/main.lang
@@ -25,6 +25,7 @@ FormatDateHourTextShort=%b %d, %Y, %I:%M %p
 FormatDateHourText=%B %d, %Y, %I:%M %p
 DatabaseConnection=Połączenia z bazą danych
 NoTemplateDefined=No template defined for this email type
+AvailableVariables=Available substitution variables
 NoTranslation=Brak tłumaczenia
 NoRecordFound=Rekord nie został znaleziony.
 NoError=Brak błędów
diff --git a/htdocs/langs/pl_PL/orders.lang b/htdocs/langs/pl_PL/orders.lang
index a6dffab091c..27f81e40afd 100644
--- a/htdocs/langs/pl_PL/orders.lang
+++ b/htdocs/langs/pl_PL/orders.lang
@@ -32,6 +32,7 @@ StatusOrderSent=Wysyłka w trakcie
 StatusOrderOnProcessShort=Zamówione
 StatusOrderProcessedShort=Przetworzone
 StatusOrderDelivered=Dostarczone
+StatusOrderDeliveredShort=Delivered
 StatusOrderToBillShort=Dostarczone
 StatusOrderToBill2Short=Do rachunku
 StatusOrderApprovedShort=Zatwierdzone
diff --git a/htdocs/langs/pl_PL/products.lang b/htdocs/langs/pl_PL/products.lang
index d41aabc3fde..5cb6e232f53 100644
--- a/htdocs/langs/pl_PL/products.lang
+++ b/htdocs/langs/pl_PL/products.lang
@@ -45,10 +45,6 @@ LastProducts=Ostatnie produkty
 CardProduct0=Karta produku
 CardProduct1=Karta usługi
 CardContract=Karta zamówienia
-Warehouse=Magazyn
-Warehouses=Magazyny
-WarehouseOpened=Magazyn otwarty
-WarehouseClosed=Magazyn zamknięty
 Stock=Zapas
 Stocks=Zapasy
 Movement=Przesunięcie
@@ -318,3 +314,11 @@ WarningSelectOneDocument=Proszę zaznaczyć co najmniej jeden dokument
 DefaultUnitToShow=Unit
 NbOfQtyInProposals=Qty in proposals
 ClinkOnALinkOfColumn=Click on a link of column %s to get a detailed view...
+TranslatedLabel=Translated label
+TranslatedDescription=Translated description
+TranslatedNote=Translated notes
+ProductWeight=Weight for 1 product
+ProductVolume=Volume for 1 product
+WeightUnits=Weight unit
+VolumeUnits=Volume unit
+SizeUnits=Size unit
diff --git a/htdocs/langs/pl_PL/projects.lang b/htdocs/langs/pl_PL/projects.lang
index a10ba439e5d..1479193a7cc 100644
--- a/htdocs/langs/pl_PL/projects.lang
+++ b/htdocs/langs/pl_PL/projects.lang
@@ -74,6 +74,9 @@ Progress=Postęp
 ProgressDeclared=Deklarowany postęp
 ProgressCalculated=Obliczony postęp
 Time=Czas
+ListOfTasks=List of tasks
+GoToListOfTimeConsumed=Go to list of time consumed
+GoToListOfTasks=Go to list of tasks
 ListProposalsAssociatedProject=Lista ofert handlowcych związanych z projektem
 ListOrdersAssociatedProject=Lista zamówień klienta związanych z projektem
 ListInvoicesAssociatedProject=Lista faktur klienta związanych z projektem
@@ -198,3 +201,4 @@ OppStatusNEGO=Negocjacje
 OppStatusPENDING=W oczekiwaniu
 OppStatusWIN=Won
 OppStatusLOST=Zagubiony
+Budget=Budget
diff --git a/htdocs/langs/pl_PL/sendings.lang b/htdocs/langs/pl_PL/sendings.lang
index dfd19ab9828..1d5fb14d287 100644
--- a/htdocs/langs/pl_PL/sendings.lang
+++ b/htdocs/langs/pl_PL/sendings.lang
@@ -70,6 +70,8 @@ ProductQtyInSuppliersOrdersRunning=Ilość produktów w otwartych dostawców zam
 ProductQtyInShipmentAlreadySent=Ilość produktu z otwartego zamówienia klienta już wysłana
 ProductQtyInSuppliersShipmentAlreadyRecevied=Ilość produktów z otwartego zlecenia dostawca otrzymał już
 NoProductToShipFoundIntoStock=Nie znaleziono produktu do wysyłki do <b>magazynu% s.</b> Prawidłowe akcji lub wrócić do wyboru innego magazynu.
+WeightVolShort=Weight/Vol.
+ValidateOrderFirstBeforeShipment=You must first validate the order before being able to make shipments.
 
 # Sending methods
 SendingMethodCATCH=Odbiór własny
diff --git a/htdocs/langs/pl_PL/supplier_proposal.lang b/htdocs/langs/pl_PL/supplier_proposal.lang
index cfce2f50ad8..2f385c73795 100644
--- a/htdocs/langs/pl_PL/supplier_proposal.lang
+++ b/htdocs/langs/pl_PL/supplier_proposal.lang
@@ -58,3 +58,5 @@ DefaultModelSupplierProposalCreate=Stworzenie modelu Domyślnie
 DefaultModelSupplierProposalToBill=Domyślny szablon podczas zamykania wniosek cenowej (przyjęte)
 DefaultModelSupplierProposalClosed=Domyślny szablon podczas zamykania wniosek cenowej (odmówił)
 ListOfSupplierProposal=Lista wniosków wniosku dostawca
+SupplierProposalsToClose=Supplier proposals to close
+SupplierProposalsToProcess=Supplier proposals to process
diff --git a/htdocs/langs/pt_PT/admin.lang b/htdocs/langs/pt_PT/admin.lang
index 77296c82eab..0cf24bb1321 100644
--- a/htdocs/langs/pt_PT/admin.lang
+++ b/htdocs/langs/pt_PT/admin.lang
@@ -282,6 +282,7 @@ ModuleSetup=Configuração do módulo
 ModulesSetup=Configuração dos módulos
 ModuleFamilyBase=Sistema
 ModuleFamilyCrm=Gestão cliente (CRM)
+ModuleFamilySrm=Supplier Relation Management (SRM)
 ModuleFamilyProducts=Products Management (PM)
 ModuleFamilyHr=Human Resource Management (HR)
 ModuleFamilyProjects=Projectos/Trabalho cooperativo
@@ -587,6 +588,7 @@ Permission38=Exportar Produtos
 Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
 Permission42=Criar/Modificar projectos
 Permission44=Eliminar projectos
+Permission45=Export projects
 Permission61=Consultar Intervenções
 Permission62=Criar/Modificar Intervenções
 Permission64=Eliminar Intervenções
@@ -640,6 +642,7 @@ Permission162=Criar/modificar contractos/subscrições
 Permission163=Ativar um serviço/subscrição de um contracto
 Permission164=Desativar um serviço/subscrição de um contracto
 Permission165=Apagar contractos/subscrições
+Permission167=Export contracts
 Permission171=Read trips and expenses (yours and your subordinates)
 Permission172=Criar/modificar viagens e despesas
 Permission173=Apagar viagens e despesas
@@ -788,6 +791,7 @@ Permission2403=Consultar acções (acontecimientos ou tarefas) de outros
 Permission2411=Ler acções (eventos ou tarefas) de outros
 Permission2412=Criar / modificar acções (eventos ou tarefas) de outros
 Permission2413=Excluir acções (eventos ou tarefas) de outros
+Permission2414=Export actions/tasks of others
 Permission2501=Consultar documentos
 Permission2502=Enviar ou eliminar documentos
 Permission2503=Enviar ou excluir documentos
@@ -1713,3 +1717,4 @@ ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s is available. Ve
 MultiPriceRuleDesc=When option "Several level of prices per product/service" is on, you can define different prices (one per price level) for each product. To save you time, you can enter here rule to have price for each level autocalculated according to price of first level, so you will have to enter only price for first level on each product. This page is here to save you time and can be usefull only if your prices for each leve are relative to first level. You can ignore this page in most cases.
 ModelModulesProduct=Templates for product documents
 ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
+SeeSubstitutionVars=See * note for list of possible substitution variables
diff --git a/htdocs/langs/pt_PT/bills.lang b/htdocs/langs/pt_PT/bills.lang
index 3b82848bd67..32aca972180 100644
--- a/htdocs/langs/pt_PT/bills.lang
+++ b/htdocs/langs/pt_PT/bills.lang
@@ -219,6 +219,7 @@ RemainderToBill=Falta Facturar
 SendBillByMail=Enviar a factura por E-Mail
 SendReminderBillByMail=Enviar um lembrete por E-Mail
 RelatedCommercialProposals=Orçamentos associados
+RelatedRecurringCustomerInvoices=Related recurring customer invoices
 MenuToValid=A Confirmar
 DateMaxPayment=Data limite de pagamento
 DateEcheance=Data Vencimento
@@ -319,7 +320,6 @@ toolTipFrequency=Examples:<br /><b>Set 7 / day</b>: give a new invoice every 7 d
 NextDateToExecution=Date for next invoice generation
 DateLastGeneration=Date of last generation
 MaxPeriodNumber=Max nb of invoice generation
-RestPeriodNumber=Rest period number
 NbOfGenerationDone=Nb of invoice generation already done
 InvoiceAutoValidate=Automatically validate invoice
 GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
@@ -471,3 +471,7 @@ PDFCrevetteSituationInvoiceLine=Situation N°%s : Inv. N°%s on %s
 TotalSituationInvoice=Total situation
 invoiceLineProgressError=Invoice line progress can't be egal or upper the next invoice line
 updatePriceNextInvoiceErrorUpdateline=Error : update price on invoice line : %s
+ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
+ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
+ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
+
diff --git a/htdocs/langs/pt_PT/boxes.lang b/htdocs/langs/pt_PT/boxes.lang
index 7498992b26e..e72ee06f989 100644
--- a/htdocs/langs/pt_PT/boxes.lang
+++ b/htdocs/langs/pt_PT/boxes.lang
@@ -60,8 +60,8 @@ BoxTitleLastContracts=Últimos contratos
 BoxTitleLastModifiedDonations=%s Última modificação doações
 BoxTitleLastModifiedExpenses=Last %s modified expense reports
 BoxGlobalActivity=Atividade Global (faturas, propostas, encomendas)
-BoxGoodCustomers=Good Customers
-BoxTitleGoodCustomers=%s Good Customers
+BoxGoodCustomers=Good customers
+BoxTitleGoodCustomers=%s Good customers
 FailedToRefreshDataInfoNotUpToDate=Erro ao  refresh fluxo RSS. data do último refresh: %s
 LastRefreshDate=Data última actualização
 NoRecordedBookmarks=Não existem favoritos pessoais. Click aqui para adicionar.
diff --git a/htdocs/langs/pt_PT/companies.lang b/htdocs/langs/pt_PT/companies.lang
index d23914fb451..2cc51537f4e 100644
--- a/htdocs/langs/pt_PT/companies.lang
+++ b/htdocs/langs/pt_PT/companies.lang
@@ -202,7 +202,7 @@ ProfId3IN=Prof ID 3
 ProfId4IN=Prof Id 4
 ProfId5IN=Prof Id 5
 ProfId6IN=-
-ProfId1LU=Id. prof. 1 (RCS)
+ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
 ProfId2LU=Id. prof. 2 (Business permit)
 ProfId3LU=-
 ProfId4LU=-
@@ -317,10 +317,12 @@ ShowContact=Mostrar Contacto
 ContactsAllShort=Todos (sem filtro)
 ContactType=Tipo de Contacto
 ContactForOrders=Contacto para Pedidos
+ContactForOrdersOrShipments=Order's or shipment's contact
 ContactForProposals=Contacto de Orçamentos
 ContactForContracts=Contacto de Contratos
 ContactForInvoices=Contacto de Facturas
 NoContactForAnyOrder=Este contacto não é contacto de nenhum pedido
+NoContactForAnyOrderOrShipment=This contact is not a contact for any order or shipment
 NoContactForAnyProposal=Este contacto não é contacto de nenhum orçamento
 NoContactForAnyContract=Este contacto não é contacto de nenhum contrato
 NoContactForAnyInvoice=Este contacto não é contacto de nenhuma factura
@@ -438,3 +440,6 @@ MergeThirdparties=Merge third parties
 ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one ? All linked objects (invoices, orders, ...) will be moved to current third party so you will be able to delete the duplicate one.
 ThirdpartiesMergeSuccess=Thirdparties have been merged
 ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
+SaleRepresentativeLogin=Login of sale representative
+SaleRepresentativeFirstname=Firstname of sale representative
+SaleRepresentativeLastname=Lastname of sale representative
diff --git a/htdocs/langs/pt_PT/errors.lang b/htdocs/langs/pt_PT/errors.lang
index 18157c1c2f5..c88b558c861 100644
--- a/htdocs/langs/pt_PT/errors.lang
+++ b/htdocs/langs/pt_PT/errors.lang
@@ -172,6 +172,8 @@ ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
 ErrorOppStatusRequiredIfAmount=You set an estimated amount for this opportunity/lead. So you must also enter its status
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
 ErrorSavingChanges=An error has ocurred when saving the changes
+ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
+ErrorFileMustHaveFormat=File must have format %s
 
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
diff --git a/htdocs/langs/pt_PT/exports.lang b/htdocs/langs/pt_PT/exports.lang
index de2d6836a0b..f41025c0f6c 100644
--- a/htdocs/langs/pt_PT/exports.lang
+++ b/htdocs/langs/pt_PT/exports.lang
@@ -128,6 +128,10 @@ SpecialCode=Código Especial
 ExportStringFilter=%% allows replacing one or more characters in the text
 ExportDateFilter=YYYY, YYYYMM, YYYYMMDD : filters by one year/month/day<br>YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD : filters over a range of years/months/days<br> > YYYY, > YYYYMM, > YYYYMMDD : filters on all following years/months/days<br> < YYYY, < YYYYMM, < YYYYMMDD : filters on all previous years/months/days
 ExportNumericFilter='NNNNN' filters by one value<br>'NNNNN+NNNNN' filters over a range of values<br>'&gt;NNNNN' filters by lower values<br>'&gt;NNNNN' filters by higher values
+ImportFromLine=Import starting from line number
+EndAtLineNb=End at line number
+SetThisValueTo2ToExcludeFirstLine=For example, set this value to 3 to exclude the 2 first lines
+KeepEmptyToGoToEndOfFile=Keep this field empty to go up to the end of file
 ## filters
 SelectFilterFields=If you want to filter on some values, just input values here.
 FilterableFields=Filterable Fields
diff --git a/htdocs/langs/pt_PT/main.lang b/htdocs/langs/pt_PT/main.lang
index 03966fe92be..1817d6e715a 100644
--- a/htdocs/langs/pt_PT/main.lang
+++ b/htdocs/langs/pt_PT/main.lang
@@ -25,6 +25,7 @@ FormatDateHourTextShort=%d %b %Y %H:%M
 FormatDateHourText=%d %B %Y %H:%M
 DatabaseConnection=Conexão à Base de Dados
 NoTemplateDefined=No template defined for this email type
+AvailableVariables=Available substitution variables
 NoTranslation=Sem tradução
 NoRecordFound=Nenhum foi encontrado nenhum registo
 NoError=Nenhum erro
diff --git a/htdocs/langs/pt_PT/orders.lang b/htdocs/langs/pt_PT/orders.lang
index 52defe754c1..0f70711a631 100644
--- a/htdocs/langs/pt_PT/orders.lang
+++ b/htdocs/langs/pt_PT/orders.lang
@@ -32,6 +32,7 @@ StatusOrderSent=Expedição em processamento
 StatusOrderOnProcessShort=Ordered
 StatusOrderProcessedShort=Processado
 StatusOrderDelivered=Delivered
+StatusOrderDeliveredShort=Delivered
 StatusOrderToBillShort=A Facturar
 StatusOrderToBill2Short=A facturar
 StatusOrderApprovedShort=Aprovado
diff --git a/htdocs/langs/pt_PT/products.lang b/htdocs/langs/pt_PT/products.lang
index e3432adb5ad..9e262f02f20 100644
--- a/htdocs/langs/pt_PT/products.lang
+++ b/htdocs/langs/pt_PT/products.lang
@@ -45,10 +45,6 @@ LastProducts=Ultimos Produtos
 CardProduct0=Ficha do Produto
 CardProduct1=Ficha do Serviço
 CardContract=Ficha do Contrato
-Warehouse=Armazem
-Warehouses=Armazens
-WarehouseOpened=Warehouse open
-WarehouseClosed=Armazem fechado
 Stock=Stock
 Stocks=Stocks
 Movement=Movimento
@@ -318,3 +314,11 @@ WarningSelectOneDocument=Please select at least one document
 DefaultUnitToShow=Unit
 NbOfQtyInProposals=Qty in proposals
 ClinkOnALinkOfColumn=Click on a link of column %s to get a detailed view...
+TranslatedLabel=Translated label
+TranslatedDescription=Translated description
+TranslatedNote=Translated notes
+ProductWeight=Weight for 1 product
+ProductVolume=Volume for 1 product
+WeightUnits=Weight unit
+VolumeUnits=Volume unit
+SizeUnits=Size unit
diff --git a/htdocs/langs/pt_PT/projects.lang b/htdocs/langs/pt_PT/projects.lang
index 3569cd2b7a8..c6bc715fada 100644
--- a/htdocs/langs/pt_PT/projects.lang
+++ b/htdocs/langs/pt_PT/projects.lang
@@ -74,6 +74,9 @@ Progress=Progresso
 ProgressDeclared=Progresso declarado
 ProgressCalculated=Progresso calculado
 Time=Tempo
+ListOfTasks=List of tasks
+GoToListOfTimeConsumed=Go to list of time consumed
+GoToListOfTasks=Go to list of tasks
 ListProposalsAssociatedProject=Lista de Orçamentos Associados ao Projeto
 ListOrdersAssociatedProject=Lista de Encomendas Associadas ao Projeto
 ListInvoicesAssociatedProject=Lista de Faturas Associadas ao Projeto
@@ -198,3 +201,4 @@ OppStatusNEGO=Negociation
 OppStatusPENDING=Pending
 OppStatusWIN=Won
 OppStatusLOST=Lost
+Budget=Budget
diff --git a/htdocs/langs/pt_PT/sendings.lang b/htdocs/langs/pt_PT/sendings.lang
index b9a3ba0cb08..d14727be32b 100644
--- a/htdocs/langs/pt_PT/sendings.lang
+++ b/htdocs/langs/pt_PT/sendings.lang
@@ -70,6 +70,8 @@ ProductQtyInSuppliersOrdersRunning=Product quantity into opened suppliers orders
 ProductQtyInShipmentAlreadySent=Product quantity from opened customer order already sent
 ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from opened supplier order already received
 NoProductToShipFoundIntoStock=No product to ship found into warehouse <b>%s</b>. Correct stock or go back to choose another warehouse.
+WeightVolShort=Weight/Vol.
+ValidateOrderFirstBeforeShipment=You must first validate the order before being able to make shipments.
 
 # Sending methods
 SendingMethodCATCH=Capturas por cliente
diff --git a/htdocs/langs/pt_PT/supplier_proposal.lang b/htdocs/langs/pt_PT/supplier_proposal.lang
index 1a1bdc4df16..e37ced1b38f 100644
--- a/htdocs/langs/pt_PT/supplier_proposal.lang
+++ b/htdocs/langs/pt_PT/supplier_proposal.lang
@@ -58,3 +58,5 @@ DefaultModelSupplierProposalCreate=Default model creation
 DefaultModelSupplierProposalToBill=Default template when closing a price request (accepted)
 DefaultModelSupplierProposalClosed=Default template when closing a price request (refused)
 ListOfSupplierProposal=List of supplier proposal requests
+SupplierProposalsToClose=Supplier proposals to close
+SupplierProposalsToProcess=Supplier proposals to process
diff --git a/htdocs/langs/ro_RO/admin.lang b/htdocs/langs/ro_RO/admin.lang
index 6ad10fce78e..8ac743c0064 100644
--- a/htdocs/langs/ro_RO/admin.lang
+++ b/htdocs/langs/ro_RO/admin.lang
@@ -282,6 +282,7 @@ ModuleSetup=Configurare Modul
 ModulesSetup=Configurare Module
 ModuleFamilyBase=Sistem
 ModuleFamilyCrm=Clientul Ressource Management (CRM)
+ModuleFamilySrm=Supplier Relation Management (SRM)
 ModuleFamilyProducts=Managementul Produselor (PM)
 ModuleFamilyHr=Management Resurse Umane (HR)
 ModuleFamilyProjects=Proiecte
@@ -587,6 +588,7 @@ Permission38=Exportul de produse
 Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
 Permission42=Creare / Modificare de proiecte, pentru a edita sarcinile mele de proiecte
 Permission44=Ştergere proiecte
+Permission45=Export projects
 Permission61=Citeşte intervenţii
 Permission62=Creare / Modificare intervenţii
 Permission64=Ştergere intervenţii
@@ -640,6 +642,7 @@ Permission162=Creare / modificare contracte / abonamente
 Permission163=Activează un serviciu / abonament al unui contract
 Permission164=Dezactivarea unui serviciu / abonament al unui contract
 Permission165=Ștergeți contracte / abonamente
+Permission167=Export contracts
 Permission171=Read trips and expenses (yours and your subordinates)
 Permission172=Creare / Modificare ordin de deplasare şi cheltuieli
 Permission173=Ştergere ordin de deplasare şi cheltuieli
@@ -788,6 +791,7 @@ Permission2403=Citeşte acţiuni (evenimente sau sarcini) de alţii
 Permission2411=Citeşte acţiuni (evenimente sau sarcini) ale altor persoane
 Permission2412=Crearea / modificarea acţiuni (evenimente sau sarcini) ale altor persoane
 Permission2413=Ştergeţi acţiuni (evenimente sau sarcini) ale altor persoane
+Permission2414=Export actions/tasks of others
 Permission2501=Citeşte documente
 Permission2502=Trimiteti sau şterge documente
 Permission2503=Trimite sau şterge documente
@@ -1713,3 +1717,4 @@ ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s is available. Ve
 MultiPriceRuleDesc=When option "Several level of prices per product/service" is on, you can define different prices (one per price level) for each product. To save you time, you can enter here rule to have price for each level autocalculated according to price of first level, so you will have to enter only price for first level on each product. This page is here to save you time and can be usefull only if your prices for each leve are relative to first level. You can ignore this page in most cases.
 ModelModulesProduct=Templates for product documents
 ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
+SeeSubstitutionVars=See * note for list of possible substitution variables
diff --git a/htdocs/langs/ro_RO/bills.lang b/htdocs/langs/ro_RO/bills.lang
index be8bed41489..a05ed3bb353 100644
--- a/htdocs/langs/ro_RO/bills.lang
+++ b/htdocs/langs/ro_RO/bills.lang
@@ -219,6 +219,7 @@ RemainderToBill=Rest de facturat
 SendBillByMail=Trimiteţi factura prin email
 SendReminderBillByMail=Trimite o relansare  prin e-mail
 RelatedCommercialProposals=Oferte comerciale asociate
+RelatedRecurringCustomerInvoices=Related recurring customer invoices
 MenuToValid=De validat
 DateMaxPayment=Data limită a plăţii
 DateEcheance=Data limită
@@ -319,7 +320,6 @@ toolTipFrequency=Examples:<br /><b>Set 7 / day</b>: give a new invoice every 7 d
 NextDateToExecution=Date for next invoice generation
 DateLastGeneration=Date of last generation
 MaxPeriodNumber=Max nb of invoice generation
-RestPeriodNumber=Rest period number
 NbOfGenerationDone=Nb of invoice generation already done
 InvoiceAutoValidate=Automatically validate invoice
 GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
@@ -471,3 +471,7 @@ PDFCrevetteSituationInvoiceLine=Situation N°%s : Inv. N°%s on %s
 TotalSituationInvoice=Total situation
 invoiceLineProgressError=Invoice line progress can't be egal or upper the next invoice line
 updatePriceNextInvoiceErrorUpdateline=Error : update price on invoice line : %s
+ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
+ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
+ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
+
diff --git a/htdocs/langs/ro_RO/boxes.lang b/htdocs/langs/ro_RO/boxes.lang
index f85ef68c9ea..53eadeeec61 100644
--- a/htdocs/langs/ro_RO/boxes.lang
+++ b/htdocs/langs/ro_RO/boxes.lang
@@ -60,8 +60,8 @@ BoxTitleLastContracts=Ultimele  %s  contracte
 BoxTitleLastModifiedDonations=Ultimele %s  donaţii modificate 
 BoxTitleLastModifiedExpenses=Ultimele %s rapoarte cheltuieli modificare 
 BoxGlobalActivity=Activitate globală ( facturi, oferte, comenzi)
-BoxGoodCustomers=Good Customers
-BoxTitleGoodCustomers=%s Good Customers
+BoxGoodCustomers=Good customers
+BoxTitleGoodCustomers=%s Good customers
 FailedToRefreshDataInfoNotUpToDate=Eşec la reîmprospătarea fluxului RSS. Ultima reîmprospătare reuşită la data: %s
 LastRefreshDate=Ultima dată reîmprospătare
 NoRecordedBookmarks=Niciun marcaj definit.
diff --git a/htdocs/langs/ro_RO/companies.lang b/htdocs/langs/ro_RO/companies.lang
index ed45b6fc4db..ba41b428f9e 100644
--- a/htdocs/langs/ro_RO/companies.lang
+++ b/htdocs/langs/ro_RO/companies.lang
@@ -202,7 +202,7 @@ ProfId3IN=Prof Id-ul 3
 ProfId4IN=Id-ul prof. univ 4
 ProfId5IN=Prof ID 5
 ProfId6IN=-
-ProfId1LU=Id. prof. 1 (RCS)
+ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
 ProfId2LU=Id. prof. 2 (Business permit)
 ProfId3LU=-
 ProfId4LU=-
@@ -317,10 +317,12 @@ ShowContact=Afişeză contact
 ContactsAllShort=Toate (fără filtru)
 ContactType=Tip Contact
 ContactForOrders=Contact Comenzi
+ContactForOrdersOrShipments=Order's or shipment's contact
 ContactForProposals=Contact  Ofertă
 ContactForContracts=Contact  Contracte
 ContactForInvoices=Contact  Facturi
 NoContactForAnyOrder=Acest contact nu este  contact pentru nici o comanda
+NoContactForAnyOrderOrShipment=This contact is not a contact for any order or shipment
 NoContactForAnyProposal=Acest contact nu este contact pentru nicio ofertă comercială
 NoContactForAnyContract=Acest contact nu este  contact pentru nici un contract
 NoContactForAnyInvoice=Acest contact nu este  contact pentru nici o factură
@@ -438,3 +440,6 @@ MergeThirdparties=Imbina terti
 ConfirmMergeThirdparties=Sigur doriți să îmbinați acesti terți? Toate obiectele legate (facturi, comenzi, ...), vor fi mutate terțul curent, astfel încât vei fi capabil sa ștergeti pe cea duplicat.
 ThirdpartiesMergeSuccess=Tertii au fost imbinati
 ErrorThirdpartiesMerge=A apărut o eroare laștergerea terților. Vă rugăm să verificați logurile. Modificările au fost anulate.
+SaleRepresentativeLogin=Login of sale representative
+SaleRepresentativeFirstname=Firstname of sale representative
+SaleRepresentativeLastname=Lastname of sale representative
diff --git a/htdocs/langs/ro_RO/errors.lang b/htdocs/langs/ro_RO/errors.lang
index 04c04f75db2..9d349776a85 100644
--- a/htdocs/langs/ro_RO/errors.lang
+++ b/htdocs/langs/ro_RO/errors.lang
@@ -172,6 +172,8 @@ ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
 ErrorOppStatusRequiredIfAmount=You set an estimated amount for this opportunity/lead. So you must also enter its status
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
 ErrorSavingChanges=An error has ocurred when saving the changes
+ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
+ErrorFileMustHaveFormat=File must have format %s
 
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
diff --git a/htdocs/langs/ro_RO/exports.lang b/htdocs/langs/ro_RO/exports.lang
index 178c770b431..b4140aba83c 100644
--- a/htdocs/langs/ro_RO/exports.lang
+++ b/htdocs/langs/ro_RO/exports.lang
@@ -128,6 +128,10 @@ SpecialCode=Cod special
 ExportStringFilter=%% permite înlocuirea unuia sau mai multor caractere in text
 ExportDateFilter=YYYY, YYYYMM, YYYYMMDD : filtrează după un an/lună/zi<br>YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD : filtrează peste un rang de ani/luni/zile<br> > YYYY, > YYYYMM, > YYYYMMDD : filtrează pe toţi următorii ani/luni/zile<br> < YYYY, < YYYYMM, < YYYYMMDD : filtrează pe toşi precedenţii ani/luni/zile
 ExportNumericFilter='NNNNN' filtrează după o valoare<br>'NNNNN+NNNNN' filtrează peste un rang de valori<br>'&gt;NNNNN' filtrează după valori mai mici<br>'&gt;NNNNN' filtrează după valori mai mari
+ImportFromLine=Import starting from line number
+EndAtLineNb=End at line number
+SetThisValueTo2ToExcludeFirstLine=For example, set this value to 3 to exclude the 2 first lines
+KeepEmptyToGoToEndOfFile=Keep this field empty to go up to the end of file
 ## filters
 SelectFilterFields=Dacă doriți să filtrați pe anumite valori, doar introduceţi valorile aici.
 FilterableFields=Campuri filtrabile
diff --git a/htdocs/langs/ro_RO/main.lang b/htdocs/langs/ro_RO/main.lang
index 9159581dae9..b2b1f00b31f 100644
--- a/htdocs/langs/ro_RO/main.lang
+++ b/htdocs/langs/ro_RO/main.lang
@@ -25,6 +25,7 @@ FormatDateHourTextShort=%d %b %Y %H:%M
 FormatDateHourText=%d %B %Y %H:%M
 DatabaseConnection=Conexiunea la baza de date
 NoTemplateDefined=No template defined for this email type
+AvailableVariables=Available substitution variables
 NoTranslation=Fără traducere
 NoRecordFound=Nicio înregistrare  gasită
 NoError=Nicio eroare
diff --git a/htdocs/langs/ro_RO/orders.lang b/htdocs/langs/ro_RO/orders.lang
index dd4f5559bba..464e5f7658b 100644
--- a/htdocs/langs/ro_RO/orders.lang
+++ b/htdocs/langs/ro_RO/orders.lang
@@ -32,6 +32,7 @@ StatusOrderSent=Livrare în curs
 StatusOrderOnProcessShort=Comandat
 StatusOrderProcessedShort=Procesate
 StatusOrderDelivered=Livrate
+StatusOrderDeliveredShort=Delivered
 StatusOrderToBillShort=Livrate
 StatusOrderToBill2Short=De facturat
 StatusOrderApprovedShort=Aprobată
diff --git a/htdocs/langs/ro_RO/products.lang b/htdocs/langs/ro_RO/products.lang
index 2f16c109df4..929c64b7c12 100644
--- a/htdocs/langs/ro_RO/products.lang
+++ b/htdocs/langs/ro_RO/products.lang
@@ -45,10 +45,6 @@ LastProducts=Ultimele produse
 CardProduct0=Fişă Produs
 CardProduct1=Fişă  Serviciul
 CardContract=Fişă  Contract
-Warehouse=Depozit
-Warehouses=Depozite
-WarehouseOpened=Depozit deschis
-WarehouseClosed=Depozit închis
 Stock=Stoc
 Stocks=Stocuri
 Movement=Transfer
@@ -318,3 +314,11 @@ WarningSelectOneDocument=Please select at least one document
 DefaultUnitToShow=Unit
 NbOfQtyInProposals=Qty in proposals
 ClinkOnALinkOfColumn=Click on a link of column %s to get a detailed view...
+TranslatedLabel=Translated label
+TranslatedDescription=Translated description
+TranslatedNote=Translated notes
+ProductWeight=Weight for 1 product
+ProductVolume=Volume for 1 product
+WeightUnits=Weight unit
+VolumeUnits=Volume unit
+SizeUnits=Size unit
diff --git a/htdocs/langs/ro_RO/projects.lang b/htdocs/langs/ro_RO/projects.lang
index 497b42cec70..301c6242d24 100644
--- a/htdocs/langs/ro_RO/projects.lang
+++ b/htdocs/langs/ro_RO/projects.lang
@@ -74,6 +74,9 @@ Progress=Progres
 ProgressDeclared=Progres calculat
 ProgressCalculated=Progres calculat
 Time=Timp
+ListOfTasks=List of tasks
+GoToListOfTimeConsumed=Go to list of time consumed
+GoToListOfTasks=Go to list of tasks
 ListProposalsAssociatedProject=Lista oferte comerciale asociate la proiect
 ListOrdersAssociatedProject=Lista  comenzi asociate la proiect
 ListInvoicesAssociatedProject=Lista facturi clienti asociate la proiect
@@ -198,3 +201,4 @@ OppStatusNEGO=Negociere
 OppStatusPENDING=In asteptarea
 OppStatusWIN=Castigat
 OppStatusLOST=Pierdut
+Budget=Budget
diff --git a/htdocs/langs/ro_RO/sendings.lang b/htdocs/langs/ro_RO/sendings.lang
index 06645302e08..5db7540b446 100644
--- a/htdocs/langs/ro_RO/sendings.lang
+++ b/htdocs/langs/ro_RO/sendings.lang
@@ -70,6 +70,8 @@ ProductQtyInSuppliersOrdersRunning=Cantitate produs in comenzile furnizorilor de
 ProductQtyInShipmentAlreadySent=Product quantity from opened customer order already sent
 ProductQtyInSuppliersShipmentAlreadyRecevied=Cantitate produs din comenzile furnizorilor deschise deja primite
 NoProductToShipFoundIntoStock=No product to ship found into warehouse <b>%s</b>. Correct stock or go back to choose another warehouse.
+WeightVolShort=Weight/Vol.
+ValidateOrderFirstBeforeShipment=You must first validate the order before being able to make shipments.
 
 # Sending methods
 SendingMethodCATCH=Colectată de client
diff --git a/htdocs/langs/ro_RO/supplier_proposal.lang b/htdocs/langs/ro_RO/supplier_proposal.lang
index 1e19f83ffbe..77fa3cdd5b7 100644
--- a/htdocs/langs/ro_RO/supplier_proposal.lang
+++ b/htdocs/langs/ro_RO/supplier_proposal.lang
@@ -1,22 +1,22 @@
 # Dolibarr language file - Source file is en_US - supplier_proposal
 SupplierProposal=Oferte Comercială Furnizor
-supplier_proposalDESC=Manage price requests to suppliers
-SupplierProposalShort=Supplier proposals
-SupplierProposalNew=New request
+supplier_proposalDESC=Gestiioneaza cereri pret la furnizori
+SupplierProposalShort=Oferte Furnizori
+SupplierProposalNew=Cerere noua
 CommRequest=Cerere Preţ 
 CommRequests=Cereri Preţ 
 SearchRequest=Cauta o cerere
 DraftRequests=Cereri schiţă
-SupplierProposalsDraft=Draft supplier proposals
-LastModifiedRequests=Last %s modified price requests
-RequestsOpened=Open price requests
+SupplierProposalsDraft=Ofertă  Furnizor Schiţă
+LastModifiedRequests=Ultimiele %s cereri pret  modificate
+RequestsOpened=Deschide Cereri Preţ 
 SupplierProposalArea=Oferte Furnizori
-SupplierProposalShort=Supplier proposals
+SupplierProposalShort=Oferte Furnizori
 SupplierProposals=Oferte Furnizori
-NewAskPrice=New price request
+NewAskPrice=Cerere Preţ  Noua
 NewAsk=Cerere noua
-ShowSupplierProposal=Show price request
-AddSupplierProposal=Create a price request
+ShowSupplierProposal=Arata Cerere Preţ 
+AddSupplierProposal=Crează o cerere de pret
 SupplierProposalRefFourn=Ref Furnizor 
 SupplierProposalDate=Data de livrare
 SupplierProposalRefFournNotice=Before closing to "Accepted", think to grasp suppliers references.
@@ -28,9 +28,9 @@ ValidateAsk=Validează cererre
 AddAsk=Crează o cerere
 SupplierProposalDraft=Schiţe
 SupplierProposalOpened=Deschis
-SupplierProposalStatusDraft=Draft (needs to be validated)
-SupplierProposalStatusValidated=Validated (request is open)
-SupplierProposalStatusOpened=Validated (request is open)
+SupplierProposalStatusDraft=Schiţă (cererea tebuie validata)
+SupplierProposalStatusValidated=Validata(cererea este deschisa)
+SupplierProposalStatusOpened=Validata(cererea este deschisa)
 SupplierProposalStatusClosed=Închis
 SupplierProposalStatusSigned=Acceptat
 SupplierProposalStatusNotSigned=Refuzat
@@ -47,14 +47,16 @@ CreateEmptyAsk=Crează o cerere goala
 CloneAsk=Cloneaza Cerere pret 
 ConfirmCloneAsk=Are you sure you want to clone the price request <b>%s</b> ?
 ConfirmReOpenAsk=Are you sure you want to open back the price request <b>%s</b> ?
-SendAskByMail=Send price request by mail
+SendAskByMail=Trimitere  cerere pret  pe mail
 SendAskRef=Sending the price request %s
 SupplierProposalCard=Fişă Cerere
 ConfirmDeleteAsk=Are you sure you want to delete this price request ?
-ActionsOnSupplierProposal=Events on price request
+ActionsOnSupplierProposal=Evenimente pe cererea de pret
 DocModelAuroreDescription=A complete request model (logo...)
 CommercialAsk=Cerere Preţ 
 DefaultModelSupplierProposalCreate=Default model creation
 DefaultModelSupplierProposalToBill=Default template when closing a price request (accepted)
 DefaultModelSupplierProposalClosed=Default template when closing a price request (refused)
 ListOfSupplierProposal=List of supplier proposal requests
+SupplierProposalsToClose=Supplier proposals to close
+SupplierProposalsToProcess=Supplier proposals to process
diff --git a/htdocs/langs/ru_RU/admin.lang b/htdocs/langs/ru_RU/admin.lang
index 7b6b1c271f6..2b31c043860 100644
--- a/htdocs/langs/ru_RU/admin.lang
+++ b/htdocs/langs/ru_RU/admin.lang
@@ -282,6 +282,7 @@ ModuleSetup=Модуль установки
 ModulesSetup=Настройка модулей
 ModuleFamilyBase=Система
 ModuleFamilyCrm=Клиент Ressource Management (CRM)
+ModuleFamilySrm=Supplier Relation Management (SRM)
 ModuleFamilyProducts=Products Management (PM)
 ModuleFamilyHr=Human Resource Management (HR)
 ModuleFamilyProjects=Проекты / Совместная работа
@@ -587,6 +588,7 @@ Permission38=Экспорт продукции
 Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
 Permission42=Создать / изменить проекты, редактировать задачи, для моих проектов
 Permission44=Удаление проектов
+Permission45=Export projects
 Permission61=Читать мероприятий
 Permission62=Создать / изменить мероприятий
 Permission64=Удалить мероприятий
@@ -640,6 +642,7 @@ Permission162=Создать/изменить котракты/подписки
 Permission163=Активировать усгулу/подписку на контракте
 Permission164=Отключить услугу/подписку на контракте
 Permission165=Удалить контракты/подписки
+Permission167=Export contracts
 Permission171=Read trips and expenses (yours and your subordinates)
 Permission172=Создать/изменить поездки и расходы
 Permission173=Удалить поездки и расходы
@@ -788,6 +791,7 @@ Permission2403=Читать мероприятия (задачи, события
 Permission2411=Читайте действия (события или задачи), других
 Permission2412=Создать / изменить действия (события или задачи), других
 Permission2413=Удалить действия (события или задачи), других
+Permission2414=Export actions/tasks of others
 Permission2501=Читайте документы
 Permission2502=Добавить или удалить документы
 Permission2503=Отправить или удалять документы
@@ -1713,3 +1717,4 @@ ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s is available. Ve
 MultiPriceRuleDesc=When option "Several level of prices per product/service" is on, you can define different prices (one per price level) for each product. To save you time, you can enter here rule to have price for each level autocalculated according to price of first level, so you will have to enter only price for first level on each product. This page is here to save you time and can be usefull only if your prices for each leve are relative to first level. You can ignore this page in most cases.
 ModelModulesProduct=Templates for product documents
 ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
+SeeSubstitutionVars=See * note for list of possible substitution variables
diff --git a/htdocs/langs/ru_RU/bills.lang b/htdocs/langs/ru_RU/bills.lang
index 7079db1bf2e..733d58d583c 100644
--- a/htdocs/langs/ru_RU/bills.lang
+++ b/htdocs/langs/ru_RU/bills.lang
@@ -219,6 +219,7 @@ RemainderToBill=Остаток к выставлению
 SendBillByMail=Отправить счет-фактуру по email
 SendReminderBillByMail=Отправить напоминание по email
 RelatedCommercialProposals=Связанные коммерческие предложения
+RelatedRecurringCustomerInvoices=Related recurring customer invoices
 MenuToValid=Для проверки
 DateMaxPayment=Оплата до
 DateEcheance=Предельная дата оплаты
@@ -319,7 +320,6 @@ toolTipFrequency=Examples:<br /><b>Set 7 / day</b>: give a new invoice every 7 d
 NextDateToExecution=Date for next invoice generation
 DateLastGeneration=Date of last generation
 MaxPeriodNumber=Max nb of invoice generation
-RestPeriodNumber=Rest period number
 NbOfGenerationDone=Nb of invoice generation already done
 InvoiceAutoValidate=Automatically validate invoice
 GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
@@ -471,3 +471,7 @@ PDFCrevetteSituationInvoiceLine=Situation N°%s : Inv. N°%s on %s
 TotalSituationInvoice=Total situation
 invoiceLineProgressError=Invoice line progress can't be egal or upper the next invoice line
 updatePriceNextInvoiceErrorUpdateline=Error : update price on invoice line : %s
+ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
+ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
+ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
+
diff --git a/htdocs/langs/ru_RU/boxes.lang b/htdocs/langs/ru_RU/boxes.lang
index 906aebee993..596d0d65b76 100644
--- a/htdocs/langs/ru_RU/boxes.lang
+++ b/htdocs/langs/ru_RU/boxes.lang
@@ -60,8 +60,8 @@ BoxTitleLastContracts=Последние %s договоров
 BoxTitleLastModifiedDonations=Последние %s измененных пожертвований
 BoxTitleLastModifiedExpenses=Last %s modified expense reports
 BoxGlobalActivity=Глобальная активность (фактуры, предложения, заказы)
-BoxGoodCustomers=Good Customers
-BoxTitleGoodCustomers=%s Good Customers
+BoxGoodCustomers=Good customers
+BoxTitleGoodCustomers=%s Good customers
 FailedToRefreshDataInfoNotUpToDate=Не удалось обновить RSS-поток. Дата последнего успешного обновления: %s
 LastRefreshDate=Дата последнего обновления
 NoRecordedBookmarks=Закладки не созданы.
diff --git a/htdocs/langs/ru_RU/companies.lang b/htdocs/langs/ru_RU/companies.lang
index 321395a5c14..fe033feb707 100644
--- a/htdocs/langs/ru_RU/companies.lang
+++ b/htdocs/langs/ru_RU/companies.lang
@@ -202,7 +202,7 @@ ProfId3IN=Проф Id 3
 ProfId4IN=Проф Id 4
 ProfId5IN=Проф Id 5
 ProfId6IN=-
-ProfId1LU=Id. prof. 1 (RCS)
+ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
 ProfId2LU=Id. prof. 2 (Business permit)
 ProfId3LU=-
 ProfId4LU=-
@@ -317,10 +317,12 @@ ShowContact=Показать контакт
 ContactsAllShort=Все (без фильтра)
 ContactType=Вид контакт
 ContactForOrders=Контакт заказа
+ContactForOrdersOrShipments=Order's or shipment's contact
 ContactForProposals=Контакт потенциального клиента
 ContactForContracts=Контакт договора
 ContactForInvoices=Контакт счета-фактуры
 NoContactForAnyOrder=Этот контакт не является контактом заказа
+NoContactForAnyOrderOrShipment=This contact is not a contact for any order or shipment
 NoContactForAnyProposal=Этот контакт не является контактом коммерческого предложения
 NoContactForAnyContract=Этот контакт не является контактом договора
 NoContactForAnyInvoice=Этот контакт не является контактом счета-фактуры
@@ -438,3 +440,6 @@ MergeThirdparties=Merge third parties
 ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one ? All linked objects (invoices, orders, ...) will be moved to current third party so you will be able to delete the duplicate one.
 ThirdpartiesMergeSuccess=Thirdparties have been merged
 ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
+SaleRepresentativeLogin=Login of sale representative
+SaleRepresentativeFirstname=Firstname of sale representative
+SaleRepresentativeLastname=Lastname of sale representative
diff --git a/htdocs/langs/ru_RU/errors.lang b/htdocs/langs/ru_RU/errors.lang
index 561a004a1d8..359b84897fc 100644
--- a/htdocs/langs/ru_RU/errors.lang
+++ b/htdocs/langs/ru_RU/errors.lang
@@ -172,6 +172,8 @@ ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
 ErrorOppStatusRequiredIfAmount=You set an estimated amount for this opportunity/lead. So you must also enter its status
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
 ErrorSavingChanges=An error has ocurred when saving the changes
+ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
+ErrorFileMustHaveFormat=File must have format %s
 
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
diff --git a/htdocs/langs/ru_RU/exports.lang b/htdocs/langs/ru_RU/exports.lang
index 40ed9cf876a..f34e137bcfe 100644
--- a/htdocs/langs/ru_RU/exports.lang
+++ b/htdocs/langs/ru_RU/exports.lang
@@ -128,6 +128,10 @@ SpecialCode=Special code
 ExportStringFilter=%% allows replacing one or more characters in the text
 ExportDateFilter=YYYY, YYYYMM, YYYYMMDD : filters by one year/month/day<br>YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD : filters over a range of years/months/days<br> > YYYY, > YYYYMM, > YYYYMMDD : filters on all following years/months/days<br> < YYYY, < YYYYMM, < YYYYMMDD : filters on all previous years/months/days
 ExportNumericFilter='NNNNN' filters by one value<br>'NNNNN+NNNNN' filters over a range of values<br>'&gt;NNNNN' filters by lower values<br>'&gt;NNNNN' filters by higher values
+ImportFromLine=Import starting from line number
+EndAtLineNb=End at line number
+SetThisValueTo2ToExcludeFirstLine=For example, set this value to 3 to exclude the 2 first lines
+KeepEmptyToGoToEndOfFile=Keep this field empty to go up to the end of file
 ## filters
 SelectFilterFields=If you want to filter on some values, just input values here.
 FilterableFields=Filterable Fields
diff --git a/htdocs/langs/ru_RU/main.lang b/htdocs/langs/ru_RU/main.lang
index 93a36669177..d63727bcc14 100644
--- a/htdocs/langs/ru_RU/main.lang
+++ b/htdocs/langs/ru_RU/main.lang
@@ -25,6 +25,7 @@ FormatDateHourTextShort=%d %b %Y %H:%M
 FormatDateHourText=%d %B %Y %H:%M
 DatabaseConnection=Подключение к базе данных
 NoTemplateDefined=No template defined for this email type
+AvailableVariables=Available substitution variables
 NoTranslation=Нет перевода
 NoRecordFound=Запись не найдена
 NoError=Нет ошибки
diff --git a/htdocs/langs/ru_RU/orders.lang b/htdocs/langs/ru_RU/orders.lang
index 4204553356e..c9d56ce0603 100644
--- a/htdocs/langs/ru_RU/orders.lang
+++ b/htdocs/langs/ru_RU/orders.lang
@@ -32,6 +32,7 @@ StatusOrderSent=Поставки в процессе
 StatusOrderOnProcessShort=Заказано
 StatusOrderProcessedShort=Обработано
 StatusOrderDelivered=Delivered
+StatusOrderDeliveredShort=Delivered
 StatusOrderToBillShort=В законопроекте
 StatusOrderToBill2Short=Для выставления
 StatusOrderApprovedShort=Утверждено
diff --git a/htdocs/langs/ru_RU/products.lang b/htdocs/langs/ru_RU/products.lang
index 44e2092a3cb..c86bc8f2964 100644
--- a/htdocs/langs/ru_RU/products.lang
+++ b/htdocs/langs/ru_RU/products.lang
@@ -45,10 +45,6 @@ LastProducts=Последние товары
 CardProduct0=Карточка товара
 CardProduct1=Карточка услуги
 CardContract=Карточка контакта
-Warehouse=Склад
-Warehouses=Склады
-WarehouseOpened=Warehouse open
-WarehouseClosed=Склад закрыт
 Stock=Склад
 Stocks=Склады
 Movement=Движение
@@ -318,3 +314,11 @@ WarningSelectOneDocument=Please select at least one document
 DefaultUnitToShow=Unit
 NbOfQtyInProposals=Qty in proposals
 ClinkOnALinkOfColumn=Click on a link of column %s to get a detailed view...
+TranslatedLabel=Translated label
+TranslatedDescription=Translated description
+TranslatedNote=Translated notes
+ProductWeight=Weight for 1 product
+ProductVolume=Volume for 1 product
+WeightUnits=Weight unit
+VolumeUnits=Volume unit
+SizeUnits=Size unit
diff --git a/htdocs/langs/ru_RU/projects.lang b/htdocs/langs/ru_RU/projects.lang
index 6687b192491..27c4995d20d 100644
--- a/htdocs/langs/ru_RU/projects.lang
+++ b/htdocs/langs/ru_RU/projects.lang
@@ -74,6 +74,9 @@ Progress=Прогресс
 ProgressDeclared=Заданный ход выполнения проекта
 ProgressCalculated=Вычисленный  ход выполнения проекта
 Time=Время
+ListOfTasks=List of tasks
+GoToListOfTimeConsumed=Go to list of time consumed
+GoToListOfTasks=Go to list of tasks
 ListProposalsAssociatedProject=Списки коммерческих предложений, связанных с проектом
 ListOrdersAssociatedProject=Списки заказы, связанные с проектом
 ListInvoicesAssociatedProject=Списки счетов, связанных с проектом
@@ -198,3 +201,4 @@ OppStatusNEGO=Negociation
 OppStatusPENDING=Pending
 OppStatusWIN=Won
 OppStatusLOST=Lost
+Budget=Budget
diff --git a/htdocs/langs/ru_RU/sendings.lang b/htdocs/langs/ru_RU/sendings.lang
index bfc7a7b254b..1f41fb7c5bc 100644
--- a/htdocs/langs/ru_RU/sendings.lang
+++ b/htdocs/langs/ru_RU/sendings.lang
@@ -70,6 +70,8 @@ ProductQtyInSuppliersOrdersRunning=Количество товара в откр
 ProductQtyInShipmentAlreadySent=Product quantity from opened customer order already sent
 ProductQtyInSuppliersShipmentAlreadyRecevied=Количество товара из открытого заказа поставщика уже получено. 
 NoProductToShipFoundIntoStock=No product to ship found into warehouse <b>%s</b>. Correct stock or go back to choose another warehouse.
+WeightVolShort=Weight/Vol.
+ValidateOrderFirstBeforeShipment=You must first validate the order before being able to make shipments.
 
 # Sending methods
 SendingMethodCATCH=Получено заказчиком
diff --git a/htdocs/langs/ru_RU/supplier_proposal.lang b/htdocs/langs/ru_RU/supplier_proposal.lang
index b96f039ac86..4b7777b30c6 100644
--- a/htdocs/langs/ru_RU/supplier_proposal.lang
+++ b/htdocs/langs/ru_RU/supplier_proposal.lang
@@ -58,3 +58,5 @@ DefaultModelSupplierProposalCreate=Создание модели по умолч
 DefaultModelSupplierProposalToBill=Default template when closing a price request (accepted)
 DefaultModelSupplierProposalClosed=Default template when closing a price request (refused)
 ListOfSupplierProposal=List of supplier proposal requests
+SupplierProposalsToClose=Supplier proposals to close
+SupplierProposalsToProcess=Supplier proposals to process
diff --git a/htdocs/langs/sk_SK/admin.lang b/htdocs/langs/sk_SK/admin.lang
index 4ebf090c666..4a4f526e1a4 100644
--- a/htdocs/langs/sk_SK/admin.lang
+++ b/htdocs/langs/sk_SK/admin.lang
@@ -282,6 +282,7 @@ ModuleSetup=Nastavenie modulu
 ModulesSetup=Moduly nastavenie
 ModuleFamilyBase=Systém
 ModuleFamilyCrm=Riadenie vzťahov so zákazníkmi (CRM)
+ModuleFamilySrm=Supplier Relation Management (SRM)
 ModuleFamilyProducts=Products Management (PM)
 ModuleFamilyHr=Human Resource Management (HR)
 ModuleFamilyProjects=Projekty / tímovú prácu
@@ -587,6 +588,7 @@ Permission38=Export produktov
 Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
 Permission42=Vytvoriť / upraviť projektov (spoločné projekty, projekt a ja som kontakt pre)
 Permission44=Odstrániť projektov (spoločné projekty, projekt a ja som kontakt pre)
+Permission45=Export projects
 Permission61=Prečítajte intervencie
 Permission62=Vytvoriť / upraviť zásahy
 Permission64=Odstrániť intervencie
@@ -640,6 +642,7 @@ Permission162=Vytvoriť / upraviť zákazky / predplatné
 Permission163=Aktivovať službu / predplatné zmluvy
 Permission164=Zakázať službu / predplatné zmluvy
 Permission165=Odstrániť zmluvy / predplatné
+Permission167=Export contracts
 Permission171=Read trips and expenses (yours and your subordinates)
 Permission172=Vytvoriť / upraviť obchodné cesty a náklady
 Permission173=Odstrániť obchodné cesty a náklady
@@ -788,6 +791,7 @@ Permission2403=Odstrániť akcie (udalosti alebo úlohy) ktoré súvisia s jeho
 Permission2411=Prečítajte akcie (udalosti alebo úlohy) a ďalšie
 Permission2412=Vytvoriť / upraviť akcie (udalosti alebo úlohy) ďalších
 Permission2413=Odstrániť akcie (udalosti alebo úlohy) ďalších
+Permission2414=Export actions/tasks of others
 Permission2501=Čítanie / Dokumenty k stiahnutiu
 Permission2502=Dokumenty k stiahnutiu
 Permission2503=Vložte alebo odstraňovať dokumenty
@@ -1713,3 +1717,4 @@ ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s is available. Ve
 MultiPriceRuleDesc=When option "Several level of prices per product/service" is on, you can define different prices (one per price level) for each product. To save you time, you can enter here rule to have price for each level autocalculated according to price of first level, so you will have to enter only price for first level on each product. This page is here to save you time and can be usefull only if your prices for each leve are relative to first level. You can ignore this page in most cases.
 ModelModulesProduct=Templates for product documents
 ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
+SeeSubstitutionVars=See * note for list of possible substitution variables
diff --git a/htdocs/langs/sk_SK/bills.lang b/htdocs/langs/sk_SK/bills.lang
index 5b9119ab8be..55f71b64a7c 100644
--- a/htdocs/langs/sk_SK/bills.lang
+++ b/htdocs/langs/sk_SK/bills.lang
@@ -219,6 +219,7 @@ RemainderToBill=Zostávajúca časť zákona
 SendBillByMail=Poslať e-mailom faktúru
 SendReminderBillByMail=Poslať upozornenie e-mailom
 RelatedCommercialProposals=Súvisiace obchodné návrhy
+RelatedRecurringCustomerInvoices=Related recurring customer invoices
 MenuToValid=Ak chcete platné
 DateMaxPayment=Platba musí prebehnúť do
 DateEcheance=Dátum splatnosti obmedzenia
@@ -319,7 +320,6 @@ toolTipFrequency=Examples:<br /><b>Set 7 / day</b>: give a new invoice every 7 d
 NextDateToExecution=Date for next invoice generation
 DateLastGeneration=Date of last generation
 MaxPeriodNumber=Max nb of invoice generation
-RestPeriodNumber=Rest period number
 NbOfGenerationDone=Nb of invoice generation already done
 InvoiceAutoValidate=Automatically validate invoice
 GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
@@ -471,3 +471,7 @@ PDFCrevetteSituationInvoiceLine=Situation N°%s : Inv. N°%s on %s
 TotalSituationInvoice=Total situation
 invoiceLineProgressError=Invoice line progress can't be egal or upper the next invoice line
 updatePriceNextInvoiceErrorUpdateline=Error : update price on invoice line : %s
+ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
+ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
+ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
+
diff --git a/htdocs/langs/sk_SK/boxes.lang b/htdocs/langs/sk_SK/boxes.lang
index 6b6622ab3da..5a5b9ea4dcb 100644
--- a/htdocs/langs/sk_SK/boxes.lang
+++ b/htdocs/langs/sk_SK/boxes.lang
@@ -60,8 +60,8 @@ BoxTitleLastContracts=Posledný %s zmluvy
 BoxTitleLastModifiedDonations=Posledné %s upravené dary
 BoxTitleLastModifiedExpenses=Last %s modified expense reports
 BoxGlobalActivity=Globálna aktivita (faktúry, návrhy, objednávky)
-BoxGoodCustomers=Good Customers
-BoxTitleGoodCustomers=%s Good Customers
+BoxGoodCustomers=Good customers
+BoxTitleGoodCustomers=%s Good customers
 FailedToRefreshDataInfoNotUpToDate=Nepodarilo sa obnoviť RSS toku. Posledný úspešný refresh Dátum: %s
 LastRefreshDate=Posledný obnovovacia dáta
 NoRecordedBookmarks=Žiadne záložky definované.
diff --git a/htdocs/langs/sk_SK/companies.lang b/htdocs/langs/sk_SK/companies.lang
index dd3884213f5..764c9e5aa32 100644
--- a/htdocs/langs/sk_SK/companies.lang
+++ b/htdocs/langs/sk_SK/companies.lang
@@ -202,7 +202,7 @@ ProfId3IN=Prof ID 3 (SRVC TAX)
 ProfId4IN=Prof Id 4
 ProfId5IN=Prof Id 5
 ProfId6IN=-
-ProfId1LU=Id. prof. 1 (RCS)
+ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
 ProfId2LU=Id. prof. 2 (Business permit)
 ProfId3LU=-
 ProfId4LU=-
@@ -317,10 +317,12 @@ ShowContact=Zobraziť kontakt
 ContactsAllShort=Všetko (Bez filtra)
 ContactType=Kontaktujte typ
 ContactForOrders=Order kontakt
+ContactForOrdersOrShipments=Order's or shipment's contact
 ContactForProposals=Návrh je kontakt
 ContactForContracts=Zmluva je kontakt
 ContactForInvoices=Faktúra je kontakt
 NoContactForAnyOrder=Tento kontakt nie je kontakt na ľubovoľnom poradí
+NoContactForAnyOrderOrShipment=This contact is not a contact for any order or shipment
 NoContactForAnyProposal=Tento kontakt nie je kontaktnou osobou pre akékoľvek komerčné návrhu
 NoContactForAnyContract=Tento kontakt nie je kontakt u každej zákazky
 NoContactForAnyInvoice=Tento kontakt nie je kontakt pre každé faktúre
@@ -438,3 +440,6 @@ MergeThirdparties=Merge third parties
 ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one ? All linked objects (invoices, orders, ...) will be moved to current third party so you will be able to delete the duplicate one.
 ThirdpartiesMergeSuccess=Thirdparties have been merged
 ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
+SaleRepresentativeLogin=Login of sale representative
+SaleRepresentativeFirstname=Firstname of sale representative
+SaleRepresentativeLastname=Lastname of sale representative
diff --git a/htdocs/langs/sk_SK/errors.lang b/htdocs/langs/sk_SK/errors.lang
index 6f30c1c71b7..01975fd3997 100644
--- a/htdocs/langs/sk_SK/errors.lang
+++ b/htdocs/langs/sk_SK/errors.lang
@@ -172,6 +172,8 @@ ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
 ErrorOppStatusRequiredIfAmount=You set an estimated amount for this opportunity/lead. So you must also enter its status
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
 ErrorSavingChanges=An error has ocurred when saving the changes
+ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
+ErrorFileMustHaveFormat=File must have format %s
 
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
diff --git a/htdocs/langs/sk_SK/exports.lang b/htdocs/langs/sk_SK/exports.lang
index 2660cf12fac..a46feb674bf 100644
--- a/htdocs/langs/sk_SK/exports.lang
+++ b/htdocs/langs/sk_SK/exports.lang
@@ -128,6 +128,10 @@ SpecialCode=Special code
 ExportStringFilter=%% allows replacing one or more characters in the text
 ExportDateFilter=YYYY, YYYYMM, YYYYMMDD : filters by one year/month/day<br>YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD : filters over a range of years/months/days<br> > YYYY, > YYYYMM, > YYYYMMDD : filters on all following years/months/days<br> < YYYY, < YYYYMM, < YYYYMMDD : filters on all previous years/months/days
 ExportNumericFilter='NNNNN' filters by one value<br>'NNNNN+NNNNN' filters over a range of values<br>'&gt;NNNNN' filters by lower values<br>'&gt;NNNNN' filters by higher values
+ImportFromLine=Import starting from line number
+EndAtLineNb=End at line number
+SetThisValueTo2ToExcludeFirstLine=For example, set this value to 3 to exclude the 2 first lines
+KeepEmptyToGoToEndOfFile=Keep this field empty to go up to the end of file
 ## filters
 SelectFilterFields=Ak chcete filtrovať niektoré hodnoty, stačí zadať hodnoty tu.
 FilterableFields=Filterable Fields
diff --git a/htdocs/langs/sk_SK/main.lang b/htdocs/langs/sk_SK/main.lang
index 5e33cf1c57c..64ebb8f4e3c 100644
--- a/htdocs/langs/sk_SK/main.lang
+++ b/htdocs/langs/sk_SK/main.lang
@@ -25,6 +25,7 @@ FormatDateHourTextShort=%b %d, %Y, %I:%M %p
 FormatDateHourText=%B %d, %Y, %I:%M %p
 DatabaseConnection=Pripojenie k databáze
 NoTemplateDefined=No template defined for this email type
+AvailableVariables=Available substitution variables
 NoTranslation=Preklad neexistuje
 NoRecordFound=Nebol nájdený žiadny záznam
 NoError=Žiadna chyba
diff --git a/htdocs/langs/sk_SK/orders.lang b/htdocs/langs/sk_SK/orders.lang
index faf4a8b0f7a..a7633cb34ac 100644
--- a/htdocs/langs/sk_SK/orders.lang
+++ b/htdocs/langs/sk_SK/orders.lang
@@ -32,6 +32,7 @@ StatusOrderSent=Preprava v procese
 StatusOrderOnProcessShort=Ordered
 StatusOrderProcessedShort=Spracované
 StatusOrderDelivered=Delivered
+StatusOrderDeliveredShort=Delivered
 StatusOrderToBillShort=Dodáva sa
 StatusOrderToBill2Short=K účtu
 StatusOrderApprovedShort=Schválený
diff --git a/htdocs/langs/sk_SK/products.lang b/htdocs/langs/sk_SK/products.lang
index 63f6bdc9f32..a0247c1c1ef 100644
--- a/htdocs/langs/sk_SK/products.lang
+++ b/htdocs/langs/sk_SK/products.lang
@@ -45,10 +45,6 @@ LastProducts=Najnovšie produkty
 CardProduct0=Karta produktu
 CardProduct1=Servisná karta
 CardContract=Zmluva karty
-Warehouse=Sklad
-Warehouses=Sklady
-WarehouseOpened=Warehouse open
-WarehouseClosed=Sklad uzavretý
 Stock=Sklad
 Stocks=Zásoby
 Movement=Pohyb
@@ -318,3 +314,11 @@ WarningSelectOneDocument=Please select at least one document
 DefaultUnitToShow=Unit
 NbOfQtyInProposals=Qty in proposals
 ClinkOnALinkOfColumn=Click on a link of column %s to get a detailed view...
+TranslatedLabel=Translated label
+TranslatedDescription=Translated description
+TranslatedNote=Translated notes
+ProductWeight=Weight for 1 product
+ProductVolume=Volume for 1 product
+WeightUnits=Weight unit
+VolumeUnits=Volume unit
+SizeUnits=Size unit
diff --git a/htdocs/langs/sk_SK/projects.lang b/htdocs/langs/sk_SK/projects.lang
index 5345598f90e..6453fec2772 100644
--- a/htdocs/langs/sk_SK/projects.lang
+++ b/htdocs/langs/sk_SK/projects.lang
@@ -74,6 +74,9 @@ Progress=Pokrok
 ProgressDeclared=Deklarovaná pokrok
 ProgressCalculated=Vypočítaná pokrok
 Time=Čas
+ListOfTasks=List of tasks
+GoToListOfTimeConsumed=Go to list of time consumed
+GoToListOfTasks=Go to list of tasks
 ListProposalsAssociatedProject=Zoznam obchodných návrhov spojených s projektom
 ListOrdersAssociatedProject=Zoznam objednávok zákazníka súvisiace s projektom
 ListInvoicesAssociatedProject=Zoznam zákazníka faktúry súvisiace s projektom
@@ -198,3 +201,4 @@ OppStatusNEGO=Negociation
 OppStatusPENDING=Pending
 OppStatusWIN=Won
 OppStatusLOST=Lost
+Budget=Budget
diff --git a/htdocs/langs/sk_SK/sendings.lang b/htdocs/langs/sk_SK/sendings.lang
index 47a26e5f541..c422d82bf7a 100644
--- a/htdocs/langs/sk_SK/sendings.lang
+++ b/htdocs/langs/sk_SK/sendings.lang
@@ -70,6 +70,8 @@ ProductQtyInSuppliersOrdersRunning=Product quantity into opened suppliers orders
 ProductQtyInShipmentAlreadySent=Product quantity from opened customer order already sent
 ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from opened supplier order already received
 NoProductToShipFoundIntoStock=No product to ship found into warehouse <b>%s</b>. Correct stock or go back to choose another warehouse.
+WeightVolShort=Weight/Vol.
+ValidateOrderFirstBeforeShipment=You must first validate the order before being able to make shipments.
 
 # Sending methods
 SendingMethodCATCH=Chytiť zákazníka
diff --git a/htdocs/langs/sk_SK/supplier_proposal.lang b/htdocs/langs/sk_SK/supplier_proposal.lang
index 1a1bdc4df16..e37ced1b38f 100644
--- a/htdocs/langs/sk_SK/supplier_proposal.lang
+++ b/htdocs/langs/sk_SK/supplier_proposal.lang
@@ -58,3 +58,5 @@ DefaultModelSupplierProposalCreate=Default model creation
 DefaultModelSupplierProposalToBill=Default template when closing a price request (accepted)
 DefaultModelSupplierProposalClosed=Default template when closing a price request (refused)
 ListOfSupplierProposal=List of supplier proposal requests
+SupplierProposalsToClose=Supplier proposals to close
+SupplierProposalsToProcess=Supplier proposals to process
diff --git a/htdocs/langs/sl_SI/admin.lang b/htdocs/langs/sl_SI/admin.lang
index 2c265f17b15..a0b7c49e3ef 100644
--- a/htdocs/langs/sl_SI/admin.lang
+++ b/htdocs/langs/sl_SI/admin.lang
@@ -282,6 +282,7 @@ ModuleSetup=Nastavitve modula
 ModulesSetup=Nastavitve modulov
 ModuleFamilyBase=Sistem
 ModuleFamilyCrm=Upravljanje odnosov s strankami (CRM)
+ModuleFamilySrm=Supplier Relation Management (SRM)
 ModuleFamilyProducts=Upravljanje proizvodov (Products Management - PM)
 ModuleFamilyHr=Upravljanje s človeškimi viri (Human Resource Management - HR)
 ModuleFamilyProjects=Delo na projektih/sodelovanje
@@ -587,6 +588,7 @@ Permission38=Izvoz proizvodov
 Permission41=Beri projekte in naloge (za katere sem jaz kontaktna oseba). Lahko se vnese porabljen čas za dodeljeno nalogo (časovnica)
 Permission42=Kreiranje/spreminjanje projektov, urejanje nalog v mojih projektih
 Permission44=Brisanje projektov
+Permission45=Export projects
 Permission61=Branje intervencij
 Permission62=Kreiranje/spreminjanje intervencij
 Permission64=Delete intervencij
@@ -640,6 +642,7 @@ Permission162=Kreiranje/spreminjanje pogodb/naročnin
 Permission163=Aktiviranje pogodbene storitve/naročnine
 Permission164=Onemogočenje pogodbene storitve/naročnine
 Permission165=Brisanje pogodb/naročnin
+Permission167=Export contracts
 Permission171=Read trips and expenses (yours and your subordinates)
 Permission172=Kreiranje/spreminjanje potnih nalogov in stroškov
 Permission173=Brisanje potnih nalogov in stroškov
@@ -788,6 +791,7 @@ Permission2403=Brisanje aktivnosti (dogodki ali naloge) povezanih s tem uporabni
 Permission2411=Branje aktivnosti (dogodki ali naloge) ostalih
 Permission2412=Kreiranje/spreminjanje aktivnosti (dogodki ali naloge) ostalih
 Permission2413=Delete aktivnosti (dogodki ali naloge) ostalih
+Permission2414=Export actions/tasks of others
 Permission2501=Branje dokumentov
 Permission2502=Pošiljanje ali brisanje dokumentov
 Permission2503=Pošiljanje ali brisanje dokumentov
@@ -1713,3 +1717,4 @@ ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s is available. Ve
 MultiPriceRuleDesc=When option "Several level of prices per product/service" is on, you can define different prices (one per price level) for each product. To save you time, you can enter here rule to have price for each level autocalculated according to price of first level, so you will have to enter only price for first level on each product. This page is here to save you time and can be usefull only if your prices for each leve are relative to first level. You can ignore this page in most cases.
 ModelModulesProduct=Templates for product documents
 ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
+SeeSubstitutionVars=See * note for list of possible substitution variables
diff --git a/htdocs/langs/sl_SI/bills.lang b/htdocs/langs/sl_SI/bills.lang
index 62f7735e936..e1d16d97b4a 100644
--- a/htdocs/langs/sl_SI/bills.lang
+++ b/htdocs/langs/sl_SI/bills.lang
@@ -219,6 +219,7 @@ RemainderToBill=Opomnik za fakturiranje
 SendBillByMail=Pošlji račun po e-mailu
 SendReminderBillByMail=Pošlji opomin po e-mailu
 RelatedCommercialProposals=Povezane komercialne ponudbe
+RelatedRecurringCustomerInvoices=Related recurring customer invoices
 MenuToValid=Za potrditev
 DateMaxPayment=Rok plačila do
 DateEcheance=Omejitev roka plačila
@@ -319,7 +320,6 @@ toolTipFrequency=Examples:<br /><b>Set 7 / day</b>: give a new invoice every 7 d
 NextDateToExecution=Date for next invoice generation
 DateLastGeneration=Date of last generation
 MaxPeriodNumber=Max nb of invoice generation
-RestPeriodNumber=Rest period number
 NbOfGenerationDone=Nb of invoice generation already done
 InvoiceAutoValidate=Automatically validate invoice
 GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
@@ -471,3 +471,7 @@ PDFCrevetteSituationInvoiceLine=Situation N°%s : Inv. N°%s on %s
 TotalSituationInvoice=Total situation
 invoiceLineProgressError=Invoice line progress can't be egal or upper the next invoice line
 updatePriceNextInvoiceErrorUpdateline=Error : update price on invoice line : %s
+ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
+ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
+ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
+
diff --git a/htdocs/langs/sl_SI/boxes.lang b/htdocs/langs/sl_SI/boxes.lang
index e0420989e86..1291bb80729 100644
--- a/htdocs/langs/sl_SI/boxes.lang
+++ b/htdocs/langs/sl_SI/boxes.lang
@@ -60,8 +60,8 @@ BoxTitleLastContracts=Zadnjih %s pogodb
 BoxTitleLastModifiedDonations=Zadnjih %s spremenjenih donacij
 BoxTitleLastModifiedExpenses=Zadnjih %s spremenjenih poročil o stroških
 BoxGlobalActivity=Globalna aktivnost (računi, ponudbe, naročila)
-BoxGoodCustomers=Good Customers
-BoxTitleGoodCustomers=%s Good Customers
+BoxGoodCustomers=Good customers
+BoxTitleGoodCustomers=%s Good customers
 FailedToRefreshDataInfoNotUpToDate=Neuspešna osvežitev RSS fluxa. Datum zadnje uspešne osvežitve: %s
 LastRefreshDate=Datum zadnje osvežitve
 NoRecordedBookmarks=Ni definiranih zaznamkov.
diff --git a/htdocs/langs/sl_SI/companies.lang b/htdocs/langs/sl_SI/companies.lang
index 19742a134f5..50f62796bd2 100644
--- a/htdocs/langs/sl_SI/companies.lang
+++ b/htdocs/langs/sl_SI/companies.lang
@@ -202,7 +202,7 @@ ProfId3IN=Prof Id 3
 ProfId4IN=Prof Id 4
 ProfId5IN==
 ProfId6IN=-
-ProfId1LU=Id. prof. 1 (RCS)
+ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
 ProfId2LU=Id. prof. 2 (Business permit)
 ProfId3LU=-
 ProfId4LU=-
@@ -317,10 +317,12 @@ ShowContact=Pokaži kontakt
 ContactsAllShort=Vsi (brez filtra)
 ContactType=Vrsta kontakta
 ContactForOrders=Kontakt za naročilo
+ContactForOrdersOrShipments=Order's or shipment's contact
 ContactForProposals=Kontakt za ponudbo
 ContactForContracts=Kontakt za pogodbo
 ContactForInvoices=Kontakt za račun
 NoContactForAnyOrder=Ta kontakt ni pravi za naročila
+NoContactForAnyOrderOrShipment=This contact is not a contact for any order or shipment
 NoContactForAnyProposal=Ta kontakt ni pravi za komercialne ponudbe
 NoContactForAnyContract=Ta kontakt ni pravi za pogodbe
 NoContactForAnyInvoice=Ta kontakt ni pravi za račune
@@ -438,3 +440,6 @@ MergeThirdparties=Združi partnerje
 ConfirmMergeThirdparties=Ali zares želite združiti tega partnerja s trenutnim? Vsi povezani objekti (računi, naročila,  ...) bodo premaknjeni k trenutnemu partnerju, zato boste lahko zbrisali podvojene.
 ThirdpartiesMergeSuccess=Partnerja sta bila združena
 ErrorThirdpartiesMerge=Pri brisanju partnerja je prišlo do napake. Prosimo, preverite dnevnik. Spremembe so bile preklicane.
+SaleRepresentativeLogin=Login of sale representative
+SaleRepresentativeFirstname=Firstname of sale representative
+SaleRepresentativeLastname=Lastname of sale representative
diff --git a/htdocs/langs/sl_SI/errors.lang b/htdocs/langs/sl_SI/errors.lang
index 344e9a66436..eb1ef6b30aa 100644
--- a/htdocs/langs/sl_SI/errors.lang
+++ b/htdocs/langs/sl_SI/errors.lang
@@ -172,6 +172,8 @@ ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
 ErrorOppStatusRequiredIfAmount=You set an estimated amount for this opportunity/lead. So you must also enter its status
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
 ErrorSavingChanges=An error has ocurred when saving the changes
+ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
+ErrorFileMustHaveFormat=File must have format %s
 
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
diff --git a/htdocs/langs/sl_SI/exports.lang b/htdocs/langs/sl_SI/exports.lang
index a882da13bb3..c9e7f793460 100644
--- a/htdocs/langs/sl_SI/exports.lang
+++ b/htdocs/langs/sl_SI/exports.lang
@@ -128,6 +128,10 @@ SpecialCode=Posebna koda
 ExportStringFilter=%% dovoljuje zamenjavo enega ali več znakov v besedilu
 ExportDateFilter=YYYY, YYYYMM, YYYYMMDD : filtrira po enem letu/mesecu/dnevu<br>YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD : filtrira po območju let/mesecev/dni<br> > YYYY, > YYYYMM, > YYYYMMDD : filtrira po vseh letih/mesecih/dnevih<br> < YYYY, < YYYYMM, < YYYYMMDD : filtrira po vseh prejšnjih letih/mesecih/dnevih
 ExportNumericFilter='NNNNN' filtrira po eni vrednosti<br>'NNNNN+NNNNN' filtrira po območju vrednosti<br>'&gt;NNNNN' filtrira po nižjih vrednostih<br>'&gt;NNNNN' filtrira po višjih vrednostih
+ImportFromLine=Import starting from line number
+EndAtLineNb=End at line number
+SetThisValueTo2ToExcludeFirstLine=For example, set this value to 3 to exclude the 2 first lines
+KeepEmptyToGoToEndOfFile=Keep this field empty to go up to the end of file
 ## filters
 SelectFilterFields=Če želite filtrirati po nekaterih vrednostih, jih vnesite tukaj
 FilterableFields=Polja za filtriranje
diff --git a/htdocs/langs/sl_SI/main.lang b/htdocs/langs/sl_SI/main.lang
index 117d0333d52..a61accb03db 100644
--- a/htdocs/langs/sl_SI/main.lang
+++ b/htdocs/langs/sl_SI/main.lang
@@ -25,6 +25,7 @@ FormatDateHourTextShort=%d. %b, %Y, %I:%M %p
 FormatDateHourText=%d. %B, %Y, %I:%M %p
 DatabaseConnection=Povezave podatkovnih baz
 NoTemplateDefined=No template defined for this email type
+AvailableVariables=Available substitution variables
 NoTranslation=Ni prevoda
 NoRecordFound=Ni najden zapis
 NoError=Ni napake
diff --git a/htdocs/langs/sl_SI/orders.lang b/htdocs/langs/sl_SI/orders.lang
index d3fbeb5398a..9f9d7af2a07 100644
--- a/htdocs/langs/sl_SI/orders.lang
+++ b/htdocs/langs/sl_SI/orders.lang
@@ -32,6 +32,7 @@ StatusOrderSent=Pošiljanje v teku
 StatusOrderOnProcessShort=Naročeno
 StatusOrderProcessedShort=Obdelano
 StatusOrderDelivered=Delivered
+StatusOrderDeliveredShort=Delivered
 StatusOrderToBillShort=Za fakturiranje
 StatusOrderToBill2Short=Za fakturiranje
 StatusOrderApprovedShort=Odobreno
diff --git a/htdocs/langs/sl_SI/products.lang b/htdocs/langs/sl_SI/products.lang
index 649bad86247..3dc6738a71a 100644
--- a/htdocs/langs/sl_SI/products.lang
+++ b/htdocs/langs/sl_SI/products.lang
@@ -45,10 +45,6 @@ LastProducts=Zadnji proizvodi
 CardProduct0=Kartica proizvoda
 CardProduct1=Kartica storitve
 CardContract=Kartica pogodbe
-Warehouse=Skladišče
-Warehouses=Skladišča
-WarehouseOpened=Skladišče odprto
-WarehouseClosed=Skladišče zaprto
 Stock=Zaloga
 Stocks=Zaloge
 Movement=Premik
@@ -318,3 +314,11 @@ WarningSelectOneDocument=Please select at least one document
 DefaultUnitToShow=Unit
 NbOfQtyInProposals=Qty in proposals
 ClinkOnALinkOfColumn=Click on a link of column %s to get a detailed view...
+TranslatedLabel=Translated label
+TranslatedDescription=Translated description
+TranslatedNote=Translated notes
+ProductWeight=Weight for 1 product
+ProductVolume=Volume for 1 product
+WeightUnits=Weight unit
+VolumeUnits=Volume unit
+SizeUnits=Size unit
diff --git a/htdocs/langs/sl_SI/projects.lang b/htdocs/langs/sl_SI/projects.lang
index 7a468c1702c..81c1c01c46d 100644
--- a/htdocs/langs/sl_SI/projects.lang
+++ b/htdocs/langs/sl_SI/projects.lang
@@ -74,6 +74,9 @@ Progress=Napredek
 ProgressDeclared=Declared progress
 ProgressCalculated=Calculated progress
 Time=Čas
+ListOfTasks=List of tasks
+GoToListOfTimeConsumed=Go to list of time consumed
+GoToListOfTasks=Go to list of tasks
 ListProposalsAssociatedProject=Seznam komercialnih ponudb, povezanih s projektom
 ListOrdersAssociatedProject=Seznam naročil kupcev, povezanih s projektom
 ListInvoicesAssociatedProject=Seznam računov kupcem, povezanih s projektom
@@ -198,3 +201,4 @@ OppStatusNEGO=Negociation
 OppStatusPENDING=Pending
 OppStatusWIN=Won
 OppStatusLOST=Lost
+Budget=Budget
diff --git a/htdocs/langs/sl_SI/sendings.lang b/htdocs/langs/sl_SI/sendings.lang
index 16208e2abdd..11ca3d62861 100644
--- a/htdocs/langs/sl_SI/sendings.lang
+++ b/htdocs/langs/sl_SI/sendings.lang
@@ -70,6 +70,8 @@ ProductQtyInSuppliersOrdersRunning=Product quantity into opened suppliers orders
 ProductQtyInShipmentAlreadySent=Product quantity from opened customer order already sent
 ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from opened supplier order already received
 NoProductToShipFoundIntoStock=No product to ship found into warehouse <b>%s</b>. Correct stock or go back to choose another warehouse.
+WeightVolShort=Weight/Vol.
+ValidateOrderFirstBeforeShipment=You must first validate the order before being able to make shipments.
 
 # Sending methods
 SendingMethodCATCH=Lasten prevzem kupca
diff --git a/htdocs/langs/sl_SI/supplier_proposal.lang b/htdocs/langs/sl_SI/supplier_proposal.lang
index 38c285a0e0e..455767aaa8e 100644
--- a/htdocs/langs/sl_SI/supplier_proposal.lang
+++ b/htdocs/langs/sl_SI/supplier_proposal.lang
@@ -58,3 +58,5 @@ DefaultModelSupplierProposalCreate=Default model creation
 DefaultModelSupplierProposalToBill=Default template when closing a price request (accepted)
 DefaultModelSupplierProposalClosed=Default template when closing a price request (refused)
 ListOfSupplierProposal=List of supplier proposal requests
+SupplierProposalsToClose=Supplier proposals to close
+SupplierProposalsToProcess=Supplier proposals to process
diff --git a/htdocs/langs/sq_AL/admin.lang b/htdocs/langs/sq_AL/admin.lang
index deca56bf2c1..c83ce1dba12 100644
--- a/htdocs/langs/sq_AL/admin.lang
+++ b/htdocs/langs/sq_AL/admin.lang
@@ -282,6 +282,7 @@ ModuleSetup=Module setup
 ModulesSetup=Modules setup
 ModuleFamilyBase=System
 ModuleFamilyCrm=Customer Relation Management (CRM)
+ModuleFamilySrm=Supplier Relation Management (SRM)
 ModuleFamilyProducts=Products Management (PM)
 ModuleFamilyHr=Human Resource Management (HR)
 ModuleFamilyProjects=Projects/Collaborative work
@@ -587,6 +588,7 @@ Permission38=Export products
 Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
 Permission42=Create/modify projects (shared project and projects i'm contact for)
 Permission44=Delete projects (shared project and projects i'm contact for)
+Permission45=Export projects
 Permission61=Read interventions
 Permission62=Create/modify interventions
 Permission64=Delete interventions
@@ -640,6 +642,7 @@ Permission162=Create/modify contracts/subscriptions
 Permission163=Activate a service/subscription of a contract
 Permission164=Disable a service/subscription of a contract
 Permission165=Delete contracts/subscriptions
+Permission167=Export contracts
 Permission171=Read trips and expenses (yours and your subordinates)
 Permission172=Create/modify trips and expenses
 Permission173=Delete trips and expenses
@@ -788,6 +791,7 @@ Permission2403=Delete actions (events or tasks) linked to his account
 Permission2411=Read actions (events or tasks) of others
 Permission2412=Create/modify actions (events or tasks) of others
 Permission2413=Delete actions (events or tasks) of others
+Permission2414=Export actions/tasks of others
 Permission2501=Read/Download documents
 Permission2502=Download documents
 Permission2503=Submit or delete documents
@@ -1713,3 +1717,4 @@ ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s is available. Ve
 MultiPriceRuleDesc=When option "Several level of prices per product/service" is on, you can define different prices (one per price level) for each product. To save you time, you can enter here rule to have price for each level autocalculated according to price of first level, so you will have to enter only price for first level on each product. This page is here to save you time and can be usefull only if your prices for each leve are relative to first level. You can ignore this page in most cases.
 ModelModulesProduct=Templates for product documents
 ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
+SeeSubstitutionVars=See * note for list of possible substitution variables
diff --git a/htdocs/langs/sq_AL/bills.lang b/htdocs/langs/sq_AL/bills.lang
index e67ad0ade2d..790a146ee98 100644
--- a/htdocs/langs/sq_AL/bills.lang
+++ b/htdocs/langs/sq_AL/bills.lang
@@ -219,6 +219,7 @@ RemainderToBill=Remainder to bill
 SendBillByMail=Send invoice by email
 SendReminderBillByMail=Send reminder by email
 RelatedCommercialProposals=Related commercial proposals
+RelatedRecurringCustomerInvoices=Related recurring customer invoices
 MenuToValid=To valid
 DateMaxPayment=Payment due before
 DateEcheance=Due date limit
@@ -319,7 +320,6 @@ toolTipFrequency=Examples:<br /><b>Set 7 / day</b>: give a new invoice every 7 d
 NextDateToExecution=Date for next invoice generation
 DateLastGeneration=Date of last generation
 MaxPeriodNumber=Max nb of invoice generation
-RestPeriodNumber=Rest period number
 NbOfGenerationDone=Nb of invoice generation already done
 InvoiceAutoValidate=Automatically validate invoice
 GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
@@ -471,3 +471,7 @@ PDFCrevetteSituationInvoiceLine=Situation N°%s : Inv. N°%s on %s
 TotalSituationInvoice=Total situation
 invoiceLineProgressError=Invoice line progress can't be egal or upper the next invoice line
 updatePriceNextInvoiceErrorUpdateline=Error : update price on invoice line : %s
+ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
+ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
+ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
+
diff --git a/htdocs/langs/sq_AL/boxes.lang b/htdocs/langs/sq_AL/boxes.lang
index 57bfc174ec5..7619a335b61 100644
--- a/htdocs/langs/sq_AL/boxes.lang
+++ b/htdocs/langs/sq_AL/boxes.lang
@@ -60,8 +60,8 @@ BoxTitleLastContracts=Last %s contracts
 BoxTitleLastModifiedDonations=Last %s modified donations
 BoxTitleLastModifiedExpenses=Last %s modified expense reports
 BoxGlobalActivity=Global activity (invoices, proposals, orders)
-BoxGoodCustomers=Good Customers
-BoxTitleGoodCustomers=%s Good Customers
+BoxGoodCustomers=Good customers
+BoxTitleGoodCustomers=%s Good customers
 FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Last successfull refresh date: %s
 LastRefreshDate=Last refresh date
 NoRecordedBookmarks=No bookmarks defined.
diff --git a/htdocs/langs/sq_AL/companies.lang b/htdocs/langs/sq_AL/companies.lang
index 588867b1f2f..fe967d3252f 100644
--- a/htdocs/langs/sq_AL/companies.lang
+++ b/htdocs/langs/sq_AL/companies.lang
@@ -202,7 +202,7 @@ ProfId3IN=Prof Id 3 (SRVC TAX)
 ProfId4IN=Prof Id 4
 ProfId5IN=Prof Id 5
 ProfId6IN=-
-ProfId1LU=Id. prof. 1 (RCS)
+ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
 ProfId2LU=Id. prof. 2 (Business permit)
 ProfId3LU=-
 ProfId4LU=-
@@ -317,10 +317,12 @@ ShowContact=Show contact
 ContactsAllShort=All (No filter)
 ContactType=Contact type
 ContactForOrders=Order's contact
+ContactForOrdersOrShipments=Order's or shipment's contact
 ContactForProposals=Proposal's contact
 ContactForContracts=Contract's contact
 ContactForInvoices=Invoice's contact
 NoContactForAnyOrder=This contact is not a contact for any order
+NoContactForAnyOrderOrShipment=This contact is not a contact for any order or shipment
 NoContactForAnyProposal=This contact is not a contact for any commercial proposal
 NoContactForAnyContract=This contact is not a contact for any contract
 NoContactForAnyInvoice=This contact is not a contact for any invoice
@@ -438,3 +440,6 @@ MergeThirdparties=Merge third parties
 ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one ? All linked objects (invoices, orders, ...) will be moved to current third party so you will be able to delete the duplicate one.
 ThirdpartiesMergeSuccess=Thirdparties have been merged
 ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
+SaleRepresentativeLogin=Login of sale representative
+SaleRepresentativeFirstname=Firstname of sale representative
+SaleRepresentativeLastname=Lastname of sale representative
diff --git a/htdocs/langs/sq_AL/errors.lang b/htdocs/langs/sq_AL/errors.lang
index 718b3e8413f..fa7804ce355 100644
--- a/htdocs/langs/sq_AL/errors.lang
+++ b/htdocs/langs/sq_AL/errors.lang
@@ -172,6 +172,8 @@ ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
 ErrorOppStatusRequiredIfAmount=You set an estimated amount for this opportunity/lead. So you must also enter its status
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
 ErrorSavingChanges=An error has ocurred when saving the changes
+ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
+ErrorFileMustHaveFormat=File must have format %s
 
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
diff --git a/htdocs/langs/sq_AL/exports.lang b/htdocs/langs/sq_AL/exports.lang
index 03c87b28bcf..1a490ea647d 100644
--- a/htdocs/langs/sq_AL/exports.lang
+++ b/htdocs/langs/sq_AL/exports.lang
@@ -128,6 +128,10 @@ SpecialCode=Special code
 ExportStringFilter=%% allows replacing one or more characters in the text
 ExportDateFilter=YYYY, YYYYMM, YYYYMMDD : filters by one year/month/day<br>YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD : filters over a range of years/months/days<br> > YYYY, > YYYYMM, > YYYYMMDD : filters on all following years/months/days<br> < YYYY, < YYYYMM, < YYYYMMDD : filters on all previous years/months/days
 ExportNumericFilter='NNNNN' filters by one value<br>'NNNNN+NNNNN' filters over a range of values<br>'&gt;NNNNN' filters by lower values<br>'&gt;NNNNN' filters by higher values
+ImportFromLine=Import starting from line number
+EndAtLineNb=End at line number
+SetThisValueTo2ToExcludeFirstLine=For example, set this value to 3 to exclude the 2 first lines
+KeepEmptyToGoToEndOfFile=Keep this field empty to go up to the end of file
 ## filters
 SelectFilterFields=If you want to filter on some values, just input values here.
 FilterableFields=Filterable Fields
diff --git a/htdocs/langs/sq_AL/main.lang b/htdocs/langs/sq_AL/main.lang
index 6c1c5d4d111..99f865eb786 100644
--- a/htdocs/langs/sq_AL/main.lang
+++ b/htdocs/langs/sq_AL/main.lang
@@ -25,6 +25,7 @@ FormatDateHourTextShort=%b %d, %Y, %I:%M %p
 FormatDateHourText=%B %d, %Y, %I:%M %p
 DatabaseConnection=Database connection
 NoTemplateDefined=No template defined for this email type
+AvailableVariables=Available substitution variables
 NoTranslation=No translation
 NoRecordFound=No record found
 NoError=No error
diff --git a/htdocs/langs/sq_AL/orders.lang b/htdocs/langs/sq_AL/orders.lang
index c0bfc3ccce3..33cd265b07f 100644
--- a/htdocs/langs/sq_AL/orders.lang
+++ b/htdocs/langs/sq_AL/orders.lang
@@ -32,6 +32,7 @@ StatusOrderSent=Shipment in process
 StatusOrderOnProcessShort=Ordered
 StatusOrderProcessedShort=Processed
 StatusOrderDelivered=Delivered
+StatusOrderDeliveredShort=Delivered
 StatusOrderToBillShort=Delivered
 StatusOrderToBill2Short=To bill
 StatusOrderApprovedShort=Approved
diff --git a/htdocs/langs/sq_AL/products.lang b/htdocs/langs/sq_AL/products.lang
index 5118e77c22b..27e8130e762 100644
--- a/htdocs/langs/sq_AL/products.lang
+++ b/htdocs/langs/sq_AL/products.lang
@@ -45,10 +45,6 @@ LastProducts=Last products
 CardProduct0=Product card
 CardProduct1=Service card
 CardContract=Contract card
-Warehouse=Warehouse
-Warehouses=Warehouses
-WarehouseOpened=Warehouse open
-WarehouseClosed=Warehouse closed
 Stock=Stock
 Stocks=Stocks
 Movement=Movement
@@ -318,3 +314,11 @@ WarningSelectOneDocument=Please select at least one document
 DefaultUnitToShow=Unit
 NbOfQtyInProposals=Qty in proposals
 ClinkOnALinkOfColumn=Click on a link of column %s to get a detailed view...
+TranslatedLabel=Translated label
+TranslatedDescription=Translated description
+TranslatedNote=Translated notes
+ProductWeight=Weight for 1 product
+ProductVolume=Volume for 1 product
+WeightUnits=Weight unit
+VolumeUnits=Volume unit
+SizeUnits=Size unit
diff --git a/htdocs/langs/sq_AL/projects.lang b/htdocs/langs/sq_AL/projects.lang
index 59f4ec5af51..b4a21befd80 100644
--- a/htdocs/langs/sq_AL/projects.lang
+++ b/htdocs/langs/sq_AL/projects.lang
@@ -74,6 +74,9 @@ Progress=Progress
 ProgressDeclared=Declared progress
 ProgressCalculated=Calculated progress
 Time=Time
+ListOfTasks=List of tasks
+GoToListOfTimeConsumed=Go to list of time consumed
+GoToListOfTasks=Go to list of tasks
 ListProposalsAssociatedProject=List of the commercial proposals associated with the project
 ListOrdersAssociatedProject=List of customer's orders associated with the project
 ListInvoicesAssociatedProject=List of customer's invoices associated with the project
@@ -198,3 +201,4 @@ OppStatusNEGO=Negociation
 OppStatusPENDING=Pending
 OppStatusWIN=Won
 OppStatusLOST=Lost
+Budget=Budget
diff --git a/htdocs/langs/sq_AL/sendings.lang b/htdocs/langs/sq_AL/sendings.lang
index fb7b9c08868..97f57e1d3c7 100644
--- a/htdocs/langs/sq_AL/sendings.lang
+++ b/htdocs/langs/sq_AL/sendings.lang
@@ -70,6 +70,8 @@ ProductQtyInSuppliersOrdersRunning=Product quantity into opened suppliers orders
 ProductQtyInShipmentAlreadySent=Product quantity from opened customer order already sent
 ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from opened supplier order already received
 NoProductToShipFoundIntoStock=No product to ship found into warehouse <b>%s</b>. Correct stock or go back to choose another warehouse.
+WeightVolShort=Weight/Vol.
+ValidateOrderFirstBeforeShipment=You must first validate the order before being able to make shipments.
 
 # Sending methods
 SendingMethodCATCH=Catch by customer
diff --git a/htdocs/langs/sq_AL/supplier_proposal.lang b/htdocs/langs/sq_AL/supplier_proposal.lang
index 1a1bdc4df16..e37ced1b38f 100644
--- a/htdocs/langs/sq_AL/supplier_proposal.lang
+++ b/htdocs/langs/sq_AL/supplier_proposal.lang
@@ -58,3 +58,5 @@ DefaultModelSupplierProposalCreate=Default model creation
 DefaultModelSupplierProposalToBill=Default template when closing a price request (accepted)
 DefaultModelSupplierProposalClosed=Default template when closing a price request (refused)
 ListOfSupplierProposal=List of supplier proposal requests
+SupplierProposalsToClose=Supplier proposals to close
+SupplierProposalsToProcess=Supplier proposals to process
diff --git a/htdocs/langs/sr_RS/admin.lang b/htdocs/langs/sr_RS/admin.lang
index cdcb95252f3..4e50d1190a8 100644
--- a/htdocs/langs/sr_RS/admin.lang
+++ b/htdocs/langs/sr_RS/admin.lang
@@ -282,6 +282,7 @@ ModuleSetup=Module setup
 ModulesSetup=Modules setup
 ModuleFamilyBase=System
 ModuleFamilyCrm=Customer Relation Management (CRM)
+ModuleFamilySrm=Supplier Relation Management (SRM)
 ModuleFamilyProducts=Products Management (PM)
 ModuleFamilyHr=Human Resource Management (HR)
 ModuleFamilyProjects=Projects/Collaborative work
@@ -587,6 +588,7 @@ Permission38=Export products
 Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
 Permission42=Create/modify projects (shared project and projects i'm contact for)
 Permission44=Delete projects (shared project and projects i'm contact for)
+Permission45=Export projects
 Permission61=Read interventions
 Permission62=Create/modify interventions
 Permission64=Delete interventions
@@ -640,6 +642,7 @@ Permission162=Create/modify contracts/subscriptions
 Permission163=Activate a service/subscription of a contract
 Permission164=Disable a service/subscription of a contract
 Permission165=Delete contracts/subscriptions
+Permission167=Export contracts
 Permission171=Pogledaj putovanja i troškove (Vaše i Vašeg tima)
 Permission172=Create/modify trips and expenses
 Permission173=Delete trips and expenses
@@ -788,6 +791,7 @@ Permission2403=Delete actions (events or tasks) linked to his account
 Permission2411=Read actions (events or tasks) of others
 Permission2412=Create/modify actions (events or tasks) of others
 Permission2413=Delete actions (events or tasks) of others
+Permission2414=Export actions/tasks of others
 Permission2501=Read/Download documents
 Permission2502=Download documents
 Permission2503=Submit or delete documents
@@ -1713,3 +1717,4 @@ ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s je dostupan. Ver
 MultiPriceRuleDesc=Kada je uključena opcija "Više nivoa cene za proizvod/uslugu", možete definisati različite cene za svaki proizvod (po jednu za svaki nivo cene). Da biste uštedeli vreme, ovde možete uneti pravilo za automatsko računanje cene na svim nivoima na osnovu cene koju unesete za prvi nivo. Ova strana ima za cilj da uštedi Vaše vreme i može biti korisna samo ukoliko su cene za svaki od nivoa u funkciji s prvim nivoom cene. U većini slučajeva možete ignorisati ovu stranu.
 ModelModulesProduct=Templates for product documents
 ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
+SeeSubstitutionVars=See * note for list of possible substitution variables
diff --git a/htdocs/langs/sr_RS/bills.lang b/htdocs/langs/sr_RS/bills.lang
index e7e17ef5683..25b52f0da30 100644
--- a/htdocs/langs/sr_RS/bills.lang
+++ b/htdocs/langs/sr_RS/bills.lang
@@ -219,6 +219,7 @@ RemainderToBill=Remainder to bill
 SendBillByMail=Send invoice by email
 SendReminderBillByMail=Send reminder by email
 RelatedCommercialProposals=Related commercial proposals
+RelatedRecurringCustomerInvoices=Related recurring customer invoices
 MenuToValid=To valid
 DateMaxPayment=Payment due before
 DateEcheance=Due date limit
@@ -319,7 +320,6 @@ toolTipFrequency=Examples:<br /><b>Set 7 / day</b>: give a new invoice every 7 d
 NextDateToExecution=Date for next invoice generation
 DateLastGeneration=Date of last generation
 MaxPeriodNumber=Max nb of invoice generation
-RestPeriodNumber=Rest period number
 NbOfGenerationDone=Nb of invoice generation already done
 InvoiceAutoValidate=Automatically validate invoice
 GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
@@ -471,3 +471,7 @@ PDFCrevetteSituationInvoiceLine=Situation N°%s : Inv. N°%s on %s
 TotalSituationInvoice=Total situation
 invoiceLineProgressError=Invoice line progress can't be egal or upper the next invoice line
 updatePriceNextInvoiceErrorUpdateline=Error : update price on invoice line : %s
+ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
+ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
+ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
+
diff --git a/htdocs/langs/sr_RS/boxes.lang b/htdocs/langs/sr_RS/boxes.lang
index 84e63514dce..913ed1b1fe2 100644
--- a/htdocs/langs/sr_RS/boxes.lang
+++ b/htdocs/langs/sr_RS/boxes.lang
@@ -60,8 +60,8 @@ BoxTitleLastContracts=Poslednji %s ugovor
 BoxTitleLastModifiedDonations=Poslednje %s  modifikovana donacija
 BoxTitleLastModifiedExpenses=Poslednje %s modifikovani izveštaj troškova
 BoxGlobalActivity=Opšta aktivnost (fakture, ponude, narudžbine)
-BoxGoodCustomers=Good Customers
-BoxTitleGoodCustomers=%s Good Customers
+BoxGoodCustomers=Good customers
+BoxTitleGoodCustomers=%s Good customers
 FailedToRefreshDataInfoNotUpToDate=Nije uspeo refresh RSS fluksa. Poslednji datum uspešnog refresh-a:  %s
 LastRefreshDate=Poslednji datum refresh-a
 NoRecordedBookmarks=Nema definisane zabeleške
diff --git a/htdocs/langs/sr_RS/companies.lang b/htdocs/langs/sr_RS/companies.lang
index 583a65b05ef..5c971a79572 100644
--- a/htdocs/langs/sr_RS/companies.lang
+++ b/htdocs/langs/sr_RS/companies.lang
@@ -202,7 +202,7 @@ ProfId3IN=Prof Id 3 (SRVC TAX)
 ProfId4IN=Prof Id 4
 ProfId5IN=Prof Id 5
 ProfId6IN=-
-ProfId1LU=Id. prof. 1 (RCS)
+ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
 ProfId2LU=Id. prof. 2 (Business permit)
 ProfId3LU=-
 ProfId4LU=-
@@ -317,10 +317,12 @@ ShowContact=Prikaži kontakt
 ContactsAllShort=Sve (Bez filtera)
 ContactType=Tip kontakta
 ContactForOrders=Kontakt iz narudžbine
+ContactForOrdersOrShipments=Order's or shipment's contact
 ContactForProposals=Kontakt iz ponude
 ContactForContracts=Kontakt iz ugovora
 ContactForInvoices=Kontakt iz računa
 NoContactForAnyOrder=Ovaj kontakt nije ni u jednoj nadudžbini
+NoContactForAnyOrderOrShipment=This contact is not a contact for any order or shipment
 NoContactForAnyProposal=Ovaj kontakt nije ni u jednoj ponudi
 NoContactForAnyContract=Ovaj kontakt nije ni u jednom ugovoru
 NoContactForAnyInvoice=Ovaj kontakt nije ni u jednom računu
@@ -438,3 +440,6 @@ MergeThirdparties=Spoji subjekte
 ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one ? All linked objects (invoices, orders, ...) will be moved to current third party so you will be able to delete the duplicate one.
 ThirdpartiesMergeSuccess=Subjekti su spojeni
 ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
+SaleRepresentativeLogin=Login of sale representative
+SaleRepresentativeFirstname=Firstname of sale representative
+SaleRepresentativeLastname=Lastname of sale representative
diff --git a/htdocs/langs/sr_RS/errors.lang b/htdocs/langs/sr_RS/errors.lang
index d1758837c5b..f1fb5683b8d 100644
--- a/htdocs/langs/sr_RS/errors.lang
+++ b/htdocs/langs/sr_RS/errors.lang
@@ -172,6 +172,8 @@ ErrorMandatoryParametersNotProvided=Obavezni parametar(i) nije dat
 ErrorOppStatusRequiredIfAmount=Podesili ste procenjeni iznos za ovu priliku, tako da morate uneti i status.
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Pogrešna definicija Menu Array u Module Descriptoru (pogrešna vrednost za fk_menu)
 ErrorSavingChanges=Došlo je do greške prilikom čuvanja promena.
+ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
+ErrorFileMustHaveFormat=File must have format %s
 
 # Warnings
 WarningPasswordSetWithNoAccount=Lozinka je podešena za ovog člana, ali korisnik nije kreiran. To znači da je lozinka sačuvana, ali se član ne može ulogovati na Dolibarr. Informaciju može koristiti neka eksterna komponenta, ali ako nemate potrebe da definišete korisnika/lozinku za članove, možete deaktivirati opciju "Upravljanje lozinkama za svakog člana" u podešavanjima modula Članovi. Ukoliko morate da kreirate login, ali Vam nije potrebna lozinka, ostavite ovo polje prazno da se ovo upozorenje ne bi prikazivalo. Napomena: email može biti korišćen kao login ako je član povezan sa korisnikom.
diff --git a/htdocs/langs/sr_RS/exports.lang b/htdocs/langs/sr_RS/exports.lang
index ed1a9c452b4..8027a45ee5e 100644
--- a/htdocs/langs/sr_RS/exports.lang
+++ b/htdocs/langs/sr_RS/exports.lang
@@ -128,6 +128,10 @@ SpecialCode=Posebni kod
 ExportStringFilter=%% omogućava zamenu jednog ili više karaktera u tekstu
 ExportDateFilter=YYYY, YYYYMM, YYYYMMDD : filtrira po godini/mesecu/danu<br>YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD : filtrira po periodugodina/meseci/dana<br> > YYYY, > YYYYMM, > YYYYMMDD : filtrira po svim narednim godinama/msecima/danima<br> < YYYY, < YYYYMM, < YYYYMMDD : filtrira po svim prethodnim godinama/mesecima/danima
 ExportNumericFilter='NNNNN' filtrira po jednoj vrednosti<br>'NNNNN+NNNNN' filtrira po rasponu vrednosti<br>'&gt;NNNNN' filtrira po nižim vrednostima<br>'&gt;NNNNN' filtrira po višim vrednostima
+ImportFromLine=Import starting from line number
+EndAtLineNb=End at line number
+SetThisValueTo2ToExcludeFirstLine=For example, set this value to 3 to exclude the 2 first lines
+KeepEmptyToGoToEndOfFile=Keep this field empty to go up to the end of file
 ## filters
 SelectFilterFields=Ukoliko želite da filtrirate po nekim vrednostima unesite ih ovde.
 FilterableFields=Polja koj se mogu filtrirati
diff --git a/htdocs/langs/sr_RS/main.lang b/htdocs/langs/sr_RS/main.lang
index b67f3c2ade2..4bfe0b80488 100644
--- a/htdocs/langs/sr_RS/main.lang
+++ b/htdocs/langs/sr_RS/main.lang
@@ -25,6 +25,7 @@ FormatDateHourTextShort=%d %b %Y %H:%M
 FormatDateHourText=%d %B %Y %H:%M
 DatabaseConnection=Konekcija sa bazom
 NoTemplateDefined=Nema definisanog šablona za ovaj tip mejla
+AvailableVariables=Available substitution variables
 NoTranslation=Nema prevoda
 NoRecordFound=Nema rezultata
 NoError=Nema greške
diff --git a/htdocs/langs/sr_RS/orders.lang b/htdocs/langs/sr_RS/orders.lang
index e15c8ac60ed..7abaa95f1af 100644
--- a/htdocs/langs/sr_RS/orders.lang
+++ b/htdocs/langs/sr_RS/orders.lang
@@ -32,6 +32,7 @@ StatusOrderSent=Isporuka u toku
 StatusOrderOnProcessShort=Naručeno
 StatusOrderProcessedShort=Obrađeno
 StatusOrderDelivered=Isporučeno
+StatusOrderDeliveredShort=Delivered
 StatusOrderToBillShort=Isporučeno
 StatusOrderToBill2Short=Za naplatu
 StatusOrderApprovedShort=Odobreno
diff --git a/htdocs/langs/sr_RS/products.lang b/htdocs/langs/sr_RS/products.lang
index a92601d5d0c..84b05a01aaf 100644
--- a/htdocs/langs/sr_RS/products.lang
+++ b/htdocs/langs/sr_RS/products.lang
@@ -45,10 +45,6 @@ LastProducts=Poslednji proizvodi
 CardProduct0=Kartica proizvoda
 CardProduct1=Kartica usluge
 CardContract=Kartica ugovora
-Warehouse=Skladište
-Warehouses=Skladišta
-WarehouseOpened=Otvoreno skladište
-WarehouseClosed=Zatvoreno skladište
 Stock=Stanje
 Stocks=Stanja
 Movement=Promena
@@ -318,3 +314,11 @@ WarningSelectOneDocument=Molimo izaberite barem jedan dokument
 DefaultUnitToShow=Jedinica
 NbOfQtyInProposals=Količina u prilikama
 ClinkOnALinkOfColumn=Click on a link of column %s to get a detailed view...
+TranslatedLabel=Translated label
+TranslatedDescription=Translated description
+TranslatedNote=Translated notes
+ProductWeight=Weight for 1 product
+ProductVolume=Volume for 1 product
+WeightUnits=Weight unit
+VolumeUnits=Volume unit
+SizeUnits=Size unit
diff --git a/htdocs/langs/sr_RS/projects.lang b/htdocs/langs/sr_RS/projects.lang
index 2b164234162..8ba6046454e 100644
--- a/htdocs/langs/sr_RS/projects.lang
+++ b/htdocs/langs/sr_RS/projects.lang
@@ -74,6 +74,9 @@ Progress=Napredovanje
 ProgressDeclared=Prijavljeni napredak
 ProgressCalculated=Izračunati napredak
 Time=Vreme
+ListOfTasks=List of tasks
+GoToListOfTimeConsumed=Go to list of time consumed
+GoToListOfTasks=Go to list of tasks
 ListProposalsAssociatedProject=Lista komercijalnih ponuda vezanih za projekat
 ListOrdersAssociatedProject=Lista narudžbina klijenata vezanih za projekat
 ListInvoicesAssociatedProject=Lista računa klijenata vezanih za projekat
@@ -198,3 +201,4 @@ OppStatusNEGO=Pregovaranje
 OppStatusPENDING=Na čekanju
 OppStatusWIN=Dobijeno
 OppStatusLOST=Izgubljeno
+Budget=Budget
diff --git a/htdocs/langs/sr_RS/sendings.lang b/htdocs/langs/sr_RS/sendings.lang
index 33ad352bdab..05d05825f30 100644
--- a/htdocs/langs/sr_RS/sendings.lang
+++ b/htdocs/langs/sr_RS/sendings.lang
@@ -70,6 +70,8 @@ ProductQtyInSuppliersOrdersRunning=Količina proizvoda u otvorenim dobavljačevi
 ProductQtyInShipmentAlreadySent=Količina proizvoda u već poslatim otvorenim narudžbinama klijenta
 ProductQtyInSuppliersShipmentAlreadyRecevied=Količina proizvoda u već primljenim otvorenim dobavljačevim narudžbinama
 NoProductToShipFoundIntoStock=Nema proizvoda za isporuku u magacin <b>%s</b>. Ispravite zalihu ili izaberite drugi magacin.
+WeightVolShort=Weight/Vol.
+ValidateOrderFirstBeforeShipment=You must first validate the order before being able to make shipments.
 
 # Sending methods
 SendingMethodCATCH=Klijent preuzima
diff --git a/htdocs/langs/sv_SE/admin.lang b/htdocs/langs/sv_SE/admin.lang
index f5425f3fef0..5aa61a8a919 100644
--- a/htdocs/langs/sv_SE/admin.lang
+++ b/htdocs/langs/sv_SE/admin.lang
@@ -282,6 +282,7 @@ ModuleSetup=Modul setup
 ModulesSetup=Moduler setup
 ModuleFamilyBase=System
 ModuleFamilyCrm=Customer Relation Management (CRM)
+ModuleFamilySrm=Supplier Relation Management (SRM)
 ModuleFamilyProducts=Products Management (PM)
 ModuleFamilyHr=Human Resource Management (HR)
 ModuleFamilyProjects=Projekt / gemensamt arbete
@@ -587,6 +588,7 @@ Permission38=EXPORTVARA
 Permission41=Läs projekt och uppgifter (gemensamma projekt och projekt jag är kontaktperson för). Kan också ange tid konsumeras på tilldelade uppgifter (tidrapport)
 Permission42=Skapa / modifiera projekt (gemensamma projekt och projekt som jag är kontaktperson för)
 Permission44=Ta bort projekt (gemensamma projekt och projekt som jag är kontaktperson för)
+Permission45=Export projects
 Permission61=Läs insatser
 Permission62=Skapa / ändra inlägg
 Permission64=Ta bort inlägg
@@ -640,6 +642,7 @@ Permission162=Skapa / ändra avtal / abonnemang
 Permission163=Aktivera en tjänst / teckning av ett kontrakt
 Permission164=Inaktivera en tjänst / teckning av ett kontrakt
 Permission165=Radera kontrakt / abonnemang
+Permission167=Export contracts
 Permission171=Read trips and expenses (yours and your subordinates)
 Permission172=Skapa / ändra resor och kostnader
 Permission173=Ta bort resor och kostnader
@@ -788,6 +791,7 @@ Permission2403=Radera åtgärder (händelser eller uppgifter) kopplade till sitt
 Permission2411=Läs åtgärder (händelser eller uppgifter) andras
 Permission2412=Skapa / ändra åtgärder (händelser eller uppgifter) andras
 Permission2413=Radera åtgärder (händelser eller uppgifter) andras
+Permission2414=Export actions/tasks of others
 Permission2501=Läsa dokument
 Permission2502=Skicka eller ta bort dokument
 Permission2503=Lämna eller ta bort dokument
@@ -1713,3 +1717,4 @@ ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s is available. Ve
 MultiPriceRuleDesc=When option "Several level of prices per product/service" is on, you can define different prices (one per price level) for each product. To save you time, you can enter here rule to have price for each level autocalculated according to price of first level, so you will have to enter only price for first level on each product. This page is here to save you time and can be usefull only if your prices for each leve are relative to first level. You can ignore this page in most cases.
 ModelModulesProduct=Templates for product documents
 ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
+SeeSubstitutionVars=See * note for list of possible substitution variables
diff --git a/htdocs/langs/sv_SE/bills.lang b/htdocs/langs/sv_SE/bills.lang
index a6192007c74..82f31f3f387 100644
--- a/htdocs/langs/sv_SE/bills.lang
+++ b/htdocs/langs/sv_SE/bills.lang
@@ -219,6 +219,7 @@ RemainderToBill=Återstår att fakturan
 SendBillByMail=Skicka faktura via e-post
 SendReminderBillByMail=Skicka påminnelse via e-post
 RelatedCommercialProposals=Relaterade kommersiella förslag
+RelatedRecurringCustomerInvoices=Related recurring customer invoices
 MenuToValid=Till giltiga
 DateMaxPayment=Betalning innan
 DateEcheance=Förfallodag
@@ -319,7 +320,6 @@ toolTipFrequency=Examples:<br /><b>Set 7 / day</b>: give a new invoice every 7 d
 NextDateToExecution=Date for next invoice generation
 DateLastGeneration=Date of last generation
 MaxPeriodNumber=Max nb of invoice generation
-RestPeriodNumber=Rest period number
 NbOfGenerationDone=Nb of invoice generation already done
 InvoiceAutoValidate=Automatically validate invoice
 GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
@@ -471,3 +471,7 @@ PDFCrevetteSituationInvoiceLine=Situation N°%s : Inv. N°%s on %s
 TotalSituationInvoice=Total situation
 invoiceLineProgressError=Invoice line progress can't be egal or upper the next invoice line
 updatePriceNextInvoiceErrorUpdateline=Error : update price on invoice line : %s
+ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
+ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
+ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
+
diff --git a/htdocs/langs/sv_SE/boxes.lang b/htdocs/langs/sv_SE/boxes.lang
index e8446214fcd..998bbbcaa9c 100644
--- a/htdocs/langs/sv_SE/boxes.lang
+++ b/htdocs/langs/sv_SE/boxes.lang
@@ -60,8 +60,8 @@ BoxTitleLastContracts=Senaste %s kontrakt
 BoxTitleLastModifiedDonations=Sista %s modifierad donationer
 BoxTitleLastModifiedExpenses=Last %s modified expense reports
 BoxGlobalActivity=Global aktivitet (fakturor, förslag, order)
-BoxGoodCustomers=Good Customers
-BoxTitleGoodCustomers=%s Good Customers
+BoxGoodCustomers=Good customers
+BoxTitleGoodCustomers=%s Good customers
 FailedToRefreshDataInfoNotUpToDate=Misslyckades med att uppdatera RSS-flöde. Senaste framgångsrika uppdatera datum: %s
 LastRefreshDate=Senaste uppdateringen datum
 NoRecordedBookmarks=Inga bokmärken definieras. Klicka <a href="%s">här</a> för att lägga till bokmärken.
diff --git a/htdocs/langs/sv_SE/companies.lang b/htdocs/langs/sv_SE/companies.lang
index 980e6ce44c7..5e30fb8799f 100644
--- a/htdocs/langs/sv_SE/companies.lang
+++ b/htdocs/langs/sv_SE/companies.lang
@@ -202,7 +202,7 @@ ProfId3IN=Prof Id 3
 ProfId4IN=Prof Id 4
 ProfId5IN=Prof ID 5
 ProfId6IN=-
-ProfId1LU=Id. prof. 1 (RCS)
+ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
 ProfId2LU=Id. prof. 2 (Business permit)
 ProfId3LU=-
 ProfId4LU=-
@@ -317,10 +317,12 @@ ShowContact=Visa kontakt
 ContactsAllShort=Alla (inget filter)
 ContactType=Kontakttyp
 ContactForOrders=Beställningens kontaktinformation
+ContactForOrdersOrShipments=Order's or shipment's contact
 ContactForProposals=Offertens kontaktinformation
 ContactForContracts=Kontraktets kontaktinformation
 ContactForInvoices=Fakturans kontaktinformation
 NoContactForAnyOrder=Denna kontakt är inte kontakt för någon order
+NoContactForAnyOrderOrShipment=This contact is not a contact for any order or shipment
 NoContactForAnyProposal=Denna kontakt är inte kontakt i någon kommersiell offert
 NoContactForAnyContract=Denna kontakt är inte kontakt för något kontrakt
 NoContactForAnyInvoice=Denna kontakt är inte kontakt för någon faktura
@@ -438,3 +440,6 @@ MergeThirdparties=Merge third parties
 ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one ? All linked objects (invoices, orders, ...) will be moved to current third party so you will be able to delete the duplicate one.
 ThirdpartiesMergeSuccess=Thirdparties have been merged
 ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
+SaleRepresentativeLogin=Login of sale representative
+SaleRepresentativeFirstname=Firstname of sale representative
+SaleRepresentativeLastname=Lastname of sale representative
diff --git a/htdocs/langs/sv_SE/errors.lang b/htdocs/langs/sv_SE/errors.lang
index 97bc0b78bf1..c0bb781f815 100644
--- a/htdocs/langs/sv_SE/errors.lang
+++ b/htdocs/langs/sv_SE/errors.lang
@@ -172,6 +172,8 @@ ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
 ErrorOppStatusRequiredIfAmount=You set an estimated amount for this opportunity/lead. So you must also enter its status
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
 ErrorSavingChanges=An error has ocurred when saving the changes
+ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
+ErrorFileMustHaveFormat=File must have format %s
 
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
diff --git a/htdocs/langs/sv_SE/exports.lang b/htdocs/langs/sv_SE/exports.lang
index e90500124ce..ae2ae80df00 100644
--- a/htdocs/langs/sv_SE/exports.lang
+++ b/htdocs/langs/sv_SE/exports.lang
@@ -128,6 +128,10 @@ SpecialCode=Specialkod
 ExportStringFilter=%% Tillåter ersätta ett eller flera tecken i texten
 ExportDateFilter=ÅÅÅÅ, ÅÅÅÅMM, ÅÅÅÅMMDD: filter efter ett år / månad / dag <br> ÅÅÅÅ + ÅÅÅÅ, ÅÅÅÅMM + ÅÅÅÅMM, ÅÅÅÅMMDD + ÅÅÅÅMMDD: filter över en rad år / månader / dagar <br> > ÅÅÅÅ,> ÅÅÅÅMM,> ÅÅÅÅMMDD: filter på alla följande år / månader / dagar <br> <ÅÅÅÅ, <ÅÅÅÅMM, <ÅÅÅÅMMDD: filter på alla tidigare år / månader / dagar
 ExportNumericFilter='NNNNN "filter med en värde <br> 'NNNNN + NNNNN' filter över ett intervall av värden <br> "> NNNNN" filter med lägre värden <br> "> NNNNN" filter med högre värden
+ImportFromLine=Import starting from line number
+EndAtLineNb=End at line number
+SetThisValueTo2ToExcludeFirstLine=For example, set this value to 3 to exclude the 2 first lines
+KeepEmptyToGoToEndOfFile=Keep this field empty to go up to the end of file
 ## filters
 SelectFilterFields=Om du vill filtrera på vissa värderingar, fyll i ingångsvärden här.
 FilterableFields=Filterable Fields
diff --git a/htdocs/langs/sv_SE/main.lang b/htdocs/langs/sv_SE/main.lang
index cbc7e24719a..9b891e056bd 100644
--- a/htdocs/langs/sv_SE/main.lang
+++ b/htdocs/langs/sv_SE/main.lang
@@ -25,6 +25,7 @@ FormatDateHourTextShort=%d %b %Y, %H:%M
 FormatDateHourText=%d %B %Y, %H:%M
 DatabaseConnection=Databasanslutning
 NoTemplateDefined=No template defined for this email type
+AvailableVariables=Available substitution variables
 NoTranslation=Ingen översättning
 NoRecordFound=Ingen post funnen
 NoError=Inget fel
diff --git a/htdocs/langs/sv_SE/orders.lang b/htdocs/langs/sv_SE/orders.lang
index 883550d7fd6..ff1051f681c 100644
--- a/htdocs/langs/sv_SE/orders.lang
+++ b/htdocs/langs/sv_SE/orders.lang
@@ -32,6 +32,7 @@ StatusOrderSent=Sändning pågår
 StatusOrderOnProcessShort=Beställda
 StatusOrderProcessedShort=Bearbetade
 StatusOrderDelivered=Delivered
+StatusOrderDeliveredShort=Delivered
 StatusOrderToBillShort=Till Bill
 StatusOrderToBill2Short=Till Bill
 StatusOrderApprovedShort=Godkänd
diff --git a/htdocs/langs/sv_SE/products.lang b/htdocs/langs/sv_SE/products.lang
index f9d737e4c83..e28336ebb64 100644
--- a/htdocs/langs/sv_SE/products.lang
+++ b/htdocs/langs/sv_SE/products.lang
@@ -45,10 +45,6 @@ LastProducts=Senaste produkter
 CardProduct0=Produkt-kort
 CardProduct1=Tjänstekort
 CardContract=Kontrakt kort
-Warehouse=Warehouse
-Warehouses=Lager
-WarehouseOpened=Warehouse open
-WarehouseClosed=Lager stängt
 Stock=Lager
 Stocks=Lager
 Movement=Movement
@@ -318,3 +314,11 @@ WarningSelectOneDocument=Please select at least one document
 DefaultUnitToShow=Unit
 NbOfQtyInProposals=Qty in proposals
 ClinkOnALinkOfColumn=Click on a link of column %s to get a detailed view...
+TranslatedLabel=Translated label
+TranslatedDescription=Translated description
+TranslatedNote=Translated notes
+ProductWeight=Weight for 1 product
+ProductVolume=Volume for 1 product
+WeightUnits=Weight unit
+VolumeUnits=Volume unit
+SizeUnits=Size unit
diff --git a/htdocs/langs/sv_SE/projects.lang b/htdocs/langs/sv_SE/projects.lang
index 9c91293a4cc..77be1874eb2 100644
--- a/htdocs/langs/sv_SE/projects.lang
+++ b/htdocs/langs/sv_SE/projects.lang
@@ -74,6 +74,9 @@ Progress=Framsteg
 ProgressDeclared=Förklarades framsteg
 ProgressCalculated=Beräknat framsteg
 Time=Tid
+ListOfTasks=List of tasks
+GoToListOfTimeConsumed=Go to list of time consumed
+GoToListOfTasks=Go to list of tasks
 ListProposalsAssociatedProject=Förteckning över de kommersiella förslag i samband med projektet
 ListOrdersAssociatedProject=Förteckning över kundens order i samband med projektet
 ListInvoicesAssociatedProject=Förteckning över kundens fakturor i samband med projektet
@@ -198,3 +201,4 @@ OppStatusNEGO=Negociation
 OppStatusPENDING=Pending
 OppStatusWIN=Won
 OppStatusLOST=Lost
+Budget=Budget
diff --git a/htdocs/langs/sv_SE/sendings.lang b/htdocs/langs/sv_SE/sendings.lang
index 564747798a7..3a1bacde5cc 100644
--- a/htdocs/langs/sv_SE/sendings.lang
+++ b/htdocs/langs/sv_SE/sendings.lang
@@ -70,6 +70,8 @@ ProductQtyInSuppliersOrdersRunning=Produktkvantitet till öppnade leverantörsor
 ProductQtyInShipmentAlreadySent=Product quantity from opened customer order already sent
 ProductQtyInSuppliersShipmentAlreadyRecevied=Produktkvantitet från öppnade leverantörsorder är redan skickade
 NoProductToShipFoundIntoStock=No product to ship found into warehouse <b>%s</b>. Correct stock or go back to choose another warehouse.
+WeightVolShort=Weight/Vol.
+ValidateOrderFirstBeforeShipment=You must first validate the order before being able to make shipments.
 
 # Sending methods
 SendingMethodCATCH=Fångst av kunden
diff --git a/htdocs/langs/sv_SE/supplier_proposal.lang b/htdocs/langs/sv_SE/supplier_proposal.lang
index 1a1bdc4df16..e37ced1b38f 100644
--- a/htdocs/langs/sv_SE/supplier_proposal.lang
+++ b/htdocs/langs/sv_SE/supplier_proposal.lang
@@ -58,3 +58,5 @@ DefaultModelSupplierProposalCreate=Default model creation
 DefaultModelSupplierProposalToBill=Default template when closing a price request (accepted)
 DefaultModelSupplierProposalClosed=Default template when closing a price request (refused)
 ListOfSupplierProposal=List of supplier proposal requests
+SupplierProposalsToClose=Supplier proposals to close
+SupplierProposalsToProcess=Supplier proposals to process
diff --git a/htdocs/langs/sw_SW/admin.lang b/htdocs/langs/sw_SW/admin.lang
index deca56bf2c1..c83ce1dba12 100644
--- a/htdocs/langs/sw_SW/admin.lang
+++ b/htdocs/langs/sw_SW/admin.lang
@@ -282,6 +282,7 @@ ModuleSetup=Module setup
 ModulesSetup=Modules setup
 ModuleFamilyBase=System
 ModuleFamilyCrm=Customer Relation Management (CRM)
+ModuleFamilySrm=Supplier Relation Management (SRM)
 ModuleFamilyProducts=Products Management (PM)
 ModuleFamilyHr=Human Resource Management (HR)
 ModuleFamilyProjects=Projects/Collaborative work
@@ -587,6 +588,7 @@ Permission38=Export products
 Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
 Permission42=Create/modify projects (shared project and projects i'm contact for)
 Permission44=Delete projects (shared project and projects i'm contact for)
+Permission45=Export projects
 Permission61=Read interventions
 Permission62=Create/modify interventions
 Permission64=Delete interventions
@@ -640,6 +642,7 @@ Permission162=Create/modify contracts/subscriptions
 Permission163=Activate a service/subscription of a contract
 Permission164=Disable a service/subscription of a contract
 Permission165=Delete contracts/subscriptions
+Permission167=Export contracts
 Permission171=Read trips and expenses (yours and your subordinates)
 Permission172=Create/modify trips and expenses
 Permission173=Delete trips and expenses
@@ -788,6 +791,7 @@ Permission2403=Delete actions (events or tasks) linked to his account
 Permission2411=Read actions (events or tasks) of others
 Permission2412=Create/modify actions (events or tasks) of others
 Permission2413=Delete actions (events or tasks) of others
+Permission2414=Export actions/tasks of others
 Permission2501=Read/Download documents
 Permission2502=Download documents
 Permission2503=Submit or delete documents
@@ -1713,3 +1717,4 @@ ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s is available. Ve
 MultiPriceRuleDesc=When option "Several level of prices per product/service" is on, you can define different prices (one per price level) for each product. To save you time, you can enter here rule to have price for each level autocalculated according to price of first level, so you will have to enter only price for first level on each product. This page is here to save you time and can be usefull only if your prices for each leve are relative to first level. You can ignore this page in most cases.
 ModelModulesProduct=Templates for product documents
 ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
+SeeSubstitutionVars=See * note for list of possible substitution variables
diff --git a/htdocs/langs/sw_SW/bills.lang b/htdocs/langs/sw_SW/bills.lang
index e67ad0ade2d..790a146ee98 100644
--- a/htdocs/langs/sw_SW/bills.lang
+++ b/htdocs/langs/sw_SW/bills.lang
@@ -219,6 +219,7 @@ RemainderToBill=Remainder to bill
 SendBillByMail=Send invoice by email
 SendReminderBillByMail=Send reminder by email
 RelatedCommercialProposals=Related commercial proposals
+RelatedRecurringCustomerInvoices=Related recurring customer invoices
 MenuToValid=To valid
 DateMaxPayment=Payment due before
 DateEcheance=Due date limit
@@ -319,7 +320,6 @@ toolTipFrequency=Examples:<br /><b>Set 7 / day</b>: give a new invoice every 7 d
 NextDateToExecution=Date for next invoice generation
 DateLastGeneration=Date of last generation
 MaxPeriodNumber=Max nb of invoice generation
-RestPeriodNumber=Rest period number
 NbOfGenerationDone=Nb of invoice generation already done
 InvoiceAutoValidate=Automatically validate invoice
 GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
@@ -471,3 +471,7 @@ PDFCrevetteSituationInvoiceLine=Situation N°%s : Inv. N°%s on %s
 TotalSituationInvoice=Total situation
 invoiceLineProgressError=Invoice line progress can't be egal or upper the next invoice line
 updatePriceNextInvoiceErrorUpdateline=Error : update price on invoice line : %s
+ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
+ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
+ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
+
diff --git a/htdocs/langs/sw_SW/boxes.lang b/htdocs/langs/sw_SW/boxes.lang
index 57bfc174ec5..7619a335b61 100644
--- a/htdocs/langs/sw_SW/boxes.lang
+++ b/htdocs/langs/sw_SW/boxes.lang
@@ -60,8 +60,8 @@ BoxTitleLastContracts=Last %s contracts
 BoxTitleLastModifiedDonations=Last %s modified donations
 BoxTitleLastModifiedExpenses=Last %s modified expense reports
 BoxGlobalActivity=Global activity (invoices, proposals, orders)
-BoxGoodCustomers=Good Customers
-BoxTitleGoodCustomers=%s Good Customers
+BoxGoodCustomers=Good customers
+BoxTitleGoodCustomers=%s Good customers
 FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Last successfull refresh date: %s
 LastRefreshDate=Last refresh date
 NoRecordedBookmarks=No bookmarks defined.
diff --git a/htdocs/langs/sw_SW/companies.lang b/htdocs/langs/sw_SW/companies.lang
index 588867b1f2f..fe967d3252f 100644
--- a/htdocs/langs/sw_SW/companies.lang
+++ b/htdocs/langs/sw_SW/companies.lang
@@ -202,7 +202,7 @@ ProfId3IN=Prof Id 3 (SRVC TAX)
 ProfId4IN=Prof Id 4
 ProfId5IN=Prof Id 5
 ProfId6IN=-
-ProfId1LU=Id. prof. 1 (RCS)
+ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
 ProfId2LU=Id. prof. 2 (Business permit)
 ProfId3LU=-
 ProfId4LU=-
@@ -317,10 +317,12 @@ ShowContact=Show contact
 ContactsAllShort=All (No filter)
 ContactType=Contact type
 ContactForOrders=Order's contact
+ContactForOrdersOrShipments=Order's or shipment's contact
 ContactForProposals=Proposal's contact
 ContactForContracts=Contract's contact
 ContactForInvoices=Invoice's contact
 NoContactForAnyOrder=This contact is not a contact for any order
+NoContactForAnyOrderOrShipment=This contact is not a contact for any order or shipment
 NoContactForAnyProposal=This contact is not a contact for any commercial proposal
 NoContactForAnyContract=This contact is not a contact for any contract
 NoContactForAnyInvoice=This contact is not a contact for any invoice
@@ -438,3 +440,6 @@ MergeThirdparties=Merge third parties
 ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one ? All linked objects (invoices, orders, ...) will be moved to current third party so you will be able to delete the duplicate one.
 ThirdpartiesMergeSuccess=Thirdparties have been merged
 ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
+SaleRepresentativeLogin=Login of sale representative
+SaleRepresentativeFirstname=Firstname of sale representative
+SaleRepresentativeLastname=Lastname of sale representative
diff --git a/htdocs/langs/sw_SW/errors.lang b/htdocs/langs/sw_SW/errors.lang
index 718b3e8413f..fa7804ce355 100644
--- a/htdocs/langs/sw_SW/errors.lang
+++ b/htdocs/langs/sw_SW/errors.lang
@@ -172,6 +172,8 @@ ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
 ErrorOppStatusRequiredIfAmount=You set an estimated amount for this opportunity/lead. So you must also enter its status
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
 ErrorSavingChanges=An error has ocurred when saving the changes
+ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
+ErrorFileMustHaveFormat=File must have format %s
 
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
diff --git a/htdocs/langs/sw_SW/exports.lang b/htdocs/langs/sw_SW/exports.lang
index 03c87b28bcf..1a490ea647d 100644
--- a/htdocs/langs/sw_SW/exports.lang
+++ b/htdocs/langs/sw_SW/exports.lang
@@ -128,6 +128,10 @@ SpecialCode=Special code
 ExportStringFilter=%% allows replacing one or more characters in the text
 ExportDateFilter=YYYY, YYYYMM, YYYYMMDD : filters by one year/month/day<br>YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD : filters over a range of years/months/days<br> > YYYY, > YYYYMM, > YYYYMMDD : filters on all following years/months/days<br> < YYYY, < YYYYMM, < YYYYMMDD : filters on all previous years/months/days
 ExportNumericFilter='NNNNN' filters by one value<br>'NNNNN+NNNNN' filters over a range of values<br>'&gt;NNNNN' filters by lower values<br>'&gt;NNNNN' filters by higher values
+ImportFromLine=Import starting from line number
+EndAtLineNb=End at line number
+SetThisValueTo2ToExcludeFirstLine=For example, set this value to 3 to exclude the 2 first lines
+KeepEmptyToGoToEndOfFile=Keep this field empty to go up to the end of file
 ## filters
 SelectFilterFields=If you want to filter on some values, just input values here.
 FilterableFields=Filterable Fields
diff --git a/htdocs/langs/sw_SW/main.lang b/htdocs/langs/sw_SW/main.lang
index abc26865694..3bead553dd0 100644
--- a/htdocs/langs/sw_SW/main.lang
+++ b/htdocs/langs/sw_SW/main.lang
@@ -25,6 +25,7 @@ FormatDateHourTextShort=%b %d, %Y, %I:%M %p
 FormatDateHourText=%B %d, %Y, %I:%M %p
 DatabaseConnection=Database connection
 NoTemplateDefined=No template defined for this email type
+AvailableVariables=Available substitution variables
 NoTranslation=No translation
 NoRecordFound=No record found
 NoError=No error
diff --git a/htdocs/langs/sw_SW/orders.lang b/htdocs/langs/sw_SW/orders.lang
index c0bfc3ccce3..33cd265b07f 100644
--- a/htdocs/langs/sw_SW/orders.lang
+++ b/htdocs/langs/sw_SW/orders.lang
@@ -32,6 +32,7 @@ StatusOrderSent=Shipment in process
 StatusOrderOnProcessShort=Ordered
 StatusOrderProcessedShort=Processed
 StatusOrderDelivered=Delivered
+StatusOrderDeliveredShort=Delivered
 StatusOrderToBillShort=Delivered
 StatusOrderToBill2Short=To bill
 StatusOrderApprovedShort=Approved
diff --git a/htdocs/langs/sw_SW/products.lang b/htdocs/langs/sw_SW/products.lang
index 5118e77c22b..27e8130e762 100644
--- a/htdocs/langs/sw_SW/products.lang
+++ b/htdocs/langs/sw_SW/products.lang
@@ -45,10 +45,6 @@ LastProducts=Last products
 CardProduct0=Product card
 CardProduct1=Service card
 CardContract=Contract card
-Warehouse=Warehouse
-Warehouses=Warehouses
-WarehouseOpened=Warehouse open
-WarehouseClosed=Warehouse closed
 Stock=Stock
 Stocks=Stocks
 Movement=Movement
@@ -318,3 +314,11 @@ WarningSelectOneDocument=Please select at least one document
 DefaultUnitToShow=Unit
 NbOfQtyInProposals=Qty in proposals
 ClinkOnALinkOfColumn=Click on a link of column %s to get a detailed view...
+TranslatedLabel=Translated label
+TranslatedDescription=Translated description
+TranslatedNote=Translated notes
+ProductWeight=Weight for 1 product
+ProductVolume=Volume for 1 product
+WeightUnits=Weight unit
+VolumeUnits=Volume unit
+SizeUnits=Size unit
diff --git a/htdocs/langs/sw_SW/projects.lang b/htdocs/langs/sw_SW/projects.lang
index 59f4ec5af51..b4a21befd80 100644
--- a/htdocs/langs/sw_SW/projects.lang
+++ b/htdocs/langs/sw_SW/projects.lang
@@ -74,6 +74,9 @@ Progress=Progress
 ProgressDeclared=Declared progress
 ProgressCalculated=Calculated progress
 Time=Time
+ListOfTasks=List of tasks
+GoToListOfTimeConsumed=Go to list of time consumed
+GoToListOfTasks=Go to list of tasks
 ListProposalsAssociatedProject=List of the commercial proposals associated with the project
 ListOrdersAssociatedProject=List of customer's orders associated with the project
 ListInvoicesAssociatedProject=List of customer's invoices associated with the project
@@ -198,3 +201,4 @@ OppStatusNEGO=Negociation
 OppStatusPENDING=Pending
 OppStatusWIN=Won
 OppStatusLOST=Lost
+Budget=Budget
diff --git a/htdocs/langs/sw_SW/sendings.lang b/htdocs/langs/sw_SW/sendings.lang
index fb7b9c08868..97f57e1d3c7 100644
--- a/htdocs/langs/sw_SW/sendings.lang
+++ b/htdocs/langs/sw_SW/sendings.lang
@@ -70,6 +70,8 @@ ProductQtyInSuppliersOrdersRunning=Product quantity into opened suppliers orders
 ProductQtyInShipmentAlreadySent=Product quantity from opened customer order already sent
 ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from opened supplier order already received
 NoProductToShipFoundIntoStock=No product to ship found into warehouse <b>%s</b>. Correct stock or go back to choose another warehouse.
+WeightVolShort=Weight/Vol.
+ValidateOrderFirstBeforeShipment=You must first validate the order before being able to make shipments.
 
 # Sending methods
 SendingMethodCATCH=Catch by customer
diff --git a/htdocs/langs/th_TH/admin.lang b/htdocs/langs/th_TH/admin.lang
index 9d895d55391..e191071b4b2 100644
--- a/htdocs/langs/th_TH/admin.lang
+++ b/htdocs/langs/th_TH/admin.lang
@@ -282,6 +282,7 @@ ModuleSetup=การติดตั้งโมดูล
 ModulesSetup=การติดตั้งโมดูล
 ModuleFamilyBase=ระบบ
 ModuleFamilyCrm=การบริหารลูกค้าสัมพันธ์ (CRM)
+ModuleFamilySrm=Supplier Relation Management (SRM)
 ModuleFamilyProducts=Products Management (PM)
 ModuleFamilyHr=Human Resource Management (HR)
 ModuleFamilyProjects=โครงการ / ทำงานร่วมกัน
@@ -587,6 +588,7 @@ Permission38=สินค้าส่งออก
 Permission41=อ่านโครงการและงาน (โครงการและโครงการที่ใช้ร่วมกันฉันติดต่อ) นอกจากนี้ยังสามารถใส่เวลาที่ใช้ในงานที่ได้รับมอบหมาย (timesheet)
 Permission42=สร้าง / แก้ไขโครงการ (โครงการและโครงการที่ใช้ร่วมกันฉันติดต่อ)
 Permission44=ลบโครงการ (โครงการและโครงการที่ใช้ร่วมกันฉันติดต่อ)
+Permission45=Export projects
 Permission61=อ่านการแทรกแซง
 Permission62=สร้าง / แก้ไขการแทรกแซง
 Permission64=ลบแทรกแซง
@@ -640,6 +642,7 @@ Permission162=สร้าง / แก้ไขสัญญา / สมัคร
 Permission163=เปิดใช้งานบริการ / สมัครสมาชิกของสัญญา
 Permission164=ปิดการใช้งานบริการ / สมัครสมาชิกของสัญญา
 Permission165=ลบสัญญา / สมัครสมาชิก
+Permission167=Export contracts
 Permission171=Read trips and expenses (yours and your subordinates)
 Permission172=สร้าง / แก้ไขการเดินทางและค่าใช้จ่าย
 Permission173=ลบการเดินทางและค่าใช้จ่าย
@@ -788,6 +791,7 @@ Permission2403=ลบการกระทำ (เหตุการณ์หร
 Permission2411=อ่านการกระทำ (เหตุการณ์หรืองาน) ของบุคคลอื่น
 Permission2412=สร้าง / แก้ไขการกระทำ (เหตุการณ์หรืองาน) ของบุคคลอื่น
 Permission2413=ลบการกระทำ (เหตุการณ์หรืองาน) ของบุคคลอื่น
+Permission2414=Export actions/tasks of others
 Permission2501=อ่าน / ดาวน์โหลดเอกสาร
 Permission2502=ดาวน์โหลดเอกสาร
 Permission2503=ส่งเอกสารหรือลบ
@@ -1713,3 +1717,4 @@ ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s is available. Ve
 MultiPriceRuleDesc=When option "Several level of prices per product/service" is on, you can define different prices (one per price level) for each product. To save you time, you can enter here rule to have price for each level autocalculated according to price of first level, so you will have to enter only price for first level on each product. This page is here to save you time and can be usefull only if your prices for each leve are relative to first level. You can ignore this page in most cases.
 ModelModulesProduct=Templates for product documents
 ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
+SeeSubstitutionVars=See * note for list of possible substitution variables
diff --git a/htdocs/langs/th_TH/bills.lang b/htdocs/langs/th_TH/bills.lang
index 014b7f7d5c7..b8cdb734815 100644
--- a/htdocs/langs/th_TH/bills.lang
+++ b/htdocs/langs/th_TH/bills.lang
@@ -219,6 +219,7 @@ RemainderToBill=เพื่อเรียกเก็บเงินส่ว
 SendBillByMail=ส่งใบแจ้งหนี้ทางอีเมล
 SendReminderBillByMail=ส่งการแจ้งเตือนทางอีเมล
 RelatedCommercialProposals=ข้อเสนอในเชิงพาณิชย์ที่เกี่ยวข้อง
+RelatedRecurringCustomerInvoices=Related recurring customer invoices
 MenuToValid=เพื่อให้ถูกต้อง
 DateMaxPayment=ก่อนที่จะถึงกำหนดชำระ
 DateEcheance=ขีด จำกัด วันที่ครบกำหนด
@@ -319,7 +320,6 @@ toolTipFrequency=Examples:<br /><b>Set 7 / day</b>: give a new invoice every 7 d
 NextDateToExecution=Date for next invoice generation
 DateLastGeneration=Date of last generation
 MaxPeriodNumber=Max nb of invoice generation
-RestPeriodNumber=Rest period number
 NbOfGenerationDone=Nb of invoice generation already done
 InvoiceAutoValidate=Automatically validate invoice
 GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
@@ -471,3 +471,7 @@ PDFCrevetteSituationInvoiceLine=Situation N°%s : Inv. N°%s on %s
 TotalSituationInvoice=Total situation
 invoiceLineProgressError=Invoice line progress can't be egal or upper the next invoice line
 updatePriceNextInvoiceErrorUpdateline=Error : update price on invoice line : %s
+ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
+ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
+ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
+
diff --git a/htdocs/langs/th_TH/boxes.lang b/htdocs/langs/th_TH/boxes.lang
index 8bde8427330..b93ef97f921 100644
--- a/htdocs/langs/th_TH/boxes.lang
+++ b/htdocs/langs/th_TH/boxes.lang
@@ -60,8 +60,8 @@ BoxTitleLastContracts=สัญญา% s ล่าสุด
 BoxTitleLastModifiedDonations=% ของเงินบริจาคล่าสุดมีการปรับเปลี่ยน
 BoxTitleLastModifiedExpenses=Last %s modified expense reports
 BoxGlobalActivity=กิจกรรมทั่วโลก (ใบแจ้งหนี้, ข้อเสนอ, การสั่งซื้อ)
-BoxGoodCustomers=Good Customers
-BoxTitleGoodCustomers=%s Good Customers
+BoxGoodCustomers=Good customers
+BoxTitleGoodCustomers=%s Good customers
 FailedToRefreshDataInfoNotUpToDate=ล้มเหลวในการฟื้นฟูการไหลของ RSS วันรีเฟรชประสบความสำเร็จล่าสุด:% s
 LastRefreshDate=วันรีเฟรชล่าสุด
 NoRecordedBookmarks=บุ๊คมาร์คไม่มีกำหนด
diff --git a/htdocs/langs/th_TH/companies.lang b/htdocs/langs/th_TH/companies.lang
index fcfe9e9deac..183d76f572d 100644
--- a/htdocs/langs/th_TH/companies.lang
+++ b/htdocs/langs/th_TH/companies.lang
@@ -202,7 +202,7 @@ ProfId3IN=ศหมายเลข 3 (SRVC ภาษี)
 ProfId4IN=ศหมายเลข 4
 ProfId5IN=Id ศ 5
 ProfId6IN=-
-ProfId1LU=Id. prof. 1 (RCS)
+ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
 ProfId2LU=Id. prof. 2 (Business permit)
 ProfId3LU=-
 ProfId4LU=-
@@ -317,10 +317,12 @@ ShowContact=แสดงรายชื่อผู้ติดต่อ
 ContactsAllShort=ทั้งหมด (ไม่กรอง)
 ContactType=ประเภทติดต่อ
 ContactForOrders=ติดต่อสั่งซื้อของ
+ContactForOrdersOrShipments=Order's or shipment's contact
 ContactForProposals=ติดต่อข้อเสนอของ
 ContactForContracts=ติดต่อสัญญา
 ContactForInvoices=การติดต่อของใบแจ้งหนี้
 NoContactForAnyOrder=การติดต่อที่ไม่สามารถติดต่อสำหรับการสั่งซื้อใด ๆ
+NoContactForAnyOrderOrShipment=This contact is not a contact for any order or shipment
 NoContactForAnyProposal=ติดต่อนี้ไม่ได้ติดต่อสำหรับข้อเสนอการค้าใด ๆ
 NoContactForAnyContract=การติดต่อที่ไม่สามารถติดต่อสำหรับการทำสัญญาใด ๆ
 NoContactForAnyInvoice=ติดต่อนี้ไม่ได้ติดต่อสำหรับใบแจ้งหนี้ใด ๆ
@@ -438,3 +440,6 @@ MergeThirdparties=ผสานบุคคลที่สาม
 ConfirmMergeThirdparties=คุณแน่ใจหรือว่าต้องการผสานบุคคลที่สามนี้ในปัจจุบัน? วัตถุที่เชื่อมโยงทุกชนิด (ใบแจ้งหนี้การสั่งซื้อ, ... ) จะถูกย้ายไปยังบุคคลที่สามในปัจจุบันดังนั้นคุณจะสามารถลบที่ซ้ำกันอย่างใดอย่างหนึ่ง
 ThirdpartiesMergeSuccess=Thirdparties ได้รับการรวม
 ErrorThirdpartiesMerge=มีข้อผิดพลาดเมื่อมีการลบ thirdparties กรุณาตรวจสอบการเข้าสู่ระบบ เปลี่ยนแปลงได้รับการหวนกลับ
+SaleRepresentativeLogin=Login of sale representative
+SaleRepresentativeFirstname=Firstname of sale representative
+SaleRepresentativeLastname=Lastname of sale representative
diff --git a/htdocs/langs/th_TH/errors.lang b/htdocs/langs/th_TH/errors.lang
index d4c7e7578ae..62c259cb6b9 100644
--- a/htdocs/langs/th_TH/errors.lang
+++ b/htdocs/langs/th_TH/errors.lang
@@ -172,6 +172,8 @@ ErrorMandatoryParametersNotProvided=พารามิเตอร์บัง
 ErrorOppStatusRequiredIfAmount=You set an estimated amount for this opportunity/lead. So you must also enter its status
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
 ErrorSavingChanges=An error has ocurred when saving the changes
+ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
+ErrorFileMustHaveFormat=File must have format %s
 
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
diff --git a/htdocs/langs/th_TH/exports.lang b/htdocs/langs/th_TH/exports.lang
index d2343563900..412241bac6e 100644
--- a/htdocs/langs/th_TH/exports.lang
+++ b/htdocs/langs/th_TH/exports.lang
@@ -128,6 +128,10 @@ SpecialCode=รหัสพิเศษ
 ExportStringFilter=%% ช่วยให้แทนที่ตัวอักษรหนึ่งหรือมากกว่าหนึ่งในข้อความ
 ExportDateFilter=ปปปป YYYYMM, YYYYMMDD: กรองโดยหนึ่งปี / เดือน / วัน <br> ปปปปปปปป +, YYYYMM + YYYYMM, YYYYMMDD + YYYYMMDD: กรองในช่วงปี / เดือน / วัน <br> > ปปปป> YYYYMM> YYYYMMDD: กรองต่อไปนี้ในทุกปี / เดือน / วัน <br> <ปปปป <YYYYMM <YYYYMMDD: ตัวกรองในปีที่ผ่านมาก่อนหน้านี้ทั้งหมด / เดือน / วัน
 ExportNumericFilter=กรอง 'nnnnn โดยหนึ่งค่า <br> 'nnnnn + nnnnn' ตัวกรองในช่วงของค่า <br> '> nnnnn' ตัวกรองโดยค่าที่ต่ำกว่า <br> '> nnnnn' ตัวกรองโดยค่าที่สูงขึ้น
+ImportFromLine=Import starting from line number
+EndAtLineNb=End at line number
+SetThisValueTo2ToExcludeFirstLine=For example, set this value to 3 to exclude the 2 first lines
+KeepEmptyToGoToEndOfFile=Keep this field empty to go up to the end of file
 ## filters
 SelectFilterFields=หากคุณต้องการที่จะกรองบางค่าเพียงค่าที่ป้อนเข้าที่นี่
 FilterableFields=Filterable Fields
diff --git a/htdocs/langs/th_TH/main.lang b/htdocs/langs/th_TH/main.lang
index 8b86cdd3126..8ffe1ae11ca 100644
--- a/htdocs/langs/th_TH/main.lang
+++ b/htdocs/langs/th_TH/main.lang
@@ -25,6 +25,7 @@ FormatDateHourTextShort=%b %d, %Y, %I:%M %p
 FormatDateHourText=%B %d, %Y, %I:%M %p
 DatabaseConnection=เชื่อมต่อฐานข้อมูล
 NoTemplateDefined=No template defined for this email type
+AvailableVariables=Available substitution variables
 NoTranslation=แปลไม่มี
 NoRecordFound=บันทึกไม่พบ
 NoError=ไม่มีข้อผิดพลาด
diff --git a/htdocs/langs/th_TH/orders.lang b/htdocs/langs/th_TH/orders.lang
index ea2c6ac0fe9..828dfe260e4 100644
--- a/htdocs/langs/th_TH/orders.lang
+++ b/htdocs/langs/th_TH/orders.lang
@@ -32,6 +32,7 @@ StatusOrderSent=ในขั้นตอนการจัดส่ง
 StatusOrderOnProcessShort=ได้รับคำสั่ง
 StatusOrderProcessedShort=การประมวลผล
 StatusOrderDelivered=Delivered
+StatusOrderDeliveredShort=Delivered
 StatusOrderToBillShort=จัดส่ง
 StatusOrderToBill2Short=เพื่อเรียกเก็บเงิน
 StatusOrderApprovedShort=ได้รับการอนุมัติ
diff --git a/htdocs/langs/th_TH/products.lang b/htdocs/langs/th_TH/products.lang
index 3a6a95b720e..554218ef68f 100644
--- a/htdocs/langs/th_TH/products.lang
+++ b/htdocs/langs/th_TH/products.lang
@@ -45,10 +45,6 @@ LastProducts=ผลิตภัณฑ์ล่าสุด
 CardProduct0=รหัสผลิตภัณฑ์
 CardProduct1=บัตรบริการ
 CardContract=บัตรสัญญา
-Warehouse=คลังสินค้า
-Warehouses=โกดัง
-WarehouseOpened=เปิดคลังสินค้า
-WarehouseClosed=คลังสินค้าปิด
 Stock=สต็อกสินค้า
 Stocks=หุ้น
 Movement=การเคลื่อนไหว
@@ -318,3 +314,11 @@ WarningSelectOneDocument=Please select at least one document
 DefaultUnitToShow=Unit
 NbOfQtyInProposals=Qty in proposals
 ClinkOnALinkOfColumn=Click on a link of column %s to get a detailed view...
+TranslatedLabel=Translated label
+TranslatedDescription=Translated description
+TranslatedNote=Translated notes
+ProductWeight=Weight for 1 product
+ProductVolume=Volume for 1 product
+WeightUnits=Weight unit
+VolumeUnits=Volume unit
+SizeUnits=Size unit
diff --git a/htdocs/langs/th_TH/projects.lang b/htdocs/langs/th_TH/projects.lang
index e4e93bafbfb..e111c0aca8e 100644
--- a/htdocs/langs/th_TH/projects.lang
+++ b/htdocs/langs/th_TH/projects.lang
@@ -74,6 +74,9 @@ Progress=ความคืบหน้า
 ProgressDeclared=ความคืบหน้าการประกาศ
 ProgressCalculated=ความคืบหน้าของการคำนวณ
 Time=เวลา
+ListOfTasks=List of tasks
+GoToListOfTimeConsumed=Go to list of time consumed
+GoToListOfTasks=Go to list of tasks
 ListProposalsAssociatedProject=รายชื่อของข้อเสนอในเชิงพาณิชย์ที่เกี่ยวข้องกับโครงการ
 ListOrdersAssociatedProject=รายชื่อของการสั่งซื้อของลูกค้าที่เกี่ยวข้องกับโครงการ
 ListInvoicesAssociatedProject=รายการของใบแจ้งหนี้ของลูกค้าที่เกี่ยวข้องกับโครงการ
@@ -198,3 +201,4 @@ OppStatusNEGO=Negociation
 OppStatusPENDING=Pending
 OppStatusWIN=Won
 OppStatusLOST=Lost
+Budget=Budget
diff --git a/htdocs/langs/th_TH/sendings.lang b/htdocs/langs/th_TH/sendings.lang
index 32462a0dd98..d3b526fd5a9 100644
--- a/htdocs/langs/th_TH/sendings.lang
+++ b/htdocs/langs/th_TH/sendings.lang
@@ -70,6 +70,8 @@ ProductQtyInSuppliersOrdersRunning=ปริมาณสินค้าลงใ
 ProductQtyInShipmentAlreadySent=ปริมาณสินค้าจากการสั่งซื้อของลูกค้าที่เปิดส่งแล้ว
 ProductQtyInSuppliersShipmentAlreadyRecevied=ปริมาณการสั่งซื้อสินค้าจากซัพพลายเออร์ที่เปิดรับอยู่แล้ว
 NoProductToShipFoundIntoStock=No product to ship found into warehouse <b>%s</b>. Correct stock or go back to choose another warehouse.
+WeightVolShort=Weight/Vol.
+ValidateOrderFirstBeforeShipment=You must first validate the order before being able to make shipments.
 
 # Sending methods
 SendingMethodCATCH=จับลูกค้า
diff --git a/htdocs/langs/th_TH/supplier_proposal.lang b/htdocs/langs/th_TH/supplier_proposal.lang
index 1a1bdc4df16..e37ced1b38f 100644
--- a/htdocs/langs/th_TH/supplier_proposal.lang
+++ b/htdocs/langs/th_TH/supplier_proposal.lang
@@ -58,3 +58,5 @@ DefaultModelSupplierProposalCreate=Default model creation
 DefaultModelSupplierProposalToBill=Default template when closing a price request (accepted)
 DefaultModelSupplierProposalClosed=Default template when closing a price request (refused)
 ListOfSupplierProposal=List of supplier proposal requests
+SupplierProposalsToClose=Supplier proposals to close
+SupplierProposalsToProcess=Supplier proposals to process
diff --git a/htdocs/langs/tr_TR/accountancy.lang b/htdocs/langs/tr_TR/accountancy.lang
index f17bfaded45..341bcbe0f00 100644
--- a/htdocs/langs/tr_TR/accountancy.lang
+++ b/htdocs/langs/tr_TR/accountancy.lang
@@ -34,7 +34,7 @@ AccountAccounting=Muhasebe hesabı
 AccountAccountingSuggest=Accounting account suggest
 Ventilation=Analiz
 
-MenuAccountancy=Accountancy
+MenuAccountancy=Muhasebe
 CustomersVentilation=Müşteri analizi
 SuppliersVentilation=Tedarikçi analizi
 TradeMargin=Ticaret kar oranı
@@ -47,7 +47,7 @@ UpdateAccount=Bir muhasebe hesabının değiştirilmesi
 UpdateMvts=Bir hareketin değiştirilmesi
 WriteBookKeeping=Büyük defter hesap kayıtları
 Bookkeeping=Büyük Defter
-AccountBalance=Account balance
+AccountBalance=Hesap bakiyesi
 
 AccountingVentilation=Analiz muhasebesi
 AccountingVentilationSupplier=Tedarikçi hesabı analizi
@@ -104,7 +104,7 @@ Code_tiers=Üçüncü parti
 Labelcompte=Hesap etiketi
 Sens=Sens (borsa haberleri yayınlama günlüğü)
 Codejournal=Günlük
-NumPiece=Piece number
+NumPiece=Parça sayısı
 
 DelBookKeeping=Büyük defter kayıtlarını sil
 
@@ -167,7 +167,7 @@ Type=Alan türü
 Param=Ek parametreler
 EnabledProduct=Ürünlerde
 EnabledTiers=Üçüncü partide
-EnabledVat=In VAT
+EnabledVat=KDV nde
 
 ## Tools - Init accounting account on product / service
 InitAccountancy=Muhasebe başlangıcı
diff --git a/htdocs/langs/tr_TR/admin.lang b/htdocs/langs/tr_TR/admin.lang
index 71ac557548a..303b87bedf3 100644
--- a/htdocs/langs/tr_TR/admin.lang
+++ b/htdocs/langs/tr_TR/admin.lang
@@ -154,7 +154,7 @@ Purge=Temizleme
 PurgeAreaDesc=Bu sayfa, Dolibarr tarafından oluşturulan ve kayıt edilen tüm dosyaları silebilmenizi sağlar (<b>%s</b> dizinindeki geçici dosyaları ya da tüm dosyaları). Bu özelliği kullanmak gerekli değildir. Web sunucusunca oluşturulan dosyaların silinmesine olanak vermeyen bir servis sağlayıcı tarafından barındırılan Dolibarr kullanıcıları için sağlanmıştır.
 PurgeDeleteLogFile=Syslog modülü tarafından tanımlanan <b>%s</b> kütük dosyasını silin (bilgi kaybetme riskiniz yoktur)
 PurgeDeleteTemporaryFiles=Tüm geçici dosyaları sil (bilgi kaybetme riskiniz yoktur)
-PurgeDeleteTemporaryFilesShort=Delete temporary files
+PurgeDeleteTemporaryFilesShort=Geçici dosyaları sil
 PurgeDeleteAllFilesInDocumentsDir=<b>%s</b> dizinindeki bütün dosyaları sil. Geçici dosyalarla birlikte veritabanı yedek artıkları, belgelere eklenmiş dosyalar (üçüncü partiler, faturalar, v.s.) ECM modülüne yüklenen dosyalar da silinecektir.
 PurgeRunNow=Şimdi temizle
 PurgeNothingToDelete=Silinecek dizin ya da dosya yok.
@@ -282,6 +282,7 @@ ModuleSetup=Modül kurulumu
 ModulesSetup=Modüllerin kurulumu
 ModuleFamilyBase=Sistem
 ModuleFamilyCrm=Müşteri İlişkileri Yönetimi (CRM)
+ModuleFamilySrm=Tefadrikçi İlişkileri Yönetimi (SRM)
 ModuleFamilyProducts=Ürün Yönetimi (ÜY)
 ModuleFamilyHr=İnsan Kaynakları Yönetimi (İK)
 ModuleFamilyProjects=Projeler/Ortak çalışma
@@ -587,6 +588,7 @@ Permission38=Ürün dışaaktar
 Permission41=Proje ve görevleri oku (paylaşılan projeleri ve benim ilgilisi olduğum projeleri). Aynı zamanda verilen görevlerde harcanan süreleri de ekleyebilir (zaman çizelgeleri).
 Permission42=Proje oluştur/düzenle (paylaşılan projeler ve ilgilisi olduğum projeler)
 Permission44=Proje sil (paylaşılan projeler ve ilgilisi olduğum projeler)
+Permission45=Export projects
 Permission61=Müdahale oku
 Permission62=Müdahale oluştur/düzenle
 Permission64=Müdahale sil
@@ -640,6 +642,7 @@ Permission162=Sözleşme/abonelik oluştur/değiştir
 Permission163=Bir sözleşmeye ait bir hizmet/abonelik etkinleştir
 Permission164=Bir sözleşmeye ait bir hizmet/abonelik engelle
 Permission165=Sözleşme/abonelik sil
+Permission167=Export contracts
 Permission171=Seyahat ve giderleri okuyun (kendi ve astlarının)
 Permission172=Gezi ve gider oluştur/değiştir
 Permission173=Gezi ve gider sil
@@ -788,6 +791,7 @@ Permission2403=Onun hesabına bağlı eylemleri (etkinlikleri veya görevleri) s
 Permission2411=Başkalarının eylemlerini (etkinliklerini veya görevlerini) oku
 Permission2412=Başkalarının eylemlerini (etkinliklerini veya görevlerini) oluştur/değiştir
 Permission2413=Başkalarının eylemlerini (etkinliklerini veya görevlerini) sil
+Permission2414=Export actions/tasks of others
 Permission2501=Belge oku/indir
 Permission2502=Belge indir
 Permission2503=Belge gönder ya da sil
@@ -1091,7 +1095,7 @@ SendmailOptionMayHurtBuggedMTA="PHP doğrudan posta" yöntemini kullanarak posta
 TranslationSetup=Çeviri yapılandırması
 TranslationDesc=Ekran görüntüsündeki dil değiştirilebilir:<br>* Genel olarak bu menüden <strong>Giriş - Kurulum - Görünüm</strong><br>* Yalnızca <strong>User display</strong> sekmesindeki kullanıcı formundan (ekranın tepesindeki oturum aça tıklayın).
 TranslationOverwriteDesc=Aşağıdaki tabloyu tamamlayarak/düzenleyerek bazı değerlerin üzerine de yazabilirsiniz. "%s" için dil kodunu kullanabilir, "%s" için langs/xx_XX/somefile.lang dosyasında bulunan anahtarı kullanabilir ve "%s" yeni bir çeviri için kullanmak isteyeceğiniz yeni değerdir.
-TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
+TotalNumberOfActivatedModules=Etkileştirilmiş özel modül toplam sayısı
 YouMustEnableOneModule=Enaz 1 modül etkinleştirmelisiniz
 ClassNotFoundIntoPathWarning=Sınıf %s PHP youlnda bulunamadı
 YesInSummer=Yazın evet
@@ -1641,7 +1645,7 @@ CloseFiscalYear=Kapalı mali yıl
 DeleteFiscalYear=Mali yıl sil
 ConfirmDeleteFiscalYear=Bu mali yılın silmek istediğinizden emin misiniz?
 AlwaysEditable=Her zaman düzenlenebilir
-IsHidden=Is not visible
+IsHidden=Görünmez
 MAIN_APPLICATION_TITLE=Uygulamanın görünür adına zorla (uyarı: burada kendi adınızı ayarlamanız, DoliDoid mobil uygulamasını kullanırken, kullanıcı adını oto doldur özelliğini durdurabilir)
 NbMajMin=Enaz sayıdaki büyük harf karakteri
 NbNumMin=Enaz sayıdaki sayısal karakterler
@@ -1666,7 +1670,7 @@ BackupDumpWizard=Veritabanı yedekleme döküm dosyası oluşturma sihirbazı
 SomethingMakeInstallFromWebNotPossible=Web arayüzünden dış modül kurulumu aşağıdaki nedenden ötürü olanaksızdır:
 SomethingMakeInstallFromWebNotPossible2=Bu nedenle, burada anlatılan yükseltme işlemi yalnızca ayrıcalıklı bir kullanıcın elle atacağı adımlardır.
 InstallModuleFromWebHasBeenDisabledByFile=Dış modülün uygulama içerisinden kurulumu yöneticiniz tarafından engellenmiştir. Bu özelliğe izin verilmesi için ondan <strong>%s</strong> dosyasını kaldırmasını istemelisiniz.
-ConfFileMuseContainCustom=Installing an external module from application save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to have option<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
+ConfFileMuseContainCustom=Uygulama içinden dış modül kurarken modül dosyalarını bu dizine kaydedin: <strong>%s</strong>. Bu dizinin Dolibar tarafından işlenebilmesi için önce <strong>conf/conf.php</strong> dosyanızı ayarlamalısınız ki böylece<br> <strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong> seçeneklerini elde edin
 HighlightLinesOnMouseHover=Tablo satırlarını fare üzerine geldiğinde vurgula
 HighlightLinesColor=Fare üzerinden geçerken satır rengini vurgula (vurgulanmaması için boş bırakın)
 TextTitleColor=Sayfa başlık rengi
@@ -1711,5 +1715,6 @@ TitleExampleForMaintenanceRelease=Bu bakım sürümü duyurmak için kullanabile
 ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s hazırdır. Sürüm %s hem kullanıcılar, hem de geliştiriciler için bir çok yeni özellik içeren bir ana sürümdür. Bu sürümü http://www.dolibarr.org (Kararlı sürümler alt dizininden) portalının indirme alanından yükleyebilirsiniz. Değişiklerin tam listesini incelemek için <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> adresine bakabilirsiniz.
 ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s hazırdır. Sürüm %s bir bakım sürümü olup yalnızca hataların onarımını içerir. Daha eski bir sürüm kullanan herkesin bu sürüme yükselmesini öneririz. Her bakım sürümünde olduğu gibi, bu sürümde de ne yeni özellik ne de veri yapısı değişikliği vardır. Bu sürümü http://www.dolibarr.org (Kararlı sürümler alt dizininden) portalının indirmeler alanından yükleyebilirsiniz. Tam değişiklik listesini incelemek için <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> adresine bakabilirsiniz.
 MultiPriceRuleDesc="Her ürün/hizmet için çok seviyeli fiyat" açık ise her ürün için farklı fiyatlar (her fiyat seviyesi için bir) tanımlayabilirsiniz. Zaman kazanmak için, burada, temel fiyata göre her seviye için kendiliğinden hesaplama yapılması için kural girebilirisiniz. Bu sayfa zaman kazanmanız için vardır ve yalnzca diğer fiyat seviyeleri temel fiyata bağlı ise kullanışlıdır. Çoğu durumda bu sayfayı gözardı edebilirsiniz.
-ModelModulesProduct=Templates for product documents
-ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
+ModelModulesProduct=Ürün belgeleri için şablonlar
+ToGenerateCodeDefineAutomaticRuleFirst=Otomatik kodlar oluşturabilmek için önce otomatik olarak barkod numarası tanımlayacak bir yönetici tanımlamalısınız.
+SeeSubstitutionVars=See * note for list of possible substitution variables
diff --git a/htdocs/langs/tr_TR/bills.lang b/htdocs/langs/tr_TR/bills.lang
index 048613ec2c8..4d14e0320c6 100644
--- a/htdocs/langs/tr_TR/bills.lang
+++ b/htdocs/langs/tr_TR/bills.lang
@@ -58,7 +58,7 @@ Payment=Ödeme
 PaymentBack=Geri ödeme
 Payments=Ödemeler
 PaymentsBack=Geri ödemeler
-paymentInInvoiceCurrency=in invoices currency
+paymentInInvoiceCurrency=fatura para biriminde
 PaidBack=Geri ödenen
 DeletePayment=Ödeme sil
 ConfirmDeletePayment=Bu ödemeyi silmek istediğinizden emin misiniz?
@@ -107,7 +107,7 @@ EnterPaymentDueToCustomer=Müşteri nedeniyle ödeme yap
 DisabledBecauseRemainderToPayIsZero=Ödenmemiş kalan sıfır olduğundan devre dışı
 PriceBase=Temel fiyat
 BillStatus=Fatura durumu
-StatusOfGeneratedInvoices=Status of generated invoices
+StatusOfGeneratedInvoices=Oluşturulan faturaların durumu
 BillStatusDraft=Taslak (doğrulanma gerektirir)
 BillStatusPaid=Ödendi
 BillStatusPaidBackOrConverted=Ödenmiş ya da indirime dönüştürülmüş
@@ -141,10 +141,10 @@ ErrorCantCancelIfReplacementInvoiceNotValidated=Hata, halen taslak durumunda ola
 BillFrom=Kimden
 BillTo=Kime
 ActionsOnBill=Fatura üzerindeki eylemler
-RecurringInvoiceTemplate=Recurring invoice
-NoQualifiedRecurringInvoiceTemplateFound=No recurring template invoice qualified for generation.
-FoundXQualifiedRecurringInvoiceTemplate=Found %s recurring template invoice(s) qualified for generation.
-NotARecurringInvoiceTemplate=Not a recurring template invoice
+RecurringInvoiceTemplate=Yinelenen fatura
+NoQualifiedRecurringInvoiceTemplateFound=Oluşturmak için gerekli nitelikte yinelenen fatura şablonu yok.
+FoundXQualifiedRecurringInvoiceTemplate=Oluşturmak için gerekli nitelikte %s yinelenen fatura(lar) şablonu bulundu.
+NotARecurringInvoiceTemplate=Bir yinelenen fatura şablonu değil
 NewBill=Yeni fatura
 LastBills=Son %s fatura
 LastCustomersBills=Son %s müşteri faturası
@@ -205,7 +205,7 @@ Rest=Bekleyen
 AmountExpected=İstenen tutar
 ExcessReceived=Fazla alınan
 EscompteOffered=Teklif edilen indirim (vadeden önce ödemede)
-EscompteOfferedShort=Discount
+EscompteOfferedShort=İndirim
 SendBillRef=%s faturasının gönderilmesi
 SendReminderBillRef=%s faturasının gönderilmesi (anımsatma)
 StandingOrders=Ödeme talimatları
@@ -219,6 +219,7 @@ RemainderToBill=Faturalanacak bakiye
 SendBillByMail=Faturayı E-posta ile gönder
 SendReminderBillByMail=Hatırlatılmayı E-posta ile gönder
 RelatedCommercialProposals=İlgili teklifler
+RelatedRecurringCustomerInvoices=Related recurring customer invoices
 MenuToValid=Doğrulanacak
 DateMaxPayment=Vadesinden önce ödeme
 DateEcheance=Vade tarihi sınırı
@@ -312,19 +313,18 @@ AmountPaymentDistributedOnInvoice=Faturaya dağıtılan ödeme tutarı
 PaymentNote=Ödeme notu
 ListOfPreviousSituationInvoices=Önceki hakediş faturaları listesi
 ListOfNextSituationInvoices=Sonraki hakediş faturaları listesi
-FrequencyPer_d=Every %s days
-FrequencyPer_m=Every %s months
-FrequencyPer_y=Every %s years
-toolTipFrequency=Examples:<br /><b>Set 7 / day</b>: give a new invoice every 7 days<br /><b>Set 3 / month</b>: give a new invoice every 3 month
-NextDateToExecution=Date for next invoice generation
-DateLastGeneration=Date of last generation
-MaxPeriodNumber=Max nb of invoice generation
-RestPeriodNumber=Rest period number
-NbOfGenerationDone=Nb of invoice generation already done
-InvoiceAutoValidate=Automatically validate invoice
-GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
-DateIsNotEnough=Date not yet reached
-InvoiceGeneratedFromTemplate=Invoice %s generated from recurring template invoice %s
+FrequencyPer_d=Her %s günde
+FrequencyPer_m=Her %s ayda
+FrequencyPer_y=Her %s yılda
+toolTipFrequency=Örnekler:<br /><b>7 gün ayarı</b>: her 7 günde bir yeni fatura ver<br /><b>3 ay</b>: her 3 ayda bir yeni fatura ver
+NextDateToExecution=Sonraki fatura oluşturulacak tarih
+DateLastGeneration=Son oluşturma tarihi
+MaxPeriodNumber=Oluturulan ençok fatura sayısı
+NbOfGenerationDone=Hali hazırda  oluşturulmuş fatura sayısı
+InvoiceAutoValidate=Fatura otomatik doğrulama
+GeneratedFromRecurringInvoice=Şablondan oluşturulan yinelenen fatura %s
+DateIsNotEnough=Henüz tarihe ulaşılmadı
+InvoiceGeneratedFromTemplate=Fatura %s yinelenen fatura şablonundan %s oluşturuldu
 # PaymentConditions
 PaymentConditionShortRECEP=Derhal
 PaymentConditionRECEP=Derhal
@@ -471,3 +471,7 @@ PDFCrevetteSituationInvoiceLine=Hakediş No%s : Fat. No%s / %s
 TotalSituationInvoice=Toplam hakediş
 invoiceLineProgressError=Fatura satırı ilerleyişi sonraki fatura satırına eşit ya da daha yüksek olamaz
 updatePriceNextInvoiceErrorUpdateline=Hata : Faturanın bu satırı üzerindeki fiyatı güncelle : %s
+ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
+ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
+ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
+
diff --git a/htdocs/langs/tr_TR/boxes.lang b/htdocs/langs/tr_TR/boxes.lang
index cb020b307c1..8f4f5678ab8 100644
--- a/htdocs/langs/tr_TR/boxes.lang
+++ b/htdocs/langs/tr_TR/boxes.lang
@@ -60,8 +60,8 @@ BoxTitleLastContracts=Son %s sözleşme
 BoxTitleLastModifiedDonations=Son değiştirilen %s bağış
 BoxTitleLastModifiedExpenses=Son düzenlenen %s gider raporu
 BoxGlobalActivity=Genel etkinlik (faturalar, teklifler, siparişler)
-BoxGoodCustomers=Good Customers
-BoxTitleGoodCustomers=%s Good Customers
+BoxGoodCustomers=İyi müşteriler
+BoxTitleGoodCustomers=%s İyi müşteri
 FailedToRefreshDataInfoNotUpToDate=RSS akışı yenilemesi yapılamadı. Son başarılı yenileme tarihi: %s
 LastRefreshDate=Son yenileme tarihi
 NoRecordedBookmarks=Tanımlanmış yerimi yok.
@@ -97,4 +97,4 @@ ForCustomersInvoices=Müşteri faturaları
 ForCustomersOrders=Müşteri siparişleri
 ForProposals=Teklifler
 LastXMonthRolling=Devreden son %s ay
-ChooseBoxToAdd=Add a box to your dashboard...
+ChooseBoxToAdd=Kontrol panelinize bir kutu ekleyin...
diff --git a/htdocs/langs/tr_TR/companies.lang b/htdocs/langs/tr_TR/companies.lang
index f36f36dde1c..d4d189cd186 100644
--- a/htdocs/langs/tr_TR/companies.lang
+++ b/htdocs/langs/tr_TR/companies.lang
@@ -202,8 +202,8 @@ ProfId3IN=Prof Id 3
 ProfId4IN=Prof Id 4
 ProfId5IN=Prof Id 5
 ProfId6IN=-
-ProfId1LU=Id. prof. 1 (RCS)
-ProfId2LU=Id. prof. 2 (Business permit)
+ProfId1LU=Id. prof. 1 (R.C.S. Lüksemburg)
+ProfId2LU=Id. prof. 2 (İş izini)
 ProfId3LU=-
 ProfId4LU=-
 ProfId5LU=-
@@ -317,10 +317,12 @@ ShowContact=Kişi göster
 ContactsAllShort=Hepsi (süzmeden)
 ContactType=Kişi tipi
 ContactForOrders=Sipariş yetkilisi
+ContactForOrdersOrShipments=Siparişin ya da sevkiyatın ilgilisi
 ContactForProposals=Teklif yetkilisi
 ContactForContracts=Sözleşme yetkilisi
 ContactForInvoices=Fatura yetkilisi
 NoContactForAnyOrder=Bu kişi herhangi bir siparişin yetkilisi değildir
+NoContactForAnyOrderOrShipment=Bu kişi hiçbir sipariş ya da sevkiyatın ilgilisi değildir
 NoContactForAnyProposal=Bu kişi herhangi bir teklifin yetkilisi değildir
 NoContactForAnyContract=Bu kişi herhangi bir sözleşmenin yetkilisi değildir
 NoContactForAnyInvoice=Bu kişi herhangi bir faturanın yetkilisi değildir
@@ -438,3 +440,6 @@ MergeThirdparties=Üçüncü partileri birleştir
 ConfirmMergeThirdparties=Bu üçüncü partiyi geçerli olanla birleştirmek istediğinizden emin misiniz? Bütün bağlantılı öğeler (faturalar, siparişler, ...) geçerli olan üçüncü partiye taşınacaktır, böylece ikinciyi silebileceksiniz.
 ThirdpartiesMergeSuccess=Üçüncü partiler birleştirilmiştir
 ErrorThirdpartiesMerge=Üçüncü partiler silinirken bir hata oluştu. Lütfen günlüğü denetleyin. Değişiklikler ger, geri dönüştürülmüştür.
+SaleRepresentativeLogin=Satış temsilcisinin kullanıcı adı
+SaleRepresentativeFirstname=Satış temsilcisinin İlk Adı
+SaleRepresentativeLastname=Satış temsilcisinin soyadı
diff --git a/htdocs/langs/tr_TR/compta.lang b/htdocs/langs/tr_TR/compta.lang
index 01b090b2ed6..65dad07a6af 100644
--- a/htdocs/langs/tr_TR/compta.lang
+++ b/htdocs/langs/tr_TR/compta.lang
@@ -221,4 +221,4 @@ OtherCountriesCustomersReport=Yabancı müşteri raporu
 BasedOnTwoFirstLettersOfVATNumberBeingDifferentFromYourCompanyCountry=Kendi firmanızın ülke kodundan farklı olan KDV sinin ilk iki harfine dayanan
 SameCountryCustomersWithVAT=Yerli müşteri raporu
 BasedOnTwoFirstLettersOfVATNumberBeingTheSameAsYourCompanyCountry=Kendi firmanızın ülke koduyla aynı olan KDV sinin ilk iki harfine dayanan
-LinkedFichinter=Link to an intervention
+LinkedFichinter=Bir müdahaleye bağlan
diff --git a/htdocs/langs/tr_TR/cron.lang b/htdocs/langs/tr_TR/cron.lang
index 3e321df2700..33496f06592 100644
--- a/htdocs/langs/tr_TR/cron.lang
+++ b/htdocs/langs/tr_TR/cron.lang
@@ -16,7 +16,7 @@ KeyForCronAccess=Cron işlerini başlatacak URL için güvenlik anahtarı
 FileToLaunchCronJobs=Cron işlerini başlatacak komut satırı
 CronExplainHowToRunUnix=Unix ortamında komut satırını her 5 dakikada bir çalıştırmak için kron sekmesi girişini kullanmalısınız
 CronExplainHowToRunWin=Mikrosot (tm) Windows ortamında komut satırını her 5 dakikada bir çalıştırmak için Planlanmış görev araçlarını kullanmalısınız
-CronMethodDoesNotExists=Class %s does not contains any method %s
+CronMethodDoesNotExists=Sınıf %s hiçbir %s yöntemi içermiyor
 # Menu
 CronJobs=Planlı işler
 CronListActive=Devre dışı/planlı işlerin listesi
@@ -40,8 +40,8 @@ CronNone=Hiçbiri
 CronDtStart=Önce değil
 CronDtEnd=Sonra değil
 CronDtNextLaunch=Sonraki yürütme
-CronDtLastLaunch=Start date of last execution
-CronDtLastResult=End date of last execution
+CronDtLastLaunch=Son yürütmenin başlama tarihi
+CronDtLastResult=Son yürütmenin bitiş tarihi
 CronFrequency=Sıklık
 CronClass=Sınıf
 CronMethod=Yöntem
@@ -90,5 +90,5 @@ CronMenu=Kron
 CronCannotLoadClass=%s sınıfı ya da %s nesnesi yüklenemiyor
 UseMenuModuleToolsToAddCronJobs=Planlı işleri görmek ve düzenlemek için "Giriş - Modül araçları - İş listesi" menüsüne gidin.
 TaskDisabled=İş engellendi
-MakeLocalDatabaseDumpShort=Local database backup
-MakeLocalDatabaseDump=Create a local database dump
+MakeLocalDatabaseDumpShort=Yerel veritabanı yedeklemesi
+MakeLocalDatabaseDump=Yerel bir veritabanı dökümü oluştur
diff --git a/htdocs/langs/tr_TR/errors.lang b/htdocs/langs/tr_TR/errors.lang
index fd94d26d257..0158d4425f3 100644
--- a/htdocs/langs/tr_TR/errors.lang
+++ b/htdocs/langs/tr_TR/errors.lang
@@ -172,6 +172,8 @@ ErrorMandatoryParametersNotProvided=Zorunlu parametre(ler) girilmemiş
 ErrorOppStatusRequiredIfAmount=Bu fırsat/aday için tahmini bir tutar ayarladınız. Durumunu da girmelisiniz
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Modül Tanımlayıcıda hatalı Menu Dizisi tanımı (fk_menu anahtarı için hatalı değer)
 ErrorSavingChanges=Değişiklikler kaydedilirken bir hata oluştu
+ErrorWarehouseRequiredIntoShipmentLine=Depo gemi hattı üzerinde gerekli
+ErrorFileMustHaveFormat=Dosya %s biçiminde olmalıdır
 
 # Warnings
 WarningPasswordSetWithNoAccount=Bu üye için bir parola ayarlıdır. Ancak, hiçbir kullanıcı hesabı oluşturulmamıştır. Yani bu şifre saklanır ama Dolibarr'a giriş için kullanılamaz. Dış bir modül/arayüz tarafından kullanılıyor olabilir, ama bir üye için ne bir kullanıcı adı ne de parola tanımlamanız gerekmiyorsa "Her üye için bir kullanıcı adı yönet" seçeneğini devre dışı bırakabilirsiniz. Bir kullanıcı adı yönetmeniz gerekiyorsa ama herhangi bir parolaya gereksinim duymuyorsanız bu uyarıyı engellemek için bu alanı boş bırakabilirsiniz. Not: Eğer bir üye bir kullanıcıya bağlıysa kullanıcı adı olarak eposta adresi de kullanılabilir.
diff --git a/htdocs/langs/tr_TR/exports.lang b/htdocs/langs/tr_TR/exports.lang
index 7ff0de87487..5baa84507fb 100644
--- a/htdocs/langs/tr_TR/exports.lang
+++ b/htdocs/langs/tr_TR/exports.lang
@@ -90,7 +90,7 @@ SelectAtLeastOneField=En az bir kaynak alanı dışaaktarılacak alanlar bölüm
 SelectFormat=Bu içeaktarma dosya biçimini seçin
 RunImportFile=Dosya içeaktarmayı başlatın
 NowClickToRunTheImport=İçeaktarma denemesi sonucunu denetleyin. Herşey yolundaysa, kesin içeaktarmayı başlatın.
-DataLoadedWithId=All data will be loaded with the following import id: <b>%s</b>
+DataLoadedWithId=Bütün veriler bu içeaktarma id'i ile yüklenecektir: <b>%s</b>
 ErrorMissingMandatoryValue=Kaynak dosyada alan için zorunlu veri boş <b>%s</b>.
 TooMuchErrors=Kaynak dosyasında, liste sınırlandığından görüntülenmeyen <b>%s</b> hatalı satır daha var.
 TooMuchWarnings=Kaynak dosyasında, liste sınırlandığından görüntülenmeyen <b>%s</b> uyarı içeren satır daha var.
@@ -128,9 +128,13 @@ SpecialCode=Özel kod
 ExportStringFilter=%% metinde bir ya da fazla karakterin değiştirilmesine izin verir
 ExportDateFilter=YYYY, YYYYMM, YYYYMMDD : bir yıılık yıl/ay/gün süzgeçi<br>YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD : yıllar arası yıllar/aylar/günler süzgeçi<br> > YYYY, > YYYYMM, > YYYYMMDD : izleyen tüm yıllar için yıılar/aylar/günler süzgeçi<br> < YYYY, < YYYYMM, < YYYYMMDD : bütün önceki yıllar/aylar/günler süzgeçi
 ExportNumericFilter='NNNNN' bir değere göre süzgeç<br>'NNNNN+NNNNN' bir değerler aralığı süzgeçi<br>'&gt;NNNNN' düşük değerlere göre süzgeç<br>'&gt;NNNNN' yüksek değerlere göre süzgeç
+ImportFromLine=İçeaktarımın başladığı satır numarası
+EndAtLineNb=Satır numarası sonu
+SetThisValueTo2ToExcludeFirstLine=Örneğin, İlk 2 satırı dışarıda tutmak için bu değeri 3 e ayarlayın
+KeepEmptyToGoToEndOfFile=Dosya sonuna gitmek için bu alanı boş bırakın
 ## filters
 SelectFilterFields=Süzmek istediğiniz değerleri buraya yazın.
-FilterableFields=Filterable Fields
+FilterableFields=Süzülebilir Alanlar
 FilteredFields=Süzülmüş alanlar
 FilteredFieldsValues=Süzgeç değeri
 FormatControlRule=Biçim denetimi kuralı
diff --git a/htdocs/langs/tr_TR/holiday.lang b/htdocs/langs/tr_TR/holiday.lang
index 5fbe6195b84..a226f8f4c55 100644
--- a/htdocs/langs/tr_TR/holiday.lang
+++ b/htdocs/langs/tr_TR/holiday.lang
@@ -12,7 +12,7 @@ DateDebCP=Başlama tarihi
 DateFinCP=Bitiş tarihi
 DateCreateCP=Oluşturma tarihi
 DraftCP=Taslak
-ToReviewCP=Onay bekliyor
+ToReviewCP=Onay bekleyen
 ApprovedCP=Onaylandı
 CancelCP=İptal edildi
 RefuseCP=Reddedildi
diff --git a/htdocs/langs/tr_TR/languages.lang b/htdocs/langs/tr_TR/languages.lang
index 33502c554e0..8ce0f3b25df 100644
--- a/htdocs/langs/tr_TR/languages.lang
+++ b/htdocs/langs/tr_TR/languages.lang
@@ -32,7 +32,7 @@ Language_es_MX=İspanyolca (Meksika)
 Language_es_PY=İspanyolca (Paraguay)
 Language_es_PE=İspanyolca (Peru)
 Language_es_PR=İspanyolca (Porto Riko)
-Language_es_VE=Spanish (Venezuela)
+Language_es_VE=İspanyolca (Venezüella)
 Language_et_EE=Estonyaca
 Language_eu_ES=Baskça
 Language_fa_IR=Farsça
diff --git a/htdocs/langs/tr_TR/mails.lang b/htdocs/langs/tr_TR/mails.lang
index b1ba4013d62..fee78432f5c 100644
--- a/htdocs/langs/tr_TR/mails.lang
+++ b/htdocs/langs/tr_TR/mails.lang
@@ -47,7 +47,7 @@ MailingSuccessfullyValidated=Eposta doğrulanması başarılı
 MailUnsubcribe=Aboneliği kaldır
 Unsuscribe=Aboneliği kaldır
 MailingStatusNotContact=Bir daha görüşme
-MailingStatusReadAndUnsubscribe=Read and unsubscribe
+MailingStatusReadAndUnsubscribe=Oku ve aboneliği kaldır
 ErrorMailRecipientIsEmpty=Eposta alıcısı boş
 WarningNoEMailsAdded=Alıcının listesine ekli yeni Eposta yok.
 ConfirmValidMailing=Bu epostayı doğrulamak istediğinizden emin misiniz?
diff --git a/htdocs/langs/tr_TR/main.lang b/htdocs/langs/tr_TR/main.lang
index b8efd2ca1cf..6839b243c3a 100644
--- a/htdocs/langs/tr_TR/main.lang
+++ b/htdocs/langs/tr_TR/main.lang
@@ -25,6 +25,7 @@ FormatDateHourTextShort=%d %b %Y %H:%M
 FormatDateHourText=%d %B %Y %H:%M
 DatabaseConnection=Veritabanı bağlantısı
 NoTemplateDefined=Bu eposta türü için hiç şablon tanımlanmamış
+AvailableVariables=Available substitution variables
 NoTranslation=Çeviri yok
 NoRecordFound=Kayıt bulunamadı
 NoError=Hata yok
@@ -311,7 +312,7 @@ UnitPriceHT=Birim fiyat (net)
 UnitPriceTTC=Birim fiyat
 PriceU=B.F.
 PriceUHT=B.F. (net)
-PriceUHTCurrency=U.P (currency)
+PriceUHTCurrency=B.F (para birimi)
 SupplierProposalUHT=U.P. net İstenmiş
 PriceUTTC=B.F. (vergi dahil)
 Amount=Tutar
@@ -322,9 +323,9 @@ AmountTTCShort=Tutar (KDV dahil)
 AmountHT=Tutar (KDV hariç)
 AmountTTC=Miktarı (KDV dahil)
 AmountVAT=KDV tutarı
-MulticurrencyAmountHT=Amount (net of tax), original currency
-MulticurrencyAmountTTC=Amount (inc. of tax), original currency
-MulticurrencyAmountVAT=Amount tax, original currency
+MulticurrencyAmountHT=Tutar (vergisiz net), ilk para birimi
+MulticurrencyAmountTTC=Tutar (vergi dahil), ilk para birimi
+MulticurrencyAmountVAT=Toplam vergi, ilk para birimi
 AmountLT1=Vergi 2 tutarı
 AmountLT2=Vergi 3 tutarı
 AmountLT1ES=RE Tutarı
@@ -339,7 +340,7 @@ Percentage=Yüzde
 Total=Toplam
 SubTotal=Aratoplam
 TotalHTShort=Toplam (Net)
-TotalHTShortCurrency=Total (net in currency)
+TotalHTShortCurrency=Toplam (para biriminde net)
 TotalTTCShort=Toplam (KDV dahil)
 TotalHT=Toplam (KDV hariç)
 TotalHTforthispage=Bu sayfa toplamı (vergisiz net)
@@ -462,7 +463,7 @@ Datas=Veriler
 None=Hiçbiri
 NoneF=Hiçbiri
 Late=Son
-LateDesc=Delay to define if a record is late or not depends on your setup. Ask your admin to change delay from menu Home - Setup - Alerts.
+LateDesc=Bir kayıdın sizin ayarlarınıza dayanarak gecikmiş olduğu ya da olmadığını tanımlayabilmek için gerekli süre. Yöneticinizden Giriş - Ayarlar - Uyarılar menüsünden süreyi değiştirmesini isteyin.
 Photo=Resim
 Photos=Resimler
 AddPhoto=Resim ekle
@@ -545,7 +546,7 @@ NbOfCustomers=Müşteri sayısı
 NbOfLines=Satır sayısı
 NbOfObjects=Nesne sayısı
 NbOfReferers=Yönlendirenlerin sayısı
-NbOfObjectReferers=Number of refering objects
+NbOfObjectReferers=Yönlendiren nesnelerin sayısı
 Referers=Yönlendirme nesneleri
 TotalQuantity=Toplam miktar
 DateFromTo=%s den %s e kadar
@@ -701,7 +702,7 @@ LinkedToSpecificUsers=Belirli bir kullanıcı kişisine bağlantılı
 DeleteAFile=Bir dosya sil
 ConfirmDeleteAFile=Dosya silmek istediğinizden emin misiniz
 NoResults=Sonuç yok
-AdminTools=Admin tools
+AdminTools=Yönetici araçları
 SystemTools=Sistem araçları
 ModulesSystemTools=Modül araçları
 Test=Deneme
@@ -740,8 +741,8 @@ Hello=Merhaba
 Sincerely=Saygılar
 DeleteLine=Satır sil
 ConfirmDeleteLine=Bu satırı silmek istediğinizden emin misiniz?
-NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked records
-TooManyRecordForMassAction=Too many records selected for mass action. Such action are restriced to a list of %s records.
+NoPDFAvailableForDocGenAmongChecked=Kontrol edilen kayıtlar arasında belge oluşturmak için hiç PDF yok
+TooManyRecordForMassAction=Toplu işlem için çok sayıda kayıt seçildi. Böyle bir işlem %s kayıtlık bir listeyle sınırlıdır.
 # Week day
 Monday=Pazartesi
 Tuesday=Salı
diff --git a/htdocs/langs/tr_TR/orders.lang b/htdocs/langs/tr_TR/orders.lang
index 4faf8530d7f..78a781b1b9f 100644
--- a/htdocs/langs/tr_TR/orders.lang
+++ b/htdocs/langs/tr_TR/orders.lang
@@ -32,6 +32,7 @@ StatusOrderSent=Sevkiyat işlemde
 StatusOrderOnProcessShort=Sipariş edildi
 StatusOrderProcessedShort=İşlenmiş
 StatusOrderDelivered=Teslim edildi
+StatusOrderDeliveredShort=Teslim edildi
 StatusOrderToBillShort=Teslim edlidi
 StatusOrderToBill2Short=Faturalanacak
 StatusOrderApprovedShort=Onaylı
diff --git a/htdocs/langs/tr_TR/products.lang b/htdocs/langs/tr_TR/products.lang
index 23d2c9943cf..65327393645 100644
--- a/htdocs/langs/tr_TR/products.lang
+++ b/htdocs/langs/tr_TR/products.lang
@@ -45,10 +45,6 @@ LastProducts=Son ürünler
 CardProduct0=Ürün kartı
 CardProduct1=Hizmet kartı
 CardContract=Sözleşme kartı
-Warehouse=Depo
-Warehouses=Depolar
-WarehouseOpened=Depo açık
-WarehouseClosed=Depo kapalı
 Stock=Stok
 Stocks=Stoklar
 Movement=Hareket
@@ -295,11 +291,11 @@ ComposedProductIncDecStock=Ana değişimde stok Arttır/Eksilt
 ComposedProduct=Yan ürün
 MinSupplierPrice=En düşük tedarikçi fiyatı
 DynamicPriceConfiguration=Dinamik fiyat yapılandırması
-DynamicPriceDesc=On product card, with this module enabled, you should be able to set mathematic functions to calculate Customer or Supplier prices. Such function can use all mathematic operators, some constants and variables. You can set here the variables you want to be able and if the variable need an automatic update, the external URL to use to ask Dolibarr to update automaticaly the value.
-AddVariable=Add Variable
-AddUpdater=Add Updater
+DynamicPriceDesc=Ürün kartında bu modülü etkinleştirirseniz, Müşteri ve Tedarikçi fiyatlarını hesaplamak için matematik işlevlerini ayarlayabilirsiniz. Böyle bir işlev tüm matematik işlemlerini, bazı değişmezleri ve değişkenleri kullanabilir. Burada kullanabileceğiz değişkenleri ayarlayabilirsiniz ve eğer değişkenin otomatik güncellenmesi gerekirse dış URL Dolibarr'ın değeri otomatik güncellemesini istemek için kullanılabilir.
+AddVariable=Değişken ekle
+AddUpdater=Güncellemeci ekle
 GlobalVariables=Genel değişkenler
-VariableToUpdate=Variable to update
+VariableToUpdate=Güncellenecek değişken
 GlobalVariableUpdaters=Genel değişkenler güncelleyicisi
 GlobalVariableUpdaterType0=JSON verisi
 GlobalVariableUpdaterHelp0=Belirtilen URL'den JSON verilerini ayrıştırır, DEĞER ilgili değerin yerini belirtir,
@@ -317,4 +313,12 @@ DefaultPriceRealPriceMayDependOnCustomer=Varsayılan fiyat, gerçek fiyat müşt
 WarningSelectOneDocument=Lütfen enaz bir belge seçin
 DefaultUnitToShow=Birim
 NbOfQtyInProposals=Teklifteki Mik
-ClinkOnALinkOfColumn=Click on a link of column %s to get a detailed view...
+ClinkOnALinkOfColumn=Ayrıntılı görüntüsünü almak istediğiniz %s sütunundaki bağlantıya tıklayın...
+TranslatedLabel=Çevrilmiş etiket
+TranslatedDescription=Çevirilmiş açıklama
+TranslatedNote=çevirilmiş notlar
+ProductWeight=Weight for 1 product
+ProductVolume=Volume for 1 product
+WeightUnits=Ağırlık birimi
+VolumeUnits=Volume unit
+SizeUnits=Boyut birimi
diff --git a/htdocs/langs/tr_TR/projects.lang b/htdocs/langs/tr_TR/projects.lang
index a394c09f583..dbdfcadfce7 100644
--- a/htdocs/langs/tr_TR/projects.lang
+++ b/htdocs/langs/tr_TR/projects.lang
@@ -5,7 +5,7 @@ ProjectId=Proje Kimliği
 ProjectLabel=Proje etiketi
 Project=Proje
 Projects=Projeler
-ProjectsArea=Projects Area
+ProjectsArea=Projeler Alanı
 ProjectStatus=Proje durumu
 SharedProject=Herkes
 PrivateProject=Proje ilgilileri
@@ -20,7 +20,7 @@ TasksPublicDesc=Bu görünüm okuma izininiz olan tüm projeleri ve görevleri i
 TasksDesc=Bu görünüm tüm projeleri ve görevleri içerir (size verilen kullanıcı izinleri her şeyi görmenizi sağlar).
 AllTaskVisibleButEditIfYouAreAssigned=Böyle projeler için bütün görevler görünür, ancak; yalnızca size atanmış görevlere süre girebilirsiniz. Süre girmek istediğiniz görevi kendinize atayın.
 OnlyYourTaskAreVisible=Yalnızca atanmış olduğunuz görevler görünür. Süre girmek istediğiniz görevi kendinize atayın.
-ProjectsArea=Projects Area
+ProjectsArea=Projeler Alanı
 NewProject=Yeni proje
 AddProject=Proje oluştur
 DeleteAProject=Bir proje sil
@@ -68,12 +68,15 @@ Activities=Görevler/etkinlikler
 MyActivity=Etkinliğim
 MyActivities=Görevlerim/etkinliklerim
 MyProjects=Projelerim
-MyProjectsArea=My projects Area
+MyProjectsArea=Projelerim Alanı
 DurationEffective=Etken süre
 Progress=İlerleme
 ProgressDeclared=Bildirilen ilerleme
 ProgressCalculated=Hesaplanan ilerleme
 Time=Süre
+ListOfTasks=List of tasks
+GoToListOfTimeConsumed=Go to list of time consumed
+GoToListOfTasks=Go to list of tasks
 ListProposalsAssociatedProject=Proje ile ilgili tekliflerin listesi
 ListOrdersAssociatedProject=Proje ile ilgili müşteri siparişleri listesi
 ListInvoicesAssociatedProject=Proje ile ilgili müşteri faturaları listesi
@@ -185,9 +188,9 @@ TaskAssignedToEnterTime=Atanan görevler. Bu göreve süre girmek mümkün olmal
 IdTaskTime=Görev zamanı kimliği
 YouCanCompleteRef=Eğer referansı bazı bilgilerle tamamlamak isterseniz (arama süzgeçleri olarak kullanmak üzere), ayırmak için bir karakter eklemeniz önerilir, böylece otomatik numaralandırma sonraki projeler için de çalışacaktır. Örneğin; %s-ABC. Etikete arama anahtarları da eklemeyi yeğleyebilirsiniz.
 OpenedProjectsByThirdparties=Üçüncü partiye göre açık projeler
-OnlyOpportunitiesShort=Only opportunities
-OpenedOpportunitiesShort=Opened opportunities
-NotAnOpportunityShort=Not an opportunity
+OnlyOpportunitiesShort=Yalnızca fırsatlar
+OpenedOpportunitiesShort=Açık fırsatlar
+NotAnOpportunityShort=Bir fırsat değil
 OpportunityTotalAmount=Fırsatlar toplam tutarı
 OpportunityPonderatedAmount=Fırsatların ağırlık tutarı
 OpportunityPonderatedAmountDesc=Olasılıkla ölçülen fırsat tutarı
@@ -198,3 +201,4 @@ OppStatusNEGO=Pazarlık
 OppStatusPENDING=Beklemede
 OppStatusWIN=Kazanç
 OppStatusLOST=Kayıp
+Budget=Budget
diff --git a/htdocs/langs/tr_TR/receiptprinter.lang b/htdocs/langs/tr_TR/receiptprinter.lang
index bc2914029f5..cdc9628388f 100644
--- a/htdocs/langs/tr_TR/receiptprinter.lang
+++ b/htdocs/langs/tr_TR/receiptprinter.lang
@@ -1,10 +1,10 @@
 # Dolibarr language file - Source file is en_US - receiptprinter
-ReceiptPrinterSetup=Setup of module ReceiptPrinter
+ReceiptPrinterSetup=MakbuzYazıcısı modülü ayarları
 PrinterAdded=Yazıcı %s eklendi
 PrinterUpdated=Yazıcı %s güncellendi
 PrinterDeleted=Yazıcı %s silindi
 TestSentToPrinter=Deneme %s Yazıcısına Gönderildi
-ReceiptPrinter=Receipt printers
+ReceiptPrinter=Makbuz yazıcıları
 ReceiptPrinterDesc=Yazıcı ayarları
 ReceiptPrinterTemplateDesc=Şablon ayarları
 ReceiptPrinterTypeDesc=Fiş Yazıcısı türü açıklaması
diff --git a/htdocs/langs/tr_TR/sendings.lang b/htdocs/langs/tr_TR/sendings.lang
index cb89b8834f1..3aea929cb4d 100644
--- a/htdocs/langs/tr_TR/sendings.lang
+++ b/htdocs/langs/tr_TR/sendings.lang
@@ -70,6 +70,8 @@ ProductQtyInSuppliersOrdersRunning=Açık tedarikçi siparişlerindeki ürün mi
 ProductQtyInShipmentAlreadySent=Gönderilmiş olan ve açık durumdaki müşteri siparişindeki miktar
 ProductQtyInSuppliersShipmentAlreadyRecevied=Açık tedarikçi siparişlerindeki halihazırda teslim alınmış ürün miktarı
 NoProductToShipFoundIntoStock=Bu <b>%s</b> deposunda sevk edilecek hiç mal bulunamadı. Stoğu düzeltin ya da bir başka depo seçmek için geri gidin.
+WeightVolShort=Weight/Vol.
+ValidateOrderFirstBeforeShipment=You must first validate the order before being able to make shipments.
 
 # Sending methods
 SendingMethodCATCH=Müşteri tarafından
diff --git a/htdocs/langs/tr_TR/stocks.lang b/htdocs/langs/tr_TR/stocks.lang
index aa5500eb822..375521c8b2f 100644
--- a/htdocs/langs/tr_TR/stocks.lang
+++ b/htdocs/langs/tr_TR/stocks.lang
@@ -34,8 +34,8 @@ LastMovements=Son hareketler
 Units=Birimler
 Unit=Birim
 StockCorrection=Stok düzelt
-StockTransfer=Transfer stock
-MassStockTransferShort=Mass stock transfer
+StockTransfer=Stok aktarma
+MassStockTransferShort=Toplu stok aktarma
 StockMovement=Stok hareketi
 StockMovements=Stok hareketleri
 LabelMovement=Taşıma etiketi
diff --git a/htdocs/langs/tr_TR/supplier_proposal.lang b/htdocs/langs/tr_TR/supplier_proposal.lang
index b2f85c1b8ac..4ac4b755298 100644
--- a/htdocs/langs/tr_TR/supplier_proposal.lang
+++ b/htdocs/langs/tr_TR/supplier_proposal.lang
@@ -7,7 +7,7 @@ CommRequest=Fiyat isteği
 CommRequests=Fiyat istekleri
 SearchRequest=İstek ara
 DraftRequests=Taslak istekler
-SupplierProposalsDraft=Draft supplier proposals
+SupplierProposalsDraft=Taslak tedarikçi teklifleri
 LastModifiedRequests=Değiştirilen son %s fiyat isteği
 RequestsOpened=Fiyat isteği aç
 SupplierProposalArea=Tedarikçi teklifleri alanı
@@ -58,3 +58,5 @@ DefaultModelSupplierProposalCreate=Varsayılan model oluşturma
 DefaultModelSupplierProposalToBill=Bir fiyat isteğini kapatma sırasında (kabul edilmiş) varsayılan şablon
 DefaultModelSupplierProposalClosed=Bir fiyat isteğini kapatma sırasında (reddedilmiş) varsayılan şablon 
 ListOfSupplierProposal=Tedarikçi teklif istekleri listesi
+SupplierProposalsToClose=Supplier proposals to close
+SupplierProposalsToProcess=Supplier proposals to process
diff --git a/htdocs/langs/tr_TR/users.lang b/htdocs/langs/tr_TR/users.lang
index 46e25015c8a..2ae73699d42 100644
--- a/htdocs/langs/tr_TR/users.lang
+++ b/htdocs/langs/tr_TR/users.lang
@@ -122,4 +122,4 @@ LoginUsingOpenID=Oturum açmak için OpenID kullan
 WeeklyHours=Haftalık saatler
 ColorUser=Kullanıcı rengi
 DisabledInMonoUserMode=Bakım modunda devre dışıdır
-UserAccountancyCode=User accountancy code
+UserAccountancyCode=Kullanıcı muhasebe kodu
diff --git a/htdocs/langs/uk_UA/admin.lang b/htdocs/langs/uk_UA/admin.lang
index 89150c3ce67..6534c5d00c5 100644
--- a/htdocs/langs/uk_UA/admin.lang
+++ b/htdocs/langs/uk_UA/admin.lang
@@ -282,6 +282,7 @@ ModuleSetup=Module setup
 ModulesSetup=Modules setup
 ModuleFamilyBase=System
 ModuleFamilyCrm=Customer Relation Management (CRM)
+ModuleFamilySrm=Supplier Relation Management (SRM)
 ModuleFamilyProducts=Products Management (PM)
 ModuleFamilyHr=Human Resource Management (HR)
 ModuleFamilyProjects=Projects/Collaborative work
@@ -587,6 +588,7 @@ Permission38=Export products
 Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
 Permission42=Create/modify projects (shared project and projects i'm contact for)
 Permission44=Delete projects (shared project and projects i'm contact for)
+Permission45=Export projects
 Permission61=Read interventions
 Permission62=Create/modify interventions
 Permission64=Delete interventions
@@ -640,6 +642,7 @@ Permission162=Create/modify contracts/subscriptions
 Permission163=Activate a service/subscription of a contract
 Permission164=Disable a service/subscription of a contract
 Permission165=Delete contracts/subscriptions
+Permission167=Export contracts
 Permission171=Read trips and expenses (yours and your subordinates)
 Permission172=Create/modify trips and expenses
 Permission173=Delete trips and expenses
@@ -788,6 +791,7 @@ Permission2403=Delete actions (events or tasks) linked to his account
 Permission2411=Read actions (events or tasks) of others
 Permission2412=Create/modify actions (events or tasks) of others
 Permission2413=Delete actions (events or tasks) of others
+Permission2414=Export actions/tasks of others
 Permission2501=Read/Download documents
 Permission2502=Download documents
 Permission2503=Submit or delete documents
@@ -1713,3 +1717,4 @@ ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s is available. Ve
 MultiPriceRuleDesc=When option "Several level of prices per product/service" is on, you can define different prices (one per price level) for each product. To save you time, you can enter here rule to have price for each level autocalculated according to price of first level, so you will have to enter only price for first level on each product. This page is here to save you time and can be usefull only if your prices for each leve are relative to first level. You can ignore this page in most cases.
 ModelModulesProduct=Templates for product documents
 ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
+SeeSubstitutionVars=See * note for list of possible substitution variables
diff --git a/htdocs/langs/uk_UA/bills.lang b/htdocs/langs/uk_UA/bills.lang
index 9448650e2ca..fbbe975f392 100644
--- a/htdocs/langs/uk_UA/bills.lang
+++ b/htdocs/langs/uk_UA/bills.lang
@@ -219,6 +219,7 @@ RemainderToBill=Залишок до виставляння
 SendBillByMail=Відправити рахунок-фактуру по email
 SendReminderBillByMail=Відправити нагадування по email
 RelatedCommercialProposals=Пов'язані комерційні пропозиції
+RelatedRecurringCustomerInvoices=Related recurring customer invoices
 MenuToValid=Для перевірки
 DateMaxPayment=Оплата до
 DateEcheance=Гранична дата оплати
@@ -319,7 +320,6 @@ toolTipFrequency=Examples:<br /><b>Set 7 / day</b>: give a new invoice every 7 d
 NextDateToExecution=Date for next invoice generation
 DateLastGeneration=Date of last generation
 MaxPeriodNumber=Max nb of invoice generation
-RestPeriodNumber=Rest period number
 NbOfGenerationDone=Nb of invoice generation already done
 InvoiceAutoValidate=Automatically validate invoice
 GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
@@ -471,3 +471,7 @@ PDFCrevetteSituationInvoiceLine=Situation N°%s : Inv. N°%s on %s
 TotalSituationInvoice=Total situation
 invoiceLineProgressError=Invoice line progress can't be egal or upper the next invoice line
 updatePriceNextInvoiceErrorUpdateline=Error : update price on invoice line : %s
+ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
+ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
+ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
+
diff --git a/htdocs/langs/uk_UA/boxes.lang b/htdocs/langs/uk_UA/boxes.lang
index 0a467938faf..6d77f8e4b23 100644
--- a/htdocs/langs/uk_UA/boxes.lang
+++ b/htdocs/langs/uk_UA/boxes.lang
@@ -60,8 +60,8 @@ BoxTitleLastContracts=Last %s contracts
 BoxTitleLastModifiedDonations=Last %s modified donations
 BoxTitleLastModifiedExpenses=Last %s modified expense reports
 BoxGlobalActivity=Global activity (invoices, proposals, orders)
-BoxGoodCustomers=Good Customers
-BoxTitleGoodCustomers=%s Good Customers
+BoxGoodCustomers=Good customers
+BoxTitleGoodCustomers=%s Good customers
 FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Last successfull refresh date: %s
 LastRefreshDate=Last refresh date
 NoRecordedBookmarks=No bookmarks defined.
diff --git a/htdocs/langs/uk_UA/companies.lang b/htdocs/langs/uk_UA/companies.lang
index 588867b1f2f..fe967d3252f 100644
--- a/htdocs/langs/uk_UA/companies.lang
+++ b/htdocs/langs/uk_UA/companies.lang
@@ -202,7 +202,7 @@ ProfId3IN=Prof Id 3 (SRVC TAX)
 ProfId4IN=Prof Id 4
 ProfId5IN=Prof Id 5
 ProfId6IN=-
-ProfId1LU=Id. prof. 1 (RCS)
+ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
 ProfId2LU=Id. prof. 2 (Business permit)
 ProfId3LU=-
 ProfId4LU=-
@@ -317,10 +317,12 @@ ShowContact=Show contact
 ContactsAllShort=All (No filter)
 ContactType=Contact type
 ContactForOrders=Order's contact
+ContactForOrdersOrShipments=Order's or shipment's contact
 ContactForProposals=Proposal's contact
 ContactForContracts=Contract's contact
 ContactForInvoices=Invoice's contact
 NoContactForAnyOrder=This contact is not a contact for any order
+NoContactForAnyOrderOrShipment=This contact is not a contact for any order or shipment
 NoContactForAnyProposal=This contact is not a contact for any commercial proposal
 NoContactForAnyContract=This contact is not a contact for any contract
 NoContactForAnyInvoice=This contact is not a contact for any invoice
@@ -438,3 +440,6 @@ MergeThirdparties=Merge third parties
 ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one ? All linked objects (invoices, orders, ...) will be moved to current third party so you will be able to delete the duplicate one.
 ThirdpartiesMergeSuccess=Thirdparties have been merged
 ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
+SaleRepresentativeLogin=Login of sale representative
+SaleRepresentativeFirstname=Firstname of sale representative
+SaleRepresentativeLastname=Lastname of sale representative
diff --git a/htdocs/langs/uk_UA/errors.lang b/htdocs/langs/uk_UA/errors.lang
index 718b3e8413f..fa7804ce355 100644
--- a/htdocs/langs/uk_UA/errors.lang
+++ b/htdocs/langs/uk_UA/errors.lang
@@ -172,6 +172,8 @@ ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
 ErrorOppStatusRequiredIfAmount=You set an estimated amount for this opportunity/lead. So you must also enter its status
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
 ErrorSavingChanges=An error has ocurred when saving the changes
+ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
+ErrorFileMustHaveFormat=File must have format %s
 
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
diff --git a/htdocs/langs/uk_UA/exports.lang b/htdocs/langs/uk_UA/exports.lang
index 03c87b28bcf..1a490ea647d 100644
--- a/htdocs/langs/uk_UA/exports.lang
+++ b/htdocs/langs/uk_UA/exports.lang
@@ -128,6 +128,10 @@ SpecialCode=Special code
 ExportStringFilter=%% allows replacing one or more characters in the text
 ExportDateFilter=YYYY, YYYYMM, YYYYMMDD : filters by one year/month/day<br>YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD : filters over a range of years/months/days<br> > YYYY, > YYYYMM, > YYYYMMDD : filters on all following years/months/days<br> < YYYY, < YYYYMM, < YYYYMMDD : filters on all previous years/months/days
 ExportNumericFilter='NNNNN' filters by one value<br>'NNNNN+NNNNN' filters over a range of values<br>'&gt;NNNNN' filters by lower values<br>'&gt;NNNNN' filters by higher values
+ImportFromLine=Import starting from line number
+EndAtLineNb=End at line number
+SetThisValueTo2ToExcludeFirstLine=For example, set this value to 3 to exclude the 2 first lines
+KeepEmptyToGoToEndOfFile=Keep this field empty to go up to the end of file
 ## filters
 SelectFilterFields=If you want to filter on some values, just input values here.
 FilterableFields=Filterable Fields
diff --git a/htdocs/langs/uk_UA/main.lang b/htdocs/langs/uk_UA/main.lang
index 39ae7d3c3a0..db14badad48 100644
--- a/htdocs/langs/uk_UA/main.lang
+++ b/htdocs/langs/uk_UA/main.lang
@@ -25,6 +25,7 @@ FormatDateHourTextShort=%b %d, %Y, %I:%M %p
 FormatDateHourText=%B %d, %Y, %I:%M %p
 DatabaseConnection=Підключеня до Бази Данних
 NoTemplateDefined=No template defined for this email type
+AvailableVariables=Available substitution variables
 NoTranslation=Немає перекладу
 NoRecordFound=Записів не знайдено
 NoError=Немає помилок
diff --git a/htdocs/langs/uk_UA/orders.lang b/htdocs/langs/uk_UA/orders.lang
index c0bfc3ccce3..33cd265b07f 100644
--- a/htdocs/langs/uk_UA/orders.lang
+++ b/htdocs/langs/uk_UA/orders.lang
@@ -32,6 +32,7 @@ StatusOrderSent=Shipment in process
 StatusOrderOnProcessShort=Ordered
 StatusOrderProcessedShort=Processed
 StatusOrderDelivered=Delivered
+StatusOrderDeliveredShort=Delivered
 StatusOrderToBillShort=Delivered
 StatusOrderToBill2Short=To bill
 StatusOrderApprovedShort=Approved
diff --git a/htdocs/langs/uk_UA/products.lang b/htdocs/langs/uk_UA/products.lang
index 5118e77c22b..27e8130e762 100644
--- a/htdocs/langs/uk_UA/products.lang
+++ b/htdocs/langs/uk_UA/products.lang
@@ -45,10 +45,6 @@ LastProducts=Last products
 CardProduct0=Product card
 CardProduct1=Service card
 CardContract=Contract card
-Warehouse=Warehouse
-Warehouses=Warehouses
-WarehouseOpened=Warehouse open
-WarehouseClosed=Warehouse closed
 Stock=Stock
 Stocks=Stocks
 Movement=Movement
@@ -318,3 +314,11 @@ WarningSelectOneDocument=Please select at least one document
 DefaultUnitToShow=Unit
 NbOfQtyInProposals=Qty in proposals
 ClinkOnALinkOfColumn=Click on a link of column %s to get a detailed view...
+TranslatedLabel=Translated label
+TranslatedDescription=Translated description
+TranslatedNote=Translated notes
+ProductWeight=Weight for 1 product
+ProductVolume=Volume for 1 product
+WeightUnits=Weight unit
+VolumeUnits=Volume unit
+SizeUnits=Size unit
diff --git a/htdocs/langs/uk_UA/projects.lang b/htdocs/langs/uk_UA/projects.lang
index 59f4ec5af51..b4a21befd80 100644
--- a/htdocs/langs/uk_UA/projects.lang
+++ b/htdocs/langs/uk_UA/projects.lang
@@ -74,6 +74,9 @@ Progress=Progress
 ProgressDeclared=Declared progress
 ProgressCalculated=Calculated progress
 Time=Time
+ListOfTasks=List of tasks
+GoToListOfTimeConsumed=Go to list of time consumed
+GoToListOfTasks=Go to list of tasks
 ListProposalsAssociatedProject=List of the commercial proposals associated with the project
 ListOrdersAssociatedProject=List of customer's orders associated with the project
 ListInvoicesAssociatedProject=List of customer's invoices associated with the project
@@ -198,3 +201,4 @@ OppStatusNEGO=Negociation
 OppStatusPENDING=Pending
 OppStatusWIN=Won
 OppStatusLOST=Lost
+Budget=Budget
diff --git a/htdocs/langs/uk_UA/sendings.lang b/htdocs/langs/uk_UA/sendings.lang
index fb7b9c08868..97f57e1d3c7 100644
--- a/htdocs/langs/uk_UA/sendings.lang
+++ b/htdocs/langs/uk_UA/sendings.lang
@@ -70,6 +70,8 @@ ProductQtyInSuppliersOrdersRunning=Product quantity into opened suppliers orders
 ProductQtyInShipmentAlreadySent=Product quantity from opened customer order already sent
 ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from opened supplier order already received
 NoProductToShipFoundIntoStock=No product to ship found into warehouse <b>%s</b>. Correct stock or go back to choose another warehouse.
+WeightVolShort=Weight/Vol.
+ValidateOrderFirstBeforeShipment=You must first validate the order before being able to make shipments.
 
 # Sending methods
 SendingMethodCATCH=Catch by customer
diff --git a/htdocs/langs/uk_UA/supplier_proposal.lang b/htdocs/langs/uk_UA/supplier_proposal.lang
index 1a1bdc4df16..e37ced1b38f 100644
--- a/htdocs/langs/uk_UA/supplier_proposal.lang
+++ b/htdocs/langs/uk_UA/supplier_proposal.lang
@@ -58,3 +58,5 @@ DefaultModelSupplierProposalCreate=Default model creation
 DefaultModelSupplierProposalToBill=Default template when closing a price request (accepted)
 DefaultModelSupplierProposalClosed=Default template when closing a price request (refused)
 ListOfSupplierProposal=List of supplier proposal requests
+SupplierProposalsToClose=Supplier proposals to close
+SupplierProposalsToProcess=Supplier proposals to process
diff --git a/htdocs/langs/uz_UZ/admin.lang b/htdocs/langs/uz_UZ/admin.lang
index deca56bf2c1..c83ce1dba12 100644
--- a/htdocs/langs/uz_UZ/admin.lang
+++ b/htdocs/langs/uz_UZ/admin.lang
@@ -282,6 +282,7 @@ ModuleSetup=Module setup
 ModulesSetup=Modules setup
 ModuleFamilyBase=System
 ModuleFamilyCrm=Customer Relation Management (CRM)
+ModuleFamilySrm=Supplier Relation Management (SRM)
 ModuleFamilyProducts=Products Management (PM)
 ModuleFamilyHr=Human Resource Management (HR)
 ModuleFamilyProjects=Projects/Collaborative work
@@ -587,6 +588,7 @@ Permission38=Export products
 Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
 Permission42=Create/modify projects (shared project and projects i'm contact for)
 Permission44=Delete projects (shared project and projects i'm contact for)
+Permission45=Export projects
 Permission61=Read interventions
 Permission62=Create/modify interventions
 Permission64=Delete interventions
@@ -640,6 +642,7 @@ Permission162=Create/modify contracts/subscriptions
 Permission163=Activate a service/subscription of a contract
 Permission164=Disable a service/subscription of a contract
 Permission165=Delete contracts/subscriptions
+Permission167=Export contracts
 Permission171=Read trips and expenses (yours and your subordinates)
 Permission172=Create/modify trips and expenses
 Permission173=Delete trips and expenses
@@ -788,6 +791,7 @@ Permission2403=Delete actions (events or tasks) linked to his account
 Permission2411=Read actions (events or tasks) of others
 Permission2412=Create/modify actions (events or tasks) of others
 Permission2413=Delete actions (events or tasks) of others
+Permission2414=Export actions/tasks of others
 Permission2501=Read/Download documents
 Permission2502=Download documents
 Permission2503=Submit or delete documents
@@ -1713,3 +1717,4 @@ ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s is available. Ve
 MultiPriceRuleDesc=When option "Several level of prices per product/service" is on, you can define different prices (one per price level) for each product. To save you time, you can enter here rule to have price for each level autocalculated according to price of first level, so you will have to enter only price for first level on each product. This page is here to save you time and can be usefull only if your prices for each leve are relative to first level. You can ignore this page in most cases.
 ModelModulesProduct=Templates for product documents
 ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
+SeeSubstitutionVars=See * note for list of possible substitution variables
diff --git a/htdocs/langs/uz_UZ/bills.lang b/htdocs/langs/uz_UZ/bills.lang
index e67ad0ade2d..790a146ee98 100644
--- a/htdocs/langs/uz_UZ/bills.lang
+++ b/htdocs/langs/uz_UZ/bills.lang
@@ -219,6 +219,7 @@ RemainderToBill=Remainder to bill
 SendBillByMail=Send invoice by email
 SendReminderBillByMail=Send reminder by email
 RelatedCommercialProposals=Related commercial proposals
+RelatedRecurringCustomerInvoices=Related recurring customer invoices
 MenuToValid=To valid
 DateMaxPayment=Payment due before
 DateEcheance=Due date limit
@@ -319,7 +320,6 @@ toolTipFrequency=Examples:<br /><b>Set 7 / day</b>: give a new invoice every 7 d
 NextDateToExecution=Date for next invoice generation
 DateLastGeneration=Date of last generation
 MaxPeriodNumber=Max nb of invoice generation
-RestPeriodNumber=Rest period number
 NbOfGenerationDone=Nb of invoice generation already done
 InvoiceAutoValidate=Automatically validate invoice
 GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
@@ -471,3 +471,7 @@ PDFCrevetteSituationInvoiceLine=Situation N°%s : Inv. N°%s on %s
 TotalSituationInvoice=Total situation
 invoiceLineProgressError=Invoice line progress can't be egal or upper the next invoice line
 updatePriceNextInvoiceErrorUpdateline=Error : update price on invoice line : %s
+ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
+ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
+ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
+
diff --git a/htdocs/langs/uz_UZ/boxes.lang b/htdocs/langs/uz_UZ/boxes.lang
index 57bfc174ec5..7619a335b61 100644
--- a/htdocs/langs/uz_UZ/boxes.lang
+++ b/htdocs/langs/uz_UZ/boxes.lang
@@ -60,8 +60,8 @@ BoxTitleLastContracts=Last %s contracts
 BoxTitleLastModifiedDonations=Last %s modified donations
 BoxTitleLastModifiedExpenses=Last %s modified expense reports
 BoxGlobalActivity=Global activity (invoices, proposals, orders)
-BoxGoodCustomers=Good Customers
-BoxTitleGoodCustomers=%s Good Customers
+BoxGoodCustomers=Good customers
+BoxTitleGoodCustomers=%s Good customers
 FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Last successfull refresh date: %s
 LastRefreshDate=Last refresh date
 NoRecordedBookmarks=No bookmarks defined.
diff --git a/htdocs/langs/uz_UZ/companies.lang b/htdocs/langs/uz_UZ/companies.lang
index 588867b1f2f..fe967d3252f 100644
--- a/htdocs/langs/uz_UZ/companies.lang
+++ b/htdocs/langs/uz_UZ/companies.lang
@@ -202,7 +202,7 @@ ProfId3IN=Prof Id 3 (SRVC TAX)
 ProfId4IN=Prof Id 4
 ProfId5IN=Prof Id 5
 ProfId6IN=-
-ProfId1LU=Id. prof. 1 (RCS)
+ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
 ProfId2LU=Id. prof. 2 (Business permit)
 ProfId3LU=-
 ProfId4LU=-
@@ -317,10 +317,12 @@ ShowContact=Show contact
 ContactsAllShort=All (No filter)
 ContactType=Contact type
 ContactForOrders=Order's contact
+ContactForOrdersOrShipments=Order's or shipment's contact
 ContactForProposals=Proposal's contact
 ContactForContracts=Contract's contact
 ContactForInvoices=Invoice's contact
 NoContactForAnyOrder=This contact is not a contact for any order
+NoContactForAnyOrderOrShipment=This contact is not a contact for any order or shipment
 NoContactForAnyProposal=This contact is not a contact for any commercial proposal
 NoContactForAnyContract=This contact is not a contact for any contract
 NoContactForAnyInvoice=This contact is not a contact for any invoice
@@ -438,3 +440,6 @@ MergeThirdparties=Merge third parties
 ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one ? All linked objects (invoices, orders, ...) will be moved to current third party so you will be able to delete the duplicate one.
 ThirdpartiesMergeSuccess=Thirdparties have been merged
 ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
+SaleRepresentativeLogin=Login of sale representative
+SaleRepresentativeFirstname=Firstname of sale representative
+SaleRepresentativeLastname=Lastname of sale representative
diff --git a/htdocs/langs/uz_UZ/errors.lang b/htdocs/langs/uz_UZ/errors.lang
index 718b3e8413f..fa7804ce355 100644
--- a/htdocs/langs/uz_UZ/errors.lang
+++ b/htdocs/langs/uz_UZ/errors.lang
@@ -172,6 +172,8 @@ ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
 ErrorOppStatusRequiredIfAmount=You set an estimated amount for this opportunity/lead. So you must also enter its status
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
 ErrorSavingChanges=An error has ocurred when saving the changes
+ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
+ErrorFileMustHaveFormat=File must have format %s
 
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
diff --git a/htdocs/langs/uz_UZ/exports.lang b/htdocs/langs/uz_UZ/exports.lang
index 03c87b28bcf..1a490ea647d 100644
--- a/htdocs/langs/uz_UZ/exports.lang
+++ b/htdocs/langs/uz_UZ/exports.lang
@@ -128,6 +128,10 @@ SpecialCode=Special code
 ExportStringFilter=%% allows replacing one or more characters in the text
 ExportDateFilter=YYYY, YYYYMM, YYYYMMDD : filters by one year/month/day<br>YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD : filters over a range of years/months/days<br> > YYYY, > YYYYMM, > YYYYMMDD : filters on all following years/months/days<br> < YYYY, < YYYYMM, < YYYYMMDD : filters on all previous years/months/days
 ExportNumericFilter='NNNNN' filters by one value<br>'NNNNN+NNNNN' filters over a range of values<br>'&gt;NNNNN' filters by lower values<br>'&gt;NNNNN' filters by higher values
+ImportFromLine=Import starting from line number
+EndAtLineNb=End at line number
+SetThisValueTo2ToExcludeFirstLine=For example, set this value to 3 to exclude the 2 first lines
+KeepEmptyToGoToEndOfFile=Keep this field empty to go up to the end of file
 ## filters
 SelectFilterFields=If you want to filter on some values, just input values here.
 FilterableFields=Filterable Fields
diff --git a/htdocs/langs/uz_UZ/main.lang b/htdocs/langs/uz_UZ/main.lang
index d951b0eacb1..bb5e30a7ca9 100644
--- a/htdocs/langs/uz_UZ/main.lang
+++ b/htdocs/langs/uz_UZ/main.lang
@@ -25,6 +25,7 @@ FormatDateHourTextShort=%d %b %Y %H:%M
 FormatDateHourText=%d %B %Y %H:%M
 DatabaseConnection=Database connection
 NoTemplateDefined=No template defined for this email type
+AvailableVariables=Available substitution variables
 NoTranslation=No translation
 NoRecordFound=No record found
 NoError=No error
diff --git a/htdocs/langs/uz_UZ/orders.lang b/htdocs/langs/uz_UZ/orders.lang
index c0bfc3ccce3..33cd265b07f 100644
--- a/htdocs/langs/uz_UZ/orders.lang
+++ b/htdocs/langs/uz_UZ/orders.lang
@@ -32,6 +32,7 @@ StatusOrderSent=Shipment in process
 StatusOrderOnProcessShort=Ordered
 StatusOrderProcessedShort=Processed
 StatusOrderDelivered=Delivered
+StatusOrderDeliveredShort=Delivered
 StatusOrderToBillShort=Delivered
 StatusOrderToBill2Short=To bill
 StatusOrderApprovedShort=Approved
diff --git a/htdocs/langs/uz_UZ/products.lang b/htdocs/langs/uz_UZ/products.lang
index 5118e77c22b..27e8130e762 100644
--- a/htdocs/langs/uz_UZ/products.lang
+++ b/htdocs/langs/uz_UZ/products.lang
@@ -45,10 +45,6 @@ LastProducts=Last products
 CardProduct0=Product card
 CardProduct1=Service card
 CardContract=Contract card
-Warehouse=Warehouse
-Warehouses=Warehouses
-WarehouseOpened=Warehouse open
-WarehouseClosed=Warehouse closed
 Stock=Stock
 Stocks=Stocks
 Movement=Movement
@@ -318,3 +314,11 @@ WarningSelectOneDocument=Please select at least one document
 DefaultUnitToShow=Unit
 NbOfQtyInProposals=Qty in proposals
 ClinkOnALinkOfColumn=Click on a link of column %s to get a detailed view...
+TranslatedLabel=Translated label
+TranslatedDescription=Translated description
+TranslatedNote=Translated notes
+ProductWeight=Weight for 1 product
+ProductVolume=Volume for 1 product
+WeightUnits=Weight unit
+VolumeUnits=Volume unit
+SizeUnits=Size unit
diff --git a/htdocs/langs/uz_UZ/projects.lang b/htdocs/langs/uz_UZ/projects.lang
index 59f4ec5af51..b4a21befd80 100644
--- a/htdocs/langs/uz_UZ/projects.lang
+++ b/htdocs/langs/uz_UZ/projects.lang
@@ -74,6 +74,9 @@ Progress=Progress
 ProgressDeclared=Declared progress
 ProgressCalculated=Calculated progress
 Time=Time
+ListOfTasks=List of tasks
+GoToListOfTimeConsumed=Go to list of time consumed
+GoToListOfTasks=Go to list of tasks
 ListProposalsAssociatedProject=List of the commercial proposals associated with the project
 ListOrdersAssociatedProject=List of customer's orders associated with the project
 ListInvoicesAssociatedProject=List of customer's invoices associated with the project
@@ -198,3 +201,4 @@ OppStatusNEGO=Negociation
 OppStatusPENDING=Pending
 OppStatusWIN=Won
 OppStatusLOST=Lost
+Budget=Budget
diff --git a/htdocs/langs/uz_UZ/sendings.lang b/htdocs/langs/uz_UZ/sendings.lang
index fb7b9c08868..97f57e1d3c7 100644
--- a/htdocs/langs/uz_UZ/sendings.lang
+++ b/htdocs/langs/uz_UZ/sendings.lang
@@ -70,6 +70,8 @@ ProductQtyInSuppliersOrdersRunning=Product quantity into opened suppliers orders
 ProductQtyInShipmentAlreadySent=Product quantity from opened customer order already sent
 ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from opened supplier order already received
 NoProductToShipFoundIntoStock=No product to ship found into warehouse <b>%s</b>. Correct stock or go back to choose another warehouse.
+WeightVolShort=Weight/Vol.
+ValidateOrderFirstBeforeShipment=You must first validate the order before being able to make shipments.
 
 # Sending methods
 SendingMethodCATCH=Catch by customer
diff --git a/htdocs/langs/vi_VN/admin.lang b/htdocs/langs/vi_VN/admin.lang
index d9ecfa61d98..3e10819e180 100644
--- a/htdocs/langs/vi_VN/admin.lang
+++ b/htdocs/langs/vi_VN/admin.lang
@@ -282,6 +282,7 @@ ModuleSetup=Cài đặt module
 ModulesSetup=Cài đặt module
 ModuleFamilyBase=Hệ thống
 ModuleFamilyCrm=Quản lý quan hệ khách hàng (CRM)
+ModuleFamilySrm=Supplier Relation Management (SRM)
 ModuleFamilyProducts=Products Management (PM)
 ModuleFamilyHr=Human Resource Management (HR)
 ModuleFamilyProjects=Các dự án/Việc cộng tác
@@ -587,6 +588,7 @@ Permission38=Xuất dữ liệu sản phẩm
 Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
 Permission42=Tạo/chỉnh sửa dự án (dự án chung và các dự án tôi liên lạc)
 Permission44=Xóa dự án (dự án chia sẻ và các dự án tôi liên lạc)
+Permission45=Export projects
 Permission61=Xem intervention
 Permission62=Tạo/chỉnh sửa intervention
 Permission64=Xóa intervention
@@ -640,6 +642,7 @@ Permission162=Tạo/chỉnh sửa hợp đồng/thuê bao
 Permission163=Kích hoạt dịch vụ/thuê bao của hợp đồng
 Permission164=Vô hiệu dịch vụ/thuê bao của hợp đồng
 Permission165=Xóa hợp đồng/thuê bao
+Permission167=Export contracts
 Permission171=Read trips and expenses (yours and your subordinates)
 Permission172=Tạo/chỉnh sửa công tác phí
 Permission173=Xóa công tác phí
@@ -788,6 +791,7 @@ Permission2403=Xóa hành động (sự kiện hay tác vụ) liên quan đến
 Permission2411=Xem hành động (sự kiện hay tác vụ) của người khác
 Permission2412=Tạo/chỉnh sửa hành động (sự kiện hay tác vụ) của người khác
 Permission2413=Xóa hành động (sự kiện hay tác vụ) của người khác
+Permission2414=Export actions/tasks of others
 Permission2501=Xem/Tải về tài liệu
 Permission2502=Tải về tài liệu
 Permission2503=Gửi hoặc xóa tài liệu
@@ -1713,3 +1717,4 @@ ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s is available. Ve
 MultiPriceRuleDesc=When option "Several level of prices per product/service" is on, you can define different prices (one per price level) for each product. To save you time, you can enter here rule to have price for each level autocalculated according to price of first level, so you will have to enter only price for first level on each product. This page is here to save you time and can be usefull only if your prices for each leve are relative to first level. You can ignore this page in most cases.
 ModelModulesProduct=Templates for product documents
 ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
+SeeSubstitutionVars=See * note for list of possible substitution variables
diff --git a/htdocs/langs/vi_VN/bills.lang b/htdocs/langs/vi_VN/bills.lang
index 325496e2b65..2fa076af8a1 100644
--- a/htdocs/langs/vi_VN/bills.lang
+++ b/htdocs/langs/vi_VN/bills.lang
@@ -219,6 +219,7 @@ RemainderToBill=Nhắc nhở ra hóa đơn
 SendBillByMail=Gửi hóa đơn qua email
 SendReminderBillByMail=Gửi nhắc nhở bằng email
 RelatedCommercialProposals=Đơn hàng đề xuất liên quan
+RelatedRecurringCustomerInvoices=Related recurring customer invoices
 MenuToValid=Để xác nhận
 DateMaxPayment=Thoánh toán trước hạn
 DateEcheance=Ngày đáo hạn
@@ -319,7 +320,6 @@ toolTipFrequency=Examples:<br /><b>Set 7 / day</b>: give a new invoice every 7 d
 NextDateToExecution=Date for next invoice generation
 DateLastGeneration=Date of last generation
 MaxPeriodNumber=Max nb of invoice generation
-RestPeriodNumber=Rest period number
 NbOfGenerationDone=Nb of invoice generation already done
 InvoiceAutoValidate=Automatically validate invoice
 GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
@@ -471,3 +471,7 @@ PDFCrevetteSituationInvoiceLine=Situation N°%s : Inv. N°%s on %s
 TotalSituationInvoice=Total situation
 invoiceLineProgressError=Invoice line progress can't be egal or upper the next invoice line
 updatePriceNextInvoiceErrorUpdateline=Error : update price on invoice line : %s
+ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
+ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
+ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
+
diff --git a/htdocs/langs/vi_VN/boxes.lang b/htdocs/langs/vi_VN/boxes.lang
index 93eab95a4b1..822da88e37e 100644
--- a/htdocs/langs/vi_VN/boxes.lang
+++ b/htdocs/langs/vi_VN/boxes.lang
@@ -60,8 +60,8 @@ BoxTitleLastContracts=Hợp đồng cuối %s
 BoxTitleLastModifiedDonations=Cuối %s đóng góp sửa đổi
 BoxTitleLastModifiedExpenses=Last %s modified expense reports
 BoxGlobalActivity=Hoạt động toàn cầu (hoá đơn, đề xuất, đơn đặt hàng)
-BoxGoodCustomers=Good Customers
-BoxTitleGoodCustomers=%s Good Customers
+BoxGoodCustomers=Good customers
+BoxTitleGoodCustomers=%s Good customers
 FailedToRefreshDataInfoNotUpToDate=Không thể làm mới RSS thông. Cuối ngày làm mới thành công: %s
 LastRefreshDate=Cuối ngày làm mới
 NoRecordedBookmarks=Không có dấu xác định.
diff --git a/htdocs/langs/vi_VN/companies.lang b/htdocs/langs/vi_VN/companies.lang
index 7782e8a357f..bbf8ce98cbb 100644
--- a/htdocs/langs/vi_VN/companies.lang
+++ b/htdocs/langs/vi_VN/companies.lang
@@ -202,7 +202,7 @@ ProfId3IN=Prof Id 3 (SRVC TAX)
 ProfId4IN=Prof Id 4
 ProfId5IN=Prof Id 5
 ProfId6IN=-
-ProfId1LU=Id. prof. 1 (RCS)
+ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
 ProfId2LU=Id. prof. 2 (Business permit)
 ProfId3LU=-
 ProfId4LU=-
@@ -317,10 +317,12 @@ ShowContact=Hiện liên lạc
 ContactsAllShort=Tất cả (không lọc)
 ContactType=Loại liên lạc
 ContactForOrders=Liên lạc đơn hàng
+ContactForOrdersOrShipments=Order's or shipment's contact
 ContactForProposals=Liên lạc đơn hàng đề xuất
 ContactForContracts=Liên lạc hợp đồng
 ContactForInvoices=Liên lạc hóa đơn
 NoContactForAnyOrder=Liên lạc này không phải cho bất kỳ đơn hàng nào
+NoContactForAnyOrderOrShipment=This contact is not a contact for any order or shipment
 NoContactForAnyProposal=Liên lạc này không phải cho bất kỳ đơn hàng đề xuất nào
 NoContactForAnyContract=Liên lạc này không phải cho bất kỳ hợp đồng nào
 NoContactForAnyInvoice=Liên lạc này không phải cho bất kỳ hóa đơn nào
@@ -438,3 +440,6 @@ MergeThirdparties=Merge third parties
 ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one ? All linked objects (invoices, orders, ...) will be moved to current third party so you will be able to delete the duplicate one.
 ThirdpartiesMergeSuccess=Thirdparties have been merged
 ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
+SaleRepresentativeLogin=Login of sale representative
+SaleRepresentativeFirstname=Firstname of sale representative
+SaleRepresentativeLastname=Lastname of sale representative
diff --git a/htdocs/langs/vi_VN/errors.lang b/htdocs/langs/vi_VN/errors.lang
index 3f6a5e5ea86..e173ceea397 100644
--- a/htdocs/langs/vi_VN/errors.lang
+++ b/htdocs/langs/vi_VN/errors.lang
@@ -172,6 +172,8 @@ ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
 ErrorOppStatusRequiredIfAmount=You set an estimated amount for this opportunity/lead. So you must also enter its status
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
 ErrorSavingChanges=An error has ocurred when saving the changes
+ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
+ErrorFileMustHaveFormat=File must have format %s
 
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
diff --git a/htdocs/langs/vi_VN/exports.lang b/htdocs/langs/vi_VN/exports.lang
index f6118e99e5e..83bd78c16df 100644
--- a/htdocs/langs/vi_VN/exports.lang
+++ b/htdocs/langs/vi_VN/exports.lang
@@ -128,6 +128,10 @@ SpecialCode=Mã số đặc biệt
 ExportStringFilter=%% Cho phép thay thế một hay nhiều ký tự trong văn bản
 ExportDateFilter=YYYY, YYYYMM, YYYYMMDD: bộ lọc một năm / tháng / ngày <br> YYYY + YYYY, YYYYMM + YYYYMM, YYYYMMDD + YYYYMMDD: bộ lọc trên một loạt các năm / tháng / ngày <br> > YYYY,> YYYYMM,> YYYYMMDD: bộ lọc trên tất cả các năm / tháng / ngày sau <br> <YYYY, <YYYYMM, <YYYYMMDD: bộ lọc trên tất cả các năm / tháng / ngày trước
 ExportNumericFilter=Bộ lọc 'nnnnn' bởi một giá trị <br> Bộ lọc 'nnnnn + nnnnn "trên một loạt các giá trị <br> '> Nnnnn "bộ lọc các giá trị thấp <br> '> Nnnnn "bộ lọc các giá trị cao hơn
+ImportFromLine=Import starting from line number
+EndAtLineNb=End at line number
+SetThisValueTo2ToExcludeFirstLine=For example, set this value to 3 to exclude the 2 first lines
+KeepEmptyToGoToEndOfFile=Keep this field empty to go up to the end of file
 ## filters
 SelectFilterFields=Nếu bạn muốn lọc vào một số giá trị, giá trị chỉ vào đây.
 FilterableFields=Filterable Fields
diff --git a/htdocs/langs/vi_VN/main.lang b/htdocs/langs/vi_VN/main.lang
index 2a00c2ec45e..b06caf8ed9e 100644
--- a/htdocs/langs/vi_VN/main.lang
+++ b/htdocs/langs/vi_VN/main.lang
@@ -25,6 +25,7 @@ FormatDateHourTextShort=%b %d, %Y, %I:%M %p
 FormatDateHourText=%B %d, %Y, %I:%M %p
 DatabaseConnection=Kết nối cơ sở dữ liệu
 NoTemplateDefined=No template defined for this email type
+AvailableVariables=Available substitution variables
 NoTranslation=Không dịch
 NoRecordFound=Không tìm thấy bản ghi
 NoError=Không có lỗi
diff --git a/htdocs/langs/vi_VN/orders.lang b/htdocs/langs/vi_VN/orders.lang
index 467b8b885af..eef330c96d1 100644
--- a/htdocs/langs/vi_VN/orders.lang
+++ b/htdocs/langs/vi_VN/orders.lang
@@ -32,6 +32,7 @@ StatusOrderSent=Đang vận chuyển
 StatusOrderOnProcessShort=Đã đặt hàng
 StatusOrderProcessedShort=Đã xử lý
 StatusOrderDelivered=Delivered
+StatusOrderDeliveredShort=Delivered
 StatusOrderToBillShort=Đã giao hàng
 StatusOrderToBill2Short=Để thanh toán
 StatusOrderApprovedShort=Đã duyệt
diff --git a/htdocs/langs/vi_VN/products.lang b/htdocs/langs/vi_VN/products.lang
index e2598cad17e..875ac9c6220 100644
--- a/htdocs/langs/vi_VN/products.lang
+++ b/htdocs/langs/vi_VN/products.lang
@@ -45,10 +45,6 @@ LastProducts=Sản phẩm cuối
 CardProduct0=Thẻ Sản phẩm
 CardProduct1=Thẻ Dịch vụ
 CardContract=Thẻ Hợp đồng
-Warehouse=Kho hàng
-Warehouses=Các kho hàng
-WarehouseOpened=Warehouse open
-WarehouseClosed=Kho đã đóng
 Stock=Tồn kho
 Stocks=Tồn kho
 Movement=Chuyển kho
@@ -318,3 +314,11 @@ WarningSelectOneDocument=Please select at least one document
 DefaultUnitToShow=Unit
 NbOfQtyInProposals=Qty in proposals
 ClinkOnALinkOfColumn=Click on a link of column %s to get a detailed view...
+TranslatedLabel=Translated label
+TranslatedDescription=Translated description
+TranslatedNote=Translated notes
+ProductWeight=Weight for 1 product
+ProductVolume=Volume for 1 product
+WeightUnits=Weight unit
+VolumeUnits=Volume unit
+SizeUnits=Size unit
diff --git a/htdocs/langs/vi_VN/projects.lang b/htdocs/langs/vi_VN/projects.lang
index fb47419d372..174b4a88dc1 100644
--- a/htdocs/langs/vi_VN/projects.lang
+++ b/htdocs/langs/vi_VN/projects.lang
@@ -74,6 +74,9 @@ Progress=Tiến độ
 ProgressDeclared=Tiến độ công bố
 ProgressCalculated=Tiến độ được tính toán
 Time=Thời gian
+ListOfTasks=List of tasks
+GoToListOfTimeConsumed=Go to list of time consumed
+GoToListOfTasks=Go to list of tasks
 ListProposalsAssociatedProject=Danh sách các đơn hàng đề xuất được gắn với dự án
 ListOrdersAssociatedProject=Danh sách các đơn hàng khách hàng được gắn với dự án
 ListInvoicesAssociatedProject=Danh sách các hóa đơn khách hàng được gắn với dự án
@@ -198,3 +201,4 @@ OppStatusNEGO=Negociation
 OppStatusPENDING=Pending
 OppStatusWIN=Won
 OppStatusLOST=Lost
+Budget=Budget
diff --git a/htdocs/langs/vi_VN/sendings.lang b/htdocs/langs/vi_VN/sendings.lang
index a6a4c1fcec9..9e3f1589eca 100644
--- a/htdocs/langs/vi_VN/sendings.lang
+++ b/htdocs/langs/vi_VN/sendings.lang
@@ -70,6 +70,8 @@ ProductQtyInSuppliersOrdersRunning=Product quantity into opened suppliers orders
 ProductQtyInShipmentAlreadySent=Product quantity from opened customer order already sent
 ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from opened supplier order already received
 NoProductToShipFoundIntoStock=No product to ship found into warehouse <b>%s</b>. Correct stock or go back to choose another warehouse.
+WeightVolShort=Weight/Vol.
+ValidateOrderFirstBeforeShipment=You must first validate the order before being able to make shipments.
 
 # Sending methods
 SendingMethodCATCH=Catch của khách hàng
diff --git a/htdocs/langs/vi_VN/supplier_proposal.lang b/htdocs/langs/vi_VN/supplier_proposal.lang
index 1a1bdc4df16..e37ced1b38f 100644
--- a/htdocs/langs/vi_VN/supplier_proposal.lang
+++ b/htdocs/langs/vi_VN/supplier_proposal.lang
@@ -58,3 +58,5 @@ DefaultModelSupplierProposalCreate=Default model creation
 DefaultModelSupplierProposalToBill=Default template when closing a price request (accepted)
 DefaultModelSupplierProposalClosed=Default template when closing a price request (refused)
 ListOfSupplierProposal=List of supplier proposal requests
+SupplierProposalsToClose=Supplier proposals to close
+SupplierProposalsToProcess=Supplier proposals to process
diff --git a/htdocs/langs/zh_CN/admin.lang b/htdocs/langs/zh_CN/admin.lang
index 37dd21abeca..20857fbb107 100644
--- a/htdocs/langs/zh_CN/admin.lang
+++ b/htdocs/langs/zh_CN/admin.lang
@@ -282,6 +282,7 @@ ModuleSetup=模块设置
 ModulesSetup=模块设置
 ModuleFamilyBase=系统
 ModuleFamilyCrm=客户关系管理(CRM)
+ModuleFamilySrm=Supplier Relation Management (SRM)
 ModuleFamilyProducts=产品管理
 ModuleFamilyHr=人事管理
 ModuleFamilyProjects=项目/协同工作
@@ -587,6 +588,7 @@ Permission38=导出产品信息
 Permission41=读取项目和任务(共享的工程和我参与的项目)。还可输入项目所消耗的时间(时间表)
 Permission42=建立/修改项目(共享的项目和我参与的项目)
 Permission44=删除项目(共享的项目和我参与的项目)
+Permission45=Export projects
 Permission61=读取干预
 Permission62=建立/修改干预
 Permission64=删除干预
@@ -640,6 +642,7 @@ Permission162=创建/修改合同/订阅
 Permission163=启用合同中的服务/产品
 Permission164=禁用合同中的服务/产品
 Permission165=删除合同/订阅
+Permission167=Export contracts
 Permission171=Read trips and expenses (yours and your subordinates)
 Permission172=创建/修改行程及开支
 Permission173=删除行程及开支
@@ -788,6 +791,7 @@ Permission2403=删除关联至此用户账户的动作(事件或任务)
 Permission2411=读取他人的动作(事件或任务)
 Permission2412=建立/修改他人的动作(事件或任务)
 Permission2413=删除他人的动作(事件或任务)
+Permission2414=Export actions/tasks of others
 Permission2501=读取/下载文档
 Permission2502=下载文档
 Permission2503=提交或删除的文档
@@ -1713,3 +1717,4 @@ ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s is available. Ve
 MultiPriceRuleDesc=When option "Several level of prices per product/service" is on, you can define different prices (one per price level) for each product. To save you time, you can enter here rule to have price for each level autocalculated according to price of first level, so you will have to enter only price for first level on each product. This page is here to save you time and can be usefull only if your prices for each leve are relative to first level. You can ignore this page in most cases.
 ModelModulesProduct=Templates for product documents
 ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
+SeeSubstitutionVars=See * note for list of possible substitution variables
diff --git a/htdocs/langs/zh_CN/bills.lang b/htdocs/langs/zh_CN/bills.lang
index d5c70c8e88a..30b12c6916e 100644
--- a/htdocs/langs/zh_CN/bills.lang
+++ b/htdocs/langs/zh_CN/bills.lang
@@ -219,6 +219,7 @@ RemainderToBill=其余部分法案
 SendBillByMail=通过电子邮件发送发票
 SendReminderBillByMail=通过电子邮件发送提醒
 RelatedCommercialProposals=有关的商业提案
+RelatedRecurringCustomerInvoices=Related recurring customer invoices
 MenuToValid=需要确认
 DateMaxPayment=付款日期
 DateEcheance=截止日期
@@ -319,7 +320,6 @@ toolTipFrequency=Examples:<br /><b>Set 7 / day</b>: give a new invoice every 7 d
 NextDateToExecution=Date for next invoice generation
 DateLastGeneration=Date of last generation
 MaxPeriodNumber=Max nb of invoice generation
-RestPeriodNumber=Rest period number
 NbOfGenerationDone=Nb of invoice generation already done
 InvoiceAutoValidate=Automatically validate invoice
 GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
@@ -471,3 +471,7 @@ PDFCrevetteSituationInvoiceLine=Situation N°%s : Inv. N°%s on %s
 TotalSituationInvoice=Total situation
 invoiceLineProgressError=Invoice line progress can't be egal or upper the next invoice line
 updatePriceNextInvoiceErrorUpdateline=Error : update price on invoice line : %s
+ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
+ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
+ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
+
diff --git a/htdocs/langs/zh_CN/boxes.lang b/htdocs/langs/zh_CN/boxes.lang
index 6db12270788..4d1976e170e 100644
--- a/htdocs/langs/zh_CN/boxes.lang
+++ b/htdocs/langs/zh_CN/boxes.lang
@@ -60,8 +60,8 @@ BoxTitleLastContracts=最近的 %s 个联系人
 BoxTitleLastModifiedDonations=最近更新的 %s 项捐赠
 BoxTitleLastModifiedExpenses=Last %s modified expense reports
 BoxGlobalActivity=全局活动(账单,报价,订单)
-BoxGoodCustomers=Good Customers
-BoxTitleGoodCustomers=%s Good Customers
+BoxGoodCustomers=Good customers
+BoxTitleGoodCustomers=%s Good customers
 FailedToRefreshDataInfoNotUpToDate=RSS 刷新失败上次成功更新日期: %s
 LastRefreshDate=上次更新日期
 NoRecordedBookmarks=未设置任何书签。
diff --git a/htdocs/langs/zh_CN/companies.lang b/htdocs/langs/zh_CN/companies.lang
index 04fbec06e85..faf3c67ccec 100644
--- a/htdocs/langs/zh_CN/companies.lang
+++ b/htdocs/langs/zh_CN/companies.lang
@@ -202,7 +202,7 @@ ProfId3IN=教授ID已3
 ProfId4IN=ID四教授
 ProfId5IN=教授标识5
 ProfId6IN=-
-ProfId1LU=Id. prof. 1 (RCS)
+ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
 ProfId2LU=Id. prof. 2 (Business permit)
 ProfId3LU=-
 ProfId4LU=-
@@ -317,10 +317,12 @@ ShowContact=显示联系人
 ContactsAllShort=全部（不过滤）
 ContactType=联系人类型
 ContactForOrders=订单的联系人
+ContactForOrdersOrShipments=Order's or shipment's contact
 ContactForProposals=提案的联系人
 ContactForContracts=合同的联系人
 ContactForInvoices=发票的联系人
 NoContactForAnyOrder=不是任何订单的联系人
+NoContactForAnyOrderOrShipment=This contact is not a contact for any order or shipment
 NoContactForAnyProposal=不是任何提案的联系人
 NoContactForAnyContract=不是任何合同的联系人
 NoContactForAnyInvoice=不是任何发票的联系人
@@ -438,3 +440,6 @@ MergeThirdparties=Merge third parties
 ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one ? All linked objects (invoices, orders, ...) will be moved to current third party so you will be able to delete the duplicate one.
 ThirdpartiesMergeSuccess=Thirdparties have been merged
 ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
+SaleRepresentativeLogin=Login of sale representative
+SaleRepresentativeFirstname=Firstname of sale representative
+SaleRepresentativeLastname=Lastname of sale representative
diff --git a/htdocs/langs/zh_CN/errors.lang b/htdocs/langs/zh_CN/errors.lang
index 985078ee2cd..7cb651400c3 100644
--- a/htdocs/langs/zh_CN/errors.lang
+++ b/htdocs/langs/zh_CN/errors.lang
@@ -172,6 +172,8 @@ ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
 ErrorOppStatusRequiredIfAmount=You set an estimated amount for this opportunity/lead. So you must also enter its status
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
 ErrorSavingChanges=An error has ocurred when saving the changes
+ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
+ErrorFileMustHaveFormat=File must have format %s
 
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
diff --git a/htdocs/langs/zh_CN/exports.lang b/htdocs/langs/zh_CN/exports.lang
index 5832b1c9654..267eb3cf22a 100644
--- a/htdocs/langs/zh_CN/exports.lang
+++ b/htdocs/langs/zh_CN/exports.lang
@@ -128,6 +128,10 @@ SpecialCode=Special code
 ExportStringFilter=%% allows replacing one or more characters in the text
 ExportDateFilter=YYYY, YYYYMM, YYYYMMDD : filters by one year/month/day<br>YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD : filters over a range of years/months/days<br> > YYYY, > YYYYMM, > YYYYMMDD : filters on all following years/months/days<br> < YYYY, < YYYYMM, < YYYYMMDD : filters on all previous years/months/days
 ExportNumericFilter='NNNNN' filters by one value<br>'NNNNN+NNNNN' filters over a range of values<br>'&gt;NNNNN' filters by lower values<br>'&gt;NNNNN' filters by higher values
+ImportFromLine=Import starting from line number
+EndAtLineNb=End at line number
+SetThisValueTo2ToExcludeFirstLine=For example, set this value to 3 to exclude the 2 first lines
+KeepEmptyToGoToEndOfFile=Keep this field empty to go up to the end of file
 ## filters
 SelectFilterFields=如果你想过滤一些值，这里只是输入值。
 FilterableFields=Filterable Fields
diff --git a/htdocs/langs/zh_CN/loan.lang b/htdocs/langs/zh_CN/loan.lang
index 811d1c4c0df..44fea37dfa5 100644
--- a/htdocs/langs/zh_CN/loan.lang
+++ b/htdocs/langs/zh_CN/loan.lang
@@ -43,8 +43,8 @@ AmortizationMonthlyPaymentOverYears=月度付款的摊销：: <b>%s</b> 按 %s 
 Totalsforyear=年度合计
 MonthlyPayment=月度付款
 LoanCalcDesc= <b>抵押计算器</b> 可以用来计算房屋抵押贷款中月度付款的金额（需要知道房屋出售价格、贷款条件、买家定金比例、贷款利率）。<br> 
-GoToInterest=%s will go towards INTEREST
-GoToPrincipal=%s will go towards PRINCIPAL
+GoToInterest=%s 将指向利率
+GoToPrincipal=%s 将指向资本
 YouWillSpend=You will spend %s on your house in year %s
 # Admin
 ConfigLoan=Configuration of the module loan
diff --git a/htdocs/langs/zh_CN/main.lang b/htdocs/langs/zh_CN/main.lang
index 3fcb16c7535..64a520ff60e 100644
--- a/htdocs/langs/zh_CN/main.lang
+++ b/htdocs/langs/zh_CN/main.lang
@@ -25,6 +25,7 @@ FormatDateHourTextShort=%b %d, %Y, %I:%M %p
 FormatDateHourText=%B %d, %Y, %I:%M %p
 DatabaseConnection=数据库连接
 NoTemplateDefined=No template defined for this email type
+AvailableVariables=Available substitution variables
 NoTranslation=没有翻译
 NoRecordFound=没有找到记录
 NoError=没有错误
diff --git a/htdocs/langs/zh_CN/orders.lang b/htdocs/langs/zh_CN/orders.lang
index c4365eb3b7e..16f63b6f266 100644
--- a/htdocs/langs/zh_CN/orders.lang
+++ b/htdocs/langs/zh_CN/orders.lang
@@ -32,6 +32,7 @@ StatusOrderSent=船运处理中
 StatusOrderOnProcessShort=Ordered
 StatusOrderProcessedShort=处理中
 StatusOrderDelivered=Delivered
+StatusOrderDeliveredShort=Delivered
 StatusOrderToBillShort=已递送
 StatusOrderToBill2Short=待付账
 StatusOrderApprovedShort=已核准
diff --git a/htdocs/langs/zh_CN/products.lang b/htdocs/langs/zh_CN/products.lang
index b5e060cd79f..c5bd25a9096 100644
--- a/htdocs/langs/zh_CN/products.lang
+++ b/htdocs/langs/zh_CN/products.lang
@@ -45,10 +45,6 @@ LastProducts=最近的产品
 CardProduct0=产品 信息卡
 CardProduct1=服务 信息卡
 CardContract=合同 信息卡
-Warehouse=仓库
-Warehouses=仓库
-WarehouseOpened=Warehouse open
-WarehouseClosed=仓库已关闭
 Stock=库存
 Stocks=仓库
 Movement=库间移动
@@ -318,3 +314,11 @@ WarningSelectOneDocument=Please select at least one document
 DefaultUnitToShow=Unit
 NbOfQtyInProposals=Qty in proposals
 ClinkOnALinkOfColumn=Click on a link of column %s to get a detailed view...
+TranslatedLabel=Translated label
+TranslatedDescription=Translated description
+TranslatedNote=Translated notes
+ProductWeight=Weight for 1 product
+ProductVolume=Volume for 1 product
+WeightUnits=Weight unit
+VolumeUnits=Volume unit
+SizeUnits=Size unit
diff --git a/htdocs/langs/zh_CN/projects.lang b/htdocs/langs/zh_CN/projects.lang
index 113639d225b..bbd8b5cf27d 100644
--- a/htdocs/langs/zh_CN/projects.lang
+++ b/htdocs/langs/zh_CN/projects.lang
@@ -74,6 +74,9 @@ Progress=进展
 ProgressDeclared=Declared progress
 ProgressCalculated=Calculated progress
 Time=时间
+ListOfTasks=List of tasks
+GoToListOfTimeConsumed=Go to list of time consumed
+GoToListOfTasks=Go to list of tasks
 ListProposalsAssociatedProject=名单与项目有关的商业建议
 ListOrdersAssociatedProject=名单与项目相关的客户的订单
 ListInvoicesAssociatedProject=名单与项目相关的客户的发票
@@ -198,3 +201,4 @@ OppStatusNEGO=Negociation
 OppStatusPENDING=Pending
 OppStatusWIN=Won
 OppStatusLOST=Lost
+Budget=Budget
diff --git a/htdocs/langs/zh_CN/sendings.lang b/htdocs/langs/zh_CN/sendings.lang
index 6efce9dba4a..6d045e14abe 100644
--- a/htdocs/langs/zh_CN/sendings.lang
+++ b/htdocs/langs/zh_CN/sendings.lang
@@ -70,6 +70,8 @@ ProductQtyInSuppliersOrdersRunning=Product quantity into opened suppliers orders
 ProductQtyInShipmentAlreadySent=Product quantity from opened customer order already sent
 ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from opened supplier order already received
 NoProductToShipFoundIntoStock=No product to ship found into warehouse <b>%s</b>. Correct stock or go back to choose another warehouse.
+WeightVolShort=Weight/Vol.
+ValidateOrderFirstBeforeShipment=You must first validate the order before being able to make shipments.
 
 # Sending methods
 SendingMethodCATCH=按客户捕捉
diff --git a/htdocs/langs/zh_CN/supplier_proposal.lang b/htdocs/langs/zh_CN/supplier_proposal.lang
index 700799ce245..a01b088ac82 100644
--- a/htdocs/langs/zh_CN/supplier_proposal.lang
+++ b/htdocs/langs/zh_CN/supplier_proposal.lang
@@ -58,3 +58,5 @@ DefaultModelSupplierProposalCreate=Default model creation
 DefaultModelSupplierProposalToBill=Default template when closing a price request (accepted)
 DefaultModelSupplierProposalClosed=Default template when closing a price request (refused)
 ListOfSupplierProposal=List of supplier proposal requests
+SupplierProposalsToClose=Supplier proposals to close
+SupplierProposalsToProcess=Supplier proposals to process
diff --git a/htdocs/langs/zh_TW/admin.lang b/htdocs/langs/zh_TW/admin.lang
index c9e4b927ec1..745ccb3efd1 100644
--- a/htdocs/langs/zh_TW/admin.lang
+++ b/htdocs/langs/zh_TW/admin.lang
@@ -282,6 +282,7 @@ ModuleSetup=模組設置
 ModulesSetup=模組設置
 ModuleFamilyBase=系統
 ModuleFamilyCrm=客戶關係管理（CRM）
+ModuleFamilySrm=Supplier Relation Management (SRM)
 ModuleFamilyProducts=Products Management (PM)
 ModuleFamilyHr=Human Resource Management (HR)
 ModuleFamilyProjects=項目/協同工作
@@ -587,6 +588,7 @@ Permission38=匯出產品資訊
 Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
 Permission42=建立/修改項目（共享的項目和項目我聯繫）
 Permission44=刪除項目（共享的項目和項目我聯繫）
+Permission45=Export projects
 Permission61=閲讀干預
 Permission62=建立/修改干預
 Permission64=刪除干預
@@ -640,6 +642,7 @@ Permission162=Create/modify contracts/subscriptions
 Permission163=Activate a service/subscription of a contract
 Permission164=Disable a service/subscription of a contract
 Permission165=Delete contracts/subscriptions
+Permission167=Export contracts
 Permission171=Read trips and expenses (yours and your subordinates)
 Permission172=Create/modify trips and expenses
 Permission173=Delete trips and expenses
@@ -788,6 +791,7 @@ Permission2403=（事件或任務）與他的帳戶刪除操作
 Permission2411=閲讀的行動（事件或任務）他人
 Permission2412=建立/修改行動（事件或任務）的人
 Permission2413=（事件或任務）刪除他人行動
+Permission2414=Export actions/tasks of others
 Permission2501=閲讀文件
 Permission2502=提交或刪除文件
 Permission2503=提交或刪除的文件
@@ -1713,3 +1717,4 @@ ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s is available. Ve
 MultiPriceRuleDesc=When option "Several level of prices per product/service" is on, you can define different prices (one per price level) for each product. To save you time, you can enter here rule to have price for each level autocalculated according to price of first level, so you will have to enter only price for first level on each product. This page is here to save you time and can be usefull only if your prices for each leve are relative to first level. You can ignore this page in most cases.
 ModelModulesProduct=Templates for product documents
 ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
+SeeSubstitutionVars=See * note for list of possible substitution variables
diff --git a/htdocs/langs/zh_TW/bills.lang b/htdocs/langs/zh_TW/bills.lang
index b1736c1f2f7..c169d456241 100644
--- a/htdocs/langs/zh_TW/bills.lang
+++ b/htdocs/langs/zh_TW/bills.lang
@@ -219,6 +219,7 @@ RemainderToBill=其余部分法案
 SendBillByMail=通過電子郵件發送發票
 SendReminderBillByMail=通過電子郵件發送提醒
 RelatedCommercialProposals=有關的商業建議
+RelatedRecurringCustomerInvoices=Related recurring customer invoices
 MenuToValid=為了有效
 DateMaxPayment=付款到期日
 DateEcheance=截止日期限制
@@ -319,7 +320,6 @@ toolTipFrequency=Examples:<br /><b>Set 7 / day</b>: give a new invoice every 7 d
 NextDateToExecution=Date for next invoice generation
 DateLastGeneration=Date of last generation
 MaxPeriodNumber=Max nb of invoice generation
-RestPeriodNumber=Rest period number
 NbOfGenerationDone=Nb of invoice generation already done
 InvoiceAutoValidate=Automatically validate invoice
 GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
@@ -471,3 +471,7 @@ PDFCrevetteSituationInvoiceLine=Situation N°%s : Inv. N°%s on %s
 TotalSituationInvoice=Total situation
 invoiceLineProgressError=Invoice line progress can't be egal or upper the next invoice line
 updatePriceNextInvoiceErrorUpdateline=Error : update price on invoice line : %s
+ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
+ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
+ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
+
diff --git a/htdocs/langs/zh_TW/boxes.lang b/htdocs/langs/zh_TW/boxes.lang
index 135b3fe6157..a05d6eba9ec 100644
--- a/htdocs/langs/zh_TW/boxes.lang
+++ b/htdocs/langs/zh_TW/boxes.lang
@@ -60,8 +60,8 @@ BoxTitleLastContracts=上次%的承
 BoxTitleLastModifiedDonations=最後更新的捐款清單
 BoxTitleLastModifiedExpenses=Last %s modified expense reports
 BoxGlobalActivity=Global activity (invoices, proposals, orders)
-BoxGoodCustomers=Good Customers
-BoxTitleGoodCustomers=%s Good Customers
+BoxGoodCustomers=Good customers
+BoxTitleGoodCustomers=%s Good customers
 FailedToRefreshDataInfoNotUpToDate=無法刷新的RSS流量。上次成功刷新日期：%s
 LastRefreshDate=最後更新日期
 NoRecordedBookmarks=沒有書簽定義。點擊<a href="%s">這裏</a>添加書簽。
diff --git a/htdocs/langs/zh_TW/companies.lang b/htdocs/langs/zh_TW/companies.lang
index a9d6adf3476..e48fd2cf1a2 100644
--- a/htdocs/langs/zh_TW/companies.lang
+++ b/htdocs/langs/zh_TW/companies.lang
@@ -202,7 +202,7 @@ ProfId3IN=教授ID已3
 ProfId4IN=ID四教授
 ProfId5IN=教授標識5
 ProfId6IN=-
-ProfId1LU=Id. prof. 1 (RCS)
+ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
 ProfId2LU=Id. prof. 2 (Business permit)
 ProfId3LU=-
 ProfId4LU=-
@@ -317,10 +317,12 @@ ShowContact=顯示聯絡
 ContactsAllShort=全部（不過濾）
 ContactType=聯絡型式
 ContactForOrders=訂單聯絡人
+ContactForOrdersOrShipments=Order's or shipment's contact
 ContactForProposals=提案聯絡人
 ContactForContracts=合約聯絡人
 ContactForInvoices=Invoice聯絡人
 NoContactForAnyOrder=這不是訂單聯絡人
+NoContactForAnyOrderOrShipment=This contact is not a contact for any order or shipment
 NoContactForAnyProposal=這不是提案聯絡人
 NoContactForAnyContract=這不是合同聯絡人
 NoContactForAnyInvoice=這不是 Invoice 聯絡人
@@ -438,3 +440,6 @@ MergeThirdparties=合併客戶/供應商
 ConfirmMergeThirdparties=確定要合併這個客戶/供應商到你所選擇的這間公司?所有相關的表單(發票,訂單...)將會一起轉移至你所選的這間公司，因此你將可以刪除掉重複建立的這個客戶/供應商資料.
 ThirdpartiesMergeSuccess=客戶/供應商將被合併
 ErrorThirdpartiesMerge=刪除客戶/供應商時發生錯誤.請檢查log紀錄. 變更將會回復.
+SaleRepresentativeLogin=Login of sale representative
+SaleRepresentativeFirstname=Firstname of sale representative
+SaleRepresentativeLastname=Lastname of sale representative
diff --git a/htdocs/langs/zh_TW/errors.lang b/htdocs/langs/zh_TW/errors.lang
index 57589ceb690..a8e5afd0fbe 100644
--- a/htdocs/langs/zh_TW/errors.lang
+++ b/htdocs/langs/zh_TW/errors.lang
@@ -172,6 +172,8 @@ ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
 ErrorOppStatusRequiredIfAmount=You set an estimated amount for this opportunity/lead. So you must also enter its status
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
 ErrorSavingChanges=An error has ocurred when saving the changes
+ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
+ErrorFileMustHaveFormat=File must have format %s
 
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
diff --git a/htdocs/langs/zh_TW/exports.lang b/htdocs/langs/zh_TW/exports.lang
index 4bf0426d28a..1e3b3e75ea3 100644
--- a/htdocs/langs/zh_TW/exports.lang
+++ b/htdocs/langs/zh_TW/exports.lang
@@ -128,6 +128,10 @@ SpecialCode=Special code
 ExportStringFilter=%% allows replacing one or more characters in the text
 ExportDateFilter=YYYY, YYYYMM, YYYYMMDD : filters by one year/month/day<br>YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD : filters over a range of years/months/days<br> > YYYY, > YYYYMM, > YYYYMMDD : filters on all following years/months/days<br> < YYYY, < YYYYMM, < YYYYMMDD : filters on all previous years/months/days
 ExportNumericFilter='NNNNN' filters by one value<br>'NNNNN+NNNNN' filters over a range of values<br>'&gt;NNNNN' filters by lower values<br>'&gt;NNNNN' filters by higher values
+ImportFromLine=Import starting from line number
+EndAtLineNb=End at line number
+SetThisValueTo2ToExcludeFirstLine=For example, set this value to 3 to exclude the 2 first lines
+KeepEmptyToGoToEndOfFile=Keep this field empty to go up to the end of file
 ## filters
 SelectFilterFields=If you want to filter on some values, just input values here.
 FilterableFields=Filterable Fields
diff --git a/htdocs/langs/zh_TW/main.lang b/htdocs/langs/zh_TW/main.lang
index af04a545443..34860eec423 100644
--- a/htdocs/langs/zh_TW/main.lang
+++ b/htdocs/langs/zh_TW/main.lang
@@ -25,6 +25,7 @@ FormatDateHourTextShort=%Y %b %d, %I:%M %p
 FormatDateHourText=%Y %B %d, , %I:%M %p
 DatabaseConnection=資料庫連接
 NoTemplateDefined=No template defined for this email type
+AvailableVariables=Available substitution variables
 NoTranslation=No translation
 NoRecordFound=No record found
 NoError=沒有發生錯誤
diff --git a/htdocs/langs/zh_TW/orders.lang b/htdocs/langs/zh_TW/orders.lang
index 2bead1f2dca..77da07f5c21 100644
--- a/htdocs/langs/zh_TW/orders.lang
+++ b/htdocs/langs/zh_TW/orders.lang
@@ -32,6 +32,7 @@ StatusOrderSent=Shipment in process
 StatusOrderOnProcessShort=Ordered
 StatusOrderProcessedShort=處理完畢
 StatusOrderDelivered=Delivered
+StatusOrderDeliveredShort=Delivered
 StatusOrderToBillShort=等待帳單
 StatusOrderToBill2Short=為了法案
 StatusOrderApprovedShort=核準
diff --git a/htdocs/langs/zh_TW/products.lang b/htdocs/langs/zh_TW/products.lang
index 32e6e29d69d..179dbd46558 100644
--- a/htdocs/langs/zh_TW/products.lang
+++ b/htdocs/langs/zh_TW/products.lang
@@ -45,10 +45,6 @@ LastProducts=最新產品
 CardProduct0=產品卡
 CardProduct1=服務卡
 CardContract=合同卡
-Warehouse=倉庫
-Warehouses=倉庫
-WarehouseOpened=Warehouse open
-WarehouseClosed=關閉倉庫
 Stock=庫存
 Stocks=庫存
 Movement=轉讓
@@ -318,3 +314,11 @@ WarningSelectOneDocument=Please select at least one document
 DefaultUnitToShow=Unit
 NbOfQtyInProposals=Qty in proposals
 ClinkOnALinkOfColumn=Click on a link of column %s to get a detailed view...
+TranslatedLabel=Translated label
+TranslatedDescription=Translated description
+TranslatedNote=Translated notes
+ProductWeight=Weight for 1 product
+ProductVolume=Volume for 1 product
+WeightUnits=Weight unit
+VolumeUnits=Volume unit
+SizeUnits=Size unit
diff --git a/htdocs/langs/zh_TW/projects.lang b/htdocs/langs/zh_TW/projects.lang
index fb2328ce869..2599ab48413 100644
--- a/htdocs/langs/zh_TW/projects.lang
+++ b/htdocs/langs/zh_TW/projects.lang
@@ -74,6 +74,9 @@ Progress=進展
 ProgressDeclared=Declared progress
 ProgressCalculated=Calculated progress
 Time=時間
+ListOfTasks=List of tasks
+GoToListOfTimeConsumed=Go to list of time consumed
+GoToListOfTasks=Go to list of tasks
 ListProposalsAssociatedProject=名單與項目有關的商業建議
 ListOrdersAssociatedProject=名單與項目相關的客戶的訂單
 ListInvoicesAssociatedProject=名單與項目相關的客戶的發票
@@ -198,3 +201,4 @@ OppStatusNEGO=Negociation
 OppStatusPENDING=Pending
 OppStatusWIN=Won
 OppStatusLOST=Lost
+Budget=Budget
diff --git a/htdocs/langs/zh_TW/sendings.lang b/htdocs/langs/zh_TW/sendings.lang
index 3001cb8c8f8..0ae316d4846 100644
--- a/htdocs/langs/zh_TW/sendings.lang
+++ b/htdocs/langs/zh_TW/sendings.lang
@@ -70,6 +70,8 @@ ProductQtyInSuppliersOrdersRunning=Product quantity into opened suppliers orders
 ProductQtyInShipmentAlreadySent=Product quantity from opened customer order already sent
 ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from opened supplier order already received
 NoProductToShipFoundIntoStock=No product to ship found into warehouse <b>%s</b>. Correct stock or go back to choose another warehouse.
+WeightVolShort=Weight/Vol.
+ValidateOrderFirstBeforeShipment=You must first validate the order before being able to make shipments.
 
 # Sending methods
 SendingMethodCATCH=按客戶捕捉
diff --git a/htdocs/langs/zh_TW/supplier_proposal.lang b/htdocs/langs/zh_TW/supplier_proposal.lang
index 1a1bdc4df16..e37ced1b38f 100644
--- a/htdocs/langs/zh_TW/supplier_proposal.lang
+++ b/htdocs/langs/zh_TW/supplier_proposal.lang
@@ -58,3 +58,5 @@ DefaultModelSupplierProposalCreate=Default model creation
 DefaultModelSupplierProposalToBill=Default template when closing a price request (accepted)
 DefaultModelSupplierProposalClosed=Default template when closing a price request (refused)
 ListOfSupplierProposal=List of supplier proposal requests
+SupplierProposalsToClose=Supplier proposals to close
+SupplierProposalsToProcess=Supplier proposals to process
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index c70b48aaf32..17611868829 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -325,6 +325,11 @@ if (! empty($_SESSION["disablemodules"]))
         {
         	if (empty($conf->$module)) $conf->$module=new stdClass();
         	$conf->$module->enabled=false;
+        	if ($module == 'fournisseur')		// Special case
+        	{
+        		$conf->supplier_order->enabled=0;
+        		$conf->supplier_invoice->enabled=0;
+        	}
         }
     }
 }
diff --git a/htdocs/opensurvey/fonctions.php b/htdocs/opensurvey/fonctions.php
index 5b11a821b7c..d194646140c 100644
--- a/htdocs/opensurvey/fonctions.php
+++ b/htdocs/opensurvey/fonctions.php
@@ -190,9 +190,9 @@ function dol_survey_random($car)
 {
 	$string = "";
 	$chaine = "abcdefghijklmnopqrstuvwxyz123456789";
-	srand((double) microtime()*1000000);
+	mt_srand((double) microtime()*1000000);
 	for($i=0; $i<$car; $i++) {
-		$string .= $chaine[rand()%strlen($chaine)];
+		$string .= $chaine[mt_rand() % strlen($chaine)];
 	}
 	return $string;
 }
diff --git a/htdocs/paypal/lib/paypal.lib.php b/htdocs/paypal/lib/paypal.lib.php
index f06624cb076..b51086b8e07 100644
--- a/htdocs/paypal/lib/paypal.lib.php
+++ b/htdocs/paypal/lib/paypal.lib.php
@@ -249,8 +249,8 @@ function getPaypalPaymentUrl($mode,$type,$ref='',$amount='9.99',$freetag='your_f
             else
             {
                 $out.='&securekey='.($mode?'<font color="#666666">':'');
-                if ($mode == 1) $out.="hash('".$conf->global->PAYPAL_SECURITY_TOKEN."' + 'order' + order_ref)";
-                if ($mode == 0) $out.= dol_hash($conf->global->PAYPAL_SECURITY_TOKEN . 'order' . $ref, 2);
+                if ($mode == 1) $out.="hash('".$conf->global->PAYPAL_SECURITY_TOKEN."' + '".$type."' + order_ref)";
+                if ($mode == 0) $out.= dol_hash($conf->global->PAYPAL_SECURITY_TOKEN . $type . $ref, 2);
                 $out.=($mode?'</font>':'');
             }
         }
@@ -267,8 +267,8 @@ function getPaypalPaymentUrl($mode,$type,$ref='',$amount='9.99',$freetag='your_f
             else
             {
                 $out.='&securekey='.($mode?'<font color="#666666">':'');
-                if ($mode == 1) $out.="hash('".$conf->global->PAYPAL_SECURITY_TOKEN."' + 'invoice' + invoice_ref)";
-                if ($mode == 0) $out.= dol_hash($conf->global->PAYPAL_SECURITY_TOKEN . 'invoice' . $ref, 2);
+                if ($mode == 1) $out.="hash('".$conf->global->PAYPAL_SECURITY_TOKEN."' + '".$type."' + invoice_ref)";
+                if ($mode == 0) $out.= dol_hash($conf->global->PAYPAL_SECURITY_TOKEN . $type . $ref, 2);
                 $out.=($mode?'</font>':'');
             }
         }
@@ -285,8 +285,8 @@ function getPaypalPaymentUrl($mode,$type,$ref='',$amount='9.99',$freetag='your_f
             else
             {
                 $out.='&securekey='.($mode?'<font color="#666666">':'');
-                if ($mode == 1) $out.="hash('".$conf->global->PAYPAL_SECURITY_TOKEN."' + 'contactline' + contractline_ref)";
-                if ($mode == 0) $out.= dol_hash($conf->global->PAYPAL_SECURITY_TOKEN . 'contractline' . $ref, 2);
+                if ($mode == 1) $out.="hash('".$conf->global->PAYPAL_SECURITY_TOKEN."' + '".$type."' + contractline_ref)";
+                if ($mode == 0) $out.= dol_hash($conf->global->PAYPAL_SECURITY_TOKEN . $type . $ref, 2);
                 $out.=($mode?'</font>':'');
             }
         }
@@ -303,8 +303,8 @@ function getPaypalPaymentUrl($mode,$type,$ref='',$amount='9.99',$freetag='your_f
             else
             {
                 $out.='&securekey='.($mode?'<font color="#666666">':'');
-                if ($mode == 1) $out.="hash('".$conf->global->PAYPAL_SECURITY_TOKEN."' + 'membersubscription' + member_ref)";
-                if ($mode == 0) $out.= dol_hash($conf->global->PAYPAL_SECURITY_TOKEN . 'membersubscription' . $ref, 2);
+                if ($mode == 1) $out.="hash('".$conf->global->PAYPAL_SECURITY_TOKEN."' + '".$type."' + member_ref)";
+                if ($mode == 0) $out.= dol_hash($conf->global->PAYPAL_SECURITY_TOKEN . $type . $ref, 2);
                 $out.=($mode?'</font>':'');
             }
         }
diff --git a/htdocs/product/admin/price_rules.php b/htdocs/product/admin/price_rules.php
index 64fa982fff1..e284572e7e7 100644
--- a/htdocs/product/admin/price_rules.php
+++ b/htdocs/product/admin/price_rules.php
@@ -52,10 +52,10 @@ if ($_POST) {
 			continue;
 		}
 
+		$i_var_percent = 0;
+
 		if ($i != 1) {
 			$i_var_percent = (float) price2num($var_percent[$i]);
-		} else {
-			$i_var_percent = 0;
 		}
 
 		$i_var_min_percent = (float) price2num($var_min_percent[$i]);
@@ -72,15 +72,15 @@ if ($_POST) {
 		if (!$check1 || !$check2) {
 
 			//If the level is between range but percent fields are empty, then we ensure it does not exist in DB
-			if ($check1 && !$check2) {
+			if ($check1) {
 				$db->query("DELETE FROM ".MAIN_DB_PREFIX."product_pricerules WHERE level = ".(int) $i);
 			}
 
 			continue;
 		}
 
-		$sql = "INSERT INTO ".MAIN_DB_PREFIX."product_pricerules
-		SET level = ".(int) $i.", fk_level = ".$db->escape($i_fk_level).", var_percent = ".$i_var_percent.", var_min_percent = ".$i_var_min_percent;
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX."product_pricerules (level, fk_level, var_percent, var_min_percent) VALUES (
+		".(int) $i.", ".$db->escape($i_fk_level).", ".$i_var_percent.", ".$i_var_min_percent.")";
 
 		if (!$db->query($sql)) {
 
@@ -166,7 +166,7 @@ $genPriceOptions = function($level) use ($price_options) {
 		<tr>
 			<td class="fieldrequired" style="text-align: center"><?php echo $langs->trans('SellingPrice') ?> 1</td>
 			<td></td>
-			<td style="text-align: center"><input type="text"  style="text-align: right" name="var_min_percent[1]" size="5" value="<?php echo isset($rules[1]) ? price($rules[1]->var_min_percent, 2) : '' ?>"> <?php echo $langs->trans('PercentDiscountOver', $langs->trans('SellingPrice').' 1') ?></td>
+			<td style="text-align: center"><input type="text"  style="text-align: right" name="var_min_percent[1]" size="5" value="<?php echo price(isset($rules[1]) ? $rules[1]->var_min_percent : 0, 2) ?>"> <?php echo $langs->trans('PercentDiscountOver', $langs->trans('SellingPrice').' 1') ?></td>
 		</tr>
 		<?php for ($i = 2; $i <= $conf->global->PRODUIT_MULTIPRICES_LIMIT; $i++): ?>
 			<tr>
@@ -179,11 +179,11 @@ $genPriceOptions = function($level) use ($price_options) {
 					?>
 					</td>
 				<td style="text-align: center">
-					<input type="text" style="text-align: right" name="var_percent[<?php echo $i ?>]" size="5" value="<?php echo isset($rules[$i]) ? price($rules[$i]->var_percent, 2) : '' ?>">
+					<input type="text" style="text-align: right" name="var_percent[<?php echo $i ?>]" size="5" value="<?php echo price(isset($rules[$i]) ? $rules[$i]->var_percent : 0, 2) ?>">
 					<?php echo $langs->trans('PercentVariationOver', Form::selectarray("fk_level[$i]", $genPriceOptions($i), (isset($rules[$i]) ? $rules[$i]->fk_level : null))) ?>
 				</td>
 				<td style="text-align: center">
-					<input type="text" style="text-align: right" name="var_min_percent[<?php echo $i ?>]" size="5" value="<?php echo isset($rules[$i]) ? price($rules[$i]->var_min_percent, 2) : '' ?>">
+					<input type="text" style="text-align: right" name="var_min_percent[<?php echo $i ?>]" size="5" value="<?php echo price(isset($rules[$i]) ? $rules[$i]->var_min_percent : 0, 2) ?>">
 					<?php echo $langs->trans('PercentDiscountOver', $langs->trans('SellingPrice').' '.$i) ?>
 				</td>
 			</tr>
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 2d1a4187963..f7ad9459cbc 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -4124,13 +4124,12 @@ class Product extends CommonObject
 		for ($i = 1; $i <= $conf->global->PRODUIT_MULTIPRICES_LIMIT; $i++) {
 
 			$price = $baseprice;
-			$price_min = 0;
+			$price_min = $baseprice;
 
-			if ($i > 1) {
-				//We have to make sure it does exist and it is > 0
-				if (isset($rules[$i]->var_percent) && $rules[$i]->var_percent) {
-					$price = $prices[$rules[$i]->fk_level] * (1 + ($rules[$i]->var_percent/100));
-				}
+			//We have to make sure it does exist and it is > 0
+			//First price level only allows changing min_price
+			if ($i > 1 && isset($rules[$i]->var_percent) && $rules[$i]->var_percent) {
+				$price = $prices[$rules[$i]->fk_level] * (1 + ($rules[$i]->var_percent/100));
 			}
 
 			$prices[$i] = $price;
diff --git a/htdocs/product/document.php b/htdocs/product/document.php
index 177c3bd2f81..7c3d3591341 100644
--- a/htdocs/product/document.php
+++ b/htdocs/product/document.php
@@ -187,13 +187,13 @@ if ($object->id)
 		$filearrayold=dol_dir_list($upload_dirold,"files",0,'','(\.meta|_preview\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
 		$filearray=array_merge($filearray, $filearrayold);
 	}
-	
+
 	$totalsize=0;
 	foreach($filearray as $key => $file)
 	{
 		$totalsize+=$file['size'];
 	}
-	
+
 
     dol_banner_tab($object, 'ref', '', ($user->societe_id?0:1), 'ref');
     
@@ -215,7 +215,6 @@ if ($object->id)
     $param = '&id=' . $object->id;
     include_once DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_post_headers.tpl.php';
 
-
     // Merge propal PDF document PDF files
     if (!empty($conf->global->PRODUIT_PDF_MERGE_PROPAL))
     {
@@ -230,10 +229,16 @@ if ($object->id)
 
     	$form = new Form($db);
 
+
     	$filearray = dol_dir_list($upload_dir, "files", 0, '', '\.meta$', 'name', SORT_ASC, 1);
 
+    	if (! empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO))    // For backward compatiblity, we scan also old dirs
+    	{
+    		$filearray = dol_dir_list($upload_dirold, "files", 0, '', '\.meta$', 'name', SORT_ASC, 1);
+    	}
+
     	// For each file build select list with PDF extention
-    	if (count($filearray) > 0) 
+    	if (count($filearray) > 0)
     	{
     		print '<br>';
     		// Actual file to merge is :
diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php
index 96020e81ada..f5fc8c8655c 100644
--- a/htdocs/product/fournisseurs.php
+++ b/htdocs/product/fournisseurs.php
@@ -229,6 +229,7 @@ if (empty($reshook))
 					{
 						//Check the expression validity by parsing it
                         $priceparser = new PriceParser($db);
+                        $object->fk_supplier_price_expression = $price_expression;
                         $price_result = $priceparser->parseProductSupplier($object);
 						if ($price_result < 0) { //Expression is not valid
 							$error++;
@@ -470,7 +471,7 @@ if ($id > 0 || $ref)
 							on_change();
 						}
 						function on_click() {
-							window.location = "'.DOL_URL_ROOT.'/product/dynamic_price/editor.php?id='.$id.'&tab=fournisseurs&eid=" + $("#eid").attr("value");
+							window.location = "'.DOL_URL_ROOT.'/product/dynamic_price/editor.php?id='.$id.'&tab=fournisseurs&eid=" + $("#eid").val();
 						}
 						function on_change() {
 							if ($("#eid").val() == 0) {
diff --git a/htdocs/product/index.php b/htdocs/product/index.php
index 2fa1ec06fb3..2f15b98b562 100644
--- a/htdocs/product/index.php
+++ b/htdocs/product/index.php
@@ -95,7 +95,7 @@ if (count($listofsearchfields))
 	{
 		if ($i == 0) print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
 		print '<tr '.$bc[false].'>';
-		print '<td class="nowrap"><label for="'.$key.'">'.$langs->trans($value["text"]).'</label>:</td><td><input type="text" class="flat" name="'.$key.'" id="'.$key.'" size="18"></td>';
+		print '<td class="nowrap"><label for="'.$key.'">'.$langs->trans($value["text"]).'</label>:</td><td><input type="text" class="flat inputsearch" name="'.$key.'" id="'.$key.'" size="18"></td>';
 		if ($i == 0) print '<td rowspan="'.count($listofsearchfields).'"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td>';
 		print '</tr>';
 		$i++;
diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index 168c844768e..857a6634bf6 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -194,7 +194,7 @@ if (empty($reshook))
 			$newlocaltax2_type = GETPOST('localtax2_type', 'array');
 
 			//Shall we generate prices using price rules?
-			$object->price_autogen = GETPOST('usePriceRules') == 'on' ? true : false;
+			$object->price_autogen = GETPOST('usePriceRules') == 'on';
 
 			for ($i = 1; $i <= $conf->global->PRODUIT_MULTIPRICES_LIMIT; $i ++) 
 			{
diff --git a/htdocs/projet/activity/index.php b/htdocs/projet/activity/index.php
index 91792e91f48..b9c8e455751 100644
--- a/htdocs/projet/activity/index.php
+++ b/htdocs/projet/activity/index.php
@@ -90,7 +90,7 @@ if (count($listofsearchfields))
 	{
 		if ($i == 0) print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
 		print '<tr '.$bc[false].'>';
-		print '<td class="nowrap"><label for="'.$key.'">'.$langs->trans($value["text"]).'</label>:</td><td><input type="text" class="flat" name="'.$key.'" id="'.$key.'" size="18"></td>';
+		print '<td class="nowrap"><label for="'.$key.'">'.$langs->trans($value["text"]).'</label>:</td><td><input type="text" class="flat inputsearch" name="'.$key.'" id="'.$key.'" size="18"></td>';
 		if ($i == 0) print '<td rowspan="'.count($listofsearchfields).'"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td>';
 		print '</tr>';
 		$i++;
diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index b9a0e8ab55a..90a4d70130d 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -955,7 +955,7 @@ class Project extends CommonObject
         $this->budget_amount = 10000;
 
         /*
-        $nbp = rand(1, 9);
+        $nbp = mt_rand(1, 9);
         $xnbp = 0;
         while ($xnbp < $nbp)
         {
diff --git a/htdocs/projet/index.php b/htdocs/projet/index.php
index 00de0dfc596..f3623bdd6a1 100644
--- a/htdocs/projet/index.php
+++ b/htdocs/projet/index.php
@@ -114,7 +114,7 @@ if (count($listofsearchfields))
 	{
 		if ($i == 0) print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
 		print '<tr '.$bc[false].'>';
-		print '<td class="nowrap"><label for="'.$key.'">'.$langs->trans($value["text"]).'</label>:</td><td><input type="text" class="flat" name="'.$key.'" id="'.$key.'" size="18"></td>';
+		print '<td class="nowrap"><label for="'.$key.'">'.$langs->trans($value["text"]).'</label>:</td><td><input type="text" class="flat inputsearch" name="'.$key.'" id="'.$key.'" size="18"></td>';
 		if ($i == 0) print '<td rowspan="'.count($listofsearchfields).'"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td>';
 		print '</tr>';
 		$i++;
diff --git a/htdocs/public/demo/dolibarr_screenshot2.png b/htdocs/public/demo/dolibarr_screenshot2.png
index 60573422016..adb7788e677 100644
Binary files a/htdocs/public/demo/dolibarr_screenshot2.png and b/htdocs/public/demo/dolibarr_screenshot2.png differ
diff --git a/htdocs/public/demo/dolibarr_screenshot6.png b/htdocs/public/demo/dolibarr_screenshot6.png
index 0b5bd9aef4d..f9ededd38fc 100644
Binary files a/htdocs/public/demo/dolibarr_screenshot6.png and b/htdocs/public/demo/dolibarr_screenshot6.png differ
diff --git a/htdocs/public/demo/dolibarr_screenshot8.png b/htdocs/public/demo/dolibarr_screenshot8.png
index 68752f336b6..eb520a9166f 100644
Binary files a/htdocs/public/demo/dolibarr_screenshot8.png and b/htdocs/public/demo/dolibarr_screenshot8.png differ
diff --git a/htdocs/public/demo/dolibarr_screenshot9.png b/htdocs/public/demo/dolibarr_screenshot9.png
index b0d24b7cf10..d6765506f74 100644
Binary files a/htdocs/public/demo/dolibarr_screenshot9.png and b/htdocs/public/demo/dolibarr_screenshot9.png differ
diff --git a/htdocs/public/demo/index.php b/htdocs/public/demo/index.php
index dee17b4955f..ad27d097005 100644
--- a/htdocs/public/demo/index.php
+++ b/htdocs/public/demo/index.php
@@ -63,34 +63,34 @@ if (empty($reshook))
 {
 	$demoprofiles=array(
 		array('default'=>'1', 'key'=>'profdemoservonly','label'=>'DemoCompanyServiceOnly',
-		'disablemodules'=>'adherent,barcode,cashdesk,categorie,don,expedition,externalsite,incoterm,mailmanspip,margin,prelevement,product,productbatch,stock',
+		'disablemodules'=>'adherent,barcode,cashdesk,don,expedition,externalsite,incoterm,mailmanspip,margin,prelevement,product,productbatch,stock',
 		'icon'=>DOL_URL_ROOT.'/public/demo/dolibarr_screenshot8.png'),
 		array('default'=>'-1','key'=>'profdemoshopwithdesk','label'=>'DemoCompanyShopWithCashDesk',
-		'disablemodules'=>'adherent,categorie,don,externalsite,ficheinter,incoterm,mailmanspip,prelevement,product,productbatch,stock',
+		'disablemodules'=>'adherent,don,externalsite,ficheinter,incoterm,mailmanspip,prelevement,product,productbatch,stock',
 		'icon'=>DOL_URL_ROOT.'/public/demo/dolibarr_screenshot2.png'),
 		array('default'=>'0', 'key'=>'profdemoprodstock','label'=>'DemoCompanyProductAndStocks',
-		'disablemodules'=>'adherent,contrat,categorie,don,externalsite,ficheinter,mailmanspip,prelevement,service',
+		'disablemodules'=>'adherent,contrat,don,externalsite,ficheinter,mailmanspip,prelevement,service',
 		'icon'=>DOL_URL_ROOT.'/public/demo/dolibarr_screenshot2.png'),
 		array('default'=>'0', 'key'=>'profdemoall','label'=>'DemoCompanyAll',
 		'disablemodules'=>'adherent,don,externalsite,mailmanspip',
 		'icon'=>DOL_URL_ROOT.'/public/demo/dolibarr_screenshot9.png'),
 		array('default'=>'-1', 'key'=>'profdemofun','label'=>'DemoFundation',
-		'disablemodules'=>'banque,barcode,cashdesk,commande,commercial,compta,comptabilite,contrat,expedition,externalsite,facture,ficheinter,fournisseur,incoterm,mailmanspip,margin,prelevement,product,productbatch,projet,propal,propale,service,societe,stock,tax',
+		'disablemodules'=>'banque,barcode,cashdesk,commande,commercial,compta,comptabilite,contrat,expedition,externalsite,ficheinter,incoterm,mailmanspip,margin,prelevement,product,productbatch,projet,propal,propale,service,societe,stock,tax',
 		'icon'=>DOL_URL_ROOT.'/public/demo/dolibarr_screenshot6.png'),
 		array('default'=>'0', 'key'=>'profdemofun2','label'=>'DemoFundation2',
-		'disablemodules'=>'barcode,cashdesk,commande,commercial,compta,comptabilite,contrat,expedition,externalsite,facture,ficheinter,fournisseur,mailmanspip,margin,prelevement,product,productbatch,projet,propal,propale,service,societe,stock,tax',
+		'disablemodules'=>'barcode,cashdesk,commande,commercial,compta,comptabilite,contrat,expedition,externalsite,ficheinter,incoterm,mailmanspip,margin,prelevement,product,productbatch,projet,propal,propale,service,societe,stock,tax',
 		'icon'=>DOL_URL_ROOT.'/public/demo/dolibarr_screenshot6.png')
 	);
 
 	// Visible
-	$alwayscheckedmodules=array('barcode','bookmark','externalrss','fckeditor','geoipmaxmind','gravatar','memcached','syslog','user','webservices');  // Technical module we always want
-	$alwaysuncheckedmodules=array('paybox','paypal','google','printing','resource','scanner','workflow');  // Module we never want
+	$alwayscheckedmodules=array('barcode','bookmark','categorie','externalrss','fckeditor','geoipmaxmind','gravatar','memcached','syslog','user','webservices');  // Technical module we always want
+	$alwaysuncheckedmodules=array('dynamicprices','loan','multicurrency','paybox','paypal','google','printing','resource','scanner','workflow');  // Module we never want
 	// Not visible
 	$alwayshiddencheckedmodules=array('accounting','barcode','bookmark','clicktodial','comptabilite','document','domain','externalrss','externalsite','fckeditor','geoipmaxmind','gravatar','label','ldap',
-									'mailmanspip','notification','syslog','user','webservices',
+									'mailmanspip','notification','oauth','syslog','user','webservices',
 	                                // Extended modules
 	                                'memcached','numberwords','zipautofillfr');
-	$alwayshiddenuncheckedmodules=array('ftp',
+	$alwayshiddenuncheckedmodules=array('ftp','webservicesclient','api','websites',
 	                                // Extended modules
 	                                'awstats','bittorrent','bootstrap','cabinetmed','cmcic','concatpdf','customfield','dolicloud','filemanager','lightbox','mantis','monitoring','moretemplates','multicompany','nltechno','numberingpack','openstreetmap',
 	                                'ovh','phenix','phpsysinfo','pibarcode','postnuke','selectbank','skincoloreditor','submiteverywhere','survey','thomsonphonebook','topten','tvacerfa','voyage','webcalendar','webmail');
@@ -251,6 +251,40 @@ box-shadow: 4px 4px 4px #EEE;
 background: -webkit-linear-gradient(bottom, rgb(255,255,255) 85%, rgb(255,255,255) 100%);
 
 }
+.csscolumns {
+    margin-top: 6px;
+    -webkit-column-count: 4; /* Chrome, Safari, Opera */
+    -moz-column-count: 4; /* Firefox */
+    column-count: 4;
+}
+@media only screen and (max-width: 840px)
+{
+	.csscolumns {
+		-webkit-column-count: 3; /* Chrome, Safari, Opera */
+	    -moz-column-count: 3; /* Firefox */
+	    column-count: 3;
+	}
+}
+@media only screen and (max-width: 640px)
+{
+	.csscolumns {
+		-webkit-column-count: 2; /* Chrome, Safari, Opera */
+	    -moz-column-count: 2; /* Firefox */
+	    column-count: 2;
+	}
+}
+<<<<<<< HEAD
+
+=======
+@media only screen and (max-width: 420px)
+{
+	.csscolumns {
+		-webkit-column-count: 1; /* Chrome, Safari, Opera */
+	    -moz-column-count: 1; /* Firefox */
+	    column-count: 1;
+	}
+}
+>>>>>>> refs/remotes/origin/3.9
 </style>
 
 <script type="text/javascript">
@@ -289,7 +323,7 @@ print '<tr><td>';
 print '<div class="center"><img src="'.DOL_URL_ROOT.'/theme/dolibarr_logo.png" alt="Dolibarr logo"></div><br>';
 print '<br>';
 
-print $langs->trans("DemoDesc").'<br>';
+print '<div style="text-align: justify;">'.$langs->trans("DemoDesc").'</div><br>';
 print '<br>';
 print '<font color="#555577"><b>'.$langs->trans("ChooseYourDemoProfil").'</b></font>';
 
@@ -331,7 +365,7 @@ foreach ($demoprofiles as $profilearray)
         print '<table summary="Dolibarr online demonstration for profile '.$profilearray['label'].'" style="font-size:14px;" width="100%" class="CTable CTableRow'.($i%2==0?'1':'0').'">'."\n";
 		// Title
         print '<tr>';
-		print '<td width="50" id="a1'.$profilearray['key'].'" class="'.(empty($profilearray['url'])?'modulelineshow cursorpointer':'nomodulelines').'"><a href="'.$urlwithmod.'" class="'.(empty($profilearray['url'])?'modulelineshow':'nomodulelines').'"><img src="'.$profilearray['icon'].'" width="48" border="0" alt="Demo '.$profilearray['label'].'"></a></td>';
+		print '<td width="132" id="a1'.$profilearray['key'].'" class="'.(empty($profilearray['url'])?'modulelineshow cursorpointer':'nomodulelines').'"><a href="'.$urlwithmod.'" class="'.(empty($profilearray['url'])?'modulelineshow':'nomodulelines').'"><img class="demothumb" src="'.$profilearray['icon'].'" width="128" border="0" alt="Demo '.$profilearray['label'].'"></a></td>';
 		print '<td id="a2'.$profilearray['key'].'" class="'.(empty($profilearray['url'])?'modulelineshow cursorpointer':'nomodulelines').'"><a href="'.$urlwithmod.'" class="'.(empty($profilearray['url'])?'modulelineshow':'nomodulelines').'">'.$langs->trans($profilearray['label']).'</a></td>';
 		print '</tr>'."\n";
         // Modules
@@ -340,7 +374,8 @@ foreach ($demoprofiles as $profilearray)
     		print '<tr id="tr1'.$profilearray['key'].'" class="moduleline">';
     		print '<td colspan="2">';
     		print $langs->trans("ThisIsListOfModules").'<br>';
-    		print '<table width="100%">';
+    		print '<div class="csscolumns">';
+    		//print '<table width="100%">';
     		$listofdisabledmodules=explode(',',$profilearray['disablemodules']);
     		$j=0;
     		$nbcolsmod=empty($conf->dol_optimize_smallscreen)?4:3;
@@ -362,22 +397,23 @@ foreach ($demoprofiles as $profilearray)
                 else
                 {
                     $modulo=($j % $nbcolsmod);
-        		    if ($modulo == 0) print '<tr>';
-                    print '<td><input type="checkbox" class="checkbox" name="'.$modulekeyname.'" value="1"';
+        		    //if ($modulo == 0) print '<tr>';
+                    //print '<td>';
+                    print '<!-- id='.$val->numero.' -->';
+                    print '<input type="checkbox" class="checkbox" name="'.$modulekeyname.'" value="1"';
                     if (in_array($modulekeyname,$alwaysuncheckedmodules)) print ' disabled';
                     if (! in_array($modulekeyname,$alwaysuncheckedmodules)  && (! in_array($modulekeyname,$listofdisabledmodules) || in_array($modulekeyname,$alwayscheckedmodules))) print ' checked';
-                    print '> '.$val->getName().' &nbsp;';
-                    print '<!-- id='.$val->numero.' -->';
-                    print '</td>';
-                    if ($modulo == ($nbcolsmod - 1)) print '</tr>';
+                    print '> '.$val->getName().'<br>';
+                    //print '</td>';
+                    //if ($modulo == ($nbcolsmod - 1)) print '</tr>';
                     $j++;
                 }
     		}
-    		print '</table>';
-    		print '</td>';
+    		//print '</table>';
+    		print '</div></td>';
     		print '</tr>'."\n";
 
-		    print '<tr id="tr2'.$profilearray['key'].'" class="moduleline"><td colspan="'.$nbcolsmod.'" align="center"><input type="submit" value=" &nbsp; &nbsp; '.$langs->trans("Start").' &nbsp; &nbsp; " class="button"></td></tr>';
+		    print '<tr id="tr2'.$profilearray['key'].'" class="moduleline"><td colspan="2" align="center"><input type="submit" value=" &nbsp; &nbsp; '.$langs->trans("Start").' &nbsp; &nbsp; " class="button"></td></tr>';
         }
 		print '</table>';
 		print '</form>'."\n";
diff --git a/htdocs/societe/class/companybankaccount.class.php b/htdocs/societe/class/companybankaccount.class.php
index 3924e8a9174..f71b04b7730 100644
--- a/htdocs/societe/class/companybankaccount.class.php
+++ b/htdocs/societe/class/companybankaccount.class.php
@@ -46,16 +46,14 @@ class CompanyBankAccount extends Account
 	 *
 	 *  @param      DoliDB		$db      Database handler
      */
-    function __construct($db)
+    public function __construct(DoliDB $db)
     {
         $this->db = $db;
 
         $this->socid = 0;
-        $this->clos = 0;
         $this->solde = 0;
         $this->error_number = 0;
         $this->default_rib = 0;
-        return 1;
     }
 
 
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index cb966901a44..13d6d7dcde8 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -4,7 +4,7 @@
  * Copyright (C) 2004       Eric Seigne             <eric.seigne@ryxeo.com>
  * Copyright (C) 2003       Brian Fraval            <brian@fraval.org>
  * Copyright (C) 2006       Andre Cianfarani        <acianfa@free.fr>
- * Copyright (C) 2005-2012  Regis Houssin           <regis.houssin@capnetworks.com>
+ * Copyright (C) 2005-2016  Regis Houssin           <regis.houssin@capnetworks.com>
  * Copyright (C) 2008       Patrick Raguin          <patrick.raguin@auguria.net>
  * Copyright (C) 2010-2014  Juanjo Menent           <jmenent@2byte.es>
  * Copyright (C) 2013       Florian Henry           <florian.henry@open-concept.pro>
@@ -867,7 +867,7 @@ class Societe extends CommonObject
             }
             $sql .= ", fk_user_modif = ".(! empty($user->id)?"'".$user->id."'":"null");
 			$sql .= ", fk_multicurrency = ".(int) $this->fk_multicurrency;
-			$sql .= ', multicurrency_code = "'.$this->db->escape($this->multicurrency_code).'"';
+			$sql .= ', multicurrency_code = \''.$this->db->escape($this->multicurrency_code)."'";
             $sql .= " WHERE rowid = '" . $id ."'";
 
 
@@ -1662,10 +1662,19 @@ class Societe extends CommonObject
 
         $reparray=array();
 
-        $sql = "SELECT u.rowid, u.lastname, u.firstname, u.email, u.statut, u.entity";
+        $sql = "SELECT DISTINCT u.rowid, u.lastname, u.firstname, u.email, u.statut, u.entity";
         $sql.= " FROM ".MAIN_DB_PREFIX."societe_commerciaux as sc, ".MAIN_DB_PREFIX."user as u";
-        $sql.= " WHERE u.rowid = sc.fk_user AND sc.fk_soc =".$this->id;
-        $sql.= " AND entity in (0, ".$conf->entity.")";
+        if (! empty($conf->multicompany->enabled) && ! empty($conf->multicompany->transverse_mode))
+        {
+        	$sql.= ", ".MAIN_DB_PREFIX."usergroup_user as ug";
+        	$sql.= " WHERE ((ug.fk_user = sc.fk_user";
+        	$sql.= " AND ug.entity = ".$conf->entity.")";
+        	$sql.= " OR u.admin = 1)";
+        }
+        else
+        	$sql.= " WHERE entity in (0, ".$conf->entity.")";
+
+        $sql.= " AND u.rowid = sc.fk_user AND sc.fk_soc =".$this->id;
 
         $resql = $this->db->query($sql);
         if ($resql)
diff --git a/htdocs/societe/commerciaux.php b/htdocs/societe/commerciaux.php
index 152f655835e..b87bad6099d 100644
--- a/htdocs/societe/commerciaux.php
+++ b/htdocs/societe/commerciaux.php
@@ -33,7 +33,7 @@ $langs->load("suppliers");
 $langs->load("banks");
 
 // Security check
-$socid = GETPOST("socid");
+$socid = GETPOST('socid', 'int');
 if ($user->societe_id) $socid=$user->societe_id;
 $result = restrictedArea($user, 'societe','','');
 
@@ -43,17 +43,14 @@ $hookmanager->initHooks(array('salesrepresentativescard','globalcard'));
  *	Actions
  */
 
-if($_GET["socid"] && $_GET["commid"])
+if (! empty($socid) && $_GET["commid"])
 {
 	$action = 'add';
 
 	if ($user->rights->societe->creer)
 	{
-
 		$object = new Societe($db);
-		$object->id = $_GET["socid"];
-		$object->fetch($_GET["socid"]);
-
+		$object->fetch($socid);
 
 		$parameters=array('id'=>$_GET["commid"]);
 		$reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
@@ -61,25 +58,24 @@ if($_GET["socid"] && $_GET["commid"])
 
 		if (empty($reshook)) $object->add_commercial($user, $_GET["commid"]);
 
-		header("Location: commerciaux.php?socid=".$object->id);
+		header("Location: ".$_SERVER["PHP_SELF"]."?socid=".$object->id);
 		exit;
 	}
 	else
 	{
-		header("Location: commerciaux.php?socid=".$_GET["socid"]);
+		header("Location: ".$_SERVER["PHP_SELF"]."?socid=".$socid);
 		exit;
 	}
 }
 
-if ($socid && $_GET["delcommid"])
+if (! empty($socid) && $_GET["delcommid"])
 {
 	$action = 'delete';
 
 	if ($user->rights->societe->creer)
 	{
 		$object = new Societe($db);
-		$object->id = $_GET["socid"];
-		$object->fetch($_GET["socid"]);
+		$object->fetch($socid);
 
 		$parameters=array('id'=>$_GET["delcommid"]);
 		$reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
@@ -92,7 +88,7 @@ if ($socid && $_GET["delcommid"])
 	}
 	else
 	{
-		header("Location: commerciaux.php?socid=".$_GET["socid"]);
+		header("Location: ".$_SERVER["PHP_SELF"]."?socid=".$socid);
 		exit;
 	}
 }
@@ -107,7 +103,7 @@ llxHeader('',$langs->trans("ThirdParty"),$help_url);
 
 $form = new Form($db);
 
-if ($socid)
+if (! empty($socid))
 {
 	$object = new Societe($db);
 	$result=$object->fetch($socid);
@@ -141,12 +137,26 @@ if ($socid)
 	print '<tr><td>'.$langs->trans("SalesRepresentatives").'</td>';
 	print '<td colspan="3">';
 
-	$sql = "SELECT u.rowid, u.login, u.fk_soc, u.lastname, u.firstname, u.statut, u.entity";
+	$sql = "SELECT DISTINCT u.rowid, u.login, u.fk_soc, u.lastname, u.firstname, u.statut, u.entity";
 	$sql .= " FROM ".MAIN_DB_PREFIX."user as u";
 	$sql .= " , ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+	if (! empty($conf->multicompany->enabled) && ! empty($conf->multicompany->transverse_mode))
+	{
+	    $sql.= ", ".MAIN_DB_PREFIX."usergroup_user as ug";
+	}
 	$sql .= " WHERE sc.fk_soc =".$object->id;
 	$sql .= " AND sc.fk_user = u.rowid";
+	if (! empty($conf->multicompany->enabled) && ! empty($conf->multicompany->transverse_mode))
+	{
+		$sql.= " AND ((ug.fk_user = sc.fk_user";
+		$sql.= " AND ug.entity = ".$conf->entity.")";
+		$sql.= " OR u.admin = 1)";
+	}
+	else
+		$sql.= " AND u.entity IN (0,".$conf->entity.")";
+
 	$sql .= " ORDER BY u.lastname ASC ";
+
 	dol_syslog('societe/commerciaux.php::list salesman sql = '.$sql,LOG_DEBUG);
 	$resql = $db->query($sql);
 	if ($resql)
@@ -183,7 +193,7 @@ if ($socid)
 			print '&nbsp;';
 			if ($user->rights->societe->creer)
 			{
-			    print '<a href="commerciaux.php?socid='.$_GET["socid"].'&amp;delcommid='.$obj->rowid.'">';
+			    print '<a href="'.$_SERVER["PHP_SELF"].'?socid='.$object->id.'&amp;delcommid='.$obj->rowid.'">';
 			    print img_delete();
 			    print '</a>';
 			}
@@ -217,9 +227,17 @@ if ($socid)
 		$langs->load("users");
 		$title=$langs->trans("ListOfUsers");
 
-		$sql = "SELECT u.rowid, u.lastname, u.firstname, u.login, u.statut";
+		$sql = "SELECT DISTINCT u.rowid, u.lastname, u.firstname, u.login, u.statut";
 		$sql.= " FROM ".MAIN_DB_PREFIX."user as u";
-		$sql.= " WHERE u.entity IN (0,".$conf->entity.")";
+		if (! empty($conf->multicompany->enabled) && ! empty($conf->multicompany->transverse_mode))
+		{
+			$sql.= ", ".MAIN_DB_PREFIX."usergroup_user as ug";
+			$sql.= " WHERE ((ug.fk_user = u.rowid";
+			$sql.= " AND ug.entity = ".$conf->entity.")";
+			$sql.= " OR u.admin = 1)";
+		}
+		else
+			$sql.= " WHERE u.entity IN (0,".$conf->entity.")";
 		if (! empty($conf->global->USER_HIDE_INACTIVE_IN_COMBOBOX)) $sql.= " AND u.statut<>0 ";
 		$sql.= " ORDER BY u.lastname ASC ";
 
@@ -251,10 +269,11 @@ if ($socid)
 				print img_object($langs->trans("ShowUser"),"user").' ';
 				print dolGetFirstLastname($obj->firstname, $obj->lastname)."\n";
 				print '</a>';
+
 				print '</td>';
 				print '<td>'.$obj->login.'</td>';
 				print '<td>'.User::LibStatut($obj->statut,0).'</td>';
-				print '<td><a href="commerciaux.php?socid='.$_GET["socid"].'&amp;commid='.$obj->rowid.'">'.$langs->trans("Add").'</a></td>';
+				print '<td><a href="'.$_SERVER["PHP_SELF"].'?socid='.$object->id.'&amp;commid='.$obj->rowid.'">'.$langs->trans("Add").'</a></td>';
 
 				print '</tr>'."\n";
 				$i++;
diff --git a/htdocs/societe/consumption.php b/htdocs/societe/consumption.php
index 2ac6d3cbd7d..4228ba0319b 100644
--- a/htdocs/societe/consumption.php
+++ b/htdocs/societe/consumption.php
@@ -42,16 +42,16 @@ $object = new Societe($db);
 if ($socid > 0) $object->fetch($socid);
 
 // Sort & Order fields
+$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) {
-    $page = 0;
-}
-$offset = $conf->liste_limit * $page;
+if ($page == -1) { $page = 0; }
+$offset = $limit * $page;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
 if (! $sortorder) $sortorder='DESC';
 if (! $sortfield) $sortfield='dateprint';
-$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
 
 // Search fields
 $sref=GETPOST("sref");
@@ -124,7 +124,7 @@ print '<div class="underbanner clearboth"></div>';
 print '<table class="border" width="100%">';
 
 // Alias names (commercial, trademark or alias names)
-print '<tr id="name_alias"><td class="titlefield" width="25%"><label for="name_alias_input">'.$langs->trans('AliasNames').'</label></td>';
+print '<tr id="name_alias"><td class="titlefield"><label for="name_alias_input">'.$langs->trans('AliasNames').'</label></td>';
 print '<td colspan="3">'.$object->name_alias.'</td></tr>';
 
 if (! empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
@@ -305,9 +305,19 @@ if ($month > 0) {
 	$end = dol_time_plus_duree($start,1,'y') - 1;
 	$sql.= " AND ".$dateprint." BETWEEN '".$db->idate($start)."' AND '".$db->idate($end)."'";
 }
-if ($sref) $sql.= " AND ".$doc_number." LIKE '%".$sref."%'";
-if ($sprod_fulldescr) $sql.= " AND (d.description LIKE '%".$sprod_fulldescr."%' OR p.label LIKE '%".$sprod_fulldescr."%')";
+if ($sref) $sql.= " AND ".$doc_number." LIKE '%".$db->escape($sref)."%'";
+if ($sprod_fulldescr) 
+{
+    $sql.= " AND (d.description LIKE '%".$db->escape($sprod_fulldescr)."%'";
+    if (GETPOST('type_element') != 'fichinter') $sql.= " OR p.ref LIKE '%".$db->escape($sprod_fulldescr)."%'";
+    if (GETPOST('type_element') != 'fichinter') $sql.= " OR p.label LIKE '%".$db->escape($sprod_fulldescr)."%'";
+    $sql.=")";
+}
 $sql.= $db->order($sortfield,$sortorder);
+
+$resql=$db->query($sql);
+$totalnboflines = $db->num_rows($resql);
+
 $sql.= $db->plimit($limit + 1, $offset);
 //print $sql;
 
@@ -316,49 +326,56 @@ $typeElementString = $form->selectarray("type_element", $elementTypeArray, GETPO
 $button = '<input type="submit" class="button" name="button_third" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
 $param="&amp;sref=".$sref."&amp;month=".$month."&amp;year=".$year."&amp;sprod_fulldescr=".$sprod_fulldescr."&amp;socid=".$socid."&amp;type_element=".$type_element;
 
-print_barre_liste($langs->trans('ProductsIntoElements').' '.$typeElementString.' '.$button, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder,'',$num, '', '');
 
 if ($sql_select)
 {
 	$resql=$db->query($sql);
 	if (!$resql) dol_print_error($db);
-}
 
-print '<table class="liste" width="100%">'."\n";
-// Titles with sort buttons
-print '<tr class="liste_titre">';
-print_liste_field_titre($langs->trans('Ref'),$_SERVER['PHP_SELF'],'doc_number','',$param,'align="left"',$sortfield,$sortorder);
-print_liste_field_titre($langs->trans('Date'),$_SERVER['PHP_SELF'],'dateprint','',$param,'align="center" width="150"',$sortfield,$sortorder);
-print_liste_field_titre($langs->trans('Status'),$_SERVER['PHP_SELF'],'fk_status','',$param,'align="center"',$sortfield,$sortorder);
-print_liste_field_titre($langs->trans('Product'),$_SERVER['PHP_SELF'],'','',$param,'align="left"',$sortfield,$sortorder);
-print_liste_field_titre($langs->trans('Quantity'),$_SERVER['PHP_SELF'],'prod_qty','',$param,'align="right"',$sortfield,$sortorder);
-print "</tr>\n";
-// Filters
-print '<tr class="liste_titre">';
-print '<td class="liste_titre" align="left">';
-print '<input class="flat" type="text" name="sref" size="8" value="'.$sref.'">';
-print '</td>';
-print '<td class="liste_titre nowrap">'; // date
-print $formother->select_month($month?$month:-1,'month',1);
-$formother->select_year($year?$year:-1,'year',1, 20, 1);
-print '</td>';
-print '<td class="liste_titre" align="center">';
-print '</td>';
-print '<td class="liste_titre" align="left">';
-print '<input class="flat" type="text" name="sprod_fulldescr" size="15" value="'.dol_escape_htmltag($sprod_fulldescr).'">';
-print '</td>';
-print '<td class="liste_titre" align="right">';
-$searchpitco=$form->showFilterAndCheckAddButtons(0);
-print $searchpitco;
-print '</td>';
-print '</tr>';
-
-if ($sql_select)
-{
 	$var=true;
 	$num = $db->num_rows($resql);
+	
+	$param="&socid=".$socid."&type_element=".$type_element;
+    if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
+	if ($sprod_fulldescr) $param.= "&sprod_fulldescr=".urlencode($sprod_fulldescr);
+	if ($sref) $param.= "&sref=".urlencode($sref);
+	if ($month) $param.= "&month=".$month;
+	if ($year) $param.= "&year=".$year;
+	if ($optioncss != '') $param.='&optioncss='.$optioncss;
+	
+    print_barre_liste($langs->trans('ProductsIntoElements').' '.$typeElementString.' '.$button, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder,'',$num, $totalnboflines, '', 0, '', '', $limit);
+    
+    print '<table class="liste" width="100%">'."\n";
+    // Titles with sort buttons
+    print '<tr class="liste_titre">';
+    print_liste_field_titre($langs->trans('Ref'),$_SERVER['PHP_SELF'],'doc_number','',$param,'align="left"',$sortfield,$sortorder);
+    print_liste_field_titre($langs->trans('Date'),$_SERVER['PHP_SELF'],'dateprint','',$param,'align="center" width="150"',$sortfield,$sortorder);
+    print_liste_field_titre($langs->trans('Status'),$_SERVER['PHP_SELF'],'fk_status','',$param,'align="center"',$sortfield,$sortorder);
+    print_liste_field_titre($langs->trans('Product'),$_SERVER['PHP_SELF'],'','',$param,'align="left"',$sortfield,$sortorder);
+    print_liste_field_titre($langs->trans('Quantity'),$_SERVER['PHP_SELF'],'prod_qty','',$param,'align="right"',$sortfield,$sortorder);
+    print "</tr>\n";
+    // Filters
+    print '<tr class="liste_titre">';
+    print '<td class="liste_titre" align="left">';
+    print '<input class="flat" type="text" name="sref" size="8" value="'.$sref.'">';
+    print '</td>';
+    print '<td class="liste_titre nowrap">'; // date
+    print $formother->select_month($month?$month:-1,'month',1);
+    $formother->select_year($year?$year:-1,'year',1, 20, 1);
+    print '</td>';
+    print '<td class="liste_titre" align="center">';
+    print '</td>';
+    print '<td class="liste_titre" align="left">';
+    print '<input class="flat" type="text" name="sprod_fulldescr" size="15" value="'.dol_escape_htmltag($sprod_fulldescr).'">';
+    print '</td>';
+    print '<td class="liste_titre" align="right">';
+    $searchpitco=$form->showFilterAndCheckAddButtons(0);
+    print $searchpitco;
+    print '</td>';
+    print '</tr>';
+
 	$i = 0;
-	while (($objp = $db->fetch_object($resql)) && $i < $conf->liste_limit )
+	while (($objp = $db->fetch_object($resql)) && $i < min($num, $limit))
 	{
 		$documentstatic->id=$objp->doc_id;
 		$documentstatic->ref=$objp->doc_number;
@@ -532,20 +549,42 @@ if ($sql_select)
 		print "</tr>\n";
 		$i++;
 	}
-	if ($num > $conf->liste_limit) {
+
+	print "</table>";
+	
+	if ($num > $limit) {
 		print_barre_liste('', $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder,'',$num);
 	}
 	$db->free($resql);
 }
 else if (empty($type_element) || $type_element == -1)
 {
+    print_barre_liste($langs->trans('ProductsIntoElements').' '.$typeElementString.' '.$button, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder,'',$num, '', '');
+    
+    print '<table class="liste" width="100%">'."\n";
+    // Titles with sort buttons
+    print '<tr class="liste_titre">';
+    print_liste_field_titre($langs->trans('Ref'),$_SERVER['PHP_SELF'],'doc_number','',$param,'align="left"',$sortfield,$sortorder);
+    print_liste_field_titre($langs->trans('Date'),$_SERVER['PHP_SELF'],'dateprint','',$param,'align="center" width="150"',$sortfield,$sortorder);
+    print_liste_field_titre($langs->trans('Status'),$_SERVER['PHP_SELF'],'fk_status','',$param,'align="center"',$sortfield,$sortorder);
+    print_liste_field_titre($langs->trans('Product'),$_SERVER['PHP_SELF'],'','',$param,'align="left"',$sortfield,$sortorder);
+    print_liste_field_titre($langs->trans('Quantity'),$_SERVER['PHP_SELF'],'prod_qty','',$param,'align="right"',$sortfield,$sortorder);
+    print "</tr>\n";
+    
 	print '<tr '.$bc[0].'><td colspan="5">'.$langs->trans("SelectElementAndClickRefresh").'</td></tr>';
+
+	print "</table>";
 }
 else {
+    print_barre_liste($langs->trans('ProductsIntoElements').' '.$typeElementString.' '.$button, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder,'',$num, '', '');
+    
+    print '<table class="liste" width="100%">'."\n";
+    
 	print '<tr '.$bc[0].'><td colspan="5">'.$langs->trans("FeatureNotYetAvailable").'</td></tr>';
+
+	print "</table>";
 }
 
-print "</table>";
 print "</form>";
 
 llxFooter();
diff --git a/htdocs/societe/index.php b/htdocs/societe/index.php
index 615ee04cd44..98ee42afc57 100644
--- a/htdocs/societe/index.php
+++ b/htdocs/societe/index.php
@@ -79,7 +79,7 @@ if (count($listofsearchfields))
 	{
 		if ($i == 0) print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
 		print '<tr '.$bc[false].'>';
-		print '<td class="nowrap"><label for="'.$key.'">'.$langs->trans($value["text"]).'</label>:</td><td><input type="text" class="flat" name="'.$key.'" id="'.$key.'" size="18"></td>';
+		print '<td class="nowrap"><label for="'.$key.'">'.$langs->trans($value["text"]).'</label>:</td><td><input type="text" class="flat inputsearch" name="'.$key.'" id="'.$key.'" size="18"></td>';
 		if ($i == 0) print '<td rowspan="'.count($listofsearchfields).'"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td>';
 		print '</tr>';
 		$i++;
diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index 0108ff1b55b..1b2a515695b 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -778,9 +778,9 @@ if ($resql)
 	   {
 			if (! empty($arrayfields["ef.".$key]['checked'])) 
 			{
-			    $typeofextrafield=$extrafields->attribute_type[$key];
-			    if (in_array($typeofextrafield, array('int'))) print '<td class="liste_titre right">'; 
-			    else print '<td class="liste_titre">';
+                $align=$extrafields->getAlignFlag($key);
+                $typeofextrafield=$extrafields->attribute_type[$key];
+                print '<td class="liste_titre'.($align?' '.$align:'').'">';
 			    if (in_array($typeofextrafield, array('varchar', 'int', 'select')))
 				{
 				    $crit=$val;
diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php
index 613348ed044..983205f60b9 100644
--- a/htdocs/societe/soc.php
+++ b/htdocs/societe/soc.php
@@ -2342,7 +2342,18 @@ else
 		$reshook=$hookmanager->executeHooks('addMoreActionsButtons',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
 		if (empty($reshook))
 		{
-	        if (! empty($object->email))
+			$at_least_one_email_contact = false;
+			$TContact = $object->contact_array_objects();
+			foreach ($TContact as &$contact)
+			{
+				if (!empty($contact->email)) 
+				{
+					$at_least_one_email_contact = true;
+					break;
+				}
+			}
+			
+	        if (! empty($object->email) || $at_least_one_email_contact)
 	        {
 	        	$langs->load("mails");
 	        	print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?socid='.$object->id.'&amp;action=presend&amp;mode=init">'.$langs->trans('SendMail').'</a></div>';
diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php
index a66c849bf3a..5411cee24b6 100644
--- a/htdocs/supplier_proposal/card.php
+++ b/htdocs/supplier_proposal/card.php
@@ -729,6 +729,18 @@ if (empty($reshook))
 					unset($_POST['dp_desc']);
 					unset($_POST['idprod']);
 
+					unset($_POST['date_starthour']);
+					unset($_POST['date_startmin']);
+					unset($_POST['date_startsec']);
+					unset($_POST['date_startday']);
+					unset($_POST['date_startmonth']);
+					unset($_POST['date_startyear']);
+					unset($_POST['date_endhour']);
+					unset($_POST['date_endmin']);
+					unset($_POST['date_endsec']);
+					unset($_POST['date_endday']);
+					unset($_POST['date_endmonth']);
+					unset($_POST['date_endyear']);
 				} else {
 					$db->rollback();
 
@@ -836,6 +848,19 @@ if (empty($reshook))
 				unset($_POST['product_desc']);
 				unset($_POST['fournprice']);
 				unset($_POST['buying_price']);
+
+				unset($_POST['date_starthour']);
+				unset($_POST['date_startmin']);
+				unset($_POST['date_startsec']);
+				unset($_POST['date_startday']);
+				unset($_POST['date_startmonth']);
+				unset($_POST['date_startyear']);
+				unset($_POST['date_endhour']);
+				unset($_POST['date_endmin']);
+				unset($_POST['date_endsec']);
+				unset($_POST['date_endday']);
+				unset($_POST['date_endmonth']);
+				unset($_POST['date_endyear']);
 			} else {
 				$db->rollback();
 
@@ -1076,7 +1101,7 @@ if ($action == 'create')
 		print '</td>';
 	} else {
 		print '<td colspan="2">';
-		print $form->select_company('', 'socid', 's.fournisseur = 1', 1);
+		print $form->select_company('', 'socid', 's.fournisseur = 1', 'SelectThirdParty');
 		print '</td>';
 	}
 	print '</tr>' . "\n";
@@ -1905,12 +1930,8 @@ if ($action == 'create')
 		$formmail->withcancel = 1;
 
 		// Tableau des substitutions
-		$formmail->substit['__ASKREF__'] = $object->ref;
-		$formmail->substit['__SIGNATURE__'] = $user->signature;
-		$formmail->substit['__THIRDPARTY_NAME__'] = $object->thirdparty->name;
-		$formmail->substit['__PROJECT_REF__'] = (is_object($object->projet)?$object->projet->ref:'');
-		$formmail->substit['__CONTACTCIVNAME__'] = '';
-		$formmail->substit['__PERSONALIZED__'] = '';
+		$formmail->setSubstitFromObject($object);
+		$formmail->substit['__SUPPLIERPROPREF__'] = $object->ref;
 
 		// Tableau des parametres complementaires
 		$formmail->param['action'] = 'send';
diff --git a/htdocs/supplier_proposal/class/supplier_proposal.class.php b/htdocs/supplier_proposal/class/supplier_proposal.class.php
index b5319210fc7..df634da27ae 100644
--- a/htdocs/supplier_proposal/class/supplier_proposal.class.php
+++ b/htdocs/supplier_proposal/class/supplier_proposal.class.php
@@ -62,7 +62,7 @@ class SupplierProposal extends CommonObject
 	 */
     var $author;
 	var $ref_fourn;  //Reference saisie lors de l'ajout d'une ligne à la demande
-    var $statut;					// 0 (draft), 1 (validated), 2 (signed), 3 (not signed), 4 (billed)
+    var $statut;					// 0 (draft), 1 (validated), 2 (signed), 3 (not signed), 4 (processed/billed)
     var $date;						// Date of proposal
     var $date_livraison;
 
@@ -139,6 +139,29 @@ class SupplierProposal extends CommonObject
 	var $multicurrency_total_tva;
 	var $multicurrency_total_ttc;
 	
+	/**
+	 * Draft status
+	 */
+	const STATUS_DRAFT = 0;
+	/**
+	 * Validated status
+	 */
+	const STATUS_VALIDATED = 1;
+	/**
+	 * Signed quote
+	 */
+	const STATUS_SIGNED = 2;
+	/**
+	 * Not signed quote
+	 */
+	const STATUS_NOTSIGNED = 3;
+	/**
+	 * Billed or processed quote
+	 */
+	const STATUS_BILLED = 4;	
+	
+	
+	
     /**
      *	Constructor
      *
@@ -2087,7 +2110,7 @@ class SupplierProposal extends CommonObject
      */
     function load_board($user,$mode)
     {
-        global $conf, $user;
+        global $conf, $user, $langs;
 
         $now=dol_now();
 
@@ -2110,29 +2133,43 @@ class SupplierProposal extends CommonObject
         $resql=$this->db->query($sql);
         if ($resql)
         {
-            if ($mode == 'opened') $delay_warning=$conf->supplier_proposal->cloture->warning_delay;
-            if ($mode == 'signed') $delay_warning=$conf->supplier_proposal->facturation->warning_delay;
+            if ($mode == 'opened') {
+	            $delay_warning=$conf->supplier_proposal->cloture->warning_delay;
+	            $statut = self::STATUS_VALIDATED;
+	            $label = $langs->trans("SupplierProposalsToClose");
+            }
+            if ($mode == 'signed') {
+	            $delay_warning=$conf->supplier_proposal->facturation->warning_delay;
+	            $statut = self::STATUS_SIGNED;
+	            $label = $langs->trans("SupplierProposalsToProcess");      // May be billed or ordered
+            }
 
+	        $response = new WorkboardResponse();
+	        $response->warning_delay = $delay_warning/60/60/24;
+	        $response->label = $label;
+	        $response->url = DOL_URL_ROOT.'/supplier_proposal/list.php?viewstatut='.$statut;
+	        $response->img = img_object($langs->trans("SupplierProposals"),"propal");
+            
             // This assignment in condition is not a bug. It allows walking the results.
             while ($obj=$this->db->fetch_object($resql))
             {
-                $this->nbtodo++;
+                $response->nbtodo++;
                 if ($mode == 'opened')
                 {
                     $datelimit = $this->db->jdate($obj->datefin);
                     if ($datelimit < ($now - $delay_warning))
                     {
-                        $this->nbtodolate++;
+                        $response->nbtodolate++;
                     }
                 }
                 // TODO Definir regle des propales a facturer en retard
                 // if ($mode == 'signed' && ! count($this->FactureListeArray($obj->rowid))) $this->nbtodolate++;
             }
-            return 1;
+            return $response;
         }
         else
         {
-            $this->error=$this->db->error();
+            $this->error=$this->db->lasterror();
             return -1;
         }
     }
@@ -2207,7 +2244,7 @@ class SupplierProposal extends CommonObject
                 $line->remise_percent=00;
             }
 
-            $prodid = rand(1, $num_prods);
+            $prodid = mt_rand(1, $num_prods);
             $line->fk_product=$prodids[$prodid];
 
             $this->lines[$xnbp]=$line;
@@ -2257,7 +2294,7 @@ class SupplierProposal extends CommonObject
         else
         {
             dol_print_error($this->db);
-            $this->error=$this->db->error();
+            $this->error=$this->db->lasterror();
             return -1;
         }
     }
diff --git a/htdocs/theme/eldy/img/warning.png b/htdocs/theme/eldy/img/warning.png
index f1b93b8cc82..9ec45736b05 100644
Binary files a/htdocs/theme/eldy/img/warning.png and b/htdocs/theme/eldy/img/warning.png differ
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index ad72cd5f5ad..65c232c6737 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -209,6 +209,8 @@ print '$colortexttitlenotab='.$colortexttitlenotab."\n";
 print '$colortexttitle='.$colortexttitle."\n";
 print '$colortext='.$colortext."\n";
 print '$colortextlink='.$colortextlink."\n";
+print '$colortextbackhmenu='.$colortextbackhmenu."\n";
+print '$colortextbackvmenu='.$colortextbackvmenu."\n";
 print 'dol_hide_topmenu='.$dol_hide_topmenu."\n";
 print 'dol_hide_leftmenu='.$dol_hide_leftmenu."\n";
 print 'dol_optimize_smallscreen='.$dol_optimize_smallscreen."\n";
@@ -433,6 +435,9 @@ th .button {
 .centpercent {
 	width: 100%;
 }
+.quatrevingtpercent, .inputsearch {
+	width: 80%;
+}
 textarea.centpercent {
 	width: 96%;
 }
@@ -529,6 +534,13 @@ div.myavailability {
 .strikefordisabled {
 	text-decoration: line-through;
 }
+.tdoverflow {
+    max-width: 0;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+}
+
 
 /* ============================================================================== */
 /* Styles to hide objects                                                         */
@@ -2147,11 +2159,11 @@ table.liste, table.noborder, table.formdoc, div.noborder {
 
 	margin: 0px 0px 5px 0px;
 
-	-moz-box-shadow: 2px 2px 4px #CCC;
+/*	-moz-box-shadow: 2px 2px 4px #CCC;
 	-webkit-box-shadow: 2px 2px 4px #CCC;
 	box-shadow: 2px 2px 4px #CCC;
 
-/*	-moz-border-radius: 0.2em;
+	-moz-border-radius: 0.2em;
 	-webkit-border-radius: 0.2em;
 	border-radius: 0.2em;*/
 }
@@ -2217,7 +2229,7 @@ div.refidpadding  {
 }
 div.refid  {
 	font-weight: bold;
-  	color: #766;
+  	color: #866;
   	font-size: 160%;
 }
 div.refidno  {
@@ -2628,9 +2640,9 @@ span.dashboardlineko {
 	font-weight: bold;
 }
 .boxtable {
-    -moz-box-shadow: 3px 3px 4px #DDD;
+/*    -moz-box-shadow: 3px 3px 4px #DDD;
     -webkit-box-shadow: 3px 3px 4px #DDD;
-    box-shadow: 3px 3px 4px #DDD;
+    box-shadow: 3px 3px 4px #DDD; */
     margin-bottom: 8px !important;
 }
 
@@ -2638,7 +2650,7 @@ span.dashboardlineko {
 .box {
     padding-right: 0px;
     padding-left: 0px;
-    padding-bottom: 4px;
+    padding-bottom: 12px;
 }
 
 tr.box_titre {
@@ -2688,9 +2700,13 @@ tr.box_pair {
 
 tr.box_pair td, tr.box_impair td {
 	padding: 4px;
+}
+tr.box_pair:not(:last-child) td, tr.box_impair:not(:last-child) td {
     border-bottom: 1px solid #ddd;
 }
-
+.noborderbottom {
+	border-bottom: none !important;
+}
 .formboxfilter {
 	vertical-align: middle;
 	margin-bottom: 6px;
@@ -4023,6 +4039,12 @@ border-top-right-radius: 6px;
 
 
 
+/* For demo pages */
+img.demothumb {
+    box-shadow: 2px 2px 8px #888;
+}
+
+
 /* The theme for public pages */
 .public_body {
 	margin: 20px;
@@ -4033,6 +4055,9 @@ border-top-right-radius: 6px;
 
 
 
+
+
+
 /* CSS style used for small screen */
 
 .imgopensurveywizard
@@ -4050,25 +4075,53 @@ border-top-right-radius: 6px;
 
 }
 
-@media only screen and (max-width: <?php echo round($nbtopmenuentries * $fontsize * 6.7, 0) + 10; ?>px)
+/* nboftopmenuentries = <?php echo $nbtopmenuentries ?>, fontsize=<?php echo $fontsize ?> */
+/* rule to reduce top menu - 1st reduction */
+@media only screen and (max-width: <?php echo round($nbtopmenuentries * $fontsize * 6.7, 0) + 8; ?>px)
 {
+	div.tmenucenter {
+	    max-width: <?php echo round($fontsize * 4); ?>px;	/* size of viewport */
+    	white-space: nowrap;
+  		overflow: hidden;
+  		text-overflow: ellipsis;
+  		color: #<?php echo $colortextbackhmenu; ?>;
+	}
 	.mainmenuaspan {
-    	display: none;
+    	/*display: none;*/
+  		font-size: 10px;
     }
+    .topmenuimage {
+    	background-size: 26px auto;
+    	margin-top: 0px;
+	}
+
     li.tmenu, li.tmenusel {
     	min-width: 32px;
     }
     div.mainmenu {
     	min-width: auto;
     }
-    .topmenuimage {
-    	background-size: 26px auto;
-    	margin-top: 8px;
-	}
 	div.tmenuleft {
 		display: none;
 	}
 }
+/* rule to reduce top menu - 2nd reduction */
+@media only screen and (max-width: <?php echo round($nbtopmenuentries * $fontsize * 4.5, 0) + 8; ?>px)
+{
+	div.tmenucenter {
+	    max-width: <?php echo round($fontsize * 2); ?>px;	/* size of viewport */
+  		text-overflow: clip;
+	}
+	.mainmenuaspan {
+    	/*display: none;*/
+  		font-size: 10px;
+    }
+    .topmenuimage {
+    	background-size: 20px auto;
+    	margin-top: 2px;
+	}
+}
+/* rule to reduce top menu - 3rd reduction */
 @media only screen and (max-width: 570px)
 {
 	/* Reduce login top right info */
@@ -4086,13 +4139,20 @@ border-top-right-radius: 6px;
 		top: 4px;
 		max-width: 82px;
 	}
+    li.tmenu, li.tmenusel {
+        min-width: 30px;
+    }
 
+	div.tmenucenter {
+  		text-overflow: clip;
+	}
+    .topmenuimage {
+    	background-size: 20px auto;
+    	margin-top: 2px !important;
+	}
 	div.mainmenu {
     	min-width: 20px;
     }
-	.topmenuimage {
-    	background-size: 20px auto;
-    }
 
 	#tooltip {
 		position: absolute;
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 1266f5799a2..8662a8c835e 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -204,6 +204,8 @@ print '$colortexttitlenotab='.$colortexttitlenotab."\n";
 print '$colortexttitle='.$colortexttitle."\n";
 print '$colortext='.$colortext."\n";
 print '$colortextlink='.$colortextlink."\n";
+print '$colortextbackhmenu='.$colortextbackhmenu."\n";
+print '$colortextbackvmenu='.$colortextbackvmenu."\n";
 print 'dol_hide_topmenu='.$dol_hide_topmenu."\n";
 print 'dol_hide_leftmenu='.$dol_hide_leftmenu."\n";
 print 'dol_optimize_smallscreen='.$dol_optimize_smallscreen."\n";
@@ -420,6 +422,9 @@ th .button {
 .centpercent {
 	width: 100%;
 }
+.quatrevingtpercent, .inputsearch {
+	width: 80%;
+}
 textarea.centpercent {
 	width: 96%;
 }
@@ -517,6 +522,12 @@ div.myavailability {
 .strikefordisabled {
 	text-decoration: line-through;
 }
+.tdoverflow {
+    max-width: 0;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+}
 
 
 /* ============================================================================== */
@@ -881,13 +892,14 @@ ul.tmenu {	/* t r b l */
 }
 ul.tmenu li {
 	background: rgb(<?php echo $colorbackhmenu1 ?>);
-
+	/*
 	background-image: linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(0,0,0,.3) 100%);
 	background-image: -o-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(0,0,0,.3) 100%);
 	background-image: -moz-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(0,0,0,.3) 100%);
 	background-image: -webkit-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(0,0,0,.3) 100%);
 	background-image: -ms-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(0,0,0,.3) 100%);
 	background-image: -webkit-gradient( linear, left top, left bottom, color-stop(0, rgba(255,255,255,.3)), color-stop(1, rgba(0,0,0,.3)) );
+	*/
 }
 li.tmenu, li.tmenusel {
 	<?php print $minwidthtmenu?'min-width: '.$minwidthtmenu.'px;':''; ?>
@@ -3855,6 +3867,13 @@ border-top-right-radius: 6px;
 
 
 
+/* For demo pages */
+img.demothumb {
+    box-shadow: 2px 2px 8px #888;
+	margin-bottom: 4px;
+}
+
+
 /* The theme for public pages */
 .public_body {
 	margin: 20px;
@@ -3897,25 +3916,53 @@ border-top-right-radius: 6px;
 	}
 }
 
+
+/* nboftopmenuentries = <?php echo $nbtopmenuentries ?>, fontsize=<?php echo $fontsize ?> */
+/* rule to reduce top menu - 1st reduction */
 @media only screen and (max-width:  <?php echo round($nbtopmenuentries * $fontsize * 7, 0) + 200; ?>px)
 {
+	div.tmenucenter {
+	    max-width: <?php echo round($fontsize * 4); ?>px;	/* size of viewport */
+    	white-space: nowrap;
+  		overflow: hidden;
+  		text-overflow: ellipsis;
+  		color: #<?php echo $colortextbackhmenu; ?>;
+	}
 	.mainmenuaspan {
-    	display: none;
+    	/*display: none;*/
+  		font-size: 10px;
     }
+    .topmenuimage {
+    	background-size: 26px auto;
+    	margin-top: 0px;
+	}
     li.tmenu, li.tmenusel {
     	min-width: 32px;
     }
     div.mainmenu {
     	min-width: auto;
     }
-    .topmenuimage {
-    	background-size: 26px auto;
-    	margin-top: 8px;
-	}
 	div.tmenuleft {
 		display: none;
 	}
 }
+/* rule to reduce top menu - 2nd reduction */
+@media only screen and (max-width: <?php echo round($nbtopmenuentries * $fontsize * 4.5, 0) + 200; ?>px)
+{
+	div.tmenucenter {
+	    max-width: <?php echo round($fontsize * 2); ?>px;	/* size of viewport */
+  		text-overflow: clip;
+	}
+	.mainmenuaspan {
+    	/*display: none;*/
+  		font-size: 10px;
+    }
+    .topmenuimage {
+    	background-size: 20px auto;
+    	margin-top: 2px;
+	}
+}
+/* rule to reduce top menu - 3rd reduction */
 @media only screen and (max-width: 570px)
 {
 	/* Reduce login top right info */
@@ -3933,12 +3980,20 @@ border-top-right-radius: 6px;
 		top: 9px;
 	}
 
+    li.tmenu, li.tmenusel {
+        min-width: 30px;
+    }
+
+	div.tmenucenter {
+  		text-overflow: clip;
+	}
+    .topmenuimage {
+    	background-size: 20px auto;
+    	margin-top: 2px !important;
+	}
 	div.mainmenu {
     	min-width: 20px;
     }
-	.topmenuimage {
-    	background-size: 20px auto;
-    }
     
 	#tooltip {
 		position: absolute;
diff --git a/htdocs/user/class/userbankaccount.class.php b/htdocs/user/class/userbankaccount.class.php
index 30c795bbd72..a91d064c7f8 100644
--- a/htdocs/user/class/userbankaccount.class.php
+++ b/htdocs/user/class/userbankaccount.class.php
@@ -44,15 +44,13 @@ class UserBankAccount extends Account
 	 *
 	 *  @param      DoliDB		$db      Database handler
      */
-    function __construct($db)
+    public function __construct(DoliDB $db)
     {
         $this->db = $db;
 
         $this->socid = 0;
-        $this->clos = 0;
         $this->solde = 0;
         $this->error_number = 0;
-        return 1;
     }
 
 
diff --git a/htdocs/user/home.php b/htdocs/user/home.php
index e9d9fb6c489..6bcd468f62e 100644
--- a/htdocs/user/home.php
+++ b/htdocs/user/home.php
@@ -68,20 +68,19 @@ print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<table class="noborder nohover" width="100%">';
 print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
 print '<tr '.$bc[$var].'><td>';
-print $langs->trans("User").':</td><td><input class="flat" type="text" name="search_user" size="18"></td><td'.($canreadperms?' rowspan="2"':'').'><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
+print $langs->trans("User").':</td><td><input class="flat inputsearch" type="text" name="search_user" size="18"></td><td'.($canreadperms?' rowspan="2"':'').'><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
 
 // Search Group
 if ($canreadperms)
 {
 	$var=false;
 	print '<tr '.$bc[$var].'><td>';
-	print $langs->trans("Group").':</td><td><input class="flat" type="text" name="search_group" size="18"></td></tr>';
+	print $langs->trans("Group").':</td><td><input class="flat inputsearch" type="text" name="search_group" size="18"></td></tr>';
 }
 
 print "</table><br>\n";
 print '</form>';
 
-//print '</td><td valign="top" width="70%" class="notopnoleftnoright">';
 print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
 
 
diff --git a/test/phpunit/BankAccountTest.php b/test/phpunit/BankAccountTest.php
index 7c59571464c..a212ff0317a 100644
--- a/test/phpunit/BankAccountTest.php
+++ b/test/phpunit/BankAccountTest.php
@@ -214,7 +214,7 @@ class BankAccountTest extends PHPUnit_Framework_TestCase
 
         $localobject=new Account($this->savdb);
         $result=$localobject->fetch($id);
-        $result=$localobject->delete($id);
+        $result=$localobject->delete($user);
 
         print __METHOD__." id=".$id." result=".$result."\n";
         $this->assertLessThan($result, 0);