From ac4ac649aaeffb3082fb7a1d84323fac5842ad52 Mon Sep 17 00:00:00 2001
From: Andrew Isherwood <andrew.isherwood@ptfs-europe.com>
Date: Fri, 6 Dec 2019 10:30:20 +0000
Subject: [PATCH] Bug 23971: (follow-up) Remove data duplication
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

In response to Séverine observations in comment #10, this patch removes
the duplicate logging of the borrowernumber

https://bugs.koha-community.org/show_bug.cgi?id=23971
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>

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

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
---
 C4/Acquisition.pm     | 8 ++------
 acqui/addorder.pl     | 3 +--
 acqui/basket.pl       | 9 +++------
 acqui/basketheader.pl | 3 +--
 4 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/C4/Acquisition.pm b/C4/Acquisition.pm
index 23aaf25d0d..e03474a8e7 100644
--- a/C4/Acquisition.pm
+++ b/C4/Acquisition.pm
@@ -509,14 +509,10 @@ sub ModBasket {
 
     # Log the basket update
     if (C4::Context->preference("AcqLog")) {
-        my $infos = $basketinfo->{borrowernumber} ?
-            sprintf("%010d", $basketinfo->{borrowernumber}) :
-            undef;
         logaction(
             'ACQUISITIONS',
             'MODIFY_BASKET',
-            $basketinfo->{'basketno'},
-            $infos
+            $basketinfo->{'basketno'}
         );
     }
 
@@ -559,7 +555,7 @@ case the AcqCreateItem syspref takes precedence).
 =cut
 
 sub ModBasketHeader {
-    my ($basketno, $basketname, $note, $booksellernote, $contractnumber, $booksellerid, $deliveryplace, $billingplace, $is_standing, $create_items, $borrowernumber) = @_;
+    my ($basketno, $basketname, $note, $booksellernote, $contractnumber, $booksellerid, $deliveryplace, $billingplace, $is_standing, $create_items) = @_;
 
     $is_standing ||= 0;
     my $query = qq{
diff --git a/acqui/addorder.pl b/acqui/addorder.pl
index bef3dc8171..cd69a4d251 100755
--- a/acqui/addorder.pl
+++ b/acqui/addorder.pl
@@ -365,8 +365,7 @@ if (C4::Context->preference("AcqLog") && $basketno) {
     logaction(
         'ACQUISITIONS',
         'MODIFY_BASKET',
-        $basketno,
-        sprintf("%010d", $loggedinuser)
+        $basketno
     );
 }
 
diff --git a/acqui/basket.pl b/acqui/basket.pl
index 5a0a9101d7..015f27a6b5 100755
--- a/acqui/basket.pl
+++ b/acqui/basket.pl
@@ -210,8 +210,7 @@ if ( $op eq 'delete_confirm' ) {
                             closed => 1,
                             });
             ModBasket( { basketno => $basketno,
-                         basketgroupid => $basketgroupid,
-                         borrowernumber => $loggedinuser } );
+                         basketgroupid => $basketgroupid } );
             print $query->redirect('/cgi-bin/koha/acqui/basketgroup.pl?booksellerid='.$booksellerid.'&closed=1');
         } else {
             print $query->redirect('/cgi-bin/koha/acqui/booksellers.pl?booksellerid=' . $booksellerid);
@@ -244,8 +243,7 @@ elsif ( $op eq 'ediorder' ) {
     $branch = undef if(defined $branch and $branch eq '');
     ModBasket({
         basketno => $basket->{basketno},
-        branch   => $branch,
-        borrowernumber => $loggedinuser
+        branch   => $branch
     });
     print $query->redirect("/cgi-bin/koha/acqui/basket.pl?basketno=$basketno");
     exit;
@@ -561,8 +559,7 @@ sub edi_close_and_order {
             ModBasket(
                 {
                     basketno       => $basketno,
-                    basketgroupid  => $basketgroupid,
-                    borrowernumber => $loggedinuser
+                    basketgroupid  => $basketgroupid
                 }
             );
             print $query->redirect(
diff --git a/acqui/basketheader.pl b/acqui/basketheader.pl
index 0cb5737b20..f06900ce85 100755
--- a/acqui/basketheader.pl
+++ b/acqui/basketheader.pl
@@ -153,8 +153,7 @@ if ( $op eq 'add_form' ) {
             scalar $input->param('deliveryplace'),
             scalar $input->param('billingplace'),
             scalar $input->param('is_standing') ? 1 : undef,
-            scalar $input->param('create_items'),
-            $loggedinuser
+            scalar $input->param('create_items')
         );
     } else { #New basket
         $basketno = NewBasket(
-- 
2.39.5