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

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/patron_messages.inc (-1 / +34 lines)
Lines 4-10 Link Here
4
[% SET return_claims = patron.return_claims %]
4
[% SET return_claims = patron.return_claims %]
5
[% SET logged_in_branchcode = Branches.GetLoggedInBranchcode() %]
5
[% SET logged_in_branchcode = Branches.GetLoggedInBranchcode() %]
6
6
7
[% IF ( has_modifications || warndeparture || returnbeforeexpiry || expired || patron.gonenoaddress || patron.lost || userdebarred || odues || ( return_claims.count > ClaimReturnedWarningThreshold ) || age_limitations || charges || charges_guarantors_guarantees || charges_guarantees || credits ) %]
7
[% IF ( has_modifications || warndeparture || returnbeforeexpiry || expired || patron.gonenoaddress || patron.lost || userdebarred || odues || ( return_claims.count > ClaimReturnedWarningThreshold ) || age_limitations || charges || charges_guarantors_guarantees || charges_guarantees || credits || ItemLocationUpdated ) %]
8
    <h3>Attention</h3>
8
    <h3>Attention</h3>
9
    <ul>
9
    <ul>
10
        [% IF ( has_modifications ) %]
10
        [% IF ( has_modifications ) %]
Lines 128-133 Link Here
128
            </li>
128
            </li>
129
        [% END %]
129
        [% END %]
130
130
131
        [% IF ( ItemLocationUpdated ) %]
132
            <p class="problem ret_location_update">
133
            [% FOREACH Location IN ItemLocationUpdated.values %]
134
		Item shelving location updated.
135
                <br /><span>Old value:</span>
136
                [% IF Location.from %]
137
                    [% SET av_description = AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.location', authorised_value => Location.from ) %]
138
                    [% IF Location.from == '' %]
139
                        <span>empty</span>
140
                    [% ELSIF av_description == '' %]
141
                        [% Location.from | html %] (<span>No description available</span>)
142
                    [% ELSE %]
143
                        [% av_description | html %]
144
                    [% END %]
145
                [% ELSE %]
146
                    <span>"Blank"</span>
147
                [% END %]
148
                <br />New value:
149
                [% IF Location.to %]
150
                    [% SET av_description = AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.location', authorised_value => Location.to ) %]
151
                    [% IF Location.to == '' %]
152
                        empty
153
                    [% ELSIF av_description == '' %]
154
                        [% Location.to | html %] (Not an authorized value)
155
                    [% ELSE %]
156
                        [% av_description | html %]
157
                    [% END %]
158
                [% ELSE %]
159
                    "Blank"
160
                [% END %]
161
            [% END %]
162
	    </p>
163
        [% END %]
131
    </ul>
164
    </ul>
132
165
133
[% END # /F ( has_modifications || warndeparture... %]
166
[% END # /F ( has_modifications || warndeparture... %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref (+17 lines)
Lines 640-645 Circulation: Link Here
640
            - "Note: PROC and CART are special values, for these locations the location and permanent_location can differ, in all other cases an update will affect both. Items in the CART location will be returned to their permanent location on checkout.<br/>"
640
            - "Note: PROC and CART are special values, for these locations the location and permanent_location can differ, in all other cases an update will affect both. Items in the CART location will be returned to their permanent location on checkout.<br/>"
641
            - "The special term _BLANK_ may be used on either side of a value pair to update or remove the location from items with no location assigned.<br/>"
641
            - "The special term _BLANK_ may be used on either side of a value pair to update or remove the location from items with no location assigned.<br/>"
642
            - "The special term _ALL_ is used on the left side of the colon (:) to affect all items, <strong>and overrides all other rules.</strong>"
642
            - "The special term _ALL_ is used on the left side of the colon (:) to affect all items, <strong>and overrides all other rules.</strong>"
643
        -
644
            - pref: UpdateItemLocationOnCheckout
645
              type: textarea
646
              syntax: text/x-yaml
647
              class: code
648
            - "This is a list of value pairs. The first value is followed immediately by colon space then the second value.<br/><br/>"
649
            - "Examples:<br/>"
650
            - "PROC: FIC - causes an item in the Processing Center location to be updated into the Fiction location on check out.<br/>"
651
            - "FIC: GEN - causes an item in the Fiction location to be updated into the General stacks location on check out.<br/>"
652
            - "_BLANK_: FIC - causes an item that has no location to be updated into the Fiction location on check out.<br/>"
653
            - "FIC: _BLANK_ - causes an item in location FIC to be updated to a blank location on check out.<br/>"
654
            - "_ALL_: FIC - causes all items to be updated into the Fiction location on check out.<br/>"
655
            - "PROC: _PERM_ - causes an item that is in the Processing Center to be updated to it's permanent location.<br/><br/>"
656
            - "General rule: if the location value on the left of the colon (:) matches the item's current location, it will be updated to match the location value on the right of the colon (:).<br/>"
657
            - "Note: PROC and CART are special values, for these locations the location and permanent_location can differ, in all other cases an update will affect both. Items in the CART location will be returned to their permanent location on checkout.<br/>"
658
            - "The special term _BLANK_ may be used on either side of a value pair to update or remove the location from items with no location assigned.<br/>"
659
            - "The special term _ALL_ is used on the left side of the colon (:) to affect all items, <strong>and overrides all other rules.</strong>"
643
        -
660
        -
644
            - pref: UpdateNotForLoanStatusOnCheckin
661
            - pref: UpdateNotForLoanStatusOnCheckin
645
              type: textarea
662
              type: textarea
(-)a/koha-tmpl/intranet-tmpl/prog/js/pages/preferences.js (-2 / +1 lines)
Lines 184-190 $( document ).ready( function () { Link Here
184
        document.location.hash = "jumped";
184
        document.location.hash = "jumped";
185
    }
185
    }
186
186
187
    $("#pref_UpdateItemLocationOnCheckin").change(function(){
187
    $("#pref_UpdateItemLocationOnCheckin, #pref_UpdateItemLocationOnCheckout").change(function(){
188
        var the_text = $(this).val();
188
        var the_text = $(this).val();
189
        var alert_text = '';
189
        var alert_text = '';
190
        if (the_text.indexOf('_ALL_:') != -1) alert_text = __("Note: _ALL_ value will override all other values") + '\n';
190
        if (the_text.indexOf('_ALL_:') != -1) alert_text = __("Note: _ALL_ value will override all other values") + '\n';
191
- 

Return to bug 21159