From 6e2564450e93fc0b2fd66c71d6c3c128a3099ccd Mon Sep 17 00:00:00 2001
From: Ryan Higgins <rch@liblime.com>
Date: Fri, 17 Aug 2007 18:47:26 -0500
Subject: [PATCH] Adding labels generator.

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
Signed-off-by: Chris Cormack <crc@liblime.com>
---
 C4/Labels.pm                                  | 638 ++++++++++++++----
 barcodes/barcodes.pl                          | 161 -----
 barcodes/barcodesGenerator.pl                 | 373 ----------
 barcodes/label-home.pl                        |  78 ---
 barcodes/label-manager.pl                     | 154 -----
 barcodes/label-print-opus-pdf.pl              | 189 ------
 barcodes/label-print.pl                       | 135 ----
 barcodes/pdfViewer.pl                         |  40 --
 barcodes/printerConfig.pl                     | 128 ----
 barcodes/test.textblock.pl                    |  33 -
 installer/kohastructure.sql                   |   1 +
 .../prog/en/barcodes/barcodes.tmpl            |  85 ---
 .../en/barcodes/label-create-template.tmpl    |  69 --
 .../prog/en/barcodes/label-home.tmpl          | 189 ------
 .../prog/en/barcodes/label-manager.tmpl       |  60 --
 .../prog/en/barcodes/label-templates.tmpl     |  52 --
 .../prog/en/barcodes/printerConfig.tmpl       |  88 ---
 .../prog/en/barcodes/search.tmpl              |  60 --
 .../prog/en/includes/label-status.inc         |   7 +
 .../prog/en/includes/menu-labels.inc          |   8 +
 .../label-bib-search.tmpl                     |   4 +-
 .../prog/en/labels/label-create-layout.tmpl   | 281 ++++++++
 .../prog/en/labels/label-create-template.tmpl |  64 ++
 .../prog/en/labels/label-edit-layout.tmpl     | 182 +++++
 .../label-edit-template.tmpl                  |  46 +-
 .../prog/en/labels/label-home.tmpl            |  57 ++
 .../prog/en/labels/label-manager.tmpl         | 111 +++
 .../en/{barcodes => labels}/label-print.tmpl  |   0
 .../prog/en/labels/label-templates.tmpl       |  57 ++
 .../prog/en/{barcodes => labels}/result.tmpl  |  91 ++-
 .../intranet-tmpl/prog/en/labels/search.tmpl  | 128 ++++
 .../prog/en/tools/tools-home.tmpl             |   4 +
 labels/label-create-layout.pl                 |  84 +++
 labels/label-create-template.pl               |  85 +++
 labels/label-edit-layout.pl                   |  87 +++
 labels/label-edit-template.pl                 |  80 +++
 labels/label-home.pl                          |  95 +++
 {barcodes => labels}/label-item-search.pl     | 159 +++--
 labels/label-manager.pl                       | 195 ++++++
 {barcodes => labels}/label-print-pdf.pl       | 175 +++--
 labels/label-save-template.pl                 |  50 ++
 labels/label-select-pdf.pl                    |  32 +
 labels/label-templates.pl                     |  82 +++
 43 files changed, 2504 insertions(+), 2193 deletions(-)
 delete mode 100755 barcodes/barcodes.pl
 delete mode 100755 barcodes/barcodesGenerator.pl
 delete mode 100755 barcodes/label-home.pl
 delete mode 100755 barcodes/label-manager.pl
 delete mode 100755 barcodes/label-print-opus-pdf.pl
 delete mode 100755 barcodes/label-print.pl
 delete mode 100755 barcodes/pdfViewer.pl
 delete mode 100755 barcodes/printerConfig.pl
 delete mode 100755 barcodes/test.textblock.pl
 delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/barcodes/barcodes.tmpl
 delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/barcodes/label-create-template.tmpl
 delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/barcodes/label-home.tmpl
 delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/barcodes/label-manager.tmpl
 delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/barcodes/label-templates.tmpl
 delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/barcodes/printerConfig.tmpl
 delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/barcodes/search.tmpl
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/label-status.inc
 create mode 100755 koha-tmpl/intranet-tmpl/prog/en/includes/menu-labels.inc
 rename koha-tmpl/intranet-tmpl/prog/en/{barcodes => labels}/label-bib-search.tmpl (86%)
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/labels/label-create-layout.tmpl
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/labels/label-create-template.tmpl
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/labels/label-edit-layout.tmpl
 rename koha-tmpl/intranet-tmpl/prog/en/{barcodes => labels}/label-edit-template.tmpl (52%)
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/labels/label-home.tmpl
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/labels/label-manager.tmpl
 rename koha-tmpl/intranet-tmpl/prog/en/{barcodes => labels}/label-print.tmpl (100%)
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/labels/label-templates.tmpl
 rename koha-tmpl/intranet-tmpl/prog/en/{barcodes => labels}/result.tmpl (50%)
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/labels/search.tmpl
 create mode 100755 labels/label-create-layout.pl
 create mode 100755 labels/label-create-template.pl
 create mode 100755 labels/label-edit-layout.pl
 create mode 100755 labels/label-edit-template.pl
 create mode 100755 labels/label-home.pl
 rename {barcodes => labels}/label-item-search.pl (61%)
 create mode 100755 labels/label-manager.pl
 rename {barcodes => labels}/label-print-pdf.pl (55%)
 create mode 100755 labels/label-save-template.pl
 create mode 100755 labels/label-select-pdf.pl
 create mode 100755 labels/label-templates.pl

diff --git a/C4/Labels.pm b/C4/Labels.pm
index 933506b1de..4f357d46f3 100755
--- a/C4/Labels.pm
+++ b/C4/Labels.pm
@@ -24,10 +24,11 @@ use vars qw($VERSION @ISA @EXPORT);
 
 use PDF::Reuse;
 use Text::Wrap;
+use Algorithm::CheckDigits;
+# use Data::Dumper;
+# use Smart::Comments;
 
-$VERSION = do { my @v = '$Revision$' =~ /\d+/g;
-    shift(@v) . "." . join( "_", map { sprintf "%03d", $_ } @v );
-};
+$VERSION = 0.01;
 
 =head1 NAME
 
@@ -39,17 +40,28 @@ C4::Labels - Functions for printing spine labels and barcodes in Koha
 
 =cut
 
-@ISA = qw(Exporter);
+@ISA    = qw(Exporter);
 @EXPORT = qw(
-  	&get_label_options &get_label_items
-  	&build_circ_barcode &draw_boundaries
+  &get_label_options &get_label_items
+  &build_circ_barcode &draw_boundaries
   &drawbox &GetActiveLabelTemplate
   &GetAllLabelTemplates &DeleteTemplate
   &GetSingleLabelTemplate &SaveTemplate
   &CreateTemplate &SetActiveTemplate
   &SaveConf &DrawSpineText &GetTextWrapCols
   &GetUnitsValue &DrawBarcode
-
+  &get_printingtypes
+  &get_layouts
+  &get_barcode_types
+  &get_batches &delete_batch
+  &add_batch &SetFontSize &printText
+  &GetItemFields
+  &get_text_fields
+  get_layout &save_layout &add_layout
+  &set_active_layout &by_order
+  &build_text_dropbox
+  &delete_layout &get_active_layout
+&get_highest_batch
 );
 
 =item get_label_options;
@@ -64,7 +76,7 @@ Return a pointer on a hash list containing info from labels_conf table in Koha D
 #'
 sub get_label_options {
     my $dbh    = C4::Context->dbh;
-    my $query2 = " SELECT * FROM labels_conf LIMIT 1 ";
+    my $query2 = " SELECT * FROM labels_conf where active = 1";
     my $sth    = $dbh->prepare($query2);
     $sth->execute();
     my $conf_data = $sth->fetchrow_hashref;
@@ -72,6 +84,263 @@ sub get_label_options {
     return $conf_data;
 }
 
+sub get_layouts {
+
+## FIXME: this if/else could be compacted...
+    my $dbh = C4::Context->dbh;
+    my @data;
+    my $query = " Select * from labels_conf";
+    my $sth   = $dbh->prepare($query);
+    $sth->execute();
+    my @resultsloop;
+    while ( my $data = $sth->fetchrow_hashref ) {
+
+        $data->{'fieldlist'} = get_text_fields( $data->{'id'} );
+        push( @resultsloop, $data );
+    }
+    $sth->finish;
+
+    # @resultsloop
+
+    return @resultsloop;
+}
+
+sub get_layout {
+    my ($layout_id) = @_;
+    my $dbh = C4::Context->dbh;
+
+    # get the actual items to be printed.
+    my $query = " Select * from labels_conf where id = ?";
+    my $sth   = $dbh->prepare($query);
+    $sth->execute($layout_id);
+    my $data = $sth->fetchrow_hashref;
+    $sth->finish;
+    return $data;
+}
+
+sub get_active_layout {
+    my ($layout_id) = @_;
+    my $dbh = C4::Context->dbh;
+
+    # get the actual items to be printed.
+    my $query = " Select * from labels_conf where active = 1";
+    my $sth   = $dbh->prepare($query);
+    $sth->execute();
+    my $data = $sth->fetchrow_hashref;
+    $sth->finish;
+    return $data;
+}
+
+sub delete_layout {
+    my ($layout_id) = @_;
+    my $dbh = C4::Context->dbh;
+
+    # get the actual items to be printed.
+    my $query = "delete from  labels_conf where id = ?";
+    my $sth   = $dbh->prepare($query);
+    $sth->execute($layout_id);
+    $sth->finish;
+}
+
+sub get_printingtypes {
+    my ($layout_id) = @_;
+    my @printtypes;
+
+    push( @printtypes, { code => 'BAR',    desc => "barcode" } );
+    push( @printtypes, { code => 'BIB',    desc => "biblio" } );
+    push( @printtypes, { code => 'BARBIB', desc => "barcode / biblio" } );
+    push( @printtypes, { code => 'BIBBAR', desc => "biblio / barcode" } );
+    push( @printtypes, { code => 'ALT',    desc => "alternating labels" } );
+
+    my $conf             = get_layout($layout_id);
+    my $active_printtype = $conf->{'printingtype'};
+
+    # lop thru layout, insert selected to hash
+
+    foreach my $printtype (@printtypes) {
+        if ( $printtype->{'code'} eq $active_printtype ) {
+            $printtype->{'active'} = 'MOO';
+        }
+    }
+    return @printtypes;
+}
+
+sub build_text_dropbox {
+    my ($order) = @_;
+
+    #  my @fields      = get_text_fields();
+    #    my $field_count = scalar @fields;
+    my $field_count = 10;    # <-----------       FIXME hard coded
+
+    my @lines;
+    !$order
+      ? push( @lines, { num => '', selected => '1' } )
+      : push( @lines, { num => '' } );
+    for ( my $i = 1 ; $i <= $field_count ; $i++ ) {
+        my $line = { num => "$i" };
+        $line->{'selected'} = 1 if $i eq $order;
+        push( @lines, $line );
+    }
+
+    # add a blank row too
+
+    return @lines;
+}
+
+sub get_text_fields {
+    my ($layout_id, $sorttype) = @_;
+
+    my ( $a, $b, $c, $d, $e, $f, $g, $h, $i ,$j, $k );
+
+    my $sortorder = get_layout($layout_id);
+
+    # $sortorder
+
+    $a = {
+        code  => 'itemtype',
+        desc  => "Item Type",
+        order => $sortorder->{'itemtype'}
+    };
+    $b = {
+        code  => 'dewey',
+        desc  => "Dewey",
+        order => $sortorder->{'dewey'}
+    };
+    $c = { code => 'issn', desc => "ISSN", 
+        order => $sortorder->{'issn'} };
+    $d = { code => 'isbn', desc => "ISBN", 
+            order => $sortorder->{'isbn'} };
+    $e = {
+        code  => 'class',
+        desc  => "Classification",
+        order => $sortorder->{'class'}
+    };
+    $f = {
+        code  => 'subclass',
+        desc  => "Sub-Class",
+        order => $sortorder->{'subclass'}
+    };
+    $g = {
+        code  => 'barcode',
+        desc  => "Barcode",
+        order => $sortorder->{'barcode'}
+    };
+    $h =
+      { code => 'author', desc => "Author", order => $sortorder->{'author'} };
+    $i = { code => 'title', desc => "Title", order => $sortorder->{'title'} };
+    $j = { code => 'itemcallnumber', desc => "Call Number", order => $sortorder->{'itemcallnumber'} };
+	$k = { code => 'subtitle', desc => "Subtitle", order => $sortorder->{'subtitle'} }; 
+    
+	my @text_fields = ( $a, $b, $c, $d, $e, $f, $g, $h, $i ,$j, $k );
+
+    my @new_fields;
+    foreach my $field (@text_fields) {
+        push( @new_fields, $field ) if $field->{'order'} > 0;
+    }
+
+    my @sorted_fields = sort by_order @new_fields;
+    my $active_fields;
+    foreach my $field (@sorted_fields) {
+     $sorttype eq 'codes' ?   $active_fields .= "$field->{'code'} " :
+          $active_fields .= "$field->{'desc'} ";
+    }
+    return $active_fields;
+
+}
+
+sub by_order {
+    $$a{order} <=> $$b{order};
+}
+
+sub add_batch {
+    my $new_batch;
+    my $dbh = C4::Context->dbh;
+    my $q =
+      "select distinct batch_id from labels order by batch_id desc limit 1";
+    my $sth = $dbh->prepare($q);
+    $sth->execute();
+    my $data = $sth->fetchrow_hashref;
+    $sth->finish;
+
+    if ( !$data->{'batch_id'} ) {
+        $new_batch = 1;
+    }
+    else {
+        $new_batch = ( $data->{'batch_id'} + 1 );
+    }
+
+    return $new_batch;
+}
+
+
+sub get_highest_batch {
+    my $new_batch;
+    my $dbh = C4::Context->dbh;
+    my $q =
+      "select distinct batch_id from labels order by batch_id desc limit 1";
+    my $sth = $dbh->prepare($q);
+    $sth->execute();
+    my $data = $sth->fetchrow_hashref;
+    $sth->finish;
+
+    if ( !$data->{'batch_id'} ) {
+        $new_batch = 1;
+    }
+    else {
+        $new_batch =  $data->{'batch_id'};
+    }
+
+    return $new_batch;
+}
+
+
+sub get_batches {
+    my $dbh = C4::Context->dbh;
+    my $q   = "select batch_id, count(*) as num from labels group by batch_id";
+    my $sth = $dbh->prepare($q);
+    $sth->execute();
+    my @resultsloop;
+    while ( my $data = $sth->fetchrow_hashref ) {
+        push( @resultsloop, $data );
+    }
+    $sth->finish;
+
+    # adding a dummy batch=1 value , if none exists in the db
+    if ( !scalar(@resultsloop) ) {
+        push( @resultsloop, { batch_id => '1' , num => '0' } );
+    }
+    return @resultsloop;
+}
+
+sub delete_batch {
+    my ($batch_id) = @_;
+    my $dbh        = C4::Context->dbh;
+    my $q          = "DELETE FROM labels where batch_id  = ?";
+    my $sth        = $dbh->prepare($q);
+    $sth->execute($batch_id);
+    $sth->finish;
+}
+
+sub get_barcode_types {
+    my ($layout_id) = @_;
+    my $layout      = get_layout($layout_id);
+    my $barcode     = $layout->{'barcodetype'};
+    my @array;
+
+    push( @array, { code => 'CODE39',    desc => 'Code 39' } );
+    push( @array, { code => 'CODE39MOD', desc => 'Code39 + Modulo43' } );
+    push( @array, { code => 'CODE39MOD10', desc => 'Code39 + Modulo10' } ); 
+	push( @array, { code => 'ITF',       desc => 'Interleaved 2 of 5' } );
+
+    foreach my $line (@array) {
+        if ( $line->{'code'} eq $barcode ) {
+            $line->{'active'} = 1;
+        }
+
+    }
+    return @array;
+}
+
 sub GetUnitsValue {
     my ($units) = @_;
     my $unitvalue;
@@ -80,7 +349,6 @@ sub GetUnitsValue {
     $unitvalue = '2.83464567' if ( $units eq 'MM' );
     $unitvalue = '28.3464567' if ( $units eq 'CM' );
     $unitvalue = 72           if ( $units eq 'INCH' );
-    warn $units, $unitvalue;
     return $unitvalue;
 }
 
@@ -94,7 +362,7 @@ sub GetTextWrapCols {
 
     while ( $strwidth < $textlimit ) {
         $strwidth = prStrWidth( $string, 'C', $fontsize );
-        $string   = $string . '0';
+        $string = $string . '0';
 
         #	warn "strwidth $strwidth, $textlimit, $string";
         $count++;
@@ -113,11 +381,11 @@ sub GetActiveLabelTemplate {
 }
 
 sub GetSingleLabelTemplate {
-    my ($tmpl_code) = @_;
-    my $dbh         = C4::Context->dbh;
-    my $query       = " SELECT * FROM labels_templates where tmpl_code = ?";
-    my $sth         = $dbh->prepare($query);
-    $sth->execute($tmpl_code);
+    my ($tmpl_id) = @_;
+    my $dbh       = C4::Context->dbh;
+    my $query     = " SELECT * FROM labels_templates where tmpl_id = ?";
+    my $sth       = $dbh->prepare($query);
+    $sth->execute($tmpl_id);
     my $template = $sth->fetchrow_hashref;
     $sth->finish;
     return $template;
@@ -126,45 +394,54 @@ sub GetSingleLabelTemplate {
 sub SetActiveTemplate {
 
     my ($tmpl_id) = @_;
-    warn "TMPL_ID = $tmpl_id";
+  
     my $dbh   = C4::Context->dbh;
     my $query = " UPDATE labels_templates SET active = NULL";
     my $sth   = $dbh->prepare($query);
-    $sth->execute;
+    $sth->execute();
 
-    $query = "UPDATE labels_templates SET active = 1 WHERE tmpl_id = ?";
-    $sth   = $dbh->prepare($query);
+    my $query = "UPDATE labels_templates SET active = 1 WHERE tmpl_id = ?";
+    my $sth   = $dbh->prepare($query);
     $sth->execute($tmpl_id);
     $sth->finish;
 }
 
-sub DeleteTemplate {
-    my ($tmpl_code) = @_;
+sub set_active_layout {
+
+    my ($layout_id) = @_;
     my $dbh         = C4::Context->dbh;
-    my $query       = " DELETE  FROM labels_templates where tmpl_code = ?";
+    my $query       = " UPDATE labels_conf SET active = NULL";
     my $sth         = $dbh->prepare($query);
-    $sth->execute($tmpl_code);
+    $sth->execute();
+
+    my $query = "UPDATE labels_conf SET active = 1 WHERE id = ?";
+    my $sth   = $dbh->prepare($query);
+    $sth->execute($layout_id);
     $sth->finish;
 }
 
-sub SaveTemplate {
+sub DeleteTemplate {
+    my ($tmpl_id) = @_;
+    my $dbh       = C4::Context->dbh;
+    my $query     = " DELETE  FROM labels_templates where tmpl_id = ?";
+    my $sth       = $dbh->prepare($query);
+    $sth->execute($tmpl_id);
+    $sth->finish;
+}
 
+sub SaveTemplate {
     my (
         $tmpl_id,     $tmpl_code,   $tmpl_desc,    $page_width,
         $page_height, $label_width, $label_height, $topmargin,
         $leftmargin,  $cols,        $rows,         $colgap,
-        $rowgap,      $active,      $fontsize,     $units
-      )
-      = @_;
-
-    #warn "FONTSIZE =$fontsize";
-
-    my $dbh   = C4::Context->dbh;
+        $rowgap,      $fontsize,     $units
+    ) = @_;
+    my $dbh = C4::Context->dbh;
     my $query =
       " UPDATE labels_templates SET tmpl_code=?, tmpl_desc=?, page_width=?,
-                         page_height=?, label_width=?, label_height=?, topmargin=?,
-                         leftmargin=?, cols=?, rows=?, colgap=?, rowgap=?, fontsize=?,
-						 units=? 
+               page_height=?, label_width=?, label_height=?, topmargin=?,
+               leftmargin=?, cols=?, rows=?, colgap=?, rowgap=?, fontsize=?,
+	  		   units=? 
                   WHERE tmpl_id = ?";
 
     my $sth = $dbh->prepare($query);
@@ -175,8 +452,6 @@ sub SaveTemplate {
         $fontsize,    $units,        $tmpl_id
     );
     $sth->finish;
-
-    SetActiveTemplate($tmpl_id) if ( $active eq '1' );
 }
 
 sub CreateTemplate {
@@ -185,9 +460,8 @@ sub CreateTemplate {
         $tmpl_code,   $tmpl_desc,    $page_width, $page_height,
         $label_width, $label_height, $topmargin,  $leftmargin,
         $cols,        $rows,         $colgap,     $rowgap,
-        $active,      $fontsize,     $units
-      )
-      = @_;
+        $fontsize,     $units
+    ) = @_;
 
     my $dbh = C4::Context->dbh;
 
@@ -203,24 +477,6 @@ sub CreateTemplate {
         $cols,        $rows,         $colgap,     $rowgap,
         $fontsize,    $units
     );
-
-    warn "ACTIVE = $active";
-
-    if ( $active eq '1' ) {
-
-  # get the tmpl_id of the newly created template, then call SetActiveTemplate()
-        my $query =
-          "SELECT tmpl_id from labels_templates order by tmpl_id desc limit 1";
-        my $sth = $dbh->prepare($query);
-        $sth->execute();
-
-        my $data    = $sth->fetchrow_hashref;
-        my $tmpl_id = $data->{'tmpl_id'};
-
-        SetActiveTemplate($tmpl_id);
-        $sth->finish;
-    }
-    return $tmpl_id;
 }
 
 sub GetAllLabelTemplates {
@@ -237,34 +493,36 @@ sub GetAllLabelTemplates {
     }
     $sth->finish;
 
+    #warn Dumper @resultsloop;
     return @resultsloop;
 }
 
-sub SaveConf {
+#sub SaveConf {
+sub add_layout {
 
     my (
-        $barcodetype,    $title,  $isbn,    $itemtype,
-        $bcn,            $dcn,    $classif, $subclass,
-        $itemcallnumber, $author, $tmpl_id, $printingtype,
-        $guidebox,       $startlabel
-      )
-      = @_;
+        $barcodetype,  $title,         	$subtitle, 	$isbn,       $issn,
+        $itemtype,     $bcn,            $dcn,        $classif,
+        $subclass,     $itemcallnumber, $author,     $tmpl_id,
+        $printingtype, $guidebox,       $startlabel, $layoutname
+    ) = @_;
 
     my $dbh    = C4::Context->dbh;
-    my $query2 = "DELETE FROM labels_conf";
+    my $query2 = "update labels_conf set active = NULL";
     my $sth2   = $dbh->prepare($query2);
-    $sth2->execute;
-    $query2 = "INSERT INTO labels_conf
-            ( barcodetype, title, isbn, itemtype, barcode,
+    $sth2->execute();
+    my $query2 = "INSERT INTO labels_conf
+            ( barcodetype, title, subtitle, isbn,issn, itemtype, barcode,
               dewey, class, subclass, itemcallnumber, author, printingtype,
-                guidebox, startlabel )
-               values ( ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ? )";
-    $sth2 = $dbh->prepare($query2);
+                guidebox, startlabel, layoutname, active )
+               values ( ?, ?, ?, ?, ?, ?, ?,  ?,?, ?, ?, ?, ?, ?,?,?, 1 )";
+    my $sth2 = $dbh->prepare($query2);
     $sth2->execute(
-        $barcodetype,    $title,  $isbn,         $itemtype,
-        $bcn,            $dcn,    $classif,      $subclass,
-        $itemcallnumber, $author, $printingtype, $guidebox,
-        $startlabel
+        $barcodetype, $title, $subtitle, $isbn, $issn,
+
+        $itemtype, $bcn,            $dcn,    $classif,
+        $subclass, $itemcallnumber, $author, $printingtype,
+        $guidebox, $startlabel,     $layoutname
     );
     $sth2->finish;
 
@@ -272,6 +530,36 @@ sub SaveConf {
     return;
 }
 
+sub save_layout {
+
+    my (
+        $barcodetype,  $title,          $subtitle,	$isbn,       $issn,
+        $itemtype,     $bcn,            $dcn,        $classif,
+        $subclass,     $itemcallnumber, $author,     $tmpl_id,
+        $printingtype, $guidebox,       $startlabel, $layoutname,
+        $layout_id
+    ) = @_;
+### $layoutname
+### $layout_id
+
+    my $dbh    = C4::Context->dbh;
+    my $query2 = "update labels_conf set 
+             barcodetype=?, title=?, subtitle=?, isbn=?,issn=?, 
+            itemtype=?, barcode=?,    dewey=?, class=?,
+             subclass=?, itemcallnumber=?, author=?,  printingtype=?,  
+               guidebox=?, startlabel=?, layoutname=? where id = ?";
+    my $sth2 = $dbh->prepare($query2);
+    $sth2->execute(
+        $barcodetype, $title,          $subtitle,	$isbn,       $issn,
+        $itemtype,    $bcn,            $dcn,        $classif,
+        $subclass,    $itemcallnumber, $author,     $printingtype,
+        $guidebox,    $startlabel,     $layoutname, $layout_id
+    );
+    $sth2->finish;
+
+    return;
+}
+
 =item get_label_items;
 
         $options = get_label_items()
@@ -283,28 +571,46 @@ Returns an array of references-to-hash, whos keys are the field from the biblio,
 
 #'
 sub get_label_items {
+    my ($batch_id) = @_;
     my $dbh = C4::Context->dbh;
 
-    # get the actual items to be printed.
+    my @resultsloop = ();
+    my $count;
     my @data;
-    my $query3 = " Select * from labels ";
-    my $sth    = $dbh->prepare($query3);
-    $sth->execute();
-    my @resultsloop;
+    my $sth;
+
+    if ($batch_id) {
+        my $query3 = "Select * from labels where batch_id = ? order by labelid ";
+        $sth = $dbh->prepare($query3);
+        $sth->execute($batch_id);
+
+    }
+    else {
+
+        my $query3 = "Select * from labels";
+        $sth = $dbh->prepare($query3);
+        $sth->execute();
+    }
     my $cnt = $sth->rows;
     my $i1  = 1;
     while ( my $data = $sth->fetchrow_hashref ) {
 
         # lets get some summary info from each item
-        my $query1 =
-          " select * from biblio, biblioitems, items where itemnumber = ? and
-                                items.biblioitemnumber=biblioitems.biblioitemnumber and
-                                biblioitems.biblionumber=biblio.biblionumber";
-
-        my $sth1 = $dbh->prepare($query1);
+        my $query1 = " 
+	 select i.*, bi.*, b.*  from items i,biblioitems bi,biblio b 
+		where itemnumber=? and  i.biblioitemnumber=bi.biblioitemnumber and                  
+		bi.biblionumber=b.biblionumber"; 
+     
+	 my $sth1 = $dbh->prepare($query1);
         $sth1->execute( $data->{'itemnumber'} );
+
         my $data1 = $sth1->fetchrow_hashref();
 
+        $data1->{'labelno'}  = $i1;
+        $data1->{'batch_id'} = $batch_id;
+        $data1->{'summary'} =
+          "$data1->{'barcode'}, $data1->{'title'}, $data1->{'isbn'}";
+
         push( @resultsloop, $data1 );
         $sth1->finish;
 
@@ -312,6 +618,17 @@ sub get_label_items {
     }
     $sth->finish;
     return @resultsloop;
+
+}
+
+sub GetItemFields {
+    my @fields = qw (
+      barcode title subtitle
+      dewey isbn issn author class
+      itemtype subclass itemcallnumber
+
+    );
+    return @fields;
 }
 
 sub DrawSpineText {
@@ -319,23 +636,39 @@ sub DrawSpineText {
     my ( $y_pos, $label_height, $fontsize, $x_pos, $left_text_margin,
         $text_wrap_cols, $item, $conf_data )
       = @_;
-
+# hack to fix column name mismatch betwen labels_conf.class, and bibitems.classification
+	$$item->{'class'} = $$item->{'classification'};
+ 
     $Text::Wrap::columns   = $text_wrap_cols;
     $Text::Wrap::separator = "\n";
 
     my $str;
+    ##      $item
 
     my $top_text_margin = ( $fontsize + 3 );
     my $line_spacer = ($fontsize);    # number of pixels between text rows.
 
     # add your printable fields manually in here
-    my @fields =
-      qw (dewey isbn classification itemtype subclass itemcallnumber);
-    my $vPos = ( $y_pos + ( $label_height - $top_text_margin ) );
-    my $hPos = ( $x_pos + $left_text_margin );
+
+my $layout_id = $$conf_data->{'id'};
+
+#    my @fields = GetItemFields();
+
+my $str_fields = get_text_fields($layout_id, 'codes' );
+my @fields = split(/ /, $str_fields);
+### @fields
+
+    my $vPos   = ( $y_pos + ( $label_height - $top_text_margin ) );
+    my $hPos   = ( $x_pos + $left_text_margin );
+
+    # warn Dumper $conf_data;
+    #warn Dumper $item;
 
     foreach my $field (@fields) {
 
+        # testing hack
+#     $$item->{"$field"} = $field . ": " . $$item->{"$field"};
+
         # if the display option for this field is selected in the DB,
         # and the item record has some values for this field, display it.
         if ( $$conf_data->{"$field"} && $$item->{"$field"} ) {
@@ -344,7 +677,6 @@ sub DrawSpineText {
 
             # get the string
             $str = $$item->{"$field"};
-
             # strip out naughty existing nl/cr's
             $str =~ s/\n//g;
             $str =~ s/\r//g;
@@ -362,26 +694,43 @@ sub DrawSpineText {
             foreach my $str (@strings) {
 
                 #warn "HPOS ,  VPOS $hPos, $vPos ";
-                prText( $hPos, $vPos, $str );
+                # set the font size A
+
+                #   prText( $hPos, $vPos, $str );
+                PrintText( $hPos, $vPos, $fontsize, $str );
                 $vPos = $vPos - $line_spacer;
             }
-        }    # if field is valid
-    }    #foreach feild
+        }    # if field is     }    #foreach feild
+    }
+}
+
+sub PrintText {
+    my ( $hPos, $vPos, $fontsize, $text ) = @_;
+    my $str = "BT /Ft1 $fontsize Tf $hPos $vPos Td ($text) Tj ET";
+    prAdd($str);
+}
+
+sub SetFontSize {
+
+    my ($fontsize) = @_;
+### fontsize
+    my $str = "BT/F13 30 Tf288 720 Td( AAAAAAAAAA ) TjET";
+    prAdd($str);
 }
 
 sub DrawBarcode {
 
+    # x and y are from the top-left :)
     my ( $x_pos, $y_pos, $height, $width, $barcode, $barcodetype ) = @_;
-    $barcode = '123456789';
     my $num_of_bars = length($barcode);
-    my $bar_width = ( ( $width / 10 ) * 8 );    # %80 of lenght of label width
+    my $bar_width   = $width * .8;        # %80 of length of label width
     my $tot_bar_length;
     my $bar_length;
     my $guard_length = 10;
     my $xsize_ratio;
 
-    if ( $barcodetype eq 'Code39' ) {
-        $bar_length     = '14.4333333333333';
+    if ( $barcodetype eq 'CODE39' ) {
+        $bar_length = '17.5';
         $tot_bar_length =
           ( $bar_length * $num_of_bars ) + ( $guard_length * 2 );
         $xsize_ratio = ( $bar_width / $tot_bar_length );
@@ -389,10 +738,10 @@ sub DrawBarcode {
             PDF::Reuse::Barcode::Code39(
                 x => ( $x_pos + ( $width / 10 ) ),
                 y => ( $y_pos + ( $height / 10 ) ),
-                value => "*$barcode*",
-                ySize => ( .02 * $height ),
-                xSize => $xsize_ratio,
-                hide_asterisk => $xsize_ratio,
+                value         => "*$barcode*",
+                ySize         => ( .02 * $height ),
+                xSize         => $xsize_ratio,
+                hide_asterisk => 1,
             );
         };
         if ($@) {
@@ -400,8 +749,61 @@ sub DrawBarcode {
         }
     }
 
-    elsif ( $barcodetype eq 'COOP2of5' ) {
-        $bar_length     = '9.43333333333333';
+    elsif ( $barcodetype eq 'CODE39MOD' ) {
+
+        # get modulo43 checksum
+        my $c39 = CheckDigits('code_39');
+        $barcode = $c39->complete($barcode);
+
+        $bar_length = '19';
+        $tot_bar_length =
+          ( $bar_length * $num_of_bars ) + ( $guard_length * 2 );
+        $xsize_ratio = ( $bar_width / $tot_bar_length );
+        eval {
+            PDF::Reuse::Barcode::Code39(
+                x => ( $x_pos + ( $width / 10 ) ),
+                y => ( $y_pos + ( $height / 10 ) ),
+                value         => "*$barcode*",
+                ySize         => ( .02 * $height ),
+                xSize         => $xsize_ratio,
+                hide_asterisk => 1,
+            );
+        };
+
+        if ($@) {
+            warn "$barcodetype, $barcode FAILED:$@";
+        }
+    }
+    elsif ( $barcodetype eq 'CODE39MOD10' ) {
+ 
+        # get modulo43 checksum
+        my $c39_10 = CheckDigits('visa');
+        $barcode = $c39_10->complete($barcode);
+
+        $bar_length = '19';
+        $tot_bar_length =
+          ( $bar_length * $num_of_bars ) + ( $guard_length * 2 );
+        $xsize_ratio = ( $bar_width / $tot_bar_length );
+        eval {
+            PDF::Reuse::Barcode::Code39(
+                x => ( $x_pos + ( $width / 10 ) ),
+                y => ( $y_pos + ( $height / 10 ) ),
+                value         => "*$barcode*",
+                ySize         => ( .02 * $height ),
+                xSize         => $xsize_ratio,
+                hide_asterisk => 1,
+				text         => 0, 
+            );
+        };
+
+        if ($@) {
+            warn "$barcodetype, $barcode FAILED:$@";
+        }
+    }
+
+ 
+    elsif ( $barcodetype eq 'COOP2OF5' ) {
+        $bar_length = '9.43333333333333';
         $tot_bar_length =
           ( $bar_length * $num_of_bars ) + ( $guard_length * 2 );
         $xsize_ratio = ( $bar_width / $tot_bar_length ) * .9;
@@ -419,8 +821,8 @@ sub DrawBarcode {
         }
     }
 
-    elsif ( $barcodetype eq 'Industrial2of5' ) {
-        $bar_length     = '13.1333333333333';
+    elsif ( $barcodetype eq 'INDUSTRIAL2OF5' ) {
+        $bar_length = '13.1333333333333';
         $tot_bar_length =
           ( $bar_length * $num_of_bars ) + ( $guard_length * 2 );
         $xsize_ratio = ( $bar_width / $tot_bar_length ) * .9;
@@ -437,6 +839,7 @@ sub DrawBarcode {
             warn "$barcodetype, $barcode FAILED:$@";
         }
     }
+
     my $moo2 = $tot_bar_length * $xsize_ratio;
 
     warn " $x_pos, $y_pos, $barcode, $barcodetype\n";
@@ -457,6 +860,8 @@ $item is the result of a previous call to get_label_items();
 sub build_circ_barcode {
     my ( $x_pos_circ, $y_pos, $value, $barcodetype, $item ) = @_;
 
+    #warn Dumper \$item;
+
     #warn "value = $value\n";
 
     #$DB::single = 1;
@@ -495,15 +900,17 @@ sub build_circ_barcode {
 
     }
     elsif ( $barcodetype eq 'Code39' ) {
+
         eval {
             PDF::Reuse::Barcode::Code39(
                 x     => ( $x_pos_circ + 9 ),
                 y     => ( $y_pos + 15 ),
+                value => $value,
+
                 #           prolong => 2.96,
                 xSize => .85,
+
                 ySize => 1.3,
-				value => "*$value*",
-				#hide_asterisk => $xsize_ratio,
             );
         };
         if ($@) {
@@ -751,11 +1158,10 @@ sub draw_boundaries {
     my (
         $x_pos_spine, $x_pos_circ1,  $x_pos_circ2, $y_pos,
         $spine_width, $label_height, $circ_width
-      )
-      = @_;
+    ) = @_;
 
     my $y_pos_initial = ( ( 792 - 36 ) - 90 );
-    $y_pos            = $y_pos_initial;
+    my $y_pos         = $y_pos_initial;
     my $i             = 1;
 
     for ( $i = 1 ; $i <= 8 ; $i++ ) {
@@ -791,9 +1197,11 @@ sub drawbox {
     #    warn "llx,y= $llx,$lly  ,   urx,y=$urx,$ury \n";
 
     my $str = "q\n";    # save the graphic state
-    $str .= "0.5 w\n";                     # border color red
-    $str .= "1.0 0.0 0.0  RG\n";           # border color red
-    $str .= "0.5 0.75 1.0 rg\n";           # fill color blue
+    $str .= "0.5 w\n";              # border color red
+    $str .= "1.0 0.0 0.0  RG\n";    # border color red
+         #   $str .= "0.5 0.75 1.0 rg\n";           # fill color blue
+    $str .= "1.0 1.0 1.0  rg\n";    # fill color white
+
     $str .= "$llx $lly $urx $ury re\n";    # a rectangle
     $str .= "B\n";                         # fill (and a little more)
     $str .= "Q\n";                         # save the graphic state
diff --git a/barcodes/barcodes.pl b/barcodes/barcodes.pl
deleted file mode 100755
index 7e78ffb036..0000000000
--- a/barcodes/barcodes.pl
+++ /dev/null
@@ -1,161 +0,0 @@
-#!/usr/bin/perl
-
-# script to generate items barcodes
-# written 07/04
-# by Veleda Matias - matias_veleda@hotmail.com - Physics Library UNLP Argentina and
-#    Casta�eda Sebastian - seba3c@yahoo.com.ar - Physics Library UNLP Argentina and
-
-# This file is part of Koha.
-#
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-#
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
-
-use strict;
-use CGI;
-use C4::Auth;
-use C4::Output;
-use C4::Context;
-use C4::Barcodes::PrinterConfig;
-
-# This function returns the path to deal with the correct files, considering
-# templates set and language.
-sub getPath {
-    my $type         = shift @_;
-    my $templatesSet = C4::Context->preference('template');
-    my $lang         = C4::Context->preference('opaclanguages');
-    if ( $type eq "intranet" ) {
-        return "$ENV{'DOCUMENT_ROOT'}/intranet-tmpl/$templatesSet/$lang";
-    }
-    else {
-        return "$ENV{'DOCUMENT_ROOT'}/opac-tmpl/$templatesSet/$lang";
-    }
-}
-
-# Load a configuration file. Before use this function, check if that file exists.
-sub loadConfFromFile {
-    my $fileName = shift @_;
-    my %keyValues;
-    open FILE, "<$fileName";
-    while (<FILE>) {
-        chomp;
-        if (/\s*([\w_]*)\s*=\s*([\[\]\<\>\w_\s:@,\.-]*)\s*/) {
-            $keyValues{$1} = $2;
-        }
-    }
-    close FILE;
-    return %keyValues;
-}
-
-# Save settings to a configuration file. It delete previous configuration settings.
-sub saveConfToFile {
-    my $fileName  = shift @_;
-    my %keyValues = %{ shift @_ };
-    my $i;
-    open FILE, ">$fileName";
-    foreach $i ( keys(%keyValues) ) {
-        print FILE $i . " = " . $keyValues{$i} . "\n";
-    }
-    close FILE;
-}
-
-# Load the config file.
-my $filenameConf =
-  &getPath("intranet") . "/includes/labelConfig/itemsLabelConfig.conf";
-my %labelConfig = &loadConfFromFile($filenameConf);
-
-my $input = new CGI;
-
-# Defines type of page to use in the printer process
-my @labelTable =
-  C4::Barcodes::PrinterConfig::labelsPage( $labelConfig{'rows'},
-    $labelConfig{'columns'} );
-
-# It creates a list of posible intervals to choose codes to generate
-my %list = (
-    'continuous'  => 'Continuous Range of items',
-    'individuals' => 'Individual Codes'
-);
-my @listValues = keys(%list);
-my $rangeType  = CGI::scrolling_list(
-    -name     => 'rangeType',
-    -values   => \@listValues,
-    -labels   => \%list,
-    -size     => 1,
-    -default  => ['continuous'],
-    -multiple => 0,
-    -id       => "rangeType",
-    -onChange => "changeRange(this)"
-);
-
-# It creates a list of posible standard codifications. First checks if the user has just added a new code.
-if ( $input->param('addCode') ) {
-    my $newCountryName = $input->param('countryName');
-    my $newCountryCode = $input->param('countryCode');
-
-    my $countryCodesFilename =
-      &getPath("intranet") . "/includes/countryCodes/countryCodes.dat";
-    open COUNTRY_CODES, ">>$countryCodesFilename";
-    print COUNTRY_CODES $newCountryCode . " = " . $newCountryName . "\n";
-    close COUNTRY_CODES;
-}
-
-# Takes the country codes from a file and use them to set the country list.
-my $countryCodes =
-  &getPath("intranet") . "/includes/countryCodes/countryCodes.dat";
-%list = &loadConfFromFile($countryCodes);
-@listValues = keys(%list);
-my $number_system = CGI::scrolling_list(
-    -name     => 'numbersystem',
-    -values   => \@listValues,
-    -labels   => \%list,
-    -size     => 1,
-    -multiple => 0
-);
-
-# Set the script name
-my $script_name = "/cgi-bin/koha/barcodes/barcodesGenerator.pl";
-
-# Get the template to use
-my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
-    {
-        template_name   => "barcodes/barcodes.tmpl",
-        type            => "intranet",
-        query           => $input,
-        authnotrequired => 0,
-        flagsrequired   => { tools => 1 },
-        debug           => 1,
-    }
-);
-
-# Replace the template values with the real ones
-$template->param( SCRIPT_NAME   => $script_name );
-$template->param( NUMBER_SYSTEM => $number_system );
-$template->param( PAGES         => $labelConfig{'pageType'} );
-$template->param( RANGE_TYPE    => $rangeType );
-$template->param( LABEL_TABLE   => \@labelTable );
-$template->param( COL_SPAN      => $labelConfig{'columns'} );
-if ( $input->param('error') ) {
-    $template->param( ERROR => 1 );
-}
-else {
-    $template->param( ERROR => 0 );
-}
-$template->param(
-    intranetcolorstylesheet =>
-      C4::Context->preference("intranetcolorstylesheet"),
-    intranetstylesheet => C4::Context->preference("intranetstylesheet"),
-    IntranetNav        => C4::Context->preference("IntranetNav"),
-);
-
-# Shows the template with the real values replaced
-output_html_with_http_headers $input, $cookie, $template->output;
diff --git a/barcodes/barcodesGenerator.pl b/barcodes/barcodesGenerator.pl
deleted file mode 100755
index af0c4dc5ff..0000000000
--- a/barcodes/barcodesGenerator.pl
+++ /dev/null
@@ -1,373 +0,0 @@
-#!/usr/bin/perl
-
-# script to generate items barcodes
-# written 07/04
-# by Veleda Matias - matias_veleda@hotmail.com - Physics Library UNLP Argentina and
-#    Castañeda Sebastian - seba3c@yahoo.com.ar - Physics Library UNLP Argentina and
-
-# This file is part of Koha.
-#
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-#
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
-
-require Exporter;
-
-use strict;
-
-use CGI;
-use C4::Context;
-use C4::Output;
-
-
-#FIXME : module deprecated ?
-use PDF::API2;
-use PDF::API2::Page;
-use PDF::API2::Util;
-use C4::Barcodes::PrinterConfig;
-use Time::localtime;
-
-# This function returns the path to deal with the correct files, considering
-# templates set and language.
-sub getPath {
-    my $type         = shift @_;
-    my $templatesSet = C4::Context->preference('template');
-    my $lang         = C4::Context->preference('opaclanguages');
-    if ( $type eq "intranet" ) {
-        return "$ENV{'DOCUMENT_ROOT'}/intranet-tmpl/$templatesSet/$lang";
-    }
-    else {
-        return "$ENV{'DOCUMENT_ROOT'}/opac-tmpl/$templatesSet/$lang";
-    }
-}
-
-# Load a configuration file. Before use this function, check if that file exists.
-sub loadConfFromFile {
-    my $fileName = shift @_;
-    my %keyValues;
-    open FILE, "<$fileName";
-    while (<FILE>) {
-        chomp;
-        if (/\s*([\w_]*)\s*=\s*([\[\]\<\>\w_\s:@,\.-]*)\s*/) {
-            $keyValues{$1} = $2;
-        }
-    }
-    close FILE;
-    return %keyValues;
-}
-
-# Save settings to a configuration file. It delete previous configuration settings.
-sub saveConfToFile {
-    my $fileName  = shift @_;
-    my %keyValues = %{ shift @_ };
-    my $i;
-    open FILE, ">$fileName";
-    foreach $i ( keys(%keyValues) ) {
-        print FILE $i . " = " . $keyValues{$i} . "\n";
-    }
-    close FILE;
-}
-
-# Load the config file.
-my $filenameConf =
-  &getPath("intranet") . "/includes/labelConfig/itemsLabelConfig.conf";
-my %labelConfig = &loadConfFromFile($filenameConf);
-
-# Creates a CGI object and take its parameters
-my $cgi              = new CGI;
-my $from             = $cgi->param('from');
-my $to               = $cgi->param('to');
-my $individualCodes  = $cgi->param('individualCodes');
-my $rangeType        = $cgi->param('rangeType');
-my $pageType         = $cgi->param('pages');
-my $label            = $cgi->param('label');
-my $numbersystem     = $cgi->param('numbersystem');
-my $text_under_label = $cgi->param('text_under_label');
-
-# Generate the checksum from an inventary code
-sub checksum {
-
-    sub calculateDigit {
-        my $code       = shift @_;
-        my $sum        = 0;
-        my $odd_parity = 1;
-        my $i;
-        for ( $i = length($code) - 1 ; $i >= 0 ; $i-- ) {
-            if ($odd_parity) {
-                $sum = $sum + ( 3 * substr( $code, $i, 1 ) );
-            }
-            else {
-                $sum = $sum + substr( $code, $i, 1 );
-            }
-            $odd_parity = !$odd_parity;
-        }
-        my $check_digit = 10 - ( $sum % 10 );
-        if ( $check_digit == 10 ) {
-            $check_digit = 0;
-        }
-        return $code . $check_digit;
-    }
-
-    my $currentCode = shift @_;
-    $currentCode = &calculateDigit($currentCode);
-    return $currentCode;
-}
-
-# Assigns a temporary name to the PDF file
-sub assingFilename {
-    my ( $from, $to ) = @_;
-    my $ip      = $cgi->remote_addr();
-    my $random  = int( rand(1000000) );
-    my $timeObj = localtime();
-    my ( $day, $month, $year, $hour, $min, $sec ) = (
-        $timeObj->mday,
-        $timeObj->mon + 1,
-        $timeObj->year + 1900,
-        $timeObj->hour, $timeObj->min, $timeObj->sec
-    );
-    my $tmpFileName =
-        $random . '-' . $ip
-      . '-(From '
-      . $from . ' to '
-      . $to . ')-['
-      . $day . '.'
-      . $month . '.'
-      . $year . ']-['
-      . $hour . ':'
-      . $min . ':'
-      . $sec . '].pdf';
-    return $tmpFileName;
-}
-
-sub getCallnum {
-
-    #grabs a callnumber for the specified barcode
-    my ($barcode) = @_;
-    my $query =
-"select dewey from items,biblioitems where items.biblionumber=biblioitems.biblionumber and items.barcode=?";
-    my $dbh = C4::Context->dbh;
-    my $sth = $dbh->prepare($query);
-    $sth->execute($barcode);
-    my ($callnum) = $sth->fetchrow_array();
-    warn "Call number is:" . $barcode;
-    return $callnum;
-}
-
-# Takes inventary codes from database and if they are between
-# the interval specify by parameters, it generates the correspond barcodes
-sub barcodesGenerator {
-    my ( $from, $to, $rangeType, $individualCodes, $text_under_label ) = @_;
-
-    # Returns a database handler
-    my $dbh = C4::Context->dbh;
-
-    # Create the query to database
-    # Assigns a temporary filename for the pdf file
-    my $tmpFileName = &assingFilename( $from, $to );
-
-    # warn "range type: ".$rangeType;
-    if ( $rangeType eq 'continuous' ) {
-
-        # Set the temp directory for pdf´s files
-        if ( !defined( $ENV{'TEMP'} ) ) {
-            $ENV{'TEMP'} = '/tmp/';
-        }
-        $tmpFileName = $ENV{'TEMP'} . $tmpFileName;
-
-        # Creates a PDF object
-        my $pdf = PDF::API2->new( -file => $tmpFileName );
-
-        # Set the positions where barcodes are going to be placed
-        C4::Barcodes::PrinterConfig::setPositionsForX(
-            $labelConfig{'marginLeft'}, $labelConfig{'labelWidth'},
-            $labelConfig{'columns'},    $labelConfig{'pageType'}
-        );
-        C4::Barcodes::PrinterConfig::setPositionsForY(
-            $labelConfig{'marginBottom'}, $labelConfig{'labelHeigth'},
-            $labelConfig{'rows'},         $labelConfig{'pageType'}
-        );
-
-        # Creates a font object
-        my $tr = $pdf->corefont('Helvetica-Bold');
-
-        # Barcode position
-        my ( $page, $gfx, $text );
-        for ( my $code = $from ; $code <= $to ; $code++ ) {
-
-            # Generetase checksum
-            my $codeC = &checksum($code);
-
-            # Generate the corresponde barcode to $code
-            # warn "Code is :-->".$codeC."<--";
-            my $barcode = $pdf->barcode(
-                -font => $tr,         # The font object to use
-                -type => 'ean128',    # Standard of codification
-                -code => $codeC,      # Text to codify
-                -extn => '012345',    # Barcode extension (if it is aplicable)
-                -umzn => 10,          # Top limit of the finished bar
-                -lmzn => 10,          # Bottom limit of the finished bar
-                -zone => 15,          # Bars size
-                -quzn => 0,           # Space destinated for legend
-                -ofwt => 0.01,        # Bars width
-                -fnsz => 8,           # Font size
-                -text => ''
-            );
-
-            ( my $x, my $y, $pdf, $page, $gfx, $text, $tr, $label ) =
-              C4::Barcodes::PrinterConfig::getLabelPosition( $label, $pdf,
-                $page, $gfx, $text, $tr, $pageType );
-
-            # Assigns a barcodes to $gfx
-            $gfx->barcode( $barcode, $x, $y,
-                ( 72 / $labelConfig{'systemDpi'} ) );
-
-            # Assigns the additional information to the barcode (Legend)
-            $text->translate( $x - 48, $y - 22 );
-
-            #warn "code is ".$codeC;
-            if ($text_under_label) {
-                $text->text($text_under_label);
-            }
-            else {
-                $text->text( getCallnum($code) );
-            }
-        }
-
-        # Writes the objects added in $gfx to $page
-        $pdf->finishobjects( $page, $gfx, $text );
-
-        # Save changes to the PDF
-        $pdf->saveas;
-
-        # Close the conection with the PDF file
-        $pdf->end;
-
-        # Show the PDF file
-        print $cgi->redirect(
-            "/cgi-bin/koha/barcodes/pdfViewer.pl?tmpFileName=$tmpFileName");
-    }
-    else {
-        my $rangeCondition;
-        if ( $individualCodes ne "" ) {
-            $rangeCondition = "AND (I.barcode IN " . $individualCodes . ")";
-        }
-        else {
-            $rangeCondition =
-              "AND (I.barcode >= " . $from . " AND I.barcode <=" . $to . " )";
-        }
-
-        my $query =
-"SELECT CONCAT('$numbersystem',REPEAT('0',((12 - LENGTH('$numbersystem')) - LENGTH(I.barcode))), I.barcode) AS Codigo, B.title, B.author FROM biblio B, items I WHERE (I.biblionumber = B.biblioNumber ) "
-          . $rangeCondition
-          . " AND (I.barcode <> 'FALTA') ORDER BY Codigo";
-
-        # Prepare the query
-        my $sth = $dbh->prepare($query);
-
-        # Executes the query
-        $sth->execute;
-        if ( $sth->rows ) {    # There are inventary codes
-                               # Set the temp directory for pdf´s files
-            if ( !defined( $ENV{'TEMP'} ) ) {
-                $ENV{'TEMP'} = '/tmp/';
-            }
-
-            # Assigns a temporary filename for the pdf file
-            my $tmpFileName = &assingFilename( $from, $to );
-            $tmpFileName = $ENV{'TEMP'} . $tmpFileName;
-
-            # Creates a PDF object
-            my $pdf = PDF::API2->new( -file => $tmpFileName );
-
-            # Set the positions where barcodes are going to be placed
-            C4::Barcodes::PrinterConfig::setPositionsForX(
-                $labelConfig{'marginLeft'}, $labelConfig{'labelWidth'},
-                $labelConfig{'columns'},    $labelConfig{'pageType'}
-            );
-            C4::Barcodes::PrinterConfig::setPositionsForY(
-                $labelConfig{'marginBottom'}, $labelConfig{'labelHeigth'},
-                $labelConfig{'rows'},         $labelConfig{'pageType'}
-            );
-
-            # Creates a font object
-            my $tr = $pdf->corefont('Helvetica-Bold');
-
-            # Barcode position
-            my ( $page, $gfx, $text );
-            while ( my ( $code, $dewey, $title, $author ) =
-                $sth->fetchrow_array )
-            {
-
-                # Generetase checksum
-                $code = &checksum($code);
-
-                # Generate the corresponde barcode to $code
-                my $barcode = $pdf->barcode(
-                    -font => $tr,       # The font object to use
-                    -type => 'ean13',   # Standard of codification
-                    -code => $code,     # Text to codify
-                    -extn => '012345',  # Barcode extension (if it is aplicable)
-                    -umzn => 10,        # Top limit of the finished bar
-                    -lmzn => 10,        # Bottom limit of the finished bar
-                    -zone => 15,        # Bars size
-                    -quzn => 0,         # Space destinated for legend
-                    -ofwt => 0.01,      # Bars width
-                    -fnsz => 8,         # Font size
-                    -text => ''
-                );
-
-                ( my $x, my $y, $pdf, $page, $gfx, $text, $tr, $label ) =
-                  C4::Barcodes::PrinterConfig::getLabelPosition( $label, $pdf,
-                    $page, $gfx, $text, $tr, $pageType );
-
-                # Assigns a barcodes to $gfx
-                $gfx->barcode( $barcode, $x, $y,
-                    ( 72 / $labelConfig{'systemDpi'} ) );
-
-                # Assigns the additional information to the barcode (Legend)
-                $text->translate( $x - 48, $y - 22 );
-                if ($text_under_label) {
-                    $text->text($text_under_label);
-                }
-                else {
-                    $text->text( substr $title, 0, 30 );
-                    $text->translate( $x - 48, $y - 29 );
-
-                    #$text->text(substr $author, 0, 30);
-                    $text->text( substr $author, 0, 30 );
-                }
-            }
-
-            # Writes the objects added in $gfx to $page
-            $pdf->finishobjects( $page, $gfx, $text );
-
-            # Save changes to the PDF
-            $pdf->saveas;
-
-            # Close the conection with the PDF file
-            $pdf->end;
-
-            # Show the PDF file
-            print $cgi->redirect(
-                "/cgi-bin/koha/barcodes/pdfViewer.pl?tmpFileName=$tmpFileName");
-        }
-        else {
-
-            # Rollback and shows the error legend
-            print $cgi->redirect("/cgi-bin/koha/barcodes/barcodes.pl?error=1");
-        }
-        $sth->finish;
-    }
-}
-
-barcodesGenerator( $from, $to, $rangeType, $individualCodes,
-    $text_under_label );
diff --git a/barcodes/label-home.pl b/barcodes/label-home.pl
deleted file mode 100755
index 5fa02ad9f1..0000000000
--- a/barcodes/label-home.pl
+++ /dev/null
@@ -1,78 +0,0 @@
-#!/usr/bin/perl
-
-# This file is part of Koha.
-#
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-#
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
-
-use strict;
-use CGI;
-use C4::Auth;
-use C4::Output;
-use C4::Labels;
-use C4::Context;
-
-
-my $query = new CGI;
-my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
-    {
-        template_name   => "barcodes/label-home.tmpl",
-        query           => $query,
-        type            => "intranet",
-        authnotrequired => 0,
-        flagsrequired   => { tools => 1 },
-        debug           => 1,
-    }
-);
-
-my $data = get_label_options();
-
-my $active_template = GetActiveLabelTemplate();
-my @label_templates = GetAllLabelTemplates();
-
-$template->param( guidebox => 1 ) if ( $data->{'guidebox'} );
-
-$data->{'printingtype'} = 'both' if ( !$data->{'printingtype'} );
-$template->param( "printingtype_$data->{'printingtype'}" => 1 );
-$template->param( "papertype_$data->{'papertype'}"       => 1 );
-
-$template->param( "$data->{'barcodetype'}_checked" => 1 );
-
-$template->param( "startrow" . $data->{'startrow'} . "_checked" => 1 );
-$template->param(
-    itemtype        => $data->{'itemtype'},
-    active_template => $data->{'active_template'},
-    label_templates => \@label_templates,
-
-    papertype      => $data->{'papertype'},
-    author         => $data->{'author'},
-    barcode        => $data->{'barcode'},
-    id             => $data->{'id'},
-    barcodetype    => $data->{'barcodetype'},
-    title          => $data->{'title'},
-    isbn           => $data->{'isbn'},
-    dewey          => $data->{'dewey'},
-    class          => $data->{'class'},
-    startrow       => $data->{'startrow'},
-    subclass       => $data->{'subclass'},
-    itemcallnumber => $data->{'itemcallnumber'},
-    startlabel     => $data->{'startlabel'},
-    fontsize       => $active_template->{'fontsize'},
-
-    intranetcolorstylesheet =>
-      C4::Context->preference("intranetcolorstylesheet"),
-    intranetstylesheet => C4::Context->preference("intranetstylesheet"),
-    IntranetNav        => C4::Context->preference("IntranetNav"),
-);
-
-output_html_with_http_headers $query, $cookie, $template->output;
diff --git a/barcodes/label-manager.pl b/barcodes/label-manager.pl
deleted file mode 100755
index b25ac2f80f..0000000000
--- a/barcodes/label-manager.pl
+++ /dev/null
@@ -1,154 +0,0 @@
-#!/usr/bin/perl
-
-# This file is part of Koha.
-#
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-#
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
-
-use strict;
-use CGI;
-use C4::Auth;
-use C4::Labels;
-use C4::Output;
-
-use POSIX;
-
-my $dbh            = C4::Context->dbh;
-my $query          = new CGI;
-my $op             = $query->param('op');
-my $barcodetype    = $query->param('barcodetype');
-my $title          = $query->param('title');
-my $isbn           = $query->param('isbn');
-my $itemtype       = $query->param('itemtype');
-my $bcn            = $query->param('bcn');
-my $dcn            = $query->param('dcn');
-my $classif        = $query->param('classif');
-my $itemcallnumber = $query->param('itemcallnumber');
-my $subclass       = $query->param('subclass');
-my $author         = $query->param('author');
-my $tmpl_id        = $query->param('tmpl_id');
-my $itemnumber     = $query->param('itemnumber');
-my $summary        = $query->param('summary');
-my $startlabel     = $query->param('startlabel');
-my $printingtype   = $query->param('printingtype');
-my $guidebox       = $query->param('guidebox');
-my $fontsize       = $query->param('fontsize');
-
-#warn "ID =$tmpl_id";
-
-my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
-    {
-        template_name   => "barcodes/label-manager.tmpl",
-        query           => $query,
-        type            => "intranet",
-        authnotrequired => 1,
-        flagsrequired   => { tools => 1 },
-        debug           => 1,
-    }
-);
-
-if ( $op eq 'save_conf' ) {
-    SaveConf(
-        $barcodetype,    $title,  $isbn,    $itemtype,
-        $bcn,            $dcn,    $classif, $subclass,
-        $itemcallnumber, $author, $tmpl_id, $printingtype,
-        $guidebox,       $startlabel
-    );
-
-}
-elsif ( $op eq 'add' ) {
-    my $query2 = "INSERT INTO labels ( itemnumber ) values ( ? )";
-    my $sth2   = $dbh->prepare($query2);
-    $sth2->execute($itemnumber);
-    $sth2->finish;
-}
-elsif ( $op eq 'deleteall' ) {
-    my $query2 = "DELETE FROM labels";
-    my $sth2   = $dbh->prepare($query2);
-    $sth2->execute();
-    $sth2->finish;
-}
-elsif ( $op eq 'delete' ) {
-    warn "MASON, deleting label..";
-    my $query2 = "DELETE FROM labels where itemnumber = ?";
-    my $sth2   = $dbh->prepare($query2);
-    $sth2->execute($itemnumber);
-    $sth2->finish;
-}
-
-#  first lets do a read of the labels table , to get the a list of the
-# currently entered items to be prinited
-
-my @resultsloop = ();
-my $count;
-my @data;
-my $query3 = "Select * from labels";
-my $sth    = $dbh->prepare($query3);
-$sth->execute();
-
-my $cnt = $sth->rows;
-my $i1  = 1;
-while ( my $data = $sth->fetchrow_hashref ) {
-
-    # lets get some summary info from each item
-    my $query1 = "
-			select * from biblio,biblioitems,items where itemnumber=? and 
-				items.biblioitemnumber=biblioitems.biblioitemnumber and 
-				biblioitems.biblionumber=biblio.biblionumber";
-
-    my $sth1 = $dbh->prepare($query1);
-    $sth1->execute( $data->{'itemnumber'} );
-    my $data1 = $sth1->fetchrow_hashref();
-
-    $data1->{'labelno'} = $i1;
-    $data1->{'summary'} =
-      "$data1->{'barcode'}, $data1->{'title'}, $data1->{'isbn'}";
-
-    push( @resultsloop, $data1 );
-    $sth1->finish;
-
-    $i1++;
-}
-$sth->finish;
-
-# this script can be run from the side nav, and is not passed a value for $startrow
-# so lets get it from the DB
-
-my $dbh    = C4::Context->dbh;
-my $query2 = "SELECT * FROM labels_conf LIMIT 1";
-my $sth    = $dbh->prepare($query2);
-$sth->execute();
-
-my $data = $sth->fetchrow_hashref;
-$sth->finish;
-
-#calc-ing number of sheets
-
-#$sheets_needed = ceil($sheets_needed);    # rounding up int's
-
-#my $tot_labels       = ( $sheets_needed * 8 );
-#my $start_results    = ( $number_of_results + $startrow );
-#my $labels_remaining = ( $tot_labels - $start_results );
-
-$template->param(
-    resultsloop => \@resultsloop,
-
-    #  startrow         => $startrow,
-    #  sheets           => $sheets_needed,
-    #  labels_remaining => $labels_remaining,
-    intranetcolorstylesheet =>
-      C4::Context->preference("intranetcolorstylesheet"),
-    intranetstylesheet => C4::Context->preference("intranetstylesheet"),
-    IntranetNav        => C4::Context->preference("IntranetNav"),
-);
-output_html_with_http_headers $query, $cookie, $template->output;
diff --git a/barcodes/label-print-opus-pdf.pl b/barcodes/label-print-opus-pdf.pl
deleted file mode 100755
index 5247ce9417..0000000000
--- a/barcodes/label-print-opus-pdf.pl
+++ /dev/null
@@ -1,189 +0,0 @@
-#!/usr/bin/perl
-
-# This file is part of Koha.
-#
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-#
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
-
-use strict;
-use CGI;
-use C4::Labels;
-use C4::Auth;
-use C4::Output;
-use C4::Context;
-use PDF::Reuse;
-use PDF::Reuse::Barcode;
-use POSIX;
-use Text::Wrap;
-
-
-$Text::Wrap::columns   = 39;
-$Text::Wrap::separator = "\n";
-
-my $htdocs_path = C4::Context->config('intrahtdocs');
-my $cgi         = new CGI;
-my $spine_text  = "";
-
-# get the printing settings
-my $conf_data    = get_label_options();
-my @resultsloop  = get_label_items();
-my $barcodetype  = $conf_data->{'barcodetype'};
-my $printingtype = $conf_data->{'printingtype'};
-my $guidebox     = $conf_data->{'guidebox'};
-my $startrow     = $conf_data->{'startrow'};
-
-# if none selected, then choose 'both'
-if ( !$printingtype ) {
-    $printingtype = 'both';
-}
-
-# opus paper dims. in *millimeters*
-# multiply values by '2.83465', to find their value in Postscript points.
-
-# $xmargin           = 12;
-# $label_height     = 34;
-# $label_width      = 74;
-# $x_pos_spine      = 12;
-# $pageheight       = 304;
-# $pagewidth       = 174;
-# $line_spacer      = 10;
-# $label_rows       = 8;
-
-# sheet dimensions in PS points.
-
-my $top_margin       = 7;
-my $left_margin      = 34;
-my $top_text_margin  = 20;
-my $left_text_margin = 10;
-my $label_height     = 96;
-my $spine_width      = 210;
-my $colspace         = 9;
-my $rowspace         = 11;
-my $x_pos_spine      = 36;
-my $pageheight       = 861;
-my $pagewidth        = 493;
-my $line_spacer      = 10;
-my $label_rows       = 8;
-
-# setting up the pdf doc
-#remove the file before write, for testing
-#unlink "$htdocs_path/barcodes/new.pdf";
-#prFile("$htdocs_path/barcodes/new.pdf");
-#prLogDir("$htdocs_path/barcodes");
-
-# fix, no longer writes to temp dir
-prInitVars();    # To initiate ALL global variables and tables
-$| = 1;
-print STDOUT "Content-Type: application/pdf \n\n";
-prFile();
-
-prMbox( 0, 0, $pagewidth, $pageheight );
-prFont('courier');    # Just setting a font
-prFontSize(9);
-
-my $str;
-
-my $y_pos_initial = ( ( $pageheight - $top_margin ) - $label_height );
-my $y_pos_initial_startrow =
-  ( ( $pageheight - $top_margin ) - ( $label_height * $startrow ) );
-my $y_pos = $y_pos_initial_startrow;
-
-my $page_break_count = $startrow;
-my $codetype         = 'Code39';
-
-#do page border
-# commented out coz it was running into the side-feeds of the paper.
-# drawbox( 0, 0 , $pagewidth, $pageheight );
-
-my $item;
-
-# for loop
-my $i2 = 1;
-
-foreach $item (@resultsloop) {
-    my $x_pos_spine_tmp = $x_pos_spine;
-
-    for ( 1 .. 2 ) {
-
-        if ( $guidebox == 1 ) {
-            warn
-"COUNT1, PBREAKCNT=$page_break_count,  y=$y_pos, labhght = $label_height";
-            drawbox( $x_pos_spine_tmp, $y_pos, $spine_width, $label_height );
-        }
-
-        #-----------------draw spine text
-        if ( $printingtype eq 'spine' || $printingtype eq 'both' ) {
-
-            #warn "PRINTTYPE = $printingtype";
-
-            # add your printable fields manually in here
-            my @fields = qw (itemtype dewey isbn classification);
-            my $vPos   = ( $y_pos + ( $label_height - $top_text_margin ) );
-            my $hPos   = ( $x_pos_spine_tmp + $left_text_margin );
-            foreach my $field (@fields) {
-
-               # if the display option for this field is selected in the DB,
-               # and the item record has some values for this field, display it.
-                if ( $conf_data->{"$field"} && $item->{"$field"} ) {
-
-                    #warn "CONF_TYPE = $field";
-
-                    # get the string
-                    $str = $item->{"$field"};
-
-                    # strip out naughty existing nl/cr's
-                    $str =~ s/\n//g;
-                    $str =~ s/\r//g;
-
-                    # chop the string up into _upto_ 12 chunks
-                    # and seperate the chunks with newlines
-
-                    $str = wrap( "", "", "$str" );
-                    $str = wrap( "", "", "$str" );
-
-                    # split the chunks between newline's, into an array
-                    my @strings = split /\n/, $str;
-
-                    # then loop for each string line
-                    foreach my $str (@strings) {
-
-                        warn "HPOS ,  VPOS $hPos, $vPos ";
-                        prText( $hPos, $vPos, $str );
-                        $vPos = $vPos - $line_spacer;
-                    }
-                }    # if field is valid
-            }    # foreach   @field
-        }    #if spine
-
-        $x_pos_spine_tmp = ( $x_pos_spine_tmp + $spine_width + $colspace );
-    }    # for 1 ..2
-    warn " $y_pos - $label_height - $rowspace";
-    $y_pos = ( $y_pos - $label_height - $rowspace );
-    warn " $y_pos - $label_height - $rowspace";
-
-    #-----------------draw spine text
-
-    # the gaylord labels have 8 rows per sheet, this pagebreaks after 8 rows
-    if ( $page_break_count == $label_rows ) {
-        prPage();
-        $page_break_count = 0;
-        $i2               = 0;
-        $y_pos            = $y_pos_initial;
-    }
-    $page_break_count++;
-    $i2++;
-}
-prEnd();
-
-#print $cgi->redirect("/intranet-tmpl/barcodes/new.pdf");
-
diff --git a/barcodes/label-print.pl b/barcodes/label-print.pl
deleted file mode 100755
index acf6a515f2..0000000000
--- a/barcodes/label-print.pl
+++ /dev/null
@@ -1,135 +0,0 @@
-#!/usr/bin/perl
-
-# This file is part of koha
-#
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-#
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
-
-use strict;
-use CGI;
-use C4::Auth;
-use C4::Serials;
-use C4::Output;
-use C4::Context;
-
-use GD::Barcode::UPCE;
-use Data::Random qw(:all);
-
-my $htdocs_path = C4::Context->config('intrahtdocs');
-
-my $query = new CGI;
-
-my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
-    {
-        template_name   => "barcodes/label-print.tmpl",
-        query           => $query,
-        type            => "intranet",
-        authnotrequired => 0,
-        flagsrequired   => { tools => 1 },
-        debug           => 1,
-    }
-);
-
-my $dbh    = C4::Context->dbh;
-my $query2 = "SELECT * FROM labels_conf LIMIT 1";
-my $sth    = $dbh->prepare($query2);
-$sth->execute();
-
-my $conf_data = $sth->fetchrow_hashref;
-
-$sth->finish;
-
-my @data;
-my $query3 = "Select * from labels";
-my $sth    = $dbh->prepare($query3);
-$sth->execute();
-my @resultsloop;
-my $cnt = $sth->rows;
-my $i1  = 1;
-while ( my $data = $sth->fetchrow_hashref ) {
-
-    # lets get some summary info from each item
-
-    my $query1 = "
-                        select * from biblio,biblioitems,items where itemnumber=? and
-                                items.biblioitemnumber=biblioitems.biblioitemnumber and
-                                biblioitems.biblionumber=biblio.biblionumber";
-
-    my $sth1 = $dbh->prepare($query1);
-    $sth1->execute( $data->{'itemnumber'} );
-    my $data1 = $sth1->fetchrow_hashref();
-
-    push( @resultsloop, $data1 );
-    $sth1->finish;
-
-    $i1++;
-}
-$sth->finish;
-
-#------------------------------------------------------
-
-#lets write barcode files to tmp dir for every item in @resultsloop
-
-binmode(FILE);
-foreach my $item (@resultsloop) {
-
-    my $random = int( rand(100000000000) ) + 999999999999;
-
-    #warn  "$random\n";
-
-    $item->{'barcode'} = $random;
-
-    #	my $itembarcode = $item->{'barcode'};
-    #	warn $item->{'barcode'};
-
-    my $filename = "$htdocs_path/barcodes/$item->{'barcode'}.png";
-
-    #warn $filename;
-    open( FILE, ">$filename" );
-
-    print FILE GD::Barcode->new( 'EAN13', $item->{'barcode'} )->plot->png;
-
-    #	warn $GD::Barcode::errStr;
-
-    close(FILE);
-
-    #warn Dumper  $item->{'barcode'};
-
-}
-
-# lets pass the config setting
-
-$template->param(
-
-    resultsloop => \@resultsloop,
-
-    itemtype_opt       => $conf_data->{'itemtype'},
-    papertype_opt      => $conf_data->{'papertype'},
-    author_opt         => $conf_data->{'author'},
-    barcode_opt        => $conf_data->{'barcode'},
-    id_opt             => $conf_data->{'id'},
-    type_opt           => $conf_data->{'type'},
-    title_opt          => $conf_data->{'title'},
-    isbn_opt           => $conf_data->{'isbn'},
-    dewey_opt          => $conf_data->{'dewey'},
-    class_opt          => $conf_data->{'class'},
-    subclass_opt       => $conf_data->{'subclass'},
-    itemcallnumber_opt => $conf_data->{'itemcallnumber'},
-
-    intranetcolorstylesheet =>
-      C4::Context->preference("intranetcolorstylesheet"),
-    intranetstylesheet => C4::Context->preference("intranetstylesheet"),
-    IntranetNav        => C4::Context->preference("IntranetNav"),
-);
-output_html_with_http_headers $query, $cookie, $template->output;
-
diff --git a/barcodes/pdfViewer.pl b/barcodes/pdfViewer.pl
deleted file mode 100755
index 4060224600..0000000000
--- a/barcodes/pdfViewer.pl
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/usr/bin/perl
-
-# script to show a PDF file.
-# written 07/04
-# by Veleda Matias - matias_veleda@hotmail.com - Physics Library UNLP Argentina and
-#    Castañeda Sebastian - seba3c@yahoo.com.ar - Physics Library UNLP Argentina and
-
-# This file is part of Koha.
-#
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-#
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
-
-require Exporter;
-
-use strict;
-use C4::Context;
-use CGI;
-
-# This script take a pdf filename as a parameter and output it to the browser.
-my $cgi         = new CGI;
-my $filename    = "barcodes.pdf";
-my $tmpFileName = $cgi->param('tmpFileName');
-print "Content-Disposition: attachment; filename = $filename\n\n";
-print $cgi->header( -type => 'application/pdf' ),
-  $cgi->start_html( -title => "Codify to PDF" );
-open fh, "<$tmpFileName";
-while (<fh>) {
-    print;
-}
-print $cgi->end_html();
diff --git a/barcodes/printerConfig.pl b/barcodes/printerConfig.pl
deleted file mode 100755
index 174801bb60..0000000000
--- a/barcodes/printerConfig.pl
+++ /dev/null
@@ -1,128 +0,0 @@
-#!/usr/bin/perl
-
-# script to set the labels configuration for the printer process.
-# written 07/04
-# by Veleda Matias - matias_veleda@hotmail.com - Physics Library UNLP Argentina and
-
-# This file is part of Koha.
-#
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-#
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
-
-require Exporter;
-
-use strict;
-
-use CGI;
-use C4::Context;
-use C4::Output;
-use C4::Auth;
-
-use PDF::API2;
-use PDF::API2::Page;
-use PDF::API2::Util;
-
-# This function returns the path to deal with the correct files, considering
-# templates set and language.
-sub getPath {
-    my $type         = shift @_;
-    my $templatesSet = C4::Context->preference('template');
-    my $lang         = C4::Context->preference('opaclanguages');
-    if ( $type eq "intranet" ) {
-        return "$ENV{'DOCUMENT_ROOT'}/intranet-tmpl/$templatesSet/$lang";
-    }
-    else {
-        return "$ENV{'DOCUMENT_ROOT'}/opac-tmpl/$templatesSet/$lang";
-    }
-}
-
-# Load a configuration file.
-sub loadConfFromFile {
-    my $fileName = shift @_;
-    my %keyValues;
-    open FILE, "<$fileName";
-    while (<FILE>) {
-        chomp;
-        if (/\s*([\w_]*)\s*=\s*([\[\]\<\>\w_\s:@,\.-]*)\s*/) {
-            $keyValues{$1} = $2;
-        }
-    }
-    close FILE;
-    return %keyValues;
-}
-
-# Save settings to a configuration file.
-sub saveConfToFile {
-    my $fileName  = shift @_;
-    my %keyValues = %{ shift @_ };
-    my $i;
-    open FILE, ">$fileName";
-    my $i;
-    foreach $i ( keys(%keyValues) ) {
-        print FILE $i . " = " . $keyValues{$i} . "\n";
-    }
-    close FILE;
-}
-
-# Creates a CGI object and take his parameters
-my $input = new CGI;
-
-if ( $input->param('saveSettings') ) {
-    my $labelConf =
-      &getPath("intranet") . "/includes/labelConfig/itemsLabelConfig.conf";
-    my %newConfiguration = (
-        pageType     => $input->param('pageType'),
-        columns      => $input->param('columns'),
-        rows         => $input->param('rows'),
-        systemDpi    => $input->param('systemDpi'),
-        labelWidth   => $input->param('labelWidth'),
-        labelHeigth  => $input->param('labelHeigth'),
-        marginBottom => $input->param('marginBottom'),
-        marginLeft   => $input->param('marginLeft')
-    );
-    saveConfToFile( $labelConf, \%newConfiguration );
-    print $input->redirect('/cgi-bin/koha/barcodes/barcodes.pl');
-}
-
-# Get the template to use
-my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
-    {
-        template_name   => "barcodes/printerConfig.tmpl",
-        type            => "intranet",
-        query           => $input,
-        authnotrequired => 0,
-        flagsrequired   => { tools => 1 },
-        debug           => 1,
-    }
-);
-
-my $filenameConf =
-  &getPath("intranet") . "/includes/labelConfig/itemsLabelConfig.conf";
-my %labelConfig = &loadConfFromFile($filenameConf);
-
-$template->param( COLUMNS      => $labelConfig{'columns'} );
-$template->param( ROWS         => $labelConfig{'rows'} );
-$template->param( SYSTEM_DPI   => $labelConfig{'systemDpi'} );
-$template->param( LABEL_WIDTH  => $labelConfig{'labelWidth'} );
-$template->param( LABEL_HEIGTH => $labelConfig{'labelHeigth'} );
-$template->param( MARGIN_TOP   => $labelConfig{'marginBottom'} );
-$template->param( MARGIN_LEFT  => $labelConfig{'marginLeft'} );
-$template->param( SCRIPT_NAME  => '/cgi-bin/koha/barcodes/printerConfig.pl' );
-$template->param( "$labelConfig{'pageType'}" => 1 );
-$template->param(
-    intranetcolorstylesheet =>
-      C4::Context->preference("intranetcolorstylesheet"),
-    intranetstylesheet => C4::Context->preference("intranetstylesheet"),
-    IntranetNav        => C4::Context->preference("IntranetNav"),
-);
-output_html_with_http_headers $input, $cookie, $template->output;
diff --git a/barcodes/test.textblock.pl b/barcodes/test.textblock.pl
deleted file mode 100755
index 67d9c9ba3f..0000000000
--- a/barcodes/test.textblock.pl
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/usr/bin/perl
-
-use C4::Context;
-use PDF::API2;
-use PDF::Table;
-
-my $pdftable = new PDF::Table;
-my $pdf      = PDF::API2->new();
-
-#$pdf->mediabox(612,792);
-my $fnt  = $pdf->corefont('Helvetica-Bold');
-my $page = $pdf->page;                         # returns the last page
-my $txt  = $page->text;
-$txt->{' font'} = $fnt;
-$text_to_place = "moo moo";
-
-( $width_of_last_line, $ypos_of_last_line, $left_over_text ) =
-  $pdftable->text_block(
-    $txt,
-    $text_to_place,
-    -x => 100,
-    -y => 300,
-    -w => 50,
-    -h => 40,
-
-    # 	-lead     => 13,
-    #	-font_size => 12,
-    # -parspace => 0,
-    #   -align    => "left",
-    #   -hang     => 1,
-  );
-
-$pdf->saveas("$htdocs_path/barcodes/foo.pdf");
diff --git a/installer/kohastructure.sql b/installer/kohastructure.sql
index 7717c083f0..d3c89278eb 100644
--- a/installer/kohastructure.sql
+++ b/installer/kohastructure.sql
@@ -912,6 +912,7 @@ CREATE TABLE `itemtypes` (
 DROP TABLE IF EXISTS `labels`;
 CREATE TABLE `labels` (
   `labelid` int(11) NOT NULL auto_increment,
+   `batch_id`   varchar(10)  NOT NULL,
   `itemnumber` varchar(100) NOT NULL default '',
   `timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP,
   PRIMARY KEY  (`labelid`)
diff --git a/koha-tmpl/intranet-tmpl/prog/en/barcodes/barcodes.tmpl b/koha-tmpl/intranet-tmpl/prog/en/barcodes/barcodes.tmpl
deleted file mode 100644
index 26b7fe369e..0000000000
--- a/koha-tmpl/intranet-tmpl/prog/en/barcodes/barcodes.tmpl
+++ /dev/null
@@ -1,85 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha &rsaquo; Label and Barcode Printing</title>
-<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
-<!-- TMPL_INCLUDE NAME="menu-barcodes.inc" -->
-
-<!--   START OF ADD COUNTRY CODE PANEL  -->
-<div class="countryPanel" id="addCountryCode">
- 	<form action="/cgi-bin/koha/barcodes/barcodes.pl" method="post" style="display:inline">
-		<input type="hidden" name="addCode" value="1" />
-<h4>Add a new Country Code</h4>
-<ul>
-	<li><label for="countryName">Country Name:</label> <input type="text" size="10" id="countryName" name="countryName" /></li>
-	<li><label for="countryCode">Country Code:</label> <input type="text" size="3" id="countryCode" name="countryCode" /></li>
-</ul>
-<input type="submit" name="submit" id="submit" value="Save Code"/>
-<input type="button" name="cancel" id="cancel" value="Cancel" onclick="document.getElementById('addCountryCode').style.display = 'none'" />
-	</form>
-</div>
-
-<!--   END OF ADD COUNTRY CODE PANEL  -->
-
-	<h1>Barcodes Generator</h1>
-	<h3>Generate barcodes from inventory codes</h3>
-	<ul>
-		<li>Select a range of inventary codes. You can choose a continuous range or individual inventory codes</li>
-		<li>Select the standard type to generate barcodes.</li>
-		<li>Define the page size for output the PDF.</li>
-		<li>Depending on page size, Koha will show you how the page is arranged
-		    for each barcode. You can define wich point to start printing the page.
-		</li>
-	</ul>
-	
-<!-- TMPL_IF NAME="ERROR" -->Can't find inventory codes in that range. Please try again.<!-- /TMPL_IF -->
-
-	<form id="formulario" method="post" action="<!-- TMPL_VAR NAME="SCRIPT_NAME" -->" name="form1" onsubmit="return checkFields(this);" target="_blank">
-		<label for="rangeType">Type of Interval: </label><!-- TMPL_VAR NAME="RANGE_TYPE" -->
-
-<div id="continuous" class="panel" style="display:inline">
-	<ul>
-		<li><label for="from">From:</label><input id="from" type="text" name="from" size="20" /></li>
-		<li><label for="to">To:</label><input id="to" type="text" name="to" size="20" /></li>
-	</ul>
-</div>
-
-					 
- <div id="individuals" class="panel" style="display:none; background-color: #ffffff;">
-<label for="inventaryCode">Inventory Code: </label><input id="inventaryCode" type="text" name="inventaryCode" size="20" />
-<a href="#" onclick="addItem(); return false;">[+]</a>	
-<a href="#" onclick="removeItem(); return false;">[-]</a>
-<select id="inventaryList" size="5" style="width:150px">
-</select>
-<input type="hidden" id="individualCodes" name="individualCodes">																						
-</div>						
-
-<p>
-<label for="numbersystem">Country Code: </label><!-- TMPL_VAR NAME="NUMBER_SYSTEM" --><a href="#" onClick="addCountryCode(); return false;">[+]</a></p>
-
-<p>								<label for="pageType">Page Size</label><input type="text" id="pageType" name="pageType" readonly="readonly" disabled="disabled" value="<!-- TMPL_VAR NAME="PAGES" -->"  size="10" /><a href="/cgi-bin/koha/barcodes/printerConfig.pl">[Go to Printer Configuration]</a></p>
-								
-
-<p><label for="text_under_label">Text under label</label>
-					<input type="text" id="text_under_label" name="text_under_label" size="40" value="<!-- TMPL_VAR name="text_under_label -->" /> If this field is empty, author and title will be used instead</p>
-
-			    	<table>
-						<tr>
-							<th colspan="<!-- TMPL_VAR NAME="COL_SPAN" -->">Label number to start printing</th>
-						</tr>
-						<!-- TMPL_LOOP NAME="LABEL_TABLE" -->
-							<tr>
-								<!-- TMPL_LOOP NAME="columns" -->
-									<td>
-										<input type="radio" id="label" value="<!-- TMPL_VAR NAME="tagname" -->" name="label" <!-- TMPL_VAR NAME="check" -->>  Label  <!-- TMPL_VAR NAME="labelname" --></td>
-								<!-- /TMPL_LOOP -->
-							</tr>
-						<!-- /TMPL_LOOP -->  			    
-					</table>
-
-<input type="submit" value="Generate Barcodes" name="B1">
-<input type="reset" value="Clear Fields" name="B2">
-</form>
-
-<!-- TMPL_INCLUDE name="intranet-bottom.inc" -->
-
diff --git a/koha-tmpl/intranet-tmpl/prog/en/barcodes/label-create-template.tmpl b/koha-tmpl/intranet-tmpl/prog/en/barcodes/label-create-template.tmpl
deleted file mode 100644
index a40db5aa0c..0000000000
--- a/koha-tmpl/intranet-tmpl/prog/en/barcodes/label-create-template.tmpl
+++ /dev/null
@@ -1,69 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha &rsaquo; Label and Barcode Printing</title>
-<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE name="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="label-topmenu.inc" -->
-<!-- TMPL_INCLUDE name="intranet-nav.inc" -->
-
-<div id="main">
-<form name="input" action="/cgi-bin/koha/barcodes/label-create-template.pl" method="get">
-
-<h3>
-        Create Label Template
-</h3>
-
-
-
-<h3>Template Settings</h3>
-<table>
-
-Template Code: <input type="text"  size="40" name="tmpl_code"><br>
-Template Description: <textarea name="tmpl_desc" cols="40" rows="3" name="tmpl_desc" ></TEXTAREA><br>
-
-<tr>
-        <td>Page Width:</td><td><input type="text"  size="2" name="page_width"></td>
-        <td>Page Height:</td><td><input type="text" size="2" name="page_height"></td>
-</tr>
-<tr>
-        <td>Label Width:</td><td><input type="text"  size="2" name="label_width"></td>
-        <td>Label Height:</td><td><input type="text" size="2" name="label_height"></td>
-</tr>
-<tr>
-        <td>Top Page Margin:</td><td><input type="text" size="2" name="topmargin"></td>
-        <td>Left Page Margin:</td><td><input type="text" size="2" name="leftmargin"></td>
-</tr>
-<tr>
-        <td>Number of Columns:</td><td><input type="text" size="2" name="cols"></td>
-        <td>Number of Rows:</td><td><input type="text" size="2" name="rows"></td>
-</tr>
-<tr>
-        <td>Gap between Columns:</td><td><input type="text" size="2" name="colgap"></td>
-        <td>Gap between Rows:</td><td><input type="text" size="2" name="rowgap"></td>
-</tr>
-</table>
-
-
-<br>
-Units: <select name="units">
-    <!-- TMPL_LOOP NAME="units" -->
-        <option value="<!-- TMPL_VAR NAME="unit" -->"><!-- TMPL_VAR NAME="desc" --></option>
-    <!-- /TMPL_LOOP -->
-</select>
-
-<br>
-<br>
-Font Size: <input type="textbox" name="fontsize"  SIZE="1"  
-		value="">
-<br>
-<br>
-Active: <input type="checkbox" name="active">
-
-        <input type="hidden" name="op" value="create">
-<br>
-<br>
-        <input type="submit" value="Save">
-        <input type="reset" value="Reset">
-</form>
-</div>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
-
diff --git a/koha-tmpl/intranet-tmpl/prog/en/barcodes/label-home.tmpl b/koha-tmpl/intranet-tmpl/prog/en/barcodes/label-home.tmpl
deleted file mode 100644
index de92f94f5a..0000000000
--- a/koha-tmpl/intranet-tmpl/prog/en/barcodes/label-home.tmpl
+++ /dev/null
@@ -1,189 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha &rsaquo; Label and Barcode Printing</title>
-<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
-<!-- TMPL_INCLUDE NAME="menu-barcodes.inc" -->
-
-<form name="input" action="/cgi-bin/koha/barcodes/label-manager.pl" method="get">
-
-<h3>
-        Choose Fields to Print
-</h3>
-<table summary="fields to print">
-<tr>
-        <td>
-                <!-- TMPL_IF NAME="itemtype"-->
-                    <input type="checkbox" name="itemtype" value=1 checked>
-                <!-- TMPL_ELSE -->
-                    <input type="checkbox" name="itemtype" value=1>
-                <!-- /TMPL_IF -->
-                <label for="itemtype">Item Type</label>
-        </td>
-
-        <td>
-                <!-- TMPL_IF NAME="isbn"-->
-                    <input type="checkbox" name="isbn" value=1 checked>
-                <!-- TMPL_ELSE -->
-                    <input type="checkbox" name="isbn" value=1>
-                <!-- /TMPL_IF -->
-                <label for="isbn">ISBN</label>
-        </td>
-
-</tr>
-<tr>
-        <td>
-                <!-- TMPL_IF NAME="dcn"-->
-                    <input type="checkbox" name="dcn" value=1 checked>
-                <!-- TMPL_ELSE -->
-                    <input type="checkbox" name="dcn" value=1>
-                <!-- /TMPL_IF -->
-                <label for="dcn">Dewey / Call Number</label>
-        </td>
-        <td>
-                <!-- TMPL_IF NAME="classif"-->
-                    <input type="checkbox" name="classif" value=1 checked>
-                <!-- TMPL_ELSE -->
-                    <input type="checkbox" name="classif" value=1>
-                <!-- /TMPL_IF -->
-                <label for="classif">Classification</label>
-        </td>
-</tr>
-<tr>
-        <td>
-                <!-- TMPL_IF NAME="itemcallnumber"-->
-                    <input type="checkbox" name="itemcallnumber" value=1 checked>
-                <!-- TMPL_ELSE -->
-                    <input type="checkbox" name="itemcallnumber" value=1>
-                <!-- /TMPL_IF -->
-                <label for="itemcallnumber">Item Call Number</label>
-        </td>
-        <td>
-                <!-- TMPL_IF NAME="subclass"-->
-                    <input type="checkbox" name="subclass" value=1 checked>
-                <!-- TMPL_ELSE -->
-                    <input type="checkbox" name="subclass" value=1>
-                <!-- /TMPL_IF -->
-                <label for="subclass">Sub-Class</label>
-        </td>
-</tr>
-</table>
-<p>
-
-<h3>Confirm Label Template</h3>
-<select name="tmpl_id">
-    <!-- TMPL_LOOP NAME="label_templates" -->
-        <!-- TMPL_IF NAME="active" -->
-            <option value="<!-- TMPL_VAR NAME="tmpl_id" -->" selected>
-        <!-- TMPL_ELSE -->
-            <option value="<!-- TMPL_VAR NAME="tmpl_id" -->">
-        <!-- /TMPL_IF -->
-        <!-- TMPL_VAR NAME="tmpl_code" --></option>
-    <!-- /TMPL_LOOP -->
-</select>
-
-
-<h3>Confirm Barcode Type</h3>
- <select name="barcodetype">
-                <!-- TMPL_IF NAME="COOP2of5_checked" -->
-                    <option value="COOP2of5" selected>
-                <!-- TMPL_ELSE -->
-                    <option value="COOP2of5" selected>
-                <!-- /TMPL_IF -->COOP2of5</option>
-                <!-- TMPL_IF NAME="Code39_checked" -->
-                    <option value="Code39" selected>
-                <!-- TMPL_ELSE -->
-                    <option value="Code39" selected>
-                <!-- /TMPL_IF -->Code39</option>
-                <!-- TMPL_IF NAME="EAN13_checked" -->
-                    <option value="EAN13" selected>
-                <!-- TMPL_ELSE -->
-                    <option value="EAN13" selected>
-                <!-- /TMPL_IF -->EAN 13</option>
-                <!-- TMPL_IF NAME="EAN8_checked" -->
-                    <option value="EAN8" selected>
-                <!-- TMPL_ELSE -->
-                    <option value="EAN8" selected>
-                <!-- /TMPL_IF -->EAN8</option>
-                <!-- TMPL_IF NAME="ITF_checked" -->
-                    <option value="ITF" selected>
-                <!-- TMPL_ELSE -->
-                    <option value="ITF" selected>
-                <!-- /TMPL_IF -->ITF (Interleaved2of5)</option>
-                <!-- TMPL_IF NAME="Industrial2of5_checked" -->
-                    <option value="Industrial2of5" selected>
-                <!-- TMPL_ELSE -->
-                    <option value="Industrial2of5" selected>
-                <!-- /TMPL_IF -->Industrial2of5</option>
-                <!-- TMPL_IF NAME="Matrix2of5_checked" -->
-                    <option value="Matrix2of5" selected>
-                <!-- TMPL_ELSE -->
-                    <option value="Matrix2of5" selected>
-                <!-- /TMPL_IF -->Matrix2of5</option>
-                <!-- TMPL_IF NAME="NW7_checked" -->
-                    <option value="NW7" selected>
-                <!-- TMPL_ELSE -->
-                    <option value="NW7" selected>
-                <!-- /TMPL_IF -->NW7</option>
-                <!-- TMPL_IF NAME="QRcode_checked" -->
-                    <option value="QRcode" selected>
-                <!-- TMPL_ELSE -->
-                    <option value="QRcode" selected>
-                <!-- /TMPL_IF -->QRcode</option>
-                <!-- TMPL_IF NAME="UPC-A_checked" -->
-                    <option value="UPC-A" selected>
-                <!-- TMPL_ELSE -->
-                    <option value="UPC-A" selected>
-                <!-- /TMPL_IF -->UPC-A</option>
-                <!-- TMPL_IF NAME="UPC-E_checked" -->
-                    <option value="UPC-E" selected>
-                <!-- TMPL_ELSE -->
-                    <option value="UPC-E" selected>
-                <!-- /TMPL_IF -->UPC-E</option>
-        </select>
-</h3>
-
-
-<h3>Confirm Printing Type</h3>
-
-<!-- TMPL_IF NAME="printingtype_spine" -->
-    <input type="radio" name="printingtype" value="spine" checked/>
-<!-- TMPL_ELSE -->
-    <input type="radio" name="printingtype" value="spine" />
-<!--/TMPL_IF -->
-    Spine Labels
-<!-- TMPL_IF NAME="printingtype_barcode" -->
-    <input type="radio" name="printingtype" value="barcode" checked />
-<!-- TMPL_ELSE -->
-    <input type="radio" name="printingtype" value="barcode" />
-<!--/TMPL_IF -->
-Barcode Labels
-
-<!-- TMPL_IF NAME="printingtype_both" -->
-    <input type="radio" name="printingtype" value="both" checked />
-<!-- TMPL_ELSE -->
-    <input type="radio" name="printingtype" value="both" />
-<!--/TMPL_IF -->
-Both Labels
-
-<h3>
-        Start printing from Label number:<input type="textbox" name="startlabel"  SIZE="1"
-        value="<!-- TMPL_VAR NAME="startlabel" -->">
-
-</h3>
-
-<p>
-<p>
-<!-- TMPL_IF NAME="guidebox"-->
-    <input type="checkbox" name="guidebox" value=1 checked />
-<!-- TMPL_ELSE -->
-    <input type="checkbox" name="guidebox" value=1 />
-<!-- /TMPL_IF -->
-<label for="guidebox">Draw Guide Boxes</label>
-<p>
-        <input type="submit" value="Submit">
-        <input type="hidden" name=op value="save_conf">
-</p>
-</form>
-</div>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
-
diff --git a/koha-tmpl/intranet-tmpl/prog/en/barcodes/label-manager.tmpl b/koha-tmpl/intranet-tmpl/prog/en/barcodes/label-manager.tmpl
deleted file mode 100644
index 4a9d11382a..0000000000
--- a/koha-tmpl/intranet-tmpl/prog/en/barcodes/label-manager.tmpl
+++ /dev/null
@@ -1,60 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha &rsaquo; Label and Barcode Printing</title>
-<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE name="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="label-topmenu.inc" -->
-<!-- TMPL_INCLUDE name="intranet-nav.inc" -->
-<div id="main">
-<h1>Labels to be Printed</h1>
-<p>
-        Printing will start on <b>row <!-- TMPL_VAR NAME="startrow" --></b><br />
-        Printing will use <b><!-- TMPL_VAR NAME="sheets"--> sheets</b><br />
-        Currently <b><!-- TMPL_VAR NAME="labels_remaining"--> rows</b> spare on <b>sheet <!-- TMPL_VAR NAME="sheets"--></b>
-</p>
-
-<!-- TMPL_IF NAME="resultsloop" -->
-<h2>Items</h2>
-<table>
-<tr>
-        <th>Label Number</th>
-        <th>Summary</th>
-        <th>Item Type</th>
-        <th>Delete</th>
-</tr>
-<!-- TMPL_LOOP NAME="resultsloop" -->
-<tr>
-        <td>
-                <!-- TMPL_VAR NAME="labelno" -->
-        </td>
-        <td>
-                <b> <a href="/cgi-bin/koha/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"> <!-- TMPL_VAR NAME="title" -->:</a></b> <!-- TMPL_VAR NAME="author" -->:
-                <!-- TMPL_VAR NAME="isbn" -->: <!-- TMPL_VAR NAME="barcode" -->
-        </td>
-        <td>
-                <!-- TMPL_VAR NAME="itemtype" -->
-        </td>
-        <td>
-                <a href="/cgi-bin/koha/barcodes/label-manager.pl?op=delete&amp;itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->">Delete</a>
-        </td>
-</tr>
-<!-- /TMPL_LOOP -->
-</table>
-
-<p><br />
-        <a href="#" onclick="Plugin(); return false;">Add Item</a> &nbsp;&nbsp;
-        <a href="/cgi-bin/koha/barcodes/label-print.pl">Preview</a> &nbsp;&nbsp;
-        <a href="/cgi-bin/koha/barcodes/label-manager.pl?op=deleteall">Delete All</a>
-</p>
- <!-- TMPL_ELSE -->
-        <a href="#" onclick="Plugin(); return false;">Add Item</a>
-<!-- /TMPL_IF -->
-</form>
-</div>
-
-<script type="text/javascript">
-function Plugin() {
-	window.open('label-item-search.pl','FindABibIndex','width=500,height=400,toolbar=no,scrollbars=yes');
-}
-</script>
-
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/barcodes/label-templates.tmpl b/koha-tmpl/intranet-tmpl/prog/en/barcodes/label-templates.tmpl
deleted file mode 100644
index cd61f1c0e6..0000000000
--- a/koha-tmpl/intranet-tmpl/prog/en/barcodes/label-templates.tmpl
+++ /dev/null
@@ -1,52 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha &rsaquo; Label and Barcode Printing</title>
-<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE name="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="label-topmenu.inc" -->
-<!-- TMPL_INCLUDE name="intranet-nav.inc" -->
-<div id="main">
-<h1>Current Templates
-
-
-</h1>
-
-<!-- TMPL_IF NAME="resultsloop" -->
-<h2>Templates</h2>
-<table>
-<tr>
-        <th>Template Code</th>
-        <th>Description</th>
-        <th>Edit</th>
-        <th>Delete</th>
-        <th>Active</th>
-</tr>
-<!-- TMPL_LOOP NAME="resultsloop" -->
-<tr>
-        <td>
-                <!-- TMPL_VAR NAME="tmpl_code" -->
-        </td>
-        <td>
-                <!-- TMPL_VAR NAME="tmpl_desc" -->
-        </td>
-   		<td>
-				<a href="/cgi-bin/koha/barcodes/label-edit-template.pl?tmpl_code=<!-- TMPL_VAR NAME="tmpl_code" -->">Edit</a>
-        </td>
-   		<td>
-				<a href="/cgi-bin/koha/barcodes/label-templates.pl?op=delete&tmpl_code=<!-- TMPL_VAR NAME="tmpl_code" -->">Delete</a>
-        </td>
-		  <td>
-				<!-- TMPL_IF NAME="active" -->Active<!-- /TMPL_IF -->
-        </td>
-</tr>
-<!-- /TMPL_LOOP -->
-</table>
-
-<p><br />
-
-				<a href="/cgi-bin/koha/barcodes/label-create-template.pl?op=blank">Create New Label Template</a>
-
-<!-- /TMPL_IF -->
-</form>
-</div>
-
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/barcodes/printerConfig.tmpl b/koha-tmpl/intranet-tmpl/prog/en/barcodes/printerConfig.tmpl
deleted file mode 100644
index 1d04674585..0000000000
--- a/koha-tmpl/intranet-tmpl/prog/en/barcodes/printerConfig.tmpl
+++ /dev/null
@@ -1,88 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha &rsaquo; Printer Configuration</title>
-<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
-<!-- TMPL_INCLUDE NAME="menu-barcodes.inc" -->
-
-
-	<h1>Printer Configuration</h1>
-	<h3>Set printer configuration corresponding to your environment</h3>
-	<ul>
-		<li>Set width and height of the label that you are going to work with.</li>
-		<li>Set your system's default DPI.</li>
-		<li>Set the page type.</li>
-		<li>Select how many columns and rows are in your page type.</li>
-		<li>Set left- and bottom-margins of the page that you are going to use. This parameter will help to center the barcodes on the labels.</li>
-	</ul>
-	<br>
-	<form id="formulario" method="post" action="<!-- TMPL_VAR NAME="SCRIPT_NAME" -->" name="form1">
-		<input type="hidden" name="saveSettings" value="1" />
-		<table>
-			<tr>
-				<th scope="row">
-					Label width (Expressed in mm)
-				</th><td> 
-					<input id="labelWidth" type="text" name="labelWidth" size="5"
-					       value="<!-- TMPL_VAR NAME="LABEL_WIDTH" -->">
-				</td></tr>
-				<th scope="row">
-					Label heigth (Expressed in mm)
-				</th><td> 
-					<input id="labelHeigth" type="text" name="labelHeigth" size="5"
-					       value="<!-- TMPL_VAR NAME="LABEL_HEIGTH" -->">
-				</td></tr>
-				<th scope="row">
-					System dpi
-				</th><td>
-					<input id="systemDpi" type="text" name="systemDpi" size="5"
-					       value="<!-- TMPL_VAR NAME="SYSTEM_DPI" -->">
-				</td></tr>
-				<th scope="row">
-					Page Type
-				</th>	<td>
-					<select name="pageType" id="pageType" size="1">
-						<!-- TMPL_IF name="A4" -->
-							<option value="A4" selected>A4</option>
-				        <!-- TMPL_ELSE -->
-							<option value="A4">A4</option>
-						<!-- /TMPL_IF -->
-						<!-- TMPL_IF name="Letter" -->
-							<option value="Letter" selected>Letter</option>
-				        <!-- TMPL_ELSE -->
-							<option value="Letter">Letter</option>
-						<!-- /TMPL_IF -->
-						<!-- TMPL_IF name="Legal" -->
-							<option value="Legal" selected>Legal</option>
-				        <!-- TMPL_ELSE -->
-							<option value="Legal">Legal</option>
-						<!-- /TMPL_IF -->
-		            </select>
-				</td></tr>
-				<th scope="row">
-					Columns
-				</th>  <td>
-					<input id="columns" type="text" name="columns" size="5"
-					       value="<!-- TMPL_VAR NAME="COLUMNS" -->">
-				</td></tr>
-				<th scope="row">
-					Rows
-				</th>   <td>
-					<input id="rows" type="text" name="rows" size="5"
-					       value="<!-- TMPL_VAR NAME="ROWS" -->">
-				</td></tr>
-				<th scope="row">
-					Margin Bottom (Expressed in mm)
-				</th>   <td>
-					<input id="marginBottom" type="text" name="marginBottom" size="5"
-					       value="<!-- TMPL_VAR NAME="MARGIN_TOP" -->">
-				</td></tr>
-				<th scope="row">
-					Margin Left (Expressed in mm)
-				</th>   <td>
-					<input id="marginLeft" type="text" name="marginLeft" size="5"
-					       value="<!-- TMPL_VAR NAME="MARGIN_LEFT" -->">
-				</td></tr>
-			</table><input type="submit" value="Save Settings" />
-	</form>
-
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/barcodes/search.tmpl b/koha-tmpl/intranet-tmpl/prog/en/barcodes/search.tmpl
deleted file mode 100644
index acb2c93fd9..0000000000
--- a/koha-tmpl/intranet-tmpl/prog/en/barcodes/search.tmpl
+++ /dev/null
@@ -1,60 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha &rsaquo; Label and Barcode Printing &rsaquo; Search</title>
-<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
-<!-- TMPL_INCLUDE NAME="menu-barcodes.inc" -->
-
-<div id="main-compact">
-
-<h1>Catalogue Item Search</h1>
-
-<form name="f" method="post">
-	<input type="hidden" name="op" value="do_search" />
-	<input type="hidden" name="type" value="intranet" />
-	<input type="hidden" name="nbstatements" value="<!-- TMPL_VAR NAME="nbstatements" -->" />
-
-	<table>
-	<tr><th scope="row">
-		<label for="title">Title</label>
-	    </th>
-	    <td>
-		<input type="hidden" name="marclist" value="biblio.title" />
-		<input type="hidden" name="and_or" value="and" />
-		<input type="hidden" name="excluding" value="" />
-		<input type="hidden" name="operator" value="contains" />
-		<input type="text" id="title" name="value" />
-	    </td></tr>
-	<tr><th scope="row">
-		<label for="issn">ISSN</label>
-	    </th>
-	    <td>
-		<input type="hidden" name="marclist" value="biblioitems.issn" />
-		<input type="hidden" name="and_or" value="and" />
-		<input type="hidden" name="excluding" value="" />
-		<input type="hidden" name="operator" value="=" />
-		<input type="text" name="value" id="issn" />
-	    </td></tr>
-	<tr><th scope="row">
-		<label for="resultsperpage">Results per page:</label>
-	    </th>
-	    <td>
-		<select align="right" name="resultsperpage" id="resultsperpage" size="1">
-			<option value="20">20</option>
-			<option value="50">50</option>
-			<option value="100">100</option>
-		</select>
-		<label for="orderby">Ordered by</label>
-		<select name="orderby" id="orderby" size="1">
-			<option value="biblio.title">Title</option>
-			<option value="biblio.author">Author</option>
-			<option value="biblioitems.dewey">Dewey</option>
-			<option value="biblioitems.publicationyear">Publication Year</option>
-			<option value="biblioitems.publishercode">Publisher</option>
-		</select>
-	    </td></tr>
-	</table>
-<p>		<input type="submit" value="Start search" class="submit" /></p>
-</form>
-</div>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/label-status.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/label-status.inc
new file mode 100644
index 0000000000..88d85edfcb
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/label-status.inc
@@ -0,0 +1,7 @@
+<div class="details" style="width: 43%">
+<table>
+<tr><th>Layout:</th><td><!-- TMPL_IF NAME="active_layout_name" --><!-- TMPL_VAR NAME="active_layout_name" --><!-- TMPL_ELSE --><span class="error">Select a Label Layout</span><!-- /TMPL_IF --> </td></tr>
+<tr><th>Template: </th><td><!-- TMPL_IF NAME="active_template_name" --><!-- TMPL_VAR NAME="active_template_name" --><!-- TMPL_ELSE --><span class="error">Select a Label Template</span><!-- /TMPL_IF --> </td></tr>
+<tr><th>Batch: </th><td><!-- TMPL_IF NAME="batch_id" --><!-- TMPL_VAR NAME="batch_id" --><!-- TMPL_ELSE --><span class="error">Select items to print</span><!-- /TMPL_IF --> </td></tr>
+</table>
+</div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/menu-labels.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/menu-labels.inc
new file mode 100755
index 0000000000..d54babbb21
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/menu-labels.inc
@@ -0,0 +1,8 @@
+<div id="submenu">
+<a href="/cgi-bin/koha/labels/label-home.pl">Label Layouts</a> | 
+<a href="/cgi-bin/koha/labels/label-templates.pl">Label Templates</a> | 
+<a href="/cgi-bin/koha/labels/label-manager.pl">Create or Print Label Batches</a> | 
+</div>
+
+
+
diff --git a/koha-tmpl/intranet-tmpl/prog/en/barcodes/label-bib-search.tmpl b/koha-tmpl/intranet-tmpl/prog/en/labels/label-bib-search.tmpl
similarity index 86%
rename from koha-tmpl/intranet-tmpl/prog/en/barcodes/label-bib-search.tmpl
rename to koha-tmpl/intranet-tmpl/prog/en/labels/label-bib-search.tmpl
index 6ce3faeb49..82feff00ff 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/barcodes/label-bib-search.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/labels/label-bib-search.tmpl
@@ -1,6 +1,4 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha &rsaquo; Label and Barcode Printing &rsaquo; Search</title>
-<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Barcodes and Labels: Search<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <div id="main-compact">
 
 <h1>Search</h1>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/labels/label-create-layout.tmpl b/koha-tmpl/intranet-tmpl/prog/en/labels/label-create-layout.tmpl
new file mode 100644
index 0000000000..df5f979f18
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/labels/label-create-layout.tmpl
@@ -0,0 +1,281 @@
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><title>Koha &rsaquo;  Labels</title>
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="menu-labels.inc" -->
+
+<div id="main">
+<!-- TMPL_INCLUDE NAME="label-status.inc" -->
+<form name="input" action="/cgi-bin/koha/labels/label-manager.pl" method="get">
+
+
+
+<h3>
+        Layout Name
+
+</h3>
+<input type="textbox" name="layoutname"  SIZE="20"
+        value="<!-- TMPL_VAR NAME="layoutname" -->">
+
+
+<p>
+<p>
+<p>
+
+
+
+<h3>
+        Choose Order Of Fields to Print
+</h3>
+<table summary="fields to print">
+<tr>
+        <td>
+        <select name="tx_title">
+        <option value="0" SELECTED></option>
+        <option value="1">1</option>
+        <option value="2">2</option>
+        <option value="3">3</option>
+        <option value="4">4</option>
+        <option value="5">5</option>
+        <option value="6">6</option>
+        <option value="7">7</option>
+        <option value="8">8</option>
+        <option value="9">9</option>
+        <option value="10">10</option>
+        </select>
+        <label>Title</label>
+        </td>
+<td>
+        <select name="tx_subtitle">
+          <option value="0" SELECTED></option>
+        <option value="1">1</option>
+        <option value="2">2</option>
+        <option value="3">3</option>
+        <option value="4">4</option>
+        <option value="5">5</option>
+        <option value="6">6</option>
+        <option value="7">7</option>
+        <option value="8">8</option>
+        <option value="9">9</option>
+        <option value="10">10</option>
+      </select>
+        <label>Subtitle</label>
+        </td>
+ 
+        <td>
+        <select name="tx_author">
+         <option value="0" SELECTED></option>
+        <option value="1">1</option>
+        <option value="2">2</option>
+        <option value="3">3</option>
+        <option value="4">4</option>
+        <option value="5">5</option>
+        <option value="6">6</option>
+        <option value="7">7</option>
+        <option value="8">8</option>
+        <option value="9">9</option>
+        <option value="10">10</option>
+       </select>
+        <label>Author</label>
+        </td>
+</tr>
+<tr>
+        <td>
+        <select name="tx_isbn">
+         <option value="0" SELECTED></option>
+        <option value="1">1</option>
+        <option value="2">2</option>
+        <option value="3">3</option>
+        <option value="4">4</option>
+        <option value="5">5</option>
+        <option value="6">6</option>
+        <option value="7">7</option>
+        <option value="8">8</option>
+        <option value="9">9</option>
+        <option value="10">10</option>
+       </select>
+        <label>ISBN</label>
+        </td>
+
+        <td>
+        <select name="tx_issn">
+          <option value="0" SELECTED></option>
+        <option value="1">1</option>
+        <option value="2">2</option>
+        <option value="3">3</option>
+        <option value="4">4</option>
+        <option value="5">5</option>
+        <option value="6">6</option>
+        <option value="7">7</option>
+        <option value="8">8</option>
+        <option value="9">9</option>
+        <option value="10">10</option>
+      </select>
+        <label>ISSN</label>
+        </td>
+
+
+        <td>
+        <select name="tx_itemtype">
+         <option value="0" SELECTED></option>
+        <option value="1">1</option>
+        <option value="2">2</option>
+        <option value="3">3</option>
+        <option value="4">4</option>
+        <option value="5">5</option>
+        <option value="6">6</option>
+        <option value="7">7</option>
+        <option value="8">8</option>
+        <option value="9">9</option>
+        <option value="10">10</option>
+       </select>
+        <label>Itemtype</label>
+        </td>
+
+
+  </tr>
+<tr>
+        <td>
+        <select name="tx_dewey">
+         <option value="0" SELECTED></option>
+        <option value="1">1</option>
+        <option value="2">2</option>
+        <option value="3">3</option>
+        <option value="4">4</option>
+        <option value="5">5</option>
+        <option value="6">6</option>
+        <option value="7">7</option>
+        <option value="8">8</option>
+        <option value="9">9</option>
+        <option value="10">10</option>
+       </select>
+        <label>Dewey</label>
+        </td>
+
+        <td>
+        <select name="tx_barcode">
+         <option value="0" SELECTED></option>
+        <option value="1">1</option>
+        <option value="2">2</option>
+        <option value="3">3</option>
+        <option value="4">4</option>
+        <option value="5">5</option>
+        <option value="6">6</option>
+        <option value="7">7</option>
+        <option value="8">8</option>
+        <option value="9">9</option>
+        <option value="10">10</option>
+       </select>
+        <label>Barcode</label>
+        </td>
+
+
+        <td>
+        <select name="tx_classif">
+         <option value="0" SELECTED></option>
+        <option value="1">1</option>
+        <option value="2">2</option>
+        <option value="3">3</option>
+        <option value="4">4</option>
+        <option value="5">5</option>
+        <option value="6">6</option>
+        <option value="7">7</option>
+        <option value="8">8</option>
+        <option value="9">9</option>
+        <option value="10">10</option>
+       </select>
+        <label>Classification</label>
+        </td>
+</tr>
+<tr>
+        <td>
+        <select name="tx_subclass">
+         <option value="0" SELECTED></option>
+        <option value="1">1</option>
+        <option value="2">2</option>
+        <option value="3">3</option>
+        <option value="4">4</option>
+        <option value="5">5</option>
+        <option value="6">6</option>
+        <option value="7">7</option>
+        <option value="8">8</option>
+        <option value="9">9</option>
+        <option value="10">10</option>
+       </select>
+        <label>Sub-Class</label>
+        </td>
+
+
+        <td>
+        <select name="tx_itemcallnumber">
+          <option value="0" SELECTED></option>
+        <option value="1">1</option>
+        <option value="2">2</option>
+        <option value="3">3</option>
+        <option value="4">4</option>
+        <option value="5">5</option>
+        <option value="6">6</option>
+        <option value="7">7</option>
+        <option value="8">8</option>
+        <option value="9">9</option>
+        <option value="10">10</option>
+      </select>
+        <label>Call Number</label>
+        </td>
+
+
+  </tr>
+
+
+
+
+
+
+
+
+</table>
+<p>
+
+
+
+<h3>Choose Barcode Type</h3>
+<select name="barcodetype">
+    <!-- TMPL_LOOP NAME="barcode_types" -->
+        <option value="<!-- TMPL_VAR NAME="code" -->"
+            <!-- TMPL_IF NAME="active" --> selected  <!-- /TMPL_IF -->
+        ><!-- TMPL_VAR NAME="desc" --></option>
+    <!-- /TMPL_LOOP -->
+</select>
+
+
+
+<h3>Choose Layout Type</h3>
+<select name="printingtype">
+    <!-- TMPL_LOOP NAME="printingtypes" -->
+        <option value="<!-- TMPL_VAR NAME="code" -->"
+            <!-- TMPL_IF NAME="active" --> selected  <!-- /TMPL_IF -->
+        ><!-- TMPL_VAR NAME="desc" --></option>
+    <!-- /TMPL_LOOP -->
+</select>
+
+
+
+
+<h3>
+        Start printing from Label number:<input type="textbox" name="startlabel"  SIZE="2" value="1">
+
+
+</h3>
+
+<p>
+<p>
+<h3>Draw Guide Boxes<input type="checkbox" name="guidebox" value=1></h3>
+<p>
+<p>
+<p>
+        <input type="submit" value="Submit">
+		<input type="hidden" name=op value="add_layout"> 
+</p>
+</form>
+</div>
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
+
diff --git a/koha-tmpl/intranet-tmpl/prog/en/labels/label-create-template.tmpl b/koha-tmpl/intranet-tmpl/prog/en/labels/label-create-template.tmpl
new file mode 100644
index 0000000000..0fea0072b3
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/labels/label-create-template.tmpl
@@ -0,0 +1,64 @@
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><title>Koha &rsaquo;  Labels</title>
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="menu-labels.inc" -->
+
+<div id="main">
+
+<form name="input" action="/cgi-bin/koha/labels/label-create-template.pl" method="get">
+
+<h3>
+        Create Label Template
+</h3>
+
+
+
+<h3>Template Settings</h3>
+<table>
+
+Template Code: <input type="text"  size="40" name="tmpl_code"><br>
+Template Description: <textarea name="tmpl_desc" cols="40" rows="3" name="tmpl_desc" ></TEXTAREA><br>
+
+<tr>
+        <td>Page Width:</td><td><input type="text"  size="4" name="page_width"></td>
+        <td>Page Height:</td><td><input type="text" size="4" name="page_height"></td>
+</tr>
+<tr>
+        <td>Label Width:</td><td><input type="text"  size="4" name="label_width"></td>
+        <td>Label Height:</td><td><input type="text" size="4" name="label_height"></td>
+</tr>
+<tr>
+        <td>Top Page Margin:</td><td><input type="text" size="4" name="topmargin"></td>
+        <td>Left Page Margin:</td><td><input type="text" size="4" name="leftmargin"></td>
+</tr>
+<tr>
+        <td>Number of Columns:</td><td><input type="text" size="4" name="cols"></td>
+        <td>Number of Rows:</td><td><input type="text" size="4" name="rows"></td>
+</tr>
+<tr>
+        <td>Gap between Columns:</td><td><input type="text" size="4" name="colgap"></td>
+        <td>Gap between Rows:</td><td><input type="text" size="4" name="rowgap"></td>
+</tr>
+</table>
+
+
+<br>
+Units: <select name="units">
+    <!-- TMPL_LOOP NAME="units" -->
+        <option value="<!-- TMPL_VAR NAME="unit" -->"><!-- TMPL_VAR NAME="desc" --></option>
+    <!-- /TMPL_LOOP -->
+</select>
+
+<br>
+<br>
+Font Size: <input type="textbox" name="fontsize"  SIZE="2"  
+		value="">
+<br>
+<br>
+        <input type="submit" value="Create Template">
+        <input type="reset" value="Reset">
+  <input type="hidden" name=op value="create">
+</form>
+</div>
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
+
diff --git a/koha-tmpl/intranet-tmpl/prog/en/labels/label-edit-layout.tmpl b/koha-tmpl/intranet-tmpl/prog/en/labels/label-edit-layout.tmpl
new file mode 100644
index 0000000000..aa0fd867d3
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/labels/label-edit-layout.tmpl
@@ -0,0 +1,182 @@
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Labels<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE name="masthead.inc" -->
+<!-- TMPL_INCLUDE NAME="label-topmenu.inc" -->
+<!-- TMPL_INCLUDE name="intranet-nav.inc" -->
+
+<div id="main">
+
+<form name="input" action="/cgi-bin/koha/labels/label-manager.pl" method="get">
+
+<h3>Layout Name</h3>
+<input type="textbox" name="layoutname"  SIZE="20" value="<!-- TMPL_VAR NAME="layoutname" -->">
+
+<br />
+<br />
+
+<h3>Choose Barcode Type (encoding)</h3>
+<select name="barcodetype">
+    <!-- TMPL_LOOP NAME="barcode_types" -->
+        <option value="<!-- TMPL_VAR NAME="code" -->"
+            <!-- TMPL_IF NAME="active" --> selected  <!-- /TMPL_IF -->
+        ><!-- TMPL_VAR NAME="desc" --></option>
+    <!-- /TMPL_LOOP -->
+</select>
+<br />
+
+<h3>Choose Layout Type</h3>
+<select name="printingtype">
+    <!-- TMPL_LOOP NAME="printingtypes" -->
+        <option value="<!-- TMPL_VAR NAME="code" -->"
+            <!-- TMPL_IF NAME="active" --> selected  <!-- /TMPL_IF -->>
+        <!-- TMPL_VAR NAME="desc" --></option>
+    <!-- /TMPL_LOOP -->
+</select>
+
+<br />
+<br />
+
+<h3>
+    Choose Order Of Text Fields to Print
+</h3>
+<table summary="fields to print">
+<tr>
+        <td>
+ <select name="tx_title">
+            <!-- TMPL_LOOP Name="tx_title" -->
+                <option value="<!-- TMPL_VAR Name="num" -->"<!-- TMPL_IF Name="selected" --> selected <!-- /TMPL_IF -->>
+                    <!-- TMPL_VAR Name="num" -->
+                </option>
+            <!-- /TMPL_LOOP -->
+            </select>
+        <label>Title</label>
+        </td>
+            <td>
+        <select name="tx_subtitle">
+                 <!-- TMPL_LOOP Name="tx_subtitle" -->
+                <option value="<!-- TMPL_VAR Name="num" -->"<!-- TMPL_IF Name="selected" --> selected <!-- /TMPL_IF -->>
+                    <!-- TMPL_VAR Name="num" -->
+                </option>
+            <!-- /TMPL_LOOP -->
+      </select>
+        <label>Subtitle</label>
+        </td> 
+
+        <td>
+        <select name="tx_author">
+             <!-- TMPL_LOOP Name="tx_author" -->
+                <option value="<!-- TMPL_VAR Name="num" -->"<!-- TMPL_IF Name="selected" --> selected <!-- /TMPL_IF -->>
+                    <!-- TMPL_VAR Name="num" -->
+                </option>
+            <!-- /TMPL_LOOP -->
+            </select>
+       <label>Author</label>
+        </td>
+</tr> 
+ <tr>
+        <td>
+        <select name="tx_isbn">
+              <!-- TMPL_LOOP Name="tx_isbn" -->
+                <option value="<!-- TMPL_VAR Name="num" -->"<!-- TMPL_IF Name="selected" --> selected <!-- /TMPL_IF -->>
+                    <!-- TMPL_VAR Name="num" -->
+                </option>
+            <!-- /TMPL_LOOP -->
+            </select>
+      <label>ISBN</label>
+        </td>
+
+        <td>
+        <select name="tx_issn">
+               <!-- TMPL_LOOP Name="tx_issn" -->
+                <option value="<!-- TMPL_VAR Name="num" -->"<!-- TMPL_IF Name="selected" --> selected <!-- /TMPL_IF -->>
+                    <!-- TMPL_VAR Name="num" -->
+                </option>
+            <!-- /TMPL_LOOP -->
+            </select>
+     <label>ISSN</label>
+        <td>
+        <select name="tx_itemtype">
+                 <!-- TMPL_LOOP Name="tx_itemtype" -->
+                <option value="<!-- TMPL_VAR Name="num" -->"<!-- TMPL_IF Name="selected" --> selected <!-- /TMPL_IF -->>
+                    <!-- TMPL_VAR Name="num" -->
+                </option>
+            <!-- /TMPL_LOOP -->
+            </select>
+   <label>Itemtype</label>
+        </td>
+  </tr>
+<tr>
+        <td>
+        <select name="tx_dewey">
+                <!-- TMPL_LOOP Name="tx_dewey" -->
+                <option value="<!-- TMPL_VAR Name="num" -->"<!-- TMPL_IF Name="selected" --> selected <!-- /TMPL_IF -->>
+                    <!-- TMPL_VAR Name="num" -->
+                </option>
+            <!-- /TMPL_LOOP -->
+       </select>
+        <label>Dewey</label>
+        </td>
+        <td>
+        <select name="tx_barcode">
+                 <!-- TMPL_LOOP Name="tx_barcode" -->
+                <option value="<!-- TMPL_VAR Name="num" -->"<!-- TMPL_IF Name="selected" --> selected <!-- /TMPL_IF -->>
+                    <!-- TMPL_VAR Name="num" -->
+                </option>
+            <!-- /TMPL_LOOP -->
+      </select>
+        <label>Barcode (as text)</label>
+        </td>
+        <td>
+        <select name="tx_classif">
+                  <!-- TMPL_LOOP Name="tx_classif" -->
+                <option value="<!-- TMPL_VAR Name="num" -->"<!-- TMPL_IF Name="selected" --> selected <!-- /TMPL_IF -->>
+                    <!-- TMPL_VAR Name="num" -->
+                </option>
+            <!-- /TMPL_LOOP -->
+     </select>
+        <label>Classification</label>
+        </td>
+</tr> 
+ <tr>
+        <td>
+        <select name="tx_subclass">
+                  <!-- TMPL_LOOP Name="tx_subclass" -->
+                <option value="<!-- TMPL_VAR Name="num" -->"<!-- TMPL_IF Name="selected" --> selected <!-- /TMPL_IF -->>
+                    <!-- TMPL_VAR Name="num" -->
+                </option>
+            <!-- /TMPL_LOOP -->
+     </select>
+        <label>Subclass</label>
+        </td>
+            <td>
+        <select name="tx_itemcallnumber">
+                 <!-- TMPL_LOOP Name="tx_itemcallnumber" -->
+                <option value="<!-- TMPL_VAR Name="num" -->"<!-- TMPL_IF Name="selected" --> selected <!-- /TMPL_IF -->>
+                    <!-- TMPL_VAR Name="num" -->
+                </option>
+            <!-- /TMPL_LOOP -->
+      </select>
+        <label>Call Number</label>
+        </td>
+  </tr>
+</table>
+
+<br />
+<h3>
+        Start printing from Label number:<input type="textbox" name="startlabel"  SIZE="1"  value=" <!-- TMPL_VAR NAME="startlabel" --> ">
+</h3>
+
+<br />
+<h3>Draw Guide Boxes<input type="checkbox" name="guidebox" value=1 
+                <!-- TMPL_IF NAME="guidebox"-->
+                     checked
+                <!-- /TMPL_IF -->  ></h3>
+
+<p>
+        <input type="submit" value="Submit">
+        <input type="hidden" name=op value="save_layout">
+        <input type="hidden" name=layout_id value="<!-- TMPL_VAR NAME="layout_id" -->">
+</p>
+</form>
+</div>
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
+
diff --git a/koha-tmpl/intranet-tmpl/prog/en/barcodes/label-edit-template.tmpl b/koha-tmpl/intranet-tmpl/prog/en/labels/label-edit-template.tmpl
similarity index 52%
rename from koha-tmpl/intranet-tmpl/prog/en/barcodes/label-edit-template.tmpl
rename to koha-tmpl/intranet-tmpl/prog/en/labels/label-edit-template.tmpl
index abab686492..c955f22344 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/barcodes/label-edit-template.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/labels/label-edit-template.tmpl
@@ -1,12 +1,10 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha &rsaquo; Label and Barcode Printing</title>
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><title>Koha &rsaquo;  Labels</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE name="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="label-topmenu.inc" -->
-<!-- TMPL_INCLUDE name="intranet-nav.inc" -->
+<!-- TMPL_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="menu-labels.inc" -->
 
 <div id="main">
-<form name="input" action="/cgi-bin/koha/barcodes/label-save-template.pl" method="get">
+<form name="input" action="/cgi-bin/koha/labels/label-save-template.pl" method="get">
 
 <h3>
         Edit Label Template
@@ -22,24 +20,24 @@ Template Code: <input type="text"  size="40" name="tmpl_code" value="<!-- TMPL_V
 Template Description: <textarea name="tmpl_desc" cols="40" rows="3" name="tmpl_desc" ><!-- TMPL_VAR NAME="tmpl_desc" --></TEXTAREA><br>
 
 <tr>
-        <td>Page Width:</td><td><input type="text"  size="2" name="page_width"  value="<!-- TMPL_VAR NAME="page_width" -->"></td>
-        <td>Page Height:</td><td><input type="text" size="2" name="page_height"  value="<!-- TMPL_VAR NAME="page_height" -->"></td>
+        <td>Page Width:</td><td><input type="text"  size="4" name="page_width"  value="<!-- TMPL_VAR NAME="page_width" -->"></td>
+        <td>Page Height:</td><td><input type="text" size="4" name="page_height"  value="<!-- TMPL_VAR NAME="page_height" -->"></td>
 </tr>
 <tr>
-        <td>Label Width:</td><td><input type="text"  size="2" name="label_width"  value="<!-- TMPL_VAR NAME="label_width" -->"></td>
-        <td>Label Height:</td><td><input type="text" size="2" name="label_height"  value="<!-- TMPL_VAR NAME="label_height" -->"></td>
+        <td>Label Width:</td><td><input type="text"  size="4" name="label_width"  value="<!-- TMPL_VAR NAME="label_width" -->"></td>
+        <td>Label Height:</td><td><input type="text" size="4" name="label_height"  value="<!-- TMPL_VAR NAME="label_height" -->"></td>
 </tr>
 <tr>
-        <td>Top Page Margin:</td><td><input type="text" size="2" name="topmargin"  value="<!-- TMPL_VAR NAME="topmargin" -->"></td>
-        <td>Left Page Margin:</td><td><input type="text" size="2" name="leftmargin"  value="<!-- TMPL_VAR NAME="leftmargin" -->"></td>
+        <td>Top Page Margin:</td><td><input type="text" size="4" name="topmargin"  value="<!-- TMPL_VAR NAME="topmargin" -->"></td>
+        <td>Left Page Margin:</td><td><input type="text" size="4" name="leftmargin"  value="<!-- TMPL_VAR NAME="leftmargin" -->"></td>
 </tr>
 <tr>
-        <td>Number of Columns:</td><td><input type="text" size="2" name="cols"  value="<!-- TMPL_VAR NAME="cols" -->"></td>
-        <td>Number of Rows:</td><td><input type="text" size="2" name="rows"  value="<!-- TMPL_VAR NAME="rows" -->"></td>
+        <td>Number of Columns:</td><td><input type="text" size="4" name="cols"  value="<!-- TMPL_VAR NAME="cols" -->"></td>
+        <td>Number of Rows:</td><td><input type="text" size="4" name="rows"  value="<!-- TMPL_VAR NAME="rows" -->"></td>
 </tr>
 <tr>
-        <td>Gap between Columns:</td><td><input type="text" size="2" name="colgap"  value="<!-- TMPL_VAR NAME="colgap" -->"></td>
-        <td>Gap between Rows:</td><td><input type="text" size="2" name="rowgap"  value="<!-- TMPL_VAR NAME="rowgap" -->"></td>
+        <td>Gap between Columns:</td><td><input type="text" size="4" name="colgap"  value="<!-- TMPL_VAR NAME="colgap" -->"></td>
+        <td>Gap between Rows:</td><td><input type="text" size="4" name="rowgap"  value="<!-- TMPL_VAR NAME="rowgap" -->"></td>
 
 
 
@@ -48,11 +46,9 @@ Template Description: <textarea name="tmpl_desc" cols="40" rows="3" name="tmpl_d
 
 Units: <select name="units">
     <!-- TMPL_LOOP NAME="units" -->
-        <!-- TMPL_IF NAME="selected" -->
-            <option value="<!-- TMPL_VAR NAME="unit" -->" selected >
-        <!-- TMPL_ELSE -->
-            <option value="<!-- TMPL_VAR NAME="unit" -->">
-        <!-- /TMPL_IF --><!-- TMPL_VAR NAME="desc" --></option>
+        <option value="<!-- TMPL_VAR NAME="unit" -->"
+            <!-- TMPL_IF NAME="selected" --> selected  <!-- /TMPL_IF -->
+        ><!-- TMPL_VAR NAME="desc" --></option>
     <!-- /TMPL_LOOP -->
 </select>
 
@@ -64,14 +60,10 @@ Font Size: <input type="textbox" name="fontsize"  SIZE="1"
 <br>
 
 
-Active: <input type="checkbox" name="active" 
-	    <!-- TMPL_IF NAME="active" --> checked <!-- /TMPL_IF --> >
-
-        <input type="hidden" name="tmpl_id" value="<!-- TMPL_VAR NAME="tmpl_id" -->">
-<p>
-<p>
         <input type="submit" value="Save">
         <input type="reset" value="Reset">
+        <input type="hidden" value="<!-- TMPL_VAR NAME="tmpl_id" -->" name="tmpl_id"
+
 </p>
 </form>
 </div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/labels/label-home.tmpl b/koha-tmpl/intranet-tmpl/prog/en/labels/label-home.tmpl
new file mode 100644
index 0000000000..ddbdd0f81a
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/labels/label-home.tmpl
@@ -0,0 +1,57 @@
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><title>Koha &rsaquo;  Labels</title>
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="menu-labels.inc" -->
+
+<div id="main">
+<!-- TMPL_INCLUDE NAME="label-status.inc" -->
+
+<!-- TMPL_IF NAME="layout_loop" -->
+<h2>Select a Current Layout</h2>
+<form name="input" action="/cgi-bin/koha/labels/label-manager.pl" method="get">
+<table>
+<tr>
+        <th>Layout</th>
+        <th>Barcode Type</th>
+        <th>Print Type</th>
+        <th>Fields to Print</th>
+        <th>Edit</th>
+        <th>Delete</th>
+        <th>Active</th>
+</tr>
+<!-- TMPL_LOOP NAME="layout_loop" -->
+<tr>
+          <td><!-- TMPL_VAR NAME="layoutname" -->  </td>
+       <td>    <!-- TMPL_VAR NAME="barcodetype" -->    </td>
+       <td>   <!-- TMPL_VAR NAME="printingtype" -->    </td>
+
+       <td>
+                <!-- TMPL_VAR NAME="fieldlist" -->
+        </td>
+
+       <td>
+                <a href="/cgi-bin/koha/labels/label-edit-layout.pl?layout_id=<!-- TMPL_VAR NAME="id" -->">Edit</a>
+        </td>
+        <td>
+                <a href="/cgi-bin/koha/label-home.pl?op=delete_layout&layout_id=<!-- TMPL_VAR NAME="id"-->">Delete</a>
+        </td>
+<td>
+<input type="radio" name="layout_id" value="<!-- TMPL_VAR NAME="id" -->"  
+                <!-- TMPL_IF NAME="active" -->
+ checked
+                <!-- /TMPL_IF -->
+ >
+        </td>
+</tr>
+
+<!-- /TMPL_LOOP -->
+<tr><td colspan="7" align="right">
+     <input type="submit" value="Set Active Layout">
+        <input type="hidden" name=op value="set_active_layout">
+</table>
+</form>
+<!-- /TMPL_IF -->
+<p><a href="/cgi-bin/koha/labels/label-create-layout.pl">Create New Layout</a></p>
+</div>
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
+
diff --git a/koha-tmpl/intranet-tmpl/prog/en/labels/label-manager.tmpl b/koha-tmpl/intranet-tmpl/prog/en/labels/label-manager.tmpl
new file mode 100644
index 0000000000..e0f80d3fda
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/labels/label-manager.tmpl
@@ -0,0 +1,111 @@
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><title>Koha &rsaquo;  Labels</title>
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="menu-labels.inc" -->
+
+<div id="main">
+<!-- TMPL_INCLUDE NAME="label-status.inc" -->
+
+<!-- TMPL_UNLESS NAME="batch_id" -->
+<div class="details">
+<a class="button" href="/cgi-bin/koha/labels/label-manager.pl?op=add_batch">Create New Batch</a> 
+
+<!-- <form style="padding: 3px 30px; border-left: 1px solid black;border-right: 1px solid black;margin: 0 20px;" name="input" action="/cgi-bin/koha/labels/label-manager.pl" method="get">
+<select name="batch_id">
+    <!-- TMPL_LOOP NAME="batches" -->
+        <option value="<!-- TMPL_VAR NAME="batch_id" -->" <!-- TMPL_IF NAME="active" --> selected  <!-- /TMPL_IF -->>
+        <!-- TMPL_VAR NAME="batch_id" --></option>
+    <!-- /TMPL_LOOP -->
+</select>
+<input type="submit" value="Open Existing Batch">
+</form>
+-->
+</div>
+<!-- TMPL_IF NAME="batches" -->
+<h2>Label Batches</h2>
+<table>
+<tr>
+        <th>Batch id</th>
+        <th>#</th>
+        <th>Edit</th>
+        <th>Delete</th>
+        <th>Print</th>
+</tr>
+<!-- TMPL_LOOP NAME="batches" -->
+<tr>
+        <td>
+                <!-- TMPL_VAR NAME="batch_id" -->
+        </td>
+        <td>
+                <!-- TMPL_VAR NAME="num" --> records
+        </td>
+        <td>
+                <a href="/cgi-bin/koha/labels/label-manager.pl?batch_id=<!-- TMPL_VAR NAME="batch_id" -->">Edit</a>
+        </td>
+        <td>
+                <a href="/cgi-bin/koha/labels/label-manager.pl?op=delete_batch&batch_id=<!-- TMPL_VAR NAME="batch_id" -->">Delete</a>
+        </td>
+          <td>
+		  <a class="button" style="float: right;"  href="/cgi-bin/koha/labels/label-print-pdf.pl?batch_id=<!-- TMPL_VAR NAME="batch_id" -->">Generate PDF for Batch  <!-- TMPL_VAR NAME="batch_id" --></a>
+        </td></tr>
+<!-- /TMPL_LOOP -->
+</table>
+
+<!-- /TMPL_IF -->
+
+<!-- TMPL_ELSE -->
+<div class="details">
+<br /> 
+
+        <a class="button" href="#" onclick="Plugin(<!-- TMPL_VAR NAME="batch_id" -->); return false;">Add item(s) to batch</a> &nbsp;&nbsp;&nbsp;&nbsp;
+		<a class="button" href="/cgi-bin/koha/labels/label-manager.pl?batch_id=">Return to batch summary</a>&nbsp;&nbsp;&nbsp;&nbsp;
+        <a class="button" style="border:2px solid #634;" href="/cgi-bin/koha/labels/label-manager.pl?op=delete_batch&amp;batch_id=<!-- TMPL_VAR NAME="batch_id" -->">Delete current batch (<!-- TMPL_VAR NAME="batch_id" -->)</a>&nbsp;&nbsp;&nbsp;&nbsp;
+<a class="button"  href="/cgi-bin/koha/labels/label-print-pdf.pl?batch_id=<!-- TMPL_VAR NAME="batch_id" -->">Generate PDF for Batch: <!-- TMPL_VAR NAME="batch_id" --></a>
+</div>
+
+<h2>Items to be Printed for Batch <!-- TMPL_VAR NAME="batch_id" -->  (<!-- TMPL_VAR NAME="batch_count" -->  items)</h2>
+
+<table>
+<tr>
+        <th>Label Number</th>
+        <th>Summary</th>
+        <th>Item Type</th>
+        <th>Barcode</th>
+        <th>Delete</th>
+</tr>
+<!-- TMPL_LOOP NAME="resultsloop" -->
+<tr>
+        <td>
+                <!-- TMPL_VAR NAME="labelno" -->
+        </td>
+        <td>
+                <b> <a href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->"> <!-- TMPL_VAR NAME="title" -->:</a></b> <!-- TMPL_VAR NAME="author" -->:
+                <!-- TMPL_VAR NAME="isbn" -->         </td>
+        <td>           <!-- TMPL_VAR NAME="itemtype" -->         </td>
+        <td>          <!-- TMPL_VAR NAME="barcode" -->         </td>
+        <td>
+                <a href="/cgi-bin/koha/labels/label-manager.pl?op=delete&amp;itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->&amp;batch_id=<!-- TMPL_VAR NAME="batch_id" -->">Delete</a>
+        </td>
+</tr>
+<!-- /TMPL_LOOP -->
+</table>
+
+
+<!-- /TMPL_UNLESS -->
+
+
+
+</div>
+
+
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
+
+
+
+<script type="text/javascript">
+function Plugin(batch_id) {
+	window.open("label-item-search.pl?batch_id="+batch_id+"",'FindABibIndex','width=600,height=460,toolbar=no,scrollbars=yes');
+}
+</script>
+
+
diff --git a/koha-tmpl/intranet-tmpl/prog/en/barcodes/label-print.tmpl b/koha-tmpl/intranet-tmpl/prog/en/labels/label-print.tmpl
similarity index 100%
rename from koha-tmpl/intranet-tmpl/prog/en/barcodes/label-print.tmpl
rename to koha-tmpl/intranet-tmpl/prog/en/labels/label-print.tmpl
diff --git a/koha-tmpl/intranet-tmpl/prog/en/labels/label-templates.tmpl b/koha-tmpl/intranet-tmpl/prog/en/labels/label-templates.tmpl
new file mode 100644
index 0000000000..042687e942
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/labels/label-templates.tmpl
@@ -0,0 +1,57 @@
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><title>Koha &rsaquo;  Labels</title>
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="menu-labels.inc" -->
+
+<div id="main">
+<!-- TMPL_INCLUDE NAME="label-status.inc" -->
+
+<!-- TMPL_IF NAME="resultsloop" -->
+<h2>Templates</h2>
+<form name="input" action="/cgi-bin/koha/labels/label-templates.pl" method="get">
+<table>
+<tr>
+        <th>Template Code</th>
+        <th>Description</th>
+        <th>Edit</th>
+        <th>Delete</th>
+        <th>Active</th>
+</tr>
+<!-- TMPL_LOOP NAME="resultsloop" -->
+<tr>
+        <td>
+                <!-- TMPL_VAR NAME="tmpl_code" -->
+        </td>
+        <td>
+                <!-- TMPL_VAR NAME="tmpl_desc" -->
+        </td>
+   		<td>
+				<a href="/cgi-bin/koha/labels/label-edit-template.pl?tmpl_id=<!-- TMPL_VAR NAME="tmpl_id" -->">Edit</a>
+        </td>
+   		<td>
+				<a href="/cgi-bin/koha/labels/label-templates.pl?op=delete&tmpl_id=<!-- TMPL_VAR NAME="tmpl_id" -->">Delete</a>
+        </td>
+		  <td>
+<input type="radio" name="tmpl_id" value="<!-- TMPL_VAR NAME="tmpl_id" -->"  
+                <!-- TMPL_IF NAME="active" -->
+ checked
+                <!-- /TMPL_IF -->
+ >
+
+        </td>
+</tr>
+<!-- /TMPL_LOOP -->
+ <tr><td colspan="5" align="right">
+ <input class="button" type="submit" value="Set Active Template">
+        <input type="hidden" name=op value="set_active_template">
+</td></tr>
+</table>
+
+</form>
+<!-- /TMPL_IF -->
+
+<br/>
+<a href="/cgi-bin/koha/labels/label-create-template.pl?op=blank">Create New Label Template</a>
+</div>
+
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/barcodes/result.tmpl b/koha-tmpl/intranet-tmpl/prog/en/labels/result.tmpl
similarity index 50%
rename from koha-tmpl/intranet-tmpl/prog/en/barcodes/result.tmpl
rename to koha-tmpl/intranet-tmpl/prog/en/labels/result.tmpl
index 6a59dc87cd..4c1d08a0d5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/barcodes/result.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/labels/result.tmpl
@@ -1,15 +1,10 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha &rsaquo; Label and Barcode Printing &rsaquo; Search Results</title>
-<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
-<!-- TMPL_INCLUDE NAME="menu-barcodes.inc" -->
-
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Barcodes and Labels: Search Results<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <div id="main-compact">
 	<h1>Search results</h1>
 	<div class="results">
-		<p>
+		<p >
 			<!-- TMPL_IF NAME=displayprev -->
-				<a href="label-item-search.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search">
+				<a href="label-item-search.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search&amp;batch_id=<!-- TMPL_VAR NAME="batch_id" -->">
 					&lt;&lt;
 				</a>
 			<!-- /TMPL_IF -->
@@ -17,11 +12,11 @@
 				<!-- TMPL_IF NAME=highlight -->
 					<span class="current"><!-- TMPL_VAR NAME="number" --></span>
 				<!-- TMPL_ELSE -->
-					<a href="label-item-search.pl?startfrom=<!-- TMPL_VAR NAME=startfrom -->&amp;<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search"><!-- TMPL_VAR NAME="number" --></a>
+					<a href="label-item-search.pl?startfrom=<!-- TMPL_VAR NAME=startfrom -->&amp;<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search&amp;batch_id=<!-- TMPL_VAR NAME="batch_id" -->"><!-- TMPL_VAR NAME="number" --></a>
 				<!-- /TMPL_IF -->
 			<!-- /TMPL_LOOP -->
 			<!-- TMPL_IF NAME=displaynext -->
-				<a href="label-item-search.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search">&gt;&gt;</a>
+				<a href="label-item-search.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search&amp;batch_id=<!-- TMPL_VAR NAME="batch_id" -->">&gt;&gt;</a>
 				<!-- /TMPL_IF -->
 		</p>
 		<p>
@@ -32,11 +27,15 @@
 			<!-- /TMPL_IF -->
 		</p>
 	</div>
-
+<form name='resultform'>
+	<span class="no"><a class="button" href="#" onclick="history.go(-1)" > &laquo; Back</a>&nbsp;&nbsp;&nbsp;&nbsp; <a class="button" href="#" onclick="window.close()">[ Done ]</a></span>
+<input type="submit" class="icon addchecked" value="Add checked" onclick="add_item('checked',<!-- TMPL_VAR NAME="batch_id" -->); return false" />
 	<table>
 	<tr>
-		<th>Summary</th>
-		<th>Item Type</th>
+	<tr>
+		<th><a href="#" onclick="check_all()" >Check all</a></th>
+		<th>Biblio Summary</th>
+		<th>Item Summary</th>
 		<th>Add</th>
 	</tr>
 	<!-- TMPL_LOOP name="result" -->
@@ -45,44 +44,51 @@
 		<!-- TMPL_ELSE -->
 			<tr>
 		<!-- /TMPL_IF -->
-				<td>
-					<p><b><!-- TMPL_VAR NAME="title" --></b></p>
-					<p><!-- TMPL_VAR NAME="author" -->
+			<td> <input type="checkbox" name="itemnumber" id="itm<!-- TMPL_VAR NAME="itemnumber" -->" value="<!-- TMPL_VAR NAME="itemnumber" -->" />	</td>
+			<td>
+					<p><b><!-- TMPL_VAR NAME="title" --></b>&nbsp;&nbsp;
+					<!-- TMPL_VAR NAME="author" -->
+					<p>[ <!-- TMPL_VAR NAME="itemtype" --> ]
 					<!-- TMPL_IF name="publishercode" -->- <!-- TMPL_VAR name="publishercode" --><!-- /TMPL_IF -->
 					<!-- TMPL_IF name="place" --> ; <!-- TMPL_VAR name="place" --><!-- /TMPL_IF -->
 					<!-- TMPL_IF name="pages" --> - <!-- TMPL_VAR name="pages" --><!-- /TMPL_IF -->
-					<!-- TMPL_IF name="notes" --> : <!-- TMPL_VAR name="notes" --><!-- /TMPL_IF -->
-					<!-- TMPL_IF name="size" --> ; <!-- TMPL_VAR name="size" --><!-- /TMPL_IF -->
-					<!-- TMPL_IF name="barcode" --> ; <!-- TMPL_VAR name="barcode" --><!-- /TMPL_IF -->
+					<!-- TMPL_IF name="notes" --> <br /> <!-- TMPL_VAR name="notes" --><!-- /TMPL_IF -->
 					</p>
 				</td>
 <!-- NEW -->
 				<td>
-					<!-- TMPL_VAR NAME="itemtype" -->
+					<!-- TMPL_IF name="itemcallnumber" --><!-- TMPL_VAR name="itemcallnumber" --><br /> <!-- /TMPL_IF -->
+					<!-- TMPL_IF name="dateaccessioned" -->[<!-- TMPL_VAR name="dateaccessioned" -->]<br /> <!-- /TMPL_IF -->
+					<!-- TMPL_IF name="barcode" --> <!-- TMPL_VAR name="barcode" --> <!-- /TMPL_IF -->
+
 				</td>
 				<td>
-					<a onclick="add_item(<!-- TMPL_VAR NAME="itemnumber" -->); return false" href="/cgi-bin/koha/barcodes/label-manager.pl?itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->&amp;op=add">Add</a>
+					<a onclick="add_item(<!-- TMPL_VAR NAME="itemnumber" -->,<!-- TMPL_VAR NAME="batch_id" -->); return false" href="/cgi-bin/koha/barcodes/label-manager.pl?itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->&amp;batch_id=<!-- TMPL_VAR name="batch_id" -->&amp;op=add">Add</a>
+
+
+
+
 
 <!-- /NEW -->
 				</td>
 			</tr>
 			<!-- /TMPL_LOOP -->
 		</table>
-
+</form>
 	<div class="results">
 		<p>
 			<!-- TMPL_IF NAME=displayprev -->
-			<a href="label-item-search.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search">&lt;&lt;</a>
+			<a href="label-item-search.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search>&amp;batch_id=<!-- TMPL_VAR NAME="batch_id" -->">&lt;&lt;</a>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_LOOP NAME=numbers -->
 				<!-- TMPL_IF NAME=highlight -->
 				<span class="current"><!-- TMPL_VAR NAME="number" --></span>
 				<!-- TMPL_ELSE -->
-				<a href="label-item-search.pl?startfrom=<!-- TMPL_VAR NAME=startfrom -->&amp;<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search"><!-- TMPL_VAR NAME="number" --></a>
+				<a href="label-item-search.pl?startfrom=<!-- TMPL_VAR NAME=startfrom -->&amp;<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search&amp;batch_id=<!-- TMPL_VAR NAME="batch_id" -->"><!-- TMPL_VAR NAME="number" --></a>
 				<!-- /TMPL_IF -->
 			<!-- /TMPL_LOOP -->
 			<!-- TMPL_IF NAME=displaynext -->
-			<a href="label-item-search.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search">&gt;&gt;</a>
+			<a href="label-item-search.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search&amp;batch_id=<!-- TMPL_VAR NAME="batch_id" -->">&gt;&gt;</a>
 				<!-- /TMPL_IF -->
 		</p>
 	</div> 
@@ -91,8 +97,39 @@
 <script type="text/javascript">
 <!--
 
-function add_item(itemnumber){
-     var myurl = "label-manager.pl?op=add&itemnumber="+itemnumber+"";
+
+function add_item(itemnum,batch_id){
+
+ var getstr='';
+ if (itemnum == 'checked') {
+    itms= new Array;        
+    if(document.resultform.itemnumber.length > 0) {
+        for (var i=0; i < document.resultform.itemnumber.length; i++) {
+            if (document.resultform.itemnumber[i].checked) {
+                itms.push("itemnumber=" +  document.resultform.itemnumber[i].value);
+            }
+        }
+        getstr = itms.join("&");
+    }
+  } else {
+		getstr = "itemnumber="+itemnum;
+} 
+ 	var myurl = "label-manager.pl?op=add&batch_id="+batch_id+"&"+getstr;
+	window.opener.location.href = myurl;
+}
+/* # TODO  there's a checkall fcn in opac/includes.... that should be modified to accept form object. */
+function check_all()
+{
+count = document.resultform.elements.length;
+    for (i=0; i < count; i++)  
+    {   
+            document.resultform.elements[i].checked = 1;
+    }
+}
+
+function add_item3(itemnumber){
+
+ var myurl = "label-manager.pl?op=add&itemnumber="+itemnumber+"";
      window.opener.location.href = myurl;
 }
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/labels/search.tmpl b/koha-tmpl/intranet-tmpl/prog/en/labels/search.tmpl
new file mode 100644
index 0000000000..350c7ce012
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/labels/search.tmpl
@@ -0,0 +1,128 @@
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><title>Koha &rsaquo;  Labels</title>
+<!-- TMPL_INCLUDE NAME="calendar.inc" -->
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+
+<div id="main-compact">
+
+<h1>Catalog item search
+
+<!-- TMPL_IF name="batch_id" -->
+ for batch <!-- TMPL_VAR NAME="batch_id" -->
+<!-- /TMPL_IF  -->
+</h1>
+
+<form name="f" method="post">
+	<input type="hidden" name="op" value="do_search" />
+	<input type="hidden" name="batch_id" value="<!-- TMPL_VAR NAME="batch_id" -->" />
+<div>
+  <select name="idx">
+    <option value="kw" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Keyword</option>
+    <option value="au" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Author</option>
+    <option value="yr" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Publication Date</option>
+    <option value="sn" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Standard Number</option>
+    <option value="nb" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>ISBN</option>
+    <option value="ns" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>ISSN</option>
+    <option value="lcn" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Call Number</option>
+    <option value="su" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Subject</option>
+   <option value="ti" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Title</option>
+    <option value="ti,phr" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Title Phrase</option>
+    <option value="se" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Series Title</option>
+    <option value="bc" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Barcode</option>
+    <option value="acqdate" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Acquisition Date</option>
+</select>
+   <input type="text" size="30" name="marclist" title="Enter search terms" value=""/>  
+</div><div>
+<select name="idx">
+    <option value="kw" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Keyword</option>
+    <option value="au" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Author</option>
+    <option value="yr" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Publication Date</option>
+    <option value="sn" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Standard Number</option>
+    <option value="nb" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>ISBN</option>
+    <option value="ns" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>ISSN</option>
+    <option value="lcn" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Call Number</option>
+    <option value="su" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Subject</option>
+   <option value="ti" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Title</option>
+    <option value="ti,phr" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Title Phrase</option>
+    <option value="se" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Series Title</option>
+    <option value="bc" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Barcode</option>
+    <option value="acqdate" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Acquisition Date</option>
+</select>
+   <input type="text" size="30" name="q" title="Enter search terms" value=""/>  
+</div>
+
+<!-- TMPL_IF NAME="sort_by_loop" -->
+<fieldset><legend>Sort by: </legend>
+    <p><select id="sort_by" name="sort_by">
+        <option value="">Field-weighted, Relevance Ranked</option>
+        <!-- TMPL_LOOP NAME="sort_by_loop" -->
+        <option value="<!-- TMPL_VAR NAME="value" -->" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->><!-- TMPL_VAR NAME="label" --></option>
+        <!-- /TMPL_LOOP -->
+    </select>
+        </p>
+</fieldset>
+<!-- /TMPL_IF -->
+
+	<table>
+<!--
+	<tr><th scope="row">
+		<label for="datefrom">Added on or after date</label>
+	    </th>
+	    <td>
+		<input type="hidden" name="marclist" value="items.dateaccessioned" />
+		<input type="hidden" name="and_or" value="and" />
+		<input type="hidden" name="excluding" value="" />
+		<input type="hidden" name="operator" value=">=" />
+  <input type="text" size="10" id="datefrom" name="value" value="" />                                                      
+  <img src="<!-- TMPL_VAR Name="themelang" -->/includes/calendar/cal.gif" border="0" id="openCalendarFrom" style="cursor: pointer;" valign="top" />
+
+<script type="text/javascript">
+    Calendar.setup({
+        inputField     :    "datefrom",
+      ifFormat : "%Y-%m-%d",
+        button         :    "openCalendarFrom",
+        align          :    "Tl",
+        singleClick    :    false
+    });
+</script>
+
+
+</td>
+    </tr>
+	<tr><th scope="row">
+		<label for="dateto">Added on or before date</label>
+	    </th>
+	    <td>
+		<input type="hidden" name="marclist" value="items.dateaccessioned" />
+		<input type="hidden" name="and_or" value="and" />
+		<input type="hidden" name="excluding" value="" />
+		<input type="hidden" name="operator" value="<=" />
+  <input type="text" size="10" id="dateto" name="value" value="" />                                                      
+  <img src="<!-- TMPL_VAR Name="themelang" -->/includes/calendar/cal.gif" border="0" id="openCalendarTo" style="cursor: pointer;" valign="top" />
+
+<script type="text/javascript">
+    Calendar.setup({
+        inputField     :    "dateto",
+      ifFormat : "%Y-%m-%d",
+        button         :    "openCalendarTo",
+        align          :    "Tl",
+    });
+</script>
+-->
+    <tr><th scope="row">Document Type</th>
+                <td colspan="2">
+                    <select name="Filter">
+                        <option value="">All Item Types</option>
+                        <!-- TMPL_LOOP name="itemtypeloop" -->
+                            <option value="<!-- TMPL_VAR name="value" -->" 
+                    <!-- TMPL_IF name="selected" --> selected="selected"
+                    <!-- /TMPL_IF -->><!-- TMPL_VAR name="description" --></option>
+                        <!-- /TMPL_LOOP -->
+                    </select>
+                </td>
+            </tr>
+
+	</table>
+<p>		<input type="submit" value="Start search" class="submit" /></p>
+</form>
+</div>
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/tools/tools-home.tmpl b/koha-tmpl/intranet-tmpl/prog/en/tools/tools-home.tmpl
index 95dee37e93..f72d08d6c5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/tools/tools-home.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/tools/tools-home.tmpl
@@ -9,6 +9,10 @@
 
 <table>
 <caption>Various tools</caption>
+<tr>
+    <td><a href="/cgi-bin/koha/labels/label-home.pl">Label creator</a></td>
+    <td>Create printable labels and barcodes from catalog data.</td>
+</tr>
 <tr>
     <td><a href="/cgi-bin/koha/tools/barcodes.pl">Label generator</a></td>
     <td>Generate spine labels and barcodes</td>
diff --git a/labels/label-create-layout.pl b/labels/label-create-layout.pl
new file mode 100755
index 0000000000..14caeaef4e
--- /dev/null
+++ b/labels/label-create-layout.pl
@@ -0,0 +1,84 @@
+#!/usr/bin/perl
+
+use strict;
+use CGI;
+use C4::Auth;
+use C4::Output;
+use C4::Labels;
+use C4::Context;
+use HTML::Template;
+
+#use Data::Dumper;
+#use Smart::Comments;
+
+my $query = new CGI;
+my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
+    {
+        template_name   => "labels/label-create-layout.tmpl",
+        query           => $query,
+        type            => "intranet",
+        authnotrequired => 0,
+        flagsrequired   => { catalogue => 1 },
+        debug           => 1,
+    }
+);
+
+my $data = get_label_options();
+my $op =  $query->param('op');
+
+my $active_template = GetActiveLabelTemplate();
+my @label_templates = GetAllLabelTemplates();
+my @printingtypes       = get_printingtypes();
+my @layouts       = get_layouts();
+my @barcode_types = get_barcode_types();
+my @batches = get_batches();
+
+if ($op = 'add_layout') {
+}
+
+
+
+ 
+###  $data
+
+$template->param( guidebox => 1 ) if ( $data->{'guidebox'} );
+$template->param( "papertype_$data->{'papertype'}"       => 1 );
+$template->param( "$data->{'barcodetype'}_checked" => 1 );
+$template->param( "startrow" . $data->{'startrow'} . "_checked" => 1 );
+
+$template->param(
+
+    op => $op,
+    active_template => $data->{'active_template'},
+    label_templates => \@label_templates,
+    barcode_types   => \@barcode_types,
+    printingtypes    => \@printingtypes,
+layout_loop => \@layouts,
+
+batches => \@batches,
+     id             => $data->{'id'},
+    barcodetype    => $data->{'barcodetype'},
+      papertype => $data->{'papertype'},
+
+    tx_author         => $data->{'author'},
+    tx_barcode        => $data->{'barcode'},
+   tx_title          => $data->{'title'},
+   tx_subtitle          => $data->{'subtitle'},
+    tx_isbn           => $data->{'isbn'},
+    tx_issn           => $data->{'issn'},
+    tx_itemtype            => $data->{'itemtype'},
+    tx_dewey          => $data->{'dewey'},
+    tx_class          => $data->{'class'},
+    tx_subclass       => $data->{'subclass'},
+    tx_itemcallnumber => $data->{'itemcallnumber'},
+
+    startlabel     => $data->{'startlabel'},
+    fontsize       => $active_template->{'fontsize'},
+
+    intranetcolorstylesheet =>
+      C4::Context->preference("intranetcolorstylesheet"),
+    intranetstylesheet => C4::Context->preference("intranetstylesheet"),
+    IntranetNav        => C4::Context->preference("IntranetNav"),
+);
+
+output_html_with_http_headers $query, $cookie, $template->output;
diff --git a/labels/label-create-template.pl b/labels/label-create-template.pl
new file mode 100755
index 0000000000..bd9a5c2d9c
--- /dev/null
+++ b/labels/label-create-template.pl
@@ -0,0 +1,85 @@
+#!/usr/bin/perl
+
+use strict;
+use CGI;
+use C4::Auth;
+use C4::Context;
+use C4::Output;
+use C4::Labels;
+use HTML::Template;
+use POSIX;
+
+#use Data::Dumper;
+use Smart::Comments;
+
+my $dbh   = C4::Context->dbh;
+my $query = new CGI;
+### $query
+
+my $tmpl_code    = $query->param('tmpl_code');
+my $tmpl_desc    = $query->param('tmpl_desc');
+my $page_height  = $query->param('page_height');
+my $page_width   = $query->param('page_width');
+my $label_height = $query->param('label_height');
+my $label_width  = $query->param('label_width');
+my $topmargin    = $query->param('topmargin');
+my $leftmargin   = $query->param('leftmargin');
+my $cols         = $query->param('cols');
+my $rows         = $query->param('rows');
+my $colgap       = $query->param('colgap');
+my $rowgap       = $query->param('rowgap');
+my $units        = $query->param('units');
+my $fontsize     = $query->param('fontsize');
+
+my $batch_id     = $query->param('batch_id');
+
+
+my $op = $query->param('op');
+my @resultsloop;
+
+my ( $template, $loggedinuser, $cookie );
+
+if ( $op eq 'blank' ) {
+
+    my @units = (
+        { unit => 'INCH',  desc => 'Inches' },
+        { unit => 'CM',    desc => 'Centimeters' },
+        { unit => 'MM',    desc => 'Millimeters' },
+        { unit => 'POINT', desc => 'Postscript Points' },
+    );
+
+    ( $template, $loggedinuser, $cookie ) = get_template_and_user(
+        {
+            template_name   => "labels/label-create-template.tmpl",
+            query           => $query,
+            type            => "intranet",
+            authnotrequired => 1,
+            flagsrequired   => { catalogue => 1 },
+            debug           => 1,
+        }
+    );
+
+    $template->param(
+        units                   => \@units,
+        intranetcolorstylesheet =>
+          C4::Context->preference("intranetcolorstylesheet"),
+        intranetstylesheet => C4::Context->preference("intranetstylesheet"),
+        IntranetNav        => C4::Context->preference("IntranetNav"),
+    );
+
+}
+
+elsif ( $op eq 'create' ) {
+    CreateTemplate(
+
+        $tmpl_code, $tmpl_desc, $page_width,
+        $page_height, $label_width, $label_height, $topmargin,
+        $leftmargin,  $cols,        $rows,         $colgap,
+        $rowgap,      $fontsize,     $units );
+
+ print $query->redirect("./label-templates.pl");
+exit;
+
+}
+
+output_html_with_http_headers $query, $cookie, $template->output;
diff --git a/labels/label-edit-layout.pl b/labels/label-edit-layout.pl
new file mode 100755
index 0000000000..28f45c56a5
--- /dev/null
+++ b/labels/label-edit-layout.pl
@@ -0,0 +1,87 @@
+#!/usr/bin/perl
+
+use strict;
+use CGI;
+use C4::Auth;
+use C4::Context;
+use C4::Output;
+use C4::Labels;
+use C4::Interface::CGI::Output;
+use HTML::Template;
+use POSIX;
+
+#use Data::Dumper;
+#use Smart::Comments;
+
+my $dbh       = C4::Context->dbh;
+my $query     = new CGI;
+my $layout_id = $query->param('layout_id');
+
+### $query;
+
+my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
+    {
+        template_name   => "barcodes/label-edit-layout.tmpl",
+        query           => $query,
+        type            => "intranet",
+        authnotrequired => 1,
+        flagsrequired   => { catalogue => 1 },
+        debug           => 1,
+    }
+);
+
+my $layout = get_layout($layout_id);
+ my @barcode_types = get_barcode_types($layout_id);
+my @printingtypes       = get_printingtypes($layout_id);
+### @printingtypes 
+### $layout
+
+my $layoutname =  $layout->{'layoutname'};
+my $layout_id =  $layout->{'id'};
+my $guidebox =  $layout->{'guidebox'};
+my $startlabel  =  $layout->{'startlabel'};
+
+my @title          = build_text_dropbox( $layout->{'title'} );
+my @subtitle          = build_text_dropbox( $layout->{'subtitle'} );
+my @author         = build_text_dropbox( $layout->{'author'} );
+my @barcode        = build_text_dropbox( $layout->{'barcode'} );
+my @isbn           = build_text_dropbox( $layout->{'isbn'} );
+my @issn           = build_text_dropbox( $layout->{'issn'} );
+my @itemtype       = build_text_dropbox( $layout->{'itemtype'} );
+my @dewey          = build_text_dropbox( $layout->{'dewey'} );
+my @class          = build_text_dropbox( $layout->{'class'} );
+my @subclass       = build_text_dropbox( $layout->{'subclass'} );
+my @itemcallnumber = build_text_dropbox( $layout->{'itemcallnumber'} );
+
+
+### @subclass 
+
+$template->param(
+    barcode_types => \@barcode_types,
+    printingtypes => \@printingtypes,
+
+    layoutname => $layoutname,
+    layout_id => $layout_id,
+
+guidebox => $guidebox,
+startlabel => $startlabel,
+
+    tx_title          => \@title,
+    tx_subtitle          => \@subtitle,
+    tx_author         => \@author,
+    tx_isbn           => \@isbn,
+    tx_issn           => \@issn,
+    tx_itemtype       => \@itemtype,
+    tx_dewey          => \@dewey,
+    tx_barcode        => \@barcode,
+    tx_classif        => \@class,
+    tx_subclass       => \@subclass,
+    tx_itemcallnumber => \@itemcallnumber,
+
+    intranetcolorstylesheet =>
+      C4::Context->preference("intranetcolorstylesheet"),
+    intranetstylesheet => C4::Context->preference("intranetstylesheet"),
+    IntranetNav        => C4::Context->preference("IntranetNav"),
+);
+
+output_html_with_http_headers $query, $cookie, $template->output;
diff --git a/labels/label-edit-template.pl b/labels/label-edit-template.pl
new file mode 100755
index 0000000000..b4ec950f49
--- /dev/null
+++ b/labels/label-edit-template.pl
@@ -0,0 +1,80 @@
+#!/usr/bin/perl
+
+use strict;
+use CGI;
+use C4::Auth;
+use C4::Context;
+use C4::Output;
+use C4::Labels;
+use HTML::Template;
+use POSIX;
+
+# use Data::Dumper;
+
+my $dbh       = C4::Context->dbh;
+my $query     = new CGI;
+
+my $tmpl_id = $query->param('tmpl_id');
+
+my $width      = $query->param('width');
+my $height     = $query->param('height');
+my $topmargin  = $query->param('topmargin');
+my $leftmargin = $query->param('leftmargin');
+my $columns    = $query->param('columns');
+my $rows       = $query->param('rows');
+my $colgap     = $query->param('colgap');
+my $rowgap     = $query->param('rowgap');
+
+my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
+    {
+        template_name   => "labels/label-edit-template.tmpl",
+        query           => $query,
+        type            => "intranet",
+        authnotrequired => 1,
+        flagsrequired   => { catalogue => 1 },
+        debug           => 1,
+    }
+);
+
+my $tmpl = GetSingleLabelTemplate($tmpl_id);
+
+my @units = (
+    { unit => 'INCH',  desc => 'Inches' },
+    { unit => 'CM',    desc => 'Centimeters' },
+    { unit => 'MM',    desc => 'Millimeters' },
+    { unit => 'POINT', desc => 'Postscript Points' },
+);
+
+foreach my $unit (@units) {
+    if ( $unit->{'unit'} eq $tmpl->{'units'} ) {
+        $unit->{'selected'} = 1;
+    }
+}
+
+$template->param(
+
+    units => \@units,
+
+    tmpl_id      => $tmpl->{'tmpl_id'},
+    tmpl_code    => $tmpl->{'tmpl_code'},
+    tmpl_desc    => $tmpl->{'tmpl_desc'},
+    page_width   => $tmpl->{'page_width'},
+    page_height  => $tmpl->{'page_height'},
+    label_width  => $tmpl->{'label_width'},
+    label_height => $tmpl->{'label_height'},
+    topmargin    => $tmpl->{'topmargin'},
+    leftmargin   => $tmpl->{'leftmargin'},
+    cols         => $tmpl->{'cols'},
+    rows         => $tmpl->{'rows'},
+    colgap       => $tmpl->{'colgap'},
+    rowgap       => $tmpl->{'rowgap'},
+    fontsize     => $tmpl->{'fontsize'},
+    active       => $tmpl->{'active'},
+
+    intranetcolorstylesheet =>
+      C4::Context->preference("intranetcolorstylesheet"),
+    intranetstylesheet => C4::Context->preference("intranetstylesheet"),
+    IntranetNav        => C4::Context->preference("IntranetNav"),
+);
+
+output_html_with_http_headers $query, $cookie, $template->output;
diff --git a/labels/label-home.pl b/labels/label-home.pl
new file mode 100755
index 0000000000..cfdcec33f8
--- /dev/null
+++ b/labels/label-home.pl
@@ -0,0 +1,95 @@
+#!/usr/bin/perl
+
+use strict;
+use CGI;
+use C4::Auth;
+use C4::Output;
+use C4::Labels;
+use C4::Output;
+use C4::Context;
+use HTML::Template;
+
+use Smart::Comments;
+
+my $query = new CGI;
+my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
+    {
+        template_name   => "labels/label-home.tmpl",
+        query           => $query,
+        type            => "intranet",
+        authnotrequired => 0,
+        flagsrequired   => { catalogue => 1 },
+        debug           => 1,
+    }
+);
+
+# little block for displaying active layout/template/batch in templates
+# ----------
+my $batch_id     = $query->param('batch_id');
+my $active_layout = get_active_layout();
+my $active_template = GetActiveLabelTemplate();
+my $active_layout_name = $active_layout->{'layoutname'};
+my $active_template_name = $active_template->{'tmpl_code'};
+# ----------
+
+
+my $data = get_label_options();
+my $op =  $query->param('op');
+my $layout_id =  $query->param('layout_id');
+
+my @label_templates = GetAllLabelTemplates();
+my @printingtypes       = get_printingtypes();
+my @layouts       = get_layouts();
+my @barcode_types = get_barcode_types();
+my @batches = get_batches();
+
+if ($op = 'delete_layout') {
+delete_layout($layout_id);
+}
+
+
+
+ 
+###  $data
+
+$template->param( guidebox => 1 ) if ( $data->{'guidebox'} );
+$template->param( "papertype_$data->{'papertype'}"       => 1 );
+$template->param( "$data->{'barcodetype'}_checked" => 1 );
+$template->param( "startrow" . $data->{'startrow'} . "_checked" => 1 );
+
+$template->param(
+    op => $op,
+    active_layout_name => $active_layout_name,
+    active_template_name => $active_template_name,
+
+    label_templates => \@label_templates,
+    barcode_types   => \@barcode_types,
+    printingtypes    => \@printingtypes,
+layout_loop => \@layouts,
+
+batches => \@batches,
+     id             => $data->{'id'},
+    barcodetype    => $data->{'barcodetype'},
+      papertype => $data->{'papertype'},
+
+    tx_author         => $data->{'author'},
+    tx_barcode        => $data->{'barcode'},
+   tx_title          => $data->{'title'},
+    tx_isbn           => $data->{'isbn'},
+    tx_issn           => $data->{'issn'},
+    tx_itemtype            => $data->{'itemtype'},
+    tx_dewey          => $data->{'dewey'},
+    tx_class          => $data->{'class'},
+    tx_subclass       => $data->{'subclass'},
+    tx_itemcallnumber => $data->{'itemcallnumber'},
+
+    startlabel     => $data->{'startlabel'},
+    fontsize       => $active_template->{'fontsize'},
+
+    intranetcolorstylesheet =>
+      C4::Context->preference("intranetcolorstylesheet"),
+    intranetstylesheet => C4::Context->preference("intranetstylesheet"),
+    IntranetNav        => C4::Context->preference("IntranetNav"),
+);
+
+output_html_with_http_headers $query, $cookie, $template->output;
diff --git a/barcodes/label-item-search.pl b/labels/label-item-search.pl
similarity index 61%
rename from barcodes/label-item-search.pl
rename to labels/label-item-search.pl
index 6f3176b780..c365a6279c 100755
--- a/barcodes/label-item-search.pl
+++ b/labels/label-item-search.pl
@@ -23,22 +23,32 @@ require Exporter;
 use CGI;
 use C4::Koha;
 use C4::Auth;
-
+use HTML::Template;
 use C4::Context;
+use C4::Search;
 use C4::Auth;
 use C4::Output;
 use C4::Biblio;
 use C4::Acquisition;
+use C4::Search;
 use C4::Koha;    # XXX subfield_is_koha_internal_p
 
+#use Smart::Comments;
+#use Data::Dumper;
+
 # Creates a scrolling list with the associated default value.
 # Using more than one scrolling list in a CGI assigns the same default value to all the
 # scrolling lists on the page !?!? That's why this function was written.
 
-my $query = new CGI;
-my $type  = $query->param('type');
-my $op    = $query->param('op');
-my $dbh   = C4::Context->dbh;
+my $query           = new CGI;
+my $type            = $query->param('type');
+my $op              = $query->param('op');
+my $batch_id        = $query->param('batch_id');
+my $dateaccessioned = $query->param('dateaccessioned');
+
+### $query;
+
+my $dbh = C4::Context->dbh;
 
 my $startfrom = $query->param('startfrom');
 $startfrom = 0 if ( !defined $startfrom );
@@ -59,33 +69,60 @@ if ( $op eq "do_search" ) {
     # builds tag and subfield arrays
     my @tags;
 
-    foreach my $marc (@marclist) {
-        if ($marc) {
-            my ( $tag, $subfield ) =
-              GetMarcFromKohaField( $marc );
-            if ($tag) {
-                push @tags, $dbh->quote("$tag$subfield");
-            }
-            else {
-                push @tags, $dbh->quote( substr( $marc, 0, 4 ) );
-            }
+    my ( $results, $total ) ;
+      #catalogsearch( $dbh, \@tags, \@and_or, \@excluding, \@operator, \@value,
+      #  $startfrom * $resultsperpage,
+      #  $resultsperpage, $orderby );
+
+use Data::Dumper;
+my $searchquery=$marclist[0];
+my ($error, $marcresults) = SimpleSearch($searchquery);
+
+my $hits = scalar @$marcresults;
+my @results;
+my $results;
+
+
+for(my $i=0;$i<$hits;$i++) {
+    my %resultsloop;
+    my $marcrecord = MARC::File::USMARC::decode($marcresults->[$i]);
+    my $biblio = TransformMarcToKoha(C4::Context->dbh,$marcrecord,'');
+    #build the hash for the template.
+    %resultsloop=%$biblio;
+    $resultsloop{highlight}       = ($i % 2)?(1):(0);
+#warn $resultsloop{biblionumber};
+
+    push @results, \%resultsloop;
+}
+    my @results2;
+    my $i;
+    for ( $i = 0 ; $i <= ( $hits - 1 ) ; $i++ ) {
+
+        my $itemnums = get_itemnumbers_of($results[$i]->{'biblionumber'});
+
+        my $iii = $itemnums->{$results[$i]->{'biblionumber'} } ;
+        my $item_results;
+		if ($iii ) {
+			$item_results =  &GetItemInfosOf( @$iii );
         }
-        else {
-            push @tags, "";
+        foreach my $item (keys %$item_results) {
+			for my $bibdata (keys %{$results[$i]}) {
+#warn Dumper($bibdata);        
+#warn Dumper($results[$i]->{$bibdata});
+				$item_results->{$item}{$bibdata} = $results[$i]->{$bibdata};
+			}
+            push @results2, $item_results->{$item};
         }
-    }
-    my ( $results, $total ) =
-      catalogsearch( $dbh, \@tags, \@and_or, \@excluding, \@operator, \@value,
-        $startfrom * $resultsperpage,
-        $resultsperpage, $orderby );
 
-    ( $template, $loggedinuser, $cookie ) = get_template_and_user(
+    }
+   ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         {
-            template_name   => "barcodes/result.tmpl",
+            template_name   => "labels/result.tmpl",
             query           => $query,
             type            => "intranet",
             authnotrequired => 0,
-            flagsrequired   => { tools => 1 },
+            flagsrequired   => { borrowers => 1 },
+            flagsrequired   => { catalogue => 1 },
             debug           => 1,
         }
     );
@@ -140,15 +177,15 @@ if ( $op eq "do_search" ) {
     # then pushes the items onto a new array, as we really want the
     # items attached to the bibs not thew bibs themselves
 
-    my @results2;
+   # my @results2;
     my $i;
     for ( $i = 0 ; $i <= ( $total - 1 ) ; $i++ )
     {    #total-1 coz the array starts at 0
             #warn $i;
-
-        my $type         = 'intra';
+            #warn Dumper $results->[$i]{'bibid'};
+        my $type = 'intra';
         my @item_results =
-          &GetItemsInfo( $results->[$i]{'biblionumber'}, $type );
+          &ItemInfo( 0, $results->[$i]{'biblionumber'}, $type );
 
         foreach my $item (@item_results) {
 
@@ -171,51 +208,55 @@ if ( $op eq "do_search" ) {
         from           => $from,
         to             => $to,
         numbers        => \@numbers,
+        batch_id       => $batch_id,
     );
 }
+
+#
+#
+#   search section
+#
+#
+
 else {
     ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         {
-            template_name   => "barcodes/search.tmpl",
+            template_name   => "labels/search.tmpl",
             query           => $query,
             type            => "intranet",
             authnotrequired => 0,
-            flagsrequired   => { tools => 1 },
+            flagsrequired   => { catalogue => 1 },
             debug           => 1,
         }
     );
-    my $sth =
-      $dbh->prepare(
-        "Select itemtype,description from itemtypes order by description");
-    $sth->execute;
-    my @itemtype;
-    my %itemtypes;
-    push @itemtype, "";
-    $itemtypes{''} = "";
-    while ( my ( $value, $lib ) = $sth->fetchrow_array ) {
-        push @itemtype, $value;
-        $itemtypes{$value} = $lib;
-    }
 
-    my $CGIitemtype = CGI::scrolling_list(
-        -name     => 'value',
-        -values   => \@itemtype,
-        -labels   => \%itemtypes,
-        -size     => 1,
-        -multiple => 0
+
+   #using old rel2.2 getitemtypes for testing!!!!, not devweek's GetItemTypes()
+
+    my $itemtypes = GetItemTypes;
+    my @itemtypeloop;
+    my ($thisitemtype );
+    foreach my $thisitemtype (keys %$itemtypes) {
+            my %row =(value => $thisitemtype,
+                           description => $itemtypes->{$thisitemtype}->{'description'},
+                            );  
+            push @itemtypeloop, \%row;
+    }  
+
+
+    $template->param(
+    itemtypeloop =>\@itemtypeloop,
+        batch_id     => $batch_id,
     );
-    $sth->finish;
 
-    $template->param( CGIitemtype => $CGIitemtype, );
+    # Print the page
+    $template->param(
+        intranetcolorstylesheet =>
+          C4::Context->preference("intranetcolorstylesheet"),
+        intranetstylesheet => C4::Context->preference("intranetstylesheet"),
+        IntranetNav        => C4::Context->preference("IntranetNav"),
+    );
 }
-
-# Print the page
-$template->param(
-    intranetcolorstylesheet =>
-      C4::Context->preference("intranetcolorstylesheet"),
-    intranetstylesheet => C4::Context->preference("intranetstylesheet"),
-    IntranetNav        => C4::Context->preference("IntranetNav"),
-);
 output_html_with_http_headers $query, $cookie, $template->output;
 
 # Local Variables:
diff --git a/labels/label-manager.pl b/labels/label-manager.pl
new file mode 100755
index 0000000000..c666d727ae
--- /dev/null
+++ b/labels/label-manager.pl
@@ -0,0 +1,195 @@
+#!/usr/bin/perl
+
+use strict;
+use CGI;
+use C4::Auth;
+use C4::Labels;
+use C4::Output;
+use HTML::Template;
+use POSIX;
+
+#use Data::Dumper;
+#use Smart::Comments;
+
+my $dbh            = C4::Context->dbh;
+my $query          = new CGI;
+my $op             = $query->param('op');
+my $layout_id =    $query->param('layout_id');
+my $layoutname =    $query->param('layoutname');
+my $barcodetype    = $query->param('barcodetype');
+
+
+my $bcn          = $query->param('tx_barcode');
+my $author          = $query->param('tx_author');
+
+my $title          = $query->param('tx_title');
+my $subtitle          = $query->param('tx_subtitle');
+my $isbn           = $query->param('tx_isbn');
+my $issn           = $query->param('tx_issn');
+my $itemtype       = $query->param('tx_itemtype');
+my $dcn            = $query->param('tx_dewey');
+my $classif        = $query->param('tx_classif');
+my $itemcallnumber = $query->param('tx_itemcallnumber');
+my $subclass       = $query->param('tx_subclass');
+my $author         = $query->param('tx_author');
+my $tmpl_id        = $query->param('tmpl_id');
+my $summary        = $query->param('summary');
+my $startlabel     = $query->param('startlabel');
+my $printingtype   = $query->param('printingtype');
+my $guidebox       = $query->param('guidebox');
+my $fontsize       = $query->param('fontsize');
+my @itemnumber     = $query->param('itemnumber');
+
+
+# little block for displaying active layout/template/batch in templates
+# ----------
+my $batch_id     = $query->param('batch_id');
+my $active_layout = get_active_layout();
+my $active_template = GetActiveLabelTemplate();
+my $active_layout_name = $active_layout->{'layoutname'};
+my $active_template_name = $active_template->{'tmpl_code'};
+# ----------
+
+#if (!$batch_id ) {
+#    $batch_id  = get_highest_batch();
+#}
+
+my ($itemnumber) = @itemnumber if (scalar(@itemnumber) == 1);
+
+my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
+    {
+        template_name   => "labels/label-manager.tmpl",
+        query           => $query,
+        type            => "intranet",
+        authnotrequired => 1,
+        flagsrequired   => { catalogue => 1 },
+        debug           => 1,
+    }
+);
+
+if ( $op eq 'save_conf' ) {    # this early sub is depreciated, use save_layout()
+   
+   SaveConf(
+        $barcodetype,    $title,  $isbn, 
+        $issn,    $itemtype,         $bcn,            $dcn, 
+       $classif, $subclass,         $itemcallnumber,      $author, 
+        $tmpl_id, $printingtype,   $guidebox,       $startlabel, $layoutname
+    );
+     print $query->redirect("label-home.pl");
+    exit;
+}
+
+
+elsif  ( $op eq 'save_layout' ) {
+    save_layout(
+        $barcodetype,    $title,  $subtitle, $isbn, 
+        $issn,    $itemtype,         $bcn,            $dcn, 
+       $classif, $subclass,         $itemcallnumber,      $author, 
+        $tmpl_id, $printingtype,   $guidebox,       $startlabel, $layoutname,
+        $layout_id
+    );
+
+### $layoutname
+
+     print $query->redirect("label-home.pl");
+    exit;
+}
+elsif  ( $op eq 'add_layout' ) {
+add_layout(
+        $barcodetype,    $title, $subtitle,  $isbn, 
+        $issn,    $itemtype,         $bcn,            $dcn, 
+       $classif, $subclass,         $itemcallnumber,      $author, 
+        $tmpl_id, $printingtype,   $guidebox,       $startlabel, $layoutname,
+        $layout_id
+    );
+
+### $layoutname
+
+     print $query->redirect("label-home.pl");
+    exit;
+}
+
+
+
+
+
+elsif ( $op eq 'add' ) {   # add item
+    my $query2 = "INSERT INTO labels ( itemnumber, batch_id ) values ( ?,? )";
+    my $sth2   = $dbh->prepare($query2);
+    for my $inum (@itemnumber) {
+		$sth2->execute($inum, $batch_id);
+    }
+	$sth2->finish;
+}
+elsif ( $op eq 'deleteall' ) {
+    my $query2 = "DELETE FROM labels";
+    my $sth2   = $dbh->prepare($query2);
+    $sth2->execute();
+    $sth2->finish;
+}
+elsif ( $op eq 'delete' ) {
+    my $query2 = "DELETE FROM labels where itemnumber = ?";
+    my $sth2   = $dbh->prepare($query2);
+    $sth2->execute($itemnumber);
+    $sth2->finish;
+}
+
+
+elsif ( $op eq 'delete_batch' ) {
+    delete_batch($batch_id);
+     print $query->redirect("label-manager.pl?batch_id=");
+	 exit;
+}
+
+elsif ( $op eq 'add_batch' ) {
+    $batch_id= add_batch();
+
+}
+
+elsif ( $op eq 'set_active_layout' ) {
+    set_active_layout($layout_id);
+     print $query->redirect("label-home.pl");
+    exit;
+}
+
+
+#  first lets do a read of the labels table , to get the a list of the
+# currently entered items to be prinited
+#use Data::Dumper;
+my @batches = get_batches();
+my @resultsloop = get_label_items($batch_id);
+#warn $batches[0];
+#warn $batch_id;
+#warn Dumper(@resultsloop);
+
+my $tmpl =GetActiveLabelTemplate();
+### $tmpl
+#calc-ing number of sheets
+#my $number_of_results = scalar @resultsloop;
+#my $sheets_needed = ( ( --$number_of_results + $startrow ) / 8 );
+#$sheets_needed = ceil($sheets_needed);    # rounding up int's
+
+#my $tot_labels       = ( $sheets_needed * 8 );
+#my $start_results    = ( $number_of_results + $startrow );
+#my $labels_remaining = ( $tot_labels - $start_results );
+
+$template->param(
+    batch_id => $batch_id,
+	batch_count => scalar @resultsloop,
+    active_layout_name => $active_layout_name,
+    active_template_name => $active_template_name,
+
+    resultsloop => \@resultsloop,
+    batches => \@batches,
+	tmpl_desc => $tmpl->{'tmpl_desc'},
+
+    #  startrow         => $startrow,
+    #  sheets           => $sheets_needed,
+    #  labels_remaining => $labels_remaining,
+
+    intranetcolorstylesheet =>
+      C4::Context->preference("intranetcolorstylesheet"),
+    intranetstylesheet => C4::Context->preference("intranetstylesheet"),
+    IntranetNav        => C4::Context->preference("IntranetNav"),
+);
+output_html_with_http_headers $query, $cookie, $template->output;
diff --git a/barcodes/label-print-pdf.pl b/labels/label-print-pdf.pl
similarity index 55%
rename from barcodes/label-print-pdf.pl
rename to labels/label-print-pdf.pl
index a473b7637e..18769fe519 100755
--- a/barcodes/label-print-pdf.pl
+++ b/labels/label-print-pdf.pl
@@ -1,58 +1,35 @@
 #!/usr/bin/perl
 
-# This file is part of Koha.
-#
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-#
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
-
-# $Id$
-
-=head1 label-print-pdf.pl
-
- this script is really divided into 2 differenvt section,
-
- the first section creates, and defines the new PDF file the barcodes
- using PDF::Reuse::Barcode, then saves the file to disk.
-
- the second section then opens the pdf file off disk, and places the spline label
- text in the left-most column of the page. then save the file again.
-
- the reason for this goofyness, it that i couldnt find a single perl package that handled both barcodes and decent text placement.
-
-=cut
-
 use strict;
 use CGI;
 use C4::Labels;
 use C4::Auth;
 use C4::Output;
 use C4::Context;
-
+use HTML::Template;
 use PDF::Reuse;
 use PDF::Reuse::Barcode;
 use POSIX;
-use C4::Labels;
-use Acme::Comment;
-
+#use C4::Labels;
+#use Smart::Comments;
 
 my $htdocs_path = C4::Context->config('intrahtdocs');
 my $cgi         = new CGI;
-my $spine_text  = "";
+print $cgi->header( -type => 'application/pdf', -attachment => 'barcode.pdf' );
+
+my $spine_text = "";
+
+warn "label-print-pdf ***";
 
 # get the printing settings
-my $template     = GetActiveLabelTemplate();
-my $conf_data    = get_label_options();
-my @resultsloop  = get_label_items();
+my $template    = GetActiveLabelTemplate();
+my $conf_data   = get_label_options();
+
+my $batch_id =   $cgi->param('batch_id');
+my @resultsloop = get_label_items($batch_id);
+
+#$DB::single = 1;
+
 my $barcodetype  = $conf_data->{'barcodetype'};
 my $printingtype = $conf_data->{'printingtype'};
 my $guidebox     = $conf_data->{'guidebox'};
@@ -60,12 +37,24 @@ my $start_label  = $conf_data->{'startlabel'};
 my $fontsize     = $template->{'fontsize'};
 my $units        = $template->{'units'};
 
-warn "UNITS $units";
-warn "fontsize = $fontsize";
+### $printingtype;
+
+=c
+################### defaults for testing
+my $barcodetype  = 'CODE39';
+my $printingtype = 'BARBIB';
+my $guidebox     = 1;
+my $start_label  = 1;
+my $units        = 'POINTS'
+=cut
+
+#my $fontsize = 3;
+
+#warn "UNITS $units";
+#warn "fontsize = $fontsize";
+#warn Dumper $template;
 
 my $unitvalue = GetUnitsValue($units);
-warn $unitvalue;
-warn $units;
 
 my $tmpl_code = $template->{'tmpl_code'};
 my $tmpl_desc = $template->{'tmpl_desc'};
@@ -86,7 +75,7 @@ my $label_rows = $template->{'rows'};
 
 my $text_wrap_cols = GetTextWrapCols( $fontsize, $label_width );
 
-warn $label_cols, $label_rows;
+#warn $label_cols, $label_rows;
 
 # set the paper size
 my $lowerLeftX  = 0;
@@ -96,7 +85,6 @@ my $upperRightY = $page_height;
 
 prInitVars();
 $| = 1;
-print STDOUT "Content-Type: application/pdf \r\n\r\n";
 prFile();
 
 prMbox( $lowerLeftX, $lowerLeftY, $upperRightX, $upperRightY );
@@ -107,13 +95,12 @@ prFontSize($fontsize);
 
 my $margin           = $top_margin;
 my $left_text_margin = 3;
-
 my $str;
 
 #warn "STARTROW = $startrow\n";
 
 #my $page_break_count = $startrow;
-my $codetype = 'Code39';
+my $codetype; # = 'Code39';
 
 #do page border
 #drawbox( $lowerLeftX, $lowerLeftY, $upperRightX, $upperRightY );
@@ -123,10 +110,10 @@ my ( $i, $i2 );    # loop counters
 
 # big row loop
 
-warn " $lowerLeftX, $lowerLeftY, $upperRightX, $upperRightY";
-warn "$label_rows, $label_cols\n";
-warn "$label_height, $label_width\n";
-warn "$page_height, $page_width\n";
+#warn " $lowerLeftX, $lowerLeftY, $upperRightX, $upperRightY";
+#warn "$label_rows, $label_cols\n";
+#warn "$label_height, $label_width\n";
+#warn "$page_height, $page_width\n";
 
 my ( $rowcount, $colcount, $x_pos, $y_pos, $rowtemp, $coltemp );
 
@@ -138,7 +125,13 @@ if ( $start_label eq 1 ) {
 }
 
 else {
+
+    #eval {
     $rowcount = ceil( $start_label / $label_cols );
+
+    #} ;
+    #$rowcount = 1 if $@;
+
     $colcount = ( $start_label - ( ( $rowcount - 1 ) * $label_cols ) );
 
     $x_pos = $left_margin + ( $label_width * ( $colcount - 1 ) ) +
@@ -151,40 +144,86 @@ else {
 
 warn "ROW COL $rowcount, $colcount";
 
-#my $barcodetype = 'Code39';
+#my $barcodetype; # = 'Code39';
 
-foreach $item (@resultsloop) {
+#
+#    main foreach loop
+#
 
-    warn "-----------------";
-    if ($guidebox) {
-        drawbox( $x_pos, $y_pos, $label_width, $label_height );
+foreach $item (@resultsloop) {
+#    warn "$x_pos, $y_pos, $label_width, $label_height";
+    my $barcode = $item->{'barcode'};
+    if ( $printingtype eq 'BAR' ) {
+        drawbox( $x_pos, $y_pos, $label_width, $label_height ) if $guidebox;
+        DrawBarcode( $x_pos, $y_pos, $label_height, $label_width, $barcode,
+            $barcodetype );
+        CalcNextLabelPos();
     }
+    elsif ( $printingtype eq 'BARBIB' ) {
+        drawbox( $x_pos, $y_pos, $label_width, $label_height ) if $guidebox;
 
-    if ( $printingtype eq 'spine' || $printingtype eq 'both' ) {
-        if ($guidebox) {
-            drawbox( $x_pos, $y_pos, $label_width, $label_height );
-        }
+        # reposoitioning barcode up the top of label
+        my $barcode_height = ($label_height / 1.5 );    ## scaling voodoo
+        my $text_height    = $label_height / 2;
+        my $barcode_y      = $y_pos + ( $label_height / 2.5  );   ## scaling voodoo
+
+        DrawBarcode( $x_pos, $barcode_y, $barcode_height, $label_width,
+            $barcode, $barcodetype );
+        DrawSpineText( $y_pos, $text_height, $fontsize, $x_pos,
+            $left_text_margin, $text_wrap_cols, \$item, \$conf_data );
+
+        CalcNextLabelPos();
 
+    }    # correct
+    elsif ( $printingtype eq 'BIBBAR' ) {
+        drawbox( $x_pos, $y_pos, $label_width, $label_height ) if $guidebox;
+        my $barcode_height = $label_height / 2;
+        DrawBarcode( $x_pos, $y_pos, $barcode_height, $label_width, $barcode,
+            $barcodetype );
         DrawSpineText( $y_pos, $label_height, $fontsize, $x_pos,
             $left_text_margin, $text_wrap_cols, \$item, \$conf_data );
+
+        CalcNextLabelPos();
+    }
+
+    elsif ( $printingtype eq 'ALT' ) {
+        drawbox( $x_pos, $y_pos, $label_width, $label_height ) if $guidebox;
+        DrawBarcode( $x_pos, $y_pos, $label_height, $label_width, $barcode,
+            $barcodetype );
+        CalcNextLabelPos();
+        drawbox( $x_pos, $y_pos, $label_width, $label_height ) if $guidebox;
+        DrawSpineText( $y_pos, $label_height, $fontsize, $x_pos,
+            $left_text_margin, $text_wrap_cols, \$item, \$conf_data );
+
         CalcNextLabelPos();
     }
 
-    if ( $printingtype eq 'barcode' || $printingtype eq 'both' ) {
-        if ($guidebox) {
-            drawbox( $x_pos, $y_pos, $label_width, $label_height );
-        }
 
-        DrawBarcode( $x_pos, $y_pos, $label_height, $label_width,
-            $item->{'barcode'}, $barcodetype );
+    elsif ( $printingtype eq 'BIB' ) {
+        drawbox( $x_pos, $y_pos, $label_width, $label_height ) if $guidebox;
+        DrawSpineText( $y_pos, $label_height, $fontsize, $x_pos,
+            $left_text_margin, $text_wrap_cols, \$item, \$conf_data );
         CalcNextLabelPos();
     }
 
+
+
+
+
+
+
+
+
+
+
 }    # end for item loop
 prEnd();
 
-print $cgi->redirect("/intranet-tmpl/barcodes/new.pdf");
-
+#
+#
+#
+#
+#
 sub CalcNextLabelPos {
     if ( $colcount lt $label_cols ) {
 
diff --git a/labels/label-save-template.pl b/labels/label-save-template.pl
new file mode 100755
index 0000000000..2ecda4f4ac
--- /dev/null
+++ b/labels/label-save-template.pl
@@ -0,0 +1,50 @@
+#!/usr/bin/perl
+
+use strict;
+use CGI;
+use C4::Auth;
+use C4::Context;
+use C4::Output;
+use C4::Labels;
+use C4::Interface::CGI::Output;
+use HTML::Template;
+use POSIX;
+
+#use Data::Dumper;
+#use Smart::Comments;
+
+
+my $dbh   = C4::Context->dbh;
+my $query = new CGI;
+
+my $tmpl_id      = $query->param('tmpl_id');
+my $tmpl_code    = $query->param('tmpl_code');
+my $tmpl_desc    = $query->param('tmpl_desc');
+my $page_height  = $query->param('page_height');
+my $page_width   = $query->param('page_width');
+my $label_height = $query->param('label_height');
+my $label_width  = $query->param('label_width');
+my $topmargin    = $query->param('topmargin');
+my $leftmargin   = $query->param('leftmargin');
+my $cols         = $query->param('cols');
+my $rows         = $query->param('rows');
+my $colgap       = $query->param('colgap');
+my $rowgap       = $query->param('rowgap');
+my $fontsize     = $query->param('fontsize');
+my $units        = $query->param('units');
+my $active       = $query->param('active');
+
+
+SaveTemplate(
+
+    $tmpl_id,     $tmpl_code,   $tmpl_desc,    $page_width,
+    $page_height, $label_width, $label_height, $topmargin,
+    $leftmargin,  $cols,        $rows,         $colgap,
+    $rowgap,      $fontsize,     $units
+
+);
+
+
+ print $query->redirect("./label-templates.pl");
+
+
diff --git a/labels/label-select-pdf.pl b/labels/label-select-pdf.pl
new file mode 100755
index 0000000000..41f3ef5bb2
--- /dev/null
+++ b/labels/label-select-pdf.pl
@@ -0,0 +1,32 @@
+#!/usr/bin/perl
+
+use lib '/usr/local/opus-dev/intranet/modules';
+use C4::Context("/etc/koha-opus-dev.conf");
+
+use strict;
+use CGI;
+use C4::Labels;
+use C4::Auth;
+use C4::Output;
+use C4::Interface::CGI::Output;
+use C4::Context;
+use HTML::Template;
+
+use Data::Dumper;
+
+# get the printing settings
+my $conf_data = get_label_options();
+my $cgi       = new CGI;
+
+my $papertype = $conf_data->{'papertype'};
+warn $papertype;
+
+if ( $papertype eq "Gaylord8511" ) {
+    warn "GAY";
+    print $cgi->redirect("/cgi-bin/koha/barcodes/label-print-pdf.pl");
+}
+elsif ( $papertype eq "OPUS-Dot Matrix" ) {
+    warn "OPUS labes";
+    print $cgi->redirect("/cgi-bin/koha/barcodes/label-print-opus-pdf.pl");
+}
+
diff --git a/labels/label-templates.pl b/labels/label-templates.pl
new file mode 100755
index 0000000000..ce18734046
--- /dev/null
+++ b/labels/label-templates.pl
@@ -0,0 +1,82 @@
+#!/usr/bin/perl
+
+use strict;
+use CGI;
+use C4::Auth;
+use C4::Context;
+use C4::Output;
+use C4::Labels;
+use HTML::Template;
+use POSIX;
+
+#use Data::Dumper;
+
+my $dbh       = C4::Context->dbh;
+my $query     = new CGI;
+my $op        = $query->param('op');
+my $tmpl_code = $query->param('tmpl_code');
+my $tmpl_id = $query->param('tmpl_id');
+
+
+my $width      = $query->param('width');
+my $height     = $query->param('height');
+my $topmargin  = $query->param('topmargin');
+my $leftmargin = $query->param('leftmargin');
+my $columns    = $query->param('columns');
+my $rows       = $query->param('rows');
+my $colgap     = $query->param('colgap');
+my $rowgap     = $query->param('rowgap');
+
+my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
+    {
+        template_name   => "labels/label-templates.tmpl",
+        query           => $query,
+        type            => "intranet",
+        authnotrequired => 1,
+        flagsrequired   => { catalogue => 1 },
+        debug           => 1,
+    }
+);
+
+
+my @resultsloop;
+
+
+if ( $op eq 'set_active_template' ) {
+    SetActiveTemplate($tmpl_id);
+}
+
+elsif ( $op eq 'delete' ) {
+    DeleteTemplate($tmpl_id);
+}
+
+elsif ( $op eq 'save' ) {
+    SaveTemplate($tmpl_code);
+}
+
+    @resultsloop = GetAllLabelTemplates();
+
+# little block for displaying active layout/template/batch in templates
+# ----------
+my $batch_id     = $query->param('batch_id');
+my $active_layout = get_active_layout();
+my $active_template = GetActiveLabelTemplate();
+my $active_layout_name = $active_layout->{'layoutname'};
+my $active_template_name = $active_template->{'tmpl_code'};
+# ----------
+
+$template->param(
+
+    batch_id => $batch_id,
+    active_layout_name => $active_layout_name,
+    active_template_name => $active_template_name,
+
+    resultsloop => \@resultsloop,
+
+    intranetcolorstylesheet =>
+      C4::Context->preference("intranetcolorstylesheet"),
+    intranetstylesheet => C4::Context->preference("intranetstylesheet"),
+    IntranetNav        => C4::Context->preference("IntranetNav"),
+);
+
+output_html_with_http_headers $query, $cookie, $template->output;
-- 
2.39.2