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

(-)a/acqui/histsearch.pl (+3 lines)
Lines 149-155 $template->param( Link Here
149
    basketgroupname         => $basketgroupname,
149
    basketgroupname         => $basketgroupname,
150
    from_placed_on          => $from_date,
150
    from_placed_on          => $from_date,
151
    to_placed_on            => $to_date,
151
    to_placed_on            => $to_date,
152
    orderstatus             => $orderstatus,
153
    budget_id               => $budget,
152
    bp_loop                 => $bp_loop,
154
    bp_loop                 => $bp_loop,
155
    search_done             => $do_search,
153
    debug                   => $debug || $input->param('debug') || 0,
156
    debug                   => $debug || $input->param('debug') || 0,
154
    uc(C4::Context->preference("marcflavour")) => 1
157
    uc(C4::Context->preference("marcflavour")) => 1
155
);
158
);
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt (-19 / +49 lines)
Lines 51-62 Link Here
51
        <li>
51
        <li>
52
            <label for="orderstatus">Order status: </label>
52
            <label for="orderstatus">Order status: </label>
53
            <select name="orderstatus" id="orderstatus">
53
            <select name="orderstatus" id="orderstatus">
54
                <option value=""></option>
54
                [% IF orderstatus == "" %]
55
                <option value="new">New orders</option>
55
                  <option value=""></option>
56
                <option value="ordered">Pending orders</option>
56
                [% ELSE %]
57
                <option value="partial">Partially received orders</option>
57
                  <option value="" selected="selected"></option>
58
                <option value="complete">Received orders</option>
58
                [% END %]
59
                <option value="cancelled">Cancelled orders</option>
59
                [% IF orderstatus == "new" %]
60
                  <option value="new" selected="selected">New</option>
61
                [% ELSE %]
62
                  <option value="new">New</option>
63
                [% END %]
64
                [% IF orderstatus == "ordered" %]
65
                  <option value="ordered" selected="selected">Pending</option>
66
                [% ELSE %]
67
                  <option value="ordered">Pending</option>
68
                [% END %]
69
                [% IF orderstatus == "partial" %]
70
                  <option value="partial" selected="selected">Partially received</option>
71
                [% ELSE %]
72
                  <option value="partial">Partially received</option>
73
                [% END %]
74
                [% IF orderstatus == "complete" %]
75
                  <option value="complete" selected="selected">Received</option>
76
                [% ELSE %]
77
                  <option value="complete">Received</option>
78
                [% END %]
79
                [% IF orderstatus == "cancelled" %]
80
                  <option value="cancelled" selected="selected">Cancelled</option>
81
                [% ELSE %]
82
                  <option value="cancelled">Cancelled</option>
83
                [% END %]
60
            </select>
84
            </select>
61
        </li>
85
        </li>
62
        <li>
86
        <li>
Lines 66-72 Link Here
66
                [% FOREACH bp_loo IN bp_loop %]
90
                [% FOREACH bp_loo IN bp_loop %]
67
                    <optgroup label="[% bp_loo.budget_period_description %]">
91
                    <optgroup label="[% bp_loo.budget_period_description %]">
68
                    [% FOREACH h_loo IN bp_loo.hierarchy %]
92
                    [% FOREACH h_loo IN bp_loo.hierarchy %]
93
                      [% IF h_loo.budget_id == budget_id %]
94
                        <option type="text" value="[% h_loo.budget_id %]" branchcode="[% h_loo.budget_branchcode %]" selected="selected">
95
                      [% ELSE %]
69
                        <option type="text" value="[% h_loo.budget_id %]" branchcode="[% h_loo.budget_branchcode %]">
96
                        <option type="text" value="[% h_loo.budget_id %]" branchcode="[% h_loo.budget_branchcode %]">
97
                      [% END %]
70
                            [% h_loo.budget_display_name %]
98
                            [% h_loo.budget_display_name %]
71
                        </option>
99
                        </option>
72
                    [% END %]
100
                    [% END %]
Lines 94-99 Link Here
94
            <thead>
122
            <thead>
95
			<tr>
123
			<tr>
96
                <th>Order line (parent)</th>
124
                <th>Order line (parent)</th>
125
                <th>Status</th>
97
				<th>Basket</th>
126
				<th>Basket</th>
98
				<th>Basket group</th>
127
				<th>Basket group</th>
99
                <th>Invoice number</th>
128
                <th>Invoice number</th>
Lines 101-107 Link Here
101
				<th>Vendor</th>
130
				<th>Vendor</th>
102
				<th>Placed on</th>
131
				<th>Placed on</th>
103
				<th>Received on</th>
132
				<th>Received on</th>
104
                <th>Status</th>
105
                <th>Quantity received</th>
133
                <th>Quantity received</th>
106
                <th>Pending order</th>
134
                <th>Pending order</th>
107
				<th>Unit cost</th>
135
				<th>Unit cost</th>
Lines 115-120 Link Here
115
                        [% order.ordernumber %]
143
                        [% order.ordernumber %]
116
                        [% IF order.ordernumber != order.parent_ordernumber %]([% order.parent_ordernumber %])[% END %]
144
                        [% IF order.ordernumber != order.parent_ordernumber %]([% order.parent_ordernumber %])[% END %]
117
                    </td>
145
                    </td>
146
                    <td>
147
                        [% SWITCH order.orderstatus %]
148
                            [% CASE 'new' %]New
149
                            [% CASE 'ordered' %]Pending
150
                            [% CASE 'partial' %]Partially received
151
                            [% CASE 'complete' %]Received
152
                            [% CASE 'cancelled' %]Cancelled
153
                        [% END %]
154
                    </td>
118
                    <td>[% order.basketname %] (<a href="basket.pl?basketno=[% order.basketno %]">[% order.basketno %]</a>)</td>
155
                    <td>[% order.basketname %] (<a href="basket.pl?basketno=[% order.basketno %]">[% order.basketno %]</a>)</td>
119
                    <td>
156
                    <td>
120
                        [% IF ( order.basketgroupid ) %]
157
                        [% IF ( order.basketgroupid ) %]
Lines 140-154 Link Here
140
                            [% order.datereceived | $KohaDates %]
177
                            [% order.datereceived | $KohaDates %]
141
                        [% END %]
178
                        [% END %]
142
                    </td>
179
                    </td>
143
                    <td>
144
                        [% SWITCH order.orderstatus %]
145
                            [% CASE 'new' %]New orders
146
                            [% CASE 'ordered' %]Pending orders
147
                            [% CASE 'partial' %]Partially received orders
148
                            [% CASE 'complete' %]Received orders
149
                            [% CASE 'cancelled' %]Cancelled orders
150
                        [% END %]
151
                    </td>
152
                    <td>[% order.quantityreceived %]</td>
180
                    <td>[% order.quantityreceived %]</td>
153
                    <td>[% order.quantity %]</td>
181
                    <td>[% order.quantity %]</td>
154
                    <td>[% order.ecost %]</td>
182
                    <td>[% order.ecost %]</td>
Lines 156-163 Link Here
156
                </tr>
184
                </tr>
157
            [% END %]
185
            [% END %]
158
            </tbody>
186
            </tbody>
159
		</table>
187
        </table>
160
	</div>[% ELSE %][% END %]
188
    </div>
189
    [% ELSIF search_done %]
190
      There is no order for this search.
191
    [% END %]
161
192
162
</div>
193
</div>
163
</div>
194
</div>
164
- 

Return to bug 5336