Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

nomenclature cleanup for acquisitions:

Browse source 
supplier -> vendor
freight -> shipping
parcel -> shipment
shopping basket -> basket
parcel code -> invoice number

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
This commit is contained in:
Joshua Ferraro 2008-01-01 21:02:10 -05:00
parent 052861306b
commit f78b79da6c
10 changed files with 43 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tmpl
View file

@ -29,13 +29,13 @@
<span class="problem">Your administrator must define a budget in Administration</span>
<!-- /TMPL_IF -->
<form name="findsupplier" action="/cgi-bin/koha/acqui/booksellers.pl" method="post">
<p><label for="supplierpage">Supplier </label><input type="text" size="25" name="supplier" id="supplierpage" class="focus" />
<p><label for="supplierpage">Vendor </label><input type="text" size="25" name="supplier" id="supplierpage" class="focus" />
<input type="submit" value="Search" />
</p>
</form>
<!-- TMPL_ELSE -->
<form name="findsupplier" action="/cgi-bin/koha/acqui/booksellers.pl" method="post">
<p><label for="supplierpage">Supplier: </label><input type="text" size="25" name="supplier" id="supplierpage" class="focus" />
<p><label for="supplierpage">Vendor: </label><input type="text" size="25" name="supplier" id="supplierpage" class="focus" />
<input type="submit" value="Search" />
</p>
</form>
@ -131,10 +131,9 @@
<div id="acqui_acqui_home_hints">
<h2>Help</h2>
<p>To start an acquisition, whether an order, local purchase or donation first search on the supplier, you will be asked to check their details, and enter your name which will set up a "shopping basket" for you. (Why is this you might ask... well because we want to know that it's really you ordering things - not just your computer).</p>
<p>To order an item you need to establish whether a biblio already exists for it, and either add an item, or set up a new biblio then add the item. </p>
<p>To start a new shopping basket with a new supplier return to this page and just start a new supplier search.</p>
<p>To close off a shopping basket click on "view shopping baskets" or search above, and the click on "confirm basket".</p>
<p>To begin an order, local purchase or donation, search for the vendor or benefactor, and then you can create a new Basket.</p>
<p>A Basket is a collection of orders.</p>
<p>To order an item you need to establish whether a biblio already exists for it, and either add an item, or set up a new biblio and then add the item.</p>
</div>
</div>

8
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl
View file

@ -1,5 +1,5 @@
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
<title>Koha &rsaquo; Acquisitions &rsaquo; <!-- TMPL_UNLESS name="basketno" -->New <!-- /TMPL_UNLESS -->Shopping Basket <!-- TMPL_IF NAME="basketno" -->(<!-- TMPL_VAR NAME="basketno" -->)<!-- /TMPL_IF --> for <!-- TMPL_VAR NAME="name" --></title>
<title>Koha &rsaquo; Acquisitions &rsaquo; <!-- TMPL_UNLESS name="basketno" -->New <!-- /TMPL_UNLESS -->Basket <!-- TMPL_IF NAME="basketno" -->(<!-- TMPL_VAR NAME="basketno" -->)<!-- /TMPL_IF --> for <!-- TMPL_VAR NAME="name" --></title>
<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<!-- TMPL_UNLESS name="closedate" -->
<script type="text/javascript">
@ -19,7 +19,7 @@
<!-- TMPL_INCLUDE NAME="acquisitions-search.inc" -->
<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?supplierid=<!-- TMPL_VAR NAME="booksellerid" -->"><!-- TMPL_VAR NAME="name" --></a> &rsaquo; <!-- TMPL_UNLESS name="basketno" -->New <!-- /TMPL_UNLESS -->Shopping Basket <!-- TMPL_IF NAME="basketno" -->(<!-- TMPL_VAR NAME="basketno" -->)<!-- /TMPL_IF --> for <!-- TMPL_VAR NAME="name" --></div>
<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?supplierid=<!-- TMPL_VAR NAME="booksellerid" -->"><!-- TMPL_VAR NAME="name" --></a> &rsaquo; <!-- TMPL_UNLESS name="basketno" -->New <!-- /TMPL_UNLESS -->Basket <!-- TMPL_IF NAME="basketno" -->(<!-- TMPL_VAR NAME="basketno" -->)<!-- /TMPL_IF --> for <!-- TMPL_VAR NAME="name" --></div>
<div id="doc3" class="yui-t2">
@ -27,14 +27,14 @@
<div id="yui-main">
<div class="yui-b">
<h1><!-- TMPL_UNLESS name="basketno" -->New <!-- /TMPL_UNLESS -->Shopping Basket <!-- TMPL_VAR NAME="basketno" --> for <a href="supplier.pl?supplierid=<!-- TMPL_VAR NAME="booksellerid" -->"><!-- TMPL_VAR NAME="name" --></a></h1>
<h1><!-- TMPL_UNLESS name="basketno" -->New <!-- /TMPL_UNLESS -->Basket <!-- TMPL_VAR NAME="basketno" --> for <a href="supplier.pl?supplierid=<!-- TMPL_VAR NAME="booksellerid" -->"><!-- TMPL_VAR NAME="name" --></a></h1>
<!-- TMPL_IF NAME="basketno" --><div id="acqui_basket_summary">
<h2>Basket Details</h2>
<p>Basket number: <!-- TMPL_VAR NAME="basketno" --></p>
<p>Managed by: <!-- TMPL_VAR NAME="authorisedbyname" --></p>
<p>Open on: <!-- TMPL_VAR NAME="creationdate" --></p>
<p>For supplier ID: <!-- TMPL_VAR NAME="booksellerid" --></p>
<p>For vendor ID: <!-- TMPL_VAR NAME="booksellerid" --></p>
<p>Invoice number: <!-- TMPL_VAR NAME="booksellerinvoicenumber" --></p>
<!-- TMPL_IF name="closedate" --><p>Closed On: <!-- TMPL_VAR name="closedate" --></p><!-- /TMPL_IF -->
<!-- TMPL_UNLESS name="closedate" -->

10
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tmpl
View file

@ -1,12 +1,12 @@
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
<title>Koha &rsaquo; Search for supplier <!-- TMPL_VAR name="supplier" --></title>
<title>Koha &rsaquo; Search for vendor <!-- TMPL_VAR name="supplier" --></title>
<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
</head>
<body>
<!-- TMPL_INCLUDE NAME="header.inc" -->
<!-- TMPL_INCLUDE NAME="acquisitions-search.inc" -->
<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 Supplier <em><!-- TMPL_VAR name="supplier" --></em> </div>
<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><!-- TMPL_VAR name="supplier" --></em> </div>
<div id="doc3" class="yui-t2">
@ -16,7 +16,7 @@
<!-- TMPL_INCLUDE NAME="acquisitions-toolbar.inc" -->
<h1>You searched on <b>supplier <!-- TMPL_VAR name="supplier" -->,</b> <!-- TMPL_VAR name="count" --> results found</h1>
<h1>You searched on <b>vendor <!-- TMPL_VAR name="supplier" -->,</b> <!-- TMPL_VAR name="count" --> results found</h1>
<div id="acqui_order_supplierlist">
<table>
<tr>
@ -68,7 +68,7 @@
</tr>
<!-- /TMPL_LOOP -->
<!-- TMPL_ELSE -->
<tr><td>No pending basket</td></tr>
<tr><td>No pending baskets</td></tr>
<!-- /TMPL_IF -->
</table>
</td>
@ -82,4 +82,4 @@
<!-- TMPL_INCLUDE NAME="acquisitions-menu.inc" -->
</div>
</div>
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

6
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tmpl
View file

@ -22,7 +22,7 @@
<ol>
<li><label for="title">Title: </label> <input type="text" name="title" id="title" value="<!-- TMPL_VAR name="title"-->" /></li>
<li><label for="author">Author: </label> <input type="text" name="author" id="author" value="<!-- TMPL_VAR name="author" -->" /></li>
<li><label for="name">Supplier: </label> <input type="text" name="name" id="name" value="<!-- TMPL_VAR name="name" -->" /></li>
<li><label for="name">Vendor: </label> <input type="text" name="name" id="name" value="<!-- TMPL_VAR name="name" -->" /></li>
<li><label for="from">From: </label> <img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" border="0" id="openCalendarFrom" style="cursor: pointer;" alt="Show Calendar" />
<input type="text" readonly="readonly" size="10" id="from" name="fromplacedon" value="<!-- TMPL_VAR name="from_placed_on" -->" />
<script language="JavaScript" type="text/javascript">
@ -89,9 +89,9 @@
<table>
<tr>
<th>Basket</th>
<th>Parcel / Invoice</th>
<th>Invoice Number</th>
<th>Summary</th>
<th>Supplier</th>
<th>Vendor</th>
<th>Placed on</th>
<th>Received on</th>
<th>Quantity ordered</th>

6
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tmpl
View file

@ -19,8 +19,8 @@
<table>
<tr>
<th>Order Date</th>
<th>Supplier</th>
<th>Book information</th>
<th>Vendor</th>
<th>Information</th>
<th>Total cost</th>
<th>Basket</th>
<th>&nbsp;</th>
@ -116,4 +116,4 @@
<!-- TMPL_INCLUDE NAME="acquisitions-menu.inc" -->
</div>
</div>
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

6
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl
View file

@ -93,7 +93,7 @@ if (quantity ==0) {
<ul> <li>Basket number: <!-- TMPL_VAR NAME="basketno" --></li>
<li>Managed by: <!-- TMPL_VAR NAME="authorisedbyname" --></li>
<li>Open on: <!-- TMPL_VAR NAME="creationdate" --></li>
<li>For supplier ID: <!-- TMPL_VAR NAME="booksellerid" --></li>
<li>For vendor ID: <!-- TMPL_VAR NAME="booksellerid" --></li>
<li>Invoice number: <!-- TMPL_VAR NAME="booksellerinvoicenumber" --></li>
<!-- TMPL_IF name="closedate" --><li>Closed on: <!-- TMPL_VAR name="closedate" --></li><!-- /TMPL_IF --></ul>
</div>
@ -222,10 +222,10 @@ if (quantity ==0) {
</li>
<li>
<!-- TMPL_IF name="close" -->
<span class="label">Supplier price: </span>
<span class="label">Vendor price: </span>
<input type="hidden" size="20" name="list_price" id="list_price" value="<!-- TMPL_VAR NAME="listprice" -->" /><!-- TMPL_VAR NAME="listprice" -->
<!-- TMPL_ELSE -->
<label for="list_price">Supplier price: </label>
<label for="list_price">Vendor price: </label>
<input type="text" size="20" name="list_price" id="list_price" value="<!-- TMPL_VAR NAME="listprice" -->" onchange="update(this.form)" />
<!--/TMPL_IF-->
</li>

8
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tmpl
View file

@ -28,13 +28,13 @@
<!-- /TMPL_IF -->
</h1>
<div id="acqui_recieve_summary">
<p>Invoice / Parcel: <!-- TMPL_VAR NAME="invoice" --></p>
<p>Invoice number: <!-- TMPL_VAR NAME="invoice" --></p>
<p>Received by: <!-- TMPL_VAR NAME="loggedinusername" --></p>
<p>On: <!-- TMPL_VAR NAME="formatteddatereceived" --></p>
<!-- TODO: Add date picker, change rcv date. -->
</div>
<div id="acqui_recieve_recievelist">
<h2>Items in parcel</h2>
<h2>Items in shipment</h2>
<form action="/cgi-bin/koha/acqui/parcel.pl" method="get" name="orderform">
<table>
<tr>
@ -73,7 +73,7 @@
<td colspan="5">
</td>
</p>
<th colspan="1">Freight</th>
<th colspan="1">Shipping</th>
<td><!-- TMPL_VAR NAME="totalfreight" --></td>
</tr> <!-- /TMPL_IF -->
<!-- TMPL_IF NAME="gst" -->
@ -97,7 +97,7 @@
</form>
</div>
<div id="acqui_recieve_search">
<h2>Search orders to add to this parcel</h2>
<h2>Search orders to add to this shipment</h2>
<form action="/cgi-bin/koha/acqui/orderreceive.pl">
<input type="hidden" name="supplierid" value="<!-- TMPL_VAR NAME="supplierid" -->" />
<input type="hidden" name="gst" value="<!-- TMPL_VAR NAME="gst" -->" />

16
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tmpl
View file

@ -1,5 +1,5 @@
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
<title>Koha &rsaquo; Acquisitions &rsaquo; Receive parcel from supplier <!-- TMPL_VAR NAME="name" --></title>
<title>Koha &rsaquo; Acquisitions &rsaquo; Receive shipment from vendor <!-- TMPL_VAR NAME="name" --></title>
<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<!-- TMPL_INCLUDE NAME="calendar.inc" -->
</head>
@ -7,7 +7,7 @@
<!-- TMPL_INCLUDE NAME="header.inc" -->
<!-- TMPL_INCLUDE NAME="acquisitions-search.inc" -->
<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?supplierid=<!-- TMPL_VAR NAME="supplierid" -->"><!-- TMPL_VAR NAME="name" --></a> &rsaquo; Receive parcel from supplier <!-- TMPL_VAR NAME="name" --></div>
<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?supplierid=<!-- TMPL_VAR NAME="supplierid" -->"><!-- TMPL_VAR NAME="name" --></a> &rsaquo; Receive shipment from vendor <!-- TMPL_VAR NAME="name" --></div>
<div id="doc" class="yui-t7">
@ -15,9 +15,9 @@
<div id="yui-main">
<div class="yui-b">
<h1>Receive parcel from supplier <a href="/cgi-bin/koha/acqui/supplier.pl?supplierid=<!-- TMPL_VAR NAME="supplierid" -->"><!-- TMPL_VAR NAME="name" --></a></h1>
<h1>Receive shipment from vendor <a href="/cgi-bin/koha/acqui/supplier.pl?supplierid=<!-- TMPL_VAR NAME="supplierid" -->"><!-- TMPL_VAR NAME="name" --></a></h1>
<!-- TMPL_IF NAME="count" --><p> <!-- TMPL_VAR NAME="count" --> parcels found</p><!--/TMPL_IF-->
<!-- TMPL_IF NAME="count" --><p> <!-- TMPL_VAR NAME="count" --> shipments found</p><!--/TMPL_IF-->
<div id="resultnumber">
<!-- Row of numbers corresponding to search result pages -->
<!-- TMPL_IF NAME="displayprev" -->
@ -64,7 +64,7 @@
<tr>
<th>Line</th>
<th>Date Received</th>
<th>Invoice /Parcel Code</th>
<th>Invoice Number</th>
<th>Item Count</th>
<th>Biblio count</th>
<th>Items expected</th>
@ -103,9 +103,9 @@
<div id="parcels_new_parcel">
<form method="get" action="parcel.pl">
<fieldset class="rows">
<legend>Receive a new parcel</legend>
<legend>Receive a new shipment</legend>
<ol> <li>
<label for="invoice">Supplier Invoice </label>
<label for="invoice">Vendor Invoice </label>
<input type="hidden" name="supplierid" value="<!-- TMPL_VAR NAME="supplierid" -->" />
<input type="hidden" name="op" value="new" />
<input type="text" size="20" id="invoice" name="invoice" />
@ -117,7 +117,7 @@
</li>
<!--/TMPL_IF-->
<li>
<label for="freight">Freight:</label>
<label for="freight">Shipping:</label>
<input type="text" size="20" id="freight" name="freight" />
</li>
<li><label for="datereceived">Shipment date: </label>

2
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tmpl
View file

@ -23,7 +23,7 @@
<tr>
<th>Title</th>
<th>Order</th>
<th>Supplier</th>
<th>Vendor</th>
<th>Invoice</th>
<th>Itemtype</th>
<th>Receieved</th>

14
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl
View file

@ -1,16 +1,16 @@
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
<title>Koha &rsaquo; Supplier <!-- TMPL_VAR name="bookselname" --></title>
<title>Koha &rsaquo; Vendor <!-- TMPL_VAR name="bookselname" --></title>
<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<script type="text/javascript">
//<![CDATA[
function confirm_deletion() {
if (confirm("Confirm deletion of this supplier ?")) {
if (confirm("Confirm deletion of this vendor ?")) {
window.location="/cgi-bin/koha/acqui/supplier.pl?supplierid=<!--TMPL_VAR Name="id"-->&op=delete";
}
}
function check(f) {
if (f.company.value == "") {
alert("You must specify a name for this supplier.");
alert("You must specify a name for this vendor.");
return false;
}
f.submit();
@ -22,7 +22,7 @@ if (f.company.value == "") {
<!-- TMPL_INCLUDE NAME="header.inc" -->
<!-- TMPL_INCLUDE NAME="acquisitions-search.inc" -->
<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; <!--TMPL_IF Name="enter"--><!-- TMPL_IF name="id" --> <a href="/cgi-bin/koha/acqui/supplier.pl?supplierid=<!-- TMPL_VAR NAME="id" -->"><!-- TMPL_VAR NAME="name" --></a> &rsaquo; Update: <!-- TMPL_VAR NAME="name" --><!-- TMPL_ELSE -->Add supplier<!-- /TMPL_IF --> <!-- TMPL_ELSE --><!-- TMPL_VAR NAME="name" --><!-- /TMPL_IF --></div>
<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; <!--TMPL_IF Name="enter"--><!-- TMPL_IF name="id" --> <a href="/cgi-bin/koha/acqui/supplier.pl?supplierid=<!-- TMPL_VAR NAME="id" -->"><!-- TMPL_VAR NAME="name" --></a> &rsaquo; Update: <!-- TMPL_VAR NAME="name" --><!-- TMPL_ELSE -->Add vendor<!-- /TMPL_IF --> <!-- TMPL_ELSE --><!-- TMPL_VAR NAME="name" --><!-- /TMPL_IF --></div>
<div id="doc" class="yui-t7">
@ -32,7 +32,7 @@ if (f.company.value == "") {
<!-- TMPL_IF name="id" -->
<h1>Update: <!-- TMPL_VAR NAME="name" --></h1>
<!-- TMPL_ELSE -->
<h1>Add supplier</h1>
<h1>Add vendor</h1>
<!-- /TMPL_IF -->
<!-- /TMPL_IF -->
<!-- TMPL_UNLESS NAME="enter" --><!-- TMPL_INCLUDE NAME="acquisitions-toolbar.inc" --><!-- /TMPL_UNLESS -->
@ -80,7 +80,7 @@ if (f.company.value == "") {
<div class="yui-g">
<fieldset class="rows">
<legend>Ordering information</legend>
<ol class="radio"><li><label for="activestatus" class="radio">Supplier is:</label>
<ol class="radio"><li><label for="activestatus" class="radio">Vendor is:</label>
<!-- TMPL_IF name="active" -->
<label for="activestatus">Active</label> <input type="radio" id="activestatus" name="status" value="1" checked="checked" />
<label for="inactivestatus">Inactive</label> <input type="radio" id="inactivestatus" name="status" value="0" />
@ -181,7 +181,7 @@ if (f.company.value == "") {
</div>
<div id="supplier-ordering-information" class="yui-g">
<h3>Ordering information</h3>
<p><strong>Supplier is: </strong>
<p><strong>Vendor is: </strong>
<!-- TMPL_IF name="active" -->
Active
<!-- TMPL_ELSE -->