From e2d56c0b2b6b45af2926fe3c8b80c35868fb3738 Mon Sep 17 00:00:00 2001
From: Josef Moravec <josef.moravec@gmail.com>
Date: Sun, 11 Jun 2017 19:22:06 +0000
Subject: [PATCH] Bug 10132: Admin pages changes

Signed-off-by: Hugo Agud <hagud@orex.es>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
---
 admin/branches.pl                                               | 1 +
 koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt       | 1 +
 .../prog/en/modules/admin/preferences/cataloguing.pref          | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/admin/branches.pl b/admin/branches.pl
index abe3e5a749..bcd712f292 100755
--- a/admin/branches.pl
+++ b/admin/branches.pl
@@ -76,6 +76,7 @@ if ( $op eq 'add_form' ) {
       branchip
       branchnotes
       opac_info
+      marcorgcode
     );
     my $is_a_modif = $input->param('is_a_modif');
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt
index fb2d723703..929eb7f295 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt
@@ -191,6 +191,7 @@ tinyMCE.init({
                 <li><label for="branchurl">URL: </label><input type="text" name="branchurl" id="branchurl"  size="80" value="[% library.branchurl |html %]" class="url" /></li>
                 <li><label for="opac_info">OPAC info: </label><textarea name="opac_info" id="opac_info">[% library.opac_info |html %]</textarea></li>
                 <li><label for="branchip">IP: </label><input type="text" name="branchip" id="branchip"  size="15" maxlength="15" value="[% library.branchip |html %]" /> <span class="hint">Can be entered as a single IP, or a subnet such as 192.168.1.*</span></li>
+                <li><label for="marcorgccode">MARC Organization Code</label> <input type="text" name="marcorgcode" id="marcorgcode" size="16" value="[% library.marcorgcode |html %]" /> <span class="hint">If not filled in defaults to system preference MARCOrgCode. You can obtain your code from <a href="http://www.loc.gov/marc/organizations/orgshome.html">Library of Congress</a>.</span>
                 <li><label for="branchnotes">Notes: </label><input type="text" name="branchnotes" id="branchnotes" size="80" value="[% library.branchnotes |html %]" /></li>
             </ol>
         </fieldset>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/cataloguing.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/cataloguing.pref
index 1aeadf9860..18f7fd34b2 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/cataloguing.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/cataloguing.pref
@@ -71,7 +71,7 @@ Cataloging:
         -
             - Fill in the <a href="http://www.loc.gov/marc/organizations/orgshome.html">MARC organization code</a>
             - pref: MARCOrgCode
-            - by default in new MARC21 records (leave blank to disable).
+            - by default in new MARC21 records (leave blank to disable). This can be also set on libraries level.
         -
             - When items are created, give them the temporary location of
             - pref: NewItemsDefaultLocation
-- 
2.39.5