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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt (-4 / +4 lines)
Lines 122-129 $(document).ready(function() { Link Here
122
                <td align="center">[% loop_budge.budget_owner %]</td>
122
                <td align="center">[% loop_budge.budget_owner %]</td>
123
                <td align="center">[% loop_budge.budget_branchname %]</td>
123
                <td align="center">[% loop_budge.budget_branchname %]</td>
124
                <td align="right" >[% loop_budge.budget_amount %]</td>
124
                <td align="right" >[% loop_budge.budget_amount %]</td>
125
                <td align="right" ><a href="ordered.pl?fund=[% loop_budge.budget_id %]&fund_code=[% loop_budge.budget_code %]">[% loop_budge.budget_ordered %]</a></td>
125
                <td align="right" ><a href="ordered.pl?fund=[% loop_budge.budget_id %]&amp;fund_code=[% loop_budge.budget_code %]">[% loop_budge.budget_ordered %]</a></td>
126
                <td align="right" ><a href="spent.pl?fund=[% loop_budge.budget_id %]&fund_code=[% loop_budge.budget_code %]">[% loop_budge.budget_spent %]</a></td>
126
                <td align="right" ><a href="spent.pl?fund=[% loop_budge.budget_id %]&amp;fund_code=[% loop_budge.budget_code %]">[% loop_budge.budget_spent %]</a></td>
127
                <td align="right" >[% loop_budge.budget_avail %]</td>
127
                <td align="right" >[% loop_budge.budget_avail %]</td>
128
            </tr>
128
            </tr>
129
            [% ELSE %]
129
            [% ELSE %]
Lines 136-143 $(document).ready(function() { Link Here
136
                <td align="center">[% loop_budge.budget_owner %]</td>
136
                <td align="center">[% loop_budge.budget_owner %]</td>
137
                <td align="center">[% loop_budge.budget_branchname %]</td>
137
                <td align="center">[% loop_budge.budget_branchname %]</td>
138
                <td align="right" >[% loop_budge.budget_amount %]</td>
138
                <td align="right" >[% loop_budge.budget_amount %]</td>
139
                <td align="right" ><a href="ordered.pl?fund=[% loop_budge.budget_id %]&fund_code=[% loop_budge.budget_code %]">[% loop_budge.budget_ordered %]</a></td>
139
                <td align="right" ><a href="ordered.pl?fund=[% loop_budge.budget_id %]&amp;fund_code=[% loop_budge.budget_code %]">[% loop_budge.budget_ordered %]</a></td>
140
                <td align="right" ><a href="spent.pl?fund=[% loop_budge.budget_id %]&fund_code=[% loop_budge.budget_code %]">[% loop_budge.budget_spent %]</a></td>
140
                <td align="right" ><a href="spent.pl?fund=[% loop_budge.budget_id %]&amp;fund_code=[% loop_budge.budget_code %]">[% loop_budge.budget_spent %]</a></td>
141
                <td align="right" >[% loop_budge.budget_avail %]</td>
141
                <td align="right" >[% loop_budge.budget_avail %]</td>
142
            [% END %]
142
            [% END %]
143
        [% END %]
143
        [% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt (-3 / +3 lines)
Lines 1-10 Link Here
1
[% USE KohaDates %]
1
[% USE KohaDates %]
2
[% INCLUDE 'doc-head-open.inc' %]
2
[% INCLUDE 'doc-head-open.inc' %]
3
<title>Koha &rsaquo; Acquisitions &rsaquo; Order Staged MARC Records
3
<title>Koha &rsaquo; Acquisitions &rsaquo; Order staged MARC records
4
[% IF ( batch_details ) %]
4
[% IF ( batch_details ) %]
5
 &rsaquo; Batch [% import_batch_id %]
5
 &rsaquo; Batch [% import_batch_id %]
6
[% ELSE %]
6
[% ELSE %]
7
 &rsaquo; Batch List
7
 &rsaquo; Batch list
8
[% END %]
8
[% END %]
9
</title>
9
</title>
10
[% INCLUDE 'doc-head-close.inc' %]
10
[% INCLUDE 'doc-head-close.inc' %]
Lines 146-152 Link Here
146
                </fieldset>
146
                </fieldset>
147
                [% END %] <!-- items -->
147
                [% END %] <!-- items -->
148
                <fieldset class="rows">
148
                <fieldset class="rows">
149
                    <legend>Accounting Details</legend>
149
                    <legend>Accounting details</legend>
150
                    <ol>
150
                    <ol>
151
                        <li>
151
                        <li>
152
                            <!-- origquantityrec only here for javascript compatibility (additem.js needs it, useless here, usefull when receiveing an order -->
152
                            <!-- origquantityrec only here for javascript compatibility (additem.js needs it, useless here, usefull when receiveing an order -->
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt (-3 / +3 lines)
Lines 237-243 Link Here
237
                <tfoot>
237
                <tfoot>
238
                [% IF ( GST ) %]
238
                [% IF ( GST ) %]
239
                <tr>
239
                <tr>
240
                    <th scope="row">Total Tax Exc.</th>
240
                    <th scope="row">Total tax exc.</th>
241
                    <td>[% total_rrp_gste %]</td>
241
                    <td>[% total_rrp_gste %]</td>
242
                    <td>&nbsp;</td>
242
                    <td>&nbsp;</td>
243
                    <td>[% qty_total %]</td>
243
                    <td>[% qty_total %]</td>
Lines 258-264 Link Here
258
                    <td>[% gist_est %]</td>
258
                    <td>[% gist_est %]</td>
259
                </tr>
259
                </tr>
260
                <tr>
260
                <tr>
261
                    <th scope="row">Total Tax Inc. ([% currency %])</th>
261
                    <th scope="row">Total tax inc. ([% currency %])</th>
262
                    <td>[% total_rrp_gsti %]</td>
262
                    <td>[% total_rrp_gsti %]</td>
263
                    <td>&nbsp;</td>
263
                    <td>&nbsp;</td>
264
                    <td>[% qty_total %]</td>
264
                    <td>[% qty_total %]</td>
Lines 289-295 Link Here
289
                                [% IF ( books_loo.suggestionid ) %]
289
                                [% IF ( books_loo.suggestionid ) %]
290
                                    <br/>
290
                                    <br/>
291
                                    Suggested by: [% books_loo.surnamesuggestedby %][% IF ( books_loo.firstnamesuggestedby ) %], [% books_loo.firstnamesuggestedby %] [% END %]
291
                                    Suggested by: [% books_loo.surnamesuggestedby %][% IF ( books_loo.firstnamesuggestedby ) %], [% books_loo.firstnamesuggestedby %] [% END %]
292
                                    (<a href="/cgi-bin/koha/suggestion/suggestion.pl?suggestionid=[% books_loo.suggestionid %]&op=show">suggestion #[% books_loo.suggestionid %]</a>)
292
                                    (<a href="/cgi-bin/koha/suggestion/suggestion.pl?suggestionid=[% books_loo.suggestionid %]&amp;op=show">suggestion #[% books_loo.suggestionid %]</a>)
293
                                [% END %]
293
                                [% END %]
294
                                [% IF ( books_loo.notes ) %]
294
                                [% IF ( books_loo.notes ) %]
295
                                    <p class="ordernote"><strong>Note: </strong>[% books_loo.notes|html %] [<a href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% books_loo.ordernumber %]">Change note</a>]</p>
295
                                    <p class="ordernote"><strong>Note: </strong>[% books_loo.notes|html %] [<a href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% books_loo.ordernumber %]">Change note</a>]</p>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt (-11 / +11 lines)
Lines 1-5 Link Here
1
[% INCLUDE 'doc-head-open.inc' %]
1
[% INCLUDE 'doc-head-open.inc' %]
2
<title>Koha &rsaquo; Basket Grouping for [% booksellername |html %]</title>
2
<title>Koha &rsaquo; Basket grouping for [% booksellername |html %]</title>
3
[% INCLUDE 'doc-head-close.inc' %]
3
[% INCLUDE 'doc-head-close.inc' %]
4
<script type="text/javascript" src="[% themelang %]/js/acq.js"></script>
4
<script type="text/javascript" src="[% themelang %]/js/acq.js"></script>
5
[% IF ( grouping ) %]
5
[% IF ( grouping ) %]
Lines 137-151 function yuiToolbar() { Link Here
137
[% INCLUDE 'header.inc' %]
137
[% INCLUDE 'header.inc' %]
138
[% INCLUDE 'acquisitions-search.inc' %]
138
[% INCLUDE 'acquisitions-search.inc' %]
139
139
140
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo; <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% booksellername |html %]</a> &rsaquo; Basket Grouping</div>
140
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo; <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% booksellername |html %]</a> &rsaquo; Basket grouping</div>
141
141
142
<div id="doc" class="yui-t7">
142
<div id="doc" class="yui-t7">
143
            
143
            
144
        <div class="yui-b"> 
144
        <div class="yui-b"> 
145
        	<div id="toolbar">
145
        	<div id="toolbar">
146
				<a href="?op=add&amp;booksellerid=[% booksellerid %]" name="newbasketgroup" id="newbasketgroup">New Basket Group</a>
146
				<a href="?op=add&amp;booksellerid=[% booksellerid %]" name="newbasketgroup" id="newbasketgroup">New basket group</a>
147
			</div>
147
			</div>
148
			<h1>Basket Grouping for <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% booksellername |html %]</a></h1>
148
			<h1>Basket grouping for <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% booksellername |html %]</a></h1>
149
		</div>
149
		</div>
150
[% IF ( grouping ) %]
150
[% IF ( grouping ) %]
151
	<div id="bd"> 
151
	<div id="bd"> 
Lines 156-162 function yuiToolbar() { Link Here
156
	            <div id="groups">
156
	            <div id="groups">
157
	            <fieldset class="brief">
157
	            <fieldset class="brief">
158
	            <div class="workarea_alt" >
158
	            <div class="workarea_alt" >
159
	            <h3>Ungrouped Baskets</h3>
159
	            <h3>Ungrouped baskets</h3>
160
	            <ul id="ungrouped" class="draglist_alt">
160
	            <ul id="ungrouped" class="draglist_alt">
161
	            [% IF ( baskets ) %]
161
	            [% IF ( baskets ) %]
162
	                [% FOREACH basket IN baskets %]
162
	                [% FOREACH basket IN baskets %]
Lines 185-200 function yuiToolbar() { Link Here
185
		    	<form action="" method="post" id="groupingform" onsubmit="return submitForm(this)">
185
		    	<form action="" method="post" id="groupingform" onsubmit="return submitForm(this)">
186
					<fieldset id="various" class="brief">
186
					<fieldset id="various" class="brief">
187
					<ol>
187
					<ol>
188
						<li><label for="basketgroupname">Basket Group Name:</label>
188
						<li><label for="basketgroupname">Basket group name:</label>
189
							<input type="text" name="basketgroupname" id="basketgroupname" value="[% name %]" /></li>
189
							<input type="text" name="basketgroupname" id="basketgroupname" value="[% name %]" /></li>
190
						<li><label for="billingplace">Billing Place:</label>
190
						<li><label for="billingplace">Billing place:</label>
191
							<select name="billingplace" id="billingplace" style="width:13em;">
191
							<select name="billingplace" id="billingplace" style="width:13em;">
192
								[% FOREACH billingplaceloo IN billingplaceloop %]
192
								[% FOREACH billingplaceloo IN billingplaceloop %]
193
	                                [% IF ( billingplaceloo.selected ) %]<option value="[% billingplaceloo.value %]" selected="selected">[% billingplaceloo.branchname %]</option>
193
	                                [% IF ( billingplaceloo.selected ) %]<option value="[% billingplaceloo.value %]" selected="selected">[% billingplaceloo.branchname %]</option>
194
	                                [% ELSE %]<option value="[% billingplaceloo.value %]">[% billingplaceloo.branchname %]</option>[% END%]
194
	                                [% ELSE %]<option value="[% billingplaceloo.value %]">[% billingplaceloo.branchname %]</option>[% END%]
195
								[% END %]
195
								[% END %]
196
												</select></li>
196
												</select></li>
197
						<li><label for="deliveryplace">Delivery Place:</label>
197
						<li><label for="deliveryplace">Delivery place:</label>
198
							<select name="deliveryplace" id="deliveryplace" style="width:13em;">
198
							<select name="deliveryplace" id="deliveryplace" style="width:13em;">
199
								<option value="">--</option>
199
								<option value="">--</option>
200
								[% FOREACH deliveryplaceloo IN deliveryplaceloop %]
200
								[% FOREACH deliveryplaceloo IN deliveryplaceloop %]
Lines 203-209 function yuiToolbar() { Link Here
203
								[% END %]
203
								[% END %]
204
												</select></li>
204
												</select></li>
205
                        <li><p>or</p></li>
205
                        <li><p>or</p></li>
206
                        <li><label for="freedeliveryplace">Delivery Place:</label>
206
                        <li><label for="freedeliveryplace">Delivery place:</label>
207
                            <textarea cols="26" rows="3" name="freedeliveryplace" id="freedeliveryplace">[% freedeliveryplace %]</textarea></li>
207
                            <textarea cols="26" rows="3" name="freedeliveryplace" id="freedeliveryplace">[% freedeliveryplace %]</textarea></li>
208
						<li><label for="deliverycomment">Delivery comment:</label>
208
						<li><label for="deliverycomment">Delivery comment:</label>
209
							<textarea cols="26" rows="3" name="deliverycomment" id="deliverycomment">[% deliverycomment %]</textarea>
209
							<textarea cols="26" rows="3" name="deliverycomment" id="deliverycomment">[% deliverycomment %]</textarea>
Lines 253-259 function yuiToolbar() { Link Here
253
		<table>
253
		<table>
254
			<thead>
254
			<thead>
255
				<tr>
255
				<tr>
256
					<th>Basket Group</th><th colspan="3">Action</th>
256
					<th>Basket group</th><th colspan="3">Action</th>
257
				</tr>
257
				</tr>
258
			</thead>
258
			</thead>
259
			<tbody>
259
			<tbody>
Lines 285-291 function yuiToolbar() { Link Here
285
		<table>
285
		<table>
286
			<thead>
286
			<thead>
287
				<tr>
287
				<tr>
288
					<th>Basket Group</th><th colspan="3">Action</th>
288
					<th>Basket group</th><th colspan="3">Action</th>
289
				</tr>
289
				</tr>
290
			</thead>
290
			</thead>
291
			<tbody>
291
			<tbody>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt (-1 / +1 lines)
Lines 38-44 $(document).ready(function() { Link Here
38
[% INCLUDE 'header.inc' %]
38
[% INCLUDE 'header.inc' %]
39
[% INCLUDE 'acquisitions-search.inc' %]
39
[% INCLUDE 'acquisitions-search.inc' %]
40
40
41
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo; Search for Vendor <em>[% supplier %]</em> </div>
41
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo; Search for vendor <em>[% supplier %]</em> </div>
42
42
43
<div id="doc3" class="yui-t2">
43
<div id="doc3" class="yui-t2">
44
   
44
   
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt (-5 / +5 lines)
Lines 1-6 Link Here
1
[% USE KohaDates %]
1
[% USE KohaDates %]
2
[% INCLUDE 'doc-head-open.inc' %]
2
[% INCLUDE 'doc-head-open.inc' %]
3
<title>Koha &rsaquo; Acquisitions &rsaquo; [% IF ( suggestions_loop ) %]Orders search &rsaquo; Search Results[% ELSE %]Order search[% END %]</title>
3
<title>Koha &rsaquo; Acquisitions &rsaquo; [% IF ( suggestions_loop ) %]Orders search &rsaquo; Search results[% ELSE %]Order search[% END %]</title>
4
[% INCLUDE 'doc-head-close.inc' %]
4
[% INCLUDE 'doc-head-close.inc' %]
5
[% INCLUDE 'calendar.inc' %]
5
[% INCLUDE 'calendar.inc' %]
6
</head>
6
</head>
Lines 8-14 Link Here
8
[% INCLUDE 'header.inc' %]
8
[% INCLUDE 'header.inc' %]
9
[% INCLUDE 'acquisitions-search.inc' %]
9
[% INCLUDE 'acquisitions-search.inc' %]
10
10
11
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo; [% IF ( suggestions_loop ) %]<a href="/cgi-bin/koha/acqui/histsearch.pl">Orders search</a> &rsaquo; Search Results[% ELSE %]Order search[% END %]</div>
11
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo; [% IF ( suggestions_loop ) %]<a href="/cgi-bin/koha/acqui/histsearch.pl">Orders search</a> &rsaquo; Search results[% ELSE %]Order search[% END %]</div>
12
12
13
<div id="doc3" class="yui-t2">
13
<div id="doc3" class="yui-t2">
14
   
14
   
Lines 25-31 Link Here
25
		<li><label for="isbn">ISBN: </label> <input type="isbn" name="isbn" id="isbn" value="[% isbn %]" /></li>
25
		<li><label for="isbn">ISBN: </label> <input type="isbn" name="isbn" id="isbn" value="[% isbn %]" /></li>
26
		<li><label for="name">Vendor: </label> <input type="text" name="name" id="name" value="[% name %]" /></li>
26
		<li><label for="name">Vendor: </label> <input type="text" name="name" id="name" value="[% name %]" /></li>
27
		<li><label for="basket">Basket: </label> <input type="text" name="basket" id="basket" value="[% basket %]" /></li>
27
		<li><label for="basket">Basket: </label> <input type="text" name="basket" id="basket" value="[% basket %]" /></li>
28
		<li><label for="booksellerinvoicenumber ">Bookseller Invoice No: </label> <input type="text" name="booksellerinvoicenumber" id="booksellerinvoicenumber" value="[% booksellerinvoicenumber %]" /></li>
28
		<li><label for="booksellerinvoicenumber ">Bookseller invoice no: </label> <input type="text" name="booksellerinvoicenumber" id="booksellerinvoicenumber" value="[% booksellerinvoicenumber %]" /></li>
29
		<li><label for="from">From: </label> 
29
		<li><label for="from">From: </label> 
30
			<input type="text" size="10" id="from" name="from" value="[% from_placed_on %]" />
30
			<input type="text" size="10" id="from" name="from" value="[% from_placed_on %]" />
31
			<img src="[% themelang %]/lib/calendar/cal.gif" id="openCalendarFrom" style="cursor: pointer;" alt="Show Calendar" />
31
			<img src="[% themelang %]/lib/calendar/cal.gif" id="openCalendarFrom" style="cursor: pointer;" alt="Show Calendar" />
Lines 60-72 Link Here
60
    <input type="hidden" name="do_search" value="1" />
60
    <input type="hidden" name="do_search" value="1" />
61
	<fieldset class="action"><input type="submit" value="Search" /></fieldset>
61
	<fieldset class="action"><input type="submit" value="Search" /></fieldset>
62
	</form>[% END %]
62
	</form>[% END %]
63
	[% IF ( suggestions_loop ) %]<h1>Search Results</h1>
63
	[% IF ( suggestions_loop ) %]<h1>Search results</h1>
64
	<div id="acqui_histsearch">
64
	<div id="acqui_histsearch">
65
		<table>
65
		<table>
66
			<tr>
66
			<tr>
67
				<th>Basket</th>
67
				<th>Basket</th>
68
				<th>Basket group</th>
68
				<th>Basket group</th>
69
				<th>Invoice Number</th>
69
				<th>Invoice number</th>
70
				<th>Summary</th>
70
				<th>Summary</th>
71
				<th>Vendor</th>
71
				<th>Vendor</th>
72
				<th>Placed on</th>
72
				<th>Placed on</th>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt (-1 / +1 lines)
Lines 61-67 $(document).ready(function() { Link Here
61
	[% END %]
61
	[% END %]
62
    <table id="late_orders">
62
    <table id="late_orders">
63
        <tr>
63
        <tr>
64
            <th>Order Date</th>
64
            <th>Order date</th>
65
            <th>Estimated delivery date</th>
65
            <th>Estimated delivery date</th>
66
            <th>Vendor</th>
66
            <th>Vendor</th>
67
            <th>Information</th>
67
            <th>Information</th>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tt (-3 / +3 lines)
Lines 1-5 Link Here
1
[% INCLUDE 'doc-head-open.inc' %]
1
[% INCLUDE 'doc-head-open.inc' %]
2
<title>Koha &rsaquo; Acquisitions &rsaquo; Search Existing Records</title>
2
<title>Koha &rsaquo; Acquisitions &rsaquo; Search existing records</title>
3
[% INCLUDE 'greybox.inc' %]
3
[% INCLUDE 'greybox.inc' %]
4
[% INCLUDE 'doc-head-close.inc' %]
4
[% INCLUDE 'doc-head-close.inc' %]
5
</head>
5
</head>
Lines 7-13 Link Here
7
[% INCLUDE 'header.inc' %]
7
[% INCLUDE 'header.inc' %]
8
[% INCLUDE 'acquisitions-search.inc' %]
8
[% INCLUDE 'acquisitions-search.inc' %]
9
9
10
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo; <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% name %]</a> &rsaquo; <a href="/cgi-bin/koha/acqui/basket.pl?=[% basketno %]">Basket [% basketno %]</a> &rsaquo; Search Existing Records</div>
10
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo; <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% name %]</a> &rsaquo; <a href="/cgi-bin/koha/acqui/basket.pl?=[% basketno %]">Basket [% basketno %]</a> &rsaquo; Search existing records</div>
11
11
12
<div id="doc3" class="yui-t2">
12
<div id="doc3" class="yui-t2">
13
   
13
   
Lines 15-21 Link Here
15
	<div id="yui-main">
15
	<div id="yui-main">
16
	<div class="yui-b">
16
	<div class="yui-b">
17
	
17
	
18
<h1>Search Existing Records</h1>
18
<h1>Search existing records</h1>
19
19
20
20
21
[% IF ( total ) %]
21
[% IF ( total ) %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt (-2 / +2 lines)
Lines 25-33 Link Here
25
	<th> Order </th>
25
	<th> Order </th>
26
	<th> Vendor </th>
26
	<th> Vendor </th>
27
	<th> Itemtype </th>
27
	<th> Itemtype </th>
28
	<th> Left on Order </th>
28
	<th> Left on order </th>
29
	<th> Estimated cost per unit </th>
29
	<th> Estimated cost per unit </th>
30
	<th> Date Ordered </th>
30
	<th> Date ordered </th>
31
	<th> Subtotal </th>
31
	<th> Subtotal </th>
32
    </tr>
32
    </tr>
33
    </thead>
33
    </thead>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt (-1 / +1 lines)
Lines 61-67 Link Here
61
    <div class="error" style="display:none"></div>
61
    <div class="error" style="display:none"></div>
62
62
63
    <fieldset class="rows">
63
    <fieldset class="rows">
64
    <legend>Catalog Details</legend>
64
    <legend>Catalog details</legend>
65
    <ol><li><span class="label">Title: </span><span class="title">[% title |html %]</span></li>
65
    <ol><li><span class="label">Title: </span><span class="title">[% title |html %]</span></li>
66
    <li> <span class="label">Author: </span>
66
    <li> <span class="label">Author: </span>
67
        [% author %]</li>
67
        [% author %]</li>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt (-10 / +10 lines)
Lines 1-6 Link Here
1
[% INCLUDE 'doc-head-open.inc' %]
1
[% INCLUDE 'doc-head-open.inc' %]
2
<title>Koha &rsaquo; Acquisitions &rsaquo; [% IF ( date ) %]
2
<title>Koha &rsaquo; Acquisitions &rsaquo; [% IF ( date ) %]
3
            Receipt Summary for [% name %] [% IF ( invoice ) %]Invoice [% invoice %][% END %] on [% formatteddatereceived %][% ELSE %]Receive Orders from [% name %][% END %]</title>
3
            Receipt summary for [% name %] [% IF ( invoice ) %]invoice [% invoice %][% END %] on [% formatteddatereceived %][% ELSE %]Receive orders from [% name %][% END %]</title>
4
[% INCLUDE 'doc-head-close.inc' %]
4
[% INCLUDE 'doc-head-close.inc' %]
5
[% INCLUDE 'greybox.inc' %]
5
[% INCLUDE 'greybox.inc' %]
6
<script type="text/javascript" src="[% yuipath %]/json/json-min.js"></script>
6
<script type="text/javascript" src="[% yuipath %]/json/json-min.js"></script>
Lines 158-164 Link Here
158
[% INCLUDE 'acquisitions-search.inc' %]
158
[% INCLUDE 'acquisitions-search.inc' %]
159
159
160
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo;  [% IF ( datereceived ) %]
160
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo;  [% IF ( datereceived ) %]
161
            Receipt Summary for <i>[% name %]</i> [% IF ( invoice ) %]<i>[ [% invoice %] ]</i>[% END %] on <i>[% formatteddatereceived %]</i>
161
            Receipt summary for <i>[% name %]</i> [% IF ( invoice ) %]<i>[ [% invoice %] ]</i>[% END %] on <i>[% formatteddatereceived %]</i>
162
        [% ELSE %]
162
        [% ELSE %]
163
            Receive orders from [% name %]
163
            Receive orders from [% name %]
164
        [% END %]</div>
164
        [% END %]</div>
Lines 180-186 Link Here
180
	[% END %]
180
	[% END %]
181
    <h1>
181
    <h1>
182
        [% IF ( datereceived ) %]
182
        [% IF ( datereceived ) %]
183
            Receipt Summary for <i>[% name %]</i> [% IF ( invoice ) %] <i> [ [% invoice %] ] </i>[% END %] on <i>[% formatteddatereceived %]</i>
183
            Receipt summary for <i>[% name %]</i> [% IF ( invoice ) %] <i> [ [% invoice %] ] </i>[% END %] on <i>[% formatteddatereceived %]</i>
184
        [% ELSE %]
184
        [% ELSE %]
185
            Receive orders from [% name %]
185
            Receive orders from [% name %]
186
        [% END %]
186
        [% END %]
Lines 202-216 Link Here
202
	<!-- TODO: Add date picker, change rcv date. -->
202
	<!-- TODO: Add date picker, change rcv date. -->
203
</div>
203
</div>
204
<div id="acqui_receive_search">
204
<div id="acqui_receive_search">
205
    <h3>Pending Orders</h3>
205
    <h3>Pending orders</h3>
206
206
207
 [% IF ( loop_orders ) %]<table id="pendingt">
207
 [% IF ( loop_orders ) %]<table id="pendingt">
208
    <thead>
208
    <thead>
209
        <tr>
209
        <tr>
210
            <th>Basket</th>
210
            <th>Basket</th>
211
            <th>Order Line</th>
211
            <th>Order line</th>
212
            <th>Summary</th>
212
            <th>Summary</th>
213
    	    <th>View Record</th>
213
	    <th>View record</th>
214
            <th>Quantity</th>
214
            <th>Quantity</th>
215
            <th>Unit cost</th>
215
            <th>Unit cost</th>
216
            <th>Order cost</th>
216
            <th>Order cost</th>
Lines 307-313 Link Here
307
	</div>
307
	</div>
308
</div>
308
</div>
309
<div id="acqui_receive_receivelist">
309
<div id="acqui_receive_receivelist">
310
    <h3>Already Received</h3>
310
    <h3>Already received</h3>
311
311
312
   [% IF ( loop_received ) %]
312
   [% IF ( loop_received ) %]
313
   <form action="/cgi-bin/koha/acqui/parcel.pl" method="get" name="orderform">
313
   <form action="/cgi-bin/koha/acqui/parcel.pl" method="get" name="orderform">
Lines 315-323 Link Here
315
        <thead>
315
        <thead>
316
	    <tr>
316
	    <tr>
317
		<th>Basket</th>
317
		<th>Basket</th>
318
		<th>Order Line</th>
318
		<th>Order line</th>
319
		<th>Summary</th>
319
		<th>Summary</th>
320
		<th>View Record</th>
320
		<th>View record</th>
321
		<th>Quantity</th>  
321
		<th>Quantity</th>  
322
		<th>Est cost</th>
322
		<th>Est cost</th>
323
		<th>Actual cost</th>
323
		<th>Actual cost</th>
Lines 420-426 Link Here
420
		</li>
420
		</li>
421
421
422
		<li>
422
		<li>
423
		    <label for="orderfilter">Order Line :</label>
423
		    <label for="orderfilter">Order line :</label>
424
		    <input type="text" name="orderfilter" id="orderfilter" />
424
		    <input type="text" name="orderfilter" id="orderfilter" />
425
		</li>
425
		</li>
426
	    </ol>
426
	    </ol>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt (-6 / +6 lines)
Lines 25-33 Link Here
25
<table class="small">
25
<table class="small">
26
        <tr>
26
        <tr>
27
            <th>Line</th>
27
            <th>Line</th>
28
            <th>Date Received</th>
28
            <th>Date received</th>
29
            <th>Invoice Number</th>
29
            <th>Invoice number</th>
30
            <th>Item Count</th>
30
            <th>Item count</th>
31
            <th>Biblio count</th>
31
            <th>Biblio count</th>
32
            <th>Items expected</th>
32
            <th>Items expected</th>
33
        </tr>
33
        </tr>
Lines 85-91 Link Here
85
    <fieldset class="rows">
85
    <fieldset class="rows">
86
    <legend>Receive a new shipment</legend>
86
    <legend>Receive a new shipment</legend>
87
       <ol> <li>
87
       <ol> <li>
88
            <label for="invoice">Vendor Invoice </label>
88
            <label for="invoice">Vendor invoice </label>
89
            <input type="hidden" name="booksellerid" value="[% booksellerid %]" />
89
            <input type="hidden" name="booksellerid" value="[% booksellerid %]" />
90
            <input type="hidden" name="op" value="new" />
90
            <input type="hidden" name="op" value="new" />
91
			<input type="text" size="20" id="invoice" name="invoice" />
91
			<input type="text" size="20" id="invoice" name="invoice" />
Lines 131-138 Link Here
131
                <label for="dateto">To:</label><input type="text" size="9" id="dateto" name="dateto" value="[% dateto %]" /></li>
131
                <label for="dateto">To:</label><input type="text" size="9" id="dateto" name="dateto" value="[% dateto %]" /></li>
132
            <li><label for="orderby">Sort by :</label><select name="orderby" id="orderby">
132
            <li><label for="orderby">Sort by :</label><select name="orderby" id="orderby">
133
                <option value="aqorders.booksellerinvoicenumber">Invoice number</option>
133
                <option value="aqorders.booksellerinvoicenumber">Invoice number</option>
134
                <option value="datereceived"> Date Received</option>
134
                <option value="datereceived"> Date received</option>
135
                <option value="datereceived desc"> Date Received reverse</option>
135
                <option value="datereceived desc"> Date received reverse</option>
136
                <option value="aqorders.booksellerinvoicenumber desc"> Invoice number reverse</option>
136
                <option value="aqorders.booksellerinvoicenumber desc"> Invoice number reverse</option>
137
                </select><br />
137
                </select><br />
138
                <label for="resultsperpage">Results per page :</label><select name="resultsperpage" id="resultsperpage">
138
                <label for="resultsperpage">Results per page :</label><select name="resultsperpage" id="resultsperpage">
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt (-4 / +4 lines)
Lines 28-37 Link Here
28
	<th> Invoice </th>
28
	<th> Invoice </th>
29
	<th> Itemtype </th>
29
	<th> Itemtype </th>
30
	<th> Received </th>
30
	<th> Received </th>
31
	<th> Unit Price </th>
31
	<th> Unit price </th>
32
	<th> Freight per Item </th>
32
	<th> Freight per item </th>
33
	<th> Date Ordered </th>
33
	<th> Date ordered </th>
34
	<th> Date Received </th>
34
	<th> Date received </th>
35
	<th> Subtotal </th>
35
	<th> Subtotal </th>
36
    </tr>
36
    </tr>
37
    </thead>
37
    </thead>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt (-6 / +6 lines)
Lines 155-163 if (f.company.value == "") { Link Here
155
        <div class="yui-g">
155
        <div class="yui-g">
156
            <div id="supplier-company-details" class="yui-u first">
156
            <div id="supplier-company-details" class="yui-u first">
157
                <h2>Vendor details</h2>
157
                <h2>Vendor details</h2>
158
                <p><span class="label">Company Name: </span>[% name %]</p>
158
                <p><span class="label">Company name: </span>[% name %]</p>
159
                <p><span class="label">Postal Address: </span>[% postal %]</p>
159
                <p><span class="label">Postal address: </span>[% postal %]</p>
160
                <p><span class="label">Physical Address: </span>[% address1 %][% address2 %][% address3 %][% address4 %]</p>
160
                <p><span class="label">Physical address: </span>[% address1 %][% address2 %][% address3 %][% address4 %]</p>
161
                <p><span class="label">Phone: </span>[% phone %]</p>
161
                <p><span class="label">Phone: </span>[% phone %]</p>
162
                <p><span class="label">Fax: </span>[% fax %]</p>
162
                <p><span class="label">Fax: </span>[% fax %]</p>
163
                [% IF ( url ) %]
163
                [% IF ( url ) %]
Lines 192-202 if (f.company.value == "") { Link Here
192
                    [% END %]</p>
192
                    [% END %]</p>
193
            <p><strong>List prices are: </strong>[% listprice %]</p>
193
            <p><strong>List prices are: </strong>[% listprice %]</p>
194
            <p><strong>Invoice prices are: </strong>[% invoiceprice %]</p>
194
            <p><strong>Invoice prices are: </strong>[% invoiceprice %]</p>
195
            [% IF ( GST ) %]<p><strong>Tax Number Registered: </strong>
195
            [% IF ( GST ) %]<p><strong>Tax number registered: </strong>
196
                    [% IF ( gstreg ) %]Yes[% ELSE %]No[% END %]</p>
196
                    [% IF ( gstreg ) %]Yes[% ELSE %]No[% END %]</p>
197
            <p><strong>List Item Price Includes Tax: </strong>
197
            <p><strong>List item price includes tax: </strong>
198
                    [% IF ( listincgst ) %]Yes[% ELSE %]No[% END %]</p>
198
                    [% IF ( listincgst ) %]Yes[% ELSE %]No[% END %]</p>
199
            <p><strong>Invoice Item Price Includes Tax: </strong>
199
            <p><strong>Invoice item price includes tax: </strong>
200
                    [% IF ( invoiceincgst ) %]Yes[% ELSE %]No[% END %]</p>[% END %]
200
                    [% IF ( invoiceincgst ) %]Yes[% ELSE %]No[% END %]</p>[% END %]
201
            <p><strong>Discount: </strong>
201
            <p><strong>Discount: </strong>
202
                [% discount %] %</p>
202
                [% discount %] %</p>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt (-6 / +5 lines)
Lines 76-89 tr.selected { background-color : #FFFFCC; } tr.selected td { background-color : Link Here
76
	    <fieldset class="rows">
76
	    <fieldset class="rows">
77
		 <ol><li><label for="searchtitle">Title: </label> <input type="text" id="searchtitle"  name="title" value="[% title |html %]" /></li>
77
		 <ol><li><label for="searchtitle">Title: </label> <input type="text" id="searchtitle"  name="title" value="[% title |html %]" /></li>
78
		 <li><label for="isbn">ISBN/ISSN: </label> <input type="text" id="isbn" name="isbn" value="[% isbn %]" /></li>
78
		 <li><label for="isbn">ISBN/ISSN: </label> <input type="text" id="isbn" name="isbn" value="[% isbn %]" /></li>
79
		 <li><label for="lccall">LC Call Number: </label> <input type="text" id="lccall" name="lccall" value="" /></li>
79
		 <li><label for="lccall">LC call number: </label> <input type="text" id="lccall" name="lccall" value="" /></li>
80
         <li><label for="controlnumber">Control No.: </label> <input type="text" id="controlnumber" name="controlnumber" value="" /></li>
80
         <li><label for="controlnumber">Control no.: </label> <input type="text" id="controlnumber" name="controlnumber" value="" /></li>
81
</ol>
81
</ol>
82
		</fieldset>
82
		</fieldset>
83
	    </div>
83
	    </div>
84
    <div class="yui-u">
84
    <div class="yui-u">
85
	<fieldset class="rows">		 <ol><li><label for="author">Author: </label> <input type="text" id="author" name="author" value="[% author %]" /><!--  <label for="Keyword">Keyword</label> <input type="text" name="keyword" value="" /> --></li>
85
	<fieldset class="rows">		 <ol><li><label for="author">Author: </label> <input type="text" id="author" name="author" value="[% author %]" /><!--  <label for="Keyword">Keyword</label> <input type="text" name="keyword" value="" /> --></li>
86
		 <li> <label for="subject">Subject Heading: </label> <input type="text" id="subject" name="subject" value="" /></li>
86
		 <li> <label for="subject">Subject heading: </label> <input type="text" id="subject" name="subject" value="" /></li>
87
		 <li><label for="dewey">Dewey: </label> <input type="text" id="dewey" name="dewey" value="" /></li></ol></fieldset>
87
		 <li><label for="dewey">Dewey: </label> <input type="text" id="dewey" name="dewey" value="" /></li></ol></fieldset>
88
	     <fieldset class="rows" >
88
	     <fieldset class="rows" >
89
                 <ol>
89
                 <ol>
Lines 108-114 tr.selected { background-color : #FFFFCC; } tr.selected td { background-color : Link Here
108
	    </div>
108
	    </div>
109
</div>
109
</div>
110
<div class="yui-g">
110
<div class="yui-g">
111
<h2>Search targets <span style="display: inline; font-size: 70%; padding-left: 1em;"><span class="checkall"><a id="CheckAll" href="#">Select All</a></span><span class="clearall"><a id="CheckNone" href="#">Clear All</a></span></span></h2>
111
<h2>Search targets <span style="display: inline; font-size: 70%; padding-left: 1em;"><span class="checkall"><a id="CheckAll" href="#">Select all</a></span><span class="clearall"><a id="CheckNone" href="#">Clear all</a></span></span></h2>
112
112
113
    [% FOREACH serverloo IN serverloop %]
113
    [% FOREACH serverloo IN serverloop %]
114
        <p>
114
        <p>
Lines 143-149 tr.selected { background-color : #FFFFCC; } tr.selected td { background-color : Link Here
143
        [% IF ( breeding_loo.breedingid ) %]
143
        [% IF ( breeding_loo.breedingid ) %]
144
144
145
        [% IF ( breeding_loo.toggle ) %]<tr class="highlight">[% ELSE %]<tr>[% END %]
145
        [% IF ( breeding_loo.toggle ) %]<tr class="highlight">[% ELSE %]<tr>[% END %]
146
            <td>[% breeding_loo.server %] <div class="linktools"><a href="/cgi-bin/koha/catalogue/showmarc.pl?importid=[% breeding_loo.breedingid %]" rel="gb_page_center[600,500]">Preview MARC</a> <a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&amp;importid=[% breeding_loo.breedingid %]" rel="gb_page_center[600,500]">Preview Card</a> <a href="/cgi-bin/koha/acqui/neworderempty.pl?frameworkcode=[% frameworkcode %]&amp;breedingid=[% breeding_loo.breedingid %]&amp;booksellerid=[% booksellerid %]&amp;basketno=[% basketno %]">Order</a> <a href="#" id="closemenu" title="Close this menu"> X </a></div></td>
146
            <td>[% breeding_loo.server %] <div class="linktools"><a href="/cgi-bin/koha/catalogue/showmarc.pl?importid=[% breeding_loo.breedingid %]" rel="gb_page_center[600,500]">Preview MARC</a> <a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&amp;importid=[% breeding_loo.breedingid %]" rel="gb_page_center[600,500]">Preview card</a> <a href="/cgi-bin/koha/acqui/neworderempty.pl?frameworkcode=[% frameworkcode %]&amp;breedingid=[% breeding_loo.breedingid %]&amp;booksellerid=[% booksellerid %]&amp;basketno=[% basketno %]">Order</a> <a href="#" id="closemenu" title="Close this menu"> X </a></div></td>
147
            <td>[% breeding_loo.title |html %]</td>
147
            <td>[% breeding_loo.title |html %]</td>
148
            <td>[% breeding_loo.author %]</td>
148
            <td>[% breeding_loo.author %]</td>
149
            <td>[% breeding_loo.isbn %]</td>
149
            <td>[% breeding_loo.isbn %]</td>
150
- 

Return to bug 2780