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

(-)a/C4/Circulation.pm (-8 / +4 lines)
Lines 1385-1398 sub AddIssue { Link Here
1385
                }
1385
                }
1386
              );
1386
              );
1387
1387
1388
        if ( $item->{'location'} eq 'CART' && $item->{'permanent_location'} ne 'CART'  ) {
1388
            if ( $item->{'location'} eq 'CART' && $item->{'permanent_location'} ne 'CART'  ) {
1389
        ## Item was moved to cart via UpdateItemLocationOnCheckin, anything issued should be taken off the cart.
1389
            ## Item was moved to cart via UpdateItemLocationOnCheckin, anything issued should be taken off the cart.
1390
            CartToShelf( $item->{'itemnumber'} );
1390
                CartToShelf( $item->{'itemnumber'} );
1391
        }
1391
            }
1392
        $item->{'issues'}++;
1393
        if ( C4::Context->preference('UpdateTotalIssuesOnCirc') ) {
1394
            UpdateTotalIssues($item->{'biblionumber'}, 1);
1395
        }
1396
1392
1397
            $item->{'issues'}++;
1393
            $item->{'issues'}++;
1398
            if ( C4::Context->preference('UpdateTotalIssuesOnCirc') ) {
1394
            if ( C4::Context->preference('UpdateTotalIssuesOnCirc') ) {
(-)a/C4/Items.pm (+1 lines)
Lines 625-630 sub ModItemTransfer { Link Here
625
    my ( $itemnumber, $frombranch, $tobranch ) = @_;
625
    my ( $itemnumber, $frombranch, $tobranch ) = @_;
626
626
627
    my $dbh = C4::Context->dbh;
627
    my $dbh = C4::Context->dbh;
628
    my $item = GetItem( $itemnumber );
628
629
629
    # Remove the 'shelving cart' location status if it is being used.
630
    # Remove the 'shelving cart' location status if it is being used.
630
    CartToShelf( $itemnumber ) if ( $item->{'location'} eq 'CART' && $item->{'permanent_location'} ne 'CART' );
631
    CartToShelf( $itemnumber ) if ( $item->{'location'} eq 'CART' && $item->{'permanent_location'} ne 'CART' );
(-)a/C4/Reserves.pm (+2 lines)
Lines 1275-1280 sub ModReserveStatus { Link Here
1275
    my $sth_set = $dbh->prepare($query);
1275
    my $sth_set = $dbh->prepare($query);
1276
    $sth_set->execute( $newstatus, $itemnumber );
1276
    $sth_set->execute( $newstatus, $itemnumber );
1277
1277
1278
    my $item = GetItem($itemnumber);
1278
    if ( ( $item->{'location'} eq 'CART' && $item->{'permanent_location'} ne 'CART'  ) && $newstatus ) {
1279
    if ( ( $item->{'location'} eq 'CART' && $item->{'permanent_location'} ne 'CART'  ) && $newstatus ) {
1279
      CartToShelf( $itemnumber );
1280
      CartToShelf( $itemnumber );
1280
    }
1281
    }
Lines 1350-1355 sub ModReserveAffect { Link Here
1350
      if ( !$transferToDo && !$already_on_shelf );
1351
      if ( !$transferToDo && !$already_on_shelf );
1351
1352
1352
    _FixPriority( { biblionumber => $biblionumber } );
1353
    _FixPriority( { biblionumber => $biblionumber } );
1354
    my $item = GetItem($itemnumber);
1353
    if ( ( $item->{'location'} eq 'CART' && $item->{'permanent_location'} ne 'CART'  ) ) {
1355
    if ( ( $item->{'location'} eq 'CART' && $item->{'permanent_location'} ne 'CART'  ) ) {
1354
      CartToShelf( $itemnumber );
1356
      CartToShelf( $itemnumber );
1355
    }
1357
    }
(-)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