@@ -, +, @@ --- acqui/addorder.pl | 2 + acqui/neworderempty.pl | 6 +- .../prog/en/modules/acqui/neworderempty.tt | 46 ++++++++++++++------ 3 files changed, 38 insertions(+), 16 deletions(-) --- a/acqui/addorder.pl +++ a/acqui/addorder.pl @@ -204,6 +204,8 @@ if ( $orderinfo->{quantity} ne '0' ) { "biblioitems.publishercode" => $$orderinfo{publishercode} ? $$orderinfo{publishercode} : "", "biblioitems.publicationyear" => $$orderinfo{publicationyear} ? $$orderinfo{publicationyear}: "", "biblio.copyrightdate" => $$orderinfo{publicationyear} ? $$orderinfo{publicationyear}: "", + "biblioitems.place" => $$orderinfo{place} ? $$orderinfo{place}: "", + "biblioitems.collectiontitle" => $$orderinfo{collectiontitle} ? $$orderinfo{collectiontitle}: "", "biblioitems.itemtype" => $$orderinfo{itemtype} ? $$orderinfo{itemtype} : "", }); --- a/acqui/neworderempty.pl +++ a/acqui/neworderempty.pl @@ -98,7 +98,7 @@ my $title = $input->param('title'); my $author = $input->param('author'); my $publicationyear = $input->param('publicationyear'); my $bookseller = GetBookSellerFromId($booksellerid); # FIXME: else ERROR! -my $ordernumber = $input->param('ordernumber') || ''; +my $ordernumber = $input->param('ordernumber') || ''; my $biblionumber = $input->param('biblionumber'); my $basketno = $input->param('basketno'); my $suggestionid = $input->param('suggestionid'); @@ -376,6 +376,7 @@ $template->param( isbn => $data->{'isbn'}, seriestitle => $data->{'seriestitle'}, itemtypeloop => \@itemtypes, + collectiontitle => $data->{'collectiontitle'}, quantity => $data->{'quantity'}, quantityrec => $data->{'quantity'}, rrp => $data->{'rrp'}, @@ -384,9 +385,8 @@ $template->param( ecost => $data->{'ecost'}, notes => $data->{'notes'}, publishercode => $data->{'publishercode'}, - + place => $data->{'place'}, import_batch_id => $import_batch_id, - # CHECKME: gst-stuff needs verifing, mason. gstrate => $bookseller->{'gstrate'} // C4::Context->preference("gist") // 0, gstreg => $bookseller->{'gstreg'}, --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt @@ -214,33 +214,44 @@ $(document).ready(function() [% END %]
  • - [% IF ( biblionumber ) %] - Publisher: - [% publishercode %] + [% IF ( biblionumber ) %] +  Copyright date: + [% publicationyear %] [% ELSE %] - - + + [% END %]
  • [% IF ( biblionumber ) %] - Publication year: - [% publicationyear %] + ISBN or ISSN or other standard number: + [% isbn %] [% ELSE %] - - + + [% END %]
  • +
  • [% IF ( biblionumber ) %] - ISBN: - [% isbn %] + Publisher: + [% publishercode %] [% ELSE %] - - + + [% END %]
  • + [% IF ( biblionumber ) %] +  Publication place: + [% place %] + [% ELSE %] + + + [% END %] + +
  • +
  • [% IF ( biblionumber ) %] Series: [% seriestitle %] @@ -266,6 +277,15 @@ $(document).ready(function()
  • [% END %] [% END %] +
  • + [% IF ( biblionumber ) %] + Collection title: + [% collectiontitle %] + [% ELSE %] + + + [% END %] +
  • [% IF ( items ) %] --