From aa3e89c5785a13a6af64f367cf22f35230e1e40d Mon Sep 17 00:00:00 2001 From: Claire Hernandez Date: Fri, 8 Apr 2011 12:11:50 +0200 Subject: [PATCH] [PATCH] BZ6070 On a new order defined from suggestion some fields were missing. (MT4937) The missing fields : publicationyear, place, collectiontitle. More the layout has been modified. --- acqui/neworderempty.pl | 5 ++- .../prog/en/modules/acqui/neworderempty.tmpl | 28 ++++++++++++++----- .../prog/en/modules/suggestion/suggestion.tmpl | 1 + 3 files changed, 24 insertions(+), 10 deletions(-) diff --git a/acqui/neworderempty.pl b/acqui/neworderempty.pl index 386dda7..d5cc98c 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,7 +377,7 @@ $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. diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl index 0eacf19..6ecee6e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl @@ -215,21 +215,33 @@ $(document).ready(function()
  • - Publisher: + Published by: " /> - + " />
  • + +  At: + " /> + + + " /> + + +
  • +
  • + - Publication year: +  On: " /> - - - " /> + + + " /> +
  • @@ -243,10 +255,10 @@ $(document).ready(function()
  • Series: - " /> + " /> - " /> + " />
  • diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tmpl index 3d7817e..24f20d5 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tmpl @@ -111,6 +111,7 @@ $(document).ready(function() { calcNewsuggTotal(); });
  • " />
  • "/>
  • "/>
  • +
  • " />
  • "/>
  • "/>
  • -- 1.7.1