diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index 7e282c3667d7d80d245c824ead4ab09c735f7af3..77f295bd8133ac5f82dbc0de16326b1685579ecf 100644
--- a/htdocs/core/lib/pdf.lib.php
+++ b/htdocs/core/lib/pdf.lib.php
@@ -1491,23 +1491,23 @@ function pdf_getlinevatrate($object,$i,$outputlangs,$hidedetails=0)
 		{
 			$tmpresult='';
 
-			$tmpresult.=vatrate($object->lines[$i]->tva_tx,1,$object->lines[$i]->info_bits,1);
+			$tmpresult.=vatrate($object->lines[$i]->tva_tx, 1, $object->lines[$i]->info_bits, 1);
 			if (empty($conf->PDF_MAIN_HIDE_SECOND_TAX))
 			{
-				if ($object->lines[$i]->total_localtax1 != 0)
+				if ($object->lines[$i]->localtax1_tx != 0)
 				{
 					if (preg_replace('/[\s0%]/','',$tmpresult)) $tmpresult.='/';
 					else $tmpresult='';
-					$tmpresult.=vatrate(abs($object->lines[$i]->total_localtax1),1);
+					$tmpresult.=vatrate(abs($object->lines[$i]->localtax1_tx),1);
 				}
 			}
 			if (empty($conf->PDF_MAIN_HIDE_THIRD_TAX))
 			{
-				if ($object->lines[$i]->total_localtax2 != 0)
+				if ($object->lines[$i]->localtax2_tx != 0)
 				{
 					if (preg_replace('/[\s0%]/','',$tmpresult)) $tmpresult.='/';
 					else $tmpresult='';
-					$tmpresult.=vatrate(abs($object->lines[$i]->total_localtax2),1);
+					$tmpresult.=vatrate(abs($object->lines[$i]->localtax2_tx),1);
 				}
 			}
 
diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang
index b03b8ad37bbdeaee2a07caf89e9dcef06783b4f3..8dfc02c49f17420a82e9828cafd1ebe0169aac06 100644
--- a/htdocs/langs/en_US/errors.lang
+++ b/htdocs/langs/en_US/errors.lang
@@ -195,6 +195,7 @@ ErrorNoWarehouseDefined=Error, no warehouses defined.
 ErrorBadLinkSourceSetButBadValueForRef=The link you use is not valid. A 'source' for payment is defined, but value for 'ref' is not valid. 
 ErrorTooManyErrorsProcessStopped=Too many errors. Process was stopped.
 ErrorOnlyInvoiceValidatedCanBeSentInMassAction=Only validated invoices can be sent using the "Send by email" mass action. 
+ErrorChooseBetweenFreeEntryOrPredefinedProduct=You must choose if article is a predefined product or not
 
 # 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/en_US/main.lang b/htdocs/langs/en_US/main.lang
index 8d180568073d896d284849cc55eacf67782d2f32..b8544ee3edad74e59f22c9ab703858e7014a38df 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -657,8 +657,8 @@ Page=Page
 Notes=Notes
 AddNewLine=Add new line
 AddFile=Add file
-FreeZone=Free entry
-FreeLineOfType=Free entry of type
+FreeZone=Not a predefined product/service
+FreeLineOfType=Not a predefined entry of type
 CloneMainAttributes=Clone object with its main attributes
 PDFMerge=PDF Merge
 Merge=Merge