Attachment 4065 Details for Bug 6097 – patch signed-off

[patch] patch signed-off

0001-Bug-6097-Overdue_notices-when-no-letter-debarred-act.patch (text/plain), 2.90 KB, created by Paul Poulain on 2011-05-09 16:18:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Paul Poulain

Created: 2011-05-09 16:18:17 UTC

Size: 2.90 KB

patch

obsolete

>From 33d9372acc37c38890f976685b6b325366436663 Mon Sep 17 00:00:00 2001
>From: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
>Date: Wed, 5 Jan 2011 15:35:51 +0100
>Subject: [PATCH] Bug 6097: Overdue_notices : when no letter debarred action not done
>
>When No letter in overduerules,
>if action is debarr... Then the member would not be debarred
>This patch fixes that
>
>Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
>---
> misc/cronjobs/overdue_notices.pl |   22 +++++++++++-----------
> 1 files changed, 11 insertions(+), 11 deletions(-)
>
>diff --git a/misc/cronjobs/overdue_notices.pl b/misc/cronjobs/overdue_notices.pl
>index bc97ecb..9ce8b20 100755
>--- a/misc/cronjobs/overdue_notices.pl
>+++ b/misc/cronjobs/overdue_notices.pl
>@@ -413,11 +413,6 @@ END_SQL
>                 : ($MAX)
>             );                                            # issues being more than maxdays late are managed somewhere else. (borrower probably suspended)
> 
>-            if ( !$overdue_rules->{"letter$i"} ) {
>-                $verbose and warn "No letter$i code for branch '$branchcode'";
>-                next PERIOD;
>-            }
>-
>             # $letter->{'content'} is the text of the mail that is sent.
>             # this text contains fields that are replaced by their value. Those fields must be written between brackets
>             # The following fields are available :
>@@ -458,6 +453,17 @@ END_SQL
>                     $address1, $address2, $city, $postcode, $country, $email,
>                     $longest_issue ) = $sth->fetchrow )
>             {
>+                if ( $overdue_rules->{"debarred$i"} ) {
>+
>+                    #action taken is debarring
>+                    C4::Members::DebarMember( $borrowernumber, '9999-12-31' );
>+                    $verbose and warn "debarring $borrowernumber $firstname $lastname\n";
>+                }
>+                if ( !$overdue_rules->{"letter$i"} ) {
>+                    $verbose and warn "No letter$i code for branch '$branchcode'";
>+                    next PERIOD;
>+                }
>+                
>                 $verbose and warn "borrower $firstname, $lastname ($borrowernumber) has $itemcount items triggering level $i.";
>     
>                 my $letter = C4::Letters::getletter( 'circulation', $overdue_rules->{"letter$i"} );
>@@ -470,12 +476,6 @@ END_SQL
>                     next PERIOD;
>                 }
>     
>-                if ( $overdue_rules->{"debarred$i"} ) {
>-    
>-                    #action taken is debarring
>-                    C4::Members::DebarMember($borrowernumber);
>-                    $verbose and warn "debarring $borrowernumber $firstname $lastname\n";
>-                }
>                 my @params = ($listall ? ( $borrowernumber , 1 , $MAX ) : ( $borrowernumber, $mindays, $maxdays ));
>                 $verbose and warn "STH2 PARAMS: borrowernumber = $borrowernumber, mindays = $mindays, maxdays = $maxdays";
>                 $sth2->execute(@params);
>-- 
>1.7.4.1
>

Actions: View | Diff | Splinter Review

Attachments on bug 6097: 3754 | 4065 | 8086