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

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-add-to-basket.inc (+1 lines)
Lines 16-21 Link Here
16
        <li><a href="/cgi-bin/koha/acqui/newordersubscription.pl?booksellerid=[% booksellerid | html %]&amp;basketno=[% basketno | html %]">From a subscription</a></li>
16
        <li><a href="/cgi-bin/koha/acqui/newordersubscription.pl?booksellerid=[% booksellerid | html %]&amp;basketno=[% basketno | html %]">From a subscription</a></li>
17
        <li><a href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=[% booksellerid | html %]&amp;basketno=[% basketno | html %]">From a new (empty) record</a></li>
17
        <li><a href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=[% booksellerid | html %]&amp;basketno=[% basketno | html %]">From a new (empty) record</a></li>
18
        <li><a href="/cgi-bin/koha/acqui/z3950_search.pl?booksellerid=[% booksellerid | html %]&amp;basketno=[% basketno | html %]">From an external source</a></li>
18
        <li><a href="/cgi-bin/koha/acqui/z3950_search.pl?booksellerid=[% booksellerid | html %]&amp;basketno=[% basketno | html %]">From an external source</a></li>
19
        <li><a href="/cgi-bin/koha/tools/stage-marc-import.pl?basketno=[% basketno | html %]&amp;booksellerid=[% booksellerid | html %]"> From a new file</a></li>
19
        <li><a href="/cgi-bin/koha/acqui/addorderiso2709.pl?booksellerid=[% booksellerid | html %]&amp;basketno=[% basketno | html %]"> From a staged file</a></li>
20
        <li><a href="/cgi-bin/koha/acqui/addorderiso2709.pl?booksellerid=[% booksellerid | html %]&amp;basketno=[% basketno | html %]"> From a staged file</a></li>
20
        [% IF ( CAN_user_circulate ) %]<li><a href="/cgi-bin/koha/circ/reserveratios.pl?booksellerid=[% booksellerid | html %]&amp;basketno=[% basketno | html %]">From titles with highest hold ratios</a></li>[% END %]
21
        [% IF ( CAN_user_circulate ) %]<li><a href="/cgi-bin/koha/circ/reserveratios.pl?booksellerid=[% booksellerid | html %]&amp;basketno=[% basketno | html %]">From titles with highest hold ratios</a></li>[% END %]
21
      </ul>
22
      </ul>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stage-marc-import.tt (+7 lines)
Lines 41-46 Link Here
41
	<li>[% total | html %]  records in file</li>
41
	<li>[% total | html %]  records in file</li>
42
	<li>[% import_errors | html %] records not staged because of MARC error</li>
42
	<li>[% import_errors | html %] records not staged because of MARC error</li>
43
	<li>[% staged | html %] records staged</li>
43
	<li>[% staged | html %] records staged</li>
44
[% IF basketno && booksellerid %]
45
    <li><a href="/cgi-bin/koha/acqui/addorderiso2709.pl?import_batch_id=2&basketno=[% basketno | html %]&booksellerid=[% booksellerid %]">Add staged files to basket</a></li>
46
[% END %]
44
    [% IF ( checked_matches ) %]
47
    [% IF ( checked_matches ) %]
45
	<li>[% matched | html %] records with at least one match in catalog per matching rule 
48
	<li>[% matched | html %] records with at least one match in catalog per matching rule 
46
        &quot;[% matcher_code | html %]&quot;</li>
49
        &quot;[% matcher_code | html %]&quot;</li>
Lines 90-95 Link Here
90
</form>
93
</form>
91
94
92
    <form method="post" id="processfile" action="[% SCRIPT_NAME | html %]" enctype="multipart/form-data">
95
    <form method="post" id="processfile" action="[% SCRIPT_NAME | html %]" enctype="multipart/form-data">
96
[% IF basketno && booksellerid %]
97
    <input type="hidden" name="basketno" id="basketno" value="[% basketno | html %]" />
98
    <input type="hidden" name="booksellerid" id="booksellerid" value="[% booksellerid | html %]" />
99
[% END %]
93
<fieldset class="rows">
100
<fieldset class="rows">
94
        <input type="hidden" name="uploadedfileid" id="uploadedfileid" value="" />
101
        <input type="hidden" name="uploadedfileid" id="uploadedfileid" value="" />
95
        <input type="hidden" name="runinbackground" id="runinbackground" value="" />
102
        <input type="hidden" name="runinbackground" id="runinbackground" value="" />
(-)a/tools/stage-marc-import.pl (-3 / +10 lines)
Lines 58-63 my $record_type = $input->param('record_type'); Link Here
58
my $encoding                   = $input->param('encoding') || 'UTF-8';
58
my $encoding                   = $input->param('encoding') || 'UTF-8';
59
my $format                     = $input->param('format') || 'ISO2709';
59
my $format                     = $input->param('format') || 'ISO2709';
60
my $marc_modification_template = $input->param('marc_modification_template_id');
60
my $marc_modification_template = $input->param('marc_modification_template_id');
61
my $basketno                   = $input->param('basketno');
62
my $booksellerid               = $input->param('booksellerid');
61
63
62
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
64
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
63
    {
65
    {
Lines 74-79 $template->param( Link Here
74
    SCRIPT_NAME => '/cgi-bin/koha/tools/stage-marc-import.pl',
76
    SCRIPT_NAME => '/cgi-bin/koha/tools/stage-marc-import.pl',
75
    uploadmarc  => $fileID,
77
    uploadmarc  => $fileID,
76
    record_type => $record_type,
78
    record_type => $record_type,
79
    basketno => $basketno,
80
    booksellerid => $booksellerid,
77
);
81
);
78
82
79
my %cookies = parse CGI::Cookie($cookie);
83
my %cookies = parse CGI::Cookie($cookie);
Lines 181-187 if ($completedJobID) { Link Here
181
        checked_matches => $checked_matches,
185
        checked_matches => $checked_matches,
182
        matcher_failed  => $matcher_failed,
186
        matcher_failed  => $matcher_failed,
183
        matcher_code    => $matcher_code,
187
        matcher_code    => $matcher_code,
184
        import_batch_id => $batch_id
188
        import_batch_id => $batch_id,
189
        booksellerid    => $booksellerid,
190
        basketno        => $basketno
185
    };
191
    };
186
    if ($runinbackground) {
192
    if ($runinbackground) {
187
        $job->finish($results);
193
        $job->finish($results);
Lines 195-201 if ($completedJobID) { Link Here
195
                         checked_matches => $checked_matches,
201
                         checked_matches => $checked_matches,
196
                         matcher_failed => $matcher_failed,
202
                         matcher_failed => $matcher_failed,
197
                         matcher_code => $matcher_code,
203
                         matcher_code => $matcher_code,
198
                         import_batch_id => $batch_id
204
                         import_batch_id => $batch_id,
205
                         booksellerid => $booksellerid,
206
                         basketno => $basketno
199
                        );
207
                        );
200
    }
208
    }
201
209
202
- 

Return to bug 21333