Attachment #40925 for bug #12054

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

Lines 93-99 if ( $supplier_count == 1 ) { Link Here

(-)a/acqui/booksellers.pl (-1 / +2 lines)
93	$template->param(	93	$template->param(
94	supplier_name => $suppliers[0]->{'name'},	94	supplier_name => $suppliers[0]->{'name'},
95	booksellerid => $suppliers[0]->{'id'},	95	booksellerid => $suppliers[0]->{'id'},
96	basketcount => $suppliers[0]->{'basketcount'}	96	basketcount => $suppliers[0]->{'basketcount'},
		97	active => $suppliers[0]->{active},
97	);	98	);
98	}	99	}
99		100

Lines 128-133 $template->param( uncertainpriceorders => \@orders, Link Here

(-)a/acqui/uncertainprice.pl (+1 lines)
128	booksellernotes => $bookseller->{'notes'},	128	booksellernotes => $bookseller->{'notes'},
129	basketcount => $bookseller->{'basketcount'},	129	basketcount => $bookseller->{'basketcount'},
130	subscriptioncount => $bookseller->{'subscriptioncount'},	130	subscriptioncount => $bookseller->{'subscriptioncount'},
		131	active => $bookseller->{active},
131	owner => $owner,	132	owner => $owner,
132	scriptname => "/cgi-bin/koha/acqui/uncertainprice.pl");	133	scriptname => "/cgi-bin/koha/acqui/uncertainprice.pl");
133	$template->{'VARS'}->{'contacts'} = $bookseller->{'contacts'};	134	$template->{'VARS'}->{'contacts'} = $bookseller->{'contacts'};

Lines 53-58 $template->param( Link Here

(-)a/admin/aqcontract.pl (+1 lines)
53	booksellerid => $booksellerid,	53	booksellerid => $booksellerid,
54	booksellername => $bookseller->{name},	54	booksellername => $bookseller->{name},
55	basketcount => $bookseller->{'basketcount'},	55	basketcount => $bookseller->{'basketcount'},
		56	active => $bookseller->{active},
56	subscriptioncount => $bookseller->{'subscriptioncount'},	57	subscriptioncount => $bookseller->{'subscriptioncount'},
57	);	58	);
58		59




        <span class="caret"></span>
        </a>
        <ul class="dropdown-menu">
            [% IF CAN_user_acquisition_order_manage && active %]
                <li><a href="/cgi-bin/koha/acqui/basketheader.pl?booksellerid=[% booksellerid %]&amp;op=add_form">Basket</a></li>
            [% END %]
            [% IF CAN_user_acquisition_contracts_manage && active %]
                <li><a href="/cgi-bin/koha/admin/aqcontract.pl?op=add_form&amp;booksellerid=[% booksellerid %]">Contract</a></li>
            [% END %]
            [% IF ( CAN_user_acquisition_vendors_manage ) %]

                    <div class="btn-group"><a class="btn btn-small" id="deletesupplier" href="javascript:confirm_deletion()"><i class="icon-remove"></i> Delete vendor</a></div>
                [% END %]
            [% END %]
            [% IF CAN_user_acquisition_order_receive && basketcount %]
                <div class="btn-group"><a class="btn btn-small" id="receive" href="/cgi-bin/koha/acqui/parcels.pl?booksellerid=[% booksellerid %]"><i class="icon-inbox"></i> Receive shipments</a></div>
            [% END %]
        [% ELSE %]

Lines 161-167 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt (-1 / +6 lines)
161	[% UNLESS ( selectbasketg ) %]	161	[% UNLESS ( selectbasketg ) %]
162	[% UNLESS ( closedate ) %]	162	[% UNLESS ( closedate ) %]
163	<div id="toolbar" class="btn-toolbar">	163	<div id="toolbar" class="btn-toolbar">
164	<div class="btn-group"><a href="#addtoBasket" role="button" class="btn btn-small" data-toggle="modal"><i class="icon-plus"></i> Add to basket</a></div>	164	[% IF active %]
		165	<div class="btn-group"><a href="#addtoBasket" role="button" class="btn btn-small" data-toggle="modal"><i class="icon-plus"></i> Add to basket</a></div>
		166	[% END %]
165	<div class="btn-group"><a href="basketheader.pl?booksellerid=[% booksellerid %]&basketno=[% basketno %]&op=add_form" class="btn btn-small" id="basketheadbutton"><i class="icon-pencil"></i> Edit basket</a></div>	167	<div class="btn-group"><a href="basketheader.pl?booksellerid=[% booksellerid %]&basketno=[% basketno %]&op=add_form" class="btn btn-small" id="basketheadbutton"><i class="icon-pencil"></i> Edit basket</a></div>
166	[%# FIXME This action should not be available for everyone %]	168	[%# FIXME This action should not be available for everyone %]
167	<div class="btn-group"><a href="#deleteBasketModal" role="button" class="btn btn-small" data-toggle="modal" id="delbasketbutton"><i class="icon-remove"></i> Delete this basket</a></div>	169	<div class="btn-group"><a href="#deleteBasketModal" role="button" class="btn btn-small" data-toggle="modal" id="delbasketbutton"><i class="icon-remove"></i> Delete this basket</a></div>
Lines 627-633 Link Here
627	</div>	629	</div>
628	</div>	630	</div>
629		631
		632	[% IF active %]
630	[% INCLUDE 'acquisitions-add-to-basket.inc' %]	633	[% INCLUDE 'acquisitions-add-to-basket.inc' %]
		634	[% END %]
		635
631	[% END %]	636	[% END %]
632	[% END %]	637	[% END %]
633	[% END %] [% ELSE %] <!-- if we want just to select a basketgroup for a closed basket -->	638	[% END %] [% ELSE %] <!-- if we want just to select a basketgroup for a closed basket -->

Lines 157-163 $(document).ready(function() { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt (-1 / +1 lines)
157	<td>	157	<td>
158	<a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basket.basketno %]">View</a>	158	<a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basket.basketno %]">View</a>
159		159
160	[% UNLESS ( basket.closedate ) %]	160	[% IF not basket.closedate and supplier.active %]
161	\| <a id="addtoBasketLabel[% basket.basketno %]" href="#addtoBasket[% basket.basketno %]" role="button" data-toggle="modal">Add to basket</a>	161	\| <a id="addtoBasketLabel[% basket.basketno %]" href="#addtoBasket[% basket.basketno %]" role="button" data-toggle="modal">Add to basket</a>
162	<!-- Modal -->	162	<!-- Modal -->
163	<div id="addtoBasket[% basket.basketno %]" class="modal hide" tabindex="-1" role="dialog" aria-labelledby="addtoBasketLabel[% basket.basketno %]" aria-hidden="true" data-basketno="[% basket.basketname %]">	163	<div id="addtoBasket[% basket.basketno %]" class="modal hide" tabindex="-1" role="dialog" aria-labelledby="addtoBasketLabel[% basket.basketno %]" aria-hidden="true" data-basketno="[% basket.basketname %]">

Lines 194-200 function Check(ff) { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt (-2 / +6 lines)
194	[% END %]	194	[% END %]
195	</table>	195	</table>
196	[% ELSE %]	196	[% ELSE %]
197	<div class="dialog message">There are no contracts with this vendor. <a href="/cgi-bin/koha/admin/aqcontract.pl?op=add_form&booksellerid=[% booksellerid %]">Add a contract</a>.</div>	197	<div class="dialog message">
		198	There are no contracts with this vendor.
		199	[% IF active %]
		200	<a href="/cgi-bin/koha/admin/aqcontract.pl?op=add_form&booksellerid=[% booksellerid %]">Add a contract</a>.
		201	[% END %]
		202	</div>
198	[% END %]	203	[% END %]
199	[% END %]	204	[% END %]
200	</div>	205	</div>
201	-

Return to bug 12054

Lines 14-23 function confirm_deletion() { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc (-3 / +3 lines)
14	<span class="caret"></span>	14	<span class="caret"></span>
15	</a>	15	</a>
16	<ul class="dropdown-menu">	16	<ul class="dropdown-menu">
17	[% IF ( CAN_user_acquisition_order_manage ) %]	17	[% IF CAN_user_acquisition_order_manage && active %]
18	<li><a href="/cgi-bin/koha/acqui/basketheader.pl?booksellerid=[% booksellerid %]&op=add_form">Basket</a></li>	18	<li><a href="/cgi-bin/koha/acqui/basketheader.pl?booksellerid=[% booksellerid %]&op=add_form">Basket</a></li>
19	[% END %]	19	[% END %]
20	[% IF ( CAN_user_acquisition_contracts_manage ) %]	20	[% IF CAN_user_acquisition_contracts_manage && active %]
21	<li><a href="/cgi-bin/koha/admin/aqcontract.pl?op=add_form&booksellerid=[% booksellerid %]">Contract</a></li>	21	<li><a href="/cgi-bin/koha/admin/aqcontract.pl?op=add_form&booksellerid=[% booksellerid %]">Contract</a></li>
22	[% END %]	22	[% END %]
23	[% IF ( CAN_user_acquisition_vendors_manage ) %]	23	[% IF ( CAN_user_acquisition_vendors_manage ) %]
Lines 31-37 function confirm_deletion() { Link Here
31	<div class="btn-group"><a class="btn btn-small" id="deletesupplier" href="javascript:confirm_deletion()"><i class="icon-remove"></i> Delete vendor</a></div>	31	<div class="btn-group"><a class="btn btn-small" id="deletesupplier" href="javascript:confirm_deletion()"><i class="icon-remove"></i> Delete vendor</a></div>
32	[% END %]	32	[% END %]
33	[% END %]	33	[% END %]
34	[% IF ( CAN_user_acquisition_order_receive && basketcount ) %]	34	[% IF CAN_user_acquisition_order_receive && basketcount %]
35	<div class="btn-group"><a class="btn btn-small" id="receive" href="/cgi-bin/koha/acqui/parcels.pl?booksellerid=[% booksellerid %]"><i class="icon-inbox"></i> Receive shipments</a></div>	35	<div class="btn-group"><a class="btn btn-small" id="receive" href="/cgi-bin/koha/acqui/parcels.pl?booksellerid=[% booksellerid %]"><i class="icon-inbox"></i> Receive shipments</a></div>
36	[% END %]	36	[% END %]
37	[% ELSE %]	37	[% ELSE %]