[Koha-cvs] koha koha-tmpl/intranet-tmpl/ccfls/en/members/m... [dev_week]

[Kyle Hall]

CVSROOT:        /sources/koha
Module name:    koha
Branch:         dev_week
Changes by:     Kyle Hall <kylemhall>   07/10/31 18:53:38

Modified files:
        koha-tmpl/intranet-tmpl/ccfls/en/members: moremember.tmpl 
        members        : moremember.pl 

Log message:
        Added holding branch to the list of items on loan for moremember.pl

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/ccfls/en/members/moremember.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1.2.20&r2=1.1.2.1.2.21
http://cvs.savannah.gnu.org/viewcvs/koha/members/moremember.pl?cvsroot=koha&only_with_tag=dev_week&r1=1.5.2.14.2.7&r2=1.5.2.14.2.8

Patches:
Index: koha-tmpl/intranet-tmpl/ccfls/en/members/moremember.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/ccfls/en/members/Attic/moremember.tmpl,v
retrieving revision 1.1.2.1.2.20
retrieving revision 1.1.2.1.2.21
diff -u -b -r1.1.2.1.2.20 -r1.1.2.1.2.21
--- koha-tmpl/intranet-tmpl/ccfls/en/members/moremember.tmpl    30 Aug 2007 
12:10:29 -0000      1.1.2.1.2.20
+++ koha-tmpl/intranet-tmpl/ccfls/en/members/moremember.tmpl    31 Oct 2007 
18:53:37 -0000      1.1.2.1.2.21
@@ -218,14 +218,15 @@
                <th>Call Number</th>
                <th>Due</th>
                <th>Itemtype</th>
-               <!-- Hide from NPL --><th>Charge</th><!-- /Hide from NPL -->
+               <!-- Hide from NPL <th>Charge</th>  /Hide from NPL -->
+               <th>Holding Branch</th>
                <th>Price</th>
                <!-- TMPL_UNLESS NAME="unvalidlibrarian"--><th><input 
style="border:inset 1px;" name="allbox" type="checkbox" value="Check All" 
onclick="CheckAll(document.itemsOnLoanForm);" /></th><!-- /TMPL_UNLESS -->
 <!-- HIDE FOR CCFLS ( NO LONGER NEEDED ) <th>Return</th> -->
                <!-- TMPL_IF NAME="failedRenewals"--><th>Renew Attempt</th><!-- 
/TMPL_IF -->
        </tr>
        </thead>
-       <tfoot><tr><td colspan="4">Total Replacement Cost:</td><td 
class="sum"><!-- TMPL_VAR name="totalprice" --></td><td 
colspan="3">&nbsp;</td></tr></tfoot>
+       <tfoot><tr><td colspan="5">Total Replacement Cost:</td><td 
class="sum"><!-- TMPL_VAR name="totalprice" --></td><td 
colspan="2">&nbsp;</td></tr></tfoot>
 <tbody>
 <!-- TMPL_IF NAME="issueloop" -->
   <!-- TMPL_LOOP name="issueloop" -->
@@ -242,7 +243,8 @@
                <td><!-- TMPL_VAR name="itemcallnumber" --></td>
                <td><!-- TMPL_VAR name="date_due" --></td>
                <td><!-- TMPL_VAR name="itemtype" --></td>
-               <td class="credit"><!-- TMPL_VAR name="charge" --></td>
+               <!-- HIDE <td class="credit"><!-- TMPL_VAR name="charge" 
--></td> -->
+               <td><!-- TMPL_VAR name="holdingbranch" --></td>
                <td class="credit"><!-- TMPL_VAR name="price" --></td>
                <!-- TMPL_UNLESS NAME="unvalidlibrarian"--><td>
                <!-- TMPL_IF name="norenew" -->

Index: members/moremember.pl
===================================================================
RCS file: /sources/koha/koha/members/moremember.pl,v
retrieving revision 1.5.2.14.2.7
retrieving revision 1.5.2.14.2.8
diff -u -b -r1.5.2.14.2.7 -r1.5.2.14.2.8
--- members/moremember.pl       8 Jul 2007 22:14:23 -0000       1.5.2.14.2.7
+++ members/moremember.pl       31 Oct 2007 18:53:37 -0000      1.5.2.14.2.8
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# $Id: moremember.pl,v 1.5.2.14.2.7 2007/07/08 22:14:23 sushi Exp $
+# $Id: moremember.pl,v 1.5.2.14.2.8 2007/10/31 18:53:37 kylemhall Exp $
 
 # script to do a borrower enquiry/bring up borrower details etc
 # Displays all the details about a borrower
@@ -202,6 +202,10 @@
        if ($datedue < $today){
                $row{'red'}=1; #print "<font color=red>";
        }
+       
+        my $item = getiteminformation( my $env, $issue->[$i]{'itemnumber'} );
+        $row{'holdingbranch'} = $item->{'holdingbranch'};
+       
        #find the charge for an item
        # FIXME - This is expecting
        # &C4::Circulation::Renewals2::calc_charges, but it's getting