From ad550017ff7618e5e4bdb8686a88710480648864 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Tue, 19 Dec 2017 15:04:13 -0300 Subject: [PATCH] Bug 19694: Force scalar context for output_pref called with billingdate If no string is passed to output_pref, it needs to be called in scalar context (to avoid a shift in the hash elements). Here we have billingdate that is not defined yet (NULL) Test plan: - Search for an existing invoice - Show details - Changing shipping cost - Save - Verify the new amount is shown Signed-off-by: Jon Knight Signed-off-by: Kyle M Hall Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens --- acqui/invoice.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/acqui/invoice.pl b/acqui/invoice.pl index 3ab2d9f7c2..dd1360fd69 100755 --- a/acqui/invoice.pl +++ b/acqui/invoice.pl @@ -84,8 +84,8 @@ elsif ( $op && $op eq 'mod' ) { ModInvoice( invoiceid => $invoiceid, invoicenumber => $invoicenumber, - shipmentdate => output_pref( { str => scalar $input->param('shipmentdate'), dateformat => 'iso', dateonly => 1 } ), - billingdate => output_pref( { str => scalar $input->param('billingdate'), dateformat => 'iso', dateonly => 1 } ), + shipmentdate => scalar output_pref( { str => scalar $input->param('shipmentdate'), dateformat => 'iso', dateonly => 1 } ), + billingdate => scalar output_pref( { str => scalar $input->param('billingdate'), dateformat => 'iso', dateonly => 1 } ), shipmentcost => $shipmentcost, shipmentcost_budgetid => $shipment_budget_id ); -- 2.39.5