Merge branch 'master' of https://git.code.sf.net/p/frontaccounting/git

diff --git a/README.md b/README.md
index 4ca88378425bdea05f2f873c3db6c079453efe93..7170cf5f19831b357813c090afc1c4aeb0861fd6 100644 (file)
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-FrontAccounting ERP
+![FrontAccounting ERP](./themes/default/images/logo_frontaccounting.jpg  "FrontAccounting ERP")
 ===================
 
 FrontAccounting ERP is open source, web-based accounting software for small and medium enterprises.
@@ -6,17 +6,55 @@ It supports double entry accounting providing both low level journal entry and u
 interface for everyday business activity with automatic GL postings generation. This is multicurrency,
 multilanguage system with active worldwide users community:
 
-Project web site http://frontaccounting.com
+* [Project web site](http://frontaccounting.com)
+* [SourceForge project page](http://sourceforge.net/projects/frontaccounting/)
+* [Central users forum](http://frontaccounting.com/punbb/index.php)
+* [Main code repository](https://sourceforge.net/p/frontaccounting/git/ci/master/tree/)
+* [GitHub mirror](http://github.com/FrontAccountingERP/FA)
+* [Mantis bugtracker](http://mantis.frontaccounting.com)
+* [FrontAccounting Wiki](http://frontaccounting.com/fawiki/)
 
-SourceForge project page: http://sourceforge.net/projects/frontaccounting/
+This project is developed as cooperative effort by FrontAccounting team and available under [GPL v.3 license](./doc/license.txt) 
 
-Central users forum: http://frontaccounting.com/punbb/index.php
+## Requirements
 
-Main code repository: https://sourceforge.net/p/frontaccounting/git/ci/master/tree/
+To use FrontAccounting application you should have already installed: 
 
-GitHub mirror: http://github.com/FrontAccountingERP/FA
+*   Any HTTP web server supporting php eg. _**Apache with mod_php**_ or _**IIS**_.
+*   **_PHP_** >=5.0 (version 5.6 or 7.x is recommended)
+*   **_MySQL_** >=4.1 server with **_Innodb_** tables enabled, or any version on **MariaDB** server
+*   **_Adobe Acrobat Reader_** (or any another PDF reader like _**evince**_) is handy for viewing reports before printing them out.
 
-Mantis bugtracker: http://mantis.frontaccounting.com
+## Installation
+### 1. PHP configuration checks
 
-FrontAccounting is available under GPL v.3 license.
+*   One critical aspect of the PHP installation is the setting of **_session.auto_start_** in the php.ini file. Some rpm distributions of PHP have the default setting of **_session.auto_start = 1_**. This starts a new session at the beginning of each script. However, this makes it impossible to instantiate any class objects that the system relies on. Classes are used extensively by this system. When sessions are required they are started by the system and this setting of **_session.auto_start_** can and should be set to 0.
+*   For security reasons both Register Globals and Magic Quotes php settings should be set to Off. When FrontAccounting is used with www server running php as Apache module, respective flags are set in .htaccess file. When your server uses CGI interface to PHP you should set  **_magic_quotes_gpc = 0_** and **_register_globals = 0_** in php.ini file.
+*   **_Innodb_** tables must be enabled in the MySQL server. These tables allow database transactions which are a critical component of the software. This is enabled by default in the newer versions of MySQL. If you need to enable it yourself, consult the MySQL manual.
 
+### 2. Download application files
+
+* Download and unpack latest FrontAccounting tarball from SourceForge into folder created under web server document root, e.g. **/var/www/html/frontaccounting**
+
+* If you prefer easy upgrades when new minor versions are released, you can clone sources from SourceForge project page or Github mirror e.g.:
+>      # cd  /var/www/html
+>      # git clone `https://git.code.sf.net/p/frontaccounting/git` frontaccounting
+
+Master branch contains all the latest bugfixes made atop the last stable release.
+       
+### 3. Installation
+
+Use your browser to open page at URL related to chosen installation folder. As an example, if you plan to use application locally and in previous step you have put files on your Linux box in /var/www/html/frontaccounting subfolder, just select `http://localhost/frontaccounting` url in your browser, and you will see start page of installation wizard. Follow instructions displayed during the process.
+
+During installation you will need to provide data server credentials with permissions to create new database, or you will have to provide existing database name and credentials for user with valid usage permissions to access it. You will have to chose also a couple of other options including installation language, optimal encoding for database data etc. Keep in mind that some options (like additional translations and charts of accounts) presented during installation process could be installed also later, when FrontAccounting is already in use.
+
+ After successful installation please remove or rename your install directory for safety reasons. You won't need it any more.
+
+### 4. Logging In For the First Time
+
+ Open a browser and enter the URL for the web server directory where FrontAccounting is installed. Enter the user name  **admin** and use password declared during install process to login as company administrator. Now you can proceed with configuration process setting up additional user accounts, creating fiscal years, defining additional currencies, GL accounts etc. All configuration options available in application are described in [FrontAccounting Wiki](http://frontaccounting.com/fawiki/) available directly from Help links on every application page under ![Help](./themes/default/images/help.gif  "Help") icon.
+ 
+
+## Troubleshooting
+
+If you encountered any problems with FrontAccounting configuration or usage, please consult your case with other users on [Frontaccounting forum](http://frontaccounting.com/punbb/index.php). If you think you have encountered a bug in application and after consulting other community members you still are sure this is really a bug, please fill in a report in project [Mantis bugtracker](http://mantis.frontaccounting.com) with all details which allow development team reproduce the problem, and hopefully fix it. Keep in mind, that  [GitHub](http://github.com/FrontAccountingERP/FA) page is mainly passive mirror for project based on SorceForge, so posting bug reports here is at least suboptimal.

diff --git a/admin/db/transactions_db.inc b/admin/db/transactions_db.inc
index d343b7c4ba8522119d1e93688bd73101ff4d4244..f7d2d295ec6ff7177c44799ac7c63f56c3dd4c31 100644 (file)
--- a/admin/db/transactions_db.inc
+++ b/admin/db/transactions_db.inc
@@ -35,7 +35,7 @@ function get_sql_for_view_transactions($filtertype, $from, $to, &$trans_ref)
        if ($type_name)
                $sql .= ", t.$type_name as type";
        $sql .= " FROM $table_name t LEFT JOIN ".TB_PREF."voided v ON"
-               ." t.$trans_no_name=v.id AND v.type=$filtertype";
+               ." t.$trans_no_name=v.id AND v.type=".db_escape($filtertype);
 
        $sql .= " WHERE ISNULL(v.`memo_`)";
        if ($from != null && $to != null)

diff --git a/doc/license.txt b/doc/license.txt
index 10926e87f113fb026c366866d6fa466061562870..0824bf8499eb834c37cd7280ea8af4663cf56f7e 100644 (file)
--- a/doc/license.txt
+++ b/doc/license.txt
@@ -1,3 +1,26 @@
+FrontAccounting is developed as cooperative effort by wide range of community
+members including developers, testers, translators and professional users.
+
+Copyright 2007-2009 Joe Hunt Consulting
+Copyright 2010-2018 FrontAccounting LLC
+
+Contributors:
+  Joe Hunt <joe.hunt.consulting@gmail.com>
+  Janusz Dobrowolski <janusz@frontaccounting.eu>
+  ApMuthu <ApMuthu@usa.net>
+  Cambell Prince <cambell.prince@gmail.com>
+  Maxime Bourget <bmx007@gmail.com>
+  Braath Waate <braathwaate@whitewaterhill.com>
+  Notrinos <trananhphuong83@gmail.com>
+  Alastair Robertson <frontaccounting@kwikpay.co.nz>
+  Ross Addison <frontaccounting@bbqq.co.uk>
+  Thomas A. Moulton <tom@moulton.us>
+  Mithy <themithy@gmail.com>
+  Boxygen <faisalayub1980@gmail.com>
+  kvvaradha <kvvaradha@gmail.com>
+  poncho1234 <caf247247@gmail.com>
+
+--------------------------------------------------------------------------
                     GNU GENERAL PUBLIC LICENSE
                        Version 3, 29 June 2007
 

diff --git a/includes/references.inc b/includes/references.inc
index 7a919f27d43720094bf9ac746d90d74ad9e9ed46..526dc1553cdb0cfa8b392e64228aef66d5781d7e 100644 (file)
--- a/includes/references.inc
+++ b/includes/references.inc
@@ -165,6 +165,7 @@ class references
                $type_fld = $db_info[1];
                $tno_fld = $db_info[2];
                $ref_fld = $db_info[3];
+               $type = db_escape($type);
 
                // retrieve last ref number in the refline from original transaction table
                $sql = "SELECT MAX(CAST(SUBSTR($ref_fld, ".(strlen($prefix)+1).",LENGTH($ref_fld)-".(strlen($postfix)+strlen($prefix)).") AS UNSIGNED))"

diff --git a/install.html b/install.html
deleted file mode 100644 (file)
index e8d75f1..0000000
--- a/install.html
+++ /dev/null
@@ -1,111 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en"><head><title>FrontAccounting</title></head>
-<body>
-<div><strong><span style="font-size: 20pt;"><span style="color: rgb(204, 102, 0); font-style: italic;">Front</span>Accounting
-Installation</span></strong></div>
-<h2>Pre-requisites</h2>
-<ul style="margin-top: 0pt;" type="disc">
-<li>A working HTTP web server eg. <em><strong>Apache,
-IIS</strong></em>. </li>
-<li><strong><em>PHP</em></strong>
-installed on the web server. </li>
-<li>A working <strong><em>MySQL</em></strong>
-server - with <strong><em>innodb</em></strong>
-tables enabled (see notes below) </li>
-<li><strong><em>Adobe Acrobat Reader</em></strong>
-- or another PDF reader for viewing the PDF reports before printing them out. </li>
-</ul>
-<h2>Important Notes</h2>
-<ul>
-<li>One critical aspect of the PHP installation is the setting
-of <strong><em>session.auto_start</em></strong>
-in the php.ini file. Some rpm distributions of PHP have the default
-setting of <strong><em>session.auto_start = 1</em></strong>.
-This starts a new session at the beginning of each script. However,
-this makes it impossible to instantiate any class objects that the
-system relies on. Classes are used extensively by this system. When
-sessions are required they are started by the system and this setting
-of <strong><em>session.auto_start</em></strong>
-can and should be set to 0. </li>
-<li>
-For security reasons both Register Globals and Magic Quotes php settings 
-should be set to Off. When FrontAccounting is used with www server running 
-php as Apache module, respective flags are set in .htaccess file. When your
-server uses CGI interface to PHP you should set 
-<strong><em>magic_quotes_gpc = 0</em></strong> and 
-<strong><em>register_globals = 0</em></strong> in php.ini file.
-</li>
-<li><strong><em>Innodb</em></strong>
-tables must be enabled in the MySQL server. These tables allow database
-transactions which are a critical component of the software. This is
-enabled by default in the newer versions of MySQL. If you need to
-enable it yourself, consult the MySQL manual. </li>
-<li>FrontAccounting is implemented and tested with MySQL.
-Generally
-it should work with other databases, but this is not supported in any
-way at the moment. </li>
-</ul>
-<h2>Copying all the project files to the correct directory</h2>
-<ul>
-<li>You must obviously have downloaded the project archive to
-be reading this file. </li>
-<li>All the files inside this archive should be copied to a
-directory under the web server root directory. </li>
-<li>For example, create a folder called <strong>/account</strong>,
-and extract the archive into this folder. </li>
-</ul>
-<h2>Installation Steps</h2><ol><li>If you have the option to create multiple databases on your
-host, create one, fi. <strong>frontacc</strong>, otherwise
-write down the database name for your account. At the same time look up
-the username and password for the database. You will need these
-informations during the wizard install. </li>
-<li>Enter <strong><em>your_url/account</em></strong>
-(or whatever directory you entered). This will run the install wizard if this is the first time you run FrontAccounting,
-setup a drill company and optional populating with initial demo data. You can later
-on create your own real company. It is a good idea to get familiar with
-the system before starting your own company.&nbsp; </li>
-<li>After successfully install, remove or rename your install
-directory for safety reasons. You don't need it any more.</li>
-</ol><h2>&nbsp;Logging In For the First Time</h2>
-<ol>
-<li>Pleae ensure that the folder <strong>/company/0</strong>
-on the server is <strong>writable</strong>. </li>
-<li>Open a browser and enter the URL for the web server
-directory where FrontAccounting is installed. </li>
-<li>Enter the user name:&nbsp; '<strong>admin</strong>'
-</li>
-<li>Enter the password you created during install.
-</li>
-<li>(NB : enter without quotation marks). </li>
-<li>
-<div>You can set up additional user accounts from the System
-Setup
-tab. Be careful not to delete the demonstration user until a new user
-has been set up. If there are no users defined the next time you try to
-login you won't be able to. The only way then to create a user to login
-with is to manually edit the SQL table "users" to insert a user.</div>
-</li>
-</ol>
-<h2>Setting Up Company Specific Data</h2>
-<ol>
-<li>All the standing configuration data is defined from the
-Setup tab
-and each link should be reviewed to enter appropriate data for the
-business. </li></ol><h2>Troubleshooting</h2>
-<ol>
-<li>If FrontAccounting is installed locally, you may have the <strong><em>session
-save path</em></strong> not set correctly. Normally this is
-set in your php.ini (for Windows). The entry is called <strong><em>session.save_path</em></strong>.
-Make sure this is set to a directory that actually exists. The default
-is set to /tmp, which may not be valid. </li>
-<li>If you are installing FrontAccounting onto a shared server,
-you may have to set the session save path within FrontAccounting. At
-the top of&nbsp;
-/includes/session.inc you will find this line : </li>
-<li>Uncomment this line and set the path to a directory that
-exists
-on your server. Make sure that you have read/write privileges on this
-directory. </li>
-</ol>
-<p>&nbsp;</p>
-</body></html>
\ No newline at end of file

diff --git a/lang/new_language_template/LC_MESSAGES/empty.po b/lang/new_language_template/LC_MESSAGES/empty.po
index 39082393f03349b804eb02a271c1d66e9682dbb7..a0acb8cd50ddf00a88ffd37dacd2ddb5f0fbf432 100644 (file)
--- a/lang/new_language_template/LC_MESSAGES/empty.po
+++ b/lang/new_language_template/LC_MESSAGES/empty.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-12-05 20:11+0100\n"
+"POT-Creation-Date: 2018-12-23 10:56+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -72,8 +72,7 @@ msgstr ""
 
 #: access/login.php:106 access/login.php:112 access/password_reset.php:69
 #: access/password_reset.php:75 admin/create_coy.php:247
-#: admin/create_coy.php:327 admin/inst_upgrade.php:63
-#: includes/sysnames.inc:208
+#: admin/create_coy.php:327 admin/inst_upgrade.php:63 includes/sysnames.inc:208
 msgid "Company"
 msgstr ""
 
@@ -156,21 +155,19 @@ msgstr ""
 #: admin/crm_categories.php:106 admin/fiscalyears.php:164
 #: admin/inst_lang.php:100 admin/payment_terms.php:142 admin/printers.php:96
 #: admin/shipping_companies.php:106 admin/tags.php:140 admin/users.php:153
-#: dimensions/inquiry/search_dimensions.php:116
-#: gl/manage/bank_accounts.php:133 gl/manage/currencies.php:164
-#: gl/manage/exchange_rates.php:94 gl/manage/gl_account_classes.php:131
-#: gl/manage/gl_account_types.php:159 gl/manage/gl_quick_entries.php:201
-#: gl/manage/gl_quick_entries.php:303 gl/includes/ui/gl_bank_ui.inc:179
-#: gl/includes/ui/gl_journal_ui.inc:160 includes/ui/class.crud_view.inc:281
-#: includes/ui/contacts_view.inc:61 includes/ui/simple_crud_class.inc:52
-#: includes/ui/ui_view.inc:1567 inventory/prices.php:163
-#: inventory/purchasing_data.php:167
+#: dimensions/inquiry/search_dimensions.php:116 gl/manage/bank_accounts.php:133
+#: gl/manage/currencies.php:164 gl/manage/exchange_rates.php:94
+#: gl/manage/gl_account_classes.php:131 gl/manage/gl_account_types.php:159
+#: gl/manage/gl_quick_entries.php:201 gl/manage/gl_quick_entries.php:303
+#: gl/includes/ui/gl_bank_ui.inc:179 gl/includes/ui/gl_journal_ui.inc:160
+#: includes/ui/class.crud_view.inc:281 includes/ui/contacts_view.inc:61
+#: includes/ui/simple_crud_class.inc:52 includes/ui/ui_view.inc:1567
+#: inventory/prices.php:163 inventory/purchasing_data.php:167
 #: inventory/includes/item_adjustments_ui.inc:100
 #: inventory/includes/stock_transfers_ui.inc:83
-#: inventory/manage/item_categories.php:147
-#: inventory/manage/item_codes.php:142 inventory/manage/item_units.php:110
-#: inventory/manage/locations.php:170 inventory/manage/sales_kits.php:51
-#: manufacturing/manage/bom_edit.php:59
+#: inventory/manage/item_categories.php:147 inventory/manage/item_codes.php:142
+#: inventory/manage/item_units.php:110 inventory/manage/locations.php:170
+#: inventory/manage/sales_kits.php:51 manufacturing/manage/bom_edit.php:59
 #: manufacturing/manage/work_centres.php:114
 #: manufacturing/includes/work_order_issue_ui.inc:61
 #: purchasing/includes/ui/invoice_ui.inc:551
@@ -185,7 +182,7 @@ msgstr ""
 msgid "Edit"
 msgstr ""
 
-#: admin/attachments.php:191 gl/inquiry/journal_inquiry.php:116
+#: admin/attachments.php:191 gl/inquiry/journal_inquiry.php:117
 msgid "View"
 msgstr ""
 
@@ -208,10 +205,9 @@ msgstr ""
 #: inventory/prices.php:164 inventory/purchasing_data.php:168
 #: inventory/includes/item_adjustments_ui.inc:102
 #: inventory/includes/stock_transfers_ui.inc:84
-#: inventory/manage/item_categories.php:148
-#: inventory/manage/item_codes.php:143 inventory/manage/item_units.php:111
-#: inventory/manage/locations.php:171 inventory/manage/sales_kits.php:52
-#: manufacturing/manage/bom_edit.php:60
+#: inventory/manage/item_categories.php:148 inventory/manage/item_codes.php:143
+#: inventory/manage/item_units.php:111 inventory/manage/locations.php:171
+#: inventory/manage/sales_kits.php:52 manufacturing/manage/bom_edit.php:60
 #: manufacturing/manage/work_centres.php:115
 #: manufacturing/includes/work_order_issue_ui.inc:63
 #: purchasing/includes/ui/invoice_ui.inc:317
@@ -230,7 +226,7 @@ msgstr ""
 #: admin/void_transaction.php:186 dimensions/inquiry/search_dimensions.php:124
 #: dimensions/view/view_dimension.php:55 gl/bank_account_reconcile.php:267
 #: gl/inquiry/bank_inquiry.php:71 gl/inquiry/gl_account_inquiry.php:128
-#: gl/inquiry/journal_inquiry.php:106 gl/inquiry/journal_inquiry.php:121
+#: gl/inquiry/journal_inquiry.php:107 gl/inquiry/journal_inquiry.php:122
 #: includes/ui/allocation_cart.inc:290
 #: inventory/inquiry/stock_movements.php:104
 #: manufacturing/search_work_orders.php:157
@@ -272,14 +268,13 @@ msgstr ""
 #: inventory/view/view_transfer.php:50 manufacturing/manage/bom_edit.php:43
 #: manufacturing/includes/manufacturing_ui.inc:28
 #: purchasing/includes/ui/invoice_ui.inc:501
-#: purchasing/includes/ui/invoice_ui.inc:513
-#: purchasing/po_receive_items.php:62 reporting/rep104.php:109
-#: reporting/rep105.php:115 reporting/rep204.php:84 reporting/rep303.php:121
-#: reporting/rep303.php:127 reporting/rep304.php:127 reporting/rep305.php:106
-#: reporting/rep306.php:141 reporting/rep307.php:114 reporting/rep308.php:223
-#: reporting/rep309.php:99 reporting/rep310.php:142 reporting/rep401.php:71
-#: sales/create_recurrent_invoices.php:203 sales/manage/credit_status.php:97
-#: sales/manage/recurrent_invoices.php:128
+#: purchasing/includes/ui/invoice_ui.inc:513 purchasing/po_receive_items.php:62
+#: reporting/rep104.php:109 reporting/rep105.php:115 reporting/rep204.php:84
+#: reporting/rep303.php:121 reporting/rep303.php:127 reporting/rep304.php:127
+#: reporting/rep305.php:106 reporting/rep306.php:141 reporting/rep307.php:114
+#: reporting/rep308.php:223 reporting/rep309.php:99 reporting/rep310.php:142
+#: reporting/rep401.php:71 sales/create_recurrent_invoices.php:203
+#: sales/manage/credit_status.php:97 sales/manage/recurrent_invoices.php:128
 #: sales/inquiry/sales_orders_view.php:284
 #: sales/inquiry/sales_orders_view.php:288 taxes/tax_groups.php:126
 #: taxes/tax_types.php:115
@@ -341,20 +336,21 @@ msgstr ""
 
 #: admin/backups.php:109 admin/create_coy.php:268 admin/fiscalyears.php:155
 #: admin/inst_lang.php:85 admin/inst_lang.php:97
-#: dimensions/inquiry/search_dimensions.php:106
-#: gl/manage/bank_accounts.php:130 gl/manage/currencies.php:162
-#: gl/manage/gl_account_classes.php:126 gl/manage/gl_quick_entries.php:237
-#: includes/system_tests.inc:41 includes/system_tests.inc:116
-#: includes/system_tests.inc:129 includes/ui/class.reflines_crud.inc:56
-#: includes/ui/ui_lists.inc:1874 purchasing/manage/suppliers.php:122
-#: reporting/rep101.php:121 reporting/rep101.php:132 reporting/rep102.php:110
-#: reporting/rep102.php:112 reporting/rep104.php:103 reporting/rep106.php:81
-#: reporting/rep114.php:74 reporting/rep201.php:111 reporting/rep202.php:116
-#: reporting/rep202.php:118 reporting/rep203.php:84 reporting/rep303.php:112
-#: reporting/rep303.php:117 reporting/rep304.php:123 reporting/rep402.php:129
-#: reporting/rep402.php:130 reporting/rep402.php:181 reporting/rep501.php:113
-#: sales/manage/sales_points.php:94 sales/manage/sales_points.php:95
-#: sales/manage/sales_types.php:119 taxes/item_tax_types.php:129
+#: dimensions/inquiry/search_dimensions.php:106 gl/manage/bank_accounts.php:130
+#: gl/manage/currencies.php:162 gl/manage/gl_account_classes.php:126
+#: gl/manage/gl_quick_entries.php:237 includes/system_tests.inc:41
+#: includes/system_tests.inc:116 includes/system_tests.inc:129
+#: includes/ui/class.reflines_crud.inc:56 includes/ui/ui_lists.inc:1876
+#: purchasing/manage/suppliers.php:122 reporting/rep101.php:121
+#: reporting/rep101.php:132 reporting/rep102.php:110 reporting/rep102.php:112
+#: reporting/rep104.php:103 reporting/rep106.php:81 reporting/rep114.php:74
+#: reporting/rep115.php:157 reporting/rep201.php:111 reporting/rep202.php:116
+#: reporting/rep202.php:118 reporting/rep203.php:84 reporting/rep206.php:111
+#: reporting/rep303.php:112 reporting/rep303.php:117 reporting/rep304.php:123
+#: reporting/rep402.php:129 reporting/rep402.php:130 reporting/rep402.php:181
+#: reporting/rep501.php:113 sales/manage/sales_points.php:94
+#: sales/manage/sales_points.php:95 sales/manage/sales_types.php:119
+#: taxes/item_tax_types.php:129
 msgid "No"
 msgstr ""
 
@@ -701,12 +697,12 @@ msgid "Optional Modules"
 msgstr ""
 
 #: admin/company_preferences.php:270 includes/dashboard.inc:118
-#: reporting/reports_main.php:295
+#: reporting/reports_main.php:315
 msgid "Manufacturing"
 msgstr ""
 
 #: admin/company_preferences.php:271 includes/dashboard.inc:116
-#: inventory/manage/items.php:24 reporting/reports_main.php:319
+#: inventory/manage/items.php:24 reporting/reports_main.php:339
 msgid "Fixed Assets"
 msgstr ""
 
@@ -750,7 +746,7 @@ msgstr ""
 #: admin/gl_setup.php:309 admin/inst_chart.php:84 admin/inst_lang.php:103
 #: admin/inst_module.php:146 admin/inst_module.php:164
 #: admin/inst_module.php:207 admin/inst_theme.php:81
-#: dimensions/dimension_entry.php:283 gl/gl_bank.php:413 gl/gl_budget.php:134
+#: dimensions/dimension_entry.php:283 gl/gl_bank.php:415 gl/gl_budget.php:134
 #: gl/manage/gl_quick_entries.php:60 gl/includes/ui/gl_bank_ui.inc:265
 #: gl/includes/ui/gl_journal_ui.inc:278 includes/ui/class.crud_view.inc:289
 #: includes/ui/db_pager_view.inc:180 includes/ui/simple_crud_class.inc:56
@@ -885,8 +881,8 @@ msgstr ""
 msgid "Charset"
 msgstr ""
 
-#: admin/create_coy.php:248 admin/inst_lang.php:36
-#: admin/print_profiles.php:161 includes/ui/class.reflines_crud.inc:38
+#: admin/create_coy.php:248 admin/inst_lang.php:36 admin/print_profiles.php:161
+#: includes/ui/class.reflines_crud.inc:38
 #: purchasing/includes/ui/invoice_ui.inc:140
 #: purchasing/includes/ui/invoice_ui.inc:143
 #: purchasing/includes/ui/po_ui.inc:172 purchasing/includes/ui/po_ui.inc:174
@@ -895,21 +891,21 @@ msgstr ""
 
 #: admin/create_coy.php:268 admin/create_coy.php:351 admin/fiscalyears.php:159
 #: admin/inst_lang.php:85 admin/inst_lang.php:97
-#: dimensions/inquiry/search_dimensions.php:106
-#: gl/manage/bank_accounts.php:128 gl/manage/currencies.php:162
-#: gl/manage/gl_account_classes.php:126 gl/manage/gl_quick_entries.php:237
-#: includes/system_tests.inc:41 includes/system_tests.inc:116
-#: includes/system_tests.inc:129 includes/ui/class.reflines_crud.inc:56
-#: includes/ui/class.reflines_crud.inc:101 includes/ui/ui_lists.inc:1875
+#: dimensions/inquiry/search_dimensions.php:106 gl/manage/bank_accounts.php:128
+#: gl/manage/currencies.php:162 gl/manage/gl_account_classes.php:126
+#: gl/manage/gl_quick_entries.php:237 includes/system_tests.inc:41
+#: includes/system_tests.inc:116 includes/system_tests.inc:129
+#: includes/ui/class.reflines_crud.inc:56
+#: includes/ui/class.reflines_crud.inc:101 includes/ui/ui_lists.inc:1877
 #: purchasing/manage/suppliers.php:122 reporting/rep101.php:120
 #: reporting/rep101.php:131 reporting/rep102.php:109 reporting/rep102.php:111
 #: reporting/rep104.php:105 reporting/rep106.php:83 reporting/rep114.php:76
-#: reporting/rep201.php:110 reporting/rep202.php:115 reporting/rep202.php:117
-#: reporting/rep203.php:83 reporting/rep303.php:107 reporting/rep303.php:116
-#: reporting/rep304.php:122 reporting/rep402.php:129 reporting/rep402.php:130
-#: reporting/rep501.php:111 sales/manage/sales_points.php:94
-#: sales/manage/sales_points.php:95 sales/manage/sales_types.php:119
-#: taxes/item_tax_types.php:133
+#: reporting/rep115.php:156 reporting/rep201.php:110 reporting/rep202.php:115
+#: reporting/rep202.php:117 reporting/rep203.php:83 reporting/rep206.php:110
+#: reporting/rep303.php:107 reporting/rep303.php:116 reporting/rep304.php:122
+#: reporting/rep402.php:129 reporting/rep402.php:130 reporting/rep501.php:111
+#: sales/manage/sales_points.php:94 sales/manage/sales_points.php:95
+#: sales/manage/sales_types.php:119 taxes/item_tax_types.php:133
 msgid "Yes"
 msgstr ""
 
@@ -1257,7 +1253,7 @@ msgid "Fiscal Year End"
 msgstr ""
 
 #: admin/fiscalyears.php:138 dimensions/inquiry/search_dimensions.php:130
-#: dimensions/inquiry/search_dimensions.php:136 includes/ui/ui_lists.inc:759
+#: dimensions/inquiry/search_dimensions.php:136 includes/ui/ui_lists.inc:761
 #: includes/ui/ui_view.inc:1566 manufacturing/search_work_orders.php:114
 #: reporting/rep402.php:134 reporting/rep501.php:87 reporting/rep710.php:113
 #: reporting/includes/excel_report.inc:231
@@ -1407,7 +1403,7 @@ msgstr ""
 #: admin/void_transaction.php:187 dimensions/inquiry/search_dimensions.php:125
 #: dimensions/view/view_dimension.php:55 gl/bank_account_reconcile.php:268
 #: gl/inquiry/bank_inquiry.php:71 gl/inquiry/gl_account_inquiry.php:128
-#: gl/inquiry/journal_inquiry.php:112 gl/view/bank_transfer_view.php:86
+#: gl/inquiry/journal_inquiry.php:113 gl/view/bank_transfer_view.php:86
 #: gl/view/gl_deposit_view.php:80 gl/view/gl_payment_view.php:78
 #: gl/view/gl_trans_view.php:38 includes/ui/contacts_view.inc:40
 #: inventory/inquiry/stock_movements.php:104
@@ -1440,7 +1436,7 @@ msgstr ""
 #: sales/view/view_receipt.php:39 sales/view/view_sales_order.php:94
 #: sales/inquiry/customer_allocation_inquiry.php:148
 #: sales/inquiry/customer_inquiry.php:197
-#: sales/inquiry/sales_deliveries_view.php:173
+#: sales/inquiry/sales_deliveries_view.php:174
 #: sales/includes/ui/sales_credit_ui.inc:81
 #: sales/includes/ui/sales_credit_ui.inc:83
 #: sales/includes/ui/sales_order_ui.inc:361
@@ -1541,7 +1537,7 @@ msgstr ""
 msgid "Show PO item codes:"
 msgstr ""
 
-#: admin/gl_setup.php:269 reporting/reports_main.php:208
+#: admin/gl_setup.php:269 reporting/reports_main.php:228
 msgid "Inventory"
 msgstr ""
 
@@ -1678,8 +1674,8 @@ msgstr ""
 msgid "Install/Update Languages"
 msgstr ""
 
-#: admin/inst_lang.php:35 admin/printers.php:84
-#: admin/shipping_companies.php:91 dimensions/dimension_entry.php:261
+#: admin/inst_lang.php:35 admin/printers.php:84 admin/shipping_companies.php:91
+#: dimensions/dimension_entry.php:261
 #: dimensions/inquiry/search_dimensions.php:126
 #: dimensions/view/view_dimension.php:55 gl/gl_journal.php:556
 #: inventory/manage/item_categories.php:117
@@ -1687,10 +1683,10 @@ msgstr ""
 #: manufacturing/manage/work_centres.php:101
 #: purchasing/includes/ui/invoice_ui.inc:278
 #: purchasing/includes/ui/invoice_ui.inc:280
-#: purchasing/includes/ui/invoice_ui.inc:282 reporting/rep501.php:87
-#: reporting/rep709.php:116 reporting/rep709.php:117
-#: sales/manage/customer_branches.php:284 sales/manage/sales_people.php:99
-#: taxes/item_tax_types.php:117
+#: purchasing/includes/ui/invoice_ui.inc:282 reporting/rep115.php:161
+#: reporting/rep206.php:115 reporting/rep501.php:87 reporting/rep709.php:116
+#: reporting/rep709.php:117 sales/manage/customer_branches.php:284
+#: sales/manage/sales_people.php:99 taxes/item_tax_types.php:117
 msgid "Name"
 msgstr ""
 
@@ -1787,8 +1783,8 @@ msgstr ""
 msgid "Install third-party extension."
 msgstr ""
 
-#: admin/inst_module.php:177 includes/ui/ui_lists.inc:759
-#: includes/ui/ui_lists.inc:2352 reporting/includes/excel_report.inc:229
+#: admin/inst_module.php:177 includes/ui/ui_lists.inc:761
+#: includes/ui/ui_lists.inc:2354 reporting/includes/excel_report.inc:229
 #: reporting/includes/pdf_report.inc:265
 msgid "Active"
 msgstr ""
@@ -1940,7 +1936,7 @@ msgstr ""
 #: dimensions/inquiry/search_dimensions.php:127
 #: dimensions/view/view_dimension.php:55 gl/bank_account_reconcile.php:266
 #: gl/inquiry/bank_inquiry.php:71 gl/inquiry/gl_account_inquiry.php:128
-#: gl/inquiry/journal_inquiry.php:108 gl/inquiry/tax_inquiry.php:80
+#: gl/inquiry/journal_inquiry.php:109 gl/inquiry/tax_inquiry.php:80
 #: gl/manage/bank_accounts.php:109 gl/manage/gl_quick_entries.php:190
 #: gl/view/accrual_trans.php:52 gl/includes/ui/gl_bank_ui.inc:90
 #: includes/ui/ui_view.inc:546 inventory/inquiry/stock_movements.php:104
@@ -1956,7 +1952,7 @@ msgstr ""
 #: reporting/rep601.php:79 reporting/rep602.php:80 reporting/rep702.php:60
 #: reporting/rep704.php:82 reporting/rep704.php:85 reporting/rep704.php:88
 #: reporting/rep709.php:112 reporting/rep710.php:78 reporting/rep710.php:86
-#: reporting/reports_main.php:365 reporting/reports_main.php:527
+#: reporting/reports_main.php:385 reporting/reports_main.php:547
 #: reporting/includes/doctext.inc:161 reporting/includes/doctext.inc:204
 #: reporting/includes/doctext.inc:223
 #: sales/inquiry/customer_allocation_inquiry.php:146
@@ -2196,11 +2192,9 @@ msgstr ""
 #: includes/ui/simple_crud_class.inc:58 includes/ui/simple_crud_class.inc:229
 #: includes/ui/ui_controls.inc:645 includes/ui/ui_input.inc:230
 #: inventory/includes/item_adjustments_ui.inc:192
-#: inventory/includes/stock_transfers_ui.inc:152
-#: inventory/manage/items.php:538
+#: inventory/includes/stock_transfers_ui.inc:152 inventory/manage/items.php:538
 #: manufacturing/includes/work_order_issue_ui.inc:134
-#: purchasing/includes/ui/po_ui.inc:444
-#: sales/create_recurrent_invoices.php:190
+#: purchasing/includes/ui/po_ui.inc:444 sales/create_recurrent_invoices.php:190
 #: sales/includes/ui/sales_credit_ui.inc:290
 #: sales/includes/ui/sales_order_ui.inc:550
 msgid "Cancel"
@@ -2258,8 +2252,7 @@ msgid "Secondary Phone"
 msgstr ""
 
 #: admin/shipping_companies.php:91 inventory/manage/locations.php:155
-#: purchasing/inquiry/suppliers_list.php:53
-#: sales/inquiry/customers_list.php:54
+#: purchasing/inquiry/suppliers_list.php:53 sales/inquiry/customers_list.php:54
 msgid "Address"
 msgstr ""
 
@@ -2288,11 +2281,11 @@ msgstr ""
 msgid "Unspecified tag type"
 msgstr ""
 
-#: admin/tags.php:40 reporting/reports_main.php:386
-#: reporting/reports_main.php:395 reporting/reports_main.php:407
-#: reporting/reports_main.php:438 reporting/reports_main.php:446
-#: reporting/reports_main.php:457 reporting/reports_main.php:485
-#: reporting/reports_main.php:492 reporting/reports_main.php:502
+#: admin/tags.php:40 reporting/reports_main.php:406
+#: reporting/reports_main.php:415 reporting/reports_main.php:427
+#: reporting/reports_main.php:458 reporting/reports_main.php:466
+#: reporting/reports_main.php:477 reporting/reports_main.php:505
+#: reporting/reports_main.php:512 reporting/reports_main.php:522
 msgid "Account Tags"
 msgstr ""
 
@@ -2421,7 +2414,7 @@ msgstr ""
 #: admin/view_print_transaction.php:129 includes/ui/ui_controls.inc:213
 #: purchasing/inquiry/po_search_completed.php:43
 #: purchasing/inquiry/po_search.php:94 sales/inquiry/customer_inquiry.php:97
-#: sales/inquiry/sales_deliveries_view.php:148
+#: sales/inquiry/sales_deliveries_view.php:149
 #: sales/inquiry/sales_orders_view.php:102
 msgid "Print"
 msgstr ""
@@ -2451,7 +2444,7 @@ msgstr ""
 #: sales/inquiry/customer_allocation_inquiry.php:51
 #: sales/inquiry/customer_branches_list.php:38
 #: sales/inquiry/customer_inquiry.php:165 sales/inquiry/customers_list.php:42
-#: sales/inquiry/sales_deliveries_view.php:116
+#: sales/inquiry/sales_deliveries_view.php:117
 #: sales/inquiry/sales_orders_view.php:236
 msgid "Search"
 msgstr ""
@@ -2473,7 +2466,7 @@ msgstr ""
 #: dimensions/view/view_dimension.php:55 gl/accruals.php:104
 #: gl/accruals.php:211 gl/bank_account_reconcile.php:269
 #: gl/inquiry/bank_inquiry.php:71 gl/inquiry/gl_account_inquiry.php:128
-#: gl/inquiry/journal_inquiry.php:107 gl/view/accrual_trans.php:52
+#: gl/inquiry/journal_inquiry.php:108 gl/view/accrual_trans.php:52
 #: gl/view/bank_transfer_view.php:83 gl/view/gl_deposit_view.php:68
 #: gl/view/gl_payment_view.php:66 includes/dashboard.inc:486
 #: includes/dashboard.inc:571 includes/ui/allocation_cart.inc:290
@@ -2521,7 +2514,7 @@ msgid "Void a Transaction"
 msgstr ""
 
 #: admin/void_transaction.php:125 admin/void_transaction.php:190
-#: gl/inquiry/accounts_list.php:63 includes/ui/ui_input.inc:152
+#: gl/inquiry/accounts_list.php:64 includes/ui/ui_input.inc:152
 #: includes/ui/ui_input.inc:301 includes/ui/ui_lists.inc:20
 #: inventory/inquiry/stock_list.php:66 inventory/inquiry/stock_list.php:69
 #: purchasing/inquiry/suppliers_list.php:65
@@ -2611,11 +2604,10 @@ msgid "The entered date is invalid."
 msgstr ""
 
 #: admin/void_transaction.php:278 gl/accruals.php:48 gl/bank_transfer.php:165
-#: gl/gl_bank.php:265 gl/gl_journal.php:222 gl/gl_journal.php:261
+#: gl/gl_bank.php:267 gl/gl_journal.php:222 gl/gl_journal.php:261
 #: gl/manage/revaluate_currencies.php:57 inventory/adjustments.php:123
 #: inventory/transfers.php:115 manufacturing/work_order_add_finished.php:95
-#: manufacturing/work_order_costs.php:86
-#: manufacturing/work_order_entry.php:151
+#: manufacturing/work_order_costs.php:86 manufacturing/work_order_entry.php:151
 #: manufacturing/work_order_issue.php:82 purchasing/po_entry_items.php:351
 #: purchasing/po_receive_items.php:179 purchasing/supplier_credit.php:186
 #: purchasing/supplier_invoice.php:193 purchasing/supplier_payment.php:200
@@ -2656,7 +2648,8 @@ msgid "Closing Year"
 msgstr ""
 
 #: admin/db/fiscalyears_db.inc:220 reporting/rep101.php:192
-#: reporting/rep201.php:170 reporting/rep706.php:185
+#: reporting/rep115.php:161 reporting/rep201.php:170 reporting/rep206.php:115
+#: reporting/rep706.php:185
 msgid "Open Balance"
 msgstr ""
 
@@ -3011,8 +3004,8 @@ msgstr ""
 msgid "Ta&x Inquiry"
 msgstr ""
 
-#: applications/generalledger.php:44 reporting/reports_main.php:413
-#: reporting/reports_main.php:463 reporting/reports_main.php:508
+#: applications/generalledger.php:44 reporting/reports_main.php:433
+#: reporting/reports_main.php:483 reporting/reports_main.php:528
 msgid "Trial &Balance"
 msgstr ""
 
@@ -3407,20 +3400,21 @@ msgid "Dimension Reference:"
 msgstr ""
 
 #: dimensions/dimension_entry.php:267 reporting/reports_main.php:36
-#: reporting/reports_main.php:66 reporting/reports_main.php:82
-#: reporting/reports_main.php:91 reporting/reports_main.php:153
-#: reporting/reports_main.php:235 reporting/reports_main.php:245
-#: reporting/reports_main.php:251 reporting/reports_main.php:261
-#: reporting/reports_main.php:269 reporting/reports_main.php:277
-#: reporting/reports_main.php:284 reporting/reports_main.php:343
-#: reporting/reports_main.php:351 reporting/reports_main.php:363
-#: reporting/reports_main.php:373 reporting/reports_main.php:391
-#: reporting/reports_main.php:402 reporting/reports_main.php:414
-#: reporting/reports_main.php:427 reporting/reports_main.php:443
-#: reporting/reports_main.php:453 reporting/reports_main.php:464
-#: reporting/reports_main.php:476 reporting/reports_main.php:490
-#: reporting/reports_main.php:499 reporting/reports_main.php:509
-#: reporting/reports_main.php:518 reporting/reports_main.php:525
+#: reporting/reports_main.php:57 reporting/reports_main.php:77
+#: reporting/reports_main.php:93 reporting/reports_main.php:102
+#: reporting/reports_main.php:164 reporting/reports_main.php:185
+#: reporting/reports_main.php:255 reporting/reports_main.php:265
+#: reporting/reports_main.php:271 reporting/reports_main.php:281
+#: reporting/reports_main.php:289 reporting/reports_main.php:297
+#: reporting/reports_main.php:304 reporting/reports_main.php:363
+#: reporting/reports_main.php:371 reporting/reports_main.php:383
+#: reporting/reports_main.php:393 reporting/reports_main.php:411
+#: reporting/reports_main.php:422 reporting/reports_main.php:434
+#: reporting/reports_main.php:447 reporting/reports_main.php:463
+#: reporting/reports_main.php:473 reporting/reports_main.php:484
+#: reporting/reports_main.php:496 reporting/reports_main.php:510
+#: reporting/reports_main.php:519 reporting/reports_main.php:529
+#: reporting/reports_main.php:538 reporting/reports_main.php:545
 msgid "Start Date"
 msgstr ""
 
@@ -3502,9 +3496,10 @@ msgstr ""
 #: gl/includes/ui/gl_journal_ui.inc:116 gl/includes/ui/gl_journal_ui.inc:119
 #: manufacturing/view/wo_costs_view.php:61
 #: purchasing/inquiry/supplier_allocation_inquiry.php:144
-#: reporting/rep402.php:139 reporting/rep601.php:80 reporting/rep602.php:81
-#: reporting/rep702.php:54 reporting/rep704.php:83 reporting/rep704.php:86
-#: reporting/rep704.php:89 reporting/rep708.php:192 reporting/rep708.php:193
+#: reporting/rep115.php:161 reporting/rep206.php:115 reporting/rep402.php:139
+#: reporting/rep601.php:80 reporting/rep602.php:81 reporting/rep702.php:54
+#: reporting/rep704.php:83 reporting/rep704.php:86 reporting/rep704.php:89
+#: reporting/rep708.php:192 reporting/rep708.php:193
 #: sales/inquiry/customer_allocation_inquiry.php:154
 msgid "Debit"
 msgstr ""
@@ -3519,9 +3514,10 @@ msgstr ""
 #: gl/includes/ui/gl_journal_ui.inc:116 gl/includes/ui/gl_journal_ui.inc:119
 #: includes/sysnames.inc:90 manufacturing/view/wo_costs_view.php:61
 #: purchasing/inquiry/supplier_allocation_inquiry.php:145
-#: reporting/rep402.php:139 reporting/rep601.php:80 reporting/rep602.php:81
-#: reporting/rep702.php:54 reporting/rep704.php:83 reporting/rep704.php:86
-#: reporting/rep704.php:89 reporting/rep708.php:192 reporting/rep708.php:193
+#: reporting/rep115.php:161 reporting/rep206.php:116 reporting/rep402.php:139
+#: reporting/rep601.php:80 reporting/rep602.php:81 reporting/rep702.php:54
+#: reporting/rep704.php:83 reporting/rep704.php:86 reporting/rep704.php:89
+#: reporting/rep708.php:192 reporting/rep708.php:193
 #: sales/inquiry/customer_allocation_inquiry.php:155
 msgid "Credit"
 msgstr ""
@@ -3533,11 +3529,11 @@ msgstr ""
 #: purchasing/inquiry/supplier_allocation_inquiry.php:147
 #: purchasing/inquiry/supplier_inquiry.php:182
 #: purchasing/inquiry/supplier_inquiry.php:195 reporting/rep101.php:140
-#: reporting/rep201.php:119 reporting/rep203.php:89 reporting/rep204.php:84
-#: reporting/rep307.php:114 reporting/rep601.php:80 reporting/rep602.php:81
-#: reporting/rep701.php:110 reporting/rep704.php:83 reporting/rep704.php:86
-#: reporting/rep704.php:89 reporting/rep708.php:185
-#: sales/inquiry/customer_allocation_inquiry.php:157
+#: reporting/rep115.php:161 reporting/rep201.php:119 reporting/rep203.php:89
+#: reporting/rep204.php:84 reporting/rep206.php:116 reporting/rep307.php:114
+#: reporting/rep601.php:80 reporting/rep602.php:81 reporting/rep701.php:110
+#: reporting/rep704.php:83 reporting/rep704.php:86 reporting/rep704.php:89
+#: reporting/rep708.php:185 sales/inquiry/customer_allocation_inquiry.php:157
 #: sales/inquiry/customer_inquiry.php:204
 #: sales/inquiry/customer_inquiry.php:217
 msgid "Balance"
@@ -3570,20 +3566,21 @@ msgid "Reference:"
 msgstr ""
 
 #: dimensions/inquiry/search_dimensions.php:74
-#: includes/ui/allocation_cart.inc:314 includes/ui/ui_lists.inc:2122
+#: includes/ui/allocation_cart.inc:314 includes/ui/ui_lists.inc:2124
 #: reporting/rep101.php:115 reporting/rep102.php:92 reporting/rep104.php:95
 #: reporting/rep104.php:99 reporting/rep105.php:96 reporting/rep105.php:100
-#: reporting/rep201.php:97 reporting/rep202.php:98 reporting/rep203.php:69
-#: reporting/rep204.php:77 reporting/rep301.php:151 reporting/rep301.php:158
-#: reporting/rep302.php:103 reporting/rep302.php:110 reporting/rep303.php:95
-#: reporting/rep303.php:102 reporting/rep304.php:109 reporting/rep304.php:114
-#: reporting/rep304.php:119 reporting/rep306.php:120 reporting/rep306.php:125
-#: reporting/rep306.php:130 reporting/rep306.php:135 reporting/rep307.php:103
-#: reporting/rep307.php:108 reporting/rep308.php:212 reporting/rep308.php:217
-#: reporting/rep309.php:93 reporting/rep310.php:121 reporting/rep310.php:126
-#: reporting/rep310.php:131 reporting/rep310.php:136 reporting/rep402.php:117
-#: reporting/rep402.php:125 reporting/rep451.php:67 reporting/rep451.php:74
-#: reporting/rep702.php:61 reporting/rep710.php:86 reporting/rep710.php:87
+#: reporting/rep115.php:128 reporting/rep201.php:97 reporting/rep202.php:98
+#: reporting/rep203.php:69 reporting/rep204.php:77 reporting/rep206.php:97
+#: reporting/rep301.php:151 reporting/rep301.php:158 reporting/rep302.php:103
+#: reporting/rep302.php:110 reporting/rep303.php:95 reporting/rep303.php:102
+#: reporting/rep304.php:109 reporting/rep304.php:114 reporting/rep304.php:119
+#: reporting/rep306.php:120 reporting/rep306.php:125 reporting/rep306.php:130
+#: reporting/rep306.php:135 reporting/rep307.php:103 reporting/rep307.php:108
+#: reporting/rep308.php:212 reporting/rep308.php:217 reporting/rep309.php:93
+#: reporting/rep310.php:121 reporting/rep310.php:126 reporting/rep310.php:131
+#: reporting/rep310.php:136 reporting/rep402.php:117 reporting/rep402.php:125
+#: reporting/rep451.php:67 reporting/rep451.php:74 reporting/rep702.php:61
+#: reporting/rep710.php:86 reporting/rep710.php:87
 msgid "All"
 msgstr ""
 
@@ -3656,7 +3653,7 @@ msgstr ""
 #: gl/inquiry/tax_inquiry.php:61 purchasing/inquiry/po_search_completed.php:82
 #: purchasing/inquiry/po_search.php:64
 #: sales/inquiry/customer_allocation_inquiry.php:44
-#: sales/inquiry/sales_deliveries_view.php:102
+#: sales/inquiry/sales_deliveries_view.php:103
 #: sales/inquiry/sales_orders_view.php:217
 msgid "from:"
 msgstr ""
@@ -3665,7 +3662,7 @@ msgstr ""
 #: gl/inquiry/tax_inquiry.php:62 purchasing/inquiry/po_search_completed.php:83
 #: purchasing/inquiry/po_search.php:65
 #: sales/inquiry/customer_allocation_inquiry.php:45
-#: sales/inquiry/sales_deliveries_view.php:103
+#: sales/inquiry/sales_deliveries_view.php:104
 #: sales/inquiry/sales_orders_view.php:218
 msgid "to:"
 msgstr ""
@@ -3732,14 +3729,14 @@ msgstr ""
 #: reporting/rep705.php:259 reporting/rep706.php:194 reporting/rep706.php:196
 #: reporting/rep706.php:204 reporting/rep707.php:218 reporting/rep707.php:220
 #: reporting/rep707.php:228 reporting/rep708.php:201 reporting/rep708.php:203
-#: reporting/rep708.php:210 reporting/reports_main.php:377
-#: reporting/reports_main.php:378 reporting/reports_main.php:384
-#: reporting/reports_main.php:385 reporting/reports_main.php:393
-#: reporting/reports_main.php:394 reporting/reports_main.php:405
-#: reporting/reports_main.php:406 reporting/reports_main.php:418
-#: reporting/reports_main.php:419 reporting/reports_main.php:431
-#: reporting/reports_main.php:437 reporting/reports_main.php:445
-#: reporting/reports_main.php:456 reporting/reports_main.php:468
+#: reporting/rep708.php:210 reporting/reports_main.php:397
+#: reporting/reports_main.php:398 reporting/reports_main.php:404
+#: reporting/reports_main.php:405 reporting/reports_main.php:413
+#: reporting/reports_main.php:414 reporting/reports_main.php:425
+#: reporting/reports_main.php:426 reporting/reports_main.php:438
+#: reporting/reports_main.php:439 reporting/reports_main.php:451
+#: reporting/reports_main.php:457 reporting/reports_main.php:465
+#: reporting/reports_main.php:476 reporting/reports_main.php:488
 #: sales/customer_delivery.php:383 sales/customer_delivery.php:391
 #: sales/customer_invoice.php:457 sales/customer_invoice.php:494
 #: sales/manage/customers.php:275 sales/manage/customers.php:277
@@ -3752,7 +3749,7 @@ msgstr ""
 
 #: gl/accruals.php:112 gl/accruals.php:229 gl/bank_account_reconcile.php:273
 #: gl/inquiry/bank_inquiry.php:72 gl/inquiry/gl_account_inquiry.php:143
-#: gl/inquiry/gl_account_inquiry.php:145 gl/inquiry/journal_inquiry.php:114
+#: gl/inquiry/gl_account_inquiry.php:145 gl/inquiry/journal_inquiry.php:115
 #: gl/manage/gl_quick_entries.php:268 gl/manage/gl_quick_entries.php:270
 #: gl/manage/gl_quick_entries.php:272 gl/view/accrual_trans.php:60
 #: gl/view/gl_deposit_view.php:105 gl/view/gl_deposit_view.php:108
@@ -3764,8 +3761,7 @@ msgstr ""
 #: gl/includes/ui/gl_bank_ui.inc:300 gl/includes/ui/gl_journal_ui.inc:113
 #: gl/includes/ui/gl_journal_ui.inc:116 gl/includes/ui/gl_journal_ui.inc:119
 #: gl/includes/ui/gl_journal_ui.inc:297 includes/ui/class.reflines_crud.inc:38
-#: inventory/cost_update.php:146
-#: inventory/includes/item_adjustments_ui.inc:214
+#: inventory/cost_update.php:146 inventory/includes/item_adjustments_ui.inc:214
 #: inventory/includes/stock_transfers_ui.inc:174
 #: manufacturing/view/wo_costs_view.php:61
 #: manufacturing/includes/work_order_issue_ui.inc:169
@@ -3810,7 +3806,7 @@ msgid "Revenue / Cost Account"
 msgstr ""
 
 #: gl/accruals.php:224 gl/gl_budget.php:90 gl/gl_budget.php:92
-#: gl/inquiry/journal_inquiry.php:113 gl/inquiry/tax_inquiry.php:80
+#: gl/inquiry/journal_inquiry.php:114 gl/inquiry/tax_inquiry.php:80
 #: gl/manage/gl_quick_entries.php:268 gl/manage/gl_quick_entries.php:270
 #: gl/manage/gl_quick_entries.php:272 gl/manage/gl_quick_entries.php:348
 #: gl/view/bank_transfer_view.php:70 gl/view/bank_transfer_view.php:80
@@ -3824,7 +3820,7 @@ msgstr ""
 #: includes/dashboard.inc:189 includes/dashboard.inc:226
 #: includes/dashboard.inc:294 includes/dashboard.inc:336
 #: includes/dashboard.inc:448 includes/sysnames.inc:138
-#: includes/ui/allocation_cart.inc:290 includes/ui/ui_lists.inc:1370
+#: includes/ui/allocation_cart.inc:290 includes/ui/ui_lists.inc:1372
 #: manufacturing/includes/manufacturing_ui.inc:253
 #: purchasing/includes/ui/invoice_ui.inc:278
 #: purchasing/includes/ui/invoice_ui.inc:280
@@ -3852,7 +3848,7 @@ msgstr ""
 msgid "Periods"
 msgstr ""
 
-#: gl/accruals.php:232 reporting/rep402.php:153 reporting/reports_main.php:306
+#: gl/accruals.php:232 reporting/rep402.php:153 reporting/reports_main.php:326
 msgid "Show GL Rows"
 msgstr ""
 
@@ -3925,9 +3921,8 @@ msgstr ""
 
 #: gl/bank_account_reconcile.php:272 gl/inquiry/bank_inquiry.php:72
 #: gl/inquiry/gl_account_inquiry.php:143 gl/inquiry/gl_account_inquiry.php:145
-#: gl/view/accrual_trans.php:60 reporting/rep601.php:79
-#: reporting/rep602.php:80 reporting/rep704.php:83 reporting/rep704.php:85
-#: reporting/rep704.php:88
+#: gl/view/accrual_trans.php:60 reporting/rep601.php:79 reporting/rep602.php:80
+#: reporting/rep704.php:83 reporting/rep704.php:85 reporting/rep704.php:88
 msgid "Person/Item"
 msgstr ""
 
@@ -4134,50 +4129,50 @@ msgstr ""
 msgid "The total bank amount exceeds allowed limit (%s)."
 msgstr ""
 
-#: gl/gl_bank.php:247
+#: gl/gl_bank.php:248
 #, php-format
 msgid ""
 "The bank transaction would result in exceed of authorized overdraft limit "
 "for transaction: %s #%s on %s."
 msgstr ""
 
-#: gl/gl_bank.php:259
+#: gl/gl_bank.php:261
 msgid "The entered date for the payment is invalid."
 msgstr ""
 
-#: gl/gl_bank.php:271
+#: gl/gl_bank.php:273
 msgid "You have to select customer and customer branch."
 msgstr ""
 
-#: gl/gl_bank.php:275
+#: gl/gl_bank.php:277
 msgid "You have to select supplier."
 msgstr ""
 
-#: gl/gl_bank.php:283
+#: gl/gl_bank.php:285
 msgid "Settled amount have to be positive number."
 msgstr ""
 
-#: gl/gl_bank.php:329
+#: gl/gl_bank.php:331
 msgid "The amount entered is not a valid number or is less than zero."
 msgstr ""
 
-#: gl/gl_bank.php:335 gl/manage/exchange_rates.php:39
+#: gl/gl_bank.php:337 gl/manage/exchange_rates.php:39
 msgid "The exchange rate cannot be zero or a negative number."
 msgstr ""
 
-#: gl/gl_bank.php:407
+#: gl/gl_bank.php:409
 msgid "Payment Items"
 msgstr ""
 
-#: gl/gl_bank.php:407
+#: gl/gl_bank.php:409
 msgid "Deposit Items"
 msgstr ""
 
-#: gl/gl_bank.php:415
+#: gl/gl_bank.php:417
 msgid "Process Payment"
 msgstr ""
 
-#: gl/gl_bank.php:415
+#: gl/gl_bank.php:417
 msgid "Process Deposit"
 msgstr ""
 
@@ -4211,15 +4206,16 @@ msgstr ""
 #: gl/gl_budget.php:90 gl/gl_budget.php:92 gl/inquiry/profit_loss.php:237
 #: gl/manage/gl_quick_entries.php:247 reporting/rep101.php:144
 #: reporting/rep105.php:119 reporting/rep106.php:98 reporting/rep114.php:90
-#: reporting/rep201.php:123 reporting/rep304.php:134 reporting/rep305.php:111
-#: reporting/rep306.php:148 reporting/rep307.php:119 reporting/rep308.php:229
-#: reporting/rep309.php:104 reporting/rep310.php:149 reporting/rep601.php:85
-#: reporting/rep602.php:86 reporting/rep702.php:59 reporting/rep704.php:94
-#: reporting/rep704.php:104 reporting/rep704.php:112 reporting/rep706.php:185
-#: reporting/rep706.php:193 reporting/rep706.php:203 reporting/rep706.php:211
-#: reporting/rep707.php:210 reporting/rep707.php:217 reporting/rep707.php:227
-#: reporting/rep707.php:235 reporting/rep708.php:200 reporting/rep708.php:209
-#: reporting/rep708.php:216 reporting/rep709.php:111 reporting/rep710.php:85
+#: reporting/rep115.php:166 reporting/rep201.php:123 reporting/rep206.php:121
+#: reporting/rep304.php:134 reporting/rep305.php:111 reporting/rep306.php:148
+#: reporting/rep307.php:119 reporting/rep308.php:229 reporting/rep309.php:104
+#: reporting/rep310.php:149 reporting/rep601.php:85 reporting/rep602.php:86
+#: reporting/rep702.php:59 reporting/rep704.php:94 reporting/rep704.php:104
+#: reporting/rep704.php:112 reporting/rep706.php:185 reporting/rep706.php:193
+#: reporting/rep706.php:203 reporting/rep706.php:211 reporting/rep707.php:210
+#: reporting/rep707.php:217 reporting/rep707.php:227 reporting/rep707.php:235
+#: reporting/rep708.php:200 reporting/rep708.php:209 reporting/rep708.php:216
+#: reporting/rep709.php:111 reporting/rep710.php:85
 msgid "Period"
 msgstr ""
 
@@ -4243,8 +4239,8 @@ msgstr ""
 #: manufacturing/includes/manufacturing_ui.inc:195
 #: purchasing/includes/ui/invoice_ui.inc:341
 #: purchasing/includes/ui/invoice_ui.inc:504
-#: purchasing/includes/ui/invoice_ui.inc:575
-#: purchasing/po_receive_items.php:63 purchasing/view/view_po.php:140
+#: purchasing/includes/ui/invoice_ui.inc:575 purchasing/po_receive_items.php:63
+#: purchasing/view/view_po.php:140
 #: purchasing/allocations/supplier_allocation_main.php:100
 #: reporting/rep101.php:260 reporting/rep106.php:90 reporting/rep106.php:125
 #: reporting/rep106.php:172 reporting/rep114.php:161 reporting/rep201.php:230
@@ -4400,8 +4396,7 @@ msgstr ""
 msgid "Input Tax"
 msgstr ""
 
-#: gl/gl_journal.php:556 gl/inquiry/tax_inquiry.php:96
-#: reporting/rep709.php:189
+#: gl/gl_journal.php:556 gl/inquiry/tax_inquiry.php:96 reporting/rep709.php:189
 msgid "Output Tax"
 msgstr ""
 
@@ -4422,7 +4417,7 @@ msgstr ""
 msgid "GL Accounts"
 msgstr ""
 
-#: gl/inquiry/accounts_list.php:40 includes/ui/ui_lists.inc:349
+#: gl/inquiry/accounts_list.php:40 includes/ui/ui_lists.inc:351
 msgid "Search GL accounts"
 msgstr ""
 
@@ -4459,9 +4454,8 @@ msgid "As at:"
 msgstr ""
 
 #: gl/inquiry/balance_sheet.php:225 gl/inquiry/profit_loss.php:298
-#: includes/dashboard.inc:394 reporting/rep705.php:322
-#: reporting/rep706.php:278 reporting/rep706.php:303 reporting/rep707.php:311
-#: reporting/rep707.php:317
+#: includes/dashboard.inc:394 reporting/rep705.php:322 reporting/rep706.php:278
+#: reporting/rep706.php:303 reporting/rep707.php:311 reporting/rep707.php:317
 msgid "Calculated Return"
 msgstr ""
 
@@ -4526,14 +4520,14 @@ msgstr ""
 msgid "No zero values"
 msgstr ""
 
-#: gl/inquiry/gl_trial_balance.php:62 reporting/reports_main.php:417
-#: reporting/reports_main.php:467 reporting/reports_main.php:512
+#: gl/inquiry/gl_trial_balance.php:62 reporting/reports_main.php:437
+#: reporting/reports_main.php:487 reporting/reports_main.php:532
 msgid "Only balances"
 msgstr ""
 
 #: gl/inquiry/gl_trial_balance.php:104 gl/inquiry/gl_trial_balance.php:165
-#: includes/dashboard.inc:526 reporting/rep706.php:307
-#: reporting/rep707.php:327 reporting/rep708.php:51 reporting/rep708.php:126
+#: includes/dashboard.inc:526 reporting/rep706.php:307 reporting/rep707.php:327
+#: reporting/rep708.php:51 reporting/rep708.php:126
 #: sales/create_recurrent_invoices.php:203
 #: sales/manage/recurrent_invoices.php:128
 msgid "Group"
@@ -4592,19 +4586,18 @@ msgstr ""
 msgid "Show closed:"
 msgstr ""
 
-#: gl/inquiry/journal_inquiry.php:109
+#: gl/inquiry/journal_inquiry.php:110
 msgid "Trans #"
 msgstr ""
 
-#: gl/inquiry/journal_inquiry.php:110 gl/view/gl_trans_view.php:44
+#: gl/inquiry/journal_inquiry.php:111 gl/view/gl_trans_view.php:44
 #: gl/includes/ui/gl_journal_ui.inc:123
 msgid "Counterparty"
 msgstr ""
 
-#: gl/inquiry/journal_inquiry.php:111 gl/inquiry/journal_inquiry.php:126
+#: gl/inquiry/journal_inquiry.php:112 gl/inquiry/journal_inquiry.php:127
 #: purchasing/includes/ui/grn_ui.inc:34 purchasing/includes/ui/grn_ui.inc:77
-#: purchasing/includes/ui/po_ui.inc:332
-#: purchasing/view/view_supp_credit.php:44
+#: purchasing/includes/ui/po_ui.inc:332 purchasing/view/view_supp_credit.php:44
 #: purchasing/view/view_supp_invoice.php:48
 #: purchasing/inquiry/po_search_completed.php:114
 #: purchasing/inquiry/po_search.php:121
@@ -4613,8 +4606,8 @@ msgstr ""
 msgid "Supplier's Reference"
 msgstr ""
 
-#: gl/inquiry/journal_inquiry.php:115 reporting/rep710.php:77
-#: reporting/rep710.php:87 reporting/reports_main.php:528
+#: gl/inquiry/journal_inquiry.php:116 reporting/rep710.php:77
+#: reporting/rep710.php:87 reporting/reports_main.php:548
 msgid "User"
 msgstr ""
 
@@ -4637,8 +4630,8 @@ msgstr ""
 msgid "Budget"
 msgstr ""
 
-#: gl/inquiry/profit_loss.php:178 reporting/reports_main.php:404
-#: reporting/reports_main.php:455 reporting/reports_main.php:501
+#: gl/inquiry/profit_loss.php:178 reporting/reports_main.php:424
+#: reporting/reports_main.php:475 reporting/reports_main.php:521
 msgid "Compare to"
 msgstr ""
 
@@ -4678,8 +4671,8 @@ msgstr ""
 msgid "Total payable or refund"
 msgstr ""
 
-#: gl/manage/bank_accounts.php:16 reporting/reports_main.php:342
-#: reporting/reports_main.php:350
+#: gl/manage/bank_accounts.php:16 reporting/reports_main.php:362
+#: reporting/reports_main.php:370
 msgid "Bank Accounts"
 msgstr ""
 
@@ -4734,8 +4727,9 @@ msgstr ""
 #: purchasing/allocations/supplier_allocation_main.php:99
 #: purchasing/allocations/supplier_allocation_main.php:107
 #: reporting/rep101.php:147 reporting/rep102.php:129 reporting/rep102.php:135
-#: reporting/rep103.php:229 reporting/rep104.php:114 reporting/rep201.php:125
-#: reporting/rep202.php:136 reporting/rep203.php:96 reporting/rep205.php:141
+#: reporting/rep103.php:229 reporting/rep104.php:114 reporting/rep115.php:168
+#: reporting/rep201.php:125 reporting/rep202.php:136 reporting/rep203.php:96
+#: reporting/rep205.php:141 reporting/rep206.php:123
 #: sales/customer_credit_invoice.php:236 sales/customer_delivery.php:328
 #: sales/customer_invoice.php:455
 #: sales/allocations/customer_allocation_main.php:97
@@ -4747,7 +4741,7 @@ msgstr ""
 #: sales/inquiry/customer_inquiry.php:121
 #: sales/inquiry/customer_inquiry.php:202
 #: sales/inquiry/customer_inquiry.php:214
-#: sales/inquiry/sales_deliveries_view.php:178
+#: sales/inquiry/sales_deliveries_view.php:179
 #: sales/inquiry/sales_orders_view.php:262
 #: sales/inquiry/sales_orders_view.php:276
 msgid "Currency"
@@ -5406,11 +5400,11 @@ msgid "GL Deposit"
 msgstr ""
 
 #: gl/view/gl_deposit_view.php:71 gl/includes/db/gl_db_banking.inc:227
-#: reporting/reports_main.php:98 reporting/reports_main.php:108
-#: reporting/reports_main.php:116 reporting/reports_main.php:130
-#: reporting/reports_main.php:138 reporting/reports_main.php:145
-#: reporting/reports_main.php:194 reporting/reports_main.php:201
-#: reporting/reports_main.php:311
+#: reporting/reports_main.php:109 reporting/reports_main.php:119
+#: reporting/reports_main.php:127 reporting/reports_main.php:141
+#: reporting/reports_main.php:149 reporting/reports_main.php:156
+#: reporting/reports_main.php:214 reporting/reports_main.php:221
+#: reporting/reports_main.php:331
 msgid "From"
 msgstr ""
 
@@ -5489,7 +5483,7 @@ msgid "Transaction Date"
 msgstr ""
 
 #: gl/view/gl_trans_view.php:39
-msgid "Journal #"
+msgid "GL #"
 msgstr ""
 
 #: gl/view/gl_trans_view.php:42
@@ -5539,11 +5533,11 @@ msgstr ""
 msgid "Exchange Variance"
 msgstr ""
 
-#: gl/includes/db/gl_db_banking.inc:227 reporting/reports_main.php:99
-#: reporting/reports_main.php:109 reporting/reports_main.php:117
-#: reporting/reports_main.php:131 reporting/reports_main.php:139
-#: reporting/reports_main.php:146 reporting/reports_main.php:195
-#: reporting/reports_main.php:202 reporting/reports_main.php:312
+#: gl/includes/db/gl_db_banking.inc:227 reporting/reports_main.php:110
+#: reporting/reports_main.php:120 reporting/reports_main.php:128
+#: reporting/reports_main.php:142 reporting/reports_main.php:150
+#: reporting/reports_main.php:157 reporting/reports_main.php:215
+#: reporting/reports_main.php:222 reporting/reports_main.php:332
 msgid "To"
 msgstr ""
 
@@ -5819,7 +5813,7 @@ msgid "Dimensions configuration"
 msgstr ""
 
 #: includes/access_levels.inc:79 inventory/manage/items.php:447
-#: reporting/reports_main.php:329
+#: reporting/reports_main.php:349
 msgid "Dimensions"
 msgstr ""
 
@@ -6370,10 +6364,11 @@ msgstr ""
 #: includes/dashboard.inc:526 includes/sysnames.inc:101
 #: includes/sysnames.inc:209 reporting/rep101.php:145 reporting/rep102.php:121
 #: reporting/rep102.php:128 reporting/rep105.php:110 reporting/rep106.php:89
-#: reporting/rep114.php:95 reporting/rep304.php:127 reporting/rep304.php:137
-#: reporting/reports_main.php:34 reporting/reports_main.php:38
-#: reporting/reports_main.php:47 reporting/reports_main.php:104
-#: reporting/reports_main.php:123 reporting/reports_main.php:239
+#: reporting/rep114.php:95 reporting/rep115.php:167 reporting/rep304.php:127
+#: reporting/rep304.php:137 reporting/reports_main.php:34
+#: reporting/reports_main.php:38 reporting/reports_main.php:47
+#: reporting/reports_main.php:59 reporting/reports_main.php:115
+#: reporting/reports_main.php:134 reporting/reports_main.php:259
 #: sales/create_recurrent_invoices.php:203
 #: sales/customer_credit_invoice.php:234 sales/customer_delivery.php:326
 #: sales/customer_invoice.php:431
@@ -6385,7 +6380,7 @@ msgstr ""
 #: sales/inquiry/customer_inquiry.php:200
 #: sales/inquiry/customer_inquiry.php:213 sales/inquiry/customers_list.php:41
 #: sales/inquiry/customers_list.php:54
-#: sales/inquiry/sales_deliveries_view.php:169
+#: sales/inquiry/sales_deliveries_view.php:170
 #: sales/inquiry/sales_orders_view.php:254
 #: sales/inquiry/sales_orders_view.php:268
 msgid "Customer"
@@ -6404,8 +6399,7 @@ msgstr ""
 #: includes/sysnames.inc:102 includes/sysnames.inc:187
 #: includes/sysnames.inc:210 inventory/purchasing_data.php:150
 #: purchasing/includes/ui/grn_ui.inc:20 purchasing/includes/ui/grn_ui.inc:52
-#: purchasing/includes/ui/po_ui.inc:304
-#: purchasing/view/view_supp_credit.php:42
+#: purchasing/includes/ui/po_ui.inc:304 purchasing/view/view_supp_credit.php:42
 #: purchasing/view/view_supp_invoice.php:46
 #: purchasing/inquiry/po_search_completed.php:112
 #: purchasing/inquiry/po_search.php:119
@@ -6418,12 +6412,13 @@ msgstr ""
 #: purchasing/allocations/supplier_allocation_main.php:98
 #: purchasing/allocations/supplier_allocation_main.php:106
 #: reporting/rep201.php:124 reporting/rep202.php:128 reporting/rep202.php:135
-#: reporting/rep203.php:95 reporting/rep204.php:90 reporting/rep306.php:141
-#: reporting/rep306.php:151 reporting/rep310.php:142 reporting/rep310.php:152
-#: reporting/reports_main.php:151 reporting/reports_main.php:155
-#: reporting/reports_main.php:164 reporting/reports_main.php:175
-#: reporting/reports_main.php:182 reporting/reports_main.php:255
-#: reporting/reports_main.php:288
+#: reporting/rep203.php:95 reporting/rep204.php:90 reporting/rep206.php:122
+#: reporting/rep306.php:141 reporting/rep306.php:151 reporting/rep310.php:142
+#: reporting/rep310.php:152 reporting/reports_main.php:162
+#: reporting/reports_main.php:166 reporting/reports_main.php:175
+#: reporting/reports_main.php:187 reporting/reports_main.php:195
+#: reporting/reports_main.php:202 reporting/reports_main.php:275
+#: reporting/reports_main.php:308
 msgid "Supplier"
 msgstr ""
 
@@ -6435,8 +6430,8 @@ msgstr ""
 #: includes/ui/ui_controls.inc:512 includes/ui/ui_controls.inc:514
 #: inventory/transfers.php:231 inventory/inquiry/stock_list.php:29
 #: inventory/manage/items.php:29 reporting/rep402.php:150
-#: reporting/reports_main.php:256 reporting/reports_main.php:289
-#: reporting/reports_main.php:303
+#: reporting/reports_main.php:276 reporting/reports_main.php:309
+#: reporting/reports_main.php:323
 msgid "Items"
 msgstr ""
 
@@ -6496,8 +6491,7 @@ msgstr ""
 #: inventory/includes/stock_transfers_ui.inc:57
 #: inventory/manage/item_codes.php:126 inventory/manage/sales_kits.php:36
 #: inventory/view/view_adjustment.php:54 inventory/view/view_transfer.php:50
-#: manufacturing/view/wo_issue_view.php:76
-#: manufacturing/manage/bom_edit.php:44
+#: manufacturing/view/wo_issue_view.php:76 manufacturing/manage/bom_edit.php:44
 #: manufacturing/includes/manufacturing_ui.inc:29
 #: manufacturing/includes/manufacturing_ui.inc:174
 #: manufacturing/includes/manufacturing_ui.inc:347
@@ -6545,7 +6539,7 @@ msgstr ""
 #: sales/view/view_credit.php:58 sales/inquiry/customer_branches_list.php:37
 #: sales/inquiry/customer_branches_list.php:49
 #: sales/inquiry/customer_inquiry.php:201
-#: sales/inquiry/sales_deliveries_view.php:171
+#: sales/inquiry/sales_deliveries_view.php:172
 #: sales/inquiry/sales_orders_view.php:255
 #: sales/inquiry/sales_orders_view.php:269
 msgid "Branch"
@@ -7492,34 +7486,35 @@ msgid "Value"
 msgstr ""
 
 #: includes/system_tests.inc:424 reporting/reports_main.php:42
-#: reporting/reports_main.php:53 reporting/reports_main.php:62
-#: reporting/reports_main.php:69 reporting/reports_main.php:78
-#: reporting/reports_main.php:87 reporting/reports_main.php:94
-#: reporting/reports_main.php:103 reporting/reports_main.php:113
-#: reporting/reports_main.php:120 reporting/reports_main.php:127
-#: reporting/reports_main.php:135 reporting/reports_main.php:142
-#: reporting/reports_main.php:148 reporting/reports_main.php:159
-#: reporting/reports_main.php:170 reporting/reports_main.php:178
-#: reporting/reports_main.php:183 reporting/reports_main.php:190
-#: reporting/reports_main.php:198 reporting/reports_main.php:205
-#: reporting/reports_main.php:214 reporting/reports_main.php:220
-#: reporting/reports_main.php:231 reporting/reports_main.php:241
-#: reporting/reports_main.php:247 reporting/reports_main.php:257
-#: reporting/reports_main.php:265 reporting/reports_main.php:273
-#: reporting/reports_main.php:280 reporting/reports_main.php:290
-#: reporting/reports_main.php:299 reporting/reports_main.php:307
-#: reporting/reports_main.php:314 reporting/reports_main.php:325
-#: reporting/reports_main.php:336 reporting/reports_main.php:346
-#: reporting/reports_main.php:353 reporting/reports_main.php:359
-#: reporting/reports_main.php:366 reporting/reports_main.php:379
-#: reporting/reports_main.php:387 reporting/reports_main.php:398
-#: reporting/reports_main.php:410 reporting/reports_main.php:420
-#: reporting/reports_main.php:432 reporting/reports_main.php:439
-#: reporting/reports_main.php:449 reporting/reports_main.php:460
+#: reporting/reports_main.php:53 reporting/reports_main.php:64
+#: reporting/reports_main.php:73 reporting/reports_main.php:80
+#: reporting/reports_main.php:89 reporting/reports_main.php:98
+#: reporting/reports_main.php:105 reporting/reports_main.php:114
+#: reporting/reports_main.php:124 reporting/reports_main.php:131
+#: reporting/reports_main.php:138 reporting/reports_main.php:146
+#: reporting/reports_main.php:153 reporting/reports_main.php:159
+#: reporting/reports_main.php:170 reporting/reports_main.php:181
+#: reporting/reports_main.php:190 reporting/reports_main.php:198
+#: reporting/reports_main.php:203 reporting/reports_main.php:210
+#: reporting/reports_main.php:218 reporting/reports_main.php:225
+#: reporting/reports_main.php:234 reporting/reports_main.php:240
+#: reporting/reports_main.php:251 reporting/reports_main.php:261
+#: reporting/reports_main.php:267 reporting/reports_main.php:277
+#: reporting/reports_main.php:285 reporting/reports_main.php:293
+#: reporting/reports_main.php:300 reporting/reports_main.php:310
+#: reporting/reports_main.php:319 reporting/reports_main.php:327
+#: reporting/reports_main.php:334 reporting/reports_main.php:345
+#: reporting/reports_main.php:356 reporting/reports_main.php:366
+#: reporting/reports_main.php:373 reporting/reports_main.php:379
+#: reporting/reports_main.php:386 reporting/reports_main.php:399
+#: reporting/reports_main.php:407 reporting/reports_main.php:418
+#: reporting/reports_main.php:430 reporting/reports_main.php:440
+#: reporting/reports_main.php:452 reporting/reports_main.php:459
 #: reporting/reports_main.php:469 reporting/reports_main.php:480
-#: reporting/reports_main.php:486 reporting/reports_main.php:495
-#: reporting/reports_main.php:505 reporting/reports_main.php:513
-#: reporting/reports_main.php:521 reporting/reports_main.php:529
+#: reporting/reports_main.php:489 reporting/reports_main.php:500
+#: reporting/reports_main.php:506 reporting/reports_main.php:515
+#: reporting/reports_main.php:525 reporting/reports_main.php:533
+#: reporting/reports_main.php:541 reporting/reports_main.php:549
 #: reporting/includes/excel_report.inc:292
 #: reporting/includes/excel_report.inc:425
 #: reporting/includes/pdf_report.inc:360 reporting/includes/pdf_report.inc:621
@@ -7918,7 +7913,7 @@ msgstr ""
 msgid "Click Here to Pick up the date"
 msgstr ""
 
-#: includes/ui/ui_input.inc:970 includes/ui/ui_lists.inc:2352
+#: includes/ui/ui_input.inc:970 includes/ui/ui_lists.inc:2354
 #: reporting/rep301.php:224 reporting/rep302.php:168 reporting/rep303.php:198
 #: reporting/rep304.php:184 reporting/rep304.php:188 reporting/rep306.php:235
 #: reporting/rep306.php:242 reporting/rep310.php:189 reporting/rep310.php:197
@@ -7969,160 +7964,160 @@ msgstr ""
 msgid "Search suppliers"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:538 includes/ui/ui_lists.inc:1549
+#: includes/ui/ui_lists.inc:540 includes/ui/ui_lists.inc:1551
 msgid "All Suppliers"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:542
+#: includes/ui/ui_lists.inc:544
 msgid "Press Space tab to filter by name fragment"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:543
+#: includes/ui/ui_lists.inc:545
 msgid "Select supplier"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:593
+#: includes/ui/ui_lists.inc:595
 msgid "All Customers"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:597
+#: includes/ui/ui_lists.inc:599
 msgid "Press Space tab to filter by name fragment; F2 - entry new customer"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:598
+#: includes/ui/ui_lists.inc:600
 msgid "Select customer"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:643
+#: includes/ui/ui_lists.inc:645
 msgid "All branches"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:646
+#: includes/ui/ui_lists.inc:648
 msgid "Select customer branch"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:682
+#: includes/ui/ui_lists.inc:684
 msgid "All Locations"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:839 includes/ui/ui_lists.inc:923
+#: includes/ui/ui_lists.inc:841 includes/ui/ui_lists.inc:925
 msgid "All Items"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:1481
+#: includes/ui/ui_lists.inc:1483
 msgid "All Sales Types"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:1829
+#: includes/ui/ui_lists.inc:1831
 msgid "Use Item Sales Accounts"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2138 includes/ui/ui_lists.inc:2154
-#: includes/ui/ui_lists.inc:2170
+#: includes/ui/ui_lists.inc:2140 includes/ui/ui_lists.inc:2156
+#: includes/ui/ui_lists.inc:2172
 msgid "All Types"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2139 sales/view/view_sales_order.php:140
+#: includes/ui/ui_lists.inc:2141 sales/view/view_sales_order.php:140
 msgid "Sales Invoices"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2140 includes/ui/ui_lists.inc:2173
+#: includes/ui/ui_lists.inc:2142 includes/ui/ui_lists.inc:2175
 msgid "Unsettled transactions"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2141 includes/ui/ui_lists.inc:2157
-#: includes/ui/ui_lists.inc:2174 includes/ui/ui_view.inc:609
+#: includes/ui/ui_lists.inc:2143 includes/ui/ui_lists.inc:2159
+#: includes/ui/ui_lists.inc:2176 includes/ui/ui_view.inc:609
 #: includes/ui/ui_view.inc:613
 msgid "Payments"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2142 includes/ui/ui_lists.inc:2158
-#: includes/ui/ui_lists.inc:2175 sales/view/view_sales_order.php:176
+#: includes/ui/ui_lists.inc:2144 includes/ui/ui_lists.inc:2160
+#: includes/ui/ui_lists.inc:2177 sales/view/view_sales_order.php:176
 msgid "Credit Notes"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2143 sales/view/view_sales_order.php:106
+#: includes/ui/ui_lists.inc:2145 sales/view/view_sales_order.php:106
 msgid "Delivery Notes"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2155 includes/ui/ui_lists.inc:2172
+#: includes/ui/ui_lists.inc:2157 includes/ui/ui_lists.inc:2174
 msgid "Invoices"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2156
+#: includes/ui/ui_lists.inc:2158
 msgid "Overdue Invoices"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2159 includes/ui/ui_lists.inc:2176
+#: includes/ui/ui_lists.inc:2161 includes/ui/ui_lists.inc:2178
 msgid "Overdue Credit Notes"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2171
+#: includes/ui/ui_lists.inc:2173
 msgid "GRNs"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2189
+#: includes/ui/ui_lists.inc:2191
 msgid "Automatically put balance on back order"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2190
+#: includes/ui/ui_lists.inc:2192
 msgid "Cancel any quantites not delivered"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2207
+#: includes/ui/ui_lists.inc:2209
 msgid "Items Returned to Inventory Location"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2208
+#: includes/ui/ui_lists.inc:2210
 msgid "Items Written Off"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2377
+#: includes/ui/ui_lists.inc:2379
 msgid "New role"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2429
+#: includes/ui/ui_lists.inc:2431
 msgid "No tags defined."
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2429
+#: includes/ui/ui_lists.inc:2431
 msgid "No active tags defined."
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2467
+#: includes/ui/ui_lists.inc:2469
 #, php-format
 msgid "Activated for '%s'"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2470
+#: includes/ui/ui_lists.inc:2472
 msgid "Available and/or installed"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2540
+#: includes/ui/ui_lists.inc:2542
 msgid "Standard new company American COA (4 digit)"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2542
+#: includes/ui/ui_lists.inc:2544
 msgid "Standard American COA (4 digit) with demo data"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2563
+#: includes/ui/ui_lists.inc:2565
 msgid "No payment Link"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2683
+#: includes/ui/ui_lists.inc:2685
 msgid "Numeric"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2683
+#: includes/ui/ui_lists.inc:2685
 msgid "Alpha Numeric"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2683
+#: includes/ui/ui_lists.inc:2685
 msgid "ALPHA NUMERIC"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2699
+#: includes/ui/ui_lists.inc:2701
 msgid "All users"
 msgstr ""
 
@@ -8387,7 +8382,7 @@ msgstr ""
 #: inventory/inquiry/stock_status.php:45 inventory/manage/item_codes.php:108
 #: manufacturing/work_order_entry.php:376
 #: manufacturing/work_order_entry.php:381 purchasing/inquiry/po_search.php:74
-#: sales/inquiry/sales_deliveries_view.php:112
+#: sales/inquiry/sales_deliveries_view.php:113
 #: sales/inquiry/sales_orders_view.php:229
 msgid "Item:"
 msgstr ""
@@ -8455,14 +8450,14 @@ msgid "Sales Type"
 msgstr ""
 
 #: inventory/prices.php:151 inventory/purchasing_data.php:150
-#: purchasing/includes/ui/invoice_ui.inc:514
-#: purchasing/po_receive_items.php:63 purchasing/view/view_grn.php:41
-#: purchasing/view/view_po.php:45 reporting/rep104.php:109
-#: reporting/includes/doctext.inc:32 reporting/includes/doctext.inc:191
-#: sales/customer_credit_invoice.php:276 sales/customer_delivery.php:421
-#: sales/customer_invoice.php:519 sales/customer_invoice.php:522
-#: sales/view/view_credit.php:91 sales/view/view_dispatch.php:113
-#: sales/view/view_invoice.php:116 sales/view/view_sales_order.php:220
+#: purchasing/includes/ui/invoice_ui.inc:514 purchasing/po_receive_items.php:63
+#: purchasing/view/view_grn.php:41 purchasing/view/view_po.php:45
+#: reporting/rep104.php:109 reporting/includes/doctext.inc:32
+#: reporting/includes/doctext.inc:191 sales/customer_credit_invoice.php:276
+#: sales/customer_delivery.php:421 sales/customer_invoice.php:519
+#: sales/customer_invoice.php:522 sales/view/view_credit.php:91
+#: sales/view/view_dispatch.php:113 sales/view/view_invoice.php:116
+#: sales/view/view_sales_order.php:220
 #: sales/includes/ui/sales_credit_ui.inc:163
 msgid "Price"
 msgstr ""
@@ -8587,11 +8582,11 @@ msgstr ""
 #: reporting/rep303.php:134 reporting/rep304.php:136 reporting/rep306.php:150
 #: reporting/rep307.php:121 reporting/rep308.php:231 reporting/rep310.php:142
 #: reporting/rep310.php:151 reporting/rep402.php:134 reporting/rep402.php:151
-#: reporting/rep451.php:87 reporting/reports_main.php:212
-#: reporting/reports_main.php:219 reporting/reports_main.php:225
-#: reporting/reports_main.php:238 reporting/reports_main.php:254
-#: reporting/reports_main.php:264 reporting/reports_main.php:272
-#: reporting/reports_main.php:287 reporting/reports_main.php:304
+#: reporting/rep451.php:87 reporting/reports_main.php:232
+#: reporting/reports_main.php:239 reporting/reports_main.php:245
+#: reporting/reports_main.php:258 reporting/reports_main.php:274
+#: reporting/reports_main.php:284 reporting/reports_main.php:292
+#: reporting/reports_main.php:307 reporting/reports_main.php:324
 #: sales/manage/sales_points.php:84
 msgid "Location"
 msgstr ""
@@ -8672,7 +8667,7 @@ msgstr ""
 
 #: inventory/includes/item_adjustments_ui.inc:34
 #: manufacturing/work_order_entry.php:200 purchasing/inquiry/po_search.php:67
-#: sales/inquiry/sales_deliveries_view.php:105
+#: sales/inquiry/sales_deliveries_view.php:106
 #: sales/inquiry/sales_orders_view.php:220
 msgid "Location:"
 msgstr ""
@@ -8736,8 +8731,7 @@ msgstr ""
 msgid "Unit Cost"
 msgstr ""
 
-#: inventory/includes/item_adjustments_ui.inc:57
-#: inventory/manage/items.php:517
+#: inventory/includes/item_adjustments_ui.inc:57 inventory/manage/items.php:517
 msgid "Initial Value"
 msgstr ""
 
@@ -8889,10 +8883,9 @@ msgid "Tax type"
 msgstr ""
 
 #: inventory/manage/item_categories.php:117
-#: inventory/manage/item_categories.php:121
-#: inventory/manage/item_codes.php:126 inventory/manage/sales_kits.php:36
-#: inventory/view/view_adjustment.php:55 inventory/view/view_transfer.php:50
-#: manufacturing/view/wo_issue_view.php:76
+#: inventory/manage/item_categories.php:121 inventory/manage/item_codes.php:126
+#: inventory/manage/sales_kits.php:36 inventory/view/view_adjustment.php:55
+#: inventory/view/view_transfer.php:50 manufacturing/view/wo_issue_view.php:76
 #: manufacturing/manage/bom_edit.php:44 purchasing/po_receive_items.php:62
 #: sales/customer_credit_invoice.php:275 sales/customer_delivery.php:420
 #: sales/customer_invoice.php:518 sales/customer_invoice.php:521
@@ -9019,8 +9012,7 @@ msgstr ""
 
 #: inventory/manage/item_codes.php:181 inventory/manage/sales_kits.php:243
 #: manufacturing/work_order_add_finished.php:194
-#: manufacturing/work_order_entry.php:404
-#: manufacturing/manage/bom_edit.php:204
+#: manufacturing/work_order_entry.php:404 manufacturing/manage/bom_edit.php:204
 msgid "Quantity:"
 msgstr ""
 
@@ -9487,7 +9479,7 @@ msgstr ""
 #: manufacturing/search_work_orders.php:67
 #: purchasing/inquiry/po_search_completed.php:80
 #: purchasing/inquiry/po_search.php:62
-#: sales/inquiry/sales_deliveries_view.php:101
+#: sales/inquiry/sales_deliveries_view.php:102
 #: sales/inquiry/sales_orders_view.php:213
 msgid "#:"
 msgstr ""
@@ -9504,7 +9496,7 @@ msgstr ""
 #: manufacturing/search_work_orders.php:84
 #: purchasing/inquiry/po_search_completed.php:99
 #: purchasing/inquiry/po_search.php:78
-#: sales/inquiry/sales_deliveries_view.php:116
+#: sales/inquiry/sales_deliveries_view.php:117
 #: sales/inquiry/sales_orders_view.php:236
 msgid "Select documents"
 msgstr ""
@@ -9568,8 +9560,7 @@ msgid "Select another &Work Order to Process"
 msgstr ""
 
 #: manufacturing/work_order_add_finished.php:64
-#: manufacturing/work_order_costs.php:63
-#: manufacturing/work_order_entry.php:323
+#: manufacturing/work_order_costs.php:63 manufacturing/work_order_entry.php:323
 msgid "The order number sent is not valid."
 msgstr ""
 
@@ -10208,8 +10199,7 @@ msgid "Production."
 msgstr ""
 
 #: manufacturing/includes/db/work_orders_db.inc:95
-#: purchasing/includes/db/po_db.inc:153
-#: sales/includes/db/cust_trans_db.inc:115
+#: purchasing/includes/db/po_db.inc:153 sales/includes/db/cust_trans_db.inc:115
 #: sales/includes/db/sales_order_db.inc:211
 msgid "Updated."
 msgstr ""
@@ -10231,7 +10221,7 @@ msgid "Supplier invoice adjustment for zero inventory of "
 msgstr ""
 
 #: purchasing/includes/db/invoice_db.inc:339 reporting/rep106.php:89
-#: sales/inquiry/sales_deliveries_view.php:154
+#: sales/inquiry/sales_deliveries_view.php:155
 #: sales/inquiry/sales_orders_view.php:134
 msgid "Invoice"
 msgstr ""
@@ -11075,8 +11065,7 @@ msgstr ""
 msgid "From Bank Account:"
 msgstr ""
 
-#: purchasing/supplier_payment.php:300
-#: purchasing/view/view_supp_payment.php:55
+#: purchasing/supplier_payment.php:300 purchasing/view/view_supp_payment.php:55
 msgid "Date Paid"
 msgstr ""
 
@@ -11112,7 +11101,7 @@ msgstr ""
 
 #: purchasing/view/view_grn.php:40 reporting/includes/doctext.inc:76
 #: reporting/includes/doctext.inc:191 reporting/includes/doctext.inc:245
-#: sales/inquiry/sales_deliveries_view.php:175
+#: sales/inquiry/sales_deliveries_view.php:176
 msgid "Delivery Date"
 msgstr ""
 
@@ -11144,7 +11133,7 @@ msgstr ""
 #: purchasing/inquiry/supplier_inquiry.php:199
 #: sales/inquiry/customer_allocation_inquiry.php:167
 #: sales/inquiry/customer_inquiry.php:220
-#: sales/inquiry/sales_deliveries_view.php:195
+#: sales/inquiry/sales_deliveries_view.php:196
 #: sales/inquiry/sales_orders_view.php:311
 msgid "Marked items are overdue."
 msgstr ""
@@ -11422,8 +11411,7 @@ msgid "Order Date"
 msgstr ""
 
 #: purchasing/inquiry/po_search_completed.php:117
-#: purchasing/inquiry/po_search.php:124
-#: sales/inquiry/sales_orders_view.php:260
+#: purchasing/inquiry/po_search.php:124 sales/inquiry/sales_orders_view.php:260
 msgid "Order Total"
 msgstr ""
 
@@ -11505,8 +11493,7 @@ msgstr ""
 msgid "Select a supplier:"
 msgstr ""
 
-#: purchasing/inquiry/suppliers_list.php:53
-#: sales/inquiry/customers_list.php:54
+#: purchasing/inquiry/suppliers_list.php:53 sales/inquiry/customers_list.php:54
 msgid "Tax ID"
 msgstr ""
 
@@ -11581,7 +11568,7 @@ msgid "Marked items are settled."
 msgstr ""
 
 #: reporting/rep101.php:126 reporting/rep102.php:104 reporting/rep114.php:108
-#: reporting/rep202.php:110 reporting/rep203.php:78
+#: reporting/rep115.php:151 reporting/rep202.php:110 reporting/rep203.php:78
 msgid "Balances in Home Currency"
 msgstr ""
 
@@ -11602,15 +11589,17 @@ msgid "Credits"
 msgstr ""
 
 #: reporting/rep101.php:146 reporting/reports_main.php:39
-#: reporting/reports_main.php:156 reporting/reports_main.php:335
+#: reporting/reports_main.php:167 reporting/reports_main.php:355
 msgid "Show Balance"
 msgstr ""
 
-#: reporting/rep101.php:148 reporting/rep102.php:132 reporting/rep201.php:126
-#: reporting/rep202.php:139 reporting/rep203.php:97 reporting/rep303.php:136
+#: reporting/rep101.php:148 reporting/rep102.php:132 reporting/rep115.php:169
+#: reporting/rep201.php:126 reporting/rep202.php:139 reporting/rep203.php:97
+#: reporting/rep206.php:124 reporting/rep303.php:136
 #: reporting/reports_main.php:41 reporting/reports_main.php:51
-#: reporting/reports_main.php:158 reporting/reports_main.php:168
-#: reporting/reports_main.php:177 reporting/reports_main.php:229
+#: reporting/reports_main.php:63 reporting/reports_main.php:169
+#: reporting/reports_main.php:179 reporting/reports_main.php:189
+#: reporting/reports_main.php:197 reporting/reports_main.php:249
 msgid "Suppress Zeros"
 msgstr ""
 
@@ -11619,18 +11608,19 @@ msgid "Customer Balances"
 msgstr ""
 
 #: reporting/rep101.php:267 reporting/rep102.php:226 reporting/rep105.php:177
-#: reporting/rep106.php:181 reporting/rep201.php:240 reporting/rep202.php:233
-#: reporting/rep203.php:176 reporting/rep204.php:148 reporting/rep301.php:249
-#: reporting/rep304.php:212 reporting/rep305.php:193 reporting/rep306.php:293
-#: reporting/rep309.php:157 reporting/rep451.php:164
+#: reporting/rep106.php:181 reporting/rep115.php:292 reporting/rep201.php:240
+#: reporting/rep202.php:233 reporting/rep203.php:176 reporting/rep204.php:148
+#: reporting/rep206.php:228 reporting/rep301.php:249 reporting/rep304.php:212
+#: reporting/rep305.php:193 reporting/rep306.php:293 reporting/rep309.php:157
+#: reporting/rep451.php:164
 msgid "Grand Total"
 msgstr ""
 
 #: reporting/rep102.php:98 reporting/rep106.php:99 reporting/rep202.php:104
 #: reporting/rep709.php:100 reporting/reports_main.php:50
-#: reporting/reports_main.php:93 reporting/reports_main.php:167
-#: reporting/reports_main.php:213 reporting/reports_main.php:324
-#: reporting/reports_main.php:520
+#: reporting/reports_main.php:104 reporting/reports_main.php:178
+#: reporting/reports_main.php:233 reporting/reports_main.php:344
+#: reporting/reports_main.php:540
 msgid "Summary Only"
 msgstr ""
 
@@ -11641,28 +11631,29 @@ msgstr ""
 #: reporting/rep102.php:127 reporting/rep202.php:134 reporting/rep203.php:94
 #: reporting/rep301.php:169 reporting/rep451.php:85
 #: reporting/reports_main.php:37 reporting/reports_main.php:46
-#: reporting/reports_main.php:67 reporting/reports_main.php:83
-#: reporting/reports_main.php:92 reporting/reports_main.php:154
-#: reporting/reports_main.php:163 reporting/reports_main.php:174
-#: reporting/reports_main.php:210 reporting/reports_main.php:236
-#: reporting/reports_main.php:246 reporting/reports_main.php:252
-#: reporting/reports_main.php:262 reporting/reports_main.php:270
-#: reporting/reports_main.php:278 reporting/reports_main.php:285
-#: reporting/reports_main.php:321 reporting/reports_main.php:344
-#: reporting/reports_main.php:352 reporting/reports_main.php:364
-#: reporting/reports_main.php:374 reporting/reports_main.php:392
-#: reporting/reports_main.php:403 reporting/reports_main.php:415
-#: reporting/reports_main.php:428 reporting/reports_main.php:444
-#: reporting/reports_main.php:454 reporting/reports_main.php:465
-#: reporting/reports_main.php:477 reporting/reports_main.php:491
-#: reporting/reports_main.php:500 reporting/reports_main.php:510
-#: reporting/reports_main.php:519 reporting/reports_main.php:526
+#: reporting/reports_main.php:58 reporting/reports_main.php:78
+#: reporting/reports_main.php:94 reporting/reports_main.php:103
+#: reporting/reports_main.php:165 reporting/reports_main.php:174
+#: reporting/reports_main.php:186 reporting/reports_main.php:194
+#: reporting/reports_main.php:230 reporting/reports_main.php:256
+#: reporting/reports_main.php:266 reporting/reports_main.php:272
+#: reporting/reports_main.php:282 reporting/reports_main.php:290
+#: reporting/reports_main.php:298 reporting/reports_main.php:305
+#: reporting/reports_main.php:341 reporting/reports_main.php:364
+#: reporting/reports_main.php:372 reporting/reports_main.php:384
+#: reporting/reports_main.php:394 reporting/reports_main.php:412
+#: reporting/reports_main.php:423 reporting/reports_main.php:435
+#: reporting/reports_main.php:448 reporting/reports_main.php:464
+#: reporting/reports_main.php:474 reporting/reports_main.php:485
+#: reporting/reports_main.php:497 reporting/reports_main.php:511
+#: reporting/reports_main.php:520 reporting/reports_main.php:530
+#: reporting/reports_main.php:539 reporting/reports_main.php:546
 msgid "End Date"
 msgstr ""
 
 #: reporting/rep102.php:131 reporting/rep202.php:138
-#: reporting/reports_main.php:49 reporting/reports_main.php:125
-#: reporting/reports_main.php:166
+#: reporting/reports_main.php:49 reporting/reports_main.php:136
+#: reporting/reports_main.php:177
 msgid "Show Also Allocated"
 msgstr ""
 
@@ -11670,7 +11661,7 @@ msgstr ""
 msgid "Aged Customer Analysis"
 msgstr ""
 
-#: reporting/rep103.php:131
+#: reporting/rep103.php:131 reporting/rep115.php:137
 msgid "All Areas"
 msgstr ""
 
@@ -11703,16 +11694,17 @@ msgid "Branch Delivery Address"
 msgstr ""
 
 #: reporting/rep103.php:158 reporting/rep205.php:99
-#: reporting/reports_main.php:57 reporting/reports_main.php:187
+#: reporting/reports_main.php:68 reporting/reports_main.php:207
 msgid "Activity Since"
 msgstr ""
 
-#: reporting/rep103.php:159 reporting/reports_main.php:58
-#: sales/manage/sales_areas.php:16
+#: reporting/rep103.php:159 reporting/reports_main.php:60
+#: reporting/reports_main.php:69 sales/manage/sales_areas.php:16
 msgid "Sales Areas"
 msgstr ""
 
-#: reporting/rep103.php:160 reporting/reports_main.php:59
+#: reporting/rep103.php:160 reporting/reports_main.php:61
+#: reporting/reports_main.php:70
 msgid "Sales Folk"
 msgstr ""
 
@@ -11754,7 +11746,7 @@ msgstr ""
 msgid "GP %"
 msgstr ""
 
-#: reporting/rep104.php:117 reporting/reports_main.php:77
+#: reporting/rep104.php:117 reporting/reports_main.php:88
 msgid "Show GP %"
 msgstr ""
 
@@ -11770,7 +11762,7 @@ msgstr ""
 msgid "All Orders"
 msgstr ""
 
-#: reporting/rep105.php:106 reporting/reports_main.php:86
+#: reporting/rep105.php:106 reporting/reports_main.php:97
 msgid "Back Orders Only"
 msgstr ""
 
@@ -11957,7 +11949,7 @@ msgstr ""
 msgid "Sales Summary Report"
 msgstr ""
 
-#: reporting/rep114.php:91 reporting/reports_main.php:68
+#: reporting/rep114.php:91 reporting/reports_main.php:79
 msgid "Tax Id Only"
 msgstr ""
 
@@ -11973,7 +11965,15 @@ msgstr ""
 msgid "Tax"
 msgstr ""
 
-#: reporting/rep201.php:105
+#: reporting/rep115.php:144
+msgid "All Sales Man"
+msgstr ""
+
+#: reporting/rep115.php:171 reporting/reports_main.php:56
+msgid "Customer Trial Balance"
+msgstr ""
+
+#: reporting/rep201.php:105 reporting/rep206.php:105
 msgid "Balances in Home currency"
 msgstr ""
 
@@ -12025,6 +12025,10 @@ msgstr ""
 msgid "Tax_Id"
 msgstr ""
 
+#: reporting/rep206.php:126
+msgid "Supplier Trial Balance"
+msgstr ""
+
 #: reporting/rep209.php:88 reporting/rep209.php:104
 #: reporting/includes/doctext.inc:170
 msgid "PURCHASE ORDER"
@@ -12096,7 +12100,7 @@ msgstr ""
 msgid "Contribution"
 msgstr ""
 
-#: reporting/rep304.php:138 reporting/reports_main.php:240
+#: reporting/rep304.php:138 reporting/reports_main.php:260
 msgid "Show Service Items"
 msgstr ""
 
@@ -12292,8 +12296,8 @@ msgid "GL Account Transactions"
 msgstr ""
 
 #: reporting/rep705.php:244 reporting/rep705.php:257 reporting/rep705.php:268
-#: reporting/reports_main.php:383 reporting/reports_main.php:436
-#: reporting/reports_main.php:484
+#: reporting/reports_main.php:403 reporting/reports_main.php:456
+#: reporting/reports_main.php:504
 msgid "Year"
 msgstr ""
 
@@ -12355,7 +12359,7 @@ msgstr ""
 msgid "Action"
 msgstr ""
 
-#: reporting/rep710.php:89 reporting/reports_main.php:524
+#: reporting/rep710.php:89 reporting/reports_main.php:544
 msgid "Audit Trail"
 msgstr ""
 
@@ -12372,70 +12376,73 @@ msgid "Customer &Balances"
 msgstr ""
 
 #: reporting/reports_main.php:40 reporting/reports_main.php:48
-#: reporting/reports_main.php:73 reporting/reports_main.php:100
-#: reporting/reports_main.php:110 reporting/reports_main.php:124
-#: reporting/reports_main.php:132 reporting/reports_main.php:140
-#: reporting/reports_main.php:147 reporting/reports_main.php:157
-#: reporting/reports_main.php:165 reporting/reports_main.php:176
-#: reporting/reports_main.php:196 reporting/reports_main.php:203
+#: reporting/reports_main.php:62 reporting/reports_main.php:84
+#: reporting/reports_main.php:111 reporting/reports_main.php:121
+#: reporting/reports_main.php:135 reporting/reports_main.php:143
+#: reporting/reports_main.php:151 reporting/reports_main.php:158
+#: reporting/reports_main.php:168 reporting/reports_main.php:176
+#: reporting/reports_main.php:188 reporting/reports_main.php:196
+#: reporting/reports_main.php:216 reporting/reports_main.php:223
 msgid "Currency Filter"
 msgstr ""
 
 #: reporting/reports_main.php:43 reporting/reports_main.php:54
-#: reporting/reports_main.php:63 reporting/reports_main.php:70
-#: reporting/reports_main.php:79 reporting/reports_main.php:88
-#: reporting/reports_main.php:95 reporting/reports_main.php:105
-#: reporting/reports_main.php:114 reporting/reports_main.php:121
-#: reporting/reports_main.php:128 reporting/reports_main.php:136
-#: reporting/reports_main.php:143 reporting/reports_main.php:149
+#: reporting/reports_main.php:65 reporting/reports_main.php:74
+#: reporting/reports_main.php:81 reporting/reports_main.php:90
+#: reporting/reports_main.php:99 reporting/reports_main.php:106
+#: reporting/reports_main.php:116 reporting/reports_main.php:125
+#: reporting/reports_main.php:132 reporting/reports_main.php:139
+#: reporting/reports_main.php:147 reporting/reports_main.php:154
 #: reporting/reports_main.php:160 reporting/reports_main.php:171
-#: reporting/reports_main.php:179 reporting/reports_main.php:184
-#: reporting/reports_main.php:191 reporting/reports_main.php:199
-#: reporting/reports_main.php:206 reporting/reports_main.php:215
-#: reporting/reports_main.php:221 reporting/reports_main.php:232
-#: reporting/reports_main.php:242 reporting/reports_main.php:248
-#: reporting/reports_main.php:258 reporting/reports_main.php:266
-#: reporting/reports_main.php:274 reporting/reports_main.php:281
-#: reporting/reports_main.php:291 reporting/reports_main.php:300
-#: reporting/reports_main.php:308 reporting/reports_main.php:315
-#: reporting/reports_main.php:326 reporting/reports_main.php:337
-#: reporting/reports_main.php:347 reporting/reports_main.php:360
+#: reporting/reports_main.php:182 reporting/reports_main.php:191
+#: reporting/reports_main.php:199 reporting/reports_main.php:204
+#: reporting/reports_main.php:211 reporting/reports_main.php:219
+#: reporting/reports_main.php:226 reporting/reports_main.php:235
+#: reporting/reports_main.php:241 reporting/reports_main.php:252
+#: reporting/reports_main.php:262 reporting/reports_main.php:268
+#: reporting/reports_main.php:278 reporting/reports_main.php:286
+#: reporting/reports_main.php:294 reporting/reports_main.php:301
+#: reporting/reports_main.php:311 reporting/reports_main.php:320
+#: reporting/reports_main.php:328 reporting/reports_main.php:335
+#: reporting/reports_main.php:346 reporting/reports_main.php:357
 #: reporting/reports_main.php:367 reporting/reports_main.php:380
-#: reporting/reports_main.php:388 reporting/reports_main.php:399
-#: reporting/reports_main.php:411 reporting/reports_main.php:421
-#: reporting/reports_main.php:433 reporting/reports_main.php:440
-#: reporting/reports_main.php:450 reporting/reports_main.php:461
+#: reporting/reports_main.php:387 reporting/reports_main.php:400
+#: reporting/reports_main.php:408 reporting/reports_main.php:419
+#: reporting/reports_main.php:431 reporting/reports_main.php:441
+#: reporting/reports_main.php:453 reporting/reports_main.php:460
 #: reporting/reports_main.php:470 reporting/reports_main.php:481
-#: reporting/reports_main.php:487 reporting/reports_main.php:496
-#: reporting/reports_main.php:506 reporting/reports_main.php:514
-#: reporting/reports_main.php:522 reporting/reports_main.php:530
+#: reporting/reports_main.php:490 reporting/reports_main.php:501
+#: reporting/reports_main.php:507 reporting/reports_main.php:516
+#: reporting/reports_main.php:526 reporting/reports_main.php:534
+#: reporting/reports_main.php:542 reporting/reports_main.php:550
 msgid "Orientation"
 msgstr ""
 
 #: reporting/reports_main.php:44 reporting/reports_main.php:55
-#: reporting/reports_main.php:64 reporting/reports_main.php:71
-#: reporting/reports_main.php:80 reporting/reports_main.php:89
-#: reporting/reports_main.php:96 reporting/reports_main.php:161
-#: reporting/reports_main.php:172 reporting/reports_main.php:180
-#: reporting/reports_main.php:185 reporting/reports_main.php:192
-#: reporting/reports_main.php:216 reporting/reports_main.php:222
-#: reporting/reports_main.php:233 reporting/reports_main.php:243
-#: reporting/reports_main.php:249 reporting/reports_main.php:259
-#: reporting/reports_main.php:267 reporting/reports_main.php:275
-#: reporting/reports_main.php:282 reporting/reports_main.php:292
-#: reporting/reports_main.php:301 reporting/reports_main.php:309
-#: reporting/reports_main.php:327 reporting/reports_main.php:338
-#: reporting/reports_main.php:348 reporting/reports_main.php:354
-#: reporting/reports_main.php:361 reporting/reports_main.php:368
-#: reporting/reports_main.php:381 reporting/reports_main.php:389
-#: reporting/reports_main.php:400 reporting/reports_main.php:412
-#: reporting/reports_main.php:422 reporting/reports_main.php:434
-#: reporting/reports_main.php:441 reporting/reports_main.php:451
-#: reporting/reports_main.php:462 reporting/reports_main.php:471
-#: reporting/reports_main.php:482 reporting/reports_main.php:488
-#: reporting/reports_main.php:497 reporting/reports_main.php:507
-#: reporting/reports_main.php:515 reporting/reports_main.php:523
-#: reporting/reports_main.php:531
+#: reporting/reports_main.php:66 reporting/reports_main.php:75
+#: reporting/reports_main.php:82 reporting/reports_main.php:91
+#: reporting/reports_main.php:100 reporting/reports_main.php:107
+#: reporting/reports_main.php:172 reporting/reports_main.php:183
+#: reporting/reports_main.php:192 reporting/reports_main.php:200
+#: reporting/reports_main.php:205 reporting/reports_main.php:212
+#: reporting/reports_main.php:236 reporting/reports_main.php:242
+#: reporting/reports_main.php:253 reporting/reports_main.php:263
+#: reporting/reports_main.php:269 reporting/reports_main.php:279
+#: reporting/reports_main.php:287 reporting/reports_main.php:295
+#: reporting/reports_main.php:302 reporting/reports_main.php:312
+#: reporting/reports_main.php:321 reporting/reports_main.php:329
+#: reporting/reports_main.php:347 reporting/reports_main.php:358
+#: reporting/reports_main.php:368 reporting/reports_main.php:374
+#: reporting/reports_main.php:381 reporting/reports_main.php:388
+#: reporting/reports_main.php:401 reporting/reports_main.php:409
+#: reporting/reports_main.php:420 reporting/reports_main.php:432
+#: reporting/reports_main.php:442 reporting/reports_main.php:454
+#: reporting/reports_main.php:461 reporting/reports_main.php:471
+#: reporting/reports_main.php:482 reporting/reports_main.php:491
+#: reporting/reports_main.php:502 reporting/reports_main.php:508
+#: reporting/reports_main.php:517 reporting/reports_main.php:527
+#: reporting/reports_main.php:535 reporting/reports_main.php:543
+#: reporting/reports_main.php:551
 msgid "Destination"
 msgstr ""
 
@@ -12443,319 +12450,323 @@ msgstr ""
 msgid "&Aged Customer Analysis"
 msgstr ""
 
-#: reporting/reports_main.php:52 reporting/reports_main.php:169
-#: reporting/reports_main.php:397 reporting/reports_main.php:409
-#: reporting/reports_main.php:448 reporting/reports_main.php:459
-#: reporting/reports_main.php:494 reporting/reports_main.php:504
+#: reporting/reports_main.php:52 reporting/reports_main.php:180
+#: reporting/reports_main.php:417 reporting/reports_main.php:429
+#: reporting/reports_main.php:468 reporting/reports_main.php:479
+#: reporting/reports_main.php:514 reporting/reports_main.php:524
 msgid "Graphics"
 msgstr ""
 
-#: reporting/reports_main.php:56
+#: reporting/reports_main.php:67
 msgid "Customer &Detail Listing"
 msgstr ""
 
-#: reporting/reports_main.php:60 reporting/reports_main.php:188
+#: reporting/reports_main.php:71 reporting/reports_main.php:208
 msgid "Activity Greater Than"
 msgstr ""
 
-#: reporting/reports_main.php:61 reporting/reports_main.php:189
+#: reporting/reports_main.php:72 reporting/reports_main.php:209
 msgid "Activity Less Than"
 msgstr ""
 
-#: reporting/reports_main.php:65
+#: reporting/reports_main.php:76
 msgid "Sales &Summary Report"
 msgstr ""
 
-#: reporting/reports_main.php:72
+#: reporting/reports_main.php:83
 msgid "&Price Listing"
 msgstr ""
 
-#: reporting/reports_main.php:74 reporting/reports_main.php:84
-#: reporting/reports_main.php:211 reporting/reports_main.php:218
-#: reporting/reports_main.php:224 reporting/reports_main.php:237
-#: reporting/reports_main.php:253 reporting/reports_main.php:263
-#: reporting/reports_main.php:271 reporting/reports_main.php:279
-#: reporting/reports_main.php:286
+#: reporting/reports_main.php:85 reporting/reports_main.php:95
+#: reporting/reports_main.php:231 reporting/reports_main.php:238
+#: reporting/reports_main.php:244 reporting/reports_main.php:257
+#: reporting/reports_main.php:273 reporting/reports_main.php:283
+#: reporting/reports_main.php:291 reporting/reports_main.php:299
+#: reporting/reports_main.php:306
 msgid "Inventory Category"
 msgstr ""
 
-#: reporting/reports_main.php:75 sales/manage/sales_types.php:16
+#: reporting/reports_main.php:86 sales/manage/sales_types.php:16
 msgid "Sales Types"
 msgstr ""
 
-#: reporting/reports_main.php:76 reporting/reports_main.php:226
+#: reporting/reports_main.php:87 reporting/reports_main.php:246
 msgid "Show Pictures"
 msgstr ""
 
-#: reporting/reports_main.php:81
+#: reporting/reports_main.php:92
 msgid "&Order Status Listing"
 msgstr ""
 
-#: reporting/reports_main.php:85
+#: reporting/reports_main.php:96
 msgid "Stock Location"
 msgstr ""
 
-#: reporting/reports_main.php:90
+#: reporting/reports_main.php:101
 msgid "&Salesman Listing"
 msgstr ""
 
-#: reporting/reports_main.php:97
+#: reporting/reports_main.php:108
 msgid "Print &Invoices"
 msgstr ""
 
-#: reporting/reports_main.php:101 reporting/reports_main.php:111
-#: reporting/reports_main.php:118
+#: reporting/reports_main.php:112 reporting/reports_main.php:122
+#: reporting/reports_main.php:129
 msgid "email Customers"
 msgstr ""
 
-#: reporting/reports_main.php:102 reporting/reports_main.php:112
+#: reporting/reports_main.php:113 reporting/reports_main.php:123
 msgid "Payment Link"
 msgstr ""
 
-#: reporting/reports_main.php:107
+#: reporting/reports_main.php:118
 msgid "Print &Credit Notes"
 msgstr ""
 
-#: reporting/reports_main.php:115
+#: reporting/reports_main.php:126
 msgid "Print &Deliveries"
 msgstr ""
 
-#: reporting/reports_main.php:119
+#: reporting/reports_main.php:130
 msgid "Print as Packing Slip"
 msgstr ""
 
-#: reporting/reports_main.php:122
+#: reporting/reports_main.php:133
 msgid "Print &Statements"
 msgstr ""
 
-#: reporting/reports_main.php:126 reporting/reports_main.php:133
-#: reporting/reports_main.php:141
+#: reporting/reports_main.php:137 reporting/reports_main.php:144
+#: reporting/reports_main.php:152
 msgid "Email Customers"
 msgstr ""
 
-#: reporting/reports_main.php:129
+#: reporting/reports_main.php:140
 msgid "&Print Sales Orders"
 msgstr ""
 
-#: reporting/reports_main.php:134
+#: reporting/reports_main.php:145
 msgid "Print as Quote"
 msgstr ""
 
-#: reporting/reports_main.php:137
+#: reporting/reports_main.php:148
 msgid "&Print Sales Quotations"
 msgstr ""
 
-#: reporting/reports_main.php:144
+#: reporting/reports_main.php:155
 msgid "Print Receipts"
 msgstr ""
 
-#: reporting/reports_main.php:152
+#: reporting/reports_main.php:163
 msgid "Supplier &Balances"
 msgstr ""
 
-#: reporting/reports_main.php:162
+#: reporting/reports_main.php:173
 msgid "&Aged Supplier Analyses"
 msgstr ""
 
-#: reporting/reports_main.php:173
+#: reporting/reports_main.php:184
+msgid "Supplier &Trial Balances"
+msgstr ""
+
+#: reporting/reports_main.php:193
 msgid "&Payment Report"
 msgstr ""
 
-#: reporting/reports_main.php:181
+#: reporting/reports_main.php:201
 msgid "Outstanding &GRNs Report"
 msgstr ""
 
-#: reporting/reports_main.php:186
+#: reporting/reports_main.php:206
 msgid "Supplier &Detail Listing"
 msgstr ""
 
-#: reporting/reports_main.php:193
+#: reporting/reports_main.php:213
 msgid "Print Purchase &Orders"
 msgstr ""
 
-#: reporting/reports_main.php:197 reporting/reports_main.php:204
+#: reporting/reports_main.php:217 reporting/reports_main.php:224
 msgid "Email Suppliers"
 msgstr ""
 
-#: reporting/reports_main.php:200
+#: reporting/reports_main.php:220
 msgid "Print Remi&ttances"
 msgstr ""
 
-#: reporting/reports_main.php:209
+#: reporting/reports_main.php:229
 msgid "Inventory &Valuation Report"
 msgstr ""
 
-#: reporting/reports_main.php:217
+#: reporting/reports_main.php:237
 msgid "Inventory &Planning Report"
 msgstr ""
 
-#: reporting/reports_main.php:223
+#: reporting/reports_main.php:243
 msgid "Stock &Check Sheets"
 msgstr ""
 
-#: reporting/reports_main.php:227
+#: reporting/reports_main.php:247
 msgid "Inventory Column"
 msgstr ""
 
-#: reporting/reports_main.php:228
+#: reporting/reports_main.php:248
 msgid "Show Shortage"
 msgstr ""
 
-#: reporting/reports_main.php:230
+#: reporting/reports_main.php:250
 msgid "Item Like"
 msgstr ""
 
-#: reporting/reports_main.php:234
+#: reporting/reports_main.php:254
 msgid "Inventory &Sales Report"
 msgstr ""
 
-#: reporting/reports_main.php:244
+#: reporting/reports_main.php:264
 msgid "&GRN Valuation Report"
 msgstr ""
 
-#: reporting/reports_main.php:250
+#: reporting/reports_main.php:270
 msgid "Inventory P&urchasing Report"
 msgstr ""
 
-#: reporting/reports_main.php:260
+#: reporting/reports_main.php:280
 msgid "Inventory &Movement Report"
 msgstr ""
 
-#: reporting/reports_main.php:268
+#: reporting/reports_main.php:288
 msgid "C&osted Inventory Movement Report"
 msgstr ""
 
-#: reporting/reports_main.php:276
+#: reporting/reports_main.php:296
 msgid "Item &Sales Summary Report"
 msgstr ""
 
-#: reporting/reports_main.php:283
+#: reporting/reports_main.php:303
 msgid "Inventory Purchasing - &Transaction Based"
 msgstr ""
 
-#: reporting/reports_main.php:296
+#: reporting/reports_main.php:316
 msgid "&Bill of Material Listing"
 msgstr ""
 
-#: reporting/reports_main.php:297
+#: reporting/reports_main.php:317
 msgid "From product"
 msgstr ""
 
-#: reporting/reports_main.php:298
+#: reporting/reports_main.php:318
 msgid "To product"
 msgstr ""
 
-#: reporting/reports_main.php:302
+#: reporting/reports_main.php:322
 msgid "Work Order &Listing"
 msgstr ""
 
-#: reporting/reports_main.php:305
+#: reporting/reports_main.php:325
 msgid "Outstanding Only"
 msgstr ""
 
-#: reporting/reports_main.php:310
+#: reporting/reports_main.php:330
 msgid "Print &Work Orders"
 msgstr ""
 
-#: reporting/reports_main.php:313
+#: reporting/reports_main.php:333
 msgid "Email Locations"
 msgstr ""
 
-#: reporting/reports_main.php:320
+#: reporting/reports_main.php:340
 msgid "&Fixed Assets Valuation"
 msgstr ""
 
-#: reporting/reports_main.php:322
+#: reporting/reports_main.php:342
 msgid "Fixed Assets Class"
 msgstr ""
 
-#: reporting/reports_main.php:323
+#: reporting/reports_main.php:343
 msgid "Fixed Assets Location"
 msgstr ""
 
-#: reporting/reports_main.php:332
+#: reporting/reports_main.php:352
 msgid "Dimension &Summary"
 msgstr ""
 
-#: reporting/reports_main.php:333
+#: reporting/reports_main.php:353
 msgid "From Dimension"
 msgstr ""
 
-#: reporting/reports_main.php:334
+#: reporting/reports_main.php:354
 msgid "To Dimension"
 msgstr ""
 
-#: reporting/reports_main.php:340
+#: reporting/reports_main.php:360
 msgid "Banking"
 msgstr ""
 
-#: reporting/reports_main.php:341
+#: reporting/reports_main.php:361
 msgid "Bank &Statement"
 msgstr ""
 
-#: reporting/reports_main.php:345 reporting/reports_main.php:416
-#: reporting/reports_main.php:466 reporting/reports_main.php:511
+#: reporting/reports_main.php:365 reporting/reports_main.php:436
+#: reporting/reports_main.php:486 reporting/reports_main.php:531
 #: sales/inquiry/customer_inquiry.php:163
 msgid "Zero values"
 msgstr ""
 
-#: reporting/reports_main.php:349
+#: reporting/reports_main.php:369
 msgid "Bank Statement w/ &Reconcile"
 msgstr ""
 
-#: reporting/reports_main.php:356
+#: reporting/reports_main.php:376
 msgid "General Ledger"
 msgstr ""
 
-#: reporting/reports_main.php:357
+#: reporting/reports_main.php:377
 msgid "Chart of &Accounts"
 msgstr ""
 
-#: reporting/reports_main.php:358
+#: reporting/reports_main.php:378
 msgid "Show Balances"
 msgstr ""
 
-#: reporting/reports_main.php:362
+#: reporting/reports_main.php:382
 msgid "List of &Journal Entries"
 msgstr ""
 
-#: reporting/reports_main.php:372 reporting/reports_main.php:426
-#: reporting/reports_main.php:475
+#: reporting/reports_main.php:392 reporting/reports_main.php:446
+#: reporting/reports_main.php:495
 msgid "GL Account &Transactions"
 msgstr ""
 
-#: reporting/reports_main.php:375 reporting/reports_main.php:429
-#: reporting/reports_main.php:478
+#: reporting/reports_main.php:395 reporting/reports_main.php:449
+#: reporting/reports_main.php:498
 msgid "From Account"
 msgstr ""
 
-#: reporting/reports_main.php:376 reporting/reports_main.php:430
-#: reporting/reports_main.php:479
+#: reporting/reports_main.php:396 reporting/reports_main.php:450
+#: reporting/reports_main.php:499
 msgid "To Account"
 msgstr ""
 
-#: reporting/reports_main.php:382 reporting/reports_main.php:435
-#: reporting/reports_main.php:483
+#: reporting/reports_main.php:402 reporting/reports_main.php:455
+#: reporting/reports_main.php:503
 msgid "Annual &Expense Breakdown"
 msgstr ""
 
-#: reporting/reports_main.php:390 reporting/reports_main.php:442
-#: reporting/reports_main.php:489
+#: reporting/reports_main.php:410 reporting/reports_main.php:462
+#: reporting/reports_main.php:509
 msgid "&Balance Sheet"
 msgstr ""
 
-#: reporting/reports_main.php:396 reporting/reports_main.php:408
-#: reporting/reports_main.php:447 reporting/reports_main.php:458
-#: reporting/reports_main.php:493 reporting/reports_main.php:503
+#: reporting/reports_main.php:416 reporting/reports_main.php:428
+#: reporting/reports_main.php:467 reporting/reports_main.php:478
+#: reporting/reports_main.php:513 reporting/reports_main.php:523
 msgid "Decimal values"
 msgstr ""
 
-#: reporting/reports_main.php:401 reporting/reports_main.php:452
-#: reporting/reports_main.php:498
+#: reporting/reports_main.php:421 reporting/reports_main.php:472
+#: reporting/reports_main.php:518
 msgid "&Profit and Loss Statement"
 msgstr ""
 
-#: reporting/reports_main.php:517
+#: reporting/reports_main.php:537
 msgid "Ta&x Report"
 msgstr ""
 
@@ -12957,8 +12968,7 @@ msgstr ""
 msgid "Report Period"
 msgstr ""
 
-#: reporting/includes/pdf_report.inc:989
-#: reporting/includes/pdf_report.inc:1037
+#: reporting/includes/pdf_report.inc:989 reporting/includes/pdf_report.inc:1037
 #, php-format
 msgid "You have no email contact defined for this type of document for '%s'."
 msgstr ""
@@ -14183,7 +14193,7 @@ msgstr ""
 #: sales/manage/customer_branches.php:270 sales/manage/customers.php:330
 #: sales/inquiry/customer_allocation_inquiry.php:42
 #: sales/inquiry/customer_inquiry.php:154
-#: sales/inquiry/sales_deliveries_view.php:114
+#: sales/inquiry/sales_deliveries_view.php:115
 #: sales/inquiry/sales_orders_view.php:232
 msgid "Select a customer: "
 msgstr ""
@@ -14342,7 +14352,7 @@ msgstr ""
 
 #: sales/manage/customer_branches.php:285
 #: sales/inquiry/customer_branches_list.php:49
-#: sales/inquiry/sales_deliveries_view.php:172
+#: sales/inquiry/sales_deliveries_view.php:173
 msgid "Contact"
 msgstr ""
 
@@ -15013,34 +15023,34 @@ msgstr ""
 msgid "Search All Deliveries"
 msgstr ""
 
-#: sales/inquiry/sales_deliveries_view.php:68
+#: sales/inquiry/sales_deliveries_view.php:69
 msgid ""
 "For batch invoicing you should\n"
 "\t\t    select at least one delivery. All items must be dispatched to\n"
 "\t\t    the same customer branch."
 msgstr ""
 
-#: sales/inquiry/sales_deliveries_view.php:168
+#: sales/inquiry/sales_deliveries_view.php:169
 msgid "Delivery #"
 msgstr ""
 
-#: sales/inquiry/sales_deliveries_view.php:174
+#: sales/inquiry/sales_deliveries_view.php:175
 msgid "Cust Ref"
 msgstr ""
 
-#: sales/inquiry/sales_deliveries_view.php:176
+#: sales/inquiry/sales_deliveries_view.php:177
 msgid "Due By"
 msgstr ""
 
-#: sales/inquiry/sales_deliveries_view.php:177
+#: sales/inquiry/sales_deliveries_view.php:178
 msgid "Delivery Total"
 msgstr ""
 
-#: sales/inquiry/sales_deliveries_view.php:179
+#: sales/inquiry/sales_deliveries_view.php:180
 msgid "Batch"
 msgstr ""
 
-#: sales/inquiry/sales_deliveries_view.php:179
+#: sales/inquiry/sales_deliveries_view.php:180
 msgid "Batch Invoicing"
 msgstr ""
 

diff --git a/update.html b/update.html
deleted file mode 100644 (file)
index 4b7f7f7..0000000
--- a/update.html
+++ /dev/null
@@ -1,326 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html><head>
-
-
-<meta http-equiv="CONTENT-TYPE" content="text/html; charset=iso-8859-1"><title>FrontAccounting Update</title>
-<meta name="GENERATOR" content="OpenOffice.org 2.4 (Linux)">
-<meta name="CREATED" content="0;0">
-<meta name="CHANGED" content="20100902;19041400"></head><body style="direction: ltr;" lang="en-US">
-<h4><strong><font color="#cc6600"><font style="font-size: 20pt;" size="5"><i>Front</i></font></font></strong><strong><font style="font-size: 20pt;" size="5">Accounting
-Update</font></strong></h4>
-<h2>Important Notes for release 2.4.1.</h2>
-<h3>This is a preliminary FrontAccounting ERP 2.4.1 release. </h3>
-This version provides a couple of new important features (in addition to all the <br>
-features merged from latest 2.3.26 release), but main development effort was <br>
-focused on internal architecture changes and cleanups to make future FA development <br>
-easier. <br>
-<br>
-At the time of release most of optional extension modules available from central<br>
-extensions repo has been also ported to 2.4 and should be mostly usable. Most Themes are<br>
-updated and many new Themes are available.<br>
-<br>
-Due to deep changes made under the hood, we highly encourage all current FA 2.3 users<br>
-to make test upgrades on a copy of your working installation connected to separate database<br>
-filled with your real company data. This will allow us find and fix any possible<br>
-upgrade issues before final 2.4 release. Please report any bugs/problems found via our <br>
-Mantis Bugtracker at http://mantis.frontaccounting.com.<br>
-<h3>Download instructions</h3>
-In Sourceforge FrontAccounting (http://sourceforge.net/projects/frontaccounting), select <br>
-Files -&gt; FrontAccounting 2.4 -&gt;2.4.1.<br>
-<br>
-For Windows users select the zip file. For all other users select the tar.gz file.<br>
-<h3>Notice for certain Windows wamp servers.</h3>
-Due to experienced long upgrade time for release 2.3 databases to release 2.4 on certain wamp <br>
-servers, we just ask you to be patience. It might take a while, but should&nbsp; end successfully. <br>
-<h4>New global flags in config.php (config-default.php):</h4>
-/* Optional popup search enabled if this is true. $max_rows_in_search = 10 <br>
-
-&nbsp;&nbsp;&nbsp; is used for maximum rows in search */<br>
-
-<span style="font-weight: bold;">$use_popup_search = true;</span><br>
-
-<span style="font-weight: bold;">$max_rows_in_search = 10;</span><br>
-
-<h2>Important Notes for release 2.3.22.</h2>
-
-
-
-
-<h4>New global flags in config.php (config-default.php):</h4>
-/* Show average costed values instead of fixed standard cost */ In Enventory Valuation Report.<br>
-<span style="font-weight: bold;">$use_costed_values = 0;</span><br>
-<br>
-/* Print Item Images on Sales Quotations. Set to 1 if so. */<br>
-<span style="font-weight: bold;">$print_item_images_on_quote = 0;</span><br>
-<h2>Important Notes for release 2.3.21.</h2>
-
-<h4>Crucial security patches:</h4>
-
-This version consists of crucial security patches and this applies especially to all publicly available servers, <br>
-&nbsp;f.i. installations which are run in not fully trusted environment like public demos, shared accounts or SAAS.<br>
-<h4>New global flags in config.php (config-default.php):</h4>
-/* Whether to allow sending new password by e-mail */<br>
-<span style="font-weight: bold;">$allow_password_reset = false</span><h2>Important Notes for release 2.3.20.</h2>
-
-<h4>Crucial security patches:</h4>
-This version consists of crucial security patches and all guest FA
-installations (I mean whenever FA is run in not fully trusted
-environment) should be updtaed.<br>
-<h2>Important Notes for release 2.3.17.</h2>
-
-<h4>New global flags in config.php (config-default.php):</h4>
-/*<br>
-&nbsp;&nbsp;&nbsp; Choose Exchange Rate Provider<br>
-&nbsp;&nbsp;&nbsp; Default is ECB for backwards compatibility<br>
-*/<br>
-<span style="font-weight: bold;">$xr_providers = array("ECB", "YAHOO", "GOOGLE", "BLOOMBERG");<br>
-$dflt_xr_provider = 0;<br>
-<br>
-</span>/*<br>
-&nbsp;&nbsp;&nbsp; Set to true when remote service is authoritative
-source of exchange rates, and can be stored automatically without<br>
-&nbsp;&nbsp;&nbsp; manual edition. Otherwise exrate is stored on first new currency transaction of the day.<br>
-*/<br>
-<span style="font-weight: bold;">$xr_provider_authoritative = false;<br>
-</span><h2>Important Notes for release 2.3.16.</h2>
-<h4>New global flags in config.php (config-default.php):</h4><span style="font-weight: bold;">/*<br>&nbsp;&nbsp; </span>&nbsp;Optional sorting new sales documents lines according to item code<span style="font-weight: bold;"><br>*/<br>$sort_sales_items = false;<br><br>/*<br>&nbsp;&nbsp; &nbsp;</span>Trial Balance opening balance presentation option.<br>&nbsp;&nbsp; &nbsp;When set to true past years part of opening balance is cleared.<span style="font-weight: bold;"><br>*/<br>$clear_trial_balance_opening = false;</span><h2>Important Notes for release 2.3.14.</h2>
-<h4>New global flags in config.php (config-default.php):</h4>
-/* default print orientation. 0 = Portrait, 1 = Landscape */<br>
-&nbsp;&nbsp;&nbsp; <span style="font-weight: bold;">$def_print_orientation
-= 0;</span><br>
-<h2>Important Notes for release 2.3.13.</h2>
-<h4>New global flags in config.php (config-default.php):</h4>
-/* No check on edit conflicts. Maybe needed to be set to 1 in certains
-Windows Servers */<br>
-&nbsp;&nbsp;&nbsp; <span style="font-weight: bold;">$no_check_edit_conflicts
-= 0;</span><br>
-<h2>Important Notes for release 2.3.12.</h2>
-<h4>New global flags in config.php (config-default.php):</h4>
-/* <br>
-&nbsp;&nbsp;&nbsp; Display a dropdown select box for
-choosing Company to login if false.<br>
-&nbsp;&nbsp;&nbsp; Show a blank editbox only if true where
-the Company NickName<br>
-&nbsp;&nbsp;&nbsp; will have to be manually entered. This
-is when privacy is needed.<br>
-*/<br>
-&nbsp; &nbsp; <span style="font-weight: bold;">$text_company_selection</span>&nbsp;
-= false;<br>
-<br>
-/*&nbsp; Should FA hide menu items (Applications, Modules, and
-Actions) from the user if they don't have access to them? <br>
-&nbsp;&nbsp;&nbsp; 0 for
-no&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 1 for yes<br>
-*/<br>
-<br>
-&nbsp;&nbsp;&nbsp; <span style="font-weight: bold;">$hide_inaccessible_menu_items</span>
-= 0;<br>
-<br>
-/*<br>
-&nbsp;&nbsp;&nbsp; Brute force prevention.<br>
-&nbsp;&nbsp;&nbsp; $login_delay seconds delay is required
-between login attempts after $login_max_attemps failed logins.<br>
-&nbsp;&nbsp;&nbsp; Set $login_delay to 0 to disable the
-feature (not recommended)<br>
-*/<br>
-&nbsp; &nbsp; <span style="font-weight: bold;">$login_delay</span>
-= 30;<br>
-&nbsp; &nbsp; <span style="font-weight: bold;">$login_max_attempts</span>
-= 10;
-<h2><strong></strong>Important Notes for release
-2.3.5.</h2>
-Change in the behaviour of <span style="font-weight: bold; font-style: italic;">Recurrent
-Invoices</span>.<br>
-<ul>
-<li>Now
-the Last Sent day is stamped with the former Last Sent (or Begin date
-the first time) + months + days. Before the Last Sent day was stamped
-with tthe creation date (today). The Invoice date is still todays date.
-</li>
-<li>If you for some reason want to make a pause in the
-recurrent
-invoices, you can now edit the Last Sent day in the Management section
-of Sales tab.</li>
-<li>Before the days value, together with a month
-value, decided which day in the month the invoice was due..
-&nbsp;This
-does not&nbsp;work now. You can&nbsp;change the day in the
-month you
-want the recurrency to happen by setting the Last Sent day with the new
-day in the Management section.&nbsp;</li>
-<li>If you create a new Recurrent Invoice the Beginning date
-can be set to the day in the month you want the recurrencies to be due.</li>
-</ul>
-<h2>Important Notes</h2>
-<p>Upgrade process can be done only by administrator of the first
-company created during FrontAccounting installation. This person is
-considered as a site admin who have granted access to potentially
-dangerous setup options, like Setup/Software Upgrade.</p>
-<p>In the following description sections related to older FA
-versions are
-prefixed with <span style="background: rgb(235, 97, 61) none repeat scroll 0% 50%; -moz-background-clip: -moz-initial; -moz-background-origin: -moz-initial; -moz-background-inline-policy: -moz-initial;">[color
-tags]</span><span style="background: transparent none repeat scroll 0% 50%; -moz-background-clip: -moz-initial; -moz-background-origin: -moz-initial; -moz-background-inline-policy: -moz-initial;">
-. Y</span>ou can skip tagged fragment safely if currently FA
-application is newer than the version in tag.</p>
-<p>Upgrade process consists of up to four stages, some of them
-are
-optional:</p>
-<ol>
-<li>
-<p>Application source files update </p>
-</li>
-<li>
-<p>Database upgrade &#8211; this step is needed only during upgrade
-which involves change in major application version number (e.g. from
-2.2.x to 2.3.x), and sometimes during upgrade from beta release to
-stable version. Otherwise this step can be skipped.</p>
-</li>
-<li>
-<p>Final cleanup &#8211; is needed when some old source files,
-obsoleted by new release should be removed.</p>
-</li>
-<li>
-<p>New features configuration &#8211; this is optional step needed
-for most major releases and some minor ones. </p>
-</li>
-</ol>
-<p style="margin-bottom: 0cm;">Before starting upgrade
-ensure nobody
-is using the application and make database backup for all companies.
-To be on safe side backup also old source files, especially those
-locally customized (if any).</p>
-<p>Log into admin account of first company.<strong> </strong><strong><span style="">If
-you use a theme other than the standard 3 (aqua, cool or default),
-switch to one of these before going further.</span></strong></p>
-<h2><strong><b>1. Application files update</b></strong></h2>
-<p style="margin-top: 0.42cm; page-break-after: avoid;"><font face="Liberation Sans, sans-serif"><font size="4"><strong><span style="">a. Source
-files update</span></strong></font></font></p>
-<p><strong><span style="">Extract distribution
-zip/tar.gz file in empty directory, and copy all the files to your
-FrontAccounting directory overwriting old files. If it is major
-release upgrade you can skip next step and go directly to cleanup.</span></strong></p>
-<p style="margin-top: 0.42cm; page-break-after: avoid;"><strong><font face="Liberation Sans, sans-serif"><font size="4"><span style="">b. Configuration
-files update</span></font></font></strong></p>
-<p><strong><span style="">Compare new
-</span></strong><strong><i><b>config.default.php</b></i></strong><strong>
-</strong><strong><span style="">file with the
-old
-</span></strong><strong><i><b>config.php </b></i></strong><strong><span style="font-style: normal;"><span style="">and
-add all n</span></span></strong><strong><span style="">ew
-settings (if any). </span></strong>
-</p>
-<p><strong><span style=""><span style="background: rgb(235, 97, 61) none repeat scroll 0% 50%; -moz-background-clip: -moz-initial; -moz-background-origin: -moz-initial; -moz-background-inline-policy: -moz-initial;">[&lt;FA
-2.2beta]</span></span></strong></p>
-<p><strong> <span style="">$show_users_online
-= 0;</span></strong></p>
-<p><strong> <span style="">$def_print_destination
-= 0;</span></strong></p>
-<p><strong><span style="">$dflt_date_fmt=0;</span></strong></p>
-<p><strong><span style="">$dflt_date_sep=0;</span></strong></p>
-<p><strong><span style="">$table_style,table_style2
-changed</span></strong></p>
-<p><strong><span style=""><span style="background: rgb(235, 97, 61) none repeat scroll 0% 50%; -moz-background-clip: -moz-initial; -moz-background-origin: -moz-initial; -moz-background-inline-policy: -moz-initial;">[&lt;FA
-2.3beta]</span></span></strong></p>
-<p><strong> <span style="">$alternative_tax_include_on_doc=0;</span></strong></p>
-<p><strong><span style="">$suppress_tax_rates
-= 0;</span></strong></p>
-<p><strong><span style=""><span style="background: rgb(235, 97, 61) none repeat scroll 0% 50%; -moz-background-clip: -moz-initial; -moz-background-origin: -moz-initial; -moz-background-inline-policy: -moz-initial;">[&lt;FA
-2.3RC1]</span></span></strong><strong> </strong>
-</p>
-<p><strong><span style="">Application version
-information and a couple of other private FA variables are stored in
-</span></strong><strong><i><b>version.php</b></i></strong><strong>
-</strong><strong><span style="">file. The
-application version displayed in footer is defined in $version
-variable unless this is set in config.php file. If you want current
-release version to be displayed on every FA update just remove or
-comment out $version variable in </span></strong><strong><span style="font-style: normal;"><span style="">config.php</span></span></strong><strong><span style="">.</span></strong></p>
-<p><strong><span style=""><span style="background: rgb(235, 97, 61) none repeat scroll 0% 50%; -moz-background-clip: -moz-initial; -moz-background-origin: -moz-initial; -moz-background-inline-policy: -moz-initial;">[&lt;FA
-2.3RC2]</span></span></strong></p>
-<p><strong> <span style="">$save_report_selections
-&nbsp;= 0; &nbsp;// A value &gt; 0 means days to save the
-report selections.</span></strong></p>
-<p><strong><span style=""><span style="background: rgb(235, 97, 61) none repeat scroll 0% 50%; -moz-background-clip: -moz-initial; -moz-background-origin: -moz-initial; -moz-background-inline-policy: -moz-initial;">[&lt;FA
-2.3]</span></span></strong></p>
-<p><strong> <span style="">$save_po_item_codes
-&nbsp;= 0; &nbsp;//&nbsp; show item codes on purchase
-order&nbsp;</span></strong></p>
-<p><strong><span style="">$def_print_destination
-= 0; // &nbsp;default print destination. 0 = PDF/Printer, 1 = Excel</span></strong></p>
-<p><strong><span style="">$alternative_tax_include_on_docs
-= 0; // &nbsp;1 = print Subtotal tax excluded, tax and Total tax
-included</span></strong></p>
-<p><strong><span style="">$suppress_tax_rates
-= 0; // &nbsp;suppress tax rates on documents. 0 = no, 1 = yes.</span></strong></p>
-<strong><span style=""><span style="background: rgb(235, 97, 61) none repeat scroll 0% 50%; -moz-background-clip: -moz-initial; -moz-background-origin: -moz-initial; -moz-background-inline-policy: -moz-initial;"></span></span></strong><strong><span style=""><span style="background: rgb(235, 97, 61) none repeat scroll 0% 50%; -moz-background-clip: -moz-initial; -moz-background-origin: -moz-initial; -moz-background-inline-policy: -moz-initial;"></span></span></strong>
-<h2><strong><b>2. Database upgrade</b></strong></h2>
-<p><strong><span style="">This step can be
-skipped
-for small version updates i.e. when you have already installed
-FrontAccounting version 2.3.1 or later. Before database upgrade is
-done on all company databases backup file is created automatically to
-enable database restore after failure.</span></strong></p>
-<p><strong><span style="">After major version
-upgrade overwriting files in first step makes the system unaccessible
-for all users but site admin, who have to run upgrade procedures to
-update all company databases to the new version provided with the
-release. After logging to administrator account of first installed
-company go directly to Setup/Software Upgrade screen, mark all
-subsequent 'Install' checkboxes and press 'Upgrade System'.</span></strong></p>
-<p style="">If something goes wrong during
-upgrade, you can eventually try forced upgrade option. Forced upgrade
-ignores some smaller errors which can arise during upgrade due to
-some exotic database configuration. This is depreciated option, so
-first read error messages if any, try to fix signalized problems,
-restore databases from backup and retry normal installation. To run
-upgrade in forced mode check box 'Force Upgrade', and press 'Upgrade
-System' again.</p>
-<h2>3. Final cleanup</h2>
-<p>Remove or rename install folder in main FrontAccounting
-directory.
-</p>
-<p>After upgrade is installed you can remove files obsoleted by
-new
-FrontAccounting version. Also old, unused settings <span style="font-style: normal;"><span style="">can
-be removed from </span></span><i><b>config.php</b></i><span style="font-style: normal;"><span style="">
-file.</span></span></p>
-<p style="margin-top: 0.42cm; page-break-after: avoid;"><font face="Liberation Sans, sans-serif"><font size="4">a.
-Source files cleanup</font></font></p>
-<p><strong><span style=""><span style="background: rgb(235, 97, 61) none repeat scroll 0% 50%; -moz-background-clip: -moz-initial; -moz-background-origin: -moz-initial; -moz-background-inline-policy: -moz-initial;">[&lt;FA
-2.2beta]</span></span></strong></p>
-<p><strong><span style=""><span style="background: transparent none repeat scroll 0% 50%; -moz-background-clip: -moz-initial; -moz-background-origin: -moz-initial; -moz-background-inline-policy: -moz-initial;">/includes/reserved.inc
-&#8211; removed.</span></span></strong></p>
-<p><strong><span style=""><span style="background: rgb(235, 97, 61) none repeat scroll 0% 50%; -moz-background-clip: -moz-initial; -moz-background-origin: -moz-initial; -moz-background-inline-policy: -moz-initial;">[&lt;FA
-2.1]</span></span></strong><strong> </strong>
-</p>
-<p><strong><span style="">/admin/db/v_banktrans.inc
-- removed</span></strong></p>
-<p style="margin-top: 0.42cm; page-break-after: avoid;"><font face="Liberation Sans, sans-serif"><font size="4"><span style="font-style: normal;"><span style="">b.
-Config.php cleanup </span></span></font></font>
-</p>
-<p><strong><span style=""><span style="background: rgb(235, 97, 61) none repeat scroll 0% 50%; -moz-background-clip: -moz-initial; -moz-background-origin: -moz-initial; -moz-background-inline-policy: -moz-initial;">[&lt;FA
-2.2RC1]</span></span></strong><strong> </strong>
-</p>
-<p><strong><span style="">$security_headings,
-$security_groups arrays &#8211; moved to database (see Access Setup) </span></strong>
-</p>
-<p><strong><span style="">$def_app &#8211; moved
-to user configuration in database.</span></strong></p>
-<p><strong><span style="font-style: normal;"><span style="">$version
-&#8211; moved to </span></span></strong><strong><i><b>version.php</b></i></strong><strong><span style="font-style: normal;"><span style="">
-file. Remove</span></span></strong></p>
-<h2>4. New features configuration</h2>
-<p>During upgrade process new features are initialized to default
-status, and sometimes old settings are also changed to conform with
-new security policy. This automatic process is designed to be as
-neutral for end users as possible, however sometimes site or company
-admin intervention can be necessary to set thing after changes to
-their best state. Below you will find description of new settings
-available after upgrade.</p>
-<p><br>
-<br>
-</p>
-<p>----------------------</p>
-<ul>
-</ul>
-</body></html>
\ No newline at end of file