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

(-)a/C4/Circulation.pm (-8 / +4 lines)
Lines 1362-1375 sub AddIssue { Link Here
1362
                }
1362
                }
1363
              );
1363
              );
1364
1364
1365
        if ( $item->{'location'} eq 'CART' && $item->{'permanent_location'} ne 'CART'  ) {
1365
            if ( $item->{'location'} eq 'CART' && $item->{'permanent_location'} ne 'CART'  ) {
1366
        ## Item was moved to cart via UpdateItemLocationOnCheckin, anything issued should be taken off the cart.
1366
            ## Item was moved to cart via UpdateItemLocationOnCheckin, anything issued should be taken off the cart.
1367
            CartToShelf( $item->{'itemnumber'} );
1367
                CartToShelf( $item->{'itemnumber'} );
1368
        }
1368
            }
1369
        $item->{'issues'}++;
1370
        if ( C4::Context->preference('UpdateTotalIssuesOnCirc') ) {
1371
            UpdateTotalIssues($item->{'biblionumber'}, 1);
1372
        }
1373
1369
1374
            $item->{'issues'}++;
1370
            $item->{'issues'}++;
1375
            if ( C4::Context->preference('UpdateTotalIssuesOnCirc') ) {
1371
            if ( C4::Context->preference('UpdateTotalIssuesOnCirc') ) {
(-)a/C4/Items.pm (+1 lines)
Lines 635-640 sub ModItemTransfer { Link Here
635
    my ( $itemnumber, $frombranch, $tobranch ) = @_;
635
    my ( $itemnumber, $frombranch, $tobranch ) = @_;
636
636
637
    my $dbh = C4::Context->dbh;
637
    my $dbh = C4::Context->dbh;
638
    my $item = GetItem( $itemnumber );
638
639
639
    # Remove the 'shelving cart' location status if it is being used.
640
    # Remove the 'shelving cart' location status if it is being used.
640
    CartToShelf( $itemnumber ) if ( $item->{'location'} eq 'CART' && $item->{'permanent_location'} ne 'CART' );
641
    CartToShelf( $itemnumber ) if ( $item->{'location'} eq 'CART' && $item->{'permanent_location'} ne 'CART' );
(-)a/C4/Reserves.pm (+2 lines)
Lines 1279-1284 sub ModReserveStatus { Link Here
1279
    my $sth_set = $dbh->prepare($query);
1279
    my $sth_set = $dbh->prepare($query);
1280
    $sth_set->execute( $newstatus, $itemnumber );
1280
    $sth_set->execute( $newstatus, $itemnumber );
1281
1281
1282
    my $item = GetItem($itemnumber);
1282
    if ( ( $item->{'location'} eq 'CART' && $item->{'permanent_location'} ne 'CART'  ) && $newstatus ) {
1283
    if ( ( $item->{'location'} eq 'CART' && $item->{'permanent_location'} ne 'CART'  ) && $newstatus ) {
1283
      CartToShelf( $itemnumber );
1284
      CartToShelf( $itemnumber );
1284
    }
1285
    }
Lines 1355-1360 sub ModReserveAffect { Link Here
1355
1356
1356
    _FixPriority( { biblionumber => $biblionumber } );
1357
    _FixPriority( { biblionumber => $biblionumber } );
1357
1358
1359
    my $item = GetItem($itemnumber);
1358
    if ( ( $item->{'location'} eq 'CART' && $item->{'permanent_location'} ne 'CART'  ) ) {
1360
    if ( ( $item->{'location'} eq 'CART' && $item->{'permanent_location'} ne 'CART'  ) ) {
1359
        CartToShelf( $itemnumber );
1361
        CartToShelf( $itemnumber );
1360
    }
1362
    }
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt (+2 lines)
Lines 44-49 Link Here
44
    var MSG_SESSION_TIMED_OUT = _( "You need to log in again, your session has timed out" );
44
    var MSG_SESSION_TIMED_OUT = _( "You need to log in again, your session has timed out" );
45
    var MSG_DATA_NOT_SAVED = _( "Error; your data might not have been saved" );
45
    var MSG_DATA_NOT_SAVED = _( "Error; your data might not have been saved" );
46
    var MSG_LOADING = _( "Loading..." );
46
    var MSG_LOADING = _( "Loading..." );
47
    var MSG_ALL_VALUE_WARN = _("Note: _ALL_ value will override all other values");
48
    var MSG_UPD_LOC_FORMAT_WARN = _("The following values are not formatted correctly:");
47
49
48
//]]>
50
//]]>
49
</script>
51
</script>
(-)a/koha-tmpl/intranet-tmpl/prog/js/pages/preferences.js (-3 / +2 lines)
Lines 141-147 $( document ).ready( function () { Link Here
141
    $("#pref_UpdateItemLocationOnCheckin").change(function(){
141
    $("#pref_UpdateItemLocationOnCheckin").change(function(){
142
        var the_text = $(this).val();
142
        var the_text = $(this).val();
143
        var alert_text = '';
143
        var alert_text = '';
144
        if ( the_text.indexOf('_ALL_:') != -1 ) alert_text= _("Note: _ALL_ value will override all other values") + '\n';
144
        if ( the_text.indexOf('_ALL_:') != -1 ) alert_text = MSG_ALL_VALUE_WARN + '\n';
145
        var split_text  =the_text.split("\n");
145
        var split_text  =the_text.split("\n");
146
        var alert_issues = '';
146
        var alert_issues = '';
147
        var issue_count = 0;
147
        var issue_count = 0;
Lines 152-158 $( document ).ready( function () { Link Here
152
                issue_count++;
152
                issue_count++;
153
            }
153
            }
154
        }
154
        }
155
        if (issue_count) alert_text += "\n"+_("The following values are not formatted correctly:")+"\n"+alert_issues;
155
        if (issue_count) alert_text += "\n"+ MSG_UPD_LOC_FORMAT_WARN  +"\n"+alert_issues;
156
        if ( alert_text.length )  alert(alert_text);
156
        if ( alert_text.length )  alert(alert_text);
157
    });
157
    });
158
158
159
- 

Return to bug 14576