From 8e8f26f2cb2195f1e07136898320875dc055aad4 Mon Sep 17 00:00:00 2001
From: Andrew Isherwood <andrew.isherwood@ptfs-europe.com>
Date: Tue, 25 Sep 2018 15:19:53 +0100
Subject: [PATCH] Bug 20996: (follow-up) Add <branch> to conf tpl

Since we now require the <branch> block, we should add it to the config
templates

Signed-off-by: Magnus Enger <magnus@libriotech.no>

Signed-off-by: Josef Moravec <josef.moravec@gmail.com>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
---
 debian/templates/koha-conf-site.xml.in | 7 +++++++
 etc/koha-conf.xml                      | 7 +++++++
 2 files changed, 14 insertions(+)

diff --git a/debian/templates/koha-conf-site.xml.in b/debian/templates/koha-conf-site.xml.in
index e6982bb27c..d2e38151fa 100644
--- a/debian/templates/koha-conf-site.xml.in
+++ b/debian/templates/koha-conf-site.xml.in
@@ -361,6 +361,13 @@ __END_SRU_PUBLICSERVER__
      <!-- Path to where Illbackends are located on the system
           - This setting should normally not be touched -->
      <backend_directory>/usr/share/koha/lib/Koha/Illbackends</backend_directory>
+     <!-- At least one <branch> block is required. -->
+     <branch>
+         <!-- The code of this branch -->
+         <code>CPL</code>
+         <!-- An optional prefix for all ILL request IDs for this branch -->
+         <prefix>ILL</prefix>
+     </branch>
      <!-- How should we treat staff comments?
           - hide: don't show in OPAC
           - show: show in OPAC -->
diff --git a/etc/koha-conf.xml b/etc/koha-conf.xml
index 4af100e389..452c7e06ea 100644
--- a/etc/koha-conf.xml
+++ b/etc/koha-conf.xml
@@ -177,6 +177,13 @@ __PAZPAR2_TOGGLE_XML_POST__
      <!-- Path to where Illbackends are located on the system
           - This setting should normally not be touched -->
      <backend_directory>__PERL_MODULE_DIR__/Koha/Illbackends</backend_directory>
+     <!-- At least one <branch> block is required. -->
+     <branch>
+         <!-- The code of this branch -->
+         <code>CPL</code>
+         <!-- An optional prefix for all ILL request IDs for this branch -->
+         <prefix>ILL</prefix>
+     </branch>
      <!-- How should we treat staff comments?
           - hide: don't show in OPAC
           - show: show in OPAC -->
-- 
2.39.5