From bc0f4a2209a8527ccccc6f89e533fde958bc3850 Mon Sep 17 00:00:00 2001
From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Date: Thu, 9 Dec 2021 13:55:41 +0000
Subject: [PATCH] Bug 29670: Fix EDI for AcqCreateItem = 'placing on order'

The AcqCreatItem at order time functionality was broken by bug 27708.
This patch resolves that.

Test plan.
1) Run the newly created unit tests that prove both settings work

Signed-off-by: Jonathan Field <jonathan.field@ptfs-europe.com>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
---
 Koha/Edifact/Order.pm | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Koha/Edifact/Order.pm b/Koha/Edifact/Order.pm
index 87e16fce99..f21a7a8b76 100644
--- a/Koha/Edifact/Order.pm
+++ b/Koha/Edifact/Order.pm
@@ -389,17 +389,17 @@ sub order_line {
             my $i_obj = $schema->resultset('Item')->find( $item->itemnumber );
             if ( defined $i_obj ) {
                 push @items, {
-                    branchcode     => $item->{branchcode},
-                    itype          => $item->{itype},
-                    location       => $item->{location},
-                    itemcallnumber => $item->{itemcallnumber},
+                    branchcode     => $i_obj->get_column('homebranch'),
+                    itype          => $i_obj->effective_itemtype,
+                    location       => $i_obj->location,
+                    itemcallnumber => $i_obj->itemcallnumber,
                 };
             }
         }
     }
     else {
         my $item_hash = {
-            itemtype       => $biblioitem->itemtype,
+            itype          => $biblioitem->itemtype,
             itemcallnumber => $biblioitem->cn_class,
         };
         my $branch = $orderline->basketno->deliveryplace;
-- 
2.11.0