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

[Henri-Damien LAURENT]

CVSROOT:        /cvsroot/koha
Module name:    koha
Branch:         rel_3_0
Changes by:     Henri-Damien LAURENT <hdl>      07/02/13 14:55:41

Modified files:
        C4             : Date.pm 
        members        : memberentry.pl 

Log message:
        Adding a check_whether_iso function in Date.pm so that ISO Dates would 
be returned unchanged when using format_date_in_iso.
        
        Adding Demoving age check if dateofbirth is empty or dateofbirth not in 
mandatory fields.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Date.pm?cvsroot=koha&only_with_tag=rel_3_0&r1=1.18.2.1&r2=1.18.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/members/memberentry.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.38.2.25&r2=1.38.2.26

Patches:
Index: C4/Date.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Date.pm,v
retrieving revision 1.18.2.1
retrieving revision 1.18.2.2
diff -u -b -r1.18.2.1 -r1.18.2.2
--- C4/Date.pm  26 Jan 2007 20:48:36 -0000      1.18.2.1
+++ C4/Date.pm  13 Feb 2007 14:55:41 -0000      1.18.2.2
@@ -100,7 +100,9 @@
         {
                 return "";
         }
-                
+    if (check_whether_iso($olddate)){
+      return $olddate;
+    } else {
         my $dateformat = get_date_format();
         my ($year,$month,$day);
         my @date;
@@ -138,9 +140,16 @@
         {
            return "9999-99-99";
         }
-
        $newdate = sprintf("%04d-%02d-%02d",$date[0],$date[1],$date[2]);
-
        return $newdate;
+    }
+}
+
+sub check_whether_iso
+{
+    my $olddate = shift;
+    my @olddate= split /\-/,$olddate ;
+       return 1 if (length($olddate[0])==4 && length($olddate[0])<=2 && 
length($olddate[0])<=2);
+       return 0;
 }
 1;

Index: members/memberentry.pl
===================================================================
RCS file: /cvsroot/koha/koha/members/memberentry.pl,v
retrieving revision 1.38.2.25
retrieving revision 1.38.2.26
diff -u -b -r1.38.2.25 -r1.38.2.26
--- members/memberentry.pl      5 Feb 2007 15:25:01 -0000       1.38.2.25
+++ members/memberentry.pl      13 Feb 2007 14:55:41 -0000      1.38.2.26
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-# $Id: memberentry.pl,v 1.38.2.25 2007/02/05 15:25:01 toins Exp $
+# $Id: memberentry.pl,v 1.38.2.26 2007/02/13 14:55:41 hdl Exp $
 
 # Copyright 2006 SAN OUEST PROVENCE et Paul POULAIN
 #
@@ -151,10 +151,10 @@
                        $data{'city'}= $borrower_city;
                        $data{'zipcode'}=$borrower_zipcode;
                        }
-                       
-                       
                }
-                if ($category_type ne 'I') {
+        my $dateofbirthmandatory=0;
+        map {$dateofbirthmandatory=1 if $_ eq "dateofbirth"} @field_check;
+        if ($category_type ne 'I' && $data{dateofbirth} && 
$dateofbirthmandatory) {
                 my $age = get_age(format_date_in_iso($data{dateofbirth}));
                 my 
(undef,$agelimitmin,$agelimitmax,undef)=getborrowercategory($data{'categorycode'});
   
                if (($age > $agelimitmax) or ($age < $agelimitmin)) {
@@ -391,12 +391,10 @@
                        push @select_branch, $branch;
                        $select_branches{$branch} = 
$branches->{$branch}->{'branchname'};
                        $default=C4::Context->userenv->{'branch'};
-                       
                        } else {
                                push @select_branch,$branch if ($branch eq 
C4::Context->userenv->{'branch'});
                                $select_branches{$branch} = 
$branches->{$branch}->{'branchname'} if ($branch eq 
C4::Context->userenv->{'branch'});
                                $default = C4::Context->userenv->{'branch'};
-                                       
                                }
        }
 # 
--------------------------------------------------------------------------------------------------------