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

(-)a/Koha/Subscription/Frequency.pm (-4 lines)
Lines 25-35 use base qw(Koha::Object); Link Here
25
25
26
=head1 NAME
26
=head1 NAME
27
27
28
<<<<<<< b4c9007cc708d995838eae801a5a24b47435095e
29
Koha::Subscription::Frequency - Koha Subscription Frequency Object class
30
=======
31
Koha::Subscription::Frequency - Koha Subscription::Frequency Object class
28
Koha::Subscription::Frequency - Koha Subscription::Frequency Object class
32
>>>>>>> Bug 17047 subscriptions management with Mana-KB
33
29
34
=head1 API
30
=head1 API
35
31
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/mana/mana-report-search-result.inc (+1 lines)
Lines 2-7 Link Here
2
[% USE Koha %]
2
[% USE Koha %]
3
[% USE AuthorisedValues %]
3
[% USE AuthorisedValues %]
4
[% USE Branches %]
4
[% USE Branches %]
5
[% USE raw %]
5
6
6
<script type="text/javascript">
7
<script type="text/javascript">
7
//<![CDATA[
8
//<![CDATA[
(-)a/t/db_dependent/Koha/Subscription.t (-1 / +2 lines)
Lines 32-37 use t::lib::TestBuilder; Link Here
32
my $schema = Koha::Database->new->schema;
32
my $schema = Koha::Database->new->schema;
33
$schema->storage->txn_begin;
33
$schema->storage->txn_begin;
34
34
35
my $builder     = t::lib::TestBuilder->new;
36
35
use_ok('Koha::Subscription');
37
use_ok('Koha::Subscription');
36
38
37
subtest 'Koha::Subscription->biblio' => sub {
39
subtest 'Koha::Subscription->biblio' => sub {
38
- 

Return to bug 17047