[Koha-cvs] koha/members memberentry.pl [rel_3_0]

[Bruno Toumi]

CVSROOT:	/sources/koha
Module name:	koha
Branch:		rel_3_0
Changes by:	Bruno Toumi <btoumi>	06/10/12 14:12:30

Modified files:
	members        : memberentry.pl 

Log message:
	bug fix for dateof birth test : modify condition use 'and' instead of 'or'
	add string for GetborCatFromCatType SQL request

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/members/memberentry.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.38.2.4&r2=1.38.2.5

Patches:
Index: memberentry.pl
===================================================================
RCS file: /sources/koha/koha/members/memberentry.pl,v
retrieving revision 1.38.2.4
retrieving revision 1.38.2.5
diff -u -b -r1.38.2.4 -r1.38.2.5
--- memberentry.pl	12 Oct 2006 09:41:54 -0000	1.38.2.4
+++ memberentry.pl	12 Oct 2006 14:12:30 -0000	1.38.2.5
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-# $Id: memberentry.pl,v 1.38.2.4 2006/10/12 09:41:54 toins Exp $
+# $Id: memberentry.pl,v 1.38.2.5 2006/10/12 14:12:30 btoumi Exp $
 
 # Copyright 2006 SAN OUEST PROVENCE et Paul POULAIN
 #
@@ -89,7 +89,6 @@
 foreach (@field_check) {
 $template->param( "mandatory$_" => 1);		
 }	
-
 $template->param("add"=>1) if ($op eq 'add');
 $template->param( "checked" => 1) if ($nodouble eq 1);
 ($borrower_data=borrdata('',$borrowernumber)) if($op eq 'modify');
@@ -154,9 +153,7 @@
                 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
-                            or $age < $agelimitmin
-                   ) {
+		if ($age > $agelimitmax and $age < $agelimitmin) {
                         push @errors, 'ERROR_age_limitations';
                         $nok = 1;
                     }
@@ -282,7 +279,8 @@
 	}
 	
 	
-	($categories,$labels)=borrowercategories($category_type,$op);
+	my $action="WHERE category_type=?";
+	($categories,$labels)=GetborCatFromCatType($category_type,$action);
 	
 	#if u modify the borrowers u must have the right value for is category code