Bugzilla – Attachment 8854 Details for
Bug 2780
Capitalize strings consistently
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
[SIGNED-OFF] Bug 2780 - Capitalize strings consistently (Acquisitions pages)
Bug-2780---Capitalize-strings-consistently-Acquisi.patch (text/plain), 30.59 KB, created by
Jared Camins-Esakov
on 2012-04-04 00:14:25 UTC
(
hide
)
Description:
[SIGNED-OFF] Bug 2780 - Capitalize strings consistently (Acquisitions pages)
Filename:
MIME Type:
Creator:
Jared Camins-Esakov
Created:
2012-04-04 00:14:25 UTC
Size:
30.59 KB
patch
obsolete
>From 57c5319ac00728499aa2a60c69b9ca4096c0737f Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Tue, 3 Apr 2012 14:22:42 -0400 >Subject: [PATCH] Bug 2780 - Capitalize strings consistently (Acquisitions pages) >Content-Type: text/plain; charset="UTF-8" > >Correcting capitalization on strings in Acquisitions templates > >Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com> >--- > .../prog/en/modules/acqui/acqui-home.tt | 8 +++--- > .../prog/en/modules/acqui/addorderiso2709.tt | 6 ++-- > .../intranet-tmpl/prog/en/modules/acqui/basket.tt | 6 ++-- > .../prog/en/modules/acqui/basketgroup.tt | 22 ++++++++++---------- > .../prog/en/modules/acqui/booksellers.tt | 2 +- > .../prog/en/modules/acqui/histsearch.tt | 10 ++++---- > .../prog/en/modules/acqui/lateorders.tt | 2 +- > .../prog/en/modules/acqui/neworderbiblio.tt | 6 ++-- > .../intranet-tmpl/prog/en/modules/acqui/ordered.tt | 4 +- > .../prog/en/modules/acqui/orderreceive.tt | 2 +- > .../intranet-tmpl/prog/en/modules/acqui/parcel.tt | 20 +++++++++--------- > .../intranet-tmpl/prog/en/modules/acqui/parcels.tt | 12 +++++----- > .../intranet-tmpl/prog/en/modules/acqui/spent.tt | 8 +++--- > .../prog/en/modules/acqui/supplier.tt | 12 +++++----- > .../prog/en/modules/acqui/z3950_search.tt | 10 ++++---- > 15 files changed, 65 insertions(+), 65 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt >index 9acc451..f0e2942 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt >@@ -122,8 +122,8 @@ $(document).ready(function() { > <td align="center">[% loop_budge.budget_owner %]</td> > <td align="center">[% loop_budge.budget_branchname %]</td> > <td align="right" >[% loop_budge.budget_amount %]</td> >- <td align="right" ><a href="ordered.pl?fund=[% loop_budge.budget_id %]&fund_code=[% loop_budge.budget_code %]">[% loop_budge.budget_ordered %]</a></td> >- <td align="right" ><a href="spent.pl?fund=[% loop_budge.budget_id %]&fund_code=[% loop_budge.budget_code %]">[% loop_budge.budget_spent %]</a></td> >+ <td align="right" ><a href="ordered.pl?fund=[% loop_budge.budget_id %]&fund_code=[% loop_budge.budget_code %]">[% loop_budge.budget_ordered %]</a></td> >+ <td align="right" ><a href="spent.pl?fund=[% loop_budge.budget_id %]&fund_code=[% loop_budge.budget_code %]">[% loop_budge.budget_spent %]</a></td> > <td align="right" >[% loop_budge.budget_avail %]</td> > </tr> > [% ELSE %] >@@ -136,8 +136,8 @@ $(document).ready(function() { > <td align="center">[% loop_budge.budget_owner %]</td> > <td align="center">[% loop_budge.budget_branchname %]</td> > <td align="right" >[% loop_budge.budget_amount %]</td> >- <td align="right" ><a href="ordered.pl?fund=[% loop_budge.budget_id %]&fund_code=[% loop_budge.budget_code %]">[% loop_budge.budget_ordered %]</a></td> >- <td align="right" ><a href="spent.pl?fund=[% loop_budge.budget_id %]&fund_code=[% loop_budge.budget_code %]">[% loop_budge.budget_spent %]</a></td> >+ <td align="right" ><a href="ordered.pl?fund=[% loop_budge.budget_id %]&fund_code=[% loop_budge.budget_code %]">[% loop_budge.budget_ordered %]</a></td> >+ <td align="right" ><a href="spent.pl?fund=[% loop_budge.budget_id %]&fund_code=[% loop_budge.budget_code %]">[% loop_budge.budget_spent %]</a></td> > <td align="right" >[% loop_budge.budget_avail %]</td> > [% END %] > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt >index 80f88f9..3fdd631 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt >@@ -1,10 +1,10 @@ > [% USE KohaDates %] > [% INCLUDE 'doc-head-open.inc' %] >-<title>Koha › Acquisitions › Order Staged MARC Records >+<title>Koha › Acquisitions › Order staged MARC records > [% IF ( batch_details ) %] > › Batch [% import_batch_id %] > [% ELSE %] >- › Batch List >+ › Batch list > [% END %] > </title> > [% INCLUDE 'doc-head-close.inc' %] >@@ -146,7 +146,7 @@ > </fieldset> > [% END %] <!-- items --> > <fieldset class="rows"> >- <legend>Accounting Details</legend> >+ <legend>Accounting details</legend> > <ol> > <li> > <!-- origquantityrec only here for javascript compatibility (additem.js needs it, useless here, usefull when receiveing an order --> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt >index 7b93de6..0cf7ff6 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt >@@ -237,7 +237,7 @@ > <tfoot> > [% IF ( GST ) %] > <tr> >- <th scope="row">Total Tax Exc.</th> >+ <th scope="row">Total tax exc.</th> > <td>[% total_rrp_gste %]</td> > <td> </td> > <td>[% qty_total %]</td> >@@ -258,7 +258,7 @@ > <td>[% gist_est %]</td> > </tr> > <tr> >- <th scope="row">Total Tax Inc. ([% currency %])</th> >+ <th scope="row">Total tax inc. ([% currency %])</th> > <td>[% total_rrp_gsti %]</td> > <td> </td> > <td>[% qty_total %]</td> >@@ -289,7 +289,7 @@ > [% IF ( books_loo.suggestionid ) %] > <br/> > Suggested by: [% books_loo.surnamesuggestedby %][% IF ( books_loo.firstnamesuggestedby ) %], [% books_loo.firstnamesuggestedby %] [% END %] >- (<a href="/cgi-bin/koha/suggestion/suggestion.pl?suggestionid=[% books_loo.suggestionid %]&op=show">suggestion #[% books_loo.suggestionid %]</a>) >+ (<a href="/cgi-bin/koha/suggestion/suggestion.pl?suggestionid=[% books_loo.suggestionid %]&op=show">suggestion #[% books_loo.suggestionid %]</a>) > [% END %] > [% IF ( books_loo.notes ) %] > <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> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt >index f19b299..93d6362 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt >@@ -1,5 +1,5 @@ > [% INCLUDE 'doc-head-open.inc' %] >-<title>Koha › Basket Grouping for [% booksellername |html %]</title> >+<title>Koha › Basket grouping for [% booksellername |html %]</title> > [% INCLUDE 'doc-head-close.inc' %] > <script type="text/javascript" src="[% themelang %]/js/acq.js"></script> > [% IF ( grouping ) %] >@@ -137,15 +137,15 @@ function yuiToolbar() { > [% INCLUDE 'header.inc' %] > [% INCLUDE 'acquisitions-search.inc' %] > >-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> › <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% booksellername |html %]</a> › Basket Grouping</div> >+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> › <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% booksellername |html %]</a> › Basket grouping</div> > > <div id="doc" class="yui-t7"> > > <div class="yui-b"> > <div id="toolbar"> >- <a href="?op=add&booksellerid=[% booksellerid %]" name="newbasketgroup" id="newbasketgroup">New Basket Group</a> >+ <a href="?op=add&booksellerid=[% booksellerid %]" name="newbasketgroup" id="newbasketgroup">New basket group</a> > </div> >- <h1>Basket Grouping for <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% booksellername |html %]</a></h1> >+ <h1>Basket grouping for <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% booksellername |html %]</a></h1> > </div> > [% IF ( grouping ) %] > <div id="bd"> >@@ -156,7 +156,7 @@ function yuiToolbar() { > <div id="groups"> > <fieldset class="brief"> > <div class="workarea_alt" > >- <h3>Ungrouped Baskets</h3> >+ <h3>Ungrouped baskets</h3> > <ul id="ungrouped" class="draglist_alt"> > [% IF ( baskets ) %] > [% FOREACH basket IN baskets %] >@@ -185,16 +185,16 @@ function yuiToolbar() { > <form action="" method="post" id="groupingform" onsubmit="return submitForm(this)"> > <fieldset id="various" class="brief"> > <ol> >- <li><label for="basketgroupname">Basket Group Name:</label> >+ <li><label for="basketgroupname">Basket group name:</label> > <input type="text" name="basketgroupname" id="basketgroupname" value="[% name %]" /></li> >- <li><label for="billingplace">Billing Place:</label> >+ <li><label for="billingplace">Billing place:</label> > <select name="billingplace" id="billingplace" style="width:13em;"> > [% FOREACH billingplaceloo IN billingplaceloop %] > [% IF ( billingplaceloo.selected ) %]<option value="[% billingplaceloo.value %]" selected="selected">[% billingplaceloo.branchname %]</option> > [% ELSE %]<option value="[% billingplaceloo.value %]">[% billingplaceloo.branchname %]</option>[% END%] > [% END %] > </select></li> >- <li><label for="deliveryplace">Delivery Place:</label> >+ <li><label for="deliveryplace">Delivery place:</label> > <select name="deliveryplace" id="deliveryplace" style="width:13em;"> > <option value="">--</option> > [% FOREACH deliveryplaceloo IN deliveryplaceloop %] >@@ -203,7 +203,7 @@ function yuiToolbar() { > [% END %] > </select></li> > <li><p>or</p></li> >- <li><label for="freedeliveryplace">Delivery Place:</label> >+ <li><label for="freedeliveryplace">Delivery place:</label> > <textarea cols="26" rows="3" name="freedeliveryplace" id="freedeliveryplace">[% freedeliveryplace %]</textarea></li> > <li><label for="deliverycomment">Delivery comment:</label> > <textarea cols="26" rows="3" name="deliverycomment" id="deliverycomment">[% deliverycomment %]</textarea> >@@ -253,7 +253,7 @@ function yuiToolbar() { > <table> > <thead> > <tr> >- <th>Basket Group</th><th colspan="3">Action</th> >+ <th>Basket group</th><th colspan="3">Action</th> > </tr> > </thead> > <tbody> >@@ -285,7 +285,7 @@ function yuiToolbar() { > <table> > <thead> > <tr> >- <th>Basket Group</th><th colspan="3">Action</th> >+ <th>Basket group</th><th colspan="3">Action</th> > </tr> > </thead> > <tbody> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt >index 798c2e7..4077b5d 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt >@@ -38,7 +38,7 @@ $(document).ready(function() { > [% INCLUDE 'header.inc' %] > [% INCLUDE 'acquisitions-search.inc' %] > >-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> › Search for Vendor <em>[% supplier %]</em> </div> >+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> › Search for vendor <em>[% supplier %]</em> </div> > > <div id="doc3" class="yui-t2"> > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt >index 1d6c242..ce6ef23 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt >@@ -1,6 +1,6 @@ > [% USE KohaDates %] > [% INCLUDE 'doc-head-open.inc' %] >-<title>Koha › Acquisitions › [% IF ( suggestions_loop ) %]Orders search › Search Results[% ELSE %]Order search[% END %]</title> >+<title>Koha › Acquisitions › [% IF ( suggestions_loop ) %]Orders search › Search results[% ELSE %]Order search[% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] > [% INCLUDE 'calendar.inc' %] > </head> >@@ -8,7 +8,7 @@ > [% INCLUDE 'header.inc' %] > [% INCLUDE 'acquisitions-search.inc' %] > >-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> › [% IF ( suggestions_loop ) %]<a href="/cgi-bin/koha/acqui/histsearch.pl">Orders search</a> › Search Results[% ELSE %]Order search[% END %]</div> >+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> › [% IF ( suggestions_loop ) %]<a href="/cgi-bin/koha/acqui/histsearch.pl">Orders search</a> › Search results[% ELSE %]Order search[% END %]</div> > > <div id="doc3" class="yui-t2"> > >@@ -25,7 +25,7 @@ > <li><label for="isbn">ISBN: </label> <input type="isbn" name="isbn" id="isbn" value="[% isbn %]" /></li> > <li><label for="name">Vendor: </label> <input type="text" name="name" id="name" value="[% name %]" /></li> > <li><label for="basket">Basket: </label> <input type="text" name="basket" id="basket" value="[% basket %]" /></li> >- <li><label for="booksellerinvoicenumber ">Bookseller Invoice No: </label> <input type="text" name="booksellerinvoicenumber" id="booksellerinvoicenumber" value="[% booksellerinvoicenumber %]" /></li> >+ <li><label for="booksellerinvoicenumber ">Bookseller invoice no: </label> <input type="text" name="booksellerinvoicenumber" id="booksellerinvoicenumber" value="[% booksellerinvoicenumber %]" /></li> > <li><label for="from">From: </label> > <input type="text" size="10" id="from" name="from" value="[% from_placed_on %]" /> > <img src="[% themelang %]/lib/calendar/cal.gif" id="openCalendarFrom" style="cursor: pointer;" alt="Show Calendar" /> >@@ -60,13 +60,13 @@ > <input type="hidden" name="do_search" value="1" /> > <fieldset class="action"><input type="submit" value="Search" /></fieldset> > </form>[% END %] >- [% IF ( suggestions_loop ) %]<h1>Search Results</h1> >+ [% IF ( suggestions_loop ) %]<h1>Search results</h1> > <div id="acqui_histsearch"> > <table> > <tr> > <th>Basket</th> > <th>Basket group</th> >- <th>Invoice Number</th> >+ <th>Invoice number</th> > <th>Summary</th> > <th>Vendor</th> > <th>Placed on</th> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt >index 9305ae5..cf54b03 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt >@@ -61,7 +61,7 @@ $(document).ready(function() { > [% END %] > <table id="late_orders"> > <tr> >- <th>Order Date</th> >+ <th>Order date</th> > <th>Estimated delivery date</th> > <th>Vendor</th> > <th>Information</th> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tt >index 5e1ee9a..6342d33 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tt >@@ -1,5 +1,5 @@ > [% INCLUDE 'doc-head-open.inc' %] >-<title>Koha › Acquisitions › Search Existing Records</title> >+<title>Koha › Acquisitions › Search existing records</title> > [% INCLUDE 'greybox.inc' %] > [% INCLUDE 'doc-head-close.inc' %] > </head> >@@ -7,7 +7,7 @@ > [% INCLUDE 'header.inc' %] > [% INCLUDE 'acquisitions-search.inc' %] > >-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> › <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% name %]</a> › <a href="/cgi-bin/koha/acqui/basket.pl?=[% basketno %]">Basket [% basketno %]</a> › Search Existing Records</div> >+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> › <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% name %]</a> › <a href="/cgi-bin/koha/acqui/basket.pl?=[% basketno %]">Basket [% basketno %]</a> › Search existing records</div> > > <div id="doc3" class="yui-t2"> > >@@ -15,7 +15,7 @@ > <div id="yui-main"> > <div class="yui-b"> > >-<h1>Search Existing Records</h1> >+<h1>Search existing records</h1> > > > [% IF ( total ) %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt >index 379d042..3ff156e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt >@@ -25,9 +25,9 @@ > <th> Order </th> > <th> Vendor </th> > <th> Itemtype </th> >- <th> Left on Order </th> >+ <th> Left on order </th> > <th> Estimated cost per unit </th> >- <th> Date Ordered </th> >+ <th> Date ordered </th> > <th> Subtotal </th> > </tr> > </thead> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt >index bb706ec..97a7223 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt >@@ -61,7 +61,7 @@ > <div class="error" style="display:none"></div> > > <fieldset class="rows"> >- <legend>Catalog Details</legend> >+ <legend>Catalog details</legend> > <ol><li><span class="label">Title: </span><span class="title">[% title |html %]</span></li> > <li> <span class="label">Author: </span> > [% author %]</li> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt >index 4ddfc7d..3ec53fb 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt >@@ -1,6 +1,6 @@ > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Acquisitions › [% IF ( date ) %] >- Receipt Summary for [% name %] [% IF ( invoice ) %]Invoice [% invoice %][% END %] on [% formatteddatereceived %][% ELSE %]Receive Orders from [% name %][% END %]</title> >+ Receipt summary for [% name %] [% IF ( invoice ) %]invoice [% invoice %][% END %] on [% formatteddatereceived %][% ELSE %]Receive orders from [% name %][% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] > [% INCLUDE 'greybox.inc' %] > <script type="text/javascript" src="[% yuipath %]/json/json-min.js"></script> >@@ -158,7 +158,7 @@ > [% INCLUDE 'acquisitions-search.inc' %] > > <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> › [% IF ( datereceived ) %] >- Receipt Summary for <i>[% name %]</i> [% IF ( invoice ) %]<i>[ [% invoice %] ]</i>[% END %] on <i>[% formatteddatereceived %]</i> >+ Receipt summary for <i>[% name %]</i> [% IF ( invoice ) %]<i>[ [% invoice %] ]</i>[% END %] on <i>[% formatteddatereceived %]</i> > [% ELSE %] > Receive orders from [% name %] > [% END %]</div> >@@ -180,7 +180,7 @@ > [% END %] > <h1> > [% IF ( datereceived ) %] >- Receipt Summary for <i>[% name %]</i> [% IF ( invoice ) %] <i> [ [% invoice %] ] </i>[% END %] on <i>[% formatteddatereceived %]</i> >+ Receipt summary for <i>[% name %]</i> [% IF ( invoice ) %] <i> [ [% invoice %] ] </i>[% END %] on <i>[% formatteddatereceived %]</i> > [% ELSE %] > Receive orders from [% name %] > [% END %] >@@ -202,15 +202,15 @@ > <!-- TODO: Add date picker, change rcv date. --> > </div> > <div id="acqui_receive_search"> >- <h3>Pending Orders</h3> >+ <h3>Pending orders</h3> > > [% IF ( loop_orders ) %]<table id="pendingt"> > <thead> > <tr> > <th>Basket</th> >- <th>Order Line</th> >+ <th>Order line</th> > <th>Summary</th> >- <th>View Record</th> >+ <th>View record</th> > <th>Quantity</th> > <th>Unit cost</th> > <th>Order cost</th> >@@ -307,7 +307,7 @@ > </div> > </div> > <div id="acqui_receive_receivelist"> >- <h3>Already Received</h3> >+ <h3>Already received</h3> > > [% IF ( loop_received ) %] > <form action="/cgi-bin/koha/acqui/parcel.pl" method="get" name="orderform"> >@@ -315,9 +315,9 @@ > <thead> > <tr> > <th>Basket</th> >- <th>Order Line</th> >+ <th>Order line</th> > <th>Summary</th> >- <th>View Record</th> >+ <th>View record</th> > <th>Quantity</th> > <th>Est cost</th> > <th>Actual cost</th> >@@ -420,7 +420,7 @@ > </li> > > <li> >- <label for="orderfilter">Order Line :</label> >+ <label for="orderfilter">Order line :</label> > <input type="text" name="orderfilter" id="orderfilter" /> > </li> > </ol> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt >index 712c472..740d0bb 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt >@@ -25,9 +25,9 @@ > <table class="small"> > <tr> > <th>Line</th> >- <th>Date Received</th> >- <th>Invoice Number</th> >- <th>Item Count</th> >+ <th>Date received</th> >+ <th>Invoice number</th> >+ <th>Item count</th> > <th>Biblio count</th> > <th>Items expected</th> > </tr> >@@ -85,7 +85,7 @@ > <fieldset class="rows"> > <legend>Receive a new shipment</legend> > <ol> <li> >- <label for="invoice">Vendor Invoice </label> >+ <label for="invoice">Vendor invoice </label> > <input type="hidden" name="booksellerid" value="[% booksellerid %]" /> > <input type="hidden" name="op" value="new" /> > <input type="text" size="20" id="invoice" name="invoice" /> >@@ -131,8 +131,8 @@ > <label for="dateto">To:</label><input type="text" size="9" id="dateto" name="dateto" value="[% dateto %]" /></li> > <li><label for="orderby">Sort by :</label><select name="orderby" id="orderby"> > <option value="aqorders.booksellerinvoicenumber">Invoice number</option> >- <option value="datereceived"> Date Received</option> >- <option value="datereceived desc"> Date Received reverse</option> >+ <option value="datereceived"> Date received</option> >+ <option value="datereceived desc"> Date received reverse</option> > <option value="aqorders.booksellerinvoicenumber desc"> Invoice number reverse</option> > </select><br /> > <label for="resultsperpage">Results per page :</label><select name="resultsperpage" id="resultsperpage"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt >index 622604b..4531717 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt >@@ -28,10 +28,10 @@ > <th> Invoice </th> > <th> Itemtype </th> > <th> Received </th> >- <th> Unit Price </th> >- <th> Freight per Item </th> >- <th> Date Ordered </th> >- <th> Date Received </th> >+ <th> Unit price </th> >+ <th> Freight per item </th> >+ <th> Date ordered </th> >+ <th> Date received </th> > <th> Subtotal </th> > </tr> > </thead> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt >index b671f48..25b52ea 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt >@@ -155,9 +155,9 @@ if (f.company.value == "") { > <div class="yui-g"> > <div id="supplier-company-details" class="yui-u first"> > <h2>Vendor details</h2> >- <p><span class="label">Company Name: </span>[% name %]</p> >- <p><span class="label">Postal Address: </span>[% postal %]</p> >- <p><span class="label">Physical Address: </span>[% address1 %][% address2 %][% address3 %][% address4 %]</p> >+ <p><span class="label">Company name: </span>[% name %]</p> >+ <p><span class="label">Postal address: </span>[% postal %]</p> >+ <p><span class="label">Physical address: </span>[% address1 %][% address2 %][% address3 %][% address4 %]</p> > <p><span class="label">Phone: </span>[% phone %]</p> > <p><span class="label">Fax: </span>[% fax %]</p> > [% IF ( url ) %] >@@ -192,11 +192,11 @@ if (f.company.value == "") { > [% END %]</p> > <p><strong>List prices are: </strong>[% listprice %]</p> > <p><strong>Invoice prices are: </strong>[% invoiceprice %]</p> >- [% IF ( GST ) %]<p><strong>Tax Number Registered: </strong> >+ [% IF ( GST ) %]<p><strong>Tax number registered: </strong> > [% IF ( gstreg ) %]Yes[% ELSE %]No[% END %]</p> >- <p><strong>List Item Price Includes Tax: </strong> >+ <p><strong>List item price includes tax: </strong> > [% IF ( listincgst ) %]Yes[% ELSE %]No[% END %]</p> >- <p><strong>Invoice Item Price Includes Tax: </strong> >+ <p><strong>Invoice item price includes tax: </strong> > [% IF ( invoiceincgst ) %]Yes[% ELSE %]No[% END %]</p>[% END %] > <p><strong>Discount: </strong> > [% discount %] %</p> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt >index 176922d..dba6f8b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt >@@ -76,14 +76,14 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color : > <fieldset class="rows"> > <ol><li><label for="searchtitle">Title: </label> <input type="text" id="searchtitle" name="title" value="[% title |html %]" /></li> > <li><label for="isbn">ISBN/ISSN: </label> <input type="text" id="isbn" name="isbn" value="[% isbn %]" /></li> >- <li><label for="lccall">LC Call Number: </label> <input type="text" id="lccall" name="lccall" value="" /></li> >- <li><label for="controlnumber">Control No.: </label> <input type="text" id="controlnumber" name="controlnumber" value="" /></li> >+ <li><label for="lccall">LC call number: </label> <input type="text" id="lccall" name="lccall" value="" /></li> >+ <li><label for="controlnumber">Control no.: </label> <input type="text" id="controlnumber" name="controlnumber" value="" /></li> > </ol> > </fieldset> > </div> > <div class="yui-u"> > <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> >- <li> <label for="subject">Subject Heading: </label> <input type="text" id="subject" name="subject" value="" /></li> >+ <li> <label for="subject">Subject heading: </label> <input type="text" id="subject" name="subject" value="" /></li> > <li><label for="dewey">Dewey: </label> <input type="text" id="dewey" name="dewey" value="" /></li></ol></fieldset> > <fieldset class="rows" > > <ol> >@@ -108,7 +108,7 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color : > </div> > </div> > <div class="yui-g"> >-<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> >+<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> > > [% FOREACH serverloo IN serverloop %] > <p> >@@ -143,7 +143,7 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color : > [% IF ( breeding_loo.breedingid ) %] > > [% IF ( breeding_loo.toggle ) %]<tr class="highlight">[% ELSE %]<tr>[% END %] >- <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&importid=[% breeding_loo.breedingid %]" rel="gb_page_center[600,500]">Preview Card</a> <a href="/cgi-bin/koha/acqui/neworderempty.pl?frameworkcode=[% frameworkcode %]&breedingid=[% breeding_loo.breedingid %]&booksellerid=[% booksellerid %]&basketno=[% basketno %]">Order</a> <a href="#" id="closemenu" title="Close this menu"> X </a></div></td> >+ <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&importid=[% breeding_loo.breedingid %]" rel="gb_page_center[600,500]">Preview card</a> <a href="/cgi-bin/koha/acqui/neworderempty.pl?frameworkcode=[% frameworkcode %]&breedingid=[% breeding_loo.breedingid %]&booksellerid=[% booksellerid %]&basketno=[% basketno %]">Order</a> <a href="#" id="closemenu" title="Close this menu"> X </a></div></td> > <td>[% breeding_loo.title |html %]</td> > <td>[% breeding_loo.author %]</td> > <td>[% breeding_loo.isbn %]</td> >-- >1.7.2.5
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 2780
:
8804
|
8805
|
8807
|
8808
|
8810
|
8812
|
8813
|
8815
|
8817
|
8818
|
8819
|
8820
|
8821
|
8823
|
8829
|
8832
|
8840
|
8841
|
8842
|
8843
|
8844
|
8845
|
8846
|
8847
|
8848
|
8849
|
8850
|
8851
|
8852
|
8853
|
8854
|
8866
|
8870
|
8871
|
8875
|
8880
|
8882
|
8883
|
8884
|
8926
|
8928
|
8929
|
8930
|
8935
|
8954
|
8960
|
8977
|
8978
|
8979
|
8980
|
8981
|
8983
|
8984
|
8985
|
8986
|
8987
|
8988
|
8989
|
8990
|
8991
|
8992
|
8993
|
8994
|
8995
|
8996
|
9013
|
9014
|
9015
|
9016
|
9017
|
9018
|
9019
|
9020
|
9021
|
9022
|
9023
|
9024
|
9025
|
9026
|
9027
|
9028
|
9029
|
9047
|
9048
|
9052
|
9054
|
9055
|
9056
|
9057
|
9058
|
9068
|
9069
|
9070
|
9071
|
9072
|
9073
|
9089
|
9091
|
9092