Attachment #170695 for bug #27063

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

Lines 539-544 $template->param( Link Here

(-)a/acqui/neworderempty.pl (+1 lines)
539	users => \@order_users,	539	users => \@order_users,
540	( uc( C4::Context->preference("marcflavour") ) ) => 1,	540	( uc( C4::Context->preference("marcflavour") ) ) => 1,
541	estimated_delivery_date => $data->{estimated_delivery_date},	541	estimated_delivery_date => $data->{estimated_delivery_date},
		542	relink_invoiceid => ( C4::Context->preference('KeepInvoiceOnOrderRelink') and $input->param("relink") ) ? $data->{invoiceid} : undef,
542	);	543	);
543		544
544	output_html_with_http_headers $input, $cookie, $template->output;	545	output_html_with_http_headers $input, $cookie, $template->output;




use Modern::Perl;

return {
    bug_number  => "27063",
    description => "Allow changing which record an order is linked to",
    up          => sub {
        my ($args) = @_;
        my ( $dbh, $out ) = @$args{qw(dbh out)};

        $dbh->do(
            q{ INSERT IGNORE INTO systempreferences (variable,value,options,explanation,type) VALUES ('KeepInvoiceOnOrderRelink', '0', NULL, 'Keep or empty the invoice when an order is relinked in Acquisitions', 'YesNo') }
        );

        say $out "Added system preference 'KeepInvoiceOnOrderRelink'";
    },
};

Lines 358-363 INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` Link Here

(-)a/installer/data/mysql/mandatory/sysprefs.sql (+1 lines)
358	('itemBarcodeInputFilter','','whitespace\|T-prefix\|cuecat\|libsuite8\|EAN13','If set, allows specification of a item barcode input filter','Choice'),	358	('itemBarcodeInputFilter','','whitespace\|T-prefix\|cuecat\|libsuite8\|EAN13','If set, allows specification of a item barcode input filter','Choice'),
359	('itemcallnumber','',NULL,'The MARC field/subfield that is used to calculate the itemcallnumber (Dewey would be 082ab or 092ab; LOC would be 050ab or 090ab) could be 852hi from an item record','free'),	359	('itemcallnumber','',NULL,'The MARC field/subfield that is used to calculate the itemcallnumber (Dewey would be 082ab or 092ab; LOC would be 050ab or 090ab) could be 852hi from an item record','free'),
360	('ItemsDeniedRenewal','','','This syspref allows to define custom rules for denying renewal of specific items.','Textarea'),	360	('ItemsDeniedRenewal','','','This syspref allows to define custom rules for denying renewal of specific items.','Textarea'),
		361	('KeepInvoiceOnOrderRelink', '0', NULL, 'Keep or empty the invoice when an order is relinked in Acquisitions', 'YesNo'),
361	('KohaAdminEmailAddress','root@localhost','','Define the email address where patron modification requests are sent','free'),	362	('KohaAdminEmailAddress','root@localhost','','Define the email address where patron modification requests are sent','free'),
362	('KohaManualBaseURL','https://koha-community.org/manual/','','Where is the Koha manual/documentation located?','Free'),	363	('KohaManualBaseURL','https://koha-community.org/manual/','','Where is the Koha manual/documentation located?','Free'),
363	('KohaManualLanguage','en','en\|ar\|cs\|de\|es\|fr\|it\|pt_BR\|tr\|zh_TW','What is the language of the online manual you want to use?','Choice'),	364	('KohaManualLanguage','en','en\|ar\|cs\|de\|es\|fr\|it\|pt_BR\|tr\|zh_TW','What is the language of the online manual you want to use?','Choice'),

Lines 357-362 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt (+3 lines)
357	<input type="hidden" name="invoiceincgst" id="invoiceincgst" value="[% invoiceincgst \| html %]" />	357	<input type="hidden" name="invoiceincgst" id="invoiceincgst" value="[% invoiceincgst \| html %]" />
358	<input type="hidden" name="suggestionid" value="[% suggestionid \| html %]" />	358	<input type="hidden" name="suggestionid" value="[% suggestionid \| html %]" />
359	<input type="hidden" name="import_batch_id" value="[% import_batch_id \| html %]" />	359	<input type="hidden" name="import_batch_id" value="[% import_batch_id \| html %]" />
		360	[% IF relink_invoiceid %]
		361	<input type="hidden" name="invoiceid" id="invoiceid" value="[% relink_invoiceid \| html %]" />
		362	[% END %]
360		363
361	[% FOREACH c IN currencies %]	364	[% FOREACH c IN currencies %]
362	<input type="hidden" id="currency_rate_[% c.currency \| html %]" name="[% c.currency \| html %]" value="[% c.rate \| html %]" />	365	<input type="hidden" id="currency_rate_[% c.currency \| html %]" name="[% c.currency \| html %]" value="[% c.rate \| html %]" />

Lines 92-98 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt (-1 / +1 lines)
92	[% END %]	92	[% END %]
93	[% IF not sub.aqbooksellerid \|\| booksellerid == sub.aqbooksellerid %]	93	[% IF not sub.aqbooksellerid \|\| booksellerid == sub.aqbooksellerid %]
94	[% IF ordernumber %]	94	[% IF ordernumber %]
95	<a href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=[% booksellerid \| uri %]&basketno=[% basketno \| uri %]&biblionumber=[% sub.biblionumber \| uri %]&from_subscriptionid=[% sub.subscriptionid \| uri %]&ordernumber=[% ordernumber \| uri %]" title="Order this one" class="btn btn-default btn-xs">	95	<a href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=[% booksellerid \| uri %]&basketno=[% basketno \| uri %]&biblionumber=[% sub.biblionumber \| uri %]&from_subscriptionid=[% sub.subscriptionid \| uri %]&ordernumber=[% ordernumber \| uri %]&relink=1" title="Order this one" class="btn btn-default btn-xs">
96	[% ELSE %]	96	[% ELSE %]
97	<a href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=[% booksellerid \| uri %]&basketno=[% basketno \| uri %]&biblionumber=[% sub.biblionumber \| uri %]&from_subscriptionid=[% sub.subscriptionid \| uri %]" title="Order this one" class="btn btn-default btn-xs">	97	<a href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=[% booksellerid \| uri %]&basketno=[% basketno \| uri %]&biblionumber=[% sub.biblionumber \| uri %]&from_subscriptionid=[% sub.subscriptionid \| uri %]" title="Order this one" class="btn btn-default btn-xs">
98	[% END %]	98	[% END %]




                            <td class="actions">
                                [% IF ( suggestion.biblionumber ) %]
                                    [% IF ordernumber %]
                                        <a href="neworderempty.pl?booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]&amp;suggestionid=[% suggestion.suggestionid | uri %]&amp;biblio=[% suggestion.biblionumber | uri %]&amp;ordernumber=[% ordernumber | uri %]&amp;relink=1" class="btn btn-default btn-xs"><i class="fa fa-plus"></i> [% tp('verb', 'Order') | html %]</a>
                                    [% ELSE %]
                                        <a href="neworderempty.pl?booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]&amp;suggestionid=[% suggestion.suggestionid | uri %]&amp;biblio=[% suggestion.biblionumber | uri %]" class="btn btn-default btn-xs"><i class="fa fa-plus"></i> [% tp('verb', 'Order') | html %]</a>
                                    [% END %]
                                [% ELSE %]
                                    [% IF ordernumber %]
                                        <a href="neworderempty.pl?booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]&amp;suggestionid=[% suggestion.suggestionid | uri %]&amp;ordernumber=[% ordernumber | uri %]&amp;relink=1" class="btn btn-default btn-xs"><i class="fa fa-plus"></i> [% tp('verb', 'Order') | html %]</a>
                                    [% ELSE %]
                                        <a href="neworderempty.pl?booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]&amp;suggestionid=[% suggestion.suggestionid | uri %]" class="btn btn-default btn-xs"><i class="fa fa-plus"></i> [% tp('verb', 'Order') | html %]</a>
                                    [% END %]

Lines 225-231 tr.selected td { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt (-1 / +1 lines)
225	<li><a href="/cgi-bin/koha/catalogue/showmarc.pl?importid=[% breeding_loo.breedingid \| uri %]" title="MARC" class="previewData dropdown-item" data-action="show_marc"><i class="fa-solid fa-eye"></i> MARC</a></li>	225	<li><a href="/cgi-bin/koha/catalogue/showmarc.pl?importid=[% breeding_loo.breedingid \| uri %]" title="MARC" class="previewData dropdown-item" data-action="show_marc"><i class="fa-solid fa-eye"></i> MARC</a></li>
226	<li><a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&importid=[% breeding_loo.breedingid \| uri %]" title="Card" class="previewData dropdown-item" data-action="show_card"><i class="fa-solid fa-eye"></i> Card</a></li>	226	<li><a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&importid=[% breeding_loo.breedingid \| uri %]" title="Card" class="previewData dropdown-item" data-action="show_card"><i class="fa-solid fa-eye"></i> Card</a></li>
227	[% IF ordernumber %]	227	[% IF ordernumber %]
228	<li><a href="/cgi-bin/koha/acqui/neworderempty.pl?frameworkcode=[% frameworkcode \| uri %]&breedingid=[% breeding_loo.breedingid \| uri %]&booksellerid=[% booksellerid \| uri %]&basketno=[% basketno \| uri %]&ordernumber=[% ordernumber \| uri %]" class="chosen dropdown-item" title="[% tp('verb', 'Order') \| html %]" data-action="order"><i class="fa fa-plus"></i> [% tp('verb', 'Order') \| html %]</a></li>	228	<li><a href="/cgi-bin/koha/acqui/neworderempty.pl?frameworkcode=[% frameworkcode \| uri %]&breedingid=[% breeding_loo.breedingid \| uri %]&booksellerid=[% booksellerid \| uri %]&basketno=[% basketno \| uri %]&ordernumber=[% ordernumber \| uri %]&relink=1" class="chosen dropdown-item" title="[% tp('verb', 'Order') \| html %]" data-action="order"><i class="fa fa-plus"></i> [% tp('verb', 'Order') \| html %]</a></li>
229	[% ELSE %]	229	[% ELSE %]
230	<li><a href="/cgi-bin/koha/acqui/neworderempty.pl?frameworkcode=[% frameworkcode \| uri %]&breedingid=[% breeding_loo.breedingid \| uri %]&booksellerid=[% booksellerid \| uri %]&basketno=[% basketno \| uri %]" class="chosen dropdown-item" title="[% tp('verb', 'Order') \| html %]" data-action="order"><i class="fa fa-plus"></i> [% tp('verb', 'Order') \| html %]</a></li>	230	<li><a href="/cgi-bin/koha/acqui/neworderempty.pl?frameworkcode=[% frameworkcode \| uri %]&breedingid=[% breeding_loo.breedingid \| uri %]&booksellerid=[% booksellerid \| uri %]&basketno=[% basketno \| uri %]" class="chosen dropdown-item" title="[% tp('verb', 'Order') \| html %]" data-action="order"><i class="fa fa-plus"></i> [% tp('verb', 'Order') \| html %]</a></li>
231	[% END %]	231	[% END %]

Lines 138-143 Acquisitions: Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/acquisitions.pref (+7 lines)
138	class: email	138	class: email
139	- 'when sending acquisitions order and claim notices.'	139	- 'when sending acquisitions order and claim notices.'
140	- '<br>If left empty, it will fall back to the first defined address in the following list: library reply-to, library email, <a href="/cgi-bin/koha/admin/preferences.pl?op=search&searchfield=ReplytoDefault">ReplytoDefault</a>, <a href="/cgi-bin/koha/admin/preferences.pl?op=search&searchfield=KohaAdminEmailAddress">KohaAdminEmailAddress</a>.'	140	- '<br>If left empty, it will fall back to the first defined address in the following list: library reply-to, library email, <a href="/cgi-bin/koha/admin/preferences.pl?op=search&searchfield=ReplytoDefault">ReplytoDefault</a>, <a href="/cgi-bin/koha/admin/preferences.pl?op=search&searchfield=KohaAdminEmailAddress">KohaAdminEmailAddress</a>.'
		141	-
		142	- pref: KeepInvoiceOnOrderRelink
		143	default: no
		144	choices:
		145	1: "Keep"
		146	0: "Do not keep"
		147	- " a link to the invoice when an order is relinked."
141	Printing:	148	Printing:
142	-	149	-
143	- Use the	150	- Use the

Lines 592-598 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt (-2 / +1 lines)
592	[% IF ( CAN_user_acquisition_order_manage ) %]	592	[% IF ( CAN_user_acquisition_order_manage ) %]
593	[% IF ( searchtoorder_basketno && searchtoorder_vendorid ) %]	593	[% IF ( searchtoorder_basketno && searchtoorder_vendorid ) %]
594	[% IF searchtoorder_ordernumber %]	594	[% IF searchtoorder_ordernumber %]
595	\| <a href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=[% searchtoorder_vendorid \| uri %]&basketno=[% searchtoorder_basketno \| uri %]&biblionumber=[% SEARCH_RESULT.biblionumber \| uri %]&ordernumber=[% searchtoorder_ordernumber \| uri %]">Relink to order</a>	595	\| <a href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=[% searchtoorder_vendorid \| uri %]&basketno=[% searchtoorder_basketno \| uri %]&biblionumber=[% SEARCH_RESULT.biblionumber \| uri %]&ordernumber=[% searchtoorder_ordernumber \| uri %]&relink=1">Relink to order</a>
596	[% ELSE %]	596	[% ELSE %]
597	\| <a href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=[% searchtoorder_vendorid \| uri %]&basketno=[% searchtoorder_basketno \| uri %]&biblionumber=[% SEARCH_RESULT.biblionumber \| uri %]">Add order</a>	597	\| <a href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=[% searchtoorder_vendorid \| uri %]&basketno=[% searchtoorder_basketno \| uri %]&biblionumber=[% SEARCH_RESULT.biblionumber \| uri %]">Add order</a>
598	[% END %]	598	[% END %]
599	-

Return to bug 27063

Lines 102-114 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt (-2 / +2 lines)
102	<td class="actions">	102	<td class="actions">
103	[% IF ( suggestion.biblionumber ) %]	103	[% IF ( suggestion.biblionumber ) %]
104	[% IF ordernumber %]	104	[% IF ordernumber %]
105	<a href="neworderempty.pl?booksellerid=[% booksellerid \| uri %]&basketno=[% basketno \| uri %]&suggestionid=[% suggestion.suggestionid \| uri %]&biblio=[% suggestion.biblionumber \| uri %]&ordernumber=[% ordernumber \| uri %]" class="btn btn-default btn-xs"><i class="fa fa-plus"></i> [% tp('verb', 'Order') \| html %]</a>	105	<a href="neworderempty.pl?booksellerid=[% booksellerid \| uri %]&basketno=[% basketno \| uri %]&suggestionid=[% suggestion.suggestionid \| uri %]&biblio=[% suggestion.biblionumber \| uri %]&ordernumber=[% ordernumber \| uri %]&relink=1" class="btn btn-default btn-xs"><i class="fa fa-plus"></i> [% tp('verb', 'Order') \| html %]</a>
106	[% ELSE %]	106	[% ELSE %]
107	<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	<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>
108	[% END %]	108	[% END %]
109	[% ELSE %]	109	[% ELSE %]
110	[% IF ordernumber %]	110	[% IF ordernumber %]
111	<a href="neworderempty.pl?booksellerid=[% booksellerid \| uri %]&basketno=[% basketno \| uri %]&suggestionid=[% suggestion.suggestionid \| uri %]&ordernumber=[% ordernumber \| uri %]" class="btn btn-default btn-xs"><i class="fa fa-plus"></i> [% tp('verb', 'Order') \| html %]</a>	111	<a href="neworderempty.pl?booksellerid=[% booksellerid \| uri %]&basketno=[% basketno \| uri %]&suggestionid=[% suggestion.suggestionid \| uri %]&ordernumber=[% ordernumber \| uri %]&relink=1" class="btn btn-default btn-xs"><i class="fa fa-plus"></i> [% tp('verb', 'Order') \| html %]</a>
112	[% ELSE %]	112	[% ELSE %]
113	<a href="neworderempty.pl?booksellerid=[% booksellerid \| uri %]&basketno=[% basketno \| uri %]&suggestionid=[% suggestion.suggestionid \| uri %]" class="btn btn-default btn-xs"><i class="fa fa-plus"></i> [% tp('verb', 'Order') \| html %]</a>	113	<a href="neworderempty.pl?booksellerid=[% booksellerid \| uri %]&basketno=[% basketno \| uri %]&suggestionid=[% suggestion.suggestionid \| uri %]" class="btn btn-default btn-xs"><i class="fa fa-plus"></i> [% tp('verb', 'Order') \| html %]</a>
114	[% END %]	114	[% END %]

Line 0 Link Here

(-)a/installer/data/mysql/atomicupdate/bug_27063_-_KeepInvoiceOnOrderRelink_syspref.pl (+16 lines)
	1	use Modern::Perl;
	2
	3	return {
	4	bug_number => "27063",
	5	description => "Allow changing which record an order is linked to",
	6	up => sub {
	7	my ($args) = @_;
	8	my ( $dbh, $out ) = @$args{qw(dbh out)};
	9
	10	$dbh->do(
	11	q{ INSERT IGNORE INTO systempreferences (variable,value,options,explanation,type) VALUES ('KeepInvoiceOnOrderRelink', '0', NULL, 'Keep or empty the invoice when an order is relinked in Acquisitions', 'YesNo') }
	12	);
	13
	14	say $out "Added system preference 'KeepInvoiceOnOrderRelink'";
	15	},
	16	};