gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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 <david@davidnind.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
This commit is contained in:
Owen Leonard 2019-11-20 17:00:52 +00:00 committed by Martin Renvoize
parent 1bddf5f3ba
commit 87f20fd5fe
No known key found for this signature in database
GPG Key ID: 422B469130441A0F
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
acqui/basketgroup.pl
View File

@ -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 );