From 53a11dbea95bb82ba3834b089e059e591d5cb898 Mon Sep 17 00:00:00 2001 From: Katrin Fischer Date: Sun, 8 Aug 2010 17:23:55 +0200 Subject: [PATCH] Bug 5090: New order from empty record does not save publication year and ISBN - make publication year save for MARC21 - make ISBN save - fix small template issue with label for vendor note Signed-off-by: Galen Charlton --- acqui/addorder.pl | 5 +++-- acqui/neworderempty.pl | 2 +- .../prog/en/modules/acqui/neworderempty.tmpl | 8 ++++---- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/acqui/addorder.pl b/acqui/addorder.pl index 2ab5252bc6..94560c4eac 100755 --- a/acqui/addorder.pl +++ b/acqui/addorder.pl @@ -189,17 +189,18 @@ my $bibitemnum; if ( $orderinfo->{quantity} ne '0' ) { #TODO:check to see if biblio exists unless ( $$orderinfo{biblionumber} ) { - #if it doesnt create it my $record = TransformKohaToMarc( { "biblio.title" => "$$orderinfo{title}", - "biblio.author" => "$$orderinfo{author}", + "biblio.author" => $$orderinfo{author} ? $$orderinfo{author} : "", "biblio.seriestitle" => $$orderinfo{series} ? $$orderinfo{series} : "", "biblioitems.isbn" => $$orderinfo{isbn} ? $$orderinfo{isbn} : "", "biblioitems.publishercode" => $$orderinfo{publishercode} ? $$orderinfo{publishercode} : "", "biblioitems.publicationyear" => $$orderinfo{publicationyear} ? $$orderinfo{publicationyear}: "", + "biblio.copyrightdate" => $$orderinfo{publicationyear} ? $$orderinfo{publicationyear}: "", }); + # create the record in catalogue, with framework '' my ($biblionumber,$bibitemnum) = AddBiblio($record,''); # change suggestion status if applicable diff --git a/acqui/neworderempty.pl b/acqui/neworderempty.pl index a580ae778a..6c1045934e 100755 --- a/acqui/neworderempty.pl +++ b/acqui/neworderempty.pl @@ -340,7 +340,7 @@ $template->param( orderexists => ( $new eq 'yes' ) ? 0 : 1, title => $data->{'title'}, author => $data->{'author'}, - publicationyear => $data->{'publicationyear'}, + publicationyear => $data->{'publicationyear'} ? $data->{'publicationyear'} : $data->{'copyrightdate'}, budget_loop => $budget_loop, isbn => $data->{'isbn'}, seriestitle => $data->{'seriestitle'}, 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 603d517875..1534e7561c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl @@ -80,7 +80,7 @@ ff.submit(); Basket details
  1. Internal note:
  2. -
  3. Vendor note:
  4. +
  5. Vendor note:
  6. Contract number:
  7. Contract name: ">
  8. @@ -176,16 +176,16 @@ ff.submit();
  9. ISBN: - " /> + " /> - " /> + " />
  10. Series: - " /> + " /> " /> -- 2.39.5