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

(-)a/C4/Acquisition.pm (-13 / +34 lines)
Lines 861-878 Results are ordered from most to least recent. Link Here
861
sub GetPendingOrders {
861
sub GetPendingOrders {
862
    my ($supplierid,$grouped,$owner,$basketno,$ordernumber,$search,$ean) = @_;
862
    my ($supplierid,$grouped,$owner,$basketno,$ordernumber,$search,$ean) = @_;
863
    my $dbh = C4::Context->dbh;
863
    my $dbh = C4::Context->dbh;
864
    my $strsth = "
864
    my $strsth = q{SELECT };
865
        SELECT ".($grouped?"count(*),":"")."aqbasket.basketno,
865
    $strsth .= q{COUNT(*),} if $grouped;
866
               surname,firstname,biblio.*,biblioitems.isbn,
866
    $strsth .= q{
867
               aqbasket.closedate, aqbasket.creationdate, aqbasket.basketname,
867
            aqbasket.basketno,
868
               aqorders.*
868
            borrowers.surname,
869
            borrowers.firstname,
870
            biblio.title,
871
            biblio.author,
872
            biblioitems.isbn,
873
            biblioitems.publishercode,
874
            biblioitems.publicationyear,
875
            aqbasket.closedate,
876
            aqbasket.creationdate,
877
            aqbasket.basketname,
878
            aqorders.*
869
        FROM aqorders
879
        FROM aqorders
870
        LEFT JOIN aqbasket ON aqbasket.basketno=aqorders.basketno
880
            LEFT JOIN aqbasket ON aqbasket.basketno=aqorders.basketno
871
        LEFT JOIN borrowers ON aqbasket.authorisedby=borrowers.borrowernumber
881
            LEFT JOIN borrowers ON aqbasket.authorisedby=borrowers.borrowernumber
872
        LEFT JOIN biblio ON biblio.biblionumber=aqorders.biblionumber
882
            LEFT JOIN biblio ON biblio.biblionumber=aqorders.biblionumber
873
        LEFT JOIN biblioitems ON biblioitems.biblionumber=biblio.biblionumber
883
            LEFT JOIN biblioitems ON biblioitems.biblionumber=biblio.biblionumber
874
        WHERE (quantity > quantityreceived OR quantityreceived is NULL)
884
        WHERE
875
        AND datecancellationprinted IS NULL";
885
            (quantity > quantityreceived OR quantityreceived IS NULL)
886
            AND datecancellationprinted IS NULL
887
    };
876
    my @query_params;
888
    my @query_params;
877
    my $userenv = C4::Context->userenv;
889
    my $userenv = C4::Context->userenv;
878
    if ( C4::Context->preference("IndependentBranches") ) {
890
    if ( C4::Context->preference("IndependentBranches") ) {
Lines 2433-2442 sub GetInvoiceDetails { Link Here
2433
2445
2434
    my $invoice = $sth->fetchrow_hashref;
2446
    my $invoice = $sth->fetchrow_hashref;
2435
2447
2436
    $query = qq{
2448
    $query = q{
2437
        SELECT aqorders.*, biblio.*
2449
        SELECT
2450
            aqorders.*,
2451
            biblio.title,
2452
            biblio.author,
2453
            biblio.seriestitle,
2454
            biblioitems.isbn,
2455
            biblioitems.publishercode,
2456
            biblioitems.publicationyear,
2457
            biblioitems.volume
2438
        FROM aqorders
2458
        FROM aqorders
2439
          LEFT JOIN biblio ON aqorders.biblionumber = biblio.biblionumber
2459
          LEFT JOIN biblio ON aqorders.biblionumber = biblio.biblionumber
2460
          LEFT JOIN biblioitems ON biblioitems.biblionumber=biblio.biblionumber
2440
        WHERE invoiceid = ?
2461
        WHERE invoiceid = ?
2441
    };
2462
    };
2442
    $sth = $dbh->prepare($query);
2463
    $sth = $dbh->prepare($query);
(-)a/acqui/uncertainprice.pl (-18 / +2 lines)
Lines 74-97 my $bookseller = &GetBookSellerFromId($booksellerid); Link Here
74
74
75
#show all orders that have uncertain price for the bookseller
75
#show all orders that have uncertain price for the bookseller
76
my $pendingorders = &GetPendingOrders($booksellerid,0,$owner,$basketno);
76
my $pendingorders = &GetPendingOrders($booksellerid,0,$owner,$basketno);
77
my @orders;
77
my @orders = grep { $_->{'uncertainprice'} } @$pendingorders;
78
78
79
foreach my $order (@{$pendingorders}) {
80
    if ( $order->{'uncertainprice'} ) {
81
        my $bibdata = &GetBiblioData($order->{'biblionumber'});
82
        $order->{'bibisbn'} = $bibdata->{'isbn'};
83
        $order->{'bibpublishercode'} = $bibdata->{'publishercode'};
84
        $order->{'bibpublicationyear'} = $bibdata->{'publicationyear'};
85
        $order->{'bibtitle'} = $bibdata->{'title'};
86
        $order->{'bibauthor'} = $bibdata->{'author'};
87
        $order->{'surname'} = $order->{'surname'};
88
        $order->{'firstname'} = $order->{'firstname'};
89
        my $order_as_from_db=GetOrder($order->{ordernumber});
90
        $order->{'quantity'} = $order_as_from_db->{'quantity'};
91
        $order->{'listprice'} = $order_as_from_db->{'listprice'};
92
        push(@orders, $order);
93
    }
94
}
95
if ( $op eq 'validate' ) {
79
if ( $op eq 'validate' ) {
96
    $template->param( validate => 1);
80
    $template->param( validate => 1);
97
    my $count = scalar(@orders);
81
    my $count = scalar(@orders);
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt (-10 / +8 lines)
Lines 108-125 Link Here
108
            <tbody>
108
            <tbody>
109
              [% FOREACH order IN orders_loop %]
109
              [% FOREACH order IN orders_loop %]
110
                <tr>
110
                <tr>
111
                  <td><p><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% order.biblionumber %]">[% order.title %]</a>
111
                  <td>
112
                    [% IF ( order.author ) %]
112
                    <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% order.biblionumber %]">[% order.title |html %]</a>
113
                      <br /><em>by</em> [% order.author %]
113
                    <br />
114
                    [% END %]
114
                    [% IF ( order.author ) %] <em>by</em> [% order.author %][% END %]
115
                  </p></td>
115
                    [% IF ( order.isbn ) %] &ndash; [% order.isbn %][% END %]
116
                  </td>
116
                  <td>
117
                  <td>
117
                    [% IF ( order.publishercode ) %]
118
                    [% IF ( order.publishercode ) %]
118
                      <p>[% order.publishercode %]
119
                      [% order.publishercode %]
119
                        [% IF ( order.publicationyear ) %]
120
                      [%- IF ( order.publicationyear ) %], [% order.publicationyear %][% END %]
120
                          - [% order.publicationyear %]
121
                        [% END %]
122
                      </p>
123
                    [% END %]
121
                    [% END %]
124
                  </td>
122
                  </td>
125
                  <td><p>[% order.branchcode %]</p></td>
123
                  <td><p>[% order.branchcode %]</p></td>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt (-5 / +11 lines)
Lines 200-208 Link Here
200
                <td class="orderfilterclass"><a href="neworderempty.pl?ordernumber=[% loop_order.ordernumber %]&amp;booksellerid=[% loop_order.booksellerid %]">[% loop_order.ordernumber %]</a></td>
200
                <td class="orderfilterclass"><a href="neworderempty.pl?ordernumber=[% loop_order.ordernumber %]&amp;booksellerid=[% loop_order.booksellerid %]">[% loop_order.ordernumber %]</a></td>
201
                <td class="summaryfilterclass">
201
                <td class="summaryfilterclass">
202
                  <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% loop_order.biblionumber %]">[% loop_order.title |html %]</a>
202
                  <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% loop_order.biblionumber %]">[% loop_order.title |html %]</a>
203
                [% IF ( loop_order.author ) %] by [% loop_order.author %][% END %]
203
                [% IF ( loop_order.author ) %] <em>by</em> [% loop_order.author %][% END %]
204
                [% IF ( loop_order.isbn ) %] &ndash; [% loop_order.isbn %][% END %]
204
                [% IF ( loop_order.isbn ) %] &ndash; [% loop_order.isbn %][% END %]
205
                [% IF ( loop_order.publishercode ) %]<br />Publisher :[% loop_order.publishercode %][% END %]
205
                [% IF ( loop_order.publishercode ) %]
206
                    <br /><em>Publisher:</em> [% loop_order.publishercode %]
207
                    [%- IF ( loop_order.publicationyear ) %], [% loop_order.publicationyear %][% END %]
208
                [% END %]
206
                [% IF ( loop_order.suggestionid ) %]
209
                [% IF ( loop_order.suggestionid ) %]
207
                    <br/>
210
                    <br/>
208
                    Suggested by: [% loop_order.surnamesuggestedby %][% IF ( loop_order.firstnamesuggestedby ) %], [% loop_order.firstnamesuggestedby %] [% END %]
211
                    Suggested by: [% loop_order.surnamesuggestedby %][% IF ( loop_order.firstnamesuggestedby ) %], [% loop_order.firstnamesuggestedby %] [% END %]
Lines 307-315 Link Here
307
                <td><a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% loop_receive.basketno %]">[% loop_receive.basketno %]</a></td>
310
                <td><a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% loop_receive.basketno %]">[% loop_receive.basketno %]</a></td>
308
                <td><a href="neworderempty.pl?ordernumber=[% loop_receive.ordernumber %]&amp;booksellerid=[% booksellerid %]">[% loop_receive.ordernumber %]</a></td>
311
                <td><a href="neworderempty.pl?ordernumber=[% loop_receive.ordernumber %]&amp;booksellerid=[% booksellerid %]">[% loop_receive.ordernumber %]</a></td>
309
                <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% loop_receive.biblionumber %]">[% loop_receive.title |html %]</a>
312
                <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% loop_receive.biblionumber %]">[% loop_receive.title |html %]</a>
310
                [% IF ( loop_receive.author ) %] / [% loop_receive.author %][% END %]
313
                [% IF ( loop_receive.author ) %] <em>by</em> [% loop_receive.author %][% END %]
311
                [% IF ( loop_receive.isbn ) %] - [% loop_receive.isbn %][% END %]
314
                [% IF ( loop_receive.isbn ) %] &ndash; [% loop_receive.isbn %][% END %]
312
                [% IF ( loop_receive.publishercode ) %]<br />Publisher :[% loop_receive.publishercode %][% END %]
315
                [% IF ( loop_receive.publishercode ) %]
316
                    <br /><em>Publisher:</em> [% loop_receive.publishercode %]
317
                    [%- IF ( loop_receive.publicationyear ) %], [% loop_receive.publicationyear %][% END %]
318
                [% END %]
313
                [% IF ( loop_receive.suggestionid ) %]
319
                [% IF ( loop_receive.suggestionid ) %]
314
                    <br/>
320
                    <br/>
315
                    Suggested by: [% loop_receive.surnamesuggestedby %][% IF ( loop_receive.firstnamesuggestedby ) %], [% loop_receive.firstnamesuggestedby %] [% END %]
321
                    Suggested by: [% loop_receive.surnamesuggestedby %][% IF ( loop_receive.firstnamesuggestedby ) %], [% loop_receive.firstnamesuggestedby %] [% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/transferorder.tt (-2 / +5 lines)
Lines 76-84 Link Here
76
                        <td><a href="neworderempty.pl?ordernumber=[% ordersloo.ordernumber %]">[% ordersloo.ordernumber %]</a></td>
76
                        <td><a href="neworderempty.pl?ordernumber=[% ordersloo.ordernumber %]">[% ordersloo.ordernumber %]</a></td>
77
                        <td>
77
                        <td>
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 ) %] <em>by</em> [% 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 /><em>Publisher:</em> [% 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 107-117 function check(form) { Link Here
107
            [% uncertainpriceorder.basketname %]
107
            [% uncertainpriceorder.basketname %]
108
        </td>
108
        </td>
109
	    <td>
109
	    <td>
110
	        [% uncertainpriceorder.bibtitle %] / [% uncertainpriceorder.bibauthor %] <br /> [% uncertainpriceorder.bibpublishercode %], [% uncertainpriceorder.bibpublicationyear %]<br />[% uncertainpriceorder.bibisbn %]<br />
110
            <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% uncertainpriceorder.biblionumber %]">[% uncertainpriceorder.title |html %]</a>
111
	        <a href="neworderempty.pl?ordernumber=[% uncertainpriceorder.ordernumber %]&amp;booksellerid=[% booksellerid %]&amp;basketno=[% uncertainpriceorder.basketno %]">
111
            [% IF ( uncertainpriceorder.author ) %] <em>by</em> [% uncertainpriceorder.author %][% END %]
112
	            edit
112
            [% IF ( uncertainpriceorder.isbn ) %] &ndash; [% uncertainpriceorder.isbn %][% END %]
113
	        </a>
113
            [% IF ( uncertainpriceorder.publishercode ) %]
114
	    </td>
114
                <br /><em>Publisher:</em> [% uncertainpriceorder.publishercode %]
115
                [%- IF ( uncertainpriceorder.publicationyear ) %], [% uncertainpriceorder.publicationyear %][% END %]
116
            [% END %]
117
            <br />
118
            <a href="neworderempty.pl?ordernumber=[% uncertainpriceorder.ordernumber %]&amp;booksellerid=[% booksellerid %]&amp;basketno=[% uncertainpriceorder.basketno %]">
119
                Edit
120
            </a>
121
        </td>
115
        <td>
122
        <td>
116
            [% uncertainpriceorder.firstname %] [% uncertainpriceorder.surname %]
123
            [% uncertainpriceorder.firstname %] [% uncertainpriceorder.surname %]
117
        </td>
124
        </td>
118
- 

Return to bug 11122