Ive tested this and it works fine, Galen, want me to sign off on it? Chris
* Katrin Fischer ([email protected]) wrote: > - make publication year save for MARC21 > - make ISBN save > - fix small template issue with label for vendor note > --- > 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 2ab5252..94560c4 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 a580ae7..6c10459 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 603d517..1534e75 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(); > <legend>Basket details</legend> > <ol> > <!-- TMPL_IF NAME="basketnote" --><li><span class="label">Internal > note:</span> <!-- TMPL_VAR NAME="basketnote" --></li><!-- /TMPL_IF --> > - <!-- TMPL_IF NAME="basketbooksellernote" --><li><span > class="label">Vendor note</span>: <!-- TMPL_VAR NAME="basketbooksellernote" > --></li><!-- /TMPL_IF --> > + <!-- TMPL_IF NAME="basketbooksellernote" --><li><span > class="label">Vendor note:</span> <!-- TMPL_VAR NAME="basketbooksellernote" > --></li><!-- /TMPL_IF --> > <!-- TMPL_IF NAME="basketcontractno" --> > <li><span class="label">Contract number: </span><!-- TMPL_VAR > NAME="basketcontractno" --></li> > <li><span class="label">Contract name:</span> <a > href="/cgi-bin/koha/admin/aqcontract.pl?op=add_form&contractnumber=<!-- > TMPL_VAR NAME="basketcontractno" -->"><!-- TMPL_VAR NAME="basketcontractname" > --></a></li> > @@ -176,16 +176,16 @@ ff.submit(); > <li> > <!-- TMPL_IF name="biblionumber" --> > <span class="label">ISBN: </span> > - <input type="hidden" size="20" name="ISBN" id="ISBN" > value="<!-- TMPL_VAR NAME="isbn" -->" /><!-- TMPL_VAR NAME="isbn" --> > + <input type="hidden" size="20" name="isbn" id="ISBN" > value="<!-- TMPL_VAR NAME="isbn" -->" /><!-- TMPL_VAR NAME="isbn" --> > <!-- TMPL_ELSE --> > <label for="ISBN">ISBN: </label> > - <input type="text" size="20" name="ISBN" id="ISBN" > value="<!-- TMPL_VAR NAME="isbn" -->" /> > + <input type="text" size="20" name="isbn" id="ISBN" > value="<!-- TMPL_VAR NAME="isbn" -->" /> > <!-- /TMPL_IF --> > </li> > <li> > <!-- TMPL_IF name="biblionumber" --> > <span class="label">Series: </span> > - <input type="hidden" size="20" name="series" id="series" > value="<!-- TMPL_VAR NAME="seriestitle" -->" /><span class="title"><!-- > TMPL_VAR NAME="seriestitle" --></span> > + <input type="hidden" size="20" name="series" id="series" > value="<!-- TMPL_VAR NAME="seriestitle" -->" /><!-- TMPL_VAR > NAME="seriestitle" --> > <!-- TMPL_ELSE --> > <label for="series">Series: </label> > <input type="text" size="20" name="series" id="series" > value="<!-- TMPL_VAR NAME="seriestitle" -->" /> > -- > 1.6.3.3 > > _______________________________________________ > Koha-patches mailing list > [email protected] > http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-patches -- Chris Cormack Catalyst IT Ltd. +64 4 803 2238 PO Box 11-053, Manners St, Wellington 6142, New Zealand
signature.asc
Description: Digital signature
_______________________________________________ Koha-patches mailing list [email protected] http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-patches
