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

(-)a/C4/AuthoritiesMarc.pm (-1 / +1 lines)
Lines 1792-1798 sub merge { Link Here
1792
            $indexer->index_records( $biblio->biblionumber, "specialUpdate", "biblioserver" );
1792
            $indexer->index_records( $biblio->biblionumber, "specialUpdate", "biblioserver" );
1793
        }
1793
        }
1794
        next if !$update;
1794
        next if !$update;
1795
        ModBiblio( $marcrecord, $biblio->biblionumber, $biblio->frameworkcode, { disable_autolink => 1 } );
1795
        ModBiblio( $marcrecord, $biblio->biblionumber, $biblio->frameworkcode, { disable_autolink => 1, merge => 1 } );
1796
        $counteditedbiblio++;
1796
        $counteditedbiblio++;
1797
    }
1797
    }
1798
    return $counteditedbiblio;
1798
    return $counteditedbiblio;
(-)a/C4/Biblio.pm (-1 / +2 lines)
Lines 412-418 sub ModBiblio { Link Here
412
            $decoding_error = "There was an error with this bibliographic record: " . $exception;
412
            $decoding_error = "There was an error with this bibliographic record: " . $exception;
413
            $record         = $biblio->metadata->record_strip_nonxml;
413
            $record         = $biblio->metadata->record_strip_nonxml;
414
        }
414
        }
415
        logaction( "CATALOGUING", "MODIFY", $biblionumber, "biblio $decoding_error BEFORE=>" . $record->as_formatted );
415
        my $action = $options->{'merge'} ? 'MERGE' : 'MODIFY';
416
        logaction( "CATALOGUING", $action, $biblionumber, "biblio $decoding_error BEFORE=>" . $record->as_formatted );
416
    }
417
    }
417
418
418
    if ( !$options->{disable_autolink} && C4::Context->preference('AutoLinkBiblios') ) {
419
    if ( !$options->{disable_autolink} && C4::Context->preference('AutoLinkBiblios') ) {
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/action-logs.inc (+2 lines)
Lines 55-60 Link Here
55
        <span>Delete</span>
55
        <span>Delete</span>
56
    [% CASE 'MODIFY' %]
56
    [% CASE 'MODIFY' %]
57
        <span>Modify</span>
57
        <span>Modify</span>
58
    [% CASE 'MERGE' %]
59
        <span>Merge</span>
58
    [% CASE 'ISSUE' %]
60
    [% CASE 'ISSUE' %]
59
        <span>Checkout</span>
61
        <span>Checkout</span>
60
    [% CASE 'RETURN' %]
62
    [% CASE 'RETURN' %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt (-2 / +1 lines)
Lines 147-153 Link Here
147
                            <label for="actionALL" class="viewlog"><input type="checkbox" id="actionALL" name="actions" value="" /> All</label>
147
                            <label for="actionALL" class="viewlog"><input type="checkbox" id="actionALL" name="actions" value="" /> All</label>
148
                        [% END %]
148
                        [% END %]
149
149
150
                        [% FOREACH actx IN [ 'ADD' 'DELETE' 'MODIFY' 'ISSUE' 'RETURN' 'RENEW' 'CREATE' 'CANCEL' 'FILL' 'SUSPEND' 'RESUME' 'ADDCIRCMESSAGE' 'MODCIRCMESSAGE' 'DELCIRCMESSAGE' 'STATUS_CHANGE' 'PATRON_NOTICE' 'CHANGE PASS' 'RESET PASS' 'Run' 'End' 'EDIT_MAPPINGS' 'RESET_MAPPINGS' 'ADD_BASKET' 'MODIFY_BASKET' 'MODIFY_BASKET_HEADER' 'MODIFY_BASKET_USERS' 'CLOSE_BASKET' 'APPROVE_BASKET' 'REOPEN_BASKET' 'CANCEL_ORDER' 'CREATE_ORDER' 'MODIFY_ORDER' 'CREATE_INVOICE_ADJUSTMENT' 'UPDATE_INVOICE_ADJUSTMENT' 'DELETE_INVOICE_ADJUSTMENT' 'RECEIVE_ORDER' 'MODIFY_BUDGET' 'MODIFY_FUND' 'CREATE_FUND' 'DELETE_FUND' 'ACQUISITION CLAIM' 'ACQUISITION ORDER' 'OVERDUE' 'EXPIRE' 'CREATE_RESTRICTION' 'MODIFY_RESTRICTION' 'DELETE_RESTRICTION' 'MODIFY_CARDNUMBER' ] %]
150
                        [% FOREACH actx IN [ 'ADD' 'DELETE' 'MODIFY' 'MERGE' 'ISSUE' 'RETURN' 'RENEW' 'CREATE' 'CANCEL' 'FILL' 'SUSPEND' 'RESUME' 'ADDCIRCMESSAGE' 'MODCIRCMESSAGE' 'DELCIRCMESSAGE' 'STATUS_CHANGE' 'PATRON_NOTICE' 'CHANGE PASS' 'RESET PASS' 'Run' 'End' 'EDIT_MAPPINGS' 'RESET_MAPPINGS' 'ADD_BASKET' 'MODIFY_BASKET' 'MODIFY_BASKET_HEADER' 'MODIFY_BASKET_USERS' 'CLOSE_BASKET' 'APPROVE_BASKET' 'REOPEN_BASKET' 'CANCEL_ORDER' 'CREATE_ORDER' 'MODIFY_ORDER' 'CREATE_INVOICE_ADJUSTMENT' 'UPDATE_INVOICE_ADJUSTMENT' 'DELETE_INVOICE_ADJUSTMENT' 'RECEIVE_ORDER' 'MODIFY_BUDGET' 'MODIFY_FUND' 'CREATE_FUND' 'DELETE_FUND' 'ACQUISITION CLAIM' 'ACQUISITION ORDER' 'OVERDUE' 'EXPIRE' 'CREATE_RESTRICTION' 'MODIFY_RESTRICTION' 'DELETE_RESTRICTION' 'MODIFY_CARDNUMBER' ] %]
151
                            [% IF actions.grep(actx).size %]
151
                            [% IF actions.grep(actx).size %]
152
                                <label for="action[% actx| replace('\s+', '_') | html %]" class="viewlog"
152
                                <label for="action[% actx| replace('\s+', '_') | html %]" class="viewlog"
153
                                    ><input type="checkbox" id="action[% actx | replace('\s+', '_') | html %]" name="actions" value="[% actx | html %]" checked="checked" /> [% PROCESS translate_log_action action=actx %]</label
153
                                    ><input type="checkbox" id="action[% actx | replace('\s+', '_') | html %]" name="actions" value="[% actx | html %]" checked="checked" /> [% PROCESS translate_log_action action=actx %]</label
154
- 

Return to bug 39054