Attachment #35802 for bug #7957

View | Details | Raw Unified | Return to bug 7957
Collapse All | Expand All

Lines 25-30 use C4::Branch; Link Here

(-)a/acqui/newordersubscription.pl (-1 / +2 lines)
25	use C4::Context;	25	use C4::Context;
26	use C4::Output;	26	use C4::Output;
27	use C4::Serials;	27	use C4::Serials;
		28	use C4::Serials::RoutingLists qw( GetRoutingListsCount );
28		29
29	use Koha::Acquisition::Bookseller;	30	use Koha::Acquisition::Bookseller;
30		31
Lines 72-78 foreach my $sub (@subscriptions) { Link Here
72		73
73	# to toggle between create or edit routing list options	74	# to toggle between create or edit routing list options
74	if ($routing) {	75	if ($routing) {
75	$sub->{routingedit} = check_routing( $sub->{subscriptionid} );	76	$sub->{routingedit} = GetRoutingListsCount( $sub->{subscriptionid} );
76	}	77	}
77	}	78	}
78		79

Lines 129-135 if (@subscriptionid){ Link Here

(-)a/serials/serials-collection.pl (-1 / +1 lines)
129	my $numberpattern = C4::Serials::Numberpattern::GetSubscriptionNumberpattern($subs->{numberpattern});	129	my $numberpattern = C4::Serials::Numberpattern::GetSubscriptionNumberpattern($subs->{numberpattern});
130	$subs->{frequency} = $frequency;	130	$subs->{frequency} = $frequency;
131	$subs->{numberpattern} = $numberpattern;	131	$subs->{numberpattern} = $numberpattern;
132	$subs->{'hasRouting'} = check_routing($subscriptionid);	132	$subs->{'hasRouting'} = GetRoutingListsCount($subscriptionid);
133	push @$subscriptiondescs,$subs;	133	push @$subscriptiondescs,$subs;
134	my $tmpsubscription= GetFullSubscription($subscriptionid);	134	my $tmpsubscription= GetFullSubscription($subscriptionid);
135	@subscriptioninformation=(@$tmpsubscription,@subscriptioninformation);	135	@subscriptioninformation=(@$tmpsubscription,@subscriptioninformation);

Lines 73-78 use C4::Koha; Link Here

(-)a/serials/serials-recieve.pl (-1 / +2 lines)
73	use C4::Output;	73	use C4::Output;
74	use C4::Context;	74	use C4::Context;
75	use C4::Serials;	75	use C4::Serials;
		76	use C4::Serials::RoutingLists qw/GetRoutingListsCount/;
76	use C4::Branch; # GetBranches	77	use C4::Branch; # GetBranches
77		78
78	my $query = new CGI;	79	my $query = new CGI;
Lines 104-110 my $subscription=GetSubscription($subscriptionid); Link Here
104		105
105		106
106	my $auser = $subscription->{'librarian'}; # bob	107	my $auser = $subscription->{'librarian'}; # bob
107	my $routing = check_routing($subscriptionid); # to see if routing list exists	108	my $routing = GetRoutingListsCount($subscriptionid); # to see if routing list exists
108	my $manualdate ='';	109	my $manualdate ='';
109	my $manualissue ='';	110	my $manualissue ='';
110	my $manualstatus =0;	111	my $manualstatus =0;




use C4::Biblio;
use C4::Budgets;
use Koha::DateUtils;
use Test::More tests => 41;

BEGIN {
    use_ok('C4::Serials');


is(C4::Serials::getsupplierbyserialid(),undef, 'test getting supplier idea');

is(C4::Serials::check_routing(), undef, 'test checking route');

is(C4::Serials::addroutingmember(),undef, 'test adding route member');


# Unit tests for statuses management (Bug 11689)
$subscriptionid = NewSubscription(
- 

Return to bug 7957

Lines 15-21 use C4::Bookseller; Link Here

(-)a/t/db_dependent/Serials.t (-6 / +1 lines)
15	use C4::Biblio;	15	use C4::Biblio;
16	use C4::Budgets;	16	use C4::Budgets;
17	use Koha::DateUtils;	17	use Koha::DateUtils;
18	use Test::More tests => 43;	18	use Test::More tests => 41;
19		19
20	BEGIN {	20	BEGIN {
21	use_ok('C4::Serials');	21	use_ok('C4::Serials');
Lines 179-188 is(C4::Serials::updateClaim(),undef, 'test updating claim'); Link Here
179		179
180	is(C4::Serials::getsupplierbyserialid(),undef, 'test getting supplier idea');	180	is(C4::Serials::getsupplierbyserialid(),undef, 'test getting supplier idea');
181		181
182	is(C4::Serials::check_routing(), undef, 'test checking route');
183
184	is(C4::Serials::addroutingmember(),undef, 'test adding route member');
185
186		182
187	# Unit tests for statuses management (Bug 11689)	183	# Unit tests for statuses management (Bug 11689)
188	$subscriptionid = NewSubscription(	184	$subscriptionid = NewSubscription(
189	-