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>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
my $unreceived_orders = C4::Acquisition::SearchOrders(
{
budget_id => $budget->{budget_id},
my $unreceived_orders = C4::Acquisition::SearchOrders(
{
budget_id => $budget->{budget_id},
}
);
$budget->{unreceived_orders} = $unreceived_orders;
}
);
$budget->{unreceived_orders} = $unreceived_orders;
elsif ( $op eq 'close_confirmed' ) {
my $to_budget_period_id = $input->param('to_budget_period_id');
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(
{
my $move_remaining_unspent = $input->param('move_remaining_unspent');
my $report = C4::Budgets::MoveOrders(
{
- 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,
my $to_budget_period = GetBudgetPeriod($to_budget_period_id);
$template->param(
closed => 1,
}));
$("#move_form").submit(function(){
var budget_from = "[% budget_period_description %]";
}));
$("#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 );
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 );
There is no unreceived orders for this budget.
<a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Back</a>
[% ELSE %]
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>
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>
</form>
[% END %]
[% ELSIF closed %]
</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>
<table id="closed_report">
<thead>