Attachment 26525 Details for Bug 11914 – [PASSED QA] Bug 11914 - Ordering from suggestions: fund (budget id) is not retained; price calculations not working

[patch] [PASSED QA] Bug 11914 - Ordering from suggestions: fund (budget id) is not retained; price calculations not working

PASSED-QA-Bug-11914---Ordering-from-suggestions-fu.patch (text/plain), 2.60 KB, created by Katrin Fischer on 2014-03-23 20:09:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Katrin Fischer

Created: 2014-03-23 20:09:28 UTC

Size: 2.60 KB

patch

obsolete

>From f77800a46b6215a7d518d340364af385e94ebde6 Mon Sep 17 00:00:00 2001
>From: Jacek Ablewicz <abl@biblos.pk.edu.pl>
>Date: Mon, 10 Mar 2014 10:53:52 +0100
>Subject: [PATCH] [PASSED QA] Bug 11914 - Ordering from suggestions: fund
> (budget id) is not retained; price calculations not working
>
>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 <chrisc@catalyst.net.nz>
>Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
>Works as described, passes all tests and QA script.
>---
> 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 9fdf032..5df5d27 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 596aa07..4ce63a0 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();
>         });
>-- 
>1.8.3.2

Actions: View | Diff | Splinter Review

Attachments on bug 11914: 25978 | 26037 | 26525