Attachment #113384 for bug #23971

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

Lines 27-32 use C4::Suggestions; Link Here

(-)a/C4/Acquisition.pm (-1 / +22 lines)
27	use C4::Biblio;	27	use C4::Biblio;
28	use C4::Contract;	28	use C4::Contract;
29	use C4::Debug;	29	use C4::Debug;
		30	use C4::Log qw(logaction);
30	use C4::Templates qw(gettemplate);	31	use C4::Templates qw(gettemplate);
31	use Koha::DateUtils qw( dt_from_string output_pref );	32	use Koha::DateUtils qw( dt_from_string output_pref );
32	use Koha::Acquisition::Baskets;	33	use Koha::Acquisition::Baskets;
Lines 203-208 sub NewBasket { Link Here
203	$basketbooksellernote \|\|= q{};	204	$basketbooksellernote \|\|= q{};
204	ModBasketHeader( $basket, $basketname, $basketnote, $basketbooksellernote,	205	ModBasketHeader( $basket, $basketname, $basketnote, $basketbooksellernote,
205	$basketcontractnumber, $booksellerid, $deliveryplace, $billingplace, $is_standing, $create_items );	206	$basketcontractnumber, $booksellerid, $deliveryplace, $billingplace, $is_standing, $create_items );
		207
		208	# Log the basket creation
		209	if (C4::Context->preference("AcqLog")) {
		210	logaction('ACQUISITIONS', 'ADD_BASKET', $basket);
		211	}
		212
206	return $basket;	213	return $basket;
207	}	214	}
208		215
Lines 500-505 sub ModBasket { Link Here
500	my $sth = $dbh->prepare($query);	507	my $sth = $dbh->prepare($query);
501	$sth->execute(@params);	508	$sth->execute(@params);
502		509
		510	# Log the basket update
		511	if (C4::Context->preference("AcqLog")) {
		512	my $infos = $basketinfo->{borrowernumber} ?
		513	sprintf("%010d", $basketinfo->{borrowernumber}) :
		514	undef;
		515	logaction(
		516	'ACQUISITIONS',
		517	'MODIFY_BASKET',
		518	$basketinfo->{'basketno'},
		519	$infos
		520	);
		521	}
		522
503	return;	523	return;
504	}	524	}
505		525
Lines 539-545 case the AcqCreateItem syspref takes precedence). Link Here
539	=cut	559	=cut
540		560
541	sub ModBasketHeader {	561	sub ModBasketHeader {
542	my ($basketno, $basketname, $note, $booksellernote, $contractnumber, $booksellerid, $deliveryplace, $billingplace, $is_standing, $create_items) = @_;	562	my ($basketno, $basketname, $note, $booksellernote, $contractnumber, $booksellerid, $deliveryplace, $billingplace, $is_standing, $create_items, $borrowernumber) = @_;
543		563
544	$is_standing \|\|= 0;	564	$is_standing \|\|= 0;
545	my $query = qq{	565	my $query = qq{
Lines 557-562 sub ModBasketHeader { Link Here
557	my $sth2 = $dbh->prepare($query2);	577	my $sth2 = $dbh->prepare($query2);
558	$sth2->execute($contractnumber,$basketno);	578	$sth2->execute($contractnumber,$basketno);
559	}	579	}
		580
560	return;	581	return;
561	}	582	}
562		583

Lines 217-222 sub BuildReport { Link Here

(-)a/C4/UsageStats.pm (+1 lines)
217	TagsEnabled	217	TagsEnabled
218	CalendarFirstDayOfWeek	218	CalendarFirstDayOfWeek
219	opaclanguagesdisplay	219	opaclanguagesdisplay
		220	AcqLog
220	AuthoritiesLog	221	AuthoritiesLog
221	BorrowersLog	222	BorrowersLog
222	CataloguingLog	223	CataloguingLog




use C4::Budgets;
use C4::Items;
use C4::Output;
use C4::Log qw(logaction);
use Koha::Acquisition::Currencies;
use Koha::Acquisition::Orders;
use C4::Barcodes;


}

if (C4::Context->preference("AcqLog") && $basketno) {
    logaction(
        'ACQUISITIONS',
        'MODIFY_BASKET',
        $basketno,
        sprintf("%010d", $loggedinuser)
    );
}

my $booksellerid=$$orderinfo{booksellerid};
if (my $import_batch_id=$$orderinfo{import_batch_id}) {
    print $input->redirect("/cgi-bin/koha/acqui/addorderiso2709.pl?import_batch_id=$import_batch_id&basketno=$basketno&booksellerid=$booksellerid");




                            closed => 1,
                            });
            ModBasket( { basketno => $basketno,
                         basketgroupid => $basketgroupid,
                         borrowernumber => $loggedinuser } );
            print $query->redirect('/cgi-bin/koha/acqui/basketgroup.pl?booksellerid='.$booksellerid.'&closed=1');
        } else {
            print $query->redirect('/cgi-bin/koha/acqui/booksellers.pl?booksellerid=' . $booksellerid);

    $branch = undef if(defined $branch and $branch eq '');
    ModBasket({
        basketno => $basket->{basketno},
        branch   => $branch,
        borrowernumber => $loggedinuser
    });
    print $query->redirect("/cgi-bin/koha/acqui/basket.pl?basketno=$basketno");
    exit;

            );
            ModBasket(
                {
                    basketno       => $basketno,
                    basketgroupid  => $basketgroupid,
                    borrowernumber => $loggedinuser
                }
            );
            print $query->redirect(

Lines 307-313 if ( $op eq "add" ) { Link Here

(-)a/acqui/basketgroup.pl (-1 / +2 lines)
307	my $basketno=$input->param('basketno');	307	my $basketno=$input->param('basketno');
308	my $basketgroupid=$input->param('basketgroupid');	308	my $basketgroupid=$input->param('basketgroupid');
309	ModBasket( { basketno => $basketno,	309	ModBasket( { basketno => $basketno,
310	basketgroupid => $basketgroupid } );	310	basketgroupid => $basketgroupid,
		311	borrowernumber => $loggedinuser } );
311	print $input->redirect("basket.pl?basketno=" . $basketno);	312	print $input->redirect("basket.pl?basketno=" . $basketno);
312	} elsif ( $op eq 'closeandprint') {	313	} elsif ( $op eq 'closeandprint') {
313	#	314	#

Lines 153-159 if ( $op eq 'add_form' ) { Link Here

(-)a/acqui/basketheader.pl (-1 / +2 lines)
153	scalar $input->param('deliveryplace'),	153	scalar $input->param('deliveryplace'),
154	scalar $input->param('billingplace'),	154	scalar $input->param('billingplace'),
155	scalar $input->param('is_standing') ? 1 : undef,	155	scalar $input->param('is_standing') ? 1 : undef,
156	scalar $input->param('create_items')	156	scalar $input->param('create_items'),
		157	$loggedinuser
157	);	158	);
158	} else { #New basket	159	} else { #New basket
159	$basketno = NewBasket(	160	$basketno = NewBasket(

Line 0 Link Here

(-)a/installer/data/mysql/atomicupdate/bug_23971_AcqLog_pref.perl (+7 lines)
	1	$DBversion = 'XXX'; # will be replaced by the RM
	2	if( CheckVersion( $DBversion ) ) {
	3	$dbh->do( q\| INSERT IGNORE INTO systempreferences (variable, value, explanation, options, type) VALUES ('AcqLog', '0', 'If enabled, log acquisition activity', '', 'YesNo'); \| );
	4
	5	SetVersion( $DBversion );
	6	print "Upgrade to $DBversion done (Bug 23971 - Add AcqLog syspref)\n";
	7	}

Lines 276-281 INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` Link Here

(-)a/installer/data/mysql/mandatory/sysprefs.sql (+1 lines)
276	('IntranetUserJS','','70\|10','Custom javascript for inclusion in Intranet','Textarea'),	276	('IntranetUserJS','','70\|10','Custom javascript for inclusion in Intranet','Textarea'),
277	('intranet_includes','includes',NULL,'The includes directory you want for specific look of Koha (includes or includes_npl for example)','Free'),	277	('intranet_includes','includes',NULL,'The includes directory you want for specific look of Koha (includes or includes_npl for example)','Free'),
278	('ISBD','#100\|\|{ 100a }{ 100b }{ 100c }{ 100d }{ 110a }{ 110b }{ 110c }{ 110d }{ 110e }{ 110f }{ 110g }{ 130a }{ 130d }{ 130f }{ 130g }{ 130h }{ 130k }{ 130l }{ 130m }{ 130n }{ 130o }{ 130p }{ 130r }{ 130s }{ 130t }\|<br/><br/>\r\n#245\|\|{ 245a }{ 245b }{245f }{ 245g }{ 245k }{ 245n }{ 245p }{ 245s }{ 245h }\|\r\n#246\|\|{ : 246i }{ 246a }{ 246b }{ 246f }{ 246g }{ 246n }{ 246p }{ 246h }\|\r\n#242\|\|{ = 242a }{ 242b }{ 242n }{ 242p }{ 242h }\|\r\n#245\|\|{ 245c }\|\r\n#242\|\|{ = 242c }\|\r\n#250\| - \|{ 250a }{ 250b }\|\r\n#254\|, \|{ 254a }\|\r\n#255\|, \|{ 255a }{ 255b }{ 255c }{ 255d }{ 255e }{ 255f }{ 255g }\|\r\n#256\|, \|{ 256a }\|\r\n#257\|, \|{ 257a }\|\r\n#258\|, \|{ 258a }{ 258b }\|\r\n#260\| - \|{ 260a }{ 260b }{ 260c }\|\r\n#300\| - \|{ 300a }{ 300b }{ 300c }{ 300d }{ 300e }{ 300f }{ 300g }\|\r\n#306\| - \|{ 306a }\|\r\n#307\| - \|{ 307a }{ 307b }\|\r\n#310\| - \|{ 310a }{ 310b }\|\r\n#321\| - \|{ 321a }{ 321b }\|\r\n#340\| - \|{ 3403 }{ 340a }{ 340b }{ 340c }{ 340d }{ 340e }{ 340f }{ 340h }{ 340i }\|\r\n#342\| - \|{ 342a }{ 342b }{ 342c }{ 342d }{ 342e }{ 342f }{ 342g }{ 342h }{ 342i }{ 342j }{ 342k }{ 342l }{ 342m }{ 342n }{ 342o }{ 342p }{ 342q }{ 342r }{ 342s }{ 342t }{ 342u }{ 342v }{ 342w }\|\r\n#343\| - \|{ 343a }{ 343b }{ 343c }{ 343d }{ 343e }{ 343f }{ 343g }{ 343h }{ 343i }\|\r\n#351\| - \|{ 3513 }{ 351a }{ 351b }{ 351c }\|\r\n#352\| - \|{ 352a }{ 352b }{ 352c }{ 352d }{ 352e }{ 352f }{ 352g }{ 352i }{ 352q }\|\r\n#362\| - \|{ 362a }{ 351z }\|\r\n#440\| - \|{ 440a }{ 440n }{ 440p }{ 440v }{ 440x }\|.\r\n#490\| - \|{ 490a }{ 490v }{ 490x }\|.\r\n#800\| - \|{ 800a }{ 800b }{ 800c }{ 800d }{ 800e }{ 800f }{ 800g }{ 800h }{ 800j }{ 800k }{ 800l }{ 800m }{ 800n }{ 800o }{ 800p }{ 800q }{ 800r }{ 800s }{ 800t }{ 800u }{ 800v }\|.\r\n#810\| - \|{ 810a }{ 810b }{ 810c }{ 810d }{ 810e }{ 810f }{ 810g }{ 810h }{ 810k }{ 810l }{ 810m }{ 810n }{ 810o }{ 810p }{ 810r }{ 810s }{ 810t }{ 810u }{ 810v }\|.\r\n#811\| - \|{ 811a }{ 811c }{ 811d }{ 811e }{ 811f }{ 811g }{ 811h }{ 811k }{ 811l }{ 811n }{ 811p }{ 811q }{ 811s }{ 811t }{ 811u }{ 811v }\|.\r\n#830\| - \|{ 830a }{ 830d }{ 830f }{ 830g }{ 830h }{ 830k }{ 830l }{ 830m }{ 830n }{ 830o }{ 830p }{ 830r }{ 830s }{ 830t }{ 830v }\|.\r\n#500\|<br/><br/>\|{ 5003 }{ 500a }\|\r\n#501\|<br/><br/>\|{ 501a }\|\r\n#502\|<br/><br/>\|{ 502a }\|\r\n#504\|<br/><br/>\|{ 504a }\|\r\n#505\|<br/><br/>\|{ 505a }{ 505t }{ 505r }{ 505g }{ 505u }\|\r\n#506\|<br/><br/>\|{ 5063 }{ 506a }{ 506b }{ 506c }{ 506d }{ 506u }\|\r\n#507\|<br/><br/>\|{ 507a }{ 507b }\|\r\n#508\|<br/><br/>\|{ 508a }{ 508a }\|\r\n#510\|<br/><br/>\|{ 5103 }{ 510a }{ 510x }{ 510c }{ 510b }\|\r\n#511\|<br/><br/>\|{ 511a }\|\r\n#513\|<br/><br/>\|{ 513a }{513b }\|\r\n#514\|<br/><br/>\|{ 514z }{ 514a }{ 514b }{ 514c }{ 514d }{ 514e }{ 514f }{ 514g }{ 514h }{ 514i }{ 514j }{ 514k }{ 514m }{ 514u }\|\r\n#515\|<br/><br/>\|{ 515a }\|\r\n#516\|<br/><br/>\|{ 516a }\|\r\n#518\|<br/><br/>\|{ 5183 }{ 518a }\|\r\n#520\|<br/><br/>\|{ 5203 }{ 520a }{ 520b }{ 520u }\|\r\n#521\|<br/><br/>\|{ 5213 }{ 521a }{ 521b }\|\r\n#522\|<br/><br/>\|{ 522a }\|\r\n#524\|<br/><br/>\|{ 524a }\|\r\n#525\|<br/><br/>\|{ 525a }\|\r\n#526\|<br/><br/>\|{\\n510i }{\\n510a }{ 510b }{ 510c }{ 510d }{\\n510x }\|\r\n#530\|<br/><br/>\|{\\n5063 }{\\n506a }{ 506b }{ 506c }{ 506d }{\\n506u }\|\r\n#533\|<br/><br/>\|{\\n5333 }{\\n533a }{\\n533b }{\\n533c }{\\n533d }{\\n533e }{\\n533f }{\\n533m }{\\n533n }\|\r\n#534\|<br/><br/>\|{\\n533p }{\\n533a }{\\n533b }{\\n533c }{\\n533d }{\\n533e }{\\n533f }{\\n533m }{\\n533n }{\\n533t }{\\n533x }{\\n533z }\|\r\n#535\|<br/><br/>\|{\\n5353 }{\\n535a }{\\n535b }{\\n535c }{\\n535d }\|\r\n#538\|<br/><br/>\|{\\n5383 }{\\n538a }{\\n538i }{\\n538u }\|\r\n#540\|<br/><br/>\|{\\n5403 }{\\n540a }{ 540b }{ 540c }{ 540d }{\\n520u }\|\r\n#544\|<br/><br/>\|{\\n5443 }{\\n544a }{\\n544b }{\\n544c }{\\n544d }{\\n544e }{\\n544n }\|\r\n#545\|<br/><br/>\|{\\n545a }{ 545b }{\\n545u }\|\r\n#546\|<br/><br/>\|{\\n5463 }{\\n546a }{ 546b }\|\r\n#547\|<br/><br/>\|{\\n547a }\|\r\n#550\|<br/><br/>\|{ 550a }\|\r\n#552\|<br/><br/>\|{ 552z }{ 552a }{ 552b }{ 552c }{ 552d }{ 552e }{ 552f }{ 552g }{ 552h }{ 552i }{ 552j }{ 552k }{ 552l }{ 552m }{ 552n }{ 562o }{ 552p }{ 552u }\|\r\n#555\|<br/><br/>\|{ 5553 }{ 555a }{ 555b }{ 555c }{ 555d }{ 555u }\|\r\n#556\|<br/><br/>\|{ 556a }{ 506z }\|\r\n#563\|<br/><br/>\|{ 5633 }{ 563a }{ 563u }\|\r\n#565\|<br/><br/>\|{ 5653 }{ 565a }{ 565b }{ 565c }{ 565d }{ 565e }\|\r\n#567\|<br/><br/>\|{ 567a }\|\r\n#580\|<br/><br/>\|{ 580a }\|\r\n#581\|<br/><br/>\|{ 5633 }{ 581a }{ 581z }\|\r\n#584\|<br/><br/>\|{ 5843 }{ 584a }{ 584b }\|\r\n#585\|<br/><br/>\|{ 5853 }{ 585a }\|\r\n#586\|<br/><br/>\|{ 5863 }{ 586a }\|\r\n#020\|<br/><br/><label>ISBN: </label>\|{ 020a }{ 020c }\|\r\n#022\|<br/><br/><label>ISSN: </label>\|{ 022a }\|\r\n#222\| = \|{ 222a }{ 222b }\|\r\n#210\| = \|{ 210a }{ 210b }\|\r\n#024\|<br/><br/><label>Standard No.: </label>\|{ 024a }{ 024c }{ 024d }{ 0242 }\|\r\n#027\|<br/><br/><label>Standard Tech. Report. No.: </label>\|{ 027a }\|\r\n#028\|<br/><br/><label>Publisher. No.: </label>\|{ 028a }{ 028b }\|\r\n#013\|<br/><br/><label>Patent No.: </label>\|{ 013a }{ 013b }{ 013c }{ 013d }{ 013e }{ 013f }\|\r\n#030\|<br/><br/><label>CODEN: </label>\|{ 030a }\|\r\n#037\|<br/><br/><label>Source: </label>\|{ 037a }{ 037b }{ 037c }{ 037f }{ 037g }{ 037n }\|\r\n#010\|<br/><br/><label>LCCN: </label>\|{ 010a }\|\r\n#015\|<br/><br/><label>Nat. Bib. No.: </label>\|{ 015a }{ 0152 }\|\r\n#016\|<br/><br/><label>Nat. Bib. Agency Control No.: </label>\|{ 016a }{ 0162 }\|\r\n#600\|<br/><br/><label>Subjects--Personal Names: </label>\|{\\n6003 }{\\n600a}{ 600b }{ 600c }{ 600d }{ 600e }{ 600f }{ 600g }{ 600h }{--600k}{ 600l }{ 600m }{ 600n }{ 600o }{--600p}{ 600r }{ 600s }{ 600t }{ 600u }{--600x}{--600z}{--600y}{--600v}\|\r\n#610\|<br/><br/><label>Subjects--Corporate Names: </label>\|{\\n6103 }{\\n610a}{ 610b }{ 610c }{ 610d }{ 610e }{ 610f }{ 610g }{ 610h }{--610k}{ 610l }{ 610m }{ 610n }{ 610o }{--610p}{ 610r }{ 610s }{ 610t }{ 610u }{--610x}{--610z}{--610y}{--610v}\|\r\n#611\|<br/><br/><label>Subjects--Meeting Names: </label>\|{\\n6113 }{\\n611a}{ 611b }{ 611c }{ 611d }{ 611e }{ 611f }{ 611g }{ 611h }{--611k}{ 611l }{ 611m }{ 611n }{ 611o }{--611p}{ 611r }{ 611s }{ 611t }{ 611u }{--611x}{--611z}{--611y}{--611v}\|\r\n#630\|<br/><br/><label>Subjects--Uniform Titles: </label>\|{\\n630a}{ 630b }{ 630c }{ 630d }{ 630e }{ 630f }{ 630g }{ 630h }{--630k }{ 630l }{ 630m }{ 630n }{ 630o }{--630p}{ 630r }{ 630s }{ 630t }{--630x}{--630z}{--630y}{--630v}\|\r\n#648\|<br/><br/><label>Subjects--Chronological Terms: </label>\|{\\n6483 }{\\n648a }{--648x}{--648z}{--648y}{--648v}\|\r\n#650\|<br/><br/><label>Subjects--Topical Terms: </label>\|{\\n6503 }{\\n650a}{ 650b }{ 650c }{ 650d }{ 650e }{--650x}{--650z}{--650y}{--650v}\|\r\n#651\|<br/><br/><label>Subjects--Geographic Terms: </label>\|{\\n6513 }{\\n651a}{ 651b }{ 651c }{ 651d }{ 651e }{--651x}{--651z}{--651y}{--651v}\|\r\n#653\|<br/><br/><label>Subjects--Index Terms: </label>\|{ 653a }\|\r\n#654\|<br/><br/><label>Subjects--Facted Index Terms: </label>\|{\\n6543 }{\\n654a}{--654b}{--654x}{--654z}{--654y}{--654v}\|\r\n#655\|<br/><br/><label>Index Terms--Genre/Form: </label>\|{\\n6553 }{\\n655a}{--655b}{--655x }{--655z}{--655y}{--655v}\|\r\n#656\|<br/><br/><label>Index Terms--Occupation: </label>\|{\\n6563 }{\\n656a}{--656k}{--656x}{--656z}{--656y}{--656v}\|\r\n#657\|<br/><br/><label>Index Terms--Function: </label>\|{\\n6573 }{\\n657a}{--657x}{--657z}{--657y}{--657v}\|\r\n#658\|<br/><br/><label>Index Terms--Curriculum Objective: </label>\|{\\n658a}{--658b}{--658c}{--658d}{--658v}\|\r\n#050\|<br/><br/><label>LC Class. No.: </label>\|{ 050a }{ / 050b }\|\r\n#082\|<br/><br/><label>Dewey Class. No.: </label>\|{ 082a }{ / 082b }\|\r\n#080\|<br/><br/><label>Universal Decimal Class. No.: </label>\|{ 080a }{ 080x }{ / 080b }\|\r\n#070\|<br/><br/><label>National Agricultural Library Call No.: </label>\|{ 070a }{ / 070b }\|\r\n#060\|<br/><br/><label>National Library of Medicine Call No.: </label>\|{ 060a }{ / 060b }\|\r\n#074\|<br/><br/><label>GPO Item No.: </label>\|{ 074a }\|\r\n#086\|<br/><br/><label>Gov. Doc. Class. No.: </label>\|{ 086a }\|\r\n#088\|<br/><br/><label>Report. No.: </label>\|{ 088a }\|','70\|10','ISBD','Textarea'),	278	('ISBD','#100\|\|{ 100a }{ 100b }{ 100c }{ 100d }{ 110a }{ 110b }{ 110c }{ 110d }{ 110e }{ 110f }{ 110g }{ 130a }{ 130d }{ 130f }{ 130g }{ 130h }{ 130k }{ 130l }{ 130m }{ 130n }{ 130o }{ 130p }{ 130r }{ 130s }{ 130t }\|<br/><br/>\r\n#245\|\|{ 245a }{ 245b }{245f }{ 245g }{ 245k }{ 245n }{ 245p }{ 245s }{ 245h }\|\r\n#246\|\|{ : 246i }{ 246a }{ 246b }{ 246f }{ 246g }{ 246n }{ 246p }{ 246h }\|\r\n#242\|\|{ = 242a }{ 242b }{ 242n }{ 242p }{ 242h }\|\r\n#245\|\|{ 245c }\|\r\n#242\|\|{ = 242c }\|\r\n#250\| - \|{ 250a }{ 250b }\|\r\n#254\|, \|{ 254a }\|\r\n#255\|, \|{ 255a }{ 255b }{ 255c }{ 255d }{ 255e }{ 255f }{ 255g }\|\r\n#256\|, \|{ 256a }\|\r\n#257\|, \|{ 257a }\|\r\n#258\|, \|{ 258a }{ 258b }\|\r\n#260\| - \|{ 260a }{ 260b }{ 260c }\|\r\n#300\| - \|{ 300a }{ 300b }{ 300c }{ 300d }{ 300e }{ 300f }{ 300g }\|\r\n#306\| - \|{ 306a }\|\r\n#307\| - \|{ 307a }{ 307b }\|\r\n#310\| - \|{ 310a }{ 310b }\|\r\n#321\| - \|{ 321a }{ 321b }\|\r\n#340\| - \|{ 3403 }{ 340a }{ 340b }{ 340c }{ 340d }{ 340e }{ 340f }{ 340h }{ 340i }\|\r\n#342\| - \|{ 342a }{ 342b }{ 342c }{ 342d }{ 342e }{ 342f }{ 342g }{ 342h }{ 342i }{ 342j }{ 342k }{ 342l }{ 342m }{ 342n }{ 342o }{ 342p }{ 342q }{ 342r }{ 342s }{ 342t }{ 342u }{ 342v }{ 342w }\|\r\n#343\| - \|{ 343a }{ 343b }{ 343c }{ 343d }{ 343e }{ 343f }{ 343g }{ 343h }{ 343i }\|\r\n#351\| - \|{ 3513 }{ 351a }{ 351b }{ 351c }\|\r\n#352\| - \|{ 352a }{ 352b }{ 352c }{ 352d }{ 352e }{ 352f }{ 352g }{ 352i }{ 352q }\|\r\n#362\| - \|{ 362a }{ 351z }\|\r\n#440\| - \|{ 440a }{ 440n }{ 440p }{ 440v }{ 440x }\|.\r\n#490\| - \|{ 490a }{ 490v }{ 490x }\|.\r\n#800\| - \|{ 800a }{ 800b }{ 800c }{ 800d }{ 800e }{ 800f }{ 800g }{ 800h }{ 800j }{ 800k }{ 800l }{ 800m }{ 800n }{ 800o }{ 800p }{ 800q }{ 800r }{ 800s }{ 800t }{ 800u }{ 800v }\|.\r\n#810\| - \|{ 810a }{ 810b }{ 810c }{ 810d }{ 810e }{ 810f }{ 810g }{ 810h }{ 810k }{ 810l }{ 810m }{ 810n }{ 810o }{ 810p }{ 810r }{ 810s }{ 810t }{ 810u }{ 810v }\|.\r\n#811\| - \|{ 811a }{ 811c }{ 811d }{ 811e }{ 811f }{ 811g }{ 811h }{ 811k }{ 811l }{ 811n }{ 811p }{ 811q }{ 811s }{ 811t }{ 811u }{ 811v }\|.\r\n#830\| - \|{ 830a }{ 830d }{ 830f }{ 830g }{ 830h }{ 830k }{ 830l }{ 830m }{ 830n }{ 830o }{ 830p }{ 830r }{ 830s }{ 830t }{ 830v }\|.\r\n#500\|<br/><br/>\|{ 5003 }{ 500a }\|\r\n#501\|<br/><br/>\|{ 501a }\|\r\n#502\|<br/><br/>\|{ 502a }\|\r\n#504\|<br/><br/>\|{ 504a }\|\r\n#505\|<br/><br/>\|{ 505a }{ 505t }{ 505r }{ 505g }{ 505u }\|\r\n#506\|<br/><br/>\|{ 5063 }{ 506a }{ 506b }{ 506c }{ 506d }{ 506u }\|\r\n#507\|<br/><br/>\|{ 507a }{ 507b }\|\r\n#508\|<br/><br/>\|{ 508a }{ 508a }\|\r\n#510\|<br/><br/>\|{ 5103 }{ 510a }{ 510x }{ 510c }{ 510b }\|\r\n#511\|<br/><br/>\|{ 511a }\|\r\n#513\|<br/><br/>\|{ 513a }{513b }\|\r\n#514\|<br/><br/>\|{ 514z }{ 514a }{ 514b }{ 514c }{ 514d }{ 514e }{ 514f }{ 514g }{ 514h }{ 514i }{ 514j }{ 514k }{ 514m }{ 514u }\|\r\n#515\|<br/><br/>\|{ 515a }\|\r\n#516\|<br/><br/>\|{ 516a }\|\r\n#518\|<br/><br/>\|{ 5183 }{ 518a }\|\r\n#520\|<br/><br/>\|{ 5203 }{ 520a }{ 520b }{ 520u }\|\r\n#521\|<br/><br/>\|{ 5213 }{ 521a }{ 521b }\|\r\n#522\|<br/><br/>\|{ 522a }\|\r\n#524\|<br/><br/>\|{ 524a }\|\r\n#525\|<br/><br/>\|{ 525a }\|\r\n#526\|<br/><br/>\|{\\n510i }{\\n510a }{ 510b }{ 510c }{ 510d }{\\n510x }\|\r\n#530\|<br/><br/>\|{\\n5063 }{\\n506a }{ 506b }{ 506c }{ 506d }{\\n506u }\|\r\n#533\|<br/><br/>\|{\\n5333 }{\\n533a }{\\n533b }{\\n533c }{\\n533d }{\\n533e }{\\n533f }{\\n533m }{\\n533n }\|\r\n#534\|<br/><br/>\|{\\n533p }{\\n533a }{\\n533b }{\\n533c }{\\n533d }{\\n533e }{\\n533f }{\\n533m }{\\n533n }{\\n533t }{\\n533x }{\\n533z }\|\r\n#535\|<br/><br/>\|{\\n5353 }{\\n535a }{\\n535b }{\\n535c }{\\n535d }\|\r\n#538\|<br/><br/>\|{\\n5383 }{\\n538a }{\\n538i }{\\n538u }\|\r\n#540\|<br/><br/>\|{\\n5403 }{\\n540a }{ 540b }{ 540c }{ 540d }{\\n520u }\|\r\n#544\|<br/><br/>\|{\\n5443 }{\\n544a }{\\n544b }{\\n544c }{\\n544d }{\\n544e }{\\n544n }\|\r\n#545\|<br/><br/>\|{\\n545a }{ 545b }{\\n545u }\|\r\n#546\|<br/><br/>\|{\\n5463 }{\\n546a }{ 546b }\|\r\n#547\|<br/><br/>\|{\\n547a }\|\r\n#550\|<br/><br/>\|{ 550a }\|\r\n#552\|<br/><br/>\|{ 552z }{ 552a }{ 552b }{ 552c }{ 552d }{ 552e }{ 552f }{ 552g }{ 552h }{ 552i }{ 552j }{ 552k }{ 552l }{ 552m }{ 552n }{ 562o }{ 552p }{ 552u }\|\r\n#555\|<br/><br/>\|{ 5553 }{ 555a }{ 555b }{ 555c }{ 555d }{ 555u }\|\r\n#556\|<br/><br/>\|{ 556a }{ 506z }\|\r\n#563\|<br/><br/>\|{ 5633 }{ 563a }{ 563u }\|\r\n#565\|<br/><br/>\|{ 5653 }{ 565a }{ 565b }{ 565c }{ 565d }{ 565e }\|\r\n#567\|<br/><br/>\|{ 567a }\|\r\n#580\|<br/><br/>\|{ 580a }\|\r\n#581\|<br/><br/>\|{ 5633 }{ 581a }{ 581z }\|\r\n#584\|<br/><br/>\|{ 5843 }{ 584a }{ 584b }\|\r\n#585\|<br/><br/>\|{ 5853 }{ 585a }\|\r\n#586\|<br/><br/>\|{ 5863 }{ 586a }\|\r\n#020\|<br/><br/><label>ISBN: </label>\|{ 020a }{ 020c }\|\r\n#022\|<br/><br/><label>ISSN: </label>\|{ 022a }\|\r\n#222\| = \|{ 222a }{ 222b }\|\r\n#210\| = \|{ 210a }{ 210b }\|\r\n#024\|<br/><br/><label>Standard No.: </label>\|{ 024a }{ 024c }{ 024d }{ 0242 }\|\r\n#027\|<br/><br/><label>Standard Tech. Report. No.: </label>\|{ 027a }\|\r\n#028\|<br/><br/><label>Publisher. No.: </label>\|{ 028a }{ 028b }\|\r\n#013\|<br/><br/><label>Patent No.: </label>\|{ 013a }{ 013b }{ 013c }{ 013d }{ 013e }{ 013f }\|\r\n#030\|<br/><br/><label>CODEN: </label>\|{ 030a }\|\r\n#037\|<br/><br/><label>Source: </label>\|{ 037a }{ 037b }{ 037c }{ 037f }{ 037g }{ 037n }\|\r\n#010\|<br/><br/><label>LCCN: </label>\|{ 010a }\|\r\n#015\|<br/><br/><label>Nat. Bib. No.: </label>\|{ 015a }{ 0152 }\|\r\n#016\|<br/><br/><label>Nat. Bib. Agency Control No.: </label>\|{ 016a }{ 0162 }\|\r\n#600\|<br/><br/><label>Subjects--Personal Names: </label>\|{\\n6003 }{\\n600a}{ 600b }{ 600c }{ 600d }{ 600e }{ 600f }{ 600g }{ 600h }{--600k}{ 600l }{ 600m }{ 600n }{ 600o }{--600p}{ 600r }{ 600s }{ 600t }{ 600u }{--600x}{--600z}{--600y}{--600v}\|\r\n#610\|<br/><br/><label>Subjects--Corporate Names: </label>\|{\\n6103 }{\\n610a}{ 610b }{ 610c }{ 610d }{ 610e }{ 610f }{ 610g }{ 610h }{--610k}{ 610l }{ 610m }{ 610n }{ 610o }{--610p}{ 610r }{ 610s }{ 610t }{ 610u }{--610x}{--610z}{--610y}{--610v}\|\r\n#611\|<br/><br/><label>Subjects--Meeting Names: </label>\|{\\n6113 }{\\n611a}{ 611b }{ 611c }{ 611d }{ 611e }{ 611f }{ 611g }{ 611h }{--611k}{ 611l }{ 611m }{ 611n }{ 611o }{--611p}{ 611r }{ 611s }{ 611t }{ 611u }{--611x}{--611z}{--611y}{--611v}\|\r\n#630\|<br/><br/><label>Subjects--Uniform Titles: </label>\|{\\n630a}{ 630b }{ 630c }{ 630d }{ 630e }{ 630f }{ 630g }{ 630h }{--630k }{ 630l }{ 630m }{ 630n }{ 630o }{--630p}{ 630r }{ 630s }{ 630t }{--630x}{--630z}{--630y}{--630v}\|\r\n#648\|<br/><br/><label>Subjects--Chronological Terms: </label>\|{\\n6483 }{\\n648a }{--648x}{--648z}{--648y}{--648v}\|\r\n#650\|<br/><br/><label>Subjects--Topical Terms: </label>\|{\\n6503 }{\\n650a}{ 650b }{ 650c }{ 650d }{ 650e }{--650x}{--650z}{--650y}{--650v}\|\r\n#651\|<br/><br/><label>Subjects--Geographic Terms: </label>\|{\\n6513 }{\\n651a}{ 651b }{ 651c }{ 651d }{ 651e }{--651x}{--651z}{--651y}{--651v}\|\r\n#653\|<br/><br/><label>Subjects--Index Terms: </label>\|{ 653a }\|\r\n#654\|<br/><br/><label>Subjects--Facted Index Terms: </label>\|{\\n6543 }{\\n654a}{--654b}{--654x}{--654z}{--654y}{--654v}\|\r\n#655\|<br/><br/><label>Index Terms--Genre/Form: </label>\|{\\n6553 }{\\n655a}{--655b}{--655x }{--655z}{--655y}{--655v}\|\r\n#656\|<br/><br/><label>Index Terms--Occupation: </label>\|{\\n6563 }{\\n656a}{--656k}{--656x}{--656z}{--656y}{--656v}\|\r\n#657\|<br/><br/><label>Index Terms--Function: </label>\|{\\n6573 }{\\n657a}{--657x}{--657z}{--657y}{--657v}\|\r\n#658\|<br/><br/><label>Index Terms--Curriculum Objective: </label>\|{\\n658a}{--658b}{--658c}{--658d}{--658v}\|\r\n#050\|<br/><br/><label>LC Class. No.: </label>\|{ 050a }{ / 050b }\|\r\n#082\|<br/><br/><label>Dewey Class. No.: </label>\|{ 082a }{ / 082b }\|\r\n#080\|<br/><br/><label>Universal Decimal Class. No.: </label>\|{ 080a }{ 080x }{ / 080b }\|\r\n#070\|<br/><br/><label>National Agricultural Library Call No.: </label>\|{ 070a }{ / 070b }\|\r\n#060\|<br/><br/><label>National Library of Medicine Call No.: </label>\|{ 060a }{ / 060b }\|\r\n#074\|<br/><br/><label>GPO Item No.: </label>\|{ 074a }\|\r\n#086\|<br/><br/><label>Gov. Doc. Class. No.: </label>\|{ 086a }\|\r\n#088\|<br/><br/><label>Report. No.: </label>\|{ 088a }\|','70\|10','ISBD','Textarea'),
		279	('AcqLog','0',NULL,'If ON, log acquisitions activity','YesNo'),
279	('IssueLog','1',NULL,'If ON, log checkout activity','YesNo'),	280	('IssueLog','1',NULL,'If ON, log checkout activity','YesNo'),
280	('IssueLostItem','alert','Defines what should be done when an attempt is made to issue an item that has been marked as lost.','alert\|confirm\|nothing','Choice'),	281	('IssueLostItem','alert','Defines what should be done when an attempt is made to issue an item that has been marked as lost.','alert\|confirm\|nothing','Choice'),
281	('IssuingInProcess','0',NULL,'If ON, disables fines if the patron is issuing item that accumulate debt','YesNo'),	282	('IssuingInProcess','0',NULL,'If ON, disables fines if the patron is issuing item that accumulate debt','YesNo'),

Lines 42-47 Logging: Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/logs.pref (+6 lines)
42	on: Log	42	on: Log
43	off: "Don't log"	43	off: "Don't log"
44	- when changes to ILL requests take place.	44	- when changes to ILL requests take place.
		45	-
		46	- pref: AcqLog
		47	choices:
		48	on: Log
		49	off: "Don't log"
		50	- when acquisitions actions take place
45	-	51	-
46	- pref: IssueLog	52	- pref: IssueLog
47	choices:	53	choices:

Lines 115-120 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt (-2 / +5 lines)
115	[% CASE 'ADDCIRCMESSAGE' %]Add circulation message	115	[% CASE 'ADDCIRCMESSAGE' %]Add circulation message
116	[% CASE 'DELCIRCMESSAGE' %]Delete circulation message	116	[% CASE 'DELCIRCMESSAGE' %]Delete circulation message
117	[% CASE 'STATUS_CHANGE' %]Change ILL request status	117	[% CASE 'STATUS_CHANGE' %]Change ILL request status
		118	[% CASE 'ADD_BASKET' %]Create an acquisitions basket
		119	[% CASE 'MODIFY_BASKET' %]Modify an acquisitions basket
		120	[% CASE 'CLOSE_BASKET' %]Close an acquisitions basket
		121	[% CASE 'APPROVE_BASKET' %]Approve an acquisitions basket
118	[% CASE 'Run' %]Run	122	[% CASE 'Run' %]Run
119	[% CASE %][% action \| html %]	123	[% CASE %][% action \| html %]
120	[% END %]	124	[% END %]
Lines 189-195 Link Here
189	<label for="actionALL" class="viewlog"><input type="checkbox" id="actionALL" name="actions" value=""> All</label>	193	<label for="actionALL" class="viewlog"><input type="checkbox" id="actionALL" name="actions" value=""> All</label>
190	[% END %]	194	[% END %]
191		195
192	[% FOREACH actx IN [ 'ADD' 'DELETE' 'MODIFY' 'ISSUE' 'RETURN' 'RENEW' 'CREATE' 'CANCEL' 'SUSPEND' 'RESUME' 'ADDCIRCMESSAGE' 'DELCIRCMESSAGE' 'STATUS_CHANGE' 'CHANGE PASS' 'Run' ] %]	196	[% FOREACH actx IN [ 'ADD' 'DELETE' 'MODIFY' 'ISSUE' 'RETURN' 'RENEW' 'CREATE' 'CANCEL' 'SUSPEND' 'RESUME' 'ADDCIRCMESSAGE' 'DELCIRCMESSAGE' 'STATUS_CHANGE' 'CHANGE PASS' 'Run' 'ADD_BASKET' 'MODIFY_BASKET' 'CLOSE_BASKET' 'APPROVE_BASKET' ] %]
193	[% IF actions.grep(actx).size %]	197	[% IF actions.grep(actx).size %]
194	<label for="action[% actx\| replace('\s+', '_') \| html %]" class="viewlog"><input type="checkbox" id="action[% actx \| replace('\s+', '_') \| html %]" name="actions" value="[% actx \| html %]" checked="checked"> [% PROCESS translate_log_action action=actx %]</label>	198	<label for="action[% actx\| replace('\s+', '_') \| html %]" class="viewlog"><input type="checkbox" id="action[% actx \| replace('\s+', '_') \| html %]" name="actions" value="[% actx \| html %]" checked="checked"> [% PROCESS translate_log_action action=actx %]</label>
195	[% ELSE %]	199	[% ELSE %]
196	-

Return to bug 23971

Lines 126-131 use C4::Biblio; # AddBiblio TransformKohaToMarc Link Here

(-)a/acqui/addorder.pl (+10 lines)
126	use C4::Budgets;	126	use C4::Budgets;
127	use C4::Items;	127	use C4::Items;
128	use C4::Output;	128	use C4::Output;
		129	use C4::Log qw(logaction);
129	use Koha::Acquisition::Currencies;	130	use Koha::Acquisition::Currencies;
130	use Koha::Acquisition::Orders;	131	use Koha::Acquisition::Orders;
131	use C4::Barcodes;	132	use C4::Barcodes;
Lines 360-365 if ( $basket->{is_standing} \|\| $orderinfo->{quantity} ne '0' ) { Link Here
360		361
361	}	362	}
362		363
		364	if (C4::Context->preference("AcqLog") && $basketno) {
		365	logaction(
		366	'ACQUISITIONS',
		367	'MODIFY_BASKET',
		368	$basketno,
		369	sprintf("%010d", $loggedinuser)
		370	);
		371	}
		372
363	my $booksellerid=$$orderinfo{booksellerid};	373	my $booksellerid=$$orderinfo{booksellerid};
364	if (my $import_batch_id=$$orderinfo{import_batch_id}) {	374	if (my $import_batch_id=$$orderinfo{import_batch_id}) {
365	print $input->redirect("/cgi-bin/koha/acqui/addorderiso2709.pl?import_batch_id=$import_batch_id&basketno=$basketno&booksellerid=$booksellerid");	375	print $input->redirect("/cgi-bin/koha/acqui/addorderiso2709.pl?import_batch_id=$import_batch_id&basketno=$basketno&booksellerid=$booksellerid");

Lines 210-216 if ( $op eq 'delete_confirm' ) { Link Here

(-)a/acqui/basket.pl (-4 / +7 lines)
210	closed => 1,	210	closed => 1,
211	});	211	});
212	ModBasket( { basketno => $basketno,	212	ModBasket( { basketno => $basketno,
213	basketgroupid => $basketgroupid } );	213	basketgroupid => $basketgroupid,
		214	borrowernumber => $loggedinuser } );
214	print $query->redirect('/cgi-bin/koha/acqui/basketgroup.pl?booksellerid='.$booksellerid.'&closed=1');	215	print $query->redirect('/cgi-bin/koha/acqui/basketgroup.pl?booksellerid='.$booksellerid.'&closed=1');
215	} else {	216	} else {
216	print $query->redirect('/cgi-bin/koha/acqui/booksellers.pl?booksellerid=' . $booksellerid);	217	print $query->redirect('/cgi-bin/koha/acqui/booksellers.pl?booksellerid=' . $booksellerid);
Lines 243-249 elsif ( $op eq 'ediorder' ) { Link Here
243	$branch = undef if(defined $branch and $branch eq '');	244	$branch = undef if(defined $branch and $branch eq '');
244	ModBasket({	245	ModBasket({
245	basketno => $basket->{basketno},	246	basketno => $basket->{basketno},
246	branch => $branch	247	branch => $branch,
		248	borrowernumber => $loggedinuser
247	});	249	});
248	print $query->redirect("/cgi-bin/koha/acqui/basket.pl?basketno=$basketno");	250	print $query->redirect("/cgi-bin/koha/acqui/basket.pl?basketno=$basketno");
249	exit;	251	exit;
Lines 558-565 sub edi_close_and_order { Link Here
558	);	560	);
559	ModBasket(	561	ModBasket(
560	{	562	{
561	basketno => $basketno,	563	basketno => $basketno,
562	basketgroupid => $basketgroupid	564	basketgroupid => $basketgroupid,
		565	borrowernumber => $loggedinuser
563	}	566	}
564	);	567	);
565	print $query->redirect(	568	print $query->redirect(