From 55a6354bb3a62f0858d2d30c4f4c88e9fff6aca9 Mon Sep 17 00:00:00 2001
From: Nicole Engard <nengard@bywatersolutions.com>
Date: Fri, 21 May 2010 06:47:52 -0400
Subject: [PATCH] bug 4802 - fix swapped files in acq help
Content-Type: text/plain; charset="utf-8"

---
 .../en/modules/help/admin/aqbudgetperiods.tmpl     |   30 ++++++-------------
 .../prog/en/modules/help/admin/aqbudgets.tmpl      |   29 ++++++++++++------
 2 files changed, 29 insertions(+), 30 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/aqbudgetperiods.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/aqbudgetperiods.tmpl
index e5671c2..de90fec 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/aqbudgetperiods.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/aqbudgetperiods.tmpl
@@ -1,31 +1,21 @@
 <!-- TMPL_INCLUDE NAME="help-top.inc" -->
 
-<h1>Funds</h1>
+<h1>Budgets</h1>
 
-<p>A fund is added to a budget.</p>
+<p>Budgets are the top level used for tracking accounting values related to acquisitions. An example would be to create a budget for the current year and then breaking that into Funds for different areas of the library.</p>
 
-<p style="color: rgb(153, 0, 0);">IMPORTANT: A budget must be defined before a fund can be created.</p>
+<h3>Add a budget</h3>
 
-<p>To add a new fund click the New button and then choose which Budget you would like to add the fund to.</p>
-
-<p>In the form that appears you wan to enter the basics about your fund.</p>
-
-<p>The three first fields are required, the rest are optional</p>
+<p>To add a budget click the 'New Budget' button.</p>
 
 <ul>
-<li>Fund Code is a unique identifer for your fund</li>
-<li>The Fund Name should be something that librarians will understand</li>
-<li>Amount should be entered with only numbers and decimals, no other characters</li>
-<li>You can choose to assign this fund to a librarian. Doing so will make it so that only that librarian can make changes to the Fund</li>
-<li>Choose which library will be using this fund</li>
-<li>You can restrict who can order from this fund by choosing either the owner or the library from the 'Restrict access to' menu</li>
-<li>Notes are simply for any descriptive notes you might want to add so that librarians know when to use this fund</li>
-<li>Planning categories are used for statistical purposes. To learn more about planning categories, check out the Planning Category FAQ.</li>
+<li>Choose the time period this budget is for, whether it's an academic year, a fiscal year, a quarter, etc.</li>
+<li>The Description should be something that will help you identify the budget when ordering</li>
+<li>In the amount box do not use any symbols, simply enter the amount of the budget with numbers and decimals.</li>
+<li>Marking a budget active makes it usable when placing orders in the acquisitions module, even if the order is placed after the budget end date. This will allow you to record orders that were places in a previous budget period.</li>
+<li>Locking a budget means that Funds will not be able to be modified by librarians</li>
 </ul>
 
-<p>When complete, click 'Submit' and you will be brought to a list of all of the funds for the budget.</p>
-
-<p>To the right of each fund you will find the 'Edit,' 'Delete,' and 'Add Child Fund' options. A child fund simply a sub-fund of the fund listed. An example would be to have a fund for 'Fiction' and under that have a fund for 'New Releases' and a fund for 'Science Fiction.' It is an optional way to further organize your finances.</p>
-
+<p>Once you have made your edits, click the 'Save Changes' button. You will be brought to a list of your existing budgets.</p>
 
 <!-- TMPL_INCLUDE NAME="help-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/aqbudgets.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/aqbudgets.tmpl
index de90fec..34d9640 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/aqbudgets.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/aqbudgets.tmpl
@@ -1,21 +1,30 @@
 <!-- TMPL_INCLUDE NAME="help-top.inc" -->
 
-<h1>Budgets</h1>
+<h1>Funds</h1>
 
-<p>Budgets are the top level used for tracking accounting values related to acquisitions. An example would be to create a budget for the current year and then breaking that into Funds for different areas of the library.</p>
+<p>A fund is added to a budget.</p>
 
-<h3>Add a budget</h3>
+<p style="color: rgb(153, 0, 0);">IMPORTANT: A budget must be defined before a fund can be created.</p>
 
-<p>To add a budget click the 'New Budget' button.</p>
+<p>To add a new fund click the New button and then choose which Budget you would like to add the fund to.</p>
+
+<p>In the form that appears you wan to enter the basics about your fund.</p>
+
+<p>The three first fields are required, the rest are optional</p>
 
 <ul>
-<li>Choose the time period this budget is for, whether it's an academic year, a fiscal year, a quarter, etc.</li>
-<li>The Description should be something that will help you identify the budget when ordering</li>
-<li>In the amount box do not use any symbols, simply enter the amount of the budget with numbers and decimals.</li>
-<li>Marking a budget active makes it usable when placing orders in the acquisitions module, even if the order is placed after the budget end date. This will allow you to record orders that were places in a previous budget period.</li>
-<li>Locking a budget means that Funds will not be able to be modified by librarians</li>
+<li>Fund Code is a unique identifer for your fund</li>
+<li>The Fund Name should be something that librarians will understand</li>
+<li>Amount should be entered with only numbers and decimals, no other characters</li>
+<li>You can choose to assign this fund to a librarian. Doing so will make it so that only that librarian can make changes to the Fund</li>
+<li>Choose which library will be using this fund</li>
+<li>You can restrict who can order from this fund by choosing either the owner or the library from the 'Restrict access to' menu</li>
+<li>Notes are simply for any descriptive notes you might want to add so that librarians know when to use this fund</li>
+<li>Planning categories are used for statistical purposes. To learn more about planning categories, check out the Planning Category FAQ.</li>
 </ul>
 
-<p>Once you have made your edits, click the 'Save Changes' button. You will be brought to a list of your existing budgets.</p>
+<p>When complete, click 'Submit' and you will be brought to a list of all of the funds for the budget.</p>
+
+<p>To the right of each fund you will find the 'Edit,' 'Delete,' and 'Add Child Fund' options. A child fund simply a sub-fund of the fund listed. An example would be to have a fund for 'Fiction' and under that have a fund for 'New Releases' and a fund for 'Science Fiction.' It is an optional way to further organize your finances.</p>
 
 <!-- TMPL_INCLUDE NAME="help-bottom.inc" -->
\ No newline at end of file
-- 
1.5.6.5