Attachment #29428 for bug #12164

View | Details | Raw Unified | Return to bug 12164
Collapse All | Expand All




        my $unreceived_orders = C4::Acquisition::SearchOrders(
            {
                budget_id => $budget->{budget_id},
                pending   => 1,
            }
        );
        $budget->{unreceived_orders} = $unreceived_orders;


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 $from_budget_period = GetBudgetPeriod($budget_period_id);
    my $to_budget_period   = GetBudgetPeriod($to_budget_period_id);
    $template->param(
        closed           => 1,




          }));
          $("#move_form").submit(function(){
            var budget_from = "[% budget_period_description %]";
            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 );

    There is no unreceived orders for this budget.
    <a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Back</a>
  [% ELSE %]
    <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>

    </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 %] - [% 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>
- 

Return to bug 12164

Lines 224-229 elsif ( $op eq 'close_form' ) { Link Here

(-)a/admin/aqbudgetperiods.pl (-2 / +2 lines)
224	my $unreceived_orders = C4::Acquisition::SearchOrders(	224	my $unreceived_orders = C4::Acquisition::SearchOrders(
225	{	225	{
226	budget_id => $budget->{budget_id},	226	budget_id => $budget->{budget_id},
		227	pending => 1,
227	}	228	}
228	);	229	);
229	$budget->{unreceived_orders} = $unreceived_orders;	230	$budget->{unreceived_orders} = $unreceived_orders;
Lines 243-249 elsif ( $op eq 'close_form' ) { Link Here
243		244
244	elsif ( $op eq 'close_confirmed' ) {	245	elsif ( $op eq 'close_confirmed' ) {
245	my $to_budget_period_id = $input->param('to_budget_period_id');	246	my $to_budget_period_id = $input->param('to_budget_period_id');
246	my $from_budget_period_id = $input->param('from_budget_period_id');
247	my $move_remaining_unspent = $input->param('move_remaining_unspent');	247	my $move_remaining_unspent = $input->param('move_remaining_unspent');
248	my $report = C4::Budgets::MoveOrders(	248	my $report = C4::Budgets::MoveOrders(
249	{	249	{
Lines 253-259 elsif ( $op eq 'close_confirmed' ) { Link Here
253	}	253	}
254	);	254	);
255		255
256	my $from_budget_period = GetBudgetPeriod($from_budget_period_id);	256	my $from_budget_period = GetBudgetPeriod($budget_period_id);
257	my $to_budget_period = GetBudgetPeriod($to_budget_period_id);	257	my $to_budget_period = GetBudgetPeriod($to_budget_period_id);
258	$template->param(	258	$template->param(
259	closed => 1,	259	closed => 1,

Lines 98-104 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt (-4 / +3 lines)
98	}));	98	}));
99	$("#move_form").submit(function(){	99	$("#move_form").submit(function(){
100	var budget_from = "[% budget_period_description %]";	100	var budget_from = "[% budget_period_description %]";
101	var budget_to = $("#budget_period").find("option:selected").html();	101	var budget_to = $("#to_budget_period_id").find("option:selected").html();
102	var alert_message = _("You have chosen to move all unreceived orders from '%s' to '%s'.").format(budget_from, budget_to);	102	var alert_message = _("You have chosen to move all unreceived orders from '%s' to '%s'.").format(budget_from, budget_to);
103	alert_message += _("\nThis action cannot be reversed. Do you wish to continue?");	103	alert_message += _("\nThis action cannot be reversed. Do you wish to continue?");
104	return confirm ( alert_message );	104	return confirm ( alert_message );
Lines 396-402 Link Here
396	There is no unreceived orders for this budget.	396	There is no unreceived orders for this budget.
397	<a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Back</a>	397	<a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Back</a>
398	[% ELSE %]	398	[% ELSE %]
399	<h3>Choose the funds you want to move unreceived orders:</h3>	399	<h3>The unreceived orders from the following funds will be moved</h3>
400	Fund list of budget <a href="/cgi-bin/koha/admin/aqbudgets.pl?budget_period_id=[% budget_period_id %]">[% budget_period_description %]</a>:	400	Fund list of budget <a href="/cgi-bin/koha/admin/aqbudgets.pl?budget_period_id=[% budget_period_id %]">[% budget_period_description %]</a>:
401	<table id="budgeth">	401	<table id="budgeth">
402	<thead>	402	<thead>
Lines 445-451 Link Here
445	</form>	445	</form>
446	[% END %]	446	[% END %]
447	[% ELSIF closed %]	447	[% ELSIF closed %]
448	<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>	448	<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>
449		449
450	<table id="closed_report">	450	<table id="closed_report">
451	<thead>	451	<thead>
452	-