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

(-)a/admin/aqbudgetperiods.pl (-2 / +4 lines)
Lines 113-126 if ( $op eq 'add_form' ) { Link Here
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
    print $input->redirect("/cgi-bin/koha/acqui/acqui-home.pl?step=2");
124
    exit;
125
}
124
	$op='else';
126
	$op='else';
125
}
127
}
126
128
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/onboardinginclude.inc (-45 / +83 lines)
Lines 1-7 Link Here
1
[% USE Koha %]
2
[% USE KohaDates %]
3
[% USE Branches %]
4
5
<style type="text/css">
1
<style type="text/css">
6
 #onboardingModal{
2
 #onboardingModal{
7
     z-index:1;
3
     z-index:1;
Lines 14-71 Link Here
14
     top:auto;
10
     top:auto;
15
     right:auto;
11
     right:auto;
16
     bottom:auto;
12
     bottom:auto;
17
            border-radius:25px;
13
     border-radius:25px;
18
}
14
}
19
</style>
15
</style>
20
16
21
[% step = 1 %]
17
    <div id="onboardingModal">
22
18
         <span class="close">&times;</span><br><br>
23
<div id="onboardingModal">
19
    [% IF  displayonboardscreen == "acquisitions" %]
24
     <span class="close">&times;</span><br><br>
20
        [% IF step == 2 %]
25
[% IF  displayonboardscreen == "acquisitions" %]
21
        <form action="/cgi-bin/koha/admin/aqbudgets.pl" id="edit_fund" name="Aform" method="post">
26
     <h2> Create a budget</h2>
22
            <fieldset class="rows">
27
     <form action="/cgi-bin/koha/admin/aqbudgetperiods.pl" name="f" method="post">
23
            <legend>[% IF ( budget_id ) %]Modify[% ELSE %]Add[% END %] Fund
28
        <fieldset class="rows">
24
                [% IF ( budget_period_description ) %]
25
                    [% budget_name %] for Budget '[% budget_period_description %]'
26
                [% END %]
27
            </legend>
29
            <input type="hidden" name="op" value="add_validate" />
28
            <input type="hidden" name="op" value="add_validate" />
30
            <input type="hidden" name="budget_period_id" value="[% budget_period_id %]" />
29
            <input type="hidden" name="checked" value="0" />
31
            <ol>
30
            <ol>
32
                <li>
31
            [% IF ( budget_parent_id ) %]
33
                    <label class="required" for="from">Start date: </label>
32
                 <li>
34
                    <input type="text" size="10" id="from" name="budget_period_startdate" value="[% budget_period_startdate | $KohaDates %]" class="datepickerfrom" />
33
                    <span class="label">Fund parent: </span>
35
                    <div class="hint">[% INCLUDE 'date-format.inc' %]</div>
34
                    [% budget_parent_name %]
35
                    [% budget_parent_id %] - [% budget_parent_name %]
36
                    <input type="hidden" name="budget_parent_id" value="[% budget_parent_id %]" />
36
                </li>
37
                </li>
38
            [% END %]
37
39
38
                <li>
40
            <li>
39
                    <label class="required" for="to">End date: </label>
41
                <label class="required"  for="budget_code">Fund code: </label>
40
                    <input type="text" size="10" id="to" name="budget_period_enddate" value="[% budget_period_enddate | $KohaDates %]" class="datepickerto" />
42
                <input type="text" name="budget_code" id="budget_code" value="[% budget_code %]" size="30" />
41
                    <div class="hint">[% INCLUDE 'date-format.inc' %]</div>
43
            </li>
42
                </li>
43
44
44
                <li>
45
            <li>
45
                    <label class="required" for="budget_period_description">Description: </label>
46
                <label class="required" for="budget_name">Fund name: </label>
46
                    <input type="text" id="budget_period_description" name="budget_period_description"
47
                <input type="text" name="budget_name" id="budget_name" value="[% budget_name %]" size="60" />
47
                    size="48" maxlength="80" value="[% budget_period_description %]" />
48
            </li>
48
                </li>
49
49
50
                <li>
50
            <li>
51
                    <label for="budget_period_total">Total amount: </label>
51
                <label style="white-space: nowrap;" for="budget_amount" class="required">Amount: </label>
52
                    <input type="text" id="budget_period_total" name="budget_period_total"
52
                <input type="text" name="budget_amount" id="budget_amount" value="[% budget_amount | $Price on_editing => 1 %]" size="8" />
53
                    size="10" maxlength="80" value="[% budget_period_total | $Price on_editing => 1 %]" />
53
            </li>
54
                </li>
55
54
56
                <li>
55
            <fieldset class="action">
57
                    <label for="budget_period_active">Make budget active: </label>
56
                <input type="submit" value="Submit" /> <a class="cancel" href="/cgi-bin/koha/admin/aqbudgets.pl">Cancel</a>
58
                    [% IF ( budget_period_active ) %]<input type="checkbox" checked="checked" id="budget_period_active" name="budget_period_a    ctive" value="1" />[% ELSE %]  <input type="checkbox" id="budget_period_active" name="budget_period_active" value="1"/> [% END %]
57
                <input type="hidden" name="budget_period_id" value="[% budget_period_id %]" />
59
                </li>
58
            </fieldset>
60
            </ol>
59
        </form>
61
        </fielset>
60
61
    [% ELSE %]
62
        <h2> Create a budget</h2>
63
        <form action="/cgi-bin/koha/admin/aqbudgetperiods.pl" name="f" method="post">
64
            <fieldset class="rows">
65
                <input type="hidden" name="op" value="add_validate" />
66
                <input type="hidden" name="budget_period_id" value="[% budget_period_id %]" />
67
                <ol>
68
                    <li>
69
                        <label class="required" for="from">Start date: </label>
70
                        <input type="text" size="10" id="from" name="budget_period_startdate" value="[% budget_period_startdate | $KohaDates %]" class="datepickerfrom" />
71
                        <div class="hint">[% INCLUDE 'date-format.inc' %]</div>
72
                    </li>
73
74
                    <li>
75
                        <label class="required" for="to">End date: </label>
76
                        <input type="text" size="10" id="to" name="budget_period_enddate" value="[% budget_period_enddate | $KohaDates %]" class="datepickerto" />
77
                        <div class="hint">[% INCLUDE 'date-format.inc' %]</div>
78
                    </li>
79
80
                    <li>
81
                        <label class="required" for="budget_period_description">Description: </label>
82
                        <input type="text" id="budget_period_description" name="budget_period_description" size="48" maxlength="80" value="[% budget_period_description %]" />
83
                    </li>
84
85
                    <li>
86
                        <label for="budget_period_total">Total amount: </label>
87
                        <input type="text" id="budget_period_total" name="budget_period_total" size="10" maxlength="80" value="[% budget_period_total | $Price on_editing => 1 %]" />
88
                    </li>
89
90
                    <li>
91
                        <label for="budget_period_active">Make budget active: </label>
92
                        [% IF ( budget_period_active ) %]<input type="checkbox" checked="checked" id="budget_period_active" name="budget_period_active" value="1" />[% ELSE %]  <input type="checkbox" id="budget_period_active" name="budget_period_active" value="1"/> [% END %]
93
                    </li>
94
                </ol>
95
            </fieldset>
96
97
            <fieldset class="action">
98
                <a href = "/cgi-bin/koha/acqui/acqui-home.pl?step=2">
99
                <input type="submit" class="action" value="Submit" />
100
                </a>
101
                <a href="/cgi-bin/koha/admin/aqbudgetperiods.pl" class="cancel">Cancel</a>
102
            </fieldset>
103
        </form>
104
    </div>
105
    [% END %]
62
106
63
        <fieldset class="action">
64
            <input type="button" value="Save" onclick="Check(this.form)" />
65
            <a href="/cgi-bin/koha/admin/aqbudgetperiods.pl" class="cancel">Cancel</a>
66
        </fielset>
67
    </form>
68
</div>
69
[% ELSIF displayonboardscreen == "label" %]
107
[% ELSIF displayonboardscreen == "label" %]
70
108
71
109
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt (+7 lines)
Lines 1-5 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' %]
Lines 9-14 Link Here
9
<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" />
10
<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>
11
15
16
[% INCLUDE 'calendar.inc' %]
17
<script type="text/javascript" src="[% interface %]/[% theme %]/js/acq.js"></script>
18
12
<script type="text/javascript">
19
<script type="text/javascript">
13
//<![CDATA[
20
//<![CDATA[
14
21
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt (-2 / +1 lines)
Lines 334-340 Link Here
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
341
- 

Return to bug 18002