Bugzilla – Attachment 16767 Details for
Bug 5343
Subscription cost (Link serial and acqui modules)
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
[PASSED QA] Bug 5343: It is not possible to add a subscription for another supplier
PASSED-QA-Bug-5343-It-is-not-possible-to-add-a-sub.patch (text/plain), 2.89 KB, created by
Katrin Fischer
on 2013-03-22 11:13:41 UTC
(
hide
)
Description:
[PASSED QA] Bug 5343: It is not possible to add a subscription for another supplier
Filename:
MIME Type:
Creator:
Katrin Fischer
Created:
2013-03-22 11:13:41 UTC
Size:
2.89 KB
patch
obsolete
>From a70a0a1c9ee3acda6c840450e8b01b5bdcd1ecfc Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@biblibre.com> >Date: Thu, 21 Mar 2013 15:16:09 +0100 >Subject: [PATCH] [PASSED QA] Bug 5343: It is not possible to add a > subscription for another supplier > >If a supplier is defined for a subscription, you cannot order this >subscription to another supplier. If no supplier is defined, you can. > >FIX: If a cancelled order is linked to a subscription, you can order it. > >Signed-off-by: Leila Arkab <koha.aixmarseille@gmail.com> >Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> >--- > C4/Serials.pm | 1 + > .../prog/en/modules/acqui/newordersubscription.tt | 5 +++-- > 2 files changed, 4 insertions(+), 2 deletions(-) > >diff --git a/C4/Serials.pm b/C4/Serials.pm >index 3492e09..b8b53ed 100644 >--- a/C4/Serials.pm >+++ b/C4/Serials.pm >@@ -2548,6 +2548,7 @@ sub subscriptionCurrentlyOnOrder { > SELECT COUNT(*) FROM aqorders > WHERE subscriptionid = ? > AND datereceived IS NULL >+ AND datecancellationprinted IS NULL > |; > my $sth = $dbh->prepare( $query ); > $sth->execute($subscriptionid); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt >index 4ca5e31..dd01d19 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt >@@ -22,7 +22,6 @@ > $(document).ready(function() { > $("#srlt").dataTable($.extend(true, {}, dataTablesDefaults, { > "aoColumnDefs": [ >- { "aTargets": [ -1 ], "bSortable": false, "bSearchable": false }, > [% IF (dateformat == 'metric') %] > { "aTargets": [ -2 ], "sType": "uk_date" }, > [% END %] >@@ -95,10 +94,12 @@ > <td> > [% IF (sub.alreadyOnOrder) %] > Outstanding order (only one order per subscription is allowed) >- [% ELSE %] >+ [% ELSIF not sub.aqbooksellerid || booksellerid == sub.aqbooksellerid%] > <a href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=[% booksellerid %]&basketno=[% basketno %]&biblionumber=[% sub.biblionumber %]&subscriptionid=[% sub.subscriptionid %]" title="Order this one"> > Order > </a> >+ [% ELSE %] >+ <a title="This subscription depends on another supplier" style="cursor:help">Not orderable</a> > [% END %] > </td> > </tr> >-- >1.7.9.5
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 5343
:
13010
|
13011
|
15840
|
16321
|
16482
|
16492
|
16510
|
16624
|
16625
|
16626
|
16641
|
16723
|
16724
|
16725
|
16726
|
16728
|
16733
|
16735
|
16736
|
16737
|
16738
|
16739
|
16748
|
16754
|
16762
|
16764
|
16765
|
16766
| 16767 |
16768
|
16769
|
16770