[Koha-cvs] koha acqui/lateorders.pl C4/Letters.pm [rel_3_0]

[paul poulain]

CVSROOT:        /sources/koha
Module name:    koha
Branch:         rel_3_0
Changes by:     paul poulain <tipaul>   07/01/25 09:35:35

Modified files:
        acqui          : lateorders.pl 
        C4             : Letters.pm 

Log message:
        bugfixing lateorders : claiming late orders now works, and is properly 
encoded (utf8).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/acqui/lateorders.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.6.2.2&r2=1.6.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Letters.pm?cvsroot=koha&only_with_tag=rel_3_0&r1=1.4.2.8&r2=1.4.2.9

Patches:
Index: acqui/lateorders.pl
===================================================================
RCS file: /sources/koha/koha/acqui/lateorders.pl,v
retrieving revision 1.6.2.2
retrieving revision 1.6.2.3
diff -u -b -r1.6.2.2 -r1.6.2.3
--- acqui/lateorders.pl 14 Dec 2006 15:41:54 -0000      1.6.2.2
+++ acqui/lateorders.pl 25 Jan 2007 09:35:35 -0000      1.6.2.3
@@ -15,7 +15,7 @@
 # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
 # Suite 330, Boston, MA  02111-1307 USA
 
-# $Id: lateorders.pl,v 1.6.2.2 2006/12/14 15:41:54 toins Exp $
+# $Id: lateorders.pl,v 1.6.2.3 2007/01/25 09:35:35 tipaul Exp $
 
 =head1 NAME
 
@@ -90,22 +90,6 @@
 
 $template->param(Supplier=>$supplierlist{$supplierid}) if ($supplierid);
 
-my $branches = GetBranches;
-
-my @branchloop;
-foreach my $thisbranch (sort keys %$branches) {
-       my %row =(value => $thisbranch,
-                               branchname => 
$branches->{$thisbranch}->{'branchname'},
-                       );
-       push @branchloop, \%row;
-}
-my $CGIbranch=CGI::scrolling_list( -name     => 'branch',
-                               -values   => address@hidden,
-                               -labels   => $branches,
-                               -size     => 1,
-                               -tabindex=>'',
-                               -multiple => 0 );
-
 my @lateorders = GetLateOrders($delay,$supplierid,$branch);
 my $count = scalar @lateorders;
 
@@ -129,7 +113,6 @@
 
 $template->param(delay=>$delay) if ($delay);
 $template->param(
-       branchloop => address@hidden,
        CGIsupplier => $CGIsupplier,
        lateorders => address@hidden,
        total=>$total,

Index: C4/Letters.pm
===================================================================
RCS file: /sources/koha/koha/C4/Letters.pm,v
retrieving revision 1.4.2.8
retrieving revision 1.4.2.9
diff -u -b -r1.4.2.8 -r1.4.2.9
--- C4/Letters.pm       12 Jan 2007 18:11:06 -0000      1.4.2.8
+++ C4/Letters.pm       25 Jan 2007 09:35:35 -0000      1.4.2.9
@@ -30,7 +30,7 @@
 use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
 
 # set the version for version checking
-$VERSION = do { my @v = '$Revision: 1.4.2.8 $' =~ /\d+/g;
+$VERSION = do { my @v = '$Revision: 1.4.2.9 $' =~ /\d+/g;
     shift(@v) . "." . join( "_", map { sprintf "%03d", $_ } @v );
 };
 
@@ -301,6 +301,7 @@
                         From => $userenv->{emailaddress},
                         Subject => "".$innerletter->{title},
                         Message => "".$innerletter->{content},
+                        'Content-Type' => 'text/plain; charset="utf8"',
                         );
             sendmail(%mail);
                        warn "sending to $mail{To} From $mail{From} subj 
$mail{Subject} Mess $mail{Message}";
@@ -308,7 +309,6 @@
         if (C4::Context->preference("LetterLog")){
            logaction($userenv->{number},"ACQUISITION","Send Acquisition claim 
letter","","order list : 
".join(",",@$externalid)."\n$innerletter->{title}\n$innerletter->{content}")
         }
-               warn "sending to From $userenv->{emailaddress} subj 
$innerletter->{title} Mess $innerletter->{content}";
     }
        elsif ($type eq 'claimissues') {
 #              warn "sending issues...";