From 7aa55a83711d2fad211989e92ed8886402465187 Mon Sep 17 00:00:00 2001 From: Paul Poulain Date: Mon, 23 May 2011 10:11:56 +0200 Subject: [PATCH] BZ6070 On a new order defined from suggestion some fields were missing The missing fields : publicationyear, place, collectiontitle. (MT4937) --- acqui/neworderempty.pl | 6 ++-- .../prog/en/modules/acqui/neworderempty.tt | 29 ++++++++++++++++--- 2 files changed, 27 insertions(+), 8 deletions(-) diff --git a/acqui/neworderempty.pl b/acqui/neworderempty.pl index 386dda7..15a29e1 100755 --- a/acqui/neworderempty.pl +++ b/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'); @@ -368,6 +368,7 @@ $template->param( budget_loop => $budget_loop, isbn => $data->{'isbn'}, seriestitle => $data->{'seriestitle'}, + collectiontitle => $data->{'collectiontitle'}, quantity => $data->{'quantity'}, quantityrec => $data->{'quantity'}, rrp => $data->{'rrp'}, @@ -376,9 +377,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'}, diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt index d6c8459..72ca68d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt @@ -215,19 +215,29 @@ $(document).ready(function()
  • [% IF ( biblionumber ) %] - Publisher: + Published by: [% publishercode %] [% ELSE %] - + [% END %]
  • - [% IF ( biblionumber ) %] - Publication year: + [% IF ( biblionumber ) %] +  At: + " />[% place %] + [% ELSE %] + + + [% END %] + +
  • +
  • + [% IF ( biblionumber ) %] +  On: [% publicationyear %] [% ELSE %] - + [% END %]
  • @@ -249,6 +259,15 @@ $(document).ready(function() [% END %] +
  • + [% IF ( biblionumber ) %] + Collection: + [% collectiontitle %] + [% ELSE %] + + + [% END %] +
  • [% IF ( items ) %] -- 1.7.4.1