[Koha-cvs] koha/C4 Labels.pm [dev_week]

[Mason James]

CVSROOT:        /sources/koha
Module name:    koha
Branch:         dev_week
Changes by:     Mason James <sushi>     07/07/15 23:17:37

Modified files:
        C4             : Labels.pm 

Log message:
        updating devweek with newer commits from rel22.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Labels.pm?cvsroot=koha&only_with_tag=dev_week&r1=1.3.4.29&r2=1.3.4.30

Patches:
Index: Labels.pm
===================================================================
RCS file: /sources/koha/koha/C4/Labels.pm,v
retrieving revision 1.3.4.29
retrieving revision 1.3.4.30
diff -u -b -r1.3.4.29 -r1.3.4.30
--- Labels.pm   10 Jul 2007 13:18:05 -0000      1.3.4.29
+++ Labels.pm   15 Jul 2007 23:17:37 -0000      1.3.4.30
@@ -428,14 +428,12 @@
 }
 
 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
+        $rowgap,      $fontsize,     $units
     ) = @_;
-
     my $dbh = C4::Context->dbh;
     my $query =
       " UPDATE labels_templates SET tmpl_code=?, tmpl_desc=?, page_width=?,
@@ -452,8 +450,6 @@
         $fontsize,    $units,        $tmpl_id
     );
     $sth->finish;
-
-    SetActiveTemplate($tmpl_id) if ( $active eq '1' );
 }
 
 sub CreateTemplate {
@@ -815,9 +811,8 @@
 
     my $moo2 = $tot_bar_length * $xsize_ratio;
 
-    warn " $x_pos, $y_pos, $barcode, $barcodetype\n";
-    warn
-"BAR_WDTH = $bar_width, TOT.BAR.LGHT=$tot_bar_length  R*TOT.BAR =$moo2 \n";
+#    warn " $x_pos, $y_pos, $barcode, $barcodetype\n";
+#    warn "BAR_WDTH = $bar_width, TOT.BAR.LGHT=$tot_bar_length  R*TOT.BAR 
=$moo2 \n";
 }
 
 =item build_circ_barcode;