From 1b0c02376e772a6ad9d45e01bcbac106ee534c92 Mon Sep 17 00:00:00 2001 From: Jacek Ablewicz Date: Mon, 10 Mar 2014 10:53:52 +0100 Subject: [PATCH] Bug 11914: fix two issues when creating an order from a suggestion When order is being created from purchase suggestion: - Budget/fund stored in suggestion record (if any) is not retained on order page, system always defaults to 'Select a fund' even if some fund was already chosen for a suggestion on the earlier stage. - If there was a price given to, and stored within suggestion record, initial prices calculations on order page are not working properly ('Replacement cost', 'Budgeted cost' and 'Total' show as 0.00 or blank). As a workaround - to force correct price recalculation - user needs to manually alter and then re-alter some price-related fields (e.g., quantity or vendor price). This patch fixes both issues. Test plan: 1) create a suggestion: choose some buget, enter something in 'Price' and 'Quantity' fields, 2) try to make an order from this suggestion, to confirm/replicate aforementioned problems, 3) apply patch, 4) make an order from previously created suggestion again, observe that both issues are now resolved. Signed-off-by: Chris Cormack Signed-off-by: Katrin Fischer Works as described, passes all tests and QA script. Signed-off-by: Galen Charlton --- acqui/neworderempty.pl | 1 + koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt | 1 + 2 files changed, 2 insertions(+) diff --git a/acqui/neworderempty.pl b/acqui/neworderempty.pl index 9fdf03287b..5df5d27960 100755 --- a/acqui/neworderempty.pl +++ b/acqui/neworderempty.pl @@ -182,6 +182,7 @@ if ( $ordernumber eq '' ) { # create order # otherwise, retrieve suggestion information. if ($suggestionid) { $data = ($biblionumber) ? GetBiblioData($biblionumber) : GetSuggestion($suggestionid); + $budget_id ||= $data->{'budgetid'} // 0; } } else { #modify order diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt index 596aa07b9d..4ce63a0907 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt @@ -101,6 +101,7 @@ $(document).ready(function() cloneItemBlock(0, '[% UniqueItemFields %]'); [% END %] + [% IF ( suggestionid ) %]updateCosts();[% END %] $("#quantity").change(function() { updateCosts(); }); -- 2.39.5