Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

Bug 5865 - Labels wrap incorrectly when paper width is greater than height

Browse source 
This is due to the incorrect use of string comparators to compare numeric values.
This patch corrects that.

Note: This should be backported to 3.2.x

Signed-off-by: Jared Camins-Esakov <jcamins@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
This commit is contained in:
Chris Nighswonger 2011-03-14 16:27:17 -04:00 committed by Chris Cormack
parent 76d52d89e4
commit 5a924cc530
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
labels/label-create-pdf.pl
View file

@ -33,13 +33,13 @@ my $layout = C4::Labels::Layout->retrieve(layout_id => $layout_id);
sub _calc_next_label_pos { sub _calc_next_label_pos {
my ($row_count, $col_count, $llx, $lly) = @_; my ($row_count, $col_count, $llx, $lly) = @_;
if ($col_count lt $template->get_attr('cols')) { if ($col_count < $template->get_attr('cols')) {
$llx = ($llx + $template->get_attr('label_width') + $template->get_attr('col_gap')); $llx = ($llx + $template->get_attr('label_width') + $template->get_attr('col_gap'));
$col_count++; $col_count++;
} }
else { else {
$llx = $template->get_attr('left_margin'); $llx = $template->get_attr('left_margin');
if ($row_count eq $template->get_attr('rows')) { if ($row_count == $template->get_attr('rows')) {
$pdf->Page(); $pdf->Page();
$lly = ($template->get_attr('page_height') - $template->get_attr('top_margin') - $template->get_attr('label_height')); $lly = ($template->get_attr('page_height') - $template->get_attr('top_margin') - $template->get_attr('label_height'));
$row_count = 1; $row_count = 1;