diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 2dc2d0fb45c..34f14a23500 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -277,6 +277,7 @@ GenericMaskCodes2=<b>{cccc}</b> the client code<br><b>{cccc000}</b> the client c
 GenericMaskCodes3=All other characters in the mask will remain intact.<br>Spaces are not allowed.<br>
 GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany done 2007-01-31:</u><br>
 GenericMaskCodes4b=<u>Example on third party created on 2007-03-01:</u><br>
+GenericMaskCodes4c=<u>Example on product created on 2007-03-01:</u><br>
 GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC0701-000099</b><br><b>{0000+100}-ZZZ/{dd}/XXX</b> will give <b>0199-ZZZ/31/XXX</b>
 GenericNumRefModelDesc=Return a customizable number according to a defined mask. 
 ServerAvailableOnIPOrPort=Server is available at address <b>%s</b> on port <b>%s</b>
@@ -1137,6 +1138,8 @@ UseSearchToSelectProduct=Use a search form to choose a product (instead of using
 UseEcoTaxeAbility=Support Eco-Taxe (WEEE)
 SetDefaultBarcodeTypeProducts=Default barcode type to use for products
 SetDefaultBarcodeTypeThirdParties=Default barcode type to use for third parties
+ProductCodeChecker= Module for product code generation and checking (product or service)
+ProductOtherConf= Product / Service configuration
 ##### Syslog #####
 SyslogSetup=Logs module setup
 SyslogOutput=Logs outputs
diff --git a/htdocs/langs/en_US/companies.lang b/htdocs/langs/en_US/companies.lang
index 0fef5378091..b2bf2106f90 100644
--- a/htdocs/langs/en_US/companies.lang
+++ b/htdocs/langs/en_US/companies.lang
@@ -392,4 +392,4 @@ ActivityStateFilter=Activity status
 # Monkey
 MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for supplier code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
 # Leopard
-LeopardNumRefModelDesc=Customer/supplier code is free. This code can be modified at any time.
+LeopardNumRefModelDesc=The code is free. This code can be modified at any time.
diff --git a/htdocs/langs/en_US/products.lang b/htdocs/langs/en_US/products.lang
index 7c6a28231dc..5c3b330410c 100644
--- a/htdocs/langs/en_US/products.lang
+++ b/htdocs/langs/en_US/products.lang
@@ -169,4 +169,6 @@ SuppliersPrices=Suppliers prices
 CustomCode=Customs code
 CountryOrigin=Origin country
 HiddenIntoCombo=Hidden into select lists
-Nature=Nature
\ No newline at end of file
+Nature=Nature
+ProductCodeModel=Product code model
+ServiceCodeModel=Service code model
\ No newline at end of file
diff --git a/htdocs/product/admin/product.php b/htdocs/product/admin/product.php
index eddac8c041d..1ac75474ea3 100644
--- a/htdocs/product/admin/product.php
+++ b/htdocs/product/admin/product.php
@@ -237,18 +237,12 @@ foreach ($dirproduct as $dirroot)
     			}
     			else
     			{
-    				// @todo : What's that ?
-    				/*$disabled = false;
+    				$disabled = false;
     				if (! empty($conf->multicompany->enabled) && (is_object($mc) && ! empty($mc->sharings['referent']) && $mc->sharings['referent'] == $conf->entity) ? false : true);
     				print '<td align="center">';
-    				if (! $disabled) print '<a href="'.$_SERVER['PHP_SELF'].'?action=setcodeclient&value='.$file.'">';
+    				if (! $disabled) print '<a href="'.$_SERVER['PHP_SELF'].'?action=setcodeproduct&value='.$file.'">';
     				print img_picto($langs->trans("Disabled"),'switch_off');
     				if (! $disabled) print '</a>';
-    				print '</td>';*/
-					print '<td align="center">';
-    				print '<a href="'.$_SERVER['PHP_SELF'].'?action=setcodeproduct&value='.$file.'">';
-    				print img_picto($langs->trans("Disabled"),'switch_off');
-    				print '</a>';
     				print '</td>';
     			}