Adding itemtypes and branches in MARCdetail BugFixing moremember.tmpl : column descri...

Signed-off-by: Chris Cormack <crc@liblime.com>

diff --git a/catalogue/MARCdetail.pl b/catalogue/MARCdetail.pl
index c406234..68db43b 100755 (executable)
--- a/catalogue/MARCdetail.pl
+++ b/catalogue/MARCdetail.pl
@@ -60,17 +60,18 @@ sub get_authorised_value_desc ($$$$$$) {
     my ( $tagslib, $tag, $subfield, $value, $framework, $dbh ) = @_;
 
     #---- branch
-    #if ( $tagslib->{$tag}->{$subfield}->{'authorised_value'} eq "branches" ) {
+    if ( $tagslib->{$tag}->{$subfield}->{'authorised_value'} eq "branches" ) {
 
-        #       return GetBranchDetail($value)->{branchname};
-    #}
+#                return GetBranchDetail($value)->{branchname};
+               return $value;
+    }
 
     #---- itemtypes
-    #if ( $tagslib->{$tag}->{$subfield}->{'authorised_value'} eq "itemtypes" ) {
+    if ( $tagslib->{$tag}->{$subfield}->{'authorised_value'} eq "itemtypes" ) {
 
-        #          my $itemtypedef = getitemtypeinfo($itemtype);
-        #      return $itemtypedef->{description};
-    #}
+                  my $itemtypedef = getitemtypeinfo($itemtype);
+              return $itemtypedef->{description};
+    }
 
     #---- "true" authorized value
     my $category = $tagslib->{$tag}->{$subfield}->{'authorised_value'};

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl
index 28588b9..dbe7fd7 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl
@@ -189,9 +189,9 @@ function confirm_reregistration() {
        <input type="hidden" name="branch" value="<!-- TMPL_VAR NAME="branch" -->" />
     <table>
         <tr>
+            <th scope="col">Date due</th>
             <th scope="col">Title</th>
             <th scope="col">Barcode</th>
-            <th scope="col">Date due</th>
             <th scope="col">Itemtype</th>
             <th scope="col">Charge</th>
             <th scope="col">Price</th>