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

(-)a/C4/Serials.pm (-85 / +87 lines)
Lines 1344-1350 sub ModSubscription { Link Here
1344
        $periodicity,   $firstacquidate,   $irregularity,      $numberpattern, $locale,
1344
        $periodicity,   $firstacquidate,   $irregularity,      $numberpattern, $locale,
1345
        $numberlength,  $weeklength,       $monthlength,       $lastvalue1,    $innerloop1,
1345
        $numberlength,  $weeklength,       $monthlength,       $lastvalue1,    $innerloop1,
1346
        $lastvalue2,    $innerloop2,       $lastvalue3,        $innerloop3,    $status,
1346
        $lastvalue2,    $innerloop2,       $lastvalue3,        $innerloop3,    $status,
1347
        $biblionumber,  $callnumber,       $notes,             $letter,        $manualhistory,
1347
        $biblionumber,  $callnumber,       $notes,             $letter,        $late_issue_letter_code, $manualhistory,
1348
        $internalnotes, $serialsadditems,  $staffdisplaycount, $opacdisplaycount,
1348
        $internalnotes, $serialsadditems,  $staffdisplaycount, $opacdisplaycount,
1349
        $graceperiod,   $location,         $enddate,           $subscriptionid, $skip_serialseq,
1349
        $graceperiod,   $location,         $enddate,           $subscriptionid, $skip_serialseq,
1350
        $itemtype,      $previousitemtype, $mana_id,           $ccode,          $published_on_template
1350
        $itemtype,      $previousitemtype, $mana_id,           $ccode,          $published_on_template
Lines 1353-1397 sub ModSubscription { Link Here
1353
    my $subscription = Koha::Subscriptions->find($subscriptionid);
1353
    my $subscription = Koha::Subscriptions->find($subscriptionid);
1354
    $subscription->set(
1354
    $subscription->set(
1355
        {
1355
        {
1356
            librarian             => $auser,
1356
            librarian              => $auser,
1357
            branchcode            => $branchcode,
1357
            branchcode             => $branchcode,
1358
            aqbooksellerid        => $aqbooksellerid,
1358
            aqbooksellerid         => $aqbooksellerid,
1359
            cost                  => $cost,
1359
            cost                   => $cost,
1360
            aqbudgetid            => $aqbudgetid,
1360
            aqbudgetid             => $aqbudgetid,
1361
            biblionumber          => $biblionumber,
1361
            biblionumber           => $biblionumber,
1362
            startdate             => $startdate,
1362
            startdate              => $startdate,
1363
            periodicity           => $periodicity,
1363
            periodicity            => $periodicity,
1364
            numberlength          => $numberlength,
1364
            numberlength           => $numberlength,
1365
            weeklength            => $weeklength,
1365
            weeklength             => $weeklength,
1366
            monthlength           => $monthlength,
1366
            monthlength            => $monthlength,
1367
            lastvalue1            => $lastvalue1,
1367
            lastvalue1             => $lastvalue1,
1368
            innerloop1            => $innerloop1,
1368
            innerloop1             => $innerloop1,
1369
            lastvalue2            => $lastvalue2,
1369
            lastvalue2             => $lastvalue2,
1370
            innerloop2            => $innerloop2,
1370
            innerloop2             => $innerloop2,
1371
            lastvalue3            => $lastvalue3,
1371
            lastvalue3             => $lastvalue3,
1372
            innerloop3            => $innerloop3,
1372
            innerloop3             => $innerloop3,
1373
            status                => $status,
1373
            status                 => $status,
1374
            notes                 => $notes,
1374
            notes                  => $notes,
1375
            letter                => $letter,
1375
            letter                 => $letter,
1376
            firstacquidate        => $firstacquidate,
1376
            late_issue_letter_code => $late_issue_letter_code,
1377
            irregularity          => $irregularity,
1377
            firstacquidate         => $firstacquidate,
1378
            numberpattern         => $numberpattern,
1378
            irregularity           => $irregularity,
1379
            locale                => $locale,
1379
            numberpattern          => $numberpattern,
1380
            callnumber            => $callnumber,
1380
            locale                 => $locale,
1381
            manualhistory         => $manualhistory,
1381
            callnumber             => $callnumber,
1382
            internalnotes         => $internalnotes,
1382
            manualhistory          => $manualhistory,
1383
            serialsadditems       => $serialsadditems,
1383
            internalnotes          => $internalnotes,
1384
            staffdisplaycount     => $staffdisplaycount,
1384
            serialsadditems        => $serialsadditems,
1385
            opacdisplaycount      => $opacdisplaycount,
1385
            staffdisplaycount      => $staffdisplaycount,
1386
            graceperiod           => $graceperiod,
1386
            opacdisplaycount       => $opacdisplaycount,
1387
            location              => $location,
1387
            graceperiod            => $graceperiod,
1388
            enddate               => $enddate,
1388
            location               => $location,
1389
            skip_serialseq        => $skip_serialseq,
1389
            enddate                => $enddate,
1390
            itemtype              => $itemtype,
1390
            skip_serialseq         => $skip_serialseq,
1391
            previousitemtype      => $previousitemtype,
1391
            itemtype               => $itemtype,
1392
            mana_id               => $mana_id,
1392
            previousitemtype       => $previousitemtype,
1393
            ccode                 => $ccode,
1393
            mana_id                => $mana_id,
1394
            published_on_template => $published_on_template,
1394
            ccode                  => $ccode,
1395
            published_on_template  => $published_on_template,
1395
        }
1396
        }
1396
    )->store;
1397
    )->store;
1397
1398
Lines 1407-1416 sub ModSubscription { Link Here
1407
1408
1408
=head2 NewSubscription
1409
=head2 NewSubscription
1409
1410
1410
$subscriptionid = &NewSubscription($auser,branchcode,$aqbooksellerid,$cost,$aqbudgetid,$biblionumber,
1411
$subscriptionid = &NewSubscription($manager_id,branchcode,$aqbooksellerid,$cost,$aqbudgetid,$biblionumber,
1411
    $startdate,$periodicity,$numberlength,$weeklength,$monthlength,
1412
    $startdate,$periodicity,$numberlength,$weeklength,$monthlength,
1412
    $lastvalue1,$innerloop1,$lastvalue2,$innerloop2,$lastvalue3,$innerloop3,
1413
    $lastvalue1,$innerloop1,$lastvalue2,$innerloop2,$lastvalue3,$innerloop3,
1413
    $status, $notes, $letter, $firstacquidate, $irregularity, $numberpattern,
1414
    $status, $notes, $letter, $late_issue_letter_code, $firstacquidate, $irregularity, $numberpattern,
1414
    $locale, $callnumber, $manualhistory, $internalnotes, $serialsadditems,
1415
    $locale, $callnumber, $manualhistory, $internalnotes, $serialsadditems,
1415
    $staffdisplaycount, $opacdisplaycount, $graceperiod, $location, $enddate,
1416
    $staffdisplaycount, $opacdisplaycount, $graceperiod, $location, $enddate,
1416
    $skip_serialseq, $itemtype, $previousitemtype);
1417
    $skip_serialseq, $itemtype, $previousitemtype);
Lines 1424-1433 the id of this new subscription Link Here
1424
1425
1425
sub NewSubscription {
1426
sub NewSubscription {
1426
    my (
1427
    my (
1427
        $auser,           $branchcode,        $aqbooksellerid,   $cost,          $aqbudgetid, $biblionumber,
1428
        $auser,           $branchcode,        $aqbooksellerid, $cost,       $aqbudgetid, $biblionumber,
1428
        $startdate,       $periodicity,       $numberlength,     $weeklength,    $monthlength,
1429
        $startdate,       $periodicity,       $numberlength,   $weeklength, $monthlength,
1429
        $lastvalue1,      $innerloop1,        $lastvalue2,       $innerloop2,    $lastvalue3,
1430
        $lastvalue1,      $innerloop1,        $lastvalue2,     $innerloop2, $lastvalue3,
1430
        $innerloop3,      $status,            $notes,            $letter,        $firstacquidate, $irregularity,
1431
        $innerloop3,      $status,            $notes, $letter, $late_issue_letter_code, $firstacquidate, $irregularity,
1431
        $numberpattern,   $locale,            $callnumber,       $manualhistory, $internalnotes,
1432
        $numberpattern,   $locale,            $callnumber,       $manualhistory, $internalnotes,
1432
        $serialsadditems, $staffdisplaycount, $opacdisplaycount, $graceperiod,
1433
        $serialsadditems, $staffdisplaycount, $opacdisplaycount, $graceperiod,
1433
        $location,        $enddate,           $skip_serialseq,   $itemtype, $previousitemtype, $mana_id, $ccode,
1434
        $location,        $enddate,           $skip_serialseq,   $itemtype, $previousitemtype, $mana_id, $ccode,
Lines 1437-1481 sub NewSubscription { Link Here
1437
1438
1438
    my $subscription = Koha::Subscription->new(
1439
    my $subscription = Koha::Subscription->new(
1439
        {
1440
        {
1440
            librarian             => $auser,
1441
            librarian              => $auser,
1441
            branchcode            => $branchcode,
1442
            branchcode             => $branchcode,
1442
            aqbooksellerid        => $aqbooksellerid,
1443
            aqbooksellerid         => $aqbooksellerid,
1443
            cost                  => $cost,
1444
            cost                   => $cost,
1444
            aqbudgetid            => $aqbudgetid,
1445
            aqbudgetid             => $aqbudgetid,
1445
            biblionumber          => $biblionumber,
1446
            biblionumber           => $biblionumber,
1446
            startdate             => $startdate,
1447
            startdate              => $startdate,
1447
            periodicity           => $periodicity,
1448
            periodicity            => $periodicity,
1448
            numberlength          => $numberlength,
1449
            numberlength           => $numberlength,
1449
            weeklength            => $weeklength,
1450
            weeklength             => $weeklength,
1450
            monthlength           => $monthlength,
1451
            monthlength            => $monthlength,
1451
            lastvalue1            => $lastvalue1,
1452
            lastvalue1             => $lastvalue1,
1452
            innerloop1            => $innerloop1,
1453
            innerloop1             => $innerloop1,
1453
            lastvalue2            => $lastvalue2,
1454
            lastvalue2             => $lastvalue2,
1454
            innerloop2            => $innerloop2,
1455
            innerloop2             => $innerloop2,
1455
            lastvalue3            => $lastvalue3,
1456
            lastvalue3             => $lastvalue3,
1456
            innerloop3            => $innerloop3,
1457
            innerloop3             => $innerloop3,
1457
            status                => $status,
1458
            status                 => $status,
1458
            notes                 => $notes,
1459
            notes                  => $notes,
1459
            letter                => $letter,
1460
            letter                 => $letter,
1460
            firstacquidate        => $firstacquidate,
1461
            late_issue_letter_code => $late_issue_letter_code,
1461
            irregularity          => $irregularity,
1462
            firstacquidate         => $firstacquidate,
1462
            numberpattern         => $numberpattern,
1463
            irregularity           => $irregularity,
1463
            locale                => $locale,
1464
            numberpattern          => $numberpattern,
1464
            callnumber            => $callnumber,
1465
            locale                 => $locale,
1465
            manualhistory         => $manualhistory,
1466
            callnumber             => $callnumber,
1466
            internalnotes         => $internalnotes,
1467
            manualhistory          => $manualhistory,
1467
            serialsadditems       => $serialsadditems,
1468
            internalnotes          => $internalnotes,
1468
            staffdisplaycount     => $staffdisplaycount,
1469
            serialsadditems        => $serialsadditems,
1469
            opacdisplaycount      => $opacdisplaycount,
1470
            staffdisplaycount      => $staffdisplaycount,
1470
            graceperiod           => $graceperiod,
1471
            opacdisplaycount       => $opacdisplaycount,
1471
            location              => $location,
1472
            graceperiod            => $graceperiod,
1472
            enddate               => $enddate,
1473
            location               => $location,
1473
            skip_serialseq        => $skip_serialseq,
1474
            enddate                => $enddate,
1474
            itemtype              => $itemtype,
1475
            skip_serialseq         => $skip_serialseq,
1475
            previousitemtype      => $previousitemtype,
1476
            itemtype               => $itemtype,
1476
            mana_id               => $mana_id,
1477
            previousitemtype       => $previousitemtype,
1477
            ccode                 => $ccode,
1478
            mana_id                => $mana_id,
1478
            published_on_template => $published_on_template,
1479
            ccode                  => $ccode,
1480
            published_on_template  => $published_on_template,
1479
        }
1481
        }
1480
    )->store;
1482
    )->store;
1481
    $subscription->discard_changes;
1483
    $subscription->discard_changes;
(-)a/Koha/Subscription.pm (+17 lines)
Lines 124-129 sub frequency { Link Here
124
    return Koha::Subscription::Frequency->_new_from_dbic($frequency_rs);
124
    return Koha::Subscription::Frequency->_new_from_dbic($frequency_rs);
125
}
125
}
126
126
127
=head3 manager
128
129
my $patron = $subscription->manager
130
131
Return the subscription manager (a Koha::Patron object)
132
133
=cut
134
135
sub manager {
136
    my ($self) = @_;
137
138
    my $manager = $self->_result->manager;
139
    return unless $manager;
140
141
    return Koha::Patron->_new_from_dbic($manager);
142
}
143
127
=head3 get_search_info
144
=head3 get_search_info
128
145
129
=cut
146
=cut
(-)a/installer/data/mysql/atomicupdate/bug-29997.pl (+46 lines)
Line 0 Link Here
1
use Modern::Perl;
2
3
return {
4
    bug_number => "29997",
5
    description => "Replace subscription.librarian by subscription.manager_id, add a foreign key constraint, and add subscription.late_issue_letter_code",
6
    up => sub {
7
        my ($args) = @_;
8
        my ($dbh, $out) = @$args{qw(dbh out)};
9
10
        unless (column_exists('subscription', 'manager_id')) {
11
            $dbh->do(q{
12
                ALTER TABLE subscription
13
                ADD COLUMN manager_id INT NULL DEFAULT NULL AFTER librarian
14
            });
15
        }
16
17
        unless (foreign_key_exists('subscription', 'subscription_manager_id_fk')) {
18
            $dbh->do(q{
19
                ALTER TABLE subscription
20
                ADD CONSTRAINT subscription_manager_id_fk
21
                FOREIGN KEY (manager_id) REFERENCES borrowers (borrowernumber)
22
                ON DELETE SET NULL ON UPDATE CASCADE
23
            });
24
        }
25
26
        if (column_exists('subscription', 'librarian')) {
27
            $dbh->do(q{
28
                UPDATE subscription LEFT JOIN borrowers ON (borrowers.userid = subscription.librarian)
29
                SET subscription.manager_id = borrowers.borrowernumber
30
                WHERE subscription.manager_id IS NULL
31
            });
32
33
            $dbh->do(q{
34
                ALTER TABLE subscription
35
                DROP COLUMN librarian
36
            });
37
        }
38
39
        unless (column_exists('subscription', 'late_issue_letter_code')) {
40
            $dbh->do(q{
41
                ALTER TABLE subscription
42
                ADD COLUMN late_issue_letter_code VARCHAR(20) NULL DEFAULT NULL AFTER letter
43
            });
44
        }
45
    },
46
};
(-)a/installer/data/mysql/kohastructure.sql (-2 / +4 lines)
Lines 6144-6150 DROP TABLE IF EXISTS `subscription`; Link Here
6144
CREATE TABLE `subscription` (
6144
CREATE TABLE `subscription` (
6145
  `biblionumber` int(11) NOT NULL COMMENT 'foreign key for biblio.biblionumber that this subscription is attached to',
6145
  `biblionumber` int(11) NOT NULL COMMENT 'foreign key for biblio.biblionumber that this subscription is attached to',
6146
  `subscriptionid` int(11) NOT NULL AUTO_INCREMENT COMMENT 'unique key for this subscription',
6146
  `subscriptionid` int(11) NOT NULL AUTO_INCREMENT COMMENT 'unique key for this subscription',
6147
  `librarian` varchar(100) DEFAULT '' COMMENT 'the librarian''s username from borrowers.userid',
6147
  `manager_id` INT NULL DEFAULT NULL COMMENT 'the borrowernumber of the patron that last modified the subscription',
6148
  `startdate` date DEFAULT NULL COMMENT 'start date for this subscription',
6148
  `startdate` date DEFAULT NULL COMMENT 'start date for this subscription',
6149
  `aqbooksellerid` int(11) DEFAULT NULL COMMENT 'foreign key for aqbooksellers.id to link to the vendor',
6149
  `aqbooksellerid` int(11) DEFAULT NULL COMMENT 'foreign key for aqbooksellers.id to link to the vendor',
6150
  `cost` int(11) DEFAULT 0,
6150
  `cost` int(11) DEFAULT 0,
Lines 6167-6172 CREATE TABLE `subscription` ( Link Here
6167
  `irregularity` mediumtext DEFAULT NULL COMMENT 'any irregularities in the subscription',
6167
  `irregularity` mediumtext DEFAULT NULL COMMENT 'any irregularities in the subscription',
6168
  `skip_serialseq` tinyint(1) NOT NULL DEFAULT 0,
6168
  `skip_serialseq` tinyint(1) NOT NULL DEFAULT 0,
6169
  `letter` varchar(20) DEFAULT NULL,
6169
  `letter` varchar(20) DEFAULT NULL,
6170
  `late_issue_letter_code` varchar(20) NULL DEFAULT NULL COMMENT 'letter code used for late issue alerts',
6170
  `numberpattern` int(11) DEFAULT NULL COMMENT 'the numbering pattern used links to subscription_numberpatterns.id',
6171
  `numberpattern` int(11) DEFAULT NULL COMMENT 'the numbering pattern used links to subscription_numberpatterns.id',
6171
  `locale` varchar(80) DEFAULT NULL COMMENT 'for foreign language subscriptions to display months, seasons, etc correctly',
6172
  `locale` varchar(80) DEFAULT NULL COMMENT 'for foreign language subscriptions to display months, seasons, etc correctly',
6172
  `distributedto` mediumtext DEFAULT NULL,
6173
  `distributedto` mediumtext DEFAULT NULL,
Lines 6195-6201 CREATE TABLE `subscription` ( Link Here
6195
  CONSTRAINT `subscription_ibfk_1` FOREIGN KEY (`periodicity`) REFERENCES `subscription_frequencies` (`id`) ON DELETE SET NULL ON UPDATE CASCADE,
6196
  CONSTRAINT `subscription_ibfk_1` FOREIGN KEY (`periodicity`) REFERENCES `subscription_frequencies` (`id`) ON DELETE SET NULL ON UPDATE CASCADE,
6196
  CONSTRAINT `subscription_ibfk_2` FOREIGN KEY (`numberpattern`) REFERENCES `subscription_numberpatterns` (`id`) ON DELETE SET NULL ON UPDATE CASCADE,
6197
  CONSTRAINT `subscription_ibfk_2` FOREIGN KEY (`numberpattern`) REFERENCES `subscription_numberpatterns` (`id`) ON DELETE SET NULL ON UPDATE CASCADE,
6197
  CONSTRAINT `subscription_ibfk_3` FOREIGN KEY (`biblionumber`) REFERENCES `biblio` (`biblionumber`) ON DELETE CASCADE ON UPDATE CASCADE,
6198
  CONSTRAINT `subscription_ibfk_3` FOREIGN KEY (`biblionumber`) REFERENCES `biblio` (`biblionumber`) ON DELETE CASCADE ON UPDATE CASCADE,
6198
  CONSTRAINT `subscription_ibfk_4` FOREIGN KEY (`aqbooksellerid`) REFERENCES `aqbooksellers` (`id`) ON DELETE SET NULL ON UPDATE CASCADE
6199
  CONSTRAINT `subscription_ibfk_4` FOREIGN KEY (`aqbooksellerid`) REFERENCES `aqbooksellers` (`id`) ON DELETE SET NULL ON UPDATE CASCADE,
6200
  CONSTRAINT `subscription_manager_id_fk` FOREIGN KEY (`manager_id`) REFERENCES `borrowers` (`borrowernumber`) ON DELETE SET NULL ON UPDATE CASCADE
6199
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
6201
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
6200
/*!40101 SET character_set_client = @saved_cs_client */;
6202
/*!40101 SET character_set_client = @saved_cs_client */;
6201
6203
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt (-1 / +19 lines)
Lines 86-92 Link Here
86
                [% ELSE %]
86
                [% ELSE %]
87
                    <input type="hidden" name="op" value="cud-addsubscription" />
87
                    <input type="hidden" name="op" value="cud-addsubscription" />
88
                [% END %]
88
                [% END %]
89
                <input type="hidden" name="user" value="[% logged_in_user.userid | html %]" />
90
                <input type="hidden" name="irreg_check" value="0" />
89
                <input type="hidden" name="irreg_check" value="0" />
91
                <fieldset id="subscription_add_information" class="rows">
90
                <fieldset id="subscription_add_information" class="rows">
92
                    <legend>Subscription details</legend>
91
                    <legend>Subscription details</legend>
Lines 204-209 Link Here
204
                                <div class="hint">To notify patrons of new serial issues, you must <a href="/cgi-bin/koha/tools/letter.pl">define a notice</a>.</div>
203
                                <div class="hint">To notify patrons of new serial issues, you must <a href="/cgi-bin/koha/tools/letter.pl">define a notice</a>.</div>
205
                            [% END %]
204
                            [% END %]
206
                        </li>
205
                        </li>
206
                        <li>
207
                            [% IF ( letterloop ) %]
208
                                <label for="late_issue_letter_code">Late issue notification: </label>
209
                                <select name="late_issue_letter_code" id="late_issue_letter_code">
210
                                    <option value="">None</option>
211
                                    [% FOREACH letter IN letterloop %]
212
                                        [% IF ( letter.value == late_issue_letter_code ) %]
213
                                            <option value="[% letter.value | html %]" selected="selected">[% letter.lettername | html %]</option>
214
                                        [% ELSE %]
215
                                            <option value="[% letter.value | html %]">[% letter.lettername | html %]</option>
216
                                        [% END %]
217
                                    [% END %]
218
                                </select>
219
                                <div class="hint">Selecting a notice will allow you to receive a notification when a serial issue is late.</div>
220
                            [% ELSE %]
221
                                <span class="label">Late issue notification: </span>
222
                                <div class="hint">To receive notifications of late serial issues, you must <a href="/cgi-bin/koha/tools/letter.pl">define a notice</a>.</div>
223
                            [% END %]
224
                        </li>
207
                        <li>
225
                        <li>
208
                            <label for="location">Location:</label>
226
                            <label for="location">Location:</label>
209
                            <select name="location" id="location">
227
                            <select name="location" id="location">
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt (-1 / +6 lines)
Lines 109-115 Link Here
109
                        <div class="rows">
109
                        <div class="rows">
110
                            <ol>
110
                            <ol>
111
                                <li><span class="label">Subscription ID: </span>[% subscriptionid | html %]</li>
111
                                <li><span class="label">Subscription ID: </span>[% subscriptionid | html %]</li>
112
                                <li><span class="label">Librarian identity:</span> [% librarian | html %]</li>
112
                                <li>
113
                                    <span class="label">Manager:</span>
114
                                    [% IF subscription.manager %]
115
                                        [% INCLUDE 'patron-title.inc' patron = subscription.manager | html %]
116
                                    [% END %]
117
                                </li>
113
                                <li><span class="label">Vendor:</span> <a href="/cgi-bin/koha/acquisition/vendors/[% aqbooksellerid | uri %]">[% aqbooksellername | html %]</a></li>
118
                                <li><span class="label">Vendor:</span> <a href="/cgi-bin/koha/acquisition/vendors/[% aqbooksellerid | uri %]">[% aqbooksellername | html %]</a></li>
114
                                <li>
119
                                <li>
115
                                    <span class="label">Bibliographic record:</span>
120
                                    <span class="label">Bibliographic record:</span>
(-)a/misc/cronjobs/serialsUpdate.pl (+19 lines)
Lines 115-120 while ( my $issue = $sth->fetchrow_hashref ) { Link Here
115
            3,                     $note
115
            3,                     $note
116
        );
116
        );
117
        $verbose and print "Serial issue with id=" . $issue->{serialid} . " marked late\n";
117
        $verbose and print "Serial issue with id=" . $issue->{serialid} . " marked late\n";
118
119
        my $subscription = Koha::Subscriptions->find($issue->{subscriptionid});
120
        if ($subscription->late_issue_letter_code && $subscription->manager_id) {
121
            my $letter = C4::Letters::GetPreparedLetter (
122
                module => 'serial',
123
                letter_code => $subscription->late_issue_letter_code,
124
                branchcode => $subscription->branchcode,
125
                tables => {
126
                    branches => $subscription->branchcode,
127
                    biblio => $subscription->biblionumber,
128
                    biblioitems => $subscription->biblionumber,
129
                    borrowers => $subscription->manager_id,
130
                    subscription => $subscription->subscriptionid,
131
                    serial => $issue->{serialid},
132
                },
133
            );
134
            my $manager = $subscription->manager;
135
            C4::Message->enqueue($letter, $manager->unblessed, 'email');
136
        }
118
    } else {
137
    } else {
119
        print "Serial issue with id=" . $issue->{serialid} . " would have been marked late\n";
138
        print "Serial issue with id=" . $issue->{serialid} . " would have been marked late\n";
120
    }
139
    }
(-)a/serials/subscription-add.pl (-12 / +11 lines)
Lines 314-320 sub redirect_add_subscription { Link Here
314
    }
314
    }
315
    my $numberpattern = Koha::Subscription::Numberpatterns->new_or_existing( { $query->Vars } );
315
    my $numberpattern = Koha::Subscription::Numberpatterns->new_or_existing( { $query->Vars } );
316
316
317
    my $auser          = $query->param('user');
318
    my $branchcode     = $query->param('branchcode');
317
    my $branchcode     = $query->param('branchcode');
319
    my $aqbooksellerid = $query->param('aqbooksellerid');
318
    my $aqbooksellerid = $query->param('aqbooksellerid');
320
    my $cost           = $query->param('cost');
319
    my $cost           = $query->param('cost');
Lines 339-344 sub redirect_add_subscription { Link Here
339
    my $notes                 = $query->param('notes');
338
    my $notes                 = $query->param('notes');
340
    my $internalnotes         = $query->param('internalnotes');
339
    my $internalnotes         = $query->param('internalnotes');
341
    my $letter                = $query->param('letter');
340
    my $letter                = $query->param('letter');
341
    my $late_issue_letter_code = $query->param('late_issue_letter_code');
342
    my $manualhistory         = $query->param('manualhist') ? 1 : 0;
342
    my $manualhistory         = $query->param('manualhist') ? 1 : 0;
343
    my $serialsadditems       = $query->param('serialsadditems');
343
    my $serialsadditems       = $query->param('serialsadditems');
344
    my $staffdisplaycount     = $query->param('staffdisplaycount');
344
    my $staffdisplaycount     = $query->param('staffdisplaycount');
Lines 369-380 sub redirect_add_subscription { Link Here
369
        }
369
        }
370
    }
370
    }
371
    my $subscriptionid = NewSubscription(
371
    my $subscriptionid = NewSubscription(
372
        $auser,                     $branchcode,       $aqbooksellerid, $cost, $aqbudgetid, $biblionumber,
372
        $loggedinuser,              $branchcode,    $aqbooksellerid, $cost, $aqbudgetid, $biblionumber,
373
        $startdate,                 $periodicity,      $numberlength,   $weeklength,
373
        $startdate,                 $periodicity,   $numberlength,   $weeklength,
374
        $monthlength,               $lastvalue1,       $innerloop1,     $lastvalue2, $innerloop2,
374
        $monthlength,               $lastvalue1,    $innerloop1,     $lastvalue2, $innerloop2,
375
        $lastvalue3,                $innerloop3,       $status,         $notes, $letter, $firstacquidate,
375
        $lastvalue3,                $innerloop3,    $status, $notes, $letter, $late_issue_letter_code, $firstacquidate,
376
        join( ";", @irregularity ), $numberpattern,    $locale,         $callnumber,
376
        join( ";", @irregularity ), $numberpattern, $locale, $callnumber,
377
        $manualhistory,             $internalnotes,    $serialsadditems,
377
        $manualhistory,             $internalnotes, $serialsadditems,
378
        $staffdisplaycount,         $opacdisplaycount, $graceperiod, $location, $enddate,
378
        $staffdisplaycount,         $opacdisplaycount, $graceperiod, $location, $enddate,
379
        $skip_serialseq,            $itemtype,         $previousitemtype, $mana_id, $ccode, $published_on_template
379
        $skip_serialseq,            $itemtype,         $previousitemtype, $mana_id, $ccode, $published_on_template
380
    );
380
    );
Lines 399-407 sub redirect_add_subscription { Link Here
399
sub redirect_mod_subscription {
399
sub redirect_mod_subscription {
400
    my $subscriptionid = $query->param('subscriptionid');
400
    my $subscriptionid = $query->param('subscriptionid');
401
    my @irregularity   = $query->multi_param('irregularity');
401
    my @irregularity   = $query->multi_param('irregularity');
402
    my $auser          = $query->param('user');
402
    my $branchcode = $query->param('branchcode');
403
    my $librarian => scalar $query->param('librarian'),
404
        my $branchcode = $query->param('branchcode');
405
    my $cost           = $query->param('cost');
403
    my $cost           = $query->param('cost');
406
    my $aqbooksellerid = $query->param('aqbooksellerid');
404
    my $aqbooksellerid = $query->param('aqbooksellerid');
407
    my $biblionumber   = $query->param('biblionumber');
405
    my $biblionumber   = $query->param('biblionumber');
Lines 447-452 sub redirect_mod_subscription { Link Here
447
    my $notes                 = $query->param('notes');
445
    my $notes                 = $query->param('notes');
448
    my $internalnotes         = $query->param('internalnotes');
446
    my $internalnotes         = $query->param('internalnotes');
449
    my $letter                = $query->param('letter');
447
    my $letter                = $query->param('letter');
448
    my $late_issue_letter_code = $query->param('late_issue_letter_code');
450
    my $manualhistory         = $query->param('manualhist') ? 1 : 0;
449
    my $manualhistory         = $query->param('manualhist') ? 1 : 0;
451
    my $serialsadditems       = $query->param('serialsadditems');
450
    my $serialsadditems       = $query->param('serialsadditems');
452
    my $staffdisplaycount     = $query->param('staffdisplaycount');
451
    my $staffdisplaycount     = $query->param('staffdisplaycount');
Lines 487-497 sub redirect_mod_subscription { Link Here
487
    }
486
    }
488
487
489
    ModSubscription(
488
    ModSubscription(
490
        $auser,            $branchcode,     $aqbooksellerid, $cost, $aqbudgetid, $startdate,
489
        $loggedinuser,     $branchcode,     $aqbooksellerid, $cost, $aqbudgetid, $startdate,
491
        $periodicity,      $firstacquidate, join( ";", @irregularity ),
490
        $periodicity,      $firstacquidate, join( ";", @irregularity ),
492
        $numberpattern,    $locale,         $numberlength,     $weeklength, $monthlength, $lastvalue1,
491
        $numberpattern,    $locale,         $numberlength,     $weeklength, $monthlength, $lastvalue1,
493
        $innerloop1,       $lastvalue2,     $innerloop2,       $lastvalue3, $innerloop3,
492
        $innerloop1,       $lastvalue2,     $innerloop2,       $lastvalue3, $innerloop3,
494
        $status,           $biblionumber,   $callnumber,       $notes,      $letter,
493
        $status,           $biblionumber,   $callnumber,       $notes,      $letter, $late_issue_letter_code,
495
        $manualhistory,    $internalnotes,  $serialsadditems,  $staffdisplaycount,
494
        $manualhistory,    $internalnotes,  $serialsadditems,  $staffdisplaycount,
496
        $opacdisplaycount, $graceperiod,    $location,         $enddate, $subscriptionid,
495
        $opacdisplaycount, $graceperiod,    $location,         $enddate, $subscriptionid,
497
        $skip_serialseq,   $itemtype,       $previousitemtype, $mana_id, $ccode, $published_on_template
496
        $skip_serialseq,   $itemtype,       $previousitemtype, $mana_id, $ccode, $published_on_template
(-)a/t/db_dependent/Acquisition/OrderFromSubscription.t (-6 / +6 lines)
Lines 50-61 my $budget_id = AddBudget( Link Here
50
);
50
);
51
51
52
my $subscriptionid = NewSubscription(
52
my $subscriptionid = NewSubscription(
53
    undef,        "",      undef, undef,        $budget_id, $biblionumber,
53
    undef,        "",      undef, undef,      $budget_id, $biblionumber,
54
    '2013-01-01', undef,   undef, undef,        undef,
54
    '2013-01-01', undef,   undef, undef,      undef,
55
    undef,        undef,   undef, undef,        undef, undef,
55
    undef,        undef,   undef, undef,      undef, undef,
56
    1,            "notes", undef, '2013-01-01', undef, undef,
56
    1,            "notes", undef, undef,      '2013-01-01', undef, undef,
57
    undef,        undef,   0,     "intnotes",   0,
57
    undef,        undef,   0,     "intnotes", 0,
58
    undef,        undef,   0,     undef,        '2013-12-31', 0
58
    undef,        undef,   0,     undef,      '2013-12-31', 0
59
);
59
);
60
die unless $subscriptionid;
60
die unless $subscriptionid;
61
61
(-)a/t/db_dependent/Koha/Acquisition/Booksellers.t (-2 / +2 lines)
Lines 104-110 subtest '->subscriptions() tests' => sub { Link Here
104
        $id_budget,   $biblionumber, '2013-01-01',         undef,
104
        $id_budget,   $biblionumber, '2013-01-01',         undef,
105
        undef,        undef,         undef,                undef,
105
        undef,        undef,         undef,                undef,
106
        undef,        undef,         undef,                undef,
106
        undef,        undef,         undef,                undef,
107
        undef,        1,             "subscription notes", undef,
107
        undef,        1,             "subscription notes", undef, undef,
108
        '2013-01-01', undef,         undef,                undef,
108
        '2013-01-01', undef,         undef,                undef,
109
        'CALL ABC',   0,             "intnotes",           0,
109
        'CALL ABC',   0,             "intnotes",           0,
110
        undef,        undef,         0,                    undef,
110
        undef,        undef,         0,                    undef,
Lines 128-134 subtest '->subscriptions() tests' => sub { Link Here
128
        $id_budget,   $biblionumber, '2013-01-01',         undef,
128
        $id_budget,   $biblionumber, '2013-01-01',         undef,
129
        undef,        undef,         undef,                undef,
129
        undef,        undef,         undef,                undef,
130
        undef,        undef,         undef,                undef,
130
        undef,        undef,         undef,                undef,
131
        undef,        1,             "subscription notes", undef,
131
        undef,        1,             "subscription notes", undef, undef,
132
        '2013-01-01', undef,         undef,                undef,
132
        '2013-01-01', undef,         undef,                undef,
133
        'CALL DEF',   0,             "intnotes",           0,
133
        'CALL DEF',   0,             "intnotes",           0,
134
        undef,        undef,         0,                    undef,
134
        undef,        undef,         0,                    undef,
(-)a/t/db_dependent/Letters.t (-6 / +6 lines)
Lines 859-870 subtest 'SendAlerts - claimissue' => sub { Link Here
859
    );
859
    );
860
860
861
    my $subscriptionid = NewSubscription(
861
    my $subscriptionid = NewSubscription(
862
        undef,        "",       $booksellerid, undef,        undef, $biblionumber,
862
        undef,        "",       $booksellerid, undef,      undef, $biblionumber,
863
        '2013-01-01', 1,        undef,         undef,        undef,
863
        '2013-01-01', 1,        undef,         undef,      undef,
864
        undef,        undef,    undef,         undef,        undef, undef,
864
        undef,        undef,    undef,         undef,      undef, undef,
865
        1,            'public', undef,         '2013-01-01', undef, $number_pattern->id,
865
        1,            'public', undef,         undef,      '2013-01-01', undef, $number_pattern->id,
866
        undef,        undef,    0,             'internal',   0,
866
        undef,        undef,    0,             'internal', 0,
867
        undef,        undef,    0,             undef,        '2013-12-31', 0
867
        undef,        undef,    0,             undef,      '2013-12-31', 0
868
    );
868
    );
869
869
870
    my ( $serials_count, @serials ) = GetSerials($subscriptionid);
870
    my ( $serials_count, @serials ) = GetSerials($subscriptionid);
(-)a/t/db_dependent/Serials.t (-9 / +11 lines)
Lines 116-121 my $subscriptionid = NewSubscription( Link Here
116
    1,
116
    1,
117
    $notes,
117
    $notes,
118
    undef,
118
    undef,
119
    undef,
119
    '2013-01-01',
120
    '2013-01-01',
120
    undef,
121
    undef,
121
    $pattern_id,
122
    $pattern_id,
Lines 156-161 NewSubscription( Link Here
156
    1,
157
    1,
157
    $notes,
158
    $notes,
158
    undef,
159
    undef,
160
    undef,
159
    '2013-01-02',
161
    '2013-01-02',
160
    undef,
162
    undef,
161
    $pattern_id,
163
    $pattern_id,
Lines 285-295 if ( not $frequency->{unit} ) { Link Here
285
    ModSubscription(
287
    ModSubscription(
286
        @$subscriptioninformation{
288
        @$subscriptioninformation{
287
            qw(
289
            qw(
288
                librarian branchcode aqbooksellerid cost aqbudgetid startdate
290
                manager_id branchcode aqbooksellerid cost aqbudgetid startdate
289
                periodicity firstacquidate irregularity numberpattern locale
291
                periodicity firstacquidate irregularity numberpattern locale
290
                numberlength weeklength monthlength lastvalue1 innerloop1 lastvalue2
292
                numberlength weeklength monthlength lastvalue1 innerloop1 lastvalue2
291
                innerloop2 lastvalue3 innerloop3 status biblionumber callnumber notes
293
                innerloop2 lastvalue3 innerloop3 status biblionumber callnumber notes
292
                letter manualhistory internalnotes serialsadditems staffdisplaycount
294
                letter late_issue_letter_code manualhistory internalnotes serialsadditems staffdisplaycount
293
                opacdisplaycount graceperiod location enddate subscriptionid
295
                opacdisplaycount graceperiod location enddate subscriptionid
294
                skip_serialseq itemtype previousitemtype mana_id ccode
296
                skip_serialseq itemtype previousitemtype mana_id ccode
295
            )
297
            )
Lines 353-363 if ($old_frequency) { Link Here
353
    ModSubscription(
355
    ModSubscription(
354
        @$subscriptioninformation{
356
        @$subscriptioninformation{
355
            qw(
357
            qw(
356
                librarian branchcode aqbooksellerid cost aqbudgetid startdate
358
                manager_id branchcode aqbooksellerid cost aqbudgetid startdate
357
                periodicity firstacquidate irregularity numberpattern locale
359
                periodicity firstacquidate irregularity numberpattern locale
358
                numberlength weeklength monthlength lastvalue1 innerloop1 lastvalue2
360
                numberlength weeklength monthlength lastvalue1 innerloop1 lastvalue2
359
                innerloop2 lastvalue3 innerloop3 status biblionumber callnumber notes
361
                innerloop2 lastvalue3 innerloop3 status biblionumber callnumber notes
360
                letter manualhistory internalnotes serialsadditems staffdisplaycount
362
                letter late_issue_letter_code manualhistory internalnotes serialsadditems staffdisplaycount
361
                opacdisplaycount graceperiod location enddate subscriptionid
363
                opacdisplaycount graceperiod location enddate subscriptionid
362
                skip_serialseq
364
                skip_serialseq
363
            )
365
            )
Lines 532-538 $subscriptionid = NewSubscription( Link Here
532
    undef,        "",            undef, undef,          $budget_id, $biblionumber,
534
    undef,        "",            undef, undef,          $budget_id, $biblionumber,
533
    '2013-01-01', $frequency_id, undef, undef,          undef,
535
    '2013-01-01', $frequency_id, undef, undef,          undef,
534
    undef,        undef,         undef, undef,          undef, undef,
536
    undef,        undef,         undef, undef,          undef, undef,
535
    1,            $notes,        undef, '2013-01-01',   undef, $pattern_id,
537
    1,            $notes,        undef, undef,          '2013-01-01', undef, $pattern_id,
536
    undef,        undef,         0,     $internalnotes, 0,
538
    undef,        undef,         0,     $internalnotes, 0,
537
    undef,        undef,         0,     undef,          '2013-12-31', 0
539
    undef,        undef,         0,     undef,          '2013-12-31', 0
538
);
540
);
Lines 664-673 subtest "PreserveSerialNotes preference" => sub { Link Here
664
subtest "NewSubscription|ModSubscription" => sub {
666
subtest "NewSubscription|ModSubscription" => sub {
665
    plan tests => 4;
667
    plan tests => 4;
666
    my $subscriptionid = NewSubscription(
668
    my $subscriptionid = NewSubscription(
667
        "",           "",            "", "",             $budget_id, $biblionumber,
669
        undef,        "",            "", "",             $budget_id, $biblionumber,
668
        '2013-01-01', $frequency_id, "", "",             "",
670
        '2013-01-01', $frequency_id, "", "",             "",
669
        "",           "",            "", "",             "", "",
671
        "",           "",            "", "",             "", "",
670
        1,            $notes,        "", '2013-01-01',   "", $pattern_id,
672
        1,            $notes,        "", undef,          '2013-01-01', "", $pattern_id,
671
        "",           "",            0,  $internalnotes, 0,
673
        "",           "",            0,  $internalnotes, 0,
672
        "",           "",            0,  "",             '2013-12-31', 0
674
        "",           "",            0,  "",             '2013-12-31', 0
673
    );
675
    );
Lines 683-693 subtest "NewSubscription|ModSubscription" => sub { Link Here
683
    ModSubscription(
685
    ModSubscription(
684
        @$subscription_info{
686
        @$subscription_info{
685
            qw(
687
            qw(
686
                librarian branchcode aqbooksellerid cost aqbudgetid startdate
688
                manager_id branchcode aqbooksellerid cost aqbudgetid startdate
687
                periodicity firstacquidate irregularity numberpattern locale
689
                periodicity firstacquidate irregularity numberpattern locale
688
                numberlength weeklength monthlength lastvalue1 innerloop1 lastvalue2
690
                numberlength weeklength monthlength lastvalue1 innerloop1 lastvalue2
689
                innerloop2 lastvalue3 innerloop3 status biblionumber callnumber notes
691
                innerloop2 lastvalue3 innerloop3 status biblionumber callnumber notes
690
                letter manualhistory internalnotes serialsadditems staffdisplaycount
692
                letter late_issue_letter_code manualhistory internalnotes serialsadditems staffdisplaycount
691
                opacdisplaycount graceperiod location enddate subscriptionid
693
                opacdisplaycount graceperiod location enddate subscriptionid
692
                skip_serialseq
694
                skip_serialseq
693
            )
695
            )
(-)a/t/db_dependent/Serials/Claims.t (-24 / +24 lines)
Lines 92-132 is( length($@), 0, "No SQL problem in GetSuppliersWithLateIssues" ); Link Here
92
is( scalar(@$supplierlist), 0, 'There is no late issues yet' );
92
is( scalar(@$supplierlist), 0, 'There is no late issues yet' );
93
93
94
my $subscriptionid_not_late = NewSubscription(
94
my $subscriptionid_not_late = NewSubscription(
95
    undef,        $branchcode, $supplier_id1, undef,        $budget_id, $biblionumber,
95
    undef,        $branchcode, $supplier_id1, undef,      $budget_id, $biblionumber,
96
    '2013-01-01', undef,       undef,         undef,        undef,
96
    '2013-01-01', undef,       undef,         undef,      undef,
97
    undef,        undef,       undef,         undef,        undef, undef,
97
    undef,        undef,       undef,         undef,      undef, undef,
98
    1,            "notes",     undef,         '9999-01-01', undef, undef,
98
    1,            "notes",     undef,         undef,      '9999-01-01', undef, undef,
99
    undef,        undef,       0,             "intnotes",   0,
99
    undef,        undef,       0,             "intnotes", 0,
100
    undef,        undef,       0,             undef,        '2013-12-31', 0
100
    undef,        undef,       0,             undef,      '2013-12-31', 0
101
);
101
);
102
$supplierlist = GetSuppliersWithLateIssues();
102
$supplierlist = GetSuppliersWithLateIssues();
103
is( scalar(@$supplierlist), 0, 'There is still no late issues yet' );
103
is( scalar(@$supplierlist), 0, 'There is still no late issues yet' );
104
104
105
my $subscriptionid_inlate1 = NewSubscription(
105
my $subscriptionid_inlate1 = NewSubscription(
106
    undef,        $branchcode, $supplier_id1, undef,        $budget_id, $biblionumber,
106
    undef,        $branchcode, $supplier_id1, undef,      $budget_id, $biblionumber,
107
    '2013-01-01', undef,       undef,         undef,        undef,
107
    '2013-01-01', undef,       undef,         undef,      undef,
108
    undef,        undef,       undef,         undef,        undef, undef,
108
    undef,        undef,       undef,         undef,      undef, undef,
109
    1,            "notes",     undef,         '2013-01-01', undef, undef,
109
    1,            "notes",     undef,         undef,      '2013-01-01', undef, undef,
110
    undef,        undef,       0,             "intnotes",   0,
110
    undef,        undef,       0,             "intnotes", 0,
111
    undef,        undef,       0,             undef,        '2013-12-31', 0
111
    undef,        undef,       0,             undef,      '2013-12-31', 0
112
);
112
);
113
113
114
my $subscriptionid_inlate2 = NewSubscription(
114
my $subscriptionid_inlate2 = NewSubscription(
115
    undef,        $branchcode, $supplier_id2, undef,        $budget_id, $biblionumber,
115
    undef,        $branchcode, $supplier_id2, undef,      $budget_id, $biblionumber,
116
    '2013-01-01', undef,       undef,         undef,        undef,
116
    '2013-01-01', undef,       undef,         undef,      undef,
117
    undef,        undef,       undef,         undef,        undef, undef,
117
    undef,        undef,       undef,         undef,      undef, undef,
118
    1,            "notes",     undef,         '2013-01-01', undef, undef,
118
    1,            "notes",     undef,         undef,      '2013-01-01', undef, undef,
119
    undef,        undef,       0,             "intnotes",   0,
119
    undef,        undef,       0,             "intnotes", 0,
120
    undef,        undef,       0,             undef,        '2013-12-31', 0
120
    undef,        undef,       0,             undef,      '2013-12-31', 0
121
);
121
);
122
122
123
my $subscriptionid_inlate3 = NewSubscription(
123
my $subscriptionid_inlate3 = NewSubscription(
124
    undef,        $branchcode, $supplier_id2, undef,        $budget_id, $biblionumber,
124
    undef,        $branchcode, $supplier_id2, undef,      $budget_id, $biblionumber,
125
    '2013-01-02', undef,       undef,         undef,        undef,
125
    '2013-01-02', undef,       undef,         undef,      undef,
126
    undef,        undef,       undef,         undef,        undef, undef,
126
    undef,        undef,       undef,         undef,      undef, undef,
127
    1,            "notes",     undef,         '2013-01-02', undef, undef,
127
    1,            "notes",     undef,         undef,      '2013-01-02', undef, undef,
128
    undef,        undef,       0,             "intnotes",   0,
128
    undef,        undef,       0,             "intnotes", 0,
129
    undef,        undef,       0,             undef,        '2013-12-31', 0
129
    undef,        undef,       0,             undef,      '2013-12-31', 0
130
);
130
);
131
131
132
$supplierlist = GetSuppliersWithLateIssues();
132
$supplierlist = GetSuppliersWithLateIssues();
(-)a/t/db_dependent/Serials_2.t (-13 / +12 lines)
Lines 61-82 my $budget_id = AddBudget( Link Here
61
);
61
);
62
62
63
my $subscriptionid_from_my_branch = NewSubscription(
63
my $subscriptionid_from_my_branch = NewSubscription(
64
    undef,        $my_branch, undef, undef,        $budget_id, $biblionumber,
64
    undef,        $my_branch, undef, undef,      $budget_id, $biblionumber,
65
    '2013-01-01', undef,      undef, undef,        undef,
65
    '2013-01-01', undef,      undef, undef,      undef,
66
    undef,        undef,      undef, undef,        undef, undef,
66
    undef,        undef,      undef, undef,      undef, undef,
67
    1,            "notes",    undef, '2013-01-01', undef, undef,
67
    1,            "notes",    undef, undef,      '2013-01-01', undef, undef,
68
    undef,        undef,      0,     "intnotes",   0,
68
    undef,        undef,      0,     "intnotes", 0,
69
    undef,        undef,      0,     undef,        '2013-12-31', 0
69
    undef,        undef,      0,     undef,      '2013-12-31', 0
70
);
70
);
71
die unless $subscriptionid_from_my_branch;
71
die unless $subscriptionid_from_my_branch;
72
72
73
my $subscriptionid_from_another_branch = NewSubscription(
73
my $subscriptionid_from_another_branch = NewSubscription(
74
    undef,        $another_branch, undef, undef,        $budget_id, $biblionumber,
74
    undef,        $another_branch, undef, undef,      $budget_id, $biblionumber,
75
    '2013-01-01', undef,           undef, undef,        undef,
75
    '2013-01-01', undef,           undef, undef,      undef,
76
    undef,        undef,           undef, undef,        undef, undef,
76
    undef,        undef,           undef, undef,      undef, undef,
77
    1,            "notes",         undef, '2013-01-01', undef, undef,
77
    1,            "notes",         undef, undef,      '2013-01-01', undef, undef,
78
    undef,        undef,           0,     "intnotes",   0,
78
    undef,        undef,           0,     "intnotes", 0,
79
    undef,        undef,           0,     undef,        '2013-12-31', 0
79
    undef,        undef,           0,     undef,      '2013-12-31', 0
80
);
80
);
81
81
82
my $subscription_from_my_branch = GetSubscription($subscriptionid_from_my_branch);
82
my $subscription_from_my_branch = GetSubscription($subscriptionid_from_my_branch);
83
- 

Return to bug 29997