[Koha-cvs] koha/circ returns.pl [rel_2_2]

[Owen Leonard]

CVSROOT:        /sources/koha
Module name:    koha
Branch:         rel_2_2
Changes by:     Owen Leonard <address@hidden>   06/03/09 18:03:34

Modified files:
        circ           : returns.pl 

Log message:
        renaming variable so that 'branchname' can be used as current branch 
setting.  By matching circulation.pl's variable naming we can display 
branchname consistently in the header of circulation-related pages.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha/circ/returns.pl.diff?only_with_tag=rel_2_2&tr1=1.37.2.5&tr2=1.37.2.6&r1=text&r2=text

Patches:
Index: koha/circ/returns.pl
diff -u koha/circ/returns.pl:1.37.2.5 koha/circ/returns.pl:1.37.2.6
--- koha/circ/returns.pl:1.37.2.5       Sun Feb  5 21:59:21 2006
+++ koha/circ/returns.pl        Thu Mar  9 18:03:34 2006
@@ -124,7 +124,7 @@
         $template->param(
             itemtitle  => $iteminfo->{'title'},
             iteminfo   => $iteminfo->{'author'},
-            branchname => $branchname,
+            tobranchname => $branchname,
             name       => $name,
             bornum     => $borrnum,
             borcnum    => $borcnum,
@@ -224,7 +224,7 @@
                        debarred => $borr->{'debarred'},
                        gonenoaddress => $borr->{'gonenoaddress'},
                        currentbranch => $branches->{ $branch }->{'branchname'},
-            branchname  => $branches->{ $res->{'branchcode'} }->{'branchname'},
+            tobranchname  => $branches->{ $res->{'branchcode'} 
}->{'branchname'},
             waiting     => 1,
             itemnumber  => $res->{'itemnumber'},
             itemtitle   => $iteminfo->{'title'},
@@ -251,7 +251,7 @@
         $template->param(
             found       => 1,
                currentbranch => $branches->{ $branch }->{'branchname'},
-            branchname  => $branches->{ $res->{'branchcode'} }->{'branchname'},
+            tobranchname  => $branches->{ $res->{'branchcode'} 
}->{'branchname'},
             reserved    => 1,
             today       => $todaysdate,
             itemnumber  => $res->{'itemnumber'},
@@ -462,7 +462,7 @@
 $template->param(
     genbrname  => $branches->{$branch}->{'branchname'},
     genprname  => $printers->{$printer}->{'printername'},
-    branch     => $branch,
+    branchname     => $branches->{$branch}->{'branchname'},
     printer    => $printer,
     errmsgloop => address@hidden,
     intranetcolorstylesheet => 
C4::Context->preference("intranetcolorstylesheet"),