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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tmpl (-3 / +3 lines)
Lines 40-46 Link Here
40
40
41
                             </td>
41
                             </td>
42
                             <td><!-- TMPL_VAR name="overlay_status"--></td>
42
                             <td><!-- TMPL_VAR name="overlay_status"--></td>
43
                             <td><a href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=<!--TMPL_VAR name="booksellerid" -->&basketno=<!-- TMPL_VAR name="basketno" -->&booksellerid=<!-- TMPL_VAR name="booksellerid" -->&breedingid=<!-- TMPL_VAR name="import_record_id" -->&import_batch_id=<!-- TMPL_VAR name="import_batch_id" -->">Add order</a></td>
43
                             <td><a href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=<!--TMPL_VAR name="booksellerid" -->&amp;basketno=<!-- TMPL_VAR name="basketno" -->&amp;booksellerid=<!-- TMPL_VAR name="booksellerid" -->&amp;breedingid=<!-- TMPL_VAR name="import_record_id" -->&amp;import_batch_id=<!-- TMPL_VAR name="import_batch_id" -->">Add order</a></td>
44
                         </tr>
44
                         </tr>
45
                         <!-- TMPL_IF name="match_biblionumber" -->
45
                         <!-- TMPL_IF name="match_biblionumber" -->
46
                           <tr>
46
                           <tr>
Lines 60-66 Link Here
60
                    <!-- TMPL_IF name="current_page" -->
60
                    <!-- TMPL_IF name="current_page" -->
61
                      <span class="current"><!-- TMPL_VAR name="page_number" --></span>
61
                      <span class="current"><!-- TMPL_VAR name="page_number" --></span>
62
                    <!-- TMPL_ELSE -->
62
                    <!-- TMPL_ELSE -->
63
                      <a class="nav" href="<!-- TMPL_VAR name="script_name" -->?import_batch_id=<!-- TMPL_VAR name="import_batch_id" -->&offset=<!-- TMPL_VAR name="offset" -->"><!-- TMPL_VAR name="page_number" --></a>
63
                      <a class="nav" href="<!-- TMPL_VAR name="script_name" -->?import_batch_id=<!-- TMPL_VAR name="import_batch_id" -->&amp;offset=<!-- TMPL_VAR name="offset" -->"><!-- TMPL_VAR name="page_number" --></a>
64
                    <!-- /TMPL_IF -->
64
                    <!-- /TMPL_IF -->
65
                  <!-- /TMPL_LOOP -->
65
                  <!-- /TMPL_LOOP -->
66
              <!-- /TMPL_IF -->
66
              <!-- /TMPL_IF -->
Lines 82-88 Link Here
82
                       <td><!-- TMPL_VAR name="import_status" --></td>
82
                       <td><!-- TMPL_VAR name="import_status" --></td>
83
                       <td><!-- TMPL_VAR name="upload_timestamp" --></td>
83
                       <td><!-- TMPL_VAR name="upload_timestamp" --></td>
84
                       <td><!-- TMPL_VAR name="num_biblios" --></td>
84
                       <td><!-- TMPL_VAR name="num_biblios" --></td>
85
                       <td><a href="<!-- TMPL_VAR name="scriptname" -->?import_batch_id=<!-- TMPL_VAR name="import_batch_id" -->&basketno=<!-- TMPL_VAR name="basketno" -->&booksellerid=<!-- TMPL_VAR name="booksellerid" -->">Add orders</a></td>
85
                       <td><a href="<!-- TMPL_VAR name="scriptname" -->?import_batch_id=<!-- TMPL_VAR name="import_batch_id" -->&amp;basketno=<!-- TMPL_VAR name="basketno" -->&amp;booksellerid=<!-- TMPL_VAR name="booksellerid" -->">Add orders</a></td>
86
                     </tr>
86
                     </tr>
87
                     <!-- /TMPL_LOOP -->
87
                     <!-- /TMPL_LOOP -->
88
                   </table>
88
                   </table>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl (-2 / +2 lines)
Lines 113-119 Link Here
113
            <!-- /TMPL_UNLESS -->
113
            <!-- /TMPL_UNLESS -->
114
            
114
            
115
    <!-- TMPL_IF NAME="NO_BOOKSELLER" -->
115
    <!-- TMPL_IF NAME="NO_BOOKSELLER" -->
116
    <h2>Supplier Not Found</h2>
116
    <h2>Vendor not found</h2>
117
    <!-- TMPL_ELSE -->
117
    <!-- TMPL_ELSE -->
118
        <!-- TMPL_IF NAME="delete_confirmed" -->
118
        <!-- TMPL_IF NAME="delete_confirmed" -->
119
            <h3>Basket deleted</h3>
119
            <h3>Basket deleted</h3>
Lines 138-144 Link Here
138
            <div id="acqui_basket_summary"  class="yui-g">
138
            <div id="acqui_basket_summary"  class="yui-g">
139
                <h2>Basket details</h2>
139
                <h2>Basket details</h2>
140
                <!-- TMPL_IF NAME="basketnote" --><p>Internal note: <!-- TMPL_VAR NAME="basketnote" --></p><!-- /TMPL_IF -->
140
                <!-- TMPL_IF NAME="basketnote" --><p>Internal note: <!-- TMPL_VAR NAME="basketnote" --></p><!-- /TMPL_IF -->
141
                <!-- TMPL_IF NAME="basketbooksellernote" --><p>Bookseller note: <!-- TMPL_VAR NAME="basketbooksellernote" --></p><!-- /TMPL_IF -->
141
                <!-- TMPL_IF NAME="basketbooksellernote" --><p>Vendor note: <!-- TMPL_VAR NAME="basketbooksellernote" --></p><!-- /TMPL_IF -->
142
                <!-- TMPL_IF NAME="basketcontractno" -->
142
                <!-- TMPL_IF NAME="basketcontractno" -->
143
                    <p>Contract number: <!-- TMPL_VAR NAME="basketcontractno" --></p>
143
                    <p>Contract number: <!-- TMPL_VAR NAME="basketcontractno" --></p>
144
                    <p>Contract name: <a href="../admin/aqcontract.pl?op=add_form&amp;contractnumber=<!-- TMPL_VAR NAME="basketcontractno" -->"><!-- TMPL_VAR NAME="basketcontractname" --></a></p>
144
                    <p>Contract name: <a href="../admin/aqcontract.pl?op=add_form&amp;contractnumber=<!-- TMPL_VAR NAME="basketcontractno" -->"><!-- TMPL_VAR NAME="basketcontractname" --></a></p>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tmpl (-4 / +4 lines)
Lines 140-147 fieldset.various li { Link Here
140
				
140
				
141
					function yuiToolbar() {
141
					function yuiToolbar() {
142
						var booksellermenu = [
142
						var booksellermenu = [
143
							{ text: _("Bookseller"), url: "/cgi-bin/koha/acqui/supplier.pl?supplierid=<!-- TMPL_VAR name="booksellerid" -->" },
143
							{ text: _("Vendor"), url: "/cgi-bin/koha/acqui/supplier.pl?supplierid=<!-- TMPL_VAR name="booksellerid" -->" },
144
							{ text: _("Edit bookseller"), url: "/cgi-bin/koha/acqui/booksellers.pl?booksellerid=<!-- TMPL_VAR name="booksellerid" -->"},
144
							{ text: _("Edit vendor"), url: "/cgi-bin/koha/acqui/booksellers.pl?booksellerid=<!-- TMPL_VAR name="booksellerid" -->"},
145
						]
145
						]
146
						var ordersbutton = [
146
						var ordersbutton = [
147
						         { text: _("Manage orders"), url: "/cgi-bin/koha/acqui/booksellers.pl?supplierid=<!-- TMPL_VAR name="booksellerid" -->" },
147
						         { text: _("Manage orders"), url: "/cgi-bin/koha/acqui/booksellers.pl?supplierid=<!-- TMPL_VAR name="booksellerid" -->" },
Lines 150-156 fieldset.various li { Link Here
150
						new YAHOO.widget.Button("newbasketgroup");
150
						new YAHOO.widget.Button("newbasketgroup");
151
					    new YAHOO.widget.Button({
151
					    new YAHOO.widget.Button({
152
					        type: "menu",
152
					        type: "menu",
153
					        label: _("Bookseller"),
153
					        label: _("Vendor"),
154
					        name: "booksellerbutton",
154
					        name: "booksellerbutton",
155
					        menu: booksellermenu,
155
					        menu: booksellermenu,
156
					        container: "toolbar"
156
					        container: "toolbar"
Lines 168-174 fieldset.various li { Link Here
168
				</script>
168
				</script>
169
				<a href="?op=add&amp;booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->" name="newbasketgroup" id="newbasketgroup">New Basket Group</a>
169
				<a href="?op=add&amp;booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->" name="newbasketgroup" id="newbasketgroup">New Basket Group</a>
170
			</div>
170
			</div>
171
        	<h1>Basket grouping for Vendor <a href="/cgi-bin/koha/acqui/supplier.pl?supplierid=<!-- TMPL_VAR NAME="booksellerid" -->"><!-- TMPL_VAR name="booksellername" --></a></h1>
171
			<h1>Basket grouping for vendor <a href="/cgi-bin/koha/acqui/supplier.pl?supplierid=<!-- TMPL_VAR NAME="booksellerid" -->"><!-- TMPL_VAR name="booksellername" --></a></h1>
172
		</div>
172
		</div>
173
<!--  TMPL_IF NAME="grouping" -->
173
<!--  TMPL_IF NAME="grouping" -->
174
	<div id="bd"> 
174
	<div id="bd"> 
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tmpl (-1 / +1 lines)
Lines 129-135 li.list2 { Link Here
129
                    <textarea name="basketnote" id="basketnote" rows="5" cols="40"><!-- TMPL_VAR NAME="basketnote" --></textarea>
129
                    <textarea name="basketnote" id="basketnote" rows="5" cols="40"><!-- TMPL_VAR NAME="basketnote" --></textarea>
130
                </li>
130
                </li>
131
                <li>
131
                <li>
132
                    <label for="basketbooksellernote">Bookseller note</label> &nbsp;
132
                    <label for="basketbooksellernote">Vendor note</label> &nbsp;
133
                    <textarea name="basketbooksellernote" id="basketbooksellernote" rows="5" cols="40"><!-- TMPL_VAR NAME="basketbooksellernote" --></textarea>
133
                    <textarea name="basketbooksellernote" id="basketbooksellernote" rows="5" cols="40"><!-- TMPL_VAR NAME="basketbooksellernote" --></textarea>
134
                </li>
134
                </li>
135
                <!-- TMPL_IF NAME="contractloop" -->
135
                <!-- TMPL_IF NAME="contractloop" -->
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl (-1 / +1 lines)
Lines 80-86 ff.submit(); Link Here
80
        <legend>Basket details</legend>
80
        <legend>Basket details</legend>
81
		<ol>
81
		<ol>
82
        <!-- TMPL_IF NAME="basketnote" --><li><span class="label">Internal note:</span> <!-- TMPL_VAR NAME="basketnote" --></li><!-- /TMPL_IF -->
82
        <!-- TMPL_IF NAME="basketnote" --><li><span class="label">Internal note:</span> <!-- TMPL_VAR NAME="basketnote" --></li><!-- /TMPL_IF -->
83
        <!-- TMPL_IF NAME="basketbooksellernote" --><li><span class="label">Bookseller note</span>: <!-- TMPL_VAR NAME="basketbooksellernote" --></li><!-- /TMPL_IF -->
83
        <!-- TMPL_IF NAME="basketbooksellernote" --><li><span class="label">Vendor note</span>: <!-- TMPL_VAR NAME="basketbooksellernote" --></li><!-- /TMPL_IF -->
84
        <!-- TMPL_IF NAME="basketcontractno" -->
84
        <!-- TMPL_IF NAME="basketcontractno" -->
85
            <li><span class="label">Contract number: </span><!-- TMPL_VAR NAME="basketcontractno" --></li>
85
            <li><span class="label">Contract number: </span><!-- TMPL_VAR NAME="basketcontractno" --></li>
86
            <li><span class="label">Contract name:</span> <a href="/cgi-bin/koha/admin/aqcontract.pl?op=add_form&amp;contractnumber=<!-- TMPL_VAR NAME="basketcontractno" -->"><!-- TMPL_VAR NAME="basketcontractname" --></a></li>
86
            <li><span class="label">Contract name:</span> <a href="/cgi-bin/koha/admin/aqcontract.pl?op=add_form&amp;contractnumber=<!-- TMPL_VAR NAME="basketcontractno" -->"><!-- TMPL_VAR NAME="basketcontractname" --></a></li>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tmpl (-7 / +7 lines)
Lines 117-123 function Check(ff) { Link Here
117
                                <li><label for="contractdescription">Description</label> &nbsp;
117
                                <li><label for="contractdescription">Description</label> &nbsp;
118
                                        <input type="text" name="contractdescription" id="contractdescription" size="40" maxlength="80" value="<!-- TMPL_VAR NAME="contractdescription" -->" />
118
                                        <input type="text" name="contractdescription" id="contractdescription" size="40" maxlength="80" value="<!-- TMPL_VAR NAME="contractdescription" -->" />
119
                                </li>
119
                                </li>
120
                                <li><label for="booksellerid">Bookseller</label>
120
                                <li><label for="booksellerid">Vendor</label>
121
                                <select id="booksellerid" name="booksellerid">
121
                                <select id="booksellerid" name="booksellerid">
122
                                <!-- TMPL_LOOP NAME="booksellerloop" -->
122
                                <!-- TMPL_LOOP NAME="booksellerloop" -->
123
                                    <!-- TMPL_IF NAME="selected" -->
123
                                    <!-- TMPL_IF NAME="selected" -->
Lines 172-183 function Check(ff) { Link Here
172
                    <fieldset>
172
                    <fieldset>
173
                        <legend>Confirm Deletion of Contract <!-- TMPL_VAR NAME="contractnumber" --></legend>
173
                        <legend>Confirm Deletion of Contract <!-- TMPL_VAR NAME="contractnumber" --></legend>
174
                        <table>
174
                        <table>
175
                            <tr><th scope="row">contractnumber:</th><td><!-- TMPL_VAR NAME="contractnumber" --></td></tr>
175
                            <tr><th scope="row">Contract number:</th><td><!-- TMPL_VAR NAME="contractnumber" --></td></tr>
176
                            <tr><th scope="row">Contract Name:</th><td><!-- TMPL_VAR NAME="contractname" --></td></tr>
176
                            <tr><th scope="row">Contract name:</th><td><!-- TMPL_VAR NAME="contractname" --></td></tr>
177
                            <tr><th scope="row">Contract Description:</th><td><!-- TMPL_VAR NAME="contractdescription" --></td></tr>
177
                            <tr><th scope="row">Contract description:</th><td><!-- TMPL_VAR NAME="contractdescription" --></td></tr>
178
                            <tr><th scope="row">contractstartdate:</th><td><!-- TMPL_VAR NAME="contractstartdate" --></td></tr>
178
                            <tr><th scope="row">Contract start date:</th><td><!-- TMPL_VAR NAME="contractstartdate" --></td></tr>
179
                            <tr><th scope="row">contractenddate:</th><td><!-- TMPL_VAR NAME="contractenddate" --></td></tr>
179
                            <tr><th scope="row">Contract end date:</th><td><!-- TMPL_VAR NAME="contractenddate" --></td></tr>
180
                            <tr><th scope="row">bookseller:</th><td><!-- TMPL_VAR NAME="booksellername" --></td></tr>
180
                            <tr><th scope="row">Vendor:</th><td><!-- TMPL_VAR NAME="booksellername" --></td></tr>
181
                        </table>
181
                        </table>
182
                        <fieldset class="action">
182
                        <fieldset class="action">
183
                            <input type="hidden" name="op" value="delete_confirmed" />
183
                            <input type="hidden" name="op" value="delete_confirmed" />
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/help/serials/claims.tmpl (-3 / +3 lines)
Lines 6-16 Link Here
6
<p>Claims are notices that you send when an issue that was expected has not been received by the library.</p>
6
<p>Claims are notices that you send when an issue that was expected has not been received by the library.</p>
7
7
8
<h2>How to lodge a Claim?</h2>
8
<h2>How to lodge a Claim?</h2>
9
<p>Make a selection from the drop down list. The &quot;All Suppliers&quot; count gives you a count of the total number of current item claims across all suppliers.</p>
9
<p>Make a selection from the drop down list. The &quot;All Vendors&quot; count gives you a count of the total number of current item claims across all vendors.</p>
10
<p>There are two ways to lodge a claim with the supplier:</p>
10
<p>There are two ways to lodge a claim with the vendor:</p>
11
	<ol>
11
	<ol>
12
		<li>Using a Letter defined in Notices. Note that you will need to set up the notice.</li>
12
		<li>Using a Letter defined in Notices. Note that you will need to set up the notice.</li>
13
		<li>Exporting the claims information. This downloads a CSV file to your local machine with all the claim data ready for additional formatting before sending to the supplier.</li>
13
		<li>Exporting the claims information. This downloads a CSV file to your local machine with all the claim data ready for additional formatting before sending to the vendor.</li>
14
	</ol>
14
	</ol>
15
15
16
<h2>How to resolve a Claim?</h2>
16
<h2>How to resolve a Claim?</h2>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tmpl (-1 / +1 lines)
Lines 235-241 Link Here
235
				<td>&nbsp;</td>
235
				<td>&nbsp;</td>
236
			</tr>
236
			</tr>
237
			<tr class="hilighted">
237
			<tr class="hilighted">
238
				<td>Supplier</td>
238
				<td>Vendor</td>
239
				<td><input type="radio" checked="checked" name="Line" value="aqbooksellers.name" /></td>
239
				<td><input type="radio" checked="checked" name="Line" value="aqbooksellers.name" /></td>
240
				<td><input type="radio" name="Column" value="aqbooksellers.name" /></td>
240
				<td><input type="radio" name="Column" value="aqbooksellers.name" /></td>
241
				<td><!-- TMPL_VAR NAME="CGIBookSeller" --></td>
241
				<td><!-- TMPL_VAR NAME="CGIBookSeller" --></td>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/serials_stats.tmpl (-2 / +2 lines)
Lines 31-41 Link Here
31
	<table id="resulttable">
31
	<table id="resulttable">
32
		<thead>
32
		<thead>
33
			<tr>
33
			<tr>
34
				<th>Bookseller</th>
34
				<th>Vendor</th>
35
				<th>Title</th>
35
				<th>Title</th>
36
				<th>Subscription id</th>
36
				<th>Subscription id</th>
37
				<th>Branch</th>
37
				<th>Branch</th>
38
				<th>Callnumber</th>
38
				<th>Call Number</th>
39
				<th>Subscription Begin</th>
39
				<th>Subscription Begin</th>
40
				<th>Subscription End</th>
40
				<th>Subscription End</th>
41
			</tr>
41
			</tr>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tmpl (-5 / +4 lines)
Lines 158-164 Link Here
158
158
159
    <h1>Claims</h1>
159
    <h1>Claims</h1>
160
160
161
<!-- TMPL_IF NAME="letter" --><!-- TMPL_UNLESS NAME="missingissues" --><!-- TMPL_IF NAME="supplierid" --> <div class="dialog alert">No missing issues found.</div><!-- TMPL_ELSE --><div class="dialog message">Please choose a supplier.</div><!-- /TMPL_IF --><!-- /TMPL_UNLESS --><!-- /TMPL_IF -->
161
<!-- TMPL_IF NAME="letter" --><!-- TMPL_UNLESS NAME="missingissues" --><!-- TMPL_IF NAME="supplierid" --> <div class="dialog alert">No missing issues found.</div><!-- TMPL_ELSE --><div class="dialog message">Please choose a vendor.</div><!-- /TMPL_IF --><!-- /TMPL_UNLESS --><!-- /TMPL_IF -->
162
	
162
	
163
	     <!-- TMPL_IF NAME="SHOWCONFIRMATION" -->
163
	     <!-- TMPL_IF NAME="SHOWCONFIRMATION" -->
164
     <div class="dialog alert">Your notification has been sent.</div>
164
     <div class="dialog alert">Your notification has been sent.</div>
Lines 248-254 Link Here
248
                    <!--TMPL_IF NAME="letter"-->
248
                    <!--TMPL_IF NAME="letter"-->
249
                    <th>Claim</th>
249
                    <th>Claim</th>
250
                    <!--/TMPL_IF-->
250
                    <!--/TMPL_IF-->
251
                    <th>Supplier</th>
251
                    <th>Vendor</th>
252
                    <th>Title</th>
252
                    <th>Title</th>
253
                    <th>Issue number</th>
253
                    <th>Issue number</th>
254
                    <th>Status</th>
254
                    <th>Status</th>
Lines 294-300 Link Here
294
	     <p><span class="exportSelected"></span></p>
294
	     <p><span class="exportSelected"></span></p>
295
        <!-- TMPL_IF Name="singlesupplier"-->
295
        <!-- TMPL_IF Name="singlesupplier"-->
296
            <input type="hidden" name="supplierid" value="<!--TMPL_VAR NAME="supplierid"-->" />
296
            <input type="hidden" name="supplierid" value="<!--TMPL_VAR NAME="supplierid"-->" />
297
            <!-- <a href="claims.pl?supplierid=<!-- TMPL_VAR name="supplierid" -->&amp;op=preview" onclick="popup(<!-- TMPL_VAR name="supplierid" -->,''); return false" class="button">Supplier Group Claim Notice</a></p> -->
297
            <!-- <a href="claims.pl?supplierid=<!-- TMPL_VAR name="supplierid" -->&amp;op=preview" onclick="popup(<!-- TMPL_VAR name="supplierid" -->,''); return false" class="button">Vendor Group Claim Notice</a></p> -->
298
        <!-- /TMPL_IF -->
298
        <!-- /TMPL_IF -->
299
299
300
<!--TMPL_IF Name="letter" -->
300
<!--TMPL_IF Name="letter" -->
Lines 346-352 Link Here
346
        <h3>Missing Issues</h3>
346
        <h3>Missing Issues</h3>
347
        <table>
347
        <table>
348
            <tr>
348
            <tr>
349
                <td><b>Supplier<b></td>
349
                <td><b>Vendor<b></td>
350
                <td><b>Title</b></td>
350
                <td><b>Title</b></td>
351
                <td><b>Issue number</b></td>
351
                <td><b>Issue number</b></td>
352
                <td><b>Missing since</b></td>
352
                <td><b>Missing since</b></td>
353
- 

Return to bug 3958