From a273c604db5ebad8aef2b1076a0a5870783ba06e Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Date: Mon, 23 Dec 2019 16:19:47 +0100
Subject: [PATCH] Bug 24277: Fix date received editing when receiving an order

Bug 8417 added the ability to edit the date received, but a merge
conflict was wrongly resolved during a rebase of
  commit 20d9ed618fbe3cdcb9c04444a1f8a584b0364069
  Bug 13321: Rename variables

Test plan:
Create an order
Receive it
Set a date (different from today)
=> The date you picked should have been set in DB for the order

Signed-off-by: Andrew Fuerste-Henry <andrew@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Signed-off-by: Joy Nelson <joy@bywatersolutions.com>
(cherry picked from commit 028a77abce1aa0c9dc9f1bab8fc3069df811c2a1)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
---
 C4/Acquisition.pm      | 12 ++++++++++--
 acqui/finishreceive.pl |  1 +
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/C4/Acquisition.pm b/C4/Acquisition.pm
index 38bb24186b..c99e39f414 100644
--- a/C4/Acquisition.pm
+++ b/C4/Acquisition.pm
@@ -1396,8 +1396,8 @@ sub ModItemOrder {
             user                 => $user,
             invoice              => $invoice,
             budget_id            => $budget_id,
+            datereceived         => $datereceived,
             received_itemnumbers => \@received_itemnumbers,
-            order_internalnote   => $order_internalnote,
         }
     );
 
@@ -1420,10 +1420,18 @@ sub ModReceiveOrder {
     my $quantrec       = $params->{quantityreceived};
     my $user           = $params->{user};
     my $budget_id      = $params->{budget_id};
+    my $datereceived   = $params->{datereceived};
     my $received_items = $params->{received_items};
 
     my $dbh = C4::Context->dbh;
-    my $datereceived = ( $invoice and $invoice->{datereceived} ) ? $invoice->{datereceived} : dt_from_string;
+    $datereceived = output_pref(
+        {
+            dt => ( $datereceived ? dt_from_string( $datereceived ) : dt_from_string ),
+            dateformat => 'iso',
+            dateonly => 1,
+        }
+    );
+
     my $suggestionid = GetSuggestionFromBiblionumber( $biblionumber );
     if ($suggestionid) {
         ModSuggestion( {suggestionid=>$suggestionid,
diff --git a/acqui/finishreceive.pl b/acqui/finishreceive.pl
index 90faed39e2..dac84613c9 100755
--- a/acqui/finishreceive.pl
+++ b/acqui/finishreceive.pl
@@ -123,6 +123,7 @@ if ($quantityrec > $origquantityrec ) {
                 user             => $user,
                 invoice          => $invoice,
                 budget_id        => $bookfund,
+                datereceived     => $datereceived,
                 received_items   => \@received_items,
             }
         );
-- 
2.20.1