From 8b54833d283213c88775cdffc968922aef15ab77 Mon Sep 17 00:00:00 2001
From: Katrin Fischer <Katrin.Fischer.83@web.de>
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 <jonathan.druart@biblibre.com>
---
 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 6ebce00..a18dd56 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,NULL,'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 - 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'),
 ('maxItemsInSearchResults','20',NULL,'Specify the maximum number of items to display for each result on a page of results','free'),
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 1cba426..f70aaf5 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;
             }
 
@@ -269,7 +269,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>
@@ -285,7 +285,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 ) %]
-- 
1.7.10.4