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

(-)a/C4/Items.pm (-37 / +16 lines)
Lines 72-77 use Koha::AuthorisedValues; Link Here
72
use Koha::DateUtils qw(dt_from_string);
72
use Koha::DateUtils qw(dt_from_string);
73
use Koha::Database;
73
use Koha::Database;
74
74
75
use Koha::Biblios;
75
use Koha::Biblioitems;
76
use Koha::Biblioitems;
76
use Koha::Items;
77
use Koha::Items;
77
use Koha::ItemTypes;
78
use Koha::ItemTypes;
Lines 1648-1654 sub _koha_new_item { Link Here
1648
1649
1649
=head2 MoveItemFromBiblio
1650
=head2 MoveItemFromBiblio
1650
1651
1651
  MoveItemFromBiblio($itenumber, $frombiblio, $tobiblio);
1652
  MoveItemFromBiblio($itemnumber, $frombiblio, $tobiblio);
1652
1653
1653
Moves an item from a biblio to another
1654
Moves an item from a biblio to another
1654
1655
Lines 1658-1699 Returns undef if the move failed or the biblionumber of the destination record o Link Here
1658
1659
1659
sub MoveItemFromBiblio {
1660
sub MoveItemFromBiblio {
1660
    my ($itemnumber, $frombiblio, $tobiblio) = @_;
1661
    my ($itemnumber, $frombiblio, $tobiblio) = @_;
1661
    my $dbh = C4::Context->dbh;
1662
1662
    my ( $tobiblioitem ) = $dbh->selectrow_array(q|
1663
    my $item = Koha::Items->find($itemnumber);
1663
        SELECT biblioitemnumber
1664
    return unless $item;
1664
        FROM biblioitems
1665
1665
        WHERE biblionumber = ?
1666
    my $biblio = Koha::Biblios->find($tobiblio);
1666
    |, undef, $tobiblio );
1667
    return unless $biblio;
1667
    my $return = $dbh->do(q|
1668
1668
        UPDATE items
1669
    return unless $item->biblionumber != $biblio->biblionumber;
1669
        SET biblioitemnumber = ?,
1670
1670
            biblionumber = ?
1671
    $item->move_to_biblio($biblio);
1671
        WHERE itemnumber = ?
1672
    ModZebra($tobiblio, 'specialUpdate', 'biblioserver');
1672
            AND biblionumber = ?
1673
    ModZebra($frombiblio, 'specialUpdate', 'biblioserver');
1673
    |, undef, $tobiblioitem, $tobiblio, $itemnumber, $frombiblio );
1674
1674
    if ($return == 1) {
1675
    return $tobiblio;
1675
        ModZebra( $tobiblio, "specialUpdate", "biblioserver" );
1676
        ModZebra( $frombiblio, "specialUpdate", "biblioserver" );
1677
	    # Checking if the item we want to move is in an order 
1678
        require C4::Acquisition;
1679
        my $order = C4::Acquisition::GetOrderFromItemnumber($itemnumber);
1680
	    if ($order) {
1681
		    # Replacing the biblionumber within the order if necessary
1682
		    $order->{'biblionumber'} = $tobiblio;
1683
	        C4::Acquisition::ModOrder($order);
1684
	    }
1685
1686
        # Update reserves, hold_fill_targets, tmp_holdsqueue and linktracker tables
1687
        for my $table_name ( qw( reserves hold_fill_targets tmp_holdsqueue linktracker ) ) {
1688
            $dbh->do( qq|
1689
                UPDATE $table_name
1690
                SET biblionumber = ?
1691
                WHERE itemnumber = ?
1692
            |, undef, $tobiblio, $itemnumber );
1693
        }
1694
        return $tobiblio;
1695
	}
1696
    return;
1697
}
1676
}
1698
1677
1699
=head2 ItemSafeToDelete
1678
=head2 ItemSafeToDelete
(-)a/Koha/Biblio.pm (+22 lines)
Lines 847-852 sub to_api_mapping { Link Here
847
    };
847
    };
848
}
848
}
849
849
850
=head3 move_items_from_biblio
851
852
$biblio->move_items_from_biblio($from_biblio);
853
854
Move items from the given biblio
855
856
=cut
857
858
sub move_items_from_biblio {
859
    my ( $self, $from_biblio ) = @_;
860
861
    my $items = $from_biblio->items;
862
    if ($items) {
863
        while (my $item = $items->next()) {
864
            $item->move_to_biblio($self);
865
        }
866
        C4::Biblio::ModZebra( $self->biblionumber, "specialUpdate", "biblioserver" );
867
        C4::Biblio::ModZebra( $from_biblio->biblionumber, "specialUpdate", "biblioserver" );
868
    }
869
}
870
871
850
=head2 Internal methods
872
=head2 Internal methods
851
873
852
=head3 type
874
=head3 type
(-)a/Koha/Item.pm (+56 lines)
Lines 540-545 sub to_api_mapping { Link Here
540
    };
540
    };
541
}
541
}
542
542
543
=head3 move_to_biblio
544
545
  $item->move_to_biblio($to_biblio);
546
547
Move the item to another biblio and update any references also in other tables.
548
549
=cut
550
551
sub move_to_biblio {
552
    my ( $self, $to_biblio ) = @_;
553
554
    my $biblionumber = $to_biblio->biblionumber;
555
556
    # Own biblionumber and biblioitemnumber
557
    $self->set({
558
        biblionumber => $biblionumber,
559
        biblioitemnumber => $to_biblio->biblioitem->biblioitemnumber
560
    })->store();
561
562
    my $schema = Koha::Database->new()->schema();
563
564
    # Acquisition orders related to the item
565
    my $orders = $schema->resultset('Aqorder')->search(
566
        { itemnumber => $self->itemnumber },
567
        { join => 'aqorders_items'}
568
    );
569
    $orders->update_all({ biblionumber => $biblionumber });
570
571
    # reserves
572
    my $reserves = $self->_result->reserves;
573
    $reserves->update_all({ biblionumber => $biblionumber });
574
575
    # hold_fill_target
576
    my $hold_fill_target = $self->_result->hold_fill_target;
577
    if ($hold_fill_target) {
578
        $hold_fill_target->update({ biblionumber => $biblionumber });
579
    }
580
581
    # tmp_holdsqueues - Can't update with DBIx since the table is missing a primary key
582
    # and can't even fake one since the significant columns are nullable.
583
    my $storage = $self->_result->result_source->storage;
584
    $storage->dbh_do(
585
        sub {
586
            my ($storage, $dbh, @cols) = @_;
587
588
            $dbh->do("UPDATE tmp_holdsqueue SET biblionumber=? WHERE itemnumber=?", undef, $biblionumber, $self->itemnumber);
589
        }
590
    );
591
    #my $tmp_holdsqueues = $self->_result->tmp_holdsqueues;
592
    #$tmp_holdsqueues->update_all({ biblionumber => $biblionumber });
593
594
    # linktrackers
595
    my $linktrackers = $schema->resultset('Linktracker')->search({ itemnumber => $self->itemnumber });
596
    $linktrackers->update_all({ biblionumber => $biblionumber });
597
}
598
543
=head2 Internal methods
599
=head2 Internal methods
544
600
545
=head3 _type
601
=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 / +105 lines)
Lines 19-25 Link Here
19
19
20
use Modern::Perl;
20
use Modern::Perl;
21
21
22
use Test::More tests => 4;
22
use Test::More tests => 5;
23
23
24
use C4::Biblio;
24
use C4::Biblio;
25
25
Lines 330-332 subtest 'pickup_locations' => sub { Link Here
330
330
331
    $schema->storage->txn_rollback;
331
    $schema->storage->txn_rollback;
332
};
332
};
333
- 
333
334
subtest 'move_items_from_biblio() tests' => sub {
335
336
    plan tests => 12;
337
338
    $schema->storage->txn_begin;
339
340
    my $dbh = C4::Context->dbh;
341
342
    my $source_biblio = $builder->build_sample_biblio();
343
    my $target_biblio = $builder->build_sample_biblio();
344
345
    my $source_biblionumber = $source_biblio->biblionumber;
346
347
    my $item1 = $builder->build_sample_item({ biblionumber => $source_biblionumber });
348
    my $item2 = $builder->build_sample_item({ biblionumber => $source_biblionumber });
349
350
    my $itemnumber1 = $item1->itemnumber;
351
    my $itemnumber2 = $item2->itemnumber;
352
353
    my $library = $builder->build_object({ class => 'Koha::Libraries' });
354
355
    my $patron = $builder->build_object({
356
        class => 'Koha::Patrons',
357
        value => { branchcode => $library->branchcode, }
358
    });
359
    my $borrowernumber = $patron->borrowernumber;
360
361
    $dbh->do("INSERT INTO aqbudgets (budget_notes) VALUES ('test')");
362
    my $budget_id = $dbh->last_insert_id(undef, undef, 'aqbudgets', 'budget_id');
363
364
    $dbh->do('INSERT INTO aqorders (biblionumber, budget_id) VALUES (?, ?)', undef, $source_biblionumber, $budget_id);
365
    my $ordernumber1 = $dbh->last_insert_id(undef, undef, 'aqorders', 'ordernumber');
366
    $dbh->do('INSERT INTO aqorders_items (ordernumber, itemnumber) VALUES (?, ?)', undef, $ordernumber1, $itemnumber1);
367
368
    $dbh->do('INSERT INTO aqorders (biblionumber, budget_id) VALUES (?, ?)', undef, $source_biblionumber, $budget_id);
369
    my $ordernumber2 = $dbh->last_insert_id(undef, undef, 'aqorders', 'ordernumber');
370
    $dbh->do('INSERT INTO aqorders_items (ordernumber, itemnumber) VALUES (?, ?)', undef, $ordernumber2, $source_biblionumber);
371
372
    my $reserve_id1 = C4::Reserves::AddReserve(
373
        $library->branchcode, $borrowernumber,
374
        $source_biblionumber, '',
375
        1,                    undef,
376
        undef,                '',
377
        "title",              $itemnumber1,
378
    );
379
380
    my $reserve_id2 = C4::Reserves::AddReserve(
381
        $library->branchcode, $patron->borrowernumber,
382
        $source_biblionumber, '',
383
        1,                    undef,
384
        undef,                '',
385
        "title",              $itemnumber2,
386
    );
387
388
    $dbh->do("INSERT INTO tmp_holdsqueue (surname,borrowernumber,itemnumber,biblionumber) VALUES ('Clamp',?,?,?)", undef, $borrowernumber, $itemnumber1, $source_biblionumber);
389
    $dbh->do("INSERT INTO tmp_holdsqueue (surname,borrowernumber,itemnumber,biblionumber) VALUES ('Clamp',?,?,?)", undef, $borrowernumber, $itemnumber2, $source_biblionumber);
390
391
    $dbh->do('INSERT INTO hold_fill_targets (borrowernumber,itemnumber,biblionumber) VALUES (?,?,?)', undef, $borrowernumber, $itemnumber1, $source_biblionumber);
392
    $dbh->do('INSERT INTO hold_fill_targets (borrowernumber,itemnumber,biblionumber) VALUES (?,?,?)', undef, $borrowernumber, $itemnumber2, $source_biblionumber);
393
394
    $dbh->do('INSERT INTO linktracker (borrowernumber,itemnumber,biblionumber) VALUES (?,?,?)', undef, $borrowernumber, $itemnumber1, $source_biblionumber);
395
    $dbh->do('INSERT INTO linktracker (borrowernumber,itemnumber,biblionumber) VALUES (?,?,?)', undef, $borrowernumber, $itemnumber2, $source_biblionumber);
396
397
    $item1->move_to_biblio($target_biblio);
398
399
    my @result = $dbh->selectrow_array('SELECT biblionumber FROM items WHERE itemnumber = ?', undef, $itemnumber1);
400
    is($result[0], $target_biblio->biblionumber, 'Correct biblionumber in the moved item');
401
402
    @result = $dbh->selectrow_array('SELECT biblionumber FROM items WHERE itemnumber = ?', undef, $itemnumber2);
403
    is($result[0], $source_biblionumber, 'Correct biblionumber in the unmoved item');
404
405
    @result = $dbh->selectrow_array('SELECT biblionumber FROM aqorders WHERE ordernumber = ?', undef, $ordernumber1);
406
    is($result[0], $target_biblio->biblionumber, 'Correct biblionumber in aqorders for order with the moved item');
407
408
    @result = $dbh->selectrow_array('SELECT biblionumber FROM aqorders WHERE ordernumber = ?', undef, $ordernumber2);
409
    is($result[0], $source_biblionumber, 'Correct biblionumber in aqorders for order with the unmoved item');
410
411
    @result = $dbh->selectrow_array('SELECT biblionumber FROM reserves WHERE reserve_id = ?', undef, $reserve_id1);
412
    is($result[0], $target_biblio->biblionumber, 'Correct biblionumber in reserves for moved item');
413
414
    @result = $dbh->selectrow_array('SELECT biblionumber FROM reserves WHERE reserve_id = ?', undef, $reserve_id2);
415
    is($result[0], $source_biblionumber, 'Correct biblionumber in reserves for unmoved item');
416
417
    @result = $dbh->selectrow_array('SELECT biblionumber FROM tmp_holdsqueue WHERE itemnumber = ?', undef, $itemnumber1);
418
    is($result[0], $target_biblio->biblionumber, 'Correct biblionumber in tmp_holdsqueue for moved item');
419
420
    @result = $dbh->selectrow_array('SELECT biblionumber FROM tmp_holdsqueue WHERE itemnumber = ?', undef, $itemnumber2);
421
    is($result[0], $source_biblionumber, 'Correct biblionumber in tmp_holdsqueue for unmoved item');
422
423
    @result = $dbh->selectrow_array('SELECT biblionumber FROM hold_fill_targets WHERE itemnumber = ?', undef, $itemnumber1);
424
    is($result[0], $target_biblio->biblionumber, 'Correct biblionumber in hold_fill_targets for moved item');
425
426
    @result = $dbh->selectrow_array('SELECT biblionumber FROM hold_fill_targets WHERE itemnumber = ?', undef, $itemnumber2);
427
    is($result[0], $source_biblionumber, 'Correct biblionumber in hold_fill_targets for unmoved item');
428
429
    @result = $dbh->selectrow_array('SELECT biblionumber FROM linktracker WHERE itemnumber = ?', undef, $itemnumber1);
430
    is($result[0], $target_biblio->biblionumber, 'Correct biblionumber in linktracker for moved item');
431
432
    @result = $dbh->selectrow_array('SELECT biblionumber FROM linktracker WHERE itemnumber = ?', undef, $itemnumber2);
433
    is($result[0], $source_biblionumber, 'Correct biblionumber in linktracker for unmoved item');
434
435
    $schema->storage->txn_rollback;
436
};

Return to bug 22690