Attachment 96611 Details for Bug 24277 – Bug 24277: Fix date received editing when receiving an order

[patch] Bug 24277: Fix date received editing when receiving an order

Bug-24277-Fix-date-received-editing-when-receiving.patch (text/plain), 2.47 KB, created by Jonathan Druart on 2019-12-23 15:22:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2019-12-23 15:22:14 UTC

Size: 2.47 KB

patch

obsolete

>From ef7936433d1fe69cd240ac17e4d72fc02d467510 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
>---
> 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 fcd590df79..f21334b05f 100644
>--- a/C4/Acquisition.pm
>+++ b/C4/Acquisition.pm
>@@ -1395,8 +1395,8 @@ sub ModItemOrder {
>             user                 => $user,
>             invoice              => $invoice,
>             budget_id            => $budget_id,
>+            datereceived         => $datereceived,
>             received_itemnumbers => \@received_itemnumbers,
>-            order_internalnote   => $order_internalnote,
>         }
>     );
> 
>@@ -1419,10 +1419,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 64aa9f5ad4..0c127b0f19 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.11.0

Actions: View | Diff | Splinter Review

Attachments on bug 24277: 96611 | 96614 | 96993 | 96994