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

(-)a/acqui/neworderempty.pl (+22 lines)
Lines 146-151 $booksellerid = $basket->{booksellerid} unless $booksellerid; Link Here
146
my $bookseller = Koha::Acquisition::Booksellers->find($booksellerid);
146
my $bookseller = Koha::Acquisition::Booksellers->find($booksellerid);
147
$data = GetOrder($ordernumber) if $ordernumber;
147
$data = GetOrder($ordernumber) if $ordernumber;
148
148
149
my $newdata;
150
151
# re-linking order to a different record
152
if ( $biblionumber and $biblionumber != $data->{biblionumber} ) {
153
    $newdata = GetBiblioData($biblionumber);
154
} elsif ( $suggestionid and $ordernumber ) {
155
    $newdata = GetSuggestion($suggestionid);
156
} elsif ( $ordernumber and $input->param('relink') ) {
157
    $newdata = {};
158
}
159
if ($newdata) {
160
    $data->{biblionumber}     = $biblionumber;
161
    $data->{title}            = $newdata->{title}            || "";
162
    $data->{author}           = $newdata->{author}           || "";
163
    $data->{publishercode}    = $newdata->{publishercode}    || "";
164
    $data->{editionstatement} = $newdata->{editionstatement} || "";
165
    $data->{publicationyear}  = $newdata->{publicationyear}  || "";
166
    $data->{isbn}             = $newdata->{isbn}             || "";
167
    $data->{seriestitle}      = $newdata->{seriestitle}      || "";
168
    $data->{copyrightdate}    = $newdata->{copyrightdate}    || "";
169
}
170
149
output_and_exit( $input, $cookie, $template, 'unknown_basket') unless $basketobj;
171
output_and_exit( $input, $cookie, $template, 'unknown_basket') unless $basketobj;
150
output_and_exit( $input, $cookie, $template, 'unknown_vendor') unless $bookseller;
172
output_and_exit( $input, $cookie, $template, 'unknown_vendor') unless $bookseller;
151
173
(-)a/acqui/newordersuggestion.pl (-7 / +9 lines)
Lines 103-116 my $input = CGI->new; Link Here
103
103
104
# getting the CGI params
104
# getting the CGI params
105
my $basketno        = $input->param('basketno');
105
my $basketno        = $input->param('basketno');
106
my $booksellerid      = $input->param('booksellerid');
106
my $booksellerid    = $input->param('booksellerid');
107
my $author          = $input->param('author');
107
my $author          = $input->param('author');
108
my $title           = $input->param('title');
108
my $title           = $input->param('title');
109
my $publishercode   = $input->param('publishercode');
109
my $publishercode   = $input->param('publishercode');
110
my $op              = $input->param('op');
110
my $op              = $input->param('op');
111
my $suggestionid    = $input->param('suggestionid');
111
my $suggestionid    = $input->param('suggestionid');
112
my $duplicateNumber = $input->param('duplicateNumber');
112
my $duplicateNumber = $input->param('duplicateNumber');
113
my $uncertainprice = $input->param('uncertainprice');
113
my $uncertainprice  = $input->param('uncertainprice');
114
my $ordernumber     = $input->param('ordernumber') || undef;
114
115
115
$op = 'else' unless $op;
116
$op = 'else' unless $op;
116
117
Lines 140-150 my $suggestions = [ Koha::Suggestions->search_limited( Link Here
140
141
141
my $vendor = Koha::Acquisition::Booksellers->find( $booksellerid );
142
my $vendor = Koha::Acquisition::Booksellers->find( $booksellerid );
142
$template->param(
143
$template->param(
143
    suggestions             => $suggestions,
144
    suggestions  => $suggestions,
144
    basketno                => $basketno,
145
    basketno     => $basketno,
145
    booksellerid              => $booksellerid,
146
    booksellerid => $booksellerid,
146
    name                    => $vendor->name,
147
    name         => $vendor->name,
147
    "op_$op"                => 1,
148
    "op_$op"     => 1,
149
    ordernumber  => $ordernumber,
148
);
150
);
149
151
150
output_html_with_http_headers $input, $cookie, $template->output;
152
output_html_with_http_headers $input, $cookie, $template->output;
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt (-1 / +1 lines)
Lines 910-916 Link Here
910
                                                            </li>
910
                                                            </li>
911
                                                            <li><a href="/cgi-bin/koha/acqui/newordersuggestion.pl?booksellerid=[% booksellerid | uri %]&amp;basketno=[% basket.basketno | uri %]">From a suggestion</a></li>
911
                                                            <li><a href="/cgi-bin/koha/acqui/newordersuggestion.pl?booksellerid=[% booksellerid | uri %]&amp;basketno=[% basket.basketno | uri %]">From a suggestion</a></li>
912
                                                            <li><a href="/cgi-bin/koha/acqui/newordersubscription.pl?booksellerid=[% booksellerid | uri %]&amp;basketno=[% basket.basketno | uri %]">From a subscription</a></li>
912
                                                            <li><a href="/cgi-bin/koha/acqui/newordersubscription.pl?booksellerid=[% booksellerid | uri %]&amp;basketno=[% basket.basketno | uri %]">From a subscription</a></li>
913
                                                            <li><a href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=[% booksellerid | uri %]&amp;basketno=[% basket.basketno | uri %]">From a new (empty) record</a></li>
913
                                                            <li><a href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=[% booksellerid | uri %]&amp;basketno=[% basket.basketno | uri %]&amp;relink=1">From a new (empty) record</a></li>
914
                                                            <li><a href="/cgi-bin/koha/acqui/duplicate_orders.pl?basketno=[% basket.basketno | uri %]">From existing orders (copy)</a></li>
914
                                                            <li><a href="/cgi-bin/koha/acqui/duplicate_orders.pl?basketno=[% basket.basketno | uri %]">From existing orders (copy)</a></li>
915
                                                            <li><a href="/cgi-bin/koha/acqui/z3950_search.pl?booksellerid=[% booksellerid | uri %]&amp;basketno=[% basket.basketno | uri %]">From an external source</a></li>
915
                                                            <li><a href="/cgi-bin/koha/acqui/z3950_search.pl?booksellerid=[% booksellerid | uri %]&amp;basketno=[% basket.basketno | uri %]">From an external source</a></li>
916
                                                            [% IF ( CAN_user_tools_stage_marc_import ) %]<li><a href="/cgi-bin/koha/tools/stage-marc-import.pl?basketno=[% basket.basketno | uri %]&amp;booksellerid=[% booksellerid | uri %]"> From a new file</a></li>[% END %]
916
                                                            [% IF ( CAN_user_tools_stage_marc_import ) %]<li><a href="/cgi-bin/koha/tools/stage-marc-import.pl?basketno=[% basket.basketno | uri %]&amp;booksellerid=[% booksellerid | uri %]"> From a new file</a></li>[% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt (-3 / +10 lines)
Lines 101-109 Link Here
101
                            </td>
101
                            </td>
102
                            <td class="actions">
102
                            <td class="actions">
103
                                [% IF ( suggestion.biblionumber ) %]
103
                                [% IF ( suggestion.biblionumber ) %]
104
                                    <a href="neworderempty.pl?booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]&amp;suggestionid=[% suggestion.suggestionid | uri %]&amp;biblio=[% suggestion.biblionumber | uri %]" class="btn btn-default btn-xs"><i class="fa fa-plus"></i> [% tp('verb', 'Order') | html %]</a>
104
                                    [% IF ordernumber %]
105
                                        <a href="neworderempty.pl?booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]&amp;suggestionid=[% suggestion.suggestionid | uri %]&amp;biblio=[% suggestion.biblionumber | uri %]&amp;ordernumber=[% ordernumber | uri %]" class="btn btn-default btn-xs"><i class="fa fa-plus"></i> [% tp('verb', 'Order') | html %]</a>
106
                                    [% ELSE %]
107
                                        <a href="neworderempty.pl?booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]&amp;suggestionid=[% suggestion.suggestionid | uri %]&amp;biblio=[% suggestion.biblionumber | uri %]" class="btn btn-default btn-xs"><i class="fa fa-plus"></i> [% tp('verb', 'Order') | html %]</a>
108
                                    [% END %]
105
                                [% ELSE %]
109
                                [% ELSE %]
106
                                    <a href="neworderempty.pl?booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]&amp;suggestionid=[% suggestion.suggestionid | uri %]" class="btn btn-default btn-xs"><i class="fa fa-plus"></i> [% tp('verb', 'Order') | html %]</a>
110
                                    [% IF ordernumber %]
111
                                        <a href="neworderempty.pl?booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]&amp;suggestionid=[% suggestion.suggestionid | uri %]&amp;ordernumber=[% ordernumber | uri %]" class="btn btn-default btn-xs"><i class="fa fa-plus"></i> [% tp('verb', 'Order') | html %]</a>
112
                                    [% ELSE %]
113
                                        <a href="neworderempty.pl?booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]&amp;suggestionid=[% suggestion.suggestionid | uri %]" class="btn btn-default btn-xs"><i class="fa fa-plus"></i> [% tp('verb', 'Order') | html %]</a>
114
                                    [% END %]
107
                                [% END %]
115
                                [% END %]
108
                            </td>
116
                            </td>
109
                        </tr>
117
                        </tr>
110
- 

Return to bug 27063