Merged bugfixes upto [0000072] (version 2.0.3).

[fa-stable.git] / lang / new_language_template / LC_MESSAGES / empty.po

diff --git a/lang/new_language_template/LC_MESSAGES/empty.po b/lang/new_language_template/LC_MESSAGES/empty.po
index 6f7ffd45b41403db1b1e9dded59b2d796b0536e3..36b14bc6d43cd2b7d00000ef1b9105b8d6862b2b 100644 (file)
--- a/lang/new_language_template/LC_MESSAGES/empty.po
+++ b/lang/new_language_template/LC_MESSAGES/empty.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FrontAccounting\n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2008-04-07 10:26+0100\n"
+"PO-Revision-Date: 2008-09-01 10:01+0100\n"
 "Last-Translator: Joe Hunt <joe.hunt.consulting@gmail.com>\n"
 "Language-Team: Translators\n"
 "MIME-Version: 1.0\n"
@@ -12,1309 +12,1110 @@ msgstr ""
 "X-Poedit-Country: UNITED KINGDOM\n"
 "X-Poedit-SourceCharset: iso-8859-1\n"
 "X-Poedit-Basepath: c:\\Apache2\\htdocs\\account2\n"
+"X-Poedit-KeywordsList: _\n"
 "X-Poedit-SearchPath-0: c:\\Apache2\\htdocs\\account2\n"
 
-# c:\Apache2\htdocs\account/config.php:118
-#: c:\Apache2\htdocs\account2/config.php:138
+#: c:\Apache2\htdocs\account2/config.php:143
 msgid "Inquiries"
 msgstr ""
 
-# c:\Apache2\htdocs\account/config.php:119
-#: c:\Apache2\htdocs\account2/config.php:139
+#: c:\Apache2\htdocs\account2/config.php:144
 msgid "Accountant"
 msgstr ""
 
-# c:\Apache2\htdocs\account/config.php:120
-#: c:\Apache2\htdocs\account2/config.php:140
+#: c:\Apache2\htdocs\account2/config.php:145
 msgid "System Administrator"
 msgstr ""
 
-# c:\Apache2\htdocs\account/applications/customers.php:7
-# c:\Apache2\htdocs\account/sales/manage/customer_branches.php:277
-# c:\Apache2\htdocs\account/includes/page/header.inc:42
-#: c:\Apache2\htdocs\account2/config.php:153
+#: c:\Apache2\htdocs\account2/config.php:158
 #: c:\Apache2\htdocs\account2/admin/inst_module.php:16
 #: c:\Apache2\htdocs\account2/applications/customers.php:9
-#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:276
+#: c:\Apache2\htdocs\account2/reporting/rep304.php:127
+#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:283
 msgid "Sales"
 msgstr ""
 
-# c:\Apache2\htdocs\account/applications/suppliers.php:7
-# c:\Apache2\htdocs\account/includes/page/header.inc:43
-#: c:\Apache2\htdocs\account2/config.php:154
+#: c:\Apache2\htdocs\account2/config.php:159
 #: c:\Apache2\htdocs\account2/admin/inst_module.php:16
 #: c:\Apache2\htdocs\account2/applications/suppliers.php:9
 msgid "Purchases"
 msgstr ""
 
-# c:\Apache2\htdocs\account/applications/inventory.php:7
-# c:\Apache2\htdocs\account/includes/page/header.inc:44
-#: c:\Apache2\htdocs\account2/config.php:155
+#: c:\Apache2\htdocs\account2/config.php:160
 #: c:\Apache2\htdocs\account2/admin/inst_module.php:16
 #: c:\Apache2\htdocs\account2/applications/inventory.php:9
 msgid "Items and Inventory"
 msgstr ""
 
-# c:\Apache2\htdocs\account/applications/manufacturing.php:7
-# c:\Apache2\htdocs\account/includes/page/header.inc:45
-#: c:\Apache2\htdocs\account2/config.php:156
+#: c:\Apache2\htdocs\account2/config.php:161
 #: c:\Apache2\htdocs\account2/admin/inst_module.php:16
 #: c:\Apache2\htdocs\account2/applications/manufacturing.php:9
 msgid "Manufacturing"
 msgstr ""
 
-# c:\Apache2\htdocs\account/applications/dimensions.php:8
-# c:\Apache2\htdocs\account/inventory/manage/items.php:355
-# c:\Apache2\htdocs\account/reporting/reports_main.php:123
-# c:\Apache2\htdocs\account/reporting/reports_main.php:126
-# c:\Apache2\htdocs\account/reporting/reports_main.php:131
-# c:\Apache2\htdocs\account/includes/page/header.inc:46
-#: c:\Apache2\htdocs\account2/config.php:157
+#: c:\Apache2\htdocs\account2/config.php:162
 #: c:\Apache2\htdocs\account2/admin/inst_module.php:17
 #: c:\Apache2\htdocs\account2/applications/dimensions.php:10
-#: c:\Apache2\htdocs\account2/inventory/manage/items.php:355
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:133
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:136
+#: c:\Apache2\htdocs\account2/inventory/manage/items.php:375
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:141
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:144
 msgid "Dimensions"
 msgstr ""
 
-# c:\Apache2\htdocs\account/applications/generalledger.php:7
-# c:\Apache2\htdocs\account/includes/page/header.inc:47
-#: c:\Apache2\htdocs\account2/config.php:158
+#: c:\Apache2\htdocs\account2/config.php:163
 #: c:\Apache2\htdocs\account2/admin/inst_module.php:17
 #: c:\Apache2\htdocs\account2/applications/generalledger.php:9
 msgid "Banking and General Ledger"
 msgstr ""
 
-# c:\Apache2\htdocs\account/applications/setup.php:7
-# c:\Apache2\htdocs\account/includes/page/header.inc:48
-#: c:\Apache2\htdocs\account2/config.php:159
+#: c:\Apache2\htdocs\account2/config.php:164
 #: c:\Apache2\htdocs\account2/admin/inst_module.php:17
 #: c:\Apache2\htdocs\account2/applications/setup.php:9
 msgid "Setup"
 msgstr ""
 
-# c:\Apache2\htdocs\account/boxaccounting.php:63
-# c:\Apache2\htdocs\account/boxaccounting.php:64
-#: c:\Apache2\htdocs\account2/frontaccounting.php:56
-#: c:\Apache2\htdocs\account2/frontaccounting.php:57
+#: c:\Apache2\htdocs\account2/frontaccounting.php:58
+#: c:\Apache2\htdocs\account2/frontaccounting.php:59
 msgid "Main  Menu"
 msgstr ""
 
-# c:\Apache2\htdocs\account/boxaccounting.php:65
-# c:\Apache2\htdocs\account/access/logout.php:7
-# c:\Apache2\htdocs\account/includes/page/header.inc:55
-#: c:\Apache2\htdocs\account2/frontaccounting.php:58
+#: c:\Apache2\htdocs\account2/frontaccounting.php:60
 #: c:\Apache2\htdocs\account2/access/logout.php:8
-#: c:\Apache2\htdocs\account2/includes/page/header.inc:129
+#: c:\Apache2\htdocs\account2/themes/aqua/renderer.php:57
+#: c:\Apache2\htdocs\account2/themes/cool/renderer.php:57
+#: c:\Apache2\htdocs\account2/themes/default/renderer.php:57
+#: c:\Apache2\htdocs\account2/themes/fancy/renderer.php:33
+#: c:\Apache2\htdocs\account2/themes/picme/renderer.php:33
 msgid "Logout"
 msgstr ""
 
-# c:\Apache2\htdocs\account/access/login.php:38
 #: c:\Apache2\htdocs\account2/access/login.php:43
 msgid "Version"
 msgstr ""
 
-# c:\Apache2\htdocs\account/access/logout.php:21
 #: c:\Apache2\htdocs\account2/access/logout.php:22
 msgid "Thank you for using"
 msgstr ""
 
-# c:\Apache2\htdocs\account/access/logout.php:33
 #: c:\Apache2\htdocs\account2/access/logout.php:34
 msgid "Click here to Login Again."
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/backups.php:14
 #: c:\Apache2\htdocs\account2/admin/backups.php:14
 msgid "Backup and Restore Database - Error"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/backups.php:15
 #: c:\Apache2\htdocs\account2/admin/backups.php:15
 msgid "Backup paths have not been set correctly."
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/backups.php:15
 #: c:\Apache2\htdocs\account2/admin/backups.php:15
 msgid "Please contact System Administrator."
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/backups.php:23
 #: c:\Apache2\htdocs\account2/admin/backups.php:23
 msgid "Backup and Restore Database"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/backups.php:46
 #: c:\Apache2\htdocs\account2/admin/backups.php:46
 msgid "This extension can not be be viewed: "
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/backups.php:53
 #: c:\Apache2\htdocs\account2/admin/backups.php:53
 msgid "Are you sure you want to delete the backup file - "
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/backups.php:63
-#: c:\Apache2\htdocs\account2/admin/backups.php:63
+#: c:\Apache2\htdocs\account2/admin/backups.php:64
 msgid "Please select a file to upload."
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/backups.php:74
-#: c:\Apache2\htdocs\account2/admin/backups.php:74
+#: c:\Apache2\htdocs\account2/admin/backups.php:75
 msgid "Backup scripts"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/backups.php:83
-# c:\Apache2\htdocs\account/admin/backups.php:95
-#: c:\Apache2\htdocs\account2/admin/backups.php:83
-#: c:\Apache2\htdocs\account2/admin/backups.php:95
+#: c:\Apache2\htdocs\account2/admin/backups.php:84
+#: c:\Apache2\htdocs\account2/admin/backups.php:96
 msgid "Create Backup"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/backups.php:83
-#: c:\Apache2\htdocs\account2/admin/backups.php:83
+#: c:\Apache2\htdocs\account2/admin/backups.php:84
 msgid "Compression"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/backups.php:84
-#: c:\Apache2\htdocs\account2/admin/backups.php:84
+#: c:\Apache2\htdocs\account2/admin/backups.php:85
 msgid "Restore Backup"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/backups.php:85
-#: c:\Apache2\htdocs\account2/admin/backups.php:85
+#: c:\Apache2\htdocs\account2/admin/backups.php:86
 msgid "View Backup"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/backups.php:86
-#: c:\Apache2\htdocs\account2/admin/backups.php:86
+#: c:\Apache2\htdocs\account2/admin/backups.php:87
 msgid "Delete Backup"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/backups.php:87
-#: c:\Apache2\htdocs\account2/admin/backups.php:87
+#: c:\Apache2\htdocs\account2/admin/backups.php:88
 msgid "Download Backup"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/backups.php:88
-#: c:\Apache2\htdocs\account2/admin/backups.php:88
+#: c:\Apache2\htdocs\account2/admin/backups.php:89
 msgid "Upload Backup"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/backups.php:95
-# c:\Apache2\htdocs\account/reporting/reports_main.php:24
-# c:\Apache2\htdocs\account/reporting/reports_main.php:31
-# c:\Apache2\htdocs\account/reporting/reports_main.php:35
-# c:\Apache2\htdocs\account/reporting/reports_main.php:41
-# c:\Apache2\htdocs\account/reporting/reports_main.php:48
-# c:\Apache2\htdocs\account/reporting/reports_main.php:55
-# c:\Apache2\htdocs\account/reporting/reports_main.php:61
-# c:\Apache2\htdocs\account/reporting/reports_main.php:68
-# c:\Apache2\htdocs\account/reporting/reports_main.php:76
-# c:\Apache2\htdocs\account/reporting/reports_main.php:83
-# c:\Apache2\htdocs\account/reporting/reports_main.php:89
-# c:\Apache2\htdocs\account/reporting/reports_main.php:93
-# c:\Apache2\htdocs\account/reporting/reports_main.php:100
-# c:\Apache2\htdocs\account/reporting/reports_main.php:107
-# c:\Apache2\htdocs\account/reporting/reports_main.php:111
-# c:\Apache2\htdocs\account/reporting/reports_main.php:116
-# c:\Apache2\htdocs\account/reporting/reports_main.php:122
-# c:\Apache2\htdocs\account/reporting/reports_main.php:130
-# c:\Apache2\htdocs\account/reporting/reports_main.php:133
-# c:\Apache2\htdocs\account/reporting/reports_main.php:145
-# c:\Apache2\htdocs\account/reporting/reports_main.php:150
-# c:\Apache2\htdocs\account/reporting/reports_main.php:162
-# c:\Apache2\htdocs\account/reporting/reports_main.php:167
-# c:\Apache2\htdocs\account/reporting/reports_main.php:173
-# c:\Apache2\htdocs\account/reporting/reports_main.php:180
-# c:\Apache2\htdocs\account/reporting/reports_main.php:187
-# c:\Apache2\htdocs\account/reporting/reports_main.php:197
-# c:\Apache2\htdocs\account/reporting/reports_main.php:201
-# c:\Apache2\htdocs\account/reporting/reports_main.php:206
-# c:\Apache2\htdocs\account/reporting/reports_main.php:212
-# c:\Apache2\htdocs\account/reporting/reports_main.php:218
-# c:\Apache2\htdocs\account/reporting/reports_main.php:227
-# c:\Apache2\htdocs\account/reporting/reports_main.php:230
-# c:\Apache2\htdocs\account/reporting/reports_main.php:234
-# c:\Apache2\htdocs\account/reporting/reports_main.php:239
-# c:\Apache2\htdocs\account/reporting/reports_main.php:244
-# c:\Apache2\htdocs\account/reporting/reports_main.php:250
-# c:\Apache2\htdocs\account/sales/view/view_sales_order.php:63
-# c:\Apache2\htdocs\account/reporting/includes/pdf_report.inc:238
-#: c:\Apache2\htdocs\account2/admin/backups.php:95
+#: c:\Apache2\htdocs\account2/admin/backups.php:96
 #: c:\Apache2\htdocs\account2/reporting/reports_main.php:25
 #: c:\Apache2\htdocs\account2/reporting/reports_main.php:32
 #: c:\Apache2\htdocs\account2/reporting/reports_main.php:36
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:42
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:49
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:54
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:62
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:67
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:73
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:81
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:88
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:95
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:100
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:103
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:110
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:117
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:121
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:126
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:132
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:43
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:50
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:55
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:63
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:68
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:74
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:82
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:89
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:96
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:101
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:104
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:111
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:118
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:122
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:127
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:134
 #: c:\Apache2\htdocs\account2/reporting/reports_main.php:140
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:155
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:160
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:172
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:177
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:184
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:148
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:163
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:168
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:180
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:185
 #: c:\Apache2\htdocs\account2/reporting/reports_main.php:192
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:199
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:209
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:213
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:219
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:226
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:232
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:241
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:244
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:200
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:207
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:217
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:221
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:227
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:234
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:240
 #: c:\Apache2\htdocs\account2/reporting/reports_main.php:249
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:255
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:260
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:266
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:252
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:257
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:263
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:268
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:274
 #: c:\Apache2\htdocs\account2/sales/view/view_sales_order.php:60
-#: c:\Apache2\htdocs\account2/reporting/includes/pdf_report.inc:238
+#: c:\Apache2\htdocs\account2/reporting/includes/pdf_report.inc:221
+#: c:\Apache2\htdocs\account2/reporting/includes/backup/pdf_report.inc:234
+#: c:\Apache2\htdocs\account2/reporting/includes/backup2/pdf_report.inc:234
 msgid "Comments"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/backups.php:144
-#: c:\Apache2\htdocs\account2/admin/backups.php:144
+#: c:\Apache2\htdocs\account2/admin/backups.php:145
 msgid "File successfully deleted."
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/backups.php:145
-# c:\Apache2\htdocs\account/admin/backups.php:162
-#: c:\Apache2\htdocs\account2/admin/backups.php:145
-#: c:\Apache2\htdocs\account2/admin/backups.php:162
-#: c:\Apache2\htdocs\account2/admin/inst_module.php:265
+#: c:\Apache2\htdocs\account2/admin/backups.php:146
+#: c:\Apache2\htdocs\account2/admin/backups.php:164
+#: c:\Apache2\htdocs\account2/admin/inst_module.php:267
 msgid "Filename"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/backups.php:152
-#: c:\Apache2\htdocs\account2/admin/backups.php:152
+#: c:\Apache2\htdocs\account2/admin/backups.php:153
 msgid "Backup is being downloaded..."
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/backups.php:161
-#: c:\Apache2\htdocs\account2/admin/backups.php:161
+#: c:\Apache2\htdocs\account2/admin/backups.php:163
 msgid "Backup successfully generated."
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/backups.php:176
-#: c:\Apache2\htdocs\account2/admin/backups.php:176
+#: c:\Apache2\htdocs\account2/admin/backups.php:178
 msgid "Restore backup completed."
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/backups.php:186
-#: c:\Apache2\htdocs\account2/admin/backups.php:186
+#: c:\Apache2\htdocs\account2/admin/backups.php:188
 msgid "Uploaded file has been restored."
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/backups.php:190
-#: c:\Apache2\htdocs\account2/admin/backups.php:190
+#: c:\Apache2\htdocs\account2/admin/backups.php:192
 msgid "Backup was not uploaded into the system."
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/backups.php:235
-# c:\Apache2\htdocs\account/admin/create_coy.php:163
-# c:\Apache2\htdocs\account/admin/fiscalyears.php:138
-# c:\Apache2\htdocs\account/admin/inst_lang.php:255
-# c:\Apache2\htdocs\account/dimensions/inquiry/search_dimensions.php:144
-# c:\Apache2\htdocs\account/gl/manage/gl_account_classes.php:108
-# c:\Apache2\htdocs\account/manufacturing/search_work_orders.php:133
-# c:\Apache2\htdocs\account/reporting/rep104.php:82
-# c:\Apache2\htdocs\account/reporting/rep501.php:99
-# c:\Apache2\htdocs\account/taxes/item_tax_types.php:114
-# c:\Apache2\htdocs\account/taxes/tax_groups.php:156
-# c:\Apache2\htdocs\account/taxes/tax_types.php:109
-# c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:1467
-#: c:\Apache2\htdocs\account2/admin/backups.php:238
-#: c:\Apache2\htdocs\account2/admin/create_coy.php:202
-#: c:\Apache2\htdocs\account2/admin/fiscalyears.php:143
-#: c:\Apache2\htdocs\account2/admin/inst_lang.php:263
-#: c:\Apache2\htdocs\account2/dimensions/inquiry/search_dimensions.php:146
-#: c:\Apache2\htdocs\account2/gl/manage/gl_account_classes.php:109
-#: c:\Apache2\htdocs\account2/manufacturing/search_work_orders.php:133
-#: c:\Apache2\htdocs\account2/reporting/rep104.php:82
+#: c:\Apache2\htdocs\account2/admin/backups.php:240
+#: c:\Apache2\htdocs\account2/admin/create_coy.php:223
+#: c:\Apache2\htdocs\account2/admin/fiscalyears.php:134
+#: c:\Apache2\htdocs\account2/admin/inst_lang.php:265
+#: c:\Apache2\htdocs\account2/dimensions/inquiry/search_dimensions.php:172
+#: c:\Apache2\htdocs\account2/gl/manage/gl_account_classes.php:106
+#: c:\Apache2\htdocs\account2/reporting/rep104.php:76
 #: c:\Apache2\htdocs\account2/reporting/rep106.php:62
 #: c:\Apache2\htdocs\account2/reporting/rep501.php:99
-#: c:\Apache2\htdocs\account2/sales/manage/sales_types.php:102
-#: c:\Apache2\htdocs\account2/taxes/item_tax_types.php:116
-#: c:\Apache2\htdocs\account2/taxes/tax_groups.php:153
-#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:1679
+#: c:\Apache2\htdocs\account2/sales/manage/sales_types.php:118
+#: c:\Apache2\htdocs\account2/taxes/item_tax_types.php:115
+#: c:\Apache2\htdocs\account2/taxes/tax_groups.php:150
+#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:1366
+#: c:\Apache2\htdocs\account2/reporting/includes/reports_classes.inc:170
 msgid "No"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/backups.php:267
-#: c:\Apache2\htdocs\account2/admin/backups.php:270
+#: c:\Apache2\htdocs\account2/admin/backups.php:272
 msgid "cannot find backup directory"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/company_preferences.php:7
-# c:\Apache2\htdocs\account/applications/setup.php:9
-# c:\Apache2\htdocs\account/applications/setup.php:10
+#: c:\Apache2\htdocs\account2/admin/change_current_user_password.php:7
+#: c:\Apache2\htdocs\account2/admin/change_current_user_password.php:84
+#: c:\Apache2\htdocs\account2/themes/aqua/renderer.php:51
+#: c:\Apache2\htdocs\account2/themes/cool/renderer.php:51
+#: c:\Apache2\htdocs\account2/themes/default/renderer.php:51
+#: c:\Apache2\htdocs\account2/themes/fancy/renderer.php:30
+#: c:\Apache2\htdocs\account2/themes/picme/renderer.php:30
+msgid "Change password"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/admin/change_current_user_password.php:22
+#: c:\Apache2\htdocs\account2/admin/users.php:31
+msgid "The password entered must be at least 4 characters long."
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/admin/change_current_user_password.php:29
+#: c:\Apache2\htdocs\account2/admin/users.php:38
+msgid "The password cannot contain the user login."
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/admin/change_current_user_password.php:36
+msgid "The passwords entered are not the same."
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/admin/change_current_user_password.php:50
+msgid "Your password has been updated."
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/admin/change_current_user_password.php:65
+#: c:\Apache2\htdocs\account2/admin/users.php:155
+msgid "User login:"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/admin/change_current_user_password.php:71
+#: c:\Apache2\htdocs\account2/admin/users.php:163
+msgid "Password:"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/admin/change_current_user_password.php:76
+msgid "Repeat password:"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/admin/change_current_user_password.php:80
+msgid "Enter your new password in the fields."
+msgstr ""
+
 #: c:\Apache2\htdocs\account2/admin/company_preferences.php:7
 #: c:\Apache2\htdocs\account2/applications/setup.php:11
 #: c:\Apache2\htdocs\account2/applications/setup.php:12
 msgid "Company Setup"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/company_preferences.php:24
-#: c:\Apache2\htdocs\account2/admin/company_preferences.php:24
+#: c:\Apache2\htdocs\account2/admin/company_preferences.php:23
 msgid "The company name must be entered."
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/company_preferences.php:34
-#: c:\Apache2\htdocs\account2/admin/company_preferences.php:36
+#: c:\Apache2\htdocs\account2/admin/company_preferences.php:40
+#: c:\Apache2\htdocs\account2/inventory/manage/items.php:55
+msgid "Only jpg files are supported - a file extension of .jpg is expected"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/admin/company_preferences.php:45
+#: c:\Apache2\htdocs\account2/inventory/manage/items.php:60
+msgid "The file size is over the maximum allowed. The maximum size allowed in KB is"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/admin/company_preferences.php:50
+#: c:\Apache2\htdocs\account2/inventory/manage/items.php:65
+msgid "Only graphics files can be uploaded"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/admin/company_preferences.php:58
+#: c:\Apache2\htdocs\account2/inventory/manage/items.php:73
+msgid "The existing image could not be removed"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/admin/company_preferences.php:68
+msgid "Error uploading logo file"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/admin/company_preferences.php:80
 msgid "Company setup has been updated."
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/company_preferences.php:69
-#: c:\Apache2\htdocs\account2/admin/company_preferences.php:74
+#: c:\Apache2\htdocs\account2/admin/company_preferences.php:120
 msgid "Name (to appear on reports):"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/company_preferences.php:70
-#: c:\Apache2\htdocs\account2/admin/company_preferences.php:75
+#: c:\Apache2\htdocs\account2/admin/company_preferences.php:121
 msgid "Official Company Number:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/company_preferences.php:71
-#: c:\Apache2\htdocs\account2/admin/company_preferences.php:76
+#: c:\Apache2\htdocs\account2/admin/company_preferences.php:122
 msgid "Tax Authority Reference:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/company_preferences.php:73
-#: c:\Apache2\htdocs\account2/admin/company_preferences.php:78
+#: c:\Apache2\htdocs\account2/admin/company_preferences.php:124
 msgid "Tax Periods:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/company_preferences.php:73
-#: c:\Apache2\htdocs\account2/admin/company_preferences.php:78
+#: c:\Apache2\htdocs\account2/admin/company_preferences.php:124
 msgid "Months."
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/company_preferences.php:74
-#: c:\Apache2\htdocs\account2/admin/company_preferences.php:79
+#: c:\Apache2\htdocs\account2/admin/company_preferences.php:125
 msgid "Tax Last Period:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/company_preferences.php:74
-#: c:\Apache2\htdocs\account2/admin/company_preferences.php:79
+#: c:\Apache2\htdocs\account2/admin/company_preferences.php:125
 msgid "Months back."
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/company_preferences.php:76
-#: c:\Apache2\htdocs\account2/admin/company_preferences.php:81
+#: c:\Apache2\htdocs\account2/admin/company_preferences.php:127
 msgid "Home Currency:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/company_preferences.php:77
-#: c:\Apache2\htdocs\account2/admin/company_preferences.php:82
-#: c:\Apache2\htdocs\account2/gl/gl_budget.php:97
+#: c:\Apache2\htdocs\account2/admin/company_preferences.php:128
+#: c:\Apache2\htdocs\account2/gl/gl_budget.php:102
 msgid "Fiscal Year:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/company_preferences.php:79
-# c:\Apache2\htdocs\account/admin/shipping_companies.php:154
-# c:\Apache2\htdocs\account/inventory/manage/locations.php:170
-# c:\Apache2\htdocs\account/purchasing/manage/suppliers.php:185
-# c:\Apache2\htdocs\account/sales/manage/customers.php:274
-# c:\Apache2\htdocs\account/sales/includes/ui/sales_order_ui.inc:364
-#: c:\Apache2\htdocs\account2/admin/company_preferences.php:84
-#: c:\Apache2\htdocs\account2/admin/shipping_companies.php:155
-#: c:\Apache2\htdocs\account2/inventory/manage/locations.php:172
-#: c:\Apache2\htdocs\account2/purchasing/manage/suppliers.php:185
-#: c:\Apache2\htdocs\account2/sales/manage/customers.php:254
-#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:413
+#: c:\Apache2\htdocs\account2/admin/company_preferences.php:130
+#: c:\Apache2\htdocs\account2/admin/shipping_companies.php:154
+#: c:\Apache2\htdocs\account2/inventory/manage/locations.php:173
+#: c:\Apache2\htdocs\account2/purchasing/manage/suppliers.php:181
+#: c:\Apache2\htdocs\account2/sales/manage/customers.php:224
+#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:427
 msgid "Address:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/company_preferences.php:81
-#: c:\Apache2\htdocs\account2/admin/company_preferences.php:86
+#: c:\Apache2\htdocs\account2/admin/company_preferences.php:132
 msgid "Telephone Number:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/company_preferences.php:82
-#: c:\Apache2\htdocs\account2/admin/company_preferences.php:87
+#: c:\Apache2\htdocs\account2/admin/company_preferences.php:133
 msgid "Facsimile Number:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/company_preferences.php:83
-# c:\Apache2\htdocs\account/admin/users.php:195
-#: c:\Apache2\htdocs\account2/admin/company_preferences.php:88
-#: c:\Apache2\htdocs\account2/admin/users.php:198
+#: c:\Apache2\htdocs\account2/admin/company_preferences.php:134
+#: c:\Apache2\htdocs\account2/admin/users.php:176
 msgid "Email Address:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/company_preferences.php:84
-#: c:\Apache2\htdocs\account2/admin/company_preferences.php:89
+#: c:\Apache2\htdocs\account2/admin/company_preferences.php:135
 msgid "Company Logo:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/company_preferences.php:85
-#: c:\Apache2\htdocs\account2/admin/company_preferences.php:90
+#: c:\Apache2\htdocs\account2/admin/company_preferences.php:136
+msgid "New Company Logo (.jpg)"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/admin/company_preferences.php:138
 msgid "Domicile:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/company_preferences.php:87
-#: c:\Apache2\htdocs\account2/admin/company_preferences.php:92
+#: c:\Apache2\htdocs\account2/admin/company_preferences.php:140
 msgid "Use Dimensions:"
 msgstr ""
 
-#: c:\Apache2\htdocs\account2/admin/company_preferences.php:94
-msgid "No Item List"
+#: c:\Apache2\htdocs\account2/admin/company_preferences.php:141
+msgid "Base for auto price calculations:"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/admin/company_preferences.php:142
+msgid "No base price list"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/admin/company_preferences.php:144
+msgid "Search Item List"
 msgstr ""
 
-#: c:\Apache2\htdocs\account2/admin/company_preferences.php:95
-msgid "No Customer List"
+#: c:\Apache2\htdocs\account2/admin/company_preferences.php:145
+msgid "Search Customer List"
 msgstr ""
 
-#: c:\Apache2\htdocs\account2/admin/company_preferences.php:96
-msgid "No Supplier List"
+#: c:\Apache2\htdocs\account2/admin/company_preferences.php:146
+msgid "Search Supplier List"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/company_preferences.php:91
-#: c:\Apache2\htdocs\account2/admin/company_preferences.php:100
+#: c:\Apache2\htdocs\account2/admin/company_preferences.php:150
 msgid "Custom Field Name"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/company_preferences.php:91
-#: c:\Apache2\htdocs\account2/admin/company_preferences.php:100
+#: c:\Apache2\htdocs\account2/admin/company_preferences.php:150
 msgid "Custom Field Value"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/company_preferences.php:110
-# c:\Apache2\htdocs\account/admin/display_prefs.php:89
-# c:\Apache2\htdocs\account/admin/forms_setup.php:45
-# c:\Apache2\htdocs\account/admin/gl_setup.php:191
-# c:\Apache2\htdocs\account/gl/gl_deposit.php:245
-# c:\Apache2\htdocs\account/gl/gl_payment.php:246
-# c:\Apache2\htdocs\account/inventory/adjustments.php:226
-# c:\Apache2\htdocs\account/inventory/cost_update.php:112
-# c:\Apache2\htdocs\account/inventory/reorder_level.php:78
-# c:\Apache2\htdocs\account/inventory/transfers.php:237
-# c:\Apache2\htdocs\account/inventory/transfers.php:241
-# c:\Apache2\htdocs\account/manufacturing/work_order_issue.php:192
-# c:\Apache2\htdocs\account/purchasing/po_receive_items.php:291
-# c:\Apache2\htdocs\account/purchasing/allocations/supplier_allocate.php:244
-# c:\Apache2\htdocs\account/sales/credit_note_entry.php:269
-# c:\Apache2\htdocs\account/sales/customer_credit_invoice.php:385
-# c:\Apache2\htdocs\account/sales/customer_invoice.php:479
-# c:\Apache2\htdocs\account/sales/allocations/customer_allocate.php:236
-# c:\Apache2\htdocs\account/gl/includes/ui/gl_deposit_ui.inc:223
-# c:\Apache2\htdocs\account/gl/includes/ui/gl_journal_ui.inc:171
-# c:\Apache2\htdocs\account/gl/includes/ui/gl_payment_ui.inc:222
-# c:\Apache2\htdocs\account/includes/ui/ui_input.inc:47
-# c:\Apache2\htdocs\account/inventory/includes/item_adjustments_ui.inc:158
-# c:\Apache2\htdocs\account/inventory/includes/stock_transfers_ui.inc:142
-# c:\Apache2\htdocs\account/manufacturing/includes/work_order_issue_ui.inc:125
-# c:\Apache2\htdocs\account/purchasing/includes/ui/po_ui.inc:320
-# c:\Apache2\htdocs\account/sales/includes/ui/sales_credit_ui.inc:212
-# c:\Apache2\htdocs\account/sales/includes/ui/sales_order_ui.inc:327
-#: c:\Apache2\htdocs\account2/admin/company_preferences.php:119
-#: c:\Apache2\htdocs\account2/admin/display_prefs.php:91
+#: c:\Apache2\htdocs\account2/admin/company_preferences.php:169
+#: c:\Apache2\htdocs\account2/admin/display_prefs.php:93
 #: c:\Apache2\htdocs\account2/admin/forms_setup.php:45
-#: c:\Apache2\htdocs\account2/admin/gl_setup.php:192
-#: c:\Apache2\htdocs\account2/gl/gl_deposit.php:250
-#: c:\Apache2\htdocs\account2/gl/gl_payment.php:247
-#: c:\Apache2\htdocs\account2/inventory/adjustments.php:230
-#: c:\Apache2\htdocs\account2/inventory/cost_update.php:116
-#: c:\Apache2\htdocs\account2/inventory/reorder_level.php:81
-#: c:\Apache2\htdocs\account2/inventory/transfers.php:246
-#: c:\Apache2\htdocs\account2/inventory/transfers.php:250
-#: c:\Apache2\htdocs\account2/manufacturing/work_order_issue.php:201
-#: c:\Apache2\htdocs\account2/purchasing/po_receive_items.php:296
-#: c:\Apache2\htdocs\account2/purchasing/allocations/supplier_allocate.php:247
-#: c:\Apache2\htdocs\account2/sales/credit_note_entry.php:247
-#: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:364
-#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:438
-#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:432
-#: c:\Apache2\htdocs\account2/sales/allocations/customer_allocate.php:247
-#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_deposit_ui.inc:223
-#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_journal_ui.inc:175
-#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_payment_ui.inc:225
-#: c:\Apache2\htdocs\account2/includes/ui/ui_input.inc:75
-#: c:\Apache2\htdocs\account2/inventory/includes/item_adjustments_ui.inc:160
-#: c:\Apache2\htdocs\account2/inventory/includes/stock_transfers_ui.inc:142
-#: c:\Apache2\htdocs\account2/manufacturing/includes/work_order_issue_ui.inc:125
-#: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:329
-#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_credit_ui.inc:230
-#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:365
+#: c:\Apache2\htdocs\account2/admin/gl_setup.php:187
+#: c:\Apache2\htdocs\account2/dimensions/dimension_entry.php:252
+#: c:\Apache2\htdocs\account2/gl/gl_bank.php:255
+#: c:\Apache2\htdocs\account2/gl/gl_budget.php:178
+#: c:\Apache2\htdocs\account2/inventory/adjustments.php:224
+#: c:\Apache2\htdocs\account2/inventory/cost_update.php:120
+#: c:\Apache2\htdocs\account2/inventory/reorder_level.php:86
+#: c:\Apache2\htdocs\account2/inventory/transfers.php:226
+#: c:\Apache2\htdocs\account2/manufacturing/work_order_entry.php:402
+#: c:\Apache2\htdocs\account2/purchasing/po_receive_items.php:302
+#: c:\Apache2\htdocs\account2/sales/credit_note_entry.php:244
+#: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:380
+#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:449
+#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:459
+#: c:\Apache2\htdocs\account2/sales/inquiry/sales_orders_view.php:285
+#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_bank_ui.inc:237
+#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_journal_ui.inc:176
+#: c:\Apache2\htdocs\account2/includes/ui/ui_input.inc:149
+#: c:\Apache2\htdocs\account2/inventory/includes/item_adjustments_ui.inc:155
+#: c:\Apache2\htdocs\account2/inventory/includes/stock_transfers_ui.inc:135
+#: c:\Apache2\htdocs\account2/manufacturing/includes/work_order_issue_ui.inc:117
+#: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:328
+#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_credit_ui.inc:271
+#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:376
 msgid "Update"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/create_coy.php:12
 #: c:\Apache2\htdocs\account2/admin/create_coy.php:12
 msgid "Create/Update Company"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/create_coy.php:79
-#: c:\Apache2\htdocs\account2/admin/create_coy.php:88
+#: c:\Apache2\htdocs\account2/admin/create_coy.php:43
+msgid "This database settings are already used by another company."
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/admin/create_coy.php:48
+msgid "You cannot have table set without prefix together with prefixed sets in the same database."
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/admin/create_coy.php:109
 msgid "Error creating Database: "
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/create_coy.php:79
-#: c:\Apache2\htdocs\account2/admin/create_coy.php:88
+#: c:\Apache2\htdocs\account2/admin/create_coy.php:109
 msgid ", Please create it manually"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/create_coy.php:91
-#: c:\Apache2\htdocs\account2/admin/create_coy.php:103
+#: c:\Apache2\htdocs\account2/admin/create_coy.php:124
 msgid "Error uploading Database Script, please upload it manually"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/create_coy.php:67
-# c:\Apache2\htdocs\account/admin/create_coy.php:120
-#: c:\Apache2\htdocs\account2/admin/create_coy.php:111
-#: c:\Apache2\htdocs\account2/admin/create_coy.php:153
+#: c:\Apache2\htdocs\account2/admin/create_coy.php:132
+#: c:\Apache2\htdocs\account2/admin/create_coy.php:174
 msgid "Cannot open the configuration file - "
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/create_coy.php:69
-# c:\Apache2\htdocs\account/admin/create_coy.php:122
-#: c:\Apache2\htdocs\account2/admin/create_coy.php:113
-#: c:\Apache2\htdocs\account2/admin/create_coy.php:155
+#: c:\Apache2\htdocs\account2/admin/create_coy.php:134
+#: c:\Apache2\htdocs\account2/admin/create_coy.php:176
 msgid "Cannot write to the configuration file - "
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/create_coy.php:71
-# c:\Apache2\htdocs\account/admin/create_coy.php:124
-#: c:\Apache2\htdocs\account2/admin/create_coy.php:115
-#: c:\Apache2\htdocs\account2/admin/create_coy.php:157
+#: c:\Apache2\htdocs\account2/admin/create_coy.php:136
+#: c:\Apache2\htdocs\account2/admin/create_coy.php:178
 msgid "The configuration file "
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/create_coy.php:71
-# c:\Apache2\htdocs\account/admin/create_coy.php:124
-# c:\Apache2\htdocs\account/admin/inst_lang.php:136
-#: c:\Apache2\htdocs\account2/admin/create_coy.php:115
-#: c:\Apache2\htdocs\account2/admin/create_coy.php:157
-#: c:\Apache2\htdocs\account2/admin/inst_lang.php:136
-#: c:\Apache2\htdocs\account2/admin/inst_module.php:169
+#: c:\Apache2\htdocs\account2/admin/create_coy.php:136
+#: c:\Apache2\htdocs\account2/admin/create_coy.php:178
+#: c:\Apache2\htdocs\account2/admin/inst_lang.php:138
+#: c:\Apache2\htdocs\account2/admin/inst_module.php:171
 msgid " is not writable. Change its permissions so it is, then re-run the operation."
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/create_coy.php:128
-#: c:\Apache2\htdocs\account2/admin/create_coy.php:147
+#: c:\Apache2\htdocs\account2/admin/create_coy.php:168
 msgid "Error removing Database: "
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/create_coy.php:128
-#: c:\Apache2\htdocs\account2/admin/create_coy.php:147
+#: c:\Apache2\htdocs\account2/admin/create_coy.php:168
 msgid ", please remove it manuallly"
 msgstr ""
 
-#: c:\Apache2\htdocs\account2/admin/create_coy.php:165
+#: c:\Apache2\htdocs\account2/admin/create_coy.php:186
 msgid "Cannot remove company data directory "
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/create_coy.php:144
-#: c:\Apache2\htdocs\account2/admin/create_coy.php:183
+#: c:\Apache2\htdocs\account2/admin/create_coy.php:204
 msgid "Are you sure you want to delete company no. "
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/create_coy.php:151
-# c:\Apache2\htdocs\account/admin/create_coy.php:232
-#: c:\Apache2\htdocs\account2/admin/create_coy.php:190
-#: c:\Apache2\htdocs\account2/admin/create_coy.php:272
+#: c:\Apache2\htdocs\account2/admin/create_coy.php:211
+#: c:\Apache2\htdocs\account2/admin/create_coy.php:293
 msgid "Company"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/create_coy.php:151
-#: c:\Apache2\htdocs\account2/admin/create_coy.php:190
+#: c:\Apache2\htdocs\account2/admin/create_coy.php:211
 msgid "Database Host"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/create_coy.php:151
-# c:\Apache2\htdocs\account/admin/create_coy.php:234
-#: c:\Apache2\htdocs\account2/admin/create_coy.php:190
-#: c:\Apache2\htdocs\account2/admin/create_coy.php:274
+#: c:\Apache2\htdocs\account2/admin/create_coy.php:211
+#: c:\Apache2\htdocs\account2/admin/create_coy.php:295
 msgid "Database User"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/create_coy.php:152
-# c:\Apache2\htdocs\account/admin/create_coy.php:236
-#: c:\Apache2\htdocs\account2/admin/create_coy.php:191
-#: c:\Apache2\htdocs\account2/admin/create_coy.php:277
+#: c:\Apache2\htdocs\account2/admin/create_coy.php:212
+#: c:\Apache2\htdocs\account2/admin/create_coy.php:298
 msgid "Database Name"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/create_coy.php:152
-# c:\Apache2\htdocs\account/admin/create_coy.php:238
-# c:\Apache2\htdocs\account/admin/create_coy.php:240
-#: c:\Apache2\htdocs\account2/admin/create_coy.php:191
-#: c:\Apache2\htdocs\account2/admin/create_coy.php:279
-#: c:\Apache2\htdocs\account2/admin/create_coy.php:281
+#: c:\Apache2\htdocs\account2/admin/create_coy.php:212
+#: c:\Apache2\htdocs\account2/admin/create_coy.php:300
+#: c:\Apache2\htdocs\account2/admin/create_coy.php:302
 msgid "Table Pref"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/create_coy.php:152
-# c:\Apache2\htdocs\account/admin/create_coy.php:241
-#: c:\Apache2\htdocs\account2/admin/create_coy.php:191
-#: c:\Apache2\htdocs\account2/admin/create_coy.php:282
+#: c:\Apache2\htdocs\account2/admin/create_coy.php:212
+#: c:\Apache2\htdocs\account2/admin/create_coy.php:303
 msgid "Default"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/create_coy.php:161
-# c:\Apache2\htdocs\account/admin/fiscalyears.php:142
-# c:\Apache2\htdocs\account/admin/inst_lang.php:253
-# c:\Apache2\htdocs\account/dimensions/inquiry/search_dimensions.php:144
-# c:\Apache2\htdocs\account/gl/manage/gl_account_classes.php:112
-# c:\Apache2\htdocs\account/manufacturing/search_work_orders.php:133
-# c:\Apache2\htdocs\account/reporting/rep104.php:84
-# c:\Apache2\htdocs\account/reporting/rep501.php:97
-# c:\Apache2\htdocs\account/taxes/item_tax_types.php:118
-# c:\Apache2\htdocs\account/taxes/tax_groups.php:154
-# c:\Apache2\htdocs\account/taxes/tax_types.php:107
-# c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:1459
-# c:\Apache2\htdocs\account/reporting/includes/reports_classes.inc:159
-#: c:\Apache2\htdocs\account2/admin/create_coy.php:200
-#: c:\Apache2\htdocs\account2/admin/fiscalyears.php:147
-#: c:\Apache2\htdocs\account2/admin/inst_lang.php:261
-#: c:\Apache2\htdocs\account2/dimensions/inquiry/search_dimensions.php:146
-#: c:\Apache2\htdocs\account2/gl/manage/gl_account_classes.php:113
-#: c:\Apache2\htdocs\account2/manufacturing/search_work_orders.php:133
-#: c:\Apache2\htdocs\account2/reporting/rep104.php:84
+#: c:\Apache2\htdocs\account2/admin/create_coy.php:221
+#: c:\Apache2\htdocs\account2/admin/fiscalyears.php:138
+#: c:\Apache2\htdocs\account2/admin/inst_lang.php:263
+#: c:\Apache2\htdocs\account2/dimensions/inquiry/search_dimensions.php:172
+#: c:\Apache2\htdocs\account2/gl/manage/gl_account_classes.php:110
+#: c:\Apache2\htdocs\account2/reporting/rep104.php:78
 #: c:\Apache2\htdocs\account2/reporting/rep106.php:64
 #: c:\Apache2\htdocs\account2/reporting/rep501.php:97
-#: c:\Apache2\htdocs\account2/sales/manage/sales_types.php:102
-#: c:\Apache2\htdocs\account2/taxes/item_tax_types.php:120
-#: c:\Apache2\htdocs\account2/taxes/tax_groups.php:151
-#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:1671
-#: c:\Apache2\htdocs\account2/reporting/includes/reports_classes.inc:164
+#: c:\Apache2\htdocs\account2/sales/manage/sales_types.php:118
+#: c:\Apache2\htdocs\account2/taxes/item_tax_types.php:119
+#: c:\Apache2\htdocs\account2/taxes/tax_groups.php:148
+#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:1365
+#: c:\Apache2\htdocs\account2/reporting/includes/reports_classes.inc:170
 msgid "Yes"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/create_coy.php:176
-# c:\Apache2\htdocs\account/dimensions/inquiry/search_dimensions.php:147
-# c:\Apache2\htdocs\account/manufacturing/search_work_orders.php:142
-# c:\Apache2\htdocs\account/purchasing/inquiry/po_search.php:143
-# c:\Apache2\htdocs\account/sales/inquiry/sales_orders_view.php:165
-# c:\Apache2\htdocs\account/includes/ui/ui_controls.inc:149
-# c:\Apache2\htdocs\account/purchasing/includes/ui/invoice_ui.inc:187
-# c:\Apache2\htdocs\account/purchasing/includes/ui/invoice_ui.inc:295
-#: c:\Apache2\htdocs\account2/admin/create_coy.php:214
-#: c:\Apache2\htdocs\account2/dimensions/inquiry/search_dimensions.php:149
-#: c:\Apache2\htdocs\account2/manufacturing/search_work_orders.php:142
-#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search.php:148
-#: c:\Apache2\htdocs\account2/sales/inquiry/customer_inquiry.php:260
-#: c:\Apache2\htdocs\account2/sales/inquiry/sales_deliveries_view.php:243
-#: c:\Apache2\htdocs\account2/sales/inquiry/sales_orders_view.php:244
-#: c:\Apache2\htdocs\account2/includes/ui/ui_controls.inc:155
+#: c:\Apache2\htdocs\account2/admin/create_coy.php:235
+#: c:\Apache2\htdocs\account2/admin/fiscalyears.php:143
+#: c:\Apache2\htdocs\account2/admin/payment_terms.php:166
+#: c:\Apache2\htdocs\account2/admin/shipping_companies.php:115
+#: c:\Apache2\htdocs\account2/admin/users.php:120
+#: c:\Apache2\htdocs\account2/dimensions/inquiry/search_dimensions.php:175
+#: c:\Apache2\htdocs\account2/gl/manage/bank_accounts.php:108
+#: c:\Apache2\htdocs\account2/gl/manage/bank_trans_types.php:100
+#: c:\Apache2\htdocs\account2/gl/manage/currencies.php:166
+#: c:\Apache2\htdocs\account2/gl/manage/exchange_rates.php:102
+#: c:\Apache2\htdocs\account2/gl/manage/gl_account_classes.php:115
+#: c:\Apache2\htdocs\account2/gl/manage/gl_account_types.php:135
+#: c:\Apache2\htdocs\account2/inventory/prices.php:139
+#: c:\Apache2\htdocs\account2/inventory/purchasing_data.php:152
+#: c:\Apache2\htdocs\account2/inventory/manage/item_categories.php:88
+#: c:\Apache2\htdocs\account2/inventory/manage/item_units.php:89
+#: c:\Apache2\htdocs\account2/inventory/manage/locations.php:129
+#: c:\Apache2\htdocs\account2/inventory/manage/movement_types.php:97
+#: c:\Apache2\htdocs\account2/manufacturing/search_work_orders.php:149
+#: c:\Apache2\htdocs\account2/manufacturing/manage/bom_edit.php:110
+#: c:\Apache2\htdocs\account2/manufacturing/manage/work_centres.php:107
+#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search.php:173
+#: c:\Apache2\htdocs\account2/sales/inquiry/customer_inquiry.php:271
+#: c:\Apache2\htdocs\account2/sales/inquiry/sales_deliveries_view.php:262
+#: c:\Apache2\htdocs\account2/sales/inquiry/sales_orders_view.php:264
+#: c:\Apache2\htdocs\account2/sales/manage/credit_status.php:110
+#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:195
+#: c:\Apache2\htdocs\account2/sales/manage/sales_areas.php:92
+#: c:\Apache2\htdocs\account2/sales/manage/sales_people.php:125
+#: c:\Apache2\htdocs\account2/sales/manage/sales_types.php:119
+#: c:\Apache2\htdocs\account2/taxes/item_tax_types.php:124
+#: c:\Apache2\htdocs\account2/taxes/tax_groups.php:156
+#: c:\Apache2\htdocs\account2/taxes/tax_types.php:112
+#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_bank_ui.inc:144
+#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_journal_ui.inc:87
+#: c:\Apache2\htdocs\account2/includes/ui/ui_controls.inc:157
+#: c:\Apache2\htdocs\account2/inventory/includes/item_adjustments_ui.inc:89
+#: c:\Apache2\htdocs\account2/inventory/includes/stock_transfers_ui.inc:78
+#: c:\Apache2\htdocs\account2/manufacturing/includes/work_order_issue_ui.inc:49
 #: c:\Apache2\htdocs\account2/purchasing/includes/ui/invoice_ui.inc:181
-#: c:\Apache2\htdocs\account2/purchasing/includes/ui/invoice_ui.inc:289
-#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:129
+#: c:\Apache2\htdocs\account2/purchasing/includes/ui/invoice_ui.inc:291
+#: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:193
+#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_credit_ui.inc:182
+#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:126
 msgid "Edit"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/create_coy.php:178
-# c:\Apache2\htdocs\account/admin/inst_lang.php:259
-# c:\Apache2\htdocs\account/includes/ui/ui_controls.inc:154
-#: c:\Apache2\htdocs\account2/admin/create_coy.php:216
-#: c:\Apache2\htdocs\account2/admin/inst_lang.php:267
-#: c:\Apache2\htdocs\account2/admin/inst_module.php:280
-#: c:\Apache2\htdocs\account2/gl/gl_budget.php:170
-#: c:\Apache2\htdocs\account2/includes/ui/ui_controls.inc:160
-#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:130
+#: c:\Apache2\htdocs\account2/admin/create_coy.php:237
+#: c:\Apache2\htdocs\account2/admin/fiscalyears.php:145
+#: c:\Apache2\htdocs\account2/admin/inst_lang.php:270
+#: c:\Apache2\htdocs\account2/admin/inst_module.php:282
+#: c:\Apache2\htdocs\account2/admin/payment_terms.php:167
+#: c:\Apache2\htdocs\account2/admin/shipping_companies.php:116
+#: c:\Apache2\htdocs\account2/admin/users.php:123
+#: c:\Apache2\htdocs\account2/gl/gl_budget.php:180
+#: c:\Apache2\htdocs\account2/gl/manage/bank_accounts.php:109
+#: c:\Apache2\htdocs\account2/gl/manage/bank_trans_types.php:101
+#: c:\Apache2\htdocs\account2/gl/manage/currencies.php:168
+#: c:\Apache2\htdocs\account2/gl/manage/exchange_rates.php:103
+#: c:\Apache2\htdocs\account2/gl/manage/gl_account_classes.php:116
+#: c:\Apache2\htdocs\account2/gl/manage/gl_account_types.php:136
+#: c:\Apache2\htdocs\account2/inventory/prices.php:140
+#: c:\Apache2\htdocs\account2/inventory/purchasing_data.php:153
+#: c:\Apache2\htdocs\account2/inventory/manage/item_categories.php:89
+#: c:\Apache2\htdocs\account2/inventory/manage/item_units.php:90
+#: c:\Apache2\htdocs\account2/inventory/manage/locations.php:130
+#: c:\Apache2\htdocs\account2/inventory/manage/movement_types.php:98
+#: c:\Apache2\htdocs\account2/manufacturing/manage/bom_edit.php:111
+#: c:\Apache2\htdocs\account2/manufacturing/manage/work_centres.php:108
+#: c:\Apache2\htdocs\account2/sales/manage/credit_status.php:111
+#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:196
+#: c:\Apache2\htdocs\account2/sales/manage/sales_areas.php:93
+#: c:\Apache2\htdocs\account2/sales/manage/sales_people.php:126
+#: c:\Apache2\htdocs\account2/sales/manage/sales_types.php:120
+#: c:\Apache2\htdocs\account2/taxes/item_tax_types.php:125
+#: c:\Apache2\htdocs\account2/taxes/tax_groups.php:157
+#: c:\Apache2\htdocs\account2/taxes/tax_types.php:113
+#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_bank_ui.inc:146
+#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_journal_ui.inc:89
+#: c:\Apache2\htdocs\account2/includes/ui/ui_controls.inc:163
+#: c:\Apache2\htdocs\account2/inventory/includes/item_adjustments_ui.inc:91
+#: c:\Apache2\htdocs\account2/inventory/includes/stock_transfers_ui.inc:80
+#: c:\Apache2\htdocs\account2/manufacturing/includes/work_order_issue_ui.inc:51
+#: c:\Apache2\htdocs\account2/purchasing/includes/ui/invoice_ui.inc:226
+#: c:\Apache2\htdocs\account2/purchasing/includes/ui/invoice_ui.inc:323
+#: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:195
+#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_credit_ui.inc:184
+#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:128
 msgid "Delete"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/create_coy.php:183
-#: c:\Apache2\htdocs\account2/admin/create_coy.php:221
+#: c:\Apache2\htdocs\account2/admin/create_coy.php:242
 msgid "The marked company is the current company which cannot be deleted."
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/create_coy.php:233
-#: c:\Apache2\htdocs\account2/admin/create_coy.php:273
+#: c:\Apache2\htdocs\account2/admin/create_coy.php:294
 msgid "Host"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/create_coy.php:151
-# c:\Apache2\htdocs\account/admin/create_coy.php:235
-#: c:\Apache2\htdocs\account2/admin/create_coy.php:276
+#: c:\Apache2\htdocs\account2/admin/create_coy.php:297
 msgid "Database Password"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/create_coy.php:238
-# c:\Apache2\htdocs\account/gl/manage/gl_account_types.php:167
-# c:\Apache2\htdocs\account/purchasing/allocations/supplier_allocate.php:221
-# c:\Apache2\htdocs\account/sales/allocations/customer_allocate.php:214
-# c:\Apache2\htdocs\account/taxes/tax_groups.php:219
-#: c:\Apache2\htdocs\account2/admin/create_coy.php:279
-#: c:\Apache2\htdocs\account2/gl/manage/gl_account_types.php:168
-#: c:\Apache2\htdocs\account2/purchasing/allocations/supplier_allocate.php:220
-#: c:\Apache2\htdocs\account2/sales/allocations/customer_allocate.php:223
-#: c:\Apache2\htdocs\account2/taxes/tax_groups.php:213
+#: c:\Apache2\htdocs\account2/admin/create_coy.php:300
+#: c:\Apache2\htdocs\account2/gl/manage/gl_account_types.php:162
+#: c:\Apache2\htdocs\account2/purchasing/allocations/supplier_allocate.php:211
+#: c:\Apache2\htdocs\account2/sales/allocations/customer_allocate.php:215
+#: c:\Apache2\htdocs\account2/taxes/tax_groups.php:209
 msgid "None"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/create_coy.php:244
-#: c:\Apache2\htdocs\account2/admin/create_coy.php:285
+#: c:\Apache2\htdocs\account2/admin/create_coy.php:306
 msgid "Database Script"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/create_coy.php:254
-#: c:\Apache2\htdocs\account2/admin/create_coy.php:289
+#: c:\Apache2\htdocs\account2/admin/create_coy.php:310
 msgid "New script Admin Password"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/create_coy.php:249
-#: c:\Apache2\htdocs\account2/admin/create_coy.php:292
-msgid "Choose from Database scripts in SQL folder. No Datase is created without a script."
+#: c:\Apache2\htdocs\account2/admin/create_coy.php:313
+msgid "Choose from Database scripts in SQL folder. No Database is created without a script."
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/create_coy.php:250
-# c:\Apache2\htdocs\account/admin/inst_lang.php:312
-# c:\Apache2\htdocs\account/includes/ui/ui_input.inc:45
-#: c:\Apache2\htdocs\account2/admin/create_coy.php:293
-#: c:\Apache2\htdocs\account2/admin/inst_lang.php:321
-#: c:\Apache2\htdocs\account2/admin/inst_module.php:329
-#: c:\Apache2\htdocs\account2/gl/gl_budget.php:169
-#: c:\Apache2\htdocs\account2/includes/ui/ui_input.inc:73
+#: c:\Apache2\htdocs\account2/admin/create_coy.php:314
+#: c:\Apache2\htdocs\account2/admin/inst_lang.php:324
+#: c:\Apache2\htdocs\account2/admin/inst_module.php:331
+#: c:\Apache2\htdocs\account2/gl/gl_budget.php:179
 msgid "Save"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/create_coy.php:278
-#: c:\Apache2\htdocs\account2/admin/create_coy.php:321
+#: c:\Apache2\htdocs\account2/admin/create_coy.php:342
 msgid "Create a new company"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/display_prefs.php:7
-# c:\Apache2\htdocs\account/applications/setup.php:13
 #: c:\Apache2\htdocs\account2/admin/display_prefs.php:7
 #: c:\Apache2\htdocs\account2/applications/setup.php:15
 msgid "Display Setup"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/display_prefs.php:32
 #: c:\Apache2\htdocs\account2/admin/display_prefs.php:34
 msgid "Display settings have been updated."
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/display_prefs.php:38
 #: c:\Apache2\htdocs\account2/admin/display_prefs.php:40
 msgid "Decimal Places"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/display_prefs.php:40
 #: c:\Apache2\htdocs\account2/admin/display_prefs.php:42
 msgid "Prices/Amounts:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/display_prefs.php:41
 #: c:\Apache2\htdocs\account2/admin/display_prefs.php:43
 msgid "Quantities:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/display_prefs.php:42
 #: c:\Apache2\htdocs\account2/admin/display_prefs.php:44
 msgid "Exchange Rates:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/display_prefs.php:43
 #: c:\Apache2\htdocs\account2/admin/display_prefs.php:45
 msgid "Percentages:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/display_prefs.php:45
 #: c:\Apache2\htdocs\account2/admin/display_prefs.php:47
 msgid "Dateformat and Separators"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/display_prefs.php:47
 #: c:\Apache2\htdocs\account2/admin/display_prefs.php:49
 msgid "Dateformat:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/display_prefs.php:49
 #: c:\Apache2\htdocs\account2/admin/display_prefs.php:51
 msgid "Date Separator:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/display_prefs.php:54
 #: c:\Apache2\htdocs\account2/admin/display_prefs.php:56
 msgid "Thousand Separator:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/display_prefs.php:59
 #: c:\Apache2\htdocs\account2/admin/display_prefs.php:61
 msgid "Decimal Separator:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/display_prefs.php:64
-# c:\Apache2\htdocs\account/applications/setup.php:21
-# c:\Apache2\htdocs\account/includes/types.inc:137
 #: c:\Apache2\htdocs\account2/admin/display_prefs.php:66
 #: c:\Apache2\htdocs\account2/applications/setup.php:23
 #: c:\Apache2\htdocs\account2/includes/types.inc:143
 msgid "Miscellaneous"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/display_prefs.php:66
 #: c:\Apache2\htdocs\account2/admin/display_prefs.php:68
-msgid "Show GL Information:"
+msgid "Show hints for new users:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/display_prefs.php:68
 #: c:\Apache2\htdocs\account2/admin/display_prefs.php:70
-msgid "Show Item Codes:"
+msgid "Show GL Information:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/display_prefs.php:70
-# c:\Apache2\htdocs\account/includes/page/footer.inc:29
 #: c:\Apache2\htdocs\account2/admin/display_prefs.php:72
-#: c:\Apache2\htdocs\account2/includes/page/footer.inc:31
+msgid "Show Item Codes:"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/admin/display_prefs.php:74
+#: c:\Apache2\htdocs\account2/themes/aqua/renderer.php:98
+#: c:\Apache2\htdocs\account2/themes/cool/renderer.php:98
+#: c:\Apache2\htdocs\account2/themes/default/renderer.php:98
+#: c:\Apache2\htdocs\account2/themes/fancy/renderer.php:38
+#: c:\Apache2\htdocs\account2/themes/picme/renderer.php:38
 msgid "Theme:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/display_prefs.php:75
-#: c:\Apache2\htdocs\account2/admin/display_prefs.php:77
+#: c:\Apache2\htdocs\account2/admin/display_prefs.php:79
 msgid "Page Size:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/display_prefs.php:80
-# c:\Apache2\htdocs\account/admin/inst_lang.php:236
-# c:\Apache2\htdocs\account/admin/inst_lang.php:302
-#: c:\Apache2\htdocs\account2/admin/display_prefs.php:82
-#: c:\Apache2\htdocs\account2/admin/inst_lang.php:244
-#: c:\Apache2\htdocs\account2/admin/inst_lang.php:310
+#: c:\Apache2\htdocs\account2/admin/display_prefs.php:84
+#: c:\Apache2\htdocs\account2/admin/inst_lang.php:246
+#: c:\Apache2\htdocs\account2/admin/inst_lang.php:313
 msgid "Language"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/display_prefs.php:85
-# c:\Apache2\htdocs\account/admin/users.php:199
-#: c:\Apache2\htdocs\account2/admin/display_prefs.php:87
-#: c:\Apache2\htdocs\account2/admin/users.php:202
+#: c:\Apache2\htdocs\account2/admin/display_prefs.php:89
+#: c:\Apache2\htdocs\account2/admin/users.php:180
 msgid "Language:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/fiscalyears.php:7
-# c:\Apache2\htdocs\account/applications/setup.php:19
 #: c:\Apache2\htdocs\account2/admin/fiscalyears.php:13
 #: c:\Apache2\htdocs\account2/applications/setup.php:21
 msgid "Fiscal Years"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/fiscalyears.php:36
-#: c:\Apache2\htdocs\account2/admin/fiscalyears.php:38
+#: c:\Apache2\htdocs\account2/admin/fiscalyears.php:31
 msgid "Invalid BEGIN date in fiscal year."
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/fiscalyears.php:41
-#: c:\Apache2\htdocs\account2/admin/fiscalyears.php:44
+#: c:\Apache2\htdocs\account2/admin/fiscalyears.php:37
 msgid "Invalid END date in fiscal year."
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/fiscalyears.php:46
-#: c:\Apache2\htdocs\account2/admin/fiscalyears.php:50
+#: c:\Apache2\htdocs\account2/admin/fiscalyears.php:43
 msgid "BEGIN date bigger than END date."
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/fiscalyears.php:87
-#: c:\Apache2\htdocs\account2/admin/fiscalyears.php:92
+#: c:\Apache2\htdocs\account2/admin/fiscalyears.php:61
+msgid "Selected fiscal year has been updated"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/admin/fiscalyears.php:66
+msgid "New fiscal year has been added"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/admin/fiscalyears.php:84
 msgid "Cannot delete this fiscal year because items have been created referring to it."
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/fiscalyears.php:121
-#: c:\Apache2\htdocs\account2/admin/fiscalyears.php:126
+#: c:\Apache2\htdocs\account2/admin/fiscalyears.php:100
+msgid "Selected fiscal year has been deleted"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/admin/fiscalyears.php:117
 msgid "Fiscal Year Begin"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/fiscalyears.php:121
-#: c:\Apache2\htdocs\account2/admin/fiscalyears.php:126
+#: c:\Apache2\htdocs\account2/admin/fiscalyears.php:117
 msgid "Fiscal Year End"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/fiscalyears.php:121
-# c:\Apache2\htdocs\account/dimensions/inquiry/search_dimensions.php:99
-# c:\Apache2\htdocs\account/manufacturing/search_work_orders.php:89
-# c:\Apache2\htdocs\account/reporting/rep501.php:75
-# c:\Apache2\htdocs\account/reporting/includes/pdf_report.inc:168
-#: c:\Apache2\htdocs\account2/admin/fiscalyears.php:126
-#: c:\Apache2\htdocs\account2/dimensions/inquiry/search_dimensions.php:101
-#: c:\Apache2\htdocs\account2/manufacturing/search_work_orders.php:89
+#: c:\Apache2\htdocs\account2/admin/fiscalyears.php:117
+#: c:\Apache2\htdocs\account2/dimensions/inquiry/search_dimensions.php:127
+#: c:\Apache2\htdocs\account2/manufacturing/search_work_orders.php:167
 #: c:\Apache2\htdocs\account2/reporting/rep501.php:75
-#: c:\Apache2\htdocs\account2/reporting/includes/pdf_report.inc:168
+#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:527
+#: c:\Apache2\htdocs\account2/reporting/includes/pdf_report.inc:151
+#: c:\Apache2\htdocs\account2/reporting/includes/backup/pdf_report.inc:164
+#: c:\Apache2\htdocs\account2/reporting/includes/backup2/pdf_report.inc:164
 msgid "Closed"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/fiscalyears.php:154
-#: c:\Apache2\htdocs\account2/admin/fiscalyears.php:159
+#: c:\Apache2\htdocs\account2/admin/fiscalyears.php:153
 msgid "The marked fiscal year is the current fiscal year which cannot be deleted."
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/fiscalyears.php:176
-# c:\Apache2\htdocs\account/admin/fiscalyears.php:181
-#: c:\Apache2\htdocs\account2/admin/fiscalyears.php:181
-#: c:\Apache2\htdocs\account2/admin/fiscalyears.php:186
+#: c:\Apache2\htdocs\account2/admin/fiscalyears.php:177
+#: c:\Apache2\htdocs\account2/admin/fiscalyears.php:182
 msgid "Fiscal Year Begin:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/fiscalyears.php:177
-# c:\Apache2\htdocs\account/admin/fiscalyears.php:182
-#: c:\Apache2\htdocs\account2/admin/fiscalyears.php:182
-#: c:\Apache2\htdocs\account2/admin/fiscalyears.php:187
+#: c:\Apache2\htdocs\account2/admin/fiscalyears.php:178
+#: c:\Apache2\htdocs\account2/admin/fiscalyears.php:183
 msgid "Fiscal Year End:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/fiscalyears.php:185
-#: c:\Apache2\htdocs\account2/admin/fiscalyears.php:190
+#: c:\Apache2\htdocs\account2/admin/fiscalyears.php:187
 msgid "Is Closed:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/fiscalyears.php:215
-#: c:\Apache2\htdocs\account2/admin/fiscalyears.php:220
-msgid "Enter a New Fiscal Year"
-msgstr ""
-
-# c:\Apache2\htdocs\account/admin/forms_setup.php:7
-# c:\Apache2\htdocs\account/applications/setup.php:14
 #: c:\Apache2\htdocs\account2/admin/forms_setup.php:7
 #: c:\Apache2\htdocs\account2/applications/setup.php:16
 msgid "Forms Setup"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/forms_setup.php:27
 #: c:\Apache2\htdocs\account2/admin/forms_setup.php:27
 msgid "Forms settings have been updated."
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/forms_setup.php:35
 #: c:\Apache2\htdocs\account2/admin/forms_setup.php:35
 msgid "Form"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/forms_setup.php:35
 #: c:\Apache2\htdocs\account2/admin/forms_setup.php:35
 msgid "Next Reference"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/gl_setup.php:7
-# c:\Apache2\htdocs\account/applications/setup.php:18
 #: c:\Apache2\htdocs\account2/admin/gl_setup.php:7
 #: c:\Apache2\htdocs\account2/applications/setup.php:20
 msgid "System and General GL Setup"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/gl_setup.php:21
 #: c:\Apache2\htdocs\account2/admin/gl_setup.php:21
 msgid "The delivery over-receive allowance must be between 0 and 100."
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/gl_setup.php:28
 #: c:\Apache2\htdocs\account2/admin/gl_setup.php:28
 msgid "The invoice over-charge allowance must be between 0 and 100."
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/gl_setup.php:35
 #: c:\Apache2\htdocs\account2/admin/gl_setup.php:35
 msgid "The past due days interval allowance must be between 0 and 100."
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/gl_setup.php:65
-#: c:\Apache2\htdocs\account2/admin/gl_setup.php:66
+#: c:\Apache2\htdocs\account2/admin/gl_setup.php:64
 msgid "The general GL setup has been updated."
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/gl_setup.php:113
-#: c:\Apache2\htdocs\account2/admin/gl_setup.php:114
+#: c:\Apache2\htdocs\account2/admin/gl_setup.php:104
 msgid "General GL"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/gl_setup.php:115
-#: c:\Apache2\htdocs\account2/admin/gl_setup.php:116
-msgid "Retained Earning Clearing Account:"
-msgstr ""
-
-# c:\Apache2\htdocs\account/admin/gl_setup.php:116
-#: c:\Apache2\htdocs\account2/admin/gl_setup.php:117
-msgid "Payroll Account:"
-msgstr ""
-
-# c:\Apache2\htdocs\account/admin/gl_setup.php:117
-#: c:\Apache2\htdocs\account2/admin/gl_setup.php:118
+#: c:\Apache2\htdocs\account2/admin/gl_setup.php:111
 msgid "Past Due Days Interval:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/gl_setup.php:117
-# c:\Apache2\htdocs\account/admin/gl_setup.php:179
-# c:\Apache2\htdocs\account/admin/gl_setup.php:185
-# c:\Apache2\htdocs\account/admin/payment_terms.php:160
-#: c:\Apache2\htdocs\account2/admin/gl_setup.php:118
-#: c:\Apache2\htdocs\account2/admin/gl_setup.php:180
-#: c:\Apache2\htdocs\account2/admin/gl_setup.php:186
-#: c:\Apache2\htdocs\account2/admin/payment_terms.php:164
+#: c:\Apache2\htdocs\account2/admin/gl_setup.php:111
+#: c:\Apache2\htdocs\account2/admin/gl_setup.php:175
+#: c:\Apache2\htdocs\account2/admin/gl_setup.php:181
+#: c:\Apache2\htdocs\account2/admin/payment_terms.php:158
 msgid "days"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/gl_setup.php:121
-#: c:\Apache2\htdocs\account2/admin/gl_setup.php:122
+#: c:\Apache2\htdocs\account2/admin/gl_setup.php:114
 msgid "Customers and Sales"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/gl_setup.php:123
-#: c:\Apache2\htdocs\account2/admin/gl_setup.php:124
+#: c:\Apache2\htdocs\account2/admin/gl_setup.php:116
 msgid "Default Credit Limit:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/gl_setup.php:125
-#: c:\Apache2\htdocs\account2/admin/gl_setup.php:126
-msgid "Sales Exchange Variances Account:"
-msgstr ""
-
-# c:\Apache2\htdocs\account/admin/gl_setup.php:127
-#: c:\Apache2\htdocs\account2/admin/gl_setup.php:128
+#: c:\Apache2\htdocs\account2/admin/gl_setup.php:121
 msgid "Shipping Charged Account:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/gl_setup.php:131
-#: c:\Apache2\htdocs\account2/admin/gl_setup.php:132
+#: c:\Apache2\htdocs\account2/admin/gl_setup.php:125
 msgid "Customers and Sales Defaults"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/gl_setup.php:133
-# c:\Apache2\htdocs\account/sales/manage/customer_branches.php:303
-#: c:\Apache2\htdocs\account2/admin/gl_setup.php:134
-#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:302
-msgid "Accounts Receivable Account:"
+#: c:\Apache2\htdocs\account2/admin/gl_setup.php:127
+msgid "Receivable Account:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/gl_setup.php:135
-# c:\Apache2\htdocs\account/admin/gl_setup.php:165
-# c:\Apache2\htdocs\account/inventory/manage/items.php:332
-# c:\Apache2\htdocs\account/sales/manage/customer_branches.php:299
-#: c:\Apache2\htdocs\account2/admin/gl_setup.php:136
-#: c:\Apache2\htdocs\account2/admin/gl_setup.php:166
-#: c:\Apache2\htdocs\account2/inventory/manage/items.php:332
-#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:298
+#: c:\Apache2\htdocs\account2/admin/gl_setup.php:129
+#: c:\Apache2\htdocs\account2/admin/gl_setup.php:161
+#: c:\Apache2\htdocs\account2/inventory/manage/items.php:352
+#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:306
 msgid "Sales Account:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/gl_setup.php:137
-# c:\Apache2\htdocs\account/sales/manage/customer_branches.php:301
-#: c:\Apache2\htdocs\account2/admin/gl_setup.php:138
-#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:300
+#: c:\Apache2\htdocs\account2/admin/gl_setup.php:132
+#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:308
 msgid "Sales Discount Account:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/gl_setup.php:139
-# c:\Apache2\htdocs\account/sales/manage/customer_branches.php:305
-#: c:\Apache2\htdocs\account2/admin/gl_setup.php:140
-#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:304
+#: c:\Apache2\htdocs\account2/admin/gl_setup.php:134
+#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:312
 msgid "Prompt Payment Discount Account:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/gl_setup.php:143
-#: c:\Apache2\htdocs\account2/admin/gl_setup.php:144
+#: c:\Apache2\htdocs\account2/admin/gl_setup.php:138
 msgid "Suppliers and Purchasing"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/gl_setup.php:145
-#: c:\Apache2\htdocs\account2/admin/gl_setup.php:146
+#: c:\Apache2\htdocs\account2/admin/gl_setup.php:140
 msgid "Delivery Over-Receive Allowance:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/gl_setup.php:147
-#: c:\Apache2\htdocs\account2/admin/gl_setup.php:148
+#: c:\Apache2\htdocs\account2/admin/gl_setup.php:142
 msgid "Invoice Over-Charge Allowance:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/gl_setup.php:149
-#: c:\Apache2\htdocs\account2/admin/gl_setup.php:150
-msgid "Purchases Exchange Variances Account:"
+#: c:\Apache2\htdocs\account2/admin/gl_setup.php:148
+msgid "Suppliers and Purchasing Defaults"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/gl_setup.php:151
-#: c:\Apache2\htdocs\account2/admin/gl_setup.php:152
-msgid "Goods Received Clearing Account:"
+#: c:\Apache2\htdocs\account2/admin/gl_setup.php:150
+msgid "Payable Account:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/gl_setup.php:153
-#: c:\Apache2\htdocs\account2/admin/gl_setup.php:154
-msgid "Suppliers and Purchasing Defaults"
+#: c:\Apache2\htdocs\account2/admin/gl_setup.php:152
+#: c:\Apache2\htdocs\account2/purchasing/manage/suppliers.php:206
+msgid "Purchase Discount Account:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/gl_setup.php:155
-# c:\Apache2\htdocs\account/purchasing/manage/suppliers.php:206
 #: c:\Apache2\htdocs\account2/admin/gl_setup.php:156
-#: c:\Apache2\htdocs\account2/purchasing/manage/suppliers.php:206
-msgid "Accounts Payable Account:"
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:113
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:114
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:119
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:123
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:128
+msgid "Inventory"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/gl_setup.php:157
-# c:\Apache2\htdocs\account/purchasing/manage/suppliers.php:210
 #: c:\Apache2\htdocs\account2/admin/gl_setup.php:158
-#: c:\Apache2\htdocs\account2/purchasing/manage/suppliers.php:210
-msgid "Purchase Discount Account:"
-msgstr ""
-
-# c:\Apache2\htdocs\account/admin/gl_setup.php:161
-#: c:\Apache2\htdocs\account2/admin/gl_setup.php:162
-msgid "Inventory Defaults"
+msgid "Allow Negative Inventory:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/gl_setup.php:163
-#: c:\Apache2\htdocs\account2/admin/gl_setup.php:164
-msgid "Allow Negative Inventory:"
+#: c:\Apache2\htdocs\account2/admin/gl_setup.php:160
+msgid "Items Defaults"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/gl_setup.php:167
-# c:\Apache2\htdocs\account/inventory/manage/items.php:334
-#: c:\Apache2\htdocs\account2/admin/gl_setup.php:168
-#: c:\Apache2\htdocs\account2/inventory/manage/items.php:334
+#: c:\Apache2\htdocs\account2/admin/gl_setup.php:163
+#: c:\Apache2\htdocs\account2/inventory/manage/items.php:354
 msgid "Inventory Account:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/gl_setup.php:169
-# c:\Apache2\htdocs\account/inventory/manage/items.php:338
-#: c:\Apache2\htdocs\account2/admin/gl_setup.php:170
-#: c:\Apache2\htdocs\account2/inventory/manage/items.php:338
+#: c:\Apache2\htdocs\account2/admin/gl_setup.php:165
+#: c:\Apache2\htdocs\account2/inventory/manage/items.php:358
 msgid "C.O.G.S. Account:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/gl_setup.php:171
-# c:\Apache2\htdocs\account/inventory/manage/items.php:339
-#: c:\Apache2\htdocs\account2/admin/gl_setup.php:172
-#: c:\Apache2\htdocs\account2/inventory/manage/items.php:339
+#: c:\Apache2\htdocs\account2/admin/gl_setup.php:167
+#: c:\Apache2\htdocs\account2/inventory/manage/items.php:359
 msgid "Inventory Adjustments Account:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/gl_setup.php:173
-# c:\Apache2\htdocs\account/inventory/manage/items.php:349
-#: c:\Apache2\htdocs\account2/admin/gl_setup.php:174
-#: c:\Apache2\htdocs\account2/inventory/manage/items.php:349
+#: c:\Apache2\htdocs\account2/admin/gl_setup.php:169
+#: c:\Apache2\htdocs\account2/inventory/manage/items.php:369
 msgid "Item Assembly Costs Account:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/gl_setup.php:177
-#: c:\Apache2\htdocs\account2/admin/gl_setup.php:178
+#: c:\Apache2\htdocs\account2/admin/gl_setup.php:173
 msgid "Manufacturing Defaults"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/gl_setup.php:179
-#: c:\Apache2\htdocs\account2/admin/gl_setup.php:180
-msgid "Default Work Order Required By After:"
+#: c:\Apache2\htdocs\account2/admin/gl_setup.php:175
+msgid "Work Order Required By After:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/gl_setup.php:183
-#: c:\Apache2\htdocs\account2/admin/gl_setup.php:184
+#: c:\Apache2\htdocs\account2/admin/gl_setup.php:179
 msgid "Dimension Defaults"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/gl_setup.php:185
-#: c:\Apache2\htdocs\account2/admin/gl_setup.php:186
-msgid "Default Dimension Required By After:"
+#: c:\Apache2\htdocs\account2/admin/gl_setup.php:181
+msgid "Dimension Required By After:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/inst_lang.php:7
-# c:\Apache2\htdocs\account/applications/setup.php:30
 #: c:\Apache2\htdocs\account2/admin/inst_lang.php:7
 #: c:\Apache2\htdocs\account2/applications/setup.php:32
 msgid "Install/Update Languages"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/inst_lang.php:119
-#: c:\Apache2\htdocs\account2/admin/inst_lang.php:119
+#: c:\Apache2\htdocs\account2/admin/inst_lang.php:121
 msgid "Cannot open the languages file - "
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/inst_lang.php:126
-#: c:\Apache2\htdocs\account2/admin/inst_lang.php:126
+#: c:\Apache2\htdocs\account2/admin/inst_lang.php:128
 msgid "Cannot write to the language file - "
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/inst_lang.php:136
-#: c:\Apache2\htdocs\account2/admin/inst_lang.php:136
+#: c:\Apache2\htdocs\account2/admin/inst_lang.php:138
 msgid "The language file "
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/inst_lang.php:230
-#: c:\Apache2\htdocs\account2/admin/inst_lang.php:238
+#: c:\Apache2\htdocs\account2/admin/inst_lang.php:240
 msgid "Are you sure you want to delete language no. "
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/inst_lang.php:236
-# c:\Apache2\htdocs\account/admin/inst_lang.php:303
-# c:\Apache2\htdocs\account/admin/shipping_companies.php:104
-# c:\Apache2\htdocs\account/dimensions/dimension_entry.php:229
-# c:\Apache2\htdocs\account/dimensions/inquiry/search_dimensions.php:98
-# c:\Apache2\htdocs\account/dimensions/inquiry/search_dimensions.php:101
-# c:\Apache2\htdocs\account/dimensions/view/view_dimension.php:35
-# c:\Apache2\htdocs\account/gl/manage/gl_account_types.php:114
-# c:\Apache2\htdocs\account/inventory/manage/item_categories.php:77
-# c:\Apache2\htdocs\account/manufacturing/manage/work_centres.php:97
-# c:\Apache2\htdocs\account/reporting/rep501.php:75
-# c:\Apache2\htdocs\account/reporting/rep709.php:171
-# c:\Apache2\htdocs\account/sales/manage/customer_branches.php:169
-# c:\Apache2\htdocs\account/sales/manage/sales_people.php:87
-# c:\Apache2\htdocs\account/taxes/item_tax_types.php:103
-# c:\Apache2\htdocs\account/purchasing/includes/ui/invoice_ui.inc:197
-# c:\Apache2\htdocs\account/purchasing/includes/ui/invoice_ui.inc:199
-# c:\Apache2\htdocs\account/purchasing/includes/ui/invoice_ui.inc:201
-#: c:\Apache2\htdocs\account2/admin/inst_lang.php:244
-#: c:\Apache2\htdocs\account2/admin/inst_lang.php:311
-#: c:\Apache2\htdocs\account2/admin/inst_module.php:265
-#: c:\Apache2\htdocs\account2/admin/inst_module.php:321
-#: c:\Apache2\htdocs\account2/admin/shipping_companies.php:105
-#: c:\Apache2\htdocs\account2/dimensions/dimension_entry.php:238
-#: c:\Apache2\htdocs\account2/dimensions/inquiry/search_dimensions.php:100
-#: c:\Apache2\htdocs\account2/dimensions/inquiry/search_dimensions.php:103
-#: c:\Apache2\htdocs\account2/dimensions/view/view_dimension.php:35
-#: c:\Apache2\htdocs\account2/gl/manage/gl_account_types.php:115
+#: c:\Apache2\htdocs\account2/admin/inst_lang.php:246
+#: c:\Apache2\htdocs\account2/admin/inst_lang.php:314
+#: c:\Apache2\htdocs\account2/admin/inst_module.php:267
+#: c:\Apache2\htdocs\account2/admin/inst_module.php:323
+#: c:\Apache2\htdocs\account2/admin/shipping_companies.php:103
+#: c:\Apache2\htdocs\account2/dimensions/dimension_entry.php:235
+#: c:\Apache2\htdocs\account2/dimensions/inquiry/search_dimensions.php:126
+#: c:\Apache2\htdocs\account2/dimensions/inquiry/search_dimensions.php:129
+#: c:\Apache2\htdocs\account2/dimensions/view/view_dimension.php:38
+#: c:\Apache2\htdocs\account2/gl/manage/gl_account_types.php:112
 #: c:\Apache2\htdocs\account2/inventory/manage/item_categories.php:78
-#: c:\Apache2\htdocs\account2/manufacturing/manage/work_centres.php:98
+#: c:\Apache2\htdocs\account2/manufacturing/manage/work_centres.php:96
 #: c:\Apache2\htdocs\account2/reporting/rep501.php:75
-#: c:\Apache2\htdocs\account2/reporting/rep709.php:171
-#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:168
-#: c:\Apache2\htdocs\account2/sales/manage/sales_people.php:92
-#: c:\Apache2\htdocs\account2/taxes/item_tax_types.php:104
-#: c:\Apache2\htdocs\account2/purchasing/includes/ui/invoice_ui.inc:191
+#: c:\Apache2\htdocs\account2/reporting/rep709.php:189
+#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:180
+#: c:\Apache2\htdocs\account2/sales/manage/sales_people.php:108
+#: c:\Apache2\htdocs\account2/taxes/item_tax_types.php:103
 #: c:\Apache2\htdocs\account2/purchasing/includes/ui/invoice_ui.inc:193
 #: c:\Apache2\htdocs\account2/purchasing/includes/ui/invoice_ui.inc:195
+#: c:\Apache2\htdocs\account2/purchasing/includes/ui/invoice_ui.inc:197
 msgid "Name"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/inst_lang.php:236
-# c:\Apache2\htdocs\account/admin/inst_lang.php:304
-#: c:\Apache2\htdocs\account2/admin/inst_lang.php:244
-#: c:\Apache2\htdocs\account2/admin/inst_lang.php:312
+#: c:\Apache2\htdocs\account2/admin/inst_lang.php:246
+#: c:\Apache2\htdocs\account2/admin/inst_lang.php:315
 msgid "Encoding"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/inst_lang.php:236
-# c:\Apache2\htdocs\account/admin/inst_lang.php:306
-#: c:\Apache2\htdocs\account2/admin/inst_lang.php:244
-#: c:\Apache2\htdocs\account2/admin/inst_lang.php:314
+#: c:\Apache2\htdocs\account2/admin/inst_lang.php:246
+#: c:\Apache2\htdocs\account2/admin/inst_lang.php:317
 msgid "Right To Left"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/inst_lang.php:264
-#: c:\Apache2\htdocs\account2/admin/inst_lang.php:272
+#: c:\Apache2\htdocs\account2/admin/inst_lang.php:275
 msgid "The marked language is the current language which cannot be deleted."
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/inst_lang.php:308
-#: c:\Apache2\htdocs\account2/admin/inst_lang.php:316
-#: c:\Apache2\htdocs\account2/admin/inst_lang.php:317
+#: c:\Apache2\htdocs\account2/admin/inst_lang.php:319
+#: c:\Apache2\htdocs\account2/admin/inst_lang.php:320
 msgid "Language File"
 msgstr ""
 
-#: c:\Apache2\htdocs\account2/admin/inst_lang.php:320
+#: c:\Apache2\htdocs\account2/admin/inst_lang.php:323
 msgid "Select your language files from your local harddisk."
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/inst_lang.php:341
-#: c:\Apache2\htdocs\account2/admin/inst_lang.php:350
+#: c:\Apache2\htdocs\account2/admin/inst_lang.php:353
 msgid "Create a new language"
 msgstr ""
 
@@ -1323,183 +1124,148 @@ msgstr ""
 msgid "Install/Update Modules"
 msgstr ""
 
-#: c:\Apache2\htdocs\account2/admin/inst_module.php:152
+#: c:\Apache2\htdocs\account2/admin/inst_module.php:154
 msgid "Cannot open the modules file - "
 msgstr ""
 
-#: c:\Apache2\htdocs\account2/admin/inst_module.php:159
+#: c:\Apache2\htdocs\account2/admin/inst_module.php:161
 msgid "Cannot write to the modules file - "
 msgstr ""
 
-#: c:\Apache2\htdocs\account2/admin/inst_module.php:169
+#: c:\Apache2\htdocs\account2/admin/inst_module.php:171
 msgid "The modules file "
 msgstr ""
 
-#: c:\Apache2\htdocs\account2/admin/inst_module.php:259
+#: c:\Apache2\htdocs\account2/admin/inst_module.php:261
 msgid "Are you sure you want to delete module: "
 msgstr ""
 
-#: c:\Apache2\htdocs\account2/admin/inst_module.php:265
+#: c:\Apache2\htdocs\account2/admin/inst_module.php:267
 msgid "Tab"
 msgstr ""
 
-#: c:\Apache2\htdocs\account2/admin/inst_module.php:265
-#: c:\Apache2\htdocs\account2/admin/inst_module.php:322
+#: c:\Apache2\htdocs\account2/admin/inst_module.php:267
+#: c:\Apache2\htdocs\account2/admin/inst_module.php:324
 msgid "Folder"
 msgstr ""
 
-#: c:\Apache2\htdocs\account2/admin/inst_module.php:320
+#: c:\Apache2\htdocs\account2/admin/inst_module.php:322
 msgid "Menu Tab"
 msgstr ""
 
-#: c:\Apache2\htdocs\account2/admin/inst_module.php:324
+#: c:\Apache2\htdocs\account2/admin/inst_module.php:326
 msgid "Module File"
 msgstr ""
 
-#: c:\Apache2\htdocs\account2/admin/inst_module.php:325
+#: c:\Apache2\htdocs\account2/admin/inst_module.php:327
 msgid "SQL File"
 msgstr ""
 
-#: c:\Apache2\htdocs\account2/admin/inst_module.php:328
+#: c:\Apache2\htdocs\account2/admin/inst_module.php:330
 msgid "Select your module PHP file from your local harddisk."
 msgstr ""
 
-#: c:\Apache2\htdocs\account2/admin/inst_module.php:358
+#: c:\Apache2\htdocs\account2/admin/inst_module.php:360
 msgid "Create a new module"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/payment_terms.php:7
-# c:\Apache2\htdocs\account/applications/setup.php:22
-# c:\Apache2\htdocs\account/reporting/includes/doctext.inc:17
 #: c:\Apache2\htdocs\account2/admin/payment_terms.php:7
 #: c:\Apache2\htdocs\account2/applications/setup.php:24
 #: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:17
 msgid "Payment Terms"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/payment_terms.php:33
-#: c:\Apache2\htdocs\account2/admin/payment_terms.php:33
+#: c:\Apache2\htdocs\account2/admin/payment_terms.php:22
 msgid "The number of days or the day in the following month must be numeric."
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/payment_terms.php:38
-#: c:\Apache2\htdocs\account2/admin/payment_terms.php:39
+#: c:\Apache2\htdocs\account2/admin/payment_terms.php:28
 msgid "The Terms description must be entered."
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/payment_terms.php:43
-#: c:\Apache2\htdocs\account2/admin/payment_terms.php:45
+#: c:\Apache2\htdocs\account2/admin/payment_terms.php:34
 msgid "When the check box to indicate a day in the following month is the due date, the due date cannot be a day after the 30th. A number between 1 and 30 is expected."
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/payment_terms.php:48
-#: c:\Apache2\htdocs\account2/admin/payment_terms.php:51
+#: c:\Apache2\htdocs\account2/admin/payment_terms.php:40
 msgid "When the check box is not checked to indicate that the term expects a number of days after which accounts are due, the number entered should be less than 500 days."
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/payment_terms.php:109
-#: c:\Apache2\htdocs\account2/admin/payment_terms.php:113
+#: c:\Apache2\htdocs\account2/admin/payment_terms.php:65
+msgid "Selected payment terms have been updated"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/admin/payment_terms.php:84
+msgid "New payment terms have been added"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/admin/payment_terms.php:102
 msgid "Cannot delete this payment term, because customer accounts have been created referring to this term."
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/payment_terms.php:118
-#: c:\Apache2\htdocs\account2/admin/payment_terms.php:122
+#: c:\Apache2\htdocs\account2/admin/payment_terms.php:111
 msgid "Cannot delete this payment term, because supplier accounts have been created referring to this term"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/payment_terms.php:139
-# c:\Apache2\htdocs\account/gl/manage/bank_trans_types.php:94
-# c:\Apache2\htdocs\account/inventory/manage/movement_types.php:91
-# c:\Apache2\htdocs\account/inventory/view/view_adjustment.php:46
-# c:\Apache2\htdocs\account/inventory/view/view_transfer.php:48
-# c:\Apache2\htdocs\account/manufacturing/manage/bom_edit.php:91
-# c:\Apache2\htdocs\account/purchasing/po_receive_items.php:49
-# c:\Apache2\htdocs\account/purchasing/supplier_credit_grns.php:110
-# c:\Apache2\htdocs\account/purchasing/supplier_invoice_grns.php:141
-# c:\Apache2\htdocs\account/purchasing/supplier_invoice_grns.php:204
-# c:\Apache2\htdocs\account/reporting/rep104.php:88
-# c:\Apache2\htdocs\account/reporting/rep105.php:101
-# c:\Apache2\htdocs\account/reporting/rep204.php:71
-# c:\Apache2\htdocs\account/reporting/rep303.php:124
-# c:\Apache2\htdocs\account/reporting/rep401.php:60
-# c:\Apache2\htdocs\account/sales/manage/credit_status.php:89
-# c:\Apache2\htdocs\account/taxes/tax_groups.php:143
-# c:\Apache2\htdocs\account/taxes/tax_types.php:98
-# c:\Apache2\htdocs\account/manufacturing/includes/manufacturing_ui.inc:21
-# c:\Apache2\htdocs\account/purchasing/includes/ui/invoice_ui.inc:302
-#: c:\Apache2\htdocs\account2/admin/payment_terms.php:143
-#: c:\Apache2\htdocs\account2/gl/manage/bank_trans_types.php:95
-#: c:\Apache2\htdocs\account2/inventory/manage/item_units.php:79
-#: c:\Apache2\htdocs\account2/inventory/manage/movement_types.php:92
+#: c:\Apache2\htdocs\account2/admin/payment_terms.php:119
+msgid "Selected payment terms have been deleted"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/admin/payment_terms.php:137
+#: c:\Apache2\htdocs\account2/gl/manage/bank_trans_types.php:90
+#: c:\Apache2\htdocs\account2/inventory/manage/item_units.php:75
+#: c:\Apache2\htdocs\account2/inventory/manage/movement_types.php:88
 #: c:\Apache2\htdocs\account2/inventory/view/view_adjustment.php:46
 #: c:\Apache2\htdocs\account2/inventory/view/view_transfer.php:48
-#: c:\Apache2\htdocs\account2/manufacturing/manage/bom_edit.php:91
-#: c:\Apache2\htdocs\account2/purchasing/po_receive_items.php:51
-#: c:\Apache2\htdocs\account2/purchasing/supplier_credit_grns.php:108
-#: c:\Apache2\htdocs\account2/purchasing/supplier_invoice_grns.php:140
-#: c:\Apache2\htdocs\account2/purchasing/supplier_invoice_grns.php:204
-#: c:\Apache2\htdocs\account2/reporting/rep104.php:88
-#: c:\Apache2\htdocs\account2/reporting/rep105.php:101
+#: c:\Apache2\htdocs\account2/manufacturing/manage/bom_edit.php:94
+#: c:\Apache2\htdocs\account2/purchasing/po_receive_items.php:53
+#: c:\Apache2\htdocs\account2/purchasing/supplier_credit_grns.php:111
+#: c:\Apache2\htdocs\account2/purchasing/supplier_invoice_grns.php:141
+#: c:\Apache2\htdocs\account2/purchasing/supplier_invoice_grns.php:218
+#: c:\Apache2\htdocs\account2/reporting/rep104.php:82
+#: c:\Apache2\htdocs\account2/reporting/rep105.php:99
 #: c:\Apache2\htdocs\account2/reporting/rep204.php:70
-#: c:\Apache2\htdocs\account2/reporting/rep303.php:124
-#: c:\Apache2\htdocs\account2/reporting/rep401.php:60
-#: c:\Apache2\htdocs\account2/sales/inquiry/sales_orders_view.php:179
-#: c:\Apache2\htdocs\account2/sales/manage/credit_status.php:89
-#: c:\Apache2\htdocs\account2/taxes/tax_groups.php:140
-#: c:\Apache2\htdocs\account2/taxes/tax_types.php:95
+#: c:\Apache2\htdocs\account2/reporting/rep303.php:122
+#: c:\Apache2\htdocs\account2/reporting/rep401.php:58
+#: c:\Apache2\htdocs\account2/sales/inquiry/sales_orders_view.php:197
+#: c:\Apache2\htdocs\account2/sales/manage/credit_status.php:90
+#: c:\Apache2\htdocs\account2/taxes/tax_groups.php:137
+#: c:\Apache2\htdocs\account2/taxes/tax_types.php:97
 #: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:21
-#: c:\Apache2\htdocs\account2/purchasing/includes/ui/invoice_ui.inc:296
+#: c:\Apache2\htdocs\account2/purchasing/includes/ui/invoice_ui.inc:300
 msgid "Description"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/payment_terms.php:139
-#: c:\Apache2\htdocs\account2/admin/payment_terms.php:143
+#: c:\Apache2\htdocs\account2/admin/payment_terms.php:137
 msgid "Following Month On"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/payment_terms.php:139
-#: c:\Apache2\htdocs\account2/admin/payment_terms.php:143
+#: c:\Apache2\htdocs\account2/admin/payment_terms.php:137
 msgid "Due After (Days)"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/payment_terms.php:147
-# c:\Apache2\htdocs\account/admin/payment_terms.php:156
-#: c:\Apache2\htdocs\account2/admin/payment_terms.php:151
-#: c:\Apache2\htdocs\account2/admin/payment_terms.php:160
+#: c:\Apache2\htdocs\account2/admin/payment_terms.php:145
+#: c:\Apache2\htdocs\account2/admin/payment_terms.php:154
 msgid "N/A"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/payment_terms.php:177
-#: c:\Apache2\htdocs\account2/admin/payment_terms.php:181
-msgid "New Payment Term"
-msgstr ""
-
-# c:\Apache2\htdocs\account/admin/payment_terms.php:201
-#: c:\Apache2\htdocs\account2/admin/payment_terms.php:205
+#: c:\Apache2\htdocs\account2/admin/payment_terms.php:200
 msgid "Terms Description:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/payment_terms.php:203
-#: c:\Apache2\htdocs\account2/admin/payment_terms.php:207
+#: c:\Apache2\htdocs\account2/admin/payment_terms.php:202
 msgid "Due After A Given No. Of Days:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/payment_terms.php:213
-#: c:\Apache2\htdocs\account2/admin/payment_terms.php:217
+#: c:\Apache2\htdocs\account2/admin/payment_terms.php:212
 msgid "Days (Or Day In Following Month):"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/shipping_companies.php:7
-# c:\Apache2\htdocs\account/applications/setup.php:23
-# c:\Apache2\htdocs\account/sales/customer_invoice.php:346
-# c:\Apache2\htdocs\account/sales/view/view_credit.php:65
-# c:\Apache2\htdocs\account/sales/view/view_invoice.php:79
-# c:\Apache2\htdocs\account/reporting/includes/doctext.inc:8
 #: c:\Apache2\htdocs\account2/admin/shipping_companies.php:7
 #: c:\Apache2\htdocs\account2/applications/setup.php:25
-#: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:241
-#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:322
-#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:301
+#: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:254
+#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:335
+#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:326
 #: c:\Apache2\htdocs\account2/sales/view/view_credit.php:65
 #: c:\Apache2\htdocs\account2/sales/view/view_dispatch.php:83
 #: c:\Apache2\htdocs\account2/sales/view/view_invoice.php:83
@@ -1507,193 +1273,132 @@ msgstr ""
 msgid "Shipping Company"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/shipping_companies.php:26
-#: c:\Apache2\htdocs\account2/admin/shipping_companies.php:26
+#: c:\Apache2\htdocs\account2/admin/shipping_companies.php:17
 msgid "The shipping company name cannot be empty."
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/shipping_companies.php:74
-#: c:\Apache2\htdocs\account2/admin/shipping_companies.php:75
+#: c:\Apache2\htdocs\account2/admin/shipping_companies.php:35
+msgid "New shipping company has been added"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/admin/shipping_companies.php:51
+msgid "Selected shipping company has been updated"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/admin/shipping_companies.php:67
 msgid "Cannot delete this shipping company because sales orders have been created using this shipper."
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/shipping_companies.php:86
-#: c:\Apache2\htdocs\account2/admin/shipping_companies.php:87
+#: c:\Apache2\htdocs\account2/admin/shipping_companies.php:79
 msgid "Cannot delete this shipping company because invoices have been created using this shipping company."
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/shipping_companies.php:104
-#: c:\Apache2\htdocs\account2/admin/shipping_companies.php:105
+#: c:\Apache2\htdocs\account2/admin/shipping_companies.php:85
+msgid "Selected shipping company has been deleted"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/admin/shipping_companies.php:103
 msgid "Contact Person"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/shipping_companies.php:104
-#: c:\Apache2\htdocs\account2/admin/shipping_companies.php:105
+#: c:\Apache2\htdocs\account2/admin/shipping_companies.php:103
 msgid "Phone Number"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/shipping_companies.php:104
-# c:\Apache2\htdocs\account/reporting/includes/doctext.inc:21
-#: c:\Apache2\htdocs\account2/admin/shipping_companies.php:105
-#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:27
+#: c:\Apache2\htdocs\account2/admin/shipping_companies.php:103
+#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:28
 msgid "Address"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/shipping_companies.php:125
-#: c:\Apache2\htdocs\account2/admin/shipping_companies.php:126
-msgid "New Shipping Company"
-msgstr ""
-
-# c:\Apache2\htdocs\account/admin/shipping_companies.php:148
-# c:\Apache2\htdocs\account/gl/manage/gl_account_types.php:165
-# c:\Apache2\htdocs\account/inventory/manage/items.php:293
-# c:\Apache2\htdocs\account/manufacturing/manage/work_centres.php:135
-# c:\Apache2\htdocs\account/gl/includes/ui/gl_deposit_ui.inc:45
-#: c:\Apache2\htdocs\account2/admin/shipping_companies.php:149
-#: c:\Apache2\htdocs\account2/gl/manage/gl_account_types.php:166
-#: c:\Apache2\htdocs\account2/inventory/manage/items.php:296
-#: c:\Apache2\htdocs\account2/manufacturing/manage/work_centres.php:136
-#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_deposit_ui.inc:45
+#: c:\Apache2\htdocs\account2/admin/shipping_companies.php:148
+#: c:\Apache2\htdocs\account2/gl/manage/gl_account_types.php:160
+#: c:\Apache2\htdocs\account2/inventory/manage/items.php:312
+#: c:\Apache2\htdocs\account2/manufacturing/manage/work_centres.php:133
+#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_bank_ui.inc:48
 msgid "Name:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/shipping_companies.php:150
-# c:\Apache2\htdocs\account/sales/manage/customer_branches.php:270
-#: c:\Apache2\htdocs\account2/admin/shipping_companies.php:151
-#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:269
+#: c:\Apache2\htdocs\account2/admin/shipping_companies.php:150
+#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:276
 msgid "Contact Person:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/shipping_companies.php:152
-# c:\Apache2\htdocs\account/sales/manage/customer_branches.php:272
-#: c:\Apache2\htdocs\account2/admin/shipping_companies.php:153
-#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:271
+#: c:\Apache2\htdocs\account2/admin/shipping_companies.php:152
+#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:278
 msgid "Phone Number:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/users.php:7
 #: c:\Apache2\htdocs\account2/admin/users.php:7
 msgid "Users"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/users.php:27
-#: c:\Apache2\htdocs\account2/admin/users.php:27
-msgid "A new user has been added."
+#: c:\Apache2\htdocs\account2/admin/users.php:22
+msgid "The user login entered must be at least 4 characters long."
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/users.php:32
-#: c:\Apache2\htdocs\account2/admin/users.php:32
+#: c:\Apache2\htdocs\account2/admin/users.php:62
 msgid "The selected user has been updated."
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/users.php:37
-#: c:\Apache2\htdocs\account2/admin/users.php:37
-msgid "User has been deleted."
-msgstr ""
-
-# c:\Apache2\htdocs\account/admin/users.php:47
-#: c:\Apache2\htdocs\account2/admin/users.php:47
-msgid "The user login entered must be at least 4 characters long."
-msgstr ""
-
-# c:\Apache2\htdocs\account/admin/users.php:55
-#: c:\Apache2\htdocs\account2/admin/users.php:56
-msgid "The password entered must be at least 4 characters long."
+#: c:\Apache2\htdocs\account2/admin/users.php:69
+msgid "A new user has been added."
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/users.php:61
-#: c:\Apache2\htdocs\account2/admin/users.php:63
-msgid "The password cannot contain the user login."
+#: c:\Apache2\htdocs\account2/admin/users.php:80
+msgid "User has been deleted."
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/users.php:115
-# c:\Apache2\htdocs\account/admin/users.php:118
-#: c:\Apache2\htdocs\account2/admin/users.php:118
-#: c:\Apache2\htdocs\account2/admin/users.php:121
+#: c:\Apache2\htdocs\account2/admin/users.php:96
+#: c:\Apache2\htdocs\account2/admin/users.php:99
 msgid "User login"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/users.php:115
-# c:\Apache2\htdocs\account/admin/users.php:118
-# c:\Apache2\htdocs\account/admin/users.php:191
-#: c:\Apache2\htdocs\account2/admin/users.php:118
-#: c:\Apache2\htdocs\account2/admin/users.php:121
-#: c:\Apache2\htdocs\account2/admin/users.php:194
+#: c:\Apache2\htdocs\account2/admin/users.php:96
+#: c:\Apache2\htdocs\account2/admin/users.php:99
+#: c:\Apache2\htdocs\account2/admin/users.php:172
 msgid "Full Name"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/users.php:115
-# c:\Apache2\htdocs\account/admin/users.php:118
-# c:\Apache2\htdocs\account/sales/manage/sales_people.php:87
-#: c:\Apache2\htdocs\account2/admin/users.php:118
-#: c:\Apache2\htdocs\account2/admin/users.php:121
+#: c:\Apache2\htdocs\account2/admin/users.php:96
+#: c:\Apache2\htdocs\account2/admin/users.php:99
 #: c:\Apache2\htdocs\account2/reporting/rep106.php:75
-#: c:\Apache2\htdocs\account2/sales/manage/sales_people.php:92
+#: c:\Apache2\htdocs\account2/sales/manage/sales_people.php:108
 msgid "Phone"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/users.php:116
-# c:\Apache2\htdocs\account/admin/users.php:119
-# c:\Apache2\htdocs\account/sales/manage/customer_branches.php:170
-# c:\Apache2\htdocs\account/sales/view/view_sales_order.php:61
-#: c:\Apache2\htdocs\account2/admin/users.php:119
-#: c:\Apache2\htdocs\account2/admin/users.php:122
-#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:169
+#: c:\Apache2\htdocs\account2/admin/users.php:97
+#: c:\Apache2\htdocs\account2/admin/users.php:100
+#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:181
 #: c:\Apache2\htdocs\account2/sales/view/view_sales_order.php:58
 msgid "E-mail"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/users.php:116
-# c:\Apache2\htdocs\account/admin/users.php:119
-#: c:\Apache2\htdocs\account2/admin/users.php:119
-#: c:\Apache2\htdocs\account2/admin/users.php:122
+#: c:\Apache2\htdocs\account2/admin/users.php:97
+#: c:\Apache2\htdocs\account2/admin/users.php:100
 msgid "Last Visit"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/users.php:116
-# c:\Apache2\htdocs\account/admin/users.php:119
-#: c:\Apache2\htdocs\account2/admin/users.php:119
-#: c:\Apache2\htdocs\account2/admin/users.php:122
+#: c:\Apache2\htdocs\account2/admin/users.php:97
+#: c:\Apache2\htdocs\account2/admin/users.php:100
 msgid "Access Level"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/users.php:151
-#: c:\Apache2\htdocs\account2/admin/users.php:154
-msgid "New User"
+#: c:\Apache2\htdocs\account2/admin/users.php:159
+msgid "User Login:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/users.php:173
-#: c:\Apache2\htdocs\account2/admin/users.php:176
-msgid "User login:"
+#: c:\Apache2\htdocs\account2/admin/users.php:169
+msgid "Enter a new password to change, leave empty to keep current."
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/users.php:178
-#: c:\Apache2\htdocs\account2/admin/users.php:181
-msgid "User Login:"
+#: c:\Apache2\htdocs\account2/admin/users.php:174
+msgid "Telephone No.:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/users.php:182
-#: c:\Apache2\htdocs\account2/admin/users.php:185
-msgid "Password:"
-msgstr ""
-
-# c:\Apache2\htdocs\account/admin/users.php:188
-#: c:\Apache2\htdocs\account2/admin/users.php:191
-msgid "Enter a new password to change, leave empty to keep current."
-msgstr ""
-
-# c:\Apache2\htdocs\account/admin/users.php:193
-#: c:\Apache2\htdocs\account2/admin/users.php:196
-msgid "Telephone No.:"
-msgstr ""
-
-# c:\Apache2\htdocs\account/admin/users.php:197
-#: c:\Apache2\htdocs\account2/admin/users.php:200
+#: c:\Apache2\htdocs\account2/admin/users.php:178
 msgid "Access Level:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/view_print_transaction.php:8
-# c:\Apache2\htdocs\account/applications/setup.php:27
 #: c:\Apache2\htdocs\account2/admin/view_print_transaction.php:16
 #: c:\Apache2\htdocs\account2/applications/setup.php:29
 msgid "View or Print Transactions"
@@ -1703,489 +1408,296 @@ msgstr ""
 msgid "Only documents can be printed."
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/view_print_transaction.php:25
-# c:\Apache2\htdocs\account/manufacturing/work_order_add_finished.php:148
-# c:\Apache2\htdocs\account/manufacturing/work_order_entry.php:329
-# c:\Apache2\htdocs\account/manufacturing/work_order_entry.php:336
-# c:\Apache2\htdocs\account/sales/customer_payments.php:199
-# c:\Apache2\htdocs\account/sales/inquiry/customer_allocation_inquiry.php:35
-# c:\Apache2\htdocs\account/gl/includes/ui/gl_deposit_ui.inc:85
-# c:\Apache2\htdocs\account/inventory/includes/item_adjustments_ui.inc:57
-# c:\Apache2\htdocs\account/manufacturing/includes/work_order_issue_ui.inc:149
 #: c:\Apache2\htdocs\account2/admin/view_print_transaction.php:28
-#: c:\Apache2\htdocs\account2/manufacturing/work_order_add_finished.php:152
-#: c:\Apache2\htdocs\account2/manufacturing/work_order_entry.php:335
-#: c:\Apache2\htdocs\account2/manufacturing/work_order_entry.php:342
-#: c:\Apache2\htdocs\account2/sales/customer_payments.php:189
+#: c:\Apache2\htdocs\account2/manufacturing/work_order_add_finished.php:154
+#: c:\Apache2\htdocs\account2/manufacturing/work_order_entry.php:341
+#: c:\Apache2\htdocs\account2/manufacturing/work_order_entry.php:349
+#: c:\Apache2\htdocs\account2/sales/customer_payments.php:191
 #: c:\Apache2\htdocs\account2/sales/inquiry/customer_allocation_inquiry.php:37
-#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_deposit_ui.inc:85
-#: c:\Apache2\htdocs\account2/inventory/includes/item_adjustments_ui.inc:57
-#: c:\Apache2\htdocs\account2/manufacturing/includes/work_order_issue_ui.inc:149
+#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_bank_ui.inc:86
+#: c:\Apache2\htdocs\account2/inventory/includes/item_adjustments_ui.inc:46
+#: c:\Apache2\htdocs\account2/manufacturing/includes/work_order_issue_ui.inc:145
 msgid "Type:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/view_print_transaction.php:27
 #: c:\Apache2\htdocs\account2/admin/view_print_transaction.php:35
 msgid "from #:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/view_print_transaction.php:29
 #: c:\Apache2\htdocs\account2/admin/view_print_transaction.php:37
 msgid "to #:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/view_print_transaction.php:31
-# c:\Apache2\htdocs\account/dimensions/inquiry/search_dimensions.php:52
-# c:\Apache2\htdocs\account/manufacturing/search_work_orders.php:45
-# c:\Apache2\htdocs\account/purchasing/inquiry/po_search.php:34
-# c:\Apache2\htdocs\account/purchasing/inquiry/po_search_completed.php:33
-# c:\Apache2\htdocs\account/purchasing/inquiry/supplier_allocation_inquiry.php:45
-# c:\Apache2\htdocs\account/purchasing/inquiry/supplier_inquiry.php:41
-# c:\Apache2\htdocs\account/sales/inquiry/customer_allocation_inquiry.php:39
-# c:\Apache2\htdocs\account/sales/inquiry/customer_inquiry.php:40
-# c:\Apache2\htdocs\account/sales/inquiry/sales_orders_view.php:49
 #: c:\Apache2\htdocs\account2/admin/view_print_transaction.php:39
-#: c:\Apache2\htdocs\account2/dimensions/inquiry/search_dimensions.php:54
-#: c:\Apache2\htdocs\account2/manufacturing/search_work_orders.php:45
-#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search.php:37
-#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search_completed.php:36
+#: c:\Apache2\htdocs\account2/dimensions/inquiry/search_dimensions.php:79
+#: c:\Apache2\htdocs\account2/manufacturing/search_work_orders.php:70
+#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search.php:61
+#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search_completed.php:59
 #: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_allocation_inquiry.php:47
 #: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_inquiry.php:43
 #: c:\Apache2\htdocs\account2/sales/inquiry/customer_allocation_inquiry.php:41
-#: c:\Apache2\htdocs\account2/sales/inquiry/customer_inquiry.php:43
-#: c:\Apache2\htdocs\account2/sales/inquiry/sales_deliveries_view.php:93
-#: c:\Apache2\htdocs\account2/sales/inquiry/sales_orders_view.php:81
-#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:6
+#: c:\Apache2\htdocs\account2/sales/inquiry/customer_inquiry.php:44
+#: c:\Apache2\htdocs\account2/sales/inquiry/sales_deliveries_view.php:115
+#: c:\Apache2\htdocs\account2/sales/inquiry/sales_orders_view.php:91
 msgid "Search"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/view_print_transaction.php:45
 #: c:\Apache2\htdocs\account2/admin/view_print_transaction.php:53
 msgid "The starting transaction number is expected to be numeric and greater than zero."
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/view_print_transaction.php:51
 #: c:\Apache2\htdocs\account2/admin/view_print_transaction.php:59
 msgid "The ending transaction number is expected to be numeric and greater than zero."
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/view_print_transaction.php:90
 #: c:\Apache2\htdocs\account2/admin/view_print_transaction.php:103
 msgid "There are no transactions for the given parameters."
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/view_print_transaction.php:96
-# c:\Apache2\htdocs\account/admin/view_print_transaction.php:98
-# c:\Apache2\htdocs\account/dimensions/inquiry/search_dimensions.php:98
-# c:\Apache2\htdocs\account/dimensions/inquiry/search_dimensions.php:101
-# c:\Apache2\htdocs\account/dimensions/view/view_dimension.php:35
-# c:\Apache2\htdocs\account/gl/inquiry/bank_inquiry.php:58
-# c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:93
-# c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:96
-# c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:99
-# c:\Apache2\htdocs\account/inventory/inquiry/stock_movements.php:57
-# c:\Apache2\htdocs\account/manufacturing/search_work_orders.php:88
-# c:\Apache2\htdocs\account/purchasing/allocations/supplier_allocate.php:195
-# c:\Apache2\htdocs\account/purchasing/allocations/supplier_allocation_main.php:60
-# c:\Apache2\htdocs\account/purchasing/allocations/supplier_allocation_main.php:63
-# c:\Apache2\htdocs\account/purchasing/inquiry/po_search.php:105
-# c:\Apache2\htdocs\account/purchasing/inquiry/po_search.php:108
-# c:\Apache2\htdocs\account/purchasing/inquiry/po_search_completed.php:98
-# c:\Apache2\htdocs\account/purchasing/inquiry/po_search_completed.php:101
-# c:\Apache2\htdocs\account/purchasing/inquiry/supplier_inquiry.php:158
-# c:\Apache2\htdocs\account/purchasing/inquiry/supplier_inquiry.php:162
-# c:\Apache2\htdocs\account/purchasing/view/view_po.php:97
-# c:\Apache2\htdocs\account/purchasing/view/view_po.php:122
-# c:\Apache2\htdocs\account/reporting/rep101.php:70
-# c:\Apache2\htdocs\account/reporting/rep201.php:71
-# c:\Apache2\htdocs\account/reporting/rep203.php:76
-# c:\Apache2\htdocs\account/reporting/rep704.php:63
-# c:\Apache2\htdocs\account/reporting/rep704.php:66
-# c:\Apache2\htdocs\account/reporting/rep704.php:69
-# c:\Apache2\htdocs\account/reporting/rep709.php:171
-# c:\Apache2\htdocs\account/sales/allocations/customer_allocate.php:187
-# c:\Apache2\htdocs\account/sales/allocations/customer_allocation_main.php:62
-# c:\Apache2\htdocs\account/sales/allocations/customer_allocation_main.php:65
-# c:\Apache2\htdocs\account/sales/inquiry/customer_inquiry.php:161
-# c:\Apache2\htdocs\account/sales/inquiry/customer_inquiry.php:164
-# c:\Apache2\htdocs\account/sales/view/view_sales_order.php:70
-# c:\Apache2\htdocs\account/sales/view/view_sales_order.php:101
-# c:\Apache2\htdocs\account/dimensions/includes/dimensions_ui.inc:23
-# c:\Apache2\htdocs\account/manufacturing/includes/manufacturing_ui.inc:149
-# c:\Apache2\htdocs\account/manufacturing/includes/manufacturing_ui.inc:192
-# c:\Apache2\htdocs\account/manufacturing/includes/manufacturing_ui.inc:228
-# c:\Apache2\htdocs\account/manufacturing/includes/manufacturing_ui.inc:268
-# c:\Apache2\htdocs\account/manufacturing/includes/manufacturing_ui.inc:272
-# c:\Apache2\htdocs\account/manufacturing/includes/manufacturing_ui.inc:323
-# c:\Apache2\htdocs\account/reporting/includes/doctext.inc:45
 #: c:\Apache2\htdocs\account2/admin/view_print_transaction.php:113
 #: c:\Apache2\htdocs\account2/admin/view_print_transaction.php:115
 #: c:\Apache2\htdocs\account2/admin/view_print_transaction.php:120
 #: c:\Apache2\htdocs\account2/admin/view_print_transaction.php:122
-#: c:\Apache2\htdocs\account2/dimensions/inquiry/search_dimensions.php:100
-#: c:\Apache2\htdocs\account2/dimensions/inquiry/search_dimensions.php:103
-#: c:\Apache2\htdocs\account2/dimensions/view/view_dimension.php:35
-#: c:\Apache2\htdocs\account2/gl/inquiry/bank_inquiry.php:60
-#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:91
-#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:94
-#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:97
-#: c:\Apache2\htdocs\account2/inventory/inquiry/stock_movements.php:60
-#: c:\Apache2\htdocs\account2/manufacturing/search_work_orders.php:88
-#: c:\Apache2\htdocs\account2/purchasing/allocations/supplier_allocate.php:193
+#: c:\Apache2\htdocs\account2/dimensions/inquiry/search_dimensions.php:126
+#: c:\Apache2\htdocs\account2/dimensions/inquiry/search_dimensions.php:129
+#: c:\Apache2\htdocs\account2/dimensions/view/view_dimension.php:38
+#: c:\Apache2\htdocs\account2/gl/inquiry/bank_inquiry.php:67
+#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:98
+#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:101
+#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:104
+#: c:\Apache2\htdocs\account2/inventory/inquiry/stock_movements.php:67
+#: c:\Apache2\htdocs\account2/manufacturing/search_work_orders.php:114
+#: c:\Apache2\htdocs\account2/purchasing/allocations/supplier_allocate.php:186
 #: c:\Apache2\htdocs\account2/purchasing/allocations/supplier_allocation_main.php:60
 #: c:\Apache2\htdocs\account2/purchasing/allocations/supplier_allocation_main.php:63
-#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search.php:110
-#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search.php:113
-#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search_completed.php:103
-#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search_completed.php:106
-#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_inquiry.php:160
-#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_inquiry.php:164
-#: c:\Apache2\htdocs\account2/purchasing/view/view_po.php:97
-#: c:\Apache2\htdocs\account2/purchasing/view/view_po.php:122
+#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search.php:135
+#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search.php:138
+#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search_completed.php:127
+#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search_completed.php:130
+#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_inquiry.php:167
+#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_inquiry.php:171
+#: c:\Apache2\htdocs\account2/purchasing/view/view_po.php:98
+#: c:\Apache2\htdocs\account2/purchasing/view/view_po.php:123
 #: c:\Apache2\htdocs\account2/reporting/rep101.php:71
 #: c:\Apache2\htdocs\account2/reporting/rep201.php:70
 #: c:\Apache2\htdocs\account2/reporting/rep203.php:75
 #: c:\Apache2\htdocs\account2/reporting/rep704.php:63
 #: c:\Apache2\htdocs\account2/reporting/rep704.php:66
 #: c:\Apache2\htdocs\account2/reporting/rep704.php:69
-#: c:\Apache2\htdocs\account2/reporting/rep709.php:171
-#: c:\Apache2\htdocs\account2/sales/allocations/customer_allocate.php:194
+#: c:\Apache2\htdocs\account2/reporting/rep709.php:189
+#: c:\Apache2\htdocs\account2/sales/allocations/customer_allocate.php:188
 #: c:\Apache2\htdocs\account2/sales/allocations/customer_allocation_main.php:62
 #: c:\Apache2\htdocs\account2/sales/allocations/customer_allocation_main.php:65
-#: c:\Apache2\htdocs\account2/sales/inquiry/customer_inquiry.php:172
+#: c:\Apache2\htdocs\account2/sales/inquiry/customer_inquiry.php:183
 #: c:\Apache2\htdocs\account2/sales/view/view_sales_order.php:68
 #: c:\Apache2\htdocs\account2/sales/view/view_sales_order.php:101
 #: c:\Apache2\htdocs\account2/sales/view/view_sales_order.php:133
 #: c:\Apache2\htdocs\account2/dimensions/includes/dimensions_ui.inc:23
-#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:149
-#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:192
-#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:228
-#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:268
-#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:272
-#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:323
-#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:54
+#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:150
+#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:193
+#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:229
+#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:269
+#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:273
+#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:324
+#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:55
 msgid "#"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/view_print_transaction.php:96
-# c:\Apache2\htdocs\account/dimensions/inquiry/search_dimensions.php:98
-# c:\Apache2\htdocs\account/dimensions/inquiry/search_dimensions.php:101
-# c:\Apache2\htdocs\account/dimensions/view/view_dimension.php:35
-# c:\Apache2\htdocs\account/gl/inquiry/bank_inquiry.php:58
-# c:\Apache2\htdocs\account/gl/view/bank_transfer_view.php:76
-# c:\Apache2\htdocs\account/gl/view/gl_deposit_view.php:66
-# c:\Apache2\htdocs\account/gl/view/gl_payment_view.php:64
-# c:\Apache2\htdocs\account/inventory/inquiry/stock_movements.php:57
-# c:\Apache2\htdocs\account/inventory/view/view_adjustment.php:34
-# c:\Apache2\htdocs\account/inventory/view/view_transfer.php:35
-# c:\Apache2\htdocs\account/manufacturing/search_work_orders.php:88
-# c:\Apache2\htdocs\account/manufacturing/view/wo_issue_view.php:32
-# c:\Apache2\htdocs\account/manufacturing/view/wo_production_view.php:33
-# c:\Apache2\htdocs\account/purchasing/allocations/supplier_allocation_main.php:60
-# c:\Apache2\htdocs\account/purchasing/allocations/supplier_allocation_main.php:63
-# c:\Apache2\htdocs\account/purchasing/inquiry/po_search.php:105
-# c:\Apache2\htdocs\account/purchasing/inquiry/po_search.php:108
-# c:\Apache2\htdocs\account/purchasing/inquiry/po_search_completed.php:98
-# c:\Apache2\htdocs\account/purchasing/inquiry/po_search_completed.php:101
-# c:\Apache2\htdocs\account/purchasing/inquiry/supplier_allocation_inquiry.php:124
-# c:\Apache2\htdocs\account/purchasing/inquiry/supplier_allocation_inquiry.php:128
-# c:\Apache2\htdocs\account/purchasing/inquiry/supplier_inquiry.php:158
-# c:\Apache2\htdocs\account/purchasing/inquiry/supplier_inquiry.php:162
-# c:\Apache2\htdocs\account/purchasing/view/view_po.php:97
-# c:\Apache2\htdocs\account/purchasing/view/view_supp_credit.php:32
-# c:\Apache2\htdocs\account/purchasing/view/view_supp_invoice.php:38
-# c:\Apache2\htdocs\account/purchasing/view/view_supp_payment.php:61
-# c:\Apache2\htdocs\account/reporting/rep501.php:75
-# c:\Apache2\htdocs\account/sales/customer_credit_invoice.php:257
-# c:\Apache2\htdocs\account/sales/customer_invoice.php:322
-# c:\Apache2\htdocs\account/sales/allocations/customer_allocation_main.php:62
-# c:\Apache2\htdocs\account/sales/allocations/customer_allocation_main.php:65
-# c:\Apache2\htdocs\account/sales/inquiry/customer_allocation_inquiry.php:119
-# c:\Apache2\htdocs\account/sales/inquiry/customer_allocation_inquiry.php:122
-# c:\Apache2\htdocs\account/sales/inquiry/customer_inquiry.php:161
-# c:\Apache2\htdocs\account/sales/inquiry/customer_inquiry.php:164
-# c:\Apache2\htdocs\account/sales/view/view_invoice.php:72
-# c:\Apache2\htdocs\account/sales/view/view_receipt.php:36
-# c:\Apache2\htdocs\account/dimensions/includes/dimensions_ui.inc:23
-# c:\Apache2\htdocs\account/manufacturing/includes/manufacturing_ui.inc:149
-# c:\Apache2\htdocs\account/manufacturing/includes/manufacturing_ui.inc:192
-# c:\Apache2\htdocs\account/manufacturing/includes/manufacturing_ui.inc:228
-# c:\Apache2\htdocs\account/manufacturing/includes/manufacturing_ui.inc:268
-# c:\Apache2\htdocs\account/manufacturing/includes/manufacturing_ui.inc:272
-# c:\Apache2\htdocs\account/manufacturing/includes/manufacturing_ui.inc:323
-# c:\Apache2\htdocs\account/purchasing/includes/ui/grn_ui.inc:28
-# c:\Apache2\htdocs\account/purchasing/includes/ui/grn_ui.inc:43
-# c:\Apache2\htdocs\account/purchasing/includes/ui/po_ui.inc:223
 #: c:\Apache2\htdocs\account2/admin/view_print_transaction.php:113
 #: c:\Apache2\htdocs\account2/admin/view_print_transaction.php:120
-#: c:\Apache2\htdocs\account2/dimensions/inquiry/search_dimensions.php:100
-#: c:\Apache2\htdocs\account2/dimensions/inquiry/search_dimensions.php:103
-#: c:\Apache2\htdocs\account2/dimensions/view/view_dimension.php:35
-#: c:\Apache2\htdocs\account2/gl/inquiry/bank_inquiry.php:60
+#: c:\Apache2\htdocs\account2/dimensions/inquiry/search_dimensions.php:126
+#: c:\Apache2\htdocs\account2/dimensions/inquiry/search_dimensions.php:129
+#: c:\Apache2\htdocs\account2/dimensions/view/view_dimension.php:38
+#: c:\Apache2\htdocs\account2/gl/inquiry/bank_inquiry.php:67
 #: c:\Apache2\htdocs\account2/gl/view/bank_transfer_view.php:76
 #: c:\Apache2\htdocs\account2/gl/view/gl_deposit_view.php:66
 #: c:\Apache2\htdocs\account2/gl/view/gl_payment_view.php:64
-#: c:\Apache2\htdocs\account2/inventory/inquiry/stock_movements.php:60
+#: c:\Apache2\htdocs\account2/inventory/inquiry/stock_movements.php:67
 #: c:\Apache2\htdocs\account2/inventory/view/view_adjustment.php:34
 #: c:\Apache2\htdocs\account2/inventory/view/view_transfer.php:35
-#: c:\Apache2\htdocs\account2/manufacturing/search_work_orders.php:88
-#: c:\Apache2\htdocs\account2/manufacturing/view/wo_issue_view.php:32
+#: c:\Apache2\htdocs\account2/manufacturing/search_work_orders.php:114
+#: c:\Apache2\htdocs\account2/manufacturing/view/wo_issue_view.php:35
 #: c:\Apache2\htdocs\account2/manufacturing/view/wo_production_view.php:33
 #: c:\Apache2\htdocs\account2/purchasing/allocations/supplier_allocation_main.php:60
 #: c:\Apache2\htdocs\account2/purchasing/allocations/supplier_allocation_main.php:63
-#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search.php:110
-#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search.php:113
-#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search_completed.php:103
-#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search_completed.php:106
-#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_allocation_inquiry.php:126
+#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search.php:135
+#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search.php:138
+#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search_completed.php:127
+#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search_completed.php:130
 #: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_allocation_inquiry.php:130
-#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_inquiry.php:160
-#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_inquiry.php:164
-#: c:\Apache2\htdocs\account2/purchasing/view/view_po.php:97
+#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_allocation_inquiry.php:134
+#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_inquiry.php:167
+#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_inquiry.php:171
+#: c:\Apache2\htdocs\account2/purchasing/view/view_po.php:98
 #: c:\Apache2\htdocs\account2/purchasing/view/view_supp_credit.php:32
 #: c:\Apache2\htdocs\account2/purchasing/view/view_supp_invoice.php:38
 #: c:\Apache2\htdocs\account2/purchasing/view/view_supp_payment.php:61
 #: c:\Apache2\htdocs\account2/reporting/rep501.php:75
-#: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:231
-#: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:233
-#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:302
-#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:304
-#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:285
-#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:287
+#: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:244
+#: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:246
+#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:315
+#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:317
+#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:310
+#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:312
 #: c:\Apache2\htdocs\account2/sales/allocations/customer_allocation_main.php:62
 #: c:\Apache2\htdocs\account2/sales/allocations/customer_allocation_main.php:65
-#: c:\Apache2\htdocs\account2/sales/inquiry/customer_allocation_inquiry.php:131
 #: c:\Apache2\htdocs\account2/sales/inquiry/customer_allocation_inquiry.php:134
-#: c:\Apache2\htdocs\account2/sales/inquiry/customer_inquiry.php:172
-#: c:\Apache2\htdocs\account2/sales/inquiry/sales_deliveries_view.php:197
+#: c:\Apache2\htdocs\account2/sales/inquiry/customer_allocation_inquiry.php:137
+#: c:\Apache2\htdocs\account2/sales/inquiry/customer_inquiry.php:183
+#: c:\Apache2\htdocs\account2/sales/inquiry/sales_deliveries_view.php:216
 #: c:\Apache2\htdocs\account2/sales/view/view_dispatch.php:76
 #: c:\Apache2\htdocs\account2/sales/view/view_invoice.php:76
 #: c:\Apache2\htdocs\account2/sales/view/view_receipt.php:36
 #: c:\Apache2\htdocs\account2/dimensions/includes/dimensions_ui.inc:23
-#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:149
-#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:192
-#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:228
-#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:268
-#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:272
-#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:323
+#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:150
+#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:193
+#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:229
+#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:269
+#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:273
+#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:324
 #: c:\Apache2\htdocs\account2/purchasing/includes/ui/grn_ui.inc:28
 #: c:\Apache2\htdocs\account2/purchasing/includes/ui/grn_ui.inc:43
-#: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:225
-#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_credit_ui.inc:48
-#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_credit_ui.inc:50
-#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:234
+#: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:227
+#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_credit_ui.inc:76
+#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_credit_ui.inc:78
+#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:235
 msgid "Reference"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/view_print_transaction.php:96
-# c:\Apache2\htdocs\account/admin/view_print_transaction.php:98
-# c:\Apache2\htdocs\account/admin/view_print_transaction.php:109
 #: c:\Apache2\htdocs\account2/admin/view_print_transaction.php:113
 #: c:\Apache2\htdocs\account2/admin/view_print_transaction.php:115
 #: c:\Apache2\htdocs\account2/admin/view_print_transaction.php:120
 #: c:\Apache2\htdocs\account2/admin/view_print_transaction.php:122
-#: c:\Apache2\htdocs\account2/admin/view_print_transaction.php:135
+#: c:\Apache2\htdocs\account2/admin/view_print_transaction.php:136
 msgid "View"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/view_print_transaction.php:96
-# c:\Apache2\htdocs\account/admin/view_print_transaction.php:98
 #: c:\Apache2\htdocs\account2/admin/view_print_transaction.php:113
 #: c:\Apache2\htdocs\account2/admin/view_print_transaction.php:115
-#: c:\Apache2\htdocs\account2/admin/view_print_transaction.php:137
-#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search.php:149
-#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search_completed.php:129
-#: c:\Apache2\htdocs\account2/sales/inquiry/customer_inquiry.php:262
-#: c:\Apache2\htdocs\account2/sales/inquiry/sales_deliveries_view.php:244
-#: c:\Apache2\htdocs\account2/sales/inquiry/sales_orders_view.php:245
+#: c:\Apache2\htdocs\account2/admin/view_print_transaction.php:138
+#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search.php:174
+#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search_completed.php:153
+#: c:\Apache2\htdocs\account2/sales/inquiry/customer_inquiry.php:273
+#: c:\Apache2\htdocs\account2/sales/inquiry/sales_deliveries_view.php:263
+#: c:\Apache2\htdocs\account2/sales/inquiry/sales_orders_view.php:265
 msgid "Print"
 msgstr ""
 
-# c:\Apache2\htdocs\account/includes/ui/ui_view.inc:51
 #: c:\Apache2\htdocs\account2/admin/view_print_transaction.php:113
 #: c:\Apache2\htdocs\account2/admin/view_print_transaction.php:115
 #: c:\Apache2\htdocs\account2/admin/view_print_transaction.php:120
 #: c:\Apache2\htdocs\account2/admin/view_print_transaction.php:122
-#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:51
+#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:52
 msgid "GL"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/view_print_transaction.php:110
-#: c:\Apache2\htdocs\account2/admin/view_print_transaction.php:138
+#: c:\Apache2\htdocs\account2/admin/view_print_transaction.php:139
 msgid "View GL"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/void_transaction.php:7
-# c:\Apache2\htdocs\account/applications/setup.php:26
 #: c:\Apache2\htdocs\account2/admin/void_transaction.php:15
 #: c:\Apache2\htdocs\account2/applications/setup.php:28
 msgid "Void a Transaction"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/void_transaction.php:25
 #: c:\Apache2\htdocs\account2/admin/void_transaction.php:27
 msgid "Transaction Type:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/void_transaction.php:27
 #: c:\Apache2\htdocs\account2/admin/void_transaction.php:29
 msgid "Transaction #:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/void_transaction.php:29
 #: c:\Apache2\htdocs\account2/admin/void_transaction.php:31
 msgid "Voiding Date:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/void_transaction.php:31
-# c:\Apache2\htdocs\account/dimensions/dimension_entry.php:239
-# c:\Apache2\htdocs\account/gl/bank_transfer.php:78
-# c:\Apache2\htdocs\account/manufacturing/work_order_add_finished.php:155
-# c:\Apache2\htdocs\account/manufacturing/work_order_entry.php:381
-# c:\Apache2\htdocs\account/manufacturing/work_order_release.php:82
-# c:\Apache2\htdocs\account/purchasing/po_entry_items.php:409
-# c:\Apache2\htdocs\account/purchasing/supplier_payment.php:100
-# c:\Apache2\htdocs\account/purchasing/supplier_trans_gl.php:119
-# c:\Apache2\htdocs\account/sales/customer_payments.php:203
-# c:\Apache2\htdocs\account/includes/ui/ui_view.inc:303
-# c:\Apache2\htdocs\account/manufacturing/includes/work_order_issue_ui.inc:157
-# c:\Apache2\htdocs\account/purchasing/includes/ui/invoice_ui.inc:146
 #: c:\Apache2\htdocs\account2/admin/void_transaction.php:33
-#: c:\Apache2\htdocs\account2/dimensions/dimension_entry.php:248
+#: c:\Apache2\htdocs\account2/dimensions/dimension_entry.php:245
 #: c:\Apache2\htdocs\account2/gl/bank_transfer.php:80
-#: c:\Apache2\htdocs\account2/manufacturing/work_order_add_finished.php:159
-#: c:\Apache2\htdocs\account2/manufacturing/work_order_entry.php:387
-#: c:\Apache2\htdocs\account2/manufacturing/work_order_release.php:87
-#: c:\Apache2\htdocs\account2/purchasing/po_entry_items.php:414
+#: c:\Apache2\htdocs\account2/manufacturing/work_order_add_finished.php:161
+#: c:\Apache2\htdocs\account2/manufacturing/work_order_entry.php:394
+#: c:\Apache2\htdocs\account2/manufacturing/work_order_release.php:86
+#: c:\Apache2\htdocs\account2/purchasing/po_entry_items.php:368
 #: c:\Apache2\htdocs\account2/purchasing/supplier_payment.php:97
-#: c:\Apache2\htdocs\account2/purchasing/supplier_trans_gl.php:125
-#: c:\Apache2\htdocs\account2/sales/customer_payments.php:193
-#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:315
-#: c:\Apache2\htdocs\account2/manufacturing/includes/work_order_issue_ui.inc:157
+#: c:\Apache2\htdocs\account2/purchasing/supplier_trans_gl.php:134
+#: c:\Apache2\htdocs\account2/sales/customer_payments.php:195
+#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:322
 #: c:\Apache2\htdocs\account2/purchasing/includes/ui/invoice_ui.inc:140
 msgid "Memo:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/void_transaction.php:36
 #: c:\Apache2\htdocs\account2/admin/void_transaction.php:38
 msgid "Void Transaction"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/void_transaction.php:40
 #: c:\Apache2\htdocs\account2/admin/void_transaction.php:42
 msgid "Are you sure you want to void this transaction ? This action cannot be undone."
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/void_transaction.php:41
 #: c:\Apache2\htdocs\account2/admin/void_transaction.php:43
 msgid "Proceed"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/void_transaction.php:42
-# c:\Apache2\htdocs\account/gl/includes/ui/gl_deposit_ui.inc:224
-# c:\Apache2\htdocs\account/gl/includes/ui/gl_journal_ui.inc:172
-# c:\Apache2\htdocs\account/gl/includes/ui/gl_payment_ui.inc:223
-# c:\Apache2\htdocs\account/inventory/includes/item_adjustments_ui.inc:159
-# c:\Apache2\htdocs\account/inventory/includes/stock_transfers_ui.inc:143
-# c:\Apache2\htdocs\account/manufacturing/includes/work_order_issue_ui.inc:126
-# c:\Apache2\htdocs\account/purchasing/includes/ui/po_ui.inc:321
-# c:\Apache2\htdocs\account/sales/includes/ui/sales_credit_ui.inc:213
-# c:\Apache2\htdocs\account/sales/includes/ui/sales_order_ui.inc:328
 #: c:\Apache2\htdocs\account2/admin/void_transaction.php:44
-#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_deposit_ui.inc:224
-#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_journal_ui.inc:176
-#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_payment_ui.inc:226
-#: c:\Apache2\htdocs\account2/inventory/includes/item_adjustments_ui.inc:161
-#: c:\Apache2\htdocs\account2/inventory/includes/stock_transfers_ui.inc:143
-#: c:\Apache2\htdocs\account2/manufacturing/includes/work_order_issue_ui.inc:126
+#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_bank_ui.inc:239
+#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_journal_ui.inc:178
+#: c:\Apache2\htdocs\account2/includes/ui/ui_input.inc:150
+#: c:\Apache2\htdocs\account2/inventory/includes/item_adjustments_ui.inc:157
+#: c:\Apache2\htdocs\account2/inventory/includes/stock_transfers_ui.inc:137
+#: c:\Apache2\htdocs\account2/manufacturing/includes/work_order_issue_ui.inc:119
 #: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:330
-#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_credit_ui.inc:231
-#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:366
+#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_credit_ui.inc:273
+#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:378
 msgid "Cancel"
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/void_transaction.php:54
-# c:\Apache2\htdocs\account/gl/bank_transfer.php:96
-# c:\Apache2\htdocs\account/gl/gl_journal.php:86
-# c:\Apache2\htdocs\account/gl/manage/exchange_rates.php:31
-# c:\Apache2\htdocs\account/manufacturing/work_order_add_finished.php:76
-# c:\Apache2\htdocs\account/purchasing/po_receive_items.php:154
-# c:\Apache2\htdocs\account/purchasing/supplier_payment.php:151
-# c:\Apache2\htdocs\account/sales/customer_credit_invoice.php:49
 #: c:\Apache2\htdocs\account2/admin/void_transaction.php:56
 #: c:\Apache2\htdocs\account2/gl/bank_transfer.php:98
-#: c:\Apache2\htdocs\account2/gl/gl_journal.php:89
-#: c:\Apache2\htdocs\account2/gl/manage/exchange_rates.php:33
-#: c:\Apache2\htdocs\account2/manufacturing/work_order_add_finished.php:76
-#: c:\Apache2\htdocs\account2/purchasing/po_receive_items.php:156
+#: c:\Apache2\htdocs\account2/gl/gl_journal.php:88
+#: c:\Apache2\htdocs\account2/gl/manage/exchange_rates.php:23
+#: c:\Apache2\htdocs\account2/manufacturing/work_order_add_finished.php:78
+#: c:\Apache2\htdocs\account2/purchasing/po_receive_items.php:160
 #: c:\Apache2\htdocs\account2/purchasing/supplier_payment.php:151
 #: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:75
-#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:193
-#: c:\Apache2\htdocs\account2/sql/sales_order_entry.php:187
+#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:197
 msgid "The entered date is invalid."
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/void_transaction.php:59
-# c:\Apache2\htdocs\account/gl/bank_transfer.php:101
-# c:\Apache2\htdocs\account/gl/gl_deposit.php:118
-# c:\Apache2\htdocs\account/gl/gl_journal.php:91
-# c:\Apache2\htdocs\account/gl/gl_payment.php:119
-# c:\Apache2\htdocs\account/inventory/adjustments.php:106
-# c:\Apache2\htdocs\account/inventory/transfers.php:106
-# c:\Apache2\htdocs\account/manufacturing/work_order_add_finished.php:81
-# c:\Apache2\htdocs\account/manufacturing/work_order_entry.php:133
-# c:\Apache2\htdocs\account/manufacturing/work_order_issue.php:57
-# c:\Apache2\htdocs\account/purchasing/supplier_credit.php:95
-# c:\Apache2\htdocs\account/purchasing/supplier_invoice.php:95
-# c:\Apache2\htdocs\account/purchasing/supplier_payment.php:156
-# c:\Apache2\htdocs\account/sales/credit_note_entry.php:123
-# c:\Apache2\htdocs\account/sales/customer_credit_invoice.php:54
-# c:\Apache2\htdocs\account/sales/customer_payments.php:55
 #: c:\Apache2\htdocs\account2/admin/void_transaction.php:62
 #: c:\Apache2\htdocs\account2/gl/bank_transfer.php:104
-#: c:\Apache2\htdocs\account2/gl/gl_deposit.php:123
-#: c:\Apache2\htdocs\account2/gl/gl_journal.php:95
-#: c:\Apache2\htdocs\account2/gl/gl_payment.php:122
-#: c:\Apache2\htdocs\account2/inventory/adjustments.php:111
-#: c:\Apache2\htdocs\account2/inventory/transfers.php:111
-#: c:\Apache2\htdocs\account2/manufacturing/work_order_add_finished.php:82
+#: c:\Apache2\htdocs\account2/gl/gl_bank.php:130
+#: c:\Apache2\htdocs\account2/gl/gl_journal.php:94
+#: c:\Apache2\htdocs\account2/inventory/adjustments.php:103
+#: c:\Apache2\htdocs\account2/inventory/transfers.php:101
+#: c:\Apache2\htdocs\account2/manufacturing/work_order_add_finished.php:84
 #: c:\Apache2\htdocs\account2/manufacturing/work_order_entry.php:135
-#: c:\Apache2\htdocs\account2/manufacturing/work_order_issue.php:60
+#: c:\Apache2\htdocs\account2/manufacturing/work_order_issue.php:69
 #: c:\Apache2\htdocs\account2/purchasing/supplier_credit.php:102
 #: c:\Apache2\htdocs\account2/purchasing/supplier_invoice.php:101
 #: c:\Apache2\htdocs\account2/purchasing/supplier_payment.php:157
-#: c:\Apache2\htdocs\account2/sales/credit_note_entry.php:123
+#: c:\Apache2\htdocs\account2/sales/credit_note_entry.php:127
 #: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:79
 #: c:\Apache2\htdocs\account2/sales/customer_payments.php:55
 msgid "The entered date is not in fiscal year."
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/void_transaction.php:65
 #: c:\Apache2\htdocs\account2/admin/void_transaction.php:69
 msgid "The transaction number is expected to be numeric and greater than zero."
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/void_transaction.php:82
 #: c:\Apache2\htdocs\account2/admin/void_transaction.php:87
 msgid "The selected transaction has already been voided."
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/void_transaction.php:94
 #: c:\Apache2\htdocs\account2/admin/void_transaction.php:100
 msgid "Selected transaction has been voided."
 msgstr ""
 
-# c:\Apache2\htdocs\account/admin/void_transaction.php:100
 #: c:\Apache2\htdocs\account2/admin/void_transaction.php:106
 msgid "The entered transaction does not exist or cannot be voided."
 msgstr ""
 
-# c:\Apache2\htdocs\account/applications/customers.php:9
-# c:\Apache2\htdocs\account/applications/dimensions.php:12
-# c:\Apache2\htdocs\account/applications/generalledger.php:9
-# c:\Apache2\htdocs\account/applications/inventory.php:9
-# c:\Apache2\htdocs\account/applications/manufacturing.php:9
-# c:\Apache2\htdocs\account/applications/suppliers.php:9
 #: c:\Apache2\htdocs\account2/applications/customers.php:11
 #: c:\Apache2\htdocs\account2/applications/dimensions.php:14
 #: c:\Apache2\htdocs\account2/applications/generalledger.php:11
@@ -2195,8 +1707,6 @@ msgstr ""
 msgid "Transactions"
 msgstr ""
 
-# c:\Apache2\htdocs\account/applications/customers.php:10
-# c:\Apache2\htdocs\account/sales/sales_order_entry.php:29
 #: c:\Apache2\htdocs\account2/applications/customers.php:12
 msgid "Sales Order Entry"
 msgstr ""
@@ -2225,27 +1735,18 @@ msgstr ""
 msgid "Template Invoice"
 msgstr ""
 
-# c:\Apache2\htdocs\account/applications/customers.php:12
 #: c:\Apache2\htdocs\account2/applications/customers.php:22
 msgid "Customer Payments"
 msgstr ""
 
-# c:\Apache2\htdocs\account/applications/customers.php:15
 #: c:\Apache2\htdocs\account2/applications/customers.php:23
 msgid "Customer Credit Notes"
 msgstr ""
 
-# c:\Apache2\htdocs\account/applications/customers.php:16
 #: c:\Apache2\htdocs\account2/applications/customers.php:24
 msgid "Allocate Customer Payments or Credit Notes"
 msgstr ""
 
-# c:\Apache2\htdocs\account/applications/customers.php:18
-# c:\Apache2\htdocs\account/applications/dimensions.php:16
-# c:\Apache2\htdocs\account/applications/generalledger.php:15
-# c:\Apache2\htdocs\account/applications/inventory.php:13
-# c:\Apache2\htdocs\account/applications/manufacturing.php:13
-# c:\Apache2\htdocs\account/applications/suppliers.php:18
 #: c:\Apache2\htdocs\account2/applications/customers.php:26
 #: c:\Apache2\htdocs\account2/applications/dimensions.php:18
 #: c:\Apache2\htdocs\account2/applications/generalledger.php:18
@@ -2255,33 +1756,23 @@ msgstr ""
 msgid "Inquiries and Reports"
 msgstr ""
 
-# c:\Apache2\htdocs\account/applications/customers.php:19
 #: c:\Apache2\htdocs\account2/applications/customers.php:27
 msgid "Sales Order Inquiry"
 msgstr ""
 
-# c:\Apache2\htdocs\account/applications/customers.php:20
 #: c:\Apache2\htdocs\account2/applications/customers.php:28
 msgid "Customer Transaction Inquiry"
 msgstr ""
 
-# c:\Apache2\htdocs\account/applications/customers.php:22
-# c:\Apache2\htdocs\account/sales/inquiry/customer_allocation_inquiry.php:13
 #: c:\Apache2\htdocs\account2/applications/customers.php:30
 #: c:\Apache2\htdocs\account2/sales/inquiry/customer_allocation_inquiry.php:15
 msgid "Customer Allocation Inquiry"
 msgstr ""
 
-# c:\Apache2\htdocs\account/applications/customers.php:24
 #: c:\Apache2\htdocs\account2/applications/customers.php:32
 msgid "Customer and Sales Reports"
 msgstr ""
 
-# c:\Apache2\htdocs\account/applications/customers.php:26
-# c:\Apache2\htdocs\account/applications/generalledger.php:24
-# c:\Apache2\htdocs\account/applications/inventory.php:18
-# c:\Apache2\htdocs\account/applications/manufacturing.php:19
-# c:\Apache2\htdocs\account/applications/suppliers.php:26
 #: c:\Apache2\htdocs\account2/applications/customers.php:34
 #: c:\Apache2\htdocs\account2/applications/dimensions.php:30
 #: c:\Apache2\htdocs\account2/applications/generalledger.php:27
@@ -2291,38 +1782,26 @@ msgstr ""
 msgid "Maintenance"
 msgstr ""
 
-# c:\Apache2\htdocs\account/applications/customers.php:27
 #: c:\Apache2\htdocs\account2/applications/customers.php:35
 msgid "Add and Manage Customers"
 msgstr ""
 
-# c:\Apache2\htdocs\account/applications/customers.php:28
-# c:\Apache2\htdocs\account/sales/manage/customer_branches.php:7
 #: c:\Apache2\htdocs\account2/applications/customers.php:36
 #: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:7
 msgid "Customer Branches"
 msgstr ""
 
-# c:\Apache2\htdocs\account/applications/customers.php:29
-# c:\Apache2\htdocs\account/reporting/reports_main.php:38
-# c:\Apache2\htdocs\account/sales/manage/sales_types.php:7
 #: c:\Apache2\htdocs\account2/applications/customers.php:37
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:39
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:40
 #: c:\Apache2\htdocs\account2/sales/manage/sales_types.php:7
 msgid "Sales Types"
 msgstr ""
 
-# c:\Apache2\htdocs\account/applications/customers.php:30
-# c:\Apache2\htdocs\account/sales/manage/sales_people.php:7
 #: c:\Apache2\htdocs\account2/applications/customers.php:38
 #: c:\Apache2\htdocs\account2/sales/manage/sales_people.php:7
 msgid "Sales Persons"
 msgstr ""
 
-# c:\Apache2\htdocs\account/applications/customers.php:31
-# c:\Apache2\htdocs\account/reporting/rep103.php:135
-# c:\Apache2\htdocs\account/reporting/reports_main.php:34
-# c:\Apache2\htdocs\account/sales/manage/sales_areas.php:8
 #: c:\Apache2\htdocs\account2/applications/customers.php:39
 #: c:\Apache2\htdocs\account2/reporting/rep103.php:135
 #: c:\Apache2\htdocs\account2/reporting/reports_main.php:35
@@ -2330,926 +1809,617 @@ msgstr ""
 msgid "Sales Areas"
 msgstr ""
 
-# c:\Apache2\htdocs\account/applications/customers.php:32
 #: c:\Apache2\htdocs\account2/applications/customers.php:40
 msgid "Credit Status Setup"
 msgstr ""
 
-# c:\Apache2\htdocs\account/applications/dimensions.php:13
-# c:\Apache2\htdocs\account/dimensions/dimension_entry.php:8
 #: c:\Apache2\htdocs\account2/applications/dimensions.php:15
 #: c:\Apache2\htdocs\account2/dimensions/dimension_entry.php:18
 msgid "Dimension Entry"
 msgstr ""
 
-# c:\Apache2\htdocs\account/applications/dimensions.php:14
 #: c:\Apache2\htdocs\account2/applications/dimensions.php:16
 msgid "Outstanding Dimensions"
 msgstr ""
 
-# c:\Apache2\htdocs\account/applications/dimensions.php:17
 #: c:\Apache2\htdocs\account2/applications/dimensions.php:19
 msgid "Dimension Inquiry"
 msgstr ""
 
-# c:\Apache2\htdocs\account/applications/dimensions.php:19
 #: c:\Apache2\htdocs\account2/applications/dimensions.php:21
 msgid "Dimension Reports"
 msgstr ""
 
-# c:\Apache2\htdocs\account/applications/generalledger.php:10
-# c:\Apache2\htdocs\account/manufacturing/view/work_order_view.php:57
-# c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:1853
-# c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:1866
 #: c:\Apache2\htdocs\account2/applications/generalledger.php:12
 #: c:\Apache2\htdocs\account2/manufacturing/view/work_order_view.php:57
-#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:2089
-#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:2106
+#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:1632
+#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:1650
 msgid "Payments"
 msgstr ""
 
-# c:\Apache2\htdocs\account/applications/generalledger.php:11
 #: c:\Apache2\htdocs\account2/applications/generalledger.php:13
 msgid "Deposits"
 msgstr ""
 
-# c:\Apache2\htdocs\account/applications/generalledger.php:12
 #: c:\Apache2\htdocs\account2/applications/generalledger.php:14
 msgid "Bank Account Transfers"
 msgstr ""
 
-# c:\Apache2\htdocs\account/applications/generalledger.php:13
-# c:\Apache2\htdocs\account/gl/gl_journal.php:21
-# c:\Apache2\htdocs\account/includes/types.inc:6
 #: c:\Apache2\htdocs\account2/applications/generalledger.php:15
-#: c:\Apache2\htdocs\account2/gl/gl_journal.php:24
+#: c:\Apache2\htdocs\account2/gl/gl_journal.php:22
 #: c:\Apache2\htdocs\account2/includes/types.inc:6
 msgid "Journal Entry"
 msgstr ""
 
 #: c:\Apache2\htdocs\account2/applications/generalledger.php:16
-#: c:\Apache2\htdocs\account2/gl/gl_budget.php:7
+#: c:\Apache2\htdocs\account2/gl/gl_budget.php:9
 msgid "Budget Entry"
 msgstr ""
 
-# c:\Apache2\htdocs\account/applications/generalledger.php:16
 #: c:\Apache2\htdocs\account2/applications/generalledger.php:19
 msgid "Bank Account Inquiry"
 msgstr ""
 
-# c:\Apache2\htdocs\account/applications/generalledger.php:17
 #: c:\Apache2\htdocs\account2/applications/generalledger.php:20
 msgid "GL Account Inquiry"
 msgstr ""
 
-# c:\Apache2\htdocs\account/applications/generalledger.php:19
-# c:\Apache2\htdocs\account/gl/inquiry/gl_trial_balance.php:8
-# c:\Apache2\htdocs\account/reporting/rep708.php:89
-# c:\Apache2\htdocs\account/reporting/reports_main.php:181
-# c:\Apache2\htdocs\account/reporting/reports_main.php:213
-# c:\Apache2\htdocs\account/reporting/reports_main.php:240
 #: c:\Apache2\htdocs\account2/applications/generalledger.php:22
 #: c:\Apache2\htdocs\account2/gl/inquiry/gl_trial_balance.php:18
 #: c:\Apache2\htdocs\account2/reporting/rep708.php:89
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:193
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:227
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:256
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:201
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:235
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:264
 msgid "Trial Balance"
 msgstr ""
 
-# c:\Apache2\htdocs\account/applications/generalledger.php:21
 #: c:\Apache2\htdocs\account2/applications/generalledger.php:24
 msgid "Banking Reports"
 msgstr ""
 
-# c:\Apache2\htdocs\account/applications/generalledger.php:22
 #: c:\Apache2\htdocs\account2/applications/generalledger.php:25
 msgid "General Ledger Reports"
 msgstr ""
 
-# c:\Apache2\htdocs\account/applications/generalledger.php:25
-# c:\Apache2\htdocs\account/gl/manage/bank_accounts.php:7
 #: c:\Apache2\htdocs\account2/applications/generalledger.php:28
 #: c:\Apache2\htdocs\account2/gl/manage/bank_accounts.php:7
 msgid "Bank Accounts"
 msgstr ""
 
-# c:\Apache2\htdocs\account/applications/generalledger.php:26
 #: c:\Apache2\htdocs\account2/applications/generalledger.php:29
 msgid "Payment, Deposit and Transfer Types"
 msgstr ""
 
-# c:\Apache2\htdocs\account/applications/generalledger.php:28
-# c:\Apache2\htdocs\account/gl/manage/currencies.php:7
 #: c:\Apache2\htdocs\account2/applications/generalledger.php:31
 #: c:\Apache2\htdocs\account2/gl/manage/currencies.php:7
 msgid "Currencies"
 msgstr ""
 
-# c:\Apache2\htdocs\account/applications/generalledger.php:29
-# c:\Apache2\htdocs\account/gl/manage/exchange_rates.php:7
 #: c:\Apache2\htdocs\account2/applications/generalledger.php:32
 #: c:\Apache2\htdocs\account2/gl/manage/exchange_rates.php:14
 msgid "Exchange Rates"
 msgstr ""
 
-# c:\Apache2\htdocs\account/applications/generalledger.php:31
-# c:\Apache2\htdocs\account/inventory/manage/items.php:330
-# c:\Apache2\htdocs\account/sales/manage/customer_branches.php:297
 #: c:\Apache2\htdocs\account2/applications/generalledger.php:34
-#: c:\Apache2\htdocs\account2/inventory/manage/items.php:330
-#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:296
+#: c:\Apache2\htdocs\account2/inventory/manage/items.php:350
+#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:303
 msgid "GL Accounts"
 msgstr ""
 
-# c:\Apache2\htdocs\account/applications/generalledger.php:32
-# c:\Apache2\htdocs\account/gl/manage/gl_account_types.php:7
 #: c:\Apache2\htdocs\account2/applications/generalledger.php:35
 #: c:\Apache2\htdocs\account2/gl/manage/gl_account_types.php:7
 msgid "GL Account Groups"
 msgstr ""
 
-# c:\Apache2\htdocs\account/applications/generalledger.php:33
-# c:\Apache2\htdocs\account/gl/manage/gl_account_classes.php:7
 #: c:\Apache2\htdocs\account2/applications/generalledger.php:36
 #: c:\Apache2\htdocs\account2/gl/manage/gl_account_classes.php:7
 msgid "GL Account Classes"
 msgstr ""
 
-# c:\Apache2\htdocs\account/applications/inventory.php:10
-# c:\Apache2\htdocs\account/inventory/transfers.php:17
 #: c:\Apache2\htdocs\account2/applications/inventory.php:12
 #: c:\Apache2\htdocs\account2/inventory/transfers.php:19
 msgid "Inventory Location Transfers"
 msgstr ""
 
-# c:\Apache2\htdocs\account/applications/inventory.php:11
 #: c:\Apache2\htdocs\account2/applications/inventory.php:13
 msgid "Inventory Adjustments"
 msgstr ""
 
-# c:\Apache2\htdocs\account/applications/inventory.php:14
 #: c:\Apache2\htdocs\account2/applications/inventory.php:16
 msgid "Inventory Item Movements"
 msgstr ""
 
-# c:\Apache2\htdocs\account/applications/inventory.php:15
-# c:\Apache2\htdocs\account/inventory/inquiry/stock_status.php:9
-# c:\Apache2\htdocs\account/inventory/inquiry/stock_status.php:11
 #: c:\Apache2\htdocs\account2/applications/inventory.php:17
 #: c:\Apache2\htdocs\account2/inventory/inquiry/stock_status.php:9
 #: c:\Apache2\htdocs\account2/inventory/inquiry/stock_status.php:11
 msgid "Inventory Item Status"
 msgstr ""
 
-# c:\Apache2\htdocs\account/applications/inventory.php:16
 #: c:\Apache2\htdocs\account2/applications/inventory.php:18
 msgid "Inventory Reports"
 msgstr ""
 
-# c:\Apache2\htdocs\account/applications/inventory.php:19
-# c:\Apache2\htdocs\account/inventory/transfers.php:227
-# c:\Apache2\htdocs\account/inventory/manage/items.php:7
 #: c:\Apache2\htdocs\account2/applications/inventory.php:21
-#: c:\Apache2\htdocs\account2/inventory/transfers.php:236
+#: c:\Apache2\htdocs\account2/inventory/transfers.php:220
 #: c:\Apache2\htdocs\account2/inventory/manage/items.php:7
 msgid "Items"
 msgstr ""
 
-# c:\Apache2\htdocs\account/applications/inventory.php:20
-# c:\Apache2\htdocs\account/inventory/manage/item_categories.php:7
 #: c:\Apache2\htdocs\account2/applications/inventory.php:22
 #: c:\Apache2\htdocs\account2/inventory/manage/item_categories.php:7
 msgid "Item Categories"
 msgstr ""
 
-# c:\Apache2\htdocs\account/applications/inventory.php:21
-# c:\Apache2\htdocs\account/inventory/manage/locations.php:7
 #: c:\Apache2\htdocs\account2/applications/inventory.php:23
 #: c:\Apache2\htdocs\account2/inventory/manage/locations.php:7
 msgid "Inventory Locations"
 msgstr ""
 
-# c:\Apache2\htdocs\account/applications/inventory.php:22
-# c:\Apache2\htdocs\account/inventory/manage/movement_types.php:7
 #: c:\Apache2\htdocs\account2/applications/inventory.php:24
 #: c:\Apache2\htdocs\account2/inventory/manage/movement_types.php:7
 msgid "Inventory Movement Types"
 msgstr ""
 
-# c:\Apache2\htdocs\account/applications/inventory.php:23
-# c:\Apache2\htdocs\account/taxes/item_tax_types.php:8
 #: c:\Apache2\htdocs\account2/applications/inventory.php:25
 #: c:\Apache2\htdocs\account2/taxes/item_tax_types.php:8
 msgid "Item Tax Types"
 msgstr ""
 
 #: c:\Apache2\htdocs\account2/applications/inventory.php:26
-#: c:\Apache2\htdocs\account2/inventory/manage/item_units.php:7
+#: c:\Apache2\htdocs\account2/inventory/manage/item_units.php:6
 msgid "Units of Measure"
 msgstr ""
 
-# c:\Apache2\htdocs\account/applications/inventory.php:25
-# c:\Apache2\htdocs\account/inventory/reorder_level.php:7
 #: c:\Apache2\htdocs\account2/applications/inventory.php:27
 #: c:\Apache2\htdocs\account2/inventory/reorder_level.php:7
 msgid "Reorder Levels"
 msgstr ""
 
-# c:\Apache2\htdocs\account/applications/inventory.php:27
 #: c:\Apache2\htdocs\account2/applications/inventory.php:29
 msgid "Pricing and Costs"
 msgstr ""
 
-# c:\Apache2\htdocs\account/applications/inventory.php:28
 #: c:\Apache2\htdocs\account2/applications/inventory.php:30
 msgid "Sales Pricing"
 msgstr ""
 
-# c:\Apache2\htdocs\account/applications/inventory.php:29
 #: c:\Apache2\htdocs\account2/applications/inventory.php:31
 msgid "Purchasing Pricing"
 msgstr ""
 
-# c:\Apache2\htdocs\account/applications/inventory.php:30
 #: c:\Apache2\htdocs\account2/applications/inventory.php:32
 msgid "Standard Costs"
 msgstr ""
 
-# c:\Apache2\htdocs\account/applications/manufacturing.php:10
-# c:\Apache2\htdocs\account/manufacturing/work_order_entry.php:8
 #: c:\Apache2\htdocs\account2/applications/manufacturing.php:12
 #: c:\Apache2\htdocs\account2/manufacturing/work_order_entry.php:18
 msgid "Work Order Entry"
 msgstr ""
 
-# c:\Apache2\htdocs\account/applications/manufacturing.php:11
 #: c:\Apache2\htdocs\account2/applications/manufacturing.php:13
 msgid "Outstanding Work Orders"
 msgstr ""
 
-# c:\Apache2\htdocs\account/applications/manufacturing.php:15
-# c:\Apache2\htdocs\account/manufacturing/inquiry/where_used_inquiry.php:7
 #: c:\Apache2\htdocs\account2/applications/manufacturing.php:17
 #: c:\Apache2\htdocs\account2/manufacturing/inquiry/where_used_inquiry.php:7
 msgid "Inventory Item Where Used Inquiry"
 msgstr ""
 
-# c:\Apache2\htdocs\account/applications/manufacturing.php:16
 #: c:\Apache2\htdocs\account2/applications/manufacturing.php:18
 msgid "Work Order Inquiry"
 msgstr ""
 
-# c:\Apache2\htdocs\account/applications/manufacturing.php:17
 #: c:\Apache2\htdocs\account2/applications/manufacturing.php:19
-msgid "Manufactoring Reports"
+msgid "Manufacturing Reports"
 msgstr ""
 
-# c:\Apache2\htdocs\account/applications/manufacturing.php:20
 #: c:\Apache2\htdocs\account2/applications/manufacturing.php:22
 msgid "Bills Of Material"
 msgstr ""
 
-# c:\Apache2\htdocs\account/applications/manufacturing.php:21
-# c:\Apache2\htdocs\account/manufacturing/manage/work_centres.php:7
 #: c:\Apache2\htdocs\account2/applications/manufacturing.php:23
 #: c:\Apache2\htdocs\account2/manufacturing/manage/work_centres.php:7
 msgid "Work Centres"
 msgstr ""
 
-# c:\Apache2\htdocs\account/applications/setup.php:11
 #: c:\Apache2\htdocs\account2/applications/setup.php:13
 msgid "User Accounts Setup"
 msgstr ""
 
-# c:\Apache2\htdocs\account/applications/setup.php:15
 #: c:\Apache2\htdocs\account2/applications/setup.php:17
 msgid "Taxes"
 msgstr ""
 
-# c:\Apache2\htdocs\account/applications/setup.php:16
-# c:\Apache2\htdocs\account/taxes/tax_groups.php:8
 #: c:\Apache2\htdocs\account2/applications/setup.php:18
 #: c:\Apache2\htdocs\account2/taxes/tax_groups.php:8
 msgid "Tax Groups"
 msgstr ""
 
-# c:\Apache2\htdocs\account/applications/setup.php:25
 #: c:\Apache2\htdocs\account2/applications/setup.php:27
 msgid "Maintanance"
 msgstr ""
 
-# c:\Apache2\htdocs\account/applications/setup.php:28
 #: c:\Apache2\htdocs\account2/applications/setup.php:30
 msgid "Backup and Restore"
 msgstr ""
 
-# c:\Apache2\htdocs\account/applications/setup.php:29
 #: c:\Apache2\htdocs\account2/applications/setup.php:31
 msgid "Create/Update Companies"
 msgstr ""
 
-# c:\Apache2\htdocs\account/applications/suppliers.php:10
-# c:\Apache2\htdocs\account/purchasing/po_entry_items.php:25
 #: c:\Apache2\htdocs\account2/applications/suppliers.php:12
 #: c:\Apache2\htdocs\account2/purchasing/po_entry_items.php:24
 msgid "Purchase Order Entry"
 msgstr ""
 
-# c:\Apache2\htdocs\account/applications/suppliers.php:11
 #: c:\Apache2\htdocs\account2/applications/suppliers.php:13
 msgid "Outstanding Purchase Orders Maintenance"
 msgstr ""
 
-# c:\Apache2\htdocs\account/applications/suppliers.php:12
 #: c:\Apache2\htdocs\account2/applications/suppliers.php:14
 msgid "Payments to Suppliers"
 msgstr ""
 
-# c:\Apache2\htdocs\account/applications/suppliers.php:14
 #: c:\Apache2\htdocs\account2/applications/suppliers.php:16
 msgid "Supplier Invoices"
 msgstr ""
 
-# c:\Apache2\htdocs\account/applications/suppliers.php:15
 #: c:\Apache2\htdocs\account2/applications/suppliers.php:17
 msgid "Supplier Credit Notes"
 msgstr ""
 
-# c:\Apache2\htdocs\account/applications/suppliers.php:16
 #: c:\Apache2\htdocs\account2/applications/suppliers.php:18
 msgid "Allocate Supplier Payments or Credit Notes"
 msgstr ""
 
-# c:\Apache2\htdocs\account/applications/suppliers.php:19
 #: c:\Apache2\htdocs\account2/applications/suppliers.php:21
 msgid "Purchase Orders Inquiry"
 msgstr ""
 
-# c:\Apache2\htdocs\account/applications/suppliers.php:20
 #: c:\Apache2\htdocs\account2/applications/suppliers.php:22
 msgid "Supplier Transaction Inquiry"
 msgstr ""
 
-# c:\Apache2\htdocs\account/applications/suppliers.php:22
-# c:\Apache2\htdocs\account/purchasing/inquiry/supplier_allocation_inquiry.php:11
 #: c:\Apache2\htdocs\account2/applications/suppliers.php:24
 #: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_allocation_inquiry.php:13
 msgid "Supplier Allocation Inquiry"
 msgstr ""
 
-# c:\Apache2\htdocs\account/applications/suppliers.php:24
 #: c:\Apache2\htdocs\account2/applications/suppliers.php:26
 msgid "Supplier and Purchasing Reports"
 msgstr ""
 
-# c:\Apache2\htdocs\account/applications/suppliers.php:27
-# c:\Apache2\htdocs\account/purchasing/manage/suppliers.php:7
 #: c:\Apache2\htdocs\account2/applications/suppliers.php:29
 #: c:\Apache2\htdocs\account2/purchasing/manage/suppliers.php:7
 msgid "Suppliers"
 msgstr ""
 
-# c:\Apache2\htdocs\account/dimensions/dimension_entry.php:35
 #: c:\Apache2\htdocs\account2/dimensions/dimension_entry.php:38
 msgid "The dimension has been entered."
 msgstr ""
 
-# c:\Apache2\htdocs\account/dimensions/dimension_entry.php:46
 #: c:\Apache2\htdocs\account2/dimensions/dimension_entry.php:49
 msgid "The dimension has been updated."
 msgstr ""
 
-# c:\Apache2\htdocs\account/dimensions/dimension_entry.php:56
 #: c:\Apache2\htdocs\account2/dimensions/dimension_entry.php:59
 msgid "The dimension has been deleted."
 msgstr ""
 
-# c:\Apache2\htdocs\account/dimensions/dimension_entry.php:66
 #: c:\Apache2\htdocs\account2/dimensions/dimension_entry.php:69
 msgid "The dimension has been closed. There can be no more changes to it."
 msgstr ""
 
-# c:\Apache2\htdocs\account/dimensions/dimension_entry.php:76
 #: c:\Apache2\htdocs\account2/dimensions/dimension_entry.php:79
 msgid "Enter a new dimension"
 msgstr ""
 
-# c:\Apache2\htdocs\account/dimensions/dimension_entry.php:78
 #: c:\Apache2\htdocs\account2/dimensions/dimension_entry.php:81
 msgid "Select an existing dimension"
 msgstr ""
 
-# c:\Apache2\htdocs\account/dimensions/dimension_entry.php:97
-#: c:\Apache2\htdocs\account2/dimensions/dimension_entry.php:100
+#: c:\Apache2\htdocs\account2/dimensions/dimension_entry.php:97
 msgid "The dimension reference must be entered."
 msgstr ""
 
-# c:\Apache2\htdocs\account/dimensions/dimension_entry.php:103
-# c:\Apache2\htdocs\account/gl/bank_transfer.php:124
-# c:\Apache2\htdocs\account/gl/gl_deposit.php:106
-# c:\Apache2\htdocs\account/gl/gl_journal.php:101
-# c:\Apache2\htdocs\account/gl/gl_payment.php:109
-# c:\Apache2\htdocs\account/inventory/adjustments.php:95
-# c:\Apache2\htdocs\account/inventory/transfers.php:96
-# c:\Apache2\htdocs\account/manufacturing/work_order_add_finished.php:58
-# c:\Apache2\htdocs\account/manufacturing/work_order_entry.php:109
-# c:\Apache2\htdocs\account/manufacturing/work_order_issue.php:68
-# c:\Apache2\htdocs\account/purchasing/po_entry_items.php:271
-# c:\Apache2\htdocs\account/purchasing/po_receive_items.php:166
-# c:\Apache2\htdocs\account/purchasing/supplier_credit.php:78
-# c:\Apache2\htdocs\account/purchasing/supplier_invoice.php:78
-# c:\Apache2\htdocs\account/purchasing/supplier_payment.php:167
-# c:\Apache2\htdocs\account/sales/credit_note_entry.php:113
-# c:\Apache2\htdocs\account/sales/customer_credit_invoice.php:66
-# c:\Apache2\htdocs\account/sales/customer_invoice.php:209
-# c:\Apache2\htdocs\account/sales/customer_payments.php:67
-#: c:\Apache2\htdocs\account2/dimensions/dimension_entry.php:107
+#: c:\Apache2\htdocs\account2/dimensions/dimension_entry.php:104
 #: c:\Apache2\htdocs\account2/gl/bank_transfer.php:125
-#: c:\Apache2\htdocs\account2/gl/gl_deposit.php:109
-#: c:\Apache2\htdocs\account2/gl/gl_journal.php:107
-#: c:\Apache2\htdocs\account2/gl/gl_payment.php:110
-#: c:\Apache2\htdocs\account2/inventory/adjustments.php:98
-#: c:\Apache2\htdocs\account2/inventory/transfers.php:99
-#: c:\Apache2\htdocs\account2/manufacturing/work_order_add_finished.php:62
+#: c:\Apache2\htdocs\account2/gl/gl_bank.php:118
+#: c:\Apache2\htdocs\account2/gl/gl_journal.php:106
+#: c:\Apache2\htdocs\account2/inventory/adjustments.php:90
+#: c:\Apache2\htdocs\account2/inventory/transfers.php:89
+#: c:\Apache2\htdocs\account2/manufacturing/work_order_add_finished.php:64
 #: c:\Apache2\htdocs\account2/manufacturing/work_order_entry.php:114
-#: c:\Apache2\htdocs\account2/manufacturing/work_order_issue.php:73
-#: c:\Apache2\htdocs\account2/purchasing/po_entry_items.php:273
-#: c:\Apache2\htdocs\account2/purchasing/po_receive_items.php:170
+#: c:\Apache2\htdocs\account2/manufacturing/work_order_issue.php:82
+#: c:\Apache2\htdocs\account2/purchasing/po_entry_items.php:245
+#: c:\Apache2\htdocs\account2/purchasing/po_receive_items.php:174
 #: c:\Apache2\htdocs\account2/purchasing/supplier_credit.php:82
 #: c:\Apache2\htdocs\account2/purchasing/supplier_invoice.php:81
 #: c:\Apache2\htdocs\account2/purchasing/supplier_payment.php:170
-#: c:\Apache2\htdocs\account2/sales/credit_note_entry.php:113
+#: c:\Apache2\htdocs\account2/sales/credit_note_entry.php:117
 #: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:92
-#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:157
-#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:209
+#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:158
+#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:229
 #: c:\Apache2\htdocs\account2/sales/customer_payments.php:67
 msgid "The entered reference is already in use."
 msgstr ""
 
-# c:\Apache2\htdocs\account/dimensions/dimension_entry.php:110
-#: c:\Apache2\htdocs\account2/dimensions/dimension_entry.php:115
+#: c:\Apache2\htdocs\account2/dimensions/dimension_entry.php:112
 msgid "The dimension name must be entered."
 msgstr ""
 
-# c:\Apache2\htdocs\account/dimensions/dimension_entry.php:116
-# c:\Apache2\htdocs\account/manufacturing/work_order_entry.php:128
-# c:\Apache2\htdocs\account/manufacturing/work_order_entry.php:198
-# c:\Apache2\htdocs\account/purchasing/po_entry_items.php:170
-#: c:\Apache2\htdocs\account2/dimensions/dimension_entry.php:122
+#: c:\Apache2\htdocs\account2/dimensions/dimension_entry.php:119
 #: c:\Apache2\htdocs\account2/manufacturing/work_order_entry.php:129
 #: c:\Apache2\htdocs\account2/manufacturing/work_order_entry.php:201
-#: c:\Apache2\htdocs\account2/purchasing/po_entry_items.php:167
+#: c:\Apache2\htdocs\account2/purchasing/po_entry_items.php:137
 msgid "The date entered is in an invalid format."
 msgstr ""
 
-# c:\Apache2\htdocs\account/dimensions/dimension_entry.php:122
-#: c:\Apache2\htdocs\account2/dimensions/dimension_entry.php:129
+#: c:\Apache2\htdocs\account2/dimensions/dimension_entry.php:126
 msgid "The required by date entered is in an invalid format."
 msgstr ""
 
-# c:\Apache2\htdocs\account/dimensions/dimension_entry.php:164
-#: c:\Apache2\htdocs\account2/dimensions/dimension_entry.php:172
+#: c:\Apache2\htdocs\account2/dimensions/dimension_entry.php:169
 msgid "This dimension cannot be deleted because it has already been processed."
 msgstr ""
 
-# c:\Apache2\htdocs\account/dimensions/dimension_entry.php:199
-#: c:\Apache2\htdocs\account2/dimensions/dimension_entry.php:208
+#: c:\Apache2\htdocs\account2/dimensions/dimension_entry.php:205
 msgid "The dimension sent is not valid."
 msgstr ""
 
-# c:\Apache2\htdocs\account/dimensions/dimension_entry.php:206
-#: c:\Apache2\htdocs\account2/dimensions/dimension_entry.php:215
+#: c:\Apache2\htdocs\account2/dimensions/dimension_entry.php:212
 msgid "This dimension is closed and cannot be edited."
 msgstr ""
 
-# c:\Apache2\htdocs\account/dimensions/dimension_entry.php:220
-# c:\Apache2\htdocs\account/dimensions/dimension_entry.php:226
-#: c:\Apache2\htdocs\account2/dimensions/dimension_entry.php:229
-#: c:\Apache2\htdocs\account2/dimensions/dimension_entry.php:235
+#: c:\Apache2\htdocs\account2/dimensions/dimension_entry.php:226
+#: c:\Apache2\htdocs\account2/dimensions/dimension_entry.php:232
 msgid "Dimension Reference:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/dimensions/dimension_entry.php:233
-# c:\Apache2\htdocs\account/dimensions/inquiry/search_dimensions.php:39
-# c:\Apache2\htdocs\account/dimensions/inquiry/search_dimensions.php:98
-# c:\Apache2\htdocs\account/dimensions/inquiry/search_dimensions.php:101
-# c:\Apache2\htdocs\account/dimensions/view/view_dimension.php:35
-# c:\Apache2\htdocs\account/gl/inquiry/bank_inquiry.php:58
-# c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:93
-# c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:96
-# c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:99
-# c:\Apache2\htdocs\account/gl/manage/bank_accounts.php:89
-# c:\Apache2\htdocs\account/inventory/inquiry/stock_movements.php:57
-# c:\Apache2\htdocs\account/manufacturing/search_work_orders.php:88
-# c:\Apache2\htdocs\account/purchasing/inquiry/supplier_allocation_inquiry.php:124
-# c:\Apache2\htdocs\account/purchasing/inquiry/supplier_allocation_inquiry.php:128
-# c:\Apache2\htdocs\account/purchasing/inquiry/supplier_inquiry.php:158
-# c:\Apache2\htdocs\account/purchasing/inquiry/supplier_inquiry.php:162
-# c:\Apache2\htdocs\account/reporting/rep102.php:147
-# c:\Apache2\htdocs\account/reporting/rep202.php:156
-# c:\Apache2\htdocs\account/reporting/rep501.php:75
-# c:\Apache2\htdocs\account/reporting/rep702.php:46
-# c:\Apache2\htdocs\account/reporting/rep704.php:63
-# c:\Apache2\htdocs\account/reporting/rep704.php:66
-# c:\Apache2\htdocs\account/reporting/rep704.php:69
-# c:\Apache2\htdocs\account/reporting/rep709.php:178
-# c:\Apache2\htdocs\account/reporting/reports_main.php:149
-# c:\Apache2\htdocs\account/sales/inquiry/customer_allocation_inquiry.php:119
-# c:\Apache2\htdocs\account/sales/inquiry/customer_allocation_inquiry.php:122
-# c:\Apache2\htdocs\account/sales/inquiry/customer_inquiry.php:161
-# c:\Apache2\htdocs\account/sales/inquiry/customer_inquiry.php:164
-# c:\Apache2\htdocs\account/dimensions/includes/dimensions_ui.inc:23
-# c:\Apache2\htdocs\account/includes/ui/ui_view.inc:463
-# c:\Apache2\htdocs\account/manufacturing/includes/manufacturing_ui.inc:268
-# c:\Apache2\htdocs\account/manufacturing/includes/manufacturing_ui.inc:272
-# c:\Apache2\htdocs\account/manufacturing/includes/manufacturing_ui.inc:323
-#: c:\Apache2\htdocs\account2/dimensions/dimension_entry.php:242
-#: c:\Apache2\htdocs\account2/dimensions/inquiry/search_dimensions.php:41
-#: c:\Apache2\htdocs\account2/dimensions/inquiry/search_dimensions.php:100
-#: c:\Apache2\htdocs\account2/dimensions/inquiry/search_dimensions.php:103
-#: c:\Apache2\htdocs\account2/dimensions/view/view_dimension.php:35
-#: c:\Apache2\htdocs\account2/gl/inquiry/bank_inquiry.php:60
-#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:91
-#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:94
-#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:97
-#: c:\Apache2\htdocs\account2/gl/manage/bank_accounts.php:89
-#: c:\Apache2\htdocs\account2/inventory/inquiry/stock_movements.php:60
-#: c:\Apache2\htdocs\account2/manufacturing/search_work_orders.php:88
-#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_allocation_inquiry.php:126
+#: c:\Apache2\htdocs\account2/dimensions/dimension_entry.php:239
+#: c:\Apache2\htdocs\account2/dimensions/inquiry/search_dimensions.php:66
+#: c:\Apache2\htdocs\account2/dimensions/inquiry/search_dimensions.php:126
+#: c:\Apache2\htdocs\account2/dimensions/inquiry/search_dimensions.php:129
+#: c:\Apache2\htdocs\account2/dimensions/view/view_dimension.php:38
+#: c:\Apache2\htdocs\account2/gl/inquiry/bank_inquiry.php:67
+#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:98
+#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:101
+#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:104
+#: c:\Apache2\htdocs\account2/gl/manage/bank_accounts.php:92
+#: c:\Apache2\htdocs\account2/inventory/inquiry/stock_movements.php:67
+#: c:\Apache2\htdocs\account2/manufacturing/search_work_orders.php:114
 #: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_allocation_inquiry.php:130
-#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_inquiry.php:160
-#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_inquiry.php:164
-#: c:\Apache2\htdocs\account2/reporting/rep102.php:152
-#: c:\Apache2\htdocs\account2/reporting/rep202.php:160
+#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_allocation_inquiry.php:134
+#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_inquiry.php:167
+#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_inquiry.php:171
+#: c:\Apache2\htdocs\account2/reporting/rep102.php:111
+#: c:\Apache2\htdocs\account2/reporting/rep202.php:112
 #: c:\Apache2\htdocs\account2/reporting/rep501.php:75
 #: c:\Apache2\htdocs\account2/reporting/rep702.php:46
 #: c:\Apache2\htdocs\account2/reporting/rep704.php:63
 #: c:\Apache2\htdocs\account2/reporting/rep704.php:66
 #: c:\Apache2\htdocs\account2/reporting/rep704.php:69
-#: c:\Apache2\htdocs\account2/reporting/rep709.php:178
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:159
-#: c:\Apache2\htdocs\account2/sales/inquiry/customer_allocation_inquiry.php:131
+#: c:\Apache2\htdocs\account2/reporting/rep709.php:196
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:167
 #: c:\Apache2\htdocs\account2/sales/inquiry/customer_allocation_inquiry.php:134
-#: c:\Apache2\htdocs\account2/sales/inquiry/customer_inquiry.php:172
+#: c:\Apache2\htdocs\account2/sales/inquiry/customer_allocation_inquiry.php:137
+#: c:\Apache2\htdocs\account2/sales/inquiry/customer_inquiry.php:183
 #: c:\Apache2\htdocs\account2/dimensions/includes/dimensions_ui.inc:23
-#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:475
-#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:268
-#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:272
-#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:323
+#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:481
+#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:269
+#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:273
+#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:324
 msgid "Type"
 msgstr ""
 
-# c:\Apache2\htdocs\account/dimensions/dimension_entry.php:235
-# c:\Apache2\htdocs\account/reporting/reports_main.php:43
-# c:\Apache2\htdocs\account/reporting/reports_main.php:147
-# c:\Apache2\htdocs\account/reporting/reports_main.php:156
-# c:\Apache2\htdocs\account/reporting/reports_main.php:169
-# c:\Apache2\htdocs\account/reporting/reports_main.php:175
-# c:\Apache2\htdocs\account/reporting/reports_main.php:182
-# c:\Apache2\htdocs\account/reporting/reports_main.php:192
-# c:\Apache2\htdocs\account/reporting/reports_main.php:203
-# c:\Apache2\htdocs\account/reporting/reports_main.php:208
-# c:\Apache2\htdocs\account/reporting/reports_main.php:214
-# c:\Apache2\htdocs\account/reporting/reports_main.php:223
-# c:\Apache2\htdocs\account/reporting/reports_main.php:232
-# c:\Apache2\htdocs\account/reporting/reports_main.php:236
-# c:\Apache2\htdocs\account/reporting/reports_main.php:241
-# c:\Apache2\htdocs\account/reporting/reports_main.php:247
-#: c:\Apache2\htdocs\account2/dimensions/dimension_entry.php:244
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:44
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:51
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:157
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:166
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:179
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:186
+#: c:\Apache2\htdocs\account2/dimensions/dimension_entry.php:241
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:45
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:52
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:129
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:165
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:174
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:187
 #: c:\Apache2\htdocs\account2/reporting/reports_main.php:194
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:204
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:215
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:221
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:228
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:237
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:246
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:251
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:257
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:263
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:202
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:212
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:223
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:229
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:236
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:245
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:254
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:259
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:265
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:271
 msgid "Start Date"
 msgstr ""
 
-# c:\Apache2\htdocs\account/dimensions/dimension_entry.php:237
-# c:\Apache2\htdocs\account/manufacturing/work_order_entry.php:364
-#: c:\Apache2\htdocs\account2/dimensions/dimension_entry.php:246
-#: c:\Apache2\htdocs\account2/manufacturing/work_order_entry.php:370
+#: c:\Apache2\htdocs\account2/dimensions/dimension_entry.php:243
+#: c:\Apache2\htdocs\account2/manufacturing/work_order_entry.php:377
 msgid "Date Required By"
 msgstr ""
 
-# c:\Apache2\htdocs\account/dimensions/dimension_entry.php:249
-#: c:\Apache2\htdocs\account2/dimensions/dimension_entry.php:258
+#: c:\Apache2\htdocs\account2/dimensions/dimension_entry.php:252
+msgid "Save changes to dimension"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/dimensions/dimension_entry.php:253
 msgid "Close This Dimension"
 msgstr ""
 
-# c:\Apache2\htdocs\account/dimensions/dimension_entry.php:250
-#: c:\Apache2\htdocs\account2/dimensions/dimension_entry.php:259
+#: c:\Apache2\htdocs\account2/dimensions/dimension_entry.php:253
+msgid "Mark this dimension as closed"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/dimensions/dimension_entry.php:254
 msgid "Delete This Dimension"
 msgstr ""
 
-# c:\Apache2\htdocs\account/dimensions/inquiry/search_dimensions.php:17
+#: c:\Apache2\htdocs\account2/dimensions/dimension_entry.php:254
+msgid "Delete unused dimension"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/dimensions/dimension_entry.php:258
+msgid "Add"
+msgstr ""
+
 #: c:\Apache2\htdocs\account2/dimensions/inquiry/search_dimensions.php:19
-msgid "Search Outstanding Dimensionss"
+msgid "Search Outstanding Dimensions"
 msgstr ""
 
-# c:\Apache2\htdocs\account/dimensions/inquiry/search_dimensions.php:22
 #: c:\Apache2\htdocs\account2/dimensions/inquiry/search_dimensions.php:24
 msgid "Search Dimensions"
 msgstr ""
 
-# c:\Apache2\htdocs\account/dimensions/inquiry/search_dimensions.php:37
-# c:\Apache2\htdocs\account/gl/bank_transfer.php:76
-# c:\Apache2\htdocs\account/manufacturing/search_work_orders.php:35
-# c:\Apache2\htdocs\account/manufacturing/work_order_add_finished.php:143
-# c:\Apache2\htdocs\account/manufacturing/work_order_entry.php:328
-# c:\Apache2\htdocs\account/manufacturing/work_order_entry.php:334
-# c:\Apache2\htdocs\account/purchasing/supplier_payment.php:98
-# c:\Apache2\htdocs\account/sales/customer_payments.php:201
-# c:\Apache2\htdocs\account/gl/includes/ui/gl_deposit_ui.inc:87
-# c:\Apache2\htdocs\account/gl/includes/ui/gl_journal_ui.inc:18
-# c:\Apache2\htdocs\account/gl/includes/ui/gl_payment_ui.inc:87
-# c:\Apache2\htdocs\account/inventory/includes/item_adjustments_ui.inc:38
-# c:\Apache2\htdocs\account/inventory/includes/stock_transfers_ui.inc:46
-# c:\Apache2\htdocs\account/manufacturing/includes/work_order_issue_ui.inc:144
-# c:\Apache2\htdocs\account/purchasing/includes/ui/invoice_ui.inc:75
-# c:\Apache2\htdocs\account/purchasing/includes/ui/invoice_ui.inc:77
-# c:\Apache2\htdocs\account/purchasing/includes/ui/po_ui.inc:87
-# c:\Apache2\htdocs\account/purchasing/includes/ui/po_ui.inc:92
-# c:\Apache2\htdocs\account/sales/includes/ui/sales_credit_ui.inc:48
-#: c:\Apache2\htdocs\account2/dimensions/inquiry/search_dimensions.php:39
+#: c:\Apache2\htdocs\account2/dimensions/inquiry/search_dimensions.php:64
 #: c:\Apache2\htdocs\account2/gl/bank_transfer.php:78
-#: c:\Apache2\htdocs\account2/manufacturing/search_work_orders.php:35
-#: c:\Apache2\htdocs\account2/manufacturing/work_order_add_finished.php:147
-#: c:\Apache2\htdocs\account2/manufacturing/work_order_entry.php:334
+#: c:\Apache2\htdocs\account2/manufacturing/search_work_orders.php:59
+#: c:\Apache2\htdocs\account2/manufacturing/work_order_add_finished.php:149
 #: c:\Apache2\htdocs\account2/manufacturing/work_order_entry.php:340
+#: c:\Apache2\htdocs\account2/manufacturing/work_order_entry.php:347
 #: c:\Apache2\htdocs\account2/purchasing/supplier_payment.php:95
-#: c:\Apache2\htdocs\account2/sales/customer_payments.php:191
-#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_deposit_ui.inc:87
+#: c:\Apache2\htdocs\account2/sales/customer_payments.php:193
+#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_bank_ui.inc:89
+#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_bank_ui.inc:91
 #: c:\Apache2\htdocs\account2/gl/includes/ui/gl_journal_ui.inc:18
-#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_payment_ui.inc:87
-#: c:\Apache2\htdocs\account2/inventory/includes/item_adjustments_ui.inc:38
-#: c:\Apache2\htdocs\account2/inventory/includes/stock_transfers_ui.inc:46
-#: c:\Apache2\htdocs\account2/manufacturing/includes/work_order_issue_ui.inc:144
+#: c:\Apache2\htdocs\account2/inventory/includes/item_adjustments_ui.inc:27
+#: c:\Apache2\htdocs\account2/inventory/includes/stock_transfers_ui.inc:35
+#: c:\Apache2\htdocs\account2/manufacturing/includes/work_order_issue_ui.inc:140
 #: c:\Apache2\htdocs\account2/purchasing/includes/ui/invoice_ui.inc:73
 #: c:\Apache2\htdocs\account2/purchasing/includes/ui/invoice_ui.inc:75
-#: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:87
-#: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:92
+#: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:85
+#: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:90
 msgid "Reference:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/dimensions/inquiry/search_dimensions.php:40
-# c:\Apache2\htdocs\account/gl/inquiry/bank_inquiry.php:29
-# c:\Apache2\htdocs\account/gl/inquiry/gl_trial_balance.php:25
-# c:\Apache2\htdocs\account/inventory/inquiry/stock_movements.php:34
-# c:\Apache2\htdocs\account/purchasing/inquiry/supplier_allocation_inquiry.php:38
-# c:\Apache2\htdocs\account/purchasing/inquiry/supplier_inquiry.php:36
-# c:\Apache2\htdocs\account/sales/inquiry/customer_inquiry.php:32
-# c:\Apache2\htdocs\account/gl/includes/ui/gl_deposit_ui.inc:40
-# c:\Apache2\htdocs\account/gl/includes/ui/gl_payment_ui.inc:16
-#: c:\Apache2\htdocs\account2/dimensions/inquiry/search_dimensions.php:42
-#: c:\Apache2\htdocs\account2/gl/inquiry/bank_inquiry.php:31
-#: c:\Apache2\htdocs\account2/gl/inquiry/gl_trial_balance.php:29
-#: c:\Apache2\htdocs\account2/inventory/inquiry/stock_movements.php:37
+#: c:\Apache2\htdocs\account2/dimensions/inquiry/search_dimensions.php:67
+#: c:\Apache2\htdocs\account2/gl/inquiry/bank_inquiry.php:37
+#: c:\Apache2\htdocs\account2/gl/inquiry/gl_trial_balance.php:35
+#: c:\Apache2\htdocs\account2/inventory/inquiry/stock_movements.php:43
 #: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_allocation_inquiry.php:40
 #: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_inquiry.php:38
-#: c:\Apache2\htdocs\account2/sales/inquiry/customer_inquiry.php:35
-#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_deposit_ui.inc:40
-#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_payment_ui.inc:16
+#: c:\Apache2\htdocs\account2/sales/inquiry/customer_inquiry.php:36
+#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_bank_ui.inc:14
+#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_bank_ui.inc:43
 msgid "From:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/dimensions/inquiry/search_dimensions.php:41
-# c:\Apache2\htdocs\account/gl/inquiry/bank_inquiry.php:30
-# c:\Apache2\htdocs\account/gl/inquiry/gl_trial_balance.php:26
-# c:\Apache2\htdocs\account/inventory/inquiry/stock_movements.php:35
-# c:\Apache2\htdocs\account/purchasing/inquiry/supplier_allocation_inquiry.php:39
-# c:\Apache2\htdocs\account/purchasing/inquiry/supplier_inquiry.php:37
-# c:\Apache2\htdocs\account/sales/inquiry/customer_inquiry.php:33
-# c:\Apache2\htdocs\account/gl/includes/ui/gl_deposit_ui.inc:16
-#: c:\Apache2\htdocs\account2/dimensions/inquiry/search_dimensions.php:43
-#: c:\Apache2\htdocs\account2/gl/inquiry/bank_inquiry.php:32
-#: c:\Apache2\htdocs\account2/gl/inquiry/gl_trial_balance.php:30
-#: c:\Apache2\htdocs\account2/inventory/inquiry/stock_movements.php:38
+#: c:\Apache2\htdocs\account2/dimensions/inquiry/search_dimensions.php:68
+#: c:\Apache2\htdocs\account2/gl/inquiry/bank_inquiry.php:38
+#: c:\Apache2\htdocs\account2/gl/inquiry/gl_trial_balance.php:36
+#: c:\Apache2\htdocs\account2/inventory/inquiry/stock_movements.php:44
 #: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_allocation_inquiry.php:41
 #: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_inquiry.php:39
-#: c:\Apache2\htdocs\account2/sales/inquiry/customer_inquiry.php:36
-#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_deposit_ui.inc:16
+#: c:\Apache2\htdocs\account2/sales/inquiry/customer_inquiry.php:37
+#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_bank_ui.inc:14
 msgid "To:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/dimensions/inquiry/search_dimensions.php:43
-# c:\Apache2\htdocs\account/manufacturing/search_work_orders.php:39
-#: c:\Apache2\htdocs\account2/dimensions/inquiry/search_dimensions.php:45
-#: c:\Apache2\htdocs\account2/manufacturing/search_work_orders.php:39
+#: c:\Apache2\htdocs\account2/dimensions/inquiry/search_dimensions.php:70
+#: c:\Apache2\htdocs\account2/manufacturing/search_work_orders.php:63
 msgid "Only Overdue:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/dimensions/inquiry/search_dimensions.php:47
-# c:\Apache2\htdocs\account/manufacturing/search_work_orders.php:41
-#: c:\Apache2\htdocs\account2/dimensions/inquiry/search_dimensions.php:49
-#: c:\Apache2\htdocs\account2/manufacturing/search_work_orders.php:41
+#: c:\Apache2\htdocs\account2/dimensions/inquiry/search_dimensions.php:74
+#: c:\Apache2\htdocs\account2/manufacturing/search_work_orders.php:66
 msgid "Only Open:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/dimensions/inquiry/search_dimensions.php:98
-# c:\Apache2\htdocs\account/dimensions/inquiry/search_dimensions.php:101
-# c:\Apache2\htdocs\account/dimensions/view/view_dimension.php:35
-# c:\Apache2\htdocs\account/gl/inquiry/bank_inquiry.php:58
-# c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:93
-# c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:96
-# c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:99
-# c:\Apache2\htdocs\account/gl/view/bank_transfer_view.php:74
-# c:\Apache2\htdocs\account/gl/view/gl_deposit_view.php:59
-# c:\Apache2\htdocs\account/gl/view/gl_payment_view.php:57
-# c:\Apache2\htdocs\account/gl/view/gl_trans_view.php:27
-# c:\Apache2\htdocs\account/inventory/inquiry/stock_movements.php:57
-# c:\Apache2\htdocs\account/inventory/view/view_adjustment.php:35
-# c:\Apache2\htdocs\account/inventory/view/view_transfer.php:38
-# c:\Apache2\htdocs\account/manufacturing/search_work_orders.php:89
-# c:\Apache2\htdocs\account/manufacturing/work_order_entry.php:363
-# c:\Apache2\htdocs\account/manufacturing/work_order_entry.php:369
-# c:\Apache2\htdocs\account/manufacturing/view/wo_production_view.php:34
-# c:\Apache2\htdocs\account/purchasing/allocations/supplier_allocate.php:195
-# c:\Apache2\htdocs\account/purchasing/allocations/supplier_allocation_main.php:60
-# c:\Apache2\htdocs\account/purchasing/allocations/supplier_allocation_main.php:63
-# c:\Apache2\htdocs\account/purchasing/inquiry/supplier_allocation_inquiry.php:125
-# c:\Apache2\htdocs\account/purchasing/inquiry/supplier_allocation_inquiry.php:128
-# c:\Apache2\htdocs\account/purchasing/inquiry/supplier_inquiry.php:159
-# c:\Apache2\htdocs\account/purchasing/inquiry/supplier_inquiry.php:163
-# c:\Apache2\htdocs\account/purchasing/view/view_po.php:122
-# c:\Apache2\htdocs\account/reporting/rep101.php:70
-# c:\Apache2\htdocs\account/reporting/rep201.php:71
-# c:\Apache2\htdocs\account/reporting/rep501.php:75
-# c:\Apache2\htdocs\account/reporting/rep704.php:63
-# c:\Apache2\htdocs\account/reporting/rep704.php:66
-# c:\Apache2\htdocs\account/reporting/rep704.php:69
-# c:\Apache2\htdocs\account/reporting/rep709.php:171
-# c:\Apache2\htdocs\account/sales/customer_invoice.php:363
-# c:\Apache2\htdocs\account/sales/allocations/customer_allocate.php:187
-# c:\Apache2\htdocs\account/sales/allocations/customer_allocation_main.php:62
-# c:\Apache2\htdocs\account/sales/allocations/customer_allocation_main.php:65
-# c:\Apache2\htdocs\account/sales/inquiry/customer_allocation_inquiry.php:119
-# c:\Apache2\htdocs\account/sales/inquiry/customer_allocation_inquiry.php:122
-# c:\Apache2\htdocs\account/sales/inquiry/customer_inquiry.php:161
-# c:\Apache2\htdocs\account/sales/inquiry/customer_inquiry.php:164
-# c:\Apache2\htdocs\account/sales/view/view_credit.php:60
-# c:\Apache2\htdocs\account/sales/view/view_sales_order.php:70
-# c:\Apache2\htdocs\account/sales/view/view_sales_order.php:101
-# c:\Apache2\htdocs\account/dimensions/includes/dimensions_ui.inc:24
-# c:\Apache2\htdocs\account/includes/ui/ui_view.inc:463
-# c:\Apache2\htdocs\account/manufacturing/includes/manufacturing_ui.inc:149
-# c:\Apache2\htdocs\account/manufacturing/includes/manufacturing_ui.inc:192
-# c:\Apache2\htdocs\account/manufacturing/includes/manufacturing_ui.inc:228
-# c:\Apache2\htdocs\account/manufacturing/includes/manufacturing_ui.inc:269
-# c:\Apache2\htdocs\account/manufacturing/includes/manufacturing_ui.inc:273
-# c:\Apache2\htdocs\account/manufacturing/includes/manufacturing_ui.inc:324
-# c:\Apache2\htdocs\account/purchasing/includes/ui/invoice_ui.inc:87
-# c:\Apache2\htdocs\account/purchasing/includes/ui/po_ui.inc:237
-# c:\Apache2\htdocs\account/reporting/includes/doctext.inc:5
-# c:\Apache2\htdocs\account/reporting/includes/doctext.inc:45
-#: c:\Apache2\htdocs\account2/dimensions/inquiry/search_dimensions.php:100
-#: c:\Apache2\htdocs\account2/dimensions/inquiry/search_dimensions.php:103
-#: c:\Apache2\htdocs\account2/dimensions/view/view_dimension.php:35
-#: c:\Apache2\htdocs\account2/gl/inquiry/bank_inquiry.php:60
-#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:91
-#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:94
-#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:97
+#: c:\Apache2\htdocs\account2/dimensions/inquiry/search_dimensions.php:126
+#: c:\Apache2\htdocs\account2/dimensions/inquiry/search_dimensions.php:129
+#: c:\Apache2\htdocs\account2/dimensions/view/view_dimension.php:38
+#: c:\Apache2\htdocs\account2/gl/inquiry/bank_inquiry.php:67
+#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:98
+#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:101
+#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:104
 #: c:\Apache2\htdocs\account2/gl/view/bank_transfer_view.php:74
 #: c:\Apache2\htdocs\account2/gl/view/gl_deposit_view.php:59
 #: c:\Apache2\htdocs\account2/gl/view/gl_payment_view.php:57
 #: c:\Apache2\htdocs\account2/gl/view/gl_trans_view.php:27
-#: c:\Apache2\htdocs\account2/inventory/inquiry/stock_movements.php:60
+#: c:\Apache2\htdocs\account2/inventory/inquiry/stock_movements.php:67
 #: c:\Apache2\htdocs\account2/inventory/view/view_adjustment.php:35
 #: c:\Apache2\htdocs\account2/inventory/view/view_transfer.php:38
-#: c:\Apache2\htdocs\account2/manufacturing/search_work_orders.php:89
-#: c:\Apache2\htdocs\account2/manufacturing/work_order_entry.php:369
-#: c:\Apache2\htdocs\account2/manufacturing/work_order_entry.php:375
+#: c:\Apache2\htdocs\account2/manufacturing/search_work_orders.php:115
+#: c:\Apache2\htdocs\account2/manufacturing/work_order_entry.php:376
+#: c:\Apache2\htdocs\account2/manufacturing/work_order_entry.php:382
 #: c:\Apache2\htdocs\account2/manufacturing/view/wo_production_view.php:34
-#: c:\Apache2\htdocs\account2/purchasing/allocations/supplier_allocate.php:193
+#: c:\Apache2\htdocs\account2/purchasing/allocations/supplier_allocate.php:186
 #: c:\Apache2\htdocs\account2/purchasing/allocations/supplier_allocation_main.php:60
 #: c:\Apache2\htdocs\account2/purchasing/allocations/supplier_allocation_main.php:63
-#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_allocation_inquiry.php:127
-#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_allocation_inquiry.php:130
-#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_inquiry.php:161
-#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_inquiry.php:165
-#: c:\Apache2\htdocs\account2/purchasing/view/view_po.php:122
+#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_allocation_inquiry.php:131
+#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_allocation_inquiry.php:134
+#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_inquiry.php:168
+#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_inquiry.php:172
+#: c:\Apache2\htdocs\account2/purchasing/view/view_po.php:123
 #: c:\Apache2\htdocs\account2/reporting/rep101.php:71
 #: c:\Apache2\htdocs\account2/reporting/rep201.php:70
 #: c:\Apache2\htdocs\account2/reporting/rep501.php:75
 #: c:\Apache2\htdocs\account2/reporting/rep704.php:63
 #: c:\Apache2\htdocs\account2/reporting/rep704.php:66
 #: c:\Apache2\htdocs\account2/reporting/rep704.php:69
-#: c:\Apache2\htdocs\account2/reporting/rep709.php:171
-#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:332
-#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:311
-#: c:\Apache2\htdocs\account2/sales/allocations/customer_allocate.php:194
+#: c:\Apache2\htdocs\account2/reporting/rep709.php:189
+#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:345
+#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:336
+#: c:\Apache2\htdocs\account2/sales/allocations/customer_allocate.php:188
 #: c:\Apache2\htdocs\account2/sales/allocations/customer_allocation_main.php:62
 #: c:\Apache2\htdocs\account2/sales/allocations/customer_allocation_main.php:65
-#: c:\Apache2\htdocs\account2/sales/inquiry/customer_allocation_inquiry.php:131
 #: c:\Apache2\htdocs\account2/sales/inquiry/customer_allocation_inquiry.php:134
-#: c:\Apache2\htdocs\account2/sales/inquiry/customer_inquiry.php:172
+#: c:\Apache2\htdocs\account2/sales/inquiry/customer_allocation_inquiry.php:137
+#: c:\Apache2\htdocs\account2/sales/inquiry/customer_inquiry.php:183
 #: c:\Apache2\htdocs\account2/sales/view/view_credit.php:60
 #: c:\Apache2\htdocs\account2/sales/view/view_sales_order.php:68
 #: c:\Apache2\htdocs\account2/sales/view/view_sales_order.php:101
 #: c:\Apache2\htdocs\account2/sales/view/view_sales_order.php:133
 #: c:\Apache2\htdocs\account2/dimensions/includes/dimensions_ui.inc:24
-#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:475
-#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:149
-#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:192
-#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:228
-#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:269
-#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:273
-#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:324
+#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:481
+#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:150
+#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:193
+#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:229
+#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:270
+#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:274
+#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:325
 #: c:\Apache2\htdocs\account2/purchasing/includes/ui/invoice_ui.inc:85
-#: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:239
+#: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:241
 #: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:5
-#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:54
+#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:55
 msgid "Date"
 msgstr ""
 
-# c:\Apache2\htdocs\account/dimensions/inquiry/search_dimensions.php:99
-# c:\Apache2\htdocs\account/dimensions/inquiry/search_dimensions.php:102
-# c:\Apache2\htdocs\account/dimensions/view/view_dimension.php:35
-# c:\Apache2\htdocs\account/purchasing/allocations/supplier_allocate.php:195
-# c:\Apache2\htdocs\account/purchasing/inquiry/supplier_allocation_inquiry.php:125
-# c:\Apache2\htdocs\account/purchasing/inquiry/supplier_allocation_inquiry.php:128
-# c:\Apache2\htdocs\account/purchasing/inquiry/supplier_inquiry.php:159
-# c:\Apache2\htdocs\account/purchasing/inquiry/supplier_inquiry.php:163
-# c:\Apache2\htdocs\account/purchasing/view/view_supp_credit.php:37
-# c:\Apache2\htdocs\account/purchasing/view/view_supp_invoice.php:43
-# c:\Apache2\htdocs\account/reporting/rep101.php:70
-# c:\Apache2\htdocs\account/reporting/rep201.php:71
-# c:\Apache2\htdocs\account/reporting/rep203.php:76
-# c:\Apache2\htdocs\account/reporting/rep501.php:75
-# c:\Apache2\htdocs\account/sales/customer_invoice.php:369
-# c:\Apache2\htdocs\account/sales/allocations/customer_allocate.php:187
-# c:\Apache2\htdocs\account/sales/inquiry/customer_allocation_inquiry.php:119
-# c:\Apache2\htdocs\account/sales/inquiry/customer_allocation_inquiry.php:122
-# c:\Apache2\htdocs\account/sales/inquiry/customer_inquiry.php:161
-# c:\Apache2\htdocs\account/sales/inquiry/customer_inquiry.php:164
-# c:\Apache2\htdocs\account/sales/view/view_invoice.php:84
-# c:\Apache2\htdocs\account/purchasing/includes/ui/invoice_ui.inc:89
-# c:\Apache2\htdocs\account/reporting/includes/doctext.inc:12
-#: c:\Apache2\htdocs\account2/dimensions/inquiry/search_dimensions.php:101
-#: c:\Apache2\htdocs\account2/dimensions/inquiry/search_dimensions.php:104
-#: c:\Apache2\htdocs\account2/dimensions/view/view_dimension.php:35
-#: c:\Apache2\htdocs\account2/purchasing/allocations/supplier_allocate.php:193
-#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_allocation_inquiry.php:127
-#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_allocation_inquiry.php:130
-#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_inquiry.php:161
-#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_inquiry.php:165
+#: c:\Apache2\htdocs\account2/dimensions/inquiry/search_dimensions.php:127
+#: c:\Apache2\htdocs\account2/dimensions/inquiry/search_dimensions.php:130
+#: c:\Apache2\htdocs\account2/dimensions/view/view_dimension.php:38
+#: c:\Apache2\htdocs\account2/purchasing/allocations/supplier_allocate.php:186
+#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_allocation_inquiry.php:131
+#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_allocation_inquiry.php:134
+#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_inquiry.php:168
+#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_inquiry.php:172
 #: c:\Apache2\htdocs\account2/purchasing/view/view_supp_credit.php:37
 #: c:\Apache2\htdocs\account2/purchasing/view/view_supp_invoice.php:43
 #: c:\Apache2\htdocs\account2/reporting/rep101.php:71
 #: c:\Apache2\htdocs\account2/reporting/rep201.php:70
 #: c:\Apache2\htdocs\account2/reporting/rep203.php:75
 #: c:\Apache2\htdocs\account2/reporting/rep501.php:75
-#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:317
-#: c:\Apache2\htdocs\account2/sales/allocations/customer_allocate.php:194
-#: c:\Apache2\htdocs\account2/sales/inquiry/customer_allocation_inquiry.php:131
+#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:342
+#: c:\Apache2\htdocs\account2/sales/allocations/customer_allocate.php:188
 #: c:\Apache2\htdocs\account2/sales/inquiry/customer_allocation_inquiry.php:134
-#: c:\Apache2\htdocs\account2/sales/inquiry/customer_inquiry.php:172
+#: c:\Apache2\htdocs\account2/sales/inquiry/customer_allocation_inquiry.php:137
+#: c:\Apache2\htdocs\account2/sales/inquiry/customer_inquiry.php:183
 #: c:\Apache2\htdocs\account2/sales/view/view_dispatch.php:88
 #: c:\Apache2\htdocs\account2/sales/view/view_invoice.php:88
 #: c:\Apache2\htdocs\account2/purchasing/includes/ui/invoice_ui.inc:87
 #: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:12
-#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:386
+#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:400
 msgid "Due Date"
 msgstr ""
 
-# c:\Apache2\htdocs\account/dimensions/inquiry/search_dimensions.php:99
-# c:\Apache2\htdocs\account/dimensions/inquiry/search_dimensions.php:102
-# c:\Apache2\htdocs\account/gl/inquiry/bank_inquiry.php:59
-# c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:94
-# c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:97
-# c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:100
-# c:\Apache2\htdocs\account/gl/inquiry/gl_trial_balance.php:77
-# c:\Apache2\htdocs\account/purchasing/inquiry/supplier_allocation_inquiry.php:126
-# c:\Apache2\htdocs\account/purchasing/inquiry/supplier_allocation_inquiry.php:129
-# c:\Apache2\htdocs\account/reporting/rep203.php:77
-# c:\Apache2\htdocs\account/reporting/rep204.php:71
-# c:\Apache2\htdocs\account/reporting/rep701.php:36
-# c:\Apache2\htdocs\account/reporting/rep704.php:64
-# c:\Apache2\htdocs\account/reporting/rep704.php:67
-# c:\Apache2\htdocs\account/reporting/rep704.php:70
-# c:\Apache2\htdocs\account/reporting/rep708.php:55
-# c:\Apache2\htdocs\account/sales/inquiry/customer_allocation_inquiry.php:120
-# c:\Apache2\htdocs\account/sales/inquiry/customer_allocation_inquiry.php:123
-#: c:\Apache2\htdocs\account2/dimensions/inquiry/search_dimensions.php:101
-#: c:\Apache2\htdocs\account2/dimensions/inquiry/search_dimensions.php:104
-#: c:\Apache2\htdocs\account2/gl/inquiry/bank_inquiry.php:61
-#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:92
-#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:95
-#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:98
-#: c:\Apache2\htdocs\account2/gl/inquiry/gl_trial_balance.php:81
-#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_allocation_inquiry.php:128
-#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_allocation_inquiry.php:131
+#: c:\Apache2\htdocs\account2/dimensions/inquiry/search_dimensions.php:127
+#: c:\Apache2\htdocs\account2/dimensions/inquiry/search_dimensions.php:130
+#: c:\Apache2\htdocs\account2/gl/inquiry/bank_inquiry.php:68
+#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:99
+#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:102
+#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:105
+#: c:\Apache2\htdocs\account2/gl/inquiry/gl_trial_balance.php:88
+#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_allocation_inquiry.php:132
+#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_allocation_inquiry.php:135
 #: c:\Apache2\htdocs\account2/reporting/rep203.php:76
 #: c:\Apache2\htdocs\account2/reporting/rep204.php:70
 #: c:\Apache2\htdocs\account2/reporting/rep701.php:36
@@ -3257,258 +2427,232 @@ msgstr ""
 #: c:\Apache2\htdocs\account2/reporting/rep704.php:67
 #: c:\Apache2\htdocs\account2/reporting/rep704.php:70
 #: c:\Apache2\htdocs\account2/reporting/rep708.php:55
-#: c:\Apache2\htdocs\account2/sales/inquiry/customer_allocation_inquiry.php:132
 #: c:\Apache2\htdocs\account2/sales/inquiry/customer_allocation_inquiry.php:135
+#: c:\Apache2\htdocs\account2/sales/inquiry/customer_allocation_inquiry.php:138
 msgid "Balance"
 msgstr ""
 
-# c:\Apache2\htdocs\account/dimensions/view/view_dimension.php:8
-#: c:\Apache2\htdocs\account2/dimensions/view/view_dimension.php:8
+#: c:\Apache2\htdocs\account2/dimensions/view/view_dimension.php:11
 msgid "View Dimension"
 msgstr ""
 
-# c:\Apache2\htdocs\account/dimensions/view/view_dimension.php:29
-# c:\Apache2\htdocs\account/manufacturing/includes/manufacturing_ui.inc:261
-# c:\Apache2\htdocs\account/manufacturing/includes/manufacturing_ui.inc:317
-#: c:\Apache2\htdocs\account2/dimensions/view/view_dimension.php:29
-#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:261
-#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:317
+#: c:\Apache2\htdocs\account2/dimensions/view/view_dimension.php:32
+#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:262
+#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:318
 msgid "The work order number sent is not valid."
 msgstr ""
 
-# c:\Apache2\htdocs\account/dimensions/view/view_dimension.php:53
-#: c:\Apache2\htdocs\account2/dimensions/view/view_dimension.php:53
+#: c:\Apache2\htdocs\account2/dimensions/view/view_dimension.php:56
 msgid "This dimension is closed."
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/bank_transfer.php:17
 #: c:\Apache2\htdocs\account2/gl/bank_transfer.php:19
 msgid "Transfer between Bank Accounts"
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/bank_transfer.php:19
-# c:\Apache2\htdocs\account/gl/gl_deposit.php:23
-# c:\Apache2\htdocs\account/gl/gl_payment.php:25
-# c:\Apache2\htdocs\account/gl/inquiry/bank_inquiry.php:19
-# c:\Apache2\htdocs\account/purchasing/supplier_payment.php:28
-# c:\Apache2\htdocs\account/sales/customer_payments.php:24
 #: c:\Apache2\htdocs\account2/gl/bank_transfer.php:21
-#: c:\Apache2\htdocs\account2/gl/gl_deposit.php:25
-#: c:\Apache2\htdocs\account2/gl/gl_payment.php:25
+#: c:\Apache2\htdocs\account2/gl/gl_bank.php:32
 #: c:\Apache2\htdocs\account2/gl/inquiry/bank_inquiry.php:21
 #: c:\Apache2\htdocs\account2/purchasing/supplier_payment.php:30
 #: c:\Apache2\htdocs\account2/sales/customer_payments.php:25
 msgid "There are no bank accounts defined in the system."
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/bank_transfer.php:20
 #: c:\Apache2\htdocs\account2/gl/bank_transfer.php:22
 msgid "There are no bank transfer types defined in the system."
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/bank_transfer.php:29
 #: c:\Apache2\htdocs\account2/gl/bank_transfer.php:31
 msgid "Transfer has been entered"
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/bank_transfer.php:31
 #: c:\Apache2\htdocs\account2/gl/bank_transfer.php:33
 msgid "View the GL Journal Entries for this Transfer"
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/bank_transfer.php:33
 #: c:\Apache2\htdocs\account2/gl/bank_transfer.php:35
 msgid "Enter Another Transfer"
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/bank_transfer.php:51
 #: c:\Apache2\htdocs\account2/gl/bank_transfer.php:53
 msgid "From Account:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/bank_transfer.php:53
 #: c:\Apache2\htdocs\account2/gl/bank_transfer.php:55
 msgid "To Account:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/bank_transfer.php:55
 #: c:\Apache2\htdocs\account2/gl/bank_transfer.php:57
 msgid "Transfer Date:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/bank_transfer.php:61
-# c:\Apache2\htdocs\account/gl/bank_transfer.php:67
-# c:\Apache2\htdocs\account/purchasing/supplier_trans_gl.php:117
-# c:\Apache2\htdocs\account/sales/customer_payments.php:177
-# c:\Apache2\htdocs\account/includes/ui/ui_view.inc:409
-# c:\Apache2\htdocs\account/includes/ui/ui_view.inc:427
 #: c:\Apache2\htdocs\account2/gl/bank_transfer.php:63
 #: c:\Apache2\htdocs\account2/gl/bank_transfer.php:69
-#: c:\Apache2\htdocs\account2/purchasing/supplier_trans_gl.php:123
-#: c:\Apache2\htdocs\account2/sales/customer_payments.php:168
-#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:421
-#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:439
+#: c:\Apache2\htdocs\account2/purchasing/supplier_trans_gl.php:132
+#: c:\Apache2\htdocs\account2/sales/customer_payments.php:170
+#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:428
+#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:446
 msgid "Amount:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/bank_transfer.php:74
-# c:\Apache2\htdocs\account/inventory/includes/stock_transfers_ui.inc:55
 #: c:\Apache2\htdocs\account2/gl/bank_transfer.php:76
-#: c:\Apache2\htdocs\account2/inventory/includes/stock_transfers_ui.inc:55
+#: c:\Apache2\htdocs\account2/inventory/includes/stock_transfers_ui.inc:44
 msgid "Transfer Type:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/bank_transfer.php:85
 #: c:\Apache2\htdocs\account2/gl/bank_transfer.php:87
 msgid "Enter Transfer"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/supplier_payment.php:128
 #: c:\Apache2\htdocs\account2/gl/bank_transfer.php:111
 #: c:\Apache2\htdocs\account2/purchasing/supplier_payment.php:125
 msgid "The entered amount is invalid or less than zero."
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/bank_transfer.php:118
-# c:\Apache2\htdocs\account/gl/gl_deposit.php:101
-# c:\Apache2\htdocs\account/gl/gl_journal.php:96
-# c:\Apache2\htdocs\account/gl/gl_payment.php:104
-# c:\Apache2\htdocs\account/inventory/adjustments.php:89
-# c:\Apache2\htdocs\account/inventory/transfers.php:91
-# c:\Apache2\htdocs\account/manufacturing/work_order_add_finished.php:52
-# c:\Apache2\htdocs\account/manufacturing/work_order_entry.php:103
-# c:\Apache2\htdocs\account/manufacturing/work_order_issue.php:62
-# c:\Apache2\htdocs\account/purchasing/po_receive_items.php:160
-# c:\Apache2\htdocs\account/purchasing/supplier_payment.php:161
-# c:\Apache2\htdocs\account/sales/credit_note_entry.php:108
-# c:\Apache2\htdocs\account/sales/customer_credit_invoice.php:60
-# c:\Apache2\htdocs\account/sales/customer_invoice.php:203
-# c:\Apache2\htdocs\account/sales/customer_payments.php:61
 #: c:\Apache2\htdocs\account2/gl/bank_transfer.php:118
-#: c:\Apache2\htdocs\account2/gl/gl_deposit.php:103
-#: c:\Apache2\htdocs\account2/gl/gl_journal.php:101
-#: c:\Apache2\htdocs\account2/gl/gl_payment.php:104
-#: c:\Apache2\htdocs\account2/inventory/adjustments.php:91
-#: c:\Apache2\htdocs\account2/inventory/transfers.php:93
-#: c:\Apache2\htdocs\account2/manufacturing/work_order_add_finished.php:55
+#: c:\Apache2\htdocs\account2/gl/gl_bank.php:112
+#: c:\Apache2\htdocs\account2/gl/gl_journal.php:100
+#: c:\Apache2\htdocs\account2/inventory/adjustments.php:83
+#: c:\Apache2\htdocs\account2/inventory/transfers.php:83
+#: c:\Apache2\htdocs\account2/manufacturing/work_order_add_finished.php:57
 #: c:\Apache2\htdocs\account2/manufacturing/work_order_entry.php:107
-#: c:\Apache2\htdocs\account2/manufacturing/work_order_issue.php:66
-#: c:\Apache2\htdocs\account2/purchasing/po_receive_items.php:163
+#: c:\Apache2\htdocs\account2/manufacturing/work_order_issue.php:75
+#: c:\Apache2\htdocs\account2/purchasing/po_receive_items.php:167
 #: c:\Apache2\htdocs\account2/purchasing/supplier_payment.php:163
-#: c:\Apache2\htdocs\account2/sales/credit_note_entry.php:109
+#: c:\Apache2\htdocs\account2/sales/credit_note_entry.php:113
 #: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:86
-#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:151
-#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:203
+#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:152
+#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:223
 #: c:\Apache2\htdocs\account2/sales/customer_payments.php:61
-#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:237
-#: c:\Apache2\htdocs\account2/sql/sales_order_entry.php:223
+#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:242
 msgid "You must enter a reference."
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/bank_transfer.php:130
 #: c:\Apache2\htdocs\account2/gl/bank_transfer.php:132
 msgid "The source and destination bank accouts cannot be the same."
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/manage/gl_accounts.php:13
-#: c:\Apache2\htdocs\account2/gl/gl_budget.php:13
+#: c:\Apache2\htdocs\account2/gl/gl_bank.php:22
+msgid "Bank Account Payment Entry"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/gl/gl_bank.php:26
+msgid "Bank Account Deposit Entry"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/gl/gl_bank.php:34
+#: c:\Apache2\htdocs\account2/purchasing/supplier_payment.php:32
+#: c:\Apache2\htdocs\account2/sales/customer_payments.php:27
+msgid "There are no bank payment types defined in the system."
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/gl/gl_bank.php:51
+msgid "Payment has been entered"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/gl/gl_bank.php:53
+msgid "View the GL Postings for this Payment"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/gl/gl_bank.php:55
+msgid "Enter Another Payment"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/gl/gl_bank.php:57
+msgid "Enter A Deposit"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/gl/gl_bank.php:67
+msgid "Deposit has been entered"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/gl/gl_bank.php:69
+msgid "View the GL Postings for this Deposit"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/gl/gl_bank.php:71
+msgid "Enter Another Deposit"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/gl/gl_bank.php:73
+msgid "Enter A Payment"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/gl/gl_bank.php:105
+msgid "You must enter at least one payment line."
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/gl/gl_bank.php:124
+msgid "The entered date for the payment is invalid."
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/gl/gl_bank.php:165
+msgid "The amount entered is not a valid number or is less than zero."
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/gl/gl_bank.php:172
+msgid "The source and destination accouts cannot be the same."
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/gl/gl_bank.php:180
+msgid "You cannot make a payment to a bank account. Please use the transfer funds facility for this."
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/gl/gl_bank.php:182
+msgid "You cannot make a deposit from a bank account. Please use the transfer funds facility for this."
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/gl/gl_bank.php:249
+msgid "Payment Items"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/gl/gl_bank.php:249
+msgid "Deposit Items"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/gl/gl_bank.php:257
+msgid "Process Payment"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/gl/gl_bank.php:257
+msgid "Process Deposit"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/gl/gl_budget.php:15
 #: c:\Apache2\htdocs\account2/gl/manage/gl_accounts.php:13
 msgid "There are no account groups defined. Please define at least one account group before entering accounts."
 msgstr ""
 
-#: c:\Apache2\htdocs\account2/gl/gl_budget.php:82
+#: c:\Apache2\htdocs\account2/gl/gl_budget.php:84
 msgid "The Budget has been saved."
 msgstr ""
 
-#: c:\Apache2\htdocs\account2/gl/gl_budget.php:84
+#: c:\Apache2\htdocs\account2/gl/gl_budget.php:86
 msgid "The Budget has been deleted."
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/manage/gl_accounts.php:217
-# c:\Apache2\htdocs\account/gl/manage/gl_accounts.php:221
-#: c:\Apache2\htdocs\account2/gl/gl_budget.php:98
-#: c:\Apache2\htdocs\account2/gl/manage/gl_accounts.php:222
-#: c:\Apache2\htdocs\account2/gl/manage/gl_accounts.php:226
+#: c:\Apache2\htdocs\account2/gl/gl_budget.php:103
+#: c:\Apache2\htdocs\account2/gl/manage/gl_accounts.php:223
+#: c:\Apache2\htdocs\account2/gl/manage/gl_accounts.php:229
 msgid "Account Code:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:55
-# c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:57
-# c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:93
-# c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:96
-# c:\Apache2\htdocs\account/gl/view/gl_trans_view.php:56
-# c:\Apache2\htdocs\account/gl/view/gl_trans_view.php:59
-# c:\Apache2\htdocs\account/inventory/manage/items.php:357
-# c:\Apache2\htdocs\account/inventory/manage/items.php:359
-# c:\Apache2\htdocs\account/purchasing/supplier_trans_gl.php:110
-# c:\Apache2\htdocs\account/purchasing/supplier_trans_gl.php:112
-# c:\Apache2\htdocs\account/purchasing/manage/suppliers.php:215
-# c:\Apache2\htdocs\account/purchasing/manage/suppliers.php:217
-# c:\Apache2\htdocs\account/purchasing/manage/suppliers.php:219
-# c:\Apache2\htdocs\account/reporting/rep501.php:80
-# c:\Apache2\htdocs\account/reporting/rep704.php:63
-# c:\Apache2\htdocs\account/reporting/rep704.php:66
-# c:\Apache2\htdocs\account/reporting/rep704.php:77
-# c:\Apache2\htdocs\account/reporting/rep704.php:79
-# c:\Apache2\htdocs\account/reporting/rep704.php:87
-# c:\Apache2\htdocs\account/reporting/rep705.php:133
-# c:\Apache2\htdocs\account/reporting/rep705.php:135
-# c:\Apache2\htdocs\account/reporting/rep705.php:145
-# c:\Apache2\htdocs\account/reporting/rep706.php:64
-# c:\Apache2\htdocs\account/reporting/rep706.php:66
-# c:\Apache2\htdocs\account/reporting/rep706.php:73
-# c:\Apache2\htdocs\account/reporting/rep707.php:78
-# c:\Apache2\htdocs\account/reporting/rep707.php:80
-# c:\Apache2\htdocs\account/reporting/rep707.php:87
-# c:\Apache2\htdocs\account/reporting/rep708.php:71
-# c:\Apache2\htdocs\account/reporting/rep708.php:73
-# c:\Apache2\htdocs\account/reporting/rep708.php:80
-# c:\Apache2\htdocs\account/reporting/reports_main.php:132
-# c:\Apache2\htdocs\account/reporting/reports_main.php:160
-# c:\Apache2\htdocs\account/reporting/reports_main.php:161
-# c:\Apache2\htdocs\account/reporting/reports_main.php:165
-# c:\Apache2\htdocs\account/reporting/reports_main.php:166
-# c:\Apache2\htdocs\account/reporting/reports_main.php:171
-# c:\Apache2\htdocs\account/reporting/reports_main.php:172
-# c:\Apache2\htdocs\account/reporting/reports_main.php:178
-# c:\Apache2\htdocs\account/reporting/reports_main.php:179
-# c:\Apache2\htdocs\account/reporting/reports_main.php:185
-# c:\Apache2\htdocs\account/reporting/reports_main.php:186
-# c:\Apache2\htdocs\account/reporting/reports_main.php:196
-# c:\Apache2\htdocs\account/reporting/reports_main.php:200
-# c:\Apache2\htdocs\account/reporting/reports_main.php:205
-# c:\Apache2\htdocs\account/reporting/reports_main.php:211
-# c:\Apache2\htdocs\account/reporting/reports_main.php:217
-# c:\Apache2\htdocs\account/sales/manage/customers.php:299
-# c:\Apache2\htdocs\account/sales/manage/customers.php:301
-# c:\Apache2\htdocs\account/gl/includes/ui/gl_deposit_ui.inc:110
-# c:\Apache2\htdocs\account/gl/includes/ui/gl_deposit_ui.inc:111
-# c:\Apache2\htdocs\account/gl/includes/ui/gl_deposit_ui.inc:113
-# c:\Apache2\htdocs\account/gl/includes/ui/gl_journal_ui.inc:47
-# c:\Apache2\htdocs\account/gl/includes/ui/gl_journal_ui.inc:48
-# c:\Apache2\htdocs\account/gl/includes/ui/gl_journal_ui.inc:50
-# c:\Apache2\htdocs\account/gl/includes/ui/gl_payment_ui.inc:109
-# c:\Apache2\htdocs\account/gl/includes/ui/gl_payment_ui.inc:110
-# c:\Apache2\htdocs\account/gl/includes/ui/gl_payment_ui.inc:112
-# c:\Apache2\htdocs\account/includes/types.inc:25
-# c:\Apache2\htdocs\account/purchasing/includes/ui/invoice_ui.inc:197
-# c:\Apache2\htdocs\account/purchasing/includes/ui/invoice_ui.inc:199
-#: c:\Apache2\htdocs\account2/gl/gl_budget.php:105
-#: c:\Apache2\htdocs\account2/gl/gl_budget.php:106
 #: c:\Apache2\htdocs\account2/gl/gl_budget.php:110
-#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:58
-#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:60
-#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:91
-#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:94
+#: c:\Apache2\htdocs\account2/gl/gl_budget.php:111
+#: c:\Apache2\htdocs\account2/gl/gl_budget.php:115
+#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:64
+#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:66
+#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:98
+#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:101
 #: c:\Apache2\htdocs\account2/gl/view/gl_trans_view.php:56
 #: c:\Apache2\htdocs\account2/gl/view/gl_trans_view.php:59
-#: c:\Apache2\htdocs\account2/inventory/manage/items.php:357
-#: c:\Apache2\htdocs\account2/inventory/manage/items.php:359
-#: c:\Apache2\htdocs\account2/purchasing/supplier_trans_gl.php:116
-#: c:\Apache2\htdocs\account2/purchasing/supplier_trans_gl.php:118
+#: c:\Apache2\htdocs\account2/inventory/manage/items.php:377
+#: c:\Apache2\htdocs\account2/inventory/manage/items.php:379
+#: c:\Apache2\htdocs\account2/purchasing/supplier_trans_gl.php:125
+#: c:\Apache2\htdocs\account2/purchasing/supplier_trans_gl.php:127
+#: c:\Apache2\htdocs\account2/purchasing/manage/suppliers.php:211
+#: c:\Apache2\htdocs\account2/purchasing/manage/suppliers.php:213
 #: c:\Apache2\htdocs\account2/purchasing/manage/suppliers.php:215
-#: c:\Apache2\htdocs\account2/purchasing/manage/suppliers.php:217
-#: c:\Apache2\htdocs\account2/purchasing/manage/suppliers.php:219
 #: c:\Apache2\htdocs\account2/reporting/rep501.php:80
 #: c:\Apache2\htdocs\account2/reporting/rep704.php:63
 #: c:\Apache2\htdocs\account2/reporting/rep704.php:66
@@ -3527,67 +2671,46 @@ msgstr ""
 #: c:\Apache2\htdocs\account2/reporting/rep708.php:71
 #: c:\Apache2\htdocs\account2/reporting/rep708.php:73
 #: c:\Apache2\htdocs\account2/reporting/rep708.php:80
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:170
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:171
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:175
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:176
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:181
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:182
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:178
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:179
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:183
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:184
 #: c:\Apache2\htdocs\account2/reporting/reports_main.php:189
 #: c:\Apache2\htdocs\account2/reporting/reports_main.php:190
 #: c:\Apache2\htdocs\account2/reporting/reports_main.php:197
 #: c:\Apache2\htdocs\account2/reporting/reports_main.php:198
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:208
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:212
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:217
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:224
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:231
-#: c:\Apache2\htdocs\account2/sales/manage/customers.php:279
-#: c:\Apache2\htdocs\account2/sales/manage/customers.php:281
-#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_deposit_ui.inc:110
-#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_deposit_ui.inc:111
-#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_deposit_ui.inc:113
-#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_journal_ui.inc:47
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:205
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:206
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:216
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:220
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:225
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:232
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:239
+#: c:\Apache2\htdocs\account2/sales/manage/customers.php:249
+#: c:\Apache2\htdocs\account2/sales/manage/customers.php:251
+#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_bank_ui.inc:114
+#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_bank_ui.inc:115
+#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_bank_ui.inc:117
 #: c:\Apache2\htdocs\account2/gl/includes/ui/gl_journal_ui.inc:48
-#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_journal_ui.inc:50
-#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_payment_ui.inc:109
-#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_payment_ui.inc:110
-#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_payment_ui.inc:112
+#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_journal_ui.inc:49
+#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_journal_ui.inc:51
 #: c:\Apache2\htdocs\account2/includes/types.inc:26
-#: c:\Apache2\htdocs\account2/purchasing/includes/ui/invoice_ui.inc:191
 #: c:\Apache2\htdocs\account2/purchasing/includes/ui/invoice_ui.inc:193
+#: c:\Apache2\htdocs\account2/purchasing/includes/ui/invoice_ui.inc:195
 msgid "Dimension"
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/manage/exchange_rates.php:150
-# c:\Apache2\htdocs\account/includes/ui/ui_view.inc:285
-#: c:\Apache2\htdocs\account2/gl/gl_budget.php:118
-#: c:\Apache2\htdocs\account2/gl/manage/exchange_rates.php:155
-#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:297
+#: c:\Apache2\htdocs\account2/gl/gl_budget.php:123
+#: c:\Apache2\htdocs\account2/gl/manage/exchange_rates.php:146
+#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:301
 msgid "Get"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/rep105.php:105
-# c:\Apache2\htdocs\account/reporting/rep702.php:45
-# c:\Apache2\htdocs\account/reporting/rep704.php:75
-# c:\Apache2\htdocs\account/reporting/rep704.php:85
-# c:\Apache2\htdocs\account/reporting/rep704.php:93
-# c:\Apache2\htdocs\account/reporting/rep706.php:55
-# c:\Apache2\htdocs\account/reporting/rep706.php:63
-# c:\Apache2\htdocs\account/reporting/rep706.php:72
-# c:\Apache2\htdocs\account/reporting/rep706.php:79
-# c:\Apache2\htdocs\account/reporting/rep707.php:70
-# c:\Apache2\htdocs\account/reporting/rep707.php:77
-# c:\Apache2\htdocs\account/reporting/rep707.php:86
-# c:\Apache2\htdocs\account/reporting/rep707.php:93
-# c:\Apache2\htdocs\account/reporting/rep708.php:70
-# c:\Apache2\htdocs\account/reporting/rep708.php:79
-# c:\Apache2\htdocs\account/reporting/rep708.php:86
-# c:\Apache2\htdocs\account/reporting/rep709.php:177
-#: c:\Apache2\htdocs\account2/gl/gl_budget.php:124
-#: c:\Apache2\htdocs\account2/gl/gl_budget.php:126
-#: c:\Apache2\htdocs\account2/reporting/rep105.php:105
+#: c:\Apache2\htdocs\account2/gl/gl_budget.php:130
+#: c:\Apache2\htdocs\account2/gl/gl_budget.php:132
+#: c:\Apache2\htdocs\account2/reporting/rep105.php:103
 #: c:\Apache2\htdocs\account2/reporting/rep106.php:79
+#: c:\Apache2\htdocs\account2/reporting/rep304.php:132
 #: c:\Apache2\htdocs\account2/reporting/rep702.php:45
 #: c:\Apache2\htdocs\account2/reporting/rep704.php:75
 #: c:\Apache2\htdocs\account2/reporting/rep704.php:85
@@ -3603,131 +2726,56 @@ msgstr ""
 #: c:\Apache2\htdocs\account2/reporting/rep708.php:70
 #: c:\Apache2\htdocs\account2/reporting/rep708.php:79
 #: c:\Apache2\htdocs\account2/reporting/rep708.php:86
-#: c:\Apache2\htdocs\account2/reporting/rep709.php:177
+#: c:\Apache2\htdocs\account2/reporting/rep709.php:195
 msgid "Period"
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/view/bank_transfer_view.php:61
-# c:\Apache2\htdocs\account/gl/view/bank_transfer_view.php:71
-# c:\Apache2\htdocs\account/gl/view/gl_deposit_view.php:58
-# c:\Apache2\htdocs\account/gl/view/gl_deposit_view.php:89
-# c:\Apache2\htdocs\account/gl/view/gl_payment_view.php:56
-# c:\Apache2\htdocs\account/gl/view/gl_payment_view.php:88
-# c:\Apache2\htdocs\account/purchasing/allocations/supplier_allocate.php:195
-# c:\Apache2\htdocs\account/purchasing/view/view_supp_payment.php:51
-# c:\Apache2\htdocs\account/purchasing/view/view_supp_payment.php:60
-# c:\Apache2\htdocs\account/sales/allocations/customer_allocate.php:187
-# c:\Apache2\htdocs\account/sales/view/view_receipt.php:31
-# c:\Apache2\htdocs\account/gl/includes/ui/gl_deposit_ui.inc:111
-# c:\Apache2\htdocs\account/gl/includes/ui/gl_deposit_ui.inc:114
-# c:\Apache2\htdocs\account/gl/includes/ui/gl_deposit_ui.inc:117
-# c:\Apache2\htdocs\account/gl/includes/ui/gl_payment_ui.inc:110
-# c:\Apache2\htdocs\account/gl/includes/ui/gl_payment_ui.inc:113
-# c:\Apache2\htdocs\account/gl/includes/ui/gl_payment_ui.inc:116
-# c:\Apache2\htdocs\account/includes/ui/ui_view.inc:393
-# c:\Apache2\htdocs\account/manufacturing/includes/manufacturing_ui.inc:228
-# c:\Apache2\htdocs\account/purchasing/includes/ui/invoice_ui.inc:197
-# c:\Apache2\htdocs\account/purchasing/includes/ui/invoice_ui.inc:199
-# c:\Apache2\htdocs\account/purchasing/includes/ui/invoice_ui.inc:201
-# c:\Apache2\htdocs\account/reporting/includes/doctext.inc:67
-#: c:\Apache2\htdocs\account2/gl/gl_budget.php:124
-#: c:\Apache2\htdocs\account2/gl/gl_budget.php:126
+#: c:\Apache2\htdocs\account2/gl/gl_budget.php:130
+#: c:\Apache2\htdocs\account2/gl/gl_budget.php:132
 #: c:\Apache2\htdocs\account2/gl/view/bank_transfer_view.php:61
 #: c:\Apache2\htdocs\account2/gl/view/bank_transfer_view.php:71
 #: c:\Apache2\htdocs\account2/gl/view/gl_deposit_view.php:58
 #: c:\Apache2\htdocs\account2/gl/view/gl_deposit_view.php:89
 #: c:\Apache2\htdocs\account2/gl/view/gl_payment_view.php:56
 #: c:\Apache2\htdocs\account2/gl/view/gl_payment_view.php:88
-#: c:\Apache2\htdocs\account2/purchasing/allocations/supplier_allocate.php:193
+#: c:\Apache2\htdocs\account2/purchasing/allocations/supplier_allocate.php:186
 #: c:\Apache2\htdocs\account2/purchasing/view/view_supp_payment.php:51
 #: c:\Apache2\htdocs\account2/purchasing/view/view_supp_payment.php:60
-#: c:\Apache2\htdocs\account2/reporting/rep102.php:256
-#: c:\Apache2\htdocs\account2/reporting/rep202.php:264
+#: c:\Apache2\htdocs\account2/reporting/rep102.php:215
+#: c:\Apache2\htdocs\account2/reporting/rep202.php:216
 #: c:\Apache2\htdocs\account2/reporting/rep706.php:256
 #: c:\Apache2\htdocs\account2/reporting/rep707.php:290
-#: c:\Apache2\htdocs\account2/sales/allocations/customer_allocate.php:194
+#: c:\Apache2\htdocs\account2/sales/allocations/customer_allocate.php:188
 #: c:\Apache2\htdocs\account2/sales/view/view_receipt.php:31
-#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_deposit_ui.inc:111
-#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_deposit_ui.inc:114
-#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_deposit_ui.inc:117
-#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_payment_ui.inc:110
-#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_payment_ui.inc:113
-#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_payment_ui.inc:116
-#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:405
-#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:228
-#: c:\Apache2\htdocs\account2/purchasing/includes/ui/invoice_ui.inc:191
+#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_bank_ui.inc:115
+#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_bank_ui.inc:118
+#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_bank_ui.inc:121
+#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:412
+#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:229
 #: c:\Apache2\htdocs\account2/purchasing/includes/ui/invoice_ui.inc:193
 #: c:\Apache2\htdocs\account2/purchasing/includes/ui/invoice_ui.inc:195
-#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:78
+#: c:\Apache2\htdocs\account2/purchasing/includes/ui/invoice_ui.inc:197
+#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:79
 msgid "Amount"
 msgstr ""
 
-#: c:\Apache2\htdocs\account2/gl/gl_budget.php:124
+#: c:\Apache2\htdocs\account2/gl/gl_budget.php:130
 msgid "Dim. incl."
 msgstr ""
 
-#: c:\Apache2\htdocs\account2/gl/gl_budget.php:124
-#: c:\Apache2\htdocs\account2/gl/gl_budget.php:126
+#: c:\Apache2\htdocs\account2/gl/gl_budget.php:130
+#: c:\Apache2\htdocs\account2/gl/gl_budget.php:132
 msgid "Last Year"
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/view/gl_deposit_view.php:111
-# c:\Apache2\htdocs\account/gl/view/gl_payment_view.php:110
-# c:\Apache2\htdocs\account/purchasing/po_receive_items.php:50
-# c:\Apache2\htdocs\account/purchasing/supplier_invoice_grns.php:143
-# c:\Apache2\htdocs\account/purchasing/allocations/supplier_allocation_main.php:61
-# c:\Apache2\htdocs\account/purchasing/allocations/supplier_allocation_main.php:64
-# c:\Apache2\htdocs\account/purchasing/view/view_po.php:122
-# c:\Apache2\htdocs\account/reporting/rep101.php:148
-# c:\Apache2\htdocs\account/reporting/rep201.php:149
-# c:\Apache2\htdocs\account/reporting/rep203.php:77
-# c:\Apache2\htdocs\account/reporting/rep203.php:139
-# c:\Apache2\htdocs\account/reporting/rep204.php:98
-# c:\Apache2\htdocs\account/reporting/rep204.php:126
-# c:\Apache2\htdocs\account/reporting/rep301.php:111
-# c:\Apache2\htdocs\account/reporting/rep301.php:145
-# c:\Apache2\htdocs\account/reporting/rep705.php:206
-# c:\Apache2\htdocs\account/reporting/rep705.php:216
-# c:\Apache2\htdocs\account/reporting/rep705.php:271
-# c:\Apache2\htdocs\account/reporting/rep705.php:281
-# c:\Apache2\htdocs\account/reporting/rep706.php:125
-# c:\Apache2\htdocs\account/reporting/rep706.php:136
-# c:\Apache2\htdocs\account/reporting/rep706.php:197
-# c:\Apache2\htdocs\account/reporting/rep706.php:217
-# c:\Apache2\htdocs\account/reporting/rep707.php:157
-# c:\Apache2\htdocs\account/reporting/rep707.php:168
-# c:\Apache2\htdocs\account/reporting/rep707.php:228
-# c:\Apache2\htdocs\account/reporting/rep707.php:241
-# c:\Apache2\htdocs\account/sales/customer_credit_invoice.php:284
-# c:\Apache2\htdocs\account/sales/customer_invoice.php:379
-# c:\Apache2\htdocs\account/sales/allocations/customer_allocation_main.php:63
-# c:\Apache2\htdocs\account/sales/allocations/customer_allocation_main.php:66
-# c:\Apache2\htdocs\account/sales/view/view_credit.php:82
-# c:\Apache2\htdocs\account/sales/view/view_invoice.php:100
-# c:\Apache2\htdocs\account/sales/view/view_sales_order.php:70
-# c:\Apache2\htdocs\account/sales/view/view_sales_order.php:101
-# c:\Apache2\htdocs\account/sales/view/view_sales_order.php:141
-# c:\Apache2\htdocs\account/dimensions/includes/dimensions_ui.inc:50
-# c:\Apache2\htdocs\account/gl/includes/ui/gl_deposit_ui.inc:149
-# c:\Apache2\htdocs\account/gl/includes/ui/gl_journal_ui.inc:98
-# c:\Apache2\htdocs\account/gl/includes/ui/gl_payment_ui.inc:149
-# c:\Apache2\htdocs\account/inventory/includes/item_adjustments_ui.inc:75
-# c:\Apache2\htdocs\account/inventory/includes/item_adjustments_ui.inc:111
-# c:\Apache2\htdocs\account/manufacturing/includes/manufacturing_ui.inc:170
-# c:\Apache2\htdocs\account/purchasing/includes/ui/invoice_ui.inc:246
-# c:\Apache2\htdocs\account/purchasing/includes/ui/invoice_ui.inc:340
-# c:\Apache2\htdocs\account/reporting/includes/doctext.inc:37
-# c:\Apache2\htdocs\account/reporting/includes/doctext.inc:40
-# c:\Apache2\htdocs\account/sales/includes/ui/sales_credit_ui.inc:104
-# c:\Apache2\htdocs\account/sales/includes/ui/sales_order_ui.inc:110
-#: c:\Apache2\htdocs\account2/gl/gl_budget.php:162
+#: c:\Apache2\htdocs\account2/gl/gl_budget.php:170
 #: c:\Apache2\htdocs\account2/gl/view/gl_deposit_view.php:111
 #: c:\Apache2\htdocs\account2/gl/view/gl_payment_view.php:110
-#: c:\Apache2\htdocs\account2/purchasing/po_receive_items.php:52
-#: c:\Apache2\htdocs\account2/purchasing/supplier_invoice_grns.php:142
+#: c:\Apache2\htdocs\account2/purchasing/po_receive_items.php:54
+#: c:\Apache2\htdocs\account2/purchasing/supplier_invoice_grns.php:143
 #: c:\Apache2\htdocs\account2/purchasing/allocations/supplier_allocation_main.php:61
 #: c:\Apache2\htdocs\account2/purchasing/allocations/supplier_allocation_main.php:64
-#: c:\Apache2\htdocs\account2/purchasing/view/view_po.php:122
+#: c:\Apache2\htdocs\account2/purchasing/view/view_po.php:123
 #: c:\Apache2\htdocs\account2/reporting/rep101.php:151
 #: c:\Apache2\htdocs\account2/reporting/rep106.php:71
 #: c:\Apache2\htdocs\account2/reporting/rep106.php:109
@@ -3735,10 +2783,12 @@ msgstr ""
 #: c:\Apache2\htdocs\account2/reporting/rep201.php:149
 #: c:\Apache2\htdocs\account2/reporting/rep203.php:76
 #: c:\Apache2\htdocs\account2/reporting/rep203.php:140
-#: c:\Apache2\htdocs\account2/reporting/rep204.php:96
-#: c:\Apache2\htdocs\account2/reporting/rep204.php:124
+#: c:\Apache2\htdocs\account2/reporting/rep204.php:97
+#: c:\Apache2\htdocs\account2/reporting/rep204.php:125
 #: c:\Apache2\htdocs\account2/reporting/rep301.php:111
 #: c:\Apache2\htdocs\account2/reporting/rep301.php:145
+#: c:\Apache2\htdocs\account2/reporting/rep304.php:157
+#: c:\Apache2\htdocs\account2/reporting/rep304.php:222
 #: c:\Apache2\htdocs\account2/reporting/rep705.php:201
 #: c:\Apache2\htdocs\account2/reporting/rep705.php:211
 #: c:\Apache2\htdocs\account2/reporting/rep705.php:266
@@ -3751,9 +2801,9 @@ msgstr ""
 #: c:\Apache2\htdocs\account2/reporting/rep707.php:182
 #: c:\Apache2\htdocs\account2/reporting/rep707.php:242
 #: c:\Apache2\htdocs\account2/reporting/rep707.php:261
-#: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:267
-#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:354
-#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:326
+#: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:281
+#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:367
+#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:352
 #: c:\Apache2\htdocs\account2/sales/allocations/customer_allocation_main.php:63
 #: c:\Apache2\htdocs\account2/sales/allocations/customer_allocation_main.php:66
 #: c:\Apache2\htdocs\account2/sales/view/view_credit.php:82
@@ -3764,328 +2814,152 @@ msgstr ""
 #: c:\Apache2\htdocs\account2/sales/view/view_sales_order.php:133
 #: c:\Apache2\htdocs\account2/sales/view/view_sales_order.php:173
 #: c:\Apache2\htdocs\account2/dimensions/includes/dimensions_ui.inc:50
-#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_deposit_ui.inc:149
-#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_journal_ui.inc:101
-#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_payment_ui.inc:152
-#: c:\Apache2\htdocs\account2/inventory/includes/item_adjustments_ui.inc:75
-#: c:\Apache2\htdocs\account2/inventory/includes/item_adjustments_ui.inc:113
-#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:170
-#: c:\Apache2\htdocs\account2/purchasing/includes/ui/invoice_ui.inc:240
-#: c:\Apache2\htdocs\account2/purchasing/includes/ui/invoice_ui.inc:335
-#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:46
-#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:49
-#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_credit_ui.inc:109
-#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:87
+#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_bank_ui.inc:160
+#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_journal_ui.inc:106
+#: c:\Apache2\htdocs\account2/inventory/includes/item_adjustments_ui.inc:65
+#: c:\Apache2\htdocs\account2/inventory/includes/item_adjustments_ui.inc:104
+#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:171
+#: c:\Apache2\htdocs\account2/purchasing/includes/ui/invoice_ui.inc:243
+#: c:\Apache2\htdocs\account2/purchasing/includes/ui/invoice_ui.inc:340
+#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:47
+#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:50
+#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_credit_ui.inc:153
+#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:84
 msgid "Total"
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/gl_deposit.php:19
-#: c:\Apache2\htdocs\account2/gl/gl_deposit.php:21
-msgid "Bank Account Deposit Entry"
-msgstr ""
-
-# c:\Apache2\htdocs\account/gl/gl_deposit.php:25
-# c:\Apache2\htdocs\account/gl/gl_payment.php:27
-# c:\Apache2\htdocs\account/purchasing/supplier_payment.php:30
-# c:\Apache2\htdocs\account/sales/customer_payments.php:26
-#: c:\Apache2\htdocs\account2/gl/gl_deposit.php:27
-#: c:\Apache2\htdocs\account2/gl/gl_payment.php:27
-#: c:\Apache2\htdocs\account2/purchasing/supplier_payment.php:32
-#: c:\Apache2\htdocs\account2/sales/customer_payments.php:27
-msgid "There are no bank payment types defined in the system."
-msgstr ""
-
-# c:\Apache2\htdocs\account/gl/gl_deposit.php:34
-#: c:\Apache2\htdocs\account2/gl/gl_deposit.php:36
-msgid "Deposit has been entered"
-msgstr ""
-
-# c:\Apache2\htdocs\account/gl/gl_deposit.php:36
-#: c:\Apache2\htdocs\account2/gl/gl_deposit.php:38
-msgid "View the GL Postings for this Deposit"
-msgstr ""
-
-# c:\Apache2\htdocs\account/gl/gl_deposit.php:38
-#: c:\Apache2\htdocs\account2/gl/gl_deposit.php:40
-msgid "Enter Another Deposit"
-msgstr ""
-
-# c:\Apache2\htdocs\account/gl/gl_deposit.php:112
-#: c:\Apache2\htdocs\account2/gl/gl_deposit.php:116
-msgid "The entered date for the deposit is invalid."
-msgstr ""
-
-#: c:\Apache2\htdocs\account2/gl/gl_deposit.php:158
-#: c:\Apache2\htdocs\account2/gl/gl_payment.php:155
-msgid "The amount entered is not a valid number or is less than zero."
-msgstr ""
-
-# c:\Apache2\htdocs\account/gl/gl_deposit.php:164
-# c:\Apache2\htdocs\account/gl/gl_payment.php:163
-#: c:\Apache2\htdocs\account2/gl/gl_deposit.php:165
-#: c:\Apache2\htdocs\account2/gl/gl_payment.php:162
-msgid "The source and destination accouts cannot be the same."
-msgstr ""
-
-# c:\Apache2\htdocs\account/gl/gl_deposit.php:170
-#: c:\Apache2\htdocs\account2/gl/gl_deposit.php:172
-msgid "You cannot make a deposit from a bank account. Please use the transfer funds facility for this."
-msgstr ""
-
-# c:\Apache2\htdocs\account/gl/gl_deposit.php:237
-#: c:\Apache2\htdocs\account2/gl/gl_deposit.php:242
-msgid "Deposit Items"
+#: c:\Apache2\htdocs\account2/gl/gl_journal.php:38
+msgid "Journal entry has been entered"
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/gl_deposit.php:247
-#: c:\Apache2\htdocs\account2/gl/gl_deposit.php:252
-msgid "Process Deposit"
+#: c:\Apache2\htdocs\account2/gl/gl_journal.php:40
+msgid "View this Journal Entry"
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/gl_journal.php:30
-#: c:\Apache2\htdocs\account2/gl/gl_journal.php:33
-msgid "Journal entry has been entered"
+#: c:\Apache2\htdocs\account2/gl/gl_journal.php:42
+msgid "Enter Another Journal Entry"
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/gl_journal.php:32
-#: c:\Apache2\htdocs\account2/gl/gl_journal.php:35
-msgid "View this Journal Entry"
+#: c:\Apache2\htdocs\account2/gl/gl_journal.php:74
+msgid "You must enter at least one journal line."
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/gl_journal.php:34
-#: c:\Apache2\htdocs\account2/gl/gl_journal.php:37
-msgid "Enter Another Journal Entry"
+#: c:\Apache2\htdocs\account2/gl/gl_journal.php:80
+msgid "The journal must balance (debits equal to credits) before it can be processed."
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/gl_journal.php:127
-# c:\Apache2\htdocs\account/gl/gl_journal.php:133
-#: c:\Apache2\htdocs\account2/gl/gl_journal.php:134
-#: c:\Apache2\htdocs\account2/gl/gl_journal.php:141
+#: c:\Apache2\htdocs\account2/gl/gl_journal.php:133
+#: c:\Apache2\htdocs\account2/gl/gl_journal.php:140
 msgid "Dimension is closed."
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/gl_journal.php:146
-#: c:\Apache2\htdocs\account2/gl/gl_journal.php:148
+#: c:\Apache2\htdocs\account2/gl/gl_journal.php:147
 msgid "You must enter either a debit amount or a credit amount."
 msgstr ""
 
-#: c:\Apache2\htdocs\account2/gl/gl_journal.php:155
+#: c:\Apache2\htdocs\account2/gl/gl_journal.php:154
 msgid "The debit amount entered is not a valid number or is less than zero."
 msgstr ""
 
-#: c:\Apache2\htdocs\account2/gl/gl_journal.php:160
+#: c:\Apache2\htdocs\account2/gl/gl_journal.php:159
 msgid "The credit amount entered is not a valid number or is less than zero."
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/gl_journal.php:184
-#: c:\Apache2\htdocs\account2/gl/gl_journal.php:168
+#: c:\Apache2\htdocs\account2/gl/gl_journal.php:167
 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\account/gl/gl_journal.php:263
-#: c:\Apache2\htdocs\account2/gl/gl_journal.php:248
+#: c:\Apache2\htdocs\account2/gl/gl_journal.php:247
 msgid "Rows"
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/gl_journal.php:274
-#: c:\Apache2\htdocs\account2/gl/gl_journal.php:257
+#: c:\Apache2\htdocs\account2/gl/gl_journal.php:253
 msgid "Process Journal Entry"
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/gl_journal.php:278
-#: c:\Apache2\htdocs\account2/gl/gl_journal.php:261
-msgid "The journal must balance (debits equal to credits) before it can be processed."
-msgstr ""
-
-# c:\Apache2\htdocs\account/gl/gl_payment.php:21
-#: c:\Apache2\htdocs\account2/gl/gl_payment.php:21
-msgid "Bank Account Payment Entry"
-msgstr ""
-
-# c:\Apache2\htdocs\account/gl/gl_payment.php:36
-#: c:\Apache2\htdocs\account2/gl/gl_payment.php:36
-msgid "Payment has been entered"
-msgstr ""
-
-# c:\Apache2\htdocs\account/gl/gl_payment.php:38
-#: c:\Apache2\htdocs\account2/gl/gl_payment.php:38
-msgid "View the GL Postings for this Payment"
-msgstr ""
-
-# c:\Apache2\htdocs\account/gl/gl_payment.php:40
-#: c:\Apache2\htdocs\account2/gl/gl_payment.php:40
-msgid "Enter Another Payment"
-msgstr ""
-
-# c:\Apache2\htdocs\account/gl/gl_payment.php:114
-#: c:\Apache2\htdocs\account2/gl/gl_payment.php:116
-msgid "The entered date for the payment is invalid."
-msgstr ""
-
-# c:\Apache2\htdocs\account/gl/gl_payment.php:169
-#: c:\Apache2\htdocs\account2/gl/gl_payment.php:169
-msgid "You cannot make a payment to a bank account. Please use the transfer funds facility for this."
-msgstr ""
-
-# c:\Apache2\htdocs\account/gl/gl_payment.php:238
-#: c:\Apache2\htdocs\account2/gl/gl_payment.php:239
-msgid "Payment Items"
-msgstr ""
-
-# c:\Apache2\htdocs\account/gl/gl_payment.php:248
-#: c:\Apache2\htdocs\account2/gl/gl_payment.php:249
-msgid "Process Payment"
+#: c:\Apache2\htdocs\account2/gl/gl_journal.php:254
+msgid "Process journal entry only if debits equal to credits"
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/inquiry/bank_inquiry.php:17
 #: c:\Apache2\htdocs\account2/gl/inquiry/bank_inquiry.php:19
 msgid "Bank Statement"
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/inquiry/bank_inquiry.php:27
-# c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:46
-#: c:\Apache2\htdocs\account2/gl/inquiry/bank_inquiry.php:29
-#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:49
+#: c:\Apache2\htdocs\account2/gl/inquiry/bank_inquiry.php:35
+#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:55
 msgid "Account:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/inquiry/bank_inquiry.php:32
-# c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:50
-# c:\Apache2\htdocs\account/gl/inquiry/gl_trial_balance.php:29
-#: c:\Apache2\htdocs\account2/gl/inquiry/bank_inquiry.php:34
-#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:53
-#: c:\Apache2\htdocs\account2/gl/inquiry/gl_trial_balance.php:33
+#: c:\Apache2\htdocs\account2/gl/inquiry/bank_inquiry.php:40
+#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:59
+#: c:\Apache2\htdocs\account2/gl/inquiry/gl_trial_balance.php:39
 msgid "Show"
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/inquiry/bank_inquiry.php:59
-# c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:94
-# c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:97
-# c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:100
-# c:\Apache2\htdocs\account/gl/inquiry/gl_trial_balance.php:79
-# c:\Apache2\htdocs\account/gl/inquiry/gl_trial_balance.php:81
-# c:\Apache2\htdocs\account/gl/inquiry/gl_trial_balance.php:83
-# c:\Apache2\htdocs\account/gl/view/gl_trans_view.php:57
-# c:\Apache2\htdocs\account/gl/view/gl_trans_view.php:60
-# c:\Apache2\htdocs\account/gl/view/gl_trans_view.php:63
-# c:\Apache2\htdocs\account/purchasing/inquiry/supplier_allocation_inquiry.php:126
-# c:\Apache2\htdocs\account/purchasing/inquiry/supplier_allocation_inquiry.php:129
-# c:\Apache2\htdocs\account/purchasing/inquiry/supplier_inquiry.php:160
-# c:\Apache2\htdocs\account/purchasing/inquiry/supplier_inquiry.php:164
-# c:\Apache2\htdocs\account/reporting/rep702.php:40
-# c:\Apache2\htdocs\account/reporting/rep704.php:64
-# c:\Apache2\htdocs\account/reporting/rep704.php:67
-# c:\Apache2\htdocs\account/reporting/rep704.php:70
-# c:\Apache2\htdocs\account/reporting/rep708.php:62
-# c:\Apache2\htdocs\account/reporting/rep708.php:63
-# c:\Apache2\htdocs\account/sales/inquiry/customer_allocation_inquiry.php:120
-# c:\Apache2\htdocs\account/sales/inquiry/customer_allocation_inquiry.php:123
-# c:\Apache2\htdocs\account/sales/inquiry/customer_inquiry.php:162
-# c:\Apache2\htdocs\account/sales/inquiry/customer_inquiry.php:165
-# c:\Apache2\htdocs\account/dimensions/includes/dimensions_ui.inc:24
-# c:\Apache2\htdocs\account/gl/includes/ui/gl_journal_ui.inc:48
-# c:\Apache2\htdocs\account/gl/includes/ui/gl_journal_ui.inc:51
-# c:\Apache2\htdocs\account/gl/includes/ui/gl_journal_ui.inc:54
-#: c:\Apache2\htdocs\account2/gl/inquiry/bank_inquiry.php:61
-#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:92
-#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:95
-#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:98
-#: c:\Apache2\htdocs\account2/gl/inquiry/gl_trial_balance.php:83
-#: c:\Apache2\htdocs\account2/gl/inquiry/gl_trial_balance.php:85
-#: c:\Apache2\htdocs\account2/gl/inquiry/gl_trial_balance.php:87
+#: c:\Apache2\htdocs\account2/gl/inquiry/bank_inquiry.php:68
+#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:99
+#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:102
+#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:105
+#: c:\Apache2\htdocs\account2/gl/inquiry/gl_trial_balance.php:90
+#: c:\Apache2\htdocs\account2/gl/inquiry/gl_trial_balance.php:92
+#: c:\Apache2\htdocs\account2/gl/inquiry/gl_trial_balance.php:94
 #: c:\Apache2\htdocs\account2/gl/view/gl_trans_view.php:57
 #: c:\Apache2\htdocs\account2/gl/view/gl_trans_view.php:60
 #: c:\Apache2\htdocs\account2/gl/view/gl_trans_view.php:63
-#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_allocation_inquiry.php:128
-#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_allocation_inquiry.php:131
-#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_inquiry.php:162
-#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_inquiry.php:166
+#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_allocation_inquiry.php:132
+#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_allocation_inquiry.php:135
+#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_inquiry.php:169
+#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_inquiry.php:173
 #: c:\Apache2\htdocs\account2/reporting/rep702.php:40
 #: c:\Apache2\htdocs\account2/reporting/rep704.php:64
 #: c:\Apache2\htdocs\account2/reporting/rep704.php:67
 #: c:\Apache2\htdocs\account2/reporting/rep704.php:70
 #: c:\Apache2\htdocs\account2/reporting/rep708.php:62
 #: c:\Apache2\htdocs\account2/reporting/rep708.php:63
-#: c:\Apache2\htdocs\account2/sales/inquiry/customer_allocation_inquiry.php:132
 #: c:\Apache2\htdocs\account2/sales/inquiry/customer_allocation_inquiry.php:135
-#: c:\Apache2\htdocs\account2/sales/inquiry/customer_inquiry.php:173
+#: c:\Apache2\htdocs\account2/sales/inquiry/customer_allocation_inquiry.php:138
+#: c:\Apache2\htdocs\account2/sales/inquiry/customer_inquiry.php:184
 #: c:\Apache2\htdocs\account2/dimensions/includes/dimensions_ui.inc:24
-#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_journal_ui.inc:48
-#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_journal_ui.inc:51
-#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_journal_ui.inc:54
+#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_journal_ui.inc:49
+#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_journal_ui.inc:52
+#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_journal_ui.inc:55
 msgid "Debit"
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/inquiry/bank_inquiry.php:59
-# c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:94
-# c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:97
-# c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:100
-# c:\Apache2\htdocs\account/gl/inquiry/gl_trial_balance.php:80
-# c:\Apache2\htdocs\account/gl/inquiry/gl_trial_balance.php:82
-# c:\Apache2\htdocs\account/gl/inquiry/gl_trial_balance.php:84
-# c:\Apache2\htdocs\account/gl/view/gl_trans_view.php:57
-# c:\Apache2\htdocs\account/gl/view/gl_trans_view.php:60
-# c:\Apache2\htdocs\account/gl/view/gl_trans_view.php:63
-# c:\Apache2\htdocs\account/purchasing/inquiry/supplier_allocation_inquiry.php:126
-# c:\Apache2\htdocs\account/purchasing/inquiry/supplier_allocation_inquiry.php:129
-# c:\Apache2\htdocs\account/purchasing/inquiry/supplier_inquiry.php:160
-# c:\Apache2\htdocs\account/purchasing/inquiry/supplier_inquiry.php:164
-# c:\Apache2\htdocs\account/reporting/rep702.php:40
-# c:\Apache2\htdocs\account/reporting/rep704.php:64
-# c:\Apache2\htdocs\account/reporting/rep704.php:67
-# c:\Apache2\htdocs\account/reporting/rep704.php:70
-# c:\Apache2\htdocs\account/reporting/rep708.php:62
-# c:\Apache2\htdocs\account/reporting/rep708.php:63
-# c:\Apache2\htdocs\account/sales/inquiry/customer_allocation_inquiry.php:120
-# c:\Apache2\htdocs\account/sales/inquiry/customer_allocation_inquiry.php:123
-# c:\Apache2\htdocs\account/sales/inquiry/customer_inquiry.php:162
-# c:\Apache2\htdocs\account/sales/inquiry/customer_inquiry.php:165
-# c:\Apache2\htdocs\account/dimensions/includes/dimensions_ui.inc:24
-# c:\Apache2\htdocs\account/gl/includes/ui/gl_journal_ui.inc:48
-# c:\Apache2\htdocs\account/gl/includes/ui/gl_journal_ui.inc:51
-# c:\Apache2\htdocs\account/gl/includes/ui/gl_journal_ui.inc:54
-#: c:\Apache2\htdocs\account2/gl/inquiry/bank_inquiry.php:61
-#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:92
-#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:95
-#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:98
-#: c:\Apache2\htdocs\account2/gl/inquiry/gl_trial_balance.php:84
-#: c:\Apache2\htdocs\account2/gl/inquiry/gl_trial_balance.php:86
-#: c:\Apache2\htdocs\account2/gl/inquiry/gl_trial_balance.php:88
+#: c:\Apache2\htdocs\account2/gl/inquiry/bank_inquiry.php:68
+#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:99
+#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:102
+#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:105
+#: c:\Apache2\htdocs\account2/gl/inquiry/gl_trial_balance.php:91
+#: c:\Apache2\htdocs\account2/gl/inquiry/gl_trial_balance.php:93
+#: c:\Apache2\htdocs\account2/gl/inquiry/gl_trial_balance.php:95
 #: c:\Apache2\htdocs\account2/gl/view/gl_trans_view.php:57
 #: c:\Apache2\htdocs\account2/gl/view/gl_trans_view.php:60
 #: c:\Apache2\htdocs\account2/gl/view/gl_trans_view.php:63
-#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_allocation_inquiry.php:128
-#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_allocation_inquiry.php:131
-#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_inquiry.php:162
-#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_inquiry.php:166
+#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_allocation_inquiry.php:132
+#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_allocation_inquiry.php:135
+#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_inquiry.php:169
+#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_inquiry.php:173
 #: c:\Apache2\htdocs\account2/reporting/rep702.php:40
 #: c:\Apache2\htdocs\account2/reporting/rep704.php:64
 #: c:\Apache2\htdocs\account2/reporting/rep704.php:67
 #: c:\Apache2\htdocs\account2/reporting/rep704.php:70
 #: c:\Apache2\htdocs\account2/reporting/rep708.php:62
 #: c:\Apache2\htdocs\account2/reporting/rep708.php:63
-#: c:\Apache2\htdocs\account2/sales/inquiry/customer_allocation_inquiry.php:132
 #: c:\Apache2\htdocs\account2/sales/inquiry/customer_allocation_inquiry.php:135
-#: c:\Apache2\htdocs\account2/sales/inquiry/customer_inquiry.php:173
+#: c:\Apache2\htdocs\account2/sales/inquiry/customer_allocation_inquiry.php:138
+#: c:\Apache2\htdocs\account2/sales/inquiry/customer_inquiry.php:184
 #: c:\Apache2\htdocs\account2/dimensions/includes/dimensions_ui.inc:24
-#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_journal_ui.inc:48
-#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_journal_ui.inc:51
-#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_journal_ui.inc:54
+#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_journal_ui.inc:49
+#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_journal_ui.inc:52
+#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_journal_ui.inc:55
 msgid "Credit"
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/inquiry/bank_inquiry.php:59
-# c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:94
-# c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:97
-# c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:100
-# c:\Apache2\htdocs\account/gl/view/gl_trans_view.php:27
-# c:\Apache2\htdocs\account/reporting/rep704.php:64
-# c:\Apache2\htdocs\account/reporting/rep704.php:66
-# c:\Apache2\htdocs\account/reporting/rep704.php:69
-#: c:\Apache2\htdocs\account2/gl/inquiry/bank_inquiry.php:61
-#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:92
-#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:95
-#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:98
+#: c:\Apache2\htdocs\account2/gl/inquiry/bank_inquiry.php:68
+#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:99
+#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:102
+#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:105
 #: c:\Apache2\htdocs\account2/gl/view/gl_trans_view.php:27
 #: c:\Apache2\htdocs\account2/reporting/rep704.php:64
 #: c:\Apache2\htdocs\account2/reporting/rep704.php:66
@@ -4093,162 +2967,91 @@ msgstr ""
 msgid "Person/Item"
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/inquiry/bank_inquiry.php:67
-# c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:105
-# c:\Apache2\htdocs\account/reporting/rep704.php:118
-#: c:\Apache2\htdocs\account2/gl/inquiry/bank_inquiry.php:69
-#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:113
+#: c:\Apache2\htdocs\account2/gl/inquiry/bank_inquiry.php:76
+#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:120
 #: c:\Apache2\htdocs\account2/reporting/rep704.php:122
 msgid "Opening Balance"
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/inquiry/bank_inquiry.php:106
-# c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:146
-# c:\Apache2\htdocs\account/reporting/rep704.php:155
-#: c:\Apache2\htdocs\account2/gl/inquiry/bank_inquiry.php:108
-#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:154
+#: c:\Apache2\htdocs\account2/gl/inquiry/bank_inquiry.php:115
+#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:161
 #: c:\Apache2\htdocs\account2/reporting/rep704.php:159
 msgid "Ending Balance"
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:18
 #: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:21
 msgid "General Ledger Account Inquiry"
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:48
-# c:\Apache2\htdocs\account/purchasing/inquiry/po_search.php:27
-# c:\Apache2\htdocs\account/purchasing/inquiry/po_search_completed.php:26
-# c:\Apache2\htdocs\account/sales/inquiry/customer_allocation_inquiry.php:32
-# c:\Apache2\htdocs\account/sales/inquiry/sales_orders_view.php:42
-#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:51
-#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search.php:30
-#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search_completed.php:29
+#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:57
+#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search.php:54
+#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search_completed.php:52
 #: c:\Apache2\htdocs\account2/sales/inquiry/customer_allocation_inquiry.php:34
-#: c:\Apache2\htdocs\account2/sales/inquiry/sales_deliveries_view.php:86
-#: c:\Apache2\htdocs\account2/sales/inquiry/sales_orders_view.php:74
+#: c:\Apache2\htdocs\account2/sales/inquiry/sales_deliveries_view.php:108
+#: c:\Apache2\htdocs\account2/sales/inquiry/sales_orders_view.php:84
 msgid "from:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:49
-# c:\Apache2\htdocs\account/purchasing/inquiry/po_search.php:28
-# c:\Apache2\htdocs\account/purchasing/inquiry/po_search_completed.php:27
-# c:\Apache2\htdocs\account/sales/inquiry/customer_allocation_inquiry.php:33
-# c:\Apache2\htdocs\account/sales/inquiry/sales_orders_view.php:43
-#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:52
-#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search.php:31
-#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search_completed.php:30
+#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:58
+#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search.php:55
+#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search_completed.php:53
 #: c:\Apache2\htdocs\account2/sales/inquiry/customer_allocation_inquiry.php:35
-#: c:\Apache2\htdocs\account2/sales/inquiry/sales_deliveries_view.php:87
-#: c:\Apache2\htdocs\account2/sales/inquiry/sales_orders_view.php:75
+#: c:\Apache2\htdocs\account2/sales/inquiry/sales_deliveries_view.php:109
+#: c:\Apache2\htdocs\account2/sales/inquiry/sales_orders_view.php:85
 msgid "to:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:94
-# c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:97
-# c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:100
-# c:\Apache2\htdocs\account/gl/view/gl_deposit_view.php:89
-# c:\Apache2\htdocs\account/gl/view/gl_payment_view.php:88
-# c:\Apache2\htdocs\account/gl/view/gl_trans_view.php:57
-# c:\Apache2\htdocs\account/gl/view/gl_trans_view.php:60
-# c:\Apache2\htdocs\account/gl/view/gl_trans_view.php:63
-# c:\Apache2\htdocs\account/sales/customer_credit_invoice.php:375
-# c:\Apache2\htdocs\account/sales/customer_invoice.php:475
-# c:\Apache2\htdocs\account/gl/includes/ui/gl_deposit_ui.inc:111
-# c:\Apache2\htdocs\account/gl/includes/ui/gl_deposit_ui.inc:114
-# c:\Apache2\htdocs\account/gl/includes/ui/gl_deposit_ui.inc:117
-# c:\Apache2\htdocs\account/gl/includes/ui/gl_deposit_ui.inc:241
-# c:\Apache2\htdocs\account/gl/includes/ui/gl_journal_ui.inc:48
-# c:\Apache2\htdocs\account/gl/includes/ui/gl_journal_ui.inc:51
-# c:\Apache2\htdocs\account/gl/includes/ui/gl_journal_ui.inc:54
-# c:\Apache2\htdocs\account/gl/includes/ui/gl_journal_ui.inc:187
-# c:\Apache2\htdocs\account/gl/includes/ui/gl_payment_ui.inc:110
-# c:\Apache2\htdocs\account/gl/includes/ui/gl_payment_ui.inc:113
-# c:\Apache2\htdocs\account/gl/includes/ui/gl_payment_ui.inc:116
-# c:\Apache2\htdocs\account/gl/includes/ui/gl_payment_ui.inc:238
-# c:\Apache2\htdocs\account/inventory/includes/item_adjustments_ui.inc:177
-# c:\Apache2\htdocs\account/inventory/includes/stock_transfers_ui.inc:161
-# c:\Apache2\htdocs\account/purchasing/includes/ui/invoice_ui.inc:197
-# c:\Apache2\htdocs\account/purchasing/includes/ui/invoice_ui.inc:199
-# c:\Apache2\htdocs\account/purchasing/includes/ui/invoice_ui.inc:201
-# c:\Apache2\htdocs\account/sales/includes/ui/sales_credit_ui.inc:249
-# c:\Apache2\htdocs\account/sales/includes/ui/sales_order_ui.inc:380
-#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:92
-#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:95
-#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:98
+#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:99
+#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:102
+#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:105
 #: c:\Apache2\htdocs\account2/gl/view/gl_deposit_view.php:89
 #: c:\Apache2\htdocs\account2/gl/view/gl_payment_view.php:88
 #: c:\Apache2\htdocs\account2/gl/view/gl_trans_view.php:57
 #: c:\Apache2\htdocs\account2/gl/view/gl_trans_view.php:60
 #: c:\Apache2\htdocs\account2/gl/view/gl_trans_view.php:63
-#: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:354
-#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:434
-#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:428
-#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_deposit_ui.inc:111
-#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_deposit_ui.inc:114
-#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_deposit_ui.inc:117
-#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_deposit_ui.inc:241
-#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_journal_ui.inc:48
-#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_journal_ui.inc:51
-#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_journal_ui.inc:54
-#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_journal_ui.inc:191
-#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_payment_ui.inc:110
-#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_payment_ui.inc:113
-#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_payment_ui.inc:116
-#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_payment_ui.inc:241
+#: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:364
+#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:445
+#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:455
+#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_bank_ui.inc:115
+#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_bank_ui.inc:118
+#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_bank_ui.inc:121
+#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_bank_ui.inc:259
+#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_journal_ui.inc:49
+#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_journal_ui.inc:52
+#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_journal_ui.inc:55
+#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_journal_ui.inc:195
 #: c:\Apache2\htdocs\account2/inventory/includes/item_adjustments_ui.inc:179
-#: c:\Apache2\htdocs\account2/inventory/includes/stock_transfers_ui.inc:161
-#: c:\Apache2\htdocs\account2/purchasing/includes/ui/invoice_ui.inc:191
+#: c:\Apache2\htdocs\account2/inventory/includes/stock_transfers_ui.inc:159
+#: c:\Apache2\htdocs\account2/manufacturing/includes/work_order_issue_ui.inc:153
 #: c:\Apache2\htdocs\account2/purchasing/includes/ui/invoice_ui.inc:193
 #: c:\Apache2\htdocs\account2/purchasing/includes/ui/invoice_ui.inc:195
-#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_credit_ui.inc:269
+#: c:\Apache2\htdocs\account2/purchasing/includes/ui/invoice_ui.inc:197
+#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_credit_ui.inc:317
 msgid "Memo"
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:84
-#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:161
+#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:168
 msgid "No general ledger transactions have been created for this account on the selected dates."
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/inquiry/gl_trial_balance.php:27
-#: c:\Apache2\htdocs\account2/gl/inquiry/gl_trial_balance.php:31
+#: c:\Apache2\htdocs\account2/gl/inquiry/gl_trial_balance.php:37
 msgid "No zero values"
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/inquiry/gl_trial_balance.php:73
-# c:\Apache2\htdocs\account/reporting/rep701.php:36
-# c:\Apache2\htdocs\account/reporting/rep705.php:122
-# c:\Apache2\htdocs\account/reporting/rep706.php:55
-# c:\Apache2\htdocs\account/reporting/rep707.php:70
-# c:\Apache2\htdocs\account/reporting/rep708.php:62
-# c:\Apache2\htdocs\account/purchasing/includes/ui/invoice_ui.inc:197
-# c:\Apache2\htdocs\account/purchasing/includes/ui/invoice_ui.inc:199
-# c:\Apache2\htdocs\account/purchasing/includes/ui/invoice_ui.inc:201
-#: c:\Apache2\htdocs\account2/gl/inquiry/gl_trial_balance.php:77
+#: c:\Apache2\htdocs\account2/gl/inquiry/gl_trial_balance.php:84
 #: c:\Apache2\htdocs\account2/reporting/rep701.php:36
 #: c:\Apache2\htdocs\account2/reporting/rep705.php:126
 #: c:\Apache2\htdocs\account2/reporting/rep706.php:63
 #: c:\Apache2\htdocs\account2/reporting/rep707.php:78
 #: c:\Apache2\htdocs\account2/reporting/rep708.php:62
-#: c:\Apache2\htdocs\account2/purchasing/includes/ui/invoice_ui.inc:191
 #: c:\Apache2\htdocs\account2/purchasing/includes/ui/invoice_ui.inc:193
 #: c:\Apache2\htdocs\account2/purchasing/includes/ui/invoice_ui.inc:195
+#: c:\Apache2\htdocs\account2/purchasing/includes/ui/invoice_ui.inc:197
 msgid "Account"
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/inquiry/gl_trial_balance.php:74
-# c:\Apache2\htdocs\account/gl/manage/bank_accounts.php:88
-# c:\Apache2\htdocs\account/gl/view/gl_trans_view.php:56
-# c:\Apache2\htdocs\account/gl/view/gl_trans_view.php:59
-# c:\Apache2\htdocs\account/gl/view/gl_trans_view.php:62
-# c:\Apache2\htdocs\account/reporting/rep701.php:36
-# c:\Apache2\htdocs\account/reporting/rep702.php:39
-# c:\Apache2\htdocs\account/reporting/rep705.php:122
-# c:\Apache2\htdocs\account/reporting/rep706.php:55
-# c:\Apache2\htdocs\account/reporting/rep707.php:70
-# c:\Apache2\htdocs\account/reporting/rep708.php:62
-#: c:\Apache2\htdocs\account2/gl/inquiry/gl_trial_balance.php:78
-#: c:\Apache2\htdocs\account2/gl/manage/bank_accounts.php:88
+#: c:\Apache2\htdocs\account2/gl/inquiry/gl_trial_balance.php:85
+#: c:\Apache2\htdocs\account2/gl/manage/bank_accounts.php:91
 #: c:\Apache2\htdocs\account2/gl/view/gl_trans_view.php:56
 #: c:\Apache2\htdocs\account2/gl/view/gl_trans_view.php:59
 #: c:\Apache2\htdocs\account2/gl/view/gl_trans_view.php:62
@@ -4261,1087 +3064,822 @@ msgstr ""
 msgid "Account Name"
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/inquiry/gl_trial_balance.php:75
-# c:\Apache2\htdocs\account/reporting/rep708.php:55
-#: c:\Apache2\htdocs\account2/gl/inquiry/gl_trial_balance.php:79
+#: c:\Apache2\htdocs\account2/gl/inquiry/gl_trial_balance.php:86
 #: c:\Apache2\htdocs\account2/reporting/rep708.php:55
 msgid "Brought Forward"
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/inquiry/gl_trial_balance.php:76
-# c:\Apache2\htdocs\account/reporting/rep708.php:55
-#: c:\Apache2\htdocs\account2/gl/inquiry/gl_trial_balance.php:80
+#: c:\Apache2\htdocs\account2/gl/inquiry/gl_trial_balance.php:87
 #: c:\Apache2\htdocs\account2/reporting/rep708.php:55
 msgid "This Period"
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/manage/bank_accounts.php:31
-#: c:\Apache2\htdocs\account2/gl/manage/bank_accounts.php:30
+#: c:\Apache2\htdocs\account2/gl/manage/bank_accounts.php:24
 msgid "The bank account name cannot be empty."
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/manage/bank_accounts.php:69
-#: c:\Apache2\htdocs\account2/gl/manage/bank_accounts.php:69
+#: c:\Apache2\htdocs\account2/gl/manage/bank_accounts.php:36
+msgid "Bank account has been updated"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/gl/manage/bank_accounts.php:44
+#: c:\Apache2\htdocs\account2/gl/manage/bank_trans_types.php:41
+msgid "New bank account has been added"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/gl/manage/bank_accounts.php:63
 msgid "Cannot delete this bank account because transactions have been created using this account."
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/manage/bank_accounts.php:88
-#: c:\Apache2\htdocs\account2/gl/manage/bank_accounts.php:88
+#: c:\Apache2\htdocs\account2/gl/manage/bank_accounts.php:68
+#: c:\Apache2\htdocs\account2/gl/manage/bank_trans_types.php:73
+msgid "Selected bank account has been deleted"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/gl/manage/bank_accounts.php:91
 msgid "GL Account"
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/manage/bank_accounts.php:88
-# c:\Apache2\htdocs\account/reporting/includes/doctext.inc:23
-#: c:\Apache2\htdocs\account2/gl/manage/bank_accounts.php:88
-#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:29
+#: c:\Apache2\htdocs\account2/gl/manage/bank_accounts.php:91
+#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:30
 msgid "Bank"
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/manage/bank_accounts.php:89
-# c:\Apache2\htdocs\account/purchasing/inquiry/supplier_allocation_inquiry.php:124
-# c:\Apache2\htdocs\account/purchasing/inquiry/supplier_allocation_inquiry.php:128
-# c:\Apache2\htdocs\account/sales/inquiry/customer_allocation_inquiry.php:119
-# c:\Apache2\htdocs\account/sales/inquiry/customer_allocation_inquiry.php:122
-# c:\Apache2\htdocs\account/includes/ui/ui_view.inc:463
-#: c:\Apache2\htdocs\account2/gl/manage/bank_accounts.php:89
-#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_allocation_inquiry.php:126
+#: c:\Apache2\htdocs\account2/gl/manage/bank_accounts.php:92
 #: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_allocation_inquiry.php:130
-#: c:\Apache2\htdocs\account2/sales/inquiry/customer_allocation_inquiry.php:131
+#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_allocation_inquiry.php:134
 #: c:\Apache2\htdocs\account2/sales/inquiry/customer_allocation_inquiry.php:134
-#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:475
+#: c:\Apache2\htdocs\account2/sales/inquiry/customer_allocation_inquiry.php:137
+#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:481
 msgid "Number"
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/manage/bank_accounts.php:89
-# c:\Apache2\htdocs\account/gl/view/bank_transfer_view.php:60
-# c:\Apache2\htdocs\account/gl/view/bank_transfer_view.php:69
-# c:\Apache2\htdocs\account/gl/view/gl_deposit_view.php:57
-# c:\Apache2\htdocs\account/gl/view/gl_payment_view.php:55
-# c:\Apache2\htdocs\account/inventory/prices.php:117
-# c:\Apache2\htdocs\account/inventory/purchasing_data.php:144
-# c:\Apache2\htdocs\account/purchasing/allocations/supplier_allocation_main.php:61
-# c:\Apache2\htdocs\account/purchasing/inquiry/po_search.php:106
-# c:\Apache2\htdocs\account/purchasing/inquiry/po_search.php:109
-# c:\Apache2\htdocs\account/purchasing/inquiry/po_search_completed.php:99
-# c:\Apache2\htdocs\account/purchasing/inquiry/po_search_completed.php:102
-# c:\Apache2\htdocs\account/purchasing/inquiry/supplier_allocation_inquiry.php:125
-# c:\Apache2\htdocs\account/purchasing/inquiry/supplier_inquiry.php:64
-# c:\Apache2\htdocs\account/purchasing/inquiry/supplier_inquiry.php:159
-# c:\Apache2\htdocs\account/purchasing/view/view_supp_credit.php:38
-# c:\Apache2\htdocs\account/purchasing/view/view_supp_invoice.php:45
-# c:\Apache2\htdocs\account/reporting/rep101.php:79
-# c:\Apache2\htdocs\account/reporting/rep102.php:146
-# c:\Apache2\htdocs\account/reporting/rep102.php:150
-# c:\Apache2\htdocs\account/reporting/rep201.php:80
-# c:\Apache2\htdocs\account/reporting/rep202.php:155
-# c:\Apache2\htdocs\account/reporting/rep203.php:85
-# c:\Apache2\htdocs\account/sales/customer_credit_invoice.php:250
-# c:\Apache2\htdocs\account/sales/customer_invoice.php:315
-# c:\Apache2\htdocs\account/sales/allocations/customer_allocation_main.php:63
-# c:\Apache2\htdocs\account/sales/inquiry/customer_allocation_inquiry.php:120
-# c:\Apache2\htdocs\account/sales/inquiry/customer_inquiry.php:66
-# c:\Apache2\htdocs\account/sales/inquiry/customer_inquiry.php:162
-# c:\Apache2\htdocs\account/sales/inquiry/sales_orders_view.php:126
-# c:\Apache2\htdocs\account/sales/view/view_credit.php:61
-# c:\Apache2\htdocs\account/sales/view/view_invoice.php:73
-#: c:\Apache2\htdocs\account2/gl/manage/bank_accounts.php:89
+#: c:\Apache2\htdocs\account2/gl/manage/bank_accounts.php:92
 #: c:\Apache2\htdocs\account2/gl/view/bank_transfer_view.php:60
 #: c:\Apache2\htdocs\account2/gl/view/bank_transfer_view.php:69
 #: c:\Apache2\htdocs\account2/gl/view/gl_deposit_view.php:57
 #: c:\Apache2\htdocs\account2/gl/view/gl_payment_view.php:55
-#: c:\Apache2\htdocs\account2/inventory/prices.php:120
-#: c:\Apache2\htdocs\account2/inventory/purchasing_data.php:149
+#: c:\Apache2\htdocs\account2/inventory/prices.php:127
+#: c:\Apache2\htdocs\account2/inventory/purchasing_data.php:136
 #: c:\Apache2\htdocs\account2/purchasing/allocations/supplier_allocation_main.php:61
-#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search.php:111
-#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search.php:114
-#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search_completed.php:104
-#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search_completed.php:107
-#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_allocation_inquiry.php:127
+#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search.php:136
+#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search.php:139
+#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search_completed.php:128
+#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search_completed.php:131
+#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_allocation_inquiry.php:131
 #: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_inquiry.php:66
-#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_inquiry.php:161
+#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_inquiry.php:168
 #: c:\Apache2\htdocs\account2/purchasing/view/view_supp_credit.php:38
 #: c:\Apache2\htdocs\account2/purchasing/view/view_supp_invoice.php:45
 #: c:\Apache2\htdocs\account2/reporting/rep101.php:79
-#: c:\Apache2\htdocs\account2/reporting/rep102.php:151
-#: c:\Apache2\htdocs\account2/reporting/rep102.php:155
+#: c:\Apache2\htdocs\account2/reporting/rep102.php:110
+#: c:\Apache2\htdocs\account2/reporting/rep102.php:114
+#: c:\Apache2\htdocs\account2/reporting/rep104.php:87
 #: c:\Apache2\htdocs\account2/reporting/rep201.php:78
-#: c:\Apache2\htdocs\account2/reporting/rep202.php:159
+#: c:\Apache2\htdocs\account2/reporting/rep202.php:111
 #: c:\Apache2\htdocs\account2/reporting/rep203.php:83
-#: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:223
-#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:294
-#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:280
+#: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:236
+#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:307
+#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:305
 #: c:\Apache2\htdocs\account2/sales/allocations/customer_allocation_main.php:63
-#: c:\Apache2\htdocs\account2/sales/inquiry/customer_allocation_inquiry.php:132
-#: c:\Apache2\htdocs\account2/sales/inquiry/customer_inquiry.php:69
-#: c:\Apache2\htdocs\account2/sales/inquiry/customer_inquiry.php:173
-#: c:\Apache2\htdocs\account2/sales/inquiry/sales_deliveries_view.php:198
-#: c:\Apache2\htdocs\account2/sales/inquiry/sales_orders_view.php:175
+#: c:\Apache2\htdocs\account2/sales/inquiry/customer_allocation_inquiry.php:135
+#: c:\Apache2\htdocs\account2/sales/inquiry/customer_inquiry.php:70
+#: c:\Apache2\htdocs\account2/sales/inquiry/customer_inquiry.php:184
+#: c:\Apache2\htdocs\account2/sales/inquiry/sales_deliveries_view.php:217
+#: c:\Apache2\htdocs\account2/sales/inquiry/sales_orders_view.php:193
 #: c:\Apache2\htdocs\account2/sales/view/view_credit.php:61
 #: c:\Apache2\htdocs\account2/sales/view/view_dispatch.php:77
 #: c:\Apache2\htdocs\account2/sales/view/view_invoice.php:77
 msgid "Currency"
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/manage/bank_accounts.php:89
-#: c:\Apache2\htdocs\account2/gl/manage/bank_accounts.php:89
+#: c:\Apache2\htdocs\account2/gl/manage/bank_accounts.php:92
 msgid "Bank Address"
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/manage/bank_accounts.php:114
-#: c:\Apache2\htdocs\account2/gl/manage/bank_accounts.php:114
-msgid "New Bank Account"
-msgstr ""
-
-# c:\Apache2\htdocs\account/gl/manage/bank_accounts.php:138
-# c:\Apache2\htdocs\account/gl/manage/bank_accounts.php:142
 #: c:\Apache2\htdocs\account2/gl/manage/bank_accounts.php:138
-#: c:\Apache2\htdocs\account2/gl/manage/bank_accounts.php:142
+#: c:\Apache2\htdocs\account2/gl/manage/bank_accounts.php:143
 msgid "Bank Account GL Code:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/manage/bank_accounts.php:145
-#: c:\Apache2\htdocs\account2/gl/manage/bank_accounts.php:145
+#: c:\Apache2\htdocs\account2/gl/manage/bank_accounts.php:147
 msgid "Account Type:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/manage/bank_accounts.php:147
-#: c:\Apache2\htdocs\account2/gl/manage/bank_accounts.php:147
+#: c:\Apache2\htdocs\account2/gl/manage/bank_accounts.php:149
 msgid "Bank Name:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/manage/bank_accounts.php:148
-#: c:\Apache2\htdocs\account2/gl/manage/bank_accounts.php:148
+#: c:\Apache2\htdocs\account2/gl/manage/bank_accounts.php:150
 msgid "Bank Account Name:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/manage/bank_accounts.php:149
-#: c:\Apache2\htdocs\account2/gl/manage/bank_accounts.php:149
+#: c:\Apache2\htdocs\account2/gl/manage/bank_accounts.php:151
 msgid "Bank Account Number:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/manage/bank_accounts.php:153
-# c:\Apache2\htdocs\account/gl/manage/bank_accounts.php:157
-#: c:\Apache2\htdocs\account2/gl/manage/bank_accounts.php:153
-#: c:\Apache2\htdocs\account2/gl/manage/bank_accounts.php:157
+#: c:\Apache2\htdocs\account2/gl/manage/bank_accounts.php:155
+#: c:\Apache2\htdocs\account2/gl/manage/bank_accounts.php:159
 msgid "Bank Account Currency:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/manage/bank_accounts.php:160
-#: c:\Apache2\htdocs\account2/gl/manage/bank_accounts.php:160
+#: c:\Apache2\htdocs\account2/gl/manage/bank_accounts.php:162
 msgid "Bank Address:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/manage/bank_trans_types.php:8
 #: c:\Apache2\htdocs\account2/gl/manage/bank_trans_types.php:8
 msgid "Bank Transaction Types"
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/manage/bank_trans_types.php:35
-#: c:\Apache2\htdocs\account2/gl/manage/bank_trans_types.php:35
+#: c:\Apache2\htdocs\account2/gl/manage/bank_trans_types.php:26
 msgid "The bank transaction type name cannot be empty."
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/manage/bank_trans_types.php:68
-#: c:\Apache2\htdocs\account2/gl/manage/bank_trans_types.php:69
+#: c:\Apache2\htdocs\account2/gl/manage/bank_trans_types.php:36
+msgid "Selected bank account settings has been updated"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/gl/manage/bank_trans_types.php:58
 msgid "Cannot delete this bank transaction type because bank transactions have been created referring to it."
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/manage/bank_trans_types.php:113
-#: c:\Apache2\htdocs\account2/gl/manage/bank_trans_types.php:114
-msgid "New Bank Transaction Type"
-msgstr ""
-
-# c:\Apache2\htdocs\account/gl/manage/bank_trans_types.php:130
-# c:\Apache2\htdocs\account/inventory/manage/items.php:295
-# c:\Apache2\htdocs\account/inventory/manage/movement_types.php:126
-# c:\Apache2\htdocs\account/manufacturing/manage/work_centres.php:136
-# c:\Apache2\htdocs\account/sales/manage/credit_status.php:136
-# c:\Apache2\htdocs\account/taxes/item_tax_types.php:163
-# c:\Apache2\htdocs\account/taxes/tax_groups.php:202
-# c:\Apache2\htdocs\account/taxes/tax_types.php:149
-#: c:\Apache2\htdocs\account2/gl/manage/bank_trans_types.php:131
-#: c:\Apache2\htdocs\account2/inventory/manage/items.php:298
-#: c:\Apache2\htdocs\account2/inventory/manage/movement_types.php:127
-#: c:\Apache2\htdocs\account2/manufacturing/manage/work_centres.php:137
-#: c:\Apache2\htdocs\account2/sales/manage/credit_status.php:136
-#: c:\Apache2\htdocs\account2/taxes/item_tax_types.php:165
-#: c:\Apache2\htdocs\account2/taxes/tax_groups.php:198
-#: c:\Apache2\htdocs\account2/taxes/tax_types.php:141
+#: c:\Apache2\htdocs\account2/gl/manage/bank_trans_types.php:124
+#: c:\Apache2\htdocs\account2/inventory/manage/items.php:314
+#: c:\Apache2\htdocs\account2/inventory/manage/movement_types.php:124
+#: c:\Apache2\htdocs\account2/manufacturing/manage/work_centres.php:134
+#: c:\Apache2\htdocs\account2/sales/manage/credit_status.php:138
+#: c:\Apache2\htdocs\account2/taxes/item_tax_types.php:162
+#: c:\Apache2\htdocs\account2/taxes/tax_groups.php:194
+#: c:\Apache2\htdocs\account2/taxes/tax_types.php:143
 msgid "Description:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/manage/currencies.php:30
-#: c:\Apache2\htdocs\account2/gl/manage/currencies.php:30
+#: c:\Apache2\htdocs\account2/gl/manage/currencies.php:20
 msgid "The currency abbreviation must be entered."
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/manage/currencies.php:35
-#: c:\Apache2\htdocs\account2/gl/manage/currencies.php:36
+#: c:\Apache2\htdocs\account2/gl/manage/currencies.php:26
 msgid "The currency name must be entered."
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/manage/currencies.php:40
-#: c:\Apache2\htdocs\account2/gl/manage/currencies.php:42
+#: c:\Apache2\htdocs\account2/gl/manage/currencies.php:32
 msgid "The currency symbol must be entered."
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/manage/currencies.php:45
-#: c:\Apache2\htdocs\account2/gl/manage/currencies.php:48
+#: c:\Apache2\htdocs\account2/gl/manage/currencies.php:38
 msgid "The hundredths name must be entered."
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/manage/currencies.php:91
-#: c:\Apache2\htdocs\account2/gl/manage/currencies.php:95
+#: c:\Apache2\htdocs\account2/gl/manage/currencies.php:60
+msgid "Selected currency settings has been updated"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/gl/manage/currencies.php:67
+msgid "New currency has been added"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/gl/manage/currencies.php:86
 msgid "Cannot delete this currency, because customer accounts have been created referring to this currency."
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/manage/currencies.php:100
-#: c:\Apache2\htdocs\account2/gl/manage/currencies.php:104
+#: c:\Apache2\htdocs\account2/gl/manage/currencies.php:95
 msgid "Cannot delete this currency, because supplier accounts have been created referring to this currency."
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/manage/currencies.php:109
-#: c:\Apache2\htdocs\account2/gl/manage/currencies.php:113
+#: c:\Apache2\htdocs\account2/gl/manage/currencies.php:104
 msgid "Cannot delete this currency, because the company preferences uses this currency."
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/manage/currencies.php:119
-#: c:\Apache2\htdocs\account2/gl/manage/currencies.php:123
+#: c:\Apache2\htdocs\account2/gl/manage/currencies.php:114
 msgid "Cannot delete this currency, because thre are bank accounts that use this currency."
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/manage/currencies.php:151
-#: c:\Apache2\htdocs\account2/gl/manage/currencies.php:155
+#: c:\Apache2\htdocs\account2/gl/manage/currencies.php:129
+#: c:\Apache2\htdocs\account2/gl/manage/gl_account_types.php:96
+msgid "Selected currency has been deleted"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/gl/manage/currencies.php:145
 msgid "Abbreviation"
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/manage/currencies.php:151
-#: c:\Apache2\htdocs\account2/gl/manage/currencies.php:155
+#: c:\Apache2\htdocs\account2/gl/manage/currencies.php:145
 msgid "Symbol"
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/manage/currencies.php:151
-#: c:\Apache2\htdocs\account2/gl/manage/currencies.php:155
+#: c:\Apache2\htdocs\account2/gl/manage/currencies.php:145
 msgid "Currency Name"
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/manage/currencies.php:152
-#: c:\Apache2\htdocs\account2/gl/manage/currencies.php:156
+#: c:\Apache2\htdocs\account2/gl/manage/currencies.php:146
 msgid "Hundredths name"
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/manage/currencies.php:152
-#: c:\Apache2\htdocs\account2/gl/manage/currencies.php:156
+#: c:\Apache2\htdocs\account2/gl/manage/currencies.php:146
 msgid "Country"
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/manage/currencies.php:182
-#: c:\Apache2\htdocs\account2/gl/manage/currencies.php:186
+#: c:\Apache2\htdocs\account2/gl/manage/currencies.php:177
 msgid "The marked currency is the home currency which cannot be deleted."
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/manage/currencies.php:207
-# c:\Apache2\htdocs\account/gl/manage/currencies.php:211
-#: c:\Apache2\htdocs\account2/gl/manage/currencies.php:211
-#: c:\Apache2\htdocs\account2/gl/manage/currencies.php:215
+#: c:\Apache2\htdocs\account2/gl/manage/currencies.php:203
+#: c:\Apache2\htdocs\account2/gl/manage/currencies.php:207
 msgid "Currency Abbreviation:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/manage/currencies.php:214
-#: c:\Apache2\htdocs\account2/gl/manage/currencies.php:218
+#: c:\Apache2\htdocs\account2/gl/manage/currencies.php:210
 msgid "Currency Symbol:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/manage/currencies.php:215
-#: c:\Apache2\htdocs\account2/gl/manage/currencies.php:219
+#: c:\Apache2\htdocs\account2/gl/manage/currencies.php:211
 msgid "Currency Name:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/manage/currencies.php:216
-#: c:\Apache2\htdocs\account2/gl/manage/currencies.php:220
+#: c:\Apache2\htdocs\account2/gl/manage/currencies.php:212
 msgid "Hundredths Name:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/manage/currencies.php:217
-#: c:\Apache2\htdocs\account2/gl/manage/currencies.php:221
+#: c:\Apache2\htdocs\account2/gl/manage/currencies.php:213
 msgid "Country:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/manage/currencies.php:249
-#: c:\Apache2\htdocs\account2/gl/manage/currencies.php:253
-msgid "Enter a New Currency"
-msgstr ""
-
-#: c:\Apache2\htdocs\account2/gl/manage/exchange_rates.php:39
+#: c:\Apache2\htdocs\account2/gl/manage/exchange_rates.php:29
 msgid "The exchange rate must be numeric and greater than zero."
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/manage/exchange_rates.php:41
-#: c:\Apache2\htdocs\account2/gl/manage/exchange_rates.php:45
+#: c:\Apache2\htdocs\account2/gl/manage/exchange_rates.php:35
 msgid "The exchange rate cannot be zero or a negative number."
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/manage/exchange_rates.php:96
-#: c:\Apache2\htdocs\account2/gl/manage/exchange_rates.php:101
+#: c:\Apache2\htdocs\account2/gl/manage/exchange_rates.php:90
 msgid "Date to Use From"
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/manage/exchange_rates.php:96
-#: c:\Apache2\htdocs\account2/gl/manage/exchange_rates.php:101
+#: c:\Apache2\htdocs\account2/gl/manage/exchange_rates.php:90
 msgid "Exchange Rate"
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/manage/exchange_rates.php:144
-# c:\Apache2\htdocs\account/gl/manage/exchange_rates.php:148
-#: c:\Apache2\htdocs\account2/gl/manage/exchange_rates.php:148
-#: c:\Apache2\htdocs\account2/gl/manage/exchange_rates.php:152
+#: c:\Apache2\htdocs\account2/gl/manage/exchange_rates.php:132
+#: c:\Apache2\htdocs\account2/gl/manage/exchange_rates.php:138
 msgid "Date to Use From:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/manage/exchange_rates.php:150
-# c:\Apache2\htdocs\account/includes/ui/ui_view.inc:284
-#: c:\Apache2\htdocs\account2/gl/manage/exchange_rates.php:154
-#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:296
+#: c:\Apache2\htdocs\account2/gl/manage/exchange_rates.php:145
+#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:300
 msgid "Exchange Rate:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/manage/exchange_rates.php:156
-#: c:\Apache2\htdocs\account2/gl/manage/exchange_rates.php:161
+#: c:\Apache2\htdocs\account2/gl/manage/exchange_rates.php:146
+msgid "Get current ECB rate"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/gl/manage/exchange_rates.php:153
 msgid "Exchange rates are entered against the company currency."
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/manage/exchange_rates.php:195
-#: c:\Apache2\htdocs\account2/gl/manage/exchange_rates.php:200
+#: c:\Apache2\htdocs\account2/gl/manage/exchange_rates.php:184
 msgid "Select a currency :"
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/manage/exchange_rates.php:210
-#: c:\Apache2\htdocs\account2/gl/manage/exchange_rates.php:215
+#: c:\Apache2\htdocs\account2/gl/manage/exchange_rates.php:200
 msgid "The selected currency is the company currency."
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/manage/exchange_rates.php:211
-#: c:\Apache2\htdocs\account2/gl/manage/exchange_rates.php:216
+#: c:\Apache2\htdocs\account2/gl/manage/exchange_rates.php:201
 msgid "The company currency is the base currency so exchange rates cannot be set for it."
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/manage/exchange_rates.php:218
-#: c:\Apache2\htdocs\account2/gl/manage/exchange_rates.php:223
-msgid "Enter a New Exchange Rate"
-msgstr ""
-
-# c:\Apache2\htdocs\account/gl/manage/gl_accounts.php:7
-# c:\Apache2\htdocs\account/reporting/rep701.php:42
-# c:\Apache2\htdocs\account/reporting/reports_main.php:143
 #: c:\Apache2\htdocs\account2/gl/manage/gl_accounts.php:7
 #: c:\Apache2\htdocs\account2/reporting/rep701.php:42
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:153
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:161
 msgid "Chart of Accounts"
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/manage/gl_accounts.php:43
 #: c:\Apache2\htdocs\account2/gl/manage/gl_accounts.php:43
 msgid "The account code must be entered."
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/manage/gl_accounts.php:48
 #: c:\Apache2\htdocs\account2/gl/manage/gl_accounts.php:49
 msgid "The account name cannot be empty."
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/manage/gl_accounts.php:53
 #: c:\Apache2\htdocs\account2/gl/manage/gl_accounts.php:55
 msgid "The account code must be numeric."
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/manage/gl_accounts.php:78
-#: c:\Apache2\htdocs\account2/gl/manage/gl_accounts.php:83
+#: c:\Apache2\htdocs\account2/gl/manage/gl_accounts.php:66
+msgid "Account data has been updated."
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/gl/manage/gl_accounts.php:72
+msgid "New account has been added."
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/gl/manage/gl_accounts.php:90
 msgid "Cannot delete this account because transactions have been created using this account."
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/manage/gl_accounts.php:104
-#: c:\Apache2\htdocs\account2/gl/manage/gl_accounts.php:109
+#: c:\Apache2\htdocs\account2/gl/manage/gl_accounts.php:111
 msgid "Cannot delete this account because it is used as one of the company default GL accounts."
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/manage/gl_accounts.php:114
-#: c:\Apache2\htdocs\account2/gl/manage/gl_accounts.php:119
+#: c:\Apache2\htdocs\account2/gl/manage/gl_accounts.php:121
 msgid "Cannot delete this account because it is used by a bank account."
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/manage/gl_accounts.php:128
-#: c:\Apache2\htdocs\account2/gl/manage/gl_accounts.php:133
+#: c:\Apache2\htdocs\account2/gl/manage/gl_accounts.php:135
 msgid "Cannot delete this account because it is used by one or more Items."
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/manage/gl_accounts.php:138
-#: c:\Apache2\htdocs\account2/gl/manage/gl_accounts.php:143
+#: c:\Apache2\htdocs\account2/gl/manage/gl_accounts.php:145
 msgid "Cannot delete this account because it is used by one or more Taxes."
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/manage/gl_accounts.php:152
-#: c:\Apache2\htdocs\account2/gl/manage/gl_accounts.php:157
+#: c:\Apache2\htdocs\account2/gl/manage/gl_accounts.php:159
 msgid "Cannot delete this account because it is used by one or more Customer Branches."
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/manage/gl_accounts.php:165
-#: c:\Apache2\htdocs\account2/gl/manage/gl_accounts.php:170
+#: c:\Apache2\htdocs\account2/gl/manage/gl_accounts.php:172
 msgid "Cannot delete this account because it is used by one or more suppliers."
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/manage/gl_accounts.php:191
-#: c:\Apache2\htdocs\account2/gl/manage/gl_accounts.php:196
-msgid "Select an Account:"
+#: c:\Apache2\htdocs\account2/gl/manage/gl_accounts.php:188
+msgid "Selected account has been deleted"
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/manage/gl_accounts.php:194
-#: c:\Apache2\htdocs\account2/gl/manage/gl_accounts.php:199
-msgid "Edit Account"
+#: c:\Apache2\htdocs\account2/gl/manage/gl_accounts.php:200
+msgid "Select an Account:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/manage/gl_accounts.php:198
-#: c:\Apache2\htdocs\account2/gl/manage/gl_accounts.php:203
-msgid "New Account"
+#: c:\Apache2\htdocs\account2/gl/manage/gl_accounts.php:202
+msgid "New account"
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/manage/gl_accounts.php:224
-#: c:\Apache2\htdocs\account2/gl/manage/gl_accounts.php:229
+#: c:\Apache2\htdocs\account2/gl/manage/gl_accounts.php:232
 msgid "Account Code 2:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/manage/gl_accounts.php:226
-#: c:\Apache2\htdocs\account2/gl/manage/gl_accounts.php:231
+#: c:\Apache2\htdocs\account2/gl/manage/gl_accounts.php:234
 msgid "Account Name:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/manage/gl_accounts.php:228
-#: c:\Apache2\htdocs\account2/gl/manage/gl_accounts.php:233
+#: c:\Apache2\htdocs\account2/gl/manage/gl_accounts.php:236
 msgid "Account Group:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/manage/gl_accounts.php:230
-#: c:\Apache2\htdocs\account2/gl/manage/gl_accounts.php:235
+#: c:\Apache2\htdocs\account2/gl/manage/gl_accounts.php:238
 msgid "Tax Type:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/manage/gl_accounts.php:230
-#: c:\Apache2\htdocs\account2/gl/manage/gl_accounts.php:235
+#: c:\Apache2\htdocs\account2/gl/manage/gl_accounts.php:238
 msgid "No Tax"
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/manage/gl_accounts.php:236
-#: c:\Apache2\htdocs\account2/gl/manage/gl_accounts.php:241
+#: c:\Apache2\htdocs\account2/gl/manage/gl_accounts.php:244
 msgid "Add Account"
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/manage/gl_accounts.php:240
-#: c:\Apache2\htdocs\account2/gl/manage/gl_accounts.php:245
+#: c:\Apache2\htdocs\account2/gl/manage/gl_accounts.php:248
 msgid "Update Account"
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/manage/gl_accounts.php:241
-#: c:\Apache2\htdocs\account2/gl/manage/gl_accounts.php:246
+#: c:\Apache2\htdocs\account2/gl/manage/gl_accounts.php:249
 msgid "Delete account"
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/manage/gl_account_classes.php:30
-#: c:\Apache2\htdocs\account2/gl/manage/gl_account_classes.php:30
+#: c:\Apache2\htdocs\account2/gl/manage/gl_account_classes.php:21
 msgid "The account class name cannot be empty."
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/manage/gl_account_classes.php:72
-#: c:\Apache2\htdocs\account2/gl/manage/gl_account_classes.php:73
+#: c:\Apache2\htdocs\account2/gl/manage/gl_account_classes.php:40
+msgid "Selected account class settings has been updated"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/gl/manage/gl_account_classes.php:45
+msgid "New account class has been added"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/gl/manage/gl_account_classes.php:63
 msgid "Cannot delete this account class because GL account types have been created referring to it."
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/manage/gl_account_classes.php:97
-#: c:\Apache2\htdocs\account2/gl/manage/gl_account_classes.php:98
+#: c:\Apache2\htdocs\account2/gl/manage/gl_account_classes.php:79
+msgid "Selected account class has been deleted"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/gl/manage/gl_account_classes.php:95
 msgid "Class ID"
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/manage/gl_account_classes.php:97
-#: c:\Apache2\htdocs\account2/gl/manage/gl_account_classes.php:98
+#: c:\Apache2\htdocs\account2/gl/manage/gl_account_classes.php:95
 msgid "Class Name"
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/manage/gl_account_classes.php:97
-# c:\Apache2\htdocs\account/reporting/rep706.php:82
-# c:\Apache2\htdocs\account/reporting/reports_main.php:168
-# c:\Apache2\htdocs\account/reporting/reports_main.php:202
-# c:\Apache2\htdocs\account/reporting/reports_main.php:231
-#: c:\Apache2\htdocs\account2/gl/manage/gl_account_classes.php:98
+#: c:\Apache2\htdocs\account2/gl/manage/gl_account_classes.php:95
 #: c:\Apache2\htdocs\account2/reporting/rep706.php:90
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:178
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:214
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:245
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:186
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:222
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:253
 msgid "Balance Sheet"
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/manage/gl_account_classes.php:126
-#: c:\Apache2\htdocs\account2/gl/manage/gl_account_classes.php:127
-msgid "New Account Class"
-msgstr ""
-
-# c:\Apache2\htdocs\account/gl/manage/gl_account_classes.php:142
-# c:\Apache2\htdocs\account/gl/manage/gl_account_classes.php:148
-#: c:\Apache2\htdocs\account2/gl/manage/gl_account_classes.php:143
-#: c:\Apache2\htdocs\account2/gl/manage/gl_account_classes.php:149
+#: c:\Apache2\htdocs\account2/gl/manage/gl_account_classes.php:141
+#: c:\Apache2\htdocs\account2/gl/manage/gl_account_classes.php:147
 msgid "Class ID:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/manage/gl_account_classes.php:151
-#: c:\Apache2\htdocs\account2/gl/manage/gl_account_classes.php:152
+#: c:\Apache2\htdocs\account2/gl/manage/gl_account_classes.php:150
 msgid "Class Name:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/manage/gl_account_classes.php:153
-#: c:\Apache2\htdocs\account2/gl/manage/gl_account_classes.php:154
+#: c:\Apache2\htdocs\account2/gl/manage/gl_account_classes.php:152
 msgid "Balance Sheet:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/manage/gl_account_types.php:31
-#: c:\Apache2\htdocs\account2/gl/manage/gl_account_types.php:31
+#: c:\Apache2\htdocs\account2/gl/manage/gl_account_types.php:22
 msgid "The account group name cannot be empty."
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/manage/gl_account_types.php:37
-#: c:\Apache2\htdocs\account2/gl/manage/gl_account_types.php:38
+#: c:\Apache2\htdocs\account2/gl/manage/gl_account_types.php:29
 msgid "You cannot set an account group to be a subgroup of itself."
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/manage/gl_account_types.php:79
-#: c:\Apache2\htdocs\account2/gl/manage/gl_account_types.php:80
+#: c:\Apache2\htdocs\account2/gl/manage/gl_account_types.php:47
+msgid "Selected account type has been updated"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/gl/manage/gl_account_types.php:52
+msgid "New account type has been added"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/gl/manage/gl_account_types.php:70
 msgid "Cannot delete this account group because GL accounts have been created referring to it."
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/manage/gl_account_types.php:89
-#: c:\Apache2\htdocs\account2/gl/manage/gl_account_types.php:90
+#: c:\Apache2\htdocs\account2/gl/manage/gl_account_types.php:80
 msgid "Cannot delete this account group because GL account groups have been created referring to it."
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/manage/gl_account_types.php:114
-#: c:\Apache2\htdocs\account2/gl/manage/gl_account_types.php:115
+#: c:\Apache2\htdocs\account2/gl/manage/gl_account_types.php:112
 msgid "Subgroup Of"
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/manage/gl_account_types.php:114
-#: c:\Apache2\htdocs\account2/gl/manage/gl_account_types.php:115
+#: c:\Apache2\htdocs\account2/gl/manage/gl_account_types.php:112
 msgid "Class Type"
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/manage/gl_account_types.php:146
-#: c:\Apache2\htdocs\account2/gl/manage/gl_account_types.php:147
-msgid "New Account Group"
-msgstr ""
-
-# c:\Apache2\htdocs\account/gl/manage/gl_account_types.php:167
-#: c:\Apache2\htdocs\account2/gl/manage/gl_account_types.php:168
+#: c:\Apache2\htdocs\account2/gl/manage/gl_account_types.php:162
 msgid "Subgroup Of:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/manage/gl_account_types.php:169
-#: c:\Apache2\htdocs\account2/gl/manage/gl_account_types.php:170
+#: c:\Apache2\htdocs\account2/gl/manage/gl_account_types.php:164
 msgid "Class Type:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/view/bank_transfer_view.php:8
 #: c:\Apache2\htdocs\account2/gl/view/bank_transfer_view.php:8
 msgid "View Bank Transfer"
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/view/bank_transfer_view.php:58
-# c:\Apache2\htdocs\account/gl/view/gl_payment_view.php:53
-# c:\Apache2\htdocs\account/purchasing/view/view_supp_payment.php:45
 #: c:\Apache2\htdocs\account2/gl/view/bank_transfer_view.php:58
 #: c:\Apache2\htdocs\account2/gl/view/gl_payment_view.php:53
 #: c:\Apache2\htdocs\account2/purchasing/view/view_supp_payment.php:45
 msgid "From Bank Account"
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/view/bank_transfer_view.php:67
-# c:\Apache2\htdocs\account/gl/view/gl_deposit_view.php:55
 #: c:\Apache2\htdocs\account2/gl/view/bank_transfer_view.php:67
 #: c:\Apache2\htdocs\account2/gl/view/gl_deposit_view.php:55
 msgid "To Bank Account"
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/view/bank_transfer_view.php:75
 #: c:\Apache2\htdocs\account2/gl/view/bank_transfer_view.php:75
 msgid "Transfer Type"
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/view/bank_transfer_view.php:82
-# c:\Apache2\htdocs\account/inventory/view/view_transfer.php:68
 #: c:\Apache2\htdocs\account2/gl/view/bank_transfer_view.php:82
 #: c:\Apache2\htdocs\account2/inventory/view/view_transfer.php:68
 msgid "This transfer has been voided."
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/view/gl_deposit_view.php:8
 #: c:\Apache2\htdocs\account2/gl/view/gl_deposit_view.php:8
 msgid "View Bank Deposit"
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/view/gl_deposit_view.php:39
 #: c:\Apache2\htdocs\account2/gl/view/gl_deposit_view.php:39
 msgid "GL Deposit"
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/view/gl_deposit_view.php:62
-# c:\Apache2\htdocs\account/reporting/reports_main.php:50
-# c:\Apache2\htdocs\account/reporting/reports_main.php:63
-# c:\Apache2\htdocs\account/reporting/reports_main.php:95
 #: c:\Apache2\htdocs\account2/gl/view/gl_deposit_view.php:62
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:56
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:64
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:75
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:105
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:57
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:65
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:76
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:106
 msgid "From"
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/view/gl_deposit_view.php:63
 #: c:\Apache2\htdocs\account2/gl/view/gl_deposit_view.php:63
 msgid "Deposit Type"
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/view/gl_deposit_view.php:72
 #: c:\Apache2\htdocs\account2/gl/view/gl_deposit_view.php:72
 msgid "This deposit has been voided."
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/view/gl_deposit_view.php:78
 #: c:\Apache2\htdocs\account2/gl/view/gl_deposit_view.php:78
 msgid "There are no items for this deposit."
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/view/gl_deposit_view.php:83
 #: c:\Apache2\htdocs\account2/gl/view/gl_deposit_view.php:83
 msgid "Items for this Deposit"
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/view/gl_deposit_view.php:85
-# c:\Apache2\htdocs\account/gl/view/gl_payment_view.php:83
 #: c:\Apache2\htdocs\account2/gl/view/gl_deposit_view.php:85
 #: c:\Apache2\htdocs\account2/gl/view/gl_payment_view.php:83
 msgid "Item Amounts are Shown in :"
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/view/gl_deposit_view.php:88
-# c:\Apache2\htdocs\account/gl/view/gl_payment_view.php:87
-# c:\Apache2\htdocs\account/gl/view/gl_trans_view.php:56
-# c:\Apache2\htdocs\account/gl/view/gl_trans_view.php:59
-# c:\Apache2\htdocs\account/gl/view/gl_trans_view.php:62
-# c:\Apache2\htdocs\account/reporting/rep701.php:36
-# c:\Apache2\htdocs\account/gl/includes/ui/gl_deposit_ui.inc:110
-# c:\Apache2\htdocs\account/gl/includes/ui/gl_deposit_ui.inc:113
-# c:\Apache2\htdocs\account/gl/includes/ui/gl_deposit_ui.inc:116
-# c:\Apache2\htdocs\account/gl/includes/ui/gl_journal_ui.inc:47
-# c:\Apache2\htdocs\account/gl/includes/ui/gl_journal_ui.inc:50
-# c:\Apache2\htdocs\account/gl/includes/ui/gl_journal_ui.inc:53
-# c:\Apache2\htdocs\account/gl/includes/ui/gl_payment_ui.inc:109
-# c:\Apache2\htdocs\account/gl/includes/ui/gl_payment_ui.inc:112
-# c:\Apache2\htdocs\account/gl/includes/ui/gl_payment_ui.inc:115
 #: c:\Apache2\htdocs\account2/gl/view/gl_deposit_view.php:88
 #: c:\Apache2\htdocs\account2/gl/view/gl_payment_view.php:87
 #: c:\Apache2\htdocs\account2/gl/view/gl_trans_view.php:56
 #: c:\Apache2\htdocs\account2/gl/view/gl_trans_view.php:59
 #: c:\Apache2\htdocs\account2/gl/view/gl_trans_view.php:62
 #: c:\Apache2\htdocs\account2/reporting/rep701.php:36
-#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_deposit_ui.inc:110
-#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_deposit_ui.inc:113
-#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_deposit_ui.inc:116
-#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_journal_ui.inc:47
-#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_journal_ui.inc:50
-#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_journal_ui.inc:53
-#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_payment_ui.inc:109
-#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_payment_ui.inc:112
-#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_payment_ui.inc:115
+#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_bank_ui.inc:114
+#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_bank_ui.inc:117
+#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_bank_ui.inc:120
+#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_journal_ui.inc:48
+#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_journal_ui.inc:51
+#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_journal_ui.inc:54
 msgid "Account Code"
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/view/gl_deposit_view.php:88
-# c:\Apache2\htdocs\account/gl/view/gl_payment_view.php:87
-# c:\Apache2\htdocs\account/gl/includes/ui/gl_deposit_ui.inc:110
-# c:\Apache2\htdocs\account/gl/includes/ui/gl_deposit_ui.inc:113
-# c:\Apache2\htdocs\account/gl/includes/ui/gl_deposit_ui.inc:116
-# c:\Apache2\htdocs\account/gl/includes/ui/gl_journal_ui.inc:47
-# c:\Apache2\htdocs\account/gl/includes/ui/gl_journal_ui.inc:50
-# c:\Apache2\htdocs\account/gl/includes/ui/gl_journal_ui.inc:53
-# c:\Apache2\htdocs\account/gl/includes/ui/gl_payment_ui.inc:109
-# c:\Apache2\htdocs\account/gl/includes/ui/gl_payment_ui.inc:112
-# c:\Apache2\htdocs\account/gl/includes/ui/gl_payment_ui.inc:115
 #: c:\Apache2\htdocs\account2/gl/view/gl_deposit_view.php:88
 #: c:\Apache2\htdocs\account2/gl/view/gl_payment_view.php:87
-#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_deposit_ui.inc:110
-#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_deposit_ui.inc:113
-#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_deposit_ui.inc:116
-#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_journal_ui.inc:47
-#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_journal_ui.inc:50
-#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_journal_ui.inc:53
-#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_payment_ui.inc:109
-#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_payment_ui.inc:112
-#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_payment_ui.inc:115
+#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_bank_ui.inc:114
+#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_bank_ui.inc:117
+#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_bank_ui.inc:120
+#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_journal_ui.inc:48
+#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_journal_ui.inc:51
+#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_journal_ui.inc:54
 msgid "Account Description"
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/view/gl_payment_view.php:8
 #: c:\Apache2\htdocs\account2/gl/view/gl_payment_view.php:8
 msgid "View Bank Payment"
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/view/gl_payment_view.php:37
 #: c:\Apache2\htdocs\account2/gl/view/gl_payment_view.php:37
 msgid "GL Payment"
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/view/gl_payment_view.php:60
 #: c:\Apache2\htdocs\account2/gl/view/gl_payment_view.php:60
 msgid "Pay To"
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/view/gl_payment_view.php:61
-# c:\Apache2\htdocs\account/purchasing/view/view_supp_payment.php:52
-# c:\Apache2\htdocs\account/sales/view/view_receipt.php:35
 #: c:\Apache2\htdocs\account2/gl/view/gl_payment_view.php:61
 #: c:\Apache2\htdocs\account2/purchasing/view/view_supp_payment.php:52
 #: c:\Apache2\htdocs\account2/sales/view/view_receipt.php:35
 msgid "Payment Type"
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/view/gl_payment_view.php:70
-# c:\Apache2\htdocs\account/purchasing/view/view_supp_payment.php:67
 #: c:\Apache2\htdocs\account2/gl/view/gl_payment_view.php:70
 #: c:\Apache2\htdocs\account2/purchasing/view/view_supp_payment.php:67
 msgid "This payment has been voided."
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/view/gl_payment_view.php:76
 #: c:\Apache2\htdocs\account2/gl/view/gl_payment_view.php:76
 msgid "There are no items for this payment."
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/view/gl_payment_view.php:81
 #: c:\Apache2\htdocs\account2/gl/view/gl_payment_view.php:81
 msgid "Items for this Payment"
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/view/gl_trans_view.php:7
-# c:\Apache2\htdocs\account/gl/view/gl_trans_view.php:26
 #: c:\Apache2\htdocs\account2/gl/view/gl_trans_view.php:7
 #: c:\Apache2\htdocs\account2/gl/view/gl_trans_view.php:26
 msgid "General Ledger Transaction Details"
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/view/gl_trans_view.php:17
 #: c:\Apache2\htdocs\account2/gl/view/gl_trans_view.php:17
 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\account/gl/view/gl_trans_view.php:47
 #: c:\Apache2\htdocs\account2/gl/view/gl_trans_view.php:47
 msgid "No general ledger transactions have been created for"
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/view/gl_trans_view.php:47
 #: c:\Apache2\htdocs\account2/gl/view/gl_trans_view.php:47
 msgid "number"
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/view/gl_trans_view.php:95
 #: c:\Apache2\htdocs\account2/gl/view/gl_trans_view.php:95
 msgid "This transaction has been voided."
 msgstr ""
 
-# c:\Apache2\htdocs\account/inventory/adjustments.php:17
 #: c:\Apache2\htdocs\account2/inventory/adjustments.php:19
 msgid "Item Adjustments Note"
 msgstr ""
 
-# c:\Apache2\htdocs\account/inventory/adjustments.php:21
 #: c:\Apache2\htdocs\account2/inventory/adjustments.php:23
 msgid "There are no inventory items defined in the system which can be adjusted (Purchased or Manufactured)."
 msgstr ""
 
-# c:\Apache2\htdocs\account/inventory/adjustments.php:23
-# c:\Apache2\htdocs\account/inventory/transfers.php:24
 #: c:\Apache2\htdocs\account2/inventory/adjustments.php:25
-#: c:\Apache2\htdocs\account2/inventory/transfers.php:26
+#: c:\Apache2\htdocs\account2/inventory/transfers.php:25
 msgid "There are no inventory movement types defined in the system. Please define at least one inventory adjustment type."
 msgstr ""
 
-# c:\Apache2\htdocs\account/inventory/adjustments.php:32
 #: c:\Apache2\htdocs\account2/inventory/adjustments.php:34
 msgid "Items adjustment has been processed"
 msgstr ""
 
-# c:\Apache2\htdocs\account/inventory/adjustments.php:33
 #: c:\Apache2\htdocs\account2/inventory/adjustments.php:35
 msgid "View this adjustment"
 msgstr ""
 
-# c:\Apache2\htdocs\account/inventory/adjustments.php:35
 #: c:\Apache2\htdocs\account2/inventory/adjustments.php:37
 msgid "View the GL Postings for this Adjustment"
 msgstr ""
 
-# c:\Apache2\htdocs\account/inventory/adjustments.php:37
 #: c:\Apache2\htdocs\account2/inventory/adjustments.php:39
 msgid "Enter Another Adjustment"
 msgstr ""
 
-# c:\Apache2\htdocs\account/inventory/adjustments.php:101
-# c:\Apache2\htdocs\account/inventory/transfers.php:101
-#: c:\Apache2\htdocs\account2/inventory/adjustments.php:105
-#: c:\Apache2\htdocs\account2/inventory/transfers.php:105
+#: c:\Apache2\htdocs\account2/inventory/adjustments.php:77
+#: c:\Apache2\htdocs\account2/inventory/transfers.php:77
+#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:207
+msgid "You must enter at least one non empty item line."
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/inventory/adjustments.php:97
+#: c:\Apache2\htdocs\account2/inventory/transfers.php:95
 msgid "The entered date for the adjustment is invalid."
 msgstr ""
 
-# c:\Apache2\htdocs\account/inventory/adjustments.php:112
-#: c:\Apache2\htdocs\account2/inventory/adjustments.php:118
+#: c:\Apache2\htdocs\account2/inventory/adjustments.php:111
 msgid "The adjustment cannot be processed because an adjustment item would cause a negative inventory balance :"
 msgstr ""
 
-#: c:\Apache2\htdocs\account2/inventory/adjustments.php:145
+#: c:\Apache2\htdocs\account2/inventory/adjustments.php:141
+#: c:\Apache2\htdocs\account2/manufacturing/work_order_issue.php:125
 msgid "The quantity entered is negative or invalid."
 msgstr ""
 
-# c:\Apache2\htdocs\account/inventory/adjustments.php:151
-# c:\Apache2\htdocs\account/manufacturing/work_order_issue.php:122
-#: c:\Apache2\htdocs\account2/inventory/adjustments.php:152
-#: c:\Apache2\htdocs\account2/manufacturing/work_order_issue.php:130
+#: c:\Apache2\htdocs\account2/inventory/adjustments.php:148
+#: c:\Apache2\htdocs\account2/manufacturing/work_order_issue.php:132
 msgid "The entered standard cost is negative or invalid."
 msgstr ""
 
-# c:\Apache2\htdocs\account/inventory/adjustments.php:218
-#: c:\Apache2\htdocs\account2/inventory/adjustments.php:222
+#: c:\Apache2\htdocs\account2/inventory/adjustments.php:218
 msgid "Adjustment Items"
 msgstr ""
 
-# c:\Apache2\htdocs\account/inventory/adjustments.php:229
-#: c:\Apache2\htdocs\account2/inventory/adjustments.php:233
+#: c:\Apache2\htdocs\account2/inventory/adjustments.php:225
 msgid "Process Adjustment"
 msgstr ""
 
-# c:\Apache2\htdocs\account/inventory/cost_update.php:17
 #: c:\Apache2\htdocs\account2/inventory/cost_update.php:17
 msgid "Inventory Item Cost Update"
 msgstr ""
 
-# c:\Apache2\htdocs\account/inventory/cost_update.php:21
 #: c:\Apache2\htdocs\account2/inventory/cost_update.php:21
 msgid "There are no costable inventory items defined in the system (Purchased or manufactured items)."
 msgstr ""
 
-# c:\Apache2\htdocs\account/inventory/cost_update.php:41
-#: c:\Apache2\htdocs\account2/inventory/cost_update.php:43
+#: c:\Apache2\htdocs\account2/inventory/cost_update.php:42
 msgid "The entered cost is not numeric."
 msgstr ""
 
-# c:\Apache2\htdocs\account/inventory/cost_update.php:46
-#: c:\Apache2\htdocs\account2/inventory/cost_update.php:49
+#: c:\Apache2\htdocs\account2/inventory/cost_update.php:48
 msgid "The new cost is the same as the old cost. Cost was not updated."
 msgstr ""
 
-# c:\Apache2\htdocs\account/inventory/cost_update.php:55
-#: c:\Apache2\htdocs\account2/inventory/cost_update.php:59
+#: c:\Apache2\htdocs\account2/inventory/cost_update.php:58
 msgid "Cost has been updated."
 msgstr ""
 
-# c:\Apache2\htdocs\account/inventory/cost_update.php:59
-#: c:\Apache2\htdocs\account2/inventory/cost_update.php:63
+#: c:\Apache2\htdocs\account2/inventory/cost_update.php:62
 msgid "View the GL Journal Entries for this Cost Update"
 msgstr ""
 
-# c:\Apache2\htdocs\account/inventory/cost_update.php:71
-# c:\Apache2\htdocs\account/inventory/prices.php:45
-# c:\Apache2\htdocs\account/inventory/purchasing_data.php:113
-# c:\Apache2\htdocs\account/inventory/reorder_level.php:31
-# c:\Apache2\htdocs\account/inventory/inquiry/stock_movements.php:30
-# c:\Apache2\htdocs\account/inventory/inquiry/stock_status.php:30
-# c:\Apache2\htdocs\account/manufacturing/work_order_entry.php:345
-# c:\Apache2\htdocs\account/manufacturing/work_order_entry.php:350
-# c:\Apache2\htdocs\account/manufacturing/inquiry/bom_cost_inquiry.php:22
-# c:\Apache2\htdocs\account/purchasing/inquiry/po_search.php:32
-# c:\Apache2\htdocs\account/sales/inquiry/sales_orders_view.php:47
-#: c:\Apache2\htdocs\account2/inventory/cost_update.php:75
-#: c:\Apache2\htdocs\account2/inventory/prices.php:45
-#: c:\Apache2\htdocs\account2/inventory/purchasing_data.php:117
-#: c:\Apache2\htdocs\account2/inventory/reorder_level.php:31
-#: c:\Apache2\htdocs\account2/inventory/inquiry/stock_movements.php:33
-#: c:\Apache2\htdocs\account2/inventory/inquiry/stock_status.php:30
-#: c:\Apache2\htdocs\account2/manufacturing/work_order_entry.php:351
-#: c:\Apache2\htdocs\account2/manufacturing/work_order_entry.php:356
+#: c:\Apache2\htdocs\account2/inventory/cost_update.php:76
+#: c:\Apache2\htdocs\account2/inventory/prices.php:47
+#: c:\Apache2\htdocs\account2/inventory/purchasing_data.php:104
+#: c:\Apache2\htdocs\account2/inventory/reorder_level.php:34
+#: c:\Apache2\htdocs\account2/inventory/inquiry/stock_movements.php:39
+#: c:\Apache2\htdocs\account2/inventory/inquiry/stock_status.php:32
+#: c:\Apache2\htdocs\account2/manufacturing/work_order_entry.php:358
+#: c:\Apache2\htdocs\account2/manufacturing/work_order_entry.php:363
 #: c:\Apache2\htdocs\account2/manufacturing/inquiry/bom_cost_inquiry.php:22
-#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search.php:35
-#: c:\Apache2\htdocs\account2/sales/inquiry/sales_deliveries_view.php:91
-#: c:\Apache2\htdocs\account2/sales/inquiry/sales_orders_view.php:79
+#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search.php:59
+#: c:\Apache2\htdocs\account2/sales/inquiry/sales_deliveries_view.php:113
+#: c:\Apache2\htdocs\account2/sales/inquiry/sales_orders_view.php:89
 msgid "Item:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/inventory/cost_update.php:92
-#: c:\Apache2\htdocs\account2/inventory/cost_update.php:96
-msgid "Last Cost"
-msgstr ""
-
-# c:\Apache2\htdocs\account/inventory/cost_update.php:95
-#: c:\Apache2\htdocs\account2/inventory/cost_update.php:99
+#: c:\Apache2\htdocs\account2/inventory/cost_update.php:102
 msgid "Standard Material Cost Per Unit"
 msgstr ""
 
-# c:\Apache2\htdocs\account/inventory/cost_update.php:100
-#: c:\Apache2\htdocs\account2/inventory/cost_update.php:104
+#: c:\Apache2\htdocs\account2/inventory/cost_update.php:107
 msgid "Standard Labour Cost Per Unit"
 msgstr ""
 
-# c:\Apache2\htdocs\account/inventory/cost_update.php:102
-#: c:\Apache2\htdocs\account2/inventory/cost_update.php:106
+#: c:\Apache2\htdocs\account2/inventory/cost_update.php:109
 msgid "Standard Overhead Cost Per Unit"
 msgstr ""
 
-# c:\Apache2\htdocs\account/inventory/prices.php:7
 #: c:\Apache2\htdocs\account2/inventory/prices.php:7
 msgid "Inventory Item Sales prices"
 msgstr ""
 
-# c:\Apache2\htdocs\account/inventory/prices.php:16
-# c:\Apache2\htdocs\account/inventory/inquiry/stock_status.php:23
-# c:\Apache2\htdocs\account/manufacturing/inquiry/where_used_inquiry.php:13
-# c:\Apache2\htdocs\account/sales/credit_note_entry.php:28
-#: c:\Apache2\htdocs\account2/inventory/prices.php:16
-#: c:\Apache2\htdocs\account2/inventory/inquiry/stock_status.php:23
+#: c:\Apache2\htdocs\account2/inventory/prices.php:18
+#: c:\Apache2\htdocs\account2/inventory/inquiry/stock_status.php:25
 #: c:\Apache2\htdocs\account2/manufacturing/inquiry/where_used_inquiry.php:12
-#: c:\Apache2\htdocs\account2/sales/credit_note_entry.php:37
+#: c:\Apache2\htdocs\account2/sales/credit_note_entry.php:38
 msgid "There are no items defined in the system."
 msgstr ""
 
-# c:\Apache2\htdocs\account/inventory/prices.php:18
-#: c:\Apache2\htdocs\account2/inventory/prices.php:18
+#: c:\Apache2\htdocs\account2/inventory/prices.php:20
 msgid "There are no sales types in the system. Please set up sales types befor entering pricing."
 msgstr ""
 
-# c:\Apache2\htdocs\account/inventory/prices.php:73
-# c:\Apache2\htdocs\account/purchasing/po_entry_items.php:166
-#: c:\Apache2\htdocs\account2/inventory/prices.php:73
+#: c:\Apache2\htdocs\account2/inventory/prices.php:61
 msgid "The price entered must be numeric."
 msgstr ""
 
-# c:\Apache2\htdocs\account/inventory/prices.php:84
-#: c:\Apache2\htdocs\account2/inventory/prices.php:86
+#: c:\Apache2\htdocs\account2/inventory/prices.php:74
 msgid "This price has been updated."
 msgstr ""
 
-# c:\Apache2\htdocs\account/inventory/prices.php:91
-#: c:\Apache2\htdocs\account2/inventory/prices.php:94
+#: c:\Apache2\htdocs\account2/inventory/prices.php:82
 msgid "The new price has been added."
 msgstr ""
 
-# c:\Apache2\htdocs\account/inventory/prices.php:105
-#: c:\Apache2\htdocs\account2/inventory/prices.php:108
+#: c:\Apache2\htdocs\account2/inventory/prices.php:96
 msgid "The selected price has been deleted."
 msgstr ""
 
-# c:\Apache2\htdocs\account/inventory/prices.php:117
-# c:\Apache2\htdocs\account/reporting/rep104.php:94
-# c:\Apache2\htdocs\account/sales/customer_invoice.php:336
-# c:\Apache2\htdocs\account/sales/view/view_credit.php:64
-# c:\Apache2\htdocs\account/sales/view/view_invoice.php:80
-# c:\Apache2\htdocs\account/sales/includes/ui/sales_credit_ui.inc:68
-#: c:\Apache2\htdocs\account2/inventory/prices.php:120
-#: c:\Apache2\htdocs\account2/reporting/rep104.php:94
-#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:309
-#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:293
+#: c:\Apache2\htdocs\account2/inventory/prices.php:127
+#: c:\Apache2\htdocs\account2/reporting/rep104.php:89
+#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:322
+#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:318
 #: c:\Apache2\htdocs\account2/sales/view/view_credit.php:64
 #: c:\Apache2\htdocs\account2/sales/view/view_dispatch.php:84
 #: c:\Apache2\htdocs\account2/sales/view/view_invoice.php:84
-#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_credit_ui.inc:72
+#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_credit_ui.inc:100
 msgid "Sales Type"
 msgstr ""
 
-# c:\Apache2\htdocs\account/inventory/prices.php:117
-# c:\Apache2\htdocs\account/inventory/purchasing_data.php:144
-# c:\Apache2\htdocs\account/purchasing/po_receive_items.php:50
-# c:\Apache2\htdocs\account/purchasing/view/view_grn.php:28
-# c:\Apache2\htdocs\account/purchasing/view/view_po.php:38
-# c:\Apache2\htdocs\account/reporting/rep104.php:88
-# c:\Apache2\htdocs\account/sales/customer_credit_invoice.php:284
-# c:\Apache2\htdocs\account/sales/customer_invoice.php:379
-# c:\Apache2\htdocs\account/sales/view/view_credit.php:82
-# c:\Apache2\htdocs\account/sales/view/view_invoice.php:100
-# c:\Apache2\htdocs\account/sales/view/view_sales_order.php:141
-# c:\Apache2\htdocs\account/purchasing/includes/ui/invoice_ui.inc:303
-# c:\Apache2\htdocs\account/purchasing/includes/ui/po_ui.inc:168
-# c:\Apache2\htdocs\account/reporting/includes/doctext.inc:37
-# c:\Apache2\htdocs\account/reporting/includes/doctext.inc:40
-# c:\Apache2\htdocs\account/sales/includes/ui/sales_credit_ui.inc:104
-# c:\Apache2\htdocs\account/sales/includes/ui/sales_order_ui.inc:110
-#: c:\Apache2\htdocs\account2/inventory/prices.php:120
-#: c:\Apache2\htdocs\account2/inventory/purchasing_data.php:149
-#: c:\Apache2\htdocs\account2/purchasing/po_receive_items.php:52
+#: c:\Apache2\htdocs\account2/inventory/prices.php:127
+#: c:\Apache2\htdocs\account2/inventory/purchasing_data.php:136
+#: c:\Apache2\htdocs\account2/purchasing/po_receive_items.php:54
 #: c:\Apache2\htdocs\account2/purchasing/view/view_grn.php:28
 #: c:\Apache2\htdocs\account2/purchasing/view/view_po.php:38
-#: c:\Apache2\htdocs\account2/reporting/rep104.php:88
-#: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:267
-#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:354
-#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:326
+#: c:\Apache2\htdocs\account2/reporting/rep104.php:82
+#: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:281
+#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:367
+#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:352
 #: c:\Apache2\htdocs\account2/sales/view/view_credit.php:82
 #: c:\Apache2\htdocs\account2/sales/view/view_dispatch.php:104
 #: c:\Apache2\htdocs\account2/sales/view/view_invoice.php:104
 #: c:\Apache2\htdocs\account2/sales/view/view_sales_order.php:173
-#: c:\Apache2\htdocs\account2/purchasing/includes/ui/invoice_ui.inc:297
-#: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:168
-#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:46
-#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:49
-#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_credit_ui.inc:109
-#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:87
+#: c:\Apache2\htdocs\account2/purchasing/includes/ui/invoice_ui.inc:301
+#: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:166
+#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:47
+#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:50
+#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_credit_ui.inc:153
+#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:84
 msgid "Price"
 msgstr ""
 
-# c:\Apache2\htdocs\account/inventory/prices.php:140
-#: c:\Apache2\htdocs\account2/inventory/prices.php:143
+#: c:\Apache2\htdocs\account2/inventory/prices.php:147
 msgid "There are no prices set up for this part."
 msgstr ""
 
-# c:\Apache2\htdocs\account/inventory/prices.php:156
-#: c:\Apache2\htdocs\account2/inventory/prices.php:159
+#: c:\Apache2\htdocs\account2/inventory/prices.php:166
 msgid "Currency:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/inventory/prices.php:158
-# c:\Apache2\htdocs\account/sales/includes/ui/sales_order_ui.inc:235
-#: c:\Apache2\htdocs\account2/inventory/prices.php:161
+#: c:\Apache2\htdocs\account2/inventory/prices.php:168
 msgid "Sales Type:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/inventory/prices.php:160
-# c:\Apache2\htdocs\account/inventory/purchasing_data.php:210
-#: c:\Apache2\htdocs\account2/inventory/prices.php:163
-#: c:\Apache2\htdocs\account2/inventory/purchasing_data.php:215
+#: c:\Apache2\htdocs\account2/inventory/prices.php:170
+#: c:\Apache2\htdocs\account2/inventory/purchasing_data.php:203
 msgid "Price:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/inventory/prices.php:164
-#: c:\Apache2\htdocs\account2/inventory/prices.php:167
-msgid "Add/Update Price"
-msgstr ""
-
-# c:\Apache2\htdocs\account/inventory/purchasing_data.php:8
-#: c:\Apache2\htdocs\account2/inventory/purchasing_data.php:8
+#: c:\Apache2\htdocs\account2/inventory/purchasing_data.php:6
 msgid "Supplier Purchasing Data"
 msgstr ""
 
-# c:\Apache2\htdocs\account/inventory/purchasing_data.php:15
-# c:\Apache2\htdocs\account/purchasing/po_entry_items.php:32
-#: c:\Apache2\htdocs\account2/inventory/purchasing_data.php:15
+#: c:\Apache2\htdocs\account2/inventory/purchasing_data.php:13
 #: c:\Apache2\htdocs\account2/purchasing/po_entry_items.php:31
 msgid "There are no purchasable inventory items defined in the system."
 msgstr ""
 
-# c:\Apache2\htdocs\account/inventory/purchasing_data.php:16
-# c:\Apache2\htdocs\account/purchasing/po_entry_items.php:30
-# c:\Apache2\htdocs\account/purchasing/supplier_credit.php:22
-# c:\Apache2\htdocs\account/purchasing/supplier_invoice.php:22
-# c:\Apache2\htdocs\account/purchasing/supplier_payment.php:26
-#: c:\Apache2\htdocs\account2/inventory/purchasing_data.php:16
+#: c:\Apache2\htdocs\account2/inventory/purchasing_data.php:14
 #: c:\Apache2\htdocs\account2/purchasing/po_entry_items.php:29
 #: c:\Apache2\htdocs\account2/purchasing/supplier_credit.php:24
 #: c:\Apache2\htdocs\account2/purchasing/supplier_invoice.php:24
@@ -5349,995 +3887,741 @@ msgstr ""
 msgid "There are no suppliers defined in the system."
 msgstr ""
 
-# c:\Apache2\htdocs\account/inventory/purchasing_data.php:41
-#: c:\Apache2\htdocs\account2/inventory/purchasing_data.php:41
+#: c:\Apache2\htdocs\account2/inventory/purchasing_data.php:26
 msgid "There is no item selected."
 msgstr ""
 
-# c:\Apache2\htdocs\account/inventory/purchasing_data.php:46
-#: c:\Apache2\htdocs\account2/inventory/purchasing_data.php:47
+#: c:\Apache2\htdocs\account2/inventory/purchasing_data.php:32
 msgid "The price entered was not numeric."
 msgstr ""
 
-# c:\Apache2\htdocs\account/inventory/purchasing_data.php:51
-#: c:\Apache2\htdocs\account2/inventory/purchasing_data.php:53
+#: c:\Apache2\htdocs\account2/inventory/purchasing_data.php:38
 msgid "The conversion factor entered was not numeric. The conversion factor is the number by which the price must be divided by to get the unit price in our unit of measure."
 msgstr ""
 
-# c:\Apache2\htdocs\account/inventory/purchasing_data.php:65
-#: c:\Apache2\htdocs\account2/inventory/purchasing_data.php:69
+#: c:\Apache2\htdocs\account2/inventory/purchasing_data.php:54
 msgid "This supplier purchasing data has been added."
 msgstr ""
 
-# c:\Apache2\htdocs\account/inventory/purchasing_data.php:78
-#: c:\Apache2\htdocs\account2/inventory/purchasing_data.php:82
+#: c:\Apache2\htdocs\account2/inventory/purchasing_data.php:65
 msgid "Supplier purchasing data has been updated."
 msgstr ""
 
-# c:\Apache2\htdocs\account/inventory/purchasing_data.php:102
-#: c:\Apache2\htdocs\account2/inventory/purchasing_data.php:106
+#: c:\Apache2\htdocs\account2/inventory/purchasing_data.php:80
 msgid "The purchasing data item has been sucessfully deleted."
 msgstr ""
 
-# c:\Apache2\htdocs\account/inventory/purchasing_data.php:124
-#: c:\Apache2\htdocs\account2/inventory/purchasing_data.php:128
+#: c:\Apache2\htdocs\account2/inventory/purchasing_data.php:115
 msgid "Entered item is not defined. Please re-enter."
 msgstr ""
 
-# c:\Apache2\htdocs\account/inventory/purchasing_data.php:138
-#: c:\Apache2\htdocs\account2/inventory/purchasing_data.php:143
+#: c:\Apache2\htdocs\account2/inventory/purchasing_data.php:130
 msgid "There is no purchasing data set up for the part selected"
 msgstr ""
 
-# c:\Apache2\htdocs\account/inventory/purchasing_data.php:144
-# c:\Apache2\htdocs\account/purchasing/allocations/supplier_allocation_main.php:60
-# c:\Apache2\htdocs\account/purchasing/inquiry/po_search.php:105
-# c:\Apache2\htdocs\account/purchasing/inquiry/po_search.php:108
-# c:\Apache2\htdocs\account/purchasing/inquiry/po_search_completed.php:98
-# c:\Apache2\htdocs\account/purchasing/inquiry/po_search_completed.php:101
-# c:\Apache2\htdocs\account/purchasing/inquiry/supplier_allocation_inquiry.php:124
-# c:\Apache2\htdocs\account/purchasing/inquiry/supplier_inquiry.php:158
-# c:\Apache2\htdocs\account/purchasing/manage/suppliers.php:151
-# c:\Apache2\htdocs\account/purchasing/view/view_supp_credit.php:31
-# c:\Apache2\htdocs\account/purchasing/view/view_supp_invoice.php:37
-# c:\Apache2\htdocs\account/reporting/rep201.php:78
-# c:\Apache2\htdocs\account/reporting/rep202.php:146
-# c:\Apache2\htdocs\account/reporting/rep202.php:153
-# c:\Apache2\htdocs\account/reporting/rep203.php:83
-# c:\Apache2\htdocs\account/reporting/rep204.php:77
-# c:\Apache2\htdocs\account/reporting/reports_main.php:70
-# c:\Apache2\htdocs\account/reporting/reports_main.php:71
-# c:\Apache2\htdocs\account/reporting/reports_main.php:77
-# c:\Apache2\htdocs\account/reporting/reports_main.php:84
-# c:\Apache2\htdocs\account/reporting/reports_main.php:90
-# c:\Apache2\htdocs\account/reporting/reports_main.php:94
-# c:\Apache2\htdocs\account/includes/types.inc:140
-# c:\Apache2\htdocs\account/purchasing/includes/ui/grn_ui.inc:11
-# c:\Apache2\htdocs\account/purchasing/includes/ui/po_ui.inc:225
-#: c:\Apache2\htdocs\account2/inventory/purchasing_data.php:149
+#: c:\Apache2\htdocs\account2/inventory/purchasing_data.php:136
 #: c:\Apache2\htdocs\account2/purchasing/allocations/supplier_allocation_main.php:60
-#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search.php:110
-#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search.php:113
-#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search_completed.php:103
-#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search_completed.php:106
-#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_allocation_inquiry.php:126
-#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_inquiry.php:160
-#: c:\Apache2\htdocs\account2/purchasing/manage/suppliers.php:151
+#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search.php:135
+#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search.php:138
+#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search_completed.php:127
+#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search_completed.php:130
+#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_allocation_inquiry.php:130
+#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_inquiry.php:167
+#: c:\Apache2\htdocs\account2/purchasing/manage/suppliers.php:142
 #: c:\Apache2\htdocs\account2/purchasing/view/view_supp_credit.php:31
 #: c:\Apache2\htdocs\account2/purchasing/view/view_supp_invoice.php:37
 #: c:\Apache2\htdocs\account2/reporting/rep201.php:77
-#: c:\Apache2\htdocs\account2/reporting/rep202.php:151
-#: c:\Apache2\htdocs\account2/reporting/rep202.php:158
+#: c:\Apache2\htdocs\account2/reporting/rep202.php:103
+#: c:\Apache2\htdocs\account2/reporting/rep202.php:110
 #: c:\Apache2\htdocs\account2/reporting/rep203.php:82
 #: c:\Apache2\htdocs\account2/reporting/rep204.php:76
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:83
 #: c:\Apache2\htdocs\account2/reporting/reports_main.php:84
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:86
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:89
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:91
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:96
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:98
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:101
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:85
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:87
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:90
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:92
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:97
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:99
 #: c:\Apache2\htdocs\account2/reporting/reports_main.php:102
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:104
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:103
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:105
 #: c:\Apache2\htdocs\account2/includes/types.inc:146
 #: c:\Apache2\htdocs\account2/purchasing/includes/ui/grn_ui.inc:11
-#: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:227
+#: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:229
 msgid "Supplier"
 msgstr ""
 
-# c:\Apache2\htdocs\account/inventory/purchasing_data.php:145
-#: c:\Apache2\htdocs\account2/inventory/purchasing_data.php:150
+#: c:\Apache2\htdocs\account2/inventory/purchasing_data.php:137
 msgid "Supplier's Unit"
 msgstr ""
 
-# c:\Apache2\htdocs\account/inventory/purchasing_data.php:145
-#: c:\Apache2\htdocs\account2/inventory/purchasing_data.php:150
+#: c:\Apache2\htdocs\account2/inventory/purchasing_data.php:137
 msgid "Supplier's Description"
 msgstr ""
 
-# c:\Apache2\htdocs\account/inventory/purchasing_data.php:203
-# c:\Apache2\htdocs\account/inventory/purchasing_data.php:207
-# c:\Apache2\htdocs\account/gl/includes/ui/gl_deposit_ui.inc:51
-# c:\Apache2\htdocs\account/gl/includes/ui/gl_payment_ui.inc:51
-# c:\Apache2\htdocs\account/purchasing/includes/ui/invoice_ui.inc:62
-# c:\Apache2\htdocs\account/purchasing/includes/ui/po_ui.inc:57
-# c:\Apache2\htdocs\account/purchasing/includes/ui/po_ui.inc:70
-#: c:\Apache2\htdocs\account2/inventory/purchasing_data.php:208
-#: c:\Apache2\htdocs\account2/inventory/purchasing_data.php:212
-#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_deposit_ui.inc:51
-#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_payment_ui.inc:51
+#: c:\Apache2\htdocs\account2/inventory/purchasing_data.php:197
+#: c:\Apache2\htdocs\account2/inventory/purchasing_data.php:201
+#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_bank_ui.inc:55
 #: c:\Apache2\htdocs\account2/purchasing/includes/ui/invoice_ui.inc:60
 #: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:57
-#: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:70
+#: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:62
 msgid "Supplier:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/inventory/purchasing_data.php:211
-#: c:\Apache2\htdocs\account2/inventory/purchasing_data.php:216
+#: c:\Apache2\htdocs\account2/inventory/purchasing_data.php:204
 msgid "Suppliers Unit of Measure:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/inventory/purchasing_data.php:217
-#: c:\Apache2\htdocs\account2/inventory/purchasing_data.php:222
+#: c:\Apache2\htdocs\account2/inventory/purchasing_data.php:210
 msgid "Conversion Factor (to our UOM):"
 msgstr ""
 
-# c:\Apache2\htdocs\account/inventory/purchasing_data.php:218
-#: c:\Apache2\htdocs\account2/inventory/purchasing_data.php:224
+#: c:\Apache2\htdocs\account2/inventory/purchasing_data.php:212
 msgid "Supplier's Code or Description:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/inventory/purchasing_data.php:224
-#: c:\Apache2\htdocs\account2/inventory/purchasing_data.php:230
-msgid "Update Purchasing Data"
-msgstr ""
-
-# c:\Apache2\htdocs\account/inventory/purchasing_data.php:228
-#: c:\Apache2\htdocs\account2/inventory/purchasing_data.php:234
-msgid "Add Purchasing Data"
-msgstr ""
-
-# c:\Apache2\htdocs\account/inventory/reorder_level.php:15
-# c:\Apache2\htdocs\account/inventory/transfers.php:22
 #: c:\Apache2\htdocs\account2/inventory/reorder_level.php:15
-#: c:\Apache2\htdocs\account2/inventory/transfers.php:24
+#: c:\Apache2\htdocs\account2/inventory/transfers.php:23
 msgid "There are no inventory items defined in the system (Purchased or manufactured items)."
 msgstr ""
 
-# c:\Apache2\htdocs\account/inventory/reorder_level.php:42
-# c:\Apache2\htdocs\account/inventory/inquiry/stock_status.php:53
-# c:\Apache2\htdocs\account/inventory/inquiry/stock_status.php:57
-# c:\Apache2\htdocs\account/manufacturing/search_work_orders.php:88
-# c:\Apache2\htdocs\account/manufacturing/inquiry/where_used_inquiry.php:45
-# c:\Apache2\htdocs\account/manufacturing/manage/bom_edit.php:91
-# c:\Apache2\htdocs\account/purchasing/inquiry/po_search.php:105
-# c:\Apache2\htdocs\account/purchasing/inquiry/po_search_completed.php:98
-# c:\Apache2\htdocs\account/reporting/rep105.php:107
-# c:\Apache2\htdocs\account/reporting/rep301.php:91
-# c:\Apache2\htdocs\account/reporting/rep302.php:177
-# c:\Apache2\htdocs\account/reporting/rep303.php:130
-# c:\Apache2\htdocs\account/reporting/reports_main.php:105
-# c:\Apache2\htdocs\account/reporting/reports_main.php:110
-# c:\Apache2\htdocs\account/reporting/reports_main.php:114
-#: c:\Apache2\htdocs\account2/inventory/reorder_level.php:42
-#: c:\Apache2\htdocs\account2/inventory/inquiry/stock_status.php:53
-#: c:\Apache2\htdocs\account2/inventory/inquiry/stock_status.php:57
-#: c:\Apache2\htdocs\account2/manufacturing/search_work_orders.php:88
-#: c:\Apache2\htdocs\account2/manufacturing/inquiry/where_used_inquiry.php:44
-#: c:\Apache2\htdocs\account2/manufacturing/manage/bom_edit.php:91
-#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search.php:110
-#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search_completed.php:103
-#: c:\Apache2\htdocs\account2/reporting/rep105.php:107
+#: c:\Apache2\htdocs\account2/inventory/reorder_level.php:47
+#: c:\Apache2\htdocs\account2/inventory/inquiry/stock_status.php:56
+#: c:\Apache2\htdocs\account2/inventory/inquiry/stock_status.php:60
+#: c:\Apache2\htdocs\account2/manufacturing/search_work_orders.php:114
+#: c:\Apache2\htdocs\account2/manufacturing/inquiry/where_used_inquiry.php:48
+#: c:\Apache2\htdocs\account2/manufacturing/manage/bom_edit.php:94
+#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search.php:135
+#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search_completed.php:127
+#: c:\Apache2\htdocs\account2/reporting/rep105.php:105
 #: c:\Apache2\htdocs\account2/reporting/rep301.php:91
-#: c:\Apache2\htdocs\account2/reporting/rep302.php:177
-#: c:\Apache2\htdocs\account2/reporting/rep303.php:130
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:115
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:120
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:124
+#: c:\Apache2\htdocs\account2/reporting/rep302.php:175
+#: c:\Apache2\htdocs\account2/reporting/rep303.php:128
+#: c:\Apache2\htdocs\account2/reporting/rep304.php:134
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:116
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:121
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:125
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:132
 msgid "Location"
 msgstr ""
 
-# c:\Apache2\htdocs\account/inventory/reorder_level.php:42
-# c:\Apache2\htdocs\account/inventory/inquiry/stock_movements.php:58
-# c:\Apache2\htdocs\account/inventory/inquiry/stock_status.php:57
-#: c:\Apache2\htdocs\account2/inventory/reorder_level.php:42
-#: c:\Apache2\htdocs\account2/inventory/inquiry/stock_movements.php:61
-#: c:\Apache2\htdocs\account2/inventory/inquiry/stock_status.php:57
+#: c:\Apache2\htdocs\account2/inventory/reorder_level.php:47
+#: c:\Apache2\htdocs\account2/inventory/inquiry/stock_movements.php:68
+#: c:\Apache2\htdocs\account2/inventory/inquiry/stock_status.php:60
 msgid "Quantity On Hand"
 msgstr ""
 
-# c:\Apache2\htdocs\account/inventory/reorder_level.php:42
-# c:\Apache2\htdocs\account/inventory/inquiry/stock_status.php:57
-#: c:\Apache2\htdocs\account2/inventory/reorder_level.php:42
-#: c:\Apache2\htdocs\account2/inventory/inquiry/stock_status.php:57
-#: c:\Apache2\htdocs\account2/sales/includes/db/sales_order_db.inc:128
-#: c:\Apache2\htdocs\account2/sales/includes/db/sales_order_db.inc:269
+#: c:\Apache2\htdocs\account2/inventory/reorder_level.php:47
+#: c:\Apache2\htdocs\account2/inventory/inquiry/stock_status.php:60
+#: c:\Apache2\htdocs\account2/sales/includes/db/sales_order_db.inc:134
+#: c:\Apache2\htdocs\account2/sales/includes/db/sales_order_db.inc:274
 msgid "Re-Order Level"
 msgstr ""
 
-# c:\Apache2\htdocs\account/inventory/transfers.php:33
-#: c:\Apache2\htdocs\account2/inventory/transfers.php:35
+#: c:\Apache2\htdocs\account2/inventory/transfers.php:34
 msgid "Inventory transfer has been processed"
 msgstr ""
 
-# c:\Apache2\htdocs\account/inventory/transfers.php:34
-#: c:\Apache2\htdocs\account2/inventory/transfers.php:36
+#: c:\Apache2\htdocs\account2/inventory/transfers.php:35
 msgid "View this transfer"
 msgstr ""
 
-# c:\Apache2\htdocs\account/inventory/transfers.php:36
-#: c:\Apache2\htdocs\account2/inventory/transfers.php:38
+#: c:\Apache2\htdocs\account2/inventory/transfers.php:37
 msgid "Enter Another Inventory Transfer"
 msgstr ""
 
-# c:\Apache2\htdocs\account/inventory/transfers.php:111
-#: c:\Apache2\htdocs\account2/inventory/transfers.php:117
+#: c:\Apache2\htdocs\account2/inventory/transfers.php:107
 msgid "The locations to transfer from and to must be different."
 msgstr ""
 
-# c:\Apache2\htdocs\account/inventory/transfers.php:119
-#: c:\Apache2\htdocs\account2/inventory/transfers.php:126
+#: c:\Apache2\htdocs\account2/inventory/transfers.php:117
 msgid "The quantity entered is greater than the available quantity for this item at the source location :"
 msgstr ""
 
-# c:\Apache2\htdocs\account/inventory/adjustments.php:139
-# c:\Apache2\htdocs\account/inventory/transfers.php:151
-# c:\Apache2\htdocs\account/manufacturing/work_order_add_finished.php:64
-# c:\Apache2\htdocs\account/manufacturing/work_order_issue.php:110
-#: c:\Apache2\htdocs\account2/inventory/transfers.php:158
-#: c:\Apache2\htdocs\account2/manufacturing/work_order_issue.php:116
-msgid "The quantity entered is not a valid number."
-msgstr ""
-
-# c:\Apache2\htdocs\account/inventory/transfers.php:157
-#: c:\Apache2\htdocs\account2/inventory/transfers.php:165
+#: c:\Apache2\htdocs\account2/inventory/transfers.php:150
 msgid "The quantity entered must be a positive number."
 msgstr ""
 
-# c:\Apache2\htdocs\account/inventory/transfers.php:238
-#: c:\Apache2\htdocs\account2/inventory/transfers.php:247
+#: c:\Apache2\htdocs\account2/inventory/transfers.php:227
 msgid "Process Transfer"
 msgstr ""
 
-# c:\Apache2\htdocs\account/inventory/inquiry/stock_movements.php:16
 #: c:\Apache2\htdocs\account2/inventory/inquiry/stock_movements.php:19
 msgid "Inventory Item Movement"
 msgstr ""
 
-# c:\Apache2\htdocs\account/inventory/inquiry/stock_movements.php:32
-# c:\Apache2\htdocs\account/inventory/includes/stock_transfers_ui.inc:37
-# c:\Apache2\htdocs\account/manufacturing/includes/work_order_issue_ui.inc:152
-#: c:\Apache2\htdocs\account2/inventory/inquiry/stock_movements.php:35
-#: c:\Apache2\htdocs\account2/inventory/includes/stock_transfers_ui.inc:37
-#: c:\Apache2\htdocs\account2/manufacturing/includes/work_order_issue_ui.inc:152
+#: c:\Apache2\htdocs\account2/inventory/inquiry/stock_movements.php:41
+#: c:\Apache2\htdocs\account2/inventory/includes/stock_transfers_ui.inc:26
+#: c:\Apache2\htdocs\account2/manufacturing/includes/work_order_issue_ui.inc:148
 msgid "From Location:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/inventory/inquiry/stock_movements.php:37
-#: c:\Apache2\htdocs\account2/inventory/inquiry/stock_movements.php:40
+#: c:\Apache2\htdocs\account2/inventory/inquiry/stock_movements.php:46
 msgid "Show Movements"
 msgstr ""
 
-# c:\Apache2\htdocs\account/inventory/inquiry/stock_movements.php:57
-#: c:\Apache2\htdocs\account2/inventory/inquiry/stock_movements.php:60
+#: c:\Apache2\htdocs\account2/inventory/inquiry/stock_movements.php:46
+#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_allocation_inquiry.php:47
+#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_inquiry.php:43
+#: c:\Apache2\htdocs\account2/sales/inquiry/customer_allocation_inquiry.php:41
+#: c:\Apache2\htdocs\account2/sales/inquiry/customer_inquiry.php:44
+msgid "Refresh Inquiry"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/inventory/inquiry/stock_movements.php:67
 msgid "Detail"
 msgstr ""
 
-# c:\Apache2\htdocs\account/inventory/inquiry/stock_movements.php:58
-#: c:\Apache2\htdocs\account2/inventory/inquiry/stock_movements.php:61
+#: c:\Apache2\htdocs\account2/inventory/inquiry/stock_movements.php:68
 msgid "Quantity In"
 msgstr ""
 
-# c:\Apache2\htdocs\account/inventory/inquiry/stock_movements.php:58
-#: c:\Apache2\htdocs\account2/inventory/inquiry/stock_movements.php:61
+#: c:\Apache2\htdocs\account2/inventory/inquiry/stock_movements.php:68
 msgid "Quantity Out"
 msgstr ""
 
-# c:\Apache2\htdocs\account/inventory/inquiry/stock_movements.php:76
-#: c:\Apache2\htdocs\account2/inventory/inquiry/stock_movements.php:79
+#: c:\Apache2\htdocs\account2/inventory/inquiry/stock_movements.php:86
 msgid "Quantity on hand before"
 msgstr ""
 
-# c:\Apache2\htdocs\account/inventory/inquiry/stock_movements.php:168
-#: c:\Apache2\htdocs\account2/inventory/inquiry/stock_movements.php:171
+#: c:\Apache2\htdocs\account2/inventory/inquiry/stock_movements.php:180
 msgid "Quantity on hand after"
 msgstr ""
 
-# c:\Apache2\htdocs\account/inventory/inquiry/stock_status.php:43
-#: c:\Apache2\htdocs\account2/inventory/inquiry/stock_status.php:43
+#: c:\Apache2\htdocs\account2/inventory/inquiry/stock_status.php:45
 msgid "This is a service and cannot have a stock holding, only the total quantity on outstanding sales orders is shown."
 msgstr ""
 
-# c:\Apache2\htdocs\account/inventory/inquiry/stock_status.php:53
-# c:\Apache2\htdocs\account/inventory/inquiry/stock_status.php:58
-# c:\Apache2\htdocs\account/reporting/rep303.php:124
-#: c:\Apache2\htdocs\account2/inventory/inquiry/stock_status.php:53
-#: c:\Apache2\htdocs\account2/inventory/inquiry/stock_status.php:58
-#: c:\Apache2\htdocs\account2/reporting/rep303.php:124
+#: c:\Apache2\htdocs\account2/inventory/inquiry/stock_status.php:56
+#: c:\Apache2\htdocs\account2/inventory/inquiry/stock_status.php:61
+#: c:\Apache2\htdocs\account2/reporting/rep303.php:122
 msgid "Demand"
 msgstr ""
 
-# c:\Apache2\htdocs\account/inventory/inquiry/stock_status.php:58
-#: c:\Apache2\htdocs\account2/inventory/inquiry/stock_status.php:58
+#: c:\Apache2\htdocs\account2/inventory/inquiry/stock_status.php:61
 msgid "Available"
 msgstr ""
 
-# c:\Apache2\htdocs\account/inventory/inquiry/stock_status.php:58
-#: c:\Apache2\htdocs\account2/inventory/inquiry/stock_status.php:58
+#: c:\Apache2\htdocs\account2/inventory/inquiry/stock_status.php:61
 msgid "On Order"
 msgstr ""
 
-# c:\Apache2\htdocs\account/inventory/manage/items.php:52
-#: c:\Apache2\htdocs\account2/inventory/manage/items.php:52
-msgid "Only jpg files are supported - a file extension of .jpg is expected"
-msgstr ""
-
-# c:\Apache2\htdocs\account/inventory/manage/items.php:57
-#: c:\Apache2\htdocs\account2/inventory/manage/items.php:57
-msgid "The file size is over the maximum allowed. The maximum size allowed in KB is"
-msgstr ""
-
-# c:\Apache2\htdocs\account/inventory/manage/items.php:62
-#: c:\Apache2\htdocs\account2/inventory/manage/items.php:62
-msgid "Only graphics files can be uploaded"
-msgstr ""
-
-# c:\Apache2\htdocs\account/inventory/manage/items.php:67
-#: c:\Apache2\htdocs\account2/inventory/manage/items.php:67
-msgid "Attempting to overwrite an existing item image"
-msgstr ""
-
-# c:\Apache2\htdocs\account/inventory/manage/items.php:71
-#: c:\Apache2\htdocs\account2/inventory/manage/items.php:71
-msgid "The existing image could not be removed"
-msgstr ""
-
-# c:\Apache2\htdocs\account/inventory/manage/items.php:79
-#: c:\Apache2\htdocs\account2/inventory/manage/items.php:79
-msgid "File url"
-msgstr ""
-
-# c:\Apache2\htdocs\account/inventory/manage/items.php:85
-#: c:\Apache2\htdocs\account2/inventory/manage/items.php:85
+#: c:\Apache2\htdocs\account2/inventory/manage/items.php:86
 msgid "There are no item categories defined in the system. At least one item category is required to add a item."
 msgstr ""
 
-# c:\Apache2\htdocs\account/inventory/manage/items.php:87
-#: c:\Apache2\htdocs\account2/inventory/manage/items.php:87
+#: c:\Apache2\htdocs\account2/inventory/manage/items.php:88
 msgid "There are no item tax types defined in the system. At least one item tax type is required to add a item."
 msgstr ""
 
-# c:\Apache2\htdocs\account/inventory/manage/items.php:114
-#: c:\Apache2\htdocs\account2/inventory/manage/items.php:114
+#: c:\Apache2\htdocs\account2/inventory/manage/items.php:117
 msgid "The item name must be entered."
 msgstr ""
 
-# c:\Apache2\htdocs\account/inventory/manage/items.php:119
-#: c:\Apache2\htdocs\account2/inventory/manage/items.php:120
+#: c:\Apache2\htdocs\account2/inventory/manage/items.php:123
 msgid "The item code cannot be empty"
 msgstr ""
 
-# c:\Apache2\htdocs\account/inventory/manage/items.php:126
-#: c:\Apache2\htdocs\account2/inventory/manage/items.php:128
+#: c:\Apache2\htdocs\account2/inventory/manage/items.php:131
 msgid "The item code cannot contain any of the following characters -  & + OR a space OR quotes"
 msgstr ""
 
-# c:\Apache2\htdocs\account/inventory/manage/items.php:166
-#: c:\Apache2\htdocs\account2/inventory/manage/items.php:169
+#: c:\Apache2\htdocs\account2/inventory/manage/items.php:148
+msgid "Item has been updated."
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/inventory/manage/items.php:161
+msgid "A new item has been added."
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/inventory/manage/items.php:179
 msgid "Cannot delete this item because there are stock movements that refer to this item."
 msgstr ""
 
-# c:\Apache2\htdocs\account/inventory/manage/items.php:175
-#: c:\Apache2\htdocs\account2/inventory/manage/items.php:178
+#: c:\Apache2\htdocs\account2/inventory/manage/items.php:188
 msgid "Cannot delete this item record because there are bills of material that require this part as a component."
 msgstr ""
 
-# c:\Apache2\htdocs\account/inventory/manage/items.php:184
-#: c:\Apache2\htdocs\account2/inventory/manage/items.php:187
+#: c:\Apache2\htdocs\account2/inventory/manage/items.php:197
 msgid "Cannot delete this item record because there are existing sales orders for this part."
 msgstr ""
 
-# c:\Apache2\htdocs\account/inventory/manage/items.php:193
-#: c:\Apache2\htdocs\account2/inventory/manage/items.php:196
+#: c:\Apache2\htdocs\account2/inventory/manage/items.php:206
 msgid "Cannot delete this item because there are existing purchase order items for it."
 msgstr ""
 
-# c:\Apache2\htdocs\account/inventory/manage/items.php:224
-#: c:\Apache2\htdocs\account2/inventory/manage/items.php:227
-msgid "Select an item:"
+#: c:\Apache2\htdocs\account2/inventory/manage/items.php:225
+msgid "Selected item has been deleted."
 msgstr ""
 
-# c:\Apache2\htdocs\account/inventory/manage/items.php:225
-#: c:\Apache2\htdocs\account2/inventory/manage/items.php:228
-msgid "Edit Item"
+#: c:\Apache2\htdocs\account2/inventory/manage/items.php:243
+msgid "Select an item:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/inventory/manage/items.php:230
-#: c:\Apache2\htdocs\account2/inventory/manage/items.php:233
-msgid "Enter a new item"
+#: c:\Apache2\htdocs\account2/inventory/manage/items.php:244
+msgid "New item"
 msgstr ""
 
-# c:\Apache2\htdocs\account/inventory/manage/items.php:235
-# c:\Apache2\htdocs\account/inventory/view/view_adjustment.php:46
-# c:\Apache2\htdocs\account/inventory/view/view_transfer.php:30
-# c:\Apache2\htdocs\account/inventory/view/view_transfer.php:48
-# c:\Apache2\htdocs\account/manufacturing/search_work_orders.php:88
-# c:\Apache2\htdocs\account/manufacturing/view/wo_issue_view.php:33
-# c:\Apache2\htdocs\account/manufacturing/view/wo_production_view.php:34
-# c:\Apache2\htdocs\account/purchasing/supplier_credit_grns.php:165
-# c:\Apache2\htdocs\account/purchasing/supplier_invoice_grns.php:141
-# c:\Apache2\htdocs\account/purchasing/supplier_invoice_grns.php:204
-# c:\Apache2\htdocs\account/reporting/rep204.php:71
-# c:\Apache2\htdocs\account/purchasing/includes/ui/invoice_ui.inc:302
-#: c:\Apache2\htdocs\account2/inventory/manage/items.php:238
+#: c:\Apache2\htdocs\account2/inventory/manage/items.php:256
 #: c:\Apache2\htdocs\account2/inventory/view/view_adjustment.php:46
 #: c:\Apache2\htdocs\account2/inventory/view/view_transfer.php:30
 #: c:\Apache2\htdocs\account2/inventory/view/view_transfer.php:48
-#: c:\Apache2\htdocs\account2/manufacturing/search_work_orders.php:88
-#: c:\Apache2\htdocs\account2/manufacturing/view/wo_issue_view.php:33
+#: c:\Apache2\htdocs\account2/manufacturing/search_work_orders.php:114
+#: c:\Apache2\htdocs\account2/manufacturing/view/wo_issue_view.php:36
 #: c:\Apache2\htdocs\account2/manufacturing/view/wo_production_view.php:34
-#: c:\Apache2\htdocs\account2/purchasing/supplier_credit_grns.php:163
-#: c:\Apache2\htdocs\account2/purchasing/supplier_invoice_grns.php:140
-#: c:\Apache2\htdocs\account2/purchasing/supplier_invoice_grns.php:204
+#: c:\Apache2\htdocs\account2/purchasing/supplier_credit_grns.php:181
+#: c:\Apache2\htdocs\account2/purchasing/supplier_invoice_grns.php:141
+#: c:\Apache2\htdocs\account2/purchasing/supplier_invoice_grns.php:218
 #: c:\Apache2\htdocs\account2/reporting/rep204.php:70
-#: c:\Apache2\htdocs\account2/purchasing/includes/ui/invoice_ui.inc:296
+#: c:\Apache2\htdocs\account2/purchasing/includes/ui/invoice_ui.inc:300
 msgid "Item"
 msgstr ""
 
-# c:\Apache2\htdocs\account/inventory/manage/items.php:246
-# c:\Apache2\htdocs\account/inventory/manage/items.php:288
-#: c:\Apache2\htdocs\account2/inventory/manage/items.php:249
-#: c:\Apache2\htdocs\account2/inventory/manage/items.php:291
+#: c:\Apache2\htdocs\account2/inventory/manage/items.php:265
+#: c:\Apache2\htdocs\account2/inventory/manage/items.php:307
 msgid "Item Code:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/inventory/manage/items.php:301
-#: c:\Apache2\htdocs\account2/inventory/manage/items.php:304
+#: c:\Apache2\htdocs\account2/inventory/manage/items.php:320
 msgid "Image File (.jpg)"
 msgstr ""
 
-# c:\Apache2\htdocs\account/inventory/manage/items.php:315
-#: c:\Apache2\htdocs\account2/inventory/manage/items.php:318
+#: c:\Apache2\htdocs\account2/inventory/manage/items.php:331
+msgid "No image"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/inventory/manage/items.php:338
 msgid "Category:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/inventory/manage/items.php:317
-#: c:\Apache2\htdocs\account2/inventory/manage/items.php:320
+#: c:\Apache2\htdocs\account2/inventory/manage/items.php:340
 msgid "Item Tax Type:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/inventory/manage/items.php:319
-#: c:\Apache2\htdocs\account2/inventory/manage/items.php:322
+#: c:\Apache2\htdocs\account2/inventory/manage/items.php:342
 msgid "Item Type:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/inventory/manage/items.php:325
-#: c:\Apache2\htdocs\account2/inventory/manage/items.php:325
+#: c:\Apache2\htdocs\account2/inventory/manage/items.php:345
 msgid "Units of Measure:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/inventory/manage/items.php:370
-#: c:\Apache2\htdocs\account2/inventory/manage/items.php:370
+#: c:\Apache2\htdocs\account2/inventory/manage/items.php:391
 msgid "Insert New Item"
 msgstr ""
 
-# c:\Apache2\htdocs\account/inventory/manage/items.php:375
-#: c:\Apache2\htdocs\account2/inventory/manage/items.php:375
+#: c:\Apache2\htdocs\account2/inventory/manage/items.php:395
 msgid "Update Item"
 msgstr ""
 
-# c:\Apache2\htdocs\account/inventory/manage/items.php:377
-#: c:\Apache2\htdocs\account2/inventory/manage/items.php:377
+#: c:\Apache2\htdocs\account2/inventory/manage/items.php:397
 msgid "Delete This Item"
 msgstr ""
 
-# c:\Apache2\htdocs\account/inventory/manage/item_categories.php:33
-#: c:\Apache2\htdocs\account2/inventory/manage/item_categories.php:33
+#: c:\Apache2\htdocs\account2/inventory/manage/item_categories.php:25
 msgid "The item category description cannot be empty."
 msgstr ""
 
-# c:\Apache2\htdocs\account/inventory/manage/item_categories.php:61
-#: c:\Apache2\htdocs\account2/inventory/manage/item_categories.php:62
+#: c:\Apache2\htdocs\account2/inventory/manage/item_categories.php:34
+msgid "Selected item category has been updated"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/inventory/manage/item_categories.php:39
+msgid "New item category has been added"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/inventory/manage/item_categories.php:56
 msgid "Cannot delete this item category because items have been created using this item category."
 msgstr ""
 
-# c:\Apache2\htdocs\account/inventory/manage/item_categories.php:96
-#: c:\Apache2\htdocs\account2/inventory/manage/item_categories.php:97
-msgid "New Item Category"
+#: c:\Apache2\htdocs\account2/inventory/manage/item_categories.php:61
+msgid "Selected item category has been deleted"
 msgstr ""
 
-# c:\Apache2\htdocs\account/inventory/manage/item_categories.php:115
-#: c:\Apache2\htdocs\account2/inventory/manage/item_categories.php:116
+#: c:\Apache2\htdocs\account2/inventory/manage/item_categories.php:115
 msgid "Category Name:"
 msgstr ""
 
-#: c:\Apache2\htdocs\account2/inventory/manage/item_units.php:33
+#: c:\Apache2\htdocs\account2/inventory/manage/item_units.php:24
 msgid "The unit of measure code cannot be empty."
 msgstr ""
 
-#: c:\Apache2\htdocs\account2/inventory/manage/item_units.php:39
+#: c:\Apache2\htdocs\account2/inventory/manage/item_units.php:30
 msgid "The unit of measure description cannot be empty."
 msgstr ""
 
-#: c:\Apache2\htdocs\account2/inventory/manage/item_units.php:45
-msgid "The number of decimal places must be integer."
+#: c:\Apache2\htdocs\account2/inventory/manage/item_units.php:37
+msgid "Selected unit has been updated"
 msgstr ""
 
-#: c:\Apache2\htdocs\account2/inventory/manage/item_units.php:65
-msgid "Cannot delete this unit of measure because items have been created using this units."
+#: c:\Apache2\htdocs\account2/inventory/manage/item_units.php:39
+msgid "New unit has been added"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/inventory/manage/item_units.php:53
+msgid "Cannot delete this unit of measure because items have been created using this unit."
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/inventory/manage/item_units.php:59
+msgid "Selected unit has been deleted"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/view/view_grn.php:28
-# c:\Apache2\htdocs\account/purchasing/view/view_po.php:38
-# c:\Apache2\htdocs\account/sales/view/view_credit.php:82
-# c:\Apache2\htdocs\account/sales/view/view_invoice.php:100
-# c:\Apache2\htdocs\account/sales/view/view_sales_order.php:140
-# c:\Apache2\htdocs\account/inventory/includes/item_adjustments_ui.inc:75
-# c:\Apache2\htdocs\account/inventory/includes/stock_transfers_ui.inc:70
-# c:\Apache2\htdocs\account/manufacturing/includes/work_order_issue_ui.inc:44
-# c:\Apache2\htdocs\account/purchasing/includes/ui/po_ui.inc:167
-# c:\Apache2\htdocs\account/reporting/includes/doctext.inc:37
-# c:\Apache2\htdocs\account/reporting/includes/doctext.inc:40
-# c:\Apache2\htdocs\account/sales/includes/ui/sales_credit_ui.inc:103
-# c:\Apache2\htdocs\account/sales/includes/ui/sales_order_ui.inc:110
-#: c:\Apache2\htdocs\account2/inventory/manage/item_units.php:79
+#: c:\Apache2\htdocs\account2/inventory/manage/item_units.php:75
 #: c:\Apache2\htdocs\account2/purchasing/view/view_grn.php:28
 #: c:\Apache2\htdocs\account2/purchasing/view/view_po.php:38
 #: c:\Apache2\htdocs\account2/sales/view/view_credit.php:82
 #: c:\Apache2\htdocs\account2/sales/view/view_dispatch.php:104
 #: c:\Apache2\htdocs\account2/sales/view/view_invoice.php:104
 #: c:\Apache2\htdocs\account2/sales/view/view_sales_order.php:172
-#: c:\Apache2\htdocs\account2/inventory/includes/item_adjustments_ui.inc:75
-#: c:\Apache2\htdocs\account2/inventory/includes/stock_transfers_ui.inc:70
-#: c:\Apache2\htdocs\account2/manufacturing/includes/work_order_issue_ui.inc:44
-#: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:167
-#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:46
-#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:49
-#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_credit_ui.inc:108
-#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:87
+#: c:\Apache2\htdocs\account2/inventory/includes/item_adjustments_ui.inc:65
+#: c:\Apache2\htdocs\account2/inventory/includes/stock_transfers_ui.inc:60
+#: c:\Apache2\htdocs\account2/manufacturing/includes/work_order_issue_ui.inc:25
+#: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:165
+#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:47
+#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:50
+#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_credit_ui.inc:152
+#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:84
 msgid "Unit"
 msgstr ""
 
-#: c:\Apache2\htdocs\account2/inventory/manage/item_units.php:79
+#: c:\Apache2\htdocs\account2/inventory/manage/item_units.php:75
 msgid "Decimals"
 msgstr ""
 
-#: c:\Apache2\htdocs\account2/inventory/manage/item_units.php:102
-msgid "New Unit of Measure"
+#: c:\Apache2\htdocs\account2/inventory/manage/item_units.php:87
+#: c:\Apache2\htdocs\account2/inventory/manage/item_units.php:124
+msgid "User Quantity Decimals"
 msgstr ""
 
-#: c:\Apache2\htdocs\account2/inventory/manage/item_units.php:122
-#: c:\Apache2\htdocs\account2/inventory/manage/item_units.php:125
+#: c:\Apache2\htdocs\account2/inventory/manage/item_units.php:118
+#: c:\Apache2\htdocs\account2/inventory/manage/item_units.php:121
 msgid "Unit Abbreviation:"
 msgstr ""
 
-#: c:\Apache2\htdocs\account2/inventory/manage/item_units.php:126
+#: c:\Apache2\htdocs\account2/inventory/manage/item_units.php:122
 msgid "Descriptive Name:"
 msgstr ""
 
-#: c:\Apache2\htdocs\account2/inventory/manage/item_units.php:127
+#: c:\Apache2\htdocs\account2/inventory/manage/item_units.php:124
 msgid "Decimal Places:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/inventory/manage/locations.php:37
-#: c:\Apache2\htdocs\account2/inventory/manage/locations.php:37
+#: c:\Apache2\htdocs\account2/inventory/manage/locations.php:30
 msgid "The location code must be five characters or less long."
 msgstr ""
 
-# c:\Apache2\htdocs\account/inventory/manage/locations.php:42
-#: c:\Apache2\htdocs\account2/inventory/manage/locations.php:43
+#: c:\Apache2\htdocs\account2/inventory/manage/locations.php:36
 msgid "The location name must be entered."
 msgstr ""
 
-# c:\Apache2\htdocs\account/inventory/manage/locations.php:73
-#: c:\Apache2\htdocs\account2/inventory/manage/locations.php:75
+#: c:\Apache2\htdocs\account2/inventory/manage/locations.php:47
+msgid "Selected location has been updated"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/inventory/manage/locations.php:56
+msgid "New location has been added"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/inventory/manage/locations.php:70
 msgid "Cannot delete this location because item movements have been created using this location."
 msgstr ""
 
-# c:\Apache2\htdocs\account/inventory/manage/locations.php:82
-#: c:\Apache2\htdocs\account2/inventory/manage/locations.php:84
+#: c:\Apache2\htdocs\account2/inventory/manage/locations.php:79
 msgid "Cannot delete this location because it is used by some work orders records."
 msgstr ""
 
-# c:\Apache2\htdocs\account/inventory/manage/locations.php:91
-#: c:\Apache2\htdocs\account2/inventory/manage/locations.php:93
+#: c:\Apache2\htdocs\account2/inventory/manage/locations.php:88
 msgid "Cannot delete this location because it is used by some branch records as the default location to deliver from."
 msgstr ""
 
-# c:\Apache2\htdocs\account/inventory/manage/locations.php:119
-#: c:\Apache2\htdocs\account2/inventory/manage/locations.php:121
-msgid "Location Code"
+#: c:\Apache2\htdocs\account2/inventory/manage/locations.php:103
+msgid "Selected location has been deleted"
 msgstr ""
 
-# c:\Apache2\htdocs\account/inventory/manage/locations.php:119
-#: c:\Apache2\htdocs\account2/inventory/manage/locations.php:121
-msgid "Location Name"
+#: c:\Apache2\htdocs\account2/inventory/manage/locations.php:119
+msgid "Location Code"
 msgstr ""
 
-# c:\Apache2\htdocs\account/inventory/manage/locations.php:139
-#: c:\Apache2\htdocs\account2/inventory/manage/locations.php:141
-msgid "New Location"
+#: c:\Apache2\htdocs\account2/inventory/manage/locations.php:119
+msgid "Location Name"
 msgstr ""
 
-# c:\Apache2\htdocs\account/inventory/manage/locations.php:160
-# c:\Apache2\htdocs\account/inventory/manage/locations.php:164
-#: c:\Apache2\htdocs\account2/inventory/manage/locations.php:162
-#: c:\Apache2\htdocs\account2/inventory/manage/locations.php:166
+#: c:\Apache2\htdocs\account2/inventory/manage/locations.php:163
+#: c:\Apache2\htdocs\account2/inventory/manage/locations.php:167
 msgid "Location Code:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/inventory/manage/locations.php:167
-#: c:\Apache2\htdocs\account2/inventory/manage/locations.php:169
+#: c:\Apache2\htdocs\account2/inventory/manage/locations.php:170
 msgid "Location Name:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/inventory/manage/locations.php:168
-#: c:\Apache2\htdocs\account2/inventory/manage/locations.php:170
+#: c:\Apache2\htdocs\account2/inventory/manage/locations.php:171
 msgid "Contact for deliveries:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/inventory/manage/locations.php:172
-#: c:\Apache2\htdocs\account2/inventory/manage/locations.php:174
+#: c:\Apache2\htdocs\account2/inventory/manage/locations.php:175
 msgid "Telephone No:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/inventory/manage/locations.php:173
-#: c:\Apache2\htdocs\account2/inventory/manage/locations.php:175
+#: c:\Apache2\htdocs\account2/inventory/manage/locations.php:176
 msgid "Facsimile No:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/inventory/manage/locations.php:174
-# c:\Apache2\htdocs\account/purchasing/manage/suppliers.php:186
-# c:\Apache2\htdocs\account/sales/manage/customers.php:276
-# c:\Apache2\htdocs\account/sales/manage/sales_people.php:138
-#: c:\Apache2\htdocs\account2/inventory/manage/locations.php:176
-#: c:\Apache2\htdocs\account2/purchasing/manage/suppliers.php:186
-#: c:\Apache2\htdocs\account2/sales/manage/customers.php:256
-#: c:\Apache2\htdocs\account2/sales/manage/sales_people.php:149
+#: c:\Apache2\htdocs\account2/inventory/manage/locations.php:177
+#: c:\Apache2\htdocs\account2/purchasing/manage/suppliers.php:182
+#: c:\Apache2\htdocs\account2/sales/manage/customers.php:226
+#: c:\Apache2\htdocs\account2/sales/manage/sales_people.php:168
 msgid "Email:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/inventory/manage/movement_types.php:33
-#: c:\Apache2\htdocs\account2/inventory/manage/movement_types.php:33
+#: c:\Apache2\htdocs\account2/inventory/manage/movement_types.php:25
 msgid "The inventory movement type name cannot be empty."
 msgstr ""
 
-# c:\Apache2\htdocs\account/inventory/manage/movement_types.php:65
-#: c:\Apache2\htdocs\account2/inventory/manage/movement_types.php:66
+#: c:\Apache2\htdocs\account2/inventory/manage/movement_types.php:34
+msgid "Selected movement type has been updated"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/inventory/manage/movement_types.php:39
+msgid "New movement type has been added"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/inventory/manage/movement_types.php:56
 msgid "Cannot delete this inventory movement type because item transactions have been created referring to it."
 msgstr ""
 
-# c:\Apache2\htdocs\account/inventory/manage/movement_types.php:109
-#: c:\Apache2\htdocs\account2/inventory/manage/movement_types.php:110
-msgid "New Inventory Movement Type"
+#: c:\Apache2\htdocs\account2/inventory/manage/movement_types.php:71
+msgid "Selected movement type has been deleted"
 msgstr ""
 
-# c:\Apache2\htdocs\account/inventory/view/view_adjustment.php:8
 #: c:\Apache2\htdocs\account2/inventory/view/view_adjustment.php:8
 msgid "View Inventory Adjustment"
 msgstr ""
 
-# c:\Apache2\htdocs\account/inventory/view/view_adjustment.php:33
 #: c:\Apache2\htdocs\account2/inventory/view/view_adjustment.php:33
 msgid "At Location"
 msgstr ""
 
-# c:\Apache2\htdocs\account/inventory/view/view_adjustment.php:36
-# c:\Apache2\htdocs\account/inventory/view/view_transfer.php:37
 #: c:\Apache2\htdocs\account2/inventory/view/view_adjustment.php:36
 #: c:\Apache2\htdocs\account2/inventory/view/view_transfer.php:37
 msgid "Adjustment Type"
 msgstr ""
 
-# c:\Apache2\htdocs\account/inventory/view/view_adjustment.php:46
-# c:\Apache2\htdocs\account/inventory/view/view_transfer.php:48
-# c:\Apache2\htdocs\account/manufacturing/manage/bom_edit.php:92
-# c:\Apache2\htdocs\account/manufacturing/view/wo_issue_view.php:68
-# c:\Apache2\htdocs\account/purchasing/view/view_grn.php:27
-# c:\Apache2\htdocs\account/purchasing/view/view_po.php:38
-# c:\Apache2\htdocs\account/reporting/rep301.php:85
-# c:\Apache2\htdocs\account/reporting/rep303.php:124
-# c:\Apache2\htdocs\account/reporting/rep401.php:60
-# c:\Apache2\htdocs\account/sales/view/view_credit.php:81
-# c:\Apache2\htdocs\account/sales/view/view_invoice.php:99
-# c:\Apache2\htdocs\account/sales/view/view_sales_order.php:140
-# c:\Apache2\htdocs\account/inventory/includes/item_adjustments_ui.inc:74
-# c:\Apache2\htdocs\account/inventory/includes/stock_transfers_ui.inc:70
-# c:\Apache2\htdocs\account/manufacturing/includes/manufacturing_ui.inc:22
-# c:\Apache2\htdocs\account/manufacturing/includes/manufacturing_ui.inc:149
-# c:\Apache2\htdocs\account/manufacturing/includes/manufacturing_ui.inc:324
-# c:\Apache2\htdocs\account/manufacturing/includes/work_order_issue_ui.inc:43
-# c:\Apache2\htdocs\account/purchasing/includes/ui/invoice_ui.inc:303
-# c:\Apache2\htdocs\account/purchasing/includes/ui/po_ui.inc:167
-# c:\Apache2\htdocs\account/reporting/includes/doctext.inc:37
-# c:\Apache2\htdocs\account/reporting/includes/doctext.inc:39
-# c:\Apache2\htdocs\account/sales/includes/ui/sales_credit_ui.inc:103
-# c:\Apache2\htdocs\account/sales/includes/ui/sales_order_ui.inc:109
 #: c:\Apache2\htdocs\account2/inventory/view/view_adjustment.php:46
 #: c:\Apache2\htdocs\account2/inventory/view/view_transfer.php:48
-#: c:\Apache2\htdocs\account2/manufacturing/manage/bom_edit.php:92
-#: c:\Apache2\htdocs\account2/manufacturing/view/wo_issue_view.php:68
+#: c:\Apache2\htdocs\account2/manufacturing/manage/bom_edit.php:95
+#: c:\Apache2\htdocs\account2/manufacturing/view/wo_issue_view.php:71
 #: c:\Apache2\htdocs\account2/purchasing/view/view_grn.php:27
 #: c:\Apache2\htdocs\account2/purchasing/view/view_po.php:38
 #: c:\Apache2\htdocs\account2/reporting/rep301.php:85
-#: c:\Apache2\htdocs\account2/reporting/rep303.php:124
-#: c:\Apache2\htdocs\account2/reporting/rep401.php:60
+#: c:\Apache2\htdocs\account2/reporting/rep303.php:122
+#: c:\Apache2\htdocs\account2/reporting/rep401.php:58
 #: c:\Apache2\htdocs\account2/sales/view/view_credit.php:81
 #: c:\Apache2\htdocs\account2/sales/view/view_dispatch.php:103
 #: c:\Apache2\htdocs\account2/sales/view/view_invoice.php:103
 #: c:\Apache2\htdocs\account2/sales/view/view_sales_order.php:172
-#: c:\Apache2\htdocs\account2/inventory/includes/item_adjustments_ui.inc:74
-#: c:\Apache2\htdocs\account2/inventory/includes/stock_transfers_ui.inc:70
+#: c:\Apache2\htdocs\account2/inventory/includes/item_adjustments_ui.inc:64
+#: c:\Apache2\htdocs\account2/inventory/includes/stock_transfers_ui.inc:60
 #: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:22
-#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:149
-#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:324
-#: c:\Apache2\htdocs\account2/manufacturing/includes/work_order_issue_ui.inc:43
-#: c:\Apache2\htdocs\account2/purchasing/includes/ui/invoice_ui.inc:297
-#: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:167
-#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:46
-#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:48
-#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_credit_ui.inc:108
-#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:85
+#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:150
+#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:325
+#: c:\Apache2\htdocs\account2/manufacturing/includes/work_order_issue_ui.inc:24
+#: c:\Apache2\htdocs\account2/purchasing/includes/ui/invoice_ui.inc:301
+#: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:165
+#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:47
+#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:49
+#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_credit_ui.inc:152
+#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:82
 msgid "Quantity"
 msgstr ""
 
-# c:\Apache2\htdocs\account/inventory/view/view_adjustment.php:47
-# c:\Apache2\htdocs\account/inventory/view/view_transfer.php:48
-# c:\Apache2\htdocs\account/manufacturing/manage/bom_edit.php:92
-# c:\Apache2\htdocs\account/manufacturing/view/wo_issue_view.php:68
-# c:\Apache2\htdocs\account/purchasing/po_receive_items.php:49
-# c:\Apache2\htdocs\account/sales/customer_credit_invoice.php:283
-# c:\Apache2\htdocs\account/sales/customer_invoice.php:378
 #: c:\Apache2\htdocs\account2/inventory/view/view_adjustment.php:47
 #: c:\Apache2\htdocs\account2/inventory/view/view_transfer.php:48
-#: c:\Apache2\htdocs\account2/manufacturing/manage/bom_edit.php:92
-#: c:\Apache2\htdocs\account2/manufacturing/view/wo_issue_view.php:68
-#: c:\Apache2\htdocs\account2/purchasing/po_receive_items.php:51
-#: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:266
-#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:353
-#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:325
+#: c:\Apache2\htdocs\account2/manufacturing/manage/bom_edit.php:95
+#: c:\Apache2\htdocs\account2/manufacturing/view/wo_issue_view.php:71
+#: c:\Apache2\htdocs\account2/purchasing/po_receive_items.php:53
+#: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:280
+#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:366
+#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:351
 msgid "Units"
 msgstr ""
 
-# c:\Apache2\htdocs\account/inventory/view/view_adjustment.php:47
-# c:\Apache2\htdocs\account/reporting/rep301.php:85
-# c:\Apache2\htdocs\account/inventory/includes/item_adjustments_ui.inc:75
-# c:\Apache2\htdocs\account/manufacturing/includes/manufacturing_ui.inc:22
-# c:\Apache2\htdocs\account/manufacturing/includes/work_order_issue_ui.inc:44
 #: c:\Apache2\htdocs\account2/inventory/view/view_adjustment.php:47
 #: c:\Apache2\htdocs\account2/reporting/rep301.php:85
-#: c:\Apache2\htdocs\account2/inventory/includes/item_adjustments_ui.inc:75
+#: c:\Apache2\htdocs\account2/inventory/includes/item_adjustments_ui.inc:65
 #: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:22
-#: c:\Apache2\htdocs\account2/manufacturing/includes/work_order_issue_ui.inc:44
+#: c:\Apache2\htdocs\account2/manufacturing/includes/work_order_issue_ui.inc:25
 msgid "Unit Cost"
 msgstr ""
 
-# c:\Apache2\htdocs\account/inventory/view/view_adjustment.php:63
 #: c:\Apache2\htdocs\account2/inventory/view/view_adjustment.php:63
 msgid "This adjustment has been voided."
 msgstr ""
 
-# c:\Apache2\htdocs\account/inventory/view/view_transfer.php:8
 #: c:\Apache2\htdocs\account2/inventory/view/view_transfer.php:8
 msgid "View Inventory Transfer"
 msgstr ""
 
-# c:\Apache2\htdocs\account/inventory/view/view_transfer.php:31
-# c:\Apache2\htdocs\account/manufacturing/view/wo_issue_view.php:33
-# c:\Apache2\htdocs\account/manufacturing/includes/manufacturing_ui.inc:22
-# c:\Apache2\htdocs\account/manufacturing/includes/manufacturing_ui.inc:76
 #: c:\Apache2\htdocs\account2/inventory/view/view_transfer.php:31
-#: c:\Apache2\htdocs\account2/manufacturing/view/wo_issue_view.php:33
+#: c:\Apache2\htdocs\account2/manufacturing/view/wo_issue_view.php:36
 #: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:22
 #: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:76
 msgid "From Location"
 msgstr ""
 
-# c:\Apache2\htdocs\account/inventory/view/view_transfer.php:32
 #: c:\Apache2\htdocs\account2/inventory/view/view_transfer.php:32
 msgid "To Location"
 msgstr ""
 
-# c:\Apache2\htdocs\account/manufacturing/search_work_orders.php:15
-#: c:\Apache2\htdocs\account2/manufacturing/search_work_orders.php:15
+#: c:\Apache2\htdocs\account2/manufacturing/search_work_orders.php:16
 msgid "Search Outstanding Work Orders"
 msgstr ""
 
-# c:\Apache2\htdocs\account/manufacturing/search_work_orders.php:20
-#: c:\Apache2\htdocs\account2/manufacturing/search_work_orders.php:20
+#: c:\Apache2\htdocs\account2/manufacturing/search_work_orders.php:21
 msgid "Search Work Orders"
 msgstr ""
 
-# c:\Apache2\htdocs\account/manufacturing/search_work_orders.php:37
-#: c:\Apache2\htdocs\account2/manufacturing/search_work_orders.php:37
+#: c:\Apache2\htdocs\account2/manufacturing/search_work_orders.php:61
 msgid "at Location:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/manufacturing/search_work_orders.php:43
-# c:\Apache2\htdocs\account/purchasing/inquiry/po_search_completed.php:31
-#: c:\Apache2\htdocs\account2/manufacturing/search_work_orders.php:43
-#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search_completed.php:34
+#: c:\Apache2\htdocs\account2/manufacturing/search_work_orders.php:68
+#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search_completed.php:57
 msgid "for item:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/manufacturing/search_work_orders.php:89
-#: c:\Apache2\htdocs\account2/manufacturing/search_work_orders.php:89
+#: c:\Apache2\htdocs\account2/manufacturing/search_work_orders.php:70
+#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search.php:61
+#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search_completed.php:59
+#: c:\Apache2\htdocs\account2/sales/inquiry/sales_deliveries_view.php:115
+#: c:\Apache2\htdocs\account2/sales/inquiry/sales_orders_view.php:91
+msgid "Select documents"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/manufacturing/search_work_orders.php:115
 msgid "Required"
 msgstr ""
 
-# c:\Apache2\htdocs\account/manufacturing/search_work_orders.php:89
-# c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:818
-# c:\Apache2\htdocs\account/manufacturing/includes/manufacturing_ui.inc:270
-#: c:\Apache2\htdocs\account2/manufacturing/search_work_orders.php:89
-#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:1018
-#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:270
+#: c:\Apache2\htdocs\account2/manufacturing/search_work_orders.php:115
+#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:787
+#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:271
 msgid "Manufactured"
 msgstr ""
 
-# c:\Apache2\htdocs\account/manufacturing/search_work_orders.php:89
-# c:\Apache2\htdocs\account/sales/inquiry/sales_orders_view.php:126
-# c:\Apache2\htdocs\account/manufacturing/includes/manufacturing_ui.inc:269
-# c:\Apache2\htdocs\account/manufacturing/includes/manufacturing_ui.inc:273
-#: c:\Apache2\htdocs\account2/manufacturing/search_work_orders.php:89
-#: c:\Apache2\htdocs\account2/sales/inquiry/sales_orders_view.php:175
-#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:269
-#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:273
+#: c:\Apache2\htdocs\account2/manufacturing/search_work_orders.php:115
+#: c:\Apache2\htdocs\account2/sales/inquiry/sales_orders_view.php:193
+#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:270
+#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:274
 msgid "Required By"
 msgstr ""
 
-# c:\Apache2\htdocs\account/manufacturing/search_work_orders.php:115
-#: c:\Apache2\htdocs\account2/manufacturing/search_work_orders.php:115
+#: c:\Apache2\htdocs\account2/manufacturing/search_work_orders.php:153
+msgid "Release"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/manufacturing/search_work_orders.php:160
 msgid "Issue"
 msgstr ""
 
-# c:\Apache2\htdocs\account/manufacturing/search_work_orders.php:116
-#: c:\Apache2\htdocs\account2/manufacturing/search_work_orders.php:116
+#: c:\Apache2\htdocs\account2/manufacturing/search_work_orders.php:161
 msgid "Produce"
 msgstr ""
 
-# c:\Apache2\htdocs\account/manufacturing/search_work_orders.php:117
-#: c:\Apache2\htdocs\account2/manufacturing/search_work_orders.php:117
+#: c:\Apache2\htdocs\account2/manufacturing/search_work_orders.php:162
 msgid "Costs"
 msgstr ""
 
-# c:\Apache2\htdocs\account/manufacturing/search_work_orders.php:117
-#: c:\Apache2\htdocs\account2/manufacturing/search_work_orders.php:117
-msgid "Not Released"
-msgstr ""
-
-# c:\Apache2\htdocs\account/manufacturing/search_work_orders.php:138
-#: c:\Apache2\htdocs\account2/manufacturing/search_work_orders.php:138
-msgid "Release"
-msgstr ""
-
-# c:\Apache2\htdocs\account/manufacturing/work_order_add_finished.php:7
-#: c:\Apache2\htdocs\account2/manufacturing/work_order_add_finished.php:17
+#: c:\Apache2\htdocs\account2/manufacturing/work_order_add_finished.php:19
 msgid "Produce or Unassemble Finished Items From Work Order"
 msgstr ""
 
-# c:\Apache2\htdocs\account/manufacturing/work_order_add_finished.php:26
-#: c:\Apache2\htdocs\account2/manufacturing/work_order_add_finished.php:29
+#: c:\Apache2\htdocs\account2/manufacturing/work_order_add_finished.php:31
 msgid "The manufacturing process has been entered."
 msgstr ""
 
-# c:\Apache2\htdocs\account/manufacturing/work_order_add_finished.php:28
-# c:\Apache2\htdocs\account/manufacturing/work_order_issue.php:24
-#: c:\Apache2\htdocs\account2/manufacturing/work_order_add_finished.php:31
-#: c:\Apache2\htdocs\account2/manufacturing/work_order_issue.php:26
+#: c:\Apache2\htdocs\account2/manufacturing/work_order_add_finished.php:33
+#: c:\Apache2\htdocs\account2/manufacturing/work_order_issue.php:28
 msgid "Select another Work Order to Process"
 msgstr ""
 
-# c:\Apache2\htdocs\account/manufacturing/work_order_add_finished.php:40
-# c:\Apache2\htdocs\account/manufacturing/work_order_entry.php:294
-# c:\Apache2\htdocs\account/manufacturing/includes/db/work_order_issues_db.inc:14
-# c:\Apache2\htdocs\account/manufacturing/includes/db/work_order_produce_items_db.inc:11
-#: c:\Apache2\htdocs\account2/manufacturing/work_order_add_finished.php:43
-#: c:\Apache2\htdocs\account2/manufacturing/work_order_entry.php:298
+#: c:\Apache2\htdocs\account2/manufacturing/work_order_add_finished.php:45
+#: c:\Apache2\htdocs\account2/manufacturing/work_order_entry.php:304
 #: c:\Apache2\htdocs\account2/manufacturing/includes/db/work_order_issues_db.inc:14
 #: c:\Apache2\htdocs\account2/manufacturing/includes/db/work_order_produce_items_db.inc:11
 msgid "The order number sent is not valid."
 msgstr ""
 
-#: c:\Apache2\htdocs\account2/manufacturing/work_order_add_finished.php:69
+#: c:\Apache2\htdocs\account2/manufacturing/work_order_add_finished.php:71
 msgid "The quantity entered is not a valid number or less then zero."
 msgstr ""
 
-# c:\Apache2\htdocs\account/manufacturing/work_order_add_finished.php:86
-#: c:\Apache2\htdocs\account2/manufacturing/work_order_add_finished.php:88
+#: c:\Apache2\htdocs\account2/manufacturing/work_order_add_finished.php:90
 msgid "The production date cannot be before the release date of the work order."
 msgstr ""
 
-# c:\Apache2\htdocs\account/manufacturing/work_order_add_finished.php:98
-#: c:\Apache2\htdocs\account2/manufacturing/work_order_add_finished.php:101
+#: c:\Apache2\htdocs\account2/manufacturing/work_order_add_finished.php:103
 msgid "The unassembling cannot be processed because there is insufficient stock."
 msgstr ""
 
-# c:\Apache2\htdocs\account/manufacturing/work_order_add_finished.php:149
-#: c:\Apache2\htdocs\account2/manufacturing/work_order_add_finished.php:153
+#: c:\Apache2\htdocs\account2/manufacturing/work_order_add_finished.php:155
 msgid "Produce Finished Items"
 msgstr ""
 
-# c:\Apache2\htdocs\account/manufacturing/work_order_add_finished.php:149
-#: c:\Apache2\htdocs\account2/manufacturing/work_order_add_finished.php:153
+#: c:\Apache2\htdocs\account2/manufacturing/work_order_add_finished.php:155
 msgid "Return Items to Work Order"
 msgstr ""
 
-# c:\Apache2\htdocs\account/manufacturing/work_order_add_finished.php:151
-# c:\Apache2\htdocs\account/manufacturing/work_order_entry.php:368
-# c:\Apache2\htdocs\account/manufacturing/manage/bom_edit.php:274
-#: c:\Apache2\htdocs\account2/manufacturing/work_order_add_finished.php:155
-#: c:\Apache2\htdocs\account2/manufacturing/work_order_entry.php:374
+#: c:\Apache2\htdocs\account2/manufacturing/work_order_add_finished.php:157
+#: c:\Apache2\htdocs\account2/manufacturing/work_order_entry.php:381
 #: c:\Apache2\htdocs\account2/manufacturing/manage/bom_edit.php:272
 msgid "Quantity:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/manufacturing/work_order_add_finished.php:153
-# c:\Apache2\htdocs\account/purchasing/allocations/supplier_allocate.php:187
-# c:\Apache2\htdocs\account/sales/allocations/customer_allocate.php:178
-# c:\Apache2\htdocs\account/gl/includes/ui/gl_deposit_ui.inc:18
-# c:\Apache2\htdocs\account/gl/includes/ui/gl_journal_ui.inc:17
-# c:\Apache2\htdocs\account/gl/includes/ui/gl_payment_ui.inc:18
-# c:\Apache2\htdocs\account/inventory/includes/item_adjustments_ui.inc:46
-# c:\Apache2\htdocs\account/inventory/includes/stock_transfers_ui.inc:48
-# c:\Apache2\htdocs\account/sales/includes/ui/sales_credit_ui.inc:80
-#: c:\Apache2\htdocs\account2/manufacturing/work_order_add_finished.php:157
-#: c:\Apache2\htdocs\account2/purchasing/allocations/supplier_allocate.php:185
-#: c:\Apache2\htdocs\account2/sales/allocations/customer_allocate.php:185
-#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_deposit_ui.inc:18
+#: c:\Apache2\htdocs\account2/manufacturing/work_order_add_finished.php:159
+#: c:\Apache2\htdocs\account2/purchasing/allocations/supplier_allocate.php:177
+#: c:\Apache2\htdocs\account2/sales/allocations/customer_allocate.php:177
+#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_bank_ui.inc:16
 #: c:\Apache2\htdocs\account2/gl/includes/ui/gl_journal_ui.inc:17
-#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_payment_ui.inc:18
-#: c:\Apache2\htdocs\account2/inventory/includes/item_adjustments_ui.inc:46
-#: c:\Apache2\htdocs\account2/inventory/includes/stock_transfers_ui.inc:48
-#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_credit_ui.inc:84
+#: c:\Apache2\htdocs\account2/inventory/includes/item_adjustments_ui.inc:35
+#: c:\Apache2\htdocs\account2/inventory/includes/stock_transfers_ui.inc:37
+#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_credit_ui.inc:130
 msgid "Date:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/manufacturing/work_order_add_finished.php:159
-# c:\Apache2\htdocs\account/purchasing/allocations/supplier_allocate.php:246
-# c:\Apache2\htdocs\account/sales/allocations/customer_allocate.php:237
-#: c:\Apache2\htdocs\account2/manufacturing/work_order_add_finished.php:163
-#: c:\Apache2\htdocs\account2/purchasing/allocations/supplier_allocate.php:249
-#: c:\Apache2\htdocs\account2/sales/allocations/customer_allocate.php:248
+#: c:\Apache2\htdocs\account2/manufacturing/work_order_add_finished.php:165
+#: c:\Apache2\htdocs\account2/purchasing/allocations/supplier_allocate.php:235
+#: c:\Apache2\htdocs\account2/sales/allocations/customer_allocate.php:239
 msgid "Process"
 msgstr ""
 
-# c:\Apache2\htdocs\account/manufacturing/work_order_add_finished.php:160
-#: c:\Apache2\htdocs\account2/manufacturing/work_order_add_finished.php:164
+#: c:\Apache2\htdocs\account2/manufacturing/work_order_add_finished.php:166
 msgid "Process And Close Order"
 msgstr ""
 
-# c:\Apache2\htdocs\account/manufacturing/work_order_entry.php:17
 #: c:\Apache2\htdocs\account2/manufacturing/work_order_entry.php:21
 msgid "There are no manufacturable items defined in the system."
 msgstr ""
 
-# c:\Apache2\htdocs\account/manufacturing/work_order_entry.php:38
 #: c:\Apache2\htdocs\account2/manufacturing/work_order_entry.php:42
 msgid "The work order been added."
 msgstr ""
 
-# c:\Apache2\htdocs\account/manufacturing/work_order_entry.php:49
 #: c:\Apache2\htdocs\account2/manufacturing/work_order_entry.php:53
 msgid "The work order been updated."
 msgstr ""
 
-# c:\Apache2\htdocs\account/manufacturing/work_order_entry.php:59
 #: c:\Apache2\htdocs\account2/manufacturing/work_order_entry.php:63
 msgid "Work order has been deleted."
 msgstr ""
 
-# c:\Apache2\htdocs\account/manufacturing/work_order_entry.php:69
 #: c:\Apache2\htdocs\account2/manufacturing/work_order_entry.php:73
 msgid "This work order has been closed. There can be no more issues against it."
 msgstr ""
 
-# c:\Apache2\htdocs\account/manufacturing/work_order_entry.php:79
 #: c:\Apache2\htdocs\account2/manufacturing/work_order_entry.php:83
 msgid "Enter a new work order"
 msgstr ""
 
-# c:\Apache2\htdocs\account/manufacturing/work_order_entry.php:80
 #: c:\Apache2\htdocs\account2/manufacturing/work_order_entry.php:84
 msgid "Select an existing work order"
 msgstr ""
@@ -6346,7 +4630,6 @@ msgstr ""
 msgid "The quantity entered is invalid or less than zero."
 msgstr ""
 
-# c:\Apache2\htdocs\account/manufacturing/work_order_entry.php:141
 #: c:\Apache2\htdocs\account2/manufacturing/work_order_entry.php:144
 msgid "The selected item to manufacture does not have a bom."
 msgstr ""
@@ -6355,806 +4638,623 @@ msgstr ""
 msgid "The cost entered is invalid or less than zero."
 msgstr ""
 
-# c:\Apache2\htdocs\account/manufacturing/work_order_entry.php:175
 #: c:\Apache2\htdocs\account2/manufacturing/work_order_entry.php:176
 msgid "The work order cannot be processed because there is an insufficient quantity for component:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/manufacturing/work_order_entry.php:176
-# c:\Apache2\htdocs\account/purchasing/inquiry/po_search.php:30
-# c:\Apache2\htdocs\account/sales/inquiry/sales_orders_view.php:45
-# c:\Apache2\htdocs\account/inventory/includes/item_adjustments_ui.inc:37
 #: c:\Apache2\htdocs\account2/manufacturing/work_order_entry.php:177
-#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search.php:33
-#: c:\Apache2\htdocs\account2/sales/inquiry/sales_deliveries_view.php:89
-#: c:\Apache2\htdocs\account2/sales/inquiry/sales_orders_view.php:77
-#: c:\Apache2\htdocs\account2/inventory/includes/item_adjustments_ui.inc:37
+#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search.php:57
+#: c:\Apache2\htdocs\account2/sales/inquiry/sales_deliveries_view.php:111
+#: c:\Apache2\htdocs\account2/sales/inquiry/sales_orders_view.php:87
+#: c:\Apache2\htdocs\account2/inventory/includes/item_adjustments_ui.inc:26
 msgid "Location:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/manufacturing/work_order_entry.php:188
 #: c:\Apache2\htdocs\account2/manufacturing/work_order_entry.php:190
 msgid "The selected item cannot be unassembled because there is insufficient stock."
 msgstr ""
 
-# c:\Apache2\htdocs\account/manufacturing/work_order_entry.php:212
 #: c:\Apache2\htdocs\account2/manufacturing/work_order_entry.php:216
 msgid "The quantity cannot be changed to be less than the quantity already manufactured for this order."
 msgstr ""
 
-# c:\Apache2\htdocs\account/manufacturing/work_order_entry.php:257
 #: c:\Apache2\htdocs\account2/manufacturing/work_order_entry.php:261
 msgid "This work order cannot be deleted because it has already been processed."
 msgstr ""
 
-# c:\Apache2\htdocs\account/manufacturing/work_order_entry.php:302
-#: c:\Apache2\htdocs\account2/manufacturing/work_order_entry.php:306
+#: c:\Apache2\htdocs\account2/manufacturing/work_order_entry.php:312
 msgid "This work order is closed and cannot be edited."
 msgstr ""
 
-# c:\Apache2\htdocs\account/manufacturing/work_order_entry.php:346
-# c:\Apache2\htdocs\account/manufacturing/work_order_entry.php:352
-#: c:\Apache2\htdocs\account2/manufacturing/work_order_entry.php:352
-#: c:\Apache2\htdocs\account2/manufacturing/work_order_entry.php:358
+#: c:\Apache2\htdocs\account2/manufacturing/work_order_entry.php:359
+#: c:\Apache2\htdocs\account2/manufacturing/work_order_entry.php:365
 msgid "Destination Location:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/manufacturing/work_order_entry.php:360
-#: c:\Apache2\htdocs\account2/manufacturing/work_order_entry.php:366
+#: c:\Apache2\htdocs\account2/manufacturing/work_order_entry.php:373
 msgid "Quantity Required:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/manufacturing/work_order_entry.php:362
-#: c:\Apache2\htdocs\account2/manufacturing/work_order_entry.php:368
+#: c:\Apache2\htdocs\account2/manufacturing/work_order_entry.php:375
 msgid "Quantity Manufactured:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/manufacturing/work_order_entry.php:375
-#: c:\Apache2\htdocs\account2/manufacturing/work_order_entry.php:381
+#: c:\Apache2\htdocs\account2/manufacturing/work_order_entry.php:388
 msgid "Total Additional Costs:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/manufacturing/work_order_entry.php:379
-#: c:\Apache2\htdocs\account2/manufacturing/work_order_entry.php:385
+#: c:\Apache2\htdocs\account2/manufacturing/work_order_entry.php:392
 msgid "Released On:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/manufacturing/work_order_entry.php:393
-#: c:\Apache2\htdocs\account2/manufacturing/work_order_entry.php:399
+#: c:\Apache2\htdocs\account2/manufacturing/work_order_entry.php:402
+msgid "Save changes to work order"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/manufacturing/work_order_entry.php:405
 msgid "Close This Work Order"
 msgstr ""
 
-# c:\Apache2\htdocs\account/manufacturing/work_order_entry.php:395
-#: c:\Apache2\htdocs\account2/manufacturing/work_order_entry.php:401
+#: c:\Apache2\htdocs\account2/manufacturing/work_order_entry.php:407
 msgid "Delete This Work Order"
 msgstr ""
 
-# c:\Apache2\htdocs\account/manufacturing/work_order_issue.php:9
-#: c:\Apache2\htdocs\account2/manufacturing/work_order_issue.php:18
+#: c:\Apache2\htdocs\account2/manufacturing/work_order_entry.php:413
+msgid "Add Workorder"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/manufacturing/work_order_issue.php:20
 msgid "Issue Items to Work Order"
 msgstr ""
 
-# c:\Apache2\htdocs\account/manufacturing/work_order_issue.php:22
-#: c:\Apache2\htdocs\account2/manufacturing/work_order_issue.php:24
+#: c:\Apache2\htdocs\account2/manufacturing/work_order_issue.php:26
 msgid "The work order issue has been entered."
 msgstr ""
 
-# c:\Apache2\htdocs\account/manufacturing/work_order_issue.php:52
-#: c:\Apache2\htdocs\account2/manufacturing/work_order_issue.php:54
+#: c:\Apache2\htdocs\account2/manufacturing/work_order_issue.php:63
 msgid "The entered date for the issue is invalid."
 msgstr ""
 
-# c:\Apache2\htdocs\account/manufacturing/work_order_issue.php:75
-#: c:\Apache2\htdocs\account2/manufacturing/work_order_issue.php:81
+#: c:\Apache2\htdocs\account2/manufacturing/work_order_issue.php:90
 msgid "The issue cannot be processed because an entered item would cause a negative inventory balance :"
 msgstr ""
 
-# c:\Apache2\htdocs\account/manufacturing/work_order_issue.php:93
-#: c:\Apache2\htdocs\account2/manufacturing/work_order_issue.php:99
+#: c:\Apache2\htdocs\account2/manufacturing/work_order_issue.php:108
 msgid "The process cannot be completed because there is an insufficient total quantity for a component."
 msgstr ""
 
-# c:\Apache2\htdocs\account/manufacturing/work_order_issue.php:94
-#: c:\Apache2\htdocs\account2/manufacturing/work_order_issue.php:100
+#: c:\Apache2\htdocs\account2/manufacturing/work_order_issue.php:109
 msgid "Component is :"
 msgstr ""
 
-# c:\Apache2\htdocs\account/manufacturing/work_order_issue.php:95
-#: c:\Apache2\htdocs\account2/manufacturing/work_order_issue.php:101
+#: c:\Apache2\htdocs\account2/manufacturing/work_order_issue.php:110
 msgid "From location :"
 msgstr ""
 
-# c:\Apache2\htdocs\account/inventory/adjustments.php:145
-# c:\Apache2\htdocs\account/manufacturing/work_order_add_finished.php:70
-# c:\Apache2\htdocs\account/manufacturing/work_order_issue.php:116
-# c:\Apache2\htdocs\account/manufacturing/manage/bom_edit.php:129
-#: c:\Apache2\htdocs\account2/manufacturing/work_order_issue.php:123
-msgid "The quantity entered must be greater than zero."
-msgstr ""
-
-# c:\Apache2\htdocs\account/manufacturing/work_order_issue.php:182
-#: c:\Apache2\htdocs\account2/manufacturing/work_order_issue.php:191
+#: c:\Apache2\htdocs\account2/manufacturing/work_order_issue.php:203
 msgid "Items to Issue"
 msgstr ""
 
-# c:\Apache2\htdocs\account/manufacturing/work_order_issue.php:195
-#: c:\Apache2\htdocs\account2/manufacturing/work_order_issue.php:204
+#: c:\Apache2\htdocs\account2/manufacturing/work_order_issue.php:209
 msgid "Process Issue"
 msgstr ""
 
-# c:\Apache2\htdocs\account/manufacturing/work_order_release.php:7
 #: c:\Apache2\htdocs\account2/manufacturing/work_order_release.php:16
 msgid "Work Order Release to Manufacturing"
 msgstr ""
 
-# c:\Apache2\htdocs\account/manufacturing/work_order_release.php:35
 #: c:\Apache2\htdocs\account2/manufacturing/work_order_release.php:38
 msgid "This work order has already been released."
 msgstr ""
 
-# c:\Apache2\htdocs\account/manufacturing/work_order_release.php:42
 #: c:\Apache2\htdocs\account2/manufacturing/work_order_release.php:46
 msgid "This Work Order cannot be released. The selected item to manufacture does not have a bom."
 msgstr ""
 
-# c:\Apache2\htdocs\account/manufacturing/work_order_release.php:55
-#: c:\Apache2\htdocs\account2/manufacturing/work_order_release.php:60
+#: c:\Apache2\htdocs\account2/manufacturing/work_order_release.php:59
 msgid "The work order has been released to manufacturing."
 msgstr ""
 
-# c:\Apache2\htdocs\account/manufacturing/work_order_release.php:57
-#: c:\Apache2\htdocs\account2/manufacturing/work_order_release.php:62
+#: c:\Apache2\htdocs\account2/manufacturing/work_order_release.php:61
 msgid "Select another work order"
 msgstr ""
 
-# c:\Apache2\htdocs\account/manufacturing/work_order_release.php:77
-#: c:\Apache2\htdocs\account2/manufacturing/work_order_release.php:82
+#: c:\Apache2\htdocs\account2/manufacturing/work_order_release.php:81
 msgid "Work Order #:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/manufacturing/work_order_release.php:78
-#: c:\Apache2\htdocs\account2/manufacturing/work_order_release.php:83
+#: c:\Apache2\htdocs\account2/manufacturing/work_order_release.php:82
 msgid "Work Order Reference:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/manufacturing/work_order_release.php:80
-# c:\Apache2\htdocs\account/manufacturing/includes/manufacturing_ui.inc:270
-#: c:\Apache2\htdocs\account2/manufacturing/work_order_release.php:85
-#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:270
+#: c:\Apache2\htdocs\account2/manufacturing/work_order_release.php:84
+#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:271
 msgid "Released Date"
 msgstr ""
 
-# c:\Apache2\htdocs\account/manufacturing/work_order_release.php:86
-#: c:\Apache2\htdocs\account2/manufacturing/work_order_release.php:91
+#: c:\Apache2\htdocs\account2/manufacturing/work_order_release.php:90
 msgid "Release Work Order"
 msgstr ""
 
-# c:\Apache2\htdocs\account/manufacturing/inquiry/bom_cost_inquiry.php:7
 #: c:\Apache2\htdocs\account2/manufacturing/inquiry/bom_cost_inquiry.php:7
 msgid "Costed Bill Of Material Inquiry"
 msgstr ""
 
-# c:\Apache2\htdocs\account/manufacturing/inquiry/bom_cost_inquiry.php:14
-# c:\Apache2\htdocs\account/manufacturing/manage/bom_edit.php:15
 #: c:\Apache2\htdocs\account2/manufacturing/inquiry/bom_cost_inquiry.php:14
 #: c:\Apache2\htdocs\account2/manufacturing/manage/bom_edit.php:15
 msgid "There are no manufactured or kit items defined in the system."
 msgstr ""
 
-# c:\Apache2\htdocs\account/manufacturing/inquiry/bom_cost_inquiry.php:29
 #: c:\Apache2\htdocs\account2/manufacturing/inquiry/bom_cost_inquiry.php:29
 msgid "All Costs Are In:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/manufacturing/inquiry/bom_cost_inquiry.php:34
 #: c:\Apache2\htdocs\account2/manufacturing/inquiry/bom_cost_inquiry.php:34
 msgid "Enter an item code above, to view the costed bill of material for."
 msgstr ""
 
-# c:\Apache2\htdocs\account/manufacturing/inquiry/where_used_inquiry.php:20
 #: c:\Apache2\htdocs\account2/manufacturing/inquiry/where_used_inquiry.php:19
 msgid "Select an item to display its parent item(s)."
 msgstr ""
 
-# c:\Apache2\htdocs\account/manufacturing/inquiry/where_used_inquiry.php:38
-#: c:\Apache2\htdocs\account2/manufacturing/inquiry/where_used_inquiry.php:37
+#: c:\Apache2\htdocs\account2/manufacturing/inquiry/where_used_inquiry.php:41
 msgid "The selected item is not used in any BOMs."
 msgstr ""
 
-# c:\Apache2\htdocs\account/manufacturing/inquiry/where_used_inquiry.php:45
-#: c:\Apache2\htdocs\account2/manufacturing/inquiry/where_used_inquiry.php:44
+#: c:\Apache2\htdocs\account2/manufacturing/inquiry/where_used_inquiry.php:48
 msgid "Parent Item"
 msgstr ""
 
-# c:\Apache2\htdocs\account/manufacturing/inquiry/where_used_inquiry.php:45
-# c:\Apache2\htdocs\account/manufacturing/manage/bom_edit.php:92
-# c:\Apache2\htdocs\account/manufacturing/includes/manufacturing_ui.inc:21
-# c:\Apache2\htdocs\account/manufacturing/includes/manufacturing_ui.inc:76
-#: c:\Apache2\htdocs\account2/manufacturing/inquiry/where_used_inquiry.php:44
-#: c:\Apache2\htdocs\account2/manufacturing/manage/bom_edit.php:92
+#: c:\Apache2\htdocs\account2/manufacturing/inquiry/where_used_inquiry.php:48
+#: c:\Apache2\htdocs\account2/manufacturing/manage/bom_edit.php:95
 #: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:21
 #: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:76
 msgid "Work Centre"
 msgstr ""
 
-# c:\Apache2\htdocs\account/manufacturing/inquiry/where_used_inquiry.php:45
-# c:\Apache2\htdocs\account/manufacturing/includes/manufacturing_ui.inc:269
-# c:\Apache2\htdocs\account/manufacturing/includes/manufacturing_ui.inc:273
-#: c:\Apache2\htdocs\account2/manufacturing/inquiry/where_used_inquiry.php:44
-#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:269
-#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:273
+#: c:\Apache2\htdocs\account2/manufacturing/inquiry/where_used_inquiry.php:48
+#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:270
+#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:274
 msgid "Quantity Required"
 msgstr ""
 
-# c:\Apache2\htdocs\account/manufacturing/manage/bom_edit.php:7
 #: c:\Apache2\htdocs\account2/manufacturing/manage/bom_edit.php:7
 msgid "Bill Of Materials"
 msgstr ""
 
-# c:\Apache2\htdocs\account/manufacturing/manage/bom_edit.php:17
 #: c:\Apache2\htdocs\account2/manufacturing/manage/bom_edit.php:17
 msgid "There are no work centres defined in the system. BOMs require at least one work centre be defined."
 msgstr ""
 
-# c:\Apache2\htdocs\account/manufacturing/manage/bom_edit.php:91
-# c:\Apache2\htdocs\account/reporting/rep105.php:101
-#: c:\Apache2\htdocs\account2/manufacturing/manage/bom_edit.php:91
-#: c:\Apache2\htdocs\account2/reporting/rep105.php:101
+#: c:\Apache2\htdocs\account2/manufacturing/manage/bom_edit.php:94
+#: c:\Apache2\htdocs\account2/reporting/rep105.php:99
 msgid "Code"
 msgstr ""
 
-#: c:\Apache2\htdocs\account2/manufacturing/manage/bom_edit.php:121
+#: c:\Apache2\htdocs\account2/manufacturing/manage/bom_edit.php:125
 msgid "The quantity entered must be numeric and greater than zero."
 msgstr ""
 
-# c:\Apache2\htdocs\account/manufacturing/manage/bom_edit.php:177
-#: c:\Apache2\htdocs\account2/manufacturing/manage/bom_edit.php:173
+#: c:\Apache2\htdocs\account2/manufacturing/manage/bom_edit.php:141
+msgid "Selected component has been updated"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/manufacturing/manage/bom_edit.php:171
+msgid "A new component part has been added to the bill of material for this item."
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/manufacturing/manage/bom_edit.php:177
 msgid "The selected component is already on this bom. You can modify it's quantity but it cannot appear more than once on the same bom."
 msgstr ""
 
-# c:\Apache2\htdocs\account/manufacturing/manage/bom_edit.php:183
-#: c:\Apache2\htdocs\account2/manufacturing/manage/bom_edit.php:179
+#: c:\Apache2\htdocs\account2/manufacturing/manage/bom_edit.php:183
 msgid "The selected component is a parent of the current item. Recursive BOMs are not allowed."
 msgstr ""
 
-# c:\Apache2\htdocs\account/manufacturing/manage/bom_edit.php:196
-#: c:\Apache2\htdocs\account2/manufacturing/manage/bom_edit.php:192
-msgid "The component item has been deleted from this bom."
+#: c:\Apache2\htdocs\account2/manufacturing/manage/bom_edit.php:195
+msgid "The component item has been deleted from this bom"
 msgstr ""
 
-# c:\Apache2\htdocs\account/manufacturing/manage/bom_edit.php:205
-#: c:\Apache2\htdocs\account2/manufacturing/manage/bom_edit.php:201
+#: c:\Apache2\htdocs\account2/manufacturing/manage/bom_edit.php:209
 msgid "Select a manufacturable item:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/manufacturing/manage/bom_edit.php:225
-#: c:\Apache2\htdocs\account2/manufacturing/manage/bom_edit.php:223
-msgid "Add a new Component"
-msgstr ""
-
-# c:\Apache2\htdocs\account/manufacturing/manage/bom_edit.php:250
-# c:\Apache2\htdocs\account/manufacturing/manage/bom_edit.php:259
-#: c:\Apache2\htdocs\account2/manufacturing/manage/bom_edit.php:248
-#: c:\Apache2\htdocs\account2/manufacturing/manage/bom_edit.php:257
+#: c:\Apache2\htdocs\account2/manufacturing/manage/bom_edit.php:250
+#: c:\Apache2\htdocs\account2/manufacturing/manage/bom_edit.php:255
 msgid "Component:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/manufacturing/manage/bom_edit.php:267
-#: c:\Apache2\htdocs\account2/manufacturing/manage/bom_edit.php:265
+#: c:\Apache2\htdocs\account2/manufacturing/manage/bom_edit.php:268
 msgid "Location to Draw From:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/manufacturing/manage/bom_edit.php:268
-#: c:\Apache2\htdocs\account2/manufacturing/manage/bom_edit.php:266
+#: c:\Apache2\htdocs\account2/manufacturing/manage/bom_edit.php:269
 msgid "Work Centre Added:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/manufacturing/manage/bom_edit.php:277
-#: c:\Apache2\htdocs\account2/manufacturing/manage/bom_edit.php:275
-msgid "Add/Update"
+#: c:\Apache2\htdocs\account2/manufacturing/manage/work_centres.php:25
+msgid "The work centre name cannot be empty."
 msgstr ""
 
-# c:\Apache2\htdocs\account/manufacturing/manage/work_centres.php:33
-#: c:\Apache2\htdocs\account2/manufacturing/manage/work_centres.php:33
-msgid "The work centre name cannot be empty."
+#: c:\Apache2\htdocs\account2/manufacturing/manage/work_centres.php:35
+msgid "Selected work center has been updated"
 msgstr ""
 
-# c:\Apache2\htdocs\account/manufacturing/manage/work_centres.php:63
-#: c:\Apache2\htdocs\account2/manufacturing/manage/work_centres.php:64
+#: c:\Apache2\htdocs\account2/manufacturing/manage/work_centres.php:40
+msgid "New work center has been added"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/manufacturing/manage/work_centres.php:55
 msgid "Cannot delete this work centre because BOMs have been created referring to it."
 msgstr ""
 
-# c:\Apache2\htdocs\account/manufacturing/manage/work_centres.php:72
-#: c:\Apache2\htdocs\account2/manufacturing/manage/work_centres.php:73
+#: c:\Apache2\htdocs\account2/manufacturing/manage/work_centres.php:64
 msgid "Cannot delete this work centre because work order requirements have been created referring to it."
 msgstr ""
 
-# c:\Apache2\htdocs\account/manufacturing/manage/work_centres.php:97
-#: c:\Apache2\htdocs\account2/manufacturing/manage/work_centres.php:98
-msgid "description"
+#: c:\Apache2\htdocs\account2/manufacturing/manage/work_centres.php:80
+msgid "Selected work center has been deleted"
 msgstr ""
 
-# c:\Apache2\htdocs\account/manufacturing/manage/work_centres.php:117
-#: c:\Apache2\htdocs\account2/manufacturing/manage/work_centres.php:118
-msgid "New Work Centre"
+#: c:\Apache2\htdocs\account2/manufacturing/manage/work_centres.php:96
+msgid "description"
 msgstr ""
 
-# c:\Apache2\htdocs\account/manufacturing/view/work_order_view.php:17
 #: c:\Apache2\htdocs\account2/manufacturing/view/work_order_view.php:17
 msgid "View Work Order"
 msgstr ""
 
-# c:\Apache2\htdocs\account/manufacturing/view/work_order_view.php:41
 #: c:\Apache2\htdocs\account2/manufacturing/view/work_order_view.php:41
 msgid "BOM for item:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/manufacturing/view/work_order_view.php:46
 #: c:\Apache2\htdocs\account2/manufacturing/view/work_order_view.php:46
 msgid "Work Order Requirements"
 msgstr ""
 
-# c:\Apache2\htdocs\account/manufacturing/view/work_order_view.php:51
 #: c:\Apache2\htdocs\account2/manufacturing/view/work_order_view.php:51
 msgid "Issues"
 msgstr ""
 
-# c:\Apache2\htdocs\account/manufacturing/view/work_order_view.php:54
 #: c:\Apache2\htdocs\account2/manufacturing/view/work_order_view.php:54
 msgid "Productions"
 msgstr ""
 
-# c:\Apache2\htdocs\account/manufacturing/view/work_order_view.php:65
 #: c:\Apache2\htdocs\account2/manufacturing/view/work_order_view.php:65
 msgid "This work order has been voided."
 msgstr ""
 
-# c:\Apache2\htdocs\account/manufacturing/view/wo_issue_view.php:7
-#: c:\Apache2\htdocs\account2/manufacturing/view/wo_issue_view.php:7
+#: c:\Apache2\htdocs\account2/manufacturing/view/wo_issue_view.php:10
 msgid "View Work Order Issue"
 msgstr ""
 
-# c:\Apache2\htdocs\account/manufacturing/view/wo_issue_view.php:32
-#: c:\Apache2\htdocs\account2/manufacturing/view/wo_issue_view.php:32
+#: c:\Apache2\htdocs\account2/manufacturing/view/wo_issue_view.php:35
 msgid "Issue #"
 msgstr ""
 
-# c:\Apache2\htdocs\account/manufacturing/view/wo_issue_view.php:32
-# c:\Apache2\htdocs\account/manufacturing/view/wo_production_view.php:33
-#: c:\Apache2\htdocs\account2/manufacturing/view/wo_issue_view.php:32
+#: c:\Apache2\htdocs\account2/manufacturing/view/wo_issue_view.php:35
 #: c:\Apache2\htdocs\account2/manufacturing/view/wo_production_view.php:33
 msgid "For Work Order #"
 msgstr ""
 
-# c:\Apache2\htdocs\account/manufacturing/view/wo_issue_view.php:33
-#: c:\Apache2\htdocs\account2/manufacturing/view/wo_issue_view.php:33
+#: c:\Apache2\htdocs\account2/manufacturing/view/wo_issue_view.php:36
 msgid "To Work Centre"
 msgstr ""
 
-# c:\Apache2\htdocs\account/manufacturing/view/wo_issue_view.php:33
-#: c:\Apache2\htdocs\account2/manufacturing/view/wo_issue_view.php:33
+#: c:\Apache2\htdocs\account2/manufacturing/view/wo_issue_view.php:36
 msgid "Date of Issue"
 msgstr ""
 
-# c:\Apache2\htdocs\account/manufacturing/view/wo_issue_view.php:50
-#: c:\Apache2\htdocs\account2/manufacturing/view/wo_issue_view.php:50
+#: c:\Apache2\htdocs\account2/manufacturing/view/wo_issue_view.php:53
 msgid "This issue has been voided."
 msgstr ""
 
-# c:\Apache2\htdocs\account/manufacturing/view/wo_issue_view.php:63
-#: c:\Apache2\htdocs\account2/manufacturing/view/wo_issue_view.php:63
+#: c:\Apache2\htdocs\account2/manufacturing/view/wo_issue_view.php:66
 msgid "There are no items for this issue."
 msgstr ""
 
-# c:\Apache2\htdocs\account/manufacturing/view/wo_issue_view.php:68
-# c:\Apache2\htdocs\account/reporting/rep401.php:60
-# c:\Apache2\htdocs\account/reporting/rep401.php:65
-# c:\Apache2\htdocs\account/manufacturing/includes/manufacturing_ui.inc:21
-# c:\Apache2\htdocs\account/manufacturing/includes/manufacturing_ui.inc:76
-#: c:\Apache2\htdocs\account2/manufacturing/view/wo_issue_view.php:68
-#: c:\Apache2\htdocs\account2/reporting/rep401.php:60
-#: c:\Apache2\htdocs\account2/reporting/rep401.php:65
+#: c:\Apache2\htdocs\account2/manufacturing/view/wo_issue_view.php:71
+#: c:\Apache2\htdocs\account2/reporting/rep401.php:58
+#: c:\Apache2\htdocs\account2/reporting/rep401.php:63
 #: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:21
 #: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:76
 msgid "Component"
 msgstr ""
 
-# c:\Apache2\htdocs\account/manufacturing/view/wo_issue_view.php:105
-#: c:\Apache2\htdocs\account2/manufacturing/view/wo_issue_view.php:105
+#: c:\Apache2\htdocs\account2/manufacturing/view/wo_issue_view.php:108
 msgid "Items for this Issue"
 msgstr ""
 
-# c:\Apache2\htdocs\account/manufacturing/view/wo_production_view.php:8
 #: c:\Apache2\htdocs\account2/manufacturing/view/wo_production_view.php:8
 msgid "View Work Order Production"
 msgstr ""
 
-# c:\Apache2\htdocs\account/manufacturing/view/wo_production_view.php:33
 #: c:\Apache2\htdocs\account2/manufacturing/view/wo_production_view.php:33
 msgid "Production #"
 msgstr ""
 
-# c:\Apache2\htdocs\account/manufacturing/view/wo_production_view.php:34
 #: c:\Apache2\htdocs\account2/manufacturing/view/wo_production_view.php:34
 msgid "Quantity Manufactured"
 msgstr ""
 
-# c:\Apache2\htdocs\account/manufacturing/view/wo_production_view.php:50
 #: c:\Apache2\htdocs\account2/manufacturing/view/wo_production_view.php:50
 msgid "This production has been voided."
 msgstr ""
 
-#: c:\Apache2\htdocs\account2/modules/wiki/local/config.php:29
-#: c:\Apache2\htdocs\account2/includes/page/header.inc:127
-msgid "Help"
-msgstr ""
-
-# c:\Apache2\htdocs\account/purchasing/po_entry_items.php:21
 #: c:\Apache2\htdocs\account2/purchasing/po_entry_items.php:20
 msgid "Modify Purchase Order #"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/po_entry_items.php:42
 #: c:\Apache2\htdocs\account2/purchasing/po_entry_items.php:41
 msgid "Purchase Order has been entered"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/po_entry_items.php:44
 #: c:\Apache2\htdocs\account2/purchasing/po_entry_items.php:43
 msgid "Purchase Order has been updated"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/po_entry_items.php:45
-# c:\Apache2\htdocs\account/sales/sales_order_entry.php:41
-# c:\Apache2\htdocs\account/sales/sales_order_entry.php:58
 #: c:\Apache2\htdocs\account2/purchasing/po_entry_items.php:44
 msgid "View this order"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/po_entry_items.php:47
 #: c:\Apache2\htdocs\account2/purchasing/po_entry_items.php:46
 msgid "Receive Items on this Purchase Order"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/po_entry_items.php:49
 #: c:\Apache2\htdocs\account2/purchasing/po_entry_items.php:48
 msgid "Enter Another Purchase Order"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/po_entry_items.php:51
 #: c:\Apache2\htdocs\account2/purchasing/po_entry_items.php:50
 msgid "Select An Outstanding Purchase Order"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/po_entry_items.php:103
-#: c:\Apache2\htdocs\account2/purchasing/po_entry_items.php:102
+#: c:\Apache2\htdocs\account2/purchasing/po_entry_items.php:82
 msgid "This item cannot be deleted because some of it has already been received."
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/po_entry_items.php:117
-#: c:\Apache2\htdocs\account2/purchasing/po_entry_items.php:116
+#: c:\Apache2\htdocs\account2/purchasing/po_entry_items.php:97
 msgid "This order cannot be cancelled because some of it has already been received."
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/po_entry_items.php:118
-#: c:\Apache2\htdocs\account2/purchasing/po_entry_items.php:117
+#: c:\Apache2\htdocs\account2/purchasing/po_entry_items.php:98
 msgid "The line item quantities may be modified to quantities more than already received. prices cannot be altered for lines that have already been received and quantities cannot be reduced below the quantity already received."
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/po_entry_items.php:130
-#: c:\Apache2\htdocs\account2/purchasing/po_entry_items.php:129
+#: c:\Apache2\htdocs\account2/purchasing/po_entry_items.php:110
 msgid "This purchase order has been cancelled."
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/po_entry_items.php:132
-#: c:\Apache2\htdocs\account2/purchasing/po_entry_items.php:131
+#: c:\Apache2\htdocs\account2/purchasing/po_entry_items.php:112
 msgid "Enter a new purchase order"
 msgstr ""
 
-#: c:\Apache2\htdocs\account2/purchasing/po_entry_items.php:155
+#: c:\Apache2\htdocs\account2/purchasing/po_entry_items.php:125
 msgid "The quantity of the order item must be numeric and not less than zero."
 msgstr ""
 
-#: c:\Apache2\htdocs\account2/purchasing/po_entry_items.php:162
+#: c:\Apache2\htdocs\account2/purchasing/po_entry_items.php:132
 msgid "The price entered must be numeric and not less than zero."
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/po_entry_items.php:187
-#: c:\Apache2\htdocs\account2/purchasing/po_entry_items.php:185
+#: c:\Apache2\htdocs\account2/purchasing/po_entry_items.php:155
 msgid "You are attempting to make the quantity ordered a quantity less than has already been invoiced or received.  This is prohibited."
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/po_entry_items.php:188
-#: c:\Apache2\htdocs\account2/purchasing/po_entry_items.php:186
+#: c:\Apache2\htdocs\account2/purchasing/po_entry_items.php:156
 msgid "The quantity received can only be modified by entering a negative receipt and the quantity invoiced can only be reduced by entering a credit note against this item."
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/po_entry_items.php:216
-#: c:\Apache2\htdocs\account2/purchasing/po_entry_items.php:215
+#: c:\Apache2\htdocs\account2/purchasing/po_entry_items.php:186
 msgid "The selected item is already on this order."
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/po_entry_items.php:244
-#: c:\Apache2\htdocs\account2/purchasing/po_entry_items.php:244
+#: c:\Apache2\htdocs\account2/purchasing/po_entry_items.php:215
 msgid "The selected item does not exist or it is a kit part and therefore cannot be purchased."
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/po_entry_items.php:257
-# c:\Apache2\htdocs\account/sales/sales_order_entry.php:116
-#: c:\Apache2\htdocs\account2/purchasing/po_entry_items.php:257
+#: c:\Apache2\htdocs\account2/purchasing/po_entry_items.php:229
 msgid "The entered order date is invalid."
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/po_entry_items.php:265
-#: c:\Apache2\htdocs\account2/purchasing/po_entry_items.php:266
+#: c:\Apache2\htdocs\account2/purchasing/po_entry_items.php:238
 msgid "There is no reference entered for this purchase order."
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/po_entry_items.php:278
-#: c:\Apache2\htdocs\account2/purchasing/po_entry_items.php:281
+#: c:\Apache2\htdocs\account2/purchasing/po_entry_items.php:253
 msgid "There is no delivery address specified."
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/po_entry_items.php:284
-#: c:\Apache2\htdocs\account2/purchasing/po_entry_items.php:288
+#: c:\Apache2\htdocs\account2/purchasing/po_entry_items.php:260
 msgid "There is no location specified to move any items into."
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/po_entry_items.php:290
-#: c:\Apache2\htdocs\account2/purchasing/po_entry_items.php:295
+#: c:\Apache2\htdocs\account2/purchasing/po_entry_items.php:267
 msgid "The order cannot be placed because there are no lines entered on this order."
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/po_entry_items.php:415
-#: c:\Apache2\htdocs\account2/purchasing/po_entry_items.php:420
+#: c:\Apache2\htdocs\account2/purchasing/po_entry_items.php:376
 msgid "Update Order"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/po_entry_items.php:417
-# c:\Apache2\htdocs\account/sales/sales_order_entry.php:469
-#: c:\Apache2\htdocs\account2/purchasing/po_entry_items.php:422
-#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:441
-#: c:\Apache2\htdocs\account2/sql/sales_order_entry.php:411
+#: c:\Apache2\htdocs\account2/purchasing/po_entry_items.php:378
+#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:440
 msgid "Place Order"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/po_entry_items.php:418
-# c:\Apache2\htdocs\account/purchasing/po_entry_items.php:421
-# c:\Apache2\htdocs\account/sales/sales_order_entry.php:438
-#: c:\Apache2\htdocs\account2/purchasing/po_entry_items.php:423
-#: c:\Apache2\htdocs\account2/purchasing/po_entry_items.php:426
-#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:440
-#: c:\Apache2\htdocs\account2/sql/sales_order_entry.php:410
+#: c:\Apache2\htdocs\account2/purchasing/po_entry_items.php:379
+#: c:\Apache2\htdocs\account2/purchasing/po_entry_items.php:382
+#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:439
 msgid "Cancel Order"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/po_receive_items.php:13
 #: c:\Apache2\htdocs\account2/purchasing/po_receive_items.php:15
 msgid "Receive Purchase Order Items"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/po_receive_items.php:22
 #: c:\Apache2\htdocs\account2/purchasing/po_receive_items.php:24
 msgid "Purchase Order Delivery has been processed"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/po_receive_items.php:24
 #: c:\Apache2\htdocs\account2/purchasing/po_receive_items.php:26
 msgid "View this Delivery"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/po_receive_items.php:30
 #: c:\Apache2\htdocs\account2/purchasing/po_receive_items.php:32
 msgid "Select a different purchase order for receiving items against"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/po_receive_items.php:40
 #: c:\Apache2\htdocs\account2/purchasing/po_receive_items.php:42
 msgid "This page can only be opened if a purchase order has been selected. Please select a purchase order first."
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/po_receive_items.php:49
-# c:\Apache2\htdocs\account/purchasing/supplier_credit_grns.php:110
-# c:\Apache2\htdocs\account/purchasing/view/view_grn.php:27
-# c:\Apache2\htdocs\account/purchasing/view/view_po.php:38
-# c:\Apache2\htdocs\account/sales/customer_credit_invoice.php:283
-# c:\Apache2\htdocs\account/sales/customer_invoice.php:378
-# c:\Apache2\htdocs\account/sales/view/view_credit.php:81
-# c:\Apache2\htdocs\account/sales/view/view_invoice.php:99
-# c:\Apache2\htdocs\account/sales/view/view_sales_order.php:140
-# c:\Apache2\htdocs\account/inventory/includes/item_adjustments_ui.inc:74
-# c:\Apache2\htdocs\account/inventory/includes/stock_transfers_ui.inc:70
-# c:\Apache2\htdocs\account/manufacturing/includes/work_order_issue_ui.inc:43
-# c:\Apache2\htdocs\account/purchasing/includes/ui/po_ui.inc:167
-# c:\Apache2\htdocs\account/reporting/includes/doctext.inc:36
-# c:\Apache2\htdocs\account/reporting/includes/doctext.inc:39
-# c:\Apache2\htdocs\account/sales/includes/ui/sales_credit_ui.inc:103
-# c:\Apache2\htdocs\account/sales/includes/ui/sales_order_ui.inc:109
-#: c:\Apache2\htdocs\account2/purchasing/po_receive_items.php:51
-#: c:\Apache2\htdocs\account2/purchasing/supplier_credit_grns.php:108
+#: c:\Apache2\htdocs\account2/purchasing/po_receive_items.php:53
+#: c:\Apache2\htdocs\account2/purchasing/supplier_credit_grns.php:111
 #: c:\Apache2\htdocs\account2/purchasing/view/view_grn.php:27
 #: c:\Apache2\htdocs\account2/purchasing/view/view_po.php:38
-#: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:266
-#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:353
-#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:325
+#: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:280
+#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:366
+#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:351
 #: c:\Apache2\htdocs\account2/sales/view/view_credit.php:81
 #: c:\Apache2\htdocs\account2/sales/view/view_dispatch.php:103
 #: c:\Apache2\htdocs\account2/sales/view/view_invoice.php:103
 #: c:\Apache2\htdocs\account2/sales/view/view_sales_order.php:172
-#: c:\Apache2\htdocs\account2/inventory/includes/item_adjustments_ui.inc:74
-#: c:\Apache2\htdocs\account2/inventory/includes/stock_transfers_ui.inc:70
-#: c:\Apache2\htdocs\account2/manufacturing/includes/work_order_issue_ui.inc:43
-#: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:167
-#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:45
-#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:48
-#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_credit_ui.inc:108
-#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:85
+#: c:\Apache2\htdocs\account2/inventory/includes/item_adjustments_ui.inc:64
+#: c:\Apache2\htdocs\account2/inventory/includes/stock_transfers_ui.inc:60
+#: c:\Apache2\htdocs\account2/manufacturing/includes/work_order_issue_ui.inc:24
+#: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:165
+#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:46
+#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:49
+#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_credit_ui.inc:152
+#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:82
 msgid "Item Code"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/po_receive_items.php:49
-# c:\Apache2\htdocs\account/reporting/rep105.php:101
-# c:\Apache2\htdocs\account/sales/customer_invoice.php:378
-#: c:\Apache2\htdocs\account2/purchasing/po_receive_items.php:51
-#: c:\Apache2\htdocs\account2/reporting/rep105.php:101
-#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:353
+#: c:\Apache2\htdocs\account2/purchasing/po_receive_items.php:53
+#: c:\Apache2\htdocs\account2/reporting/rep105.php:99
+#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:366
 msgid "Ordered"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/po_receive_items.php:49
-#: c:\Apache2\htdocs\account2/purchasing/po_receive_items.php:51
+#: c:\Apache2\htdocs\account2/purchasing/po_receive_items.php:53
 msgid "Received"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/po_receive_items.php:50
-# c:\Apache2\htdocs\account/reporting/rep101.php:71
-# c:\Apache2\htdocs\account/reporting/rep105.php:102
-# c:\Apache2\htdocs\account/reporting/rep105.php:155
-# c:\Apache2\htdocs\account/reporting/rep201.php:72
-# c:\Apache2\htdocs\account/taxes/tax_types.php:99
-# c:\Apache2\htdocs\account/reporting/includes/doctext.inc:46
-#: c:\Apache2\htdocs\account2/purchasing/po_receive_items.php:52
+#: c:\Apache2\htdocs\account2/purchasing/po_receive_items.php:54
 #: c:\Apache2\htdocs\account2/reporting/rep101.php:72
-#: c:\Apache2\htdocs\account2/reporting/rep105.php:102
-#: c:\Apache2\htdocs\account2/reporting/rep105.php:155
+#: c:\Apache2\htdocs\account2/reporting/rep105.php:100
+#: c:\Apache2\htdocs\account2/reporting/rep105.php:154
 #: c:\Apache2\htdocs\account2/reporting/rep201.php:71
-#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:55
+#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:56
 msgid "Outstanding"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/po_receive_items.php:50
-# c:\Apache2\htdocs\account/sales/customer_invoice.php:379
-#: c:\Apache2\htdocs\account2/purchasing/po_receive_items.php:52
-#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:354
+#: c:\Apache2\htdocs\account2/purchasing/po_receive_items.php:54
+#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:367
 msgid "This Delivery"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/po_receive_items.php:98
-#: c:\Apache2\htdocs\account2/purchasing/po_receive_items.php:100
+#: c:\Apache2\htdocs\account2/purchasing/po_receive_items.php:103
 msgid "Total value of items received"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/po_receive_items.php:148
-# c:\Apache2\htdocs\account/purchasing/po_receive_items.php:194
-#: c:\Apache2\htdocs\account2/purchasing/po_receive_items.php:150
-#: c:\Apache2\htdocs\account2/purchasing/po_receive_items.php:199
+#: c:\Apache2\htdocs\account2/purchasing/po_receive_items.php:154
+#: c:\Apache2\htdocs\account2/purchasing/po_receive_items.php:203
 msgid "There is nothing to process. Please enter valid quantities greater than zero."
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/po_receive_items.php:199
-#: c:\Apache2\htdocs\account2/purchasing/po_receive_items.php:204
+#: c:\Apache2\htdocs\account2/purchasing/po_receive_items.php:208
 msgid "Entered quantities cannot be greater than the quantity entered on the purchase order including the allowed over-receive percentage"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/po_receive_items.php:201
-#: c:\Apache2\htdocs\account2/purchasing/po_receive_items.php:206
+#: c:\Apache2\htdocs\account2/purchasing/po_receive_items.php:210
 msgid "Modify the ordered items on the purchase order if you wish to increase the quantities."
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/po_receive_items.php:219
-#: c:\Apache2\htdocs\account2/purchasing/po_receive_items.php:224
+#: c:\Apache2\htdocs\account2/purchasing/po_receive_items.php:228
 msgid "This order has been changed or invoiced since this delivery was started to be actioned. Processing halted. To enter a delivery against this purchase order, it must be re-selected and re-read again to update the changes made by the other user."
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/po_receive_items.php:221
-#: c:\Apache2\htdocs\account2/purchasing/po_receive_items.php:226
+#: c:\Apache2\htdocs\account2/purchasing/po_receive_items.php:230
 msgid "Select a different purchase order for receiving goods against"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/po_receive_items.php:222
-#: c:\Apache2\htdocs\account2/purchasing/po_receive_items.php:227
+#: c:\Apache2\htdocs\account2/purchasing/po_receive_items.php:231
 msgid "Re-Read the updated purchase order for receiving goods against"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/po_receive_items.php:287
-#: c:\Apache2\htdocs\account2/purchasing/po_receive_items.php:292
+#: c:\Apache2\htdocs\account2/purchasing/po_receive_items.php:298
 msgid "Items to Receive"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/po_receive_items.php:293
-#: c:\Apache2\htdocs\account2/purchasing/po_receive_items.php:298
+#: c:\Apache2\htdocs\account2/purchasing/po_receive_items.php:303
 msgid "Process Receive Items"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/supplier_credit.php:18
-# c:\Apache2\htdocs\account/includes/types.inc:17
+#: c:\Apache2\htdocs\account2/purchasing/po_receive_items.php:303
+#: c:\Apache2\htdocs\account2/purchasing/supplier_trans_gl.php:140
+msgid "Clear all GL entry fields"
+msgstr ""
+
 #: c:\Apache2\htdocs\account2/purchasing/supplier_credit.php:20
 #: c:\Apache2\htdocs\account2/includes/types.inc:18
 msgid "Supplier Credit Note"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/supplier_credit.php:33
 #: c:\Apache2\htdocs\account2/purchasing/supplier_credit.php:35
 msgid "Supplier credit note has been processed."
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/supplier_credit.php:34
 #: c:\Apache2\htdocs\account2/purchasing/supplier_credit.php:36
 msgid "View this Credit Note"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/supplier_credit.php:36
-# c:\Apache2\htdocs\account/sales/credit_note_entry.php:42
-# c:\Apache2\htdocs\account/sales/customer_credit_invoice.php:30
 #: c:\Apache2\htdocs\account2/purchasing/supplier_credit.php:38
-#: c:\Apache2\htdocs\account2/sales/credit_note_entry.php:51
+#: c:\Apache2\htdocs\account2/sales/credit_note_entry.php:52
 #: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:50
 #: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:65
 msgid "View the GL Journal Entries for this Credit Note"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/supplier_credit.php:38
-# c:\Apache2\htdocs\account/sales/credit_note_entry.php:44
 #: c:\Apache2\htdocs\account2/purchasing/supplier_credit.php:40
-#: c:\Apache2\htdocs\account2/sales/credit_note_entry.php:53
+#: c:\Apache2\htdocs\account2/sales/credit_note_entry.php:54
 msgid "Enter Another Credit Note"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/supplier_credit.php:66
 #: c:\Apache2\htdocs\account2/purchasing/supplier_credit.php:68
 msgid "The credit note cannot be processed because the there are no items or values on the invoice.  Credit notes are expected to have a charge."
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/supplier_credit.php:72
 #: c:\Apache2\htdocs\account2/purchasing/supplier_credit.php:75
 msgid "You must enter an credit note reference."
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/supplier_credit.php:84
 #: c:\Apache2\htdocs\account2/purchasing/supplier_credit.php:89
 msgid "You must enter a supplier's credit note reference."
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/supplier_credit.php:90
 #: c:\Apache2\htdocs\account2/purchasing/supplier_credit.php:96
 msgid "The credit note as entered cannot be processed because the date entered is not valid."
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/supplier_credit.php:100
-# c:\Apache2\htdocs\account/purchasing/supplier_invoice.php:100
 #: c:\Apache2\htdocs\account2/purchasing/supplier_credit.php:108
 #: c:\Apache2\htdocs\account2/purchasing/supplier_invoice.php:107
 msgid "The invoice as entered cannot be processed because the due date is in an incorrect format."
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/supplier_credit.php:106
 #: c:\Apache2\htdocs\account2/purchasing/supplier_credit.php:115
 msgid "The credit note total as entered is less than the sum of the the general ledger entires (if any) and the charges for goods received. There must be a mistake somewhere, the credit note as entered will not be processed."
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/supplier_credit.php:162
-#: c:\Apache2\htdocs\account2/purchasing/supplier_credit.php:171
+#: c:\Apache2\htdocs\account2/purchasing/supplier_credit.php:173
 msgid "Enter Credit Note"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/supplier_credit_grns.php:9
-# c:\Apache2\htdocs\account/purchasing/supplier_invoice_grns.php:12
 #: c:\Apache2\htdocs\account2/purchasing/supplier_credit_grns.php:14
-#: c:\Apache2\htdocs\account2/purchasing/supplier_invoice_grns.php:15
+#: c:\Apache2\htdocs\account2/purchasing/supplier_invoice_grns.php:14
 msgid "Select Received Items to Add"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/supplier_credit_grns.php:16
 #: c:\Apache2\htdocs\account2/purchasing/supplier_credit_grns.php:18
 msgid "To enter supplier transactions the supplier must first be selected from the supplier selection screen, then the link to enter a supplier credit note must be clicked on."
 msgstr ""
@@ -7163,553 +5263,441 @@ msgstr ""
 msgid "The quantity to credit must be numeric and greater than zero."
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/supplier_credit_grns.php:44
 #: c:\Apache2\htdocs\account2/purchasing/supplier_credit_grns.php:41
 msgid "The price is either not numeric or negative."
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/supplier_credit_grns.php:88
-#: c:\Apache2\htdocs\account2/purchasing/supplier_credit_grns.php:86
+#: c:\Apache2\htdocs\account2/purchasing/supplier_credit_grns.php:88
 msgid "Return to Credit Note Entry"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/supplier_credit_grns.php:98
-#: c:\Apache2\htdocs\account2/purchasing/supplier_credit_grns.php:96
+#: c:\Apache2\htdocs\account2/purchasing/supplier_credit_grns.php:98
 msgid "There are no received items for the selected supplier that have been invoiced."
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/supplier_credit_grns.php:99
-#: c:\Apache2\htdocs\account2/purchasing/supplier_credit_grns.php:97
+#: c:\Apache2\htdocs\account2/purchasing/supplier_credit_grns.php:99
 msgid "Credits can only be applied to invoiced items."
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/supplier_credit_grns.php:110
-# c:\Apache2\htdocs\account/purchasing/supplier_invoice_grns.php:141
-#: c:\Apache2\htdocs\account2/purchasing/supplier_credit_grns.php:108
-#: c:\Apache2\htdocs\account2/purchasing/supplier_invoice_grns.php:140
-#: c:\Apache2\htdocs\account2/sales/inquiry/sales_orders_view.php:235
+#: c:\Apache2\htdocs\account2/purchasing/supplier_credit_grns.php:111
+#: c:\Apache2\htdocs\account2/purchasing/supplier_invoice_grns.php:141
+#: c:\Apache2\htdocs\account2/sales/inquiry/sales_orders_view.php:256
 msgid "Delivery"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/supplier_credit_grns.php:110
-# c:\Apache2\htdocs\account/purchasing/supplier_credit_grns.php:165
-# c:\Apache2\htdocs\account/purchasing/supplier_invoice_grns.php:141
-# c:\Apache2\htdocs\account/purchasing/supplier_invoice_grns.php:204
-#: c:\Apache2\htdocs\account2/purchasing/supplier_credit_grns.php:108
-#: c:\Apache2\htdocs\account2/purchasing/supplier_credit_grns.php:163
-#: c:\Apache2\htdocs\account2/purchasing/supplier_invoice_grns.php:140
-#: c:\Apache2\htdocs\account2/purchasing/supplier_invoice_grns.php:204
+#: c:\Apache2\htdocs\account2/purchasing/supplier_credit_grns.php:111
+#: c:\Apache2\htdocs\account2/purchasing/supplier_credit_grns.php:181
+#: c:\Apache2\htdocs\account2/purchasing/supplier_invoice_grns.php:141
+#: c:\Apache2\htdocs\account2/purchasing/supplier_invoice_grns.php:218
 msgid "Sequence #"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/supplier_credit_grns.php:110
-# c:\Apache2\htdocs\account/reporting/rep105.php:96
-# c:\Apache2\htdocs\account/reporting/rep204.php:71
-# c:\Apache2\htdocs\account/sales/inquiry/customer_allocation_inquiry.php:119
-# c:\Apache2\htdocs\account/sales/inquiry/customer_allocation_inquiry.php:122
-# c:\Apache2\htdocs\account/sales/inquiry/customer_inquiry.php:161
-# c:\Apache2\htdocs\account/sales/inquiry/customer_inquiry.php:164
-#: c:\Apache2\htdocs\account2/purchasing/supplier_credit_grns.php:108
-#: c:\Apache2\htdocs\account2/reporting/rep105.php:96
+#: c:\Apache2\htdocs\account2/purchasing/supplier_credit_grns.php:111
+#: c:\Apache2\htdocs\account2/reporting/rep105.php:94
 #: c:\Apache2\htdocs\account2/reporting/rep204.php:70
-#: c:\Apache2\htdocs\account2/sales/inquiry/customer_allocation_inquiry.php:131
 #: c:\Apache2\htdocs\account2/sales/inquiry/customer_allocation_inquiry.php:134
-#: c:\Apache2\htdocs\account2/sales/inquiry/customer_inquiry.php:172
+#: c:\Apache2\htdocs\account2/sales/inquiry/customer_allocation_inquiry.php:137
+#: c:\Apache2\htdocs\account2/sales/inquiry/customer_inquiry.php:183
 msgid "Order"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/supplier_credit_grns.php:111
-# c:\Apache2\htdocs\account/sales/customer_invoice.php:378
-#: c:\Apache2\htdocs\account2/purchasing/supplier_credit_grns.php:109
-#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:353
-#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:325
-#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:86
+#: c:\Apache2\htdocs\account2/purchasing/supplier_credit_grns.php:112
+#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:366
+#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:351
+#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:83
 msgid "Delivered"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/supplier_credit_grns.php:111
-#: c:\Apache2\htdocs\account2/purchasing/supplier_credit_grns.php:109
+#: c:\Apache2\htdocs\account2/purchasing/supplier_credit_grns.php:112
 msgid "Total Qty Received"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/supplier_credit_grns.php:111
-# c:\Apache2\htdocs\account/purchasing/supplier_credit_grns.php:165
-#: c:\Apache2\htdocs\account2/purchasing/supplier_credit_grns.php:109
-#: c:\Apache2\htdocs\account2/purchasing/supplier_credit_grns.php:163
+#: c:\Apache2\htdocs\account2/purchasing/supplier_credit_grns.php:112
+#: c:\Apache2\htdocs\account2/purchasing/supplier_credit_grns.php:181
 msgid "Qty Already Invoiced"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/supplier_credit_grns.php:112
-#: c:\Apache2\htdocs\account2/purchasing/supplier_credit_grns.php:110
+#: c:\Apache2\htdocs\account2/purchasing/supplier_credit_grns.php:113
 msgid "Qty Yet To Invoice"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/supplier_credit_grns.php:112
-# c:\Apache2\htdocs\account/purchasing/supplier_credit_grns.php:166
-# c:\Apache2\htdocs\account/purchasing/supplier_invoice_grns.php:143
-# c:\Apache2\htdocs\account/purchasing/supplier_invoice_grns.php:205
-#: c:\Apache2\htdocs\account2/purchasing/supplier_credit_grns.php:110
-#: c:\Apache2\htdocs\account2/purchasing/supplier_credit_grns.php:164
-#: c:\Apache2\htdocs\account2/purchasing/supplier_invoice_grns.php:142
-#: c:\Apache2\htdocs\account2/purchasing/supplier_invoice_grns.php:205
+#: c:\Apache2\htdocs\account2/purchasing/supplier_credit_grns.php:113
+#: c:\Apache2\htdocs\account2/purchasing/supplier_credit_grns.php:182
+#: c:\Apache2\htdocs\account2/purchasing/supplier_invoice_grns.php:143
+#: c:\Apache2\htdocs\account2/purchasing/supplier_invoice_grns.php:219
 msgid "Order Price"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/supplier_credit_grns.php:112
-# c:\Apache2\htdocs\account/purchasing/includes/ui/invoice_ui.inc:303
-#: c:\Apache2\htdocs\account2/purchasing/supplier_credit_grns.php:110
-#: c:\Apache2\htdocs\account2/purchasing/includes/ui/invoice_ui.inc:297
+#: c:\Apache2\htdocs\account2/purchasing/supplier_credit_grns.php:113
+#: c:\Apache2\htdocs\account2/purchasing/includes/ui/invoice_ui.inc:301
 msgid "Line Value"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/supplier_credit_grns.php:163
-#: c:\Apache2\htdocs\account2/purchasing/supplier_credit_grns.php:161
+#: c:\Apache2\htdocs\account2/purchasing/supplier_credit_grns.php:179
 msgid "Delivery Item Selected For Adding To A Supplier Credit Note"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/supplier_credit_grns.php:166
-#: c:\Apache2\htdocs\account2/purchasing/supplier_credit_grns.php:164
+#: c:\Apache2\htdocs\account2/purchasing/supplier_credit_grns.php:182
 msgid "Quantity to Credit"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/supplier_credit_grns.php:166
-#: c:\Apache2\htdocs\account2/purchasing/supplier_credit_grns.php:164
+#: c:\Apache2\htdocs\account2/purchasing/supplier_credit_grns.php:182
 msgid "Credit Price"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/supplier_credit_grns.php:179
-#: c:\Apache2\htdocs\account2/purchasing/supplier_credit_grns.php:177
+#: c:\Apache2\htdocs\account2/purchasing/supplier_credit_grns.php:196
 msgid "Add to Credit Note"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/supplier_invoice.php:17
 #: c:\Apache2\htdocs\account2/purchasing/supplier_invoice.php:19
 msgid "Enter Supplier Invoice"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/supplier_invoice.php:33
 #: c:\Apache2\htdocs\account2/purchasing/supplier_invoice.php:35
 msgid "Supplier invoice has been processed."
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/supplier_invoice.php:34
 #: c:\Apache2\htdocs\account2/purchasing/supplier_invoice.php:36
 msgid "View this Invoice"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/supplier_invoice.php:36
-# c:\Apache2\htdocs\account/sales/customer_invoice.php:31
 #: c:\Apache2\htdocs\account2/purchasing/supplier_invoice.php:38
 #: c:\Apache2\htdocs\account2/sales/customer_invoice.php:51
 msgid "View the GL Journal Entries for this Invoice"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/supplier_invoice.php:38
 #: c:\Apache2\htdocs\account2/purchasing/supplier_invoice.php:40
 msgid "Enter Another Invoice"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/supplier_invoice.php:66
 #: c:\Apache2\htdocs\account2/purchasing/supplier_invoice.php:68
 msgid "The invoice cannot be processed because the there are no items or values on the invoice.  Invoices are expected to have a charge."
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/supplier_invoice.php:72
 #: c:\Apache2\htdocs\account2/purchasing/supplier_invoice.php:74
 msgid "You must enter an invoice reference."
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/supplier_invoice.php:84
 #: c:\Apache2\htdocs\account2/purchasing/supplier_invoice.php:88
 msgid "You must enter a supplier's invoice reference."
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/supplier_invoice.php:90
 #: c:\Apache2\htdocs\account2/purchasing/supplier_invoice.php:95
 msgid "The invoice as entered cannot be processed because the invoice date is in an incorrect format."
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/supplier_invoice.php:110
 #: c:\Apache2\htdocs\account2/purchasing/supplier_invoice.php:118
 msgid "This invoice number has already been entered. It cannot be entered again."
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/supplier_invoice.php:169
-#: c:\Apache2\htdocs\account2/purchasing/supplier_invoice.php:177
+#: c:\Apache2\htdocs\account2/purchasing/supplier_invoice.php:179
 msgid "Enter Invoice"
 msgstr ""
 
-#: c:\Apache2\htdocs\account2/purchasing/supplier_invoice_grns.php:38
+#: c:\Apache2\htdocs\account2/purchasing/supplier_invoice_grns.php:36
 msgid "The quantity to invoice must be numeric and greater than zero."
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/supplier_invoice_grns.php:47
-#: c:\Apache2\htdocs\account2/purchasing/supplier_invoice_grns.php:45
+#: c:\Apache2\htdocs\account2/purchasing/supplier_invoice_grns.php:43
 msgid "The price is not numeric."
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/supplier_invoice_grns.php:56
-#: c:\Apache2\htdocs\account2/purchasing/supplier_invoice_grns.php:57
+#: c:\Apache2\htdocs\account2/purchasing/supplier_invoice_grns.php:55
 msgid "The price being invoiced is more than the purchase order price by more than the allowed over-charge percentage. The system is set up to prohibit this. See the system administrator to modify the set up parameters if necessary."
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/supplier_invoice_grns.php:57
-# c:\Apache2\htdocs\account/purchasing/supplier_invoice_grns.php:68
-#: c:\Apache2\htdocs\account2/purchasing/supplier_invoice_grns.php:58
-#: c:\Apache2\htdocs\account2/purchasing/supplier_invoice_grns.php:71
+#: c:\Apache2\htdocs\account2/purchasing/supplier_invoice_grns.php:56
+#: c:\Apache2\htdocs\account2/purchasing/supplier_invoice_grns.php:69
 msgid "The over-charge percentage allowance is :"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/supplier_invoice_grns.php:67
-#: c:\Apache2\htdocs\account2/purchasing/supplier_invoice_grns.php:70
+#: c:\Apache2\htdocs\account2/purchasing/supplier_invoice_grns.php:68
 msgid "The quantity being invoiced is more than the outstanding quantity by more than the allowed over-charge percentage. The system is set up to prohibit this. See the system administrator to modify the set up parameters if necessary."
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/supplier_invoice_grns.php:117
-#: c:\Apache2\htdocs\account2/purchasing/supplier_invoice_grns.php:116
+#: c:\Apache2\htdocs\account2/purchasing/supplier_invoice_grns.php:117
 msgid "Back to Supplier Invoice Entry"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/supplier_invoice_grns.php:130
-#: c:\Apache2\htdocs\account2/purchasing/supplier_invoice_grns.php:129
+#: c:\Apache2\htdocs\account2/purchasing/supplier_invoice_grns.php:130
 msgid "There are no outstanding items received from this supplier that have not been invoiced by them."
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/supplier_invoice_grns.php:138
-#: c:\Apache2\htdocs\account2/purchasing/supplier_invoice_grns.php:137
+#: c:\Apache2\htdocs\account2/purchasing/supplier_invoice_grns.php:138
 msgid "Items Received Yet to be Invoiced"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/supplier_invoice_grns.php:141
-#: c:\Apache2\htdocs\account2/purchasing/supplier_invoice_grns.php:140
+#: c:\Apache2\htdocs\account2/purchasing/supplier_invoice_grns.php:141
 msgid "P.O."
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/supplier_invoice_grns.php:142
-#: c:\Apache2\htdocs\account2/purchasing/supplier_invoice_grns.php:141
+#: c:\Apache2\htdocs\account2/purchasing/supplier_invoice_grns.php:142
 msgid "Received On"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/supplier_invoice_grns.php:142
-# c:\Apache2\htdocs\account/purchasing/view/view_po.php:39
-#: c:\Apache2\htdocs\account2/purchasing/supplier_invoice_grns.php:141
+#: c:\Apache2\htdocs\account2/purchasing/supplier_invoice_grns.php:142
 #: c:\Apache2\htdocs\account2/purchasing/view/view_po.php:39
 msgid "Quantity Received"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/supplier_invoice_grns.php:142
-# c:\Apache2\htdocs\account/purchasing/view/view_grn.php:28
-# c:\Apache2\htdocs\account/purchasing/view/view_po.php:39
-#: c:\Apache2\htdocs\account2/purchasing/supplier_invoice_grns.php:141
+#: c:\Apache2\htdocs\account2/purchasing/supplier_invoice_grns.php:142
 #: c:\Apache2\htdocs\account2/purchasing/view/view_grn.php:28
 #: c:\Apache2\htdocs\account2/purchasing/view/view_po.php:39
 msgid "Quantity Invoiced"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/supplier_invoice_grns.php:143
-#: c:\Apache2\htdocs\account2/purchasing/supplier_invoice_grns.php:142
+#: c:\Apache2\htdocs\account2/purchasing/supplier_invoice_grns.php:143
 msgid "Uninvoiced Quantity"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/supplier_invoice_grns.php:202
-#: c:\Apache2\htdocs\account2/purchasing/supplier_invoice_grns.php:202
+#: c:\Apache2\htdocs\account2/purchasing/supplier_invoice_grns.php:216
 msgid "Delivery Item Selected For Adding To A Supplier Invoice"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/supplier_invoice_grns.php:204
-#: c:\Apache2\htdocs\account2/purchasing/supplier_invoice_grns.php:204
+#: c:\Apache2\htdocs\account2/purchasing/supplier_invoice_grns.php:218
 msgid "Quantity Outstanding"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/supplier_invoice_grns.php:205
-#: c:\Apache2\htdocs\account2/purchasing/supplier_invoice_grns.php:205
+#: c:\Apache2\htdocs\account2/purchasing/supplier_invoice_grns.php:219
 msgid "Quantity to Invoice"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/supplier_invoice_grns.php:205
-#: c:\Apache2\htdocs\account2/purchasing/supplier_invoice_grns.php:205
+#: c:\Apache2\htdocs\account2/purchasing/supplier_invoice_grns.php:219
 msgid "Actual Price"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/supplier_invoice_grns.php:219
-#: c:\Apache2\htdocs\account2/purchasing/supplier_invoice_grns.php:219
+#: c:\Apache2\htdocs\account2/purchasing/supplier_invoice_grns.php:234
 msgid "Add to Invoice"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/supplier_payment.php:16
 #: c:\Apache2\htdocs\account2/purchasing/supplier_payment.php:18
 msgid "Supplier Payment Entry"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/supplier_payment.php:38
 #: c:\Apache2\htdocs\account2/purchasing/supplier_payment.php:40
 msgid "Payment has been sucessfully entered"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/supplier_payment.php:40
 #: c:\Apache2\htdocs\account2/purchasing/supplier_payment.php:42
 msgid "View the GL Journal Entries for this Payment"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/supplier_payment.php:43
 #: c:\Apache2\htdocs\account2/purchasing/supplier_payment.php:44
 msgid "Allocate this Payment"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/supplier_payment.php:46
 #: c:\Apache2\htdocs\account2/purchasing/supplier_payment.php:46
 msgid "Enter another supplier payment"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/supplier_payment.php:74
 #: c:\Apache2\htdocs\account2/purchasing/supplier_payment.php:71
 msgid "From Bank Account:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/supplier_payment.php:76
 #: c:\Apache2\htdocs\account2/purchasing/supplier_payment.php:73
 msgid "Amount of Payment:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/supplier_payment.php:77
-# c:\Apache2\htdocs\account/sales/customer_payments.php:179
 #: c:\Apache2\htdocs\account2/purchasing/supplier_payment.php:74
-#: c:\Apache2\htdocs\account2/sales/customer_payments.php:170
+#: c:\Apache2\htdocs\account2/sales/customer_payments.php:172
 msgid "Amount of Discount:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/supplier_payment.php:79
-# c:\Apache2\htdocs\account/purchasing/view/view_supp_payment.php:46
 #: c:\Apache2\htdocs\account2/purchasing/supplier_payment.php:76
 #: c:\Apache2\htdocs\account2/purchasing/view/view_supp_payment.php:46
 msgid "Date Paid"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/supplier_payment.php:85
 #: c:\Apache2\htdocs\account2/purchasing/supplier_payment.php:82
 msgid "Payment To:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/supplier_payment.php:96
-# c:\Apache2\htdocs\account/gl/includes/ui/gl_payment_ui.inc:85
 #: c:\Apache2\htdocs\account2/purchasing/supplier_payment.php:93
-#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_payment_ui.inc:85
 msgid "Payment Type:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/supplier_payment.php:107
 #: c:\Apache2\htdocs\account2/purchasing/supplier_payment.php:104
 msgid "Enter Payment"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/supplier_payment.php:111
 #: c:\Apache2\htdocs\account2/purchasing/supplier_payment.php:108
 msgid "The amount and discount are in the bank account's currency."
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/supplier_payment.php:139
 #: c:\Apache2\htdocs\account2/purchasing/supplier_payment.php:137
 msgid "The entered discount is invalid or less than zero."
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/supplier_payment.php:145
 #: c:\Apache2\htdocs\account2/purchasing/supplier_payment.php:144
 msgid "The total of the amount and the discount negative. Please enter positive values."
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/supplier_trans_gl.php:9
 #: c:\Apache2\htdocs\account2/purchasing/supplier_trans_gl.php:13
 msgid "Add GL Items"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/supplier_trans_gl.php:15
 #: c:\Apache2\htdocs\account2/purchasing/supplier_trans_gl.php:18
 msgid "To enter a supplier invoice or credit note the supplier must first be selected."
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/supplier_trans_gl.php:47
-#: c:\Apache2\htdocs\account2/purchasing/supplier_trans_gl.php:50
+#: c:\Apache2\htdocs\account2/purchasing/supplier_trans_gl.php:55
 msgid "The account code entered is not a valid code, this line cannot be added to the transaction."
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/supplier_trans_gl.php:56
-#: c:\Apache2\htdocs\account2/purchasing/supplier_trans_gl.php:60
+#: c:\Apache2\htdocs\account2/purchasing/supplier_trans_gl.php:65
 msgid "The amount entered is not numeric. This line cannot be added to the transaction."
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/supplier_trans_gl.php:87
-#: c:\Apache2\htdocs\account2/purchasing/supplier_trans_gl.php:93
+#: c:\Apache2\htdocs\account2/purchasing/supplier_trans_gl.php:101
 msgid "Back to Invoice Entry"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/supplier_trans_gl.php:91
-#: c:\Apache2\htdocs\account2/purchasing/supplier_trans_gl.php:97
+#: c:\Apache2\htdocs\account2/purchasing/supplier_trans_gl.php:105
 msgid "Back to Credit Note Entry"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/supplier_trans_gl.php:101
-#: c:\Apache2\htdocs\account2/purchasing/supplier_trans_gl.php:107
+#: c:\Apache2\htdocs\account2/purchasing/supplier_trans_gl.php:115
 msgid "Enter a GL Line"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/supplier_trans_gl.php:107
-#: c:\Apache2\htdocs\account2/purchasing/supplier_trans_gl.php:113
+#: c:\Apache2\htdocs\account2/purchasing/supplier_trans_gl.php:122
 msgid "GL Account Selection:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/supplier_trans_gl.php:123
-#: c:\Apache2\htdocs\account2/purchasing/supplier_trans_gl.php:129
+#: c:\Apache2\htdocs\account2/purchasing/supplier_trans_gl.php:139
 msgid "Add GL Line"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/allocations/supplier_allocate.php:18
-#: c:\Apache2\htdocs\account2/purchasing/allocations/supplier_allocate.php:21
+#: c:\Apache2\htdocs\account2/purchasing/supplier_trans_gl.php:140
+msgid "Reset"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/purchasing/allocations/supplier_allocate.php:19
 msgid "Allocate Supplier Payment or Credit Note"
 msgstr ""
 
-#: c:\Apache2\htdocs\account2/purchasing/allocations/supplier_allocate.php:48
+#: c:\Apache2\htdocs\account2/purchasing/allocations/supplier_allocate.php:42
+#: c:\Apache2\htdocs\account2/sales/allocations/customer_allocate.php:43
 msgid "The entry for one or more amounts is invalid or negative."
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/allocations/supplier_allocate.php:69
-# c:\Apache2\htdocs\account/sales/allocations/customer_allocate.php:63
-#: c:\Apache2\htdocs\account2/purchasing/allocations/supplier_allocate.php:67
+#: c:\Apache2\htdocs\account2/purchasing/allocations/supplier_allocate.php:61
 #: c:\Apache2\htdocs\account2/sales/allocations/customer_allocate.php:69
 msgid "These allocations cannot be processed because the amount allocated is more than the total amount left to allocate."
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/allocations/supplier_allocate.php:183
-# c:\Apache2\htdocs\account/sales/allocations/customer_allocate.php:174
-#: c:\Apache2\htdocs\account2/purchasing/allocations/supplier_allocate.php:181
+#: c:\Apache2\htdocs\account2/purchasing/allocations/supplier_allocate.php:173
 msgid "Allocation of"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/allocations/supplier_allocate.php:188
-# c:\Apache2\htdocs\account/sales/allocations/customer_allocate.php:179
-#: c:\Apache2\htdocs\account2/purchasing/allocations/supplier_allocate.php:186
-#: c:\Apache2\htdocs\account2/sales/allocations/customer_allocate.php:186
+#: c:\Apache2\htdocs\account2/purchasing/allocations/supplier_allocate.php:178
+#: c:\Apache2\htdocs\account2/sales/allocations/customer_allocate.php:178
 msgid "Total:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/allocations/supplier_allocate.php:195
-# c:\Apache2\htdocs\account/purchasing/allocations/supplier_allocation_main.php:60
-# c:\Apache2\htdocs\account/purchasing/allocations/supplier_allocation_main.php:63
-# c:\Apache2\htdocs\account/sales/allocations/customer_allocate.php:187
-# c:\Apache2\htdocs\account/sales/allocations/customer_allocation_main.php:62
-# c:\Apache2\htdocs\account/sales/allocations/customer_allocation_main.php:65
-#: c:\Apache2\htdocs\account2/purchasing/allocations/supplier_allocate.php:193
+#: c:\Apache2\htdocs\account2/purchasing/allocations/supplier_allocate.php:186
 #: c:\Apache2\htdocs\account2/purchasing/allocations/supplier_allocation_main.php:60
 #: c:\Apache2\htdocs\account2/purchasing/allocations/supplier_allocation_main.php:63
-#: c:\Apache2\htdocs\account2/sales/allocations/customer_allocate.php:194
+#: c:\Apache2\htdocs\account2/sales/allocations/customer_allocate.php:188
 #: c:\Apache2\htdocs\account2/sales/allocations/customer_allocation_main.php:62
 #: c:\Apache2\htdocs\account2/sales/allocations/customer_allocation_main.php:65
 msgid "Transaction Type"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/allocations/supplier_allocate.php:196
-# c:\Apache2\htdocs\account/sales/allocations/customer_allocate.php:188
-#: c:\Apache2\htdocs\account2/purchasing/allocations/supplier_allocate.php:194
-#: c:\Apache2\htdocs\account2/sales/allocations/customer_allocate.php:195
+#: c:\Apache2\htdocs\account2/purchasing/allocations/supplier_allocate.php:187
+#: c:\Apache2\htdocs\account2/sales/allocations/customer_allocate.php:189
 msgid "Other Allocations"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/allocations/supplier_allocate.php:196
-# c:\Apache2\htdocs\account/sales/allocations/customer_allocate.php:188
-# c:\Apache2\htdocs\account/includes/ui/ui_view.inc:464
-#: c:\Apache2\htdocs\account2/purchasing/allocations/supplier_allocate.php:194
-#: c:\Apache2\htdocs\account2/sales/allocations/customer_allocate.php:195
-#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:476
+#: c:\Apache2\htdocs\account2/purchasing/allocations/supplier_allocate.php:187
+#: c:\Apache2\htdocs\account2/sales/allocations/customer_allocate.php:189
+#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:482
 msgid "This Allocation"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/allocations/supplier_allocate.php:196
-# c:\Apache2\htdocs\account/purchasing/allocations/supplier_allocate.php:237
-# c:\Apache2\htdocs\account/sales/allocations/customer_allocate.php:188
-# c:\Apache2\htdocs\account/sales/allocations/customer_allocate.php:230
-# c:\Apache2\htdocs\account/includes/ui/ui_view.inc:464
-#: c:\Apache2\htdocs\account2/purchasing/allocations/supplier_allocate.php:194
-#: c:\Apache2\htdocs\account2/purchasing/allocations/supplier_allocate.php:240
-#: c:\Apache2\htdocs\account2/sales/allocations/customer_allocate.php:195
-#: c:\Apache2\htdocs\account2/sales/allocations/customer_allocate.php:241
-#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:476
+#: c:\Apache2\htdocs\account2/purchasing/allocations/supplier_allocate.php:187
+#: c:\Apache2\htdocs\account2/purchasing/allocations/supplier_allocate.php:228
+#: c:\Apache2\htdocs\account2/sales/allocations/customer_allocate.php:189
+#: c:\Apache2\htdocs\account2/sales/allocations/customer_allocate.php:233
+#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:482
 msgid "Left to Allocate"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/allocations/supplier_allocate.php:220
-# c:\Apache2\htdocs\account/reporting/rep104.php:74
-# c:\Apache2\htdocs\account/reporting/rep104.php:78
-# c:\Apache2\htdocs\account/reporting/rep105.php:82
-# c:\Apache2\htdocs\account/reporting/rep105.php:86
-# c:\Apache2\htdocs\account/reporting/rep301.php:72
-# c:\Apache2\htdocs\account/reporting/rep301.php:79
-# c:\Apache2\htdocs\account/reporting/rep302.php:150
-# c:\Apache2\htdocs\account/reporting/rep302.php:157
-# c:\Apache2\htdocs\account/reporting/rep303.php:111
-# c:\Apache2\htdocs\account/reporting/rep303.php:118
-# c:\Apache2\htdocs\account/sales/allocations/customer_allocate.php:213
-#: c:\Apache2\htdocs\account2/purchasing/allocations/supplier_allocate.php:218
+#: c:\Apache2\htdocs\account2/purchasing/allocations/supplier_allocate.php:209
 #: c:\Apache2\htdocs\account2/reporting/rep101.php:56
-#: c:\Apache2\htdocs\account2/reporting/rep102.php:119
-#: c:\Apache2\htdocs\account2/reporting/rep104.php:74
-#: c:\Apache2\htdocs\account2/reporting/rep104.php:78
-#: c:\Apache2\htdocs\account2/reporting/rep105.php:82
-#: c:\Apache2\htdocs\account2/reporting/rep105.php:86
+#: c:\Apache2\htdocs\account2/reporting/rep102.php:78
+#: c:\Apache2\htdocs\account2/reporting/rep104.php:68
+#: c:\Apache2\htdocs\account2/reporting/rep104.php:72
+#: c:\Apache2\htdocs\account2/reporting/rep105.php:80
+#: c:\Apache2\htdocs\account2/reporting/rep105.php:84
 #: c:\Apache2\htdocs\account2/reporting/rep201.php:55
-#: c:\Apache2\htdocs\account2/reporting/rep202.php:127
+#: c:\Apache2\htdocs\account2/reporting/rep202.php:79
 #: c:\Apache2\htdocs\account2/reporting/rep203.php:59
 #: c:\Apache2\htdocs\account2/reporting/rep204.php:63
 #: c:\Apache2\htdocs\account2/reporting/rep301.php:72
 #: c:\Apache2\htdocs\account2/reporting/rep301.php:79
-#: c:\Apache2\htdocs\account2/reporting/rep302.php:150
-#: c:\Apache2\htdocs\account2/reporting/rep302.php:157
-#: c:\Apache2\htdocs\account2/reporting/rep303.php:111
-#: c:\Apache2\htdocs\account2/reporting/rep303.php:118
-#: c:\Apache2\htdocs\account2/sales/allocations/customer_allocate.php:221
+#: c:\Apache2\htdocs\account2/reporting/rep302.php:148
+#: c:\Apache2\htdocs\account2/reporting/rep302.php:155
+#: c:\Apache2\htdocs\account2/reporting/rep303.php:109
+#: c:\Apache2\htdocs\account2/reporting/rep303.php:116
+#: c:\Apache2\htdocs\account2/reporting/rep304.php:114
+#: c:\Apache2\htdocs\account2/reporting/rep304.php:121
+#: c:\Apache2\htdocs\account2/sales/allocations/customer_allocate.php:213
 msgid "All"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/allocations/supplier_allocate.php:228
-# c:\Apache2\htdocs\account/sales/allocations/customer_allocate.php:221
-#: c:\Apache2\htdocs\account2/purchasing/allocations/supplier_allocate.php:230
-#: c:\Apache2\htdocs\account2/sales/allocations/customer_allocate.php:230
+#: c:\Apache2\htdocs\account2/purchasing/allocations/supplier_allocate.php:218
+#: c:\Apache2\htdocs\account2/sales/allocations/customer_allocate.php:222
 msgid "Total Allocated"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/allocations/supplier_allocate.php:251
-# c:\Apache2\htdocs\account/sales/allocations/customer_allocate.php:241
-#: c:\Apache2\htdocs\account2/purchasing/allocations/supplier_allocate.php:254
-#: c:\Apache2\htdocs\account2/sales/allocations/customer_allocate.php:252
-msgid "There are no unsettled transactions to allocate."
+#: c:\Apache2\htdocs\account2/purchasing/allocations/supplier_allocate.php:234
+#: c:\Apache2\htdocs\account2/sales/allocations/customer_allocate.php:238
+msgid "Refresh"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/purchasing/allocations/supplier_allocate.php:234
+#: c:\Apache2\htdocs\account2/sales/allocations/customer_allocate.php:238
+msgid "Start again allocation of selected amount"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/allocations/supplier_allocate.php:255
-# c:\Apache2\htdocs\account/sales/allocations/customer_allocate.php:244
-#: c:\Apache2\htdocs\account2/purchasing/allocations/supplier_allocate.php:258
-#: c:\Apache2\htdocs\account2/sales/allocations/customer_allocate.php:255
+#: c:\Apache2\htdocs\account2/purchasing/allocations/supplier_allocate.php:235
+#: c:\Apache2\htdocs\account2/sales/allocations/customer_allocate.php:239
+msgid "Process allocations"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/purchasing/allocations/supplier_allocate.php:236
+#: c:\Apache2\htdocs\account2/purchasing/allocations/supplier_allocate.php:242
+#: c:\Apache2\htdocs\account2/sales/allocations/customer_allocate.php:240
+#: c:\Apache2\htdocs\account2/sales/allocations/customer_allocate.php:246
 msgid "Back to Allocations"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/allocations/supplier_allocation_main.php:16
+#: c:\Apache2\htdocs\account2/purchasing/allocations/supplier_allocate.php:237
+#: c:\Apache2\htdocs\account2/purchasing/allocations/supplier_allocate.php:243
+#: c:\Apache2\htdocs\account2/sales/allocations/customer_allocate.php:240
+#: c:\Apache2\htdocs\account2/sales/allocations/customer_allocate.php:247
+msgid "Abandon allocations and return to selection of allocatable amounts"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/purchasing/allocations/supplier_allocate.php:241
+#: c:\Apache2\htdocs\account2/sales/allocations/customer_allocate.php:244
+msgid "There are no unsettled transactions to allocate."
+msgstr ""
+
 #: c:\Apache2\htdocs\account2/purchasing/allocations/supplier_allocation_main.php:16
 msgid "Supplier Allocations"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/allocations/supplier_allocation_main.php:35
 #: c:\Apache2\htdocs\account2/purchasing/allocations/supplier_allocation_main.php:35
 msgid "Select a Supplier: "
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/allocations/supplier_allocation_main.php:38
-# c:\Apache2\htdocs\account/sales/allocations/customer_allocation_main.php:34
 #: c:\Apache2\htdocs\account2/purchasing/allocations/supplier_allocation_main.php:38
 #: c:\Apache2\htdocs\account2/sales/allocations/customer_allocation_main.php:34
 msgid "Show Settled Items:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/allocations/supplier_allocation_main.php:61
-# c:\Apache2\htdocs\account/purchasing/allocations/supplier_allocation_main.php:64
-# c:\Apache2\htdocs\account/sales/allocations/customer_allocation_main.php:63
-# c:\Apache2\htdocs\account/sales/allocations/customer_allocation_main.php:66
 #: c:\Apache2\htdocs\account2/purchasing/allocations/supplier_allocation_main.php:61
 #: c:\Apache2\htdocs\account2/purchasing/allocations/supplier_allocation_main.php:64
 #: c:\Apache2\htdocs\account2/sales/allocations/customer_allocation_main.php:63
@@ -7717,733 +5705,497 @@ msgstr ""
 msgid "Left To Allocate"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/allocations/supplier_allocation_main.php:94
-# c:\Apache2\htdocs\account/sales/allocations/customer_allocation_main.php:96
 #: c:\Apache2\htdocs\account2/purchasing/allocations/supplier_allocation_main.php:94
 #: c:\Apache2\htdocs\account2/sales/allocations/customer_allocation_main.php:97
 msgid "Allocate"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/allocations/supplier_allocation_main.php:101
-# c:\Apache2\htdocs\account/sales/allocations/customer_allocation_main.php:105
 #: c:\Apache2\htdocs\account2/purchasing/allocations/supplier_allocation_main.php:101
 #: c:\Apache2\htdocs\account2/sales/allocations/customer_allocation_main.php:106
 msgid "Marked items are settled."
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/allocations/supplier_allocation_main.php:104
-# c:\Apache2\htdocs\account/sales/allocations/customer_allocation_main.php:108
 #: c:\Apache2\htdocs\account2/purchasing/allocations/supplier_allocation_main.php:104
 #: c:\Apache2\htdocs\account2/sales/allocations/customer_allocation_main.php:109
 msgid "There are no allocations to be done."
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/inquiry/po_search.php:12
 #: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search.php:15
 msgid "Search Outstanding Purchase Orders"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/inquiry/po_search.php:25
-# c:\Apache2\htdocs\account/purchasing/inquiry/po_search_completed.php:24
-# c:\Apache2\htdocs\account/sales/inquiry/sales_orders_view.php:41
-#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search.php:28
-#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search_completed.php:27
-#: c:\Apache2\htdocs\account2/sales/inquiry/sales_deliveries_view.php:85
-#: c:\Apache2\htdocs\account2/sales/inquiry/sales_orders_view.php:71
+#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search.php:52
+#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search_completed.php:50
+#: c:\Apache2\htdocs\account2/sales/inquiry/sales_deliveries_view.php:107
+#: c:\Apache2\htdocs\account2/sales/inquiry/sales_orders_view.php:81
 msgid "#:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/inquiry/po_search.php:106
-# c:\Apache2\htdocs\account/purchasing/inquiry/po_search.php:109
-# c:\Apache2\htdocs\account/purchasing/inquiry/po_search_completed.php:99
-# c:\Apache2\htdocs\account/purchasing/inquiry/po_search_completed.php:102
-# c:\Apache2\htdocs\account/purchasing/inquiry/supplier_inquiry.php:159
-# c:\Apache2\htdocs\account/purchasing/inquiry/supplier_inquiry.php:163
-# c:\Apache2\htdocs\account/purchasing/view/view_supp_credit.php:33
-# c:\Apache2\htdocs\account/purchasing/view/view_supp_invoice.php:39
-# c:\Apache2\htdocs\account/purchasing/includes/ui/grn_ui.inc:20
-# c:\Apache2\htdocs\account/purchasing/includes/ui/po_ui.inc:253
-#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search.php:111
-#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search.php:114
-#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search_completed.php:104
-#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search_completed.php:107
-#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_inquiry.php:161
-#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_inquiry.php:165
+#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search.php:136
+#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search.php:139
+#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search_completed.php:128
+#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search_completed.php:131
+#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_inquiry.php:168
+#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_inquiry.php:172
 #: c:\Apache2\htdocs\account2/purchasing/view/view_supp_credit.php:33
 #: c:\Apache2\htdocs\account2/purchasing/view/view_supp_invoice.php:39
 #: c:\Apache2\htdocs\account2/purchasing/includes/ui/grn_ui.inc:20
-#: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:255
+#: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:257
 msgid "Supplier's Reference"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/inquiry/po_search.php:106
-# c:\Apache2\htdocs\account/purchasing/inquiry/po_search.php:109
-# c:\Apache2\htdocs\account/purchasing/inquiry/po_search_completed.php:99
-# c:\Apache2\htdocs\account/purchasing/inquiry/po_search_completed.php:102
-# c:\Apache2\htdocs\account/sales/inquiry/sales_orders_view.php:125
-#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search.php:111
-#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search.php:114
-#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search_completed.php:104
-#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search_completed.php:107
-#: c:\Apache2\htdocs\account2/sales/inquiry/sales_orders_view.php:174
+#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search.php:136
+#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search.php:139
+#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search_completed.php:128
+#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search_completed.php:131
+#: c:\Apache2\htdocs\account2/sales/inquiry/sales_orders_view.php:192
 msgid "Order Date"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/inquiry/po_search.php:106
-# c:\Apache2\htdocs\account/purchasing/inquiry/po_search.php:109
-# c:\Apache2\htdocs\account/purchasing/inquiry/po_search_completed.php:99
-# c:\Apache2\htdocs\account/purchasing/inquiry/po_search_completed.php:102
-# c:\Apache2\htdocs\account/sales/inquiry/sales_orders_view.php:126
-#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search.php:111
-#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search.php:114
-#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search_completed.php:104
-#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search_completed.php:107
-#: c:\Apache2\htdocs\account2/sales/inquiry/sales_orders_view.php:175
+#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search.php:136
+#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search.php:139
+#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search_completed.php:128
+#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search_completed.php:131
+#: c:\Apache2\htdocs\account2/sales/inquiry/sales_orders_view.php:193
 msgid "Order Total"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/inquiry/po_search.php:144
-#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search.php:150
+#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search.php:175
 msgid "Receive"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/inquiry/po_search.php:160
-#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search.php:166
+#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search.php:191
 msgid "Marked orders have overdue items."
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/inquiry/po_search_completed.php:11
 #: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search_completed.php:14
 msgid "Search Purchase Orders"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/inquiry/po_search_completed.php:29
-#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search_completed.php:32
+#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search_completed.php:55
 msgid "into location:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/inquiry/supplier_allocation_inquiry.php:36
-# c:\Apache2\htdocs\account/purchasing/manage/suppliers.php:135
 #: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_allocation_inquiry.php:38
-#: c:\Apache2\htdocs\account2/purchasing/manage/suppliers.php:135
+#: c:\Apache2\htdocs\account2/purchasing/manage/suppliers.php:130
 msgid "Select a supplier: "
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/inquiry/supplier_allocation_inquiry.php:43
-# c:\Apache2\htdocs\account/sales/inquiry/customer_allocation_inquiry.php:37
 #: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_allocation_inquiry.php:45
 #: c:\Apache2\htdocs\account2/sales/inquiry/customer_allocation_inquiry.php:39
 msgid "show settled:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/inquiry/supplier_allocation_inquiry.php:113
-# c:\Apache2\htdocs\account/purchasing/inquiry/supplier_inquiry.php:147
-#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_allocation_inquiry.php:115
-#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_inquiry.php:149
+#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_allocation_inquiry.php:125
+#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_inquiry.php:162
 msgid "There are no transactions to display for the given dates."
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/inquiry/supplier_allocation_inquiry.php:125
-# c:\Apache2\htdocs\account/purchasing/inquiry/supplier_allocation_inquiry.php:128
-#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_allocation_inquiry.php:127
-#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_allocation_inquiry.php:130
+#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_allocation_inquiry.php:131
+#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_allocation_inquiry.php:134
 msgid "Supp Reference"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/inquiry/supplier_allocation_inquiry.php:126
-# c:\Apache2\htdocs\account/purchasing/inquiry/supplier_allocation_inquiry.php:129
-# c:\Apache2\htdocs\account/reporting/rep101.php:71
-# c:\Apache2\htdocs\account/reporting/rep201.php:72
-# c:\Apache2\htdocs\account/sales/inquiry/customer_allocation_inquiry.php:120
-# c:\Apache2\htdocs\account/sales/inquiry/customer_allocation_inquiry.php:123
-# c:\Apache2\htdocs\account/reporting/includes/doctext.inc:46
-#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_allocation_inquiry.php:128
-#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_allocation_inquiry.php:131
+#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_allocation_inquiry.php:132
+#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_allocation_inquiry.php:135
 #: c:\Apache2\htdocs\account2/reporting/rep101.php:72
 #: c:\Apache2\htdocs\account2/reporting/rep201.php:71
-#: c:\Apache2\htdocs\account2/sales/inquiry/customer_allocation_inquiry.php:132
 #: c:\Apache2\htdocs\account2/sales/inquiry/customer_allocation_inquiry.php:135
-#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:55
+#: c:\Apache2\htdocs\account2/sales/inquiry/customer_allocation_inquiry.php:138
+#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:56
 msgid "Allocated"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/inquiry/supplier_allocation_inquiry.php:181
-# c:\Apache2\htdocs\account/includes/ui/ui_view.inc:459
-#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_allocation_inquiry.php:183
-#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:471
+#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_allocation_inquiry.php:187
+#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:477
 msgid "Allocations"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/inquiry/supplier_allocation_inquiry.php:198
-# c:\Apache2\htdocs\account/purchasing/inquiry/supplier_inquiry.php:220
-# c:\Apache2\htdocs\account/purchasing/view/view_po.php:82
-# c:\Apache2\htdocs\account/sales/inquiry/customer_allocation_inquiry.php:207
-# c:\Apache2\htdocs\account/sales/inquiry/customer_inquiry.php:250
-# c:\Apache2\htdocs\account/sales/inquiry/sales_orders_view.php:188
-#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_allocation_inquiry.php:200
-#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_inquiry.php:222
-#: c:\Apache2\htdocs\account2/purchasing/view/view_po.php:82
-#: c:\Apache2\htdocs\account2/sales/inquiry/customer_allocation_inquiry.php:219
-#: c:\Apache2\htdocs\account2/sales/inquiry/customer_inquiry.php:283
-#: c:\Apache2\htdocs\account2/sales/inquiry/sales_deliveries_view.php:270
-#: c:\Apache2\htdocs\account2/sales/inquiry/sales_orders_view.php:263
+#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_allocation_inquiry.php:206
+#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_inquiry.php:229
+#: c:\Apache2\htdocs\account2/purchasing/view/view_po.php:83
+#: c:\Apache2\htdocs\account2/sales/inquiry/customer_allocation_inquiry.php:222
+#: c:\Apache2\htdocs\account2/sales/inquiry/customer_inquiry.php:294
+#: c:\Apache2\htdocs\account2/sales/inquiry/sales_deliveries_view.php:289
+#: c:\Apache2\htdocs\account2/sales/inquiry/sales_orders_view.php:281
 msgid "Marked items are overdue."
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/inquiry/supplier_inquiry.php:12
 #: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_inquiry.php:14
 msgid "Supplier Inquiry"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/inquiry/supplier_inquiry.php:34
 #: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_inquiry.php:36
 msgid "Select a supplier:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/inquiry/supplier_inquiry.php:58
-# c:\Apache2\htdocs\account/purchasing/inquiry/supplier_inquiry.php:59
-# c:\Apache2\htdocs\account/purchasing/inquiry/supplier_inquiry.php:60
-# c:\Apache2\htdocs\account/reporting/rep102.php:132
-# c:\Apache2\htdocs\account/reporting/rep102.php:133
-# c:\Apache2\htdocs\account/reporting/rep102.php:134
-# c:\Apache2\htdocs\account/reporting/rep202.php:140
-# c:\Apache2\htdocs\account/reporting/rep202.php:141
-# c:\Apache2\htdocs\account/reporting/rep202.php:142
-# c:\Apache2\htdocs\account/reporting/rep202.php:171
-# c:\Apache2\htdocs\account/reporting/rep202.php:172
-# c:\Apache2\htdocs\account/reporting/rep202.php:173
-# c:\Apache2\htdocs\account/sales/inquiry/customer_inquiry.php:61
-# c:\Apache2\htdocs\account/sales/inquiry/customer_inquiry.php:62
-# c:\Apache2\htdocs\account/sales/inquiry/customer_inquiry.php:63
-# c:\Apache2\htdocs\account/reporting/includes/doctext.inc:79
 #: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_inquiry.php:60
 #: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_inquiry.php:61
 #: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_inquiry.php:62
-#: c:\Apache2\htdocs\account2/reporting/rep102.php:138
-#: c:\Apache2\htdocs\account2/reporting/rep102.php:139
-#: c:\Apache2\htdocs\account2/reporting/rep102.php:140
-#: c:\Apache2\htdocs\account2/reporting/rep102.php:255
-#: c:\Apache2\htdocs\account2/reporting/rep202.php:145
-#: c:\Apache2\htdocs\account2/reporting/rep202.php:146
-#: c:\Apache2\htdocs\account2/reporting/rep202.php:147
-#: c:\Apache2\htdocs\account2/reporting/rep202.php:175
-#: c:\Apache2\htdocs\account2/reporting/rep202.php:176
-#: c:\Apache2\htdocs\account2/reporting/rep202.php:177
-#: c:\Apache2\htdocs\account2/reporting/rep202.php:263
-#: c:\Apache2\htdocs\account2/sales/inquiry/customer_inquiry.php:64
+#: c:\Apache2\htdocs\account2/reporting/rep102.php:97
+#: c:\Apache2\htdocs\account2/reporting/rep102.php:98
+#: c:\Apache2\htdocs\account2/reporting/rep102.php:99
+#: c:\Apache2\htdocs\account2/reporting/rep102.php:214
+#: c:\Apache2\htdocs\account2/reporting/rep202.php:97
+#: c:\Apache2\htdocs\account2/reporting/rep202.php:98
+#: c:\Apache2\htdocs\account2/reporting/rep202.php:99
+#: c:\Apache2\htdocs\account2/reporting/rep202.php:127
+#: c:\Apache2\htdocs\account2/reporting/rep202.php:128
+#: c:\Apache2\htdocs\account2/reporting/rep202.php:129
+#: c:\Apache2\htdocs\account2/reporting/rep202.php:215
 #: c:\Apache2\htdocs\account2/sales/inquiry/customer_inquiry.php:65
 #: c:\Apache2\htdocs\account2/sales/inquiry/customer_inquiry.php:66
-#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:91
+#: c:\Apache2\htdocs\account2/sales/inquiry/customer_inquiry.php:67
+#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:92
 msgid "Days"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/inquiry/supplier_inquiry.php:60
-# c:\Apache2\htdocs\account/reporting/rep102.php:134
-# c:\Apache2\htdocs\account/reporting/rep202.php:142
-# c:\Apache2\htdocs\account/reporting/rep202.php:173
-# c:\Apache2\htdocs\account/sales/inquiry/customer_inquiry.php:63
-# c:\Apache2\htdocs\account/reporting/includes/doctext.inc:80
 #: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_inquiry.php:62
-#: c:\Apache2\htdocs\account2/reporting/rep102.php:140
-#: c:\Apache2\htdocs\account2/reporting/rep202.php:147
-#: c:\Apache2\htdocs\account2/reporting/rep202.php:177
-#: c:\Apache2\htdocs\account2/sales/inquiry/customer_inquiry.php:66
-#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:92
+#: c:\Apache2\htdocs\account2/reporting/rep102.php:99
+#: c:\Apache2\htdocs\account2/reporting/rep202.php:99
+#: c:\Apache2\htdocs\account2/reporting/rep202.php:129
+#: c:\Apache2\htdocs\account2/sales/inquiry/customer_inquiry.php:67
+#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:93
 msgid "Over"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/inquiry/supplier_inquiry.php:64
-# c:\Apache2\htdocs\account/sales/inquiry/customer_inquiry.php:66
 #: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_inquiry.php:66
-#: c:\Apache2\htdocs\account2/sales/inquiry/customer_inquiry.php:69
+#: c:\Apache2\htdocs\account2/sales/inquiry/customer_inquiry.php:70
 msgid "Terms"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/inquiry/supplier_inquiry.php:64
-# c:\Apache2\htdocs\account/reporting/rep102.php:137
-# c:\Apache2\htdocs\account/reporting/rep202.php:146
-# c:\Apache2\htdocs\account/sales/inquiry/customer_inquiry.php:66
-# c:\Apache2\htdocs\account/reporting/includes/doctext.inc:75
 #: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_inquiry.php:66
-#: c:\Apache2\htdocs\account2/reporting/rep102.php:143
-#: c:\Apache2\htdocs\account2/reporting/rep102.php:253
-#: c:\Apache2\htdocs\account2/reporting/rep202.php:151
-#: c:\Apache2\htdocs\account2/reporting/rep202.php:261
-#: c:\Apache2\htdocs\account2/sales/inquiry/customer_inquiry.php:69
-#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:87
+#: c:\Apache2\htdocs\account2/reporting/rep102.php:102
+#: c:\Apache2\htdocs\account2/reporting/rep102.php:212
+#: c:\Apache2\htdocs\account2/reporting/rep202.php:103
+#: c:\Apache2\htdocs\account2/reporting/rep202.php:213
+#: c:\Apache2\htdocs\account2/sales/inquiry/customer_inquiry.php:70
+#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:88
 msgid "Current"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/inquiry/supplier_inquiry.php:65
-# c:\Apache2\htdocs\account/reporting/rep102.php:138
-# c:\Apache2\htdocs\account/reporting/rep202.php:147
-# c:\Apache2\htdocs\account/sales/inquiry/customer_inquiry.php:67
-# c:\Apache2\htdocs\account/reporting/includes/doctext.inc:76
 #: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_inquiry.php:67
-#: c:\Apache2\htdocs\account2/reporting/rep102.php:144
-#: c:\Apache2\htdocs\account2/reporting/rep202.php:152
-#: c:\Apache2\htdocs\account2/sales/inquiry/customer_inquiry.php:70
-#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:88
+#: c:\Apache2\htdocs\account2/reporting/rep102.php:103
+#: c:\Apache2\htdocs\account2/reporting/rep202.php:104
+#: c:\Apache2\htdocs\account2/sales/inquiry/customer_inquiry.php:71
+#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:89
 msgid "Total Balance"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/manage/suppliers.php:14
-# c:\Apache2\htdocs\account/sales/manage/customer_branches.php:22
 #: c:\Apache2\htdocs\account2/purchasing/manage/suppliers.php:13
 #: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:21
 msgid "There are no tax groups defined in the system. At least one tax group is required before proceeding."
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/manage/suppliers.php:40
-#: c:\Apache2\htdocs\account2/purchasing/manage/suppliers.php:39
+#: c:\Apache2\htdocs\account2/purchasing/manage/suppliers.php:31
 msgid "The supplier name must be entered."
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/manage/suppliers.php:104
-#: c:\Apache2\htdocs\account2/purchasing/manage/suppliers.php:104
-msgid "Cannot delete this supplier because there are transactions that refer to this supplier."
+#: c:\Apache2\htdocs\account2/purchasing/manage/suppliers.php:55
+msgid "Supplier has been updated."
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/manage/suppliers.php:115
-#: c:\Apache2\htdocs\account2/purchasing/manage/suppliers.php:115
-msgid "Cannot delete the supplier record because purchase orders have been created against this supplier."
+#: c:\Apache2\htdocs\account2/purchasing/manage/suppliers.php:78
+msgid "A new supplier has been added."
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/manage/suppliers.php:136
-#: c:\Apache2\htdocs\account2/purchasing/manage/suppliers.php:136
-msgid "Edit Supplier"
+#: c:\Apache2\htdocs\account2/purchasing/manage/suppliers.php:98
+msgid "Cannot delete this supplier because there are transactions that refer to this supplier."
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/purchasing/manage/suppliers.php:109
+msgid "Cannot delete the supplier record because purchase orders have been created against this supplier."
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/manage/suppliers.php:145
-#: c:\Apache2\htdocs\account2/purchasing/manage/suppliers.php:145
-msgid "Enter a new supplier"
+#: c:\Apache2\htdocs\account2/purchasing/manage/suppliers.php:131
+msgid "New supplier"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/manage/suppliers.php:184
-#: c:\Apache2\htdocs\account2/purchasing/manage/suppliers.php:184
+#: c:\Apache2\htdocs\account2/purchasing/manage/suppliers.php:180
 msgid "Supplier Name:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/manage/suppliers.php:187
-#: c:\Apache2\htdocs\account2/purchasing/manage/suppliers.php:187
+#: c:\Apache2\htdocs\account2/purchasing/manage/suppliers.php:183
 msgid "Bank Account:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/manage/suppliers.php:192
-# c:\Apache2\htdocs\account/purchasing/manage/suppliers.php:197
-# c:\Apache2\htdocs\account/purchasing/includes/ui/invoice_ui.inc:105
-#: c:\Apache2\htdocs\account2/purchasing/manage/suppliers.php:192
-#: c:\Apache2\htdocs\account2/purchasing/manage/suppliers.php:197
+#: c:\Apache2\htdocs\account2/purchasing/manage/suppliers.php:188
+#: c:\Apache2\htdocs\account2/purchasing/manage/suppliers.php:193
 #: c:\Apache2\htdocs\account2/purchasing/includes/ui/invoice_ui.inc:103
 msgid "Supplier's Currency:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/manage/suppliers.php:200
-# c:\Apache2\htdocs\account/sales/manage/customer_branches.php:287
-# c:\Apache2\htdocs\account/purchasing/includes/ui/invoice_ui.inc:112
-# c:\Apache2\htdocs\account/sales/includes/ui/sales_credit_ui.inc:84
-# c:\Apache2\htdocs\account/sales/includes/ui/sales_order_ui.inc:262
-# c:\Apache2\htdocs\account/sales/includes/ui/sales_order_ui.inc:266
-#: c:\Apache2\htdocs\account2/purchasing/manage/suppliers.php:200
-#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:286
+#: c:\Apache2\htdocs\account2/purchasing/manage/suppliers.php:196
+#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:293
 #: c:\Apache2\htdocs\account2/purchasing/includes/ui/invoice_ui.inc:107
-#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:296
+#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:301
 msgid "Tax Group:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/manage/suppliers.php:202
-# c:\Apache2\htdocs\account/sales/manage/customers.php:311
-#: c:\Apache2\htdocs\account2/purchasing/manage/suppliers.php:202
-#: c:\Apache2\htdocs\account2/sales/manage/customers.php:291
+#: c:\Apache2\htdocs\account2/purchasing/manage/suppliers.php:198
+#: c:\Apache2\htdocs\account2/sales/manage/customers.php:261
 msgid "Payment Terms:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/manage/suppliers.php:204
-# c:\Apache2\htdocs\account/reporting/rep704.php:76
-# c:\Apache2\htdocs\account/reporting/rep704.php:86
-# c:\Apache2\htdocs\account/reporting/rep704.php:94
-#: c:\Apache2\htdocs\account2/purchasing/manage/suppliers.php:204
+#: c:\Apache2\htdocs\account2/purchasing/manage/suppliers.php:200
 #: c:\Apache2\htdocs\account2/reporting/rep704.php:76
 #: c:\Apache2\htdocs\account2/reporting/rep704.php:86
 #: c:\Apache2\htdocs\account2/reporting/rep704.php:94
 msgid "Accounts"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/manage/suppliers.php:208
-#: c:\Apache2\htdocs\account2/purchasing/manage/suppliers.php:208
+#: c:\Apache2\htdocs\account2/purchasing/manage/suppliers.php:202
+msgid "Accounts Payable Account:"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/purchasing/manage/suppliers.php:204
 msgid "Purchase Account:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/manage/suppliers.php:230
-#: c:\Apache2\htdocs\account2/purchasing/manage/suppliers.php:230
+#: c:\Apache2\htdocs\account2/purchasing/manage/suppliers.php:226
 msgid "Update Supplier"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/manage/suppliers.php:231
-#: c:\Apache2\htdocs\account2/purchasing/manage/suppliers.php:231
+#: c:\Apache2\htdocs\account2/purchasing/manage/suppliers.php:227
+msgid "Update supplier data"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/purchasing/manage/suppliers.php:228
 msgid "Delete Supplier"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/manage/suppliers.php:235
-#: c:\Apache2\htdocs\account2/purchasing/manage/suppliers.php:235
+#: c:\Apache2\htdocs\account2/purchasing/manage/suppliers.php:229
+msgid "Delete supplier data if have been never used"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/purchasing/manage/suppliers.php:233
 msgid "Add New Supplier Details"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/view/view_grn.php:8
 #: c:\Apache2\htdocs\account2/purchasing/view/view_grn.php:8
 msgid "View Purchase Order Delivery"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/view/view_grn.php:14
 #: c:\Apache2\htdocs\account2/purchasing/view/view_grn.php:14
 msgid "This page must be called with a Purchase Order Delivery number to review."
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/view/view_grn.php:20
-# c:\Apache2\htdocs\account/includes/types.inc:19
 #: c:\Apache2\htdocs\account2/purchasing/view/view_grn.php:20
 #: c:\Apache2\htdocs\account2/includes/types.inc:20
 msgid "Purchase Order Delivery"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/view/view_grn.php:24
-# c:\Apache2\htdocs\account/purchasing/view/view_po.php:34
-# c:\Apache2\htdocs\account/sales/view/view_sales_order.php:137
 #: c:\Apache2\htdocs\account2/purchasing/view/view_grn.php:24
 #: c:\Apache2\htdocs\account2/purchasing/view/view_po.php:34
 #: c:\Apache2\htdocs\account2/sales/view/view_sales_order.php:169
 msgid "Line Details"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/view/view_grn.php:27
-# c:\Apache2\htdocs\account/purchasing/view/view_po.php:38
-# c:\Apache2\htdocs\account/sales/customer_credit_invoice.php:283
-# c:\Apache2\htdocs\account/sales/customer_invoice.php:378
-# c:\Apache2\htdocs\account/sales/view/view_credit.php:81
-# c:\Apache2\htdocs\account/sales/view/view_invoice.php:99
-# c:\Apache2\htdocs\account/sales/view/view_sales_order.php:140
-# c:\Apache2\htdocs\account/inventory/includes/item_adjustments_ui.inc:74
-# c:\Apache2\htdocs\account/inventory/includes/stock_transfers_ui.inc:70
-# c:\Apache2\htdocs\account/manufacturing/includes/work_order_issue_ui.inc:43
-# c:\Apache2\htdocs\account/purchasing/includes/ui/po_ui.inc:167
-# c:\Apache2\htdocs\account/reporting/includes/doctext.inc:36
-# c:\Apache2\htdocs\account/reporting/includes/doctext.inc:39
-# c:\Apache2\htdocs\account/sales/includes/ui/sales_credit_ui.inc:103
-# c:\Apache2\htdocs\account/sales/includes/ui/sales_order_ui.inc:109
 #: c:\Apache2\htdocs\account2/purchasing/view/view_grn.php:27
 #: c:\Apache2\htdocs\account2/purchasing/view/view_po.php:38
-#: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:266
-#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:353
-#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:325
+#: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:280
+#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:366
+#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:351
 #: c:\Apache2\htdocs\account2/sales/view/view_credit.php:81
 #: c:\Apache2\htdocs\account2/sales/view/view_dispatch.php:103
 #: c:\Apache2\htdocs\account2/sales/view/view_invoice.php:103
 #: c:\Apache2\htdocs\account2/sales/view/view_sales_order.php:172
-#: c:\Apache2\htdocs\account2/inventory/includes/item_adjustments_ui.inc:74
-#: c:\Apache2\htdocs\account2/inventory/includes/stock_transfers_ui.inc:70
-#: c:\Apache2\htdocs\account2/manufacturing/includes/work_order_issue_ui.inc:43
-#: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:167
-#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:45
-#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:48
-#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_credit_ui.inc:108
-#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:85
+#: c:\Apache2\htdocs\account2/inventory/includes/item_adjustments_ui.inc:64
+#: c:\Apache2\htdocs\account2/inventory/includes/stock_transfers_ui.inc:60
+#: c:\Apache2\htdocs\account2/manufacturing/includes/work_order_issue_ui.inc:24
+#: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:165
+#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:46
+#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:49
+#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_credit_ui.inc:152
+#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:82
 msgid "Item Description"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/view/view_grn.php:27
-# c:\Apache2\htdocs\account/reporting/includes/doctext.inc:10
-# c:\Apache2\htdocs\account/reporting/includes/doctext.inc:37
 #: c:\Apache2\htdocs\account2/purchasing/view/view_grn.php:27
-#: c:\Apache2\htdocs\account2/sales/inquiry/sales_deliveries_view.php:197
+#: c:\Apache2\htdocs\account2/sales/inquiry/sales_deliveries_view.php:216
 #: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:10
-#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:46
+#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:47
 msgid "Delivery Date"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/view/view_grn.php:28
-# c:\Apache2\htdocs\account/purchasing/view/view_po.php:39
-# c:\Apache2\htdocs\account/purchasing/includes/ui/po_ui.inc:168
 #: c:\Apache2\htdocs\account2/purchasing/view/view_grn.php:28
 #: c:\Apache2\htdocs\account2/purchasing/view/view_po.php:39
-#: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:168
+#: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:166
 msgid "Line Total"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/view/view_grn.php:56
-# c:\Apache2\htdocs\account/purchasing/view/view_po.php:76
-# c:\Apache2\htdocs\account/sales/includes/ui/sales_order_ui.inc:158
-#: c:\Apache2\htdocs\account2/purchasing/view/view_grn.php:56
-#: c:\Apache2\htdocs\account2/purchasing/view/view_po.php:76
+#: c:\Apache2\htdocs\account2/purchasing/view/view_grn.php:57
+#: c:\Apache2\htdocs\account2/purchasing/view/view_po.php:77
 msgid "Total Excluding Tax/Shipping"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/view/view_grn.php:61
-#: c:\Apache2\htdocs\account2/purchasing/view/view_grn.php:61
+#: c:\Apache2\htdocs\account2/purchasing/view/view_grn.php:62
 msgid "This delivery has been voided."
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/view/view_po.php:9
 #: c:\Apache2\htdocs\account2/purchasing/view/view_po.php:9
 msgid "View Purchase Order"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/view/view_po.php:15
 #: c:\Apache2\htdocs\account2/purchasing/view/view_po.php:15
 msgid "This page must be called with a purchase order number to review."
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/view/view_po.php:18
-# c:\Apache2\htdocs\account/includes/types.inc:15
-# c:\Apache2\htdocs\account/purchasing/includes/ui/po_ui.inc:232
-# c:\Apache2\htdocs\account/reporting/includes/form_types.inc:9
 #: c:\Apache2\htdocs\account2/purchasing/view/view_po.php:18
 #: c:\Apache2\htdocs\account2/includes/types.inc:16
-#: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:234
+#: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:236
 msgid "Purchase Order"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/view/view_po.php:39
 #: c:\Apache2\htdocs\account2/purchasing/view/view_po.php:39
 msgid "Requested By"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/view/view_po.php:95
-#: c:\Apache2\htdocs\account2/purchasing/view/view_po.php:95
+#: c:\Apache2\htdocs\account2/purchasing/view/view_po.php:96
 #: c:\Apache2\htdocs\account2/sales/view/view_sales_order.php:32
 msgid "Deliveries"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/view/view_po.php:97
-#: c:\Apache2\htdocs\account2/purchasing/view/view_po.php:97
+#: c:\Apache2\htdocs\account2/purchasing/view/view_po.php:98
 msgid "Delivered On"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/view/view_po.php:120
-#: c:\Apache2\htdocs\account2/purchasing/view/view_po.php:120
+#: c:\Apache2\htdocs\account2/purchasing/view/view_po.php:121
 #: c:\Apache2\htdocs\account2/sales/view/view_sales_order.php:34
 msgid "Invoices/Credits"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/view/view_supp_credit.php:9
 #: c:\Apache2\htdocs\account2/purchasing/view/view_supp_credit.php:9
 msgid "View Supplier Credit Note"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/view/view_supp_credit.php:27
 #: c:\Apache2\htdocs\account2/purchasing/view/view_supp_credit.php:27
 msgid "SUPPLIER CREDIT NOTE"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/view/view_supp_credit.php:36
-# c:\Apache2\htdocs\account/purchasing/view/view_supp_invoice.php:42
-# c:\Apache2\htdocs\account/sales/customer_credit_invoice.php:272
-# c:\Apache2\htdocs\account/sales/view/view_invoice.php:83
 #: c:\Apache2\htdocs\account2/purchasing/view/view_supp_credit.php:36
 #: c:\Apache2\htdocs\account2/purchasing/view/view_supp_invoice.php:42
-#: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:255
+#: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:268
 #: c:\Apache2\htdocs\account2/sales/view/view_invoice.php:87
 msgid "Invoice Date"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/view/view_supp_credit.php:49
-# c:\Apache2\htdocs\account/purchasing/view/view_supp_invoice.php:57
-# c:\Apache2\htdocs\account/sales/view/view_credit.php:127
 #: c:\Apache2\htdocs\account2/purchasing/view/view_supp_credit.php:49
 #: c:\Apache2\htdocs\account2/purchasing/view/view_supp_invoice.php:57
 #: c:\Apache2\htdocs\account2/sales/view/view_credit.php:127
 msgid "Sub Total"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/view/view_supp_credit.php:55
 #: c:\Apache2\htdocs\account2/purchasing/view/view_supp_credit.php:55
 msgid "TOTAL CREDIT NOTE"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/view/view_supp_credit.php:59
-# c:\Apache2\htdocs\account/sales/view/view_credit.php:138
 #: c:\Apache2\htdocs\account2/purchasing/view/view_supp_credit.php:59
 #: c:\Apache2\htdocs\account2/sales/view/view_credit.php:138
 msgid "This credit note has been voided."
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/view/view_supp_invoice.php:14
 #: c:\Apache2\htdocs\account2/purchasing/view/view_supp_invoice.php:14
 msgid "View Supplier Invoice"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/view/view_supp_invoice.php:32
 #: c:\Apache2\htdocs\account2/purchasing/view/view_supp_invoice.php:32
 msgid "SUPPLIER INVOICE"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/view/view_supp_invoice.php:64
-# c:\Apache2\htdocs\account/sales/view/view_invoice.php:149
-# c:\Apache2\htdocs\account/reporting/includes/doctext.inc:68
 #: c:\Apache2\htdocs\account2/purchasing/view/view_supp_invoice.php:64
 #: c:\Apache2\htdocs\account2/sales/view/view_invoice.php:154
-#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:79
+#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:80
 msgid "TOTAL INVOICE"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/view/view_supp_invoice.php:68
-# c:\Apache2\htdocs\account/sales/view/view_invoice.php:153
 #: c:\Apache2\htdocs\account2/purchasing/view/view_supp_invoice.php:68
 #: c:\Apache2\htdocs\account2/sales/view/view_invoice.php:158
 msgid "This invoice has been voided."
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/view/view_supp_payment.php:13
 #: c:\Apache2\htdocs\account2/purchasing/view/view_supp_payment.php:13
 msgid "View Payment to Supplier"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/view/view_supp_payment.php:38
 #: c:\Apache2\htdocs\account2/purchasing/view/view_supp_payment.php:38
 msgid "Payment to Supplier"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/view/view_supp_payment.php:44
-# c:\Apache2\htdocs\account/reporting/reports_main.php:74
-# c:\Apache2\htdocs\account/reporting/reports_main.php:80
-# c:\Apache2\htdocs\account/reporting/reports_main.php:87
-# c:\Apache2\htdocs\account/reporting/reports_main.php:92
 #: c:\Apache2\htdocs\account2/purchasing/view/view_supp_payment.php:44
 msgid "To Supplier"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/view/view_supp_payment.php:50
-# c:\Apache2\htdocs\account/sales/view/view_receipt.php:30
 #: c:\Apache2\htdocs\account2/purchasing/view/view_supp_payment.php:50
 #: c:\Apache2\htdocs\account2/sales/view/view_receipt.php:30
 msgid "Payment Currency"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/view/view_supp_payment.php:57
 #: c:\Apache2\htdocs\account2/purchasing/view/view_supp_payment.php:57
 msgid "Supplier's Currency"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/rep101.php:63
-# c:\Apache2\htdocs\account/reporting/rep102.php:125
-# c:\Apache2\htdocs\account/reporting/rep202.php:134
-# c:\Apache2\htdocs\account/reporting/rep203.php:69
 #: c:\Apache2\htdocs\account2/reporting/rep101.php:64
-#: c:\Apache2\htdocs\account2/reporting/rep102.php:131
-#: c:\Apache2\htdocs\account2/reporting/rep202.php:139
+#: c:\Apache2\htdocs\account2/reporting/rep102.php:90
+#: c:\Apache2\htdocs\account2/reporting/rep202.php:91
 #: c:\Apache2\htdocs\account2/reporting/rep203.php:68
 msgid "Balances in Home Currency"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/rep101.php:70
-# c:\Apache2\htdocs\account/reporting/rep201.php:71
-# c:\Apache2\htdocs\account/reporting/rep203.php:76
-# c:\Apache2\htdocs\account/reporting/rep709.php:171
-# c:\Apache2\htdocs\account/reporting/includes/doctext.inc:45
 #: c:\Apache2\htdocs\account2/reporting/rep101.php:71
 #: c:\Apache2\htdocs\account2/reporting/rep201.php:70
 #: c:\Apache2\htdocs\account2/reporting/rep203.php:75
-#: c:\Apache2\htdocs\account2/reporting/rep709.php:171
-#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:54
+#: c:\Apache2\htdocs\account2/reporting/rep709.php:189
+#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:55
 msgid "Trans Type"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/rep101.php:70
-# c:\Apache2\htdocs\account/reporting/rep201.php:71
-# c:\Apache2\htdocs\account/reporting/includes/doctext.inc:45
 #: c:\Apache2\htdocs\account2/reporting/rep101.php:71
 #: c:\Apache2\htdocs\account2/reporting/rep201.php:70
-#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:54
+#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:55
 msgid "Charges"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/rep101.php:70
-# c:\Apache2\htdocs\account/reporting/rep201.php:72
-# c:\Apache2\htdocs\account/reporting/includes/doctext.inc:46
 #: c:\Apache2\htdocs\account2/reporting/rep101.php:71
 #: c:\Apache2\htdocs\account2/reporting/rep201.php:71
-#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:55
+#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:56
 msgid "Credits"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/rep101.php:76
-# c:\Apache2\htdocs\account/reporting/rep102.php:143
-# c:\Apache2\htdocs\account/reporting/rep201.php:77
-# c:\Apache2\htdocs\account/reporting/rep202.php:152
-# c:\Apache2\htdocs\account/reporting/rep203.php:82
-# c:\Apache2\htdocs\account/reporting/reports_main.php:20
-# c:\Apache2\htdocs\account/reporting/reports_main.php:26
-# c:\Apache2\htdocs\account/reporting/reports_main.php:44
-# c:\Apache2\htdocs\account/reporting/reports_main.php:72
-# c:\Apache2\htdocs\account/reporting/reports_main.php:78
-# c:\Apache2\htdocs\account/reporting/reports_main.php:85
-# c:\Apache2\htdocs\account/reporting/reports_main.php:148
-# c:\Apache2\htdocs\account/reporting/reports_main.php:157
-# c:\Apache2\htdocs\account/reporting/reports_main.php:170
-# c:\Apache2\htdocs\account/reporting/reports_main.php:176
-# c:\Apache2\htdocs\account/reporting/reports_main.php:183
-# c:\Apache2\htdocs\account/reporting/reports_main.php:193
-# c:\Apache2\htdocs\account/reporting/reports_main.php:204
-# c:\Apache2\htdocs\account/reporting/reports_main.php:209
-# c:\Apache2\htdocs\account/reporting/reports_main.php:215
-# c:\Apache2\htdocs\account/reporting/reports_main.php:224
-# c:\Apache2\htdocs\account/reporting/reports_main.php:233
-# c:\Apache2\htdocs\account/reporting/reports_main.php:237
-# c:\Apache2\htdocs\account/reporting/reports_main.php:242
-# c:\Apache2\htdocs\account/reporting/reports_main.php:248
 #: c:\Apache2\htdocs\account2/reporting/rep101.php:77
-#: c:\Apache2\htdocs\account2/reporting/rep102.php:149
+#: c:\Apache2\htdocs\account2/reporting/rep102.php:108
 #: c:\Apache2\htdocs\account2/reporting/rep201.php:76
-#: c:\Apache2\htdocs\account2/reporting/rep202.php:157
+#: c:\Apache2\htdocs\account2/reporting/rep202.php:109
 #: c:\Apache2\htdocs\account2/reporting/rep203.php:81
 #: c:\Apache2\htdocs\account2/reporting/reports_main.php:22
 #: c:\Apache2\htdocs\account2/reporting/reports_main.php:27
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:45
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:52
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:85
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:90
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:97
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:158
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:167
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:180
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:187
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:46
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:53
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:86
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:91
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:98
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:130
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:166
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:175
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:188
 #: c:\Apache2\htdocs\account2/reporting/reports_main.php:195
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:205
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:216
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:222
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:229
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:238
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:247
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:252
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:258
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:264
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:203
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:213
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:224
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:230
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:237
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:246
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:255
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:260
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:266
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:272
 msgid "End Date"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/rep101.php:77
-# c:\Apache2\htdocs\account/reporting/rep102.php:137
-# c:\Apache2\htdocs\account/reporting/rep102.php:144
-# c:\Apache2\htdocs\account/reporting/rep105.php:96
-# c:\Apache2\htdocs\account/reporting/reports_main.php:18
-# c:\Apache2\htdocs\account/reporting/reports_main.php:19
-# c:\Apache2\htdocs\account/reporting/reports_main.php:25
-# c:\Apache2\htdocs\account/reporting/reports_main.php:32
-# c:\Apache2\htdocs\account/reporting/reports_main.php:36
-# c:\Apache2\htdocs\account/reporting/reports_main.php:42
-# c:\Apache2\htdocs\account/reporting/reports_main.php:49
-# c:\Apache2\htdocs\account/reporting/reports_main.php:56
-# c:\Apache2\htdocs\account/reporting/reports_main.php:62
-# c:\Apache2\htdocs\account/sales/customer_credit_invoice.php:248
-# c:\Apache2\htdocs\account/sales/customer_invoice.php:313
-# c:\Apache2\htdocs\account/sales/allocations/customer_allocation_main.php:62
-# c:\Apache2\htdocs\account/sales/inquiry/customer_allocation_inquiry.php:120
-# c:\Apache2\htdocs\account/sales/inquiry/customer_inquiry.php:162
-# c:\Apache2\htdocs\account/sales/inquiry/sales_orders_view.php:125
-# c:\Apache2\htdocs\account/sales/view/view_credit.php:38
-# c:\Apache2\htdocs\account/includes/types.inc:139
 #: c:\Apache2\htdocs\account2/reporting/rep101.php:78
-#: c:\Apache2\htdocs\account2/reporting/rep102.php:143
-#: c:\Apache2\htdocs\account2/reporting/rep102.php:150
-#: c:\Apache2\htdocs\account2/reporting/rep105.php:96
+#: c:\Apache2\htdocs\account2/reporting/rep102.php:102
+#: c:\Apache2\htdocs\account2/reporting/rep102.php:109
+#: c:\Apache2\htdocs\account2/reporting/rep105.php:94
 #: c:\Apache2\htdocs\account2/reporting/rep106.php:70
 #: c:\Apache2\htdocs\account2/reporting/reports_main.php:20
 #: c:\Apache2\htdocs\account2/reporting/reports_main.php:21
@@ -8452,302 +6204,226 @@ msgstr ""
 #: c:\Apache2\htdocs\account2/reporting/reports_main.php:28
 #: c:\Apache2\htdocs\account2/reporting/reports_main.php:33
 #: c:\Apache2\htdocs\account2/reporting/reports_main.php:37
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:43
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:50
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:55
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:63
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:68
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:44
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:51
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:56
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:64
 #: c:\Apache2\htdocs\account2/reporting/reports_main.php:69
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:74
-#: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:221
-#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:292
-#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:278
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:70
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:75
+#: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:234
+#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:305
+#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:303
 #: c:\Apache2\htdocs\account2/sales/allocations/customer_allocation_main.php:62
-#: c:\Apache2\htdocs\account2/sales/inquiry/customer_allocation_inquiry.php:132
-#: c:\Apache2\htdocs\account2/sales/inquiry/customer_inquiry.php:173
-#: c:\Apache2\htdocs\account2/sales/inquiry/sales_deliveries_view.php:197
-#: c:\Apache2\htdocs\account2/sales/inquiry/sales_orders_view.php:174
+#: c:\Apache2\htdocs\account2/sales/inquiry/customer_allocation_inquiry.php:135
+#: c:\Apache2\htdocs\account2/sales/inquiry/customer_inquiry.php:184
+#: c:\Apache2\htdocs\account2/sales/inquiry/sales_deliveries_view.php:216
+#: c:\Apache2\htdocs\account2/sales/inquiry/sales_orders_view.php:192
 #: c:\Apache2\htdocs\account2/sales/view/view_credit.php:38
 #: c:\Apache2\htdocs\account2/includes/types.inc:145
 msgid "Customer"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/rep101.php:81
-# c:\Apache2\htdocs\account/reporting/reports_main.php:19
 #: c:\Apache2\htdocs\account2/reporting/rep101.php:81
 #: c:\Apache2\htdocs\account2/reporting/reports_main.php:21
 msgid "Customer Balances"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/rep101.php:155
-# c:\Apache2\htdocs\account/reporting/rep102.php:226
-# c:\Apache2\htdocs\account/reporting/rep201.php:159
-# c:\Apache2\htdocs\account/reporting/rep202.php:241
-# c:\Apache2\htdocs\account/reporting/rep203.php:149
-# c:\Apache2\htdocs\account/reporting/rep204.php:133
-# c:\Apache2\htdocs\account/reporting/rep301.php:154
 #: c:\Apache2\htdocs\account2/reporting/rep101.php:158
-#: c:\Apache2\htdocs\account2/reporting/rep102.php:239
+#: c:\Apache2\htdocs\account2/reporting/rep102.php:198
 #: c:\Apache2\htdocs\account2/reporting/rep106.php:169
 #: c:\Apache2\htdocs\account2/reporting/rep201.php:159
-#: c:\Apache2\htdocs\account2/reporting/rep202.php:247
+#: c:\Apache2\htdocs\account2/reporting/rep202.php:199
 #: c:\Apache2\htdocs\account2/reporting/rep203.php:150
-#: c:\Apache2\htdocs\account2/reporting/rep204.php:131
+#: c:\Apache2\htdocs\account2/reporting/rep204.php:132
 #: c:\Apache2\htdocs\account2/reporting/rep301.php:154
+#: c:\Apache2\htdocs\account2/reporting/rep304.php:233
 msgid "Grand Total"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/rep102.php:119
-# c:\Apache2\htdocs\account/reporting/rep202.php:128
-# c:\Apache2\htdocs\account/reporting/rep709.php:149
-# c:\Apache2\htdocs\account/reporting/reports_main.php:30
-# c:\Apache2\htdocs\account/reporting/reports_main.php:82
-# c:\Apache2\htdocs\account/reporting/reports_main.php:249
-#: c:\Apache2\htdocs\account2/reporting/rep102.php:125
+#: c:\Apache2\htdocs\account2/reporting/rep102.php:84
 #: c:\Apache2\htdocs\account2/reporting/rep106.php:80
-#: c:\Apache2\htdocs\account2/reporting/rep202.php:133
-#: c:\Apache2\htdocs\account2/reporting/rep709.php:149
+#: c:\Apache2\htdocs\account2/reporting/rep202.php:85
+#: c:\Apache2\htdocs\account2/reporting/rep709.php:167
 #: c:\Apache2\htdocs\account2/reporting/reports_main.php:30
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:53
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:93
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:265
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:54
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:94
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:273
 msgid "Summary Only"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/rep102.php:121
-# c:\Apache2\htdocs\account/reporting/rep202.php:130
-# c:\Apache2\htdocs\account/reporting/rep709.php:151
-# c:\Apache2\htdocs\account/reporting/reports_main.php:106
-#: c:\Apache2\htdocs\account2/reporting/rep102.php:127
-#: c:\Apache2\htdocs\account2/reporting/rep202.php:135
-#: c:\Apache2\htdocs\account2/reporting/rep709.php:151
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:116
+#: c:\Apache2\htdocs\account2/reporting/rep102.php:86
+#: c:\Apache2\htdocs\account2/reporting/rep202.php:87
+#: c:\Apache2\htdocs\account2/reporting/rep709.php:169
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:117
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:133
 msgid "Detailed Report"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/rep102.php:151
-# c:\Apache2\htdocs\account/reporting/reports_main.php:25
-#: c:\Apache2\htdocs\account2/reporting/rep102.php:156
+#: c:\Apache2\htdocs\account2/reporting/rep102.php:115
 #: c:\Apache2\htdocs\account2/reporting/reports_main.php:26
 msgid "Aged Customer Analysis"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/rep103.php:107
 #: c:\Apache2\htdocs\account2/reporting/rep103.php:107
 msgid "All Areas"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/rep103.php:111
 #: c:\Apache2\htdocs\account2/reporting/rep103.php:111
 msgid "All Sales Folk"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/rep103.php:115
 #: c:\Apache2\htdocs\account2/reporting/rep103.php:115
 msgid "Greater than "
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/rep103.php:119
 #: c:\Apache2\htdocs\account2/reporting/rep103.php:119
 msgid "Less than "
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/rep103.php:128
 #: c:\Apache2\htdocs\account2/reporting/rep103.php:128
 msgid "Customer Postal Address"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/rep103.php:128
 #: c:\Apache2\htdocs\account2/reporting/rep103.php:128
 msgid "Price/Turnover"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/rep103.php:128
 #: c:\Apache2\htdocs\account2/reporting/rep103.php:128
 msgid "Branch Contact Information"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/rep103.php:129
 #: c:\Apache2\htdocs\account2/reporting/rep103.php:129
 msgid "Branch Delivery Address"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/rep103.php:134
-# c:\Apache2\htdocs\account/reporting/reports_main.php:33
 #: c:\Apache2\htdocs\account2/reporting/rep103.php:134
 #: c:\Apache2\htdocs\account2/reporting/reports_main.php:34
 msgid "Activity Since"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/rep103.php:136
-# c:\Apache2\htdocs\account/reporting/reports_main.php:35
 #: c:\Apache2\htdocs\account2/reporting/rep103.php:136
 #: c:\Apache2\htdocs\account2/reporting/reports_main.php:36
 msgid "Sales Folk"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/rep103.php:137
 #: c:\Apache2\htdocs\account2/reporting/rep103.php:137
 msgid "Activity"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/rep103.php:139
 #: c:\Apache2\htdocs\account2/reporting/rep103.php:139
 msgid "Customer Details Listing"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/rep103.php:167
 #: c:\Apache2\htdocs\account2/reporting/rep103.php:167
 msgid "Customers in"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/rep103.php:191
 #: c:\Apache2\htdocs\account2/reporting/rep103.php:191
-#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:270
+#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:257
 msgid "Price List"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/rep103.php:193
 #: c:\Apache2\htdocs\account2/reporting/rep103.php:193
 msgid "Turnover"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/rep103.php:196
 #: c:\Apache2\htdocs\account2/reporting/rep103.php:196
 msgid "Ph"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/rep103.php:197
-# c:\Apache2\htdocs\account/sales/manage/sales_people.php:87
 #: c:\Apache2\htdocs\account2/reporting/rep103.php:197
-#: c:\Apache2\htdocs\account2/sales/manage/sales_people.php:92
+#: c:\Apache2\htdocs\account2/sales/manage/sales_people.php:108
 msgid "Fax"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/rep104.php:88
-#: c:\Apache2\htdocs\account2/reporting/rep104.php:88
+#: c:\Apache2\htdocs\account2/reporting/rep104.php:82
 msgid "Category/Items"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/rep104.php:88
-#: c:\Apache2\htdocs\account2/reporting/rep104.php:88
+#: c:\Apache2\htdocs\account2/reporting/rep104.php:82
 msgid "GP %"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/rep104.php:93
-# c:\Apache2\htdocs\account/reporting/rep105.php:106
-# c:\Apache2\htdocs\account/reporting/rep301.php:85
-# c:\Apache2\htdocs\account/reporting/rep301.php:90
-# c:\Apache2\htdocs\account/reporting/rep302.php:169
-# c:\Apache2\htdocs\account/reporting/rep302.php:176
-# c:\Apache2\htdocs\account/reporting/rep303.php:124
-# c:\Apache2\htdocs\account/reporting/rep303.php:129
-#: c:\Apache2\htdocs\account2/reporting/rep104.php:93
-#: c:\Apache2\htdocs\account2/reporting/rep105.php:106
+#: c:\Apache2\htdocs\account2/reporting/rep104.php:88
+#: c:\Apache2\htdocs\account2/reporting/rep105.php:104
 #: c:\Apache2\htdocs\account2/reporting/rep301.php:85
 #: c:\Apache2\htdocs\account2/reporting/rep301.php:90
-#: c:\Apache2\htdocs\account2/reporting/rep302.php:169
-#: c:\Apache2\htdocs\account2/reporting/rep302.php:176
-#: c:\Apache2\htdocs\account2/reporting/rep303.php:124
-#: c:\Apache2\htdocs\account2/reporting/rep303.php:129
+#: c:\Apache2\htdocs\account2/reporting/rep302.php:167
+#: c:\Apache2\htdocs\account2/reporting/rep302.php:174
+#: c:\Apache2\htdocs\account2/reporting/rep303.php:122
+#: c:\Apache2\htdocs\account2/reporting/rep303.php:127
+#: c:\Apache2\htdocs\account2/reporting/rep304.php:127
+#: c:\Apache2\htdocs\account2/reporting/rep304.php:133
 msgid "Category"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/rep104.php:95
-# c:\Apache2\htdocs\account/reporting/reports_main.php:40
-#: c:\Apache2\htdocs\account2/reporting/rep104.php:95
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:41
+#: c:\Apache2\htdocs\account2/reporting/rep104.php:90
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:42
 msgid "Show GP %"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/rep104.php:102
-# c:\Apache2\htdocs\account/reporting/reports_main.php:36
-#: c:\Apache2\htdocs\account2/reporting/rep104.php:102
+#: c:\Apache2\htdocs\account2/reporting/rep104.php:97
 #: c:\Apache2\htdocs\account2/reporting/reports_main.php:37
 msgid "Price Listing"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/rep104.php:119
-#: c:\Apache2\htdocs\account2/reporting/rep104.php:119
-msgid "Prices"
-msgstr ""
-
-# c:\Apache2\htdocs\account/reporting/rep105.php:90
-#: c:\Apache2\htdocs\account2/reporting/rep105.php:90
+#: c:\Apache2\htdocs\account2/reporting/rep105.php:88
 msgid "All Orders"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/rep105.php:92
-# c:\Apache2\htdocs\account/reporting/reports_main.php:47
-#: c:\Apache2\htdocs\account2/reporting/rep105.php:92
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:48
+#: c:\Apache2\htdocs\account2/reporting/rep105.php:90
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:49
 msgid "Back Orders Only"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/rep105.php:96
-# c:\Apache2\htdocs\account/sales/customer_credit_invoice.php:249
-# c:\Apache2\htdocs\account/sales/customer_invoice.php:314
-# c:\Apache2\htdocs\account/sales/inquiry/customer_inquiry.php:162
-# c:\Apache2\htdocs\account/sales/inquiry/customer_inquiry.php:165
-# c:\Apache2\htdocs\account/sales/inquiry/sales_orders_view.php:125
-# c:\Apache2\htdocs\account/sales/view/view_credit.php:49
-#: c:\Apache2\htdocs\account2/reporting/rep105.php:96
+#: c:\Apache2\htdocs\account2/reporting/rep105.php:94
 #: c:\Apache2\htdocs\account2/reporting/rep106.php:70
-#: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:222
-#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:293
-#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:279
-#: c:\Apache2\htdocs\account2/sales/inquiry/customer_inquiry.php:173
-#: c:\Apache2\htdocs\account2/sales/inquiry/sales_deliveries_view.php:197
-#: c:\Apache2\htdocs\account2/sales/inquiry/sales_orders_view.php:174
+#: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:235
+#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:306
+#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:304
+#: c:\Apache2\htdocs\account2/sales/inquiry/customer_inquiry.php:184
+#: c:\Apache2\htdocs\account2/sales/inquiry/sales_deliveries_view.php:216
+#: c:\Apache2\htdocs\account2/sales/inquiry/sales_orders_view.php:192
 #: c:\Apache2\htdocs\account2/sales/view/view_credit.php:49
 msgid "Branch"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/rep105.php:96
-#: c:\Apache2\htdocs\account2/reporting/rep105.php:96
+#: c:\Apache2\htdocs\account2/reporting/rep105.php:94
 #: c:\Apache2\htdocs\account2/reporting/rep106.php:70
 msgid "Customer Ref"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/rep105.php:97
-#: c:\Apache2\htdocs\account2/reporting/rep105.php:97
+#: c:\Apache2\htdocs\account2/reporting/rep105.php:95
 msgid "Ord Date"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/rep105.php:97
-#: c:\Apache2\htdocs\account2/reporting/rep105.php:97
+#: c:\Apache2\htdocs\account2/reporting/rep105.php:95
 msgid "Del Date"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/rep105.php:97
-# c:\Apache2\htdocs\account/reporting/rep401.php:60
-#: c:\Apache2\htdocs\account2/reporting/rep105.php:97
-#: c:\Apache2\htdocs\account2/reporting/rep401.php:60
+#: c:\Apache2\htdocs\account2/reporting/rep105.php:95
+#: c:\Apache2\htdocs\account2/reporting/rep401.php:58
 msgid "Loc"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/rep105.php:101
-#: c:\Apache2\htdocs\account2/reporting/rep105.php:101
-#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:325
+#: c:\Apache2\htdocs\account2/reporting/rep105.php:99
+#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:351
 msgid "Invoiced"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/rep105.php:108
-#: c:\Apache2\htdocs\account2/reporting/rep105.php:108
+#: c:\Apache2\htdocs\account2/reporting/rep105.php:106
 msgid "Selection"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/rep105.php:113
-# c:\Apache2\htdocs\account/reporting/reports_main.php:42
-#: c:\Apache2\htdocs\account2/reporting/rep105.php:113
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:43
+#: c:\Apache2\htdocs\account2/reporting/rep105.php:111
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:44
 msgid "Order Status Listing"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/inquiry/sales_orders_view.php:166
 #: c:\Apache2\htdocs\account2/reporting/rep106.php:70
-#: c:\Apache2\htdocs\account2/sales/inquiry/sales_deliveries_view.php:246
-#: c:\Apache2\htdocs\account2/sales/inquiry/sales_orders_view.php:230
+#: c:\Apache2\htdocs\account2/sales/inquiry/sales_deliveries_view.php:265
+#: c:\Apache2\htdocs\account2/sales/inquiry/sales_orders_view.php:251
 msgid "Invoice"
 msgstr ""
 
@@ -8758,9 +6434,9 @@ msgstr ""
 #: c:\Apache2\htdocs\account2/reporting/rep106.php:71
 #: c:\Apache2\htdocs\account2/reporting/rep106.php:75
 #: c:\Apache2\htdocs\account2/reporting/rep106.php:76
-#: c:\Apache2\htdocs\account2/sales/manage/sales_people.php:92
-#: c:\Apache2\htdocs\account2/sales/manage/sales_people.php:150
-#: c:\Apache2\htdocs\account2/sales/manage/sales_people.php:152
+#: c:\Apache2\htdocs\account2/sales/manage/sales_people.php:108
+#: c:\Apache2\htdocs\account2/sales/manage/sales_people.php:169
+#: c:\Apache2\htdocs\account2/sales/manage/sales_people.php:171
 msgid "Provision"
 msgstr ""
 
@@ -8768,68 +6444,53 @@ msgstr ""
 msgid "Salesman"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/manage/sales_people.php:87
 #: c:\Apache2\htdocs\account2/reporting/rep106.php:75
-#: c:\Apache2\htdocs\account2/sales/manage/sales_people.php:92
+#: c:\Apache2\htdocs\account2/sales/manage/sales_people.php:108
 msgid "Email"
 msgstr ""
 
 #: c:\Apache2\htdocs\account2/reporting/rep106.php:76
-#: c:\Apache2\htdocs\account2/sales/manage/sales_people.php:92
+#: c:\Apache2\htdocs\account2/sales/manage/sales_people.php:108
 msgid "Break Pt."
 msgstr ""
 
 #: c:\Apache2\htdocs\account2/reporting/rep106.php:85
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:50
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:51
 msgid "Salesman Listing"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/rep107.php:59
-# c:\Apache2\htdocs\account/reporting/rep107.php:84
-# c:\Apache2\htdocs\account/reporting/rep107.php:95
-# c:\Apache2\htdocs\account/reporting/includes/doctext.inc:32
 #: c:\Apache2\htdocs\account2/reporting/rep107.php:60
 #: c:\Apache2\htdocs\account2/reporting/rep107.php:89
 #: c:\Apache2\htdocs\account2/reporting/rep107.php:100
-#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:41
+#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:42
 msgid "INVOICE"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/rep107.php:89
-# c:\Apache2\htdocs\account/reporting/rep107.php:95
-# c:\Apache2\htdocs\account/sales/view/view_credit.php:30
-# c:\Apache2\htdocs\account/reporting/includes/doctext.inc:34
 #: c:\Apache2\htdocs\account2/reporting/rep107.php:94
 #: c:\Apache2\htdocs\account2/reporting/rep107.php:100
-#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:43
+#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:44
 msgid "CREDIT NOTE"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/rep108.php:72
-# c:\Apache2\htdocs\account/reporting/rep108.php:99
-# c:\Apache2\htdocs\account/reporting/includes/doctext.inc:44
-#: c:\Apache2\htdocs\account2/reporting/rep108.php:72
-#: c:\Apache2\htdocs\account2/reporting/rep108.php:99
-#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:53
+#: c:\Apache2\htdocs\account2/reporting/rep108.php:73
+#: c:\Apache2\htdocs\account2/reporting/rep108.php:100
+#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:54
 msgid "STATEMENT"
 msgstr ""
 
 #: c:\Apache2\htdocs\account2/reporting/rep109.php:58
 #: c:\Apache2\htdocs\account2/reporting/rep109.php:77
 #: c:\Apache2\htdocs\account2/reporting/rep109.php:88
-#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:39
-#: c:\Apache2\htdocs\account2/reporting/includes/doctext2.inc:37
+#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:40
+#: c:\Apache2\htdocs\account2/reporting/includes/doctext2.inc:38
 msgid "QUOTE"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/rep109.php:68
-# c:\Apache2\htdocs\account/reporting/rep109.php:88
-# c:\Apache2\htdocs\account/reporting/includes/doctext.inc:30
 #: c:\Apache2\htdocs\account2/reporting/rep109.php:60
 #: c:\Apache2\htdocs\account2/reporting/rep109.php:82
 #: c:\Apache2\htdocs\account2/reporting/rep109.php:88
-#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:39
-#: c:\Apache2\htdocs\account2/reporting/includes/doctext2.inc:37
+#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:40
+#: c:\Apache2\htdocs\account2/reporting/includes/doctext2.inc:38
 msgid "SALES ORDER"
 msgstr ""
 
@@ -8839,234 +6500,184 @@ msgstr ""
 
 #: c:\Apache2\htdocs\account2/reporting/rep110.php:74
 #: c:\Apache2\htdocs\account2/reporting/rep110.php:79
-#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:37
-#: c:\Apache2\htdocs\account2/reporting/includes/doctext2.inc:41
+#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:38
+#: c:\Apache2\htdocs\account2/reporting/includes/doctext2.inc:42
 msgid "DELIVERY NOTE"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/rep201.php:64
 #: c:\Apache2\htdocs\account2/reporting/rep201.php:63
 msgid "Balances in Home currency"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/rep201.php:82
-# c:\Apache2\htdocs\account/reporting/reports_main.php:71
 #: c:\Apache2\htdocs\account2/reporting/rep201.php:80
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:84
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:85
 msgid "Supplier Balances"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/rep202.php:159
-#: c:\Apache2\htdocs\account2/reporting/rep202.php:163
+#: c:\Apache2\htdocs\account2/reporting/rep202.php:115
 msgid "currency"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/rep202.php:160
-#: c:\Apache2\htdocs\account2/reporting/rep202.php:164
+#: c:\Apache2\htdocs\account2/reporting/rep202.php:116
 msgid "Aged Supplier Analysis"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/rep203.php:87
-# c:\Apache2\htdocs\account/reporting/reports_main.php:84
 #: c:\Apache2\htdocs\account2/reporting/rep203.php:85
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:96
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:97
 msgid "Payment Report"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/rep204.php:71
 #: c:\Apache2\htdocs\account2/reporting/rep204.php:70
 msgid "GRN"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/rep204.php:71
 #: c:\Apache2\htdocs\account2/reporting/rep204.php:70
 msgid "Qty Recd"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/rep204.php:71
 #: c:\Apache2\htdocs\account2/reporting/rep204.php:70
 msgid "qty Inv"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/rep204.php:72
 #: c:\Apache2\htdocs\account2/reporting/rep204.php:71
 msgid "Std Cost"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/rep204.php:72
-# c:\Apache2\htdocs\account/reporting/rep301.php:85
 #: c:\Apache2\htdocs\account2/reporting/rep204.php:71
 #: c:\Apache2\htdocs\account2/reporting/rep301.php:85
 msgid "Value"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/rep204.php:80
-# c:\Apache2\htdocs\account/reporting/reports_main.php:90
 #: c:\Apache2\htdocs\account2/reporting/rep204.php:78
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:101
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:102
 msgid "Outstanding GRNs Report"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/rep209.php:78
-# c:\Apache2\htdocs\account/reporting/rep209.php:98
-# c:\Apache2\htdocs\account/reporting/includes/doctext.inc:28
 #: c:\Apache2\htdocs\account2/reporting/rep209.php:79
 #: c:\Apache2\htdocs\account2/reporting/rep209.php:94
 #: c:\Apache2\htdocs\account2/reporting/rep209.php:99
-#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:35
+#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:36
 msgid "PURCHASE ORDER"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/rep301.php:93
-# c:\Apache2\htdocs\account/reporting/reports_main.php:103
 #: c:\Apache2\htdocs\account2/reporting/rep301.php:93
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:113
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:114
 msgid "Inventory Valuation Report"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/rep302.php:170
-#: c:\Apache2\htdocs\account2/reporting/rep302.php:170
+#: c:\Apache2\htdocs\account2/reporting/rep302.php:168
 msgid "QOH"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/rep302.php:170
-#: c:\Apache2\htdocs\account2/reporting/rep302.php:170
+#: c:\Apache2\htdocs\account2/reporting/rep302.php:168
 msgid "Cust Ord"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/rep302.php:170
-#: c:\Apache2\htdocs\account2/reporting/rep302.php:170
+#: c:\Apache2\htdocs\account2/reporting/rep302.php:168
 msgid "Supp Ord"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/rep302.php:170
-#: c:\Apache2\htdocs\account2/reporting/rep302.php:170
+#: c:\Apache2\htdocs\account2/reporting/rep302.php:168
 msgid "Sugg Ord"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/rep302.php:179
-# c:\Apache2\htdocs\account/reporting/reports_main.php:108
-#: c:\Apache2\htdocs\account2/reporting/rep302.php:179
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:118
+#: c:\Apache2\htdocs\account2/reporting/rep302.php:177
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:119
 msgid "Inventory Planning Report"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/rep303.php:124
-#: c:\Apache2\htdocs\account2/reporting/rep303.php:124
+#: c:\Apache2\htdocs\account2/reporting/rep303.php:122
 msgid "Difference"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/rep303.php:137
-# c:\Apache2\htdocs\account/reporting/reports_main.php:112
-#: c:\Apache2\htdocs\account2/reporting/rep303.php:137
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:122
+#: c:\Apache2\htdocs\account2/reporting/rep303.php:135
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:123
 msgid "Stock Check Sheets"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/rep401.php:60
-#: c:\Apache2\htdocs\account2/reporting/rep401.php:60
+#: c:\Apache2\htdocs\account2/reporting/rep304.php:127
+msgid "Cost"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/reporting/rep304.php:127
+msgid "Contribution"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/reporting/rep304.php:136
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:128
+msgid "Inventory Sales Report"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/reporting/rep401.php:58
 msgid "Wrk Ctr"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/rep401.php:67
-# c:\Apache2\htdocs\account/reporting/reports_main.php:119
-#: c:\Apache2\htdocs\account2/reporting/rep401.php:67
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:129
+#: c:\Apache2\htdocs\account2/reporting/rep401.php:65
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:137
 msgid "Bill of Material Listing"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/rep501.php:75
 #: c:\Apache2\htdocs\account2/reporting/rep501.php:75
 msgid "YTD"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/rep501.php:82
-# c:\Apache2\htdocs\account/reporting/reports_main.php:126
 #: c:\Apache2\htdocs\account2/reporting/rep501.php:82
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:136
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:144
 msgid "Dimension Summary"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/rep702.php:39
 #: c:\Apache2\htdocs\account2/reporting/rep702.php:39
 msgid "Type/Account"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/rep702.php:39
 #: c:\Apache2\htdocs\account2/reporting/rep702.php:39
 msgid "Date/Dim."
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/rep702.php:40
 #: c:\Apache2\htdocs\account2/reporting/rep702.php:40
 msgid "Person/Item/Memo"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/rep702.php:49
-# c:\Apache2\htdocs\account/reporting/reports_main.php:146
 #: c:\Apache2\htdocs\account2/reporting/rep702.php:49
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:156
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:164
 msgid "List of Journal Entries"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/rep704.php:30
-# c:\Apache2\htdocs\account/reporting/reports_main.php:155
-# c:\Apache2\htdocs\account/reporting/reports_main.php:191
-# c:\Apache2\htdocs\account/reporting/reports_main.php:222
 #: c:\Apache2\htdocs\account2/reporting/rep704.php:30
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:165
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:203
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:236
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:173
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:211
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:244
 msgid "GL Account Transactions"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/rep705.php:131
-# c:\Apache2\htdocs\account/reporting/rep705.php:143
-# c:\Apache2\htdocs\account/reporting/rep705.php:153
-# c:\Apache2\htdocs\account/reporting/reports_main.php:164
-# c:\Apache2\htdocs\account/reporting/reports_main.php:199
-# c:\Apache2\htdocs\account/reporting/reports_main.php:229
 #: c:\Apache2\htdocs\account2/reporting/rep705.php:135
 #: c:\Apache2\htdocs\account2/reporting/rep705.php:147
 #: c:\Apache2\htdocs\account2/reporting/rep705.php:157
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:174
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:211
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:243
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:182
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:219
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:251
 msgid "Year"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/rep705.php:137
-# c:\Apache2\htdocs\account/reporting/rep705.php:147
-# c:\Apache2\htdocs\account/reporting/rep705.php:155
 #: c:\Apache2\htdocs\account2/reporting/rep705.php:141
 #: c:\Apache2\htdocs\account2/reporting/rep705.php:151
 #: c:\Apache2\htdocs\account2/reporting/rep705.php:159
 msgid "Info"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/rep705.php:137
-# c:\Apache2\htdocs\account/reporting/rep705.php:147
-# c:\Apache2\htdocs\account/reporting/rep705.php:155
 #: c:\Apache2\htdocs\account2/reporting/rep705.php:141
 #: c:\Apache2\htdocs\account2/reporting/rep705.php:151
 #: c:\Apache2\htdocs\account2/reporting/rep705.php:159
 msgid "Amounts in thousands"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/rep705.php:159
-# c:\Apache2\htdocs\account/reporting/reports_main.php:163
-# c:\Apache2\htdocs\account/reporting/reports_main.php:198
-# c:\Apache2\htdocs\account/reporting/reports_main.php:228
 #: c:\Apache2\htdocs\account2/reporting/rep705.php:163
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:173
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:210
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:242
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:181
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:218
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:250
 msgid "Annual Expense Breakdown"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/rep705.php:289
-# c:\Apache2\htdocs\account/reporting/rep706.php:210
-# c:\Apache2\htdocs\account/reporting/rep707.php:247
 #: c:\Apache2\htdocs\account2/reporting/rep705.php:284
 #: c:\Apache2\htdocs\account2/reporting/rep706.php:229
 #: c:\Apache2\htdocs\account2/reporting/rep706.php:235
@@ -9075,489 +6686,350 @@ msgstr ""
 msgid "Calculated Return"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/rep706.php:55
 #: c:\Apache2\htdocs\account2/reporting/rep706.php:63
 msgid "Open Balance"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/rep706.php:56
 #: c:\Apache2\htdocs\account2/reporting/rep706.php:64
 msgid "Close Balance"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/rep706.php:254
-# c:\Apache2\htdocs\account/reporting/rep707.php:289
 #: c:\Apache2\htdocs\account2/reporting/rep706.php:255
 #: c:\Apache2\htdocs\account2/reporting/rep707.php:289
 msgid "Group"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/rep707.php:70
-# c:\Apache2\htdocs\account/reporting/includes/reports_classes.inc:163
 #: c:\Apache2\htdocs\account2/reporting/rep707.php:78
-#: c:\Apache2\htdocs\account2/reporting/includes/reports_classes.inc:172
+#: c:\Apache2\htdocs\account2/reporting/includes/reports_classes.inc:178
 msgid "Accumulated"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/rep707.php:70
 #: c:\Apache2\htdocs\account2/reporting/rep707.php:78
 msgid "Achieved %"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/rep707.php:103
-# c:\Apache2\htdocs\account/reporting/includes/reports_classes.inc:163
 #: c:\Apache2\htdocs\account2/reporting/rep707.php:111
-#: c:\Apache2\htdocs\account2/reporting/includes/reports_classes.inc:172
+#: c:\Apache2\htdocs\account2/reporting/includes/reports_classes.inc:178
 msgid "Budget"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/rep707.php:112
-# c:\Apache2\htdocs\account/reporting/includes/reports_classes.inc:163
 #: c:\Apache2\htdocs\account2/reporting/rep707.php:120
-#: c:\Apache2\htdocs\account2/reporting/includes/reports_classes.inc:172
+#: c:\Apache2\htdocs\account2/reporting/includes/reports_classes.inc:178
 msgid "Period Y-1"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/rep707.php:115
-# c:\Apache2\htdocs\account/reporting/reports_main.php:174
-# c:\Apache2\htdocs\account/reporting/reports_main.php:207
-# c:\Apache2\htdocs\account/reporting/reports_main.php:235
 #: c:\Apache2\htdocs\account2/reporting/rep707.php:123
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:185
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:220
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:250
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:193
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:228
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:258
 msgid "Profit and Loss Statement"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/rep709.php:140
-# c:\Apache2\htdocs\account/reporting/reports_main.php:246
-#: c:\Apache2\htdocs\account2/reporting/rep709.php:140
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:262
+#: c:\Apache2\htdocs\account2/reporting/rep709.php:158
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:270
 msgid "Tax Report"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/rep709.php:171
-#: c:\Apache2\htdocs\account2/reporting/rep709.php:171
+#: c:\Apache2\htdocs\account2/reporting/rep709.php:189
 msgid "Branch Name"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/rep709.php:172
-#: c:\Apache2\htdocs\account2/reporting/rep709.php:172
+#: c:\Apache2\htdocs\account2/reporting/rep709.php:190
 msgid "Net"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/rep709.php:172
-# c:\Apache2\htdocs\account/taxes/tax_groups.php:210
-#: c:\Apache2\htdocs\account2/reporting/rep709.php:172
-#: c:\Apache2\htdocs\account2/taxes/tax_groups.php:206
+#: c:\Apache2\htdocs\account2/reporting/rep709.php:190
+#: c:\Apache2\htdocs\account2/taxes/tax_groups.php:202
 msgid "Tax"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/rep709.php:225
-#: c:\Apache2\htdocs\account2/reporting/rep709.php:225
+#: c:\Apache2\htdocs\account2/reporting/rep709.php:255
 msgid "Total Outputs"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/rep709.php:268
-#: c:\Apache2\htdocs\account2/reporting/rep709.php:268
+#: c:\Apache2\htdocs\account2/reporting/rep709.php:298
 msgid "Total Inputs"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/rep709.php:275
-#: c:\Apache2\htdocs\account2/reporting/rep709.php:275
+#: c:\Apache2\htdocs\account2/reporting/rep709.php:305
 msgid "Tax Rate"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/rep709.php:275
-#: c:\Apache2\htdocs\account2/reporting/rep709.php:275
+#: c:\Apache2\htdocs\account2/reporting/rep709.php:305
 msgid "Outputs"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/rep709.php:275
-#: c:\Apache2\htdocs\account2/reporting/rep709.php:275
+#: c:\Apache2\htdocs\account2/reporting/rep709.php:305
 msgid "Output Tax"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/rep709.php:275
-#: c:\Apache2\htdocs\account2/reporting/rep709.php:275
+#: c:\Apache2\htdocs\account2/reporting/rep709.php:305
 msgid "Inputs"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/rep709.php:275
-#: c:\Apache2\htdocs\account2/reporting/rep709.php:275
+#: c:\Apache2\htdocs\account2/reporting/rep709.php:305
 msgid "Input Tax"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/rep709.php:318
-#: c:\Apache2\htdocs\account2/reporting/rep709.php:318
+#: c:\Apache2\htdocs\account2/reporting/rep709.php:357
 msgid "No tax specified"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/reports_main.php:7
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:14
-msgid "Reports and Analysis"
+#: c:\Apache2\htdocs\account2/reporting/rep709.php:392
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:160
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:161
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:164
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:173
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:181
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:186
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:193
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:201
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:211
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:218
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:222
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:228
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:235
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:244
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:250
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:253
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:258
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:264
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:270
+msgid "General Ledger"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/reports_main.php:23
-# c:\Apache2\htdocs\account/reporting/reports_main.php:29
-# c:\Apache2\htdocs\account/reporting/reports_main.php:52
-# c:\Apache2\htdocs\account/reporting/reports_main.php:58
-# c:\Apache2\htdocs\account/reporting/reports_main.php:65
-# c:\Apache2\htdocs\account/reporting/reports_main.php:75
-# c:\Apache2\htdocs\account/reporting/reports_main.php:81
-# c:\Apache2\htdocs\account/reporting/reports_main.php:88
-# c:\Apache2\htdocs\account/reporting/reports_main.php:97
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:24
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:29
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:58
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:70
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:77
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:87
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:92
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:99
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:107
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:14
+msgid "Reports and Analysis"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:24
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:29
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:38
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:59
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:71
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:78
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:88
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:93
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:100
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:108
 msgid "Currency Filter"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/reports_main.php:31
-# c:\Apache2\htdocs\account/reporting/reports_main.php:84
-# c:\Apache2\htdocs\account/reporting/reports_main.php:175
-# c:\Apache2\htdocs\account/reporting/reports_main.php:183
-# c:\Apache2\htdocs\account/reporting/reports_main.php:210
-# c:\Apache2\htdocs\account/reporting/reports_main.php:217
-# c:\Apache2\htdocs\account/reporting/reports_main.php:240
-# c:\Apache2\htdocs\account/reporting/reports_main.php:246
 #: c:\Apache2\htdocs\account2/reporting/reports_main.php:31
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:94
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:183
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:95
 #: c:\Apache2\htdocs\account2/reporting/reports_main.php:191
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:218
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:225
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:248
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:254
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:199
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:226
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:233
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:256
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:262
 msgid "Graphics"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/reports_main.php:32
 #: c:\Apache2\htdocs\account2/reporting/reports_main.php:33
 msgid "Customer Detail Listing"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/reports_main.php:35
 #: c:\Apache2\htdocs\account2/reporting/reports_main.php:36
 msgid "Activity Greater Than"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/reports_main.php:35
 #: c:\Apache2\htdocs\account2/reporting/reports_main.php:36
 msgid "Activity Less Than"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/reports_main.php:37
-# c:\Apache2\htdocs\account/reporting/reports_main.php:45
-# c:\Apache2\htdocs\account/reporting/reports_main.php:104
-# c:\Apache2\htdocs\account/reporting/reports_main.php:109
-# c:\Apache2\htdocs\account/reporting/reports_main.php:113
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:38
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:46
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:114
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:119
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:123
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:39
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:47
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:115
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:120
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:124
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:131
 msgid "Inventory Category"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/reports_main.php:39
-# c:\Apache2\htdocs\account/reporting/reports_main.php:115
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:40
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:125
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:41
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:126
 msgid "Show Pictures"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/reports_main.php:46
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:47
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:48
 msgid "Stock Location"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/reports_main.php:49
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:55
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:56
 msgid "Print Invoices/Credit Notes"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/reports_main.php:51
-# c:\Apache2\htdocs\account/reporting/reports_main.php:64
-# c:\Apache2\htdocs\account/reporting/reports_main.php:96
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:57
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:65
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:76
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:106
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:58
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:66
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:77
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:107
 msgid "To"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/reports_main.php:53
-# c:\Apache2\htdocs\account/reporting/reports_main.php:59
-# c:\Apache2\htdocs\account/reporting/reports_main.php:66
-# c:\Apache2\htdocs\account/reporting/reports_main.php:98
-# c:\Apache2\htdocs\account/reporting/includes/doctext.inc:24
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:59
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:71
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:78
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:108
-#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:24
-#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:30
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:60
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:72
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:79
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:109
+#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:25
+#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:31
 msgid "Bank Account"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/reports_main.php:54
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:60
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:66
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:61
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:67
 msgid "email Customers"
 msgstr ""
 
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:61
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:62
 msgid "Payment Link"
 msgstr ""
 
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:63
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:64
 msgid "Print Deliveries"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/reports_main.php:56
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:68
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:69
 msgid "Print Statements"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/reports_main.php:60
-# c:\Apache2\htdocs\account/reporting/reports_main.php:67
-# c:\Apache2\htdocs\account/reporting/reports_main.php:99
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:72
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:79
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:109
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:73
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:80
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:110
 msgid "Email Customers"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/reports_main.php:62
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:74
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:75
 msgid "Print Sales Orders"
 msgstr ""
 
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:80
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:81
 msgid "Print as Quote"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/reports_main.php:77
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:89
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:90
 msgid "Aged Supplier Analyses"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/reports_main.php:94
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:104
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:105
 msgid "Print Purchase Orders"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/reports_main.php:102
-# c:\Apache2\htdocs\account/reporting/reports_main.php:103
-# c:\Apache2\htdocs\account/reporting/reports_main.php:108
-# c:\Apache2\htdocs\account/reporting/reports_main.php:112
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:112
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:113
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:118
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:122
-msgid "Inventory"
-msgstr ""
-
-# c:\Apache2\htdocs\account/reporting/reports_main.php:118
-# c:\Apache2\htdocs\account/reporting/reports_main.php:119
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:128
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:129
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:136
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:137
 msgid "Manufactoring"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/reports_main.php:120
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:130
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:138
 msgid "From component"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/reports_main.php:121
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:131
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:139
 msgid "To component"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/reports_main.php:127
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:137
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:145
 msgid "From Dimension"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/reports_main.php:128
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:138
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:146
 msgid "To Dimension"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/reports_main.php:129
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:139
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:147
 msgid "Show Balance"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/reports_main.php:135
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:145
-msgid "Banking"
-msgstr ""
-
-# c:\Apache2\htdocs\account/reporting/reports_main.php:142
-# c:\Apache2\htdocs\account/reporting/reports_main.php:143
-# c:\Apache2\htdocs\account/reporting/reports_main.php:146
-# c:\Apache2\htdocs\account/reporting/reports_main.php:155
-# c:\Apache2\htdocs\account/reporting/reports_main.php:163
-# c:\Apache2\htdocs\account/reporting/reports_main.php:168
-# c:\Apache2\htdocs\account/reporting/reports_main.php:174
-# c:\Apache2\htdocs\account/reporting/reports_main.php:181
-# c:\Apache2\htdocs\account/reporting/reports_main.php:191
-# c:\Apache2\htdocs\account/reporting/reports_main.php:198
-# c:\Apache2\htdocs\account/reporting/reports_main.php:202
-# c:\Apache2\htdocs\account/reporting/reports_main.php:207
-# c:\Apache2\htdocs\account/reporting/reports_main.php:213
-# c:\Apache2\htdocs\account/reporting/reports_main.php:222
-# c:\Apache2\htdocs\account/reporting/reports_main.php:228
-# c:\Apache2\htdocs\account/reporting/reports_main.php:231
-# c:\Apache2\htdocs\account/reporting/reports_main.php:235
-# c:\Apache2\htdocs\account/reporting/reports_main.php:240
-# c:\Apache2\htdocs\account/reporting/reports_main.php:246
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:152
 #: c:\Apache2\htdocs\account2/reporting/reports_main.php:153
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:156
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:165
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:173
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:178
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:185
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:193
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:203
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:210
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:214
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:220
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:227
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:236
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:242
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:245
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:250
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:256
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:262
-msgid "General Ledger"
+msgid "Banking"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/reports_main.php:144
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:154
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:162
 msgid "Show Balances"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/reports_main.php:158
-# c:\Apache2\htdocs\account/reporting/reports_main.php:194
-# c:\Apache2\htdocs\account/reporting/reports_main.php:225
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:168
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:206
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:239
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:176
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:214
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:247
 msgid "From Account"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/reports_main.php:159
-# c:\Apache2\htdocs\account/reporting/reports_main.php:195
-# c:\Apache2\htdocs\account/reporting/reports_main.php:226
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:169
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:207
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:240
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:177
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:215
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:248
 msgid "To Account"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/reports_main.php:177
-# c:\Apache2\htdocs\account/reporting/reports_main.php:210
-# c:\Apache2\htdocs\account/reporting/reports_main.php:238
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:188
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:223
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:253
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:196
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:231
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:261
 msgid "Compare to"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/reports_main.php:184
-# c:\Apache2\htdocs\account/reporting/reports_main.php:216
-# c:\Apache2\htdocs\account/reporting/reports_main.php:243
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:196
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:230
-#: c:\Apache2\htdocs\account2/reporting/reports_main.php:259
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:204
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:238
+#: c:\Apache2\htdocs\account2/reporting/reports_main.php:267
 msgid "Zero values"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/credit_note_entry.php:24
-# c:\Apache2\htdocs\account/includes/types.inc:11
-#: c:\Apache2\htdocs\account2/sales/credit_note_entry.php:25
+#: c:\Apache2\htdocs\account2/sales/credit_note_entry.php:26
 #: c:\Apache2\htdocs\account2/includes/types.inc:11
 msgid "Customer Credit Note"
 msgstr ""
 
-#: c:\Apache2\htdocs\account2/sales/credit_note_entry.php:28
+#: c:\Apache2\htdocs\account2/sales/credit_note_entry.php:29
 #, php-format
 msgid "Modifying Customer Credit Note #%d"
 msgstr ""
 
-#: c:\Apache2\htdocs\account2/sales/credit_note_entry.php:30
+#: c:\Apache2\htdocs\account2/sales/credit_note_entry.php:31
 msgid "Modifying Customer Credit Note"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/credit_note_entry.php:30
-# c:\Apache2\htdocs\account/sales/sales_order_entry.php:424
-#: c:\Apache2\htdocs\account2/sales/credit_note_entry.php:39
-#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:422
-#: c:\Apache2\htdocs\account2/sql/sales_order_entry.php:392
+#: c:\Apache2\htdocs\account2/sales/credit_note_entry.php:40
+#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:421
 msgid "There are no customers, or there are no customers with branches. Please define customers and customer branches."
 msgstr ""
 
-#: c:\Apache2\htdocs\account2/sales/credit_note_entry.php:47
+#: c:\Apache2\htdocs\account2/sales/credit_note_entry.php:48
 #, php-format
 msgid "Credit Note # %d has been processed"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/credit_note_entry.php:40
-# c:\Apache2\htdocs\account/sales/customer_credit_invoice.php:28
-#: c:\Apache2\htdocs\account2/sales/credit_note_entry.php:49
+#: c:\Apache2\htdocs\account2/sales/credit_note_entry.php:50
 msgid "View this credit note"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/credit_note_entry.php:118
-#: c:\Apache2\htdocs\account2/sales/credit_note_entry.php:119
+#: c:\Apache2\htdocs\account2/sales/credit_note_entry.php:123
 msgid "The entered date for the credit note is invalid."
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/credit_note_entry.php:138
-#: c:\Apache2\htdocs\account2/sales/credit_note_entry.php:135
+#: c:\Apache2\htdocs\account2/sales/credit_note_entry.php:139
 msgid "For credit notes created to write off the stock, a general ledger account is required to be selected."
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/credit_note_entry.php:139
-#: c:\Apache2\htdocs\account2/sales/credit_note_entry.php:136
+#: c:\Apache2\htdocs\account2/sales/credit_note_entry.php:140
 msgid "Please select an account to write the cost of the stock off to, then click on Process again."
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/credit_note_entry.php:171
-#: c:\Apache2\htdocs\account2/sales/credit_note_entry.php:153
+#: c:\Apache2\htdocs\account2/sales/credit_note_entry.php:158
 msgid "The quantity must be greater than zero."
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/credit_note_entry.php:176
-#: c:\Apache2\htdocs\account2/sales/credit_note_entry.php:158
+#: c:\Apache2\htdocs\account2/sales/credit_note_entry.php:163
 msgid "The entered price is negative or invalid."
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/credit_note_entry.php:181
-#: c:\Apache2\htdocs\account2/sales/credit_note_entry.php:163
+#: c:\Apache2\htdocs\account2/sales/credit_note_entry.php:168
 msgid "The entered discount percent is negative, greater than 100 or invalid."
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/credit_note_entry.php:256
-#: c:\Apache2\htdocs\account2/sales/credit_note_entry.php:238
+#: c:\Apache2\htdocs\account2/sales/credit_note_entry.php:235
 msgid "Credit Note Items"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/credit_note_entry.php:273
-# c:\Apache2\htdocs\account/sales/customer_credit_invoice.php:387
-#: c:\Apache2\htdocs\account2/sales/credit_note_entry.php:248
-#: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:366
+#: c:\Apache2\htdocs\account2/sales/credit_note_entry.php:245
+#: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:382
 msgid "Process Credit Note"
 msgstr ""
 
@@ -9570,13 +7042,10 @@ msgstr ""
 msgid "Modifying Credit Invoice"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/customer_credit_invoice.php:17
 #: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:32
 msgid "Credit all or part of an Invoice"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/credit_note_entry.php:39
-# c:\Apache2\htdocs\account/sales/customer_credit_invoice.php:27
 #: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:44
 msgid "Credit Note has been processed"
 msgstr ""
@@ -9595,114 +7064,85 @@ msgstr ""
 msgid "Credit Note has been updated"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/customer_credit_invoice.php:72
 #: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:98
 msgid "The entered shipping cost is invalid or less than zero."
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/customer_credit_invoice.php:199
-#: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:113
+#: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:103
+#: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:147
+msgid "Selected quantity cannot be less than zero nor more than quantity not credited yet."
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:116
 msgid "This invoice can not be credited using the automatic facility."
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/customer_credit_invoice.php:40
-#: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:142
+#: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:145
 msgid "This page can only be opened if an invoice has been selected for crediting."
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/customer_credit_invoice.php:259
-#: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:236
+#: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:249
 msgid "Crediting Invoice"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/customer_credit_invoice.php:274
-#: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:257
+#: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:270
 msgid "Credit Note Date"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/customer_credit_invoice.php:283
-#: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:266
+#: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:280
 msgid "Invoiced Quantity"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/customer_credit_invoice.php:284
-#: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:267
+#: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:281
 msgid "Credit Quantity"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/customer_credit_invoice.php:284
-# c:\Apache2\htdocs\account/sales/view/view_credit.php:82
-# c:\Apache2\htdocs\account/sales/view/view_invoice.php:100
-# c:\Apache2\htdocs\account/reporting/includes/doctext.inc:40
-# c:\Apache2\htdocs\account/sales/includes/ui/sales_credit_ui.inc:104
-# c:\Apache2\htdocs\account/sales/includes/ui/sales_order_ui.inc:110
-#: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:267
+#: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:281
 #: c:\Apache2\htdocs\account2/sales/view/view_credit.php:82
 #: c:\Apache2\htdocs\account2/sales/view/view_dispatch.php:104
 #: c:\Apache2\htdocs\account2/sales/view/view_invoice.php:104
-#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:49
-#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_credit_ui.inc:109
-#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:87
+#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:50
+#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_credit_ui.inc:153
+#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:84
 msgid "Discount %"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/customer_credit_invoice.php:314
-#: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:302
+#: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:315
 msgid "Credit Shipping Cost"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/customer_credit_invoice.php:321
-# c:\Apache2\htdocs\account/sales/customer_invoice.php:457
-# c:\Apache2\htdocs\account/sales/view/view_invoice.php:140
-# c:\Apache2\htdocs\account/reporting/includes/doctext.inc:64
-# c:\Apache2\htdocs\account/sales/includes/ui/sales_credit_ui.inc:147
-#: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:309
-#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:416
-#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:415
+#: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:322
+#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:427
+#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:442
 #: c:\Apache2\htdocs\account2/sales/view/view_dispatch.php:145
 #: c:\Apache2\htdocs\account2/sales/view/view_invoice.php:145
-#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:75
-#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_credit_ui.inc:155
+#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:76
+#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_credit_ui.inc:201
 msgid "Sub-total"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/customer_credit_invoice.php:329
-# c:\Apache2\htdocs\account/sales/includes/ui/sales_credit_ui.inc:159
-#: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:317
-#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_credit_ui.inc:169
+#: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:330
+#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_credit_ui.inc:215
 msgid "Credit Note Total"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/customer_credit_invoice.php:343
-# c:\Apache2\htdocs\account/sales/includes/ui/sales_credit_ui.inc:232
-#: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:331
-#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_credit_ui.inc:252
+#: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:348
+#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_credit_ui.inc:301
 msgid "Credit Note Type"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/customer_credit_invoice.php:347
-# c:\Apache2\htdocs\account/sales/customer_credit_invoice.php:352
-# c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:1911
-#: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:334
-#: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:337
-#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:2153
-msgid "Items Written Off"
+#: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:356
+#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_credit_ui.inc:309
+msgid "Items Returned to Location"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/customer_credit_invoice.php:348
-# c:\Apache2\htdocs\account/sales/customer_credit_invoice.php:353
-# c:\Apache2\htdocs\account/sales/customer_credit_invoice.php:367
-# c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:1910
-#: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:335
-#: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:338
-#: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:350
-#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:2152
-msgid "Items Returned to Inventory Location"
+#: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:361
+#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_credit_ui.inc:314
+msgid "Write off the cost of the items to"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/customer_credit_invoice.php:373
-#: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:352
-msgid "Write Off the Cost of the Items to"
+#: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:380
+msgid "Update credit value for quantities entered"
 msgstr ""
 
 #: c:\Apache2\htdocs\account2/sales/customer_delivery.php:27
@@ -9768,116 +7208,118 @@ msgstr ""
 msgid "This order has no items. There is nothing to delivery."
 msgstr ""
 
-#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:100
+#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:101
 msgid "Select a different delivery"
 msgstr ""
 
-#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:101
+#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:102
 msgid "This delivery has all items invoiced. There is nothing to modify."
 msgstr ""
 
-#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:111
+#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:112
 msgid "This page can only be opened if an order or delivery note has been selected. Please select it first."
 msgstr ""
 
-#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:113
+#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:114
 msgid "Select a Sales Order to Delivery"
 msgstr ""
 
-#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:119
-#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:178
+#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:120
+#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:179
 msgid ""
 "Selected quantity cannot be less than quantity invoiced nor more than quantity\n"
 "\t\tnot dispatched on sales order."
 msgstr ""
 
-#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:123
+#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:124
 msgid "Freight cost cannot be less than zero"
 msgstr ""
 
-#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:132
+#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:133
 msgid "The entered date of delivery is invalid."
 msgstr ""
 
-#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:138
+#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:139
 msgid "The entered date of delivery is not in fiscal year."
 msgstr ""
 
-#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:144
+#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:145
 msgid "The entered dead-line for invoice is invalid."
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/customer_invoice.php:216
-#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:167
-#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:220
+#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:168
+#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:240
 msgid "The entered shipping value is not numeric."
 msgstr ""
 
-#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:173
+#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:174
 msgid "There are no item quantities on this delivery note."
 msgstr ""
 
-#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:251
+#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:261
 msgid "The delivery cannot be processed because there is an insufficient quantity for item:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/customer_invoice.php:329
-#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:307
+#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:320
 msgid "For Sales Order"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/customer_invoice.php:341
-#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:316
+#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:329
 msgid "Delivery From"
 msgstr ""
 
-#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:344
+#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:357
 msgid "Invoice Dead-line"
 msgstr ""
 
-#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:350
+#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:363
 msgid "Delivery Items"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/customer_invoice.php:379
-#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:354
-#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:326
+#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:367
+#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:352
 msgid "Tax Type"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/customer_invoice.php:379
-# c:\Apache2\htdocs\account/sales/view/view_receipt.php:32
-# c:\Apache2\htdocs\account/sales/view/view_sales_order.php:141
-#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:354
-#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:326
+#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:367
+#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:352
 #: c:\Apache2\htdocs\account2/sales/view/view_receipt.php:32
 #: c:\Apache2\htdocs\account2/sales/view/view_sales_order.php:173
 msgid "Discount"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/customer_invoice.php:451
-#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:410
-#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:405
+#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:421
+#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:432
 msgid "Shipping Cost"
 msgstr ""
 
-#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:423
+#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:434
 msgid "Amount Total"
 msgstr ""
 
-#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:428
+#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:439
 msgid "Marked items have insufficient quantities in stock as on day of delivery."
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/customer_invoice.php:473
-#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:432
+#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:443
 msgid "Action For Balance"
 msgstr ""
 
-#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:439
+#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:450
+#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:460
+msgid "Refresh document page"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:451
 msgid "Process Dispatch"
 msgstr ""
 
+#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:452
+#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:462
+#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:461
+msgid "Check entered data and save document"
+msgstr ""
+
 #: c:\Apache2\htdocs\account2/sales/customer_invoice.php:27
 #, php-format
 msgid "Modifying Sales Invoice # %d."
@@ -9902,7 +7344,6 @@ msgstr ""
 #: c:\Apache2\htdocs\account2/sales/customer_invoice.php:47
 #: c:\Apache2\htdocs\account2/sales/customer_invoice.php:64
 #: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:116
-#: c:\Apache2\htdocs\account2/sql/sales_order_entry.php:116
 msgid "View This Invoice"
 msgstr ""
 
@@ -9951,519 +7392,399 @@ msgstr ""
 msgid "Select Delivery to Invoice"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/customer_invoice.php:187
-# c:\Apache2\htdocs\account/sales/sales_order_entry.php:112
-#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:184
+#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:140
+#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:251
+msgid "Selected quantity cannot be less than quantity credited nor more than quantity not invoiced yet."
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:204
 msgid "The entered invoice date is invalid."
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/customer_invoice.php:192
-#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:190
+#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:210
 msgid "The entered invoice date is not in fiscal year."
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/customer_invoice.php:197
-#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:196
+#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:216
 msgid "The entered invoice due date is invalid."
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/customer_invoice.php:222
-#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:226
+#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:246
 msgid "There are no item quantities on this invoice."
 msgstr ""
 
-#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:290
+#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:315
 msgid "Delivery Notes:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/customer_invoice.php:375
-#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:322
+#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:347
 msgid "Invoice Items"
 msgstr ""
 
-#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:326
+#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:352
 msgid "This Invoice"
 msgstr ""
 
-#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:329
-#: c:\Apache2\htdocs\account2/reporting/includes/reports_classes.inc:250
+#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:355
+#: c:\Apache2\htdocs\account2/reporting/includes/reports_classes.inc:256
 msgid "DN"
 msgstr ""
 
-#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:334
+#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:360
 msgid "Credited"
 msgstr ""
 
-#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:379
+#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:406
 msgid "Remove"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/customer_invoice.php:464
-#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:422
+#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:449
 msgid "Invoice Total"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/customer_invoice.php:480
-#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:433
+#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:461
 msgid "Process Invoice"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/customer_payments.php:18
 #: c:\Apache2\htdocs\account2/sales/customer_payments.php:19
 msgid "Customer Payment Entry"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/customer_payments.php:22
 #: c:\Apache2\htdocs\account2/sales/customer_payments.php:23
 msgid "There are no customers defined in the system."
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/customer_payments.php:34
 #: c:\Apache2\htdocs\account2/sales/customer_payments.php:34
 msgid "The customer payment has been successfully entered."
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/customer_payments.php:36
 #: c:\Apache2\htdocs\account2/sales/customer_payments.php:36
 msgid "View the GL Journal Entries for this Customer Payment"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/customer_payments.php:37
 #: c:\Apache2\htdocs\account2/sales/customer_payments.php:38
 msgid "Allocate this Customer Payment"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/customer_payments.php:38
 #: c:\Apache2\htdocs\account2/sales/customer_payments.php:40
 msgid "Enter Another Customer Payment"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/customer_payments.php:50
 #: c:\Apache2\htdocs\account2/sales/customer_payments.php:51
 msgid "The entered date is invalid. Please enter a valid date for the payment."
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/customer_payments.php:73
 #: c:\Apache2\htdocs\account2/sales/customer_payments.php:73
 msgid "The entered amount is invalid or negative and cannot be processed."
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/customer_payments.php:82
 #: c:\Apache2\htdocs\account2/sales/customer_payments.php:79
 msgid "The entered discount is not a valid number."
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/customer_payments.php:88
 #: c:\Apache2\htdocs\account2/sales/customer_payments.php:85
 msgid "The balance of the amount and discout is zero or negative. Please enter valid amounts."
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/customer_payments.php:153
-#: c:\Apache2\htdocs\account2/sales/customer_payments.php:150
+#: c:\Apache2\htdocs\account2/sales/customer_payments.php:153
 msgid "From Customer:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/customer_payments.php:157
-# c:\Apache2\htdocs\account/gl/includes/ui/gl_deposit_ui.inc:58
-# c:\Apache2\htdocs\account/gl/includes/ui/gl_payment_ui.inc:58
-# c:\Apache2\htdocs\account/sales/includes/ui/sales_credit_ui.inc:33
-# c:\Apache2\htdocs\account/sales/includes/ui/sales_order_ui.inc:209
-#: c:\Apache2\htdocs\account2/sales/customer_payments.php:153
-#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_deposit_ui.inc:58
-#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_payment_ui.inc:58
-#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_credit_ui.inc:33
-#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:198
+#: c:\Apache2\htdocs\account2/sales/customer_payments.php:155
+#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_bank_ui.inc:62
+#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_credit_ui.inc:36
+#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:184
 msgid "Branch:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/customer_payments.php:171
-#: c:\Apache2\htdocs\account2/sales/customer_payments.php:164
+#: c:\Apache2\htdocs\account2/sales/customer_payments.php:166
 msgid "This customer account is on hold."
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/customer_payments.php:181
-#: c:\Apache2\htdocs\account2/sales/customer_payments.php:172
+#: c:\Apache2\htdocs\account2/sales/customer_payments.php:174
 msgid "Customer prompt payment discount :"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/customer_payments.php:183
-#: c:\Apache2\htdocs\account2/sales/customer_payments.php:174
+#: c:\Apache2\htdocs\account2/sales/customer_payments.php:176
 msgid "Date of Deposit:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/customer_payments.php:189
-#: c:\Apache2\htdocs\account2/sales/customer_payments.php:180
+#: c:\Apache2\htdocs\account2/sales/customer_payments.php:182
 msgid "Into Bank Account:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/customer_payments.php:211
-#: c:\Apache2\htdocs\account2/sales/customer_payments.php:201
+#: c:\Apache2\htdocs\account2/sales/customer_payments.php:203
 msgid "Amount and discount are in customer's currency."
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/customer_payments.php:215
-#: c:\Apache2\htdocs\account2/sales/customer_payments.php:205
+#: c:\Apache2\htdocs\account2/sales/customer_payments.php:207
 msgid "Add Payment"
 msgstr ""
 
-#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:30
-#: c:\Apache2\htdocs\account2/sql/sales_order_entry.php:30
+#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:31
 msgid "Direct Sales Delivery"
 msgstr ""
 
-#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:35
-#: c:\Apache2\htdocs\account2/sql/sales_order_entry.php:35
+#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:36
 msgid "Direct Sales Invoice"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/sales_order_entry.php:21
-#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:40
-#: c:\Apache2\htdocs\account2/sql/sales_order_entry.php:40
+#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:41
 msgid "Modifying Sales Order"
 msgstr ""
 
-#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:41
-#: c:\Apache2\htdocs\account2/sql/sales_order_entry.php:41
+#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:42
 #, php-format
 msgid "Modifying Sales Order # %d"
 msgstr ""
 
-#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:46
-#: c:\Apache2\htdocs\account2/sql/sales_order_entry.php:46
+#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:47
 msgid "New Sales Order Entry"
 msgstr ""
 
 #: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:58
-#: c:\Apache2\htdocs\account2/sql/sales_order_entry.php:58
 #, php-format
 msgid "Order # %d has been entered."
 msgstr ""
 
 #: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:60
 #: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:77
-#: c:\Apache2\htdocs\account2/sql/sales_order_entry.php:60
-#: c:\Apache2\htdocs\account2/sql/sales_order_entry.php:77
 msgid "View This Order"
 msgstr ""
 
 #: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:62
 #: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:79
-#: c:\Apache2\htdocs\account2/sql/sales_order_entry.php:62
-#: c:\Apache2\htdocs\account2/sql/sales_order_entry.php:79
 msgid "Print This Order"
 msgstr ""
 
 #: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:65
-#: c:\Apache2\htdocs\account2/sql/sales_order_entry.php:65
 msgid "Make Delivery Against This Order"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/sales_order_entry.php:45
 #: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:67
-#: c:\Apache2\htdocs\account2/sql/sales_order_entry.php:67
 msgid "Enter a New Order"
 msgstr ""
 
 #: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:75
-#: c:\Apache2\htdocs\account2/sql/sales_order_entry.php:75
 #, php-format
 msgid "Order # %d has been updated."
 msgstr ""
 
 #: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:82
-#: c:\Apache2\htdocs\account2/sql/sales_order_entry.php:82
 msgid "Confirm Order Quantities and Make Delivery"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/sales_order_entry.php:62
 #: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:85
-#: c:\Apache2\htdocs\account2/sql/sales_order_entry.php:85
 msgid "Select A Different Order"
 msgstr ""
 
 #: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:93
-#: c:\Apache2\htdocs\account2/sql/sales_order_entry.php:93
 #, php-format
 msgid "Delivery # %d has been entered."
 msgstr ""
 
 #: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:95
-#: c:\Apache2\htdocs\account2/sql/sales_order_entry.php:95
 msgid "View This Delivery"
 msgstr ""
 
 #: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:97
-#: c:\Apache2\htdocs\account2/sql/sales_order_entry.php:97
 msgid "Print Delivery Note"
 msgstr ""
 
 #: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:100
-#: c:\Apache2\htdocs\account2/sql/sales_order_entry.php:100
 msgid "Make Invoice Against This Delivery"
 msgstr ""
 
 #: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:104
-#: c:\Apache2\htdocs\account2/sql/sales_order_entry.php:104
 msgid "Enter a New Template Delivery"
 msgstr ""
 
 #: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:106
-#: c:\Apache2\htdocs\account2/sql/sales_order_entry.php:106
 msgid "Enter a New Delivery"
 msgstr ""
 
 #: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:114
-#: c:\Apache2\htdocs\account2/sql/sales_order_entry.php:114
 #, php-format
 msgid "Invoice # %d has been entered."
 msgstr ""
 
 #: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:118
-#: c:\Apache2\htdocs\account2/sql/sales_order_entry.php:118
 msgid "Print Sales Invoice"
 msgstr ""
 
 #: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:122
-#: c:\Apache2\htdocs\account2/sql/sales_order_entry.php:122
 msgid "Enter a New Template Invoice"
 msgstr ""
 
 #: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:124
-#: c:\Apache2\htdocs\account2/sql/sales_order_entry.php:124
 msgid "Enter a New Direct Invoice"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/sales_order_entry.php:125
-#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:198
-#: c:\Apache2\htdocs\account2/sql/sales_order_entry.php:191
+#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:202
 msgid "The entered date is not in fiscal year"
 msgstr ""
 
-#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:203
-#: c:\Apache2\htdocs\account2/sql/sales_order_entry.php:195
-msgid "You must enter at least one non empty item line."
-msgstr ""
-
-# c:\Apache2\htdocs\account/sales/sales_order_entry.php:139
-#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:208
-#: c:\Apache2\htdocs\account2/sql/sales_order_entry.php:199
+#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:212
 msgid "You must enter the person or company to whom delivery should be made to."
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/sales_order_entry.php:145
-#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:213
-#: c:\Apache2\htdocs\account2/sql/sales_order_entry.php:203
+#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:217
 msgid "You should enter the street address in the box provided. Orders cannot be accepted without a valid street address."
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/sales_order_entry.php:154
-#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:222
-#: c:\Apache2\htdocs\account2/sql/sales_order_entry.php:211
+#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:226
 msgid "The shipping cost entered is expected to be numeric."
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/sales_order_entry.php:160
-#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:227
-#: c:\Apache2\htdocs\account2/sql/sales_order_entry.php:215
+#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:231
 msgid "The delivery date is invalid."
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/sales_order_entry.php:166
-#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:232
-#: c:\Apache2\htdocs\account2/sql/sales_order_entry.php:219
+#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:237
 msgid "The requested delivery date is before the date of the order."
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/sales_order_entry.php:235
-#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:276
-#: c:\Apache2\htdocs\account2/sql/sales_order_entry.php:260
+#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:280
 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\account2/sales/sales_order_entry.php:280
+#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:284
 msgid "Price for item must be entered and can not be less than 0"
 msgstr ""
 
-#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:287
-#: c:\Apache2\htdocs\account2/sql/sales_order_entry.php:269
+#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:291
 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\account2/sales/sales_order_entry.php:313
-#: c:\Apache2\htdocs\account2/sql/sales_order_entry.php:294
+#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:316
 msgid "This item cannot be deleted because some of it has already been delivered."
 msgstr ""
 
-#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:341
-#: c:\Apache2\htdocs\account2/sql/sales_order_entry.php:321
+#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:344
 msgid "Direct delivery entry has been cancelled as requested."
 msgstr ""
 
-#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:343
-#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:347
-#: c:\Apache2\htdocs\account2/sql/sales_order_entry.php:323
-#: c:\Apache2\htdocs\account2/sql/sales_order_entry.php:327
+#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:346
+#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:350
 msgid "Enter a New Sales Delivery"
 msgstr ""
 
-#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:345
-#: c:\Apache2\htdocs\account2/sql/sales_order_entry.php:325
+#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:348
 msgid "Direct invoice entry has been cancelled as requested."
 msgstr ""
 
-#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:351
-#: c:\Apache2\htdocs\account2/sql/sales_order_entry.php:331
+#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:354
 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\account/sales/sales_order_entry.php:330
-#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:356
-#: c:\Apache2\htdocs\account2/sql/sales_order_entry.php:336
+#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:359
 msgid "This sales order has been cancelled as requested."
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/sales_order_entry.php:331
-#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:358
-#: c:\Apache2\htdocs\account2/sql/sales_order_entry.php:338
+#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:361
 msgid "Enter a New Sales Order"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/sales_order_entry.php:422
-#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:420
-#: c:\Apache2\htdocs\account2/sql/sales_order_entry.php:390
+#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:419
 msgid "There are no inventory items defined in the system."
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/sales_order_entry.php:428
-#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:425
-#: c:\Apache2\htdocs\account2/sql/sales_order_entry.php:395
+#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:424
 msgid "Invoice Date:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/sales_order_entry.php:429
-#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:426
-#: c:\Apache2\htdocs\account2/sql/sales_order_entry.php:396
+#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:425
 msgid "Sales Invoice Items"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/sales_order_entry.php:430
-#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:427
-#: c:\Apache2\htdocs\account2/sql/sales_order_entry.php:397
+#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:426
 msgid "Enter Delivery Details and Confirm Invoice"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/sales_order_entry.php:431
-#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:428
-#: c:\Apache2\htdocs\account2/sql/sales_order_entry.php:398
+#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:427
 msgid "Cancel Invoice"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/sales_order_entry.php:463
-#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:429
-#: c:\Apache2\htdocs\account2/sql/sales_order_entry.php:399
+#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:428
 msgid "Place Invoice"
 msgstr ""
 
-#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:431
-#: c:\Apache2\htdocs\account2/sql/sales_order_entry.php:401
+#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:430
 msgid "Delivery Date:"
 msgstr ""
 
-#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:432
-#: c:\Apache2\htdocs\account2/sql/sales_order_entry.php:402
+#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:431
 msgid "Delivery Note Items"
 msgstr ""
 
-#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:433
-#: c:\Apache2\htdocs\account2/sql/sales_order_entry.php:403
+#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:432
 msgid "Enter Delivery Details and Confirm Dispatch"
 msgstr ""
 
-#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:434
-#: c:\Apache2\htdocs\account2/sql/sales_order_entry.php:404
+#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:433
 msgid "Cancel Delivery"
 msgstr ""
 
-#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:435
-#: c:\Apache2\htdocs\account2/sql/sales_order_entry.php:405
+#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:434
 msgid "Place Delivery"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/sales_order_entry.php:435
-# c:\Apache2\htdocs\account/purchasing/includes/ui/po_ui.inc:109
-#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:437
-#: c:\Apache2\htdocs\account2/sql/sales_order_entry.php:407
-#: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:109
+#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:436
+#: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:107
 msgid "Order Date:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/sales_order_entry.php:436
-#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:438
-#: c:\Apache2\htdocs\account2/sql/sales_order_entry.php:408
+#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:437
 msgid "Sales Order Items"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/sales_order_entry.php:437
-#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:439
-#: c:\Apache2\htdocs\account2/sql/sales_order_entry.php:409
+#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:438
 msgid "Enter Delivery Details and Confirm Order"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/sales_order_entry.php:470
-#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:442
-#: c:\Apache2\htdocs\account2/sql/sales_order_entry.php:412
+#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:441
 msgid "Commit Order Changes"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/allocations/customer_allocate.php:13
-#: c:\Apache2\htdocs\account2/sales/allocations/customer_allocate.php:18
-msgid "Allocate Customer Payment or Credit Note"
+#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:464
+msgid "Validate changes and update document"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/allocations/supplier_allocate.php:45
-# c:\Apache2\htdocs\account/sales/allocations/customer_allocate.php:39
-#: c:\Apache2\htdocs\account2/sales/allocations/customer_allocate.php:43
-msgid "The entry for one or more amounts is invalid."
+#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:468
+msgid "Cancels document entry or removes sales order when editing an old document"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/sales/allocations/customer_allocate.php:18
+msgid "Allocate Customer Payment or Credit Note"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/allocations/supplier_allocate.php:51
-# c:\Apache2\htdocs\account/sales/allocations/customer_allocate.php:45
 #: c:\Apache2\htdocs\account2/sales/allocations/customer_allocate.php:50
 msgid "The entry for an amount to allocate was negative. A positive allocation amount is expected."
 msgstr ""
 
-#: c:\Apache2\htdocs\account2/sales/allocations/customer_allocate.php:181
+#: c:\Apache2\htdocs\account2/sales/allocations/customer_allocate.php:173
 #, php-format
 msgid "Allocation of %s # %d"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/allocations/customer_allocation_main.php:12
 #: c:\Apache2\htdocs\account2/sales/allocations/customer_allocation_main.php:12
 msgid "Customer Allocations"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/allocations/customer_allocation_main.php:31
-# c:\Apache2\htdocs\account/sales/inquiry/customer_allocation_inquiry.php:30
-# c:\Apache2\htdocs\account/sales/inquiry/customer_inquiry.php:30
-# c:\Apache2\htdocs\account/sales/manage/customers.php:217
-# c:\Apache2\htdocs\account/sales/manage/customer_branches.php:149
 #: c:\Apache2\htdocs\account2/sales/allocations/customer_allocation_main.php:31
 #: c:\Apache2\htdocs\account2/sales/inquiry/customer_allocation_inquiry.php:32
-#: c:\Apache2\htdocs\account2/sales/inquiry/customer_inquiry.php:33
-#: c:\Apache2\htdocs\account2/sales/manage/customers.php:197
-#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:148
+#: c:\Apache2\htdocs\account2/sales/inquiry/customer_inquiry.php:34
+#: c:\Apache2\htdocs\account2/sales/manage/customers.php:172
+#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:159
 msgid "Select a customer: "
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/inquiry/customer_allocation_inquiry.php:109
-# c:\Apache2\htdocs\account/sales/inquiry/customer_inquiry.php:151
-#: c:\Apache2\htdocs\account2/sales/inquiry/customer_allocation_inquiry.php:121
-#: c:\Apache2\htdocs\account2/sales/inquiry/customer_inquiry.php:162
+#: c:\Apache2\htdocs\account2/sales/inquiry/customer_allocation_inquiry.php:128
+#: c:\Apache2\htdocs\account2/sales/inquiry/customer_inquiry.php:178
 msgid "The selected customer has no transactions for the given dates."
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/inquiry/customer_allocation_inquiry.php:151
-#: c:\Apache2\htdocs\account2/sales/inquiry/customer_allocation_inquiry.php:163
+#: c:\Apache2\htdocs\account2/sales/inquiry/customer_allocation_inquiry.php:166
 msgid "Allocation"
 msgstr ""
 
@@ -10471,13 +7792,11 @@ msgstr ""
 msgid "Customer Transactions"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/inquiry/customer_inquiry.php:58
-#: c:\Apache2\htdocs\account2/sales/inquiry/customer_inquiry.php:61
+#: c:\Apache2\htdocs\account2/sales/inquiry/customer_inquiry.php:62
 msgid "CUSTOMER ACCOUNT IS ON HOLD"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/inquiry/customer_inquiry.php:194
-#: c:\Apache2\htdocs\account2/sales/inquiry/customer_inquiry.php:206
+#: c:\Apache2\htdocs\account2/sales/inquiry/customer_inquiry.php:217
 msgid "Credit This"
 msgstr ""
 
@@ -10496,19 +7815,18 @@ msgid ""
 "\t\t    the same customer branch."
 msgstr ""
 
-#: c:\Apache2\htdocs\account2/sales/inquiry/sales_deliveries_view.php:197
+#: c:\Apache2\htdocs\account2/sales/inquiry/sales_deliveries_view.php:216
 msgid "Delivery #"
 msgstr ""
 
-#: c:\Apache2\htdocs\account2/sales/inquiry/sales_deliveries_view.php:198
+#: c:\Apache2\htdocs\account2/sales/inquiry/sales_deliveries_view.php:217
 msgid "Due By"
 msgstr ""
 
-#: c:\Apache2\htdocs\account2/sales/inquiry/sales_deliveries_view.php:198
+#: c:\Apache2\htdocs\account2/sales/inquiry/sales_deliveries_view.php:217
 msgid "Delivery Total"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/inquiry/sales_orders_view.php:16
 #: c:\Apache2\htdocs\account2/sales/inquiry/sales_orders_view.php:19
 msgid "Search Outstanding Sales Orders"
 msgstr ""
@@ -10521,428 +7839,440 @@ msgstr ""
 msgid "Select Template for Delivery"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/inquiry/sales_orders_view.php:21
 #: c:\Apache2\htdocs\account2/sales/inquiry/sales_orders_view.php:34
 msgid "Search All Sales Orders"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/inquiry/sales_orders_view.php:125
-#: c:\Apache2\htdocs\account2/sales/inquiry/sales_orders_view.php:174
+#: c:\Apache2\htdocs\account2/sales/inquiry/sales_orders_view.php:192
 msgid "Order #"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/inquiry/sales_orders_view.php:125
-#: c:\Apache2\htdocs\account2/sales/inquiry/sales_orders_view.php:174
+#: c:\Apache2\htdocs\account2/sales/inquiry/sales_orders_view.php:192
 msgid "Cust Order #"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/inquiry/sales_orders_view.php:126
-#: c:\Apache2\htdocs\account2/sales/inquiry/sales_orders_view.php:175
+#: c:\Apache2\htdocs\account2/sales/inquiry/sales_orders_view.php:193
 msgid "Delivery To"
 msgstr ""
 
-#: c:\Apache2\htdocs\account2/sales/inquiry/sales_orders_view.php:181
+#: c:\Apache2\htdocs\account2/sales/inquiry/sales_orders_view.php:199
 msgid "Tmpl"
 msgstr ""
 
-#: c:\Apache2\htdocs\account2/sales/inquiry/sales_orders_view.php:225
+#: c:\Apache2\htdocs\account2/sales/inquiry/sales_orders_view.php:246
 msgid "Dispatch"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/manage/credit_status.php:7
+#: c:\Apache2\htdocs\account2/sales/inquiry/sales_orders_view.php:261
+msgid "Set this order as a template for direct deliveries/invoices"
+msgstr ""
+
 #: c:\Apache2\htdocs\account2/sales/manage/credit_status.php:7
 msgid "Credit Status"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/manage/credit_status.php:29
-#: c:\Apache2\htdocs\account2/sales/manage/credit_status.php:29
+#: c:\Apache2\htdocs\account2/sales/manage/credit_status.php:21
 msgid "The credit status description cannot be empty."
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/manage/credit_status.php:64
-#: c:\Apache2\htdocs\account2/sales/manage/credit_status.php:64
+#: c:\Apache2\htdocs\account2/sales/manage/credit_status.php:35
+msgid "New credit status has been added"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/sales/manage/credit_status.php:43
+msgid "Selected credit status has been updated"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/sales/manage/credit_status.php:58
 msgid "Cannot delete this credit status because customer accounts have been created referring to it."
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/manage/credit_status.php:89
-#: c:\Apache2\htdocs\account2/sales/manage/credit_status.php:89
+#: c:\Apache2\htdocs\account2/sales/manage/credit_status.php:74
+msgid "Selected credit status has been deleted"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/sales/manage/credit_status.php:90
 msgid "Dissallow Invoices"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/manage/credit_status.php:100
-#: c:\Apache2\htdocs\account2/sales/manage/credit_status.php:100
+#: c:\Apache2\htdocs\account2/sales/manage/credit_status.php:101
 msgid "Invoice OK"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/manage/credit_status.php:104
-#: c:\Apache2\htdocs\account2/sales/manage/credit_status.php:104
+#: c:\Apache2\htdocs\account2/sales/manage/credit_status.php:105
 msgid "NO INVOICING"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/manage/credit_status.php:118
-#: c:\Apache2\htdocs\account2/sales/manage/credit_status.php:118
-msgid "New Credit Status"
-msgstr ""
-
-# c:\Apache2\htdocs\account/sales/manage/credit_status.php:138
-#: c:\Apache2\htdocs\account2/sales/manage/credit_status.php:138
+#: c:\Apache2\htdocs\account2/sales/manage/credit_status.php:140
 msgid "Dissallow invoicing ?"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/reports_main.php:57
-# c:\Apache2\htdocs\account/sales/manage/customers.php:7
 #: c:\Apache2\htdocs\account2/sales/manage/customers.php:7
 msgid "Customers"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/manage/customers.php:30
-#: c:\Apache2\htdocs\account2/sales/manage/customers.php:29
+#: c:\Apache2\htdocs\account2/sales/manage/customers.php:20
 msgid "The customer name cannot be empty."
 msgstr ""
 
-#: c:\Apache2\htdocs\account2/sales/manage/customers.php:35
+#: c:\Apache2\htdocs\account2/sales/manage/customers.php:26
 msgid "The credit limit must be numeric and not less than zero."
 msgstr ""
 
-#: c:\Apache2\htdocs\account2/sales/manage/customers.php:41
+#: c:\Apache2\htdocs\account2/sales/manage/customers.php:32
 msgid "The payment discount must be numeric and is expected to be less than 100% and greater than or equal to 0."
 msgstr ""
 
-#: c:\Apache2\htdocs\account2/sales/manage/customers.php:47
+#: c:\Apache2\htdocs\account2/sales/manage/customers.php:38
 msgid "The discount percentage must be numeric and is expected to be less than 100% and greater than or equal to 0."
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/manage/customers.php:101
-#: c:\Apache2\htdocs\account2/sales/manage/customers.php:81
+#: c:\Apache2\htdocs\account2/sales/manage/customers.php:73
 msgid "Customer has been updated."
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/manage/customers.php:123
-#: c:\Apache2\htdocs\account2/sales/manage/customers.php:103
+#: c:\Apache2\htdocs\account2/sales/manage/customers.php:95
 msgid "A new customer has been added."
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/manage/customers.php:125
-#: c:\Apache2\htdocs\account2/sales/manage/customers.php:105
-msgid "Add branches for this customer"
-msgstr ""
-
-# c:\Apache2\htdocs\account/sales/manage/customers.php:156
-#: c:\Apache2\htdocs\account2/sales/manage/customers.php:136
+#: c:\Apache2\htdocs\account2/sales/manage/customers.php:126
 msgid "This customer cannot be deleted because there are transactions that refer to it."
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/manage/customers.php:166
-#: c:\Apache2\htdocs\account2/sales/manage/customers.php:146
+#: c:\Apache2\htdocs\account2/sales/manage/customers.php:136
 msgid "Cannot delete the customer record because orders have been created against it."
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/manage/customers.php:176
-#: c:\Apache2\htdocs\account2/sales/manage/customers.php:156
+#: c:\Apache2\htdocs\account2/sales/manage/customers.php:146
 msgid "Cannot delete this customer because there are branch records set up against it."
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/manage/customers.php:209
-#: c:\Apache2\htdocs\account2/sales/manage/customers.php:189
-msgid "There are no sales types defined. Please define at least one sales type before adding a customer."
+#: c:\Apache2\htdocs\account2/sales/manage/customers.php:157
+msgid "Selected customer has been deleted."
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/manage/customers.php:218
-#: c:\Apache2\htdocs\account2/sales/manage/customers.php:198
-msgid "Edit Customer"
+#: c:\Apache2\htdocs\account2/sales/manage/customers.php:165
+msgid "There are no sales types defined. Please define at least one sales type before adding a customer."
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/manage/customers.php:227
-#: c:\Apache2\htdocs\account2/sales/manage/customers.php:207
-msgid "Enter a new customer"
+#: c:\Apache2\htdocs\account2/sales/manage/customers.php:173
+msgid "New customer"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/manage/customers.php:273
-#: c:\Apache2\htdocs\account2/sales/manage/customers.php:253
+#: c:\Apache2\htdocs\account2/sales/manage/customers.php:223
 msgid "Customer Name:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/manage/customers.php:277
-#: c:\Apache2\htdocs\account2/sales/manage/customers.php:257
+#: c:\Apache2\htdocs\account2/sales/manage/customers.php:227
 msgid "GSTNo:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/manage/customers.php:283
-# c:\Apache2\htdocs\account/sales/manage/customers.php:287
-#: c:\Apache2\htdocs\account2/sales/manage/customers.php:263
-#: c:\Apache2\htdocs\account2/sales/manage/customers.php:267
+#: c:\Apache2\htdocs\account2/sales/manage/customers.php:233
+#: c:\Apache2\htdocs\account2/sales/manage/customers.php:237
 msgid "Customer's Currency:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/manage/customers.php:296
-#: c:\Apache2\htdocs\account2/sales/manage/customers.php:276
+#: c:\Apache2\htdocs\account2/sales/manage/customers.php:246
 msgid "Sales Type/Price List:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/manage/customers.php:307
-#: c:\Apache2\htdocs\account2/sales/manage/customers.php:287
+#: c:\Apache2\htdocs\account2/sales/manage/customers.php:257
 msgid "Discount Percent:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/manage/customers.php:308
-#: c:\Apache2\htdocs\account2/sales/manage/customers.php:288
+#: c:\Apache2\htdocs\account2/sales/manage/customers.php:258
 msgid "Prompt Payment Discount Percent:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/manage/customers.php:309
-#: c:\Apache2\htdocs\account2/sales/manage/customers.php:289
+#: c:\Apache2\htdocs\account2/sales/manage/customers.php:259
 msgid "Credit Limit:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/manage/customers.php:312
-#: c:\Apache2\htdocs\account2/sales/manage/customers.php:292
+#: c:\Apache2\htdocs\account2/sales/manage/customers.php:262
 msgid "Credit Status:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/manage/customers.php:320
-#: c:\Apache2\htdocs\account2/sales/manage/customers.php:300
+#: c:\Apache2\htdocs\account2/sales/manage/customers.php:265
+msgid "Customer branches"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/sales/manage/customers.php:266
+msgid "Add or Edit"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/sales/manage/customers.php:275
 msgid "Add New Customer"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/manage/customers.php:324
-#: c:\Apache2\htdocs\account2/sales/manage/customers.php:304
+#: c:\Apache2\htdocs\account2/sales/manage/customers.php:279
 msgid "Update Customer"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/manage/customers.php:325
-#: c:\Apache2\htdocs\account2/sales/manage/customers.php:305
+#: c:\Apache2\htdocs\account2/sales/manage/customers.php:280
+msgid "Update customer data"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/sales/manage/customers.php:281
 msgid "Delete Customer"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/manage/customer_branches.php:14
+#: c:\Apache2\htdocs\account2/sales/manage/customers.php:282
+msgid "Delete customer data if have been never used"
+msgstr ""
+
 #: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:13
 msgid "There are no customers defined in the system. Please define a customer to add customer branches."
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/manage/customer_branches.php:16
 #: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:15
 msgid "There are no sales people defined in the system. At least one sales person is required before proceeding."
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/manage/customer_branches.php:18
 #: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:17
 msgid "There are no sales areas defined in the system. At least one sales area is required before proceeding."
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/manage/customer_branches.php:20
-#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:19
-msgid "There are no shipping companies defined in the system. At least one shipping company is required before proceeding."
+#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:19
+msgid "There are no shipping companies defined in the system. At least one shipping company is required before proceeding."
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:51
+msgid "The Branch name cannot be empty."
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:82
+msgid "Selected customer branch has been updated"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/manage/customer_branches.php:56
-#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:55
-msgid "The Branch name cannot be empty."
+#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:105
+msgid "New customer branch has been added"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/manage/customer_branches.php:125
-#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:124
+#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:126
 msgid "Cannot delete this branch because customer transactions have been created to this branch."
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/manage/customer_branches.php:136
-#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:135
+#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:137
 msgid "Cannot delete this branch because sales orders exist for it. Purge old sales orders first."
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/manage/customer_branches.php:169
-#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:168
+#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:143
+msgid "Selected customer branch has been deleted"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:180
 msgid "Contact"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/manage/customer_branches.php:169
-#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:168
+#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:180
 msgid "Sales Person"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/manage/customer_branches.php:169
-#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:168
+#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:180
 msgid "Area"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/manage/customer_branches.php:170
-#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:169
+#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:181
 msgid "Phone No"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/manage/customer_branches.php:170
-#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:169
+#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:181
 msgid "Fax No"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/customer_credit_invoice.php:263
-# c:\Apache2\htdocs\account/sales/customer_invoice.php:326
-# c:\Apache2\htdocs\account/sales/manage/customer_branches.php:170
-#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:169
+#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:181
 msgid "Tax Group"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/manage/customer_branches.php:192
-# c:\Apache2\htdocs\account/sales/includes/ui/sales_order_ui.inc:55
-#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:191
-#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:202
+#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:203
+#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:193
 msgid "The selected customer does not have any branches. Please create at least one branch."
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/manage/customer_branches.php:200
-#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:199
-msgid "New Customer Branch"
-msgstr ""
-
-# c:\Apache2\htdocs\account/sales/manage/customer_branches.php:248
-#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:247
+#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:251
 msgid "Main Branch"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/manage/customer_branches.php:267
-#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:266
+#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:273
 msgid "Name and Contact"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/manage/customer_branches.php:269
-#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:268
+#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:275
 msgid "Branch Name:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/manage/customer_branches.php:273
-#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:272
+#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:279
 msgid "Fax Number:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/manage/customer_branches.php:275
-#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:274
+#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:281
 msgid "E-mail:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/manage/customer_branches.php:279
-#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:278
+#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:285
 msgid "Sales Person:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/manage/customer_branches.php:281
-#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:280
+#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:287
 msgid "Sales Area:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/manage/customer_branches.php:283
-#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:282
+#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:289
 msgid "Default Inventory Location:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/manage/customer_branches.php:285
-#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:284
+#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:291
 msgid "Default Shipping Company:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/manage/customer_branches.php:289
-#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:288
+#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:295
 msgid "Disable this Branch:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/manage/customer_branches.php:307
-#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:306
+#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:310
+msgid "Accounts Receivable Account:"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:314
 msgid "Addresses"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/manage/customer_branches.php:309
-#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:308
+#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:316
 msgid "Mailing Address:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/manage/customer_branches.php:311
-#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:310
+#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:318
 msgid "Billing Address:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/manage/sales_areas.php:29
-#: c:\Apache2\htdocs\account2/sales/manage/sales_areas.php:29
+#: c:\Apache2\htdocs\account2/sales/manage/sales_areas.php:22
 msgid "The area description cannot be empty."
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/manage/sales_areas.php:63
-#: c:\Apache2\htdocs\account2/sales/manage/sales_areas.php:63
+#: c:\Apache2\htdocs\account2/sales/manage/sales_areas.php:31
+msgid "Selected sales area has been updated"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/sales/manage/sales_areas.php:36
+msgid "New sales area has been added"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/sales/manage/sales_areas.php:58
 msgid "Cannot delete this area because customer branches have been created using this area."
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/manage/sales_areas.php:80
-#: c:\Apache2\htdocs\account2/sales/manage/sales_areas.php:80
-msgid "Area Name"
+#: c:\Apache2\htdocs\account2/sales/manage/sales_areas.php:65
+msgid "Selected sales area has been deleted"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/manage/sales_areas.php:97
-#: c:\Apache2\htdocs\account2/sales/manage/sales_areas.php:97
-msgid "New Sales Area"
+#: c:\Apache2\htdocs\account2/sales/manage/sales_areas.php:82
+msgid "Area Name"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/manage/sales_areas.php:117
-#: c:\Apache2\htdocs\account2/sales/manage/sales_areas.php:117
+#: c:\Apache2\htdocs\account2/sales/manage/sales_areas.php:122
 msgid "Area Name:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/manage/sales_people.php:31
-#: c:\Apache2\htdocs\account2/sales/manage/sales_people.php:31
+#: c:\Apache2\htdocs\account2/sales/manage/sales_people.php:23
 msgid "The sales person name cannot be empty."
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/manage/sales_people.php:111
-#: c:\Apache2\htdocs\account2/sales/manage/sales_people.php:119
-msgid "New Sales Person"
+#: c:\Apache2\htdocs\account2/sales/manage/sales_people.php:29
+msgid "Salesman provision cannot be less than 0 or more than 100%."
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/sales/manage/sales_people.php:34
+msgid "Salesman provision breakpoint must be numeric and not less than 0."
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/sales/manage/sales_people.php:68
+msgid "Selected sales person data have been updated"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/sales/manage/sales_people.php:70
+msgid "New sales person data have been added"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/sales/manage/sales_people.php:91
+msgid "Selected sales person data have been deleted"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/manage/sales_people.php:135
-#: c:\Apache2\htdocs\account2/sales/manage/sales_people.php:146
+#: c:\Apache2\htdocs\account2/sales/manage/sales_people.php:165
 msgid "Sales person name:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/manage/sales_people.php:136
-#: c:\Apache2\htdocs\account2/sales/manage/sales_people.php:147
+#: c:\Apache2\htdocs\account2/sales/manage/sales_people.php:166
 msgid "Telephone number:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/manage/sales_people.php:137
-#: c:\Apache2\htdocs\account2/sales/manage/sales_people.php:148
+#: c:\Apache2\htdocs\account2/sales/manage/sales_people.php:167
 msgid "Fax number:"
 msgstr ""
 
-#: c:\Apache2\htdocs\account2/sales/manage/sales_people.php:151
+#: c:\Apache2\htdocs\account2/sales/manage/sales_people.php:170
 msgid "Break Pt.:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/manage/sales_types.php:29
-#: c:\Apache2\htdocs\account2/sales/manage/sales_types.php:29
+#: c:\Apache2\htdocs\account2/sales/manage/sales_types.php:19
 msgid "The sales type description cannot be empty."
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/manage/sales_types.php:65
-#: c:\Apache2\htdocs\account2/sales/manage/sales_types.php:65
+#: c:\Apache2\htdocs\account2/sales/manage/sales_types.php:26
+msgid "Calculation factor must be valid positive number."
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/sales/manage/sales_types.php:39
+msgid "New sales type has been added"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/sales/manage/sales_types.php:50
+msgid "Selected sales type has been updated"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/sales/manage/sales_types.php:67
 msgid "Cannot delete this sale type because customer transactions have been created using this sales type."
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/manage/sales_types.php:78
-#: c:\Apache2\htdocs\account2/sales/manage/sales_types.php:78
+#: c:\Apache2\htdocs\account2/sales/manage/sales_types.php:80
 msgid "Cannot delete this sale type because customers are currently set up to use this sales type."
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/manage/sales_types.php:94
-#: c:\Apache2\htdocs\account2/sales/manage/sales_types.php:94
+#: c:\Apache2\htdocs\account2/sales/manage/sales_types.php:85
+msgid "Selected sales type has been deleted"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/sales/manage/sales_types.php:103
 msgid "Type Name"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/manage/sales_types.php:111
-#: c:\Apache2\htdocs\account2/sales/manage/sales_types.php:112
-msgid "New Sales type"
+#: c:\Apache2\htdocs\account2/sales/manage/sales_types.php:103
+msgid "Factor"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/sales/manage/sales_types.php:103
+msgid "Tax Incl"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/sales/manage/sales_types.php:116
+msgid "Base"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/sales/manage/sales_types.php:126
+msgid "Marked sales type is the company base pricelist for prices calculations."
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/sales/manage/sales_types.php:153
+msgid "Sales Type Name"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/sales/manage/sales_types.php:154
+msgid "Calculation factor"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/manage/sales_types.php:127
-#: c:\Apache2\htdocs\account2/sales/manage/sales_types.php:131
-msgid "Sales Type Name:"
+#: c:\Apache2\htdocs\account2/sales/manage/sales_types.php:155
+msgid "Tax included"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/view/view_credit.php:15
 #: c:\Apache2\htdocs\account2/sales/view/view_credit.php:15
 msgid "View Credit Note"
 msgstr ""
@@ -10952,9 +8282,6 @@ msgstr ""
 msgid "CREDIT NOTE #%d"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/view/view_credit.php:59
-# c:\Apache2\htdocs\account/sales/view/view_sales_order.php:70
-# c:\Apache2\htdocs\account/sales/view/view_sales_order.php:101
 #: c:\Apache2\htdocs\account2/sales/view/view_credit.php:59
 #: c:\Apache2\htdocs\account2/sales/view/view_sales_order.php:68
 #: c:\Apache2\htdocs\account2/sales/view/view_sales_order.php:101
@@ -10962,26 +8289,19 @@ msgstr ""
 msgid "Ref"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/view/view_credit.php:116
 #: c:\Apache2\htdocs\account2/sales/view/view_credit.php:117
 msgid "There are no line items on this credit note."
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/view/view_credit.php:129
-# c:\Apache2\htdocs\account/sales/view/view_invoice.php:142
-# c:\Apache2\htdocs\account/sales/view/view_sales_order.php:168
-# c:\Apache2\htdocs\account/reporting/includes/doctext.inc:65
-# c:\Apache2\htdocs\account/sales/includes/ui/sales_credit_ui.inc:152
 #: c:\Apache2\htdocs\account2/sales/view/view_credit.php:129
 #: c:\Apache2\htdocs\account2/sales/view/view_dispatch.php:147
 #: c:\Apache2\htdocs\account2/sales/view/view_invoice.php:147
-#: c:\Apache2\htdocs\account2/sales/view/view_sales_order.php:201
-#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:76
-#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_credit_ui.inc:160
+#: c:\Apache2\htdocs\account2/sales/view/view_sales_order.php:202
+#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:77
+#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_credit_ui.inc:206
 msgid "Shipping"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/view/view_credit.php:134
 #: c:\Apache2\htdocs\account2/sales/view/view_credit.php:134
 msgid "TOTAL CREDIT"
 msgstr ""
@@ -10995,38 +8315,29 @@ msgstr ""
 msgid "DISPATCH NOTE #%d"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/view/view_invoice.php:38
-# c:\Apache2\htdocs\account/reporting/includes/doctext.inc:6
 #: c:\Apache2\htdocs\account2/sales/view/view_dispatch.php:42
 #: c:\Apache2\htdocs\account2/sales/view/view_invoice.php:42
 #: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:6
 msgid "Charge To"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/view/view_invoice.php:52
 #: c:\Apache2\htdocs\account2/sales/view/view_dispatch.php:56
 #: c:\Apache2\htdocs\account2/sales/view/view_invoice.php:56
 msgid "Charge Branch"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/view/view_invoice.php:61
-# c:\Apache2\htdocs\account/reporting/includes/doctext.inc:7
 #: c:\Apache2\htdocs\account2/sales/view/view_dispatch.php:65
 #: c:\Apache2\htdocs\account2/sales/view/view_invoice.php:65
 #: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:7
 msgid "Delivered To"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/view/view_invoice.php:74
-# c:\Apache2\htdocs\account/reporting/includes/doctext.inc:18
 #: c:\Apache2\htdocs\account2/sales/view/view_dispatch.php:78
 #: c:\Apache2\htdocs\account2/sales/view/view_invoice.php:78
-#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:18
+#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:19
 msgid "Our Order No"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/view/view_invoice.php:78
-# c:\Apache2\htdocs\account/sales/view/view_sales_order.php:46
 #: c:\Apache2\htdocs\account2/sales/view/view_dispatch.php:82
 #: c:\Apache2\htdocs\account2/sales/view/view_invoice.php:82
 #: c:\Apache2\htdocs\account2/sales/view/view_sales_order.php:43
@@ -11049,7 +8360,6 @@ msgstr ""
 msgid "This dispatch has been voided."
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/view/view_invoice.php:7
 #: c:\Apache2\htdocs\account2/sales/view/view_invoice.php:14
 msgid "View Sales Invoice"
 msgstr ""
@@ -11059,12 +8369,10 @@ msgstr ""
 msgid "SALES INVOICE #%d"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/view/view_invoice.php:134
 #: c:\Apache2\htdocs\account2/sales/view/view_invoice.php:139
 msgid "There are no line items on this invoice."
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/view/view_receipt.php:7
 #: c:\Apache2\htdocs\account2/sales/view/view_receipt.php:7
 msgid "View Customer Payment"
 msgstr ""
@@ -11074,29 +8382,22 @@ msgstr ""
 msgid "Customer Payment #%d"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/reports_main.php:21
-# c:\Apache2\htdocs\account/reporting/reports_main.php:27
-# c:\Apache2\htdocs\account/sales/view/view_receipt.php:25
 #: c:\Apache2\htdocs\account2/sales/view/view_receipt.php:25
 msgid "From Customer"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/view/view_receipt.php:26
 #: c:\Apache2\htdocs\account2/sales/view/view_receipt.php:26
 msgid "Into Bank Account"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/view/view_receipt.php:27
 #: c:\Apache2\htdocs\account2/sales/view/view_receipt.php:27
 msgid "Date of Deposit"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/view/view_receipt.php:42
 #: c:\Apache2\htdocs\account2/sales/view/view_receipt.php:42
 msgid "This customer payment has been voided."
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/view/view_sales_order.php:17
 #: c:\Apache2\htdocs\account2/sales/view/view_sales_order.php:17
 msgid "View Sales Order"
 msgstr ""
@@ -11106,404 +8407,422 @@ msgstr ""
 msgid "Sales Order #%d"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/view/view_sales_order.php:33
 #: c:\Apache2\htdocs\account2/sales/view/view_sales_order.php:30
 msgid "Order Information"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/view/view_sales_order.php:43
 #: c:\Apache2\htdocs\account2/sales/view/view_sales_order.php:40
 msgid "Customer Name"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/view/view_sales_order.php:47
 #: c:\Apache2\htdocs\account2/sales/view/view_sales_order.php:44
 msgid "Deliver To Branch"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/view/view_sales_order.php:50
-# c:\Apache2\htdocs\account/purchasing/includes/ui/grn_ui.inc:19
 #: c:\Apache2\htdocs\account2/sales/view/view_sales_order.php:47
 #: c:\Apache2\htdocs\account2/purchasing/includes/ui/grn_ui.inc:19
 msgid "Ordered On"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/view/view_sales_order.php:51
 #: c:\Apache2\htdocs\account2/sales/view/view_sales_order.php:48
 msgid "Requested Delivery"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/view/view_sales_order.php:54
-# c:\Apache2\htdocs\account/purchasing/includes/ui/grn_ui.inc:14
-# c:\Apache2\htdocs\account/purchasing/includes/ui/po_ui.inc:228
 #: c:\Apache2\htdocs\account2/sales/view/view_sales_order.php:51
 #: c:\Apache2\htdocs\account2/purchasing/includes/ui/grn_ui.inc:14
-#: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:230
+#: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:232
 msgid "Order Currency"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/view/view_sales_order.php:55
 #: c:\Apache2\htdocs\account2/sales/view/view_sales_order.php:52
 msgid "Deliver From Location"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/view/view_sales_order.php:58
-# c:\Apache2\htdocs\account/purchasing/includes/ui/grn_ui.inc:51
-# c:\Apache2\htdocs\account/purchasing/includes/ui/po_ui.inc:257
 #: c:\Apache2\htdocs\account2/sales/view/view_sales_order.php:55
 #: c:\Apache2\htdocs\account2/purchasing/includes/ui/grn_ui.inc:51
-#: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:259
+#: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:261
 msgid "Delivery Address"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/view/view_sales_order.php:60
 #: c:\Apache2\htdocs\account2/sales/view/view_sales_order.php:57
 msgid "Telephone"
 msgstr ""
 
 #: c:\Apache2\htdocs\account2/sales/view/view_sales_order.php:66
-#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:2091
+#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:1634
 msgid "Delivery Notes"
 msgstr ""
 
-# c:\Apache2\htdocs\account/applications/customers.php:14
-# c:\Apache2\htdocs\account/sales/sales_order_entry.php:25
-# c:\Apache2\htdocs\account/sales/view/view_sales_order.php:35
-# c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:1851
 #: c:\Apache2\htdocs\account2/sales/view/view_sales_order.php:99
-#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:2087
+#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:1630
 msgid "Sales Invoices"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/view/view_sales_order.php:37
-# c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:1854
-# c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:1867
 #: c:\Apache2\htdocs\account2/sales/view/view_sales_order.php:130
-#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:2090
-#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:2107
+#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:1633
+#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:1651
 msgid "Credit Notes"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/view/view_sales_order.php:141
 #: c:\Apache2\htdocs\account2/sales/view/view_sales_order.php:173
 msgid "Quantity Delivered"
 msgstr ""
 
-#: c:\Apache2\htdocs\account2/sales/view/view_sales_order.php:203
+#: c:\Apache2\htdocs\account2/sales/view/view_sales_order.php:204
 msgid "Total Order Value"
 msgstr ""
 
-#: c:\Apache2\htdocs\account2/sql/sales_order_entry.php:264
-msgid "Price for item must be entered and can not be less then 0"
+#: c:\Apache2\htdocs\account2/taxes/item_tax_types.php:26
+msgid "The item tax type description cannot be empty."
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/taxes/item_tax_types.php:51
+msgid "Selected item tax type has been updated"
 msgstr ""
 
-# c:\Apache2\htdocs\account/taxes/item_tax_types.php:34
-#: c:\Apache2\htdocs\account2/taxes/item_tax_types.php:34
-msgid "The item tax type description cannot be empty."
+#: c:\Apache2\htdocs\account2/taxes/item_tax_types.php:56
+msgid "New item tax type has been added"
 msgstr ""
 
-# c:\Apache2\htdocs\account/taxes/item_tax_types.php:78
-#: c:\Apache2\htdocs\account2/taxes/item_tax_types.php:79
+#: c:\Apache2\htdocs\account2/taxes/item_tax_types.php:71
 msgid "Cannot delete this item tax type because items have been created referring to it."
 msgstr ""
 
-# c:\Apache2\htdocs\account/taxes/item_tax_types.php:103
-#: c:\Apache2\htdocs\account2/taxes/item_tax_types.php:104
-msgid "Tax exempt"
+#: c:\Apache2\htdocs\account2/taxes/item_tax_types.php:87
+msgid "Selected item tax type has been deleted"
 msgstr ""
 
-# c:\Apache2\htdocs\account/taxes/item_tax_types.php:132
-#: c:\Apache2\htdocs\account2/taxes/item_tax_types.php:134
-msgid "New Item Tax type"
+#: c:\Apache2\htdocs\account2/taxes/item_tax_types.php:103
+msgid "Tax exempt"
 msgstr ""
 
-# c:\Apache2\htdocs\account/taxes/item_tax_types.php:165
-#: c:\Apache2\htdocs\account2/taxes/item_tax_types.php:167
+#: c:\Apache2\htdocs\account2/taxes/item_tax_types.php:164
 msgid "Is Fully Tax-exempt:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/taxes/item_tax_types.php:172
-#: c:\Apache2\htdocs\account2/taxes/item_tax_types.php:174
+#: c:\Apache2\htdocs\account2/taxes/item_tax_types.php:171
 msgid "Select which taxes this item tax type is exempt from."
 msgstr ""
 
-# c:\Apache2\htdocs\account/taxes/item_tax_types.php:175
-#: c:\Apache2\htdocs\account2/taxes/item_tax_types.php:177
+#: c:\Apache2\htdocs\account2/taxes/item_tax_types.php:174
 msgid "Tax Name"
 msgstr ""
 
-#: c:\Apache2\htdocs\account2/taxes/item_tax_types.php:177
+#: c:\Apache2\htdocs\account2/taxes/item_tax_types.php:174
 msgid "Rate"
 msgstr ""
 
-# c:\Apache2\htdocs\account/taxes/item_tax_types.php:175
-#: c:\Apache2\htdocs\account2/taxes/item_tax_types.php:177
+#: c:\Apache2\htdocs\account2/taxes/item_tax_types.php:174
 msgid "Is exempt"
 msgstr ""
 
-# c:\Apache2\htdocs\account/taxes/tax_groups.php:27
-#: c:\Apache2\htdocs\account2/taxes/tax_groups.php:27
+#: c:\Apache2\htdocs\account2/taxes/tax_groups.php:18
 msgid "There are no tax types defined. Define tax types before defining tax groups."
 msgstr ""
 
-# c:\Apache2\htdocs\account/taxes/tax_groups.php:40
-#: c:\Apache2\htdocs\account2/taxes/tax_groups.php:40
+#: c:\Apache2\htdocs\account2/taxes/tax_groups.php:31
 msgid "The tax group name cannot be empty."
 msgstr ""
 
-# c:\Apache2\htdocs\account/taxes/tax_groups.php:51
-#: c:\Apache2\htdocs\account2/taxes/tax_groups.php:52
+#: c:\Apache2\htdocs\account2/taxes/tax_groups.php:43
 msgid "An entered tax rate is invalid or less than zero."
 msgstr ""
 
-# c:\Apache2\htdocs\account/taxes/tax_groups.php:108
-#: c:\Apache2\htdocs\account2/taxes/tax_groups.php:105
+#: c:\Apache2\htdocs\account2/taxes/tax_groups.php:72
+msgid "Selected tax group has been updated"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/taxes/tax_groups.php:77
+msgid "New tax group has been added"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/taxes/tax_groups.php:95
 msgid "Cannot delete this tax group because customer branches been created referring to it."
 msgstr ""
 
-# c:\Apache2\htdocs\account/taxes/tax_groups.php:117
-#: c:\Apache2\htdocs\account2/taxes/tax_groups.php:114
+#: c:\Apache2\htdocs\account2/taxes/tax_groups.php:104
 msgid "Cannot delete this tax group because suppliers been created referring to it."
 msgstr ""
 
-# c:\Apache2\htdocs\account/taxes/tax_groups.php:143
-#: c:\Apache2\htdocs\account2/taxes/tax_groups.php:140
-msgid "Tax Shipping"
+#: c:\Apache2\htdocs\account2/taxes/tax_groups.php:121
+msgid "Selected tax group has been deleted"
 msgstr ""
 
-# c:\Apache2\htdocs\account/taxes/tax_groups.php:171
-#: c:\Apache2\htdocs\account2/taxes/tax_groups.php:168
-msgid "New Tax Group"
+#: c:\Apache2\htdocs\account2/taxes/tax_groups.php:137
+msgid "Tax Shipping"
 msgstr ""
 
-# c:\Apache2\htdocs\account/taxes/tax_groups.php:203
-#: c:\Apache2\htdocs\account2/taxes/tax_groups.php:199
+#: c:\Apache2\htdocs\account2/taxes/tax_groups.php:195
 msgid "Tax Shipping:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/taxes/tax_groups.php:207
-#: c:\Apache2\htdocs\account2/taxes/tax_groups.php:203
+#: c:\Apache2\htdocs\account2/taxes/tax_groups.php:199
 msgid "Select the taxes that are included in this group."
 msgstr ""
 
-# c:\Apache2\htdocs\account/taxes/tax_groups.php:210
-# c:\Apache2\htdocs\account/taxes/tax_types.php:98
-#: c:\Apache2\htdocs\account2/taxes/tax_groups.php:206
-#: c:\Apache2\htdocs\account2/taxes/tax_types.php:95
+#: c:\Apache2\htdocs\account2/taxes/tax_groups.php:202
+#: c:\Apache2\htdocs\account2/taxes/tax_types.php:97
 msgid "Default Rate (%)"
 msgstr ""
 
-# c:\Apache2\htdocs\account/taxes/tax_groups.php:210
-#: c:\Apache2\htdocs\account2/taxes/tax_groups.php:206
+#: c:\Apache2\htdocs\account2/taxes/tax_groups.php:202
 msgid "Rate (%)"
 msgstr ""
 
-# c:\Apache2\htdocs\account/taxes/tax_types.php:7
 #: c:\Apache2\htdocs\account2/taxes/tax_types.php:6
 msgid "Tax Types"
 msgstr ""
 
-# c:\Apache2\htdocs\account/taxes/tax_types.php:26
-#: c:\Apache2\htdocs\account2/taxes/tax_types.php:25
+#: c:\Apache2\htdocs\account2/taxes/tax_types.php:18
 msgid "The tax type name cannot be empty."
 msgstr ""
 
-#: c:\Apache2\htdocs\account2/taxes/tax_types.php:31
+#: c:\Apache2\htdocs\account2/taxes/tax_types.php:24
 msgid "The default tax rate must be numeric and not less than zero."
 msgstr ""
 
-# c:\Apache2\htdocs\account/taxes/tax_types.php:72
-#: c:\Apache2\htdocs\account2/taxes/tax_types.php:68
+#: c:\Apache2\htdocs\account2/taxes/tax_types.php:39
+msgid "New tax type has been added"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/taxes/tax_types.php:50
+msgid "Selected tax type has been updated"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/taxes/tax_types.php:63
 msgid "Cannot delete this tax type because tax groups been created referring to it."
 msgstr ""
 
-# c:\Apache2\htdocs\account/taxes/tax_types.php:99
-#: c:\Apache2\htdocs\account2/taxes/tax_types.php:96
-msgid "Sales GL Account"
+#: c:\Apache2\htdocs\account2/taxes/tax_types.php:80
+msgid "Selected tax type has been deleted"
 msgstr ""
 
-# c:\Apache2\htdocs\account/taxes/tax_types.php:99
-#: c:\Apache2\htdocs\account2/taxes/tax_types.php:96
-msgid "Purchasing GL Account"
+#: c:\Apache2\htdocs\account2/taxes/tax_types.php:98
+msgid "Sales GL Account"
 msgstr ""
 
-# c:\Apache2\htdocs\account/taxes/tax_types.php:127
-#: c:\Apache2\htdocs\account2/taxes/tax_types.php:120
-msgid "New Tax Type"
+#: c:\Apache2\htdocs\account2/taxes/tax_types.php:98
+msgid "Purchasing GL Account"
 msgstr ""
 
-# c:\Apache2\htdocs\account/taxes/tax_types.php:150
-#: c:\Apache2\htdocs\account2/taxes/tax_types.php:142
+#: c:\Apache2\htdocs\account2/taxes/tax_types.php:144
 msgid "Default Rate:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/taxes/tax_types.php:152
-#: c:\Apache2\htdocs\account2/taxes/tax_types.php:144
+#: c:\Apache2\htdocs\account2/taxes/tax_types.php:146
 msgid "Sales GL Account:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/taxes/tax_types.php:153
-#: c:\Apache2\htdocs\account2/taxes/tax_types.php:145
+#: c:\Apache2\htdocs\account2/taxes/tax_types.php:147
 msgid "Purchasing GL Account:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/themes/aqua/renderer.php:6
-# c:\Apache2\htdocs\account/themes/cool/renderer.php:7
-# c:\Apache2\htdocs\account/themes/default/renderer.php:7
-#: c:\Apache2\htdocs\account2/themes/aqua/renderer.php:6
+#: c:\Apache2\htdocs\account2/themes/aqua/renderer.php:7
 #: c:\Apache2\htdocs\account2/themes/cool/renderer.php:7
 #: c:\Apache2\htdocs\account2/themes/default/renderer.php:7
+#: c:\Apache2\htdocs\account2/themes/fancy/renderer.php:7
+#: c:\Apache2\htdocs\account2/themes/newwave/renderer.php:6
+#: c:\Apache2\htdocs\account2/themes/picme/renderer.php:7
 #: c:\Apache2\htdocs\account2/includes/page/header.inc:18
 msgid "Main Menu"
 msgstr ""
 
-# c:\Apache2\htdocs\account/dimensions/includes/dimensions_ui.inc:17
+#: c:\Apache2\htdocs\account2/themes/aqua/renderer.php:50
+#: c:\Apache2\htdocs\account2/themes/cool/renderer.php:50
+#: c:\Apache2\htdocs\account2/themes/default/renderer.php:50
+#: c:\Apache2\htdocs\account2/themes/fancy/renderer.php:29
+#: c:\Apache2\htdocs\account2/themes/picme/renderer.php:29
+msgid "Preferences"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/themes/aqua/renderer.php:55
+#: c:\Apache2\htdocs\account2/themes/cool/renderer.php:55
+#: c:\Apache2\htdocs\account2/themes/default/renderer.php:55
+#: c:\Apache2\htdocs\account2/themes/fancy/renderer.php:32
+#: c:\Apache2\htdocs\account2/themes/picme/renderer.php:32
+msgid "Help"
+msgstr ""
+
 #: c:\Apache2\htdocs\account2/dimensions/includes/dimensions_ui.inc:17
 msgid "There are no transactions for this dimension."
 msgstr ""
 
-# c:\Apache2\htdocs\account/dimensions/includes/dimensions_ui.inc:21
 #: c:\Apache2\htdocs\account2/dimensions/includes/dimensions_ui.inc:21
 msgid "Transactions for this Dimension"
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/includes/ui/gl_deposit_ui.inc:48
-# c:\Apache2\htdocs\account/gl/includes/ui/gl_payment_ui.inc:48
-#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_deposit_ui.inc:48
-#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_payment_ui.inc:48
+#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_bank_ui.inc:43
+msgid "Pay To:"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_bank_ui.inc:48
+msgid "To the Order of:"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_bank_ui.inc:52
 msgid "Work Order:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/includes/ui/gl_deposit_ui.inc:54
-# c:\Apache2\htdocs\account/gl/includes/ui/gl_payment_ui.inc:54
-# c:\Apache2\htdocs\account/sales/includes/ui/sales_credit_ui.inc:19
-# c:\Apache2\htdocs\account/sales/includes/ui/sales_order_ui.inc:186
-#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_deposit_ui.inc:54
-#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_payment_ui.inc:54
-#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_credit_ui.inc:19
-#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:178
+#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_bank_ui.inc:58
+#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_credit_ui.inc:20
+#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:175
 msgid "Customer:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/includes/ui/gl_deposit_ui.inc:228
-# c:\Apache2\htdocs\account/gl/includes/ui/gl_journal_ui.inc:175
-#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_deposit_ui.inc:228
+#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_bank_ui.inc:145
+#: c:\Apache2\htdocs\account2/inventory/includes/item_adjustments_ui.inc:90
+#: c:\Apache2\htdocs\account2/inventory/includes/stock_transfers_ui.inc:79
+#: c:\Apache2\htdocs\account2/manufacturing/includes/work_order_issue_ui.inc:50
+#: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:194
+#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_credit_ui.inc:183
+#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:127
+msgid "Edit document line"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_bank_ui.inc:147
+#: c:\Apache2\htdocs\account2/inventory/includes/item_adjustments_ui.inc:92
+#: c:\Apache2\htdocs\account2/inventory/includes/stock_transfers_ui.inc:81
+#: c:\Apache2\htdocs\account2/manufacturing/includes/work_order_issue_ui.inc:52
+#: c:\Apache2\htdocs\account2/purchasing/includes/ui/invoice_ui.inc:227
+#: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:196
+#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_credit_ui.inc:185
+#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:129
+msgid "Remove line from document"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_bank_ui.inc:238
+#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_journal_ui.inc:177
+#: c:\Apache2\htdocs\account2/inventory/includes/item_adjustments_ui.inc:156
+#: c:\Apache2\htdocs\account2/inventory/includes/stock_transfers_ui.inc:136
+#: c:\Apache2\htdocs\account2/manufacturing/includes/work_order_issue_ui.inc:118
+#: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:329
+#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_credit_ui.inc:272
+#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:377
+msgid "Confirm changes"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_bank_ui.inc:240
 #: c:\Apache2\htdocs\account2/gl/includes/ui/gl_journal_ui.inc:179
-msgid "Add item"
+#: c:\Apache2\htdocs\account2/inventory/includes/item_adjustments_ui.inc:158
+#: c:\Apache2\htdocs\account2/inventory/includes/stock_transfers_ui.inc:138
+#: c:\Apache2\htdocs\account2/manufacturing/includes/work_order_issue_ui.inc:120
+#: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:331
+#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_credit_ui.inc:274
+#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:379
+msgid "Cancel changes"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_bank_ui.inc:245
+#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_journal_ui.inc:183
+#: c:\Apache2\htdocs\account2/inventory/includes/item_adjustments_ui.inc:164
+#: c:\Apache2\htdocs\account2/inventory/includes/stock_transfers_ui.inc:144
+#: c:\Apache2\htdocs\account2/manufacturing/includes/work_order_issue_ui.inc:126
+#: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:336
+#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_credit_ui.inc:280
+#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:385
+msgid "Add Item"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_bank_ui.inc:246
+#: c:\Apache2\htdocs\account2/inventory/includes/item_adjustments_ui.inc:165
+#: c:\Apache2\htdocs\account2/inventory/includes/stock_transfers_ui.inc:145
+#: c:\Apache2\htdocs\account2/manufacturing/includes/work_order_issue_ui.inc:127
+#: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:337
+#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_credit_ui.inc:281
+#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:386
+msgid "Add new item to document"
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/includes/ui/gl_journal_ui.inc:27
 #: c:\Apache2\htdocs\account2/gl/includes/ui/gl_journal_ui.inc:27
 msgid "Reverse Transaction:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/includes/ui/gl_payment_ui.inc:40
-#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_payment_ui.inc:40
-msgid "Pay To:"
+#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_journal_ui.inc:88
+msgid "Edit journal line"
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/includes/ui/gl_payment_ui.inc:45
-#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_payment_ui.inc:45
-msgid "To the Order of:"
+#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_journal_ui.inc:90
+msgid "Remove line from journal"
 msgstr ""
 
-# c:\Apache2\htdocs\account/gl/includes/ui/gl_payment_ui.inc:226
-# c:\Apache2\htdocs\account/inventory/includes/item_adjustments_ui.inc:163
-# c:\Apache2\htdocs\account/inventory/includes/stock_transfers_ui.inc:147
-# c:\Apache2\htdocs\account/manufacturing/includes/work_order_issue_ui.inc:130
-# c:\Apache2\htdocs\account/purchasing/includes/ui/po_ui.inc:325
-# c:\Apache2\htdocs\account/sales/includes/ui/sales_credit_ui.inc:217
-# c:\Apache2\htdocs\account/sales/includes/ui/sales_order_ui.inc:332
-#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_payment_ui.inc:229
-#: c:\Apache2\htdocs\account2/inventory/includes/item_adjustments_ui.inc:165
-#: c:\Apache2\htdocs\account2/inventory/includes/stock_transfers_ui.inc:147
-#: c:\Apache2\htdocs\account2/manufacturing/includes/work_order_issue_ui.inc:130
-#: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:334
-#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_credit_ui.inc:237
-#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:372
-msgid "Add Item"
+#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_journal_ui.inc:184
+msgid "Add new line to journal"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/includes/current_user.inc:268
+msgid "Requesting data..."
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/includes/errors.inc:44
+msgid "in file"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/includes/errors.inc:44
+msgid "at line "
 msgstr ""
 
-# c:\Apache2\htdocs\account/includes/errors.inc:8
-#: c:\Apache2\htdocs\account2/includes/errors.inc:8
+#: c:\Apache2\htdocs\account2/includes/errors.inc:77
 msgid "DATABASE ERROR :"
 msgstr ""
 
-# c:\Apache2\htdocs\account/includes/errors.inc:33
-#: c:\Apache2\htdocs\account2/includes/errors.inc:33
+#: c:\Apache2\htdocs\account2/includes/errors.inc:104
 msgid "The entered information is a duplicate. Please go back and enter different values."
 msgstr ""
 
-# c:\Apache2\htdocs\account/includes/errors.inc:34
-# c:\Apache2\htdocs\account/includes/session.inc:39
-# c:\Apache2\htdocs\account/includes/session.inc:66
-# c:\Apache2\htdocs\account/includes/ui/ui_controls.inc:64
-#: c:\Apache2\htdocs\account2/includes/errors.inc:34
-#: c:\Apache2\htdocs\account2/includes/session.inc:58
-#: c:\Apache2\htdocs\account2/includes/session.inc:85
-#: c:\Apache2\htdocs\account2/includes/ui/ui_controls.inc:66
-#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:660
-msgid "Back"
+#: c:\Apache2\htdocs\account2/includes/main.inc:31
+msgid "This page is usable only with javascript enabled browsers."
 msgstr ""
 
-# c:\Apache2\htdocs\account/includes/session.inc:35
-#: c:\Apache2\htdocs\account2/includes/session.inc:54
+#: c:\Apache2\htdocs\account2/includes/session.inc:69
 msgid "Incorrect Password"
 msgstr ""
 
-# c:\Apache2\htdocs\account/includes/session.inc:36
-#: c:\Apache2\htdocs\account2/includes/session.inc:55
+#: c:\Apache2\htdocs\account2/includes/session.inc:70
 msgid "The user and password combination is not valid for the system."
 msgstr ""
 
-# c:\Apache2\htdocs\account/includes/session.inc:38
-#: c:\Apache2\htdocs\account2/includes/session.inc:57
+#: c:\Apache2\htdocs\account2/includes/session.inc:72
 msgid "If you are not an authorized user, please contact your system administrator to obtain an account to enable you to use the system."
 msgstr ""
 
-# c:\Apache2\htdocs\account/includes/session.inc:53
-#: c:\Apache2\htdocs\account2/includes/session.inc:72
+#: c:\Apache2\htdocs\account2/includes/session.inc:73
+#: c:\Apache2\htdocs\account2/includes/ui/ui_controls.inc:67
+#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:630
+msgid "Back"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/includes/session.inc:87
 msgid "Security settings have not been defined for your user account."
 msgstr ""
 
-# c:\Apache2\htdocs\account/includes/session.inc:54
-#: c:\Apache2\htdocs\account2/includes/session.inc:73
+#: c:\Apache2\htdocs\account2/includes/session.inc:88
 msgid "Please contact your system administrator."
 msgstr ""
 
-# c:\Apache2\htdocs\account/includes/session.inc:62
-#: c:\Apache2\htdocs\account2/includes/session.inc:81
+#: c:\Apache2\htdocs\account2/includes/session.inc:96
 msgid "Access denied"
 msgstr ""
 
-# c:\Apache2\htdocs\account/includes/session.inc:64
-#: c:\Apache2\htdocs\account2/includes/session.inc:83
+#: c:\Apache2\htdocs\account2/includes/session.inc:98
 msgid "The security settings on your account do not permit you to access this function"
 msgstr ""
 
-# c:\Apache2\htdocs\account/includes/types.inc:7
 #: c:\Apache2\htdocs\account2/includes/types.inc:7
 msgid "Bank Payment"
 msgstr ""
 
-# c:\Apache2\htdocs\account/includes/types.inc:8
 #: c:\Apache2\htdocs\account2/includes/types.inc:8
 msgid "Bank Deposit"
 msgstr ""
 
-# c:\Apache2\htdocs\account/includes/types.inc:9
 #: c:\Apache2\htdocs\account2/includes/types.inc:9
 msgid "Funds Transfer"
 msgstr ""
 
-# c:\Apache2\htdocs\account/includes/types.inc:10
-# c:\Apache2\htdocs\account/reporting/includes/form_types.inc:5
 #: c:\Apache2\htdocs\account2/includes/types.inc:10
 msgid "Sales Invoice"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/view/view_receipt.php:20
-# c:\Apache2\htdocs\account/includes/types.inc:12
 #: c:\Apache2\htdocs\account2/includes/types.inc:12
 msgid "Customer Payment"
 msgstr ""
@@ -11512,970 +8831,881 @@ msgstr ""
 msgid "Delivery Note"
 msgstr ""
 
-# c:\Apache2\htdocs\account/includes/types.inc:13
 #: c:\Apache2\htdocs\account2/includes/types.inc:14
 msgid "Location Transfer"
 msgstr ""
 
-# c:\Apache2\htdocs\account/includes/types.inc:14
 #: c:\Apache2\htdocs\account2/includes/types.inc:15
 msgid "Inventory Adjustment"
 msgstr ""
 
-# c:\Apache2\htdocs\account/includes/types.inc:16
 #: c:\Apache2\htdocs\account2/includes/types.inc:17
 msgid "Supplier Invoice"
 msgstr ""
 
-# c:\Apache2\htdocs\account/includes/types.inc:18
 #: c:\Apache2\htdocs\account2/includes/types.inc:19
 msgid "Supplier Payment"
 msgstr ""
 
-# c:\Apache2\htdocs\account/includes/types.inc:20
-# c:\Apache2\htdocs\account/includes/types.inc:138
-# c:\Apache2\htdocs\account/reporting/includes/form_types.inc:11
 #: c:\Apache2\htdocs\account2/includes/types.inc:21
 #: c:\Apache2\htdocs\account2/includes/types.inc:144
 msgid "Work Order"
 msgstr ""
 
-# c:\Apache2\htdocs\account/includes/types.inc:21
-# c:\Apache2\htdocs\account/reporting/includes/form_types.inc:12
 #: c:\Apache2\htdocs\account2/includes/types.inc:22
 msgid "Work Order Issue"
 msgstr ""
 
-# c:\Apache2\htdocs\account/includes/types.inc:22
-# c:\Apache2\htdocs\account/reporting/includes/form_types.inc:13
 #: c:\Apache2\htdocs\account2/includes/types.inc:23
 msgid "Work Order Production"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/view/view_sales_order.php:19
-# c:\Apache2\htdocs\account/includes/types.inc:23
-# c:\Apache2\htdocs\account/reporting/includes/form_types.inc:7
 #: c:\Apache2\htdocs\account2/includes/types.inc:24
 msgid "Sales Order"
 msgstr ""
 
-# c:\Apache2\htdocs\account/includes/types.inc:24
 #: c:\Apache2\htdocs\account2/includes/types.inc:25
 msgid "Cost Update"
 msgstr ""
 
-# c:\Apache2\htdocs\account/includes/types.inc:107
 #: c:\Apache2\htdocs\account2/includes/types.inc:113
 msgid "Savings Account"
 msgstr ""
 
-# c:\Apache2\htdocs\account/includes/types.inc:108
 #: c:\Apache2\htdocs\account2/includes/types.inc:114
 msgid "Chequing Account"
 msgstr ""
 
-# c:\Apache2\htdocs\account/includes/types.inc:109
 #: c:\Apache2\htdocs\account2/includes/types.inc:115
 msgid "Credit Account"
 msgstr ""
 
-# c:\Apache2\htdocs\account/includes/types.inc:110
 #: c:\Apache2\htdocs\account2/includes/types.inc:116
 msgid "Cash Account"
 msgstr ""
 
-# c:\Apache2\htdocs\account/includes/types.inc:251
 #: c:\Apache2\htdocs\account2/includes/types.inc:257
 msgid "Assemble"
 msgstr ""
 
-# c:\Apache2\htdocs\account/includes/types.inc:252
 #: c:\Apache2\htdocs\account2/includes/types.inc:258
 msgid "Unassemble"
 msgstr ""
 
-# c:\Apache2\htdocs\account/includes/types.inc:253
 #: c:\Apache2\htdocs\account2/includes/types.inc:259
 msgid "Advanced Manufacture"
 msgstr ""
 
-# c:\Apache2\htdocs\account/includes/ui/ui_controls.inc:51
-#: c:\Apache2\htdocs\account2/includes/ui/ui_controls.inc:53
+#: c:\Apache2\htdocs\account2/includes/ui/ui_controls.inc:54
 msgid "You should automatically be forwarded."
 msgstr ""
 
-# c:\Apache2\htdocs\account/includes/ui/ui_controls.inc:52
-#: c:\Apache2\htdocs\account2/includes/ui/ui_controls.inc:54
+#: c:\Apache2\htdocs\account2/includes/ui/ui_controls.inc:55
 msgid "If this does not happen"
 msgstr ""
 
-# c:\Apache2\htdocs\account/includes/ui/ui_controls.inc:52
-#: c:\Apache2\htdocs\account2/includes/ui/ui_controls.inc:54
+#: c:\Apache2\htdocs\account2/includes/ui/ui_controls.inc:55
 msgid "click here"
 msgstr ""
 
-# c:\Apache2\htdocs\account/includes/ui/ui_controls.inc:52
-#: c:\Apache2\htdocs\account2/includes/ui/ui_controls.inc:54
+#: c:\Apache2\htdocs\account2/includes/ui/ui_controls.inc:55
 msgid "to continue"
 msgstr ""
 
-# c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:28
-# c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:32
-#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:65
-#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:69
+#: c:\Apache2\htdocs\account2/includes/ui/ui_input.inc:147
+msgid "Add new"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/includes/ui/ui_input.inc:421
+#: c:\Apache2\htdocs\account2/reporting/includes/reports_classes.inc:166
+msgid "Click Here to Pick up the date"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:9
+msgid "Set filter"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:12
+msgid "Select"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:72
+msgid "Press Space tab for search pattern entry"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:76
+msgid "Enter code fragment to search or * for all"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:77
+msgid "Enter description fragment to search or * for all"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:329
+#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:1152
 msgid "All Suppliers"
 msgstr ""
 
-# c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:103
-# c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:107
-#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:172
-#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:176
+#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:333
+#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:374
+msgid "Press Space tab to filter by name fragment"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:334
+msgid "Select supplier"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:370
 msgid "All Customers"
 msgstr ""
 
-# c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:186
-#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:254
-msgid "All Branches"
+#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:375
+msgid "Select customer"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:411
+msgid "All branches"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:414
+msgid "Select customer branch"
 msgstr ""
 
-# c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:256
-#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:327
+#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:447
 msgid "All Locations"
 msgstr ""
 
-# c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:538
-# c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:542
-# c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:613
-# c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:617
-# c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:726
-# c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:757
-# c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:770
-# c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:799
-#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:655
-#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:659
-#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:730
-#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:734
-#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:848
-#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:879
-#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:937
-#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:941
-#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:998
+#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:527
+#: c:\Apache2\htdocs\account2/reporting/includes/pdf_report.inc:149
+#: c:\Apache2\htdocs\account2/reporting/includes/backup/pdf_report.inc:162
+#: c:\Apache2\htdocs\account2/reporting/includes/backup2/pdf_report.inc:162
+msgid "Active"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:604
+#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:651
 msgid "All Items"
 msgstr ""
 
-# c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:819
-#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:1019
+#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:788
 msgid "Purchased"
 msgstr ""
 
-# c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:820
-#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:1020
+#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:789
 msgid "Service"
 msgstr ""
 
-# c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:1160
-# c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:1164
-#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:1367
-#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:1371
-msgid "All Work Centres"
+#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:1069
+msgid "All Sales Types"
 msgstr ""
 
-# c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:1850
-# c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:1863
-#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:2086
-#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:2103
+#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:1319
+msgid "Use Item Sales Accounts"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:1629
+#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:1647
 msgid "All Types"
 msgstr ""
 
-# c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:1852
-# c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:1865
-#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:2088
-#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:2105
+#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:1631
+#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:1649
 msgid "Overdue Invoices"
 msgstr ""
 
-# c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:1864
-#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:2104
+#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:1648
 msgid "Invoices"
 msgstr ""
 
-# c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:1868
-#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:2108
+#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:1652
 msgid "Overdue Credit Notes"
 msgstr ""
 
-# c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:1883
-#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:2124
+#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:1665
 msgid "Automatically put balance on back order"
 msgstr ""
 
-# c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:1884
-#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:2125
+#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:1666
 msgid "Cancel any quantites not delivered"
 msgstr ""
 
-# c:\Apache2\htdocs\account/includes/ui/ui_msgs.inc:59
-#: c:\Apache2\htdocs\account2/includes/ui/ui_msgs.inc:59
+#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:1684
+msgid "Items Returned to Inventory Location"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:1685
+msgid "Items Written Off"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/includes/ui/ui_msgs.inc:54
 msgid "in units of : "
 msgstr ""
 
-# c:\Apache2\htdocs\account/includes/ui/ui_view.inc:301
-#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:313
+#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:278
+msgid "Get daily ECB exchange rate and save for later use in invoicing process"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:320
 msgid "Date Voided:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/includes/ui/ui_view.inc:392
-# c:\Apache2\htdocs\account/includes/ui/ui_view.inc:408
-# c:\Apache2\htdocs\account/includes/ui/ui_view.inc:426
-# c:\Apache2\htdocs\account/reporting/includes/doctext.inc:66
-#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:404
-#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:420
-#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:438
-#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:77
+#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:411
+#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:427
+#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:445
+#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:78
 msgid "Included"
 msgstr ""
 
-# c:\Apache2\htdocs\account/includes/ui/ui_view.inc:463
-#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:475
+#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:481
 msgid "Total Amount"
 msgstr ""
 
-# c:\Apache2\htdocs\account/includes/ui/ui_view.inc:485
-#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:497
+#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:503
 msgid "Total Allocated:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/includes/ui/ui_view.inc:489
-#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:501
+#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:507
 msgid "Left to Allocate:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/includes/ui/ui_view.inc:650
-#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:658
+#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:627
 msgid "January"
 msgstr ""
 
-# c:\Apache2\htdocs\account/includes/ui/ui_view.inc:650
-#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:658
+#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:627
 msgid "February"
 msgstr ""
 
-# c:\Apache2\htdocs\account/includes/ui/ui_view.inc:650
-#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:658
+#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:627
 msgid "March"
 msgstr ""
 
-# c:\Apache2\htdocs\account/includes/ui/ui_view.inc:650
-#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:658
+#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:627
 msgid "April"
 msgstr ""
 
-# c:\Apache2\htdocs\account/includes/ui/ui_view.inc:650
-#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:658
+#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:627
 msgid "May"
 msgstr ""
 
-# c:\Apache2\htdocs\account/includes/ui/ui_view.inc:650
-#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:658
+#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:627
 msgid "June"
 msgstr ""
 
-# c:\Apache2\htdocs\account/includes/ui/ui_view.inc:651
-#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:658
+#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:627
 msgid "July"
 msgstr ""
 
-# c:\Apache2\htdocs\account/includes/ui/ui_view.inc:651
-#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:658
+#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:627
 msgid "August"
 msgstr ""
 
-# c:\Apache2\htdocs\account/includes/ui/ui_view.inc:651
-#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:658
+#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:627
 msgid "September"
 msgstr ""
 
-# c:\Apache2\htdocs\account/includes/ui/ui_view.inc:651
-#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:658
+#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:627
 msgid "October"
 msgstr ""
 
-# c:\Apache2\htdocs\account/includes/ui/ui_view.inc:651
-#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:658
+#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:627
 msgid "November"
 msgstr ""
 
-# c:\Apache2\htdocs\account/includes/ui/ui_view.inc:651
-#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:658
+#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:627
 msgid "December"
 msgstr ""
 
-# c:\Apache2\htdocs\account/includes/ui/ui_view.inc:652
-#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:659
+#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:628
 msgid "Su"
 msgstr ""
 
-# c:\Apache2\htdocs\account/includes/ui/ui_view.inc:652
-#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:659
+#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:628
 msgid "Mo"
 msgstr ""
 
-# c:\Apache2\htdocs\account/includes/ui/ui_view.inc:652
-#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:659
+#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:628
 msgid "Tu"
 msgstr ""
 
-# c:\Apache2\htdocs\account/includes/ui/ui_view.inc:652
-#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:659
+#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:628
 msgid "We"
 msgstr ""
 
-# c:\Apache2\htdocs\account/includes/ui/ui_view.inc:652
-#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:659
+#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:628
 msgid "Th"
 msgstr ""
 
-# c:\Apache2\htdocs\account/includes/ui/ui_view.inc:652
-#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:659
+#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:628
 msgid "Fr"
 msgstr ""
 
-# c:\Apache2\htdocs\account/includes/ui/ui_view.inc:652
-#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:659
+#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:628
 msgid "Sa"
 msgstr ""
 
-# c:\Apache2\htdocs\account/inventory/includes/item_adjustments_ui.inc:17
-# c:\Apache2\htdocs\account/inventory/includes/stock_transfers_ui.inc:17
-# c:\Apache2\htdocs\account/manufacturing/includes/work_order_issue_ui.inc:17
-# c:\Apache2\htdocs\account/sales/includes/ui/sales_order_ui.inc:17
-#: c:\Apache2\htdocs\account2/inventory/includes/item_adjustments_ui.inc:17
-#: c:\Apache2\htdocs\account2/inventory/includes/stock_transfers_ui.inc:17
-#: c:\Apache2\htdocs\account2/manufacturing/includes/work_order_issue_ui.inc:17
-#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:15
+#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:629
+msgid "W"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/inventory/includes/item_adjustments_ui.inc:11
+#: c:\Apache2\htdocs\account2/inventory/includes/stock_transfers_ui.inc:11
+#: c:\Apache2\htdocs\account2/manufacturing/includes/work_order_issue_ui.inc:11
+#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:14
 msgid "For Part :"
 msgstr ""
 
-# c:\Apache2\htdocs\account/inventory/includes/item_adjustments_ui.inc:53
-#: c:\Apache2\htdocs\account2/inventory/includes/item_adjustments_ui.inc:53
+#: c:\Apache2\htdocs\account2/inventory/includes/item_adjustments_ui.inc:42
 msgid "Detail:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/inventory/includes/item_adjustments_ui.inc:58
-#: c:\Apache2\htdocs\account2/inventory/includes/item_adjustments_ui.inc:58
+#: c:\Apache2\htdocs\account2/inventory/includes/item_adjustments_ui.inc:47
 msgid "Positive Adjustment"
 msgstr ""
 
-# c:\Apache2\htdocs\account/inventory/includes/item_adjustments_ui.inc:58
-#: c:\Apache2\htdocs\account2/inventory/includes/item_adjustments_ui.inc:58
+#: c:\Apache2\htdocs\account2/inventory/includes/item_adjustments_ui.inc:47
 msgid "Negative Adjustment"
 msgstr ""
 
-# c:\Apache2\htdocs\account/inventory/includes/stock_transfers_ui.inc:38
-#: c:\Apache2\htdocs\account2/inventory/includes/stock_transfers_ui.inc:38
+#: c:\Apache2\htdocs\account2/inventory/includes/stock_transfers_ui.inc:27
 msgid "To Location:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/manufacturing/includes/manufacturing_ui.inc:15
 #: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:15
 msgid "The bill of material for this item is empty."
 msgstr ""
 
-# c:\Apache2\htdocs\account/manufacturing/includes/manufacturing_ui.inc:22
-# c:\Apache2\htdocs\account/manufacturing/includes/manufacturing_ui.inc:54
 #: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:22
 #: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:54
 msgid "Total Cost"
 msgstr ""
 
-# c:\Apache2\htdocs\account/manufacturing/includes/manufacturing_ui.inc:70
 #: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:70
 msgid "There are no Requirements for this Order."
 msgstr ""
 
-# c:\Apache2\htdocs\account/manufacturing/includes/manufacturing_ui.inc:77
 #: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:77
 msgid "Unit Quantity"
 msgstr ""
 
-# c:\Apache2\htdocs\account/manufacturing/includes/manufacturing_ui.inc:77
 #: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:77
 msgid "Total Quantity"
 msgstr ""
 
-# c:\Apache2\htdocs\account/manufacturing/includes/manufacturing_ui.inc:77
 #: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:77
 msgid "Units Issued"
 msgstr ""
 
-# c:\Apache2\htdocs\account/manufacturing/includes/manufacturing_ui.inc:77
 #: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:77
 msgid "On Hand"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/customer_invoice.php:469
-# c:\Apache2\htdocs\account/manufacturing/includes/manufacturing_ui.inc:130
-#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:130
+#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:131
 msgid "Marked items have insufficient quantities in stock."
 msgstr ""
 
-# c:\Apache2\htdocs\account/manufacturing/includes/manufacturing_ui.inc:144
-#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:144
+#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:145
 msgid "There are no Productions for this Order."
 msgstr ""
 
-# c:\Apache2\htdocs\account/manufacturing/includes/manufacturing_ui.inc:187
-#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:187
+#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:188
 msgid "There are no Issues for this Order."
 msgstr ""
 
-# c:\Apache2\htdocs\account/manufacturing/includes/manufacturing_ui.inc:223
-#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:223
+#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:224
 msgid "There are no Payments for this Order."
 msgstr ""
 
-# c:\Apache2\htdocs\account/manufacturing/includes/manufacturing_ui.inc:268
-# c:\Apache2\htdocs\account/manufacturing/includes/manufacturing_ui.inc:272
-# c:\Apache2\htdocs\account/manufacturing/includes/manufacturing_ui.inc:323
-#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:268
-#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:272
-#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:323
-msgid "Manufactured Item"
-msgstr ""
-
-# c:\Apache2\htdocs\account/manufacturing/includes/manufacturing_ui.inc:269
-# c:\Apache2\htdocs\account/manufacturing/includes/manufacturing_ui.inc:273
-# c:\Apache2\htdocs\account/manufacturing/includes/manufacturing_ui.inc:324
 #: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:269
 #: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:273
 #: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:324
+msgid "Manufactured Item"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:270
+#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:274
+#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:325
 msgid "Into Location"
 msgstr ""
 
-# c:\Apache2\htdocs\account/manufacturing/includes/manufacturing_ui.inc:303
-# c:\Apache2\htdocs\account/manufacturing/includes/manufacturing_ui.inc:348
-#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:303
-#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:348
+#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:304
+#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:349
 msgid "This work order is closed."
 msgstr ""
 
-# c:\Apache2\htdocs\account/manufacturing/includes/work_order_issue_ui.inc:150
-#: c:\Apache2\htdocs\account2/manufacturing/includes/work_order_issue_ui.inc:150
+#: c:\Apache2\htdocs\account2/manufacturing/includes/work_order_issue_ui.inc:146
 msgid "Return Items to Location"
 msgstr ""
 
-# c:\Apache2\htdocs\account/manufacturing/includes/work_order_issue_ui.inc:150
-#: c:\Apache2\htdocs\account2/manufacturing/includes/work_order_issue_ui.inc:150
+#: c:\Apache2\htdocs\account2/manufacturing/includes/work_order_issue_ui.inc:146
 msgid "Issue Items to Work order"
 msgstr ""
 
-# c:\Apache2\htdocs\account/manufacturing/includes/work_order_issue_ui.inc:153
-#: c:\Apache2\htdocs\account2/manufacturing/includes/work_order_issue_ui.inc:153
+#: c:\Apache2\htdocs\account2/manufacturing/includes/work_order_issue_ui.inc:149
 msgid "To Work Centre:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/manufacturing/includes/work_order_issue_ui.inc:155
-#: c:\Apache2\htdocs\account2/manufacturing/includes/work_order_issue_ui.inc:155
+#: c:\Apache2\htdocs\account2/manufacturing/includes/work_order_issue_ui.inc:151
 msgid "Issue Date:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/includes/ui/grn_ui.inc:16
+#: c:\Apache2\htdocs\account2/purchasing/includes/db/invoice_db.inc:202
+#: c:\Apache2\htdocs\account2/purchasing/includes/db/invoice_db.inc:206
+msgid "Cost diff."
+msgstr ""
+
 #: c:\Apache2\htdocs\account2/purchasing/includes/ui/grn_ui.inc:16
 msgid "For Purchase Order"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/includes/ui/grn_ui.inc:32
-# c:\Apache2\htdocs\account/purchasing/includes/ui/grn_ui.inc:44
-# c:\Apache2\htdocs\account/purchasing/includes/ui/po_ui.inc:243
-# c:\Apache2\htdocs\account/purchasing/includes/ui/po_ui.inc:248
 #: c:\Apache2\htdocs\account2/purchasing/includes/ui/grn_ui.inc:32
 #: c:\Apache2\htdocs\account2/purchasing/includes/ui/grn_ui.inc:44
-#: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:245
-#: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:250
+#: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:247
+#: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:252
 msgid "Deliver Into Location"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/includes/ui/grn_ui.inc:38
 #: c:\Apache2\htdocs\account2/purchasing/includes/ui/grn_ui.inc:38
 msgid "Date Items Received"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/includes/ui/grn_ui.inc:54
-# c:\Apache2\htdocs\account/purchasing/includes/ui/po_ui.inc:261
 #: c:\Apache2\htdocs\account2/purchasing/includes/ui/grn_ui.inc:54
-#: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:263
+#: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:265
 msgid "Order Comments"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/includes/ui/invoice_ui.inc:79
 #: c:\Apache2\htdocs\account2/purchasing/includes/ui/invoice_ui.inc:77
 msgid "Supplier's Ref.:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/includes/ui/invoice_ui.inc:91
 #: c:\Apache2\htdocs\account2/purchasing/includes/ui/invoice_ui.inc:89
 msgid "Terms:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/includes/ui/invoice_ui.inc:130
 #: c:\Apache2\htdocs\account2/purchasing/includes/ui/invoice_ui.inc:124
 msgid "Sub-total:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/includes/ui/invoice_ui.inc:138
 #: c:\Apache2\htdocs\account2/purchasing/includes/ui/invoice_ui.inc:132
 msgid "Invoice Total:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/includes/ui/invoice_ui.inc:140
 #: c:\Apache2\htdocs\account2/purchasing/includes/ui/invoice_ui.inc:134
 msgid "Credit Note Total:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/includes/ui/invoice_ui.inc:179
 #: c:\Apache2\htdocs\account2/purchasing/includes/ui/invoice_ui.inc:173
 msgid "GL Items for this Invoice"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/includes/ui/invoice_ui.inc:181
 #: c:\Apache2\htdocs\account2/purchasing/includes/ui/invoice_ui.inc:175
 msgid "GL Items for this Credit Note"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/includes/ui/invoice_ui.inc:287
-#: c:\Apache2\htdocs\account2/purchasing/includes/ui/invoice_ui.inc:281
+#: c:\Apache2\htdocs\account2/purchasing/includes/ui/invoice_ui.inc:182
+msgid "Moves to additional costs posting page"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/purchasing/includes/ui/invoice_ui.inc:284
 msgid "Received Items Charged on this Invoice"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/includes/ui/invoice_ui.inc:289
-#: c:\Apache2\htdocs\account2/purchasing/includes/ui/invoice_ui.inc:283
+#: c:\Apache2\htdocs\account2/purchasing/includes/ui/invoice_ui.inc:286
 msgid "Received Items Credited on this Note"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/includes/ui/invoice_ui.inc:302
-#: c:\Apache2\htdocs\account2/purchasing/includes/ui/invoice_ui.inc:296
+#: c:\Apache2\htdocs\account2/purchasing/includes/ui/invoice_ui.inc:292
+msgid "Moves to GRN selection page"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/purchasing/includes/ui/invoice_ui.inc:300
 msgid "Delivery Sequence #"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/includes/ui/po_ui.inc:80
-#: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:80
+#: c:\Apache2\htdocs\account2/purchasing/includes/ui/invoice_ui.inc:324
+msgid "Remove item from document"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:78
 msgid "Supplier Currency:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/includes/ui/po_ui.inc:111
-#: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:111
+#: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:109
 msgid "Supplier's Reference:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/includes/ui/po_ui.inc:119
-#: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:119
+#: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:117
 msgid "Receive Into:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/includes/ui/po_ui.inc:123
-#: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:123
-msgid "Get Address"
-msgstr ""
-
-# c:\Apache2\htdocs\account/purchasing/includes/ui/po_ui.inc:146
-#: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:146
+#: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:143
 msgid "The default stock location set up for this user is not a currently defined stock location. Your system administrator needs to amend your user record."
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/includes/ui/po_ui.inc:150
-#: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:150
+#: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:147
 msgid "Deliver to:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/includes/ui/po_ui.inc:163
-#: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:163
+#: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:160
 msgid "Order Items"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/includes/ui/po_ui.inc:168
-#: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:168
-#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:396
+#: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:166
+#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:410
 msgid "Required Delivery Date"
 msgstr ""
 
-# c:\Apache2\htdocs\account/purchasing/includes/ui/po_ui.inc:209
-#: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:211
+#: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:212
 msgid "Total Excluding Shipping/Tax"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/includes/doctext.inc:4
 #: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:4
 msgid "Cust no"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/includes/doctext.inc:13
 #: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:13
 msgid "Your Ref"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/includes/doctext.inc:14
 #: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:14
 msgid "Our Ref."
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/includes/doctext.inc:15
 #: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:15
 msgid "Your VAT no."
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/includes/doctext.inc:16
 #: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:16
 msgid "Our VAT No."
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/includes/doctext.inc:19
-#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:19
+#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:18
+msgid "Customers Reference:"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:20
 msgid "Domicile"
 msgstr ""
 
-#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:22
+#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:23
 msgid "All amounts stated in"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/includes/doctext.inc:20
-#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:25
+#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:26
 msgid "Please quote Invoice no. when paying. All amounts stated in"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/includes/doctext.inc:22
-#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:28
+#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:29
 msgid "Phone/Fax/Email"
 msgstr ""
 
-#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:31
-#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:63
+#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:32
+#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:64
 msgid "You can pay through"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/includes/doctext.inc:45
-#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:54
+#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:55
 msgid "DueDate"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/includes/doctext.inc:51
-#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:60
+#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:61
 msgid "Dear Sirs"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/includes/doctext.inc:52
-#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:61
+#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:62
 msgid "Attached you will find "
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/includes/doctext.inc:53
-#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:62
+#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:63
 msgid "Kindest regards"
 msgstr ""
 
-#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:67
+#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:68
 msgid "Delivery Note No."
 msgstr ""
 
-#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:67
+#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:68
 msgid "Invoice No."
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/includes/doctext.inc:58
-#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:69
+#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:70
 msgid "Order no."
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/includes/doctext.inc:69
-#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:80
+#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:81
 msgid "TOTAL ORDER EX VAT"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/includes/doctext.inc:70
-#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:81
+#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:82
 msgid "TOTAL PO EX VAT"
 msgstr ""
 
-#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:82
+#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:83
 msgid "TOTAL DELIVERY INCL. VAT"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/includes/doctext.inc:74
-#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:86
+#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:87
 msgid "Outstanding Transactions"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/includes/doctext.inc:77
-#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:89
+#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:90
 msgid "Statement"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/includes/doctext.inc:78
-#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:90
+#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:91
 msgid "as of"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/includes/pdf_report.inc:166
-#: c:\Apache2\htdocs\account2/reporting/includes/pdf_report.inc:166
-msgid "Active"
+#: c:\Apache2\htdocs\account2/reporting/includes/header2.inc:37
+#: c:\Apache2\htdocs\account2/reporting/includes/pdf_report.inc:227
+#: c:\Apache2\htdocs\account2/reporting/includes/backup/header2a.inc:40
+#: c:\Apache2\htdocs\account2/reporting/includes/backup/pdf_report.inc:240
+#: c:\Apache2\htdocs\account2/reporting/includes/backup2/header2.inc:37
+#: c:\Apache2\htdocs\account2/reporting/includes/backup2/pdf_report.inc:240
+msgid "Page"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/includes/pdf_report.inc:210
-#: c:\Apache2\htdocs\account2/reporting/includes/pdf_report.inc:210
+#: c:\Apache2\htdocs\account2/reporting/includes/pdf_report.inc:193
+#: c:\Apache2\htdocs\account2/reporting/includes/backup/pdf_report.inc:206
+#: c:\Apache2\htdocs\account2/reporting/includes/backup2/pdf_report.inc:206
 msgid "Print Out Date"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/includes/pdf_report.inc:217
-#: c:\Apache2\htdocs\account2/reporting/includes/pdf_report.inc:217
+#: c:\Apache2\htdocs\account2/reporting/includes/pdf_report.inc:200
+#: c:\Apache2\htdocs\account2/reporting/includes/backup/pdf_report.inc:213
+#: c:\Apache2\htdocs\account2/reporting/includes/backup2/pdf_report.inc:213
 msgid "Fiscal Year"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/includes/pdf_report.inc:244
-# c:\Apache2\htdocs\account/reporting/includes/pdf_report.inc:316
-#: c:\Apache2\htdocs\account2/reporting/includes/pdf_report.inc:244
-#: c:\Apache2\htdocs\account2/reporting/includes/pdf_report.inc:316
-msgid "Page"
-msgstr ""
-
-# c:\Apache2\htdocs\account/reporting/includes/pdf_report.inc:656
-#: c:\Apache2\htdocs\account2/reporting/includes/pdf_report.inc:702
+#: c:\Apache2\htdocs\account2/reporting/includes/pdf_report.inc:441
+#: c:\Apache2\htdocs\account2/reporting/includes/backup/pdf_report.inc:458
+#: c:\Apache2\htdocs\account2/reporting/includes/backup2/pdf_report.inc:460
 msgid "sent to"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/includes/pdf_report.inc:658
-#: c:\Apache2\htdocs\account2/reporting/includes/pdf_report.inc:704
+#: c:\Apache2\htdocs\account2/reporting/includes/pdf_report.inc:443
+#: c:\Apache2\htdocs\account2/reporting/includes/backup/pdf_report.inc:460
+#: c:\Apache2\htdocs\account2/reporting/includes/backup2/pdf_report.inc:462
 msgid "NOT sent to"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/includes/reports_classes.inc:30
 #: c:\Apache2\htdocs\account2/reporting/includes/reports_classes.inc:30
 msgid "Report Classes:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/includes/reports_classes.inc:35
 #: c:\Apache2\htdocs\account2/reporting/includes/reports_classes.inc:35
 msgid "Reports For Class: "
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/includes/reports_classes.inc:112
-#: c:\Apache2\htdocs\account2/reporting/includes/reports_classes.inc:112
+#: c:\Apache2\htdocs\account2/reporting/includes/reports_classes.inc:113
+msgid "Invalid date format"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/reporting/includes/reports_classes.inc:118
 msgid "Display: "
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/includes/reports_classes.inc:123
-#: c:\Apache2\htdocs\account2/reporting/includes/reports_classes.inc:123
+#: c:\Apache2\htdocs\account2/reporting/includes/reports_classes.inc:129
 msgid "No Currency Filter"
 msgstr ""
 
-#: c:\Apache2\htdocs\account2/reporting/includes/reports_classes.inc:168
+#: c:\Apache2\htdocs\account2/reporting/includes/reports_classes.inc:174
 msgid "No Payment Link"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/includes/reports_classes.inc:167
-#: c:\Apache2\htdocs\account2/reporting/includes/reports_classes.inc:176
+#: c:\Apache2\htdocs\account2/reporting/includes/reports_classes.inc:182
 msgid "No Graphics"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/includes/reports_classes.inc:167
-#: c:\Apache2\htdocs\account2/reporting/includes/reports_classes.inc:176
+#: c:\Apache2\htdocs\account2/reporting/includes/reports_classes.inc:182
 msgid "Vertical bars"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/includes/reports_classes.inc:167
-#: c:\Apache2\htdocs\account2/reporting/includes/reports_classes.inc:176
+#: c:\Apache2\htdocs\account2/reporting/includes/reports_classes.inc:182
 msgid "Horizontal bars"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/includes/reports_classes.inc:167
-#: c:\Apache2\htdocs\account2/reporting/includes/reports_classes.inc:176
+#: c:\Apache2\htdocs\account2/reporting/includes/reports_classes.inc:182
 msgid "Dots"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/includes/reports_classes.inc:167
-#: c:\Apache2\htdocs\account2/reporting/includes/reports_classes.inc:176
+#: c:\Apache2\htdocs\account2/reporting/includes/reports_classes.inc:182
 msgid "Lines"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/includes/reports_classes.inc:167
-#: c:\Apache2\htdocs\account2/reporting/includes/reports_classes.inc:176
+#: c:\Apache2\htdocs\account2/reporting/includes/reports_classes.inc:182
 msgid "Pie"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/includes/reports_classes.inc:167
-#: c:\Apache2\htdocs\account2/reporting/includes/reports_classes.inc:176
+#: c:\Apache2\htdocs\account2/reporting/includes/reports_classes.inc:182
 msgid "Donut"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/includes/reports_classes.inc:167
-#: c:\Apache2\htdocs\account2/reporting/includes/reports_classes.inc:180
+#: c:\Apache2\htdocs\account2/reporting/includes/reports_classes.inc:186
 msgid "No Type Filter"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/includes/reports_classes.inc:177
-#: c:\Apache2\htdocs\account2/reporting/includes/reports_classes.inc:190
+#: c:\Apache2\htdocs\account2/reporting/includes/reports_classes.inc:196
 msgid "No Account Group Filter"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/includes/reports_classes.inc:194
-# c:\Apache2\htdocs\account/reporting/includes/reports_classes.inc:202
-# c:\Apache2\htdocs\account/reporting/includes/reports_classes.inc:210
-#: c:\Apache2\htdocs\account2/reporting/includes/reports_classes.inc:207
-#: c:\Apache2\htdocs\account2/reporting/includes/reports_classes.inc:215
-#: c:\Apache2\htdocs\account2/reporting/includes/reports_classes.inc:223
+#: c:\Apache2\htdocs\account2/reporting/includes/reports_classes.inc:213
+#: c:\Apache2\htdocs\account2/reporting/includes/reports_classes.inc:221
+#: c:\Apache2\htdocs\account2/reporting/includes/reports_classes.inc:229
 msgid "No Dimension Filter"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/includes/reports_classes.inc:216
-#: c:\Apache2\htdocs\account2/reporting/includes/reports_classes.inc:229
+#: c:\Apache2\htdocs\account2/reporting/includes/reports_classes.inc:235
 msgid "No Customer Filter"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/includes/reports_classes.inc:233
-#: c:\Apache2\htdocs\account2/reporting/includes/reports_classes.inc:237
+#: c:\Apache2\htdocs\account2/reporting/includes/reports_classes.inc:243
 msgid "No Supplier Filter"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/includes/reports_classes.inc:225
-#: c:\Apache2\htdocs\account2/reporting/includes/reports_classes.inc:242
+#: c:\Apache2\htdocs\account2/reporting/includes/reports_classes.inc:248
 msgid "IV"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/includes/reports_classes.inc:226
-#: c:\Apache2\htdocs\account2/reporting/includes/reports_classes.inc:243
+#: c:\Apache2\htdocs\account2/reporting/includes/reports_classes.inc:249
 msgid "CN"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/includes/reports_classes.inc:250
-#: c:\Apache2\htdocs\account2/reporting/includes/reports_classes.inc:277
+#: c:\Apache2\htdocs\account2/reporting/includes/reports_classes.inc:283
 msgid "No Location Filter"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/includes/reports_classes.inc:254
-#: c:\Apache2\htdocs\account2/reporting/includes/reports_classes.inc:281
+#: c:\Apache2\htdocs\account2/reporting/includes/reports_classes.inc:287
 msgid "No Category Filter"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/includes/reports_classes.inc:262
-#: c:\Apache2\htdocs\account2/reporting/includes/reports_classes.inc:289
+#: c:\Apache2\htdocs\account2/reporting/includes/reports_classes.inc:295
 msgid "No Area Filter"
 msgstr ""
 
-# c:\Apache2\htdocs\account/reporting/includes/reports_classes.inc:266
-#: c:\Apache2\htdocs\account2/reporting/includes/reports_classes.inc:293
+#: c:\Apache2\htdocs\account2/reporting/includes/reports_classes.inc:299
 msgid "No Sales Folk Filter"
 msgstr ""
 
-#: c:\Apache2\htdocs\account2/sales/includes/db/sales_order_db.inc:125
-#: c:\Apache2\htdocs\account2/sales/includes/db/sales_order_db.inc:265
+#: c:\Apache2\htdocs\account2/sales/includes/db/sales_order_db.inc:131
+#: c:\Apache2\htdocs\account2/sales/includes/db/sales_order_db.inc:270
 msgid "Stocks below Re-Order Level at "
 msgstr ""
 
-#: c:\Apache2\htdocs\account2/sales/includes/db/sales_order_db.inc:128
-#: c:\Apache2\htdocs\account2/sales/includes/db/sales_order_db.inc:270
+#: c:\Apache2\htdocs\account2/sales/includes/db/sales_order_db.inc:134
+#: c:\Apache2\htdocs\account2/sales/includes/db/sales_order_db.inc:275
 msgid "Below"
 msgstr ""
 
-#: c:\Apache2\htdocs\account2/sales/includes/db/sales_order_db.inc:129
-#: c:\Apache2\htdocs\account2/sales/includes/db/sales_order_db.inc:271
+#: c:\Apache2\htdocs\account2/sales/includes/db/sales_order_db.inc:135
+#: c:\Apache2\htdocs\account2/sales/includes/db/sales_order_db.inc:276
 msgid "Please reorder"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/includes/ui/sales_credit_ui.inc:57
-# c:\Apache2\htdocs\account/sales/includes/ui/sales_order_ui.inc:227
-#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_credit_ui.inc:61
-#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:244
+#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_credit_ui.inc:89
+#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:246
 msgid "Customer Currency:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/includes/ui/sales_credit_ui.inc:70
-# c:\Apache2\htdocs\account/sales/includes/ui/sales_order_ui.inc:236
-#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_credit_ui.inc:74
-#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:274
+#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_credit_ui.inc:120
+#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:278
 msgid "Customer Discount:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/includes/ui/sales_order_ui.inc:378
-#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_credit_ui.inc:89
-#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:428
+#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_credit_ui.inc:132
+#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:445
 msgid "Shipping Company:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/includes/ui/sales_credit_ui.inc:240
-#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_credit_ui.inc:260
-msgid "Items Returned to Location"
-msgstr ""
-
-# c:\Apache2\htdocs\account/sales/includes/ui/sales_credit_ui.inc:246
-#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_credit_ui.inc:266
-msgid "Write off the cost of the items to"
-msgstr ""
-
-#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:15
+#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:14
 msgid "This item is already on this order. You have been warned."
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/includes/ui/sales_order_ui.inc:51
-#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:34
+#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:33
 msgid "The selected customer account is currently on hold. Please contact the credit control personnel to discuss."
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/includes/ui/sales_order_ui.inc:82
-#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:56
+#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:49
 msgid "The selected customer and branch are not valid, or the customer does not have any branches."
 msgstr ""
 
-#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:146
+#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:145
 msgid "Total Excluding Shipping"
 msgstr ""
 
-#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:272
+#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:191
+msgid "No customer found for entered text."
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:235
+msgid "Reference number unique for this document type"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:259
 msgid "Price List:"
 msgstr ""
 
-#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:385
+#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:291
+msgid "Date of order receive"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:399
 msgid "Delivery Details"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/includes/ui/sales_order_ui.inc:346
-#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:390
+#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:404
 msgid "Invoice Delivery Details"
 msgstr ""
 
-#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:391
+#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:405
 msgid "Invoice before"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/includes/ui/sales_order_ui.inc:350
-#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:395
+#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:409
 msgid "Order Delivery Details"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/includes/ui/sales_order_ui.inc:358
-#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:407
+#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:419
 msgid "Deliver from Location:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/includes/ui/sales_order_ui.inc:362
-#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:411
+#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:422
+msgid "Enter requested day of delivery"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:424
 msgid "Deliver To:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/includes/ui/sales_order_ui.inc:365
-#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:414
+#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:425
+msgid "Additional identifier for delivery e.g. name of receiving person"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:428
+msgid "Delivery address. Default is address of customer branch"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:429
 msgid "Contact Phone Number:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/includes/ui/sales_order_ui.inc:373
-#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:422
+#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:430
+msgid "Phone number of ordering person. Defaults to branch phone number"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:438
 msgid "Customer Reference:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/includes/ui/sales_order_ui.inc:374
-#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:423
+#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:439
+msgid "Customer reference number for this order (if any)"
+msgstr ""
+
+#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:440
 msgid "Comments:"
 msgstr ""
 
-# c:\Apache2\htdocs\account/sales/includes/ui/sales_order_ui.inc:376
-#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:425
+#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:442
 msgid "Shipping Charge:"
 msgstr ""