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

(-)a/acqui/newordersuggestion.pl (+9 lines)
Lines 111-116 my $op = $input->param('op'); Link Here
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 $link_order      = $input->param('link_order');
114
115
115
$op = 'else' unless $op;
116
$op = 'else' unless $op;
116
117
Lines 128-133 if ( $op eq 'connectDuplicate' ) { Link Here
128
    ConnectSuggestionAndBiblio( $suggestionid, $duplicateNumber );
129
    ConnectSuggestionAndBiblio( $suggestionid, $duplicateNumber );
129
}
130
}
130
131
132
if ( $op eq 'link_order' and $link_order ) {
133
    my $order      = Koha::Acquisition::Orders->find($link_order);
134
    my $suggestion = Koha::Suggestions->find($suggestionid);
135
    $suggestion->update( { biblionumber => $order->biblionumber } ) if $order->biblionumber;
136
    print $input->redirect( "/cgi-bin/koha/acqui/basket.pl?basketno=" . $basketno );
137
}
138
131
my $suggestions = [
139
my $suggestions = [
132
    Koha::Suggestions->search_limited(
140
    Koha::Suggestions->search_limited(
133
        {
141
        {
Lines 147-152 $template->param( Link Here
147
    booksellerid => $booksellerid,
155
    booksellerid => $booksellerid,
148
    name         => $vendor->name,
156
    name         => $vendor->name,
149
    "op_$op"     => 1,
157
    "op_$op"     => 1,
158
    link_order   => $link_order,
150
);
159
);
151
160
152
output_html_with_http_headers $input, $cookie, $template->output;
161
output_html_with_http_headers $input, $cookie, $template->output;
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt (+4 lines)
Lines 812-817 Link Here
812
                                                        <a href="neworderempty.pl?ordernumber=[% books_loo.ordernumber | uri %]&amp;booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]">Modify</a>
812
                                                        <a href="neworderempty.pl?ordernumber=[% books_loo.ordernumber | uri %]&amp;booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]">Modify</a>
813
                                                        <br />
813
                                                        <br />
814
                                                        <a href="#" class="transfer_order" data-ordernumber="[% books_loo.ordernumber | html %]">Transfer</a>
814
                                                        <a href="#" class="transfer_order" data-ordernumber="[% books_loo.ordernumber | html %]">Transfer</a>
815
                                                        <br />
816
                                                    [% END %]
817
                                                    [% UNLESS ( books_loo.suggestionid ) %]
818
                                                        <a href="/cgi-bin/koha/acqui/newordersuggestion.pl?booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]&amp;link_order=[% books_loo.ordernumber | uri %]">Search for suggestion to link</a>
815
                                                    [% END %]
819
                                                    [% END %]
816
                                                </td>
820
                                                </td>
817
                                            [% END %]
821
                                            [% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt (-2 / +3 lines)
Lines 89-95 Link Here
89
                            </td>
89
                            </td>
90
                            <td> [% suggestion.total | $Price %] </td>
90
                            <td> [% suggestion.total | $Price %] </td>
91
                            <td class="actions">
91
                            <td class="actions">
92
                                [% IF ( suggestion.biblionumber ) %]
92
                                [% IF link_order %]
93
                                    <a href="/cgi-bin/koha/acqui/newordersuggestion.pl?op=link_order&amp;link_order=[% link_order | uri %]&amp;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', 'Link suggestion') | html %]</a>
94
                                [% ELSIF ( suggestion.biblionumber ) %]
93
                                    <a
95
                                    <a
94
                                        href="neworderempty.pl?booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]&amp;suggestionid=[% suggestion.suggestionid | uri %]&amp;biblio=[% suggestion.biblionumber | uri %]"
96
                                        href="neworderempty.pl?booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]&amp;suggestionid=[% suggestion.suggestionid | uri %]&amp;biblio=[% suggestion.biblionumber | uri %]"
95
                                        class="btn btn-default btn-xs"
97
                                        class="btn btn-default btn-xs"
96
- 

Return to bug 31632