Bugzilla – Attachment 38130 Details for
Bug 11122
Fix display of publication year/copyrightdate and publishercode on various pages in acquisitions
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 11122 - publisher code and publication year not fetched in acq orders
Bug-11122---publisher-code-and-publication-year-no.patch (text/plain), 10.23 KB, created by
Mark Tompsett
on 2015-04-19 13:29:54 UTC
(
hide
)
Description:
Bug 11122 - publisher code and publication year not fetched in acq orders
Filename:
MIME Type:
Creator:
Mark Tompsett
Created:
2015-04-19 13:29:54 UTC
Size:
10.23 KB
patch
obsolete
>From 6683b5648cc5e64f7ccb0dcf2331097dbc77189c Mon Sep 17 00:00:00 2001 >From: Fridolyn SOMERS <fridolyn.somers@biblibre.com> >Date: Wed, 23 Oct 2013 12:05:23 +0200 >Subject: [PATCH] Bug 11122 - publisher code and publication year not fetched > in acq orders > >In acquisition, several templates try to display publisher code and publication year : invoice.tt, parcel.tt, transferorder.tt. >Thoses pages use C4::Acquisition methods GetPendingOrders or GetInvoiceDetails. >The bug is that in the SQL query of those methods, biblioitems.publishercode and biblioitems.publicationyear. >In uncertainprice.pl those datas are fetch using GetBiblioData. >It whould be better to fetch them in GetPendingOrders and GetInvoiceDetails. > >This patch changes SQL queries to fetch wanted datas : aqorders.*,biblio.title,biblio.author,biblioitems.isbn,biblioitems.publishercode,biblioitems.publicationyear. GetInvoiceDetails also needs : biblio.seriestitle,biblioitems.volume. >This patch also unifies the way biblio datas are displayed : > <a href="link to catalog using biblionumber">[title]</a> <em>by</em> [author] – [isbn] > <em>Publisher:</em> [publishercode], [publicationyear] > >Test plan : >- Choose a biblio record containing a data in : > biblio.title, > biblio.author, > biblioitems.isbn, > biblioitems.publishercode, > biblioitems.publicationyear, > biblio.seriestitle, > biblioitems.volume. >- Create an order using this biblio. >- Look at this order in pages : parcel.pl, transferorder.pl, uncertainprice.pl >=> You see publisher code and publication year >- Look at this order in page : invoice.pl >=> You see publisher code, publication year, series title and volume >--- > C4/Acquisition.pm | 3 +++ > acqui/uncertainprice.pl | 20 ++------------------ > .../intranet-tmpl/prog/en/modules/acqui/invoice.tt | 3 ++- > .../intranet-tmpl/prog/en/modules/acqui/parcel.tt | 10 ++++++++-- > .../prog/en/modules/acqui/transferorder.tt | 5 ++++- > .../prog/en/modules/acqui/uncertainprice.tt | 17 ++++++++++++----- > 6 files changed, 31 insertions(+), 27 deletions(-) > >diff --git a/C4/Acquisition.pm b/C4/Acquisition.pm >index 1b3047a..4ac90fb 100644 >--- a/C4/Acquisition.pm >+++ b/C4/Acquisition.pm >@@ -1670,6 +1670,8 @@ sub SearchOrders { > biblio.*, > biblioitems.isbn, > biblioitems.biblioitemnumber, >+ biblioitems.publishercode, >+ biblioitems.publicationyear, > aqbasket.authorisedby, > aqbasket.booksellerid, > aqbasket.closedate, >@@ -2570,6 +2572,7 @@ sub GetInvoiceDetails { > SELECT aqorders.*, > biblio.*, > biblio.copyrightdate, >+ biblioitems.isbn, > biblioitems.publishercode, > biblioitems.publicationyear, > aqbasket.basketname, >diff --git a/acqui/uncertainprice.pl b/acqui/uncertainprice.pl >index b53b7e7..184088c 100755 >--- a/acqui/uncertainprice.pl >+++ b/acqui/uncertainprice.pl >@@ -81,24 +81,8 @@ my $pendingorders = SearchOrders({ > basketno => $basketno, > pending => 1, > }); >-my @orders; >- >-foreach my $order (@{$pendingorders}) { >- if ( $order->{'uncertainprice'} ) { >- my $bibdata = &GetBiblioData($order->{'biblionumber'}); >- $order->{'bibisbn'} = $bibdata->{'isbn'}; >- $order->{'bibpublishercode'} = $bibdata->{'publishercode'}; >- $order->{'bibpublicationyear'} = $bibdata->{'publicationyear'}; >- $order->{'bibtitle'} = $bibdata->{'title'}; >- $order->{'bibauthor'} = $bibdata->{'author'}; >- $order->{'surname'} = $order->{'surname'}; >- $order->{'firstname'} = $order->{'firstname'}; >- my $order_as_from_db=GetOrder($order->{ordernumber}); >- $order->{'quantity'} = $order_as_from_db->{'quantity'}; >- $order->{'listprice'} = $order_as_from_db->{'listprice'}; >- push(@orders, $order); >- } >-} >+my @orders = grep { $_->{'uncertainprice'} } @$pendingorders; >+ > if ( $op eq 'validate' ) { > $template->param( validate => 1); > my $count = scalar(@orders); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt >index ce278d4..1429ac9 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt >@@ -147,10 +147,11 @@ > [% FOREACH order IN orders_loop %] > <tr> > <td> >- <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% order.biblionumber %]">[% order.title %]</a> >+ <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% order.biblionumber %]">[% order.title |html %]</a> > [% IF ( order.author ) %] > <br /><em>by</em> [% order.author %] > [% END %] >+ [% IF ( order.isbn ) %] – [% order.isbn %][% END %] > [% IF ( order.publishercode ) %] > <br/>[% order.publishercode %] > [% IF order.publicationyear > 0 %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt >index a244f5f..6be6470 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt >@@ -256,7 +256,10 @@ > <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% loop_order.biblionumber %]">[% loop_order.title |html %]</a> > [% IF ( loop_order.author ) %] by [% loop_order.author %][% END %] > [% IF ( loop_order.isbn ) %] – [% loop_order.isbn %][% END %] >- [% IF ( loop_order.publishercode ) %]<br />Publisher:[% loop_order.publishercode %][% END %] >+ [% IF ( loop_order.publishercode ) %] >+ <br />Publisher: [% loop_order.publishercode %] >+ [%- IF ( loop_order.publicationyear ) %], [% loop_order.publicationyear %][% END %] >+ [% END %] > [% IF ( loop_order.suggestionid ) %] > <br/> > Suggested by: [% loop_order.surnamesuggestedby %][% IF ( loop_order.firstnamesuggestedby ) %], [% loop_order.firstnamesuggestedby %] [% END %] >@@ -403,7 +406,10 @@ > <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% order.biblionumber %]">[% order.title |html %]</a> > [% IF ( order.author ) %] / [% order.author %][% END %] > [% IF ( order.isbn ) %] - [% order.isbn %][% END %] >- [% IF ( order.publishercode ) %]<br />Publisher :[% order.publishercode %][% END %] >+ [% IF ( order.publishercode ) %] >+ <br />Publisher: [% order.publishercode %] >+ [%- IF ( order.publicationyear ) %], [% order.publicationyear %][% END %] >+ [% END %] > [% IF ( order.suggestionid ) %] > <br/> > Suggested by: [% order.surnamesuggestedby %][% IF ( order.firstnamesuggestedby ) %], [% order.firstnamesuggestedby %] [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/transferorder.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/transferorder.tt >index 3671632..6949bed 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/transferorder.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/transferorder.tt >@@ -78,7 +78,10 @@ > <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% ordersloo.biblionumber %]">[% ordersloo.title |html %]</a> > [% IF ( ordersloo.author ) %] by [% ordersloo.author %][% END %] > [% IF ( ordersloo.isbn ) %] – [% ordersloo.isbn %][% END %] >- [% IF ( ordersloo.publishercode ) %]<br />Publisher :[% ordersloo.publishercode %][% END %] >+ [% IF ( ordersloo.publishercode ) %] >+ <br />Publisher: [% ordersloo.publishercode %] >+ [%- IF ( ordersloo.publicationyear ) %], [% ordersloo.publicationyear %][% END %] >+ [% END %] > </td> > <td><a href="transferorder.pl?bookselleridfrom=[% ordersloo.bookselleridfrom %]&ordernumber=[% ordersloo.ordernumber %]">Transfer</a></td> > </tr> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt >index a503f2b..fa27bb7 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt >@@ -109,11 +109,18 @@ function check(form) { > [% uncertainpriceorder.basketname %] > </td> > <td> >- [% uncertainpriceorder.bibtitle %] / [% uncertainpriceorder.bibauthor %] <br /> [% uncertainpriceorder.bibpublishercode %], [% uncertainpriceorder.bibpublicationyear %]<br />[% uncertainpriceorder.bibisbn %]<br /> >- <a href="neworderempty.pl?ordernumber=[% uncertainpriceorder.ordernumber %]&booksellerid=[% booksellerid %]&basketno=[% uncertainpriceorder.basketno %]"> >- edit >- </a> >- </td> >+ <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% uncertainpriceorder.biblionumber %]">[% uncertainpriceorder.title |html %]</a> >+ [% IF ( uncertainpriceorder.author ) %] <em>by</em> [% uncertainpriceorder.author %][% END %] >+ [% IF ( uncertainpriceorder.publishercode ) %] >+ <br /><em>Publisher:</em> [% uncertainpriceorder.publishercode %] >+ [%- IF ( uncertainpriceorder.publicationyear ) %], [% uncertainpriceorder.publicationyear %][% END %] >+ [% END %] >+ [% IF ( uncertainpriceorder.isbn ) %]<br />[% uncertainpriceorder.isbn %][% END %] >+ <br /> >+ <a href="neworderempty.pl?ordernumber=[% uncertainpriceorder.ordernumber %]&booksellerid=[% booksellerid %]&basketno=[% uncertainpriceorder.basketno %]"> >+ Edit >+ </a> >+ </td> > <td> > [% uncertainpriceorder.firstname %] [% uncertainpriceorder.surname %] > </td> >-- >1.9.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 11122
:
22306
|
23227
|
38130
|
38146
|
38667
|
44710
|
44711
|
44712
|
62935
|
62936
|
62937
|
63405
|
63406
|
63407
|
63538
|
63539
|
63540