Bugzilla – Attachment 4796 Details for
Bug 6070
On a new order defined from suggestion some fields were missing.
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
proposed patch (updated)
0001-BZ6070-On-a-new-order-defined-from-suggestion-some-f.patch (text/plain), 7.15 KB, created by
Paul Poulain
on 2011-08-01 14:52:13 UTC
(
hide
)
Description:
proposed patch (updated)
Filename:
MIME Type:
Creator:
Paul Poulain
Created:
2011-08-01 14:52:13 UTC
Size:
7.15 KB
patch
obsolete
>From b12b6fc56b4f4c9da7f85956870c9f2f52503253 Mon Sep 17 00:00:00 2001 >From: Paul Poulain <paul.poulain@biblibre.com> >Date: Mon, 1 Aug 2011 16:49:32 +0200 >Subject: [PATCH] BZ6070 On a new order defined from suggestion some fields were missing > >The missing fields : publicationyear, place, collectiontitle. >(MT4937) >--- > acqui/addorder.pl | 2 + > acqui/neworderempty.pl | 6 +- > .../prog/en/modules/acqui/neworderempty.tt | 46 ++++++++++++++------ > 3 files changed, 38 insertions(+), 16 deletions(-) > >diff --git a/acqui/addorder.pl b/acqui/addorder.pl >index e321d2c..7c13a47 100755 >--- a/acqui/addorder.pl >+++ b/acqui/addorder.pl >@@ -204,6 +204,8 @@ if ( $orderinfo->{quantity} ne '0' ) { > "biblioitems.publishercode" => $$orderinfo{publishercode} ? $$orderinfo{publishercode} : "", > "biblioitems.publicationyear" => $$orderinfo{publicationyear} ? $$orderinfo{publicationyear}: "", > "biblio.copyrightdate" => $$orderinfo{publicationyear} ? $$orderinfo{publicationyear}: "", >+ "biblioitems.place" => $$orderinfo{place} ? $$orderinfo{place}: "", >+ "biblioitems.collectiontitle" => $$orderinfo{collectiontitle} ? $$orderinfo{collectiontitle}: "", > "biblioitems.itemtype" => $$orderinfo{itemtype} ? $$orderinfo{itemtype} : "", > }); > >diff --git a/acqui/neworderempty.pl b/acqui/neworderempty.pl >index db3e852..7030d84 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'); >@@ -376,6 +376,7 @@ $template->param( > isbn => $data->{'isbn'}, > seriestitle => $data->{'seriestitle'}, > itemtypeloop => \@itemtypes, >+ collectiontitle => $data->{'collectiontitle'}, > quantity => $data->{'quantity'}, > quantityrec => $data->{'quantity'}, > rrp => $data->{'rrp'}, >@@ -384,9 +385,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 d6044fc..bdccb98 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt >@@ -214,33 +214,44 @@ $(document).ready(function() > [% END %] > </li> > <li> >- [% IF ( biblionumber ) %] >- <span class="label">Publisher: </span> >- <input type="hidden" size="50" name="publishercode" id="publishercode" value="[% publishercode %]" />[% publishercode %] >+ <span> [% IF ( biblionumber ) %] >+ <span class="label"> Copyright date: </span> >+ <input type="hidden" size="10" name="publicationyear" id="publicationyear" value="[% publicationyear %]" />[% publicationyear %] > [% ELSE %] >- <label for="publishercode"> Publisher: </label> >- <input type="text" size="50" name="publishercode" id="publishercode" value="[% publishercode %]" /> >+ <label for="publicationyear"> Copyright date: </label> >+ <input type="text" size="10" name="publicationyear" id="publicationyear" value="[% publicationyear %]" /> > [% END %] > </li> > <li> > [% IF ( biblionumber ) %] >- <span class="label">Publication year: </span> >- <input type="hidden" size="10" name="publicationyear" id="publicationyear" value="[% publicationyear %]" />[% publicationyear %] >+ <span class="label">ISBN or ISSN or other standard number: </span> >+ <input type="hidden" size="50" name="isbn" id="ISBN" value="[% isbn %]" />[% isbn %] > [% ELSE %] >- <label for="publicationyear">Publication year: </label> >- <input type="text" size="10" name="publicationyear" id="publicationyear" value="[% publicationyear %]" /> >+ <label for="ISBN">ISBN or ISSN or other standard number: </label> >+ <input type="text" size="50" name="isbn" id="ISBN" value="[% isbn %]" /> > [% END %] > </li> >+ > <li> > [% IF ( biblionumber ) %] >- <span class="label">ISBN: </span> >- <input type="hidden" size="50" name="isbn" id="ISBN" value="[% isbn %]" />[% isbn %] >+ <span class="label">Publisher: </span> >+ <input type="hidden" size="50" name="publishercode" id="publishercode" value="[% publishercode %]" />[% publishercode %] > [% ELSE %] >- <label for="ISBN">ISBN: </label> >- <input type="text" size="50" name="isbn" id="ISBN" value="[% isbn %]" /> >+ <label for="publishercode"> Publisher: </label> >+ <input type="text" size="50" name="publishercode" id="publishercode" value="[% publishercode %]" /> > [% END %] > </li> > <li> >+ <span>[% IF ( biblionumber ) %] >+ <span class="label"> Publication place: </span> >+ <input type="hidden" size="20" name="place" id="place" value="[% place %]" />[% place %] >+ [% ELSE %] >+ <label for="place"> Publication place: </label> >+ <input type="text" size="20" name="place" id="place" value="[% place %]" /> >+ [% END %] >+ </span> >+ </li> >+ <li> > [% IF ( biblionumber ) %] > <span class="label">Series: </span> > <input type="hidden" size="50" name="series" id="series" value="[% seriestitle %]" />[% seriestitle %] >@@ -266,6 +277,15 @@ $(document).ready(function() > </li> > [% END %] > [% END %] >+ <li> >+ [% IF ( biblionumber ) %] >+ <span class="label">Collection title: </span> >+ <input type="hidden" size="50" name="collectiontitle" id="collectiontitle" value="[% collectiontitle %]" />[% collectiontitle %] >+ [% ELSE %] >+ <label for="collectiontitle">Collection title: </label> >+ <input type="text" size="50" name="collectiontitle" id="collectiontitle" value="[% collectiontitle %]" /> >+ [% END %] >+ </li> > </ol> > </fieldset> > [% IF ( items ) %] >-- >1.7.4.1 >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 6070
:
3707
|
3830
|
4221
|
4222
|
4239
|
4796
|
17493
|
27015