[Koha-cvs] koha/C4 Members.pm [rel_3_0]

[Henri-Damien LAURENT]

CVSROOT:        /cvsroot/koha
Module name:    koha
Branch:         rel_3_0
Changes by:     Henri-Damien LAURENT <hdl>      07/02/27 10:16:47

Modified files:
        C4             : Members.pm 

Log message:
        Bug Fixing calcexpiredate Had a problem.
        Using Date::Calc now

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Members.pm?cvsroot=koha&only_with_tag=rel_3_0&r1=1.32.2.29&r2=1.32.2.30

Patches:
Index: Members.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Members.pm,v
retrieving revision 1.32.2.29
retrieving revision 1.32.2.30
diff -u -b -r1.32.2.29 -r1.32.2.30
--- Members.pm  25 Jan 2007 10:27:14 -0000      1.32.2.29
+++ Members.pm  27 Feb 2007 10:16:47 -0000      1.32.2.30
@@ -17,20 +17,19 @@
 # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
 # Suite 330, Boston, MA  02111-1307 USA
 
-# $Id: Members.pm,v 1.32.2.29 2007/01/25 10:27:14 tipaul Exp $
+# $Id: Members.pm,v 1.32.2.30 2007/02/27 10:16:47 hdl Exp $
 
 use strict;
 require Exporter;
 use C4::Context;
-use Date::Manip;
 use C4::Date;
 use Digest::MD5 qw(md5_base64);
-use Date::Calc qw/Today/;
+use Date::Calc qw/Today Add_Delta_YM/;
 use C4::Log; # logaction
 
 use vars qw($VERSION @ISA @EXPORT @EXPORT_OK);
 
-$VERSION = do { my @v = '$Revision: 1.32.2.29 $' =~ /\d+/g; shift(@v) . "." . 
join( "_", map { sprintf "%03d", $_ } @v ); };
+$VERSION = do { my @v = '$Revision: 1.32.2.30 $' =~ /\d+/g; shift(@v) . "." . 
join( "_", map { sprintf "%03d", $_ } @v ); };
 
 =head1 NAME
 
@@ -1194,8 +1193,12 @@
     $sth->execute($categorycode);
     my ($enrolmentperiod) = $sth->fetchrow;
     $enrolmentperiod = 12 unless ($enrolmentperiod);
-    return format_date_in_iso(
-        &DateCalc( $dateenrolled, "$enrolmentperiod months" ) );
+#     warn "Avant format_date_in_iso :".$dateenrolled;
+#     $dateenrolled=format_date_in_iso($dateenrolled);
+#     warn "Apres format_date_in_iso :".$dateenrolled;
+    my @date=split /-/,format_date_in_iso($dateenrolled);
+    @date=Add_Delta_YM($date[0],$date[1],$date[2],0,$enrolmentperiod);
+    return sprintf("%04d-%02d-%02d",$date[0],$date[1],$date[2]);
 }
 
 =head2 checkuserpassword (OUEST-PROVENCE)
@@ -1598,8 +1601,7 @@
     if ( $mday < '10' ) {
         $mday = "0" . $mday;
     }
-    my $today = format_date("$year-$mon-$mday");
-    $today = format_date_in_iso($today);
+    my $today = sprintf("%04d-%02d-%02d",$year,$mon,$mday);
     my $dateexpiry = calcexpirydate( $categorycode, $today );
     my $query      = qq|   UPDATE borrowers 
                        SET  dateexpiry='$dateexpiry'