@@ -, +, @@ some presets --- cataloguing/addbiblio.pl | 2 +- .../data/mysql/atomicupdate/bug_14957-marc-merge-rules.perl | 2 +- .../intranet-tmpl/prog/en/modules/admin/marc-merge-rules.tt | 10 +++++----- tools/batch_record_modification.pl | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) --- a/cataloguing/addbiblio.pl +++ a/cataloguing/addbiblio.pl @@ -835,7 +835,7 @@ if ( $op eq "addbiblio" ) { ModBiblio( $record, $biblionumber, $frameworkcode, { context => { source => $z3950 ? 'z39.50' : 'intranet', - category => $member->{'category_type'}, + categorycode => $member->categorycode, borrower => $loggedinuser } } --- a/installer/data/mysql/atomicupdate/bug_14957-marc-merge-rules.perl +++ a/installer/data/mysql/atomicupdate/bug_14957-marc-merge-rules.perl @@ -11,7 +11,7 @@ if( CheckVersion( $DBversion ) ) { $dbh->do( $sql ); $dbh->do( "INSERT IGNORE INTO `marc_merge_rules_modules` VALUES('source', 'source from where modification request was sent', 0);" ); - $dbh->do( "INSERT IGNORE INTO `marc_merge_rules_modules` VALUES('category', 'categorycode of user who requested modification', 1);" ); + $dbh->do( "INSERT IGNORE INTO `marc_merge_rules_modules` VALUES('categorycode', 'categorycode of user who requested modification', 1);" ); $dbh->do( "INSERT IGNORE INTO `marc_merge_rules_modules` VALUES('borrower', 'borrowernumber of user who requested modification', 2);" ); $sql = q{ --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc-merge-rules.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc-merge-rules.tt @@ -115,19 +115,19 @@ $(document).ready(function(){ 'remove': 1, 'delete': 1 }, - 'Protect existing': { + 'Add new': { 'add': 1, 'append': 0, 'remove': 0, 'delete': 0 }, - 'Add only': { + 'Add and append': { 'add': 1, 'append': 1, 'remove': 0, 'delete': 0 }, - 'Protect from delete': { + 'Protect from deletion': { 'add': 1, 'append': 1, 'remove': 1, @@ -269,7 +269,7 @@ $(document).ready(function(){