Attachment 97317 Details for Bug 17667 – Bug 17667: Do not modify quantity of the original standing order when a receipt is cancelled

[patch] Bug 17667: Do not modify quantity of the original standing order when a receipt is cancelled

Bug-17667-Do-not-modify-quantity-of-the-original-s.patch (text/plain), 4.37 KB, created by ByWater Sandboxes on 2020-01-13 15:11:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: ByWater Sandboxes

Created: 2020-01-13 15:11:41 UTC

Size: 4.37 KB

patch

obsolete

>From 7fda576b29d3740f204a4d11ac76ca5e3067c512 Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>Date: Wed, 18 Dec 2019 18:10:15 +0100
>Subject: [PATCH] Bug 17667: Do not modify quantity of the original standing
> order when a receipt is cancelled
>
>When cancelling a receipt, the quantity of the original order is
>increased.
>
>Test plan:
>Create a basket, mark is as "standing orders"
>Create an order
>receive it
>cancel the receipt
>=> Without this patch the quantity of the original order is 2
>=> With this patch applied the quantity it always 1
>
>Signed-off-by: Kelly McElligott <kelly@bywatersolutions.com>
>---
> C4/Acquisition.pm | 84 ++++++++++++++++++++++++++++---------------------------
> 1 file changed, 43 insertions(+), 41 deletions(-)
>
>diff --git a/C4/Acquisition.pm b/C4/Acquisition.pm
>index f21334b05f..d99b39aab9 100644
>--- a/C4/Acquisition.pm
>+++ b/C4/Acquisition.pm
>@@ -1622,48 +1622,50 @@ sub CancelReceipt {
>     } else {
>         # The order line has a parent, increase parent quantity and delete
>         # the order line.
>-        $query = qq{
>-            SELECT quantity, datereceived
>-            FROM aqorders
>-            WHERE ordernumber = ?
>-        };
>-        $sth = $dbh->prepare($query);
>-        $sth->execute($parent_ordernumber);
>-        my $parent_order = $sth->fetchrow_hashref;
>-        unless($parent_order) {
>-            warn "Parent order $parent_ordernumber does not exist.";
>-            return;
>-        }
>-        if($parent_order->{'datereceived'}) {
>-            warn "CancelReceipt: parent order is received.".
>-                " Can't cancel receipt.";
>-            return;
>-        }
>-        $query = qq{
>-            UPDATE aqorders
>-            SET quantity = ?,
>-                orderstatus = 'ordered'
>-            WHERE ordernumber = ?
>-        };
>-        $sth = $dbh->prepare($query);
>-        my $rv = $sth->execute(
>-            $order->{'quantity'} + $parent_order->{'quantity'},
>-            $parent_ordernumber
>-        );
>-        unless($rv) {
>-            warn "Cannot update parent order line, so do not cancel".
>-                " receipt";
>-            return;
>-        }
>+        unless ( $order_obj->basket->is_standing ) {
>+            $query = qq{
>+                SELECT quantity, datereceived
>+                FROM aqorders
>+                WHERE ordernumber = ?
>+            };
>+            $sth = $dbh->prepare($query);
>+            $sth->execute($parent_ordernumber);
>+            my $parent_order = $sth->fetchrow_hashref;
>+            unless($parent_order) {
>+                warn "Parent order $parent_ordernumber does not exist.";
>+                return;
>+            }
>+            if($parent_order->{'datereceived'}) {
>+                warn "CancelReceipt: parent order is received.".
>+                    " Can't cancel receipt.";
>+                return;
>+            }
>+            $query = qq{
>+                UPDATE aqorders
>+                SET quantity = ?,
>+                    orderstatus = 'ordered'
>+                WHERE ordernumber = ?
>+            };
>+            $sth = $dbh->prepare($query);
>+            my $rv = $sth->execute(
>+                $order->{'quantity'} + $parent_order->{'quantity'},
>+                $parent_ordernumber
>+            );
>+            unless($rv) {
>+                warn "Cannot update parent order line, so do not cancel".
>+                    " receipt";
>+                return;
>+            }
> 
>-        # Recalculate tax_value
>-        $dbh->do(q|
>-            UPDATE aqorders
>-            SET
>-                tax_value_on_ordering = quantity * | . get_rounding_sql(q|ecost_tax_excluded|) . q| * tax_rate_on_ordering,
>-                tax_value_on_receiving = quantity * | . get_rounding_sql(q|unitprice_tax_excluded|) . q| * tax_rate_on_receiving
>-            WHERE ordernumber = ?
>-        |, undef, $parent_ordernumber);
>+            # Recalculate tax_value
>+            $dbh->do(q|
>+                UPDATE aqorders
>+                SET
>+                    tax_value_on_ordering = quantity * | . get_rounding_sql(q|ecost_tax_excluded|) . q| * tax_rate_on_ordering,
>+                    tax_value_on_receiving = quantity * | . get_rounding_sql(q|unitprice_tax_excluded|) . q| * tax_rate_on_receiving
>+                WHERE ordernumber = ?
>+            |, undef, $parent_ordernumber);
>+        }
> 
>         _cancel_items_receipt( $order_obj, $parent_ordernumber );
>         # Delete order line
>-- 
>2.11.0

Actions: View | Diff | Splinter Review

Attachments on bug 17667: 96427 | 96433 | 96663 | 96664 | 97317 | 97318 | 97593 | 97594