[Koha-patches] [PATCH] follow-up to bug 3854: resolve budget period language issues
Nicole Engard
nengard at gmail.com
Wed Feb 3 14:42:51 CET 2010
top level: "Root Budget" becomes "Budget"
second level: "Budget" becomes "Fund"
third level and below: "Sub-Budget" is also a "Fund", but for things
like the "create sub-budget" link, they'll be changed to "create child
fund".
---
.../prog/en/includes/acquisitions-menu.inc | 4 +-
.../prog/en/includes/budgetperiods-admin.inc | 4 +-
.../prog/en/includes/budgets-admin-toolbar.inc | 12 +++---
.../prog/en/modules/acqui/acqui-home.tmpl | 4 +-
.../prog/en/modules/acqui/basket.tmpl | 2 +-
.../prog/en/modules/admin/admin-home.tmpl | 6 +-
.../prog/en/modules/admin/aqbudgetperiods.tmpl | 40 ++++++++++----------
.../prog/en/modules/admin/aqbudgets.tmpl | 36 +++++++++---------
.../prog/en/modules/admin/aqplan.tmpl | 19 +++++----
9 files changed, 64 insertions(+), 63 deletions(-)
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc
index a02832e..75fd20f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc
@@ -1,6 +1,6 @@
<ul>
<li><a href="/cgi-bin/koha/acqui/lateorders.pl">Late orders</a></li>
<li><a href="/cgi-bin/koha/suggestion/suggestion.pl">Manage suggestions</a></li>
- <li><a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Budget Periods</a></li>
- <li><a href="/cgi-bin/koha/admin/aqbudgets.pl">Manage Budgets</a></li>
+ <li><a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Budgets</a></li>
+ <li><a href="/cgi-bin/koha/admin/aqbudgets.pl">Funds</a></li>
</ul>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/budgetperiods-admin.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/budgetperiods-admin.inc
index 368d6a8..2d4adef 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/budgetperiods-admin.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/budgetperiods-admin.inc
@@ -29,8 +29,8 @@
//]]>
</script>
<ul class="toolbar">
- <li id="periods_menuc"><a id="periods_menu" href="/cgi-bin/koha/admin/aqbudgetperiods.pl?op=add_form">Root budgets</a></li>
- <li id="budgets_menuc"><a id="budgets_menu" href="/cgi-bin/koha/cataloguing/addbiblio.pl">Budgets</a></li>
+ <li id="periods_menuc"><a id="periods_menu" href="/cgi-bin/koha/admin/aqbudgetperiods.pl?op=add_form">Budgets</a></li>
+ <li id="budgets_menuc"><a id="budgets_menu" href="/cgi-bin/koha/cataloguing/aqbudgets.pl">Funds</a></li>
<li id="planning_menuc"><a id="planning_menu" href="/cgi-bin/koha/admin/aqplan.pl?budget_period_id=<!-- TMPL_VAR NAME="budget_period_id" -->">Budget planning</a></li>
</ul>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-toolbar.inc
index b364dab..f0c041c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-toolbar.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-toolbar.inc
@@ -20,8 +20,8 @@
function yuiToolbar() {
<!-- TMPL_IF NAME="budget_period_id" -->
var budgets_menu = [
- { text: _("New root budget"), url: "/cgi-bin/koha/admin/aqbudgetperiods.pl?op=add_form" },
- { text: _("New budget for '<!-- TMPL_VAR NAME="budget_period_description" -->'"), url: "/cgi-bin/koha/admin/aqbudgets.pl?op=add_form&budget_period_id=<!-- TMPL_VAR NAME="budget_period_id" -->"
+ { text: _("New budget"), url: "/cgi-bin/koha/admin/aqbudgetperiods.pl?op=add_form" },
+ { text: _("New fund for '<!-- TMPL_VAR NAME="budget_period_description" -->'"), url: "/cgi-bin/koha/admin/aqbudgets.pl?op=add_form&budget_period_id=<!-- TMPL_VAR NAME="budget_period_id" -->"
<!-- TMPL_IF NAME="budget_period_locked" -->, disabled:true<!-- /TMPL_IF -->
<!-- TMPL_UNLESS NAME="CAN_user_acquisition_budget_add_del" -->, disabled:true <!-- /TMPL_UNLESS -->
}
@@ -32,8 +32,8 @@
<!-- TMPL_IF NAME="budget_period_id" -->
var periods_menu = [
- { text: _("Edit root budget '<!-- TMPL_VAR NAME="budget_period_description" -->'"), url: "/cgi-bin/koha/admin/aqbudgetperiods.pl?op=add_form&budget_period_id=<!-- TMPL_VAR NAME="budget_period_id" -->" },
- { text: _("Duplicate root budget '<!-- TMPL_VAR NAME="budget_period_description" -->'") }
+ { text: _("Edit budget '<!-- TMPL_VAR NAME="budget_period_description" -->'"), url: "/cgi-bin/koha/admin/aqbudgetperiods.pl?op=add_form&budget_period_id=<!-- TMPL_VAR NAME="budget_period_id" -->" },
+ { text: _("Duplicate budget '<!-- TMPL_VAR NAME="budget_period_description" -->'") }
]
<!-- /TMPL_IF -->
@@ -102,9 +102,9 @@
//]]>
</script>
<ul class="toolbar">
- <!-- TMPL_UNLESS NAME="budget_period_id" --><li><a id="newrootbudget" href="/cgi-bin/koha/admin/aqbudgetperiods.pl?op=add_form">New Root Budget</a></li><!-- /TMPL_UNLESS -->
+ <!-- TMPL_UNLESS NAME="budget_period_id" --><li><a id="newrootbudget" href="/cgi-bin/koha/admin/aqbudgetperiods.pl?op=add_form">New Budget</a></li><!-- /TMPL_UNLESS -->
<!-- TMPL_UNLESS NAME="period_button_only" --><li id="budgets_menuc"><a id="budgets_menu" href="/cgi-bin/koha/cataloguing/addbiblio.pl">New</a></li><!-- /TMPL_UNLESS -->
- <li id="periods_menuc"><a id="periods_menu" href="/cgi-bin/koha/admin/aqbudgetperiods.pl?op=add_form">Root Budgets</a></li>
+ <li id="periods_menuc"><a id="periods_menu" href="/cgi-bin/koha/admin/aqbudgetperiods.pl?op=add_form">Budgets</a></li>
<!-- TMPL_UNLESS NAME="period_button_only" --><li id="planning_menuc"><a id="planning_menu" href="/cgi-bin/koha/admin/aqplan.pl?budget_period_id=<!-- TMPL_VAR NAME="budget_period_id" -->">Budget planning</a></li>
<!-- /TMPL_UNLESS -->
</ul>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tmpl
index 6974433..4760c9c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tmpl
@@ -59,7 +59,7 @@
<!-- TMPL_IF name="loop_budget" -->
- <h3>All available budgets<!-- TMPL_IF NAME="branchname" --> for <!-- TMPL_VAR NAME="branchname" --> branch<!-- /TMPL_IF --></h3>
+ <h3>All available funds<!-- TMPL_IF NAME="branchname" --> for <!-- TMPL_VAR NAME="branchname" --> branch<!-- /TMPL_IF --></h3>
<!-- <a href="/cgi-bin/koha/admin/aqbookfund.pl" title="[ Manage funds ]">[ Manage ]</a>
<a href="/cgi-bin/koha/admin/budgetperiods.pl">manage budgets</a><br><br> -->
@@ -70,7 +70,7 @@
<table id="accounts">
<thead>
<tr>
- <th>Budget</th>
+ <th>Fund</th>
<th>Owner</th>
<th>Branch</th>
<th>Amount</th>
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 c04ad12..096bc71 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl
@@ -183,7 +183,7 @@
<th>Est.</th>
<th>Qty.</th>
<th>Total</th>
- <th>Budget</th>
+ <th>Fund</th>
<!-- TMPL_IF name="active" -->
<!-- TMPL_UNLESS name="closedate" -->
<th>Modify</th>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl
index 7a07bea..05ca4e4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl
@@ -81,11 +81,11 @@
<dt><a href="/cgi-bin/koha/admin/currency.pl">Currencies and exchange rates</a></dt>
<dd>Define currencies and exchange rates used for acquisitions.</dd>
- <dt><a href="/cgi-bin/koha/admin/aqbudgets.pl">Budgets, periods, planning</a></dt>
+ <dt><a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Budgets</a></dt>
<dd>Define your budgets</dd>
- <dt><a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Root Budgets</a></dt>
- <dd>Define your root budgets</dd>
+ <dt><a href="/cgi-bin/koha/admin/aqbudgets.pl">Funds</a></dt>
+ <dd>Define funds within your budgets</dd>
</dl>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tmpl
index c283dfc..85661f4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tmpl
@@ -57,18 +57,18 @@
</script>
<title>
- Koha › Administration › Root Budgets
+ Koha › Administration › Budgets
<!-- TMPL_IF name="add_form" -->›
<!-- TMPL_IF name="budget_period_id" -->
- Modify root budget'<!-- TMPL_VAR name="budget_period_id" -->'
+ Modify budget'<!-- TMPL_VAR name="budget_period_id" -->'
<!-- TMPL_ELSE -->
- Add root budget
+ Add budget
<!-- /TMPL_IF -->
<!-- /TMPL_IF -->
<!-- TMPL_IF name="delete_confirm" -->›
- Delete root budget '<!-- TMPL_VAR name="budget_period_description" -->'?
+ Delete budget '<!-- TMPL_VAR name="budget_period_description" -->'?
<!-- /TMPL_IF -->
<!-- TMPL_IF name="delete_confirmed" -->›
Data Deleted
@@ -94,30 +94,30 @@
<!-- add or modify a budget period -->
<!-- ####################################### -->
<!-- TMPL_IF name="add_form" -->
- <a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Root Budget</a> ›
+ <a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Budget</a> ›
<!-- TMPL_IF name="budget_period_id" -->
- Modify root budget <!-- TMPL_VAR name="budget_period_description" -->
+ Modify budget <!-- TMPL_VAR name="budget_period_description" -->
<!-- TMPL_ELSE -->
- Add root budget
+ Add budget
<!-- /TMPL_IF -->
<!-- /TMPL_IF -->
<!-- delete a budget period -->
<!-- ################################ -->
<!-- TMPL_IF name="delete_confirm" -->
- <a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Root budgets</a> ›
+ <a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Budgets</a> ›
<!-- TMPL_IF name="total" -->
- Cannot delete root budget '<!-- TMPL_VAR name="budget_period_description" -->'
+ Cannot delete budget '<!-- TMPL_VAR name="budget_period_description" -->'
<!-- TMPL_ELSE -->
- Delete root budget '<!-- TMPL_VAR name="budget_period_description" -->'?
+ Delete budget '<!-- TMPL_VAR name="budget_period_description" -->'?
<!-- /TMPL_IF -->
<!-- /TMPL_IF -->
<!-- display budget periods list -->
<!-- ########################################## -->
<!-- TMPL_IF name="else" -->
- Root budgets administration
+ Budgets administration
<!-- /TMPL_IF -->
</div>
@@ -132,9 +132,9 @@
<!-- add or modify a budget period -->
<!-- TMPL_IF name="budget_period_id" -->
- <h3>Modify root budget</h3>
+ <h3>Modify budget</h3>
<!-- TMPL_ELSE -->
- <h3>Add root budget</h3>
+ <h3>Add budget</h3>
<!-- /TMPL_IF -->
<form action="/cgi-bin/koha/admin/aqbudgetperiods.pl" name="f" method="post">
<fieldset class="rows">
@@ -225,12 +225,12 @@
<!-- TMPL_IF name="delete_confirm" -->
<!-- TMPL_IF name="total" -->
<div class="dialog message">
- <h3>Cannot delete root budget</h3>
+ <h3>Cannot delete budget</h3>
<p><strong>This record is used <!-- TMPL_VAR name="total" --> times</strong>
. Deletion is not possible.</p>
<!-- TMPL_ELSE -->
<div class="dialog alert">
- <h3>Delete root budget '<!-- TMPL_VAR name="budget_period_description" -->'?</h3>
+ <h3>Delete budget '<!-- TMPL_VAR name="budget_period_description" -->'?</h3>
<!-- /TMPL_IF -->
<!-- ############################################################# -->
@@ -251,12 +251,12 @@
<!-- /TMPL_IF -->
<!-- DEFAULT display budget periods list -->
<!-- TMPL_IF name="else" -->
- <h2>Root budgets administration</h2>
+ <h2>Budgets administration</h2>
<!-- TMPL_IF name="cur" --><p><b>Currency = <!-- TMPL_VAR name="cur" --></b></p><!-- TMPL_ELSE --><div class="dialog alert"><h3>No active currency is defined</h3><p>Please <a href="/cgi-bin/koha/admin/currency.pl">specify an active currency</a>.</p></div><!-- /TMPL_IF -->
<table id="periodsh">
<thead>
<tr>
- <th>Root Budget Name</th>
+ <th>Budget Name</th>
<th>Start Date</th>
<th>End Date</th>
<th>Active</th>
@@ -272,7 +272,7 @@
<!-- TMPL_ELSE -->
<tr class="highlight">
<!-- /TMPL_IF -->
- <td><a href="/cgi-bin/koha/admin/aqbudgets.pl?budget_period_id=<!-- TMPL_VAR name="budget_period_id" -->" title="View budgets for <!-- TMPL_VAR name="budget_period_description" -->"><!-- TMPL_VAR name="budget_period_description" --></a></td>
+ <td><a href="/cgi-bin/koha/admin/aqbudgets.pl?budget_period_id=<!-- TMPL_VAR name="budget_period_id" -->" title="View funds for <!-- TMPL_VAR name="budget_period_description" -->"><!-- TMPL_VAR name="budget_period_description" --></a></td>
<td><!-- TMPL_VAR name="budget_period_startdate" --></td>
<td><!-- TMPL_VAR name="budget_period_enddate" --></td>
<td><!-- TMPL_IF name="budget_period_active" --><span style="color:green;">Active</span> <!-- TMPL_ELSE --><!-- /TMPL_IF --> </td>
@@ -281,12 +281,12 @@
<td>
<a href="<!-- TMPL_VAR name="script_name" -->?op=add_form&budget_period_id=<!-- TMPL_VAR name="budget_period_id" escape="HTML" -->">Edit</a>
<a href="<!-- TMPL_VAR name="script_name"-->?op=delete_confirm&budget_period_id=<!-- TMPL_VAR name="budget_period_id" -->">Delete</a>
- <a href="/cgi-bin/koha/admin/aqbudgets.pl?op=add_form&budget_period_id=<!-- TMPL_VAR NAME="budget_period_id" -->">Add Budget</a>
+ <a href="/cgi-bin/koha/admin/aqbudgets.pl?op=add_form&budget_period_id=<!-- TMPL_VAR NAME="budget_period_id" -->">Add Fund</a>
</td>
</tr>
<!-- /TMPL_LOOP -->
<!-- TMPL_UNLESS NAME="period_loop" -->
- <tr><td colspan="7">No root budget</td></tr>
+ <tr><td colspan="7">No budget</td></tr>
<!-- /TMPL_UNLESS -->
</tbody>
</table>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tmpl
index 96b79a2..1de452f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tmpl
@@ -1,5 +1,5 @@
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha › Administration › Budgets<!-- TMPL_IF name="add_form" --> › <!--TMPL_IF NAME="budget_id" -->Modify Budget<!-- TMPL_IF NAME="budget_name" --> '<!-- TMPL_VAR NAME="budget_name" -->'<!-- /TMPL_IF --><!-- TMPL_ELSE -->Add Budget <!-- /TMPL_IF --><!-- /TMPL_IF --></title>
+<title>Koha › Administration › Funds<!-- TMPL_IF name="add_form" --> › <!--TMPL_IF NAME="budget_id" -->Modify Fund<!-- TMPL_IF NAME="budget_name" --> '<!-- TMPL_VAR NAME="budget_name" -->'<!-- /TMPL_IF --><!-- TMPL_ELSE -->Add Fund <!-- /TMPL_IF --><!-- /TMPL_IF --></title>
<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<!-- TMPL_INCLUDE NAME="calendar.inc" -->
<script type="text/javascript" src="<!-- TMPL_VAR NAME="themelang" -->/js/acq.js"></script>
@@ -141,9 +141,9 @@
<!-- TMPL_INCLUDE NAME="budgets-admin-search.inc" -->
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> ›
- <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> › <a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Root budgets</a> › <!-- TMPL_IF NAME="else" -->Budgets for '<!-- TMPL_VAR name="budget_period_description" -->'<!-- /TMPL_IF --><!-- TMPL_IF name="add_form" -->
- <a href="/cgi-bin/koha/admin/aqbudgets.pl?budget_period_id=<!-- TMPL_VAR NAME="budget_period_id" -->">Budgets</a> › <!-- TMPL_IF NAME="budget_id" -->Modify budget<!-- TMPL_IF NAME="budget_name" --> '<!-- TMPL_VAR NAME="budget_name" -->'<!-- /TMPL_IF --><!-- TMPL_ELSE -->Add budget<!-- /TMPL_IF --><!-- /TMPL_IF --> <!-- TMPL_IF name="delete_confirm" -->
- <a href="/cgi-bin/koha/admin/aqbudgets.pl">Budgets</a> › Delete budget?<!-- /TMPL_IF --></div>
+ <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> › <a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Budgets</a> › <!-- TMPL_IF NAME="else" -->Funds for '<!-- TMPL_VAR name="budget_period_description" -->'<!-- /TMPL_IF --><!-- TMPL_IF name="add_form" -->
+ <a href="/cgi-bin/koha/admin/aqbudgets.pl?budget_period_id=<!-- TMPL_VAR NAME="budget_period_id" -->">Funds</a> › <!-- TMPL_IF NAME="budget_id" -->Modify fund<!-- TMPL_IF NAME="budget_name" --> '<!-- TMPL_VAR NAME="budget_name" -->'<!-- /TMPL_IF --><!-- TMPL_ELSE -->Add fund<!-- /TMPL_IF --><!-- /TMPL_IF --> <!-- TMPL_IF name="delete_confirm" -->
+ <a href="/cgi-bin/koha/admin/aqbudgets.pl">Funds</a> › Delete fund?<!-- /TMPL_IF --></div>
<div id="doc3" class="yui-t2">
<div id="bd">
@@ -155,12 +155,12 @@
<!-- TMPL_UNLESS NAME="cur" --><div class="dialog alert"><h3>No active currency is defined</h3><p>Please <a href="/cgi-bin/koha/admin/currency.pl">specify an active currency</a>.</p></div><!-- /TMPL_UNLESS -->
-<h1>Budgets for '<!-- TMPL_VAR name="budget_period_description" -->'</h1>
+<h1>Funds for '<!-- TMPL_VAR name="budget_period_description" -->'</h1>
<table id="budgeth">
<thead>
<tr>
- <th>Budget hierarchy</th>
- <th>Budget name</th>
+ <th>Fund code</th>
+ <th>Fund name</th>
<th>Total<br />allocated</th>
<th>Base-level<br />allocated</th>
<th>Base-level<br />spent</th>
@@ -206,13 +206,13 @@
<td>
<a href="/cgi-bin/koha/admin/aqbudgets.pl?op=add_form&budget_id=<!-- TMPL_VAR NAME="budget_id" -->&budget_period_id=<!-- TMPL_VAR NAME="budget_period_id" -->" >Edit</a>
<a href="/cgi-bin/koha/admin/aqbudgets.pl?op=delete_confirm&budget_id=<!-- TMPL_VAR NAME="budget_id" -->&budget_period_id=<!-- TMPL_VAR NAME="budget_period_id" -->">Delete</a>
- <a href="/cgi-bin/koha/admin/aqbudgets.pl?op=add_form&budget_parent_id=<!-- TMPL_VAR NAME="budget_id" -->&budget_period_id=<!-- TMPL_VAR NAME="budget_period_id" -->">Add Sub-Budget</a>
+ <a href="/cgi-bin/koha/admin/aqbudgets.pl?op=add_form&budget_parent_id=<!-- TMPL_VAR NAME="budget_id" -->&budget_period_id=<!-- TMPL_VAR NAME="budget_period_id" -->">Add Child Fund</a>
</td>
<!-- /TMPL_IF -->
</tr>
<!-- /TMPL_LOOP -->
<!-- TMPL_ELSE -->
- <tr><td colspan="12">No budget found</td></tr>
+ <tr><td colspan="12">No fund found</td></tr>
<!-- /TMPL_IF -->
</tbody>
</table>
@@ -227,9 +227,9 @@
<form action="/cgi-bin/koha/admin/aqbudgets.pl" name="Aform" method="post">
<fieldset class="rows">
- <legend><!-- TMPL_IF NAME="budget_id" -->Modify<!-- TMPL_ELSE -->Add<!-- /TMPL_IF --> Budget
+ <legend><!-- TMPL_IF NAME="budget_id" -->Modify<!-- TMPL_ELSE -->Add<!-- /TMPL_IF --> Fund
<!-- TMPL_IF NAME="budget_period_description" -->
- <!-- TMPL_VAR NAME="budget_name" --> for period <!-- TMPL_VAR NAME="budget_period_description" -->
+ <!-- TMPL_VAR NAME="budget_name" --> for Budget '<!-- TMPL_VAR NAME="budget_period_description" -->'
<!-- /TMPL_IF -->
</legend>
@@ -238,19 +238,19 @@
<ol>
<!-- TMPL_IF NAME="budget_parent_id" -->
<li>
- <span class="label">Budget Parent: </span>
+ <span class="label">Fund Parent: </span>
<!-- TMPL_VAR NAME="budget_parent_name" -->
<!-- TMPL_VAR NAME="budget_parent_id" --> - <!-- TMPL_VAR NAME="budget_parent_name" -->
<input type="hidden" name="budget_parent_id" value="<!-- TMPL_VAR NAME="budget_parent_id" -->" />
</li>
<!-- /TMPL_IF -->
<li>
- <label class="required" for="budget_code">Budget Code: </label>
+ <label class="required" for="budget_code">Fund Code: </label>
<input type="text" name="budget_code" id="budget_code" value="<!-- TMPL_VAR NAME="budget_code" -->" size="30" />
</li>
<li>
- <label class="required" for="budget_name">Budget Name: </label>
+ <label class="required" for="budget_name">Fund Name: </label>
<input type="text" name="budget_name" id="budget_name" value="<!-- TMPL_VAR NAME="budget_name" -->" size="60" />
</li>
@@ -350,10 +350,10 @@
<!-- /TMPL_IF --> <!-- add_form -->
<!-- TMPL_IF name="delete_confirm" -->
-<div class="dialog alert"> <h3>Delete Budget <!-- TMPL_VAR NAME="budget_name" -->?</h3>
+<div class="dialog alert"> <h3>Delete Fund <!-- TMPL_VAR NAME="budget_name" -->?</h3>
<table>
<tr>
- <th scope="row">Budget Amount:</th>
+ <th scope="row">Fund Amount:</th>
<td><!-- TMPL_VAR NAME="budget_amount" --></td>
</tr>
</table>
@@ -376,7 +376,7 @@
<div class="yui-b">
<!-- TMPL_IF NAME="else" --><form action="/cgi-bin/koha/admin/aqbudgets.pl" method="get">
<fieldset class="brief">
- <h4>Budget filters</h4>
+ <h4>Fund filters</h4>
<ol>
<li>
<label for="filter_budgetbranch2">Library: </label>
@@ -389,7 +389,7 @@
</li>
<li class="radio">
- <label for="show_mine">Show my<br /> budgets only</label>
+ <label for="show_mine">Show my<br /> funds only</label>
<!-- TMPL_IF NAME="show_mine" -->
<input type="checkbox" id="show_mine" name="show_mine" value="1" checked="checked" />
<!-- TMPL_ELSE -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tmpl
index 2823518..3660b0f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tmpl
@@ -79,7 +79,7 @@ YAHOO.util.Event.onAvailable("popmenu", function () {
</script>
<title>
-Budget planning
+Budget & Fund Planning
</title>
</head>
<body>
@@ -89,7 +89,8 @@ Budget planning
<div id="breadcrumbs">
<a href="/cgi-bin/koha/mainpage.pl">Home</a> ›
<a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> ›
- <a href="/cgi-bin/koha/admin/aqbudgets.pl?budget_period_id=<!-- TMPL_VAR NAME="budget_period_id" -->">Budgets</a> ›
+ <a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Budgets</a> ›
+ <a href="/cgi-bin/koha/admin/aqbudgets.pl?budget_period_id=<!-- TMPL_VAR NAME="budget_period_id" -->">Funds</a> ›
<a href="/cgi-bin/koha/admin/aqplan.pl?budget_period_id=<!-- TMPL_VAR NAME="budget_period_id" -->">Planning</a> ›
</div>
@@ -114,7 +115,7 @@ Budget planning
<!-- TMPL_ELSE -->
<input type="checkbox" id="show_mine" name="show_mine" value="1" />
<!-- /TMPL_IF -->
- <label for="show_mine">Show my budgets only</label>
+ <label for="show_mine">Show my funds only</label>
</td>
<td>
<label for="authcat_dropbox" > Select planning type:</label>
@@ -129,7 +130,7 @@ Budget planning
<!-- TMPL_ELSE -->
<input type="checkbox" id="show_active" name="show_active" value="1" />
<!-- /TMPL_IF -->
- <label for="show_active">Show active budgets only</label>
+ <label for="show_active">Show active funds only</label>
</td>
<td></td>
</tr>
@@ -160,8 +161,8 @@ Budget planning
<table id="plan" width="100%">
<thead>
<tr>
- <th>Budget name</th>
- <th>Budget total</th>
+ <th>Fund name</th>
+ <th>Fund total</th>
<!-- TMPL_LOOP NAME="authvals_row" -->
<!-- TMPL_IF NAME="display" -->
@@ -177,10 +178,10 @@ Budget planning
<!-- /TMPL_LOOP -->
- <th >Budget remaining </th>
+ <th>Fund remaining</th>
<th id='popmenu' style=" text-align: center;" >
- <span id="add_popmenu_item" class="buttonPlus" > + </span></th>
+ <span id="add_popmenu_item" class="buttonPlus" > + </span></th>
</tr>
</thead>
@@ -294,7 +295,7 @@ Budget planning
</form>
<!-- TMPL_ELSE -->
-No budgets to display for this search criteria
+No funds to display for this search criteria
<!-- /TMPL_IF -->
--
1.5.6.5
More information about the Koha-patches
mailing list