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

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/csv_headers/reports/orders_by_budget.tt (-1 / +1 lines)
Line 1 Link Here
1
Fund[% sep %]Basket[% sep %]Basket by[% sep %]biblionumber[% sep %]Title[% sep %]Currency[% sep %]Vendor Price[% sep %]RRP[% sep %]Budgeted Cost[% sep %]Quantity[% sep %]Total RRP[% sep %]Total Cost[% sep %]Entry Date[% sep %]Date Received[% sep %]Notes
1
Fund[% sep %]"Basket Num"[% sep %]"Basket Name"[% sep %]"authorised By"[% sep %]"Biblio Number"[% sep %]Title[% sep %]Currency[% sep %]"Vendor Price"[% sep %]RRP[% sep %]"Budgeted Cost"[% sep %]Quantity[% sep %]"Total RRP"[% sep %]"Total Cost"[% sep %]"Entry Date"[% sep %]"Date Received"[% sep %]Notes
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/orders_by_budget.tt (-81 / +77 lines)
Lines 17-44 Link Here
17
17
18
<div id="doc3" class="yui-t2">
18
<div id="doc3" class="yui-t2">
19
19
20
   <div id="bd">
20
<div id="bd">
21
    <div id="yui-main">
21
        <div id="yui-main">
22
    <div class="yui-b">
22
        <div class="yui-b">
23
[% IF ( current_budget_name ) %]
23
24
<h1>Orders for fund '[% current_budget_name %]'</h1>
24
[% IF ( current_budget_name ) %]<h1>Orders for fund '[% current_budget_name %]'</h1>
25
[% ELSE %]
25
[% ELSE %]<h1>Orders by fund</h1>
26
<h1>Orders by fund</h1>
27
[% END %]
26
[% END %]
28
27
29
[% IF ( get_orders ) %]
28
[% IF ( get_orders ) %]
30
29
    <div class="results">
31
<div class="results">
30
        [% IF ( total ) %]
32
    [% IF ( total ) %]
31
            Orders found: [% total %]
33
        Orders found: [% total %]
32
        [% ELSE %]
34
    [% ELSE %]
33
            No order found
35
        No order found
34
        [% END %]
36
    [% END %]
35
    </div>
37
</div>
38
36
39
    [% IF ( ordersloop ) %]<table id="funds">
37
    [% IF ( ordersloop ) %]<table id="funds">
40
    <thead>
38
        <thead>
41
    <tr>
39
        <tr>
42
        <th>Fund</th>
40
        <th>Fund</th>
43
        <th>Basket</th>
41
        <th>Basket</th>
44
        <th>Basket Name</th>
42
        <th>Basket Name</th>
Lines 54-77 Link Here
54
        <th>Entry Date</th>
52
        <th>Entry Date</th>
55
        <th>Date Received</th>
53
        <th>Date Received</th>
56
        <th>Notes</th>
54
        <th>Notes</th>
57
    </tr>
55
        </tr>
58
    </thead>
56
        </thead>
59
    <tbody>
57
        <tbody>
60
     [% FOREACH ordersloo IN ordersloop %]
58
        [% FOREACH ordersloo IN ordersloop %]
61
        [% UNLESS ( loop.odd ) %]
59
            [% UNLESS ( loop.odd ) %]<tr class="highlight">
62
        <tr class="highlight">
60
            [% ELSE %] <tr>
63
        [% ELSE %]
61
            [% END %]
64
        <tr>
65
        [% END %]
66
            <td>[% ordersloo.budget_name |html %]</td>
62
            <td>[% ordersloo.budget_name |html %]</td>
67
            <td><a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% ordersloo.basketno %]">
63
            <td><a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% ordersloo.basketno %]"> [% ordersloo.basketno |html %]</a></td>
68
                [% ordersloo.basketno |html %]
69
            </a></td>
70
            <td>[% ordersloo.basketname |html %]</td>
64
            <td>[% ordersloo.basketname |html %]</td>
71
        <td>[% ordersloo.authorisedbyname %]</td>
65
            <td>[% ordersloo.authorisedbyname %]</td>
72
            <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% ordersloo.biblionumber %]">
66
            <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% ordersloo.biblionumber %]"> [% ordersloo.title |html %]</a></td>
73
            [% ordersloo.title |html %]
74
            </a></td>
75
            <td>[% ordersloo.currency %]</td>
67
            <td>[% ordersloo.currency %]</td>
76
            <td>[% ordersloo.listprice %]</td>
68
            <td>[% ordersloo.listprice %]</td>
77
            <td>[% ordersloo.rrp %]</td>
69
            <td>[% ordersloo.rrp %]</td>
Lines 82-140 Link Here
82
            <td>[% ordersloo.entrydate %]</td>
74
            <td>[% ordersloo.entrydate %]</td>
83
            <td>[% ordersloo.datereceived %]</td>
75
            <td>[% ordersloo.datereceived %]</td>
84
            <td>[% ordersloo.notes |html %]</td>
76
            <td>[% ordersloo.notes |html %]</td>
85
        </tr>
77
            </tr>
86
    [% END %]
78
        [% END %]
87
    </tbody>
79
        </tbody>
88
    <tfoot>
80
        <tfoot><tr><th>TOTAL</th><th></th><th></th><th></th><th></th><th></th><th></th><th></th><th></th><th>[% total_quantity %]</th><th>[% total_rrp %]</th><th>[% total_ecost %]</th><th></th><th></th><th></th></tr></tfoot>
89
    <tr><th>TOTAL</th><th></th><th></th><th></th><th></th><th></th><th></th><th></th><th></th><th>[% total_quantity %]</th><th>[% total_rrp %]</th><th>[% total_ecost %]</th><th></th><th></th><th></th></tr>
81
        </table>
90
    </tfoot>
91
    </table>
92
    [% END %]
82
    [% END %]
93
    [% ELSE %]
83
    [% ELSE %]
94
84
        <form name="f" action="/cgi-bin/koha/reports/orders_by_fund.pl" method="post">
95
    <form name="f" action="/cgi-bin/koha/reports/orders_by_fund.pl" method="post">
85
        <fieldset class="rows">
96
<fieldset class="rows">
86
        <legend>Filters</legend>
97
    <legend>Filters</legend>
87
        <ol><li><label for="budgetfilter">Fund (Budget): </label>
98
    <ol><li><label for="budgetfilter">Fund (Budget): </label><select name="budgetfilter" id="budgetfilter">
88
        <select name="budgetfilter" id="budgetfilter">
99
        <option value="">All funds</option>
89
            <option value="">All funds</option>
100
        <option value="activebudgets">All active funds</option>
90
            <option value="activebudgets">All active funds</option>
101
            [% FOREACH budgetsloo IN budgetsloop %]
91
        [% FOREACH budgetsloo IN budgetsloop %]
102
                [% IF ( budgetsloo.selected ) %]<option value="[% budgetsloo.value %]" selected="selected">[% budgetsloo.description %] [% budgetsloo.period %]</option>
92
            [% IF ( budgetsloo.selected ) %]
103
        [% ELSE %]
93
                <option value="[% budgetsloo.value %]" selected="selected">[% budgetsloo.description %] [% budgetsloo.period %]</option>
104
        <option value="[% budgetsloo.value %]">[% budgetsloo.description %] [% budgetsloo.period %]</option>
94
            [% ELSE %]
105
        [% END %]
95
                <option value="[% budgetsloo.value %]">[% budgetsloo.description %] [% budgetsloo.period %]</option>
106
            [% END %]
96
            [% END %]
107
            </select></li>
108
</ol></fieldset>
109
110
    <fieldset class="rows">
111
    <legend>Output</legend>
112
<ol><li><label for="outputscreen">To screen into the browser: </label><input type="radio" checked="checked" name="output" id="outputscreen" value="screen" /> </li>
113
<li><label for="outputfile">To a file:</label>      <input type="radio" name="output" value="file" id="outputfile" /> <label class="inline" for="basename">Named: </label><input type="text" name="basename" id="basename" value="Export" /> <label class="inline" for="MIME">Into an application
114
    </label>
115
    <select id='MIME' name='MIME' size='1'>
116
    [% FOREACH outputFormatloo IN outputFormatloop %]
117
        <option value="[% outputFormatloo %]">[% outputFormatloo %]</option>
118
    [% END %]
119
    </select>
120
    <select id='sep' name='sep' size='1'>
121
    [% FOREACH delimiterloo IN delimiterloop %]
122
        [% IF delimiterloo == delimiterPreference %]
123
            <option value="[% delimiterloo %]">[% delimiterloo %]</option>
124
        [% END %]
97
        [% END %]
125
    [% END %]
98
        </select>
126
    [% FOREACH delimiterloo IN delimiterloop %]
99
        </li></ol>
127
        [% IF delimiterloo != delimiterPreference %]
100
        </fieldset>
128
            <option value="[% delimiterloo %]">[% delimiterloo %]</option>
101
129
            [% END %]
102
        <fieldset class="rows">
130
    [% END %]
103
        <legend>Output</legend>
131
    </select>
104
        <ol><li><label for="outputscreen">To screen into the browser: </label><input type="radio" checked="checked" name="output" id="outputscreen" value="screen" /> </li>
132
    </li></ol>
105
            <li><label for="outputfile">To a file:</label>
133
    </fieldset>
106
                <input type="radio" name="output" value="file" id="outputfile" />
107
                <label class="inline" for="basename">Named: </label>
108
                <input type="text" name="basename" id="basename" value="Export" />
109
                <label class="inline" for="MIME">Into an application </label>
110
                <select id='MIME' name='MIME' size='1'>
111
                [% FOREACH outputFormatloo IN outputFormatloop %]
112
                    <option value="[% outputFormatloo %]">[% outputFormatloo %]</option>
113
                [% END %]
114
                </select>
115
                <select id='sep' name='sep' size='1'>
116
                [% FOREACH delimiterloo IN delimiterloop %]
117
                    [% IF delimiterloo == delimiterPreference %]
118
                        <option value="[% delimiterloo %]">[% delimiterloo %]</option>
119
                    [% END %]
120
                [% END %]
121
                [% FOREACH delimiterloo IN delimiterloop %]
122
                    [% IF delimiterloo != delimiterPreference %]
123
                        <option value="[% delimiterloo %]">[% delimiterloo %]</option>
124
                    [% END %]
125
                [% END %]
126
                </select>
127
        </li></ol>
128
        </fieldset>
134
129
135
<fieldset class="action">    <input type="submit" value="Submit" />
130
        <fieldset class="action">
136
    <input type="hidden" name="get_orders" value="1" /></fieldset>
131
        <input type="submit" value="Submit" />
137
</form>
132
        <input type="hidden" name="get_orders" value="1" /></fieldset>
133
        </form>
138
134
139
    [% END %]
135
    [% END %]
140
136
(-)a/reports/orders_by_fund.pl (-4 / +2 lines)
Lines 34-40 use C4::Output; Link Here
34
use C4::Budgets;
34
use C4::Budgets;
35
use C4::Biblio;
35
use C4::Biblio;
36
use C4::Reports;
36
use C4::Reports;
37
use C4::Dates qw/format_date/;
38
use C4::Acquisition; #GetBasket()
37
use C4::Acquisition; #GetBasket()
39
38
40
39
Lines 111-118 if ( $get_orders ) { Link Here
111
        $order->{'total_ecost'} = $order->{'quantity'} * $order->{'ecost'};
110
        $order->{'total_ecost'} = $order->{'quantity'} * $order->{'ecost'};
112
111
113
        # Format the dates and currencies correctly
112
        # Format the dates and currencies correctly
114
        $order->{'datereceived'} = format_date($order->{'datereceived'});
113
        $order->{'datereceived'} = Koha::DateUtils::output_pref(Koha::DateUtils::dt_from_string($order->{'datereceived'}));
115
        $order->{'entrydate'} = format_date($order->{'entrydate'});
114
        $order->{'entrydate'} = Koha::DateUtils::output_pref(Koha::DateUtils::dt_from_string($order->{'entrydate'}));
116
        $order->{'listprice'} = sprintf( "%.2f", $order->{'listprice'} );
115
        $order->{'listprice'} = sprintf( "%.2f", $order->{'listprice'} );
117
        $order->{'rrp'} = sprintf( "%.2f", $order->{'rrp'} );
116
        $order->{'rrp'} = sprintf( "%.2f", $order->{'rrp'} );
118
        $order->{'ecost'} = sprintf( "%.2f", $order->{'ecost'});
117
        $order->{'ecost'} = sprintf( "%.2f", $order->{'ecost'});
119
- 

Return to bug 11371