Attachment 29428 Details for Bug 12164 – [PASSED QA] Bug 12164: follow-up: various fixes

[patch] [PASSED QA] Bug 12164: follow-up: various fixes

PASSED-QA-Bug-12164-follow-up-various-fixes.patch (text/plain), 4.17 KB, created by Katrin Fischer on 2014-07-02 06:55:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Katrin Fischer

Created: 2014-07-02 06:55:30 UTC

Size: 4.17 KB

patch

obsolete

>From 8f37f2e2f4022c8acf51a365b37c034fdf83739f Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@biblibre.com>
>Date: Fri, 6 Jun 2014 12:53:53 +0200
>Subject: [PATCH] [PASSED QA] Bug 12164: follow-up: various fixes
>
>This follow-up fixes issues raised on bug 12164 comment 17.
>
>1/ The unreceived orders columns should only display "pending" orders
>2/ Fix some typo from_budget_period_id vs budget_period_id vs
>to_budget_period_id
>
>Signed-off-by: Paola Rossi <paola.rossi@cineca.it>
>Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
>---
> admin/aqbudgetperiods.pl                                         | 4 ++--
> koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt | 6 +++---
> 2 files changed, 5 insertions(+), 5 deletions(-)
>
>diff --git a/admin/aqbudgetperiods.pl b/admin/aqbudgetperiods.pl
>index 8e89aba..cebc024 100755
>--- a/admin/aqbudgetperiods.pl
>+++ b/admin/aqbudgetperiods.pl
>@@ -224,6 +224,7 @@ elsif ( $op eq 'close_form' ) {
>         my $unreceived_orders = C4::Acquisition::SearchOrders(
>             {
>                 budget_id => $budget->{budget_id},
>+                pending   => 1,
>             }
>         );
>         $budget->{unreceived_orders} = $unreceived_orders;
>@@ -243,7 +244,6 @@ elsif ( $op eq 'close_form' ) {
> 
> elsif ( $op eq 'close_confirmed' ) {
>     my $to_budget_period_id    = $input->param('to_budget_period_id');
>-    my $from_budget_period_id  = $input->param('from_budget_period_id');
>     my $move_remaining_unspent = $input->param('move_remaining_unspent');
>     my $report                 = C4::Budgets::MoveOrders(
>         {
>@@ -253,7 +253,7 @@ elsif ( $op eq 'close_confirmed' ) {
>         }
>     );
> 
>-    my $from_budget_period = GetBudgetPeriod($from_budget_period_id);
>+    my $from_budget_period = GetBudgetPeriod($budget_period_id);
>     my $to_budget_period   = GetBudgetPeriod($to_budget_period_id);
>     $template->param(
>         closed           => 1,
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt
>index ffb4c26..aaf41e1 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt
>@@ -98,7 +98,7 @@
>           }));
>           $("#move_form").submit(function(){
>             var budget_from = "[% budget_period_description %]";
>-            var budget_to = $("#budget_period").find("option:selected").html();
>+            var budget_to = $("#to_budget_period_id").find("option:selected").html();
>             var alert_message = _("You have chosen to move all unreceived orders from '%s' to '%s'.").format(budget_from, budget_to);
>             alert_message += _("\nThis action cannot be reversed. Do you wish to continue?");
>             return confirm ( alert_message );
>@@ -396,7 +396,7 @@
>     There is no unreceived orders for this budget.
>     <a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Back</a>
>   [% ELSE %]
>-    <h3>Choose the funds you want to move unreceived orders:</h3>
>+    <h3>The unreceived orders from the following funds will be moved</h3>
>       Fund list of budget <a href="/cgi-bin/koha/admin/aqbudgets.pl?budget_period_id=[% budget_period_id %]">[% budget_period_description %]</a>:
>     <table id="budgeth">
>       <thead>
>@@ -445,7 +445,7 @@
>     </form>
>   [% END %]
> [% ELSIF closed %]
>-  <h3>Report after moving unreceived orders from budget [% from_budget_period.budget_period_description %] ([% from_budget_period.budget_period_startdate | $KohaDates %] - [% to_budget_period.budget_period_enddate | $KohaDates %]) to [% to_budget_period.budget_period_description %] ([% to_budget_period.budget_period_startdate | $KohaDates %] - [% to_budget_period.budget_period_enddate | $KohaDates%])</h3>
>+  <h3>Report after moving unreceived orders from budget [% from_budget_period.budget_period_description %] ([% from_budget_period.budget_period_startdate | $KohaDates %] - [% from_budget_period.budget_period_enddate | $KohaDates %]) to [% to_budget_period.budget_period_description %] ([% to_budget_period.budget_period_startdate | $KohaDates %] - [% to_budget_period.budget_period_enddate | $KohaDates%])</h3>
> 
>   <table id="closed_report">
>     <thead>
>-- 
>1.9.1

Actions: View | Diff | Splinter Review

Attachments on bug 12164: 27905 | 27906 | 27907 | 27908 | 27909 | 27910 | 27911 | 28588 | 28589 | 28590 | 28591 | 28592 | 28593 | 28695 | 28702 | 28703 | 28704 | 28705 | 28706 | 28707 | 28708 | 29354 | 29355 | 29356 | 29422 | 29423 | 29424 | 29425 | 29426 | 29427 | 29428 | 29429 | 29430 | 29733 | 29734 | 29735 | 29736 | 29737 | 29738 | 29739 | 29740 | 29741 | 30043 | 30044