Attachment #115665 for bug #27485

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

Lines 208-214 sub printbasketgrouppdf{ Link Here

(-)a/acqui/basketgroup.pl (-1 / +1 lines)
208	-type => 'application/pdf',	208	-type => 'application/pdf',
209	-attachment => ( $basketgroup->{name} \|\| $basketgroupid ) . '.pdf'	209	-attachment => ( $basketgroup->{name} \|\| $basketgroupid ) . '.pdf'
210	);	210	);
211	my $pdf = printpdf($basketgroup, $bookseller, $baskets, \%orders, $bookseller->tax_rate // C4::Context->preference("gist")) \|\| die "pdf generation failed";	211	my $pdf = printpdf($basketgroup, $bookseller, $baskets, \%orders, $bookseller->tax_rate // C4::Context->preference("TaxRates")) \|\| die "pdf generation failed";
212	print $pdf;	212	print $pdf;
213		213
214	}	214	}

Lines 405-414 if ( defined $from_subscriptionid ) { Link Here

(-)a/acqui/neworderempty.pl (-2 / +2 lines)
405	my (undef, $barcode_subfield) = GetMarcFromKohaField( 'items.barcode' );	405	my (undef, $barcode_subfield) = GetMarcFromKohaField( 'items.barcode' );
406		406
407		407
408	# get option values for gist syspref	408	# get option values for TaxRates syspref
409	my @gst_values = map {	409	my @gst_values = map {
410	option => $_ + 0.0	410	option => $_ + 0.0
411	}, split( '\\|', C4::Context->preference("gist") );	411	}, split( '\\|', C4::Context->preference("TaxRates") );
412		412
413	my $quantity = $input->param('rr_quantity_to_order') ?	413	my $quantity = $input->param('rr_quantity_to_order') ?
414	$input->param('rr_quantity_to_order') :	414	$input->param('rr_quantity_to_order') :

Lines 124-133 my $budget = GetBudget( $order->budget_id ); Link Here

(-)a/acqui/orderreceive.pl (-2 / +2 lines)
124		124
125	my $datereceived = $order->datereceived ? dt_from_string( $order->datereceived ) : dt_from_string;	125	my $datereceived = $order->datereceived ? dt_from_string( $order->datereceived ) : dt_from_string;
126		126
127	# get option values for gist syspref	127	# get option values for TaxRates syspref
128	my @gst_values = map {	128	my @gst_values = map {
129	option => $_ + 0.0	129	option => $_ + 0.0
130	}, split( '\\|', C4::Context->preference("gist") );	130	}, split( '\\|', C4::Context->preference("TaxRates") );
131		131
132	my $order_internalnote = $order->order_internalnote;	132	my $order_internalnote = $order->order_internalnote;
133	my $order_vendornote = $order->order_vendornote;	133	my $order_vendornote = $order->order_vendornote;

Lines 201-207 $template->param( Link Here

(-)a/acqui/parcels.pl (-1 / +1 lines)
201	name => $bookseller->name,	201	name => $bookseller->name,
202	shipmentdate_today => dt_from_string,	202	shipmentdate_today => dt_from_string,
203	booksellerid => $booksellerid,	203	booksellerid => $booksellerid,
204	GST => C4::Context->preference('gist'),	204	GST => C4::Context->preference('TaxRates'),
205	budgets => $budget_loop,	205	budgets => $budget_loop,
206	);	206	);
207		207

Lines 100-109 if ( $op eq 'display' ) { Link Here

(-)a/acqui/supplier.pl (-2 / +2 lines)
100	} else {	100	} else {
101	my @currencies = Koha::Acquisition::Currencies->search;	101	my @currencies = Koha::Acquisition::Currencies->search;
102		102
103	# get option values from gist syspref	103	# get option values from TaxRates syspref
104	my @gst_values = map {	104	my @gst_values = map {
105	option => $_ + 0.0	105	option => $_ + 0.0
106	}, split( '\\|', C4::Context->preference("gist") );	106	}, split( '\\|', C4::Context->preference("TaxRates") );
107		107
108	$template->param(	108	$template->param(
109	# set active ON by default for supplier add (id empty for add)	109	# set active ON by default for supplier add (id empty for add)




$DBversion = 'XXX';  # will be replaced by the RM
if( CheckVersion( $DBversion ) ) {
    # you can use $dbh here like:
    $dbh->do(q{UPDATE systempreferences set variable="TaxRates" WHERE variable="gist"});

    # or perform some test and warn
    # if( !column_exists( 'biblio', 'biblionumber' ) ) {
    #    warn "There is something wrong";
    # }

    # Always end with this (adjust the bug info)
    NewVersion( $DBversion, XXXXX, "Description");
}

Lines 33-39 UPDATE systempreferences SET value = Link Here

(-)a/installer/data/mysql/localization/de-DE/custom.sql (-1 / +1 lines)
33	WHERE variable = 'OPACSearchForTitleIn';	33	WHERE variable = 'OPACSearchForTitleIn';
34	-- Sunday = 0, Monday = 1, etc.	34	-- Sunday = 0, Monday = 1, etc.
35	UPDATE systempreferences SET value = '1' WHERE variable = 'CalendarFirstDayOfWeek';	35	UPDATE systempreferences SET value = '1' WHERE variable = 'CalendarFirstDayOfWeek';
36	UPDATE systempreferences SET value = '0.07\|0.19\|0.00' WHERE variable = 'gist';	36	UPDATE systempreferences SET value = '0.07\|0.19\|0.00' WHERE variable = 'TaxRates';
37	UPDATE systempreferences SET value = 'Dieser Text wird über den Systemparameter <a href="/cgi-bin/koha/admin/preferences.pl?op=search&searchfield=RoutingListNote#jumped">RoutingListNote</a> konfiguriert.' where variable = 'RoutingListNote';	37	UPDATE systempreferences SET value = 'Dieser Text wird über den Systemparameter <a href="/cgi-bin/koha/admin/preferences.pl?op=search&searchfield=RoutingListNote#jumped">RoutingListNote</a> konfiguriert.' where variable = 'RoutingListNote';
38	UPDATE systempreferences SET value = 'barcode stocknumber' WHERE variable = 'uniqueitemfields';	38	UPDATE systempreferences SET value = 'barcode stocknumber' WHERE variable = 'uniqueitemfields';
39	UPDATE systempreferences SET value = 'de-DE,en' WHERE variable = 'language';	39	UPDATE systempreferences SET value = 'de-DE,en' WHERE variable = 'language';

Lines 211-217 INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` Link Here

(-)a/installer/data/mysql/mandatory/sysprefs.sql (-1 / +1 lines)
211	('finesMode','off','off\|production','Choose the fines mode, \'off\' (no charges), \'production\' (accrue overdue fines). Requires accruefines cronjob.','Choice'),	211	('finesMode','off','off\|production','Choose the fines mode, \'off\' (no charges), \'production\' (accrue overdue fines). Requires accruefines cronjob.','Choice'),
212	('FRBRizeEditions','0','','If ON, Koha will query one or more ISBN web services for associated ISBNs and display an Editions tab on the details pages','YesNo'),	212	('FRBRizeEditions','0','','If ON, Koha will query one or more ISBN web services for associated ISBNs and display an Editions tab on the details pages','YesNo'),
213	('GDPR_Policy','','Enforced\|Permissive\|Disabled','General Data Protection Regulation - policy', 'Choice'),	213	('GDPR_Policy','','Enforced\|Permissive\|Disabled','General Data Protection Regulation - policy', 'Choice'),
214	('gist','0','','Default Goods and Services tax rate NOT in %, but in numeric form (0.12 for 12%), set to 0 to disable GST','Integer'),	214	('TaxRates','0','','Default Goods and Services tax rate NOT in %, but in numeric form (0.12 for 12%), set to 0 to disable GST','Integer'),
215	('GoogleJackets','0',NULL,'if ON, displays jacket covers from Google Books API','YesNo'),	215	('GoogleJackets','0',NULL,'if ON, displays jacket covers from Google Books API','YesNo'),
216	('GoogleOpenIDConnect', '0', NULL, 'if ON, allows the use of Google OpenID Connect for login', 'YesNo'),	216	('GoogleOpenIDConnect', '0', NULL, 'if ON, allows the use of Google OpenID Connect for login', 'YesNo'),
217	('GoogleOAuth2ClientID', '', NULL, 'Client ID for the web app registered with Google', 'Free'),	217	('GoogleOAuth2ClientID', '', NULL, 'Client ID for the web app registered with Google', 'Free'),

Lines 22-28 UPDATE systempreferences SET value = 'Господин\|Госпожа\|Мисте Link Here

(-)a/installer/data/mysql/ru-RU/mandatory/system_preferences_full_optimal_for_install_only.sql (-1 / +1 lines)
22	UPDATE systempreferences SET value = 'metric' WHERE variable = 'dateformat';	22	UPDATE systempreferences SET value = 'metric' WHERE variable = 'dateformat';
23	UPDATE systempreferences SET value = 'udc' WHERE variable = 'DefaultClassificationSource';	23	UPDATE systempreferences SET value = 'udc' WHERE variable = 'DefaultClassificationSource';
24	UPDATE systempreferences SET value = '1' WHERE variable = 'ExtendedPatronAttributes';	24	UPDATE systempreferences SET value = '1' WHERE variable = 'ExtendedPatronAttributes';
25	UPDATE systempreferences SET value = '0.20' WHERE variable = 'gist';	25	UPDATE systempreferences SET value = '0.20' WHERE variable = 'TaxRates';
26	UPDATE systempreferences SET value = '942hv' WHERE variable = 'itemcallnumber';	26	UPDATE systempreferences SET value = '942hv' WHERE variable = 'itemcallnumber';
27	UPDATE systempreferences SET value = 'ru-RU,uk-UA,en,fr-FR,de-DE' WHERE variable = 'language';	27	UPDATE systempreferences SET value = 'ru-RU,uk-UA,en,fr-FR,de-DE' WHERE variable = 'language';
28	UPDATE systempreferences SET value = 'ru-RU,uk-UA,en,fr-FR,de-DE' WHERE variable = 'opaclanguages';	28	UPDATE systempreferences SET value = 'ru-RU,uk-UA,en,fr-FR,de-DE' WHERE variable = 'opaclanguages';

Lines 6-12 UPDATE systempreferences SET value='OPENOFFICE.ORG' WHERE variable='MIME'; Link Here

(-)a/installer/data/mysql/ru-RU/mandatory/system_preferences_optimal_values_insert_only.sql (-1 / +1 lines)
6		6
7	-- Acquisitions - Поступления	7	-- Acquisitions - Поступления
8		8
9	UPDATE systempreferences SET value='0.20' WHERE variable='gist';	9	UPDATE systempreferences SET value='0.20' WHERE variable='TaxRates';
10		10
11	-- EnhancedContent - Расширенное содержимое	11	-- EnhancedContent - Расширенное содержимое
12		12

Lines 406-412 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt (-1 / +1 lines)
406	[% END %]	406	[% END %]
407	</select>	407	</select>
408		408
409	[% IF !gst_found %]<span class="required">Tax rate not defined in system preference gist!</span>[% END %]	409	[% IF !gst_found %]<span class="required">Tax rate not defined in system preference TaxRates!</span>[% END %]
410	[% ELSE %]	410	[% ELSE %]
411	<input type="hidden" name="tax_rate" value="0" />	411	<input type="hidden" name="tax_rate" value="0" />
412	</li>	412	</li>

Lines 36-42 Acquisitions: Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/acquisitions.pref (-1 / +1 lines)
36	CH: 360'000.00 (CH)	36	CH: 360'000.00 (CH)
37	-	37	-
38	- Tax rates are	38	- Tax rates are
39	- pref: gist	39	- pref: TaxRates
40	- . Enter in numeric form, 0.12 for 12%. The first item in the list will be selected by default. For more than one value, separate with \| (pipe).	40	- . Enter in numeric form, 0.12 for 12%. The first item in the list will be selected by default. For more than one value, separate with \| (pipe).
41	- "Please note: The database will only accept values up to 4 decimals precision, further values will be rounded."	41	- "Please note: The database will only accept values up to 4 decimals precision, further values will be rounded."
42	-	42	-

Lines 18-24 use_ok('C4::Acquisition'); Link Here

(-)a/t/Prices.t (-2 / +1 lines)
18	use_ok('C4::Context');	18	use_ok('C4::Context');
19	use_ok('Koha::Number::Price');	19	use_ok('Koha::Number::Price');
20		20
21	t::lib::Mocks::mock_preference( 'gist', '0.02\|0.05\|0.196' );	21	t::lib::Mocks::mock_preference( 'TaxRates', '0.02\|0.05\|0.196' );
22		22
23	use Test::DBIx::Class;	23	use Test::DBIx::Class;
24		24
25	-

Return to bug 27485

Line 0 Link Here

(-)a/installer/data/mysql/atomicupdate/bug_27485-rename_syspref.perl (+13 lines)
	1	$DBversion = 'XXX'; # will be replaced by the RM
	2	if( CheckVersion( $DBversion ) ) {
	3	# you can use $dbh here like:
	4	$dbh->do(q{UPDATE systempreferences set variable="TaxRates" WHERE variable="gist"});
	5
	6	# or perform some test and warn
	7	# if( !column_exists( 'biblio', 'biblionumber' ) ) {
	8	# warn "There is something wrong";
	9	# }
	10
	11	# Always end with this (adjust the bug info)
	12	NewVersion( $DBversion, XXXXX, "Description");
	13	}