diff --git a/htdocs/admin/stock.php b/htdocs/admin/stock.php
index 097cabb1c63..176e0914065 100644
--- a/htdocs/admin/stock.php
+++ b/htdocs/admin/stock.php
@@ -609,12 +609,7 @@ foreach ($dirmodels as $reldir)
 
 								$htmltooltip .= '<br><br><u>'.$langs->trans("FeaturesSupported").':</u>';
 								$htmltooltip .= '<br>'.$langs->trans("Logo").': '.yn($module->option_logo, 1, 1);
-								$htmltooltip .= '<br>'.$langs->trans("PaymentMode").': '.yn($module->option_modereg, 1, 1);
-								$htmltooltip .= '<br>'.$langs->trans("PaymentConditions").': '.yn($module->option_condreg, 1, 1);
 								$htmltooltip .= '<br>'.$langs->trans("MultiLanguage").': '.yn($module->option_multilang, 1, 1);
-								//$htmltooltip .= '<br>'.$langs->trans("Discounts").': '.yn($module->option_escompte,1,1);
-								//$htmltooltip .= '<br>'.$langs->trans("CreditNote").': '.yn($module->option_credit_note,1,1);
-								$htmltooltip .= '<br>'.$langs->trans("WatermarkOnDraftOrders").': '.yn($module->option_draft_watermark, 1, 1);
 
 
 								print '<td class="center">';
diff --git a/htdocs/core/modules/modStock.class.php b/htdocs/core/modules/modStock.class.php
index 73417817cb4..831358dcf6b 100644
--- a/htdocs/core/modules/modStock.class.php
+++ b/htdocs/core/modules/modStock.class.php
@@ -371,9 +371,9 @@ class modStock extends DolibarrModules
 		$this->remove($options);
 
 		//ODT template
-		$src = DOL_DOCUMENT_ROOT.'/install/doctemplates/stock/template_stock.odt';
-		$dirodt = DOL_DATA_ROOT.'/doctemplates/stock';
-		$dest = $dirodt.'/template_stock.odt';
+		$src = DOL_DOCUMENT_ROOT.'/install/doctemplates/stocks/template_warehouse.odt';
+		$dirodt = DOL_DATA_ROOT.'/doctemplates/stocks';
+		$dest = $dirodt.'/template_warehouse.odt';
 
 		if (file_exists($src) && !file_exists($dest))
 		{
diff --git a/htdocs/install/doctemplates/products/template_product.odt b/htdocs/install/doctemplates/products/template_product.odt
index 344fcfa391a..c73fa69d92d 100644
Binary files a/htdocs/install/doctemplates/products/template_product.odt and b/htdocs/install/doctemplates/products/template_product.odt differ
diff --git a/htdocs/install/doctemplates/stocks/template_warehouse.odt b/htdocs/install/doctemplates/stocks/template_warehouse.odt
new file mode 100644
index 00000000000..5d4340230a1
Binary files /dev/null and b/htdocs/install/doctemplates/stocks/template_warehouse.odt differ