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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt (-189 / +192 lines)
Lines 2-7 Link Here
2
[% USE Asset %]
2
[% USE Asset %]
3
[% USE KohaDates %]
3
[% USE KohaDates %]
4
[% USE Branches %]
4
[% USE Branches %]
5
[% USE Price %]
5
[% INCLUDE 'doc-head-open.inc' %]
6
[% INCLUDE 'doc-head-open.inc' %]
6
<title>
7
<title>
7
[% IF ( batch_details ) %]
8
[% IF ( batch_details ) %]
Lines 160-368 Link Here
160
                                                            <a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&amp;importid=[% biblio.import_record_id | uri %]" class="previewData btn btn-default btn-xs">Card</a>
161
                                                            <a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&amp;importid=[% biblio.import_record_id | uri %]" class="previewData btn btn-default btn-xs">Card</a>
161
                                                            <a href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]&amp;breedingid=[% biblio.import_record_id | uri %]&amp;import_batch_id=[% biblio.import_batch_id | uri %]&amp;biblionumber=[% biblio.match_biblionumber | uri %]" class="btn btn-default btn-xs">Add order</a>
162
                                                            <a href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]&amp;breedingid=[% biblio.import_record_id | uri %]&amp;import_batch_id=[% biblio.import_batch_id | uri %]&amp;biblionumber=[% biblio.match_biblionumber | uri %]" class="btn btn-default btn-xs">Add order</a>
162
                                                        </span>
163
                                                        </span>
163
                                                        <fieldset class="rows order_details">
164
                                                        <form action="/cgi-bin/koha/acqui/addorderiso2709.pl" class="validated">
164
                                                            <ol>
165
                                                            <fieldset class="rows order_details">
165
                                                                <li class="status">
166
                                                                <ol>
166
                                                                    <span class="label">Match:</span>
167
                                                                    <li class="status">
167
                                                                    <span class="match">
168
                                                                        <span class="label">Match:</span>
168
                                                                        [% IF ( biblio_lis.overlay_status == 'no_match' ) %]
169
                                                                        <span class="match">
169
                                                                        <span>No match</span>
170
                                                                            [% IF ( biblio_lis.overlay_status == 'no_match' ) %]
170
                                                                        [% ELSIF ( biblio_lis.overlay_status == 'match_applied' ) %]
171
                                                                            <span>No match</span>
171
                                                                        <span>Match applied</span>
172
                                                                            [% ELSIF ( biblio_lis.overlay_status == 'match_applied' ) %]
172
                                                                        [% ELSIF ( biblio_lis.overlay_status == 'auto_match' ) %]
173
                                                                            <span>Match applied</span>
173
                                                                        <span>Match found</span>
174
                                                                            [% ELSIF ( biblio_lis.overlay_status == 'auto_match' ) %]
174
                                                                        [% ELSE %]
175
                                                                            <span>Match found</span>
175
                                                                            [% biblio_lis.overlay_status | html %]
176
                                                                        [% END %]
177
                                                                        [% IF ( biblio.match_biblionumber ) %]
178
                                                                        <span>Matches biblio [% biblio.match_biblionumber | uri %]</span> (score = [% biblio.match_score | html %]): <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblio.match_biblionumber | uri %]">[% biblio.match_citation | html %]</a>
179
                                                                        [% END %]
180
                                                                    </span>
181
                                                                </li>
182
                                                                <li class="quantity">
183
                                                                    <label for="quantity_record_[% biblio.import_record_id | html %]" class="required">Quantity: </label>
184
                                                                    <input id="quantity_record_[% biblio.import_record_id | html %]" type="text" pattern="[0-9]+" value="[% biblio.quantity.length ? biblio.quantity : 1 | html %]" name="quantity" />
185
                                                                    <span class="required">Required</span>
186
                                                                </li>
187
                                                                <li class="price">
188
                                                                    <label for="price_record_[% biblio.import_record_id | html %]">Price: </label>
189
                                                                    <input id="price_record_[% biblio.import_record_id | html %]" type="text" value="[% biblio.price | html %]" name="price" />
190
                                                                </li>
191
                                                                <li class="replacementprice">
192
                                                                    <label for="replacementprice_record_[% biblio.import_record_id | html %]">Replacement price: </label>
193
                                                                    <input id="replacementprice_record_[% biblio.import_record_id | html %]" type="text" value="[% biblio.replacementprice | html %]" name="replacementprice" />
194
                                                                </li>
195
                                                                <li class="discount">
196
                                                                    <label for="discount_record_[% biblio.import_record_id | html %]">Discount: </label>
197
                                                                    <input id="discount_record_[% biblio.import_record_id | html %]" type="text" value="[% biblio.discount | html %]" name="discount" size="6" /> %
198
                                                                    <div class="hint">If empty, discount rate from vendor will be used</div>
199
                                                                </li>
200
                                                                <li class="fund">
201
                                                                    [% IF ( close ) %]
202
                                                                        <label for="fund_record_[% biblio.import_record_id | html %]">Fund: </label>
203
                                                                        <input type="hidden" size="20" name="budget_id" value="[% budget_id | html %]" />[% Budget_name | html %]
204
                                                                    [% ELSE %]
205
                                                                        <label for="fund_record_[% biblio.import_record_id | html %]">Fund: </label>
206
                                                                        <select id="fund_record_[% biblio.import_record_id | html %]" name="budget_id">
207
                                                                            <option value="">Select a fund (will use default if set)</option>
208
                                                                            [% FOREACH budget IN budget_loop %]
209
                                                                                [% IF ( budget.b_id == biblio.budget_id ) %]
210
                                                                                [% IF budget.b_active %]
211
                                                                                    <option value="[% budget.b_id | html %]" data-sort1-authcat="[% budget.b_sort1_authcat | html %]" data-sort2-authcat="[% budget.b_sort2_authcat | html %]" selected="selected">[% budget.b_txt | html %]</option>
212
                                                                                [% ELSE %]
213
                                                                                <option value="[% budget.b_id | html %]" data-sort1-authcat="[% budget.b_sort1_authcat | html %]" data-sort2-authcat="[% budget.b_sort2_authcat | html %]" selected="selected">[% budget.b_txt | html %] (inactive)</option>
214
                                                                            [% END %]
215
                                                                            [% ELSE %]
176
                                                                            [% ELSE %]
216
                                                                                [% IF budget.b_active %]<option value="[% budget.b_id | html %]" data-sort1-authcat="[% budget.b_sort1_authcat | html %]" data-sort2-authcat="[% budget.b_sort2_authcat | html %]">[% budget.b_txt | html %]</option>
177
                                                                                [% biblio_lis.overlay_status | html %]
217
                                                                                [% ELSE %]<option value="[% budget.b_id | html %]" class="b_inactive" data-sort1-authcat="[% budget.b_sort1_authcat | html %]" data-sort2-authcat="[% budget.b_sort2_authcat | html %]">[% budget.b_txt | html %] (inactive)</option>
178
                                                                            [% END %]
179
                                                                            [% IF ( biblio.match_biblionumber ) %]
180
                                                                            <span>Matches biblio [% biblio.match_biblionumber | uri %]</span> (score = [% biblio.match_score | html %]): <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblio.match_biblionumber | uri %]">[% biblio.match_citation | html %]</a>
181
                                                                            [% END %]
182
                                                                        </span>
183
                                                                    </li>
184
                                                                    <li class="quantity">
185
                                                                        <label for="quantity_record_[% biblio.import_record_id | html %]" class="required">Quantity: </label>
186
                                                                        <input id="quantity_record_[% biblio.import_record_id | html %]" type="text" pattern="[0-9]+" value="[% biblio.quantity.length ? biblio.quantity : 1 | html %]" name="quantity" />
187
                                                                        <span class="required">Required</span>
188
                                                                    </li>
189
                                                                    <li class="price">
190
                                                                        <label for="price_record_[% biblio.import_record_id | html %]">Price: </label>
191
                                                                        <input id="price_record_[% biblio.import_record_id | html %]" class="decimal" type="text" value="[% biblio.price | $Price on_editing => 1 %]" name="price" />
192
                                                                    </li>
193
                                                                    <li class="replacementprice">
194
                                                                        <label for="replacementprice_record_[% biblio.import_record_id | html %]">Replacement price: </label>
195
                                                                        <input id="replacementprice_record_[% biblio.import_record_id | html %]" class="decimal" type="text" value="[% biblio.replacementprice | $Price on_editing => 1 %]" name="replacementprice" />
196
                                                                    </li>
197
                                                                    <li class="discount">
198
                                                                        <label for="discount_record_[% biblio.import_record_id | html %]">Discount: </label>
199
                                                                        <input id="discount_record_[% biblio.import_record_id | html %]" type="text" value="[% biblio.discount | html %]" name="discount" size="6" /> %
200
                                                                        <div class="hint">If empty, discount rate from vendor will be used</div>
201
                                                                    </li>
202
                                                                    <li class="fund">
203
                                                                        [% IF ( close ) %]
204
                                                                            <label for="fund_record_[% biblio.import_record_id | html %]">Fund: </label>
205
                                                                            <input type="hidden" size="20" name="budget_id" value="[% budget_id | html %]" />[% Budget_name | html %]
206
                                                                        [% ELSE %]
207
                                                                            <label for="fund_record_[% biblio.import_record_id | html %]">Fund: </label>
208
                                                                            <select id="fund_record_[% biblio.import_record_id | html %]" name="budget_id">
209
                                                                                <option value="">Select a fund (will use default if set)</option>
210
                                                                                [% FOREACH budget IN budget_loop %]
211
                                                                                    [% IF ( budget.b_id == biblio.budget_id ) %]
212
                                                                                    [% IF budget.b_active %]
213
                                                                                        <option value="[% budget.b_id | html %]" data-sort1-authcat="[% budget.b_sort1_authcat | html %]" data-sort2-authcat="[% budget.b_sort2_authcat | html %]" selected="selected">[% budget.b_txt | html %]</option>
214
                                                                                    [% ELSE %]
215
                                                                                    <option value="[% budget.b_id | html %]" data-sort1-authcat="[% budget.b_sort1_authcat | html %]" data-sort2-authcat="[% budget.b_sort2_authcat | html %]" selected="selected">[% budget.b_txt | html %] (inactive)</option>
218
                                                                                [% END %]
216
                                                                                [% END %]
217
                                                                                [% ELSE %]
218
                                                                                    [% IF budget.b_active %]<option value="[% budget.b_id | html %]" data-sort1-authcat="[% budget.b_sort1_authcat | html %]" data-sort2-authcat="[% budget.b_sort2_authcat | html %]">[% budget.b_txt | html %]</option>
219
                                                                                    [% ELSE %]<option value="[% budget.b_id | html %]" class="b_inactive" data-sort1-authcat="[% budget.b_sort1_authcat | html %]" data-sort2-authcat="[% budget.b_sort2_authcat | html %]">[% budget.b_txt | html %] (inactive)</option>
220
                                                                                    [% END %]
221
                                                                                    [% END %]
219
                                                                                [% END %]
222
                                                                                [% END %]
220
                                                                            [% END %]
223
                                                                            </select>
221
                                                                        </select>
224
                                                                            <span class="required" style="display:none">Required</span>
222
                                                                        <span class="required" style="display:none">Required</span>
225
                                                                        [% END %]
223
                                                                    [% END %]
226
                                                                    </li>
224
                                                                </li>
227
                                                                    <li class="sort1">
225
                                                                <li class="sort1">
228
                                                                        <label for="sort1_record_[% biblio.import_record_id | html %]">Statistic 1: </label>
226
                                                                    <label for="sort1_record_[% biblio.import_record_id | html %]">Statistic 1: </label>
229
                                                                        <input id="sort1_record_[% biblio.import_record_id | html %]" type="text" size="20" name="sort1" value="[% biblio.sort1 | html %]" />
227
                                                                    <input id="sort1_record_[% biblio.import_record_id | html %]" type="text" size="20" name="sort1" value="[% biblio.sort1 | html %]" />
230
                                                                    </li>
228
                                                                </li>
231
                                                                    <li class="sort2">
229
                                                                <li class="sort2">
232
                                                                        <label for="sort2_record_[% biblio.import_record_id | html %]">Statistic 2: </label>
230
                                                                    <label for="sort2_record_[% biblio.import_record_id | html %]">Statistic 2: </label>
233
                                                                        <input id="sort2_record_[% biblio.import_record_id | html %]" type="text" size="20" name="sort2" value="[% biblio.sort2 | html %]" />
231
                                                                    <input id="sort2_record_[% biblio.import_record_id | html %]" type="text" size="20" name="sort2" value="[% biblio.sort2 | html %]" />
234
                                                                    </li>
232
                                                                </li>
235
                                                                </ol>
233
                                                            </ol>
236
                                                                [% IF ( biblio.iteminfos.size ) %]
234
                                                            [% IF ( biblio.iteminfos.size ) %]
237
                                                                    <div class="item_edit_form">
235
                                                                <div class="item_edit_form">
238
                                                                        [% IF biblio.item_error %]Item records could not be processed because the number of item fields was uneven.[% END %]
236
                                                                    [% IF biblio.item_error %]Item records could not be processed because the number of item fields was uneven.[% END %]
239
                                                                        [% FOREACH item IN biblio.iteminfos %]
237
                                                                    [% FOREACH item IN biblio.iteminfos %]
240
                                                                            <fieldset class="rows">
238
                                                                        <fieldset class="rows">
241
                                                                                <legend>Item record [% item.item_id | html %]</legend>
239
                                                                            <legend>Item record [% item.item_id | html %]</legend>
242
                                                                                <ol>
240
                                                                            <ol>
243
                                                                                    <li>
241
                                                                                <li>
244
                                                                                        <label for="homebranch_item_[% item.item_id | html %]">homebranch</label>
242
                                                                                    <label for="homebranch_item_[% item.item_id | html %]">homebranch</label>
245
                                                                                        <select id="homebranch_item_[% item.item_id | html %]" name="homebranch_[% biblio.import_record_id | html %]">
243
                                                                                    <select id="homebranch_item_[% item.item_id | html %]" name="homebranch_[% biblio.import_record_id | html %]">
246
                                                                                            [% FOREACH l IN libraries %]
244
                                                                                        [% FOREACH l IN libraries %]
247
                                                                                                [% IF l.branchcode == item.homebranch %]
245
                                                                                            [% IF l.branchcode == item.homebranch %]
248
                                                                                                    <option value="[% l.branchcode | html %]" selected="selected">[% l.branchname | html %]</option>
246
                                                                                                <option value="[% l.branchcode | html %]" selected="selected">[% l.branchname | html %]</option>
249
                                                                                                [% ELSE %]
247
                                                                                            [% ELSE %]
250
                                                                                                    <option value="[% l.branchcode | html %]">[% l.branchname | html %]</option>
248
                                                                                                <option value="[% l.branchcode | html %]">[% l.branchname | html %]</option>
251
                                                                                                [% END %]
249
                                                                                            [% END %]
252
                                                                                            [% END %]
250
                                                                                        [% END %]
253
                                                                                        </select>
251
                                                                                    </select>
254
                                                                                    </li>
252
                                                                                </li>
253
255
254
                                                                                <li>
256
                                                                                    <li>
255
                                                                                    <label for="holdingbranch_item_[% item.item_id | html %]">holdingbranch</label>
257
                                                                                        <label for="holdingbranch_item_[% item.item_id | html %]">holdingbranch</label>
256
                                                                                    <select id="holdingbranch_item_[% item.item_id | html %]" name="holdingbranch_[% biblio.import_record_id | html %]">
258
                                                                                        <select id="holdingbranch_item_[% item.item_id | html %]" name="holdingbranch_[% biblio.import_record_id | html %]">
257
                                                                                        [% FOREACH l IN libraries %]
259
                                                                                            [% FOREACH l IN libraries %]
258
                                                                                            [% IF l.branchcode == item.holdingbranch %]
260
                                                                                                [% IF l.branchcode == item.holdingbranch %]
259
                                                                                                <option value="[% l.branchcode | html %]" selected="selected">[% l.branchname | html %]</option>
261
                                                                                                    <option value="[% l.branchcode | html %]" selected="selected">[% l.branchname | html %]</option>
260
                                                                                            [% ELSE %]
262
                                                                                                [% ELSE %]
261
                                                                                                <option value="[% l.branchcode | html %]">[% l.branchname | html %]</option>
263
                                                                                                    <option value="[% l.branchcode | html %]">[% l.branchname | html %]</option>
264
                                                                                                [% END %]
262
                                                                                            [% END %]
265
                                                                                            [% END %]
263
                                                                                        [% END %]
266
                                                                                        </select>
264
                                                                                    </select>
267
                                                                                    </li>
265
                                                                                </li>
268
                                                                                    <li>
266
                                                                                <li>
269
                                                                                        <label for="itype_item_[% item.item_id | html %]">itype</label>
267
                                                                                    <label for="itype_item_[% item.item_id | html %]">itype</label>
270
                                                                                        <select id="itype_item_[% item.item_id | html %]" name="itype_[% biblio.import_record_id | html %]">
268
                                                                                    <select id="itype_item_[% item.item_id | html %]" name="itype_[% biblio.import_record_id | html %]">
271
                                                                                            [% FOREACH itemtype IN itemtypes %]
269
                                                                                        [% FOREACH itemtype IN itemtypes %]
272
                                                                                                [% IF itemtype.itemtype == item.itype %]
270
                                                                                            [% IF itemtype.itemtype == item.itype %]
273
                                                                                                    <option value="[% itemtype.itemtype | html %]" selected="selected">[% itemtype.description | html %]</option>
271
                                                                                                <option value="[% itemtype.itemtype | html %]" selected="selected">[% itemtype.description | html %]</option>
274
                                                                                                [% ELSE %]
272
                                                                                            [% ELSE %]
275
                                                                                                    <option value="[% itemtype.itemtype | html %]">[% itemtype.description | html %]</option>
273
                                                                                                <option value="[% itemtype.itemtype | html %]">[% itemtype.description | html %]</option>
276
                                                                                                [% END %]
274
                                                                                            [% END %]
277
                                                                                            [% END %]
275
                                                                                        [% END %]
278
                                                                                        </select>
276
                                                                                    </select>
279
                                                                                    </li>
277
                                                                                </li>
278
280
279
                                                                                <li>
281
                                                                                    <li>
280
                                                                                    <label for="nonpublic_note_item_[% item.item_id | html %]">nonpublic_note</label>
282
                                                                                        <label for="nonpublic_note_item_[% item.item_id | html %]">nonpublic_note</label>
281
                                                                                    <input type="text" id="nonpublic_note_item_[% item.item_id | html %]" name="nonpublic_note_[% biblio.import_record_id | html %]" value="[% item.nonpublic_note | html %]">
283
                                                                                        <input type="text" id="nonpublic_note_item_[% item.item_id | html %]" name="nonpublic_note_[% biblio.import_record_id | html %]" value="[% item.nonpublic_note | html %]">
282
                                                                                </li>
284
                                                                                    </li>
283
                                                                                <li>
285
                                                                                    <li>
284
                                                                                    <label for="public_note_item_[% item.item_id | html %]">public_note</label>
286
                                                                                        <label for="public_note_item_[% item.item_id | html %]">public_note</label>
285
                                                                                    <input type="text" id="public_note_item_[% item.item_id | html %]" name="public_note_[% biblio.import_record_id | html %]" value="[% item.public_note | html %]">
287
                                                                                        <input type="text" id="public_note_item_[% item.item_id | html %]" name="public_note_[% biblio.import_record_id | html %]" value="[% item.public_note | html %]">
286
                                                                                </li>
288
                                                                                    </li>
287
                                                                                <li>
289
                                                                                    <li>
288
                                                                                    <label for="loc_item_[% item.item_id | html %]">loc</label>
290
                                                                                        <label for="loc_item_[% item.item_id | html %]">loc</label>
289
                                                                                    <select id="loc_item_[% item.item_id | html %]" name="loc_[% biblio.import_record_id | html %]">
291
                                                                                        <select id="loc_item_[% item.item_id | html %]" name="loc_[% biblio.import_record_id | html %]">
290
                                                                                        <option value=""> </option>
292
                                                                                            <option value=""> </option>
291
                                                                                        [% FOREACH locationloo IN locationloop %]
293
                                                                                            [% FOREACH locationloo IN locationloop %]
292
                                                                                            [% IF ( locationloo.code ) == (item.loc) %]
294
                                                                                                [% IF ( locationloo.code ) == (item.loc) %]
293
                                                                                                <option value="[% locationloo.code | html %]" selected="selected">[% locationloo.description | html %]</option>
295
                                                                                                    <option value="[% locationloo.code | html %]" selected="selected">[% locationloo.description | html %]</option>
294
                                                                                            [% ELSE %]
296
                                                                                                [% ELSE %]
295
                                                                                                <option value="[% locationloo.code | html %]">[% locationloo.description | html %]</option>
297
                                                                                                    <option value="[% locationloo.code | html %]">[% locationloo.description | html %]</option>
298
                                                                                                [% END %]
296
                                                                                            [% END %]
299
                                                                                            [% END %]
297
                                                                                        [% END %]
300
                                                                                        </select>
298
                                                                                    </select>
301
                                                                                    </li>
299
                                                                                </li>
300
302
301
                                                                                <li>
303
                                                                                    <li>
302
                                                                                    <label for="ccode_item_[% item.item_id | html %]">ccode</label>
304
                                                                                        <label for="ccode_item_[% item.item_id | html %]">ccode</label>
303
                                                                                    <select id="ccode_item_[% item.item_id | html %]" name="ccode_[% biblio.import_record_id | html %]">
305
                                                                                        <select id="ccode_item_[% item.item_id | html %]" name="ccode_[% biblio.import_record_id | html %]">
304
                                                                                        <option value=""> </option>
306
                                                                                            <option value=""> </option>
305
                                                                                        [% FOREACH ccodeloo IN ccodeloop %]
307
                                                                                            [% FOREACH ccodeloo IN ccodeloop %]
306
                                                                                            [% IF ( ccodeloo.code ) == (item.ccode) %]
308
                                                                                                [% IF ( ccodeloo.code ) == (item.ccode) %]
307
                                                                                                <option value="[% ccodeloo.code | html %]" selected="selected">[% ccodeloo.description | html %]</option>
309
                                                                                                    <option value="[% ccodeloo.code | html %]" selected="selected">[% ccodeloo.description | html %]</option>
308
                                                                                            [% ELSE %]
310
                                                                                                [% ELSE %]
309
                                                                                                <option value="[% ccodeloo.code | html %]">[% ccodeloo.description | html %]</option>
311
                                                                                                    <option value="[% ccodeloo.code | html %]">[% ccodeloo.description | html %]</option>
312
                                                                                                [% END %]
310
                                                                                            [% END %]
313
                                                                                            [% END %]
311
                                                                                        [% END %]
314
                                                                                        </select>
312
                                                                                    </select>
315
                                                                                    </li>
313
                                                                                </li>
314
316
315
                                                                                <li>
317
                                                                                    <li>
316
                                                                                    <label for="notforloan_item_[% item.item_id | html %]">notforloan</label>
318
                                                                                        <label for="notforloan_item_[% item.item_id | html %]">notforloan</label>
317
                                                                                    <select id="notforloan_item_[% item.item_id | html %]" name="notforloan_[% biblio.import_record_id | html %]">
319
                                                                                        <select id="notforloan_item_[% item.item_id | html %]" name="notforloan_[% biblio.import_record_id | html %]">
318
                                                                                        <option value=""> </option>
320
                                                                                            <option value=""> </option>
319
                                                                                        [% FOREACH n IN notforloanloop %]
321
                                                                                            [% FOREACH n IN notforloanloop %]
320
                                                                                            [% IF n.code == item.notforloan %]
322
                                                                                                [% IF n.code == item.notforloan %]
321
                                                                                                <option value="[% n.code | html %]" selected="selected">[% n.description | html %]</option>
323
                                                                                                    <option value="[% n.code | html %]" selected="selected">[% n.description | html %]</option>
322
                                                                                            [% ELSE %]
324
                                                                                                [% ELSE %]
323
                                                                                                <option value="[% n.code | html %]">[% n.description | html %]</option>
325
                                                                                                    <option value="[% n.code | html %]">[% n.description | html %]</option>
326
                                                                                                [% END %]
324
                                                                                            [% END %]
327
                                                                                            [% END %]
325
                                                                                        [% END %]
328
                                                                                        </select>
326
                                                                                    </select>
329
                                                                                    </li>
327
                                                                                </li>
330
                                                                                    <li>
328
                                                                                <li>
331
                                                                                        <label for="uri_item_[% item.item_id | html %]">uri</label>
329
                                                                                    <label for="uri_item_[% item.item_id | html %]">uri</label>
332
                                                                                        <input type="text" id="uri_item_[% item.item_id | html %]" name="uri_[% biblio.import_record_id | html %]" value="[% item.uri | html %]">
330
                                                                                    <input type="text" id="uri_item_[% item.item_id | html %]" name="uri_[% biblio.import_record_id | html %]" value="[% item.uri | html %]">
333
                                                                                    </li>
331
                                                                                </li>
334
                                                                                    <li>
332
                                                                                <li>
335
                                                                                        <label for="copyno_item_[% item.item_id | html %]">copyno</label>
333
                                                                                    <label for="copyno_item_[% item.item_id | html %]">copyno</label>
336
                                                                                        <input type="text" id="copyno_item_[% item.item_id | html %]" name="copyno_[% biblio.import_record_id | html %]" value="[% item.copyno | html %]">
334
                                                                                    <input type="text" id="copyno_item_[% item.item_id | html %]" name="copyno_[% biblio.import_record_id | html %]" value="[% item.copyno | html %]">
337
                                                                                    </li>
335
                                                                                </li>
338
                                                                                    <li>
336
                                                                                <li>
339
                                                                                        <label for="budget_code_item_[% item.item_id | html %]">budget_code</label>
337
                                                                                    <label for="budget_code_item_[% item.item_id | html %]">budget_code</label>
340
                                                                                        <select class="budget_code_item" id="budget_code_item_[% item.item_id | html %]" name="budget_code_[% biblio.import_record_id | html %]">
338
                                                                                    <select class="budget_code_item" id="budget_code_item_[% item.item_id | html %]" name="budget_code_[% biblio.import_record_id | html %]">
341
                                                                                            <option value="">Select a fund (will use default if set)</option>
339
                                                                                        <option value="">Select a fund (will use default if set)</option>
342
                                                                                            [% FOREACH budget_loo IN budget_loop %]
340
                                                                                        [% FOREACH budget_loo IN budget_loop %]
343
                                                                                                [% IF ( budget_loo.b_id ) == ( item.budget_id ) %]<option value="[% budget_loo.b_id | html %]" selected="selected">[% budget_loo.b_txt | html %]</option>
341
                                                                                            [% IF ( budget_loo.b_id ) == ( item.budget_id ) %]<option value="[% budget_loo.b_id | html %]" selected="selected">[% budget_loo.b_txt | html %]</option>
344
                                                                                                [% ELSE %]<option value="[% budget_loo.b_id | html %]">[% budget_loo.b_txt | html %]</option>
342
                                                                                            [% ELSE %]<option value="[% budget_loo.b_id | html %]">[% budget_loo.b_txt | html %]</option>
345
                                                                                                [% END %]
343
                                                                                            [% END %]
346
                                                                                            [% END %]
344
                                                                                        [% END %]
347
                                                                                        </select>
345
                                                                                    </select>
348
                                                                                        <span class="item_fund required">Required</span>
346
                                                                                    <span class="item_fund required">Required</span>
349
                                                                                    </li>
347
                                                                                </li>
350
                                                                                    <li>
348
                                                                                <li>
351
                                                                                        <label for="price_item_[% item.item_id | html %]">price</label>
349
                                                                                    <label for="price_item_[% item.item_id | html %]">price</label>
352
                                                                                        <input type="text" id="price_item_[% item.item_id | html %]" class="decimal" name="itemprice_[% biblio.import_record_id | html %]" value="[% item.itemprice | $Price on_editing => 1 %]">
350
                                                                                    <input type="text" id="price_item_[% item.item_id | html %]" name="itemprice_[% biblio.import_record_id | html %]" value="[% item.itemprice | html %]">
353
                                                                                    </li>
351
                                                                                </li>
354
                                                                                    <li>
352
                                                                                <li>
355
                                                                                        <label for="replacementprice_item_[% item.item_id | html %]">replacement price</label>
353
                                                                                    <label for="replacementprice_item_[% item.item_id | html %]">replacement price</label>
356
                                                                                        <input type="text" id="replacementprice_item_[% item.item_id | html %]" class="decimal" name="replacementprice_[% biblio.import_record_id | html %]" value="[% item.replacementprice | $Price on_editing => 1 %]">
354
                                                                                    <input type="text" id="replacementprice_item_[% item.item_id | html %]" name="replacementprice_[% biblio.import_record_id | html %]" value="[% item.replacementprice | html %]">
357
                                                                                    </li>
355
                                                                                </li>
358
                                                                                    <li>
356
                                                                                <li>
359
                                                                                        <label for="callnumber_item_[% item.item_id | html %]">callnumber</label>
357
                                                                                    <label for="callnumber_item_[% item.item_id | html %]">callnumber</label>
360
                                                                                        <input type="text" id="callnumber_item_[% item.item_id | html %]" name="itemcallnumber_[% biblio.import_record_id | html %]" value="[% item.itemcallnumber | html %]">
358
                                                                                    <input type="text" id="callnumber_item_[% item.item_id | html %]" name="itemcallnumber_[% biblio.import_record_id | html %]" value="[% item.itemcallnumber | html %]">
361
                                                                                    </li>
359
                                                                                </li>
362
                                                                                </ol>
360
                                                                            </ol>
363
                                                                            </fieldset>
361
                                                                        </fieldset>
364
                                                                        [% END # /FOREACH item %]
362
                                                                    [% END # /FOREACH item %]
365
                                                                    </div> <!-- /.item_edit_form -->
363
                                                                </div> <!-- /.item_edit_form -->
366
                                                                [% END %]
364
                                                            [% END %]
367
                                                            </fieldset> <!-- /.rows.order_details -->
365
                                                        </fieldset> <!-- /.rows.order_details -->
368
                                                        </form>
366
                                                    </td>
369
                                                    </td>
367
                                                </tr>
370
                                                </tr>
368
                                            [% END # /FOREACH biblio %]
371
                                            [% END # /FOREACH biblio %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt (-3 / +3 lines)
Lines 93-99 Link Here
93
                                [% IF readonly %]
93
                                [% IF readonly %]
94
                                    [% shipmentcost | $Price %]
94
                                    [% shipmentcost | $Price %]
95
                                [% ELSE %]
95
                                [% ELSE %]
96
                                    <input type="text" size="10" id="shipmentcost" name="shipmentcost" value="[% shipmentcost | $Price on_editing => 1 %]" />
96
                                    <input class="decimal" type="text" size="10" id="shipmentcost" name="shipmentcost" value="[% shipmentcost | $Price on_editing => 1 %]" />
97
                                [% END %]
97
                                [% END %]
98
                            </li>
98
                            </li>
99
                            <li>
99
                            <li>
Lines 168-174 Link Here
168
                                            [% IF readonly %]
168
                                            [% IF readonly %]
169
                                                [% adjustment.adjustment | $Price %]
169
                                                [% adjustment.adjustment | $Price %]
170
                                            [% ELSE %]
170
                                            [% ELSE %]
171
                                                <input type="text" name="adjustment" id="adjustment_[% adjustment.adjustment_id | html %]" value="[% adjustment.adjustment | $Price on_editing => 1 %]" />
171
                                                <input class="decimal" type="text" name="adjustment" id="adjustment_[% adjustment.adjustment_id | html %]" value="[% adjustment.adjustment | $Price on_editing => 1 %]" />
172
                                            [% END %]
172
                                            [% END %]
173
                                        </td>
173
                                        </td>
174
                                        <td>
174
                                        <td>
Lines 245-251 Link Here
245
                                <ol>
245
                                <ol>
246
                                    <li>
246
                                    <li>
247
                                        <label for="adjustment_new">Amount: </label>
247
                                        <label for="adjustment_new">Amount: </label>
248
                                        <input type="text" name="adjustment" id="adjustment_new" />
248
                                        <input class="decimal" type="text" name="adjustment" id="adjustment_new" />
249
                                    </li>
249
                                    </li>
250
                                    [% reasons = AuthorisedValues.Get("ADJ_REASON") %]
250
                                    [% reasons = AuthorisedValues.Get("ADJ_REASON") %]
251
                                    [% IF reasons.0 %]
251
                                    [% IF reasons.0 %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt (-2 / +3 lines)
Lines 162-168 Link Here
162
                        [% END # /#invoicestabs %]
162
                        [% END # /#invoicestabs %]
163
163
164
                        <div id="merge_invoices">
164
                        <div id="merge_invoices">
165
                            <form id="merge_invoice_form" action="/cgi-bin/koha/acqui/invoice.pl" method="post">
165
                            <form id="merge_invoice_form" class="validated" action="/cgi-bin/koha/acqui/invoice.pl" method="post">
166
                                <fieldset class="rows">
166
                                <fieldset class="rows">
167
                                    <ol>
167
                                    <ol>
168
                                        <li><h2>Merge invoices</h2></li>
168
                                        <li><h2>Merge invoices</h2></li>
Lines 181-186 Link Here
181
                                            </table>
181
                                            </table>
182
                                        </li>
182
                                        </li>
183
183
184
184
                                        <li>
185
                                        <li>
185
                                            <label for="merge_invoicenumber" class="required">Invoice number:</label>
186
                                            <label for="merge_invoicenumber" class="required">Invoice number:</label>
186
                                            <input type="text" size="10" id="merge_invoicenumber" name="invoicenumber" value="" class="required" required="required" />
187
                                            <input type="text" size="10" id="merge_invoicenumber" name="invoicenumber" value="" class="required" required="required" />
Lines 201-207 Link Here
201
202
202
                                        <li>
203
                                        <li>
203
                                            <label for="merge_shipmentcost">Shipment cost:</label>
204
                                            <label for="merge_shipmentcost">Shipment cost:</label>
204
                                            <input type="text" size="10" id="merge_shipmentcost" name="shipmentcost" value="" />
205
                                            <input class="decimal" type="text" size="10" id="merge_shipmentcost" name="shipmentcost" value="" />
205
                                        </li>
206
                                        </li>
206
                                        <li>
207
                                        <li>
207
                                            <label for="merge_shipment_budgetid">Fund:</label>
208
                                            <label for="merge_shipment_budgetid">Fund:</label>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt (-4 / +4 lines)
Lines 609-615 Link Here
609
                </li>
609
                </li>
610
            <li>
610
            <li>
611
                <label for="listprice">Vendor price: </label>
611
                <label for="listprice">Vendor price: </label>
612
                    <input type="text" size="20" name="listprice" id="listprice" value="[% listprice | html %]" onchange="updateCosts()" /> [% IF (listincgst == 1) %](tax inclusive)[% ELSE %](tax exclusive)[% END %]
612
                    <input class="decimal" type="text" size="20" name="listprice" id="listprice" value="[% listprice | html %]" onchange="updateCosts()" /> [% IF (listincgst == 1) %](tax inclusive)[% ELSE %](tax exclusive)[% END %]
613
            </li>
613
            </li>
614
            <li>
614
            <li>
615
                    <label for="uncertainprice">Uncertain price: </label>
615
                    <label for="uncertainprice">Uncertain price: </label>
Lines 653-663 Link Here
653
            </li>
653
            </li>
654
            <li>
654
            <li>
655
                <label for="rrp">Retail price: </label>
655
                <label for="rrp">Retail price: </label>
656
                <input type="text" size="20" name="rrp" id="rrp" value="[% rrp | html %]" /> (adjusted for [% cur_active | html %], [% IF (listincgst == 1) %]tax inclusive[% ELSE %]tax exclusive[% END %])
656
                <input class="decimal" type="text" size="20" name="rrp" id="rrp" value="[% rrp | $Price on_editing => 1 %]" /> (adjusted for [% cur_active | html %], [% IF (listincgst == 1) %]tax inclusive[% ELSE %]tax exclusive[% END %])
657
            </li>
657
            </li>
658
            <li>
658
            <li>
659
                <label for="replacementprice">Replacement cost: </label>
659
                <label for="replacementprice">Replacement cost: </label>
660
                <input type="text" size="20" name="replacementprice" id="replacementprice" value="[% replacementprice | html | $Price on_editing => 1 %]" />
660
                <input class="decimal" type="text" size="20" name="replacementprice" id="replacementprice" value="[% replacementprice | html | $Price on_editing => 1 %]" />
661
            </li>
661
            </li>
662
            <li>
662
            <li>
663
                <label for="ecost">Budgeted cost: </label>
663
                <label for="ecost">Budgeted cost: </label>
Lines 669-675 Link Here
669
            </li>
669
            </li>
670
            <li class="ordering_unitprice">
670
            <li class="ordering_unitprice">
671
                <label for="unitprice">Actual cost: </label>
671
                <label for="unitprice">Actual cost: </label>
672
                <input type="text" id="unitprice" size="20" name="unitprice" value="[% unitprice | html %]" />
672
                <input class="decimal" type="text" id="unitprice" size="20" name="unitprice" value="[% unitprice | html %]" />
673
                [% IF (invoiceincgst == 1) %](tax inc.)[% ELSE %](tax exc.)[% END %]
673
                [% IF (invoiceincgst == 1) %](tax inc.)[% ELSE %](tax exc.)[% END %]
674
            </li>
674
            </li>
675
            <li>
675
            <li>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt (-114 / +116 lines)
Lines 269-393 Link Here
269
                        <div class="col-md-12 col-lg-6">
269
                        <div class="col-md-12 col-lg-6">
270
                            <div id="accounting-panel" class="page-section">
270
                            <div id="accounting-panel" class="page-section">
271
                                <h4>Accounting details</h4>
271
                                <h4>Accounting details</h4>
272
                                <ol>
272
                                <form action="/cgi-bin/koha/acqui/orderreceive.pl" class="validated">
273
                                    <li>
273
                                    <ol>
274
                                        <label for="datereceived">Date received: </label>
274
                                        <li>
275
                                        <input type="text" size="10" id="datereceived" name="datereceived" class="flatpickr" />
275
                                            <label for="datereceived">Date received: </label>
276
                                    </li>
276
                                            <input type="text" size="10" id="datereceived" name="datereceived" class="flatpickr" />
277
                                    <li>
277
                                        </li>
278
                                        <label for="bookfund" class="required">Fund: </label>
278
                                        <li>
279
                                        <select id="bookfund" name="bookfund">
279
                                            <label for="bookfund" class="required">Fund: </label>
280
                                            <optgroup label="Current">
280
                                            <select id="bookfund" name="bookfund">
281
                                                <option id="selected_bookfund" selected="selected"></option>
281
                                                <optgroup label="Current">
282
                                            </optgroup>
282
                                                    <option id="selected_bookfund" selected="selected"></option>
283
                                        [% FOREACH budget_period_id IN budget_loops.keys %]
283
                                                </optgroup>
284
                                            [% SET budget_period = budget_loops.$budget_period_id %]
284
                                            [% FOREACH budget_period_id IN budget_loops.keys %]
285
                                            [% IF budget_period.active %]
285
                                                [% SET budget_period = budget_loops.$budget_period_id %]
286
                                                <optgroup label="[% budget_period.description | html %]">
286
                                                [% IF budget_period.active %]
287
                                            [% ELSE %]
287
                                                    <optgroup label="[% budget_period.description | html %]">
288
                                                <optgroup class="inactive_budget" label="[% budget_period.description | html %] (Inactive)">
289
                                            [% END %]
290
                                            [% FOREACH budget_loo IN budget_period.funds %]
291
                                            [% level_indent_cnt = 0 %]
292
                                                [% level_indent = "" %]
293
                                                [% WHILE level_indent_cnt < budget_loo.b_level %]
294
                                                    [% level_indent = level_indent _ " -- " %]
295
                                                    [% level_indent_cnt = level_indent_cnt +1 %]
296
                                                [% END %]
297
298
                                                [% IF ( budget_loo.b_sel ) %]
299
                                                    [% active_count = 0 #select no other fund %]
300
                                                    <option value="[% budget_loo.b_id | html %]" selected="selected" data-sort1-authcat="[% budget_loo.b_sort1_authcat | html %]" data-sort2-authcat="[% budget_loo.b_sort2_authcat | html %]">
301
                                                [% ELSIF active_count==1 && budget_loo.b_active %]
302
                                                    <option value="[% budget_loo.b_id | html %]" selected="selected" data-sort1-authcat="[% budget_loo.b_sort1_authcat | html %]" data-sort2-authcat="[% budget_loo.b_sort2_authcat | html %]">
303
                                                [% ELSE %]
288
                                                [% ELSE %]
304
                                                    [% bdgclass=budget_loo.b_active? "": "inactive_budget" | html %]
289
                                                    <optgroup class="inactive_budget" label="[% budget_period.description | html %] (Inactive)">
305
                                                    <option value="[% budget_loo.b_id | html %]" class="[% bdgclass | html %]" data-sort1-authcat="[% budget_loo.b_sort1_authcat | html %]" data-sort2-authcat="[% budget_loo.b_sort2_authcat | html %]">
290
                                                [% END %]
291
                                                [% FOREACH budget_loo IN budget_period.funds %]
292
                                                [% level_indent_cnt = 0 %]
293
                                                    [% level_indent = "" %]
294
                                                    [% WHILE level_indent_cnt < budget_loo.b_level %]
295
                                                        [% level_indent = level_indent _ " -- " %]
296
                                                        [% level_indent_cnt = level_indent_cnt +1 %]
297
                                                    [% END %]
298
299
                                                    [% IF ( budget_loo.b_sel ) %]
300
                                                        [% active_count = 0 #select no other fund %]
301
                                                        <option value="[% budget_loo.b_id | html %]" selected="selected" data-sort1-authcat="[% budget_loo.b_sort1_authcat | html %]" data-sort2-authcat="[% budget_loo.b_sort2_authcat | html %]">
302
                                                    [% ELSIF active_count==1 && budget_loo.b_active %]
303
                                                        <option value="[% budget_loo.b_id | html %]" selected="selected" data-sort1-authcat="[% budget_loo.b_sort1_authcat | html %]" data-sort2-authcat="[% budget_loo.b_sort2_authcat | html %]">
304
                                                    [% ELSE %]
305
                                                        [% bdgclass=budget_loo.b_active? "": "inactive_budget" | html %]
306
                                                        <option value="[% budget_loo.b_id | html %]" class="[% bdgclass | html %]" data-sort1-authcat="[% budget_loo.b_sort1_authcat | html %]" data-sort2-authcat="[% budget_loo.b_sort2_authcat | html %]">
307
                                                    [% END %]
308
                                                        [% level_indent | html %][% budget_loo.b_txt | html %][% IF !budget_loo.b_active %] (inactive)[% END %]
309
                                                    </option>
306
                                                [% END %]
310
                                                [% END %]
307
                                                    [% level_indent | html %][% budget_loo.b_txt | html %][% IF !budget_loo.b_active %] (inactive)[% END %]
311
                                                </optgroup>
308
                                                </option>
309
                                            [% END %]
312
                                            [% END %]
310
                                            </optgroup>
313
                                            </select>
311
                                        [% END %]
314
                                            <span class="required">Required</span>
312
                                        </select>
315
                                        </li>
313
                                        <span class="required">Required</span>
316
                                        <li>
314
                                    </li>
317
                                            <label>&nbsp;</label>
315
                                    <li>
318
                                            <span id="current-fund" class="hint"></span>
316
                                        <label>&nbsp;</label>
319
                                        </li>
317
                                        <span id="current-fund" class="hint"></span>
320
                                        <li>
318
                                    </li>
321
                                            <label for="showallbudgets">&nbsp;Show inactive:</label>
319
                                    <li>
322
                                            <input type="checkbox" id="showallbudgets" />
320
                                        <label for="showallbudgets">&nbsp;Show inactive:</label>
323
                                        </li>
321
                                        <input type="checkbox" id="showallbudgets" />
324
                                        <li>
322
                                    </li>
325
                                            <label for="creator">Ordered by: </label>
323
                                    <li>
326
                                            <span id="creator"></span>
324
                                        <label for="creator">Ordered by: </label>
327
                                        </li>
325
                                        <span id="creator"></span>
328
                                        <li>
326
                                    </li>
329
                                            <label for="quantity_to_receive">Quantity ordered: </label>
327
                                    <li>
330
                                            <input type="text" readonly="readonly" id="quantity_to_receive" name="quantity" />
328
                                        <label for="quantity_to_receive">Quantity ordered: </label>
331
                                        </li>
329
                                        <input type="text" readonly="readonly" id="quantity_to_receive" name="quantity" />
332
                                        <li>
330
                                    </li>
333
                                            <label for="quantity">Quantity received: </label>
331
                                    <li>
334
                                            <input type="text" inputmode="numeric" pattern="[0-9]*" size="20" name="quantityrec" id="quantity" />
332
                                        <label for="quantity">Quantity received: </label>
335
                                            <div id="qtyrecerror" style="display:none">
333
                                        <input type="text" inputmode="numeric" pattern="[0-9]*" size="20" name="quantityrec" id="quantity" />
336
                                                <p class="error">Warning, you have entered more items than expected.
334
                                        <div id="qtyrecerror" style="display:none">
337
                                                Items will not be created.</p>
335
                                            <p class="error">Warning, you have entered more items than expected.
338
                                            </div>
336
                                            Items will not be created.</p>
339
                                        </li>
337
                                        </div>
340
338
                                    </li>
341
                                        [% IF ( gst_values ) %]
339
342
                                        <li>
340
                                    [% IF ( gst_values ) %]
343
                                            <label for="tax_rate">Tax rate: </label>
341
                                    <li>
344
                                            <select name="tax_rate" id="tax_rate">
342
                                        <label for="tax_rate">Tax rate: </label>
345
                                            [% FOREACH gst IN gst_values %]
343
                                        <select name="tax_rate" id="tax_rate">
346
                                                <option value="[% gst.option | html %]">[% gst.option * 100 | html %]%</option>
344
                                        [% FOREACH gst IN gst_values %]
345
                                            <option value="[% gst.option | html %]">[% gst.option * 100 | html %]%</option>
346
                                        [% END %]
347
                                        </select>
348
                                    </li>
349
                                    [% END %]
350
351
                                    <li>
352
                                        <label for="rrp">Retail price: </label>
353
                                        <span id="rrp"></span>
354
                                    <li>
355
                                        <label for="replacementprice">Replacement price:</label>
356
                                        <input type="text" size="20" name="replacementprice" id="replacementprice" />
357
                                    </li>
358
                                    <li>
359
                                        <label for="ecost">Budgeted cost: </label>
360
                                        <span id="ecost"></span>
361
                                    </li>
362
                                    <li>
363
                                        <label for="unitprice">Actual cost:</label>
364
                                        <input type="text" size="20" name="unitprice" id="unitprice" />
365
                                        <span id="unitprice_hint" class="hint"></span>
366
                                    </li>
367
                                    <li>
368
                                        <label style="margin-left: 12em; text-align: left; font-weight: inherit; float:none;"><input type="checkbox" id="change_currency" name="change_currency">Change currency</label>
369
                                    </li>
370
                                    <li id="select_currency">
371
                                        <label for="invoice_unitprice"></label>
372
                                        <input type="text" size="20" name="invoice_unitprice" id="invoice_unitprice" value="" />
373
                                        [% IF currencies.count %]
374
                                        <select name="invoice_currency" id="invoice_currency">
375
                                            <option value="[% active_currency.currency | html %]" data-rate="[% active_currency.rate | html %]" selected>[% active_currency.currency | html %] ([% active_currency.symbol | html %])</option>
376
                                            [% FOR currency IN currencies %]
377
                                            <option value="[% currency.currency | html %]" data-rate="[% currency.rate | html %]">[% currency.currency | html %] ([% currency.symbol | html %])</option>
378
                                            [% END %]
347
                                            [% END %]
379
                                        </select>
348
                                            </select>
349
                                        </li>
380
                                        [% END %]
350
                                        [% END %]
381
                                    </li>
351
382
                                    <li>
352
                                        <li>
383
                                        <label for="order_internalnote">Internal note: </label>
353
                                            <label for="rrp">Retail price: </label>
384
                                        <textarea name="order_internalnote" id="order_internalnote" width="40" rows="8" ></textarea>
354
                                            <span id="rrp"></span>
385
                                    </li>
355
                                        <li>
386
                                    <li>
356
                                            <label for="replacementprice">Replacement price:</label>
387
                                        <label for="order_vendornote">Vendor note: </label>
357
                                            <input class="decimal" type="text" size="20" name="replacementprice" id="replacementprice" />
388
                                        <span id="order_vendornote"></span>
358
                                        </li>
389
                                    </li>
359
                                        <li>
390
                                </ol>
360
                                            <label for="ecost">Budgeted cost: </label>
361
                                            <span id="ecost"></span>
362
                                        </li>
363
                                        <li>
364
                                            <label for="unitprice">Actual cost:</label>
365
                                            <input class="decimal" type="text" size="20" name="unitprice" id="unitprice" />
366
                                            <span id="unitprice_hint" class="hint"></span>
367
                                        </li>
368
                                        <li>
369
                                            <label style="margin-left: 12em; text-align: left; font-weight: inherit; float:none;"><input type="checkbox" id="change_currency" name="change_currency">Change currency</label>
370
                                        </li>
371
                                        <li id="select_currency">
372
                                            <label for="invoice_unitprice"></label>
373
                                            <input class="decimal" type="text" size="20" name="invoice_unitprice" id="invoice_unitprice" value="" />
374
                                            [% IF currencies.count %]
375
                                            <select name="invoice_currency" id="invoice_currency">
376
                                                <option value="[% active_currency.currency | html %]" data-rate="[% active_currency.rate | html %]" selected>[% active_currency.currency | html %] ([% active_currency.symbol | html %])</option>
377
                                                [% FOR currency IN currencies %]
378
                                                <option value="[% currency.currency | html %]" data-rate="[% currency.rate | html %]">[% currency.currency | html %] ([% currency.symbol | html %])</option>
379
                                                [% END %]
380
                                            </select>
381
                                            [% END %]
382
                                        </li>
383
                                        <li>
384
                                            <label for="order_internalnote">Internal note: </label>
385
                                            <textarea name="order_internalnote" id="order_internalnote" width="40" rows="8" ></textarea>
386
                                        </li>
387
                                        <li>
388
                                            <label for="order_vendornote">Vendor note: </label>
389
                                            <span id="order_vendornote"></span>
390
                                        </li>
391
                                    </ol>
392
                                </form>
391
                            </div>
393
                            </div>
392
                        </div>
394
                        </div>
393
                    </div>
395
                    </div>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt (-1 / +1 lines)
Lines 164-170 Link Here
164
        </li>
164
        </li>
165
        <li>
165
        <li>
166
            <label for="shipmentcost">Shipping cost: </label>
166
            <label for="shipmentcost">Shipping cost: </label>
167
            <input type="text" id="shipmentcost" name="shipmentcost" size="10" />
167
            <input class="decimal" type="text" id="shipmentcost" name="shipmentcost" size="10" />
168
        </li>
168
        </li>
169
        <li>
169
        <li>
170
            <label for="shipmentcost_budgetid">Shipping fund: </label>
170
            <label for="shipmentcost_budgetid">Shipping fund: </label>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt (-2 / +3 lines)
Lines 1-6 Link Here
1
[% USE raw %]
1
[% USE raw %]
2
[% USE Asset %]
2
[% USE Asset %]
3
[% USE Koha %]
3
[% USE Koha %]
4
[% USE Price %]
4
[% PROCESS 'i18n.inc' %]
5
[% PROCESS 'i18n.inc' %]
5
[% SET footerjs = 1 %]
6
[% SET footerjs = 1 %]
6
[% INCLUDE 'doc-head-open.inc' %]
7
[% INCLUDE 'doc-head-open.inc' %]
Lines 134-140 Link Here
134
                                    <input type="checkbox" name="uncertainprice[% uncertainpriceorder.ordernumber | html %]" value="1" checked="checked" />
135
                                    <input type="checkbox" name="uncertainprice[% uncertainpriceorder.ordernumber | html %]" value="1" checked="checked" />
135
                                </td>
136
                                </td>
136
                                <td>
137
                                <td>
137
                                    <input class="check_uncertain" data-ordernumber="[% uncertainpriceorder.ordernumber | html %]" type="text" size="10" name="price[% uncertainpriceorder.ordernumber | html %]" value="[% uncertainpriceorder.listprice | html %]" />
138
                                    <input class="check_uncertain decimal" data-ordernumber="[% uncertainpriceorder.ordernumber | html %]" type="text" size="10" name="price[% uncertainpriceorder.ordernumber | html %]" value="[% uncertainpriceorder.listprice | $Price on_editing => 1 %]" />
138
                                </td>
139
                                </td>
139
                                <td>
140
                                <td>
140
                                [% IF basket.effective_create_items == 'ordering' %]
141
                                [% IF basket.effective_create_items == 'ordering' %]
Lines 154-160 Link Here
154
            </fieldset>
155
            </fieldset>
155
            <fieldset class="action"><input type="submit" class="btn btn-primary" value="Save" /></fieldset>
156
            <fieldset class="action"><input type="submit" class="btn btn-primary" value="Save" /></fieldset>
156
        </form>
157
        </form>
157
	[% END %]
158
    [% END %]
158
159
159
</main>
160
</main>
160
</div> <!-- /.col-sm-10.col-sm-push-2 -->
161
</div> <!-- /.col-sm-10.col-sm-push-2 -->
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt (-2 / +1 lines)
Lines 618-624 Link Here
618
                        </li>
618
                        </li>
619
                        <li>
619
                        <li>
620
                            <label for="price">Price:</label>
620
                            <label for="price">Price:</label>
621
                            <input type="text" size="20" name="price" id="price" value="[% price | html %]" />
621
                            <input class="decimal" type="text" size="20" name="price" id="price" value="[% price | $Price on_editing => 1 %]" />
622
                        </li>
622
                        </li>
623
                        <li>
623
                        <li>
624
                            <label for="total">Total: </label>
624
                            <label for="total">Total: </label>
625
- 

Return to bug 34169