From 8bd36fcc624055e6775d5ea069a5343df87525b0 Mon Sep 17 00:00:00 2001 From: Paul Poulain Date: Wed, 29 Jun 2011 20:43:50 +0200 Subject: [PATCH] BZ6066 let's the librarian choose the itemtype when ordering For libraries with item-level_itype, the itemtype is in the item. For others, it's in the biblio and should be added with the title/author when it's ordered This patch adds the list when applicable,and build the biblio record accordingly (BibLibre MT5189) --- acqui/addorder.pl | 1 + acqui/neworderempty.pl | 3 +++ .../prog/en/modules/acqui/neworderempty.tt | 17 +++++++++++++++++ 3 files changed, 21 insertions(+), 0 deletions(-) diff --git a/acqui/addorder.pl b/acqui/addorder.pl index 44623ec..e321d2c 100755 --- a/acqui/addorder.pl +++ b/acqui/addorder.pl @@ -204,6 +204,7 @@ if ( $orderinfo->{quantity} ne '0' ) { "biblioitems.publishercode" => $$orderinfo{publishercode} ? $$orderinfo{publishercode} : "", "biblioitems.publicationyear" => $$orderinfo{publicationyear} ? $$orderinfo{publicationyear}: "", "biblio.copyrightdate" => $$orderinfo{publicationyear} ? $$orderinfo{publicationyear}: "", + "biblioitems.itemtype" => $$orderinfo{itemtype} ? $$orderinfo{itemtype} : "", }); # create the record in catalogue, with framework '' diff --git a/acqui/neworderempty.pl b/acqui/neworderempty.pl index 386dda7..f6f812a 100755 --- a/acqui/neworderempty.pl +++ b/acqui/neworderempty.pl @@ -324,6 +324,8 @@ if (C4::Context->preference('AcqCreateItem') eq 'ordering' && !$ordernumber) { $template->param(items => \@itemloop); } +# Get the item types list, but only if item_level_itype is YES. Otherwise, it will be in the item, no need to display it in the biblio +my @itemtypes = C4::ItemType->all unless C4::Context->preference('item-level_itypes'); # fill template $template->param( @@ -368,6 +370,7 @@ $template->param( budget_loop => $budget_loop, isbn => $data->{'isbn'}, seriestitle => $data->{'seriestitle'}, + itemtypeloop => \@itemtypes, quantity => $data->{'quantity'}, quantityrec => $data->{'quantity'}, rrp => $data->{'rrp'}, 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..dd15658 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt @@ -249,6 +249,23 @@ $(document).ready(function() [% END %] + + [% UNLESS ( biblionumber ) %] + [% IF ( itemtypeloop ) %] +
  • + Item type: + +
  • + [% END %] + [% END %] [% IF ( items ) %] -- 1.7.4.1