View | Details | Raw Unified | Return to bug 8836
Collapse All | Expand All

(-)a/C4/Circulation.pm (+2 lines)
Lines 42-47 use C4::Koha qw( Link Here
42
    GetKohaAuthorisedValueLib
42
    GetKohaAuthorisedValueLib
43
);
43
);
44
use C4::Overdues qw(CalcFine UpdateFine);
44
use C4::Overdues qw(CalcFine UpdateFine);
45
use C4::RotatingCollections qw(GetCollectionItemBranches);
45
use Algorithm::CheckDigits;
46
use Algorithm::CheckDigits;
46
47
47
use Data::Dumper;
48
use Data::Dumper;
Lines 1948-1953 sub AddReturn { Link Here
1948
            $messages->{'NeedsTransfer'} = 1;   # TODO: instead of 1, specify branchcode that the transfer SHOULD go to, $item->{homebranch}
1949
            $messages->{'NeedsTransfer'} = 1;   # TODO: instead of 1, specify branchcode that the transfer SHOULD go to, $item->{homebranch}
1949
        }
1950
        }
1950
    }
1951
    }
1952
1951
    return ( $doreturn, $messages, $issue, $borrower );
1953
    return ( $doreturn, $messages, $issue, $borrower );
1952
}
1954
}
1953
1955
(-)a/C4/RotatingCollections.pm (-2 / +5 lines)
Lines 333-340 sub AddItemToCollection { Link Here
333
333
334
    my $sth;
334
    my $sth;
335
    $sth = $dbh->prepare("
335
    $sth = $dbh->prepare("
336
        INSERT INTO collections_tracking ( collections_tracking_id, colId, itemnumber )
336
        INSERT INTO collections_tracking (
337
        VALUES ( NULL, ?, ? )
337
            ctId,
338
            colId,
339
            itemnumber
340
        ) VALUES ( NULL, ?, ? )
338
    ");
341
    ");
339
    $sth->execute( $colId, $itemnumber ) or return ( 0, 3, $sth->errstr() );
342
    $sth->execute( $colId, $itemnumber ) or return ( 0, 3, $sth->errstr() );
340
343
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt (-1 / +1 lines)
Lines 67-73 $(document).ready(function () { Link Here
67
[% END %]
67
[% END %]
68
68
69
[% IF ( collectionItemNeedsTransferred ) %]
69
[% IF ( collectionItemNeedsTransferred ) %]
70
	<div id="rotating-collection" class="dialog message">This item is part of a Rotating Collection and needs to be Transferred to [% collectionBranch %]</div>
70
 <div id="rotating-collection" class="dialog message">This item is part of a rotating collection and needs to be transferred to [% collectionBranch %]</div>
71
[% END %]
71
[% END %]
72
72
73
<!-- Patron has fines -->
73
<!-- Patron has fines -->
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/editCollections.tt (-4 / +7 lines)
Lines 44-56 Link Here
44
      <div>
44
      <div>
45
        [% IF ( collectionsLoop ) %]
45
        [% IF ( collectionsLoop ) %]
46
          <table>
46
          <table>
47
           <thead>
47
            <tr>
48
            <tr>
48
              <th>Title</th>
49
              <th>Title</th>
49
              <th>Description</th>
50
              <th>Description</th>
50
              <th>Holding library</th>
51
              <th>Holding library</th>
51
              <td></td>
52
              <th>&nbsp;</th>
52
              <td></td>
53
              <th>&nbsp;</th>
53
            </tr>
54
            </tr>
55
           <thead>
56
           <tbody>
54
            [% FOREACH collectionsLoo IN collectionsLoop %]
57
            [% FOREACH collectionsLoo IN collectionsLoop %]
55
              <tr>
58
              <tr>
56
                <td>[% collectionsLoo.colTitle %]</td>
59
                <td>[% collectionsLoo.colTitle %]</td>
Lines 60-65 Link Here
60
                <td><a href="editCollections.pl?action=delete&amp;colId=[% collectionsLoo.colId %]">Delete</a></td>
63
                <td><a href="editCollections.pl?action=delete&amp;colId=[% collectionsLoo.colId %]">Delete</a></td>
61
              </tr>
64
              </tr>
62
            [% END %]
65
            [% END %]
66
           </tbody>
63
          </table>
67
          </table>
64
        [% ELSE %]
68
        [% ELSE %]
65
          There are no collections currently defined.
69
          There are no collections currently defined.
Lines 99-105 Link Here
99
                <label for="description">Description: </label>
103
                <label for="description">Description: </label>
100
              </td>
104
              </td>
101
              <td>
105
              <td>
102
                [% IF (editColDescription ) %]<input type="text" size="50" name="description" value="[ editColDescription %]" />
106
                [% IF (editColDescription ) %]<input type="text" size="50" name="description" value="[% editColDescription %]" />
103
                [% ELSE %]<input type="text" size="50" name="description" />[% END %]
107
                [% ELSE %]<input type="text" size="50" name="description" />[% END %]
104
              </td>
108
              </td>
105
            </tr>
109
            </tr>
106
- 

Return to bug 8836