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

(-)a/C4/Items.pm (-37 / +16 lines)
Lines 73-78 use Koha::AuthorisedValues; Link Here
73
use Koha::DateUtils qw(dt_from_string);
73
use Koha::DateUtils qw(dt_from_string);
74
use Koha::Database;
74
use Koha::Database;
75
75
76
use Koha::Biblios;
76
use Koha::Biblioitems;
77
use Koha::Biblioitems;
77
use Koha::Items;
78
use Koha::Items;
78
use Koha::ItemTypes;
79
use Koha::ItemTypes;
Lines 1650-1656 sub _koha_new_item { Link Here
1650
1651
1651
=head2 MoveItemFromBiblio
1652
=head2 MoveItemFromBiblio
1652
1653
1653
  MoveItemFromBiblio($itenumber, $frombiblio, $tobiblio);
1654
  MoveItemFromBiblio($itemnumber, $frombiblio, $tobiblio);
1654
1655
1655
Moves an item from a biblio to another
1656
Moves an item from a biblio to another
1656
1657
Lines 1660-1701 Returns undef if the move failed or the biblionumber of the destination record o Link Here
1660
1661
1661
sub MoveItemFromBiblio {
1662
sub MoveItemFromBiblio {
1662
    my ($itemnumber, $frombiblio, $tobiblio) = @_;
1663
    my ($itemnumber, $frombiblio, $tobiblio) = @_;
1663
    my $dbh = C4::Context->dbh;
1664
1664
    my ( $tobiblioitem ) = $dbh->selectrow_array(q|
1665
    my $item = Koha::Items->find($itemnumber);
1665
        SELECT biblioitemnumber
1666
    return unless $item;
1666
        FROM biblioitems
1667
1667
        WHERE biblionumber = ?
1668
    my $biblio = Koha::Biblios->find($tobiblio);
1668
    |, undef, $tobiblio );
1669
    return unless $biblio;
1669
    my $return = $dbh->do(q|
1670
1670
        UPDATE items
1671
    return unless $item->biblionumber != $biblio->biblionumber;
1671
        SET biblioitemnumber = ?,
1672
1672
            biblionumber = ?
1673
    $item->move_to_biblio($biblio);
1673
        WHERE itemnumber = ?
1674
    ModZebra($tobiblio, 'specialUpdate', 'biblioserver');
1674
            AND biblionumber = ?
1675
    ModZebra($frombiblio, 'specialUpdate', 'biblioserver');
1675
    |, undef, $tobiblioitem, $tobiblio, $itemnumber, $frombiblio );
1676
1676
    if ($return == 1) {
1677
    return $tobiblio;
1677
        ModZebra( $tobiblio, "specialUpdate", "biblioserver" );
1678
        ModZebra( $frombiblio, "specialUpdate", "biblioserver" );
1679
	    # Checking if the item we want to move is in an order 
1680
        require C4::Acquisition;
1681
        my $order = C4::Acquisition::GetOrderFromItemnumber($itemnumber);
1682
	    if ($order) {
1683
		    # Replacing the biblionumber within the order if necessary
1684
		    $order->{'biblionumber'} = $tobiblio;
1685
	        C4::Acquisition::ModOrder($order);
1686
	    }
1687
1688
        # Update reserves, hold_fill_targets, tmp_holdsqueue and linktracker tables
1689
        for my $table_name ( qw( reserves hold_fill_targets tmp_holdsqueue linktracker ) ) {
1690
            $dbh->do( qq|
1691
                UPDATE $table_name
1692
                SET biblionumber = ?
1693
                WHERE itemnumber = ?
1694
            |, undef, $tobiblio, $itemnumber );
1695
        }
1696
        return $tobiblio;
1697
	}
1698
    return;
1699
}
1678
}
1700
1679
1701
=head2 ItemSafeToDelete
1680
=head2 ItemSafeToDelete
(-)a/Koha/Biblio.pm (+21 lines)
Lines 659-664 sub is_serial { Link Here
659
    return 0;
659
    return 0;
660
}
660
}
661
661
662
=head3 move_items_from_biblio
663
664
$biblio->move_items_from_biblio($from_biblio);
665
666
Move items from the given biblio
667
668
=cut
669
670
sub move_items_from_biblio {
671
    my ( $self, $from_biblio ) = @_;
672
673
    my $items = $from_biblio->items;
674
    if ($items) {
675
        while (my $item = $items->next()) {
676
            $item->move_to_biblio($self);
677
        }
678
        C4::Biblio::ModZebra( $self->biblionumber, "specialUpdate", "biblioserver" );
679
        C4::Biblio::ModZebra( $from_biblio->biblionumber, "specialUpdate", "biblioserver" );
680
    }
681
}
682
662
=head3 type
683
=head3 type
663
684
664
=cut
685
=cut
(-)a/Koha/Item.pm (+56 lines)
Lines 385-390 sub has_pending_hold { Link Here
385
    return !C4::Context->preference('AllowItemsOnHoldCheckout') && $pending_hold->count ? 1: 0;
385
    return !C4::Context->preference('AllowItemsOnHoldCheckout') && $pending_hold->count ? 1: 0;
386
}
386
}
387
387
388
=head3 move_to_biblio
389
390
  $item->move_to_biblio($to_biblio);
391
392
Move the item to another biblio and update any references also in other tables.
393
394
=cut
395
396
sub move_to_biblio {
397
    my ( $self, $to_biblio ) = @_;
398
399
    my $biblionumber = $to_biblio->biblionumber;
400
401
    # Own biblionumber and biblioitemnumber
402
    $self->set({
403
        biblionumber => $biblionumber,
404
        biblioitemnumber => $to_biblio->biblioitem->biblioitemnumber
405
    })->store();
406
407
    my $schema = Koha::Database->new()->schema();
408
409
    # Acquisition orders related to the item
410
    my $orders = $schema->resultset('Aqorder')->search(
411
        { itemnumber => $self->itemnumber },
412
        { join => 'aqorders_items'}
413
    );
414
    $orders->update_all({ biblionumber => $biblionumber });
415
416
    # reserves
417
    my $reserves = $self->_result->reserves;
418
    $reserves->update_all({ biblionumber => $biblionumber });
419
420
    # hold_fill_target
421
    my $hold_fill_target = $self->_result->hold_fill_target;
422
    if ($hold_fill_target) {
423
        $hold_fill_target->update({ biblionumber => $biblionumber });
424
    }
425
426
    # tmp_holdsqueues - Can't update with DBIx since the table is missing a primary key
427
    # and can't even fake one since the significant columns are nullable.
428
    my $storage = $self->_result->result_source->storage;
429
    $storage->dbh_do(
430
        sub {
431
            my ($storage, $dbh, @cols) = @_;
432
433
            $dbh->do("UPDATE tmp_holdsqueue SET biblionumber=? WHERE itemnumber=?", undef, $biblionumber, $self->itemnumber);
434
        }
435
    );
436
    #my $tmp_holdsqueues = $self->_result->tmp_holdsqueues;
437
    #$tmp_holdsqueues->update_all({ biblionumber => $biblionumber });
438
439
    # linktrackers
440
    my $linktrackers = $schema->resultset('Linktracker')->search({ itemnumber => $self->itemnumber });
441
    $linktrackers->update_all({ biblionumber => $biblionumber });
442
}
443
388
=head2 Internal methods
444
=head2 Internal methods
389
445
390
=head3 _type
446
=head3 _type
(-)a/cataloguing/merge.pl (-14 / +11 lines)
Lines 31-36 use C4::Reserves qw/MergeHolds/; Link Here
31
use C4::Acquisition qw/ModOrder GetOrdersByBiblionumber/;
31
use C4::Acquisition qw/ModOrder GetOrdersByBiblionumber/;
32
32
33
use Koha::BiblioFrameworks;
33
use Koha::BiblioFrameworks;
34
use Koha::Biblios;
34
use Koha::Items;
35
use Koha::Items;
35
use Koha::MetadataRecord;
36
use Koha::MetadataRecord;
36
37
Lines 81-105 if ($merge) { Link Here
81
    $record->leader(GetMarcBiblio({ biblionumber => $ref_biblionumber })->leader());
82
    $record->leader(GetMarcBiblio({ biblionumber => $ref_biblionumber })->leader());
82
83
83
    my $frameworkcode = $input->param('frameworkcode');
84
    my $frameworkcode = $input->param('frameworkcode');
84
    my @notmoveditems;
85
85
86
    # Modifying the reference record
86
    # Modifying the reference record
87
    ModBiblio($record, $ref_biblionumber, $frameworkcode);
87
    ModBiblio($record, $ref_biblionumber, $frameworkcode);
88
88
89
    # Moving items from the other record to the reference record
89
    # Moving items from the other record to the reference record
90
    my $biblio = Koha::Biblios->find($ref_biblionumber);
90
    foreach my $biblionumber (@biblionumbers) {
91
    foreach my $biblionumber (@biblionumbers) {
91
        my $items = Koha::Items->search({ biblionumber => $biblionumber });
92
        my $from_biblio = Koha::Biblios->find($biblionumber);
92
        while ( my $item = $items->next) {
93
        $biblio->move_items_from_biblio($from_biblio);
93
            my $res = MoveItemFromBiblio( $item->itemnumber, $biblionumber, $ref_biblionumber );
94
            if ( not defined $res ) {
95
                push @notmoveditems, $item->itemnumber;
96
            }
97
        }
98
    }
99
    # If some items could not be moved :
100
    if (scalar(@notmoveditems) > 0) {
101
        my $itemlist = join(' ',@notmoveditems);
102
        push @errors, { code => "CANNOT_MOVE", value => $itemlist };
103
    }
94
    }
104
95
105
    my $sth_subscription = $dbh->prepare("
96
    my $sth_subscription = $dbh->prepare("
Lines 114-119 if ($merge) { Link Here
114
    my $sth_suggestions = $dbh->prepare("
105
    my $sth_suggestions = $dbh->prepare("
115
        UPDATE suggestions SET biblionumber = ? WHERE biblionumber = ?
106
        UPDATE suggestions SET biblionumber = ? WHERE biblionumber = ?
116
    ");
107
    ");
108
    my $sth_articlerequests = $dbh->prepare("
109
        UPDATE article_requests SET biblionumber = ? WHERE biblionumber = ?
110
    ");
117
111
118
    my $report_header = {};
112
    my $report_header = {};
119
    foreach my $biblionumber ($ref_biblionumber, @biblionumbers) {
113
    foreach my $biblionumber ($ref_biblionumber, @biblionumbers) {
Lines 163-169 if ($merge) { Link Here
163
    # Moving suggestions
157
    # Moving suggestions
164
    $sth_suggestions->execute($ref_biblionumber, $biblionumber);
158
    $sth_suggestions->execute($ref_biblionumber, $biblionumber);
165
159
166
    # Moving orders (orders linked to items of frombiblio have already been moved by MoveItemFromBiblio)
160
    # Moving article requests
161
    $sth_articlerequests->execute($ref_biblionumber, $biblionumber);
162
163
    # Moving orders (orders linked to items of frombiblio have already been moved by move_items_from_biblio)
167
    my @allorders = GetOrdersByBiblionumber($biblionumber);
164
    my @allorders = GetOrdersByBiblionumber($biblionumber);
168
    foreach my $myorder (@allorders) {
165
    foreach my $myorder (@allorders) {
169
        $myorder->{'biblionumber'} = $ref_biblionumber;
166
        $myorder->{'biblionumber'} = $ref_biblionumber;
(-)a/t/db_dependent/Items/MoveItemFromBiblio.t (+3 lines)
Lines 25-36 use Koha::Holds; Link Here
25
use Koha::Items;
25
use Koha::Items;
26
26
27
use t::lib::TestBuilder;
27
use t::lib::TestBuilder;
28
use t::lib::Mocks;
28
use Data::Dumper qw|Dumper|;
29
use Data::Dumper qw|Dumper|;
29
30
30
my $schema  = Koha::Database->new->schema;
31
my $schema  = Koha::Database->new->schema;
31
$schema->storage->txn_begin;
32
$schema->storage->txn_begin;
32
my $builder = t::lib::TestBuilder->new;
33
my $builder = t::lib::TestBuilder->new;
33
34
35
t::lib::Mocks::mock_preference( 'SearchEngine', 'Zebra' );
36
34
# NOTE This is a trick, if we want to populate the biblioitems table, we should not create a Biblio but a Biblioitem
37
# NOTE This is a trick, if we want to populate the biblioitems table, we should not create a Biblio but a Biblioitem
35
my $param = { source => 'Biblioitem' };
38
my $param = { source => 'Biblioitem' };
36
my $from_biblio = {
39
my $from_biblio = {
(-)a/t/db_dependent/Koha/Item.t (-2 / +107 lines)
Lines 19-25 Link Here
19
19
20
use Modern::Perl;
20
use Modern::Perl;
21
21
22
use Test::More tests => 2;
22
use Test::More tests => 3;
23
23
24
use Koha::Items;
24
use Koha::Items;
25
use Koha::Database;
25
use Koha::Database;
Lines 81-84 subtest 'has_pending_hold() tests' => sub { Link Here
81
    t::lib::Mocks::mock_preference( 'AllowItemsOnHoldCheckout', 0 );
81
    t::lib::Mocks::mock_preference( 'AllowItemsOnHoldCheckout', 0 );
82
    $dbh->do("DELETE FROM tmp_holdsqueue WHERE itemnumber=$itemnumber");
82
    $dbh->do("DELETE FROM tmp_holdsqueue WHERE itemnumber=$itemnumber");
83
    ok( !$item->has_pending_hold, "We don't have a pending hold if nothing in the tmp_holdsqueue");
83
    ok( !$item->has_pending_hold, "We don't have a pending hold if nothing in the tmp_holdsqueue");
84
85
    $schema->storage->txn_rollback;
86
};
87
88
subtest 'move_items_from_biblio() tests' => sub {
89
90
    plan tests => 12;
91
92
    $schema->storage->txn_begin;
93
94
    my $dbh = C4::Context->dbh;
95
96
    my $source_biblio = $builder->build_sample_biblio();
97
    my $target_biblio = $builder->build_sample_biblio();
98
99
    my $source_biblionumber = $source_biblio->biblionumber;
100
101
    my $item1 = $builder->build_sample_item({ biblionumber => $source_biblionumber });
102
    my $item2 = $builder->build_sample_item({ biblionumber => $source_biblionumber });
103
104
    my $itemnumber1 = $item1->itemnumber;
105
    my $itemnumber2 = $item2->itemnumber;
106
107
    my $library = $builder->build_object({ class => 'Koha::Libraries' });
108
109
    my $patron = $builder->build_object({
110
        class => 'Koha::Patrons',
111
        value => { branchcode => $library->branchcode, }
112
    });
113
    my $borrowernumber = $patron->borrowernumber;
114
115
    $dbh->do("INSERT INTO aqbudgets (budget_notes) VALUES ('test')");
116
    my $budget_id = $dbh->last_insert_id(undef, undef, 'aqbudgets', 'budget_id');
117
118
    $dbh->do('INSERT INTO aqorders (biblionumber, budget_id) VALUES (?, ?)', undef, $source_biblionumber, $budget_id);
119
    my $ordernumber1 = $dbh->last_insert_id(undef, undef, 'aqorders', 'ordernumber');
120
    $dbh->do('INSERT INTO aqorders_items (ordernumber, itemnumber) VALUES (?, ?)', undef, $ordernumber1, $itemnumber1);
121
122
    $dbh->do('INSERT INTO aqorders (biblionumber, budget_id) VALUES (?, ?)', undef, $source_biblionumber, $budget_id);
123
    my $ordernumber2 = $dbh->last_insert_id(undef, undef, 'aqorders', 'ordernumber');
124
    $dbh->do('INSERT INTO aqorders_items (ordernumber, itemnumber) VALUES (?, ?)', undef, $ordernumber2, $source_biblionumber);
125
126
    my $reserve_id1 = C4::Reserves::AddReserve(
127
        $library->branchcode, $borrowernumber,
128
        $source_biblionumber, '',
129
        1,                    undef,
130
        undef,                '',
131
        "title",              $itemnumber1,
132
    );
133
134
    my $reserve_id2 = C4::Reserves::AddReserve(
135
        $library->branchcode, $patron->borrowernumber,
136
        $source_biblionumber, '',
137
        1,                    undef,
138
        undef,                '',
139
        "title",              $itemnumber2,
140
    );
141
142
    $dbh->do("INSERT INTO tmp_holdsqueue (surname,borrowernumber,itemnumber,biblionumber) VALUES ('Clamp',?,?,?)", undef, $borrowernumber, $itemnumber1, $source_biblionumber);
143
    $dbh->do("INSERT INTO tmp_holdsqueue (surname,borrowernumber,itemnumber,biblionumber) VALUES ('Clamp',?,?,?)", undef, $borrowernumber, $itemnumber2, $source_biblionumber);
144
145
    $dbh->do('INSERT INTO hold_fill_targets (borrowernumber,itemnumber,biblionumber) VALUES (?,?,?)', undef, $borrowernumber, $itemnumber1, $source_biblionumber);
146
    $dbh->do('INSERT INTO hold_fill_targets (borrowernumber,itemnumber,biblionumber) VALUES (?,?,?)', undef, $borrowernumber, $itemnumber2, $source_biblionumber);
147
148
    $dbh->do('INSERT INTO linktracker (borrowernumber,itemnumber,biblionumber) VALUES (?,?,?)', undef, $borrowernumber, $itemnumber1, $source_biblionumber);
149
    $dbh->do('INSERT INTO linktracker (borrowernumber,itemnumber,biblionumber) VALUES (?,?,?)', undef, $borrowernumber, $itemnumber2, $source_biblionumber);
150
151
    $item1->move_to_biblio($target_biblio);
152
153
    my @result = $dbh->selectrow_array('SELECT biblionumber FROM items WHERE itemnumber = ?', undef, $itemnumber1);
154
    is($result[0], $target_biblio->biblionumber, 'Correct biblionumber in the moved item');
155
156
    @result = $dbh->selectrow_array('SELECT biblionumber FROM items WHERE itemnumber = ?', undef, $itemnumber2);
157
    is($result[0], $source_biblionumber, 'Correct biblionumber in the unmoved item');
158
159
    @result = $dbh->selectrow_array('SELECT biblionumber FROM aqorders WHERE ordernumber = ?', undef, $ordernumber1);
160
    is($result[0], $target_biblio->biblionumber, 'Correct biblionumber in aqorders for order with the moved item');
161
162
    @result = $dbh->selectrow_array('SELECT biblionumber FROM aqorders WHERE ordernumber = ?', undef, $ordernumber2);
163
    is($result[0], $source_biblionumber, 'Correct biblionumber in aqorders for order with the unmoved item');
164
165
    @result = $dbh->selectrow_array('SELECT biblionumber FROM reserves WHERE reserve_id = ?', undef, $reserve_id1);
166
    is($result[0], $target_biblio->biblionumber, 'Correct biblionumber in reserves for moved item');
167
168
    @result = $dbh->selectrow_array('SELECT biblionumber FROM reserves WHERE reserve_id = ?', undef, $reserve_id2);
169
    is($result[0], $source_biblionumber, 'Correct biblionumber in reserves for unmoved item');
170
171
    @result = $dbh->selectrow_array('SELECT biblionumber FROM tmp_holdsqueue WHERE itemnumber = ?', undef, $itemnumber1);
172
    is($result[0], $target_biblio->biblionumber, 'Correct biblionumber in tmp_holdsqueue for moved item');
173
174
    @result = $dbh->selectrow_array('SELECT biblionumber FROM tmp_holdsqueue WHERE itemnumber = ?', undef, $itemnumber2);
175
    is($result[0], $source_biblionumber, 'Correct biblionumber in tmp_holdsqueue for unmoved item');
176
177
    @result = $dbh->selectrow_array('SELECT biblionumber FROM hold_fill_targets WHERE itemnumber = ?', undef, $itemnumber1);
178
    is($result[0], $target_biblio->biblionumber, 'Correct biblionumber in hold_fill_targets for moved item');
179
180
    @result = $dbh->selectrow_array('SELECT biblionumber FROM hold_fill_targets WHERE itemnumber = ?', undef, $itemnumber2);
181
    is($result[0], $source_biblionumber, 'Correct biblionumber in hold_fill_targets for unmoved item');
182
183
    @result = $dbh->selectrow_array('SELECT biblionumber FROM linktracker WHERE itemnumber = ?', undef, $itemnumber1);
184
    is($result[0], $target_biblio->biblionumber, 'Correct biblionumber in linktracker for moved item');
185
186
    @result = $dbh->selectrow_array('SELECT biblionumber FROM linktracker WHERE itemnumber = ?', undef, $itemnumber2);
187
    is($result[0], $source_biblionumber, 'Correct biblionumber in linktracker for unmoved item');
188
189
    $schema->storage->txn_rollback;
84
};
190
};
85
- 

Return to bug 22690