[Koha-patches] [biblibre/3.2_community] Fixes for Bug 3958, Standardize vendor/supplier/bookseller terminology
Owen Leonard
oleonard at myacpl.org
Mon Jan 25 16:54:17 CET 2010
Changing instances of "supplier" or "bookseller" to "vendor."
---
.../prog/en/modules/acqui/addorderiso2709.tmpl | 6 +++---
.../prog/en/modules/acqui/basket.tmpl | 4 ++--
.../prog/en/modules/acqui/basketgroup.tmpl | 8 ++++----
.../prog/en/modules/acqui/basketheader.tmpl | 2 +-
.../prog/en/modules/acqui/neworderempty.tmpl | 2 +-
.../prog/en/modules/admin/aqcontract.tmpl | 14 +++++++-------
.../prog/en/modules/help/serials/claims.tmpl | 6 +++---
.../en/modules/reports/acquisitions_stats.tmpl | 2 +-
.../prog/en/modules/reports/serials_stats.tmpl | 4 ++--
.../prog/en/modules/serials/claims.tmpl | 8 ++++----
10 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tmpl
index 16d490a..e5756a4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tmpl
@@ -40,7 +40,7 @@
</td>
<td><!-- TMPL_VAR name="overlay_status"--></td>
- <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>
+ <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>
</tr>
<!-- TMPL_IF name="match_biblionumber" -->
<tr>
@@ -60,7 +60,7 @@
<!-- TMPL_IF name="current_page" -->
<span class="current"><!-- TMPL_VAR name="page_number" --></span>
<!-- TMPL_ELSE -->
- <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>
+ <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>
<!-- /TMPL_IF -->
<!-- /TMPL_LOOP -->
<!-- /TMPL_IF -->
@@ -82,7 +82,7 @@
<td><!-- TMPL_VAR name="import_status" --></td>
<td><!-- TMPL_VAR name="upload_timestamp" --></td>
<td><!-- TMPL_VAR name="num_biblios" --></td>
- <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>
+ <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>
</tr>
<!-- /TMPL_LOOP -->
</table>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl
index a174e5e..5124441 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl
@@ -113,7 +113,7 @@
<!-- /TMPL_UNLESS -->
<!-- TMPL_IF NAME="NO_BOOKSELLER" -->
- <h2>Supplier Not Found</h2>
+ <h2>Vendor not found</h2>
<!-- TMPL_ELSE -->
<!-- TMPL_IF NAME="delete_confirmed" -->
<h3>Basket deleted</h3>
@@ -138,7 +138,7 @@
<div id="acqui_basket_summary" class="yui-g">
<h2>Basket details</h2>
<!-- TMPL_IF NAME="basketnote" --><p>Internal note: <!-- TMPL_VAR NAME="basketnote" --></p><!-- /TMPL_IF -->
- <!-- TMPL_IF NAME="basketbooksellernote" --><p>Bookseller note: <!-- TMPL_VAR NAME="basketbooksellernote" --></p><!-- /TMPL_IF -->
+ <!-- TMPL_IF NAME="basketbooksellernote" --><p>Vendor note: <!-- TMPL_VAR NAME="basketbooksellernote" --></p><!-- /TMPL_IF -->
<!-- TMPL_IF NAME="basketcontractno" -->
<p>Contract number: <!-- TMPL_VAR NAME="basketcontractno" --></p>
<p>Contract name: <a href="../admin/aqcontract.pl?op=add_form&contractnumber=<!-- TMPL_VAR NAME="basketcontractno" -->"><!-- TMPL_VAR NAME="basketcontractname" --></a></p>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tmpl
index bb8a1dd..baca750 100755
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tmpl
@@ -140,8 +140,8 @@ fieldset.various li {
function yuiToolbar() {
var booksellermenu = [
- { text: _("Bookseller"), url: "/cgi-bin/koha/acqui/supplier.pl?supplierid=<!-- TMPL_VAR name="booksellerid" -->" },
- { text: _("Edit bookseller"), url: "/cgi-bin/koha/acqui/booksellers.pl?booksellerid=<!-- TMPL_VAR name="booksellerid" -->"},
+ { text: _("Vendor"), url: "/cgi-bin/koha/acqui/supplier.pl?supplierid=<!-- TMPL_VAR name="booksellerid" -->" },
+ { text: _("Edit vendor"), url: "/cgi-bin/koha/acqui/booksellers.pl?booksellerid=<!-- TMPL_VAR name="booksellerid" -->"},
]
var ordersbutton = [
{ text: _("Manage orders"), url: "/cgi-bin/koha/acqui/booksellers.pl?supplierid=<!-- TMPL_VAR name="booksellerid" -->" },
@@ -150,7 +150,7 @@ fieldset.various li {
new YAHOO.widget.Button("newbasketgroup");
new YAHOO.widget.Button({
type: "menu",
- label: _("Bookseller"),
+ label: _("Vendor"),
name: "booksellerbutton",
menu: booksellermenu,
container: "toolbar"
@@ -168,7 +168,7 @@ fieldset.various li {
</script>
<a href="?op=add&booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->" name="newbasketgroup" id="newbasketgroup">New Basket Group</a>
</div>
- <h1>Basket grouping for Vendor <a href="/cgi-bin/koha/acqui/supplier.pl?supplierid=<!-- TMPL_VAR NAME="booksellerid" -->"><!-- TMPL_VAR name="booksellername" --></a></h1>
+ <h1>Basket grouping for vendor <a href="/cgi-bin/koha/acqui/supplier.pl?supplierid=<!-- TMPL_VAR NAME="booksellerid" -->"><!-- TMPL_VAR name="booksellername" --></a></h1>
</div>
<!-- TMPL_IF NAME="grouping" -->
<div id="bd">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tmpl
index 4d159af..e6279ab 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tmpl
@@ -129,7 +129,7 @@ li.list2 {
<textarea name="basketnote" id="basketnote" rows="5" cols="40"><!-- TMPL_VAR NAME="basketnote" --></textarea>
</li>
<li>
- <label for="basketbooksellernote">Bookseller note</label>
+ <label for="basketbooksellernote">Vendor note</label>
<textarea name="basketbooksellernote" id="basketbooksellernote" rows="5" cols="40"><!-- TMPL_VAR NAME="basketbooksellernote" --></textarea>
</li>
<!-- TMPL_IF NAME="contractloop" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl
index 7cccff0..d3f8296 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl
@@ -80,7 +80,7 @@ ff.submit();
<legend>Basket details</legend>
<ol>
<!-- TMPL_IF NAME="basketnote" --><li><span class="label">Internal note:</span> <!-- TMPL_VAR NAME="basketnote" --></li><!-- /TMPL_IF -->
- <!-- TMPL_IF NAME="basketbooksellernote" --><li><span class="label">Bookseller note</span>: <!-- TMPL_VAR NAME="basketbooksellernote" --></li><!-- /TMPL_IF -->
+ <!-- TMPL_IF NAME="basketbooksellernote" --><li><span class="label">Vendor note</span>: <!-- TMPL_VAR NAME="basketbooksellernote" --></li><!-- /TMPL_IF -->
<!-- TMPL_IF NAME="basketcontractno" -->
<li><span class="label">Contract number: </span><!-- TMPL_VAR NAME="basketcontractno" --></li>
<li><span class="label">Contract name:</span> <a href="/cgi-bin/koha/admin/aqcontract.pl?op=add_form&contractnumber=<!-- TMPL_VAR NAME="basketcontractno" -->"><!-- TMPL_VAR NAME="basketcontractname" --></a></li>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tmpl
index ff40b92..6d3f053 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tmpl
@@ -117,7 +117,7 @@ function Check(ff) {
<li><label for="contractdescription">Description</label>
<input type="text" name="contractdescription" id="contractdescription" size="40" maxlength="80" value="<!-- TMPL_VAR NAME="contractdescription" -->" />
</li>
- <li><label for="booksellerid">Bookseller</label>
+ <li><label for="booksellerid">Vendor</label>
<select id="booksellerid" name="booksellerid">
<!-- TMPL_LOOP NAME="booksellerloop" -->
<!-- TMPL_IF NAME="selected" -->
@@ -172,12 +172,12 @@ function Check(ff) {
<fieldset>
<legend>Confirm Deletion of Contract <!-- TMPL_VAR NAME="contractnumber" --></legend>
<table>
- <tr><th scope="row">contractnumber:</th><td><!-- TMPL_VAR NAME="contractnumber" --></td></tr>
- <tr><th scope="row">Contract Name:</th><td><!-- TMPL_VAR NAME="contractname" --></td></tr>
- <tr><th scope="row">Contract Description:</th><td><!-- TMPL_VAR NAME="contractdescription" --></td></tr>
- <tr><th scope="row">contractstartdate:</th><td><!-- TMPL_VAR NAME="contractstartdate" --></td></tr>
- <tr><th scope="row">contractenddate:</th><td><!-- TMPL_VAR NAME="contractenddate" --></td></tr>
- <tr><th scope="row">bookseller:</th><td><!-- TMPL_VAR NAME="booksellername" --></td></tr>
+ <tr><th scope="row">Contract number:</th><td><!-- TMPL_VAR NAME="contractnumber" --></td></tr>
+ <tr><th scope="row">Contract name:</th><td><!-- TMPL_VAR NAME="contractname" --></td></tr>
+ <tr><th scope="row">Contract description:</th><td><!-- TMPL_VAR NAME="contractdescription" --></td></tr>
+ <tr><th scope="row">Contract start date:</th><td><!-- TMPL_VAR NAME="contractstartdate" --></td></tr>
+ <tr><th scope="row">Contract end date:</th><td><!-- TMPL_VAR NAME="contractenddate" --></td></tr>
+ <tr><th scope="row">Vendor:</th><td><!-- TMPL_VAR NAME="booksellername" --></td></tr>
</table>
<fieldset class="action">
<input type="hidden" name="op" value="delete_confirmed" />
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/serials/claims.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/help/serials/claims.tmpl
index 1a54609..44f0707 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/serials/claims.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/serials/claims.tmpl
@@ -6,11 +6,11 @@
<p>Claims are notices that you send when an issue that was expected has not been received by the library.</p>
<h2>How to lodge a Claim?</h2>
-<p>Make a selection from the drop down list. The "All Suppliers" count gives you a count of the total number of current item claims across all suppliers.</p>
-<p>There are two ways to lodge a claim with the supplier:</p>
+<p>Make a selection from the drop down list. The "All Vendors" count gives you a count of the total number of current item claims across all vendors.</p>
+<p>There are two ways to lodge a claim with the vendor:</p>
<ol>
<li>Using a Letter defined in Notices. Note that you will need to set up the notice.</li>
- <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>
+ <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>
</ol>
<h2>How to resolve a Claim?</h2>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tmpl
index c27a917..7c13048 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tmpl
@@ -235,7 +235,7 @@
<td> </td>
</tr>
<tr class="hilighted">
- <td>Supplier</td>
+ <td>Vendor</td>
<td><input type="radio" checked="checked" name="Line" value="aqbooksellers.name" /></td>
<td><input type="radio" name="Column" value="aqbooksellers.name" /></td>
<td><!-- TMPL_VAR NAME="CGIBookSeller" --></td>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/serials_stats.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/serials_stats.tmpl
index fca21c8..3888d2e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/serials_stats.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/serials_stats.tmpl
@@ -31,11 +31,11 @@
<table id="resulttable">
<thead>
<tr>
- <th>Bookseller</th>
+ <th>Vendor</th>
<th>Title</th>
<th>Subscription id</th>
<th>Branch</th>
- <th>Callnumber</th>
+ <th>Call Number</th>
<th>Subscription Begin</th>
<th>Subscription End</th>
</tr>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tmpl
index 15e059d..054a35e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tmpl
@@ -158,7 +158,7 @@
<h1>Claims</h1>
-<!-- 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 -->
+<!-- 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 -->
<!-- TMPL_IF NAME="SHOWCONFIRMATION" -->
<div class="dialog alert">Your notification has been sent.</div>
@@ -248,7 +248,7 @@
<!--TMPL_IF NAME="letter"-->
<th>Claim</th>
<!--/TMPL_IF-->
- <th>Supplier</th>
+ <th>Vendor</th>
<th>Title</th>
<th>Issue number</th>
<th>Status</th>
@@ -294,7 +294,7 @@
<p><span class="exportSelected"></span></p>
<!-- TMPL_IF Name="singlesupplier"-->
<input type="hidden" name="supplierid" value="<!--TMPL_VAR NAME="supplierid"-->" />
- <!-- <a href="claims.pl?supplierid=<!-- TMPL_VAR name="supplierid" -->&op=preview" onclick="popup(<!-- TMPL_VAR name="supplierid" -->,''); return false" class="button">Supplier Group Claim Notice</a></p> -->
+ <!-- <a href="claims.pl?supplierid=<!-- TMPL_VAR name="supplierid" -->&op=preview" onclick="popup(<!-- TMPL_VAR name="supplierid" -->,''); return false" class="button">Vendor Group Claim Notice</a></p> -->
<!-- /TMPL_IF -->
<!--TMPL_IF Name="letter" -->
@@ -346,7 +346,7 @@
<h3>Missing Issues</h3>
<table>
<tr>
- <td><b>Supplier<b></td>
+ <td><b>Vendor<b></td>
<td><b>Title</b></td>
<td><b>Issue number</b></td>
<td><b>Missing since</b></td>
--
1.6.3.3
More information about the Koha-patches
mailing list