This is a stop-gap fix intended for 3.0 maintenance release.
3.2 should include a label_batches table which will allow named
batches to be associated with a template & layout, and fix the
column definition of batch_id here to be an auto_incr int.
---
C4/Labels.pm | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/C4/Labels.pm b/C4/Labels.pm
index 6531164..b162010 100644
--- a/C4/Labels.pm
+++ b/C4/Labels.pm
@@ -275,7 +275,9 @@ sub add_batch ($;$) {
my $table = (@_ and 'patroncards' eq shift) ? 'patroncards' : 'labels';
my $batch_list = (@_) ? shift : undef;
my $dbh = C4::Context->dbh;
- my $q ="SELECT MAX(DISTINCT batch_id) FROM $table";
+ # FIXME : batch_id should be an auto_incr INT. Temporarily casting as
int ( see koha bug 2555 )
+ # until a label_batches table is added, and we can convert batch_id to int.
+ my $q ="SELECT MAX( CAST(batch_id AS SIGNED) ) FROM $table";
my $sth = $dbh->prepare($q);
$sth->execute();
my ($batch_id) = $sth->fetchrow_array || 0;
@@ -1108,7 +1110,8 @@ sub DrawSpineText {
} else {
$hPos = ( $x_pos + $left_text_margin );
}
- PrintText( $hPos, $vPos, $font, $fontsize, $str );
+ use Encode;
+ PrintText( $hPos, $vPos, $font, $fontsize, encode('utf8',$str)
);
$vPos = $vPos - $line_spacer;
}
}
--
1.5.5.GIT
_______________________________________________
Koha-patches mailing list
[email protected]
http://lists.koha.org/mailman/listinfo/koha-patches
