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

(-)a/C4/Acquisition.pm (+3 lines)
Lines 1670-1675 sub SearchOrders { Link Here
1670
               biblio.*,
1670
               biblio.*,
1671
               biblioitems.isbn,
1671
               biblioitems.isbn,
1672
               biblioitems.biblioitemnumber,
1672
               biblioitems.biblioitemnumber,
1673
               biblioitems.publishercode,
1674
               biblioitems.publicationyear,
1673
               aqbasket.authorisedby,
1675
               aqbasket.authorisedby,
1674
               aqbasket.booksellerid,
1676
               aqbasket.booksellerid,
1675
               aqbasket.closedate,
1677
               aqbasket.closedate,
Lines 2570-2575 sub GetInvoiceDetails { Link Here
2570
        SELECT aqorders.*,
2572
        SELECT aqorders.*,
2571
                biblio.*,
2573
                biblio.*,
2572
                biblio.copyrightdate,
2574
                biblio.copyrightdate,
2575
                biblioitems.isbn,
2573
                biblioitems.publishercode,
2576
                biblioitems.publishercode,
2574
                biblioitems.publicationyear,
2577
                biblioitems.publicationyear,
2575
                aqbasket.basketname,
2578
                aqbasket.basketname,
(-)a/acqui/uncertainprice.pl (-18 / +2 lines)
Lines 81-104 my $pendingorders = SearchOrders({ Link Here
81
    basketno => $basketno,
81
    basketno => $basketno,
82
    pending => 1,
82
    pending => 1,
83
});
83
});
84
my @orders;
84
my @orders = grep { $_->{'uncertainprice'} } @$pendingorders;
85
85
86
foreach my $order (@{$pendingorders}) {
87
    if ( $order->{'uncertainprice'} ) {
88
        my $bibdata = &GetBiblioData($order->{'biblionumber'});
89
        $order->{'bibisbn'} = $bibdata->{'isbn'};
90
        $order->{'bibpublishercode'} = $bibdata->{'publishercode'};
91
        $order->{'bibpublicationyear'} = $bibdata->{'publicationyear'};
92
        $order->{'bibtitle'} = $bibdata->{'title'};
93
        $order->{'bibauthor'} = $bibdata->{'author'};
94
        $order->{'surname'} = $order->{'surname'};
95
        $order->{'firstname'} = $order->{'firstname'};
96
        my $order_as_from_db=GetOrder($order->{ordernumber});
97
        $order->{'quantity'} = $order_as_from_db->{'quantity'};
98
        $order->{'listprice'} = $order_as_from_db->{'listprice'};
99
        push(@orders, $order);
100
    }
101
}
102
if ( $op eq 'validate' ) {
86
if ( $op eq 'validate' ) {
103
    $template->param( validate => 1);
87
    $template->param( validate => 1);
104
    my $count = scalar(@orders);
88
    my $count = scalar(@orders);
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt (-1 / +2 lines)
Lines 147-156 Link Here
147
              [% FOREACH order IN orders_loop %]
147
              [% FOREACH order IN orders_loop %]
148
                <tr>
148
                <tr>
149
                  <td>
149
                  <td>
150
                    <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% order.biblionumber %]">[% order.title %]</a>
150
                    <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% order.biblionumber %]">[% order.title |html %]</a>
151
                    [% IF ( order.author ) %]
151
                    [% IF ( order.author ) %]
152
                      <br /><em>by</em> [% order.author %]
152
                      <br /><em>by</em> [% order.author %]
153
                    [% END %]
153
                    [% END %]
154
                    [% IF ( order.isbn ) %] &ndash; [% order.isbn %][% END %]
154
                    [% IF ( order.publishercode ) %]
155
                    [% IF ( order.publishercode ) %]
155
                      <br/>[% order.publishercode %]
156
                      <br/>[% order.publishercode %]
156
                        [% IF order.publicationyear > 0 %]
157
                        [% IF order.publicationyear > 0 %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt (-2 / +8 lines)
Lines 256-262 Link Here
256
                  <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% loop_order.biblionumber %]">[% loop_order.title |html %]</a>
256
                  <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% loop_order.biblionumber %]">[% loop_order.title |html %]</a>
257
                [% IF ( loop_order.author ) %] by [% loop_order.author %][% END %]
257
                [% IF ( loop_order.author ) %] by [% loop_order.author %][% END %]
258
                [% IF ( loop_order.isbn ) %] &ndash; [% loop_order.isbn %][% END %]
258
                [% IF ( loop_order.isbn ) %] &ndash; [% loop_order.isbn %][% END %]
259
                [% IF ( loop_order.publishercode ) %]<br />Publisher:[% loop_order.publishercode %][% END %]
259
                [% IF ( loop_order.publishercode ) %]
260
                    <br />Publisher: [% loop_order.publishercode %]
261
                    [%- IF ( loop_order.publicationyear ) %], [% loop_order.publicationyear %][% END %]
262
                [% END %]
260
                [% IF ( loop_order.suggestionid ) %]
263
                [% IF ( loop_order.suggestionid ) %]
261
                    <br/>
264
                    <br/>
262
                    Suggested by: [% loop_order.surnamesuggestedby %][% IF ( loop_order.firstnamesuggestedby ) %], [% loop_order.firstnamesuggestedby %] [% END %]
265
                    Suggested by: [% loop_order.surnamesuggestedby %][% IF ( loop_order.firstnamesuggestedby ) %], [% loop_order.firstnamesuggestedby %] [% END %]
Lines 403-409 Link Here
403
                <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% order.biblionumber %]">[% order.title |html %]</a>
406
                <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% order.biblionumber %]">[% order.title |html %]</a>
404
                [% IF ( order.author ) %] / [% order.author %][% END %]
407
                [% IF ( order.author ) %] / [% order.author %][% END %]
405
                [% IF ( order.isbn ) %] - [% order.isbn %][% END %]
408
                [% IF ( order.isbn ) %] - [% order.isbn %][% END %]
406
                [% IF ( order.publishercode ) %]<br />Publisher :[% order.publishercode %][% END %]
409
                [% IF ( order.publishercode ) %]
410
                    <br />Publisher: [% order.publishercode %]
411
                    [%- IF ( order.publicationyear ) %], [% order.publicationyear %][% END %]
412
                [% END %]
407
                [% IF ( order.suggestionid ) %]
413
                [% IF ( order.suggestionid ) %]
408
                    <br/>
414
                    <br/>
409
                    Suggested by: [% order.surnamesuggestedby %][% IF ( order.firstnamesuggestedby ) %], [% order.firstnamesuggestedby %] [% END %]
415
                    Suggested by: [% order.surnamesuggestedby %][% IF ( order.firstnamesuggestedby ) %], [% order.firstnamesuggestedby %] [% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/transferorder.tt (-1 / +4 lines)
Lines 78-84 Link Here
78
                            <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% ordersloo.biblionumber %]">[% ordersloo.title |html %]</a>
78
                            <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% ordersloo.biblionumber %]">[% ordersloo.title |html %]</a>
79
                            [% IF ( ordersloo.author ) %] by [% ordersloo.author %][% END %]
79
                            [% IF ( ordersloo.author ) %] by [% ordersloo.author %][% END %]
80
                            [% IF ( ordersloo.isbn ) %] &ndash; [% ordersloo.isbn %][% END %]
80
                            [% IF ( ordersloo.isbn ) %] &ndash; [% ordersloo.isbn %][% END %]
81
                            [% IF ( ordersloo.publishercode ) %]<br />Publisher :[% ordersloo.publishercode %][% END %]
81
                            [% IF ( ordersloo.publishercode ) %]
82
                                <br />Publisher: [% ordersloo.publishercode %]
83
                                [%- IF ( ordersloo.publicationyear ) %], [% ordersloo.publicationyear %][% END %]
84
                            [% END %]
82
                        </td>
85
                        </td>
83
                        <td><a href="transferorder.pl?bookselleridfrom=[% ordersloo.bookselleridfrom %]&ordernumber=[% ordersloo.ordernumber %]">Transfer</a></td>
86
                        <td><a href="transferorder.pl?bookselleridfrom=[% ordersloo.bookselleridfrom %]&ordernumber=[% ordersloo.ordernumber %]">Transfer</a></td>
84
                      </tr>
87
                      </tr>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt (-6 / +12 lines)
Lines 109-119 function check(form) { Link Here
109
            [% uncertainpriceorder.basketname %]
109
            [% uncertainpriceorder.basketname %]
110
        </td>
110
        </td>
111
	    <td>
111
	    <td>
112
	        [% uncertainpriceorder.bibtitle %] / [% uncertainpriceorder.bibauthor %] <br /> [% uncertainpriceorder.bibpublishercode %], [% uncertainpriceorder.bibpublicationyear %]<br />[% uncertainpriceorder.bibisbn %]<br />
112
            <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% uncertainpriceorder.biblionumber %]">[% uncertainpriceorder.title |html %]</a>
113
	        <a href="neworderempty.pl?ordernumber=[% uncertainpriceorder.ordernumber %]&amp;booksellerid=[% booksellerid %]&amp;basketno=[% uncertainpriceorder.basketno %]">
113
            [% IF ( uncertainpriceorder.author ) %] <em>by</em> [% uncertainpriceorder.author %][% END %]
114
	            edit
114
            [% IF ( uncertainpriceorder.publishercode ) %]
115
	        </a>
115
                <br /><em>Publisher:</em> [% uncertainpriceorder.publishercode %]
116
	    </td>
116
                [%- IF ( uncertainpriceorder.publicationyear ) %], [% uncertainpriceorder.publicationyear %][% END %]
117
            [% END %]
118
            [% IF ( uncertainpriceorder.isbn ) %]<br />[% uncertainpriceorder.isbn %][% END %]
119
            <br />
120
            <a href="neworderempty.pl?ordernumber=[% uncertainpriceorder.ordernumber %]&amp;booksellerid=[% booksellerid %]&amp;basketno=[% uncertainpriceorder.basketno %]">
121
                Edit
122
            </a>
123
        </td>
117
        <td>
124
        <td>
118
            [% uncertainpriceorder.firstname %] [% uncertainpriceorder.surname %]
125
            [% uncertainpriceorder.firstname %] [% uncertainpriceorder.surname %]
119
        </td>
126
        </td>
120
- 

Return to bug 11122