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

(-)a/C4/Budgets.pm (+7 lines)
Lines 147-152 sub GetPeriodsCount { Link Here
147
}
147
}
148
148
149
# -------------------------------------------------------------------
149
# -------------------------------------------------------------------
150
151
sub GetHighestBudgetPeriod{
152
    my $dbh = C4::Context->dbh;
153
    warn my $data = $dbh->selectrow_array("SELECT MAX(budget_period_id) FROM aqbudgetperiods");
154
    return $data;
155
}
156
# -------------------------------------------------------------------
150
sub CheckBudgetParent {
157
sub CheckBudgetParent {
151
    my ( $new_parent, $budget ) = @_;
158
    my ( $new_parent, $budget ) = @_;
152
    my $new_parent_id = $new_parent->{'budget_id'};
159
    my $new_parent_id = $new_parent->{'budget_id'};
(-)a/acqui/acqui-home.pl (+24 lines)
Lines 124-134 $template->param( Link Here
124
    suggestions_count   => $suggestions_count,
124
    suggestions_count   => $suggestions_count,
125
);
125
);
126
126
127
128
129
130
131
132
my $aqstep;
127
my $cur = Koha::Acquisition::Currencies->get_active;
133
my $cur = Koha::Acquisition::Currencies->get_active;
134
128
if ( $cur ) {
135
if ( $cur ) {
129
    $template->param(
136
    $template->param(
130
        currency => $cur->currency,
137
        currency => $cur->currency,
131
    );
138
    );
132
}
139
}
133
140
141
my $budget = GetPeriodsCount();
142
my $budgetid = C4::Budgets->GetHighestBudgetPeriod();
143
if (!@budget_loop){
144
if (!$cur) {
145
    $aqstep = 1;
146
    $template->param( step => $aqstep );
147
} elsif ($budget && $budgetid == 1){
148
    $aqstep = 3;
149
    $template->param( step => $aqstep );
150
} elsif ($budgetid > 1) {
151
    print $query->redirect("/cgi-bin/koha/admin/aqbudgetperiods.pl");
152
    exit;
153
} else  {
154
    $aqstep = 2;
155
    $template->param( step => $aqstep );
156
}
157
}
134
output_html_with_http_headers $query, $cookie, $template->output;
158
output_html_with_http_headers $query, $cookie, $template->output;
(-)a/admin/aqbudgetperiods.pl (-2 / +6 lines)
Lines 115-128 if ( $op eq 'add_form' ) { Link Here
115
elsif ( $op eq 'add_validate' ) {
115
elsif ( $op eq 'add_validate' ) {
116
## add or modify a budget period (confirmation)
116
## add or modify a budget period (confirmation)
117
117
118
    ## update budget period data
118
## update budget period data
119
	if ( $budget_period_id ne '' ) {
119
	if ( $budget_period_id ne '' ) {
120
		$$budget_period_hashref{$_}||=0 for qw(budget_period_active budget_period_locked);
120
		$$budget_period_hashref{$_}||=0 for qw(budget_period_active budget_period_locked);
121
		my $status=ModBudgetPeriod($budget_period_hashref);
121
		my $status=ModBudgetPeriod($budget_period_hashref);
122
	} 
122
	} 
123
	else {    # ELSE ITS AN ADD
123
	else {    # ELSE ITS AN ADD
124
		my $budget_period_id=AddBudgetPeriod($budget_period_hashref);
124
		my $budget_period_id=AddBudgetPeriod($budget_period_hashref);
125
	}
125
    my $stepfund = $input->param( 'step' );
126
    $template->param( stepfund => $stepfund );
127
    print $input->redirect("/cgi-bin/koha/acqui/acqui-home.pl");
128
    exit;
129
}
126
	$op='else';
130
	$op='else';
127
}
131
}
128
132
(-)a/admin/aqbudgets.pl (-2 / +10 lines)
Lines 78-85 my $budget_permission = $input->param('budget_permission'); Link Here
78
my $budget_users_ids          = $input->param('budget_users_ids');
78
my $budget_users_ids          = $input->param('budget_users_ids');
79
my $filter_budgetbranch       = $input->param('filter_budgetbranch') // '';
79
my $filter_budgetbranch       = $input->param('filter_budgetbranch') // '';
80
my $filter_budgetname         = $input->param('filter_budgetname');
80
my $filter_budgetname         = $input->param('filter_budgetname');
81
82
83
# ' ------- get periods stuff ------------------'
81
# ' ------- get periods stuff ------------------'
84
# IF PERIODID IS DEFINED,  GET THE PERIOD - ELSE JUST GET THE ACTIVE PERIOD BY DEFAULT
82
# IF PERIODID IS DEFINED,  GET THE PERIOD - ELSE JUST GET THE ACTIVE PERIOD BY DEFAULT
85
my $period;
83
my $period;
Lines 179-184 if ($op eq 'add_form') { Link Here
179
                                                    # END $OP eq ADD_FORM
177
                                                    # END $OP eq ADD_FORM
180
#---------------------- DEFAULT DISPLAY BELOW ---------------------
178
#---------------------- DEFAULT DISPLAY BELOW ---------------------
181
179
180
182
# called by default form, used to confirm deletion of data in DB
181
# called by default form, used to confirm deletion of data in DB
183
} elsif ($op eq 'delete_confirm') {
182
} elsif ($op eq 'delete_confirm') {
184
183
Lines 220-225 if ($op eq 'add_form') { Link Here
220
        $budget_hash->{budget_id} = AddBudget( $budget_hash );
219
        $budget_hash->{budget_id} = AddBudget( $budget_hash );
221
        ModBudgetUsers($budget_hash->{budget_id}, @budgetusersid);
220
        ModBudgetUsers($budget_hash->{budget_id}, @budgetusersid);
222
        $budget_modified = 1;
221
        $budget_modified = 1;
222
223
        my $fundcreation = $input->param('fundcreation');
224
225
        if ($fundcreation eq "onboarding"){
226
            my $step  = $input->param('step');
227
            $template->param('step' => $step);
228
            print $input->redirect("/cgi-bin/koha/acqui/acqui-home.pl");
229
            exit;
230
        }
223
    }
231
    }
224
232
225
    my $set_owner_to_children = $input->param('set_owner_to_children');
233
    my $set_owner_to_children = $input->param('set_owner_to_children');
(-)a/admin/currency.pl (+9 lines)
Lines 89-94 if ( $op eq 'add_form' ) { Link Here
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
(-)a/koha-tmpl/intranet-tmpl/prog/css/staff-global.css (+6 lines)
Lines 3028-3030 fieldset.rows + fieldset.action { Link Here
3028
#patron_search #filters {
3028
#patron_search #filters {
3029
    display: none;
3029
    display: none;
3030
}
3030
}
3031
3032
div#aqhelp{
3033
    background-color:#EDF4F6;
3034
    padding:20px;
3035
    width:50%;
3036
}
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-active-currency.inc (-2 / +14 lines)
Lines 1-14 Link Here
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 %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/onboardinginclude1.inc (+59 lines)
Line 0 Link Here
1
<style type="text/css">
2
    #onboardingModal{
3
        z-index:1;
4
        background-color:#EDF4F6;
5
        padding:20px;
6
        width:70%;
7
        position:absolute;
8
        overflow:scroll;
9
        left:auto;
10
        top:auto;
11
        right:auto;
12
        bottom:auto;
13
}
14
</style>
15
16
<div id="onboardingModal">
17
        <h2> Acquisition onboarding wizard</h2>
18
        <h3> This onboarding wizard will take you through the process of setting up Acquistions </h3>
19
        <p>Start by completing this form to create a currency which you will be used to create your first budget and fund.<br>
20
        A fund is the accounting value you use to create orders</p>
21
         <form action="/cgi-bin/koha/admin/currency.pl" name="Aform" method="post" class="validated">
22
           <input type="hidden" name="op" value="add_validate" />
23
           <input type="hidden" name="step" value="2"/>
24
           <input type="hidden" name="aqcurrency" value=1 />
25
           <fieldset class="rows">
26
              <legend>
27
                      New currency
28
              </legend>
29
              <ol>
30
                 <li>
31
                      [% IF currency %]
32
                          <span class="label">Currency: </span>
33
                          <input type="hidden" name="is_a_modif" value="1" />
34
                          <input type="hidden" name="currency_code" id="currency" value="[% currency.currency %]" />[% currency.currency %]
35
                      [% ELSE %]
36
                          <label for="currency_code" class="required">Currency: </label>
37
                          <input type="text" name="currency_code" id="currency_code" size="50" maxlength="50" required="required" class="required" /> <span class="required">Required</span>
38
                      [% END %]
39
                </li>
40
                <li>
41
                      <label for="rate" class="required">Rate: </label>
42
                      <input type="text" name="rate" id="rate" size="10" maxlength="10" value=1 readonly /> <span class="required">Required</span>
43
                </li>
44
                <li>
45
                      <label for="symbol" class="required">Symbol: </label>
46
                      <input type="text" name="symbol" id="symbol" size="5" maxlength="5" value="[% currency.symbol %]" required="required" class="required" /> <span class="required">Required</span>
47
                </li>
48
                <li>
49
                      <label for="isocode">ISO code: </label>
50
                      <input type="text" name="isocode" id="isocode" size="5" maxlength="5" value="[% currency.isocode %]" />
51
                </li>
52
                      <input type="hidden" id="active" name="active" value="1"/>
53
              </ol>
54
           </fieldset>
55
           <fieldset class="action">
56
                   <input type="submit" value="Submit" />
57
           </fieldset>
58
         </form>
59
</div>
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/onboardinginclude2.inc (+63 lines)
Line 0 Link Here
1
<style type="text/css">
2
 #onboardingModal{
3
     z-index:1;
4
     background-color:#EDF4F6;
5
     padding:20px;
6
     width:70%;
7
     position:absolute;
8
     overflow:scroll;
9
     left:auto;
10
     top:auto;
11
     right:auto;
12
     bottom:auto;
13
}
14
</style>
15
    <div id="onboardingModal">
16
    [% IF  displayonboardscreen == "acquisitions" %]
17
        <h2> Acquisition onboarding wizard</h2>
18
        <p> Create a budget which is the highest level value in acquisitions accountancy. <br>
19
        After creating this budget you will be prompted to create a fund which is what you will use to set up orders.
20
        </p>
21
        <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>
22
        <h3> Create a budget</h3>
23
        <form action="/cgi-bin/koha/admin/aqbudgetperiods.pl" name="f" method="post">
24
            <fieldset class="rows">
25
                <input type="hidden" name="op" value="add_validate" />
26
                <input type="hidden" name="step" value="3"/>
27
                <input type="hidden" name="budget_period_id" value="[% budget_period_id %]" />
28
                <ol>
29
                    <li>
30
                        <label class="required" for="from">Start date: </label>
31
                        <input type="text" size="10" id="from" name="budget_period_startdate" value="[% budget_period_startdate | $KohaDates %]" class="datepickerfrom" />
32
                        <div class="hint">[% INCLUDE 'date-format.inc' %]</div>
33
                    </li>
34
35
                    <li>
36
                        <label class="required" for="to">End date: </label>
37
                        <input type="text" size="10" id="to" name="budget_period_enddate" value="[% budget_period_enddate | $KohaDates %]" class="datepickerto" />
38
                        <div class="hint">[% INCLUDE 'date-format.inc' %]</div>
39
                    </li>
40
41
                    <li>
42
                        <label class="required" for="budget_period_description">Description: </label>
43
                        <input type="text" id="budget_period_description" name="budget_period_description" size="48" maxlength="80" value="[% budget_period_description %]" />
44
                    </li>
45
46
                    <li>
47
                        <label for="budget_period_total">Total amount: </label>
48
                        <input type="text" id="budget_period_total" name="budget_period_total" size="10" maxlength="80" value="[% budget_period_total | $Price on_editing => 1 %]" />
49
                    </li>
50
51
                        <input type="hidden" id="budget_period_active" name="budget_period_active" value="1" />
52
                </ol>
53
            </fieldset>
54
            <fieldset class="action">
55
                <a href = "/cgi-bin/koha/acqui/acqui-home.pl">
56
                <input type="submit" class="action" value="Submit" />
57
                </a>
58
            </fieldset>
59
        </form>
60
    </div>
61
    [% ELSIF displayonboardscreen == "label" %]
62
        <h2>testing</h2>
63
    [% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/onboardinginclude3.inc (+75 lines)
Line 0 Link Here
1
[% USE Price %]
2
3
<style type="text/css">
4
  #onboardingModal{
5
       z-index:1;
6
       background-color:#EDF4F6;
7
       padding:20px;
8
       width:70%;
9
       position:absolute;
10
       overflow:scroll;
11
       left:auto;
12
       top:auto;
13
       right:auto;
14
       bottom:auto;
15
}
16
</style>
17
18
<div id="onboardingModal">
19
    <h2> Acquisition onboarding wizard</h2>
20
    <p> Fill out this form to create a fund which will be assigned to the budget you just created. <br>
21
    A fund is an accounting value you will use to set up orders</p>
22
    <br>
23
    <h3> Create a fund</h3>
24
    <form action="/cgi-bin/koha/admin/aqbudgets.pl" id="edit_fund" name="Aform" method="post">
25
        <input type="hidden" name="op" value="add_validate" />
26
        <input type="hidden" name="checked" value="0" />
27
        <input type="hidden" name="fundcreation" value="onboarding" />
28
        <input type="hidden" name="step" value="4" />
29
        [% IF ( budget_id ) %]
30
                <input type="hidden" name="budget_id" value="[% budget_id %]" />
31
        [% END %]
32
        [% budget_id %]
33
34
        <fieldset class="rows">
35
           <legend>[% IF ( budget_id ) %]Modify[% ELSE %]Add[% END %] Fund
36
                [% IF ( budget_period_description ) %]
37
                    [% budget_name %] for Budget '[% budget_period_description %]'
38
                [% END %]
39
           </legend>
40
        <ol>
41
                [% budget_parent_id = 0 %]
42
                <li>
43
                     <span class="label">Fund parent: </span>
44
                     [% budget_parent_name %]
45
                     [% budget_parent_id %] - [% budget_parent_name %]
46
                     <input type="hidden" name="budget_parent_id" value= NULL />
47
                </li>
48
                <li>
49
                    <label class="required"  for="budget_code">Fund code: </label>
50
                    <input type="text" name="budget_code" id="budget_code" value="[% budget_code %]" size="30" />
51
                </li>
52
53
                <li>
54
                    <label class="required" for="budget_name">Fund name: </label>
55
                    <input type="text" name="budget_name" id="budget_name" value="[% budget_name %]" size="60" />
56
                </li>
57
58
                <li>
59
                    <label style="white-space: nowrap;" for="budget_amount" class="required">Amount: </label>
60
                    <input type="text" name="budget_amount" id="budget_amount" value="[% budget_amount | $Price on_editing => 1 %]" size="8" />
61
                </li>
62
63
                <input type="hidden" name="budget_owner_id" id="budget_owner_id" value="0" />
64
65
                [% IF ( budget_id ) %]
66
                    <input type="hidden" name="budget_id" value="[% budget_id %]" />
67
                [% END %]
68
69
        </fieldset>
70
        <fieldset class="action">
71
            <input type="submit" value="Submit" />
72
            <input type="hidden" name="budget_period_id" value="1" />
73
        </fieldset>
74
    </form>
75
</div>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt (-4 / +43 lines)
Lines 1-19 Link Here
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
    });
83
});
95
});
84
//]]>
96
//]]>
85
</script>
97
</script>
Lines 98-112 $(document).ready(function() { Link Here
98
    <div class="yui-b">
110
    <div class="yui-b">
99
111
100
[% INCLUDE 'acquisitions-toolbar.inc' %]
112
[% INCLUDE 'acquisitions-toolbar.inc' %]
101
102
<h1>Acquisitions</h1>
103
    [% INCLUDE 'budgets-active-currency.inc' hide = 'yes' %]
104
    [% UNLESS ( loop_budget ) %]
113
    [% UNLESS ( loop_budget ) %]
105
        [% IF ( CAN_user_acquisition_period_manage ) %]
114
        [% 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>
115
            [% displayonboardscreen = "acquisitions" %]
116
            [% IF step == 1 %]
117
                [% INCLUDE onboardinginclude1.inc %]
118
            [% ELSIF step == 2 %]
119
                [% INCLUDE onboardinginclude2.inc %]
120
            [% ELSIF step == 3 %]
121
                [% INCLUDE onboardinginclude3.inc %]
122
            [% END %]
107
        [% ELSE %]
123
        [% ELSE %]
108
        <div class="dialog alert">Your administrator must define a budget in Administration</div>
124
        <div class="dialog alert">Your administrator must define a budget in Administration</div>
109
        [% END %]
125
        [% END %]
126
    [% ELSE %]
127
        <h1>Acquisitions</h1>
110
    [% END %]
128
    [% END %]
111
<div class="yui-g">
129
<div class="yui-g">
112
<div class="yui-u first">
130
<div class="yui-u first">
Lines 237-242 $(document).ready(function() { Link Here
237
    </div>
255
    </div>
238
    [% END %]
256
    [% END %]
239
257
258
  <button type="button" id="show" onclick"unhide(aqhelp)">Show the next steps to set up Acquisitions</button>
259
    <br><br>
260
    <div id="aqhelp">
261
        <h1> Next steps</h1>
262
        <h2> 1. Create your first vendor</h2>
263
        <p> A vendor is the organisation your institution purchases items from i.e. suppliers<br>
264
        You must create a vendor before you can create any orders</p>
265
        <b>Click <a href="/cgi-bin/koha/acqui/supplier.pl?op=enter">here</a> to create a vendor.</b>
266
        <br><br>
267
        <h2> 2. Create your first basket</h2>
268
        <p> A basket is the conceptual container that holds orders. Each basket is assigned to a single vendor so you can perform multiple separate orders from a single vendor simultaneously. Because of its reliance on vendor the basket must be created after the vendor</p>
269
        <b> To create a basket, click the 'New basket' button on the Vendor Information page which is displayed after you create a vendor</b>
270
        <br><br>
271
        <h2> 3. Create an order</h2>
272
        <p> An order is a assignment of items purchased from a single vendor at a single time</p>
273
        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.
274
        </p>
275
        <br><br>
276
        For further information about creating a vendor, basket and order go to the Koha manual:
277
        <a href="http://translate.koha-community.org/manual/master/en/html/09_acquisitions.html"> Koha manual Acquisitions section</a>
278
    </div>
240
</div>
279
</div>
241
</div>
280
</div>
242
<div class="yui-b">
281
<div class="yui-b">
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt (-1 / +1 lines)
Lines 340-346 Link Here
340
    <li>
340
    <li>
341
    <label class="required" for="from">Start date: </label>
341
    <label class="required" for="from">Start date: </label>
342
    <input type="text" size="10" id="from" name="budget_period_startdate" value="[% budget_period_startdate | $KohaDates %]" class="datepickerfrom" />
342
    <input type="text" size="10" id="from" name="budget_period_startdate" value="[% budget_period_startdate | $KohaDates %]" class="datepickerfrom" />
343
				<div class="hint">[% INCLUDE 'date-format.inc' %]</div>
343
<!--<div class="hint">[% INCLUDE 'date-format.inc' %]</div>-->
344
    </li>
344
    </li>
345
    <li>
345
    <li>
346
346
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt (-2 / +2 lines)
Lines 453-459 var MSG_PARENT_BENEATH_BUDGET = "- " + _("New budget-parent is beneath budget") Link Here
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>
470
- 

Return to bug 18002