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

Merge remote branch 'koha-fbc/k_bug_5249' into to-push

Browse source 
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
This commit is contained in:
Galen Charlton 2010-10-06 07:10:27 -04:00
commit 07ae6c6cd6
2 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
C4/Labels/Label.pm
View file

@ -470,6 +470,10 @@ sub draw_label_text {
return \@label_text; return \@label_text;
} }
sub draw_guide_box {
return $_[0]->{'guidebox'};
}
sub barcode { sub barcode {
my $self = shift; my $self = shift;
my %params = @_; my %params = @_;

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

@ -114,6 +114,7 @@ foreach my $item (@{$items}) {
format_string => $layout->get_attr('format_string'), format_string => $layout->get_attr('format_string'),
text_wrap_cols => $layout->get_text_wrap_cols(label_width => $template->get_attr('label_width'), left_text_margin => $template->get_attr('left_text_margin')), text_wrap_cols => $layout->get_text_wrap_cols(label_width => $template->get_attr('label_width'), left_text_margin => $template->get_attr('left_text_margin')),
); );
$pdf->Add($label_a->draw_guide_box) if $layout->get_attr('guidebox');
my $label_a_text = $label_a->create_label(); my $label_a_text = $label_a->create_label();
_print_text($label_a_text); _print_text($label_a_text);
($row_count, $col_count, $llx, $lly) = _calc_next_label_pos($row_count, $col_count, $llx, $lly); ($row_count, $col_count, $llx, $lly) = _calc_next_label_pos($row_count, $col_count, $llx, $lly);
@ -136,6 +137,7 @@ foreach my $item (@{$items}) {
format_string => $layout->get_attr('format_string'), format_string => $layout->get_attr('format_string'),
text_wrap_cols => $layout->get_text_wrap_cols(label_width => $template->get_attr('label_width'), left_text_margin => $template->get_attr('left_text_margin')), text_wrap_cols => $layout->get_text_wrap_cols(label_width => $template->get_attr('label_width'), left_text_margin => $template->get_attr('left_text_margin')),
); );
$pdf->Add($label_b->draw_guide_box) if $layout->get_attr('guidebox');
my $label_b_text = $label_b->create_label(); my $label_b_text = $label_b->create_label();
($row_count, $col_count, $llx, $lly) = _calc_next_label_pos($row_count, $col_count, $llx, $lly); ($row_count, $col_count, $llx, $lly) = _calc_next_label_pos($row_count, $col_count, $llx, $lly);
next LABEL_ITEMS; next LABEL_ITEMS;
@ -161,6 +163,7 @@ foreach my $item (@{$items}) {
format_string => $layout->get_attr('format_string'), format_string => $layout->get_attr('format_string'),
text_wrap_cols => $layout->get_text_wrap_cols(label_width => $template->get_attr('label_width'), left_text_margin => $template->get_attr('left_text_margin')), text_wrap_cols => $layout->get_text_wrap_cols(label_width => $template->get_attr('label_width'), left_text_margin => $template->get_attr('left_text_margin')),
); );
$pdf->Add($label->draw_guide_box) if $layout->get_attr('guidebox');
my $label_text = $label->create_label(); my $label_text = $label->create_label();
_print_text($label_text) if $label_text; _print_text($label_text) if $label_text;
($row_count, $col_count, $llx, $lly) = _calc_next_label_pos($row_count, $col_count, $llx, $lly); ($row_count, $col_count, $llx, $lly) = _calc_next_label_pos($row_count, $col_count, $llx, $lly);