From a5bad72ef9b74f830a593be0d1b8bc7e55d21a40 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Tue, 12 Nov 2013 10:27:17 +0100 Subject: [PATCH] Bug 11237: Update explanation for pref AcqItemSetSubfieldsWhenReceived This patch improves the description of the AcqItemSetSubfieldsWhenReceived system preferences to clarify that it applies to updating items during order receipt, if those items where created when the order was placed. Test plan: Update the updatedb entry and search the pref in the admin module. The explanation should have been updated. Signed-off-by: Mark Tompsett Signed-off-by: Kyle M Hall Signed-off-by: Galen Charlton --- installer/data/mysql/sysprefs.sql | 2 +- installer/data/mysql/updatedatabase.pl | 12 ++++++++++++ .../en/modules/admin/preferences/acquisitions.pref | 2 +- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql index 0de3ac7338..5d37379559 100644 --- a/installer/data/mysql/sysprefs.sql +++ b/installer/data/mysql/sysprefs.sql @@ -1,6 +1,6 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `type` ) VALUES ('AcqCreateItem','ordering','ordering|receiving|cataloguing','Define when the item is created : when ordering, when receiving, or in cataloguing module','Choice'), -('AcqItemSetSubfieldsWhenReceived','0','','This syspref set a status for item when items are created when receiving (e.g. 995\$o=5)','Free'), +('AcqItemSetSubfieldsWhenReceived','0','','Upon receiving items, update their subfields if they were created when placing an order (e.g. o=5|a="foo bar")','Free'), ('AcquisitionDetails', '1', '', 'Hide/Show acquisition details on the biblio detail page.', 'YesNo'), ('AcqViewBaskets','user','user|branch|all','Define which baskets a user is allowed to view: his own only, any within his branch or all','Choice'), ('AcqWarnOnDuplicateInvoice','0','','Warn librarians when they try to create a duplicate invoice','YesNo'), diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index 80ab210bdb..7f706c1547 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -7912,6 +7912,18 @@ if ( CheckVersion($DBversion) ) { SetVersion($DBversion); } +$DBversion = "3.15.00.XXX"; +if(CheckVersion($DBversion)) { + $dbh->do(q{ + UPDATE systempreferences + SET explanation = 'Upon receiving items, update their subfields if they were created when placing an order (e.g. o=5|a="foo bar")' + WHERE variable = "AcqItemSetSubfieldsWhenReceived" + }); + print "Upgrade to $DBversion done (Bug 11237: Update explanation for AcqItemSetSubfieldsWhenReceived syspref)\n"; + SetVersion($DBversion); +} + + =head1 FUNCTIONS =head2 TableExists($table) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/acquisitions.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/acquisitions.pref index 5eba790a44..60ba8be8e8 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/acquisitions.pref +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/acquisitions.pref @@ -43,8 +43,8 @@ Acquisitions: no: "Do not warn" - when the librarian tries to create an invoice with a duplicate number. - + - Upon receiving items, update their subfields if they were created when placing an order (e.g. o=5|a="foo bar"). - pref: AcqItemSetSubfieldsWhenReceived - - Set subfields for item when items are created when receiving (e.g. o=5|a="foo bar") Printing: - -- 2.20.1