Changed rep705 to show fiscal year instead of year
[fa-stable.git] / lang / new_language_template / LC_MESSAGES / empty.po
index 5a9a9af31ca15455d3c25a6bc59fe03e54b6aad3..803e282ebdd2b1f2d8618ec41c348054913beff2 100644 (file)
@@ -5,8 +5,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FrontAccounting\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-21 16:04+0100\n"
-"PO-Revision-Date: 2009-10-21 16:04+0100\n"
+"POT-Creation-Date: 2009-11-17 22:28+0100\n"
+"PO-Revision-Date: 2009-11-17 22:34+0100\n"
 "Last-Translator: FrontAccounting <info@frontaccounting.com>\n"
 "Language-Team: Translators\n"
 "MIME-Version: 1.0\n"
@@ -18,12 +18,12 @@ msgstr ""
 "X-Poedit-Basepath: c:\\Apache2\\htdocs\\account22\n"
 "X-Poedit-SearchPath-0: c:\\Apache2\\htdocs\\account22\n"
 
-#: c:\Apache2\htdocs\account22/frontaccounting.php:79
 #: c:\Apache2\htdocs\account22/frontaccounting.php:80
+#: c:\Apache2\htdocs\account22/frontaccounting.php:81
 msgid "Main  Menu"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/frontaccounting.php:81
+#: c:\Apache2\htdocs\account22/frontaccounting.php:82
 #: c:\Apache2\htdocs\account22/access/logout.php:17
 #: c:\Apache2\htdocs\account22/access/backup/logout1.php:17
 msgid "Logout"
@@ -478,7 +478,7 @@ msgstr ""
 #: c:\Apache2\htdocs\account22/admin/display_prefs.php:140
 #: c:\Apache2\htdocs\account22/admin/forms_setup.php:61
 #: c:\Apache2\htdocs\account22/admin/gl_setup.php:220
-#: c:\Apache2\htdocs\account22/admin/inst_module.php:281
+#: c:\Apache2\htdocs\account22/admin/inst_module.php:267
 msgid "Update"
 msgstr ""
 
@@ -594,7 +594,7 @@ msgid "Database Password"
 msgstr ""
 
 #: c:\Apache2\htdocs\account22/admin/create_coy.php:313
-#: c:\Apache2\htdocs\account22/admin/inst_upgrade.php:183
+#: c:\Apache2\htdocs\account22/admin/inst_upgrade.php:184
 msgid "None"
 msgstr ""
 
@@ -1028,9 +1028,9 @@ msgid "Are you sure you want to delete language no. "
 msgstr ""
 
 #: c:\Apache2\htdocs\account22/admin/inst_lang.php:139
-#: c:\Apache2\htdocs\account22/admin/inst_module.php:210
-#: c:\Apache2\htdocs\account22/admin/inst_module.php:251
-#: c:\Apache2\htdocs\account22/admin/inst_module.php:310
+#: c:\Apache2\htdocs\account22/admin/inst_module.php:194
+#: c:\Apache2\htdocs\account22/admin/inst_module.php:236
+#: c:\Apache2\htdocs\account22/admin/inst_module.php:296
 #: c:\Apache2\htdocs\account22/admin/printers.php:88
 #: c:\Apache2\htdocs\account22/admin/shipping_companies.php:117
 msgid "Name"
@@ -1112,80 +1112,80 @@ msgstr ""
 msgid "Module installation support is not implemented yet. You have to do it manually."
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/admin/inst_module.php:199
+#: c:\Apache2\htdocs\account22/admin/inst_module.php:183
 msgid "Selected extension has been successfully deleted"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/admin/inst_module.php:210
-#: c:\Apache2\htdocs\account22/admin/inst_module.php:251
+#: c:\Apache2\htdocs\account22/admin/inst_module.php:194
+#: c:\Apache2\htdocs\account22/admin/inst_module.php:236
 msgid "Tab"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/admin/inst_module.php:210
-#: c:\Apache2\htdocs\account22/admin/inst_module.php:251
+#: c:\Apache2\htdocs\account22/admin/inst_module.php:194
+#: c:\Apache2\htdocs\account22/admin/inst_module.php:236
 msgid "Link text"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/admin/inst_module.php:210
-#: c:\Apache2\htdocs\account22/admin/inst_module.php:311
+#: c:\Apache2\htdocs\account22/admin/inst_module.php:194
+#: c:\Apache2\htdocs\account22/admin/inst_module.php:297
 msgid "Folder"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/admin/inst_module.php:211
+#: c:\Apache2\htdocs\account22/admin/inst_module.php:195
 msgid "Access extensions"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/admin/inst_module.php:238
+#: c:\Apache2\htdocs\account22/admin/inst_module.php:223
 msgid ""
 "You are about to delete this extension\\n"
 "Do you want to continue?"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/admin/inst_module.php:251
+#: c:\Apache2\htdocs\account22/admin/inst_module.php:236
 msgid "Active"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/admin/inst_module.php:313
+#: c:\Apache2\htdocs\account22/admin/inst_module.php:299
 msgid "Menu Tab"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/admin/inst_module.php:314
+#: c:\Apache2\htdocs\account22/admin/inst_module.php:300
 msgid "Menu Link Text"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/admin/inst_module.php:316
+#: c:\Apache2\htdocs\account22/admin/inst_module.php:302
 msgid "Default status"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/admin/inst_module.php:318
+#: c:\Apache2\htdocs\account22/admin/inst_module.php:304
 msgid "Module File"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/admin/inst_module.php:319
+#: c:\Apache2\htdocs\account22/admin/inst_module.php:305
 msgid "Access Levels Extensions"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/admin/inst_module.php:320
+#: c:\Apache2\htdocs\account22/admin/inst_module.php:306
 msgid "SQL File"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/admin/inst_module.php:323
+#: c:\Apache2\htdocs\account22/admin/inst_module.php:309
 msgid "Select your module PHP file from your local harddisk."
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/admin/inst_module.php:331
+#: c:\Apache2\htdocs\account22/admin/inst_module.php:317
 msgid "Extension data has been updated."
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/admin/inst_module.php:333
+#: c:\Apache2\htdocs\account22/admin/inst_module.php:319
 msgid "Extension has been installed."
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/admin/inst_module.php:350
+#: c:\Apache2\htdocs\account22/admin/inst_module.php:336
 msgid "Current active extensions set has been saved."
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/admin/inst_module.php:364
+#: c:\Apache2\htdocs\account22/admin/inst_module.php:350
 msgid "Extensions:"
 msgstr ""
 
@@ -1193,59 +1193,59 @@ msgstr ""
 msgid "Software Upgrade"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/admin/inst_upgrade.php:110
+#: c:\Apache2\htdocs\account22/admin/inst_upgrade.php:111
 msgid "Upgrade cannot be done because database has been already partially upgraded. Please downgrade database to clean previous version or try forced upgrade."
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/admin/inst_upgrade.php:138
+#: c:\Apache2\htdocs\account22/admin/inst_upgrade.php:139
 msgid "Cannot connect to database for company"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/admin/inst_upgrade.php:150
+#: c:\Apache2\htdocs\account22/admin/inst_upgrade.php:151
 #, php-format
 msgid "Database upgrade to version %s failed for company '%s'."
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/admin/inst_upgrade.php:153
+#: c:\Apache2\htdocs\account22/admin/inst_upgrade.php:154
 msgid "You should restore company database from latest backup file"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/admin/inst_upgrade.php:164
+#: c:\Apache2\htdocs\account22/admin/inst_upgrade.php:165
 msgid "All companies data has been successfully updated"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/admin/inst_upgrade.php:171
+#: c:\Apache2\htdocs\account22/admin/inst_upgrade.php:172
 msgid "Sql file"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/admin/inst_upgrade.php:171
+#: c:\Apache2\htdocs\account22/admin/inst_upgrade.php:172
 msgid "Install"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/admin/inst_upgrade.php:172
+#: c:\Apache2\htdocs\account22/admin/inst_upgrade.php:173
 msgid "Force upgrade"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/admin/inst_upgrade.php:189
+#: c:\Apache2\htdocs\account22/admin/inst_upgrade.php:190
 msgid "Installed"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/admin/inst_upgrade.php:195
+#: c:\Apache2\htdocs\account22/admin/inst_upgrade.php:196
 #, php-format
 msgid "Partially installed (%s)"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/admin/inst_upgrade.php:204
+#: c:\Apache2\htdocs\account22/admin/inst_upgrade.php:205
 msgid ""
 "Database upgrades marked as partially installed cannot be installed automatically.\n"
 "You have to clean database manually to enable them, or try to perform forced upgrade."
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/admin/inst_upgrade.php:208
+#: c:\Apache2\htdocs\account22/admin/inst_upgrade.php:209
 msgid "Upgrade system"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/admin/inst_upgrade.php:208
+#: c:\Apache2\htdocs\account22/admin/inst_upgrade.php:209
 msgid "Save database and perform upgrade"
 msgstr ""
 
@@ -1585,6 +1585,54 @@ msgstr ""
 msgid "Secondary Phone Number:"
 msgstr ""
 
+#: c:\Apache2\htdocs\account22/admin/tags.php:33
+msgid "Unspecified tag type"
+msgstr ""
+
+#: c:\Apache2\htdocs\account22/admin/tags.php:40
+msgid "Account Tags"
+msgstr ""
+
+#: c:\Apache2\htdocs\account22/admin/tags.php:44
+msgid "Dimension Tags"
+msgstr ""
+
+#: c:\Apache2\htdocs\account22/admin/tags.php:57
+msgid "The tag name cannot be empty."
+msgstr ""
+
+#: c:\Apache2\htdocs\account22/admin/tags.php:73
+msgid "Selected tag settings have been updated"
+msgstr ""
+
+#: c:\Apache2\htdocs\account22/admin/tags.php:78
+msgid "New tag has been added"
+msgstr ""
+
+#: c:\Apache2\htdocs\account22/admin/tags.php:94
+msgid "Cannot delete this tag because records have been created referring to it."
+msgstr ""
+
+#: c:\Apache2\htdocs\account22/admin/tags.php:109
+msgid "Selected tag has been deleted"
+msgstr ""
+
+#: c:\Apache2\htdocs\account22/admin/tags.php:128
+msgid "Tag Name"
+msgstr ""
+
+#: c:\Apache2\htdocs\account22/admin/tags.php:128
+msgid "Tag Description"
+msgstr ""
+
+#: c:\Apache2\htdocs\account22/admin/tags.php:165
+msgid "Tag Name:"
+msgstr ""
+
+#: c:\Apache2\htdocs\account22/admin/tags.php:166
+msgid "Tag Description:"
+msgstr ""
+
 #: c:\Apache2\htdocs\account22/admin/users.php:16
 msgid "Users"
 msgstr ""
@@ -1853,7 +1901,7 @@ msgid "Customer and Sales &Reports"
 msgstr ""
 
 #: c:\Apache2\htdocs\account22/applications/customers.php:62
-#: c:\Apache2\htdocs\account22/applications/dimensions.php:42
+#: c:\Apache2\htdocs\account22/applications/dimensions.php:35
 #: c:\Apache2\htdocs\account22/applications/generalledger.php:50
 #: c:\Apache2\htdocs\account22/applications/inventory.php:33
 #: c:\Apache2\htdocs\account22/applications/manufacturing.php:35
@@ -1914,6 +1962,10 @@ msgstr ""
 msgid "Dimension &Reports"
 msgstr ""
 
+#: c:\Apache2\htdocs\account22/applications/dimensions.php:36
+msgid "Dimension &Tags"
+msgstr ""
+
 #: c:\Apache2\htdocs\account22/applications/generalledger.php:17
 msgid "&Banking and General Ledger"
 msgstr ""
@@ -1947,7 +1999,7 @@ msgid "&Journal Inquiry"
 msgstr ""
 
 #: c:\Apache2\htdocs\account22/applications/generalledger.php:36
-msgid "GL Account &Inquiry"
+msgid "GL &Inquiry"
 msgstr ""
 
 #: c:\Apache2\htdocs\account22/applications/generalledger.php:38
@@ -1978,23 +2030,27 @@ msgstr ""
 msgid "&Quick Entries"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/applications/generalledger.php:56
-msgid "&Currencies"
+#: c:\Apache2\htdocs\account22/applications/generalledger.php:55
+msgid "Account &Tags"
 msgstr ""
 
 #: c:\Apache2\htdocs\account22/applications/generalledger.php:58
+msgid "&Currencies"
+msgstr ""
+
+#: c:\Apache2\htdocs\account22/applications/generalledger.php:60
 msgid "&Exchange Rates"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/applications/generalledger.php:61
+#: c:\Apache2\htdocs\account22/applications/generalledger.php:63
 msgid "&GL Accounts"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/applications/generalledger.php:63
+#: c:\Apache2\htdocs\account22/applications/generalledger.php:65
 msgid "GL Account &Groups"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/applications/generalledger.php:65
+#: c:\Apache2\htdocs\account22/applications/generalledger.php:67
 msgid "GL Account &Classes"
 msgstr ""
 
@@ -2250,122 +2306,125 @@ msgstr ""
 msgid "&Suppliers"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/dimensions/dimension_entry.php:26
+#: c:\Apache2\htdocs\account22/dimensions/dimension_entry.php:27
 msgid "Dimension Entry"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/dimensions/dimension_entry.php:46
+#: c:\Apache2\htdocs\account22/dimensions/dimension_entry.php:47
 msgid "The dimension has been entered."
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/dimensions/dimension_entry.php:57
+#: c:\Apache2\htdocs\account22/dimensions/dimension_entry.php:58
 msgid "The dimension has been updated."
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/dimensions/dimension_entry.php:67
+#: c:\Apache2\htdocs\account22/dimensions/dimension_entry.php:68
 msgid "The dimension has been deleted."
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/dimensions/dimension_entry.php:77
+#: c:\Apache2\htdocs\account22/dimensions/dimension_entry.php:78
 msgid "The dimension has been closed. There can be no more changes to it."
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/dimensions/dimension_entry.php:87
+#: c:\Apache2\htdocs\account22/dimensions/dimension_entry.php:88
 msgid "The dimension has been re-opened. "
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/dimensions/dimension_entry.php:97
+#: c:\Apache2\htdocs\account22/dimensions/dimension_entry.php:98
 msgid "Enter a &new dimension"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/dimensions/dimension_entry.php:99
+#: c:\Apache2\htdocs\account22/dimensions/dimension_entry.php:100
 msgid "&Select an existing dimension"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/dimensions/dimension_entry.php:115
+#: c:\Apache2\htdocs\account22/dimensions/dimension_entry.php:116
 msgid "The dimension reference must be entered."
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/dimensions/dimension_entry.php:122
+#: c:\Apache2\htdocs\account22/dimensions/dimension_entry.php:123
 #: c:\Apache2\htdocs\account22/gl/bank_transfer.php:146
-#: c:\Apache2\htdocs\account22/gl/gl_bank.php:136
 msgid "The entered reference is already in use."
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/dimensions/dimension_entry.php:130
+#: c:\Apache2\htdocs\account22/dimensions/dimension_entry.php:131
 msgid "The dimension name must be entered."
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/dimensions/dimension_entry.php:137
+#: c:\Apache2\htdocs\account22/dimensions/dimension_entry.php:138
 msgid "The date entered is in an invalid format."
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/dimensions/dimension_entry.php:144
+#: c:\Apache2\htdocs\account22/dimensions/dimension_entry.php:145
 msgid "The required by date entered is in an invalid format."
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/dimensions/dimension_entry.php:187
+#: c:\Apache2\htdocs\account22/dimensions/dimension_entry.php:190
 msgid "This dimension cannot be deleted because it has already been processed."
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/dimensions/dimension_entry.php:230
+#: c:\Apache2\htdocs\account22/dimensions/dimension_entry.php:234
 msgid "The dimension sent is not valid."
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/dimensions/dimension_entry.php:251
-#: c:\Apache2\htdocs\account22/dimensions/dimension_entry.php:257
+#: c:\Apache2\htdocs\account22/dimensions/dimension_entry.php:261
+#: c:\Apache2\htdocs\account22/dimensions/dimension_entry.php:268
 msgid "Dimension Reference:"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/dimensions/dimension_entry.php:264
+#: c:\Apache2\htdocs\account22/dimensions/dimension_entry.php:275
 #: c:\Apache2\htdocs\account22/dimensions/inquiry/search_dimensions.php:75
-#: c:\Apache2\htdocs\account22/dimensions/inquiry/search_dimensions.php:175
+#: c:\Apache2\htdocs\account22/dimensions/inquiry/search_dimensions.php:173
 #: c:\Apache2\htdocs\account22/dimensions/view/view_dimension.php:54
 #: c:\Apache2\htdocs\account22/gl/bank_account_reconcile.php:258
 msgid "Type"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/dimensions/dimension_entry.php:266
+#: c:\Apache2\htdocs\account22/dimensions/dimension_entry.php:277
 msgid "Start Date"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/dimensions/dimension_entry.php:268
+#: c:\Apache2\htdocs\account22/dimensions/dimension_entry.php:279
 msgid "Date Required By"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/dimensions/dimension_entry.php:275
+#: c:\Apache2\htdocs\account22/dimensions/dimension_entry.php:281
+msgid "Tags:"
+msgstr ""
+
+#: c:\Apache2\htdocs\account22/dimensions/dimension_entry.php:288
 msgid "This Dimension is closed."
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/dimensions/dimension_entry.php:280
+#: c:\Apache2\htdocs\account22/dimensions/dimension_entry.php:293
 msgid "Save changes to dimension"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/dimensions/dimension_entry.php:282
+#: c:\Apache2\htdocs\account22/dimensions/dimension_entry.php:295
 msgid "Re-open This Dimension"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/dimensions/dimension_entry.php:282
+#: c:\Apache2\htdocs\account22/dimensions/dimension_entry.php:295
 msgid "Mark this dimension as re-opened"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/dimensions/dimension_entry.php:284
+#: c:\Apache2\htdocs\account22/dimensions/dimension_entry.php:297
 msgid "Close This Dimension"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/dimensions/dimension_entry.php:284
+#: c:\Apache2\htdocs\account22/dimensions/dimension_entry.php:297
 msgid "Mark this dimension as closed"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/dimensions/dimension_entry.php:285
+#: c:\Apache2\htdocs\account22/dimensions/dimension_entry.php:298
 msgid "Delete This Dimension"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/dimensions/dimension_entry.php:285
+#: c:\Apache2\htdocs\account22/dimensions/dimension_entry.php:298
 msgid "Delete unused dimension"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/dimensions/dimension_entry.php:289
+#: c:\Apache2\htdocs\account22/dimensions/dimension_entry.php:302
 msgid "Add"
 msgstr ""
 
@@ -2402,22 +2461,22 @@ msgstr ""
 msgid "Only Open:"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/dimensions/inquiry/search_dimensions.php:176
+#: c:\Apache2\htdocs\account22/dimensions/inquiry/search_dimensions.php:174
 #: c:\Apache2\htdocs\account22/dimensions/view/view_dimension.php:54
 #: c:\Apache2\htdocs\account22/gl/bank_account_reconcile.php:261
 msgid "Date"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/dimensions/inquiry/search_dimensions.php:177
+#: c:\Apache2\htdocs\account22/dimensions/inquiry/search_dimensions.php:175
 #: c:\Apache2\htdocs\account22/dimensions/view/view_dimension.php:54
 msgid "Due Date"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/dimensions/inquiry/search_dimensions.php:179
+#: c:\Apache2\htdocs\account22/dimensions/inquiry/search_dimensions.php:177
 msgid "Balance"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/dimensions/inquiry/search_dimensions.php:188
+#: c:\Apache2\htdocs\account22/dimensions/inquiry/search_dimensions.php:186
 msgid "Marked dimensions are overdue."
 msgstr ""
 
@@ -2451,7 +2510,6 @@ msgstr ""
 
 #: c:\Apache2\htdocs\account22/gl/bank_account_reconcile.php:35
 #: c:\Apache2\htdocs\account22/gl/bank_transfer.php:30
-#: c:\Apache2\htdocs\account22/gl/gl_bank.php:43
 msgid "There are no bank accounts defined in the system."
 msgstr ""
 
@@ -2571,7 +2629,6 @@ msgid "The Bank Charge Account has not been set in System and General GL Setup."
 msgstr ""
 
 #: c:\Apache2\htdocs\account22/gl/bank_transfer.php:139
-#: c:\Apache2\htdocs\account22/gl/gl_bank.php:130
 msgid "You must enter a reference."
 msgstr ""
 
@@ -2652,7 +2709,6 @@ msgid "Budget Entry"
 msgstr ""
 
 #: c:\Apache2\htdocs\account22/gl/gl_budget.php:24
-#: c:\Apache2\htdocs\account22/gl/manage/gl_accounts.php:22
 msgid "There are no account groups defined. Please define at least one account group before entering accounts."
 msgstr ""
 
@@ -2665,18 +2721,16 @@ msgid "The Budget has been deleted."
 msgstr ""
 
 #: c:\Apache2\htdocs\account22/gl/gl_budget.php:121
-#: c:\Apache2\htdocs\account22/gl/manage/gl_accounts.php:259
-#: c:\Apache2\htdocs\account22/gl/manage/gl_accounts.php:268
 msgid "Account Code:"
 msgstr ""
 
 #: c:\Apache2\htdocs\account22/gl/gl_budget.php:128
 #: c:\Apache2\htdocs\account22/gl/gl_budget.php:129
 #: c:\Apache2\htdocs\account22/gl/gl_budget.php:133
-#: c:\Apache2\htdocs\account22/gl/inquiry/gl_account_inquiry.php:73
-#: c:\Apache2\htdocs\account22/gl/inquiry/gl_account_inquiry.php:75
-#: c:\Apache2\htdocs\account22/gl/inquiry/gl_account_inquiry.php:107
-#: c:\Apache2\htdocs\account22/gl/inquiry/gl_account_inquiry.php:110
+#: c:\Apache2\htdocs\account22/gl/inquiry/gl_account_inquiry.php:80
+#: c:\Apache2\htdocs\account22/gl/inquiry/gl_account_inquiry.php:82
+#: c:\Apache2\htdocs\account22/gl/inquiry/gl_account_inquiry.php:135
+#: c:\Apache2\htdocs\account22/gl/inquiry/gl_account_inquiry.php:137
 msgid "Dimension"
 msgstr ""
 
@@ -2692,7 +2746,7 @@ msgstr ""
 
 #: c:\Apache2\htdocs\account22/gl/gl_budget.php:148
 #: c:\Apache2\htdocs\account22/gl/gl_budget.php:150
-#: c:\Apache2\htdocs\account22/gl/inquiry/journal_inquiry.php:151
+#: c:\Apache2\htdocs\account22/gl/inquiry/journal_inquiry.php:160
 #: c:\Apache2\htdocs\account22/gl/inquiry/tax_inquiry.php:85
 msgid "Amount"
 msgstr ""
@@ -2716,10 +2770,6 @@ msgstr ""
 msgid "Modifying Journal Transaction # %d."
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/gl/gl_journal.php:34
-msgid "Modifying Journal Transaction"
-msgstr ""
-
 #: c:\Apache2\htdocs\account22/gl/gl_journal.php:36
 msgid "Journal Entry"
 msgstr ""
@@ -2734,8 +2784,7 @@ msgid "&View this Journal Entry"
 msgstr ""
 
 #: c:\Apache2\htdocs\account22/gl/gl_journal.php:59
-#: c:\Apache2\htdocs\account22/gl/gl_journal.php:85
-msgid "Entry &New Journal Entry"
+msgid "Enter &New Journal Entry"
 msgstr ""
 
 #: c:\Apache2\htdocs\account22/gl/gl_journal.php:67
@@ -2750,48 +2799,52 @@ msgstr ""
 msgid "You can edit directly only journal entries created via Journal Entry page."
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/gl/gl_journal.php:139
+#: c:\Apache2\htdocs\account22/gl/gl_journal.php:85
+msgid "Entry &New Journal Entry"
+msgstr ""
+
+#: c:\Apache2\htdocs\account22/gl/gl_journal.php:141
 msgid "You must enter at least one journal line."
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/gl/gl_journal.php:145
+#: c:\Apache2\htdocs\account22/gl/gl_journal.php:147
 msgid "The journal must balance (debits equal to credits) before it can be processed."
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/gl/gl_journal.php:207
-#: c:\Apache2\htdocs\account22/gl/gl_journal.php:214
+#: c:\Apache2\htdocs\account22/gl/gl_journal.php:209
+#: c:\Apache2\htdocs\account22/gl/gl_journal.php:216
 msgid "Dimension is closed."
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/gl/gl_journal.php:221
+#: c:\Apache2\htdocs\account22/gl/gl_journal.php:223
 msgid "You must enter either a debit amount or a credit amount."
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/gl/gl_journal.php:228
+#: c:\Apache2\htdocs\account22/gl/gl_journal.php:230
 msgid "The debit amount entered is not a valid number or is less than zero."
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/gl/gl_journal.php:233
+#: c:\Apache2\htdocs\account22/gl/gl_journal.php:235
 msgid "The credit amount entered is not a valid number or is less than zero."
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/gl/gl_journal.php:239
+#: c:\Apache2\htdocs\account22/gl/gl_journal.php:241
 msgid "Cannot post to GL account used by more than one tax type."
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/gl/gl_journal.php:246
+#: c:\Apache2\htdocs\account22/gl/gl_journal.php:248
 msgid "You cannot make a journal entry for a bank account. Please use one of the banking functions for bank transactions."
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/gl/gl_journal.php:325
+#: c:\Apache2\htdocs\account22/gl/gl_journal.php:327
 msgid "Rows"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/gl/gl_journal.php:331
+#: c:\Apache2\htdocs\account22/gl/gl_journal.php:333
 msgid "Process Journal Entry"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/gl/gl_journal.php:332
+#: c:\Apache2\htdocs\account22/gl/gl_journal.php:334
 msgid "Process journal entry only if debits equal to credits"
 msgstr ""
 
@@ -2800,29 +2853,41 @@ msgid "Bank Statement"
 msgstr ""
 
 #: c:\Apache2\htdocs\account22/gl/inquiry/bank_inquiry.php:85
-#: c:\Apache2\htdocs\account22/gl/inquiry/gl_account_inquiry.php:129
+#: c:\Apache2\htdocs\account22/gl/inquiry/gl_account_inquiry.php:163
 msgid "Opening Balance"
 msgstr ""
 
 #: c:\Apache2\htdocs\account22/gl/inquiry/bank_inquiry.php:124
-#: c:\Apache2\htdocs\account22/gl/inquiry/gl_account_inquiry.php:171
+#: c:\Apache2\htdocs\account22/gl/inquiry/gl_account_inquiry.php:212
 #: c:\Apache2\htdocs\account22/gl/inquiry/gl_trial_balance.php:145
 msgid "Ending Balance"
 msgstr ""
 
 #: c:\Apache2\htdocs\account22/gl/inquiry/gl_account_inquiry.php:30
-msgid "General Ledger Account Inquiry"
+msgid "General Ledger Inquiry"
+msgstr ""
+
+#: c:\Apache2\htdocs\account22/gl/inquiry/gl_account_inquiry.php:84
+msgid "Amount min:"
+msgstr ""
+
+#: c:\Apache2\htdocs\account22/gl/inquiry/gl_account_inquiry.php:85
+msgid "Amount max:"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/gl/inquiry/gl_account_inquiry.php:108
-#: c:\Apache2\htdocs\account22/gl/inquiry/gl_account_inquiry.php:111
-#: c:\Apache2\htdocs\account22/gl/inquiry/gl_account_inquiry.php:114
-#: c:\Apache2\htdocs\account22/gl/inquiry/journal_inquiry.php:152
+#: c:\Apache2\htdocs\account22/gl/inquiry/gl_account_inquiry.php:130
+#: c:\Apache2\htdocs\account22/gl/inquiry/gl_trial_balance.php:63
+msgid "Account"
+msgstr ""
+
+#: c:\Apache2\htdocs\account22/gl/inquiry/gl_account_inquiry.php:142
+#: c:\Apache2\htdocs\account22/gl/inquiry/gl_account_inquiry.php:144
+#: c:\Apache2\htdocs\account22/gl/inquiry/journal_inquiry.php:161
 msgid "Memo"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/gl/inquiry/gl_account_inquiry.php:179
-msgid "No general ledger transactions have been created for this account on the selected dates."
+#: c:\Apache2\htdocs\account22/gl/inquiry/gl_account_inquiry.php:221
+msgid "No general ledger transactions have been created for the specified criteria."
 msgstr ""
 
 #: c:\Apache2\htdocs\account22/gl/inquiry/gl_trial_balance.php:27
@@ -2837,10 +2902,6 @@ msgstr ""
 msgid "Only balances"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/gl/inquiry/gl_trial_balance.php:63
-msgid "Account"
-msgstr ""
-
 #: c:\Apache2\htdocs\account22/gl/inquiry/gl_trial_balance.php:64
 #: c:\Apache2\htdocs\account22/gl/manage/bank_accounts.php:115
 msgid "Account Name"
@@ -2866,11 +2927,11 @@ msgstr ""
 msgid "Show closed:"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/gl/inquiry/journal_inquiry.php:149
+#: c:\Apache2\htdocs\account22/gl/inquiry/journal_inquiry.php:158
 msgid "Trans #"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/gl/inquiry/journal_inquiry.php:153
+#: c:\Apache2\htdocs\account22/gl/inquiry/journal_inquiry.php:162
 msgid "User"
 msgstr ""
 
@@ -3025,76 +3086,76 @@ msgstr ""
 msgid "New currency has been added"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/gl/manage/currencies.php:95
+#: c:\Apache2\htdocs\account22/gl/manage/currencies.php:97
 msgid "Cannot delete this currency, because customer accounts have been created referring to this currency."
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/gl/manage/currencies.php:104
+#: c:\Apache2\htdocs\account22/gl/manage/currencies.php:106
 msgid "Cannot delete this currency, because supplier accounts have been created referring to this currency."
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/gl/manage/currencies.php:113
+#: c:\Apache2\htdocs\account22/gl/manage/currencies.php:115
 msgid "Cannot delete this currency, because the company preferences uses this currency."
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/gl/manage/currencies.php:123
+#: c:\Apache2\htdocs\account22/gl/manage/currencies.php:125
 msgid "Cannot delete this currency, because thre are bank accounts that use this currency."
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/gl/manage/currencies.php:138
+#: c:\Apache2\htdocs\account22/gl/manage/currencies.php:140
 msgid "Selected currency has been deleted"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/gl/manage/currencies.php:153
+#: c:\Apache2\htdocs\account22/gl/manage/currencies.php:155
 msgid "Abbreviation"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/gl/manage/currencies.php:153
+#: c:\Apache2\htdocs\account22/gl/manage/currencies.php:155
 msgid "Symbol"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/gl/manage/currencies.php:153
+#: c:\Apache2\htdocs\account22/gl/manage/currencies.php:155
 msgid "Currency Name"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/gl/manage/currencies.php:154
+#: c:\Apache2\htdocs\account22/gl/manage/currencies.php:156
 msgid "Hundredths name"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/gl/manage/currencies.php:154
+#: c:\Apache2\htdocs\account22/gl/manage/currencies.php:156
 msgid "Country"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/gl/manage/currencies.php:154
+#: c:\Apache2\htdocs\account22/gl/manage/currencies.php:156
 msgid "Auto update"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/gl/manage/currencies.php:189
+#: c:\Apache2\htdocs\account22/gl/manage/currencies.php:191
 msgid "The marked currency is the home currency which cannot be deleted."
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/gl/manage/currencies.php:215
-#: c:\Apache2\htdocs\account22/gl/manage/currencies.php:220
+#: c:\Apache2\htdocs\account22/gl/manage/currencies.php:217
+#: c:\Apache2\htdocs\account22/gl/manage/currencies.php:222
 msgid "Currency Abbreviation:"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/gl/manage/currencies.php:223
+#: c:\Apache2\htdocs\account22/gl/manage/currencies.php:225
 msgid "Currency Symbol:"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/gl/manage/currencies.php:224
+#: c:\Apache2\htdocs\account22/gl/manage/currencies.php:226
 msgid "Currency Name:"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/gl/manage/currencies.php:225
+#: c:\Apache2\htdocs\account22/gl/manage/currencies.php:227
 msgid "Hundredths Name:"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/gl/manage/currencies.php:226
+#: c:\Apache2\htdocs\account22/gl/manage/currencies.php:228
 msgid "Country:"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/gl/manage/currencies.php:227
+#: c:\Apache2\htdocs\account22/gl/manage/currencies.php:229
 msgid "Automatic exchange rate update:"
 msgstr ""
 
@@ -3159,79 +3220,83 @@ msgstr ""
 msgid "The account code must be numeric."
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/gl/manage/gl_accounts.php:80
+#: c:\Apache2\htdocs\account22/gl/manage/gl_accounts.php:86
 msgid "Account data has been updated."
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/gl/manage/gl_accounts.php:88
+#: c:\Apache2\htdocs\account22/gl/manage/gl_accounts.php:95
 msgid "New account has been added."
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/gl/manage/gl_accounts.php:108
+#: c:\Apache2\htdocs\account22/gl/manage/gl_accounts.php:117
 msgid "Cannot delete this account because transactions have been created using this account."
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/gl/manage/gl_accounts.php:129
+#: c:\Apache2\htdocs\account22/gl/manage/gl_accounts.php:138
 msgid "Cannot delete this account because it is used as one of the company default GL accounts."
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/gl/manage/gl_accounts.php:139
+#: c:\Apache2\htdocs\account22/gl/manage/gl_accounts.php:148
 msgid "Cannot delete this account because it is used by a bank account."
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/gl/manage/gl_accounts.php:153
+#: c:\Apache2\htdocs\account22/gl/manage/gl_accounts.php:162
 msgid "Cannot delete this account because it is used by one or more Items."
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/gl/manage/gl_accounts.php:163
+#: c:\Apache2\htdocs\account22/gl/manage/gl_accounts.php:172
 msgid "Cannot delete this account because it is used by one or more Taxes."
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/gl/manage/gl_accounts.php:177
+#: c:\Apache2\htdocs\account22/gl/manage/gl_accounts.php:186
 msgid "Cannot delete this account because it is used by one or more Customer Branches."
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/gl/manage/gl_accounts.php:190
+#: c:\Apache2\htdocs\account22/gl/manage/gl_accounts.php:199
 msgid "Cannot delete this account because it is used by one or more suppliers."
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/gl/manage/gl_accounts.php:201
+#: c:\Apache2\htdocs\account22/gl/manage/gl_accounts.php:210
 msgid "Cannot delete this account because it is used by one or more Quick Entry Lines."
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/gl/manage/gl_accounts.php:217
+#: c:\Apache2\htdocs\account22/gl/manage/gl_accounts.php:228
 msgid "Selected account has been deleted"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/gl/manage/gl_accounts.php:232
+#: c:\Apache2\htdocs\account22/gl/manage/gl_accounts.php:243
 msgid "New account"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/gl/manage/gl_accounts.php:271
+#: c:\Apache2\htdocs\account22/gl/manage/gl_accounts.php:289
 msgid "Account Code 2:"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/gl/manage/gl_accounts.php:273
+#: c:\Apache2\htdocs\account22/gl/manage/gl_accounts.php:291
 msgid "Account Name:"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/gl/manage/gl_accounts.php:275
+#: c:\Apache2\htdocs\account22/gl/manage/gl_accounts.php:293
 msgid "Account Group:"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/gl/manage/gl_accounts.php:277
+#: c:\Apache2\htdocs\account22/gl/manage/gl_accounts.php:295
+msgid "Account Tags:"
+msgstr ""
+
+#: c:\Apache2\htdocs\account22/gl/manage/gl_accounts.php:297
 msgid "Account status:"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/gl/manage/gl_accounts.php:282
+#: c:\Apache2\htdocs\account22/gl/manage/gl_accounts.php:302
 msgid "Add Account"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/gl/manage/gl_accounts.php:286
+#: c:\Apache2\htdocs\account22/gl/manage/gl_accounts.php:306
 msgid "Update Account"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/gl/manage/gl_accounts.php:287
+#: c:\Apache2\htdocs\account22/gl/manage/gl_accounts.php:307
 msgid "Delete account"
 msgstr ""
 
@@ -3272,7 +3337,7 @@ msgid "Class Name"
 msgstr ""
 
 #: c:\Apache2\htdocs\account22/gl/manage/gl_account_classes.php:113
-#: c:\Apache2\htdocs\account22/gl/manage/gl_account_types.php:129
+#: c:\Apache2\htdocs\account22/gl/manage/gl_account_types.php:131
 msgid "Class Type"
 msgstr ""
 
@@ -3291,7 +3356,7 @@ msgid "Class Name:"
 msgstr ""
 
 #: c:\Apache2\htdocs\account22/gl/manage/gl_account_classes.php:174
-#: c:\Apache2\htdocs\account22/gl/manage/gl_account_types.php:188
+#: c:\Apache2\htdocs\account22/gl/manage/gl_account_types.php:190
 msgid "Class Type:"
 msgstr ""
 
@@ -3319,32 +3384,32 @@ msgstr ""
 msgid "New account type has been added"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/gl/manage/gl_account_types.php:86
+#: c:\Apache2\htdocs\account22/gl/manage/gl_account_types.php:88
 msgid "Cannot delete this account group because GL accounts have been created referring to it."
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/gl/manage/gl_account_types.php:96
+#: c:\Apache2\htdocs\account22/gl/manage/gl_account_types.php:98
 msgid "Cannot delete this account group because GL account groups have been created referring to it."
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/gl/manage/gl_account_types.php:112
+#: c:\Apache2\htdocs\account22/gl/manage/gl_account_types.php:114
 msgid "Selected account group has been deleted"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/gl/manage/gl_account_types.php:129
+#: c:\Apache2\htdocs\account22/gl/manage/gl_account_types.php:131
 msgid "ID"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/gl/manage/gl_account_types.php:129
+#: c:\Apache2\htdocs\account22/gl/manage/gl_account_types.php:131
 msgid "Subgroup Of"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/gl/manage/gl_account_types.php:180
-#: c:\Apache2\htdocs\account22/gl/manage/gl_account_types.php:183
+#: c:\Apache2\htdocs\account22/gl/manage/gl_account_types.php:182
+#: c:\Apache2\htdocs\account22/gl/manage/gl_account_types.php:185
 msgid "ID:"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/gl/manage/gl_account_types.php:186
+#: c:\Apache2\htdocs\account22/gl/manage/gl_account_types.php:188
 msgid "Subgroup Of:"
 msgstr ""
 
@@ -3492,16 +3557,24 @@ msgstr ""
 msgid "Item Amounts are Shown in :"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/gl/view/gl_deposit_view.php:97
-#: c:\Apache2\htdocs\account22/gl/view/gl_payment_view.php:96
-#: c:\Apache2\htdocs\account22/gl/view/gl_trans_view.php:69
+#: c:\Apache2\htdocs\account22/gl/view/gl_deposit_view.php:99
+#: c:\Apache2\htdocs\account22/gl/view/gl_deposit_view.php:102
+#: c:\Apache2\htdocs\account22/gl/view/gl_deposit_view.php:105
+#: c:\Apache2\htdocs\account22/gl/view/gl_payment_view.php:98
+#: c:\Apache2\htdocs\account22/gl/view/gl_payment_view.php:101
+#: c:\Apache2\htdocs\account22/gl/view/gl_payment_view.php:104
 #: c:\Apache2\htdocs\account22/gl/view/gl_trans_view.php:72
 #: c:\Apache2\htdocs\account22/gl/view/gl_trans_view.php:75
+#: c:\Apache2\htdocs\account22/gl/view/gl_trans_view.php:78
 msgid "Account Code"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/gl/view/gl_deposit_view.php:97
-#: c:\Apache2\htdocs\account22/gl/view/gl_payment_view.php:96
+#: c:\Apache2\htdocs\account22/gl/view/gl_deposit_view.php:99
+#: c:\Apache2\htdocs\account22/gl/view/gl_deposit_view.php:102
+#: c:\Apache2\htdocs\account22/gl/view/gl_deposit_view.php:105
+#: c:\Apache2\htdocs\account22/gl/view/gl_payment_view.php:98
+#: c:\Apache2\htdocs\account22/gl/view/gl_payment_view.php:101
+#: c:\Apache2\htdocs\account22/gl/view/gl_payment_view.php:104
 msgid "Account Description"
 msgstr ""
 
@@ -3542,15 +3615,15 @@ msgstr ""
 msgid "The script must be called with a valid transaction type and transaction number to review the general ledger postings for."
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/gl/view/gl_trans_view.php:60
+#: c:\Apache2\htdocs\account22/gl/view/gl_trans_view.php:63
 msgid "No general ledger transactions have been created for"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/gl/view/gl_trans_view.php:60
+#: c:\Apache2\htdocs\account22/gl/view/gl_trans_view.php:63
 msgid "number"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/gl/view/gl_trans_view.php:109
+#: c:\Apache2\htdocs\account22/gl/view/gl_trans_view.php:112
 msgid "This transaction has been voided."
 msgstr ""
 
@@ -3646,7 +3719,6 @@ msgstr ""
 #: c:\Apache2\htdocs\account22/inventory/purchasing_data.php:117
 #: c:\Apache2\htdocs\account22/inventory/reorder_level.php:43
 #: c:\Apache2\htdocs\account22/inventory/inquiry/stock_movements.php:49
-#: c:\Apache2\htdocs\account22/inventory/inquiry/stock_status.php:41
 msgid "Item:"
 msgstr ""
 
@@ -3668,7 +3740,6 @@ msgstr ""
 
 #: c:\Apache2\htdocs\account22/inventory/prices.php:27
 #: c:\Apache2\htdocs\account22/inventory/inquiry/stock_movements.php:30
-#: c:\Apache2\htdocs\account22/inventory/inquiry/stock_status.php:34
 msgid "There are no items defined in the system."
 msgstr ""
 
@@ -3813,19 +3884,15 @@ msgid "There are no inventory items defined in the system (Purchased or manufact
 msgstr ""
 
 #: c:\Apache2\htdocs\account22/inventory/reorder_level.php:57
-#: c:\Apache2\htdocs\account22/inventory/inquiry/stock_status.php:65
-#: c:\Apache2\htdocs\account22/inventory/inquiry/stock_status.php:69
 msgid "Location"
 msgstr ""
 
 #: c:\Apache2\htdocs\account22/inventory/reorder_level.php:57
 #: c:\Apache2\htdocs\account22/inventory/inquiry/stock_movements.php:78
-#: c:\Apache2\htdocs\account22/inventory/inquiry/stock_status.php:69
 msgid "Quantity On Hand"
 msgstr ""
 
 #: c:\Apache2\htdocs\account22/inventory/reorder_level.php:57
-#: c:\Apache2\htdocs\account22/inventory/inquiry/stock_status.php:69
 msgid "Re-Order Level"
 msgstr ""
 
@@ -4489,35 +4556,35 @@ msgstr ""
 msgid "Select documents"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/manufacturing/search_work_orders.php:119
+#: c:\Apache2\htdocs\account22/manufacturing/search_work_orders.php:117
 msgid "Release"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/manufacturing/search_work_orders.php:122
+#: c:\Apache2\htdocs\account22/manufacturing/search_work_orders.php:120
 msgid "Issue"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/manufacturing/search_work_orders.php:129
+#: c:\Apache2\htdocs\account22/manufacturing/search_work_orders.php:127
 msgid "Produce"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/manufacturing/search_work_orders.php:142
+#: c:\Apache2\htdocs\account22/manufacturing/search_work_orders.php:140
 msgid "Costs"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/manufacturing/search_work_orders.php:214
+#: c:\Apache2\htdocs\account22/manufacturing/search_work_orders.php:212
 msgid "Required"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/manufacturing/search_work_orders.php:215
+#: c:\Apache2\htdocs\account22/manufacturing/search_work_orders.php:213
 msgid "Manufactured"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/manufacturing/search_work_orders.php:217
+#: c:\Apache2\htdocs\account22/manufacturing/search_work_orders.php:215
 msgid "Required By"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/manufacturing/search_work_orders.php:226
+#: c:\Apache2\htdocs\account22/manufacturing/search_work_orders.php:224
 msgid "Marked orders are overdue."
 msgstr ""
 
@@ -5234,14 +5301,17 @@ msgid "Enter Another Credit Note"
 msgstr ""
 
 #: c:\Apache2\htdocs\account22/purchasing/supplier_credit.php:49
+#: c:\Apache2\htdocs\account22/purchasing/supplier_invoice.php:52
 msgid "Add an Attachment"
 msgstr ""
 
 #: c:\Apache2\htdocs\account22/purchasing/supplier_credit.php:104
+#: c:\Apache2\htdocs\account22/purchasing/supplier_invoice.php:106
 msgid "The account code entered is not a valid code, this line cannot be added to the transaction."
 msgstr ""
 
 #: c:\Apache2\htdocs\account22/purchasing/supplier_credit.php:114
+#: c:\Apache2\htdocs\account22/purchasing/supplier_invoice.php:116
 msgid "The amount entered is not numeric. This line cannot be added to the transaction."
 msgstr ""
 
@@ -5262,6 +5332,7 @@ msgid "The credit note as entered cannot be processed because the date entered i
 msgstr ""
 
 #: c:\Apache2\htdocs\account22/purchasing/supplier_credit.php:184
+#: c:\Apache2\htdocs\account22/purchasing/supplier_invoice.php:184
 msgid "The invoice as entered cannot be processed because the due date is in an incorrect format."
 msgstr ""
 
@@ -5461,19 +5532,19 @@ msgstr ""
 msgid "Show Settled Items:"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/purchasing/allocations/supplier_allocation_main.php:71
+#: c:\Apache2\htdocs\account22/purchasing/allocations/supplier_allocation_main.php:70
 msgid "Allocate"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/purchasing/allocations/supplier_allocation_main.php:95
+#: c:\Apache2\htdocs\account22/purchasing/allocations/supplier_allocation_main.php:94
 msgid "Transaction Type"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/purchasing/allocations/supplier_allocation_main.php:102
+#: c:\Apache2\htdocs\account22/purchasing/allocations/supplier_allocation_main.php:101
 msgid "Left to Allocate"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/purchasing/allocations/supplier_allocation_main.php:112
+#: c:\Apache2\htdocs\account22/purchasing/allocations/supplier_allocation_main.php:111
 msgid "Marked items are settled."
 msgstr ""
 
@@ -5486,27 +5557,27 @@ msgstr ""
 msgid "#:"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/purchasing/inquiry/po_search.php:94
+#: c:\Apache2\htdocs\account22/purchasing/inquiry/po_search.php:93
 msgid "Receive"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/purchasing/inquiry/po_search.php:174
-#: c:\Apache2\htdocs\account22/purchasing/inquiry/po_search_completed.php:158
-#: c:\Apache2\htdocs\account22/purchasing/inquiry/supplier_inquiry.php:214
+#: c:\Apache2\htdocs\account22/purchasing/inquiry/po_search.php:173
+#: c:\Apache2\htdocs\account22/purchasing/inquiry/po_search_completed.php:157
+#: c:\Apache2\htdocs\account22/purchasing/inquiry/supplier_inquiry.php:213
 msgid "Supplier's Reference"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/purchasing/inquiry/po_search.php:175
-#: c:\Apache2\htdocs\account22/purchasing/inquiry/po_search_completed.php:159
+#: c:\Apache2\htdocs\account22/purchasing/inquiry/po_search.php:174
+#: c:\Apache2\htdocs\account22/purchasing/inquiry/po_search_completed.php:158
 msgid "Order Date"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/purchasing/inquiry/po_search.php:177
-#: c:\Apache2\htdocs\account22/purchasing/inquiry/po_search_completed.php:161
+#: c:\Apache2\htdocs\account22/purchasing/inquiry/po_search.php:176
+#: c:\Apache2\htdocs\account22/purchasing/inquiry/po_search_completed.php:160
 msgid "Order Total"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/purchasing/inquiry/po_search.php:188
+#: c:\Apache2\htdocs\account22/purchasing/inquiry/po_search.php:187
 msgid "Marked orders have overdue items."
 msgstr ""
 
@@ -5531,20 +5602,20 @@ msgstr ""
 msgid "show settled:"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/purchasing/inquiry/supplier_allocation_inquiry.php:100
+#: c:\Apache2\htdocs\account22/purchasing/inquiry/supplier_allocation_inquiry.php:99
 msgid "Allocations"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/purchasing/inquiry/supplier_allocation_inquiry.php:180
+#: c:\Apache2\htdocs\account22/purchasing/inquiry/supplier_allocation_inquiry.php:179
 msgid "Supp Reference"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/purchasing/inquiry/supplier_allocation_inquiry.php:186
+#: c:\Apache2\htdocs\account22/purchasing/inquiry/supplier_allocation_inquiry.php:185
 msgid "Allocated"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/purchasing/inquiry/supplier_allocation_inquiry.php:198
-#: c:\Apache2\htdocs\account22/purchasing/inquiry/supplier_inquiry.php:234
+#: c:\Apache2\htdocs\account22/purchasing/inquiry/supplier_allocation_inquiry.php:197
+#: c:\Apache2\htdocs\account22/purchasing/inquiry/supplier_inquiry.php:233
 msgid "Marked items are overdue."
 msgstr ""
 
@@ -5556,29 +5627,29 @@ msgstr ""
 msgid "Select a supplier:"
 msgstr ""
 
+#: c:\Apache2\htdocs\account22/purchasing/inquiry/supplier_inquiry.php:67
 #: c:\Apache2\htdocs\account22/purchasing/inquiry/supplier_inquiry.php:68
 #: c:\Apache2\htdocs\account22/purchasing/inquiry/supplier_inquiry.php:69
-#: c:\Apache2\htdocs\account22/purchasing/inquiry/supplier_inquiry.php:70
 msgid "Days"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/purchasing/inquiry/supplier_inquiry.php:70
+#: c:\Apache2\htdocs\account22/purchasing/inquiry/supplier_inquiry.php:69
 msgid "Over"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/purchasing/inquiry/supplier_inquiry.php:74
+#: c:\Apache2\htdocs\account22/purchasing/inquiry/supplier_inquiry.php:73
 msgid "Terms"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/purchasing/inquiry/supplier_inquiry.php:74
+#: c:\Apache2\htdocs\account22/purchasing/inquiry/supplier_inquiry.php:73
 msgid "Current"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/purchasing/inquiry/supplier_inquiry.php:75
+#: c:\Apache2\htdocs\account22/purchasing/inquiry/supplier_inquiry.php:74
 msgid "Total Balance"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/purchasing/inquiry/supplier_inquiry.php:129
+#: c:\Apache2\htdocs\account22/purchasing/inquiry/supplier_inquiry.php:128
 msgid "Credit This"
 msgstr ""
 
@@ -6316,32 +6387,32 @@ msgstr ""
 msgid "GL Account Transactions"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/reporting/rep705.php:147
-#: c:\Apache2\htdocs\account22/reporting/rep705.php:159
-#: c:\Apache2\htdocs\account22/reporting/rep705.php:169
-#: c:\Apache2\htdocs\account22/reporting/reports_main.php:231
-#: c:\Apache2\htdocs\account22/reporting/reports_main.php:274
-#: c:\Apache2\htdocs\account22/reporting/reports_main.php:312
+#: c:\Apache2\htdocs\account22/reporting/rep705.php:151
+#: c:\Apache2\htdocs\account22/reporting/rep705.php:163
+#: c:\Apache2\htdocs\account22/reporting/rep705.php:173
+#: c:\Apache2\htdocs\account22/reporting/reports_main.php:232
+#: c:\Apache2\htdocs\account22/reporting/reports_main.php:275
+#: c:\Apache2\htdocs\account22/reporting/reports_main.php:313
 msgid "Year"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/reporting/rep705.php:153
-#: c:\Apache2\htdocs\account22/reporting/rep705.php:163
-#: c:\Apache2\htdocs\account22/reporting/rep705.php:171
+#: c:\Apache2\htdocs\account22/reporting/rep705.php:157
+#: c:\Apache2\htdocs\account22/reporting/rep705.php:167
+#: c:\Apache2\htdocs\account22/reporting/rep705.php:175
 msgid "Info"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/reporting/rep705.php:153
-#: c:\Apache2\htdocs\account22/reporting/rep705.php:163
-#: c:\Apache2\htdocs\account22/reporting/rep705.php:171
+#: c:\Apache2\htdocs\account22/reporting/rep705.php:157
+#: c:\Apache2\htdocs\account22/reporting/rep705.php:167
+#: c:\Apache2\htdocs\account22/reporting/rep705.php:175
 msgid "Amounts in thousands"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/reporting/rep705.php:175
+#: c:\Apache2\htdocs\account22/reporting/rep705.php:179
 msgid "Annual Expense Breakdown"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/reporting/rep705.php:361
+#: c:\Apache2\htdocs\account22/reporting/rep705.php:365
 #: c:\Apache2\htdocs\account22/reporting/rep706.php:319
 #: c:\Apache2\htdocs\account22/reporting/rep706.php:325
 #: c:\Apache2\htdocs\account22/reporting/rep707.php:336
@@ -6422,24 +6493,24 @@ msgstr ""
 msgid "Net Tax"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/reporting/rep710.php:76
+#: c:\Apache2\htdocs\account22/reporting/rep710.php:75
 msgid "Time"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/reporting/rep710.php:76
+#: c:\Apache2\htdocs\account22/reporting/rep710.php:75
 msgid "Trans Date"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/reporting/rep710.php:77
+#: c:\Apache2\htdocs\account22/reporting/rep710.php:76
 msgid "Action"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/reporting/rep710.php:88
-#: c:\Apache2\htdocs\account22/reporting/reports_main.php:341
+#: c:\Apache2\htdocs\account22/reporting/rep710.php:87
+#: c:\Apache2\htdocs\account22/reporting/reports_main.php:342
 msgid "Audit Trail"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/reporting/rep710.php:108
+#: c:\Apache2\htdocs\account22/reporting/rep710.php:107
 msgid "Changed"
 msgstr ""
 
@@ -6492,23 +6563,23 @@ msgstr ""
 #: c:\Apache2\htdocs\account22/reporting/reports_main.php:203
 #: c:\Apache2\htdocs\account22/reporting/reports_main.php:209
 #: c:\Apache2\htdocs\account22/reporting/reports_main.php:215
-#: c:\Apache2\htdocs\account22/reporting/reports_main.php:228
-#: c:\Apache2\htdocs\account22/reporting/reports_main.php:234
-#: c:\Apache2\htdocs\account22/reporting/reports_main.php:242
-#: c:\Apache2\htdocs\account22/reporting/reports_main.php:251
-#: c:\Apache2\htdocs\account22/reporting/reports_main.php:260
-#: c:\Apache2\htdocs\account22/reporting/reports_main.php:271
-#: c:\Apache2\htdocs\account22/reporting/reports_main.php:276
-#: c:\Apache2\htdocs\account22/reporting/reports_main.php:283
-#: c:\Apache2\htdocs\account22/reporting/reports_main.php:291
-#: c:\Apache2\htdocs\account22/reporting/reports_main.php:299
-#: c:\Apache2\htdocs\account22/reporting/reports_main.php:309
-#: c:\Apache2\htdocs\account22/reporting/reports_main.php:313
-#: c:\Apache2\htdocs\account22/reporting/reports_main.php:319
-#: c:\Apache2\htdocs\account22/reporting/reports_main.php:326
-#: c:\Apache2\htdocs\account22/reporting/reports_main.php:333
-#: c:\Apache2\htdocs\account22/reporting/reports_main.php:340
-#: c:\Apache2\htdocs\account22/reporting/reports_main.php:346
+#: c:\Apache2\htdocs\account22/reporting/reports_main.php:229
+#: c:\Apache2\htdocs\account22/reporting/reports_main.php:235
+#: c:\Apache2\htdocs\account22/reporting/reports_main.php:243
+#: c:\Apache2\htdocs\account22/reporting/reports_main.php:252
+#: c:\Apache2\htdocs\account22/reporting/reports_main.php:261
+#: c:\Apache2\htdocs\account22/reporting/reports_main.php:272
+#: c:\Apache2\htdocs\account22/reporting/reports_main.php:277
+#: c:\Apache2\htdocs\account22/reporting/reports_main.php:284
+#: c:\Apache2\htdocs\account22/reporting/reports_main.php:292
+#: c:\Apache2\htdocs\account22/reporting/reports_main.php:300
+#: c:\Apache2\htdocs\account22/reporting/reports_main.php:310
+#: c:\Apache2\htdocs\account22/reporting/reports_main.php:314
+#: c:\Apache2\htdocs\account22/reporting/reports_main.php:320
+#: c:\Apache2\htdocs\account22/reporting/reports_main.php:327
+#: c:\Apache2\htdocs\account22/reporting/reports_main.php:334
+#: c:\Apache2\htdocs\account22/reporting/reports_main.php:341
+#: c:\Apache2\htdocs\account22/reporting/reports_main.php:347
 msgid "Comments"
 msgstr ""
 
@@ -6532,22 +6603,22 @@ msgstr ""
 #: c:\Apache2\htdocs\account22/reporting/reports_main.php:204
 #: c:\Apache2\htdocs\account22/reporting/reports_main.php:210
 #: c:\Apache2\htdocs\account22/reporting/reports_main.php:216
-#: c:\Apache2\htdocs\account22/reporting/reports_main.php:229
-#: c:\Apache2\htdocs\account22/reporting/reports_main.php:235
-#: c:\Apache2\htdocs\account22/reporting/reports_main.php:243
-#: c:\Apache2\htdocs\account22/reporting/reports_main.php:252
-#: c:\Apache2\htdocs\account22/reporting/reports_main.php:261
-#: c:\Apache2\htdocs\account22/reporting/reports_main.php:272
-#: c:\Apache2\htdocs\account22/reporting/reports_main.php:277
-#: c:\Apache2\htdocs\account22/reporting/reports_main.php:284
-#: c:\Apache2\htdocs\account22/reporting/reports_main.php:292
-#: c:\Apache2\htdocs\account22/reporting/reports_main.php:300
-#: c:\Apache2\htdocs\account22/reporting/reports_main.php:310
-#: c:\Apache2\htdocs\account22/reporting/reports_main.php:314
-#: c:\Apache2\htdocs\account22/reporting/reports_main.php:320
-#: c:\Apache2\htdocs\account22/reporting/reports_main.php:327
-#: c:\Apache2\htdocs\account22/reporting/reports_main.php:334
-#: c:\Apache2\htdocs\account22/reporting/reports_main.php:347
+#: c:\Apache2\htdocs\account22/reporting/reports_main.php:230
+#: c:\Apache2\htdocs\account22/reporting/reports_main.php:236
+#: c:\Apache2\htdocs\account22/reporting/reports_main.php:244
+#: c:\Apache2\htdocs\account22/reporting/reports_main.php:253
+#: c:\Apache2\htdocs\account22/reporting/reports_main.php:262
+#: c:\Apache2\htdocs\account22/reporting/reports_main.php:273
+#: c:\Apache2\htdocs\account22/reporting/reports_main.php:278
+#: c:\Apache2\htdocs\account22/reporting/reports_main.php:285
+#: c:\Apache2\htdocs\account22/reporting/reports_main.php:293
+#: c:\Apache2\htdocs\account22/reporting/reports_main.php:301
+#: c:\Apache2\htdocs\account22/reporting/reports_main.php:311
+#: c:\Apache2\htdocs\account22/reporting/reports_main.php:315
+#: c:\Apache2\htdocs\account22/reporting/reports_main.php:321
+#: c:\Apache2\htdocs\account22/reporting/reports_main.php:328
+#: c:\Apache2\htdocs\account22/reporting/reports_main.php:335
+#: c:\Apache2\htdocs\account22/reporting/reports_main.php:348
 msgid "Destination"
 msgstr ""
 
@@ -6557,12 +6628,12 @@ msgstr ""
 
 #: c:\Apache2\htdocs\account22/reporting/reports_main.php:42
 #: c:\Apache2\htdocs\account22/reporting/reports_main.php:120
-#: c:\Apache2\htdocs\account22/reporting/reports_main.php:241
-#: c:\Apache2\htdocs\account22/reporting/reports_main.php:250
-#: c:\Apache2\htdocs\account22/reporting/reports_main.php:282
-#: c:\Apache2\htdocs\account22/reporting/reports_main.php:290
-#: c:\Apache2\htdocs\account22/reporting/reports_main.php:318
-#: c:\Apache2\htdocs\account22/reporting/reports_main.php:325
+#: c:\Apache2\htdocs\account22/reporting/reports_main.php:242
+#: c:\Apache2\htdocs\account22/reporting/reports_main.php:251
+#: c:\Apache2\htdocs\account22/reporting/reports_main.php:283
+#: c:\Apache2\htdocs\account22/reporting/reports_main.php:291
+#: c:\Apache2\htdocs\account22/reporting/reports_main.php:319
+#: c:\Apache2\htdocs\account22/reporting/reports_main.php:326
 msgid "Graphics"
 msgstr ""
 
@@ -6724,11 +6795,11 @@ msgid "&Bill of Material Listing"
 msgstr ""
 
 #: c:\Apache2\htdocs\account22/reporting/reports_main.php:176
-msgid "From component"
+msgid "From product"
 msgstr ""
 
 #: c:\Apache2\htdocs\account22/reporting/reports_main.php:177
-msgid "To component"
+msgid "To product"
 msgstr ""
 
 #: c:\Apache2\htdocs\account22/reporting/reports_main.php:180
@@ -6767,23 +6838,23 @@ msgstr ""
 #: c:\Apache2\htdocs\account22/reporting/reports_main.php:206
 #: c:\Apache2\htdocs\account22/reporting/reports_main.php:207
 #: c:\Apache2\htdocs\account22/reporting/reports_main.php:211
-#: c:\Apache2\htdocs\account22/reporting/reports_main.php:221
-#: c:\Apache2\htdocs\account22/reporting/reports_main.php:230
-#: c:\Apache2\htdocs\account22/reporting/reports_main.php:236
-#: c:\Apache2\htdocs\account22/reporting/reports_main.php:244
-#: c:\Apache2\htdocs\account22/reporting/reports_main.php:253
-#: c:\Apache2\htdocs\account22/reporting/reports_main.php:265
-#: c:\Apache2\htdocs\account22/reporting/reports_main.php:273
-#: c:\Apache2\htdocs\account22/reporting/reports_main.php:278
-#: c:\Apache2\htdocs\account22/reporting/reports_main.php:285
-#: c:\Apache2\htdocs\account22/reporting/reports_main.php:293
-#: c:\Apache2\htdocs\account22/reporting/reports_main.php:304
-#: c:\Apache2\htdocs\account22/reporting/reports_main.php:311
-#: c:\Apache2\htdocs\account22/reporting/reports_main.php:315
-#: c:\Apache2\htdocs\account22/reporting/reports_main.php:321
-#: c:\Apache2\htdocs\account22/reporting/reports_main.php:328
-#: c:\Apache2\htdocs\account22/reporting/reports_main.php:336
-#: c:\Apache2\htdocs\account22/reporting/reports_main.php:341
+#: c:\Apache2\htdocs\account22/reporting/reports_main.php:222
+#: c:\Apache2\htdocs\account22/reporting/reports_main.php:231
+#: c:\Apache2\htdocs\account22/reporting/reports_main.php:237
+#: c:\Apache2\htdocs\account22/reporting/reports_main.php:245
+#: c:\Apache2\htdocs\account22/reporting/reports_main.php:254
+#: c:\Apache2\htdocs\account22/reporting/reports_main.php:266
+#: c:\Apache2\htdocs\account22/reporting/reports_main.php:274
+#: c:\Apache2\htdocs\account22/reporting/reports_main.php:279
+#: c:\Apache2\htdocs\account22/reporting/reports_main.php:286
+#: c:\Apache2\htdocs\account22/reporting/reports_main.php:294
+#: c:\Apache2\htdocs\account22/reporting/reports_main.php:305
+#: c:\Apache2\htdocs\account22/reporting/reports_main.php:312
+#: c:\Apache2\htdocs\account22/reporting/reports_main.php:316
+#: c:\Apache2\htdocs\account22/reporting/reports_main.php:322
+#: c:\Apache2\htdocs\account22/reporting/reports_main.php:329
+#: c:\Apache2\htdocs\account22/reporting/reports_main.php:337
+#: c:\Apache2\htdocs\account22/reporting/reports_main.php:342
 msgid "General Ledger"
 msgstr ""
 
@@ -6799,55 +6870,55 @@ msgstr ""
 msgid "List of &Journal Entries"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/reporting/reports_main.php:221
-#: c:\Apache2\htdocs\account22/reporting/reports_main.php:265
-#: c:\Apache2\htdocs\account22/reporting/reports_main.php:304
+#: c:\Apache2\htdocs\account22/reporting/reports_main.php:222
+#: c:\Apache2\htdocs\account22/reporting/reports_main.php:266
+#: c:\Apache2\htdocs\account22/reporting/reports_main.php:305
 msgid "GL Account &Transactions"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/reporting/reports_main.php:224
-#: c:\Apache2\htdocs\account22/reporting/reports_main.php:268
-#: c:\Apache2\htdocs\account22/reporting/reports_main.php:307
-msgid "From Account"
-msgstr ""
-
 #: c:\Apache2\htdocs\account22/reporting/reports_main.php:225
 #: c:\Apache2\htdocs\account22/reporting/reports_main.php:269
 #: c:\Apache2\htdocs\account22/reporting/reports_main.php:308
+msgid "From Account"
+msgstr ""
+
+#: c:\Apache2\htdocs\account22/reporting/reports_main.php:226
+#: c:\Apache2\htdocs\account22/reporting/reports_main.php:270
+#: c:\Apache2\htdocs\account22/reporting/reports_main.php:309
 msgid "To Account"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/reporting/reports_main.php:230
-#: c:\Apache2\htdocs\account22/reporting/reports_main.php:273
-#: c:\Apache2\htdocs\account22/reporting/reports_main.php:311
+#: c:\Apache2\htdocs\account22/reporting/reports_main.php:231
+#: c:\Apache2\htdocs\account22/reporting/reports_main.php:274
+#: c:\Apache2\htdocs\account22/reporting/reports_main.php:312
 msgid "Annual &Expense Breakdown"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/reporting/reports_main.php:236
-#: c:\Apache2\htdocs\account22/reporting/reports_main.php:278
-#: c:\Apache2\htdocs\account22/reporting/reports_main.php:315
+#: c:\Apache2\htdocs\account22/reporting/reports_main.php:237
+#: c:\Apache2\htdocs\account22/reporting/reports_main.php:279
+#: c:\Apache2\htdocs\account22/reporting/reports_main.php:316
 msgid "&Balance Sheet"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/reporting/reports_main.php:244
-#: c:\Apache2\htdocs\account22/reporting/reports_main.php:285
-#: c:\Apache2\htdocs\account22/reporting/reports_main.php:321
+#: c:\Apache2\htdocs\account22/reporting/reports_main.php:245
+#: c:\Apache2\htdocs\account22/reporting/reports_main.php:286
+#: c:\Apache2\htdocs\account22/reporting/reports_main.php:322
 msgid "&Profit and Loss Statement"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/reporting/reports_main.php:247
-#: c:\Apache2\htdocs\account22/reporting/reports_main.php:288
-#: c:\Apache2\htdocs\account22/reporting/reports_main.php:324
+#: c:\Apache2\htdocs\account22/reporting/reports_main.php:248
+#: c:\Apache2\htdocs\account22/reporting/reports_main.php:289
+#: c:\Apache2\htdocs\account22/reporting/reports_main.php:325
 msgid "Compare to"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/reporting/reports_main.php:256
-#: c:\Apache2\htdocs\account22/reporting/reports_main.php:296
-#: c:\Apache2\htdocs\account22/reporting/reports_main.php:331
+#: c:\Apache2\htdocs\account22/reporting/reports_main.php:257
+#: c:\Apache2\htdocs\account22/reporting/reports_main.php:297
+#: c:\Apache2\htdocs\account22/reporting/reports_main.php:332
 msgid "Zero values"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/reporting/reports_main.php:336
+#: c:\Apache2\htdocs\account22/reporting/reports_main.php:337
 msgid "Ta&x Report"
 msgstr ""
 
@@ -6896,12 +6967,8 @@ msgstr ""
 msgid "Modifying Customer Credit Note #%d"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/sales/credit_note_entry.php:42
-msgid "Modifying Customer Credit Note"
-msgstr ""
-
 #: c:\Apache2\htdocs\account22/sales/credit_note_entry.php:51
-#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:593
+#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:597
 msgid "There are no customers, or there are no customers with branches. Please define customers and customer branches."
 msgstr ""
 
@@ -6970,10 +7037,6 @@ msgstr ""
 msgid "Modifying Credit Invoice # %d."
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/sales/customer_credit_invoice.php:39
-msgid "Modifying Credit Invoice"
-msgstr ""
-
 #: c:\Apache2\htdocs\account22/sales/customer_credit_invoice.php:42
 msgid "Credit all or part of an Invoice"
 msgstr ""
@@ -7034,8 +7097,8 @@ msgid "Credit Shipping Cost"
 msgstr ""
 
 #: c:\Apache2\htdocs\account22/sales/customer_credit_invoice.php:333
-#: c:\Apache2\htdocs\account22/sales/customer_delivery.php:459
-#: c:\Apache2\htdocs\account22/sales/customer_invoice.php:503
+#: c:\Apache2\htdocs\account22/sales/customer_delivery.php:462
+#: c:\Apache2\htdocs\account22/sales/customer_invoice.php:504
 msgid "Sub-total"
 msgstr ""
 
@@ -7064,10 +7127,6 @@ msgstr ""
 msgid "Modifying Delivery Note # %d."
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/sales/customer_delivery.php:38
-msgid "Modifying Delivery Note"
-msgstr ""
-
 #: c:\Apache2\htdocs\account22/sales/customer_delivery.php:41
 msgid "Deliver Items for a Sales Order"
 msgstr ""
@@ -7197,7 +7256,7 @@ msgid ""
 msgstr ""
 
 #: c:\Apache2\htdocs\account22/sales/customer_delivery.php:283
-#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:431
+#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:435
 msgid "The delivery cannot be processed because there is an insufficient quantity for item:"
 msgstr ""
 
@@ -7232,35 +7291,35 @@ msgstr ""
 msgid "Discount"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/sales/customer_delivery.php:453
+#: c:\Apache2\htdocs\account22/sales/customer_delivery.php:454
 #: c:\Apache2\htdocs\account22/sales/customer_invoice.php:493
 msgid "Shipping Cost"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/sales/customer_delivery.php:466
+#: c:\Apache2\htdocs\account22/sales/customer_delivery.php:469
 msgid "Amount Total"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/sales/customer_delivery.php:471
+#: c:\Apache2\htdocs\account22/sales/customer_delivery.php:474
 msgid "Marked items have insufficient quantities in stock as on day of delivery."
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/sales/customer_delivery.php:475
+#: c:\Apache2\htdocs\account22/sales/customer_delivery.php:478
 msgid "Action For Balance"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/sales/customer_delivery.php:482
-#: c:\Apache2\htdocs\account22/sales/customer_invoice.php:521
+#: c:\Apache2\htdocs\account22/sales/customer_delivery.php:485
+#: c:\Apache2\htdocs\account22/sales/customer_invoice.php:522
 msgid "Refresh document page"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/sales/customer_delivery.php:483
+#: c:\Apache2\htdocs\account22/sales/customer_delivery.php:486
 msgid "Process Dispatch"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/sales/customer_delivery.php:484
-#: c:\Apache2\htdocs\account22/sales/customer_invoice.php:523
-#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:642
+#: c:\Apache2\htdocs\account22/sales/customer_delivery.php:487
+#: c:\Apache2\htdocs\account22/sales/customer_invoice.php:524
+#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:646
 msgid "Check entered data and save document"
 msgstr ""
 
@@ -7269,10 +7328,6 @@ msgstr ""
 msgid "Modifying Sales Invoice # %d."
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/sales/customer_invoice.php:38
-msgid "Modifying Sales Invoice"
-msgstr ""
-
 #: c:\Apache2\htdocs\account22/sales/customer_invoice.php:40
 msgid "Issue an Invoice for Delivery Note"
 msgstr ""
@@ -7390,11 +7445,11 @@ msgstr ""
 msgid "Remove"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/sales/customer_invoice.php:510
+#: c:\Apache2\htdocs\account22/sales/customer_invoice.php:511
 msgid "Invoice Total"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/sales/customer_invoice.php:522
+#: c:\Apache2\htdocs\account22/sales/customer_invoice.php:523
 msgid "Process Invoice"
 msgstr ""
 
@@ -7475,19 +7530,11 @@ msgstr ""
 msgid "Direct Sales Invoice"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:66
-msgid "Modifying Sales Order"
-msgstr ""
-
 #: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:67
 #, php-format
 msgid "Modifying Sales Order # %d"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:72
-msgid "Modifying Sales Quotation"
-msgstr ""
-
 #: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:73
 #, php-format
 msgid "Modifying Sales Quotation # %d"
@@ -7639,153 +7686,153 @@ msgstr ""
 msgid "The requested delivery date is before the date of the order."
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:410
+#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:414
 msgid "The item could not be updated because you are attempting to set the quantity ordered to less than 0, or the discount percent to more than 100."
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:414
+#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:418
 msgid "Price for item must be entered and can not be less than 0"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:421
+#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:425
 msgid "You attempting to make the quantity ordered a quantity less than has already been delivered. The quantity delivered cannot be modified retrospectively."
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:460
+#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:464
 msgid "This item cannot be deleted because some of it has already been delivered."
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:487
+#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:491
 msgid "Direct delivery entry has been cancelled as requested."
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:488
+#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:492
 msgid "Enter a New Sales Delivery"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:491
+#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:495
 msgid "Direct invoice entry has been cancelled as requested."
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:492
+#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:496
 msgid "Enter a New Sales Invoice"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:496
+#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:500
 msgid "This order cannot be cancelled because some of it has already been invoiced or dispatched. However, the line item quantities may be modified."
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:501
+#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:505
 msgid "This sales quotation has been cancelled as requested."
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:502
+#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:506
 msgid "Enter a New Sales Quotation"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:506
+#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:510
 msgid "This sales order has been cancelled as requested."
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:507
+#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:511
 msgid "Enter a New Sales Order"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:539
+#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:543
 msgid "Sales Quotation"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:596
+#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:600
 msgid "Invoice Date:"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:597
+#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:601
 msgid "Sales Invoice Items"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:598
+#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:602
 msgid "Enter Delivery Details and Confirm Invoice"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:599
+#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:603
 msgid "Cancel Invoice"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:600
+#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:604
 msgid "Place Invoice"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:602
+#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:606
 msgid "Delivery Date:"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:603
+#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:607
 msgid "Delivery Note Items"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:604
+#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:608
 msgid "Enter Delivery Details and Confirm Dispatch"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:605
+#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:609
 msgid "Cancel Delivery"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:606
+#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:610
 msgid "Place Delivery"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:608
+#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:612
 msgid "Quotation Date:"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:609
+#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:613
 msgid "Sales Quotation Items"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:610
+#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:614
 msgid "Enter Delivery Details and Confirm Quotation"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:611
+#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:615
 msgid "Cancel Quotation"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:612
+#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:616
 msgid "Place Quotation"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:613
+#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:617
 msgid "Commit Quotations Changes"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:615
+#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:619
 msgid "Order Date:"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:616
+#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:620
 msgid "Sales Order Items"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:617
+#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:621
 msgid "Enter Delivery Details and Confirm Order"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:620
+#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:624
 msgid "Commit Order Changes"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:643
+#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:647
 msgid ""
 "You are about to void this Document.\\n"
 "Do you want to continue?"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:646
+#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:650
 msgid "Validate changes and update document"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:650
+#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:654
 msgid "Cancels document entry or removes sales order when editing an old document"
 msgstr ""
 
@@ -7810,7 +7857,7 @@ msgstr ""
 msgid "Customer Allocation Inquiry"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/sales/inquiry/customer_allocation_inquiry.php:97
+#: c:\Apache2\htdocs\account22/sales/inquiry/customer_allocation_inquiry.php:96
 msgid "Allocation"
 msgstr ""
 
@@ -7822,7 +7869,8 @@ msgstr ""
 msgid "CUSTOMER ACCOUNT IS ON HOLD"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/sales/inquiry/customer_inquiry.php:283
+#: c:\Apache2\htdocs\account22/sales/inquiry/customer_inquiry.php:291
+#: c:\Apache2\htdocs\account22/sales/inquiry/customer_inquiry.php:304
 msgid "RB"
 msgstr ""
 
@@ -7841,32 +7889,32 @@ msgid ""
 "\t\t    the same customer branch."
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/sales/inquiry/sales_deliveries_view.php:230
+#: c:\Apache2\htdocs\account22/sales/inquiry/sales_deliveries_view.php:229
 msgid "Delivery #"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/sales/inquiry/sales_deliveries_view.php:234
+#: c:\Apache2\htdocs\account22/sales/inquiry/sales_deliveries_view.php:233
 #: c:\Apache2\htdocs\account22/sales/manage/customer_branches.php:245
 msgid "Contact"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/sales/inquiry/sales_deliveries_view.php:236
+#: c:\Apache2\htdocs\account22/sales/inquiry/sales_deliveries_view.php:235
 msgid "Cust Ref"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/sales/inquiry/sales_deliveries_view.php:238
+#: c:\Apache2\htdocs\account22/sales/inquiry/sales_deliveries_view.php:237
 msgid "Due By"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/sales/inquiry/sales_deliveries_view.php:239
+#: c:\Apache2\htdocs\account22/sales/inquiry/sales_deliveries_view.php:238
 msgid "Delivery Total"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/sales/inquiry/sales_deliveries_view.php:241
+#: c:\Apache2\htdocs\account22/sales/inquiry/sales_deliveries_view.php:240
 msgid "Batch"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/sales/inquiry/sales_deliveries_view.php:241
+#: c:\Apache2\htdocs\account22/sales/inquiry/sales_deliveries_view.php:240
 msgid "Batch Invoicing"
 msgstr ""
 
@@ -7911,37 +7959,37 @@ msgstr ""
 msgid "Show All:"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/sales/inquiry/sales_orders_view.php:319
+#: c:\Apache2\htdocs\account22/sales/inquiry/sales_orders_view.php:318
 msgid "Order #"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/sales/inquiry/sales_orders_view.php:323
-#: c:\Apache2\htdocs\account22/sales/inquiry/sales_orders_view.php:337
+#: c:\Apache2\htdocs\account22/sales/inquiry/sales_orders_view.php:322
+#: c:\Apache2\htdocs\account22/sales/inquiry/sales_orders_view.php:336
 msgid "Cust Order Ref"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/sales/inquiry/sales_orders_view.php:326
-#: c:\Apache2\htdocs\account22/sales/inquiry/sales_orders_view.php:340
+#: c:\Apache2\htdocs\account22/sales/inquiry/sales_orders_view.php:325
+#: c:\Apache2\htdocs\account22/sales/inquiry/sales_orders_view.php:339
 msgid "Delivery To"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/sales/inquiry/sales_orders_view.php:333
+#: c:\Apache2\htdocs\account22/sales/inquiry/sales_orders_view.php:332
 msgid "Quote #"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/sales/inquiry/sales_orders_view.php:338
+#: c:\Apache2\htdocs\account22/sales/inquiry/sales_orders_view.php:337
 msgid "Quote Date"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/sales/inquiry/sales_orders_view.php:339
+#: c:\Apache2\htdocs\account22/sales/inquiry/sales_orders_view.php:338
 msgid "Valid until"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/sales/inquiry/sales_orders_view.php:341
+#: c:\Apache2\htdocs\account22/sales/inquiry/sales_orders_view.php:340
 msgid "Quote Total"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/sales/inquiry/sales_orders_view.php:366
+#: c:\Apache2\htdocs\account22/sales/inquiry/sales_orders_view.php:365
 msgid "Tmpl"
 msgstr ""
 
@@ -8736,15 +8784,15 @@ msgstr ""
 msgid "Upgrade from version 2.1/2.2beta to 2.2"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/sql/alter2.2.php:79
+#: c:\Apache2\htdocs\account22/sql/alter2.2.php:84
 msgid "Cannot query max sales order number."
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/sql/alter2.2.php:91
+#: c:\Apache2\htdocs\account22/sql/alter2.2.php:95
 msgid "Cannot store next sales order reference."
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/sql/alter2.2.php:241
+#: c:\Apache2\htdocs\account22/sql/alter2.2.php:246
 msgid "Cannot upgrade extensions system: file /modules/installed_modules.php is not writeable"
 msgstr ""
 
@@ -9070,38 +9118,38 @@ msgstr ""
 msgid "Inventory Item Movements"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/admin/db/maintenance_db.inc:182
+#: c:\Apache2\htdocs\account22/admin/db/maintenance_db.inc:184
 #, php-format
 msgid "Cannot open the extension setup file '%s' for writing."
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/admin/db/maintenance_db.inc:190
+#: c:\Apache2\htdocs\account22/admin/db/maintenance_db.inc:192
 #, php-format
 msgid "Cannot write to the extensions setup file '%s'."
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/admin/db/maintenance_db.inc:246
+#: c:\Apache2\htdocs\account22/admin/db/maintenance_db.inc:248
 msgid "Cannot open the languages file - "
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/admin/db/maintenance_db.inc:253
+#: c:\Apache2\htdocs\account22/admin/db/maintenance_db.inc:255
 msgid "Cannot write to the language file - "
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/admin/db/maintenance_db.inc:263
+#: c:\Apache2\htdocs\account22/admin/db/maintenance_db.inc:265
 msgid "The language files folder "
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/admin/db/maintenance_db.inc:429
+#: c:\Apache2\htdocs\account22/admin/db/maintenance_db.inc:431
 #, php-format
 msgid "SQL script execution failed in line %d: %s"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/admin/db/users_db.inc:215
+#: c:\Apache2\htdocs\account22/admin/db/users_db.inc:216
 msgid "user online"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/admin/db/users_db.inc:215
+#: c:\Apache2\htdocs\account22/admin/db/users_db.inc:216
 msgid "users online"
 msgstr ""
 
@@ -9135,7 +9183,7 @@ msgid "To the Order of:"
 msgstr ""
 
 #: c:\Apache2\htdocs\account22/gl/includes/ui/gl_bank_ui.inc:87
-#: c:\Apache2\htdocs\account22/gl/includes/ui/gl_journal_ui.inc:55
+#: c:\Apache2\htdocs\account22/gl/includes/ui/gl_journal_ui.inc:53
 msgid "Go"
 msgstr ""
 
@@ -9147,42 +9195,42 @@ msgstr ""
 msgid "Remove line from document"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/gl/includes/ui/gl_bank_ui.inc:252
-#: c:\Apache2\htdocs\account22/gl/includes/ui/gl_journal_ui.inc:214
+#: c:\Apache2\htdocs\account22/gl/includes/ui/gl_bank_ui.inc:250
+#: c:\Apache2\htdocs\account22/gl/includes/ui/gl_journal_ui.inc:213
 msgid "Confirm changes"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/gl/includes/ui/gl_bank_ui.inc:254
-#: c:\Apache2\htdocs\account22/gl/includes/ui/gl_journal_ui.inc:216
+#: c:\Apache2\htdocs\account22/gl/includes/ui/gl_bank_ui.inc:252
+#: c:\Apache2\htdocs\account22/gl/includes/ui/gl_journal_ui.inc:215
 msgid "Cancel changes"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/gl/includes/ui/gl_bank_ui.inc:259
-#: c:\Apache2\htdocs\account22/gl/includes/ui/gl_journal_ui.inc:220
+#: c:\Apache2\htdocs\account22/gl/includes/ui/gl_bank_ui.inc:257
+#: c:\Apache2\htdocs\account22/gl/includes/ui/gl_journal_ui.inc:219
 msgid "Add Item"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/gl/includes/ui/gl_bank_ui.inc:260
+#: c:\Apache2\htdocs\account22/gl/includes/ui/gl_bank_ui.inc:258
 msgid "Add new item to document"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/gl/includes/ui/gl_journal_ui.inc:40
+#: c:\Apache2\htdocs\account22/gl/includes/ui/gl_journal_ui.inc:38
 msgid "Reverse Transaction:"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/gl/includes/ui/gl_journal_ui.inc:48
+#: c:\Apache2\htdocs\account22/gl/includes/ui/gl_journal_ui.inc:46
 msgid "Quick Entry"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/gl/includes/ui/gl_journal_ui.inc:116
+#: c:\Apache2\htdocs\account22/gl/includes/ui/gl_journal_ui.inc:114
 msgid "Edit journal line"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/gl/includes/ui/gl_journal_ui.inc:118
+#: c:\Apache2\htdocs\account22/gl/includes/ui/gl_journal_ui.inc:116
 msgid "Remove line from journal"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/gl/includes/ui/gl_journal_ui.inc:221
+#: c:\Apache2\htdocs\account22/gl/includes/ui/gl_journal_ui.inc:220
 msgid "Add new line to journal"
 msgstr ""
 
@@ -9788,12 +9836,12 @@ msgid "The security settings on your account do not permit you to access this fu
 msgstr ""
 
 #: c:\Apache2\htdocs\account22/includes/types.inc:47
-#: c:\Apache2\htdocs\account22/includes/types.inc:262
+#: c:\Apache2\htdocs\account22/includes/types.inc:251
 msgid "Bank Payment"
 msgstr ""
 
 #: c:\Apache2\htdocs\account22/includes/types.inc:48
-#: c:\Apache2\htdocs\account22/includes/types.inc:261
+#: c:\Apache2\htdocs\account22/includes/types.inc:250
 msgid "Bank Deposit"
 msgstr ""
 
@@ -9826,7 +9874,7 @@ msgid "Supplier Payment"
 msgstr ""
 
 #: c:\Apache2\htdocs\account22/includes/types.inc:61
-#: c:\Apache2\htdocs\account22/includes/types.inc:119
+#: c:\Apache2\htdocs\account22/includes/types.inc:108
 msgid "Work Order"
 msgstr ""
 
@@ -9866,123 +9914,107 @@ msgstr ""
 msgid "Cash"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/includes/types.inc:96
-msgid "Purchases"
-msgstr ""
-
-#: c:\Apache2\htdocs\account22/includes/types.inc:97
-msgid "Items and Inventory"
-msgstr ""
-
-#: c:\Apache2\htdocs\account22/includes/types.inc:100
-msgid "Banking and General Ledger"
-msgstr ""
-
-#: c:\Apache2\htdocs\account22/includes/types.inc:101
-msgid "Setup"
-msgstr ""
-
-#: c:\Apache2\htdocs\account22/includes/types.inc:195
+#: c:\Apache2\htdocs\account22/includes/types.inc:184
 msgid "Assemble"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/includes/types.inc:196
+#: c:\Apache2\htdocs\account22/includes/types.inc:185
 msgid "Unassemble"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/includes/types.inc:197
+#: c:\Apache2\htdocs\account22/includes/types.inc:186
 msgid "Advanced Manufacture"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/includes/types.inc:204
+#: c:\Apache2\htdocs\account22/includes/types.inc:193
 msgid "Labour Cost"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/includes/types.inc:205
+#: c:\Apache2\htdocs\account22/includes/types.inc:194
 msgid "Overhead Cost"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/includes/types.inc:220
+#: c:\Apache2\htdocs\account22/includes/types.inc:209
 msgid "Assets"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/includes/types.inc:222
+#: c:\Apache2\htdocs\account22/includes/types.inc:211
 msgid "Equity"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/includes/types.inc:223
+#: c:\Apache2\htdocs\account22/includes/types.inc:212
 msgid "Income"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/includes/types.inc:224
+#: c:\Apache2\htdocs\account22/includes/types.inc:213
 msgid "Cost of Goods Sold"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/includes/types.inc:225
+#: c:\Apache2\htdocs\account22/includes/types.inc:214
 msgid "Expense"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/includes/types.inc:240
+#: c:\Apache2\htdocs\account22/includes/types.inc:229
 msgid "Remainder"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/includes/types.inc:242
+#: c:\Apache2\htdocs\account22/includes/types.inc:231
 msgid "Amount, increase base"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/includes/types.inc:243
+#: c:\Apache2\htdocs\account22/includes/types.inc:232
 msgid "Amount, reduce base"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/includes/types.inc:244
+#: c:\Apache2\htdocs\account22/includes/types.inc:233
 msgid "% amount of base"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/includes/types.inc:245
+#: c:\Apache2\htdocs\account22/includes/types.inc:234
 msgid "% amount of base, increase base"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/includes/types.inc:246
+#: c:\Apache2\htdocs\account22/includes/types.inc:235
 msgid "% amount of base, reduce base"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/includes/types.inc:247
+#: c:\Apache2\htdocs\account22/includes/types.inc:236
 msgid "Taxes added"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/includes/types.inc:248
+#: c:\Apache2\htdocs\account22/includes/types.inc:237
 msgid "Taxes added, increase base"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/includes/types.inc:249
+#: c:\Apache2\htdocs\account22/includes/types.inc:238
 msgid "Taxes added, reduce base"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/includes/types.inc:250
+#: c:\Apache2\htdocs\account22/includes/types.inc:239
 msgid "Taxes included"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/includes/types.inc:251
+#: c:\Apache2\htdocs\account22/includes/types.inc:240
 msgid "Taxes included, increase base"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/includes/types.inc:252
+#: c:\Apache2\htdocs\account22/includes/types.inc:241
 msgid "Taxes included, reduce base"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/includes/types.inc:264
+#: c:\Apache2\htdocs\account22/includes/types.inc:253
 msgid "Supplier Invoice/Credit"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/includes/types.inc:280
+#: c:\Apache2\htdocs\account22/includes/types.inc:269
 msgid "Purchased"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/includes/types.inc:281
+#: c:\Apache2\htdocs\account22/includes/types.inc:270
 msgid "Service"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/includes/db/audit_trail_db.inc:90
+#: c:\Apache2\htdocs\account22/includes/db/audit_trail_db.inc:93
 msgid "Some transactions journal GL postings were not indexed due to lack of audit trail record."
 msgstr ""
 
@@ -9991,6 +10023,7 @@ msgid "Other Allocations"
 msgstr ""
 
 #: c:\Apache2\htdocs\account22/includes/ui/allocation_cart.inc:259
+#: c:\Apache2\htdocs\account22/includes/ui/ui_view.inc:453
 msgid "This Allocation"
 msgstr ""
 
@@ -10007,6 +10040,7 @@ msgid "These allocations cannot be processed because the amount allocated is mor
 msgstr ""
 
 #: c:\Apache2\htdocs\account22/includes/ui/db_pager_view.inc:166
+#: c:\Apache2\htdocs\account22/includes/ui/ui_input.inc:836
 msgid "Show also Inactive"
 msgstr ""
 
@@ -10091,104 +10125,112 @@ msgstr ""
 msgid "Enter description fragment to search or * for all"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/includes/ui/ui_lists.inc:394
-#: c:\Apache2\htdocs\account22/includes/ui/ui_lists.inc:1341
+#: c:\Apache2\htdocs\account22/includes/ui/ui_lists.inc:393
+#: c:\Apache2\htdocs\account22/includes/ui/ui_lists.inc:1307
 msgid "All Suppliers"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/includes/ui/ui_lists.inc:398
+#: c:\Apache2\htdocs\account22/includes/ui/ui_lists.inc:397
 msgid "Press Space tab to filter by name fragment"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/includes/ui/ui_lists.inc:399
+#: c:\Apache2\htdocs\account22/includes/ui/ui_lists.inc:398
 msgid "Select supplier"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/includes/ui/ui_lists.inc:445
+#: c:\Apache2\htdocs\account22/includes/ui/ui_lists.inc:442
 msgid "All Customers"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/includes/ui/ui_lists.inc:449
+#: c:\Apache2\htdocs\account22/includes/ui/ui_lists.inc:446
 msgid "Press Space tab to filter by name fragment; F2 - entry new customer"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/includes/ui/ui_lists.inc:450
+#: c:\Apache2\htdocs\account22/includes/ui/ui_lists.inc:447
 msgid "Select customer"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/includes/ui/ui_lists.inc:495
+#: c:\Apache2\htdocs\account22/includes/ui/ui_lists.inc:490
 msgid "All branches"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/includes/ui/ui_lists.inc:498
+#: c:\Apache2\htdocs\account22/includes/ui/ui_lists.inc:493
 msgid "Select customer branch"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/includes/ui/ui_lists.inc:535
+#: c:\Apache2\htdocs\account22/includes/ui/ui_lists.inc:528
 msgid "All Locations"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/includes/ui/ui_lists.inc:696
-#: c:\Apache2\htdocs\account22/includes/ui/ui_lists.inc:763
+#: c:\Apache2\htdocs\account22/includes/ui/ui_lists.inc:681
+#: c:\Apache2\htdocs\account22/includes/ui/ui_lists.inc:746
 msgid "All Items"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/includes/ui/ui_lists.inc:1246
+#: c:\Apache2\htdocs\account22/includes/ui/ui_lists.inc:1214
 msgid "All Sales Types"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/includes/ui/ui_lists.inc:1448
+#: c:\Apache2\htdocs\account22/includes/ui/ui_lists.inc:1408
 msgid "Delayed"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/includes/ui/ui_lists.inc:1566
+#: c:\Apache2\htdocs\account22/includes/ui/ui_lists.inc:1524
 msgid "Use Item Sales Accounts"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/includes/ui/ui_lists.inc:1876
-#: c:\Apache2\htdocs\account22/includes/ui/ui_lists.inc:1894
+#: c:\Apache2\htdocs\account22/includes/ui/ui_lists.inc:1832
+#: c:\Apache2\htdocs\account22/includes/ui/ui_lists.inc:1849
 msgid "All Types"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/includes/ui/ui_lists.inc:1878
-#: c:\Apache2\htdocs\account22/includes/ui/ui_lists.inc:1896
+#: c:\Apache2\htdocs\account22/includes/ui/ui_lists.inc:1834
+#: c:\Apache2\htdocs\account22/includes/ui/ui_lists.inc:1851
 msgid "Overdue Invoices"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/includes/ui/ui_lists.inc:1895
+#: c:\Apache2\htdocs\account22/includes/ui/ui_lists.inc:1850
 msgid "Invoices"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/includes/ui/ui_lists.inc:1899
+#: c:\Apache2\htdocs\account22/includes/ui/ui_lists.inc:1854
 msgid "Overdue Credit Notes"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/includes/ui/ui_lists.inc:1912
+#: c:\Apache2\htdocs\account22/includes/ui/ui_lists.inc:1866
 msgid "Automatically put balance on back order"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/includes/ui/ui_lists.inc:1913
+#: c:\Apache2\htdocs\account22/includes/ui/ui_lists.inc:1867
 msgid "Cancel any quantites not delivered"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/includes/ui/ui_lists.inc:1931
+#: c:\Apache2\htdocs\account22/includes/ui/ui_lists.inc:1884
 msgid "Items Returned to Inventory Location"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/includes/ui/ui_lists.inc:1932
+#: c:\Apache2\htdocs\account22/includes/ui/ui_lists.inc:1885
 msgid "Items Written Off"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/includes/ui/ui_lists.inc:2102
+#: c:\Apache2\htdocs\account22/includes/ui/ui_lists.inc:2053
 msgid "New role"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/includes/ui/ui_lists.inc:2151
+#: c:\Apache2\htdocs\account22/includes/ui/ui_lists.inc:2111
+msgid "No tags defined."
+msgstr ""
+
+#: c:\Apache2\htdocs\account22/includes/ui/ui_lists.inc:2111
+msgid "No active tags defined."
+msgstr ""
+
+#: c:\Apache2\htdocs\account22/includes/ui/ui_lists.inc:2149
 #, php-format
 msgid "Activated for '%s'"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/includes/ui/ui_lists.inc:2154
+#: c:\Apache2\htdocs\account22/includes/ui/ui_lists.inc:2152
 msgid "Installed on system"
 msgstr ""
 
@@ -10441,6 +10483,8 @@ msgstr ""
 
 #: c:\Apache2\htdocs\account22/purchasing/includes/ui/grn_ui.inc:41
 #: c:\Apache2\htdocs\account22/purchasing/includes/ui/grn_ui.inc:53
+#: c:\Apache2\htdocs\account22/purchasing/includes/ui/po_ui.inc:252
+#: c:\Apache2\htdocs\account22/purchasing/includes/ui/po_ui.inc:257
 msgid "Deliver Into Location"
 msgstr ""
 
@@ -10449,6 +10493,7 @@ msgid "Date Items Received"
 msgstr ""
 
 #: c:\Apache2\htdocs\account22/purchasing/includes/ui/grn_ui.inc:63
+#: c:\Apache2\htdocs\account22/purchasing/includes/ui/po_ui.inc:270
 msgid "Order Comments"
 msgstr ""
 
@@ -10737,7 +10782,7 @@ msgstr ""
 msgid "Fiscal Year"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/reporting/includes/header2.inc:145
+#: c:\Apache2\htdocs\account22/reporting/includes/header2.inc:150
 #: c:\Apache2\htdocs\account22/reporting/includes/pdf_report.inc:245
 msgid "Page"
 msgstr ""
@@ -10782,113 +10827,114 @@ msgstr ""
 msgid "Cannot flush printing queue"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/reporting/includes/reports_classes.inc:41
+#: c:\Apache2\htdocs\account22/reporting/includes/reports_classes.inc:44
 msgid "Report Classes:"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/reporting/includes/reports_classes.inc:50
+#: c:\Apache2\htdocs\account22/reporting/includes/reports_classes.inc:53
 msgid "Reports For Class: "
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/reporting/includes/reports_classes.inc:66
+#: c:\Apache2\htdocs\account22/reporting/includes/reports_classes.inc:69
 msgid "Display: "
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/reporting/includes/reports_classes.inc:95
+#: c:\Apache2\htdocs\account22/reporting/includes/reports_classes.inc:98
 msgid "Invalid date format"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/reporting/includes/reports_classes.inc:138
+#: c:\Apache2\htdocs\account22/reporting/includes/reports_classes.inc:134
+msgid "Unknown report parameter type:"
+msgstr ""
+
+#: c:\Apache2\htdocs\account22/reporting/includes/reports_classes.inc:159
 msgid "No Currency Filter"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/reporting/includes/reports_classes.inc:184
-msgid "No Payment Link"
+#: c:\Apache2\htdocs\account22/reporting/includes/reports_classes.inc:204
+msgid "No payment Link"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/reporting/includes/reports_classes.inc:188
+#: c:\Apache2\htdocs\account22/reporting/includes/reports_classes.inc:208
 msgid "PDF/Printer"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/reporting/includes/reports_classes.inc:196
+#: c:\Apache2\htdocs\account22/reporting/includes/reports_classes.inc:216
 msgid "No Graphics"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/reporting/includes/reports_classes.inc:196
+#: c:\Apache2\htdocs\account22/reporting/includes/reports_classes.inc:216
 msgid "Vertical bars"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/reporting/includes/reports_classes.inc:196
+#: c:\Apache2\htdocs\account22/reporting/includes/reports_classes.inc:216
 msgid "Horizontal bars"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/reporting/includes/reports_classes.inc:196
+#: c:\Apache2\htdocs\account22/reporting/includes/reports_classes.inc:217
 msgid "Dots"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/reporting/includes/reports_classes.inc:196
+#: c:\Apache2\htdocs\account22/reporting/includes/reports_classes.inc:217
 msgid "Lines"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/reporting/includes/reports_classes.inc:196
+#: c:\Apache2\htdocs\account22/reporting/includes/reports_classes.inc:217
 msgid "Pie"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/reporting/includes/reports_classes.inc:196
+#: c:\Apache2\htdocs\account22/reporting/includes/reports_classes.inc:217
 msgid "Donut"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/reporting/includes/reports_classes.inc:201
+#: c:\Apache2\htdocs\account22/reporting/includes/reports_classes.inc:221
+#: c:\Apache2\htdocs\account22/reporting/includes/reports_classes.inc:224
 msgid "No Type Filter"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/reporting/includes/reports_classes.inc:211
+#: c:\Apache2\htdocs\account22/reporting/includes/reports_classes.inc:235
 msgid "No Account Group Filter"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/reporting/includes/reports_classes.inc:233
-#: c:\Apache2\htdocs\account22/reporting/includes/reports_classes.inc:241
-#: c:\Apache2\htdocs\account22/reporting/includes/reports_classes.inc:249
+#: c:\Apache2\htdocs\account22/reporting/includes/reports_classes.inc:250
+#: c:\Apache2\htdocs\account22/reporting/includes/reports_classes.inc:256
+#: c:\Apache2\htdocs\account22/reporting/includes/reports_classes.inc:262
 msgid "No Dimension Filter"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/reporting/includes/reports_classes.inc:255
+#: c:\Apache2\htdocs\account22/reporting/includes/reports_classes.inc:268
 msgid "No Customer Filter"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/reporting/includes/reports_classes.inc:263
+#: c:\Apache2\htdocs\account22/reporting/includes/reports_classes.inc:279
 msgid "No Supplier Filter"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/reporting/includes/reports_classes.inc:268
+#: c:\Apache2\htdocs\account22/reporting/includes/reports_classes.inc:287
 msgid "IV"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/reporting/includes/reports_classes.inc:269
+#: c:\Apache2\htdocs\account22/reporting/includes/reports_classes.inc:288
 msgid "CN"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/reporting/includes/reports_classes.inc:322
+#: c:\Apache2\htdocs\account22/reporting/includes/reports_classes.inc:338
 msgid "No Location Filter"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/reporting/includes/reports_classes.inc:326
+#: c:\Apache2\htdocs\account22/reporting/includes/reports_classes.inc:341
 msgid "No Category Filter"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/reporting/includes/reports_classes.inc:334
-msgid "No Area Filter"
-msgstr ""
-
-#: c:\Apache2\htdocs\account22/reporting/includes/reports_classes.inc:338
+#: c:\Apache2\htdocs\account22/reporting/includes/reports_classes.inc:350
 msgid "No Sales Folk Filter"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/reporting/includes/reports_classes.inc:346
+#: c:\Apache2\htdocs\account22/reporting/includes/reports_classes.inc:360
 msgid "No Users Filter"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/reporting/includes/reports_classes.inc:355
+#: c:\Apache2\htdocs\account22/reporting/includes/reports_classes.inc:368
 msgid "No tags"
 msgstr ""
 
@@ -10920,17 +10966,17 @@ msgid "Deleted."
 msgstr ""
 
 #: c:\Apache2\htdocs\account22/sales/includes/ui/sales_credit_ui.inc:94
-#: c:\Apache2\htdocs\account22/sales/includes/ui/sales_order_ui.inc:350
+#: c:\Apache2\htdocs\account22/sales/includes/ui/sales_order_ui.inc:368
 msgid "Customer Currency:"
 msgstr ""
 
 #: c:\Apache2\htdocs\account22/sales/includes/ui/sales_credit_ui.inc:112
-#: c:\Apache2\htdocs\account22/sales/includes/ui/sales_order_ui.inc:604
+#: c:\Apache2\htdocs\account22/sales/includes/ui/sales_order_ui.inc:619
 msgid "Shipping Company:"
 msgstr ""
 
 #: c:\Apache2\htdocs\account22/sales/includes/ui/sales_credit_ui.inc:114
-#: c:\Apache2\htdocs\account22/sales/includes/ui/sales_order_ui.inc:389
+#: c:\Apache2\htdocs\account22/sales/includes/ui/sales_order_ui.inc:407
 msgid "Customer Discount:"
 msgstr ""
 
@@ -10942,100 +10988,96 @@ msgstr ""
 msgid "The selected customer and branch are not valid, or the customer does not have any branches."
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/sales/includes/ui/sales_order_ui.inc:221
-msgid "Total Excluding Shipping"
+#: c:\Apache2\htdocs\account22/sales/includes/ui/sales_order_ui.inc:224
+msgid "Shipping Charge"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/sales/includes/ui/sales_order_ui.inc:281
+#: c:\Apache2\htdocs\account22/sales/includes/ui/sales_order_ui.inc:299
 msgid "No customer found for entered text."
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/sales/includes/ui/sales_order_ui.inc:344
+#: c:\Apache2\htdocs\account22/sales/includes/ui/sales_order_ui.inc:362
 msgid "Reference number unique for this document type"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/sales/includes/ui/sales_order_ui.inc:357
+#: c:\Apache2\htdocs\account22/sales/includes/ui/sales_order_ui.inc:375
 msgid "Payment:"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/sales/includes/ui/sales_order_ui.inc:379
+#: c:\Apache2\htdocs\account22/sales/includes/ui/sales_order_ui.inc:397
 msgid "Price List:"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/sales/includes/ui/sales_order_ui.inc:398
+#: c:\Apache2\htdocs\account22/sales/includes/ui/sales_order_ui.inc:416
 msgid "Date of order receive"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/sales/includes/ui/sales_order_ui.inc:545
+#: c:\Apache2\htdocs\account22/sales/includes/ui/sales_order_ui.inc:563
 msgid "Cash payment"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/sales/includes/ui/sales_order_ui.inc:547
-#: c:\Apache2\htdocs\account22/sales/includes/ui/sales_order_ui.inc:579
+#: c:\Apache2\htdocs\account22/sales/includes/ui/sales_order_ui.inc:565
+#: c:\Apache2\htdocs\account22/sales/includes/ui/sales_order_ui.inc:597
 msgid "Deliver from Location:"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/sales/includes/ui/sales_order_ui.inc:550
+#: c:\Apache2\htdocs\account22/sales/includes/ui/sales_order_ui.inc:568
 msgid "Cash account:"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/sales/includes/ui/sales_order_ui.inc:557
+#: c:\Apache2\htdocs\account22/sales/includes/ui/sales_order_ui.inc:575
 msgid "Delivery Details"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/sales/includes/ui/sales_order_ui.inc:562
+#: c:\Apache2\htdocs\account22/sales/includes/ui/sales_order_ui.inc:580
 msgid "Invoice Delivery Details"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/sales/includes/ui/sales_order_ui.inc:563
+#: c:\Apache2\htdocs\account22/sales/includes/ui/sales_order_ui.inc:581
 msgid "Invoice before"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/sales/includes/ui/sales_order_ui.inc:567
+#: c:\Apache2\htdocs\account22/sales/includes/ui/sales_order_ui.inc:585
 msgid "Quotation Delivery Details"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/sales/includes/ui/sales_order_ui.inc:572
+#: c:\Apache2\htdocs\account22/sales/includes/ui/sales_order_ui.inc:590
 msgid "Order Delivery Details"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/sales/includes/ui/sales_order_ui.inc:586
+#: c:\Apache2\htdocs\account22/sales/includes/ui/sales_order_ui.inc:604
 msgid "Enter requested day of delivery"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/sales/includes/ui/sales_order_ui.inc:586
+#: c:\Apache2\htdocs\account22/sales/includes/ui/sales_order_ui.inc:604
 msgid "Enter Valid until Date"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/sales/includes/ui/sales_order_ui.inc:587
+#: c:\Apache2\htdocs\account22/sales/includes/ui/sales_order_ui.inc:605
 msgid "Deliver To:"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/sales/includes/ui/sales_order_ui.inc:588
+#: c:\Apache2\htdocs\account22/sales/includes/ui/sales_order_ui.inc:606
 msgid "Additional identifier for delivery e.g. name of receiving person"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/sales/includes/ui/sales_order_ui.inc:591
+#: c:\Apache2\htdocs\account22/sales/includes/ui/sales_order_ui.inc:609
 msgid "Delivery address. Default is address of customer branch"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/sales/includes/ui/sales_order_ui.inc:592
+#: c:\Apache2\htdocs\account22/sales/includes/ui/sales_order_ui.inc:613
 msgid "Contact Phone Number:"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/sales/includes/ui/sales_order_ui.inc:593
+#: c:\Apache2\htdocs\account22/sales/includes/ui/sales_order_ui.inc:614
 msgid "Phone number of ordering person. Defaults to branch phone number"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/sales/includes/ui/sales_order_ui.inc:597
+#: c:\Apache2\htdocs\account22/sales/includes/ui/sales_order_ui.inc:615
 msgid "Customer Reference:"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/sales/includes/ui/sales_order_ui.inc:598
+#: c:\Apache2\htdocs\account22/sales/includes/ui/sales_order_ui.inc:616
 msgid "Customer reference number for this order (if any)"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/sales/includes/ui/sales_order_ui.inc:601
-msgid "Shipping Charge:"
-msgstr ""
-