Attachment #55057 for bug #15503

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




    my @sort1 = $input->multi_param('sort1');
    my @sort2 = $input->multi_param('sort2');
    my $active_currency = Koha::Acquisition::Currencies->get_active;
    my $biblio_count = 0;
    for my $biblio (@$biblios){
        $biblio_count++;
        # Check if this import_record_id was selected
        next if not grep { $_ eq $$biblio{import_record_id} } @import_record_id_selected;
        my ( $marcblob, $encoding ) = GetImportRecordMarc( $biblio->{'import_record_id'} );

        }

        # Add items from MarcItemFieldsToOrder
        my @homebranches = $input->multi_param('homebranch_' . $biblio_count);
        my $count = scalar @homebranches;
        my @holdingbranches = $input->multi_param('holdingbranch_' . $biblio_count);
        my @itypes = $input->multi_param('itype_' . $biblio_count);
        my @nonpublic_notes = $input->multi_param('nonpublic_note_' . $biblio_count);
        my @public_notes = $input->multi_param('public_note_' . $biblio_count);
        my @locs = $input->multi_param('loc_' . $biblio_count);
        my @ccodes = $input->multi_param('ccodes_' . $biblio_count);
        my @notforloans = $input->multi_param('notforloans_' . $biblio_count);
        my @uris = $input->multi_param('uri_' . $biblio_count);
        my @copynos = $input->multi_param('copyno_' . $biblio_count);
        my @budget_codes = $input->multi_param('budget_code_' . $biblio_count);
        my @itemprices = $input->multi_param('itemprice_' . $biblio_count);
        my $itemcreation = 0;
        for (my $i = 0; $i < $count; $i++) {
            $itemcreation = 1;

    return () unless $batch and $batch->{import_status} =~ /^staged$|^reverted$/;
    my $biblios = GetImportRecordsRange($import_batch_id,'','',$batch->{import_status});
    my @list = ();
    my $item_id = 1;
    my $item_error = 0;

    my $ccodes    = GetKohaAuthorisedValues("items.ccode");

    }


    my $biblio_count = 0;
    foreach my $biblio (@$biblios) {
        my $item_id = 1;
        $biblio_count++;
        my $citation = $biblio->{'title'};
        $citation .= " $biblio->{'author'}" if $biblio->{'author'};
        $citation .= " (" if $biblio->{'issn'} or $biblio->{'isbn'};


                    my %itemrecord = (
                        'item_id' => $item_id++,
                        'biblio_count' => $biblio_count,
                        'homebranch' => $item_homebranch,
                        'holdingbranch' => $item_holdingbranch,
                        'itype' => $item_itype,




                        <legend>Item Record [% item.item_id %]</legend>
                        <ol>
                        <li>
                        <label for="homebranch_item_[% item.item_id %]">homebranch</label><select id="homebranch_item_[% item.item_id %]" name="homebranch_[% item.biblio_count %]">
                        [% FOREACH branchloo IN branchloop %]
                          [% IF ( branchloo.value ) == ( item.homebranch )  %]
                            <option value="[% branchloo.value %]" selected="selected">[% branchloo.branchname %]</option>

                        </select>
                        </li>

                        <li><label for="holdingbranch_item_[% item.item_id %]">holdingbranch</label><select id="holdingbranch_item_[% item.item_id %]" name="holdingbranch_[% item.biblio_count %]">
                        [% FOREACH branchloo IN branchloop %]
                          [% IF ( branchloo.value ) == ( item.holdingbranch ) %]
                            <option value="[% branchloo.value %]" selected="selected">[% branchloo.branchname %]</option>

                        [% END %]
                        </select>
                        </li>
                        <li><label for="itype_item_[% item.item_id %]">itype</label><select id="itype_item_[% item.item_id %]" name="itype_[% item.biblio_count %]">
                        [% FOREACH itypeloo IN itypeloop %]
                          [% IF ( itypeloo.value ) == ( item.itype ) %]
                            <option value="[% itypeloo.itemtype %]" selected="selected">[% itypeloo.description |html %]</option>

                        </select>
                        </li>

                        <li><label for="nonpublic_note_item_[% item.item_id %]">nonpublic_note</label><input type="text" id="nonpublic_note_item_[% item.item_id %]" name="nonpublic_note_[% item.biblio_count %]" value="[% item.nonpublic_note %]"></li>
                        <li><label for="public_note_item_[% item.item_id %]">public_note</label><input type="text" id="public_note_item_[% item.item_id %]" name="public_note_[% item.biblio_count %]" value="[% item.public_note %]"></li>
                        <li><label for="loc_item_[% item.item_id %]">loc</label><select id="loc_item_[% item.item_id %]" name="loc_[% item.biblio_count %]">
                        <option value=""> </option>
                        [% FOREACH locationloo IN locationloop %]
                            [% IF ( locationloo.code ) == (item.loc) %]<option value="[% locationloo.code %]" selected="selected">[% locationloo.description %]</option>[% ELSE %]<option value="[% locationloo.code %]">[% locationloo.description %]</option>[% END %]

                       </select>
                        </li>

                        <li><label for="ccode_item_[% item.item_id %]">ccode</label><select id="ccode_item_[% item.item_id %]" name="ccode_[% item.biblio_count %]">
                        [% FOREACH ccodeloo IN ccodeloop %]
                            [% IF ( ccodeloo.code ) == (item.ccode) %]<option value="[% ccodeloo.code %]" selected="selected">[% ccodeloo.description %]</option>[% ELSE %]<option value="[% ccodeloo.code %]">[% ccodeloo.description %]</option>[% END %]
                        [% END %]
                        </select>
                        </li>

                        <li><label for="notforloan_item_[% item.item_id %]">notforloan</label><input type="text" id="notforloan_item_[% item.item_id %]" name="notforloan_[% item.biblio_count %]" value="[% item.notforloan %]"></li>
                        <li><label for="uri_item_[% item.item_id %]">uri</label><input type="text" id="uri_item_[% item.item_id %]" name="uri_[% item.biblio_count %]" value="[% item.uri %]"></li>
                        <li><label for="copyno_item_[% item.item_id %]">copyno</label><input type="text" id="copyno_item_[% item.item_id %]" name="copyno_[% item.biblio_count %]" value="[% item.copyno %]"></li>
                        <li><label for="budget_code_item_[% item.item_id %]">budget_code</label><select id="budget_code_item_[% item.item_id %]" name="budget_code_[% item.biblio_count %]">
                        <option value="">Select a fund</option>
                        [% FOREACH budget_loo IN budget_loop %]
                            [% IF ( budget_loo.b_code ) == ( item.budget_code ) %]<option value="[% budget_loo.b_id %]" selected="selected">[% budget_loo.b_txt %]</option>

                        [% END %]
                        </select>
                        </li>
                        <li><label for="price_item_[% item.item_id %]">price</label><input type="text" id="price_item_[% item.item_id %]" name="itemprice_[% item.biblio_count %]" value="[% item.itemprice %]"></li>
                        </ol>
                        </fieldset>
                        [% END %]
- 

Return to bug 15503

Lines 143-149 if ($op eq ""){ Link Here

(-)a/acqui/addorderiso2709.pl (-14 / +18 lines)
143	my @sort1 = $input->multi_param('sort1');	143	my @sort1 = $input->multi_param('sort1');
144	my @sort2 = $input->multi_param('sort2');	144	my @sort2 = $input->multi_param('sort2');
145	my $active_currency = Koha::Acquisition::Currencies->get_active;	145	my $active_currency = Koha::Acquisition::Currencies->get_active;
		146	my $biblio_count = 0;
146	for my $biblio (@$biblios){	147	for my $biblio (@$biblios){
		148	$biblio_count++;
147	# Check if this import_record_id was selected	149	# Check if this import_record_id was selected
148	next if not grep { $_ eq $$biblio{import_record_id} } @import_record_id_selected;	150	next if not grep { $_ eq $$biblio{import_record_id} } @import_record_id_selected;
149	my ( $marcblob, $encoding ) = GetImportRecordMarc( $biblio->{'import_record_id'} );	151	my ( $marcblob, $encoding ) = GetImportRecordMarc( $biblio->{'import_record_id'} );
Lines 185-203 if ($op eq ""){ Link Here
185	}	187	}
186		188
187	# Add items from MarcItemFieldsToOrder	189	# Add items from MarcItemFieldsToOrder
188	my @homebranches = $input->multi_param('homebranch');	190	my @homebranches = $input->multi_param('homebranch_' . $biblio_count);
189	my $count = scalar @homebranches;	191	my $count = scalar @homebranches;
190	my @holdingbranches = $input->multi_param('holdingbranch');	192	my @holdingbranches = $input->multi_param('holdingbranch_' . $biblio_count);
191	my @itypes = $input->multi_param('itype');	193	my @itypes = $input->multi_param('itype_' . $biblio_count);
192	my @nonpublic_notes = $input->multi_param('nonpublic_note');	194	my @nonpublic_notes = $input->multi_param('nonpublic_note_' . $biblio_count);
193	my @public_notes = $input->multi_param('public_note');	195	my @public_notes = $input->multi_param('public_note_' . $biblio_count);
194	my @locs = $input->multi_param('loc');	196	my @locs = $input->multi_param('loc_' . $biblio_count);
195	my @ccodes = $input->multi_param('ccodes');	197	my @ccodes = $input->multi_param('ccodes_' . $biblio_count);
196	my @notforloans = $input->multi_param('notforloans');	198	my @notforloans = $input->multi_param('notforloans_' . $biblio_count);
197	my @uris = $input->multi_param('uri');	199	my @uris = $input->multi_param('uri_' . $biblio_count);
198	my @copynos = $input->multi_param('copyno');	200	my @copynos = $input->multi_param('copyno_' . $biblio_count);
199	my @budget_codes = $input->multi_param('budget_code');	201	my @budget_codes = $input->multi_param('budget_code_' . $biblio_count);
200	my @itemprices = $input->multi_param('itemprice');	202	my @itemprices = $input->multi_param('itemprice_' . $biblio_count);
201	my $itemcreation = 0;	203	my $itemcreation = 0;
202	for (my $i = 0; $i < $count; $i++) {	204	for (my $i = 0; $i < $count; $i++) {
203	$itemcreation = 1;	205	$itemcreation = 1;
Lines 434-440 sub import_biblios_list { Link Here
434	return () unless $batch and $batch->{import_status} =~ /^staged$\|^reverted$/;	436	return () unless $batch and $batch->{import_status} =~ /^staged$\|^reverted$/;
435	my $biblios = GetImportRecordsRange($import_batch_id,'','',$batch->{import_status});	437	my $biblios = GetImportRecordsRange($import_batch_id,'','',$batch->{import_status});
436	my @list = ();	438	my @list = ();
437	my $item_id = 1;
438	my $item_error = 0;	439	my $item_error = 0;
439		440
440	my $ccodes = GetKohaAuthorisedValues("items.ccode");	441	my $ccodes = GetKohaAuthorisedValues("items.ccode");
Lines 450-457 sub import_biblios_list { Link Here
450	}	451	}
451		452
452		453
453		454	my $biblio_count = 0;
454	foreach my $biblio (@$biblios) {	455	foreach my $biblio (@$biblios) {
		456	my $item_id = 1;
		457	$biblio_count++;
455	my $citation = $biblio->{'title'};	458	my $citation = $biblio->{'title'};
456	$citation .= " $biblio->{'author'}" if $biblio->{'author'};	459	$citation .= " $biblio->{'author'}" if $biblio->{'author'};
457	$citation .= " (" if $biblio->{'issn'} or $biblio->{'isbn'};	460	$citation .= " (" if $biblio->{'issn'} or $biblio->{'isbn'};
Lines 513-518 sub import_biblios_list { Link Here
513		516
514	my %itemrecord = (	517	my %itemrecord = (
515	'item_id' => $item_id++,	518	'item_id' => $item_id++,
		519	'biblio_count' => $biblio_count,
516	'homebranch' => $item_homebranch,	520	'homebranch' => $item_homebranch,
517	'holdingbranch' => $item_holdingbranch,	521	'holdingbranch' => $item_holdingbranch,
518	'itype' => $item_itype,	522	'itype' => $item_itype,

Lines 292-298 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt (-13 / +12 lines)
292	<legend>Item Record [% item.item_id %]</legend>	292	<legend>Item Record [% item.item_id %]</legend>
293	<ol>	293	<ol>
294	<li>	294	<li>
295	<label for="homebranch_item_[% item.item_id %]">homebranch</label><select id="homebranch_item_[% item.item_id %]" name="homebranch">	295	<label for="homebranch_item_[% item.item_id %]">homebranch</label><select id="homebranch_item_[% item.item_id %]" name="homebranch_[% item.biblio_count %]">
296	[% FOREACH branchloo IN branchloop %]	296	[% FOREACH branchloo IN branchloop %]
297	[% IF ( branchloo.value ) == ( item.homebranch ) %]	297	[% IF ( branchloo.value ) == ( item.homebranch ) %]
298	<option value="[% branchloo.value %]" selected="selected">[% branchloo.branchname %]</option>	298	<option value="[% branchloo.value %]" selected="selected">[% branchloo.branchname %]</option>
Lines 303-309 Link Here
303	</select>	303	</select>
304	</li>	304	</li>
305		305
306	<li><label for="holdingbranch_item_[% item.item_id %]">holdingbranch</label><select id="holdingbranch_item_[% item.item_id %]" name="holdingbranch">	306	<li><label for="holdingbranch_item_[% item.item_id %]">holdingbranch</label><select id="holdingbranch_item_[% item.item_id %]" name="holdingbranch_[% item.biblio_count %]">
307	[% FOREACH branchloo IN branchloop %]	307	[% FOREACH branchloo IN branchloop %]
308	[% IF ( branchloo.value ) == ( item.holdingbranch ) %]	308	[% IF ( branchloo.value ) == ( item.holdingbranch ) %]
309	<option value="[% branchloo.value %]" selected="selected">[% branchloo.branchname %]</option>	309	<option value="[% branchloo.value %]" selected="selected">[% branchloo.branchname %]</option>
Lines 313-319 Link Here
313	[% END %]	313	[% END %]
314	</select>	314	</select>
315	</li>	315	</li>
316	<li><label for="itype_item_[% item.item_id %]">itype</label><select id="itype_item_[% item.item_id %]" name="itype">	316	<li><label for="itype_item_[% item.item_id %]">itype</label><select id="itype_item_[% item.item_id %]" name="itype_[% item.biblio_count %]">
317	[% FOREACH itypeloo IN itypeloop %]	317	[% FOREACH itypeloo IN itypeloop %]
318	[% IF ( itypeloo.value ) == ( item.itype ) %]	318	[% IF ( itypeloo.value ) == ( item.itype ) %]
319	<option value="[% itypeloo.itemtype %]" selected="selected">[% itypeloo.description \|html %]</option>	319	<option value="[% itypeloo.itemtype %]" selected="selected">[% itypeloo.description \|html %]</option>
Lines 324-332 Link Here
324	</select>	324	</select>
325	</li>	325	</li>
326		326
327	<li><label for="nonpublic_note_item_[% item.item_id %]">nonpublic_note</label><input type="text" id="nonpublic_note_item_[% item.item_id %]" name="nonpublic_note" value="[% item.nonpublic_note %]"></li>	327	<li><label for="nonpublic_note_item_[% item.item_id %]">nonpublic_note</label><input type="text" id="nonpublic_note_item_[% item.item_id %]" name="nonpublic_note_[% item.biblio_count %]" value="[% item.nonpublic_note %]"></li>
328	<li><label for="public_note_item_[% item.item_id %]">public_note</label><input type="text" id="public_note_item_[% item.item_id %]" name="public_note" value="[% item.public_note %]"></li>	328	<li><label for="public_note_item_[% item.item_id %]">public_note</label><input type="text" id="public_note_item_[% item.item_id %]" name="public_note_[% item.biblio_count %]" value="[% item.public_note %]"></li>
329	<li><label for="loc_item_[% item.item_id %]">loc</label><select id="loc_item_[% item.item_id %]" name="loc">	329	<li><label for="loc_item_[% item.item_id %]">loc</label><select id="loc_item_[% item.item_id %]" name="loc_[% item.biblio_count %]">
330	<option value=""> </option>	330	<option value=""> </option>
331	[% FOREACH locationloo IN locationloop %]	331	[% FOREACH locationloo IN locationloop %]
332	[% IF ( locationloo.code ) == (item.loc) %]<option value="[% locationloo.code %]" selected="selected">[% locationloo.description %]</option>[% ELSE %]<option value="[% locationloo.code %]">[% locationloo.description %]</option>[% END %]	332	[% IF ( locationloo.code ) == (item.loc) %]<option value="[% locationloo.code %]" selected="selected">[% locationloo.description %]</option>[% ELSE %]<option value="[% locationloo.code %]">[% locationloo.description %]</option>[% END %]
Lines 334-350 Link Here
334	</select>	334	</select>
335	</li>	335	</li>
336		336
337	<li><label for="ccode_item_[% item.item_id %]">ccode</label><select id="ccode_item_[% item.item_id %]" name="ccode">	337	<li><label for="ccode_item_[% item.item_id %]">ccode</label><select id="ccode_item_[% item.item_id %]" name="ccode_[% item.biblio_count %]">
338	[% FOREACH ccodeloo IN ccodeloop %]	338	[% FOREACH ccodeloo IN ccodeloop %]
339	[% IF ( ccodeloo.code ) == (item.ccode) %]<option value="[% ccodeloo.code %]" selected="selected">[% ccodeloo.description %]</option>[% ELSE %]<option value="[% ccodeloo.code %]">[% ccodeloo.description %]</option>[% END %]	339	[% IF ( ccodeloo.code ) == (item.ccode) %]<option value="[% ccodeloo.code %]" selected="selected">[% ccodeloo.description %]</option>[% ELSE %]<option value="[% ccodeloo.code %]">[% ccodeloo.description %]</option>[% END %]
340	[% END %]	340	[% END %]
341	</select>	341	</select>
342	</li>	342	</li>
343		343
344	<li><label for="notforloan_item_[% item.item_id %]">notforloan</label><input type="text" id="notforloan_item_[% item.item_id %]" name="notforloan" value="[% item.notforloan %]"></li>	344	<li><label for="notforloan_item_[% item.item_id %]">notforloan</label><input type="text" id="notforloan_item_[% item.item_id %]" name="notforloan_[% item.biblio_count %]" value="[% item.notforloan %]"></li>
345	<li><label for="uri_item_[% item.item_id %]">uri</label><input type="text" id="uri_item_[% item.item_id %]" name="uri" value="[% item.uri %]"></li>	345	<li><label for="uri_item_[% item.item_id %]">uri</label><input type="text" id="uri_item_[% item.item_id %]" name="uri_[% item.biblio_count %]" value="[% item.uri %]"></li>
346	<li><label for="copyno_item_[% item.item_id %]">copyno</label><input type="text" id="copyno_item_[% item.item_id %]" name="copyno" value="[% item.copyno %]"></li>	346	<li><label for="copyno_item_[% item.item_id %]">copyno</label><input type="text" id="copyno_item_[% item.item_id %]" name="copyno_[% item.biblio_count %]" value="[% item.copyno %]"></li>
347	<li><label for="budget_code_item_[% item.item_id %]">budget_code</label><select id="budget_code_item_[% item.item_id %]" name="budget_code">	347	<li><label for="budget_code_item_[% item.item_id %]">budget_code</label><select id="budget_code_item_[% item.item_id %]" name="budget_code_[% item.biblio_count %]">
348	<option value="">Select a fund</option>	348	<option value="">Select a fund</option>
349	[% FOREACH budget_loo IN budget_loop %]	349	[% FOREACH budget_loo IN budget_loop %]
350	[% IF ( budget_loo.b_code ) == ( item.budget_code ) %]<option value="[% budget_loo.b_id %]" selected="selected">[% budget_loo.b_txt %]</option>	350	[% IF ( budget_loo.b_code ) == ( item.budget_code ) %]<option value="[% budget_loo.b_id %]" selected="selected">[% budget_loo.b_txt %]</option>
Lines 353-359 Link Here
353	[% END %]	353	[% END %]
354	</select>	354	</select>
355	</li>	355	</li>
356	<li><label for="price_item_[% item.item_id %]">price</label><input type="text" id="price_item_[% item.item_id %]" name="itemprice" value="[% item.itemprice %]"></li>	356	<li><label for="price_item_[% item.item_id %]">price</label><input type="text" id="price_item_[% item.item_id %]" name="itemprice_[% item.biblio_count %]" value="[% item.itemprice %]"></li>
357	</ol>	357	</ol>
358	</fieldset>	358	</fieldset>
359	[% END %]	359	[% END %]
360	-