Attachment 22722 Details for Bug 10855 – Bug 10855: FIX conflicts with bug 7688

[patch] Bug 10855: FIX conflicts with bug 7688

Bug-10855-FIX-conflicts-with-bug-7688.patch (text/plain), 3.09 KB, created by Jonathan Druart on 2013-11-05 14:31:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2013-11-05 14:31:44 UTC

Size: 3.09 KB

patch

obsolete

>From acaf92e24cc674c483c81677373a191b68dec91b Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@biblibre.com>
>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

Actions: View | Diff | Splinter Review

Attachments on bug 10855: 20937 | 20938 | 20939 | 20940 | 20941 | 20942 | 20943 | 20944 | 21184 | 21185 | 21186 | 21187 | 21188 | 21189 | 21190 | 21191 | 21663 | 22049 | 22050 | 22051 | 22052 | 22053 | 22054 | 22055 | 22056 | 22057 | 22359 | 22360 | 22600 | 22601 | 22602 | 22603 | 22604 | 22605 | 22606 | 22607 | 22608 | 22616 | 22698 | 22699 | 22700 | 22701 | 22702 | 22703 | 22722 | 22768 | 22769 | 22869 | 23052 | 23053 | 23142 | 23143 | 23301 | 23302 | 23594 | 23595 | 23596 | 23597 | 23598 | 23599 | 23600 | 23601 | 23602 | 23774 | 23775 | 23961 | 23962 | 23963 | 23964 | 24452 | 24453 | 24454 | 24455 | 24456 | 24457 | 24569 | 24570 | 26091 | 26092 | 26093 | 26094 | 26095 | 26096 | 26097 | 26254 | 26255 | 26256 | 26257 | 26258 | 26259 | 26260 | 26276 | 26651 | 26655 | 28929 | 28930 | 28931 | 28932 | 28933 | 28934 | 28935 | 28936 | 28937 | 28938 | 28939 | 28940 | 28941 | 29095 | 29161 | 35211 | 35212 | 35213 | 35214 | 35215 | 35216 | 35217 | 35218 | 35219 | 35220 | 35221 | 35309 | 35310 | 35369 | 35556 | 36359 | 36362 | 36363 | 36364 | 36365 | 36366 | 36367 | 36368 | 36369 | 36370 | 36371 | 36372 | 36373 | 36374 | 38549 | 38550 | 38551 | 38552 | 38553 | 38554 | 38555 | 38556 | 38557 | 38558 | 38559 | 38560 | 38561 | 42296 | 42297 | 42298 | 42299 | 42300 | 42301 | 42302 | 42303 | 42304 | 42305 | 42306 | 42307 | 42308 | 42309 | 42310 | 42332 | 42333 | 43076