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

(-)a/acqui/basket.pl (-3 / +1 lines)
Lines 659-667 sub get_order_infos { Link Here
659
    }
659
    }
660
660
661
    my $suggestion = Koha::Suggestions->search( { biblionumber => $line{biblionumber} } )->single;
661
    my $suggestion = Koha::Suggestions->search( { biblionumber => $line{biblionumber} } )->single;
662
    $line{suggestionid}         = $suggestion->suggestionid;
662
    $line{suggestion} = $suggestion;
663
    $line{surnamesuggestedby}   = $suggestion->suggester->surname;
664
    $line{firstnamesuggestedby} = $suggestion->suggester->firstname;
665
663
666
    $line{estimated_delivery_date} = $order->{estimated_delivery_date};
664
    $line{estimated_delivery_date} = $order->{estimated_delivery_date};
667
665
(-)a/acqui/parcel.pl (-3 / +1 lines)
Lines 151-159 for my $order (@orders) { Link Here
151
    $total_tax_included                 += get_rounded_price( $line{unitprice_tax_included} ) * $line{quantity};
151
    $total_tax_included                 += get_rounded_price( $line{unitprice_tax_included} ) * $line{quantity};
152
152
153
    my $suggestion = Koha::Suggestions->search( { biblionumber => $line{biblionumber} } )->single;
153
    my $suggestion = Koha::Suggestions->search( { biblionumber => $line{biblionumber} } )->single;
154
    $line{suggestionid}         = $suggestion->suggestionid;
154
    $line{suggestion} = $suggestion;
155
    $line{surnamesuggestedby}   = $suggestion->suggester->surname;
156
    $line{firstnamesuggestedby} = $suggestion->suggester->firstname;
157
155
158
    if ( $line{parent_ordernumber} != $line{ordernumber} ) {
156
    if ( $line{parent_ordernumber} != $line{ordernumber} ) {
159
        if ( grep { $_->{ordernumber} == $line{parent_ordernumber} } @orders ) {
157
        if ( grep { $_->{ordernumber} == $line{parent_ordernumber} } @orders ) {
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt (-6 / +4 lines)
Lines 834-845 Link Here
834
                                                        [% books_loo.copyrightdate | html %]
834
                                                        [% books_loo.copyrightdate | html %]
835
                                                    [% END -%]
835
                                                    [% END -%]
836
                                                    [%- IF ( books_loo.editionstatement ) %], [% books_loo.editionstatement | html %][% END -%]
836
                                                    [%- IF ( books_loo.editionstatement ) %], [% books_loo.editionstatement | html %][% END -%]
837
                                                    [%- IF ( books_loo.suggestionid ) %]
837
                                                    [%- IF ( books_loo.suggestion ) %]
838
                                                        <br />
838
                                                        <br />
839
                                                        Suggested by: [% books_loo.surnamesuggestedby | html %][% IF ( books_loo.firstnamesuggestedby ) %], [% books_loo.firstnamesuggestedby | html %][% END %] (<a
839
                                                        Suggested by: [% books_loo.suggestion.suggester.surname | html %][% IF ( books_loo.suggestion.suggester.firstname ) %], [% books_loo.suggestion.suggester.firstname | html %][% END %]
840
                                                            href="/cgi-bin/koha/suggestion/suggestion.pl?suggestionid=[% books_loo.suggestionid | uri %]&amp;op=show"
840
                                                        (<a href="/cgi-bin/koha/suggestion/suggestion.pl?suggestionid=[% books_loo.suggestion.suggestionid | uri %]&amp;op=show">suggestion #[% books_loo.suggestion.suggestionid | html %]</a>)
841
                                                            >suggestion #[% books_loo.suggestionid | html %]</a
842
                                                        >)
843
                                                    [% END %]
841
                                                    [% END %]
844
                                                </p>
842
                                                </p>
845
                                                [% IF ( books_loo.order_internalnote ) %]
843
                                                [% IF ( books_loo.order_internalnote ) %]
Lines 962-968 Link Here
962
                                                        <a href="#" class="transfer_order" data-ordernumber="[% books_loo.ordernumber | html %]">Transfer</a>
960
                                                        <a href="#" class="transfer_order" data-ordernumber="[% books_loo.ordernumber | html %]">Transfer</a>
963
                                                        <br />
961
                                                        <br />
964
                                                    [% END %]
962
                                                    [% END %]
965
                                                    [% UNLESS ( books_loo.suggestionid ) %]
963
                                                    [% UNLESS ( books_loo.suggestion.suggestionid ) %]
966
                                                        <a
964
                                                        <a
967
                                                            data-action="/cgi-bin/koha/acqui/newordersuggestion.pl"
965
                                                            data-action="/cgi-bin/koha/acqui/newordersuggestion.pl"
968
                                                            data-booksellerid="[% booksellerid | html %]"
966
                                                            data-booksellerid="[% booksellerid | html %]"
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt (-3 / +2 lines)
Lines 238-246 Link Here
238
                                                [% order.copyrightdate | html %]
238
                                                [% order.copyrightdate | html %]
239
                                            [% END %]
239
                                            [% END %]
240
                                        [% END %]
240
                                        [% END %]
241
                                        [% IF ( order.suggestionid ) %]
241
                                        [% IF ( order.suggestion ) %]
242
                                            <br />
242
                                            <br />
243
                                            Suggested by: [% order.surnamesuggestedby | html %][% IF ( order.firstnamesuggestedby ) %], [% order.firstnamesuggestedby | html %][% END %] (<a
243
                                            Suggested by: [% order.suggestion.suggester.surname | html %][% IF ( order.suggestion.suggester.firstname ) %], [% order.suggestion.suggester.firstname | html %][% END %] (<a
244
                                                href="/cgi-bin/koha/suggestion/suggestion.pl?suggestionid=[% order.suggestionid | uri %]&amp;op=show"
244
                                                href="/cgi-bin/koha/suggestion/suggestion.pl?suggestionid=[% order.suggestionid | uri %]&amp;op=show"
245
                                                >suggestion #[% order.suggestionid | html %]</a
245
                                                >suggestion #[% order.suggestionid | html %]</a
246
                                            >)
246
                                            >)
247
- 

Return to bug 39723