diff --git a/htdocs/compta/facture/fiche-rec.php b/htdocs/compta/facture/fiche-rec.php
index 37570d0874f..4db3040c9c7 100644
--- a/htdocs/compta/facture/fiche-rec.php
+++ b/htdocs/compta/facture/fiche-rec.php
@@ -1098,10 +1098,17 @@ if ($action == 'create')
 		print "</td></tr>";
 
 		// Auto generate document
-		print "<tr><td>".$langs->trans("StatusOfGeneratedDocuments")."</td><td>";
-		$select = array('0'=>$langs->trans('DoNotGenerateDoc'),'1'=>$langs->trans('AutoGenerateDoc'));
-		print $form->selectarray('generate_pdf', $select, GETPOST('generate_pdf'));
-		print "</td></tr>";
+		if (! empty($conf->global->INVOICE_REC_CAN_DISABLE_DOCUMENT_FILE_GENERATION))
+		{
+			print "<tr><td>".$langs->trans("StatusOfGeneratedDocuments")."</td><td>";
+			$select = array('0'=>$langs->trans('DoNotGenerateDoc'),'1'=>$langs->trans('AutoGenerateDoc'));
+			print $form->selectarray('generate_pdf', $select, GETPOST('generate_pdf'));
+			print "</td></tr>";
+		}
+		else
+		{
+			print '<input type="hidden" name="generate_pdf" value="1">';
+		}
 
 		print "</table>";
 
@@ -1512,19 +1519,28 @@ else
 		}
 		print '</td>';
 		// Auto generate documents
-		print '<tr><td>';
-		if ($action == 'generate_pdf' || $object->frequency > 0)
-			print $form->editfieldkey($langs->trans("StatusOfGeneratedDocuments"), 'generate_pdf', $object->generate_pdf, $object, $user->rights->facture->creer);
-		else
-			print $langs->trans("StatusOfGeneratedDocuments");
-		print '</td><td>';
-			$select = 'select;0:'.$langs->trans('DoNotGenerateDoc').',1:'.$langs->trans('AutogenerateDoc');
-		if ($action == 'generate_pdf' || $object->frequency > 0)
+		if (! empty($conf->global->INVOICE_REC_CAN_DISABLE_DOCUMENT_FILE_GENERATION))
 		{
-			print $form->editfieldval($langs->trans("StatusOfGeneratedDocuments"), 'generate_pdf', $object->generate_pdf, $object, $user->rights->facture->creer, $select);
+			print '<tr>';
+			print '<td>';
+			if ($action == 'generate_pdf' || $object->frequency > 0)
+				print $form->editfieldkey($langs->trans("StatusOfGeneratedDocuments"), 'generate_pdf', $object->generate_pdf, $object, $user->rights->facture->creer);
+			else
+				print $langs->trans("StatusOfGeneratedDocuments");
+			print '</td>';
+			print '<td>';
+			$select = 'select;0:'.$langs->trans('DoNotGenerateDoc').',1:'.$langs->trans('AutogenerateDoc');
+			if ($action == 'generate_pdf' || $object->frequency > 0)
+			{
+				print $form->editfieldval($langs->trans("StatusOfGeneratedDocuments"), 'generate_pdf', $object->generate_pdf, $object, $user->rights->facture->creer, $select);
+			}
+			print '</td>';
+			print '</tr>';
+		}
+		else
+		{
+			print '<input type="hidden" name="generate_pdf" value="1">';
 		}
-		print '</td>';
-		print '</tr>';
 
 		print '</table>';
 
diff --git a/htdocs/contrat/tpl/linkedobjectblock.tpl.php b/htdocs/contrat/tpl/linkedobjectblock.tpl.php
index a2da6cef24e..271878b84e2 100644
--- a/htdocs/contrat/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/contrat/tpl/linkedobjectblock.tpl.php
@@ -33,7 +33,7 @@ $var=true;
 foreach($linkedObjectBlock as $key => $objectlink)
 {
     $ilink++;
-    
+
     $trclass=($var?'pair':'impair');
     if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) $trclass.=' liste_sub_total';
 ?>
@@ -42,7 +42,7 @@ foreach($linkedObjectBlock as $key => $objectlink)
     <td><?php echo $objectlink->getNomUrl(1); ?></td>
     <td></td>
 	<td align="center"><?php echo dol_print_date($objectlink->date_contrat,'day'); ?></td>
-	<td align="right">&nbsp;</td>
+	<td align="right"><?php // var_dump($objectlink->total_ttc); ?></td>
 	<td align="right"><?php echo $objectlink->getLibStatut(7); ?></td>
 	<td align="right"><a href="<?php echo $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&dellinkid='.$key; ?>"><?php echo img_delete($langs->transnoentitiesnoconv("RemoveLink")); ?></a></td>
 </tr>
diff --git a/htdocs/install/mysql/migration/6.0.0-7.0.0.sql b/htdocs/install/mysql/migration/6.0.0-7.0.0.sql
index 57b0b7d0d35..9ede853c752 100644
--- a/htdocs/install/mysql/migration/6.0.0-7.0.0.sql
+++ b/htdocs/install/mysql/migration/6.0.0-7.0.0.sql
@@ -544,7 +544,7 @@ ALTER TABLE llx_product ADD COLUMN accountancy_code_sell_intra varchar(32) AFTER
 ALTER TABLE llx_product ADD COLUMN accountancy_code_sell_export varchar(32) AFTER accountancy_code_sell_intra;
 
 ALTER TABLE llx_facture_rec ADD COLUMN modelpdf varchar(255) AFTER note_public;
-ALTER TABLE llx_facture_rec ADD COLUMN generate_pdf integer DEFAULT 0 AFTER auto_validate;
+ALTER TABLE llx_facture_rec ADD COLUMN generate_pdf integer DEFAULT 1 AFTER auto_validate;
 
 -- SPEC : use database type 'double' to store monetary values
 ALTER TABLE llx_blockedlog MODIFY COLUMN amounts double(24,8);
diff --git a/htdocs/install/mysql/tables/llx_facture_rec.sql b/htdocs/install/mysql/tables/llx_facture_rec.sql
index 87bb56e7dbe..dc1343872c7 100644
--- a/htdocs/install/mysql/tables/llx_facture_rec.sql
+++ b/htdocs/install/mysql/tables/llx_facture_rec.sql
@@ -72,5 +72,5 @@ create table llx_facture_rec
   nb_gen_done        integer DEFAULT NULL,		-- nb of generation done (when an invoice is generated, this field must incremented)
   nb_gen_max         integer DEFAULT NULL,		    -- maximum number of generation
   auto_validate      integer DEFAULT 0,		-- 0 to create in draft, 1 to create and validate the new invoice
-  generate_pdf       integer DEFAULT 0      -- 0 disable pdf, 1 to generate pdf
+  generate_pdf       integer DEFAULT 1      -- 0 disable pdf, 1 to generate pdf
 )ENGINE=innodb;
diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang
index 07b5e6cc0a8..e048b7aa647 100644
--- a/htdocs/langs/en_US/bills.lang
+++ b/htdocs/langs/en_US/bills.lang
@@ -513,4 +513,5 @@ ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template inv
 CreateOneBillByThird=Create one invoice per third party (otherwise, one invoice per order)
 BillCreated=%s bill(s) created
 StatusOfGeneratedDocuments=Status of document generation
-AutogenerateDoc=Auto generate document
\ No newline at end of file
+DoNotGenerateDoc=Do not generate document file
+AutogenerateDoc=Auto generate document file
\ No newline at end of file