From dcc54d3308cafedf31c9a8194ba7ef107ea949f1 Mon Sep 17 00:00:00 2001 From: Katrin Fischer Date: Mon, 24 Oct 2011 17:48:29 +0200 Subject: [PATCH] Bug 4161: Preselect active currency for new vendors Currently when creating a new vendor in acquisitions the alphabetical first currency will be preselected. For better usability and less mistakes the active curency should be preselected. To test: Check your currency settings in administration. Your active currency should not be the first in the list. 1) Create a new vendor Verify the active currency is selected for list and invoice prices. 2) Check vendor summary page Verify the correct currencies from the vendor record are shown here. 3) Edit vendor Verify the correct currencies from the vendor record are shown here. Signed-off-by: Liz Rea Verified with tests 1, 2, and 3. Signed-off-by: Paul Poulain (cherry picked from commit 5d5a04798449d1725042adb872d4acf51af672f8) Signed-off-by: Chris Nighswonger --- acqui/supplier.pl | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/acqui/supplier.pl b/acqui/supplier.pl index 2a4078a75e..44ff2501c0 100755 --- a/acqui/supplier.pl +++ b/acqui/supplier.pl @@ -122,12 +122,22 @@ if ( $op eq 'display' ) { } else { my @currencies = GetCurrencies(); my $loop_currency; + my $active_currency = GetCurrency(); + my $active_listprice = $supplier->{'listprice'}; + my $active_invoiceprice = $supplier->{'invoiceprice'}; + if (!$supplier->{listprice}) { + $active_listprice = $active_currency->{currency}; + } + if (!$supplier->{invoiceprice}) { + $active_invoiceprice = $active_currency->{currency}; + } for (@currencies) { push @{$loop_currency}, - { currency => $_->{currency}, - listprice => ( $_->{currency} eq $supplier->{listprice} ), - invoiceprice => ( $_->{currency} eq $supplier->{invoiceprice} ), - }; + { + currency => $_->{currency}, + listprice => ( $_->{currency} eq $active_listprice ), + invoiceprice => ( $_->{currency} eq $active_invoiceprice ), + }; } my $default_gst_rate = (C4::Context->preference('gist') * 100) || '0.0'; -- 2.39.5