From 0678ee81607b06ce23abb37ef171527f292bb97c Mon Sep 17 00:00:00 2001 From: Katrin Fischer Date: Mon, 9 Sep 2013 22:53:49 +0200 Subject: [PATCH] Bug 7180: Follow-up fixing minor issues - Fixed some labels from Budget to Fund - Added the system preference to sysprefs.sql - Fixed some untranslatable Javascript strings Signed-off-by: Jonathan Druart Signed-off-by: Kyle M Hall --- installer/data/mysql/sysprefs.sql | 1 + .../intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql index 661910b..72e14c0 100644 --- a/installer/data/mysql/sysprefs.sql +++ b/installer/data/mysql/sysprefs.sql @@ -175,6 +175,7 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` ('LocalCoverImages','0','1','Display local cover images on intranet details pages.','YesNo'), ('ManInvInNoissuesCharge','1',NULL,'MANUAL_INV charges block checkouts (added to noissuescharge).','YesNo'), ('MARCAuthorityControlField008','|| aca||aabn | a|a d',NULL,'Define the contents of MARC21 authority control field 008 position 06-39','Textarea'), +('MarcFieldsToOrder','',NULL,'Set the mapping values for a new order line created from a marcrecord (staged file). In a YAML format.','textarea'), ('MARCOrgCode','OSt','','Define MARC Organization Code for MARC21 records - http://www.loc.gov/marc/organizations/orgshome.html','free'), ('MaxFine',NULL,'','Maximum fine a patron can have for all late returns at one moment. Single item caps are specified in the circulation rules matrix.','Integer'), ('MaxItemsForBatch','1000',NULL,'Max number of items record to process in a batch (modification or deletion)','Integer'), diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt index d52c93d..e668275 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt @@ -101,7 +101,7 @@ $("#Aform").on("submit", function(){ if ( $("input:checkbox[name='import_record_id']:checked").length < 1 ) { - alert("There is no record selected"); + alert(_("There is no record selected")); return false; } @@ -112,7 +112,7 @@ } }); if ( error > 0 ) { - alert(error + " quantity values are not filled or not a number"); + alert(error + " " + _("quantity values are not filled or not a number")); return false; } @@ -273,7 +273,7 @@
  • [% IF ( close ) %] - Budget: + Fund: [% Budget_name %] [% ELSE %]
  • @@ -289,7 +289,7 @@
  • - +