From 20fd3d519bb0478dbf93c2789942960e60b1aa1c Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Wed, 20 Nov 2019 17:00:52 +0000 Subject: [PATCH] Bug 9993: On editing basket group delivery place resets to logged in branch This patch modifies basketgroups.pl so that existing data about a basket group's billing and delivery place are correctly preselected in the edit form. These fields shouldn't reset to the logged-in user's home branch just because they have an empty value. To test, apply the patch and go to Acquisitions -> Vendor -> Basket groups. When adding or editing a basket group the pre-selected value for "Billing place" and "Delivery place" should be correct: - When creating a new basket group: The logged-in user's library should be pre-selected. - When editing a basket group which has a library defined for either the billing or delivery places, the correct library should be pre-selected. - When editing a basket group which has no library defined for either the billing or delivery place there should be no library pre-selected (the "--" option should be pre-selected). Signed-off-by: David Nind Signed-off-by: Katrin Fischer Signed-off-by: Martin Renvoize Signed-off-by: Joy Nelson (cherry picked from commit 69afaa42391d358fac90a0fab8e00f1d10b75dc1) Signed-off-by: Lucas Gass (cherry picked from commit ed5e9732d9d078483918f594c9fdca7da737faec) Signed-off-by: Hayley Mapley --- acqui/basketgroup.pl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/acqui/basketgroup.pl b/acqui/basketgroup.pl index cc3f9fcc48..288631eab6 100755 --- a/acqui/basketgroup.pl +++ b/acqui/basketgroup.pl @@ -285,12 +285,12 @@ if ( $op eq "add" ) { $freedeliveryplace = $basketgroup->{freedeliveryplace}; $template->param( closedbg => ($basketgroup ->{'closed'}) ? 1 : 0); } else { + # When creating a new basket group preselect billing and delivery place based on logged-in user + my $patron = Koha::Patrons->find( $loggedinuser ); + $billingplace = $patron->branchcode; + $deliveryplace = $patron->branchcode; $template->param( closedbg => 0); } - # determine default billing and delivery places depending on librarian homebranch and existing basketgroup data - my $patron = Koha::Patrons->find( $loggedinuser ); # FIXME Not needed if billingplace and deliveryplace are set - $billingplace = $billingplace || $patron->branchcode; - $deliveryplace = $deliveryplace || $patron->branchcode; $template->param( billingplace => $billingplace ); $template->param( deliveryplace => $deliveryplace ); -- 2.39.5