Attachment #63224 for bug #18060

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

Lines 146-151 sub GetPeriodsCount { Link Here

(-)a/C4/Budgets.pm (+7 lines)
146	}	146	}
147		147
148	# -------------------------------------------------------------------	148	# -------------------------------------------------------------------
		149
		150	sub GetHighestBudgetPeriod{
		151	my $dbh = C4::Context->dbh;
		152	warn my $data = $dbh->selectrow_array("SELECT MAX(budget_period_id) FROM aqbudgetperiods");
		153	return $data;
		154	}
		155	# -------------------------------------------------------------------
149	sub CheckBudgetParent {	156	sub CheckBudgetParent {
150	my ( $new_parent, $budget ) = @_;	157	my ( $new_parent, $budget ) = @_;
151	my $new_parent_id = $new_parent->{'budget_id'};	158	my $new_parent_id = $new_parent->{'budget_id'};




    suggestions_count   => $suggestions_count,
);






my $aqstep;
my $cur = Koha::Acquisition::Currencies->get_active;

if ( $cur ) {
    $template->param(
        currency => $cur->currency,
    );
}

my $budget = GetPeriodsCount();
my $budgetid = C4::Budgets->GetHighestBudgetPeriod();
if (!@budget_loop){
if (!$cur) {
    $aqstep = 1;
    $template->param( step => $aqstep );
} elsif ($budget && $budgetid == 1){
    $aqstep = 3;
    $template->param( step => $aqstep );
} elsif ($budgetid > 1) {
    print $query->redirect("/cgi-bin/koha/admin/aqbudgetperiods.pl");
    exit;
} else  {
    $aqstep = 2;
    $template->param( step => $aqstep );
}
}
output_html_with_http_headers $query, $cookie, $template->output;




elsif ( $op eq 'add_validate' ) {
## add or modify a budget period (confirmation)

## update budget period data
	if ( $budget_period_id ne '' ) {
		$$budget_period_hashref{$_}||=0 for qw(budget_period_active budget_period_locked);
		my $status=ModBudgetPeriod($budget_period_hashref);
	} 
	else {    # ELSE ITS AN ADD
		my $budget_period_id=AddBudgetPeriod($budget_period_hashref);
    my $stepfund = $input->param( 'step' );
    $template->param( stepfund => $stepfund );
    print $input->redirect("/cgi-bin/koha/acqui/acqui-home.pl");
    exit;
}
	$op='else';
}





my $budget_users_ids          = $input->param('budget_users_ids');
my $filter_budgetbranch       = $input->param('filter_budgetbranch') // '';
my $filter_budgetname         = $input->param('filter_budgetname');


# ' ------- get periods stuff ------------------'
# IF PERIODID IS DEFINED,  GET THE PERIOD - ELSE JUST GET THE ACTIVE PERIOD BY DEFAULT
my $period;

                                                    # END $OP eq ADD_FORM
#---------------------- DEFAULT DISPLAY BELOW ---------------------


# called by default form, used to confirm deletion of data in DB
} elsif ($op eq 'delete_confirm') {


        $budget_hash->{budget_id} = AddBudget( $budget_hash );
        ModBudgetUsers($budget_hash->{budget_id}, @budgetusersid);
        $budget_modified = 1;

        my $fundcreation = $input->param('fundcreation');

        if ($fundcreation eq "onboarding"){
            my $step  = $input->param('step');
            $template->param('step' => $step);
            print $input->redirect("/cgi-bin/koha/acqui/acqui-home.pl");
            exit;
        }
    }

    my $set_owner_to_children = $input->param('set_owner_to_children');

Lines 89-94 if ( $op eq 'add_form' ) { Link Here

(-)a/admin/currency.pl (+9 lines)
89	}	89	}
90	$searchfield = q\|\|;	90	$searchfield = q\|\|;
91	$op = 'list';	91	$op = 'list';
		92
		93	my $aqcurrency = $input->param('aqcurrency');
		94	if ($aqcurrency == 1) {
		95	my $step = $input->param( 'step' );
		96	$template->param( step => $step );
		97	print $input->redirect("/cgi-bin/koha/acqui/acqui-home.pl");
		98	exit;
		99	}
		100
92	} elsif ( $op eq 'delete_confirm' ) {	101	} elsif ( $op eq 'delete_confirm' ) {
93	my $currency = Koha::Acquisition::Currencies->find($currency_code);	102	my $currency = Koha::Acquisition::Currencies->find($currency_code);
94		103

Lines 2995-2997 fieldset.rows + fieldset.action { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/css/staff-global.css (+6 lines)
2995	.yui-u .rows li p label.widelabel {	2995	.yui-u .rows li p label.widelabel {
2996	width: auto;	2996	width: auto;
2997	}	2997	}
		2998
		2999	div#aqhelp{
		3000	background-color:#EDF4F6;
		3001	padding:20px;
		3002	width:50%;
		3003	}




<style type="text/css">
  #onboardingModal{
     z-index:1;
     background-color:#E6F0F2;
     position:fixed;
     left:auto;
     top:auto;
     right:auto;
     bottom:auto;
}
</style>

[% IF ( currency ) %]
    [% IF ( not hide ) %]
        <p><b>Currency = [% currency %]</b></p>
    [% END %]
[% ELSE %]
   <div class="dialog alert">
        <h3>No active currency is defined</h3>
        [% IF CAN_user_parameters_parameters_remaining_permissions %]
            <p><a href="/cgi-bin/koha/admin/currency.pl">Please specify an active currency.</a></p>
        [% ELSE %]
            <p>Your administrator must specify an active currency.</p>
        [% END %]
   </div>
[% END %]




<style type="text/css">
    #onboardingModal{
        z-index:1;
        background-color:#EDF4F6;
        padding:20px;
        width:70%;
        position:fixed;
        left:auto;
        top:auto;
        right:auto;
        bottom:auto;
}
</style>

[% IF onboarding =="acqui" %]
<div id="onboardingModal">
        <h2> Acquisition onboarding wizard</h2>
        <h3> This onboarding wizard will take you through the process of setting up Acquistions </h3>
        <p>Start by completing this form to create a currency which you will be used to create your first budget and fund.<br>
        A fund is the accounting value you use to create orders</p>
         <form action="/cgi-bin/koha/admin/currency.pl" name="Aform" method="post" class="validated">
           <input type="hidden" name="op" value="add_validate" />
           <input type="hidden" name="step" value="2"/>
           <input type="hidden" name="aqcurrency" value=1 />
           <fieldset class="rows">
              <legend>
                      New currency
              </legend>
              <ol>
                 <li>
                      [% IF currency %]
                          <span class="label">Currency: </span>
                          <input type="hidden" name="is_a_modif" value="1" />
                          <input type="hidden" name="currency_code" id="currency" value="[% currency.currency %]" />[% currency.currency %]
                      [% ELSE %]
                          <label for="currency_code" class="required">Currency: </label>
                          <input type="text" name="currency_code" id="currency_code" size="50" maxlength="50" required="required" class="required" /> <span class="required">Required</span>
                      [% END %]
                </li>
                <li>
                      <label for="rate" class="required">Rate: </label>
                      <input type="text" name="rate" id="rate" size="10" maxlength="10" value="[% currency.rate %]" required="required" class="required" /> <span class="required">Required</span>
                </li>
                <li>
                      <label for="symbol" class="required">Symbol: </label>
                      <input type="text" name="symbol" id="symbol" size="5" maxlength="5" value="[% currency.symbol %]" required="required" class="required" /> <span class="required">Required</span>
                </li>
                <li>
                      <label for="isocode">ISO code: </label>
                      <input type="text" name="isocode" id="isocode" size="5" maxlength="5" value="[% currency.isocode %]" />
                </li>
                <li>
                      <label for="active">Active: </label>
                      <input type="checkbox" id="active" name="active" value="1" checked="checked" />
                      <span id="hint" class="hint"></span>
                </li>
              </ol>
           </fieldset>
           <fieldset class="action">
                   <input type="submit" value="Submit" />
           </fieldset>
         </form>
</div>

[% ELSIF onboarding == "label" %]

hello there


[% END %]




<style type="text/css">
 #onboardingModal{
     z-index:1;
     background-color:#EDF4F6;
     padding:20px;
     width:70%;
     position:fixed;
     left:auto;
     top:auto;
     right:auto;
     bottom:auto;
}
</style>
    <div id="onboardingModal">
    [% IF  displayonboardscreen == "acquisitions" %]
        <h2> Acquisition onboarding wizard</h2>
        <p> Create a budget which is the highest level value in acquisitions accountancy. <br>
        After creating this budget you will be prompted to create a fund which is what you will use to set up orders.
        </p>
        <b>If you have previously created a budget (which was subsequently deleted) then you will be redirected to the Budget Administration page after creating a budget using this form. On the Budget Administration page click Actions->Add fund to create a fund</b>
        <h3> Create a budget</h3>
        <form action="/cgi-bin/koha/admin/aqbudgetperiods.pl" name="f" method="post">
            <fieldset class="rows">
                <input type="hidden" name="op" value="add_validate" />
                <input type="hidden" name="step" value="3"/>
                <input type="hidden" name="budget_period_id" value="[% budget_period_id %]" />
                <ol>
                    <li>
                        <label class="required" for="from">Start date: </label>
                        <input type="text" size="10" id="from" name="budget_period_startdate" value="[% budget_period_startdate | $KohaDates %]" class="datepickerfrom" />
                        <div class="hint">[% INCLUDE 'date-format.inc' %]</div>
                    </li>

                    <li>
                        <label class="required" for="to">End date: </label>
                        <input type="text" size="10" id="to" name="budget_period_enddate" value="[% budget_period_enddate | $KohaDates %]" class="datepickerto" />
                        <div class="hint">[% INCLUDE 'date-format.inc' %]</div>
                    </li>

                    <li>
                        <label class="required" for="budget_period_description">Description: </label>
                        <input type="text" id="budget_period_description" name="budget_period_description" size="48" maxlength="80" value="[% budget_period_description %]" />
                    </li>

                    <li>
                        <label for="budget_period_total">Total amount: </label>
                        <input type="text" id="budget_period_total" name="budget_period_total" size="10" maxlength="80" value="[% budget_period_total | $Price on_editing => 1 %]" />
                    </li>

                    <li>
                        <label for="budget_period_active">Make budget active: </label>
                        <input type="checkbox" checked="checked" id="budget_period_active" name="budget_period_active" value="1" />
                    </li>
                </ol>
            </fieldset>
            <fieldset class="action">
                <a href = "/cgi-bin/koha/acqui/acqui-home.pl">
                <input type="submit" class="action" value="Submit" />
                </a>
            </fieldset>
        </form>
    </div>
    [% ELSIF displayonboardscreen == "label" %]
        <h2>testing</h2>
    [% END %]




<style type="text/css">
  #onboardingModal{
       z-index:1;
       background-color:#EDF4F6;
       padding:20px;
       width:70%;
       position:fixed;
       left:auto;
       top:auto;
       right:auto;
       bottom:auto;
}
</style>

<div id="onboardingModal">
    <h2> Acquisition onboarding wizard</h2>
    <p> Fill out this form to create a fund which will be assigned to the budget you just created. <br>
    A fund is an accounting value you will use to set up orders</p>
    <br>
    <h3> Create a fund</h3>
    <form action="/cgi-bin/koha/admin/aqbudgets.pl" id="edit_fund" name="Aform" method="post">
        <input type="hidden" name="op" value="add_validate" />
        <input type="hidden" name="checked" value="0" />
        <input type="hidden" name="fundcreation" value="onboarding" />
        <input type="hidden" name="step" value="4" />
        [% IF ( budget_id ) %]
                <input type="hidden" name="budget_id" value="[% budget_id %]" />
        [% END %]
        [% budget_id %]

        <fieldset class="rows">
           <legend>[% IF ( budget_id ) %]Modify[% ELSE %]Add[% END %] Fund
                [% IF ( budget_period_description ) %]
                    [% budget_name %] for Budget '[% budget_period_description %]'
                [% END %]
           </legend>
        <ol>
                [% budget_parent_id = 0 %]
                <li>
                     <span class="label">Fund parent: </span>
                     [% budget_parent_name %]
                     [% budget_parent_id %] - [% budget_parent_name %]
                     <input type="hidden" name="budget_parent_id" value= NULL />
                </li>
                <li>
                    <label class="required"  for="budget_code">Fund code: </label>
                    <input type="text" name="budget_code" id="budget_code" value="[% budget_code %]" size="30" />
                </li>

                <li>
                    <label class="required" for="budget_name">Fund name: </label>
                    <input type="text" name="budget_name" id="budget_name" value="[% budget_name %]" size="60" />
                </li>

                <li>
                    <label style="white-space: nowrap;" for="budget_amount" class="required">Amount: </label>
                    <input type="text" name="budget_amount" id="budget_amount" value="[% budget_amount | $Price on_editing => 1 %]" size="8" />
                </li>

                <input type="hidden" name="budget_owner_id" id="budget_owner_id" value="0" />

                [% IF ( budget_id ) %]
                    <input type="hidden" name="budget_id" value="[% budget_id %]" />
                [% END %]

        </fieldset>
        <fieldset class="action">
            <input type="submit" value="Submit" />
            <input type="hidden" name="budget_period_id" value="1" />
        </fieldset>
    </form>

</div>

Lines 1-19 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt (-4 / +44 lines)
1	[% USE Price %]	1	[% USE Price %]
2	[% USE Branches %]	2	[% USE Branches %]
		3	[% USE Koha %]
		4	[% USE KohaDates %]
		5	[% USE Branches %]
		6
3	[% INCLUDE 'doc-head-open.inc' %]	7	[% INCLUDE 'doc-head-open.inc' %]
4	<title>Koha &rsaquo; Acquisitions</title>	8	<title>Koha &rsaquo; Acquisitions</title>
5	[% INCLUDE 'doc-head-close.inc' %]	9	[% INCLUDE 'doc-head-close.inc' %]
6	<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" />	10	<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" />
		11
7	[% INCLUDE 'datatables.inc' %]	12	[% INCLUDE 'datatables.inc' %]
8	<link href="[% interface %]/lib/jquery/plugins/treetable/stylesheets/jquery.treetable.css" rel="stylesheet" type="text/css" />	13	<link href="[% interface %]/lib/jquery/plugins/treetable/stylesheets/jquery.treetable.css" rel="stylesheet" type="text/css" />
9	<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/treetable/jquery.treetable.js"></script>	14	<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/treetable/jquery.treetable.js"></script>
10		15
		16	[% INCLUDE 'calendar.inc' %]
		17	<script type="text/javascript" src="[% interface %]/[% theme %]/js/acq.js"></script>
		18
11	<script type="text/javascript">	19	<script type="text/javascript">
12	//<![CDATA[	20	//<![CDATA[
13		21
14	dt_overwrite_html_sorting_localeCompare();	22	dt_overwrite_html_sorting_localeCompare();
15		23
16	$(document).ready(function() {	24	$(document).ready(function() {
		25	$("#aqhelp").hide();
17		26
18	var oTable = $("#accounts").dataTable($.extend(true, {}, dataTablesDefaults, {	27	var oTable = $("#accounts").dataTable($.extend(true, {}, dataTablesDefaults, {
19	"fnDrawCallback": function ( oSettings ) {	28	"fnDrawCallback": function ( oSettings ) {
Lines 80-85 $(document).ready(function() { Link Here
80	});	89	});
81	$("#hide_inactive").click();	90	$("#hide_inactive").click();
82		91
		92	$("#show").click(function(){
		93	$("#aqhelp").show();
		94	});
		95
83	});	96	});
84	//]]>	97	//]]>
85	</script>	98	</script>
Lines 98-112 $(document).ready(function() { Link Here
98	<div class="yui-b">	111	<div class="yui-b">
99		112
100	[% INCLUDE 'acquisitions-toolbar.inc' %]	113	[% INCLUDE 'acquisitions-toolbar.inc' %]
101
102	<h1>Acquisitions</h1>
103	[% INCLUDE 'budgets-active-currency.inc' hide = 'yes' %]
104	[% UNLESS ( loop_budget ) %]	114	[% UNLESS ( loop_budget ) %]
105	[% IF ( CAN_user_acquisition_period_manage ) %]	115	[% IF ( CAN_user_acquisition_period_manage ) %]
106	<div class="dialog alert"><a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">You must define a budget in Administration</a></div>	116	[% displayonboardscreen = "acquisitions" %]
		117	[% IF step == 1 %]
		118	[% INCLUDE onboardinginclude1.inc %]
		119	[% ELSIF step == 2 %]
		120	[% INCLUDE onboardinginclude2.inc %]
		121	[% ELSIF step == 3 %]
		122	[% INCLUDE onboardinginclude3.inc %]
		123	[% END %]
107	[% ELSE %]	124	[% ELSE %]
108	<div class="dialog alert">Your administrator must define a budget in Administration</div>	125	<div class="dialog alert">Your administrator must define a budget in Administration</div>
109	[% END %]	126	[% END %]
		127	[% ELSE %]
		128	<h1>Acquisitions</h1>
110	[% END %]	129	[% END %]
111	<div class="yui-g">	130	<div class="yui-g">
112	<div class="yui-u first">	131	<div class="yui-u first">
Lines 237-242 $(document).ready(function() { Link Here
237	</div>	256	</div>
238	[% END %]	257	[% END %]
239		258
		259	<button type="button" id="show" onclick"unhide(aqhelp)">Show the next steps to set up Acquisitions</button>
		260	<br><br>
		261	<div id="aqhelp">
		262	<h1> Next steps</h1>
		263	<h2> 1. Create your first vendor</h2>
		264	<p> A vendor is the organisation your institution purchases items from i.e. suppliers<br>
		265	You must create a vendor before you can create any orders</p>
		266	<b>Click <a href="/cgi-bin/koha/acqui/supplier.pl?op=enter">here</a> to create a vendor.</b>
		267	<br><br>
		268	<h2> 2. Create your first basket</h2>
		269	<p> A basket is the conceptual container that holds orders. Each basket is assigned to a single vendor so you can perform multiple seperate orders from a single vendor simultaneously. Because of its reliance on vendor the basket must be created after the vendor</p>
		270	<b> To create a basket, click the 'New basket' button on the Vendor Information page which is displayed after you create a vendor</b>
		271	<br><br>
		272	<h2> 3. Create an order</h2>
		273	<p> An order is a assignment of items purchased from a single vendor at a single time</p>
		274	You create an order by clicking "Add to basket" in the Basket page. From here you can choose the item(s) you want to purchase from existing MARC records in your Koha catalogue, subscription, new item record, external source, staged file (bibliographic file in the process of being uploaded), or from popularly held items.
		275	</p>
		276	<br><br>
		277	For further information about creating a vendor, basket and order go to the Koha manual:
		278	<a href="http://translate.koha-community.org/manual/master/en/html/09_acquisitions.html"> Koha manual Acquisitions section</a>
		279	</div>
240	</div>	280	</div>
241	</div>	281	</div>
242	<div class="yui-b">	282	<div class="yui-b">

Lines 334-340 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt (-1 / +1 lines)
334	<li>	334	<li>
335	<label class="required" for="from">Start date: </label>	335	<label class="required" for="from">Start date: </label>
336	<input type="text" size="10" id="from" name="budget_period_startdate" value="[% budget_period_startdate \| $KohaDates %]" class="datepickerfrom" />	336	<input type="text" size="10" id="from" name="budget_period_startdate" value="[% budget_period_startdate \| $KohaDates %]" class="datepickerfrom" />
337	<div class="hint">[% INCLUDE 'date-format.inc' %]</div>	337	<!--<div class="hint">[% INCLUDE 'date-format.inc' %]</div>-->
338	</li>	338	</li>
339	<li>	339	<li>
340		340

Lines 453-459 var MSG_PARENT_BENEATH_BUDGET = "- " + _("New budget-parent is beneath budget") Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt (-1 / +2 lines)
453		453
454	<!-- ********************************************************************************************** -->	454	<!-- ********************************************************************************************** -->
455	<!-- create add/mod entry form -->	455	<!-- create add/mod entry form -->
456	[% IF op == 'add_form' && !error_not_authorised_to_modify %]	456	[% IF op == 'add_form' %]
457	<form action="/cgi-bin/koha/admin/aqbudgets.pl" id="edit_fund" name="Aform" method="post">	457	<form action="/cgi-bin/koha/admin/aqbudgets.pl" id="edit_fund" name="Aform" method="post">
458	<fieldset class="rows">	458	<fieldset class="rows">
459	<legend>[% IF ( budget_id ) %]Modify[% ELSE %]Add[% END %] Fund	459	<legend>[% IF ( budget_id ) %]Modify[% ELSE %]Add[% END %] Fund
Lines 464-469 var MSG_PARENT_BENEATH_BUDGET = "- " + _("New budget-parent is beneath budget") Link Here
464		464
465	<input type="hidden" name="op" value="add_validate" />	465	<input type="hidden" name="op" value="add_validate" />
466	<input type="hidden" name="checked" value="0" />	466	<input type="hidden" name="checked" value="0" />
		467	<input type="hidden" name="fundcreation" value="aqform" />
467	<ol>	468	<ol>
468	[% IF ( budget_parent_id ) %]	469	[% IF ( budget_parent_id ) %]
469	<li>	470	<li>

Lines 20-26 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tt (-1 / +4 lines)
20	<div class="yui-g">	20	<div class="yui-g">
21	[% INCLUDE 'labels-toolbar.inc' %]	21	[% INCLUDE 'labels-toolbar.inc' %]
22	<div class="yui-u first">	22	<div class="yui-u first">
23		23	[% IF (layout \|\| template) %]
		24	[% onboarding = "label" %]
		25	[% INCLUDE 'onboardinginclude1.inc' %]
		26	[% END %]
24	</div>	27	</div>
25	</div>	28	</div>
26	</div>	29	</div>

Lines 22-30 use strict; Link Here

(-)a/labels/label-home.pl (-1 / +12 lines)
22	use warnings;	22	use warnings;
23		23
24	use CGI qw ( -utf8 );	24	use CGI qw ( -utf8 );
		25	use vars qw($debug);
		26	use Data::Dumper;
25		27
26	use C4::Auth qw(get_template_and_user);	28	use C4::Auth qw(get_template_and_user);
27	use C4::Output qw(output_html_with_http_headers);	29	use C4::Output qw(output_html_with_http_headers);
		30	use C4::Labels;
		31	use C4::Creators;
28		32
29	my $cgi = new CGI;	33	my $cgi = new CGI;
30	my ( $template, $loggedinuser, $cookie ) = get_template_and_user(	34	my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
Lines 38-41 my ( $template, $loggedinuser, $cookie ) = get_template_and_user( Link Here
38	}	42	}
39	);	43	);
40		44
		45
		46	#check if any layouts and/or templates already exist
		47	my $layout = C4::Labels::Layout->retrieve(layout_id => 1 );
		48	$template->param( layout => $layout );
		49
		50	my $template = C4::Creators::Template->retrieve(layout_id => '1');
		51	$template->param( template => $template );
		52
41	output_html_with_http_headers $cgi, $cookie, $template->output;	53	output_html_with_http_headers $cgi, $cookie, $template->output;
42	-

Return to bug 18060

Lines 122-132 $template->param( Link Here

(-)a/acqui/acqui-home.pl (+24 lines)
122	suggestions_count => $suggestions_count,	122	suggestions_count => $suggestions_count,
123	);	123	);
124		124
		125
		126
		127
		128
		129
		130	my $aqstep;
125	my $cur = Koha::Acquisition::Currencies->get_active;	131	my $cur = Koha::Acquisition::Currencies->get_active;
		132
126	if ( $cur ) {	133	if ( $cur ) {
127	$template->param(	134	$template->param(
128	currency => $cur->currency,	135	currency => $cur->currency,
129	);	136	);
130	}	137	}
131		138
		139	my $budget = GetPeriodsCount();
		140	my $budgetid = C4::Budgets->GetHighestBudgetPeriod();
		141	if (!@budget_loop){
		142	if (!$cur) {
		143	$aqstep = 1;
		144	$template->param( step => $aqstep );
		145	} elsif ($budget && $budgetid == 1){
		146	$aqstep = 3;
		147	$template->param( step => $aqstep );
		148	} elsif ($budgetid > 1) {
		149	print $query->redirect("/cgi-bin/koha/admin/aqbudgetperiods.pl");
		150	exit;
		151	} else {
		152	$aqstep = 2;
		153	$template->param( step => $aqstep );
		154	}
		155	}
132	output_html_with_http_headers $query, $cookie, $template->output;	156	output_html_with_http_headers $query, $cookie, $template->output;

Lines 113-126 if ( $op eq 'add_form' ) { Link Here

(-)a/admin/aqbudgetperiods.pl (-2 / +6 lines)
113	elsif ( $op eq 'add_validate' ) {	113	elsif ( $op eq 'add_validate' ) {
114	## add or modify a budget period (confirmation)	114	## add or modify a budget period (confirmation)
115		115
116	## update budget period data	116	## update budget period data
117	if ( $budget_period_id ne '' ) {	117	if ( $budget_period_id ne '' ) {
118	$$budget_period_hashref{$_}\|\|=0 for qw(budget_period_active budget_period_locked);	118	$$budget_period_hashref{$_}\|\|=0 for qw(budget_period_active budget_period_locked);
119	my $status=ModBudgetPeriod($budget_period_hashref);	119	my $status=ModBudgetPeriod($budget_period_hashref);
120	}	120	}
121	else { # ELSE ITS AN ADD	121	else { # ELSE ITS AN ADD
122	my $budget_period_id=AddBudgetPeriod($budget_period_hashref);	122	my $budget_period_id=AddBudgetPeriod($budget_period_hashref);
123	}	123	my $stepfund = $input->param( 'step' );
		124	$template->param( stepfund => $stepfund );
		125	print $input->redirect("/cgi-bin/koha/acqui/acqui-home.pl");
		126	exit;
		127	}
124	$op='else';	128	$op='else';
125	}	129	}
126		130

Lines 76-83 my $budget_permission = $input->param('budget_permission'); Link Here

(-)a/admin/aqbudgets.pl (-2 / +10 lines)
76	my $budget_users_ids = $input->param('budget_users_ids');	76	my $budget_users_ids = $input->param('budget_users_ids');
77	my $filter_budgetbranch = $input->param('filter_budgetbranch') // '';	77	my $filter_budgetbranch = $input->param('filter_budgetbranch') // '';
78	my $filter_budgetname = $input->param('filter_budgetname');	78	my $filter_budgetname = $input->param('filter_budgetname');
79
80
81	# ' ------- get periods stuff ------------------'	79	# ' ------- get periods stuff ------------------'
82	# IF PERIODID IS DEFINED, GET THE PERIOD - ELSE JUST GET THE ACTIVE PERIOD BY DEFAULT	80	# IF PERIODID IS DEFINED, GET THE PERIOD - ELSE JUST GET THE ACTIVE PERIOD BY DEFAULT
83	my $period;	81	my $period;
Lines 180-185 if ($op eq 'add_form') { Link Here
180	# END $OP eq ADD_FORM	178	# END $OP eq ADD_FORM
181	#---------------------- DEFAULT DISPLAY BELOW ---------------------	179	#---------------------- DEFAULT DISPLAY BELOW ---------------------
182		180
		181
183	# called by default form, used to confirm deletion of data in DB	182	# called by default form, used to confirm deletion of data in DB
184	} elsif ($op eq 'delete_confirm') {	183	} elsif ($op eq 'delete_confirm') {
185		184
Lines 221-226 if ($op eq 'add_form') { Link Here
221	$budget_hash->{budget_id} = AddBudget( $budget_hash );	220	$budget_hash->{budget_id} = AddBudget( $budget_hash );
222	ModBudgetUsers($budget_hash->{budget_id}, @budgetusersid);	221	ModBudgetUsers($budget_hash->{budget_id}, @budgetusersid);
223	$budget_modified = 1;	222	$budget_modified = 1;
		223
		224	my $fundcreation = $input->param('fundcreation');
		225
		226	if ($fundcreation eq "onboarding"){
		227	my $step = $input->param('step');
		228	$template->param('step' => $step);
		229	print $input->redirect("/cgi-bin/koha/acqui/acqui-home.pl");
		230	exit;
		231	}
224	}	232	}
225		233
226	my $set_owner_to_children = $input->param('set_owner_to_children');	234	my $set_owner_to_children = $input->param('set_owner_to_children');

Lines 1-14 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-active-currency.inc (-2 / +14 lines)
		1	<style type="text/css">
		2	#onboardingModal{
		3	z-index:1;
		4	background-color:#E6F0F2;
		5	position:fixed;
		6	left:auto;
		7	top:auto;
		8	right:auto;
		9	bottom:auto;
		10	}
		11	</style>
		12
1	[% IF ( currency ) %]	13	[% IF ( currency ) %]
2	[% IF ( not hide ) %]	14	[% IF ( not hide ) %]
3	<p><b>Currency = [% currency %]</b></p>	15	<p><b>Currency = [% currency %]</b></p>
4	[% END %]	16	[% END %]
5	[% ELSE %]	17	[% ELSE %]
6	<div class="dialog alert">	18	<div class="dialog alert">
7	<h3>No active currency is defined</h3>	19	<h3>No active currency is defined</h3>
8	[% IF CAN_user_parameters_parameters_remaining_permissions %]	20	[% IF CAN_user_parameters_parameters_remaining_permissions %]
9	<p><a href="/cgi-bin/koha/admin/currency.pl">Please specify an active currency.</a></p>	21	<p><a href="/cgi-bin/koha/admin/currency.pl">Please specify an active currency.</a></p>
10	[% ELSE %]	22	[% ELSE %]
11	<p>Your administrator must specify an active currency.</p>	23	<p>Your administrator must specify an active currency.</p>
12	[% END %]	24	[% END %]
13	</div>	25	</div>
14	[% END %]	26	[% END %]