From 407a998799b2e7d7289a3baad028cfa4517527f9 Mon Sep 17 00:00:00 2001
From: Kyle M Hall <kyle@bywatersolutions.com>
Date: Thu, 3 Nov 2016 10:44:56 +0000
Subject: [PATCH] Bug 15503 [QA Followup] - Set itype and ccode properly

Signed-off-by: Benjamin Daeuber <bdaeuber@cityoffargo.com>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
---
 acqui/addorderiso2709.pl                                         | 5 +++--
 koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/acqui/addorderiso2709.pl b/acqui/addorderiso2709.pl
index b2c9662..042258c 100755
--- a/acqui/addorderiso2709.pl
+++ b/acqui/addorderiso2709.pl
@@ -207,8 +207,8 @@ if ($op eq ""){
         my @nonpublic_notes = $input->multi_param('nonpublic_note_' . $biblio_count);
         my @public_notes = $input->multi_param('public_note_' . $biblio_count);
         my @locs = $input->multi_param('loc_' . $biblio_count);
-        my @ccodes = $input->multi_param('ccodes_' . $biblio_count);
-        my @notforloans = $input->multi_param('notforloans_' . $biblio_count);
+        my @ccodes = $input->multi_param('ccode_' . $biblio_count);
+        my @notforloans = $input->multi_param('notforloan_' . $biblio_count);
         my @uris = $input->multi_param('uri_' . $biblio_count);
         my @copynos = $input->multi_param('copyno_' . $biblio_count);
         my @budget_codes = $input->multi_param('budget_code_' . $biblio_count);
@@ -225,6 +225,7 @@ if ($op eq ""){
                 itemnotes => $public_notes[$i],
                 location => $locs[$i],
                 ccode => $ccodes[$i],
+                itype => $itypes[$i],
                 notforloan => $notforloans[$i],
                 uri => $uris[$i],
                 copynumber => $copynos[$i],
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 d53faec..e718028 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt
@@ -344,7 +344,7 @@
                         </li>
                         <li><label for="itype_item_[% item.item_id %]">itype</label><select id="itype_item_[% item.item_id %]" name="itype_[% item.biblio_count %]">
                         [% FOREACH itypeloo IN itypeloop %]
-                          [% IF ( itypeloo.value ) == ( item.itype ) %]
+                          [% IF ( itypeloo.itemtype ) == ( item.itype ) %]
                             <option value="[% itypeloo.itemtype %]" selected="selected">[% itypeloo.description |html %]</option>
                           [% ELSE %]
                             <option value="[% itypeloo.itemtype %]">[% itypeloo.description |html %]</option>
-- 
2.1.4