From f2a2937c0c2d4aec904d597d854ed9c7f27562e9 Mon Sep 17 00:00:00 2001
From: tipaul <tipaul>
Date: Fri, 6 Jun 2003 10:00:52 +0000
Subject: [PATCH] fir for #208 + bugfix in adding an organisation

---
 insertidata.pl                                |  3 +-
 .../intranet-tmpl/default/en/newimember.tmpl  |  5 +-
 .../intranet-tmpl/default/fr/newimember.tmpl  | 49 +++++++++----------
 3 files changed, 27 insertions(+), 30 deletions(-)
diff --git a/insertidata.pl b/insertidata.pl
index a193f2c0bb..f2558fe3ea 100755
--- a/insertidata.pl
+++ b/insertidata.pl
@@ -73,11 +73,12 @@ if (my $data2=$sth->fetchrow_hashref){
 	now(),'$data{'streetcity'}','$data{'altrelationship'}','$data{'othernames'}',
 	'$data{'phoneday'}','I','$data{'city'}','$data{'area'}','$data{'phone'}',
 	'$data{'borrowernotes'}','$data{'altphone'}','$surname','$data{'initials'}',
-	'$data{'ethnicity'}','$data{'borrowernumber'}','','',$data{'branchcode'},$data{'zipcode'},$data{'homezipcode'})";
+	'$data{'ethnicity'}','$data{'borrowernumber'}','','','$data{'branchcode'}','$data{'zipcode'}','$data{'homezipcode'}')";
 }
 
 #print $query;
 my $sth2=$dbh->prepare($query);
+warn "==> $query";
 $sth2->execute;
 $sth2->finish;
 #$sth->finish;
diff --git a/koha-tmpl/intranet-tmpl/default/en/newimember.tmpl b/koha-tmpl/intranet-tmpl/default/en/newimember.tmpl
index b84732a3d4..928f090e27 100644
--- a/koha-tmpl/intranet-tmpl/default/en/newimember.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/newimember.tmpl
@@ -6,13 +6,14 @@
 	<TMPL_IF NAME=invalid>
 		Invalid cardnumber.<p>
 	<TMPL_ELSE>
+		Valid values. click OK to confirm this new borrower
 		<form action="/cgi-bin/koha/insertidata.pl" method=post>
 			<TMPL_LOOP NAME=inputsloop>
 				<input type=hidden name="<TMPL_VAR NAME="key">" value="<TMPL_VAR NAME="value">">
 			</TMPL_LOOP>
-			<input type=submit name=submit value=submit>
+			<input type=submit name=submit value=OK>
 		</form>
 	</TMPL_IF>
 </TMPL_IF>
 
-<TMPL_INCLUDE NAME="members-bottom.inc">
\ No newline at end of file
+<TMPL_INCLUDE NAME="members-bottom.inc">
diff --git a/koha-tmpl/intranet-tmpl/default/fr/newimember.tmpl b/koha-tmpl/intranet-tmpl/default/fr/newimember.tmpl
index 560f983a84..cb4eb9a374 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/newimember.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/newimember.tmpl
@@ -1,27 +1,22 @@
-<HTML> <TMPL_VAR NAME=startmenumember> <TMPL_IF NAME=missingloop> Les champs obligatoires 
-suivants n'ont pas &eacute;t&eacute; saisis. Veuillez retourner &agrave; la page 
-pr&eacute;c&eacute;dantes et compl&eacute;ter les champs. 
-<p>
-  <UL>
-    <TMPL_LOOP NAME=missingloop>
-    <LI><TMPL_VAR NAME=name>
-    </TMPL_LOOP>
-  </UL><p>
-</TMPL_IF> <TMPL_IF NAME=invalidcardnumber> Num&eacute;ro de carte erron&eacute;. 
-<p>
-</TMPL_IF>
-
-<TMPL_IF NAME=inputsloop>
-  <form action="/cgi-bin/koha/insertidata.pl" method=post>
-  <TMPL_LOOP NAME=inputsloop>
-    <input type=hidden name="<TMPL_VAR NAME=name>" value="<TMPL_VAR NAME=value>">
-  </TMPL_LOOP>
-    
-  <input type=submit name=submit value=Envoyer>
-  </form>
-</TMPL_IF>
-
-<TMPL_VAR NAME=endmenumember>
-
-</body>
-</HTML>
+<TMPL_INCLUDE NAME="members-top.inc">
+
+<TMPL_IF NAME="missingloop">
+	Les champs obligatoires
+	suivants n'ont pas &eacute;t&eacute; saisis. Veuillez retourner &agrave; la page
+	pr&eacute;c&eacute;dantes et compl&eacute;ter les champs.
+	<TMPL_VAR Name="string">
+<TMPL_ELSE>
+	<TMPL_IF NAME=invalid>
+		 Num&eacute;ro de carte erron&eacute;.
+	<TMPL_ELSE>
+		Valeurs correctes. Cliquer sur OK pour valider.
+		<form action="/cgi-bin/koha/insertidata.pl" method=post>
+			<TMPL_LOOP NAME=inputsloop>
+				<input type=hidden name="<TMPL_VAR NAME="key">" value="<TMPL_VAR NAME="value">">
+			</TMPL_LOOP>
+			<input type=submit name=submit value=OK>
+		</form>
+	</TMPL_IF>
+</TMPL_IF>
+
+<TMPL_INCLUDE NAME="members-bottom.inc">
-- 
2.20.1

