From cda8c6e41a7bf2cb470ca16ce6e36f8ce6715f14 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 12 Sep 2017 11:51:51 +0200
Subject: [PATCH] Fix ref must be 50

---
 htdocs/compta/facture/tpl/linkedobjectblockForRec.tpl.php | 8 ++++++--
 htdocs/install/mysql/migration/6.0.0-7.0.0.sql            | 5 +++++
 htdocs/install/mysql/tables/llx_contrat.sql               | 8 ++++----
 htdocs/langs/en_US/other.lang                             | 2 ++
 htdocs/main.inc.php                                       | 2 +-
 5 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/htdocs/compta/facture/tpl/linkedobjectblockForRec.tpl.php b/htdocs/compta/facture/tpl/linkedobjectblockForRec.tpl.php
index 2e7858fdb08..043778d92c3 100644
--- a/htdocs/compta/facture/tpl/linkedobjectblockForRec.tpl.php
+++ b/htdocs/compta/facture/tpl/linkedobjectblockForRec.tpl.php
@@ -36,7 +36,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';
 ?>
@@ -50,7 +50,11 @@ foreach($linkedObjectBlock as $key => $objectlink)
 			$total = $total + $objectlink->total_ht;
 			echo price($objectlink->total_ht);
 		} ?></td>
-	<td align="right"></td>
+	<td align="right">
+	<?php
+		print $objectlink->getLibStatut(3);
+	?>
+	</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>
 <?php
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 14b1e424469..9a0f30f9a38 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
@@ -42,6 +42,11 @@ ALTER TABLE llx_facture_rec ADD COLUMN suspended integer DEFAULT 0;
 
 ALTER TABLE llx_facture_rec MODIFY COLUMN titre VARCHAR(100);
 
+ALTER TABLE llx_contrat MODIFY COLUMN ref varchar(50);
+ALTER TABLE llx_contrat MODIFY COLUMN ref_customer varchar(50);
+ALTER TABLE llx_contrat MODIFY COLUMN ref_supplier varchar(50);
+ALTER TABLE llx_contrat MODIFY COLUMN ref_ext varchar(50);
+
 
 UPDATE llx_c_email_templates SET position = 0 WHERE position IS NULL;
 
diff --git a/htdocs/install/mysql/tables/llx_contrat.sql b/htdocs/install/mysql/tables/llx_contrat.sql
index 60a6b574d44..67c535ef6f2 100644
--- a/htdocs/install/mysql/tables/llx_contrat.sql
+++ b/htdocs/install/mysql/tables/llx_contrat.sql
@@ -21,10 +21,10 @@
 create table llx_contrat
 (
   rowid						integer AUTO_INCREMENT PRIMARY KEY,
-  ref						varchar(30),		            -- contrat reference
-  ref_customer				varchar(30),		            -- customer contract ref
-  ref_supplier				varchar(30),		            -- supplier contract ref
-  ref_ext					varchar(30),		            -- external contract ref
+  ref						varchar(50),		            -- contrat reference
+  ref_customer				varchar(50),		            -- customer contract ref
+  ref_supplier				varchar(50),		            -- supplier contract ref
+  ref_ext					varchar(50),		            -- external contract ref
   entity					integer DEFAULT 1 NOT NULL,		-- multi company id
   tms						timestamp,
   datec						datetime,                   	-- creation date
diff --git a/htdocs/langs/en_US/other.lang b/htdocs/langs/en_US/other.lang
index 0bf7eff8ed1..b9ce8965d71 100644
--- a/htdocs/langs/en_US/other.lang
+++ b/htdocs/langs/en_US/other.lang
@@ -26,6 +26,8 @@ MessageKO=Message on canceled payment return page
 YearOfInvoice=Year of invoice date
 PreviousYearOfInvoice=Previous year of invoice date
 NextYearOfInvoice=Following year of invoice date
+DateNextInvoiceBeforeGen=Date of next invoice (before generation)
+DateNextInvoiceAfterGen=Date of next invoice (after generation)
 
 Notify_FICHINTER_ADD_CONTACT=Added contact to Intervention
 Notify_FICHINTER_VALIDATE=Intervention validated
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 9e0329b8fa5..06a6b4658ae 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -1970,7 +1970,7 @@ if (! function_exists("llxFooter"))
     		print '<script type="text/javascript">
             	jQuery(document).ready(function () {
             		jQuery(".classfortooltip").tipTip({maxWidth: "'.dol_size(($conf->browser->layout == 'phone' ? 400 : 700),'width').'px", edgeOffset: 10, delay: 50, fadeIn: 50, fadeOut: 50});
-            		jQuery(".classfortooltiponclicktext").dialog({ width: 500, autoOpen: false });
+            		jQuery(".classfortooltiponclicktext").dialog({ width: '.($conf->browser->layout == 'phone' ? 400 : 700).', autoOpen: false });
             		jQuery(".classfortooltiponclick").click(function () {
             		    console.log("We click on tooltip for element with dolid="+$(this).attr(\'dolid\'));
             		    if ($(this).attr(\'dolid\'))