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

(-)a/C4/Acquisition.pm (+3 lines)
Lines 1701-1706 sub SearchOrders { Link Here
1701
               biblio.*,
1701
               biblio.*,
1702
               biblioitems.isbn,
1702
               biblioitems.isbn,
1703
               biblioitems.biblioitemnumber,
1703
               biblioitems.biblioitemnumber,
1704
               biblioitems.publishercode,
1705
               biblioitems.publicationyear,
1704
               aqbasket.authorisedby,
1706
               aqbasket.authorisedby,
1705
               aqbasket.booksellerid,
1707
               aqbasket.booksellerid,
1706
               aqbasket.closedate,
1708
               aqbasket.closedate,
Lines 2612-2617 sub GetInvoiceDetails { Link Here
2612
        SELECT aqorders.*,
2614
        SELECT aqorders.*,
2613
                biblio.*,
2615
                biblio.*,
2614
                biblio.copyrightdate,
2616
                biblio.copyrightdate,
2617
                biblioitems.isbn,
2615
                biblioitems.publishercode,
2618
                biblioitems.publishercode,
2616
                biblioitems.publicationyear,
2619
                biblioitems.publicationyear,
2617
                aqbasket.basketname,
2620
                aqbasket.basketname,
(-)a/acqui/uncertainprice.pl (-18 / +2 lines)
Lines 79-102 my $pendingorders = SearchOrders({ Link Here
79
    basketno => $basketno,
79
    basketno => $basketno,
80
    pending => 1,
80
    pending => 1,
81
});
81
});
82
my @orders;
82
my @orders = grep { $_->{'uncertainprice'} } @$pendingorders;
83
83
84
foreach my $order (@{$pendingorders}) {
85
    if ( $order->{'uncertainprice'} ) {
86
        my $bibdata = &GetBiblioData($order->{'biblionumber'});
87
        $order->{'bibisbn'} = $bibdata->{'isbn'};
88
        $order->{'bibpublishercode'} = $bibdata->{'publishercode'};
89
        $order->{'bibpublicationyear'} = $bibdata->{'publicationyear'};
90
        $order->{'bibtitle'} = $bibdata->{'title'};
91
        $order->{'bibauthor'} = $bibdata->{'author'};
92
        $order->{'surname'} = $order->{'surname'};
93
        $order->{'firstname'} = $order->{'firstname'};
94
        my $order_as_from_db=GetOrder($order->{ordernumber});
95
        $order->{'quantity'} = $order_as_from_db->{'quantity'};
96
        $order->{'listprice'} = $order_as_from_db->{'listprice'};
97
        push(@orders, $order);
98
    }
99
}
100
if ( $op eq 'validate' ) {
84
if ( $op eq 'validate' ) {
101
    $template->param( validate => 1);
85
    $template->param( validate => 1);
102
    my $count = scalar(@orders);
86
    my $count = scalar(@orders);
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt (-1 / +2 lines)
Lines 157-169 Link Here
157
                <tr>
157
                <tr>
158
                  <td>
158
                  <td>
159
                    [% IF order.biblionumber %]
159
                    [% IF order.biblionumber %]
160
                      <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% order.biblionumber %]">[% order.title %]</a>
160
                      <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% order.biblionumber %]">[% order.title |html %]</a>
161
                      [% IF ( order.author ) %]
161
                      [% IF ( order.author ) %]
162
                        <br /><em>by</em> [% order.author %]
162
                        <br /><em>by</em> [% order.author %]
163
                      [% END %]
163
                      [% END %]
164
                    [% ELSE %]
164
                    [% ELSE %]
165
                      <em>Deleted bibliographic record, can't find title</em>
165
                      <em>Deleted bibliographic record, can't find title</em>
166
                    [% END %]
166
                    [% END %]
167
                    [% IF ( order.isbn ) %] &ndash; [% order.isbn %][% END %]
167
                    [% IF ( order.publishercode ) %]
168
                    [% IF ( order.publishercode ) %]
168
                      <br/>[% order.publishercode %]
169
                      <br/>[% order.publishercode %]
169
                        [% IF order.publicationyear > 0 %]
170
                        [% IF order.publicationyear > 0 %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt (-2 / +8 lines)
Lines 270-276 Link Here
270
                  <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% loop_order.biblionumber %]">[% loop_order.title |html %]</a>
270
                  <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% loop_order.biblionumber %]">[% loop_order.title |html %]</a>
271
                [% IF ( loop_order.author ) %] by [% loop_order.author %][% END %]
271
                [% IF ( loop_order.author ) %] by [% loop_order.author %][% END %]
272
                [% IF ( loop_order.isbn ) %] &ndash; [% loop_order.isbn %][% END %]
272
                [% IF ( loop_order.isbn ) %] &ndash; [% loop_order.isbn %][% END %]
273
                [% IF ( loop_order.publishercode ) %]<br />Publisher:[% loop_order.publishercode %][% END %]
273
                [% IF ( loop_order.publishercode ) %]
274
                    <br />Publisher: [% loop_order.publishercode %]
275
                    [%- IF ( loop_order.publicationyear ) %], [% loop_order.publicationyear %][% END %]
276
                [% END %]
274
                [% IF ( loop_order.suggestionid ) %]
277
                [% IF ( loop_order.suggestionid ) %]
275
                    <br/>
278
                    <br/>
276
                    Suggested by: [% loop_order.surnamesuggestedby %][% IF ( loop_order.firstnamesuggestedby ) %], [% loop_order.firstnamesuggestedby %] [% END %]
279
                    Suggested by: [% loop_order.surnamesuggestedby %][% IF ( loop_order.firstnamesuggestedby ) %], [% loop_order.firstnamesuggestedby %] [% END %]
Lines 417-423 Link Here
417
                <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% order.biblionumber %]">[% order.title |html %]</a>
420
                <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% order.biblionumber %]">[% order.title |html %]</a>
418
                [% IF ( order.author ) %] / [% order.author %][% END %]
421
                [% IF ( order.author ) %] / [% order.author %][% END %]
419
                [% IF ( order.isbn ) %] - [% order.isbn %][% END %]
422
                [% IF ( order.isbn ) %] - [% order.isbn %][% END %]
420
                [% IF ( order.publishercode ) %]<br />Publisher :[% order.publishercode %][% END %]
423
                [% IF ( order.publishercode ) %]
424
                    <br />Publisher: [% order.publishercode %]
425
                    [%- IF ( order.publicationyear ) %], [% order.publicationyear %][% END %]
426
                [% END %]
421
                [% IF ( order.suggestionid ) %]
427
                [% IF ( order.suggestionid ) %]
422
                    <br/>
428
                    <br/>
423
                    Suggested by: [% order.surnamesuggestedby %][% IF ( order.firstnamesuggestedby ) %], [% order.firstnamesuggestedby %] [% END %]
429
                    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 103-109 Link Here
103
                            <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% ordersloo.biblionumber %]">[% ordersloo.title |html %]</a>
103
                            <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% ordersloo.biblionumber %]">[% ordersloo.title |html %]</a>
104
                            [% IF ( ordersloo.author ) %] by [% ordersloo.author %][% END %]
104
                            [% IF ( ordersloo.author ) %] by [% ordersloo.author %][% END %]
105
                            [% IF ( ordersloo.isbn ) %] &ndash; [% ordersloo.isbn %][% END %]
105
                            [% IF ( ordersloo.isbn ) %] &ndash; [% ordersloo.isbn %][% END %]
106
                            [% IF ( ordersloo.publishercode ) %]<br />Publisher :[% ordersloo.publishercode %][% END %]
106
                            [% IF ( ordersloo.publishercode ) %]
107
                                <br />Publisher: [% ordersloo.publishercode %]
108
                                [%- IF ( ordersloo.publicationyear ) %], [% ordersloo.publicationyear %][% END %]
109
                            [% END %]
107
                        </td>
110
                        </td>
108
                        <td><a class="btn btn-default btn-xs" href="transferorder.pl?bookselleridfrom=[% ordersloo.bookselleridfrom %]&ordernumber=[% ordersloo.ordernumber %]">Transfer</a></td>
111
                        <td><a class="btn btn-default btn-xs" href="transferorder.pl?bookselleridfrom=[% ordersloo.bookselleridfrom %]&ordernumber=[% ordersloo.ordernumber %]">Transfer</a></td>
109
                      </tr>
112
                      </tr>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt (-6 / +12 lines)
Lines 108-118 var MSG_INVALIDPRICE = _("ERROR: Price is not a valid number, please check the p Link Here
108
            [% uncertainpriceorder.basketname %]
108
            [% uncertainpriceorder.basketname %]
109
        </td>
109
        </td>
110
	    <td>
110
	    <td>
111
	        [% uncertainpriceorder.bibtitle %] / [% uncertainpriceorder.bibauthor %] <br /> [% uncertainpriceorder.bibpublishercode %], [% uncertainpriceorder.bibpublicationyear %]<br />[% uncertainpriceorder.bibisbn %]<br />
111
            <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% uncertainpriceorder.biblionumber %]">[% uncertainpriceorder.title |html %]</a>
112
	        <a href="neworderempty.pl?ordernumber=[% uncertainpriceorder.ordernumber %]&amp;booksellerid=[% booksellerid %]&amp;basketno=[% uncertainpriceorder.basketno %]">
112
            [% IF ( uncertainpriceorder.author ) %] <em>by</em> [% uncertainpriceorder.author %][% END %]
113
	            edit
113
            [% IF ( uncertainpriceorder.publishercode ) %]
114
	        </a>
114
                <br /><em>Publisher:</em> [% uncertainpriceorder.publishercode %]
115
	    </td>
115
                [%- IF ( uncertainpriceorder.publicationyear ) %], [% uncertainpriceorder.publicationyear %][% END %]
116
            [% END %]
117
            [% IF ( uncertainpriceorder.isbn ) %]<br />[% uncertainpriceorder.isbn %][% END %]
118
            <br />
119
            <a href="neworderempty.pl?ordernumber=[% uncertainpriceorder.ordernumber %]&amp;booksellerid=[% booksellerid %]&amp;basketno=[% uncertainpriceorder.basketno %]">
120
                Edit
121
            </a>
122
        </td>
116
        <td>
123
        <td>
117
            [% uncertainpriceorder.firstname %] [% uncertainpriceorder.surname %]
124
            [% uncertainpriceorder.firstname %] [% uncertainpriceorder.surname %]
118
        </td>
125
        </td>
119
- 

Return to bug 11122