Attachment #170953 for bug #31632

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

Lines 129-135 if ( $op eq 'connectDuplicate' ) { Link Here

(-)a/acqui/newordersuggestion.pl (-1 / +1 lines)
129	ConnectSuggestionAndBiblio( $suggestionid, $duplicateNumber );	129	ConnectSuggestionAndBiblio( $suggestionid, $duplicateNumber );
130	}	130	}
131		131
132	if ( $op eq 'link_order' and $link_order ) {	132	if ( $op eq 'cud-link_order' and $link_order ) {
133	my $order = Koha::Acquisition::Orders->find($link_order);	133	my $order = Koha::Acquisition::Orders->find($link_order);
134	my $suggestion = Koha::Suggestions->find($suggestionid);	134	my $suggestion = Koha::Suggestions->find($suggestionid);
135	$suggestion->update( { biblionumber => $order->biblionumber } ) if $order->biblionumber;	135	$suggestion->update( { biblionumber => $order->biblionumber } ) if $order->biblionumber;

Lines 726-732 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt (-1 / +2 lines)
726	<br />	726	<br />
727	[% END %]	727	[% END %]
728	[% UNLESS ( books_loo.suggestionid ) %]	728	[% UNLESS ( books_loo.suggestionid ) %]
729	<a href="/cgi-bin/koha/acqui/newordersuggestion.pl?booksellerid=[% booksellerid \| uri %]&basketno=[% basketno \| uri %]&link_order=[% books_loo.ordernumber \| uri %]">[% tp('verb', 'Link suggestion') \| html %]</a>	729	<a data-action="/cgi-bin/koha/acqui/newordersuggestion.pl" data-booksellerid="[% booksellerid \| uri %]" data-basketno="[% basketno \| uri %]" data-link_order="[% books_loo.ordernumber \| uri %]" data-method="post" class="submit-form-link" href="#">[% tp('verb', 'Link suggestion') \| html %]</a>
730	[% END %]	730	[% END %]
731	</td>	731	</td>
732	[% END %]	732	[% END %]
Lines 1015-1020 Link Here
1015	[% INCLUDE 'columns_settings.inc' %]	1015	[% INCLUDE 'columns_settings.inc' %]
1016	[% Asset.js("lib/hc-sticky/hc-sticky.js") \| $raw %]	1016	[% Asset.js("lib/hc-sticky/hc-sticky.js") \| $raw %]
1017	[% Asset.js("js/acq.js") \| $raw %]	1017	[% Asset.js("js/acq.js") \| $raw %]
		1018	[% Asset.js("js/form-submit.js") \| $raw %]
1018	[% INCLUDE 'calendar.inc' %]	1019	[% INCLUDE 'calendar.inc' %]
1019	<script>	1020	<script>
1020	function updateColumnsVisibility(visible) {	1021	function updateColumnsVisibility(visible) {

Lines 101-107 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt (-2 / +2 lines)
101	</td>	101	</td>
102	<td class="actions">	102	<td class="actions">
103	[% IF link_order %]	103	[% IF link_order %]
104	<a href="/cgi-bin/koha/acqui/newordersuggestion.pl?op=link_order&link_order=[% link_order \| uri %]&booksellerid=[% booksellerid \| uri %]&basketno=[% basketno \| uri %]&suggestionid=[% suggestion.suggestionid \| uri %]" class="btn btn-default btn-xs"><i class="fa fa-plus"></i> [% tp('verb', 'Link suggestion') \| html %]</a>	104	<a data-action="/cgi-bin/koha/acqui/newordersuggestion.pl" data-op="cud-link_order" data-link_order="[% link_order \| uri %]" data-booksellerid="[% booksellerid \| uri %]" data-basketno="[% basketno \| uri %]" data-suggestionid="[% suggestion.suggestionid \| uri %]" data-method="post" class="btn btn-default btn-xs submit-form-link" href="#"><i class="fa fa-plus"></i> [% tp('verb', 'Link suggestion') \| html %]</a>
105	[% ELSIF ( suggestion.biblionumber ) %]	105	[% ELSIF ( suggestion.biblionumber ) %]
106	<a href="neworderempty.pl?booksellerid=[% booksellerid \| uri %]&basketno=[% basketno \| uri %]&suggestionid=[% suggestion.suggestionid \| uri %]&biblio=[% suggestion.biblionumber \| uri %]" class="btn btn-default btn-xs"><i class="fa fa-plus"></i> [% tp('verb', 'Order') \| html %]</a>	106	<a href="neworderempty.pl?booksellerid=[% booksellerid \| uri %]&basketno=[% basketno \| uri %]&suggestionid=[% suggestion.suggestionid \| uri %]&biblio=[% suggestion.biblionumber \| uri %]" class="btn btn-default btn-xs"><i class="fa fa-plus"></i> [% tp('verb', 'Order') \| html %]</a>
107	[% ELSE %]	107	[% ELSE %]
Lines 128-133 Link Here
128		128
129	[% MACRO jsinclude BLOCK %]	129	[% MACRO jsinclude BLOCK %]
130	[% Asset.js("js/acquisitions-menu.js") \| $raw %]	130	[% Asset.js("js/acquisitions-menu.js") \| $raw %]
		131	[% Asset.js("js/form-submit.js") \| $raw %]
131	[% INCLUDE 'datatables.inc' %]	132	[% INCLUDE 'datatables.inc' %]
132	[% INCLUDE 'calendar.inc' %]	133	[% INCLUDE 'calendar.inc' %]
133	<script>	134	<script>
134	-

Return to bug 31632