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

(-)a/cataloguing/additem.pl (-13 / +48 lines)
Lines 22-48 Link Here
22
use Modern::Perl;
22
use Modern::Perl;
23
23
24
use CGI qw ( -utf8 );
24
use CGI qw ( -utf8 );
25
use List::MoreUtils qw/any/;
26
use MARC::File::XML;
27
use Storable qw(thaw freeze);
28
use URI::Escape;
29
25
use C4::Auth;
30
use C4::Auth;
26
use C4::Output;
27
use C4::Biblio;
31
use C4::Biblio;
28
use C4::Items;
29
use C4::Context;
30
use C4::Circulation;
32
use C4::Circulation;
31
use C4::Koha;
32
use C4::ClassSource;
33
use C4::ClassSource;
34
use C4::Context;
35
use C4::Items;
36
use C4::Koha;
37
use C4::Members;
38
use C4::Output;
39
use C4::Search;
40
41
use Koha::Biblio::Volume::Items;
42
use Koha::Biblio::Volumes;
33
use Koha::DateUtils;
43
use Koha::DateUtils;
34
use Koha::Items;
35
use Koha::ItemTypes;
44
use Koha::ItemTypes;
45
use Koha::Items;
36
use Koha::Libraries;
46
use Koha::Libraries;
37
use Koha::Patrons;
47
use Koha::Patrons;
38
use List::MoreUtils qw/any/;
39
use C4::Search;
40
use Storable qw(thaw freeze);
41
use URI::Escape;
42
use C4::Members;
43
44
use MARC::File::XML;
45
use URI::Escape;
46
48
47
our $dbh = C4::Context->dbh;
49
our $dbh = C4::Context->dbh;
48
50
Lines 86-91 sub set_item_default_location { Link Here
86
    $item->store;
88
    $item->store;
87
}
89
}
88
90
91
sub add_item_to_volume {
92
    my ( $biblionumber, $itemnumber, $volume, $volume_description ) = @_;
93
94
    return unless $volume;
95
96
    my $volume_id;
97
    if ( $volume eq 'create' ) {
98
        my $volume = Koha::Biblio::Volume->new(
99
            {
100
                biblionumber => $biblionumber,
101
                description  => $volume_description,
102
            }
103
        )->store();
104
105
        $volume_id = $volume->id;
106
    }
107
    else {
108
        $volume_id = $volume;
109
    }
110
111
    my $volume_item = Koha::Biblio::Volume::Item->new(
112
        {
113
            itemnumber => $itemnumber,
114
            volume_id  => $volume_id,
115
        }
116
    )->store();
117
}
118
89
# NOTE: This code is subject to change in the future with the implemenation of ajax based autobarcode code
119
# NOTE: This code is subject to change in the future with the implemenation of ajax based autobarcode code
90
# NOTE: 'incremental' is the ONLY autoBarcode option available to those not using javascript
120
# NOTE: 'incremental' is the ONLY autoBarcode option available to those not using javascript
91
sub _increment_barcode {
121
sub _increment_barcode {
Lines 408-413 my $fa_barcode = $input->param('barcode'); Link Here
408
my $fa_branch             = $input->param('branch');
438
my $fa_branch             = $input->param('branch');
409
my $fa_stickyduedate      = $input->param('stickyduedate');
439
my $fa_stickyduedate      = $input->param('stickyduedate');
410
my $fa_duedatespec        = $input->param('duedatespec');
440
my $fa_duedatespec        = $input->param('duedatespec');
441
my $volume                = $input->param('volume');
442
my $volume_description    = $input->param('volume_description');
411
443
412
my $frameworkcode = &GetFrameworkCode($biblionumber);
444
my $frameworkcode = &GetFrameworkCode($biblionumber);
413
445
Lines 516-521 if ($op eq "additem") { Link Here
516
        unless ($exist_itemnumber) {
548
        unless ($exist_itemnumber) {
517
            my ( $oldbiblionumber, $oldbibnum, $oldbibitemnum ) = AddItemFromMarc( $record, $biblionumber );
549
            my ( $oldbiblionumber, $oldbibnum, $oldbibitemnum ) = AddItemFromMarc( $record, $biblionumber );
518
            set_item_default_location($oldbibitemnum);
550
            set_item_default_location($oldbibitemnum);
551
            add_item_to_volume( $oldbiblionumber, $oldbibitemnum, $volume, $volume_description );
519
552
520
            # Pushing the last created item cookie back
553
            # Pushing the last created item cookie back
521
            if ($prefillitem && defined $record) {
554
            if ($prefillitem && defined $record) {
Lines 616-621 if ($op eq "additem") { Link Here
616
            my ( $oldbiblionumber, $oldbibnum, $oldbibitemnum ) =
649
            my ( $oldbiblionumber, $oldbibnum, $oldbibitemnum ) =
617
                AddItemFromMarc( $record, $biblionumber, { skip_modzebra_update => 1 } );
650
                AddItemFromMarc( $record, $biblionumber, { skip_modzebra_update => 1 } );
618
            set_item_default_location($oldbibitemnum);
651
            set_item_default_location($oldbibitemnum);
652
            add_item_to_volume( $oldbiblionumber, $oldbibitemnum, $volume, $volume_description );
619
653
620
            # We count the item only if it was really added
654
            # We count the item only if it was really added
621
            # That way, all items are added, even if there was some already existing barcodes
655
            # That way, all items are added, even if there was some already existing barcodes
Lines 976-981 foreach my $tag ( keys %{$tagslib}){ Link Here
976
1010
977
# what's the next op ? it's what we are not in : an add if we're editing, otherwise, and edit.
1011
# what's the next op ? it's what we are not in : an add if we're editing, otherwise, and edit.
978
$template->param(
1012
$template->param(
1013
    volumes      => scalar Koha::Biblio::Volumes->search({ biblionumber => $biblionumber }),
979
    biblionumber => $biblionumber,
1014
    biblionumber => $biblionumber,
980
    title        => $oldrecord->{title},
1015
    title        => $oldrecord->{title},
981
    author       => $oldrecord->{author},
1016
    author       => $oldrecord->{author},
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt (+30 lines)
Lines 19-24 Link Here
19
[% INCLUDE 'calendar.inc' %]
19
[% INCLUDE 'calendar.inc' %]
20
[% INCLUDE 'str/cataloging_additem.inc' %]
20
[% INCLUDE 'str/cataloging_additem.inc' %]
21
[% Asset.js("js/cataloging_additem.js") | $raw %]
21
[% Asset.js("js/cataloging_additem.js") | $raw %]
22
<script>
23
  var has_volumes = [% volumes.count %];
24
</script>
22
</head>
25
</head>
23
26
24
<body id="cat_additem" class="cat">
27
<body id="cat_additem" class="cat">
Lines 231-236 Link Here
231
    <input type="hidden" name="indicator" value=" " />
234
    <input type="hidden" name="indicator" value=" " />
232
    <input type="hidden" name="itemnumber" value="[% itemnumber | html %]" />
235
    <input type="hidden" name="itemnumber" value="[% itemnumber | html %]" />
233
236
237
[% IF volumes.count && op != 'saveitem' %]
238
    <fieldset class="rows">
239
        <legend><i class="fa fa-plus"></i> Add to volume</legend>
240
241
        <p>
242
            <label for="select_volume">Options: </label>
243
            <select name="volume" id="volume-add-or-create-form-select">
244
                <optgroup label="Use existing volume">
245
                    [% FOREACH v IN volumes %]
246
                        <option value="[% v.id | html %]">Use: [% v.description | html %]</option>
247
                    [% END %]
248
                </optgroup>
249
                <optgroup label="Other options">
250
                    <option id="volume-add-or-create-form-no-add" value="">Do not add to volume</option>
251
                    <option value="create">Create new volume</option>
252
                </optgroup>
253
            </select>
254
        </p>
255
256
        <p id="volume-add-or-create-form-description-block">
257
            <label for="volume_description" class="required">Name: </label>
258
            <input name="volume_description" id="volume-add-or-create-form-description" type="text" size="30" class="required" />
259
            <span class="required">Required</span>
260
        </p>
261
    </fieldset>
262
[% END %]
263
234
<fieldset class="action">    [% IF op != 'saveitem' %]
264
<fieldset class="action">    [% IF op != 'saveitem' %]
235
    <input type="submit" name="phony_submit" value="phony_submit" id="phony_submit" style="display:none;" onclick="return false;" />
265
    <input type="submit" name="phony_submit" value="phony_submit" id="phony_submit" style="display:none;" onclick="return false;" />
236
    <!-- Note : We use here a false submit button because we have several submit buttons and we don't want the user to believe they validated the adding of multiple items
266
    <!-- Note : We use here a false submit button because we have several submit buttons and we don't want the user to believe they validated the adding of multiple items
(-)a/koha-tmpl/intranet-tmpl/prog/js/cataloging_additem.js (-1 / +20 lines)
Lines 69-74 $(document).ready(function(){ Link Here
69
        multiCopyControl.toggle();
69
        multiCopyControl.toggle();
70
    });
70
    });
71
71
72
    // Add new item to volume
73
    if ( has_volumes ) {
74
        $('#volume-add-or-create-form-description-block').hide();
75
        $('#volume-add-or-create-form-no-add').attr('selected', 'selected' );
76
77
        $('#volume-add-or-create-form-select').on('change', function(){
78
            if ( $(this).val() == 'create' ) {
79
                $('#volume-add-or-create-form-description')
80
                    .addClass('required')
81
                    .attr( 'required', 'required' );
82
                $('#volume-add-or-create-form-description-block').show();
83
            } else {
84
                $('#volume-add-or-create-form-description')
85
                    .removeClass('required')
86
                    .removeAttr('required');
87
                $('#volume-add-or-create-form-description-block').hide();
88
            }
89
        });
90
    }
91
72
});
92
});
73
93
74
function Check(f) {
94
function Check(f) {
75
- 

Return to bug 24857