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

(-)a/C4/Acquisition.pm (-1 / +1 lines)
Lines 685-691 sub GetBasketsInfosByBookseller { Link Here
685
            , aqorders.quantity
685
            , aqorders.quantity
686
            , 0)
686
            , 0)
687
          ) AS expected_items,
687
          ) AS expected_items,
688
	  SUM( aqorders.uncertainprice ) AS uncertainprices
688
        SUM( aqorders.uncertainprice ) AS uncertainprices
689
        FROM aqbasket
689
        FROM aqbasket
690
          LEFT JOIN aqorders ON aqorders.basketno = aqbasket.basketno
690
          LEFT JOIN aqorders ON aqorders.basketno = aqbasket.basketno
691
        WHERE booksellerid = ?};
691
        WHERE booksellerid = ?};
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt (-9 / +8 lines)
Lines 60-80 Link Here
60
            [% END %]
60
            [% END %]
61
                <span class="suppliername">
61
                <span class="suppliername">
62
                    [% IF (supplier.name) %]
62
                    [% IF (supplier.name) %]
63
                        <a name="[% supplier.booksellerid | html %]" href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% supplier.booksellerid | html %]">[% supplier.name | html %]</a>
63
                        <a name="[% supplier.booksellerid | html %]" href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% supplier.booksellerid | uri %]">[% supplier.name | html %]</a>
64
                    [% ELSE %]
64
                    [% ELSE %]
65
                        <a name="[% supplier.booksellerid | html %]" href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% supplier.booksellerid | html %]">NO NAME</a>
65
                        <a name="[% supplier.booksellerid | html %]" href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% supplier.booksellerid | uri %]">NO NAME</a>
66
                    [% END %]
66
                    [% END %]
67
                </span>
67
                </span>
68
                <span class="action">
68
                <span class="action">
69
                    [% IF ( CAN_user_acquisition_order_manage ) %]
69
                    [% IF ( CAN_user_acquisition_order_manage ) %]
70
                        [% IF ( supplier.active ) %]
70
                        [% IF ( supplier.active ) %]
71
                            <a class="btn btn-default btn-sm" href="/cgi-bin/koha/acqui/basketheader.pl?booksellerid=[% supplier.booksellerid | html %]&amp;op=add_form"><i class="fa fa-plus"></i> New basket</a>
71
                            <a class="btn btn-default btn-sm" href="/cgi-bin/koha/acqui/basketheader.pl?booksellerid=[% supplier.booksellerid | uri %]&amp;op=add_form"><i class="fa fa-plus"></i> New basket</a>
72
                        [% ELSE %]
72
                        [% ELSE %]
73
                            (inactive)
73
                            (inactive)
74
                        [% END %]
74
                        [% END %]
75
                    [% END %]
75
                    [% END %]
76
                        [% IF ( supplier.loop_basket.size ) %]
76
                        [% IF ( supplier.loop_basket.size ) %]
77
                    <a class="btn btn-default btn-sm" href="/cgi-bin/koha/acqui/parcels.pl?booksellerid=[% supplier.booksellerid | html %]"><i class="fa fa-inbox"></i> Receive shipment</a>
77
                    <a class="btn btn-default btn-sm" href="/cgi-bin/koha/acqui/parcels.pl?booksellerid=[% supplier.booksellerid | uri %]"><i class="fa fa-inbox"></i> Receive shipment</a>
78
                        [% END %]
78
                        [% END %]
79
                </span>
79
                </span>
80
                <div class="baskets">
80
                <div class="baskets">
Lines 102-108 Link Here
102
                                        <tr>
102
                                        <tr>
103
                                    [% END %]
103
                                    [% END %]
104
                                        <td>[% basket.basketno | html %]</td>
104
                                        <td>[% basket.basketno | html %]</td>
105
                                        <td><a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basket.basketno | html %]">[% basket.basketname | html %]<a></td>
105
                                        <td><a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basket.basketno | uri %]">[% basket.basketname | html %]<a></td>
106
                                        <td>
106
                                        <td>
107
                                            <span title="[% basket.total_items | html %]">[% basket.total_items | html %]
107
                                            <span title="[% basket.total_items | html %]">[% basket.total_items | html %]
108
                                                [% IF basket.total_items_cancelled %]
108
                                                [% IF basket.total_items_cancelled %]
Lines 147-159 Link Here
147
                                            <div class="dropup">
147
                                            <div class="dropup">
148
                                                <div class="btn-group">
148
                                                <div class="btn-group">
149
                                                [%# There should be no space between these two buttons, it would render badly %]
149
                                                [%# There should be no space between these two buttons, it would render badly %]
150
                                                    <a class="btn btn-default btn-xs" role="button" href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basket.basketno | html %]"><i class="fa fa-eye"></i> View</a><a class="btn btn-default btn-xs dropdown-toggle" id="basketactions[% basket.basknetno | html %]" role="button" data-toggle="dropdown" href="#"><b class="caret"></b></a>
150
                                                    <a class="btn btn-default btn-xs" role="button" href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basket.basketno | uri %]"><i class="fa fa-eye"></i> View</a><a class="btn btn-default btn-xs dropdown-toggle" id="basketactions[% basket.basknetno | html %]" role="button" data-toggle="dropdown" href="#"><b class="caret"></b></a>
151
                                                    <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="basketactions[% basketn.basketno | html %]">
151
                                                    <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="basketactions[% basketn.basketno | html %]">
152
                                                        <li><a id="addtoBasketLabel[% basket.basketno | html %]" href="#addtoBasket[% basket.basketno | html %]" role="button" data-toggle="modal"><i class="fa fa-plus"></i> Add to basket</a></li>
152
                                                        <li><a id="addtoBasketLabel[% basket.basketno | html %]" href="#addtoBasket[% basket.basketno | html %]" role="button" data-toggle="modal"><i class="fa fa-plus"></i> Add to basket</a></li>
153
                                                        [% IF basket.uncertainprices %]
153
                                                        [% IF basket.uncertainprices %]
154
                                                        <li><a href="/cgi-bin/koha/acqui/uncertainprice.pl?booksellerid=[% basket.booksellerid | html %]&owner=1"><i class="fa fa-usd"></i> Uncertain prices</a></li>
154
                                                        <li><a href="/cgi-bin/koha/acqui/uncertainprice.pl?booksellerid=[% basket.booksellerid | uri %]&owner=1"><i class="fa fa-usd"></i> Uncertain prices</a></li>
155
                                                        [% ELSIF basket.total_items && !basket.is_standing %]
155
                                                        [% ELSIF basket.total_items && !basket.is_standing %]
156
                                                        <li><a href="/cgi-bin/koha/acqui/basket.pl?op=close&basketno=[% basket.basketno | html %]&booksellerid=[% basket.booksellerid | html %]"><i class="fa fa-times-circle"></i> Close this basket</a></li>
156
                                                        <li><a href="/cgi-bin/koha/acqui/basket.pl?op=close&basketno=[% basket.basketno | uri %]&booksellerid=[% basket.booksellerid | uri %]"><i class="fa fa-times-circle"></i> Close this basket</a></li>
157
                                                        [% END %]
157
                                                        [% END %]
158
                                                    </ul>
158
                                                    </ul>
159
                                                    <!-- Modal -->
159
                                                    <!-- Modal -->
160
- 

Return to bug 21364