From acaf92e24cc674c483c81677373a191b68dec91b Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Tue, 5 Nov 2013 15:30:27 +0100 Subject: [PATCH] Bug 10855: FIX conflicts with bug 7688 --- t/db_dependent/AdditionalField.t | 34 +++++++++++++++++++++------------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/t/db_dependent/AdditionalField.t b/t/db_dependent/AdditionalField.t index f7f5227..861c15a 100644 --- a/t/db_dependent/AdditionalField.t +++ b/t/db_dependent/AdditionalField.t @@ -104,6 +104,8 @@ use C4::Acquisition; use C4::Biblio; use C4::Budgets; use C4::Serials; +use C4::Serials::Frequency; +use C4::Serials::Numberpattern; my $booksellerid = C4::Bookseller::AddBookseller( { @@ -118,7 +120,7 @@ my ($biblionumber, $biblioitemnumber) = AddBiblio(MARC::Record->new, ''); my $budgetid; my $bpid = AddBudgetPeriod({ budget_period_startdate => '01-01-2015', - budget_period_enddate => '12-31-2015', + budget_period_enddate => '01-01-2016', budget_description => "budget desc" }); @@ -132,22 +134,28 @@ my $budget_id = AddBudget({ budget_period_id => $bpid }); +my $frequency_id = AddSubscriptionFrequency({ description => "Test frequency 1" }); +my $pattern_id = AddSubscriptionNumberpattern({ + label => 'Test numberpattern 1', + numberingmethod => '{X}' +}); + my $subscriptionid1 = NewSubscription( - undef, "", undef, undef, $budget_id, $biblionumber, '01-01-2013',undef, - undef, undef, undef, undef, undef, undef, undef, undef, - undef, undef, undef, undef, undef, undef, undef, undef, - undef, undef, undef, undef, undef, undef, undef, 1, - "notes", undef, undef, undef, undef, undef, undef, 0, - "intnotes", 0, undef, undef, 0, undef, '31-12-2013', + undef, "", undef, undef, $budget_id, $biblionumber, + '2013-01-01', $frequency_id, undef, undef, undef, + undef, undef, undef, undef, undef, undef, + 1, "notes",undef, '2013-01-01', undef, $pattern_id, + undef, undef, 0, "intnotes", 0, + undef, undef, 0, undef, '2013-01-01', 0 ); my $subscriptionid2 = NewSubscription( - undef, "", undef, undef, $budget_id, $biblionumber, '01-01-2013',undef, - undef, undef, undef, undef, undef, undef, undef, undef, - undef, undef, undef, undef, undef, undef, undef, undef, - undef, undef, undef, undef, undef, undef, undef, 1, - "notes", undef, undef, undef, undef, undef, undef, 0, - "intnotes", 0, undef, undef, 0, undef, '31-12-2013', + undef, "", undef, undef, $budget_id, $biblionumber, + '2013-01-01', $frequency_id, undef, undef, undef, + undef, undef, undef, undef, undef, undef, + 1, "notes",undef, '2013-01-01', undef, $pattern_id, + undef, undef, 0, "intnotes", 0, + undef, undef, 0, undef, '2013-01-01', 0 ); # insert -- 1.7.10.4