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

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>

diff --git a/C4/Labels/Label.pm b/C4/Labels/Label.pm
index ef5fa15..6437537 100644 (file)
--- a/C4/Labels/Label.pm
+++ b/C4/Labels/Label.pm
@@ -470,6 +470,10 @@ sub draw_label_text {
     return \@label_text;
 }
 
+sub draw_guide_box {
+    return $_[0]->{'guidebox'};
+}
+
 sub barcode {
     my $self = shift;
     my %params = @_;

diff --git a/labels/label-create-pdf.pl b/labels/label-create-pdf.pl
index 607e873..1108726 100755 (executable)
--- a/labels/label-create-pdf.pl
+++ b/labels/label-create-pdf.pl
@@ -114,6 +114,7 @@ foreach my $item (@{$items}) {
                                         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')),
                                           );
+        $pdf->Add($label_a->draw_guide_box) if $layout->get_attr('guidebox');
         my $label_a_text = $label_a->create_label();
         _print_text($label_a_text);
         ($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'),
                                         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();
         ($row_count, $col_count, $llx, $lly) = _calc_next_label_pos($row_count, $col_count, $llx, $lly);
         next LABEL_ITEMS;
@@ -161,6 +163,7 @@ foreach my $item (@{$items}) {
                                         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')),
                                           );
+        $pdf->Add($label->draw_guide_box) if $layout->get_attr('guidebox');
         my $label_text = $label->create_label();
         _print_text($label_text) if $label_text;
         ($row_count, $col_count, $llx, $lly) = _calc_next_label_pos($row_count, $col_count, $llx, $lly);