From 671b4dc22703ab269534649546a8350d912f652f Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Wed, 7 Nov 2018 14:01:49 +0100
Subject: [PATCH 1/2] fix : missing translation

---
 htdocs/adherents/index.php            | 6 +++---
 htdocs/fichinter/card.php             | 2 +-
 htdocs/langs/en_US/interventions.lang | 1 +
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/htdocs/adherents/index.php b/htdocs/adherents/index.php
index 931e9323904..ffe75df1c81 100644
--- a/htdocs/adherents/index.php
+++ b/htdocs/adherents/index.php
@@ -55,7 +55,7 @@ $AdherentsResilies=array();
 
 $AdherentType=array();
 
-// Liste les adherents
+// Members list
 $sql = "SELECT t.rowid, t.libelle as label, t.subscription,";
 $sql.= " d.statut, count(d.rowid) as somme";
 $sql.= " FROM ".MAIN_DB_PREFIX."adherent_type as t";
@@ -92,7 +92,7 @@ if ($result)
 
 $now=dol_now();
 
-// List members up to date
+// Members up to date list
 // current rule: uptodate = the end date is in future whatever is type
 // old rule: uptodate = if type does not need payment, that end date is null, if type need payment that end date is in future)
 $sql = "SELECT count(*) as somme , d.fk_adherent_type";
@@ -140,7 +140,7 @@ if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))     // This is usele
     	foreach($listofsearchfields as $key => $value)
     	{
     		if ($i == 0) print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
-    		print '<tr '.$bc[false].'>';
+    		print '<tr class="oddeven">';
     		print '<td class="nowrap"><label for="'.$key.'">'.$langs->trans($value["text"]).'</label>:</td><td><input type="text" class="flat inputsearch" name="'.$key.'" id="'.$key.'" size="18"></td>';
     		if ($i == 0) print '<td rowspan="'.count($listofsearchfields).'"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td>';
     		print '</tr>';
diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php
index fe15141c86c..23ad91d8831 100644
--- a/htdocs/fichinter/card.php
+++ b/htdocs/fichinter/card.php
@@ -1649,7 +1649,7 @@ else if ($id > 0 || ! empty($ref))
 		    		// create interventional model
 				if ($object->statut == Fichinter::STATUS_DRAFT && $user->rights->ficheinter->creer && (count($object->lines) > 0)) {
 					print '<div class="inline-block divButAction">';
-					print '<a class="butAction" href="'.DOL_URL_ROOT.'/fichinter/card-rec.php?id='.$object->id.'&action=create">'.$langs->trans("ChangeIntoRepeatableInterventional").'</a>';
+					print '<a class="butAction" href="'.DOL_URL_ROOT.'/fichinter/card-rec.php?id='.$object->id.'&action=create">'.$langs->trans("ChangeIntoRepeatableIntervention").'</a>';
 					print '</div>';
 				}
 
diff --git a/htdocs/langs/en_US/interventions.lang b/htdocs/langs/en_US/interventions.lang
index 604d51c41b9..a130367b14f 100644
--- a/htdocs/langs/en_US/interventions.lang
+++ b/htdocs/langs/en_US/interventions.lang
@@ -4,6 +4,7 @@ Interventions=Interventions
 InterventionCard=Intervention card
 NewIntervention=New intervention
 AddIntervention=Create intervention
+ChangeIntoRepeatableIntervention=Change to repeatable intervention
 ListOfInterventions=List of interventions
 ActionsOnFicheInter=Actions on intervention
 LastInterventions=Latest %s interventions

From f6394e4210248cb765d80ac58bab719a3dea37b4 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Wed, 7 Nov 2018 15:07:57 +0100
Subject: [PATCH 2/2] fix : error 500

---
 htdocs/fichinter/card.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php
index 23ad91d8831..cd172888a28 100644
--- a/htdocs/fichinter/card.php
+++ b/htdocs/fichinter/card.php
@@ -7,6 +7,7 @@
  * Copyright (C) 2014-2018  Ferran Marcet           <fmarcet@2byte.es>
  * Copyright (C) 2014-2018  Charlene Benke          <charlies@patas-monkey.com>
  * Copyright (C) 2015-2016  Abbes Bahfir            <bafbes@gmail.com>
+ * Copyright (C) 2018 		Philippe Grand       	<philippe.grand@atoo-net.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -1646,10 +1647,12 @@ else if ($id > 0 || ! empty($ref))
 					else print '<div class="inline-block divButAction"><a class="butActionRefused" href="#">'.$langs->trans('SendMail').'</a></div>';
 				}
 
-		    		// create interventional model
+		    	// create intervention model
 				if ($object->statut == Fichinter::STATUS_DRAFT && $user->rights->ficheinter->creer && (count($object->lines) > 0)) {
 					print '<div class="inline-block divButAction">';
-					print '<a class="butAction" href="'.DOL_URL_ROOT.'/fichinter/card-rec.php?id='.$object->id.'&action=create">'.$langs->trans("ChangeIntoRepeatableIntervention").'</a>';
+					// This feature is not yet implemented
+					//print '<a class="butAction" href="'.DOL_URL_ROOT.'/fichinter/card-rec.php?id='.$object->id.'&action=create">'.$langs->trans("ChangeIntoRepeatableIntervention").'</a>';
+					print '<a class="butAction" title="'.$langs->trans("ChangeIntoRepeatableIntervention").'" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'">'.$langs->trans("not yet implemented").'</a>';
 					print '</div>';
 				}