From 9a2677f401d83064448594880bdcd57a85cb8038 Mon Sep 17 00:00:00 2001
From: btoumi <btoumi>
Date: Thu, 22 Jun 2006 10:07:49 +0000
Subject: [PATCH] Members.pm ,memberentry(A)(P)(C).tmpl,memberentry.pl:bug fix
 with wrong field name memberentry.pl:translate  title in english ;=) (i hope
 is ok) buf fix with bad condition

---
 C4/Members.pm                                 | 14 ++++----
 .../prog/en/members/memberentryA.tmpl         | 24 +++++++-------
 .../prog/en/members/memberentryC.tmpl         | 18 +++++------
 .../prog/en/members/memberentryP.tmpl         | 32 +++++++++----------
 members/memberentry.pl                        | 20 ++++++------
 5 files changed, 54 insertions(+), 54 deletions(-)

diff --git a/C4/Members.pm b/C4/Members.pm
index 201901497f..47642b8d48 100644
--- a/C4/Members.pm
+++ b/C4/Members.pm
@@ -466,15 +466,15 @@ sub newmember {
       . ",contactnote="
       . $dbh->quote( $data{'contactnote'} )
       . ",B_address="
-      . $dbh->quote( $data{'b_address'} )
+      . $dbh->quote( $data{'B_address'} )
       . ",B_zipcode="
-      . $dbh->quote( $data{'b_zipcode'} )
+      . $dbh->quote( $data{'B_zipcode'} )
       . ",B_city="
-      . $dbh->quote( $data{'b_city'} )
+      . $dbh->quote( $data{'B_city'} )
       . ",B_phone="
-      . $dbh->quote( $data{'b_phone'} )
+      . $dbh->quote( $data{'B_phone'} )
       . ",B_email="
-      . $dbh->quote( $data{'b_email'}, )
+      . $dbh->quote( $data{'B_email'}, )
       . ",password="
       . $dbh->quote( $data{'password'} )
       . ",userid="
@@ -498,9 +498,9 @@ sub newmember {
       . ",relationship="
       . $dbh->quote( $data{'relationship'} )
       . ",B_streetnumber="
-      . $dbh->quote( $data{'b_streetnumber'}) 
+      . $dbh->quote( $data{'B_streetnumber'}) 
       . ",B_streettype="
-      . $dbh->quote( $data{'b_streettype'})
+      . $dbh->quote( $data{'B_streettype'})
       . ",gonenoaddress="
       . $dbh->quote( $data{'gonenoaddress'})	
       . ",lost="
diff --git a/koha-tmpl/intranet-tmpl/prog/en/members/memberentryA.tmpl b/koha-tmpl/intranet-tmpl/prog/en/members/memberentryA.tmpl
index 4cf10434ff..42b3291f59 100755
--- a/koha-tmpl/intranet-tmpl/prog/en/members/memberentryA.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/members/memberentryA.tmpl
@@ -73,9 +73,9 @@
 	<input type="hidden" name="zipcode"  value="<!-- TMPL_VAR NAME="zipcode" -->">
 	<input type="hidden" name="city"  value="<!-- TMPL_VAR NAME="city" -->">	
 	<input type="hidden" name="branchcode"  value="<!-- TMPL_VAR NAME="branchcode" -->">
-	<input type="hidden" name="b_address"  value="<!-- TMPL_VAR NAME="b_address" -->">
-	<input type="hidden" name="b_zipcode"  value="<!-- TMPL_VAR NAME="b_zipcode" -->">
-	<input type="hidden" name="b_city"  value="<!-- TMPL_VAR NAME="b_city" -->">	
+	<input type="hidden" name="B_address"  value="<!-- TMPL_VAR NAME="B_address" -->">
+	<input type="hidden" name="B_zipcode"  value="<!-- TMPL_VAR NAME="B_zipcode" -->">
+	<input type="hidden" name="B_city"  value="<!-- TMPL_VAR NAME="B_city" -->">	
 	<input type="hidden" name="phone"   value="<!-- TMPL_VAR NAME="phone" -->" >
 	<input type="hidden" name="phonepro" value="<!-- TMPL_VAR NAME="phonepro" -->" >
 	<input type="hidden" name="mobile"  value="<!-- TMPL_VAR NAME="mobile" -->" >	
@@ -349,31 +349,31 @@
 		<fieldset>
 		<legend>Alt Address</legend>
 			<p>
-				<!-- TMPL_IF NAME="mandatoryb_address" -->
+				<!-- TMPL_IF NAME="mandatoryB_address" -->
 					<label style="font-weight:bold">
 				<!--TMPL_ELSE-->
 					<label>
 				<!-- /TMPL_IF-->
 				Address</label>
-				<input type="text" name="b_address" size="40" value="<!-- TMPL_VAR NAME="b_address" -->">
+				<input type="text" name="B_address" size="40" value="<!-- TMPL_VAR NAME="B_address" -->">
 			</p>
 			<p>
-				<!-- TMPL_IF NAME="mandatoryb_zipcode" -->
+				<!-- TMPL_IF NAME="mandatoryB_zipcode" -->
 					<label style="font-weight:bold">
 				<!--TMPL_ELSE-->
 					<label>
 				<!-- /TMPL_IF-->
 				Zipcode</label>
-				<input type="text" name="b_zipcode" maxlength="5" size="5" value="<!-- TMPL_VAR NAME="b_zipcode" -->">
+				<input type="text" name="B_zipcode" maxlength="5" size="5" value="<!-- TMPL_VAR NAME="B_zipcode" -->">
 			</p>
 			<p>
-				<!-- TMPL_IF NAME="mandatoryb_city" -->
+				<!-- TMPL_IF NAME="mandatoryB_city" -->
 					<label style="font-weight:bold" >
 				<!--TMPL_ELSE-->
 					<label>
 				<!-- /TMPL_IF-->
 				City</label>
-				<input type="text" style="text-transform:uppercase;" name="b_city" size="20" value="<!-- TMPL_VAR NAME="b_city" -->">
+				<input type="text" style="text-transform:uppercase;" name="B_city" size="20" value="<!-- TMPL_VAR NAME="B_city" -->">
 			</p>
 		</fieldset>
 	</fieldset>
@@ -496,9 +496,9 @@
 	<input type="hidden" name="zipcode"  value="<!-- TMPL_VAR NAME="zipcode" -->">
 	<input type="hidden" name="city"  value="<!-- TMPL_VAR NAME="city" -->">	
 	<input type="hidden" name="branchcode"  value="<!-- TMPL_VAR NAME="branchcode" -->">
-	<input type="hidden" name="b_address"  value="<!-- TMPL_VAR NAME="b_address" -->">
-	<input type="hidden" name="b_zipcode"  value="<!-- TMPL_VAR NAME="b_zipcode" -->">
-	<input type="hidden" name="b_city"  value="<!-- TMPL_VAR NAME="b_city" -->">	
+	<input type="hidden" name="B_address"  value="<!-- TMPL_VAR NAME="B_address" -->">
+	<input type="hidden" name="B_zipcode"  value="<!-- TMPL_VAR NAME="B_zipcode" -->">
+	<input type="hidden" name="B_city"  value="<!-- TMPL_VAR NAME="B_city" -->">	
 	<input type="hidden" name="phone"   value="<!-- TMPL_VAR NAME="phone" -->" >
 	<input type="hidden" name="phonepro" value="<!-- TMPL_VAR NAME="phonepro" -->" >
 	<input type="hidden" name="mobile"  value="<!-- TMPL_VAR NAME="mobile" -->" >	
diff --git a/koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl b/koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl
index c2bb81ed70..5f8c2beb6f 100755
--- a/koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl
@@ -79,8 +79,8 @@
 			<input type="hidden" name="mobile" size="10" value="<!-- TMPL_VAR NAME="mobile" -->" >	
 			<input type="hidden" name="email" value="<!-- TMPL_VAR NAME="email" -->" >
 			<input type="hidden" name="emailpro" value="<!-- TMPL_VAR NAME="emailpro" -->" >
-			<input type="hidden" name="b_email" value="<!-- TMPL_VAR NAME="b_email" -->" >	
-			<input type="hidden" name="b_phone" value="<!-- TMPL_VAR NAME="b_phone" -->" >
+			<input type="hidden" name="B_email" value="<!-- TMPL_VAR NAME="B_email" -->" >	
+			<input type="hidden" name="B_phone" value="<!-- TMPL_VAR NAME="B_phone" -->" >
 			<input type="hidden" name="fax" value="<!-- TMPL_VAR NAME="fax" -->" >	
 
 			<!-- 		input from form3		 -->
@@ -244,7 +244,7 @@
 	<form name="form" action="/cgi-bin/koha/members/memberentry.pl" method="post">
 <!-- 		field always hidden in different form (1,2,3) -->
 		<input type="hidden" name="BorrowerMandatoryfield" value="<!--TMPL_VAR NAME="BorrowerMandatoryfield"-->">
-		<input type="hidden" name="FormFieldList" value="streetnumber|address|address2|zipcode|contacttitle|city|contactname|contactfirstname|branchcode|phone|phonepro|mobile|email|emailpro|b_email|b_phone">
+		<input type="hidden" name="FormFieldList" value="streetnumber|address|address2|zipcode|contacttitle|city|contactname|contactfirstname|branchcode|phone|phonepro|mobile|email|emailpro|B_email|B_phone">
 		<input type="hidden" name="category_type" value="<!-- TMPL_VAR name="category_type" -->">
 		<input type="hidden" name="type" value="borrowers">
 		<input type="hidden" name="step" value="<!-- TMPL_VAR NAME="step" -->">
@@ -469,20 +469,20 @@
 	</p>
 	<h2>Member</h2>
 	<p>	
-		<!-- TMPL_IF NAME="mandatoryb_email" -->
+		<!-- TMPL_IF NAME="mandatoryB_email" -->
 			<label  class="borrowers_mandafield">
 		<!--TMPL_ELSE-->
 			<label>
 		<!-- /TMPL_IF-->
 		E-mail (home)</label>
-		<input type="text" name="b_email" value="<!-- TMPL_VAR NAME="b_email" -->" >	
-		<!-- TMPL_IF NAME="mandatoryb_phone" -->
+		<input type="text" name="B_email" value="<!-- TMPL_VAR NAME="B_email" -->" >	
+		<!-- TMPL_IF NAME="mandatoryB_phone" -->
 			<label  class="borrowers_mandafield">
 		<!--TMPL_ELSE-->
 			<label>
 		<!-- /TMPL_IF-->
 		Phone (cell)</label>	
-		<input type="text" name="b_phone" value="<!-- TMPL_VAR NAME="b_phone" -->" >			
+		<input type="text" name="B_phone" value="<!-- TMPL_VAR NAME="B_phone" -->" >			
 	</p>
 	</fieldset>
 	<div>
@@ -538,8 +538,8 @@
 		<input type="hidden" name="mobile" size="10" value="<!-- TMPL_VAR NAME="mobile" -->" >	
 		<input type="hidden" name="email" value="<!-- TMPL_VAR NAME="email" -->" >
 		<input type="hidden" name="emailpro" value="<!-- TMPL_VAR NAME="emailpro" -->" >
-		<input type="hidden" name="b_email" value="<!-- TMPL_VAR NAME="b_email" -->" >	
-		<input type="hidden" name="b_phone" value="<!-- TMPL_VAR NAME="b_phone" -->" >
+		<input type="hidden" name="B_email" value="<!-- TMPL_VAR NAME="B_email" -->" >	
+		<input type="hidden" name="B_phone" value="<!-- TMPL_VAR NAME="B_phone" -->" >
 		<input type="hidden" name="fax" value="<!-- TMPL_VAR NAME="fax" -->" >	
 		
 		<!-- TMPL_IF NAME="opadd" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/members/memberentryP.tmpl b/koha-tmpl/intranet-tmpl/prog/en/members/memberentryP.tmpl
index 50da94fe16..69080d3972 100755
--- a/koha-tmpl/intranet-tmpl/prog/en/members/memberentryP.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/members/memberentryP.tmpl
@@ -76,10 +76,10 @@
 		<input type="hidden" name="emailpro" value="<!-- TMPL_VAR NAME="emailpro" -->" >
 		<input type="hidden" name="contactname"  value="<!-- TMPL_VAR NAME="contactname" -->">
 		<input type="hidden" name="relationship"  value="<!-- TMPL_VAR NAME="relationship" -->">
-		<input type="hidden" name="b_address" value="<!-- TMPL_VAR NAME="b_address" -->">
-		<input type="hidden" name="b_zipcode"  value="<!-- TMPL_VAR NAME="b_zipcode" -->">
-		<input type="hidden" name="b_city"  value="<!-- TMPL_VAR NAME="b_city" -->">
-		<input type="hidden" name="b_phone"  value="<!-- TMPL_VAR NAME="b_phone" -->"> 
+		<input type="hidden" name="B_address" value="<!-- TMPL_VAR NAME="B_address" -->">
+		<input type="hidden" name="B_zipcode"  value="<!-- TMPL_VAR NAME="B_zipcode" -->">
+		<input type="hidden" name="B_city"  value="<!-- TMPL_VAR NAME="B_city" -->">
+		<input type="hidden" name="B_phone"  value="<!-- TMPL_VAR NAME="B_phone" -->"> 
 		<input type="hidden" name="fax"  value="<!-- TMPL_VAR NAME="fax" -->"> 	
 		<textarea style="display:none;" name="contactnotes" cols="70" rows="3"  ><!-- TMPL_VAR NAME="contactnotes" --></textarea>
 
@@ -442,39 +442,39 @@
 			</select>
 		</p>
 		<p>
-			<!-- TMPL_IF NAME="mandatoryb_address" -->
+			<!-- TMPL_IF NAME="mandatoryB_address" -->
 				<label class="borrowers_mandafield">
 			<!-- TMPL_ELSE -->
 				<label>
 			<!-- /TMPL_IF-->
 			Adress </label>
-			<input type="text" name="b_address" size="40" value="<!-- TMPL_VAR NAME="b_address" -->">
+			<input type="text" name="B_address" size="40" value="<!-- TMPL_VAR NAME="B_address" -->">
 		</p>
 		<p>
-			<!-- TMPL_IF NAME="mandatoryb_zipcode" -->
+			<!-- TMPL_IF NAME="mandatoryB_zipcode" -->
 			<label class="borrowers_mandafield">
 			<!-- TMPL_ELSE -->
 			<label>
 			<!-- /TMPL_IF-->	
 			Zipcode</label>
-			<input type="text" maxlength="5" name="b_zipcode" size="5" value="<!-- TMPL_VAR NAME="b_zipcode" -->">
+			<input type="text" maxlength="5" name="B_zipcode" size="5" value="<!-- TMPL_VAR NAME="B_zipcode" -->">
 		</p>
-			<!-- TMPL_IF NAME="mandatoryb_city" -->
+			<!-- TMPL_IF NAME="mandatoryB_city" -->
 				<label class="borrowers_mandafield">
 			<!-- TMPL_ELSE -->
 				<label>
 			<!-- /TMPL_IF-->
 			City</label>
-			<input style="text-transform:uppercase;" type="text" name="b_city" size="20" value="<!-- TMPL_VAR NAME="b_city" -->">
+			<input style="text-transform:uppercase;" type="text" name="B_city" size="20" value="<!-- TMPL_VAR NAME="B_city" -->">
 		</p>
 		<p>
-			<!-- TMPL_IF NAME="mandatoryb_phone" -->
+			<!-- TMPL_IF NAME="mandatoryB_phone" -->
 				<label class="borrowers_mandafield">
 			<!-- TMPL_ELSE -->
 				<label>
 			<!-- /TMPL_IF-->
 			Phone (home)</label>
-			<input type="text" name="b_phone" size="20" value="<!-- TMPL_VAR NAME="b_phone" -->">
+			<input type="text" name="B_phone" size="20" value="<!-- TMPL_VAR NAME="B_phone" -->">
 		</p>
 		<p>
 			<!-- TMPL_IF NAME="mandatorycontactnotes" -->
@@ -540,10 +540,10 @@
 		<input type="hidden" name="emailpro" value="<!-- TMPL_VAR NAME="emailpro" -->" >
 		<input type="hidden" name="contactname"  value="<!-- TMPL_VAR NAME="contactname" -->">
 		<input type="hidden" name="relationship"  value="<!-- TMPL_VAR NAME="relationship" -->">
-		<input type="hidden" name="b_address" value="<!-- TMPL_VAR NAME="b_address" -->">
-		<input type="hidden" name="b_zipcode"  value="<!-- TMPL_VAR NAME="b_zipcode" -->">
-		<input type="hidden" name="b_city"  value="<!-- TMPL_VAR NAME="b_city" -->">
-		<input type="hidden" name="b_phone"  value="<!-- TMPL_VAR NAME="b_phone" -->"> 
+		<input type="hidden" name="B_address" value="<!-- TMPL_VAR NAME="B_address" -->">
+		<input type="hidden" name="B_zipcode"  value="<!-- TMPL_VAR NAME="B_zipcode" -->">
+		<input type="hidden" name="B_city"  value="<!-- TMPL_VAR NAME="B_city" -->">
+		<input type="hidden" name="B_phone"  value="<!-- TMPL_VAR NAME="B_phone" -->"> 
 		<input type="hidden" name="fax"  value="<!-- TMPL_VAR NAME="fax" -->"> 	
 		<textarea style="display:none;" name="contactnotes" cols="70" rows="3"  ><!-- TMPL_VAR NAME="contactnotes" --></textarea>
 	
diff --git a/members/memberentry.pl b/members/memberentry.pl
index 0d09c40140..785e31fe7f 100755
--- a/members/memberentry.pl
+++ b/members/memberentry.pl
@@ -145,7 +145,7 @@ if ($category_type eq 'C' and $guarantorid ne '' ){
 			$data{'city'}= $borrower_city;
 			$data{'zipcode'}=$borrower_zipcode;
 		}
-                if ($categorycode ne 'I') {
+                if ($category_type ne 'I') {
                 my $age = get_age(format_date_in_iso($data{dateofbirth}));
                 my (undef,$agelimitmin,$agelimitmax,undef)=getborrowercategory($data{'categorycode'});   
 		if ($age > $agelimitmax
@@ -324,9 +324,9 @@ if ($delete){
 		}
 		push(@relshipdata, \%row);
 	}
-	my %flags = ( 'gonenoaddress' => ['gonenoaddress', 'Adresse érronée'],
-		      'lost'          => ['lost', 'Carte Perdue'],
-		      'debarred'      => ['debarred', 'Lecteur exclu']);
+	my %flags = ( 'gonenoaddress' => ['gonenoaddress', 'Gone no address '],
+		      'lost'          => ['lost', 'Lost'],
+		      'debarred'      => ['debarred', 'Debarred']);
 
 	my @flagdata;
 	foreach (keys(%flags)) {
@@ -437,7 +437,7 @@ if ($delete){
             foreach my $error (@errors) {
                 $template->param( $error => 1);
             }
-            $template->param(nok => 1);
+            	$template->param(nok => 1);
         }
         else {
             $step++;
@@ -476,11 +476,11 @@ if ($delete){
 		fax		=> $data{'fax'},
 		phonepro        => $data{'phonepro'},
 		emailpro	=> $data{'emailpro'},
-		b_address   	=> $data{'b_address'},
-		b_city     	=> $data{'b_city'},
-		b_zipcode 	=> $data{'b_zipcode'},
-		b_email		=> $data{'b_email'},
-		b_phone        => $data{'b_phone'},
+		B_address   	=> $data{'B_address'},
+		B_city     	=> $data{'B_city'},
+		B_zipcode 	=> $data{'B_zipcode'},
+		B_email		=> $data{'B_email'},
+		B_phone        => $data{'B_phone'},
 		dateofbirth	=> $data{'dateofbirth'},
 		branchcode      => $data{'branchcode'},
 		catcodepopup	=> $catcodepopup,
-- 
2.39.2