From: Katrin Fischer <Katrin.Fischer.83@web.de>
Date: Mon, 9 Sep 2013 20:53:49 +0000 (+0200)
Subject: Bug 7180: (follow-up) fix minor issues
X-Git-Tag: v3.16.00-beta~148
X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=commitdiff_plain;h=9997918f0209408fedfee99bd41a9e38cc508d47;p=koha_fer

Bug 7180: (follow-up) fix 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 <jonathan.druart@biblibre.com>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
---

diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql
index 2ef142fd21..fc048f1862 100644
--- a/installer/data/mysql/sysprefs.sql
+++ b/installer/data/mysql/sysprefs.sql
@@ -178,6 +178,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 9cc0df942b..4215262d3c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt
@@ -96,7 +96,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;
             }
 
@@ -107,7 +107,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;
             }
 
@@ -268,7 +268,7 @@
                                 </li>
                                 <li>
                                     [% IF ( close ) %]
-                                        <span class="label">Budget: </span>
+                                        <span class="label">Fund: </span>
                                         <input type="hidden" size="20" name="budget_id" id="budget_id" value="[% budget_id %]" />[% Budget_name %]
                                     [% ELSE %]
                                         <li>
@@ -284,7 +284,7 @@
                                             </select>
                                         </li>
                                         <li>
-                                            <label for="all_budget_id">Budget: </label>
+                                            <label for="all_budget_id">Fund: </label>
                                             <select id="all_budget_id" size="1" name="all_budget_id">
                                             [% FOREACH budget_loo IN budget_loop %]
                                                 [% IF ( budget_loo.b_sel ) %]