Added deferred income account and prepayment terms in init sql files.
[fa-stable.git] / lang / new_language_template / LC_MESSAGES / empty.po
index 1a7aef5a0be42e65d796c4f6d508418535f2d897..5b57c1f8f12949aead2636fe653eed8fbcfe2fa7 100644 (file)
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-14 23:29+0200\n"
+"POT-Creation-Date: 2017-11-09 22:44+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: frontaccounting.php:75 frontaccounting.php:76
+#: frontaccounting.php:72 frontaccounting.php:73
 msgid "Main  Menu"
 msgstr ""
 
 msgid "Main  Menu"
 msgstr ""
 
-#: frontaccounting.php:77 access/logout.php:21 themes/default/renderer.php:73
+#: frontaccounting.php:74 access/logout.php:21 themes/default/renderer.php:73
 #: themes/default/renderer.php:87
 msgid "Logout"
 msgstr ""
 #: themes/default/renderer.php:87
 msgid "Logout"
 msgstr ""
@@ -71,8 +71,8 @@ msgid "Password:"
 msgstr ""
 
 #: access/login.php:106 access/login.php:112 access/password_reset.php:69
 msgstr ""
 
 #: access/login.php:106 access/login.php:112 access/password_reset.php:69
-#: access/password_reset.php:75 admin/create_coy.php:240
-#: admin/create_coy.php:316 admin/inst_upgrade.php:63
+#: access/password_reset.php:75 admin/create_coy.php:247
+#: admin/create_coy.php:327 admin/inst_upgrade.php:63
 #: includes/sysnames.inc:208
 msgid "Company"
 msgstr ""
 #: includes/sysnames.inc:208
 msgid "Company"
 msgstr ""
@@ -152,7 +152,7 @@ msgstr ""
 msgid "Type:"
 msgstr ""
 
 msgid "Type:"
 msgstr ""
 
-#: admin/attachments.php:186 admin/create_coy.php:261
+#: admin/attachments.php:186 admin/create_coy.php:269
 #: admin/crm_categories.php:106 admin/fiscalyears.php:164
 #: admin/inst_lang.php:100 admin/payment_terms.php:142 admin/printers.php:96
 #: admin/shipping_companies.php:106 admin/tags.php:140 admin/users.php:153
 #: admin/crm_categories.php:106 admin/fiscalyears.php:164
 #: admin/inst_lang.php:100 admin/payment_terms.php:142 admin/printers.php:96
 #: admin/shipping_companies.php:106 admin/tags.php:140 admin/users.php:153
@@ -181,7 +181,7 @@ msgstr ""
 #: sales/manage/sales_points.php:99 sales/manage/sales_types.php:121
 #: sales/includes/ui/sales_credit_ui.inc:192
 #: sales/includes/ui/sales_order_ui.inc:196 taxes/item_tax_types.php:139
 #: sales/manage/sales_points.php:99 sales/manage/sales_types.php:121
 #: sales/includes/ui/sales_credit_ui.inc:192
 #: sales/includes/ui/sales_order_ui.inc:196 taxes/item_tax_types.php:139
-#: taxes/tax_groups.php:137 taxes/tax_types.php:132
+#: taxes/tax_groups.php:140 taxes/tax_types.php:132
 msgid "Edit"
 msgstr ""
 
 msgid "Edit"
 msgstr ""
 
@@ -193,7 +193,7 @@ msgstr ""
 msgid "Download"
 msgstr ""
 
 msgid "Download"
 msgstr ""
 
-#: admin/attachments.php:201 admin/create_coy.php:264
+#: admin/attachments.php:201 admin/create_coy.php:272
 #: admin/crm_categories.php:110 admin/fiscalyears.php:166
 #: admin/inst_chart.php:83 admin/inst_lang.php:109 admin/inst_module.php:142
 #: admin/inst_theme.php:87 admin/payment_terms.php:143 admin/printers.php:97
 #: admin/crm_categories.php:110 admin/fiscalyears.php:166
 #: admin/inst_chart.php:83 admin/inst_lang.php:109 admin/inst_module.php:142
 #: admin/inst_theme.php:87 admin/payment_terms.php:143 admin/printers.php:97
@@ -222,7 +222,7 @@ msgstr ""
 #: sales/manage/sales_points.php:100 sales/manage/sales_types.php:122
 #: sales/includes/ui/sales_credit_ui.inc:194
 #: sales/includes/ui/sales_order_ui.inc:198 taxes/item_tax_types.php:140
 #: sales/manage/sales_points.php:100 sales/manage/sales_types.php:122
 #: sales/includes/ui/sales_credit_ui.inc:194
 #: sales/includes/ui/sales_order_ui.inc:198 taxes/item_tax_types.php:140
-#: taxes/tax_groups.php:138 taxes/tax_types.php:133
+#: taxes/tax_groups.php:141 taxes/tax_types.php:133
 msgid "Delete"
 msgstr ""
 
 msgid "Delete"
 msgstr ""
 
@@ -244,18 +244,18 @@ msgstr ""
 #: purchasing/inquiry/po_search_completed.php:110
 #: purchasing/inquiry/po_search.php:117
 #: purchasing/inquiry/supplier_allocation_inquiry.php:137
 #: purchasing/inquiry/po_search_completed.php:110
 #: purchasing/inquiry/po_search.php:117
 #: purchasing/inquiry/supplier_allocation_inquiry.php:137
-#: purchasing/inquiry/supplier_inquiry.php:178
+#: purchasing/inquiry/supplier_inquiry.php:174
 #: purchasing/allocations/supplier_allocation_main.php:95
 #: reporting/rep101.php:132 reporting/rep201.php:107 reporting/rep203.php:88
 #: reporting/rep306.php:141 reporting/rep601.php:79 reporting/rep602.php:80
 #: reporting/rep704.php:82 reporting/rep704.php:85 reporting/rep704.php:88
 #: reporting/rep710.php:78 reporting/includes/doctext.inc:166
 #: reporting/includes/doctext.inc:207 reporting/includes/doctext.inc:245
 #: purchasing/allocations/supplier_allocation_main.php:95
 #: reporting/rep101.php:132 reporting/rep201.php:107 reporting/rep203.php:88
 #: reporting/rep306.php:141 reporting/rep601.php:79 reporting/rep602.php:80
 #: reporting/rep704.php:82 reporting/rep704.php:85 reporting/rep704.php:88
 #: reporting/rep710.php:78 reporting/includes/doctext.inc:166
 #: reporting/includes/doctext.inc:207 reporting/includes/doctext.inc:245
-#: sales/allocations/customer_allocation_main.php:88
+#: sales/allocations/customer_allocation_main.php:93
 #: sales/view/view_sales_order.php:109 sales/view/view_sales_order.php:142
 #: sales/view/view_sales_order.php:179
 #: sales/inquiry/customer_allocation_inquiry.php:147
 #: sales/view/view_sales_order.php:109 sales/view/view_sales_order.php:142
 #: sales/view/view_sales_order.php:179
 #: sales/inquiry/customer_allocation_inquiry.php:147
-#: sales/inquiry/customer_inquiry.php:203
+#: sales/inquiry/customer_inquiry.php:194
 msgid "#"
 msgstr ""
 
 msgid "#"
 msgstr ""
 
@@ -280,12 +280,12 @@ msgstr ""
 #: sales/create_recurrent_invoices.php:203 sales/manage/credit_status.php:97
 #: sales/manage/recurrent_invoices.php:128
 #: sales/inquiry/sales_orders_view.php:284
 #: sales/create_recurrent_invoices.php:203 sales/manage/credit_status.php:97
 #: sales/manage/recurrent_invoices.php:128
 #: sales/inquiry/sales_orders_view.php:284
-#: sales/inquiry/sales_orders_view.php:288 taxes/tax_groups.php:123
+#: sales/inquiry/sales_orders_view.php:288 taxes/tax_groups.php:126
 #: taxes/tax_types.php:115
 msgid "Description"
 msgstr ""
 
 #: taxes/tax_types.php:115
 msgid "Description"
 msgstr ""
 
-#: admin/attachments.php:210 admin/backups.php:67 admin/backups.php:152
+#: admin/attachments.php:210 admin/backups.php:67 admin/backups.php:153
 msgid "Filename"
 msgstr ""
 
 msgid "Filename"
 msgstr ""
 
@@ -310,7 +310,7 @@ msgid "Attached File"
 msgstr ""
 
 #: admin/backups.php:21 admin/backups.php:40 admin/backups.php:118
 msgstr ""
 
 #: admin/backups.php:21 admin/backups.php:40 admin/backups.php:118
-#: admin/backups.php:145 admin/backups.php:158 admin/backups.php:178
+#: admin/backups.php:146 admin/backups.php:159 admin/backups.php:179
 msgid "Select backup file first."
 msgstr ""
 
 msgid "Select backup file first."
 msgstr ""
 
@@ -338,112 +338,112 @@ msgstr ""
 msgid "Database backup failed."
 msgstr ""
 
 msgid "Database backup failed."
 msgstr ""
 
-#: admin/backups.php:102 admin/create_coy.php:260 admin/fiscalyears.php:155
+#: admin/backups.php:102 admin/create_coy.php:268 admin/fiscalyears.php:155
 #: admin/inst_lang.php:85 admin/inst_lang.php:97
 #: dimensions/inquiry/search_dimensions.php:106
 #: gl/manage/bank_accounts.php:130 gl/manage/currencies.php:162
 #: gl/manage/gl_account_classes.php:126 gl/manage/gl_quick_entries.php:237
 #: includes/system_tests.inc:38 includes/system_tests.inc:113
 #: includes/system_tests.inc:126 includes/ui/class.reflines_crud.inc:56
 #: admin/inst_lang.php:85 admin/inst_lang.php:97
 #: dimensions/inquiry/search_dimensions.php:106
 #: gl/manage/bank_accounts.php:130 gl/manage/currencies.php:162
 #: gl/manage/gl_account_classes.php:126 gl/manage/gl_quick_entries.php:237
 #: includes/system_tests.inc:38 includes/system_tests.inc:113
 #: includes/system_tests.inc:126 includes/ui/class.reflines_crud.inc:56
-#: includes/ui/ui_lists.inc:1852 purchasing/manage/suppliers.php:122
-#: reporting/rep101.php:128 reporting/rep102.php:110 reporting/rep102.php:112
-#: reporting/rep104.php:103 reporting/rep106.php:81 reporting/rep114.php:74
-#: reporting/rep201.php:103 reporting/rep202.php:116 reporting/rep202.php:118
-#: reporting/rep203.php:84 reporting/rep303.php:112 reporting/rep303.php:116
-#: reporting/rep304.php:123 reporting/rep402.php:99 reporting/rep402.php:134
-#: reporting/rep501.php:113 sales/manage/sales_points.php:94
-#: sales/manage/sales_points.php:95 sales/manage/sales_types.php:119
-#: taxes/item_tax_types.php:129
+#: includes/ui/ui_lists.inc:1870 includes/ui/ui_lists.inc.orig:1867
+#: purchasing/manage/suppliers.php:122 reporting/rep101.php:128
+#: reporting/rep102.php:110 reporting/rep102.php:112 reporting/rep104.php:103
+#: reporting/rep106.php:81 reporting/rep114.php:74 reporting/rep201.php:103
+#: reporting/rep202.php:116 reporting/rep202.php:118 reporting/rep203.php:84
+#: reporting/rep303.php:112 reporting/rep303.php:116 reporting/rep304.php:123
+#: reporting/rep402.php:99 reporting/rep402.php:134 reporting/rep501.php:113
+#: sales/manage/sales_points.php:94 sales/manage/sales_points.php:95
+#: sales/manage/sales_types.php:119 taxes/item_tax_types.php:129
 msgid "No"
 msgstr ""
 
 msgid "No"
 msgstr ""
 
-#: admin/backups.php:142
+#: admin/backups.php:143
 msgid "Restore backup completed."
 msgstr ""
 
 msgid "Restore backup completed."
 msgstr ""
 
-#: admin/backups.php:151
+#: admin/backups.php:152
 msgid "File successfully deleted."
 msgstr ""
 
 msgid "File successfully deleted."
 msgstr ""
 
-#: admin/backups.php:156
+#: admin/backups.php:157
 msgid "Can't delete backup file."
 msgstr ""
 
 msgid "Can't delete backup file."
 msgstr ""
 
-#: admin/backups.php:168
+#: admin/backups.php:169
 msgid "You can only upload *.sql backup files"
 msgstr ""
 
 msgid "You can only upload *.sql backup files"
 msgstr ""
 
-#: admin/backups.php:170
+#: admin/backups.php:171
 msgid "Filename contains forbidden chars. Please rename file and try again."
 msgstr ""
 
 msgid "Filename contains forbidden chars. Please rename file and try again."
 msgstr ""
 
-#: admin/backups.php:173
+#: admin/backups.php:174
 msgid "File uploaded to backup directory"
 msgstr ""
 
 msgid "File uploaded to backup directory"
 msgstr ""
 
-#: admin/backups.php:176
+#: admin/backups.php:177
 msgid "File was not uploaded into the system."
 msgstr ""
 
 msgid "File was not uploaded into the system."
 msgstr ""
 
-#: admin/backups.php:185
+#: admin/backups.php:186
 msgid "Create backup"
 msgstr ""
 
 msgid "Create backup"
 msgstr ""
 
-#: admin/backups.php:186 sales/includes/ui/sales_order_ui.inc:581
+#: admin/backups.php:187 sales/includes/ui/sales_order_ui.inc:581
 #: sales/includes/ui/sales_order_ui.inc:637
 msgid "Comments:"
 msgstr ""
 
 #: sales/includes/ui/sales_order_ui.inc:637
 msgid "Comments:"
 msgstr ""
 
-#: admin/backups.php:187
+#: admin/backups.php:188
 msgid "Compression:"
 msgstr ""
 
 msgid "Compression:"
 msgstr ""
 
-#: admin/backups.php:189
+#: admin/backups.php:190
 msgid "Create Backup"
 msgstr ""
 
 msgid "Create Backup"
 msgstr ""
 
-#: admin/backups.php:191
+#: admin/backups.php:192
 msgid "Backup scripts maintenance"
 msgstr ""
 
 msgid "Backup scripts maintenance"
 msgstr ""
 
-#: admin/backups.php:197
+#: admin/backups.php:198
 msgid "View Backup"
 msgstr ""
 
 msgid "View Backup"
 msgstr ""
 
-#: admin/backups.php:198
+#: admin/backups.php:199
 msgid "Download Backup"
 msgstr ""
 
 msgid "Download Backup"
 msgstr ""
 
-#: admin/backups.php:199
+#: admin/backups.php:200
 msgid "Restore Backup"
 msgstr ""
 
 msgid "Restore Backup"
 msgstr ""
 
-#: admin/backups.php:200
+#: admin/backups.php:201
 msgid ""
 "You are about to restore database from backup file.\n"
 "Do you want to continue?"
 msgstr ""
 
 msgid ""
 "You are about to restore database from backup file.\n"
 "Do you want to continue?"
 msgstr ""
 
-#: admin/backups.php:202
+#: admin/backups.php:203
 msgid "Delete Backup"
 msgstr ""
 
 msgid "Delete Backup"
 msgstr ""
 
-#: admin/backups.php:204
+#: admin/backups.php:205
 #, php-format
 msgid ""
 "You are about to remove selected backup file.\n"
 "Do you want to continue ?"
 msgstr ""
 
 #, php-format
 msgid ""
 "You are about to remove selected backup file.\n"
 "Do you want to continue ?"
 msgstr ""
 
-#: admin/backups.php:210
+#: admin/backups.php:211
 msgid "Update security settings"
 msgstr ""
 
 msgid "Update security settings"
 msgstr ""
 
-#: admin/backups.php:211
+#: admin/backups.php:212
 msgid "Protect security settings"
 msgstr ""
 
 msgid "Protect security settings"
 msgstr ""
 
-#: admin/backups.php:215
+#: admin/backups.php:216
 msgid "Upload file"
 msgstr ""
 
 msgid "Upload file"
 msgstr ""
 
@@ -541,175 +541,183 @@ msgstr ""
 msgid "Company setup has been updated."
 msgstr ""
 
 msgid "Company setup has been updated."
 msgstr ""
 
-#: admin/company_preferences.php:169
+#: admin/company_preferences.php:181
 msgid "General settings"
 msgstr ""
 
 msgid "General settings"
 msgstr ""
 
-#: admin/company_preferences.php:171
+#: admin/company_preferences.php:183
 msgid "Name (to appear on reports):"
 msgstr ""
 
 msgid "Name (to appear on reports):"
 msgstr ""
 
-#: admin/company_preferences.php:172 admin/shipping_companies.php:142
+#: admin/company_preferences.php:184 admin/shipping_companies.php:142
 #: includes/ui/contacts_view.inc:106 inventory/manage/locations.php:212
 #: sales/manage/customers.php:234 sales/includes/ui/sales_order_ui.inc:628
 msgid "Address:"
 msgstr ""
 
 #: includes/ui/contacts_view.inc:106 inventory/manage/locations.php:212
 #: sales/manage/customers.php:234 sales/includes/ui/sales_order_ui.inc:628
 msgid "Address:"
 msgstr ""
 
-#: admin/company_preferences.php:173
+#: admin/company_preferences.php:185
 msgid "Domicile:"
 msgstr ""
 
 msgid "Domicile:"
 msgstr ""
 
-#: admin/company_preferences.php:175 admin/shipping_companies.php:138
+#: admin/company_preferences.php:187 admin/shipping_companies.php:138
 #: purchasing/manage/suppliers.php:135 sales/manage/customer_branches.php:253
 msgid "Phone Number:"
 msgstr ""
 
 #: purchasing/manage/suppliers.php:135 sales/manage/customer_branches.php:253
 msgid "Phone Number:"
 msgstr ""
 
-#: admin/company_preferences.php:176 includes/ui/contacts_view.inc:101
+#: admin/company_preferences.php:188 includes/ui/contacts_view.inc:101
 #: purchasing/manage/suppliers.php:138 sales/manage/customer_branches.php:255
 #: sales/manage/customers.php:258
 msgid "Fax Number:"
 msgstr ""
 
 #: purchasing/manage/suppliers.php:138 sales/manage/customer_branches.php:255
 #: sales/manage/customers.php:258
 msgid "Fax Number:"
 msgstr ""
 
-#: admin/company_preferences.php:177 admin/users.php:211
+#: admin/company_preferences.php:189 admin/users.php:211
 msgid "Email Address:"
 msgstr ""
 
 msgid "Email Address:"
 msgstr ""
 
-#: admin/company_preferences.php:179
+#: admin/company_preferences.php:191
 msgid "BCC Address for all outgoing mails:"
 msgstr ""
 
 msgid "BCC Address for all outgoing mails:"
 msgstr ""
 
-#: admin/company_preferences.php:181
+#: admin/company_preferences.php:193
 msgid "Official Company Number:"
 msgstr ""
 
 msgid "Official Company Number:"
 msgstr ""
 
-#: admin/company_preferences.php:182 purchasing/manage/suppliers.php:95
+#: admin/company_preferences.php:194 purchasing/manage/suppliers.php:95
 #: sales/manage/customers.php:236
 msgid "GSTNo:"
 msgstr ""
 
 #: sales/manage/customers.php:236
 msgid "GSTNo:"
 msgstr ""
 
-#: admin/company_preferences.php:183
+#: admin/company_preferences.php:195
 msgid "Home Currency:"
 msgstr ""
 
 msgid "Home Currency:"
 msgstr ""
 
-#: admin/company_preferences.php:185
+#: admin/company_preferences.php:197
 msgid "Company Logo:"
 msgstr ""
 
 msgid "Company Logo:"
 msgstr ""
 
-#: admin/company_preferences.php:186
+#: admin/company_preferences.php:198
 msgid "New Company Logo (.jpg)"
 msgstr ""
 
 msgid "New Company Logo (.jpg)"
 msgstr ""
 
-#: admin/company_preferences.php:187
+#: admin/company_preferences.php:199
 msgid "Delete Company Logo:"
 msgstr ""
 
 msgid "Delete Company Logo:"
 msgstr ""
 
-#: admin/company_preferences.php:189
+#: admin/company_preferences.php:201
 msgid "Automatic Revaluation Currency Accounts"
 msgstr ""
 
 msgid "Automatic Revaluation Currency Accounts"
 msgstr ""
 
-#: admin/company_preferences.php:190
+#: admin/company_preferences.php:202
 msgid "Time Zone on Reports"
 msgstr ""
 
 msgid "Time Zone on Reports"
 msgstr ""
 
-#: admin/company_preferences.php:191
+#: admin/company_preferences.php:203
+msgid "Company Logo on Reports"
+msgstr ""
+
+#: admin/company_preferences.php:204
 msgid "Database Scheme Version"
 msgstr ""
 
 msgid "Database Scheme Version"
 msgstr ""
 
-#: admin/company_preferences.php:195
+#: admin/company_preferences.php:208
 msgid "General Ledger Settings"
 msgstr ""
 
 msgid "General Ledger Settings"
 msgstr ""
 
-#: admin/company_preferences.php:196 gl/gl_budget.php:62
+#: admin/company_preferences.php:209 gl/gl_budget.php:62
 msgid "Fiscal Year:"
 msgstr ""
 
 msgid "Fiscal Year:"
 msgstr ""
 
-#: admin/company_preferences.php:197
+#: admin/company_preferences.php:210
 msgid "Tax Periods:"
 msgstr ""
 
 msgid "Tax Periods:"
 msgstr ""
 
-#: admin/company_preferences.php:197
+#: admin/company_preferences.php:210
 msgid "Months."
 msgstr ""
 
 msgid "Months."
 msgstr ""
 
-#: admin/company_preferences.php:198
+#: admin/company_preferences.php:211
 msgid "Tax Last Period:"
 msgstr ""
 
 msgid "Tax Last Period:"
 msgstr ""
 
-#: admin/company_preferences.php:198
+#: admin/company_preferences.php:211
 msgid "Months back."
 msgstr ""
 
 msgid "Months back."
 msgstr ""
 
-#: admin/company_preferences.php:199
+#: admin/company_preferences.php:212
 msgid "Put alternative Tax Include on Docs"
 msgstr ""
 
 msgid "Put alternative Tax Include on Docs"
 msgstr ""
 
-#: admin/company_preferences.php:200
+#: admin/company_preferences.php:213
 msgid "Suppress Tax Rates on Docs"
 msgstr ""
 
 msgid "Suppress Tax Rates on Docs"
 msgstr ""
 
-#: admin/company_preferences.php:202
+#: admin/company_preferences.php:215
 msgid "Sales Pricing"
 msgstr ""
 
 msgid "Sales Pricing"
 msgstr ""
 
-#: admin/company_preferences.php:203
+#: admin/company_preferences.php:216
 msgid "Base for auto price calculations:"
 msgstr ""
 
 msgid "Base for auto price calculations:"
 msgstr ""
 
-#: admin/company_preferences.php:204
+#: admin/company_preferences.php:217
 msgid "No base price list"
 msgstr ""
 
 msgid "No base price list"
 msgstr ""
 
-#: admin/company_preferences.php:206
+#: admin/company_preferences.php:219
 msgid "Add Price from Std Cost:"
 msgstr ""
 
 msgid "Add Price from Std Cost:"
 msgstr ""
 
-#: admin/company_preferences.php:208
+#: admin/company_preferences.php:221
 msgid "Round calculated prices to nearest:"
 msgstr ""
 
 msgid "Round calculated prices to nearest:"
 msgstr ""
 
-#: admin/company_preferences.php:212
+#: admin/company_preferences.php:225
 msgid "Optional Modules"
 msgstr ""
 
 msgid "Optional Modules"
 msgstr ""
 
-#: admin/company_preferences.php:213 includes/dashboard.inc:118
+#: admin/company_preferences.php:226 includes/dashboard.inc:118
 #: reporting/reports_main.php:285
 msgid "Manufacturing"
 msgstr ""
 
 #: reporting/reports_main.php:285
 msgid "Manufacturing"
 msgstr ""
 
-#: admin/company_preferences.php:214 includes/dashboard.inc:116
+#: admin/company_preferences.php:227 includes/dashboard.inc:116
 #: inventory/manage/items.php:24 reporting/reports_main.php:308
 msgid "Fixed Assets"
 msgstr ""
 
 #: inventory/manage/items.php:24 reporting/reports_main.php:308
 msgid "Fixed Assets"
 msgstr ""
 
-#: admin/company_preferences.php:215
+#: admin/company_preferences.php:228
 msgid "Use Dimensions:"
 msgstr ""
 
 msgid "Use Dimensions:"
 msgstr ""
 
-#: admin/company_preferences.php:217
+#: admin/company_preferences.php:230
 msgid "User Interface Options"
 msgstr ""
 
 msgid "User Interface Options"
 msgstr ""
 
-#: admin/company_preferences.php:219
+#: admin/company_preferences.php:232
+msgid "Short Name and Name in List"
+msgstr ""
+
+#: admin/company_preferences.php:233
 msgid "Search Item List"
 msgstr ""
 
 msgid "Search Item List"
 msgstr ""
 
-#: admin/company_preferences.php:220
+#: admin/company_preferences.php:234
 msgid "Search Customer List"
 msgstr ""
 
 msgid "Search Customer List"
 msgstr ""
 
-#: admin/company_preferences.php:221
+#: admin/company_preferences.php:235
 msgid "Search Supplier List"
 msgstr ""
 
 msgid "Search Supplier List"
 msgstr ""
 
-#: admin/company_preferences.php:222
+#: admin/company_preferences.php:236
 msgid "Login Timeout:"
 msgstr ""
 
 msgid "Login Timeout:"
 msgstr ""
 
-#: admin/company_preferences.php:222
+#: admin/company_preferences.php:236
 msgid "seconds"
 msgstr ""
 
 msgid "seconds"
 msgstr ""
 
-#: admin/company_preferences.php:227 admin/display_prefs.php:160
+#: admin/company_preferences.php:241 admin/display_prefs.php:160
 #: admin/gl_setup.php:274 admin/inst_chart.php:77 admin/inst_lang.php:103
 #: admin/inst_module.php:136 admin/inst_module.php:154
 #: admin/inst_module.php:197 admin/inst_theme.php:81
 #: admin/gl_setup.php:274 admin/inst_chart.php:77 admin/inst_lang.php:103
 #: admin/inst_module.php:136 admin/inst_module.php:154
 #: admin/inst_module.php:197 admin/inst_theme.php:81
@@ -718,7 +726,7 @@ msgstr ""
 #: gl/includes/ui/gl_journal_ui.inc:267 includes/ui/class.crud_view.inc:289
 #: includes/ui/db_pager_view.inc:180 includes/ui/simple_crud_class.inc:56
 #: includes/ui/simple_crud_class.inc:225 includes/ui/ui_input.inc:226
 #: gl/includes/ui/gl_journal_ui.inc:267 includes/ui/class.crud_view.inc:289
 #: includes/ui/db_pager_view.inc:180 includes/ui/simple_crud_class.inc:56
 #: includes/ui/simple_crud_class.inc:225 includes/ui/ui_input.inc:226
-#: includes/ui/ui_input.inc:961 inventory/adjustments.php:255
+#: includes/ui/ui_input.inc:959 inventory/adjustments.php:255
 #: inventory/cost_update.php:150 inventory/reorder_level.php:111
 #: inventory/transfers.php:237 inventory/includes/item_adjustments_ui.inc:190
 #: inventory/includes/stock_transfers_ui.inc:150
 #: inventory/cost_update.php:150 inventory/reorder_level.php:111
 #: inventory/transfers.php:237 inventory/includes/item_adjustments_ui.inc:190
 #: inventory/includes/stock_transfers_ui.inc:150
@@ -742,105 +750,113 @@ msgstr ""
 msgid "Database settings are not specified."
 msgstr ""
 
 msgid "Database settings are not specified."
 msgstr ""
 
-#: admin/create_coy.php:53
+#: admin/create_coy.php:48
+msgid "Database port has to be numeric or empty."
+msgstr ""
+
+#: admin/create_coy.php:59
 msgid "This database settings are already used by another company."
 msgstr ""
 
 msgid "This database settings are already used by another company."
 msgstr ""
 
-#: admin/create_coy.php:58
+#: admin/create_coy.php:64
 msgid ""
 "You cannot have table set without prefix together with prefixed sets in the "
 "same database."
 msgstr ""
 
 msgid ""
 "You cannot have table set without prefix together with prefixed sets in the "
 "same database."
 msgstr ""
 
-#: admin/create_coy.php:117
+#: admin/create_coy.php:124
 msgid "Error creating Database: "
 msgstr ""
 
 msgid "Error creating Database: "
 msgstr ""
 
-#: admin/create_coy.php:117
+#: admin/create_coy.php:124
 msgid ", Please create it manually"
 msgstr ""
 
 msgid ", Please create it manually"
 msgstr ""
 
-#: admin/create_coy.php:123
+#: admin/create_coy.php:130
 msgid "Cannot create new company due to bugs in sql file."
 msgstr ""
 
 msgid "Cannot create new company due to bugs in sql file."
 msgstr ""
 
-#: admin/create_coy.php:141 admin/create_coy.php:209
+#: admin/create_coy.php:148 admin/create_coy.php:216
 msgid "Cannot open the configuration file - "
 msgstr ""
 
 msgid "Cannot open the configuration file - "
 msgstr ""
 
-#: admin/create_coy.php:143 admin/create_coy.php:211
+#: admin/create_coy.php:150 admin/create_coy.php:218
 msgid "Cannot write to the configuration file - "
 msgstr ""
 
 msgid "Cannot write to the configuration file - "
 msgstr ""
 
-#: admin/create_coy.php:145 admin/create_coy.php:181 admin/create_coy.php:213
+#: admin/create_coy.php:152 admin/create_coy.php:188 admin/create_coy.php:220
 msgid "The configuration file "
 msgstr ""
 
 msgid "The configuration file "
 msgstr ""
 
-#: admin/create_coy.php:145 admin/create_coy.php:181 admin/create_coy.php:213
-#: admin/db/maintenance_db.inc:251
+#: admin/create_coy.php:152 admin/create_coy.php:188 admin/create_coy.php:220
+#: admin/db/maintenance_db.inc:253
 msgid ""
 " is not writable. Change its permissions so it is, then re-run the operation."
 msgstr ""
 
 msgid ""
 " is not writable. Change its permissions so it is, then re-run the operation."
 msgstr ""
 
-#: admin/create_coy.php:157
+#: admin/create_coy.php:164
 msgid "New company has been created."
 msgstr ""
 
 msgid "New company has been created."
 msgstr ""
 
-#: admin/create_coy.php:157
+#: admin/create_coy.php:164
 msgid "Company has been updated."
 msgstr ""
 
 msgid "Company has been updated."
 msgstr ""
 
-#: admin/create_coy.php:174
+#: admin/create_coy.php:181
 msgid ""
 "Broken company subdirectories system. You have to remove this company "
 "manually."
 msgstr ""
 
 msgid ""
 "Broken company subdirectories system. You have to remove this company "
 "manually."
 msgstr ""
 
-#: admin/create_coy.php:190
+#: admin/create_coy.php:197
 msgid "Cannot rename subdirectory to temporary name."
 msgstr ""
 
 msgid "Cannot rename subdirectory to temporary name."
 msgstr ""
 
-#: admin/create_coy.php:196
+#: admin/create_coy.php:203
 msgid "Cannot rename company subdirectory"
 msgstr ""
 
 msgid "Cannot rename company subdirectory"
 msgstr ""
 
-#: admin/create_coy.php:202
+#: admin/create_coy.php:209
 msgid "Error removing Database: "
 msgstr ""
 
 msgid "Error removing Database: "
 msgstr ""
 
-#: admin/create_coy.php:202
+#: admin/create_coy.php:209
 msgid ", please remove it manually"
 msgstr ""
 
 msgid ", please remove it manually"
 msgstr ""
 
-#: admin/create_coy.php:222
+#: admin/create_coy.php:229
 msgid "Cannot remove temporary renamed company data directory "
 msgstr ""
 
 msgid "Cannot remove temporary renamed company data directory "
 msgstr ""
 
-#: admin/create_coy.php:225
+#: admin/create_coy.php:232
 msgid "Selected company has been deleted"
 msgstr ""
 
 msgid "Selected company has been deleted"
 msgstr ""
 
-#: admin/create_coy.php:240
+#: admin/create_coy.php:247
 msgid "Database Host"
 msgstr ""
 
 msgid "Database Host"
 msgstr ""
 
-#: admin/create_coy.php:240 admin/create_coy.php:321 admin/create_coy.php:331
+#: admin/create_coy.php:247
+msgid "Database Port"
+msgstr ""
+
+#: admin/create_coy.php:247 admin/create_coy.php:333 admin/create_coy.php:344
 msgid "Database User"
 msgstr ""
 
 msgid "Database User"
 msgstr ""
 
-#: admin/create_coy.php:241 admin/create_coy.php:323 admin/create_coy.php:332
+#: admin/create_coy.php:248 admin/create_coy.php:335 admin/create_coy.php:345
 msgid "Database Name"
 msgstr ""
 
 msgid "Database Name"
 msgstr ""
 
-#: admin/create_coy.php:241 admin/create_coy.php:325 admin/create_coy.php:333
+#: admin/create_coy.php:248 admin/create_coy.php:337 admin/create_coy.php:347
 msgid "Table Pref"
 msgstr ""
 
 msgid "Table Pref"
 msgstr ""
 
-#: admin/create_coy.php:241
+#: admin/create_coy.php:248
 msgid "Charset"
 msgstr ""
 
 msgid "Charset"
 msgstr ""
 
-#: admin/create_coy.php:241 admin/inst_lang.php:36
+#: admin/create_coy.php:248 admin/inst_lang.php:36
 #: admin/print_profiles.php:161 includes/ui/class.reflines_crud.inc:38
 #: purchasing/includes/ui/invoice_ui.inc:140
 #: purchasing/includes/ui/invoice_ui.inc:143
 #: admin/print_profiles.php:161 includes/ui/class.reflines_crud.inc:38
 #: purchasing/includes/ui/invoice_ui.inc:140
 #: purchasing/includes/ui/invoice_ui.inc:143
@@ -848,71 +864,79 @@ msgstr ""
 msgid "Default"
 msgstr ""
 
 msgid "Default"
 msgstr ""
 
-#: admin/create_coy.php:260 admin/create_coy.php:337 admin/fiscalyears.php:159
+#: admin/create_coy.php:268 admin/create_coy.php:351 admin/fiscalyears.php:159
 #: admin/inst_lang.php:85 admin/inst_lang.php:97
 #: dimensions/inquiry/search_dimensions.php:106
 #: gl/manage/bank_accounts.php:128 gl/manage/currencies.php:162
 #: gl/manage/gl_account_classes.php:126 gl/manage/gl_quick_entries.php:237
 #: includes/system_tests.inc:38 includes/system_tests.inc:113
 #: includes/system_tests.inc:126 includes/ui/class.reflines_crud.inc:56
 #: admin/inst_lang.php:85 admin/inst_lang.php:97
 #: dimensions/inquiry/search_dimensions.php:106
 #: gl/manage/bank_accounts.php:128 gl/manage/currencies.php:162
 #: gl/manage/gl_account_classes.php:126 gl/manage/gl_quick_entries.php:237
 #: includes/system_tests.inc:38 includes/system_tests.inc:113
 #: includes/system_tests.inc:126 includes/ui/class.reflines_crud.inc:56
-#: includes/ui/class.reflines_crud.inc:101 includes/ui/ui_lists.inc:1853
-#: purchasing/manage/suppliers.php:122 reporting/rep101.php:127
-#: reporting/rep102.php:109 reporting/rep102.php:111 reporting/rep104.php:105
-#: reporting/rep106.php:83 reporting/rep114.php:76 reporting/rep201.php:102
-#: reporting/rep202.php:115 reporting/rep202.php:117 reporting/rep203.php:83
-#: reporting/rep303.php:107 reporting/rep303.php:115 reporting/rep304.php:122
-#: reporting/rep402.php:99 reporting/rep501.php:111
+#: includes/ui/class.reflines_crud.inc:101 includes/ui/ui_lists.inc:1871
+#: includes/ui/ui_lists.inc.orig:1868 purchasing/manage/suppliers.php:122
+#: reporting/rep101.php:127 reporting/rep102.php:109 reporting/rep102.php:111
+#: reporting/rep104.php:105 reporting/rep106.php:83 reporting/rep114.php:76
+#: reporting/rep201.php:102 reporting/rep202.php:115 reporting/rep202.php:117
+#: reporting/rep203.php:83 reporting/rep303.php:107 reporting/rep303.php:115
+#: reporting/rep304.php:122 reporting/rep402.php:99 reporting/rep501.php:111
 #: sales/manage/sales_points.php:94 sales/manage/sales_points.php:95
 #: sales/manage/sales_types.php:119 taxes/item_tax_types.php:133
 msgid "Yes"
 msgstr ""
 
 #: sales/manage/sales_points.php:94 sales/manage/sales_points.php:95
 #: sales/manage/sales_types.php:119 taxes/item_tax_types.php:133
 msgid "Yes"
 msgstr ""
 
-#: admin/create_coy.php:266
+#: admin/create_coy.php:274
 #, php-format
 msgid ""
 "You are about to remove company \\'%s\\'.\n"
 "Do you want to continue ?"
 msgstr ""
 
 #, php-format
 msgid ""
 "You are about to remove company \\'%s\\'.\n"
 "Do you want to continue ?"
 msgstr ""
 
-#: admin/create_coy.php:274
+#: admin/create_coy.php:282
 msgid "The marked company is the current company which cannot be deleted."
 msgstr ""
 
 msgid "The marked company is the current company which cannot be deleted."
 msgstr ""
 
-#: admin/create_coy.php:275
+#: admin/create_coy.php:283
 msgid ""
 "If no Admin Password is entered, the new Admin Password will be "
 "'<b>password</b>' by default "
 msgstr ""
 
 msgid ""
 "If no Admin Password is entered, the new Admin Password will be "
 "'<b>password</b>' by default "
 msgstr ""
 
-#: admin/create_coy.php:320 admin/create_coy.php:330 admin/printers.php:84
+#: admin/create_coy.php:284
+msgid "Set Only Port value if you cannot use the default port 3306."
+msgstr ""
+
+#: admin/create_coy.php:331 admin/create_coy.php:342 admin/printers.php:84
 msgid "Host"
 msgstr ""
 
 msgid "Host"
 msgstr ""
 
-#: admin/create_coy.php:322
+#: admin/create_coy.php:332 admin/create_coy.php:343 admin/printers.php:135
+msgid "Port"
+msgstr ""
+
+#: admin/create_coy.php:334
 msgid "Database Password"
 msgstr ""
 
 msgid "Database Password"
 msgstr ""
 
-#: admin/create_coy.php:324
+#: admin/create_coy.php:336 admin/create_coy.php:346
 msgid "Database Collation:"
 msgstr ""
 
 msgid "Database Collation:"
 msgstr ""
 
-#: admin/create_coy.php:325 admin/inst_chart.php:71 admin/inst_chart.php:73
+#: admin/create_coy.php:337 admin/inst_chart.php:71 admin/inst_chart.php:73
 #: admin/inst_lang.php:87 admin/inst_lang.php:90 admin/inst_module.php:125
 #: admin/inst_theme.php:76 admin/inst_theme.php:78
 #: gl/manage/gl_account_types.php:189 includes/db/audit_trail_db.inc:127
 #: admin/inst_lang.php:87 admin/inst_lang.php:90 admin/inst_module.php:125
 #: admin/inst_theme.php:76 admin/inst_theme.php:78
 #: gl/manage/gl_account_types.php:189 includes/db/audit_trail_db.inc:127
-#: includes/ui/allocation_cart.inc:316 inventory/manage/items.php:446
+#: includes/ui/allocation_cart.inc:316 inventory/manage/items.php:447
 msgid "None"
 msgstr ""
 
 msgid "None"
 msgstr ""
 
-#: admin/create_coy.php:326 admin/create_coy.php:335 admin/create_coy.php:337
+#: admin/create_coy.php:338 admin/create_coy.php:349 admin/create_coy.php:351
 msgid "Default Company"
 msgstr ""
 
 msgid "Default Company"
 msgstr ""
 
-#: admin/create_coy.php:327
+#: admin/create_coy.php:339
 msgid "Database Script"
 msgstr ""
 
 msgid "Database Script"
 msgstr ""
 
-#: admin/create_coy.php:328
+#: admin/create_coy.php:340
 msgid "New script Admin Password"
 msgstr ""
 
 msgid "New script Admin Password"
 msgstr ""
 
@@ -1203,9 +1227,10 @@ msgid "Fiscal Year End"
 msgstr ""
 
 #: admin/fiscalyears.php:138 dimensions/inquiry/search_dimensions.php:130
 msgstr ""
 
 #: admin/fiscalyears.php:138 dimensions/inquiry/search_dimensions.php:130
-#: dimensions/inquiry/search_dimensions.php:136 includes/ui/ui_lists.inc:743
-#: includes/ui/ui_view.inc:1546 manufacturing/search_work_orders.php:114
-#: reporting/rep402.php:103 reporting/rep501.php:87 reporting/rep710.php:113
+#: dimensions/inquiry/search_dimensions.php:136 includes/ui/ui_lists.inc:758
+#: includes/ui/ui_lists.inc.orig:758 includes/ui/ui_view.inc:1546
+#: manufacturing/search_work_orders.php:114 reporting/rep402.php:103
+#: reporting/rep501.php:87 reporting/rep710.php:113
 #: reporting/includes/excel_report.inc:231
 #: reporting/includes/pdf_report.inc:267
 msgid "Closed"
 #: reporting/includes/excel_report.inc:231
 #: reporting/includes/pdf_report.inc:267
 msgid "Closed"
@@ -1357,18 +1382,18 @@ msgstr ""
 #: purchasing/inquiry/po_search_completed.php:111
 #: purchasing/inquiry/po_search.php:118
 #: purchasing/inquiry/supplier_allocation_inquiry.php:138
 #: purchasing/inquiry/po_search_completed.php:111
 #: purchasing/inquiry/po_search.php:118
 #: purchasing/inquiry/supplier_allocation_inquiry.php:138
-#: purchasing/inquiry/supplier_inquiry.php:179
+#: purchasing/inquiry/supplier_inquiry.php:175
 #: purchasing/allocations/supplier_allocation_main.php:96
 #: reporting/rep501.php:87 reporting/rep601.php:79 reporting/rep602.php:80
 #: reporting/rep702.php:53 reporting/includes/doctext.inc:220
 #: sales/customer_credit_invoice.php:241 sales/customer_credit_invoice.php:246
 #: sales/customer_delivery.php:333 sales/customer_delivery.php:338
 #: sales/customer_invoice.php:445 sales/customer_invoice.php:450
 #: purchasing/allocations/supplier_allocation_main.php:96
 #: reporting/rep501.php:87 reporting/rep601.php:79 reporting/rep602.php:80
 #: reporting/rep702.php:53 reporting/includes/doctext.inc:220
 #: sales/customer_credit_invoice.php:241 sales/customer_credit_invoice.php:246
 #: sales/customer_delivery.php:333 sales/customer_delivery.php:338
 #: sales/customer_invoice.php:445 sales/customer_invoice.php:450
-#: sales/allocations/customer_allocation_main.php:89
+#: sales/allocations/customer_allocation_main.php:94
 #: sales/view/view_dispatch.php:85 sales/view/view_invoice.php:85
 #: sales/view/view_receipt.php:39 sales/view/view_sales_order.php:94
 #: sales/inquiry/customer_allocation_inquiry.php:148
 #: sales/view/view_dispatch.php:85 sales/view/view_invoice.php:85
 #: sales/view/view_receipt.php:39 sales/view/view_sales_order.php:94
 #: sales/inquiry/customer_allocation_inquiry.php:148
-#: sales/inquiry/customer_inquiry.php:205
+#: sales/inquiry/customer_inquiry.php:196
 #: sales/inquiry/sales_deliveries_view.php:173
 #: sales/includes/ui/sales_credit_ui.inc:81
 #: sales/includes/ui/sales_credit_ui.inc:83
 #: sales/inquiry/sales_deliveries_view.php:173
 #: sales/includes/ui/sales_credit_ui.inc:81
 #: sales/includes/ui/sales_credit_ui.inc:83
@@ -1409,7 +1434,7 @@ msgid "Receivable Account:"
 msgstr ""
 
 #: admin/gl_setup.php:201 admin/gl_setup.php:246
 msgstr ""
 
 #: admin/gl_setup.php:201 admin/gl_setup.php:246
-#: inventory/manage/item_categories.php:228 inventory/manage/items.php:468
+#: inventory/manage/item_categories.php:228 inventory/manage/items.php:469
 #: sales/manage/customer_branches.php:242
 msgid "Sales Account:"
 msgstr ""
 #: sales/manage/customer_branches.php:242
 msgid "Sales Account:"
 msgstr ""
@@ -1499,22 +1524,22 @@ msgid "Items Defaults"
 msgstr ""
 
 #: admin/gl_setup.php:248 inventory/manage/item_categories.php:244
 msgstr ""
 
 #: admin/gl_setup.php:248 inventory/manage/item_categories.php:244
-#: inventory/manage/items.php:477
+#: inventory/manage/items.php:478
 msgid "Inventory Account:"
 msgstr ""
 
 #: admin/gl_setup.php:250 inventory/manage/item_categories.php:232
 msgid "Inventory Account:"
 msgstr ""
 
 #: admin/gl_setup.php:250 inventory/manage/item_categories.php:232
-#: inventory/manage/item_categories.php:246 inventory/manage/items.php:478
-#: inventory/manage/items.php:483
+#: inventory/manage/item_categories.php:246 inventory/manage/items.php:479
+#: inventory/manage/items.php:484
 msgid "C.O.G.S. Account:"
 msgstr ""
 
 #: admin/gl_setup.php:252 inventory/manage/item_categories.php:247
 msgid "C.O.G.S. Account:"
 msgstr ""
 
 #: admin/gl_setup.php:252 inventory/manage/item_categories.php:247
-#: inventory/manage/items.php:479
+#: inventory/manage/items.php:480
 msgid "Inventory Adjustments Account:"
 msgstr ""
 
 msgid "Inventory Adjustments Account:"
 msgstr ""
 
-#: admin/gl_setup.php:254 inventory/manage/items.php:490
+#: admin/gl_setup.php:254 inventory/manage/items.php:491
 msgid "WIP Account:"
 msgstr ""
 
 msgid "WIP Account:"
 msgstr ""
 
@@ -1610,7 +1635,7 @@ msgstr ""
 #: admin/inst_lang.php:35 admin/printers.php:84
 #: admin/shipping_companies.php:91 dimensions/dimension_entry.php:261
 #: dimensions/inquiry/search_dimensions.php:126
 #: admin/inst_lang.php:35 admin/printers.php:84
 #: admin/shipping_companies.php:91 dimensions/dimension_entry.php:261
 #: dimensions/inquiry/search_dimensions.php:126
-#: dimensions/view/view_dimension.php:55 gl/gl_journal.php:546
+#: dimensions/view/view_dimension.php:55 gl/gl_journal.php:548
 #: inventory/manage/item_categories.php:117
 #: inventory/manage/item_categories.php:121
 #: manufacturing/manage/work_centres.php:101
 #: inventory/manage/item_categories.php:117
 #: inventory/manage/item_categories.php:121
 #: manufacturing/manage/work_centres.php:101
@@ -1716,8 +1741,9 @@ msgstr ""
 msgid "Install third-party extension."
 msgstr ""
 
 msgid "Install third-party extension."
 msgstr ""
 
-#: admin/inst_module.php:167 includes/ui/ui_lists.inc:743
-#: includes/ui/ui_lists.inc:2330 reporting/includes/excel_report.inc:229
+#: admin/inst_module.php:167 includes/ui/ui_lists.inc:758
+#: includes/ui/ui_lists.inc:2348 includes/ui/ui_lists.inc.orig:758
+#: includes/ui/ui_lists.inc.orig:2345 reporting/includes/excel_report.inc:229
 #: reporting/includes/pdf_report.inc:265
 msgid "Active"
 msgstr ""
 #: reporting/includes/pdf_report.inc:265
 msgid "Active"
 msgstr ""
@@ -1880,7 +1906,7 @@ msgstr ""
 #: manufacturing/includes/manufacturing_ui.inc:295
 #: manufacturing/includes/manufacturing_ui.inc:346
 #: purchasing/inquiry/supplier_allocation_inquiry.php:136
 #: manufacturing/includes/manufacturing_ui.inc:295
 #: manufacturing/includes/manufacturing_ui.inc:346
 #: purchasing/inquiry/supplier_allocation_inquiry.php:136
-#: purchasing/inquiry/supplier_inquiry.php:177 reporting/rep102.php:130
+#: purchasing/inquiry/supplier_inquiry.php:173 reporting/rep102.php:130
 #: reporting/rep202.php:137 reporting/rep402.php:103 reporting/rep501.php:87
 #: reporting/rep601.php:79 reporting/rep602.php:80 reporting/rep702.php:60
 #: reporting/rep704.php:82 reporting/rep704.php:85 reporting/rep704.php:88
 #: reporting/rep202.php:137 reporting/rep402.php:103 reporting/rep501.php:87
 #: reporting/rep601.php:79 reporting/rep602.php:80 reporting/rep702.php:60
 #: reporting/rep704.php:82 reporting/rep704.php:85 reporting/rep704.php:88
@@ -1889,7 +1915,7 @@ msgstr ""
 #: reporting/includes/doctext.inc:161 reporting/includes/doctext.inc:202
 #: reporting/includes/doctext.inc:221
 #: sales/inquiry/customer_allocation_inquiry.php:146
 #: reporting/includes/doctext.inc:161 reporting/includes/doctext.inc:202
 #: reporting/includes/doctext.inc:221
 #: sales/inquiry/customer_allocation_inquiry.php:146
-#: sales/inquiry/customer_inquiry.php:202
+#: sales/inquiry/customer_inquiry.php:193
 msgid "Type"
 msgstr ""
 
 msgid "Type"
 msgstr ""
 
@@ -1963,10 +1989,6 @@ msgstr ""
 msgid "Host name or IP"
 msgstr ""
 
 msgid "Host name or IP"
 msgstr ""
 
-#: admin/printers.php:135
-msgid "Port"
-msgstr ""
-
 #: admin/printers.php:137
 msgid "Timeout"
 msgstr ""
 #: admin/printers.php:137
 msgid "Timeout"
 msgstr ""
@@ -2082,8 +2104,8 @@ msgid "Role:"
 msgstr ""
 
 #: admin/security_roles.php:177 gl/manage/gl_accounts.php:202
 msgstr ""
 
 #: admin/security_roles.php:177 gl/manage/gl_accounts.php:202
-#: inventory/inquiry/stock_movements.php:67 inventory/manage/items.php:562
-#: purchasing/manage/suppliers.php:292 sales/manage/customers.php:331
+#: inventory/inquiry/stock_movements.php:67 inventory/manage/items.php:564
+#: purchasing/manage/suppliers.php:294 sales/manage/customers.php:332
 msgid "Show inactive:"
 msgstr ""
 
 msgid "Show inactive:"
 msgstr ""
 
@@ -2130,7 +2152,7 @@ msgstr ""
 #: includes/ui/ui_controls.inc:645 includes/ui/ui_input.inc:229
 #: inventory/includes/item_adjustments_ui.inc:192
 #: inventory/includes/stock_transfers_ui.inc:152
 #: includes/ui/ui_controls.inc:645 includes/ui/ui_input.inc:229
 #: inventory/includes/item_adjustments_ui.inc:192
 #: inventory/includes/stock_transfers_ui.inc:152
-#: inventory/manage/items.php:545
+#: inventory/manage/items.php:547
 #: manufacturing/includes/work_order_issue_ui.inc:134
 #: purchasing/includes/ui/po_ui.inc:438
 #: sales/create_recurrent_invoices.php:190
 #: manufacturing/includes/work_order_issue_ui.inc:134
 #: purchasing/includes/ui/po_ui.inc:438
 #: sales/create_recurrent_invoices.php:190
@@ -2139,7 +2161,7 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
 msgid "Cancel"
 msgstr ""
 
-#: admin/security_roles.php:244 inventory/manage/items.php:545
+#: admin/security_roles.php:244 inventory/manage/items.php:547
 msgid "Cancel Edition"
 msgstr ""
 
 msgid "Cancel Edition"
 msgstr ""
 
@@ -2353,7 +2375,7 @@ msgstr ""
 #: admin/view_print_transaction.php:43 admin/view_print_transaction.php:45
 #: admin/view_print_transaction.php:129 includes/ui/ui_controls.inc:213
 #: purchasing/inquiry/po_search_completed.php:43
 #: admin/view_print_transaction.php:43 admin/view_print_transaction.php:45
 #: admin/view_print_transaction.php:129 includes/ui/ui_controls.inc:213
 #: purchasing/inquiry/po_search_completed.php:43
-#: purchasing/inquiry/po_search.php:94 sales/inquiry/customer_inquiry.php:186
+#: purchasing/inquiry/po_search.php:94 sales/inquiry/customer_inquiry.php:97
 #: sales/inquiry/sales_deliveries_view.php:148
 #: sales/inquiry/sales_orders_view.php:102
 msgid "Print"
 #: sales/inquiry/sales_deliveries_view.php:148
 #: sales/inquiry/sales_orders_view.php:102
 msgid "Print"
@@ -2379,11 +2401,11 @@ msgstr ""
 #: purchasing/inquiry/po_search_completed.php:99
 #: purchasing/inquiry/po_search.php:78
 #: purchasing/inquiry/supplier_allocation_inquiry.php:57
 #: purchasing/inquiry/po_search_completed.php:99
 #: purchasing/inquiry/po_search.php:78
 #: purchasing/inquiry/supplier_allocation_inquiry.php:57
-#: purchasing/inquiry/supplier_inquiry.php:56
+#: purchasing/inquiry/supplier_inquiry.php:147
 #: purchasing/inquiry/suppliers_list.php:42
 #: sales/inquiry/customer_allocation_inquiry.php:51
 #: sales/inquiry/customer_branches_list.php:38
 #: purchasing/inquiry/suppliers_list.php:42
 #: sales/inquiry/customer_allocation_inquiry.php:51
 #: sales/inquiry/customer_branches_list.php:38
-#: sales/inquiry/customer_inquiry.php:54 sales/inquiry/customers_list.php:42
+#: sales/inquiry/customer_inquiry.php:164 sales/inquiry/customers_list.php:42
 #: sales/inquiry/sales_deliveries_view.php:116
 #: sales/inquiry/sales_orders_view.php:236
 msgid "Search"
 #: sales/inquiry/sales_deliveries_view.php:116
 #: sales/inquiry/sales_orders_view.php:236
 msgid "Search"
@@ -2426,7 +2448,7 @@ msgstr ""
 #: purchasing/includes/ui/invoice_ui.inc:114
 #: purchasing/includes/ui/po_ui.inc:312 purchasing/view/view_po.php:140
 #: purchasing/inquiry/supplier_allocation_inquiry.php:141
 #: purchasing/includes/ui/invoice_ui.inc:114
 #: purchasing/includes/ui/po_ui.inc:312 purchasing/view/view_po.php:140
 #: purchasing/inquiry/supplier_allocation_inquiry.php:141
-#: purchasing/inquiry/supplier_inquiry.php:182
+#: purchasing/inquiry/supplier_inquiry.php:178
 #: purchasing/allocations/supplier_allocation_main.php:97
 #: reporting/rep101.php:132 reporting/rep107.php:203 reporting/rep201.php:107
 #: reporting/rep306.php:141 reporting/rep402.php:103 reporting/rep501.php:87
 #: purchasing/allocations/supplier_allocation_main.php:97
 #: reporting/rep101.php:132 reporting/rep107.php:203 reporting/rep201.php:107
 #: reporting/rep306.php:141 reporting/rep402.php:103 reporting/rep501.php:87
@@ -2436,11 +2458,11 @@ msgstr ""
 #: reporting/includes/doctext.inc:207 reporting/includes/doctext.inc:245
 #: reporting/includes/header2.inc:137 sales/customer_delivery.php:366
 #: sales/customer_invoice.php:485
 #: reporting/includes/doctext.inc:207 reporting/includes/doctext.inc:245
 #: reporting/includes/header2.inc:137 sales/customer_delivery.php:366
 #: sales/customer_invoice.php:485
-#: sales/allocations/customer_allocation_main.php:90
+#: sales/allocations/customer_allocation_main.php:95
 #: sales/view/view_credit.php:69 sales/view/view_sales_order.php:109
 #: sales/view/view_sales_order.php:142 sales/view/view_sales_order.php:179
 #: sales/inquiry/customer_allocation_inquiry.php:150
 #: sales/view/view_credit.php:69 sales/view/view_sales_order.php:109
 #: sales/view/view_sales_order.php:142 sales/view/view_sales_order.php:179
 #: sales/inquiry/customer_allocation_inquiry.php:150
-#: sales/inquiry/customer_inquiry.php:206
+#: sales/inquiry/customer_inquiry.php:197
 msgid "Date"
 msgstr ""
 
 msgid "Date"
 msgstr ""
 
@@ -2456,7 +2478,8 @@ msgstr ""
 #: admin/void_transaction.php:125 admin/void_transaction.php:184
 #: gl/inquiry/accounts_list.php:63 includes/ui/ui_input.inc:152
 #: includes/ui/ui_input.inc:300 includes/ui/ui_lists.inc:20
 #: admin/void_transaction.php:125 admin/void_transaction.php:184
 #: gl/inquiry/accounts_list.php:63 includes/ui/ui_input.inc:152
 #: includes/ui/ui_input.inc:300 includes/ui/ui_lists.inc:20
-#: inventory/inquiry/stock_list.php:66 inventory/inquiry/stock_list.php:69
+#: includes/ui/ui_lists.inc.orig:20 inventory/inquiry/stock_list.php:66
+#: inventory/inquiry/stock_list.php:69
 #: purchasing/inquiry/suppliers_list.php:65
 #: purchasing/inquiry/suppliers_list.php:68
 #: sales/inquiry/customer_branches_list.php:60
 #: purchasing/inquiry/suppliers_list.php:65
 #: purchasing/inquiry/suppliers_list.php:68
 #: sales/inquiry/customer_branches_list.php:60
@@ -2577,44 +2600,44 @@ msgstr ""
 msgid "Open Balance"
 msgstr ""
 
 msgid "Open Balance"
 msgstr ""
 
-#: admin/db/maintenance_db.inc:152
+#: admin/db/maintenance_db.inc:154
 #, php-format
 msgid "Cannot open the extension setup file '%s' for writing."
 msgstr ""
 
 #, php-format
 msgid "Cannot open the extension setup file '%s' for writing."
 msgstr ""
 
-#: admin/db/maintenance_db.inc:160
+#: admin/db/maintenance_db.inc:162
 #, php-format
 msgid "Cannot write to the extensions setup file '%s'."
 msgstr ""
 
 #, php-format
 msgid "Cannot write to the extensions setup file '%s'."
 msgstr ""
 
-#: admin/db/maintenance_db.inc:179
+#: admin/db/maintenance_db.inc:181
 msgid "Cannot update system extensions list."
 msgstr ""
 
 msgid "Cannot update system extensions list."
 msgstr ""
 
-#: admin/db/maintenance_db.inc:197
+#: admin/db/maintenance_db.inc:199
 #, php-format
 msgid "Cannot update extensions list for company '%s'."
 msgstr ""
 
 #, php-format
 msgid "Cannot update extensions list for company '%s'."
 msgstr ""
 
-#: admin/db/maintenance_db.inc:233
+#: admin/db/maintenance_db.inc:235
 msgid "Cannot open the languages file - "
 msgstr ""
 
 msgid "Cannot open the languages file - "
 msgstr ""
 
-#: admin/db/maintenance_db.inc:240
+#: admin/db/maintenance_db.inc:242
 msgid "Cannot write to the language file - "
 msgstr ""
 
 msgid "Cannot write to the language file - "
 msgstr ""
 
-#: admin/db/maintenance_db.inc:251
+#: admin/db/maintenance_db.inc:253
 msgid "The language files folder "
 msgstr ""
 
 msgid "The language files folder "
 msgstr ""
 
-#: admin/db/maintenance_db.inc:400
+#: admin/db/maintenance_db.inc:402
 msgid ""
 "This is new format backup file which cannot be restored on database not "
 "migrated to utf8."
 msgstr ""
 
 msgid ""
 "This is new format backup file which cannot be restored on database not "
 "migrated to utf8."
 msgstr ""
 
-#: admin/db/maintenance_db.inc:484
+#: admin/db/maintenance_db.inc:486
 #, php-format
 msgid "SQL script execution failed in line %d: %s"
 msgstr ""
 #, php-format
 msgid "SQL script execution failed in line %d: %s"
 msgstr ""
@@ -3037,7 +3060,7 @@ msgstr ""
 msgid "&Units of Measure"
 msgstr ""
 
 msgid "&Units of Measure"
 msgstr ""
 
-#: applications/inventory.php:45 inventory/manage/items.php:591
+#: applications/inventory.php:45 inventory/manage/items.php:593
 msgid "&Reorder Levels"
 msgstr ""
 
 msgid "&Reorder Levels"
 msgstr ""
 
@@ -3053,7 +3076,7 @@ msgstr ""
 msgid "Purchasing &Pricing"
 msgstr ""
 
 msgid "Purchasing &Pricing"
 msgstr ""
 
-#: applications/inventory.php:53 inventory/manage/items.php:590
+#: applications/inventory.php:53 inventory/manage/items.php:592
 msgid "Standard &Costs"
 msgstr ""
 
 msgid "Standard &Costs"
 msgstr ""
 
@@ -3394,7 +3417,7 @@ msgid "Balance for this Dimension"
 msgstr ""
 
 #: dimensions/includes/dimensions_ui.inc:31 gl/accruals.php:104
 msgstr ""
 
 #: dimensions/includes/dimensions_ui.inc:31 gl/accruals.php:104
-#: gl/inquiry/gl_account_inquiry.php:129 gl/inquiry/gl_trial_balance.php:184
+#: gl/inquiry/gl_account_inquiry.php:129 gl/inquiry/gl_trial_balance.php:215
 #: gl/manage/gl_quick_entries.php:248 gl/manage/gl_quick_entries.php:342
 #: includes/dashboard.inc:606 includes/sysnames.inc:179
 #: purchasing/includes/ui/invoice_ui.inc:278
 #: gl/manage/gl_quick_entries.php:248 gl/manage/gl_quick_entries.php:342
 #: includes/dashboard.inc:606 includes/sysnames.inc:179
 #: purchasing/includes/ui/invoice_ui.inc:278
@@ -3408,49 +3431,51 @@ msgstr ""
 #: dimensions/includes/dimensions_ui.inc:31 gl/accruals.php:112
 #: gl/bank_account_reconcile.php:234 gl/inquiry/bank_inquiry.php:72
 #: gl/inquiry/gl_account_inquiry.php:141 gl/inquiry/gl_account_inquiry.php:143
 #: dimensions/includes/dimensions_ui.inc:31 gl/accruals.php:112
 #: gl/bank_account_reconcile.php:234 gl/inquiry/bank_inquiry.php:72
 #: gl/inquiry/gl_account_inquiry.php:141 gl/inquiry/gl_account_inquiry.php:143
-#: gl/inquiry/gl_trial_balance.php:190 gl/inquiry/gl_trial_balance.php:192
-#: gl/inquiry/gl_trial_balance.php:194 gl/view/accrual_trans.php:60
+#: gl/inquiry/gl_trial_balance.php:221 gl/inquiry/gl_trial_balance.php:223
+#: gl/inquiry/gl_trial_balance.php:225 gl/view/accrual_trans.php:60
 #: gl/view/gl_trans_view.php:96 gl/view/gl_trans_view.php:99
 #: gl/view/gl_trans_view.php:102 gl/includes/ui/gl_journal_ui.inc:103
 #: gl/includes/ui/gl_journal_ui.inc:106 gl/includes/ui/gl_journal_ui.inc:109
 #: manufacturing/view/wo_costs_view.php:61
 #: purchasing/inquiry/supplier_allocation_inquiry.php:144
 #: gl/view/gl_trans_view.php:96 gl/view/gl_trans_view.php:99
 #: gl/view/gl_trans_view.php:102 gl/includes/ui/gl_journal_ui.inc:103
 #: gl/includes/ui/gl_journal_ui.inc:106 gl/includes/ui/gl_journal_ui.inc:109
 #: manufacturing/view/wo_costs_view.php:61
 #: purchasing/inquiry/supplier_allocation_inquiry.php:144
-#: purchasing/inquiry/supplier_inquiry.php:185 reporting/rep601.php:80
-#: reporting/rep602.php:81 reporting/rep702.php:54 reporting/rep704.php:83
-#: reporting/rep704.php:86 reporting/rep704.php:89 reporting/rep708.php:192
-#: reporting/rep708.php:193 sales/inquiry/customer_allocation_inquiry.php:154
-#: sales/inquiry/customer_inquiry.php:211
+#: reporting/rep601.php:80 reporting/rep602.php:81 reporting/rep702.php:54
+#: reporting/rep704.php:83 reporting/rep704.php:86 reporting/rep704.php:89
+#: reporting/rep708.php:192 reporting/rep708.php:193
+#: sales/inquiry/customer_allocation_inquiry.php:154
 msgid "Debit"
 msgstr ""
 
 #: dimensions/includes/dimensions_ui.inc:31 gl/accruals.php:112
 #: gl/bank_account_reconcile.php:235 gl/inquiry/bank_inquiry.php:72
 #: gl/inquiry/gl_account_inquiry.php:141 gl/inquiry/gl_account_inquiry.php:143
 msgid "Debit"
 msgstr ""
 
 #: dimensions/includes/dimensions_ui.inc:31 gl/accruals.php:112
 #: gl/bank_account_reconcile.php:235 gl/inquiry/bank_inquiry.php:72
 #: gl/inquiry/gl_account_inquiry.php:141 gl/inquiry/gl_account_inquiry.php:143
-#: gl/inquiry/gl_trial_balance.php:191 gl/inquiry/gl_trial_balance.php:193
-#: gl/inquiry/gl_trial_balance.php:195 gl/view/accrual_trans.php:60
+#: gl/inquiry/gl_trial_balance.php:222 gl/inquiry/gl_trial_balance.php:224
+#: gl/inquiry/gl_trial_balance.php:226 gl/view/accrual_trans.php:60
 #: gl/view/gl_trans_view.php:96 gl/view/gl_trans_view.php:99
 #: gl/view/gl_trans_view.php:102 gl/includes/ui/gl_journal_ui.inc:103
 #: gl/includes/ui/gl_journal_ui.inc:106 gl/includes/ui/gl_journal_ui.inc:109
 #: includes/sysnames.inc:90 manufacturing/view/wo_costs_view.php:61
 #: purchasing/inquiry/supplier_allocation_inquiry.php:145
 #: gl/view/gl_trans_view.php:96 gl/view/gl_trans_view.php:99
 #: gl/view/gl_trans_view.php:102 gl/includes/ui/gl_journal_ui.inc:103
 #: gl/includes/ui/gl_journal_ui.inc:106 gl/includes/ui/gl_journal_ui.inc:109
 #: includes/sysnames.inc:90 manufacturing/view/wo_costs_view.php:61
 #: purchasing/inquiry/supplier_allocation_inquiry.php:145
-#: purchasing/inquiry/supplier_inquiry.php:186 reporting/rep601.php:80
-#: reporting/rep602.php:81 reporting/rep702.php:54 reporting/rep704.php:83
-#: reporting/rep704.php:86 reporting/rep704.php:89 reporting/rep708.php:192
-#: reporting/rep708.php:193 sales/inquiry/customer_allocation_inquiry.php:155
-#: sales/inquiry/customer_inquiry.php:212
+#: reporting/rep601.php:80 reporting/rep602.php:81 reporting/rep702.php:54
+#: reporting/rep704.php:83 reporting/rep704.php:86 reporting/rep704.php:89
+#: reporting/rep708.php:192 reporting/rep708.php:193
+#: sales/inquiry/customer_allocation_inquiry.php:155
 msgid "Credit"
 msgstr ""
 
 #: dimensions/includes/dimensions_ui.inc:45
 #: dimensions/inquiry/search_dimensions.php:131 gl/inquiry/bank_inquiry.php:72
 msgid "Credit"
 msgstr ""
 
 #: dimensions/includes/dimensions_ui.inc:45
 #: dimensions/inquiry/search_dimensions.php:131 gl/inquiry/bank_inquiry.php:72
-#: gl/inquiry/gl_account_inquiry.php:141 gl/inquiry/gl_trial_balance.php:188
+#: gl/inquiry/gl_account_inquiry.php:141 gl/inquiry/gl_trial_balance.php:219
 #: includes/dashboard.inc:606
 #: purchasing/inquiry/supplier_allocation_inquiry.php:147
 #: includes/dashboard.inc:606
 #: purchasing/inquiry/supplier_allocation_inquiry.php:147
-#: reporting/rep101.php:136 reporting/rep201.php:111 reporting/rep203.php:89
-#: reporting/rep204.php:84 reporting/rep307.php:114 reporting/rep601.php:80
-#: reporting/rep602.php:81 reporting/rep701.php:110 reporting/rep704.php:83
-#: reporting/rep704.php:86 reporting/rep704.php:89 reporting/rep708.php:185
+#: purchasing/inquiry/supplier_inquiry.php:182
+#: purchasing/inquiry/supplier_inquiry.php:195 reporting/rep101.php:136
+#: reporting/rep201.php:111 reporting/rep203.php:89 reporting/rep204.php:84
+#: reporting/rep307.php:114 reporting/rep601.php:80 reporting/rep602.php:81
+#: reporting/rep701.php:110 reporting/rep704.php:83 reporting/rep704.php:86
+#: reporting/rep704.php:89 reporting/rep708.php:185
 #: sales/inquiry/customer_allocation_inquiry.php:157
 #: sales/inquiry/customer_allocation_inquiry.php:157
+#: sales/inquiry/customer_inquiry.php:203
+#: sales/inquiry/customer_inquiry.php:216
 msgid "Balance"
 msgstr ""
 
 msgid "Balance"
 msgstr ""
 
@@ -3481,38 +3506,39 @@ msgid "Reference:"
 msgstr ""
 
 #: dimensions/inquiry/search_dimensions.php:74
 msgstr ""
 
 #: dimensions/inquiry/search_dimensions.php:74
-#: includes/ui/allocation_cart.inc:314 includes/ui/ui_lists.inc:2100
-#: reporting/rep101.php:114 reporting/rep102.php:92 reporting/rep104.php:95
-#: reporting/rep104.php:99 reporting/rep105.php:95 reporting/rep105.php:99
-#: reporting/rep201.php:89 reporting/rep202.php:98 reporting/rep203.php:69
-#: reporting/rep204.php:77 reporting/rep301.php:151 reporting/rep301.php:158
-#: reporting/rep302.php:103 reporting/rep302.php:110 reporting/rep303.php:95
-#: reporting/rep303.php:102 reporting/rep304.php:109 reporting/rep304.php:114
-#: reporting/rep304.php:119 reporting/rep306.php:120 reporting/rep306.php:125
-#: reporting/rep306.php:130 reporting/rep306.php:135 reporting/rep307.php:103
-#: reporting/rep307.php:108 reporting/rep308.php:212 reporting/rep308.php:217
-#: reporting/rep309.php:93 reporting/rep402.php:87 reporting/rep402.php:95
-#: reporting/rep451.php:57 reporting/rep451.php:64 reporting/rep702.php:61
-#: reporting/rep710.php:86 reporting/rep710.php:87
+#: includes/ui/allocation_cart.inc:314 includes/ui/ui_lists.inc:2118
+#: includes/ui/ui_lists.inc.orig:2115 reporting/rep101.php:114
+#: reporting/rep102.php:92 reporting/rep104.php:95 reporting/rep104.php:99
+#: reporting/rep105.php:95 reporting/rep105.php:99 reporting/rep201.php:89
+#: reporting/rep202.php:98 reporting/rep203.php:69 reporting/rep204.php:77
+#: reporting/rep301.php:151 reporting/rep301.php:158 reporting/rep302.php:103
+#: reporting/rep302.php:110 reporting/rep303.php:95 reporting/rep303.php:102
+#: reporting/rep304.php:109 reporting/rep304.php:114 reporting/rep304.php:119
+#: reporting/rep306.php:120 reporting/rep306.php:125 reporting/rep306.php:130
+#: reporting/rep306.php:135 reporting/rep307.php:103 reporting/rep307.php:108
+#: reporting/rep308.php:212 reporting/rep308.php:217 reporting/rep309.php:93
+#: reporting/rep402.php:87 reporting/rep402.php:95 reporting/rep451.php:67
+#: reporting/rep451.php:74 reporting/rep702.php:61 reporting/rep710.php:86
+#: reporting/rep710.php:87
 msgid "All"
 msgstr ""
 
 #: dimensions/inquiry/search_dimensions.php:75 gl/inquiry/bank_inquiry.php:50
 msgid "All"
 msgstr ""
 
 #: dimensions/inquiry/search_dimensions.php:75 gl/inquiry/bank_inquiry.php:50
-#: gl/inquiry/gl_trial_balance.php:54 gl/inquiry/journal_inquiry.php:48
+#: gl/inquiry/gl_trial_balance.php:55 gl/inquiry/journal_inquiry.php:48
 #: gl/inquiry/profit_loss.php:175 gl/includes/ui/gl_bank_ui.inc:52
 #: gl/includes/ui/gl_bank_ui.inc:114 inventory/inquiry/stock_movements.php:85
 #: purchasing/inquiry/supplier_allocation_inquiry.php:50
 #: gl/inquiry/profit_loss.php:175 gl/includes/ui/gl_bank_ui.inc:52
 #: gl/includes/ui/gl_bank_ui.inc:114 inventory/inquiry/stock_movements.php:85
 #: purchasing/inquiry/supplier_allocation_inquiry.php:50
-#: purchasing/inquiry/supplier_inquiry.php:51
-#: sales/inquiry/customer_inquiry.php:46
+#: purchasing/inquiry/supplier_inquiry.php:143
+#: sales/inquiry/customer_inquiry.php:160
 msgid "From:"
 msgstr ""
 
 #: dimensions/inquiry/search_dimensions.php:76 gl/inquiry/bank_inquiry.php:51
 msgid "From:"
 msgstr ""
 
 #: dimensions/inquiry/search_dimensions.php:76 gl/inquiry/bank_inquiry.php:51
-#: gl/inquiry/gl_trial_balance.php:55 gl/inquiry/journal_inquiry.php:49
+#: gl/inquiry/gl_trial_balance.php:56 gl/inquiry/journal_inquiry.php:49
 #: gl/inquiry/profit_loss.php:176 inventory/inquiry/stock_movements.php:86
 #: purchasing/inquiry/supplier_allocation_inquiry.php:51
 #: gl/inquiry/profit_loss.php:176 inventory/inquiry/stock_movements.php:86
 #: purchasing/inquiry/supplier_allocation_inquiry.php:51
-#: purchasing/inquiry/supplier_inquiry.php:52
-#: sales/inquiry/customer_inquiry.php:47
+#: purchasing/inquiry/supplier_inquiry.php:144
+#: sales/inquiry/customer_inquiry.php:161
 msgid "To:"
 msgstr ""
 
 msgid "To:"
 msgstr ""
 
@@ -3533,7 +3559,7 @@ msgstr ""
 #: purchasing/view/view_supp_credit.php:48
 #: purchasing/view/view_supp_invoice.php:52
 #: purchasing/inquiry/supplier_allocation_inquiry.php:142
 #: purchasing/view/view_supp_credit.php:48
 #: purchasing/view/view_supp_invoice.php:52
 #: purchasing/inquiry/supplier_allocation_inquiry.php:142
-#: purchasing/inquiry/supplier_inquiry.php:183 reporting/rep101.php:132
+#: purchasing/inquiry/supplier_inquiry.php:179 reporting/rep101.php:132
 #: reporting/rep201.php:107 reporting/rep203.php:88 reporting/rep501.php:87
 #: reporting/includes/doctext.inc:111 reporting/includes/doctext.inc:143
 #: reporting/includes/doctext.inc:164 reporting/includes/doctext.inc:166
 #: reporting/rep201.php:107 reporting/rep203.php:88 reporting/rep501.php:87
 #: reporting/includes/doctext.inc:111 reporting/includes/doctext.inc:143
 #: reporting/includes/doctext.inc:164 reporting/includes/doctext.inc:166
@@ -3541,7 +3567,7 @@ msgstr ""
 #: sales/customer_invoice.php:492 sales/view/view_dispatch.php:97
 #: sales/view/view_invoice.php:96
 #: sales/inquiry/customer_allocation_inquiry.php:151
 #: sales/customer_invoice.php:492 sales/view/view_dispatch.php:97
 #: sales/view/view_invoice.php:96
 #: sales/inquiry/customer_allocation_inquiry.php:151
-#: sales/inquiry/customer_inquiry.php:207
+#: sales/inquiry/customer_inquiry.php:198
 #: sales/includes/ui/sales_order_ui.inc:588
 msgid "Due Date"
 msgstr ""
 #: sales/includes/ui/sales_order_ui.inc:588
 msgid "Due Date"
 msgstr ""
@@ -3615,8 +3641,8 @@ msgstr ""
 #: gl/gl_budget.php:75 gl/inquiry/balance_sheet.php:127
 #: gl/inquiry/balance_sheet.php:129 gl/inquiry/gl_account_inquiry.php:79
 #: gl/inquiry/gl_account_inquiry.php:81 gl/inquiry/gl_account_inquiry.php:134
 #: gl/gl_budget.php:75 gl/inquiry/balance_sheet.php:127
 #: gl/inquiry/balance_sheet.php:129 gl/inquiry/gl_account_inquiry.php:79
 #: gl/inquiry/gl_account_inquiry.php:81 gl/inquiry/gl_account_inquiry.php:134
-#: gl/inquiry/gl_account_inquiry.php:136 gl/inquiry/gl_trial_balance.php:57
-#: gl/inquiry/gl_trial_balance.php:59 gl/inquiry/profit_loss.php:184
+#: gl/inquiry/gl_account_inquiry.php:136 gl/inquiry/gl_trial_balance.php:58
+#: gl/inquiry/gl_trial_balance.php:60 gl/inquiry/profit_loss.php:184
 #: gl/inquiry/profit_loss.php:186 gl/manage/gl_quick_entries.php:268
 #: gl/manage/gl_quick_entries.php:270 gl/manage/gl_quick_entries.php:353
 #: gl/manage/gl_quick_entries.php:355 gl/view/accrual_trans.php:54
 #: gl/inquiry/profit_loss.php:186 gl/manage/gl_quick_entries.php:268
 #: gl/manage/gl_quick_entries.php:270 gl/manage/gl_quick_entries.php:353
 #: gl/manage/gl_quick_entries.php:355 gl/view/accrual_trans.php:54
@@ -3629,8 +3655,8 @@ msgstr ""
 #: gl/includes/ui/gl_journal_ui.inc:105 includes/dashboard.inc:134
 #: includes/dashboard.inc:336 includes/sysnames.inc:43
 #: includes/sysnames.inc:180 inventory/manage/item_categories.php:258
 #: gl/includes/ui/gl_journal_ui.inc:105 includes/dashboard.inc:134
 #: includes/dashboard.inc:336 includes/sysnames.inc:43
 #: includes/sysnames.inc:180 inventory/manage/item_categories.php:258
-#: inventory/manage/item_categories.php:260 inventory/manage/items.php:457
-#: inventory/manage/items.php:459 purchasing/includes/ui/invoice_ui.inc:140
+#: inventory/manage/item_categories.php:260 inventory/manage/items.php:458
+#: inventory/manage/items.php:460 purchasing/includes/ui/invoice_ui.inc:140
 #: purchasing/includes/ui/invoice_ui.inc:278
 #: purchasing/includes/ui/invoice_ui.inc:280
 #: purchasing/includes/ui/po_ui.inc:172 purchasing/manage/suppliers.php:147
 #: purchasing/includes/ui/invoice_ui.inc:278
 #: purchasing/includes/ui/invoice_ui.inc:280
 #: purchasing/includes/ui/po_ui.inc:172 purchasing/manage/suppliers.php:147
@@ -3733,18 +3759,20 @@ msgstr ""
 #: includes/dashboard.inc:189 includes/dashboard.inc:226
 #: includes/dashboard.inc:294 includes/dashboard.inc:336
 #: includes/dashboard.inc:448 includes/sysnames.inc:138
 #: includes/dashboard.inc:189 includes/dashboard.inc:226
 #: includes/dashboard.inc:294 includes/dashboard.inc:336
 #: includes/dashboard.inc:448 includes/sysnames.inc:138
-#: includes/ui/allocation_cart.inc:290 includes/ui/ui_lists.inc:1349
+#: includes/ui/allocation_cart.inc:290 includes/ui/ui_lists.inc:1367
+#: includes/ui/ui_lists.inc.orig:1364
 #: manufacturing/includes/manufacturing_ui.inc:253
 #: purchasing/includes/ui/invoice_ui.inc:278
 #: purchasing/includes/ui/invoice_ui.inc:280
 #: purchasing/includes/ui/invoice_ui.inc:282
 #: purchasing/view/view_supp_payment.php:60
 #: manufacturing/includes/manufacturing_ui.inc:253
 #: purchasing/includes/ui/invoice_ui.inc:278
 #: purchasing/includes/ui/invoice_ui.inc:280
 #: purchasing/includes/ui/invoice_ui.inc:282
 #: purchasing/view/view_supp_payment.php:60
-#: purchasing/view/view_supp_payment.php:72 reporting/rep102.php:242
+#: purchasing/view/view_supp_payment.php:72
+#: purchasing/inquiry/supplier_inquiry.php:181 reporting/rep102.php:242
 #: reporting/rep107.php:205 reporting/rep107.php:270 reporting/rep109.php:197
 #: reporting/rep110.php:194 reporting/rep111.php:194 reporting/rep113.php:183
 #: reporting/rep202.php:250 reporting/rep209.php:199 reporting/rep706.php:308
 #: reporting/rep107.php:205 reporting/rep107.php:270 reporting/rep109.php:197
 #: reporting/rep110.php:194 reporting/rep111.php:194 reporting/rep113.php:183
 #: reporting/rep202.php:250 reporting/rep209.php:199 reporting/rep706.php:308
-#: reporting/rep707.php:326 reporting/rep710.php:78
-#: sales/view/view_receipt.php:44
+#: reporting/rep707.php:328 reporting/rep710.php:78
+#: sales/view/view_receipt.php:44 sales/inquiry/customer_inquiry.php:202
 msgid "Amount"
 msgstr ""
 
 msgid "Amount"
 msgstr ""
 
@@ -4137,12 +4165,12 @@ msgstr ""
 
 #: gl/gl_budget.php:126 gl/inquiry/balance_sheet.php:98
 #: gl/inquiry/balance_sheet.php:202 gl/inquiry/balance_sheet.php:233
 
 #: gl/gl_budget.php:126 gl/inquiry/balance_sheet.php:98
 #: gl/inquiry/balance_sheet.php:202 gl/inquiry/balance_sheet.php:233
-#: gl/inquiry/gl_trial_balance.php:220 gl/inquiry/profit_loss.php:120
-#: gl/inquiry/profit_loss.php:287 gl/view/gl_deposit_view.php:137
-#: gl/view/gl_payment_view.php:136 gl/view/gl_trans_view.php:144
-#: gl/includes/ui/gl_bank_ui.inc:195 gl/includes/ui/gl_journal_ui.inc:169
-#: includes/dashboard.inc:487 includes/dashboard.inc:571
-#: inventory/includes/item_adjustments_ui.inc:60
+#: gl/inquiry/gl_trial_balance.php:174 gl/inquiry/gl_trial_balance.php:251
+#: gl/inquiry/profit_loss.php:120 gl/inquiry/profit_loss.php:287
+#: gl/view/gl_deposit_view.php:137 gl/view/gl_payment_view.php:136
+#: gl/view/gl_trans_view.php:144 gl/includes/ui/gl_bank_ui.inc:195
+#: gl/includes/ui/gl_journal_ui.inc:169 includes/dashboard.inc:487
+#: includes/dashboard.inc:571 inventory/includes/item_adjustments_ui.inc:60
 #: inventory/includes/item_adjustments_ui.inc:114
 #: manufacturing/includes/manufacturing_ui.inc:195
 #: purchasing/includes/ui/invoice_ui.inc:341
 #: inventory/includes/item_adjustments_ui.inc:114
 #: manufacturing/includes/manufacturing_ui.inc:195
 #: purchasing/includes/ui/invoice_ui.inc:341
@@ -4150,7 +4178,7 @@ msgstr ""
 #: purchasing/includes/ui/invoice_ui.inc:575
 #: purchasing/po_receive_items.php:63 purchasing/view/view_po.php:140
 #: purchasing/allocations/supplier_allocation_main.php:100
 #: purchasing/includes/ui/invoice_ui.inc:575
 #: purchasing/po_receive_items.php:63 purchasing/view/view_po.php:140
 #: purchasing/allocations/supplier_allocation_main.php:100
-#: reporting/rep101.php:249 reporting/rep106.php:90 reporting/rep106.php:125
+#: reporting/rep101.php:255 reporting/rep106.php:90 reporting/rep106.php:125
 #: reporting/rep106.php:172 reporting/rep114.php:161 reporting/rep201.php:222
 #: reporting/rep203.php:89 reporting/rep203.php:166 reporting/rep204.php:113
 #: reporting/rep204.php:141 reporting/rep301.php:192 reporting/rep301.php:240
 #: reporting/rep106.php:172 reporting/rep114.php:161 reporting/rep201.php:222
 #: reporting/rep203.php:89 reporting/rep203.php:166 reporting/rep204.php:113
 #: reporting/rep204.php:141 reporting/rep301.php:192 reporting/rep301.php:240
@@ -4159,14 +4187,14 @@ msgstr ""
 #: reporting/rep306.php:176 reporting/rep306.php:196 reporting/rep306.php:212
 #: reporting/rep306.php:261 reporting/rep306.php:276 reporting/rep306.php:287
 #: reporting/rep308.php:304 reporting/rep309.php:125 reporting/rep309.php:152
 #: reporting/rep306.php:176 reporting/rep306.php:196 reporting/rep306.php:212
 #: reporting/rep306.php:261 reporting/rep306.php:276 reporting/rep306.php:287
 #: reporting/rep308.php:304 reporting/rep309.php:125 reporting/rep309.php:152
-#: reporting/rep451.php:107 reporting/rep451.php:142 reporting/rep702.php:142
+#: reporting/rep451.php:120 reporting/rep451.php:155 reporting/rep702.php:142
 #: reporting/rep705.php:152 reporting/rep705.php:312 reporting/rep706.php:106
 #: reporting/rep706.php:255 reporting/rep706.php:290 reporting/rep707.php:115
 #: reporting/rep705.php:152 reporting/rep705.php:312 reporting/rep706.php:106
 #: reporting/rep706.php:255 reporting/rep706.php:290 reporting/rep707.php:115
-#: reporting/rep707.php:297 reporting/rep708.php:253
+#: reporting/rep707.php:299 reporting/rep708.php:253
 #: reporting/includes/doctext.inc:32 reporting/includes/doctext.inc:191
 #: sales/customer_credit_invoice.php:276 sales/customer_delivery.php:421
 #: sales/customer_invoice.php:519 sales/customer_invoice.php:522
 #: reporting/includes/doctext.inc:32 reporting/includes/doctext.inc:191
 #: sales/customer_credit_invoice.php:276 sales/customer_delivery.php:421
 #: sales/customer_invoice.php:519 sales/customer_invoice.php:522
-#: sales/allocations/customer_allocation_main.php:93
+#: sales/allocations/customer_allocation_main.php:98
 #: sales/view/view_credit.php:91 sales/view/view_dispatch.php:113
 #: sales/view/view_invoice.php:116 sales/view/view_sales_order.php:109
 #: sales/view/view_sales_order.php:142 sales/view/view_sales_order.php:179
 #: sales/view/view_credit.php:91 sales/view/view_dispatch.php:113
 #: sales/view/view_invoice.php:116 sales/view/view_sales_order.php:109
 #: sales/view/view_sales_order.php:142 sales/view/view_sales_order.php:179
@@ -4291,46 +4319,43 @@ msgstr ""
 msgid "Rows"
 msgstr ""
 
 msgid "Rows"
 msgstr ""
 
-#: gl/gl_journal.php:539
+#: gl/gl_journal.php:540
 msgid "Tax register record"
 msgstr ""
 
 msgid "Tax register record"
 msgstr ""
 
-#: gl/gl_journal.php:541
+#: gl/gl_journal.php:543
 msgid "VAT date:"
 msgstr ""
 
 msgid "VAT date:"
 msgstr ""
 
-#: gl/gl_journal.php:542
-msgid "Tax group:"
-msgstr ""
-
-#: gl/gl_journal.php:546 gl/inquiry/tax_inquiry.php:102
+#: gl/gl_journal.php:548 gl/inquiry/tax_inquiry.php:102
 #: reporting/rep709.php:189
 msgid "Input Tax"
 msgstr ""
 
 #: reporting/rep709.php:189
 msgid "Input Tax"
 msgstr ""
 
-#: gl/gl_journal.php:546 gl/inquiry/tax_inquiry.php:96
+#: gl/gl_journal.php:548 gl/inquiry/tax_inquiry.php:96
 #: reporting/rep709.php:189
 msgid "Output Tax"
 msgstr ""
 
 #: reporting/rep709.php:189
 msgid "Output Tax"
 msgstr ""
 
-#: gl/gl_journal.php:546
+#: gl/gl_journal.php:548
 msgid "Net amount"
 msgstr ""
 
 msgid "Net amount"
 msgstr ""
 
-#: gl/gl_journal.php:561
+#: gl/gl_journal.php:563
 msgid "Process Journal Entry"
 msgstr ""
 
 msgid "Process Journal Entry"
 msgstr ""
 
-#: gl/gl_journal.php:562
+#: gl/gl_journal.php:564
 msgid "Process journal entry only if debits equal to credits"
 msgstr ""
 
 msgid "Process journal entry only if debits equal to credits"
 msgstr ""
 
-#: gl/inquiry/accounts_list.php:25 inventory/manage/items.php:466
+#: gl/inquiry/accounts_list.php:25 inventory/manage/items.php:467
 #: sales/manage/customer_branches.php:240
 msgid "GL Accounts"
 msgstr ""
 
 #: sales/manage/customer_branches.php:240
 msgid "GL Accounts"
 msgstr ""
 
-#: gl/inquiry/accounts_list.php:40 includes/ui/ui_lists.inc:346
+#: gl/inquiry/accounts_list.php:40 includes/ui/ui_lists.inc:349
+#: includes/ui/ui_lists.inc.orig:349
 msgid "Search GL accounts"
 msgstr ""
 
 msgid "Search GL accounts"
 msgstr ""
 
@@ -4366,8 +4391,8 @@ msgstr ""
 
 #: gl/inquiry/balance_sheet.php:225 gl/inquiry/profit_loss.php:298
 #: includes/dashboard.inc:394 reporting/rep705.php:322
 
 #: gl/inquiry/balance_sheet.php:225 gl/inquiry/profit_loss.php:298
 #: includes/dashboard.inc:394 reporting/rep705.php:322
-#: reporting/rep706.php:278 reporting/rep706.php:303 reporting/rep707.php:309
-#: reporting/rep707.php:315
+#: reporting/rep706.php:278 reporting/rep706.php:303 reporting/rep707.php:311
+#: reporting/rep707.php:317
 msgid "Calculated Return"
 msgstr ""
 
 msgid "Calculated Return"
 msgstr ""
 
@@ -4394,7 +4419,7 @@ msgid "Opening Balance"
 msgstr ""
 
 #: gl/inquiry/bank_inquiry.php:130 gl/inquiry/gl_account_inquiry.php:213
 msgstr ""
 
 #: gl/inquiry/bank_inquiry.php:130 gl/inquiry/gl_account_inquiry.php:213
-#: gl/inquiry/gl_trial_balance.php:230 reporting/rep601.php:157
+#: gl/inquiry/gl_trial_balance.php:261 reporting/rep601.php:157
 #: reporting/rep602.php:157 reporting/rep704.php:191 reporting/rep708.php:262
 msgid "Ending Balance"
 msgstr ""
 #: reporting/rep602.php:157 reporting/rep704.php:191 reporting/rep708.php:262
 msgid "Ending Balance"
 msgstr ""
@@ -4424,28 +4449,28 @@ msgstr ""
 msgid "Trial Balance"
 msgstr ""
 
 msgid "Trial Balance"
 msgstr ""
 
-#: gl/inquiry/gl_trial_balance.php:60
+#: gl/inquiry/gl_trial_balance.php:61
 msgid "No zero values"
 msgstr ""
 
 msgid "No zero values"
 msgstr ""
 
-#: gl/inquiry/gl_trial_balance.php:61 reporting/reports_main.php:406
+#: gl/inquiry/gl_trial_balance.php:62 reporting/reports_main.php:406
 #: reporting/reports_main.php:456 reporting/reports_main.php:501
 msgid "Only balances"
 msgstr ""
 
 #: reporting/reports_main.php:456 reporting/reports_main.php:501
 msgid "Only balances"
 msgstr ""
 
-#: gl/inquiry/gl_trial_balance.php:93 gl/inquiry/gl_trial_balance.php:154
+#: gl/inquiry/gl_trial_balance.php:104 gl/inquiry/gl_trial_balance.php:165
 #: includes/dashboard.inc:526 reporting/rep706.php:307
 #: includes/dashboard.inc:526 reporting/rep706.php:307
-#: reporting/rep707.php:325 reporting/rep708.php:51 reporting/rep708.php:126
+#: reporting/rep707.php:327 reporting/rep708.php:51 reporting/rep708.php:126
 #: sales/create_recurrent_invoices.php:203
 #: sales/manage/recurrent_invoices.php:128
 msgid "Group"
 msgstr ""
 
 #: sales/create_recurrent_invoices.php:203
 #: sales/manage/recurrent_invoices.php:128
 msgid "Group"
 msgstr ""
 
-#: gl/inquiry/gl_trial_balance.php:172
+#: gl/inquiry/gl_trial_balance.php:203
 msgid "The from date cannot be bigger than the fiscal year end."
 msgstr ""
 
 msgid "The from date cannot be bigger than the fiscal year end."
 msgstr ""
 
-#: gl/inquiry/gl_trial_balance.php:185 gl/manage/bank_accounts.php:109
+#: gl/inquiry/gl_trial_balance.php:216 gl/manage/bank_accounts.php:109
 #: gl/view/gl_trans_view.php:95 gl/view/gl_trans_view.php:98
 #: gl/view/gl_trans_view.php:101 manufacturing/view/wo_costs_view.php:60
 #: reporting/rep701.php:110 reporting/rep702.php:53 reporting/rep705.php:235
 #: gl/view/gl_trans_view.php:95 gl/view/gl_trans_view.php:98
 #: gl/view/gl_trans_view.php:101 manufacturing/view/wo_costs_view.php:60
 #: reporting/rep701.php:110 reporting/rep702.php:53 reporting/rep705.php:235
@@ -4453,21 +4478,21 @@ msgstr ""
 msgid "Account Name"
 msgstr ""
 
 msgid "Account Name"
 msgstr ""
 
-#: gl/inquiry/gl_trial_balance.php:186 reporting/rep708.php:185
+#: gl/inquiry/gl_trial_balance.php:217 reporting/rep708.php:185
 msgid "Brought Forward"
 msgstr ""
 
 msgid "Brought Forward"
 msgstr ""
 
-#: gl/inquiry/gl_trial_balance.php:187 reporting/rep708.php:185
+#: gl/inquiry/gl_trial_balance.php:218 reporting/rep708.php:185
 msgid "This Period"
 msgstr ""
 
 msgid "This Period"
 msgstr ""
 
-#: gl/inquiry/gl_trial_balance.php:206 gl/manage/gl_account_types.php:127
+#: gl/inquiry/gl_trial_balance.php:237 gl/manage/gl_account_types.php:127
 #: includes/dashboard.inc:147 includes/dashboard.inc:170
 #: includes/dashboard.inc:147 includes/dashboard.inc:170
-#: reporting/rep451.php:70 reporting/rep451.php:76
+#: reporting/rep451.php:80 reporting/rep451.php:86
 msgid "Class"
 msgstr ""
 
 msgid "Class"
 msgstr ""
 
-#: gl/inquiry/gl_trial_balance.php:238 reporting/rep708.php:283
+#: gl/inquiry/gl_trial_balance.php:269 reporting/rep708.php:283
 msgid ""
 "The Opening Balance is not in balance, probably due to a non closed Previous "
 "Fiscalyear."
 msgid ""
 "The Opening Balance is not in balance, probably due to a non closed Previous "
 "Fiscalyear."
@@ -4513,7 +4538,7 @@ msgstr ""
 #: purchasing/view/view_supp_invoice.php:48
 #: purchasing/inquiry/po_search_completed.php:114
 #: purchasing/inquiry/po_search.php:121
 #: purchasing/view/view_supp_invoice.php:48
 #: purchasing/inquiry/po_search_completed.php:114
 #: purchasing/inquiry/po_search.php:121
-#: purchasing/inquiry/supplier_inquiry.php:181
+#: purchasing/inquiry/supplier_inquiry.php:177
 #: reporting/includes/doctext.inc:163 reporting/includes/doctext.inc:186
 msgid "Supplier's Reference"
 msgstr ""
 #: reporting/includes/doctext.inc:163 reporting/includes/doctext.inc:186
 msgid "Supplier's Reference"
 msgstr ""
@@ -4532,7 +4557,7 @@ msgstr ""
 msgid "Accumulated"
 msgstr ""
 
 msgid "Accumulated"
 msgstr ""
 
-#: gl/inquiry/profit_loss.php:31 reporting/rep707.php:255
+#: gl/inquiry/profit_loss.php:31 reporting/rep707.php:257
 #: reporting/includes/reports_classes.inc:249
 msgid "Period Y-1"
 msgstr ""
 #: reporting/includes/reports_classes.inc:249
 msgid "Period Y-1"
 msgstr ""
@@ -4633,9 +4658,9 @@ msgstr ""
 #: purchasing/inquiry/po_search.php:123
 #: purchasing/inquiry/supplier_allocation_inquiry.php:143
 #: purchasing/inquiry/supplier_allocation_inquiry.php:153
 #: purchasing/inquiry/po_search.php:123
 #: purchasing/inquiry/supplier_allocation_inquiry.php:143
 #: purchasing/inquiry/supplier_allocation_inquiry.php:153
-#: purchasing/inquiry/supplier_inquiry.php:74
-#: purchasing/inquiry/supplier_inquiry.php:184
-#: purchasing/inquiry/supplier_inquiry.php:196
+#: purchasing/inquiry/supplier_inquiry.php:50
+#: purchasing/inquiry/supplier_inquiry.php:180
+#: purchasing/inquiry/supplier_inquiry.php:192
 #: purchasing/allocations/supplier_allocation_main.php:99
 #: purchasing/allocations/supplier_allocation_main.php:107
 #: reporting/rep101.php:142 reporting/rep102.php:129 reporting/rep102.php:135
 #: purchasing/allocations/supplier_allocation_main.php:99
 #: purchasing/allocations/supplier_allocation_main.php:107
 #: reporting/rep101.php:142 reporting/rep102.php:129 reporting/rep102.php:135
@@ -4643,15 +4668,15 @@ msgstr ""
 #: reporting/rep202.php:136 reporting/rep203.php:96 reporting/rep205.php:141
 #: sales/customer_credit_invoice.php:236 sales/customer_delivery.php:328
 #: sales/customer_invoice.php:455
 #: reporting/rep202.php:136 reporting/rep203.php:96 reporting/rep205.php:141
 #: sales/customer_credit_invoice.php:236 sales/customer_delivery.php:328
 #: sales/customer_invoice.php:455
-#: sales/allocations/customer_allocation_main.php:92
-#: sales/allocations/customer_allocation_main.php:100
+#: sales/allocations/customer_allocation_main.php:97
+#: sales/allocations/customer_allocation_main.php:105
 #: sales/view/view_credit.php:70 sales/view/view_dispatch.php:86
 #: sales/view/view_invoice.php:86
 #: sales/inquiry/customer_allocation_inquiry.php:153
 #: sales/inquiry/customer_allocation_inquiry.php:163
 #: sales/view/view_credit.php:70 sales/view/view_dispatch.php:86
 #: sales/view/view_invoice.php:86
 #: sales/inquiry/customer_allocation_inquiry.php:153
 #: sales/inquiry/customer_allocation_inquiry.php:163
-#: sales/inquiry/customer_inquiry.php:76
-#: sales/inquiry/customer_inquiry.php:210
-#: sales/inquiry/customer_inquiry.php:223
+#: sales/inquiry/customer_inquiry.php:121
+#: sales/inquiry/customer_inquiry.php:201
+#: sales/inquiry/customer_inquiry.php:213
 #: sales/inquiry/sales_deliveries_view.php:178
 #: sales/inquiry/sales_orders_view.php:262
 #: sales/inquiry/sales_orders_view.php:276
 #: sales/inquiry/sales_deliveries_view.php:178
 #: sales/inquiry/sales_orders_view.php:262
 #: sales/inquiry/sales_orders_view.php:276
@@ -5468,7 +5493,7 @@ msgstr ""
 #: manufacturing/work_order_add_finished.php:186
 #: manufacturing/work_order_costs.php:133
 #: purchasing/allocations/supplier_allocate.php:56
 #: manufacturing/work_order_add_finished.php:186
 #: manufacturing/work_order_costs.php:133
 #: purchasing/allocations/supplier_allocate.php:56
-#: sales/allocations/customer_allocate.php:54
+#: sales/allocations/customer_allocate.php:59
 #: sales/includes/ui/sales_credit_ui.inc:117
 msgid "Date:"
 msgstr ""
 #: sales/includes/ui/sales_credit_ui.inc:117
 msgid "Date:"
 msgstr ""
@@ -5719,7 +5744,7 @@ msgstr ""
 msgid "Dimensions configuration"
 msgstr ""
 
 msgid "Dimensions configuration"
 msgstr ""
 
-#: includes/access_levels.inc:79 inventory/manage/items.php:455
+#: includes/access_levels.inc:79 inventory/manage/items.php:456
 #: reporting/reports_main.php:318
 msgid "Dimensions"
 msgstr ""
 #: reporting/reports_main.php:318
 msgid "Dimensions"
 msgstr ""
@@ -6056,7 +6081,7 @@ msgstr ""
 msgid "Fixed Asset disposals"
 msgstr ""
 
 msgid "Fixed Asset disposals"
 msgstr ""
 
-#: includes/access_levels.inc:207 inventory/manage/items.php:411
+#: includes/access_levels.inc:207 inventory/manage/items.php:412
 msgid "Depreciation"
 msgstr ""
 
 msgid "Depreciation"
 msgstr ""
 
@@ -6262,7 +6287,7 @@ msgstr ""
 msgid "New password for"
 msgstr ""
 
 msgid "New password for"
 msgstr ""
 
-#: includes/current_user.inc:616
+#: includes/current_user.inc:618
 msgid "Requesting data..."
 msgstr ""
 
 msgid "Requesting data..."
 msgstr ""
 
@@ -6278,13 +6303,13 @@ msgstr ""
 #: sales/create_recurrent_invoices.php:203
 #: sales/customer_credit_invoice.php:234 sales/customer_delivery.php:326
 #: sales/customer_invoice.php:431
 #: sales/create_recurrent_invoices.php:203
 #: sales/customer_credit_invoice.php:234 sales/customer_delivery.php:326
 #: sales/customer_invoice.php:431
-#: sales/allocations/customer_allocation_main.php:91
-#: sales/allocations/customer_allocation_main.php:99
+#: sales/allocations/customer_allocation_main.php:96
+#: sales/allocations/customer_allocation_main.php:104
 #: sales/manage/recurrent_invoices.php:128 sales/view/view_credit.php:47
 #: sales/inquiry/customer_allocation_inquiry.php:152
 #: sales/inquiry/customer_allocation_inquiry.php:162
 #: sales/manage/recurrent_invoices.php:128 sales/view/view_credit.php:47
 #: sales/inquiry/customer_allocation_inquiry.php:152
 #: sales/inquiry/customer_allocation_inquiry.php:162
-#: sales/inquiry/customer_inquiry.php:208
-#: sales/inquiry/customer_inquiry.php:222 sales/inquiry/customers_list.php:41
+#: sales/inquiry/customer_inquiry.php:199
+#: sales/inquiry/customer_inquiry.php:212 sales/inquiry/customers_list.php:41
 #: sales/inquiry/customers_list.php:54
 #: sales/inquiry/sales_deliveries_view.php:169
 #: sales/inquiry/sales_orders_view.php:254
 #: sales/inquiry/customers_list.php:54
 #: sales/inquiry/sales_deliveries_view.php:169
 #: sales/inquiry/sales_orders_view.php:254
@@ -6312,8 +6337,8 @@ msgstr ""
 #: purchasing/inquiry/po_search.php:119
 #: purchasing/inquiry/supplier_allocation_inquiry.php:139
 #: purchasing/inquiry/supplier_allocation_inquiry.php:152
 #: purchasing/inquiry/po_search.php:119
 #: purchasing/inquiry/supplier_allocation_inquiry.php:139
 #: purchasing/inquiry/supplier_allocation_inquiry.php:152
-#: purchasing/inquiry/supplier_inquiry.php:180
-#: purchasing/inquiry/supplier_inquiry.php:195
+#: purchasing/inquiry/supplier_inquiry.php:176
+#: purchasing/inquiry/supplier_inquiry.php:191
 #: purchasing/inquiry/suppliers_list.php:41
 #: purchasing/inquiry/suppliers_list.php:53
 #: purchasing/allocations/supplier_allocation_main.php:98
 #: purchasing/inquiry/suppliers_list.php:41
 #: purchasing/inquiry/suppliers_list.php:53
 #: purchasing/allocations/supplier_allocation_main.php:98
@@ -6442,7 +6467,7 @@ msgstr ""
 #: sales/manage/customers.php:295 sales/manage/recurrent_invoices.php:128
 #: sales/view/view_credit.php:58 sales/inquiry/customer_branches_list.php:37
 #: sales/inquiry/customer_branches_list.php:49
 #: sales/manage/customers.php:295 sales/manage/recurrent_invoices.php:128
 #: sales/view/view_credit.php:58 sales/inquiry/customer_branches_list.php:37
 #: sales/inquiry/customer_branches_list.php:49
-#: sales/inquiry/customer_inquiry.php:209
+#: sales/inquiry/customer_inquiry.php:200
 #: sales/inquiry/sales_deliveries_view.php:171
 #: sales/inquiry/sales_orders_view.php:255
 #: sales/inquiry/sales_orders_view.php:269
 #: sales/inquiry/sales_deliveries_view.php:171
 #: sales/inquiry/sales_orders_view.php:255
 #: sales/inquiry/sales_orders_view.php:269
@@ -6455,17 +6480,18 @@ msgid "Remainder"
 msgstr ""
 
 #: includes/dashboard.inc:487 includes/dashboard.inc:572
 msgstr ""
 
 #: includes/dashboard.inc:487 includes/dashboard.inc:572
-#: purchasing/inquiry/supplier_inquiry.php:68
-#: purchasing/inquiry/supplier_inquiry.php:69
-#: purchasing/inquiry/supplier_inquiry.php:70 reporting/rep102.php:116
+#: purchasing/inquiry/supplier_inquiry.php:44
+#: purchasing/inquiry/supplier_inquiry.php:45
+#: purchasing/inquiry/supplier_inquiry.php:46 reporting/rep102.php:116
 #: reporting/rep102.php:117 reporting/rep102.php:118 reporting/rep102.php:241
 #: reporting/rep102.php:117 reporting/rep102.php:118 reporting/rep102.php:241
-#: reporting/rep108.php:150 reporting/rep108.php:151 reporting/rep108.php:152
+#: reporting/rep108.php:151 reporting/rep108.php:152 reporting/rep108.php:153
 #: reporting/rep202.php:122 reporting/rep202.php:123 reporting/rep202.php:124
 #: reporting/rep202.php:156 reporting/rep202.php:157 reporting/rep202.php:158
 #: reporting/rep202.php:249 sales/create_recurrent_invoices.php:203
 #: sales/manage/recurrent_invoices.php:128
 #: reporting/rep202.php:122 reporting/rep202.php:123 reporting/rep202.php:124
 #: reporting/rep202.php:156 reporting/rep202.php:157 reporting/rep202.php:158
 #: reporting/rep202.php:249 sales/create_recurrent_invoices.php:203
 #: sales/manage/recurrent_invoices.php:128
-#: sales/inquiry/customer_inquiry.php:71 sales/inquiry/customer_inquiry.php:72
-#: sales/inquiry/customer_inquiry.php:73
+#: sales/inquiry/customer_inquiry.php:116
+#: sales/inquiry/customer_inquiry.php:117
+#: sales/inquiry/customer_inquiry.php:118
 msgid "Days"
 msgstr ""
 
 msgid "Days"
 msgstr ""
 
@@ -6509,23 +6535,28 @@ msgstr ""
 msgid "The entered reference is already in use."
 msgstr ""
 
 msgid "The entered reference is already in use."
 msgstr ""
 
-#: includes/errors.inc:124
+#: includes/errors.inc:94
+#, php-format
+msgid "Unhandled exception [%s]: %s."
+msgstr ""
+
+#: includes/errors.inc:132
 msgid "in file"
 msgstr ""
 
 msgid "in file"
 msgstr ""
 
-#: includes/errors.inc:124
+#: includes/errors.inc:132
 msgid "at line "
 msgstr ""
 
 msgid "at line "
 msgstr ""
 
-#: includes/errors.inc:176
+#: includes/errors.inc:184
 msgid "Debug mode database warning:"
 msgstr ""
 
 msgid "Debug mode database warning:"
 msgstr ""
 
-#: includes/errors.inc:178
+#: includes/errors.inc:186
 msgid "DATABASE ERROR :"
 msgstr ""
 
 msgid "DATABASE ERROR :"
 msgstr ""
 
-#: includes/errors.inc:210
+#: includes/errors.inc:218
 msgid ""
 "The entered information is a duplicate. Please go back and enter different "
 "values."
 msgid ""
 "The entered information is a duplicate. Please go back and enter different "
 "values."
@@ -6535,48 +6566,54 @@ msgstr ""
 msgid "This page is usable only with javascript enabled browsers."
 msgstr ""
 
 msgid "This page is usable only with javascript enabled browsers."
 msgstr ""
 
-#: includes/packages.inc:189
+#: includes/packages.inc:190
 #, php-format
 msgid "No key field '%s' in file '%s'"
 msgstr ""
 
 #, php-format
 msgid "No key field '%s' in file '%s'"
 msgstr ""
 
-#: includes/packages.inc:294
+#: includes/packages.inc:295
 msgid "Cannot download repo index file."
 msgstr ""
 
 msgid "Cannot download repo index file."
 msgstr ""
 
-#: includes/packages.inc:306 includes/packages.inc:343
+#: includes/packages.inc:304 includes/system_tests.inc:398
+msgid ""
+"OpenSSL have to be available on your server to use extension repository "
+"system."
+msgstr ""
+
+#: includes/packages.inc:311 includes/packages.inc:348
 #, php-format
 msgid "Cannot delete outdated '%s' file."
 msgstr ""
 
 #, php-format
 msgid "Cannot delete outdated '%s' file."
 msgstr ""
 
-#: includes/packages.inc:310
+#: includes/packages.inc:315
 msgid "Release file in repository is invalid, or public key is outdated."
 msgstr ""
 
 msgid "Release file in repository is invalid, or public key is outdated."
 msgstr ""
 
-#: includes/packages.inc:327
+#: includes/packages.inc:332
 msgid "Repository version does not match application version."
 msgstr ""
 
 msgid "Repository version does not match application version."
 msgstr ""
 
-#: includes/packages.inc:335 includes/packages.inc:377
+#: includes/packages.inc:340 includes/packages.inc:382
 #, php-format
 msgid "Cannot download '%s' file."
 msgstr ""
 
 #, php-format
 msgid "Cannot download '%s' file."
 msgstr ""
 
-#: includes/packages.inc:347
+#: includes/packages.inc:352
 #, php-format
 msgid ""
 "Security alert: broken index file in repository '%s'. Please inform "
 "repository administrator about this issue."
 msgstr ""
 
 #, php-format
 msgid ""
 "Security alert: broken index file in repository '%s'. Please inform "
 "repository administrator about this issue."
 msgstr ""
 
-#: includes/packages.inc:383
+#: includes/packages.inc:388
 #, php-format
 msgid ""
 "Security alert: broken package '%s' in repository. Please inform repository "
 "administrator about this issue."
 msgstr ""
 
 #, php-format
 msgid ""
 "Security alert: broken package '%s' in repository. Please inform repository "
 "administrator about this issue."
 msgstr ""
 
-#: includes/packages.inc:641 includes/packages.inc:696
+#: includes/packages.inc:646 includes/packages.inc:701
 #, php-format
 msgid "Package '%s' not found."
 msgstr ""
 #, php-format
 msgid "Package '%s' not found."
 msgstr ""
@@ -6753,7 +6790,7 @@ msgstr ""
 msgid "Sales Order"
 msgstr ""
 
 msgid "Sales Order"
 msgstr ""
 
-#: includes/sysnames.inc:41 sales/sales_order_entry.php:656
+#: includes/sysnames.inc:41 sales/sales_order_entry.php:655
 msgid "Sales Quotation"
 msgstr ""
 
 msgid "Sales Quotation"
 msgstr ""
 
@@ -7364,12 +7401,6 @@ msgid ""
 "OpenSSL PHP extension have to be enabled to use extension repository system."
 msgstr ""
 
 "OpenSSL PHP extension have to be enabled to use extension repository system."
 msgstr ""
 
-#: includes/system_tests.inc:398
-msgid ""
-"OpenSSL have to be available on your server to use extension repository "
-"system."
-msgstr ""
-
 #: includes/system_tests.inc:421
 msgid "Test"
 msgstr ""
 #: includes/system_tests.inc:421
 msgid "Test"
 msgstr ""
@@ -7413,7 +7444,7 @@ msgstr ""
 #: reporting/reports_main.php:502 reporting/reports_main.php:510
 #: reporting/reports_main.php:518 reporting/includes/excel_report.inc:292
 #: reporting/includes/excel_report.inc:425
 #: reporting/reports_main.php:502 reporting/reports_main.php:510
 #: reporting/reports_main.php:518 reporting/includes/excel_report.inc:292
 #: reporting/includes/excel_report.inc:425
-#: reporting/includes/pdf_report.inc:347 reporting/includes/pdf_report.inc:608
+#: reporting/includes/pdf_report.inc:358 reporting/includes/pdf_report.inc:619
 #: sales/view/view_sales_order.php:98
 msgid "Comments"
 msgstr ""
 #: sales/view/view_sales_order.php:98
 msgid "Comments"
 msgstr ""
@@ -7557,7 +7588,7 @@ msgstr ""
 
 #: includes/ui/allocation_cart.inc:290
 #: purchasing/allocations/supplier_allocation_main.php:94
 
 #: includes/ui/allocation_cart.inc:290
 #: purchasing/allocations/supplier_allocation_main.php:94
-#: sales/allocations/customer_allocation_main.php:87
+#: sales/allocations/customer_allocation_main.php:92
 msgid "Transaction Type"
 msgstr ""
 
 msgid "Transaction Type"
 msgstr ""
 
@@ -7585,7 +7616,7 @@ msgstr ""
 #: purchasing/allocations/supplier_allocation_main.php:101
 #: reporting/rep112.php:150 reporting/rep210.php:157
 #: reporting/includes/doctext.inc:166 reporting/includes/doctext.inc:207
 #: purchasing/allocations/supplier_allocation_main.php:101
 #: reporting/rep112.php:150 reporting/rep210.php:157
 #: reporting/includes/doctext.inc:166 reporting/includes/doctext.inc:207
-#: sales/allocations/customer_allocation_main.php:94
+#: sales/allocations/customer_allocation_main.php:99
 msgid "Left to Allocate"
 msgstr ""
 
 msgid "Left to Allocate"
 msgstr ""
 
@@ -7716,7 +7747,7 @@ msgstr ""
 msgid "You have to select at least one category."
 msgstr ""
 
 msgid "You have to select at least one category."
 msgstr ""
 
-#: includes/ui/db_pager_view.inc:172 includes/ui/ui_input.inc:959
+#: includes/ui/db_pager_view.inc:172 includes/ui/ui_input.inc:957
 msgid "Show also Inactive"
 msgstr ""
 
 msgid "Show also Inactive"
 msgstr ""
 
@@ -7805,212 +7836,233 @@ msgid ""
 "Do you want to abandon changes?"
 msgstr ""
 
 "Do you want to abandon changes?"
 msgstr ""
 
-#: includes/ui/ui_input.inc:656 reporting/includes/reports_classes.inc:223
+#: includes/ui/ui_input.inc:654 reporting/includes/reports_classes.inc:223
 msgid "Click Here to Pick up the date"
 msgstr ""
 
 msgid "Click Here to Pick up the date"
 msgstr ""
 
-#: includes/ui/ui_input.inc:971 includes/ui/ui_lists.inc:2330
-#: reporting/rep301.php:224 reporting/rep302.php:168 reporting/rep303.php:178
-#: reporting/rep304.php:184 reporting/rep304.php:188 reporting/rep306.php:235
-#: reporting/rep306.php:242 reporting/rep451.php:130
-#: sales/manage/customer_branches.php:292
+#: includes/ui/ui_input.inc:969 includes/ui/ui_lists.inc:2348
+#: includes/ui/ui_lists.inc.orig:2345 reporting/rep301.php:224
+#: reporting/rep302.php:168 reporting/rep303.php:178 reporting/rep304.php:184
+#: reporting/rep304.php:188 reporting/rep306.php:235 reporting/rep306.php:242
+#: reporting/rep451.php:143 sales/manage/customer_branches.php:292
 msgid "Inactive"
 msgstr ""
 
 msgid "Inactive"
 msgstr ""
 
-#: includes/ui/ui_input.inc:981 includes/ui/ui_input.inc:993
+#: includes/ui/ui_input.inc:979 includes/ui/ui_input.inc:991
 msgid "Current Credit:"
 msgstr ""
 
 msgid "Current Credit:"
 msgstr ""
 
-#: includes/ui/ui_input.inc:1007
+#: includes/ui/ui_input.inc:1005
 msgid "Bank Balance:"
 msgstr ""
 
 msgid "Bank Balance:"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:17
+#: includes/ui/ui_lists.inc:17 includes/ui/ui_lists.inc.orig:17
 msgid "Set filter"
 msgstr ""
 
 msgid "Set filter"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:99
+#: includes/ui/ui_lists.inc:99 includes/ui/ui_lists.inc.orig:99
 msgid "Press Space tab for search pattern entry"
 msgstr ""
 
 msgid "Press Space tab for search pattern entry"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:103
+#: includes/ui/ui_lists.inc:103 includes/ui/ui_lists.inc.orig:103
 msgid "Enter code fragment to search or * for all"
 msgstr ""
 
 msgid "Enter code fragment to search or * for all"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:104
+#: includes/ui/ui_lists.inc:104 includes/ui/ui_lists.inc.orig:104
 msgid "Enter description fragment to search or * for all"
 msgstr ""
 
 msgid "Enter description fragment to search or * for all"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:305 includes/ui/ui_lists.inc:309
-#: includes/ui/ui_lists.inc:313 includes/ui/ui_lists.inc:317
-#: includes/ui/ui_lists.inc:321 includes/ui/ui_lists.inc:326
-#: includes/ui/ui_lists.inc:330 inventory/inquiry/stock_list.php:42
+#: includes/ui/ui_lists.inc:308 includes/ui/ui_lists.inc:312
+#: includes/ui/ui_lists.inc:316 includes/ui/ui_lists.inc:320
+#: includes/ui/ui_lists.inc:324 includes/ui/ui_lists.inc:329
+#: includes/ui/ui_lists.inc:333 includes/ui/ui_lists.inc.orig:308
+#: includes/ui/ui_lists.inc.orig:312 includes/ui/ui_lists.inc.orig:316
+#: includes/ui/ui_lists.inc.orig:320 includes/ui/ui_lists.inc.orig:324
+#: includes/ui/ui_lists.inc.orig:329 includes/ui/ui_lists.inc.orig:333
+#: inventory/inquiry/stock_list.php:42
 msgid "Search items"
 msgstr ""
 
 msgid "Search items"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:334 sales/inquiry/customers_list.php:42
+#: includes/ui/ui_lists.inc:337 includes/ui/ui_lists.inc.orig:337
+#: sales/inquiry/customers_list.php:42
 msgid "Search customers"
 msgstr ""
 
 msgid "Search customers"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:338 sales/inquiry/customer_branches_list.php:38
+#: includes/ui/ui_lists.inc:341 includes/ui/ui_lists.inc.orig:341
+#: sales/inquiry/customer_branches_list.php:38
 msgid "Search branches"
 msgstr ""
 
 msgid "Search branches"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:342 purchasing/inquiry/suppliers_list.php:42
+#: includes/ui/ui_lists.inc:345 includes/ui/ui_lists.inc.orig:345
+#: purchasing/inquiry/suppliers_list.php:42
 msgid "Search suppliers"
 msgstr ""
 
 msgid "Search suppliers"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:526 includes/ui/ui_lists.inc:1528
+#: includes/ui/ui_lists.inc:538 includes/ui/ui_lists.inc:1546
+#: includes/ui/ui_lists.inc.orig:538 includes/ui/ui_lists.inc.orig:1543
 msgid "All Suppliers"
 msgstr ""
 
 msgid "All Suppliers"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:530
+#: includes/ui/ui_lists.inc:542 includes/ui/ui_lists.inc.orig:542
 msgid "Press Space tab to filter by name fragment"
 msgstr ""
 
 msgid "Press Space tab to filter by name fragment"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:531
+#: includes/ui/ui_lists.inc:543 includes/ui/ui_lists.inc.orig:543
 msgid "Select supplier"
 msgstr ""
 
 msgid "Select supplier"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:577
+#: includes/ui/ui_lists.inc:592 includes/ui/ui_lists.inc.orig:592
 msgid "All Customers"
 msgstr ""
 
 msgid "All Customers"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:581
+#: includes/ui/ui_lists.inc:596 includes/ui/ui_lists.inc.orig:596
 msgid "Press Space tab to filter by name fragment; F2 - entry new customer"
 msgstr ""
 
 msgid "Press Space tab to filter by name fragment; F2 - entry new customer"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:582
+#: includes/ui/ui_lists.inc:597 includes/ui/ui_lists.inc.orig:597
 msgid "Select customer"
 msgstr ""
 
 msgid "Select customer"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:627
+#: includes/ui/ui_lists.inc:642 includes/ui/ui_lists.inc.orig:642
 msgid "All branches"
 msgstr ""
 
 msgid "All branches"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:630
+#: includes/ui/ui_lists.inc:645 includes/ui/ui_lists.inc.orig:645
 msgid "Select customer branch"
 msgstr ""
 
 msgid "Select customer branch"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:666
+#: includes/ui/ui_lists.inc:681 includes/ui/ui_lists.inc.orig:681
 msgid "All Locations"
 msgstr ""
 
 msgid "All Locations"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:823 includes/ui/ui_lists.inc:907
+#: includes/ui/ui_lists.inc:838 includes/ui/ui_lists.inc:922
+#: includes/ui/ui_lists.inc.orig:838 includes/ui/ui_lists.inc.orig:922
 msgid "All Items"
 msgstr ""
 
 msgid "All Items"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:1460
+#: includes/ui/ui_lists.inc:1478 includes/ui/ui_lists.inc.orig:1475
 msgid "All Sales Types"
 msgstr ""
 
 msgid "All Sales Types"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:1807
+#: includes/ui/ui_lists.inc:1825 includes/ui/ui_lists.inc.orig:1822
 msgid "Use Item Sales Accounts"
 msgstr ""
 
 msgid "Use Item Sales Accounts"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2116 includes/ui/ui_lists.inc:2132
-#: includes/ui/ui_lists.inc:2148
+#: includes/ui/ui_lists.inc:2134 includes/ui/ui_lists.inc:2150
+#: includes/ui/ui_lists.inc:2166 includes/ui/ui_lists.inc.orig:2131
+#: includes/ui/ui_lists.inc.orig:2147 includes/ui/ui_lists.inc.orig:2163
 msgid "All Types"
 msgstr ""
 
 msgid "All Types"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2117 sales/view/view_sales_order.php:140
+#: includes/ui/ui_lists.inc:2135 includes/ui/ui_lists.inc.orig:2132
+#: sales/view/view_sales_order.php:140
 msgid "Sales Invoices"
 msgstr ""
 
 msgid "Sales Invoices"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2118 includes/ui/ui_lists.inc:2134
-#: includes/ui/ui_lists.inc:2151
-msgid "Overdue Invoices"
+#: includes/ui/ui_lists.inc:2136 includes/ui/ui_lists.inc:2169
+#: includes/ui/ui_lists.inc.orig:2133 includes/ui/ui_lists.inc.orig:2166
+msgid "Unsettled transactions"
 msgstr ""
 
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2119 includes/ui/ui_lists.inc:2135
-#: includes/ui/ui_lists.inc:2152 includes/ui/ui_view.inc:609
-#: includes/ui/ui_view.inc:613
+#: includes/ui/ui_lists.inc:2137 includes/ui/ui_lists.inc:2153
+#: includes/ui/ui_lists.inc:2170 includes/ui/ui_lists.inc.orig:2134
+#: includes/ui/ui_lists.inc.orig:2150 includes/ui/ui_lists.inc.orig:2167
+#: includes/ui/ui_view.inc:609 includes/ui/ui_view.inc:613
 msgid "Payments"
 msgstr ""
 
 msgid "Payments"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2120 includes/ui/ui_lists.inc:2136
-#: includes/ui/ui_lists.inc:2153 sales/view/view_sales_order.php:176
+#: includes/ui/ui_lists.inc:2138 includes/ui/ui_lists.inc:2154
+#: includes/ui/ui_lists.inc:2171 includes/ui/ui_lists.inc.orig:2135
+#: includes/ui/ui_lists.inc.orig:2151 includes/ui/ui_lists.inc.orig:2168
+#: sales/view/view_sales_order.php:176
 msgid "Credit Notes"
 msgstr ""
 
 msgid "Credit Notes"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2121 sales/view/view_sales_order.php:106
+#: includes/ui/ui_lists.inc:2139 includes/ui/ui_lists.inc.orig:2136
+#: sales/view/view_sales_order.php:106
 msgid "Delivery Notes"
 msgstr ""
 
 msgid "Delivery Notes"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2133 includes/ui/ui_lists.inc:2150
+#: includes/ui/ui_lists.inc:2151 includes/ui/ui_lists.inc:2168
+#: includes/ui/ui_lists.inc.orig:2148 includes/ui/ui_lists.inc.orig:2165
 msgid "Invoices"
 msgstr ""
 
 msgid "Invoices"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2137 includes/ui/ui_lists.inc:2154
+#: includes/ui/ui_lists.inc:2152 includes/ui/ui_lists.inc.orig:2149
+msgid "Overdue Invoices"
+msgstr ""
+
+#: includes/ui/ui_lists.inc:2155 includes/ui/ui_lists.inc:2172
+#: includes/ui/ui_lists.inc.orig:2152 includes/ui/ui_lists.inc.orig:2169
 msgid "Overdue Credit Notes"
 msgstr ""
 
 msgid "Overdue Credit Notes"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2149
+#: includes/ui/ui_lists.inc:2167 includes/ui/ui_lists.inc.orig:2164
 msgid "GRNs"
 msgstr ""
 
 msgid "GRNs"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2167
+#: includes/ui/ui_lists.inc:2185 includes/ui/ui_lists.inc.orig:2182
 msgid "Automatically put balance on back order"
 msgstr ""
 
 msgid "Automatically put balance on back order"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2168
+#: includes/ui/ui_lists.inc:2186 includes/ui/ui_lists.inc.orig:2183
 msgid "Cancel any quantites not delivered"
 msgstr ""
 
 msgid "Cancel any quantites not delivered"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2185
+#: includes/ui/ui_lists.inc:2203 includes/ui/ui_lists.inc.orig:2200
 msgid "Items Returned to Inventory Location"
 msgstr ""
 
 msgid "Items Returned to Inventory Location"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2186
+#: includes/ui/ui_lists.inc:2204 includes/ui/ui_lists.inc.orig:2201
 msgid "Items Written Off"
 msgstr ""
 
 msgid "Items Written Off"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2355
+#: includes/ui/ui_lists.inc:2373 includes/ui/ui_lists.inc.orig:2370
 msgid "New role"
 msgstr ""
 
 msgid "New role"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2407
+#: includes/ui/ui_lists.inc:2425 includes/ui/ui_lists.inc.orig:2422
 msgid "No tags defined."
 msgstr ""
 
 msgid "No tags defined."
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2407
+#: includes/ui/ui_lists.inc:2425 includes/ui/ui_lists.inc.orig:2422
 msgid "No active tags defined."
 msgstr ""
 
 msgid "No active tags defined."
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2445
+#: includes/ui/ui_lists.inc:2463 includes/ui/ui_lists.inc.orig:2460
 #, php-format
 msgid "Activated for '%s'"
 msgstr ""
 
 #, php-format
 msgid "Activated for '%s'"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2448
+#: includes/ui/ui_lists.inc:2466 includes/ui/ui_lists.inc.orig:2463
 msgid "Available and/or installed"
 msgstr ""
 
 msgid "Available and/or installed"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2518
+#: includes/ui/ui_lists.inc:2536 includes/ui/ui_lists.inc.orig:2533
 msgid "Standard new company American COA (4 digit)"
 msgstr ""
 
 msgid "Standard new company American COA (4 digit)"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2520
+#: includes/ui/ui_lists.inc:2538 includes/ui/ui_lists.inc.orig:2535
 msgid "Standard American COA (4 digit) with demo data"
 msgstr ""
 
 msgid "Standard American COA (4 digit) with demo data"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2541
+#: includes/ui/ui_lists.inc:2559 includes/ui/ui_lists.inc.orig:2556
 msgid "No payment Link"
 msgstr ""
 
 msgid "No payment Link"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2661
+#: includes/ui/ui_lists.inc:2679 includes/ui/ui_lists.inc.orig:2676
 msgid "Numeric"
 msgstr ""
 
 msgid "Numeric"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2661
+#: includes/ui/ui_lists.inc:2679 includes/ui/ui_lists.inc.orig:2676
 msgid "Alpha Numeric"
 msgstr ""
 
 msgid "Alpha Numeric"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2661
+#: includes/ui/ui_lists.inc:2679 includes/ui/ui_lists.inc.orig:2676
 msgid "ALPHA NUMERIC"
 msgstr ""
 
 msgid "ALPHA NUMERIC"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2677
+#: includes/ui/ui_lists.inc:2695 includes/ui/ui_lists.inc.orig:2692
 msgid "All users"
 msgstr ""
 
 msgid "All users"
 msgstr ""
 
@@ -8212,7 +8264,7 @@ msgid "The entered standard cost is negative or invalid."
 msgstr ""
 
 #: inventory/adjustments.php:228 inventory/cost_update.php:42
 msgstr ""
 
 #: inventory/adjustments.php:228 inventory/cost_update.php:42
-#: inventory/transfers.php:216 sales/sales_order_entry.php:702
+#: inventory/transfers.php:216 sales/sales_order_entry.php:701
 msgid "There are no fixed assets defined in the system."
 msgstr ""
 
 msgid "There are no fixed assets defined in the system."
 msgstr ""
 
@@ -8474,7 +8526,7 @@ msgstr ""
 #: reporting/rep105.php:120 reporting/rep301.php:171 reporting/rep302.php:130
 #: reporting/rep303.php:133 reporting/rep304.php:136 reporting/rep306.php:150
 #: reporting/rep307.php:121 reporting/rep308.php:231 reporting/rep402.php:103
 #: reporting/rep105.php:120 reporting/rep301.php:171 reporting/rep302.php:130
 #: reporting/rep303.php:133 reporting/rep304.php:136 reporting/rep306.php:150
 #: reporting/rep307.php:121 reporting/rep308.php:231 reporting/rep402.php:103
-#: reporting/rep402.php:109 reporting/rep451.php:77
+#: reporting/rep402.php:109 reporting/rep451.php:87
 #: reporting/reports_main.php:212 reporting/reports_main.php:219
 #: reporting/reports_main.php:225 reporting/reports_main.php:238
 #: reporting/reports_main.php:254 reporting/reports_main.php:264
 #: reporting/reports_main.php:212 reporting/reports_main.php:219
 #: reporting/reports_main.php:225 reporting/reports_main.php:238
 #: reporting/reports_main.php:254 reporting/reports_main.php:264
@@ -8629,7 +8681,7 @@ msgid "Unit Cost"
 msgstr ""
 
 #: inventory/includes/item_adjustments_ui.inc:57
 msgstr ""
 
 #: inventory/includes/item_adjustments_ui.inc:57
-#: inventory/manage/items.php:525
+#: inventory/manage/items.php:526
 msgid "Initial Value"
 msgstr ""
 
 msgid "Initial Value"
 msgstr ""
 
@@ -8703,9 +8755,9 @@ msgstr ""
 #: inventory/inquiry/stock_movements.php:88
 #: purchasing/includes/ui/invoice_ui.inc:483
 #: purchasing/inquiry/supplier_allocation_inquiry.php:57
 #: inventory/inquiry/stock_movements.php:88
 #: purchasing/includes/ui/invoice_ui.inc:483
 #: purchasing/inquiry/supplier_allocation_inquiry.php:57
-#: purchasing/inquiry/supplier_inquiry.php:56
+#: purchasing/inquiry/supplier_inquiry.php:147
 #: sales/inquiry/customer_allocation_inquiry.php:51
 #: sales/inquiry/customer_allocation_inquiry.php:51
-#: sales/inquiry/customer_inquiry.php:54
+#: sales/inquiry/customer_inquiry.php:164
 msgid "Refresh Inquiry"
 msgstr ""
 
 msgid "Refresh Inquiry"
 msgstr ""
 
@@ -8828,35 +8880,35 @@ msgstr ""
 msgid "Default values for new items"
 msgstr ""
 
 msgid "Default values for new items"
 msgstr ""
 
-#: inventory/manage/item_categories.php:212 inventory/manage/items.php:394
+#: inventory/manage/item_categories.php:212 inventory/manage/items.php:395
 msgid "Item Tax Type:"
 msgstr ""
 
 msgid "Item Tax Type:"
 msgstr ""
 
-#: inventory/manage/item_categories.php:217 inventory/manage/items.php:397
+#: inventory/manage/item_categories.php:217 inventory/manage/items.php:398
 msgid "Item Type:"
 msgstr ""
 
 msgid "Item Type:"
 msgstr ""
 
-#: inventory/manage/item_categories.php:219 inventory/manage/items.php:399
+#: inventory/manage/item_categories.php:219 inventory/manage/items.php:400
 msgid "Units of Measure:"
 msgstr ""
 
 msgid "Units of Measure:"
 msgstr ""
 
-#: inventory/manage/item_categories.php:224 inventory/manage/items.php:406
+#: inventory/manage/item_categories.php:224 inventory/manage/items.php:407
 msgid "Exclude from sales:"
 msgstr ""
 
 msgid "Exclude from sales:"
 msgstr ""
 
-#: inventory/manage/item_categories.php:226 inventory/manage/items.php:408
+#: inventory/manage/item_categories.php:226 inventory/manage/items.php:409
 msgid "Exclude from purchases:"
 msgstr ""
 
 msgid "Exclude from purchases:"
 msgstr ""
 
-#: inventory/manage/item_categories.php:238 inventory/manage/items.php:471
+#: inventory/manage/item_categories.php:238 inventory/manage/items.php:472
 msgid "Asset account:"
 msgstr ""
 
 msgid "Asset account:"
 msgstr ""
 
-#: inventory/manage/item_categories.php:239 inventory/manage/items.php:472
+#: inventory/manage/item_categories.php:239 inventory/manage/items.php:473
 msgid "Depreciation cost account:"
 msgstr ""
 
 msgid "Depreciation cost account:"
 msgstr ""
 
-#: inventory/manage/item_categories.php:240 inventory/manage/items.php:473
+#: inventory/manage/item_categories.php:240 inventory/manage/items.php:474
 msgid "Depreciation/Disposal account:"
 msgstr ""
 
 msgid "Depreciation/Disposal account:"
 msgstr ""
 
@@ -8868,7 +8920,7 @@ msgstr ""
 msgid "Foreign Item Codes"
 msgstr ""
 
 msgid "Foreign Item Codes"
 msgstr ""
 
-#: inventory/manage/item_codes.php:26 sales/sales_order_entry.php:704
+#: inventory/manage/item_codes.php:26 sales/sales_order_entry.php:703
 msgid "There are no inventory items defined in the system."
 msgstr ""
 
 msgid "There are no inventory items defined in the system."
 msgstr ""
 
@@ -8917,7 +8969,7 @@ msgstr ""
 #: manufacturing/manage/work_centres.php:138
 #: sales/create_recurrent_invoices.php:179 sales/manage/credit_status.php:145
 #: sales/manage/recurrent_invoices.php:191 taxes/item_tax_types.php:173
 #: manufacturing/manage/work_centres.php:138
 #: sales/create_recurrent_invoices.php:179 sales/manage/credit_status.php:145
 #: sales/manage/recurrent_invoices.php:191 taxes/item_tax_types.php:173
-#: taxes/tax_groups.php:162 taxes/tax_types.php:158
+#: taxes/tax_groups.php:165 taxes/tax_types.php:158
 msgid "Description:"
 msgstr ""
 
 msgid "Description:"
 msgstr ""
 
@@ -8998,126 +9050,126 @@ msgstr ""
 msgid "Item Code:"
 msgstr ""
 
 msgid "Item Code:"
 msgstr ""
 
-#: inventory/manage/items.php:401
+#: inventory/manage/items.php:402
 msgid "Editable description:"
 msgstr ""
 
 msgid "Editable description:"
 msgstr ""
 
-#: inventory/manage/items.php:413
+#: inventory/manage/items.php:414
 msgid "Fixed Asset Class"
 msgstr ""
 
 msgid "Fixed Asset Class"
 msgstr ""
 
-#: inventory/manage/items.php:415
+#: inventory/manage/items.php:416
 msgid "Depreciation Method"
 msgstr ""
 
 msgid "Depreciation Method"
 msgstr ""
 
-#: inventory/manage/items.php:426 inventory/manage/items.php:435
+#: inventory/manage/items.php:427 inventory/manage/items.php:436
 msgid "Depreciation Rate"
 msgstr ""
 
 msgid "Depreciation Rate"
 msgstr ""
 
-#: inventory/manage/items.php:430
+#: inventory/manage/items.php:431
 msgid "Depreciation Years"
 msgstr ""
 
 msgid "Depreciation Years"
 msgstr ""
 
-#: inventory/manage/items.php:430
+#: inventory/manage/items.php:431
 msgid "years"
 msgstr ""
 
 msgid "years"
 msgstr ""
 
-#: inventory/manage/items.php:433
+#: inventory/manage/items.php:434
 msgid "Base Rate"
 msgstr ""
 
 msgid "Base Rate"
 msgstr ""
 
-#: inventory/manage/items.php:438
+#: inventory/manage/items.php:439
 msgid "Rate multiplier"
 msgstr ""
 
 msgid "Rate multiplier"
 msgstr ""
 
-#: inventory/manage/items.php:442 inventory/manage/items.php:445
+#: inventory/manage/items.php:443 inventory/manage/items.php:446
 msgid "Depreciation Start"
 msgstr ""
 
 msgid "Depreciation Start"
 msgstr ""
 
-#: inventory/manage/items.php:446
+#: inventory/manage/items.php:447
 msgid "Last Depreciation"
 msgstr ""
 
 msgid "Last Depreciation"
 msgstr ""
 
-#: inventory/manage/items.php:494
+#: inventory/manage/items.php:495
 msgid "Other"
 msgstr ""
 
 msgid "Other"
 msgstr ""
 
-#: inventory/manage/items.php:497
+#: inventory/manage/items.php:498
 msgid "Image File (.jpg)"
 msgstr ""
 
 msgid "Image File (.jpg)"
 msgstr ""
 
-#: inventory/manage/items.php:512
+#: inventory/manage/items.php:513
 msgid "No image"
 msgstr ""
 
 msgid "No image"
 msgstr ""
 
-#: inventory/manage/items.php:517
+#: inventory/manage/items.php:518
 msgid "Delete Image:"
 msgstr ""
 
 msgid "Delete Image:"
 msgstr ""
 
-#: inventory/manage/items.php:519
+#: inventory/manage/items.php:520
 msgid "Item status:"
 msgstr ""
 
 msgid "Item status:"
 msgstr ""
 
-#: inventory/manage/items.php:521
+#: inventory/manage/items.php:522
 msgid "Values"
 msgstr ""
 
 msgid "Values"
 msgstr ""
 
-#: inventory/manage/items.php:526 reporting/rep451.php:70
+#: inventory/manage/items.php:527 reporting/rep451.php:80
 msgid "Depreciations"
 msgstr ""
 
 msgid "Depreciations"
 msgstr ""
 
-#: inventory/manage/items.php:527
+#: inventory/manage/items.php:528
 msgid "Current Value"
 msgstr ""
 
 msgid "Current Value"
 msgstr ""
 
-#: inventory/manage/items.php:535
+#: inventory/manage/items.php:537
 msgid "Insert New Item"
 msgstr ""
 
 msgid "Insert New Item"
 msgstr ""
 
-#: inventory/manage/items.php:539
+#: inventory/manage/items.php:541
 msgid "Update Item"
 msgstr ""
 
 msgid "Update Item"
 msgstr ""
 
-#: inventory/manage/items.php:542
+#: inventory/manage/items.php:544
 msgid "Select this items and return to document entry."
 msgstr ""
 
 msgid "Select this items and return to document entry."
 msgstr ""
 
-#: inventory/manage/items.php:543
+#: inventory/manage/items.php:545
 msgid "Clone This Item"
 msgstr ""
 
 msgid "Clone This Item"
 msgstr ""
 
-#: inventory/manage/items.php:544
+#: inventory/manage/items.php:546
 msgid "Delete This Item"
 msgstr ""
 
 msgid "Delete This Item"
 msgstr ""
 
-#: inventory/manage/items.php:559
+#: inventory/manage/items.php:561
 msgid "Select an item:"
 msgstr ""
 
 msgid "Select an item:"
 msgstr ""
 
-#: inventory/manage/items.php:560
+#: inventory/manage/items.php:562
 msgid "New item"
 msgstr ""
 
 msgid "New item"
 msgstr ""
 
-#: inventory/manage/items.php:584 inventory/manage/items.php:587
-#: purchasing/manage/suppliers.php:309 sales/manage/customer_branches.php:310
-#: sales/manage/customers.php:350
+#: inventory/manage/items.php:586 inventory/manage/items.php:589
+#: purchasing/manage/suppliers.php:311 sales/manage/customer_branches.php:310
+#: sales/manage/customers.php:351
 msgid "&General settings"
 msgstr ""
 
 msgid "&General settings"
 msgstr ""
 
-#: inventory/manage/items.php:585 inventory/manage/items.php:593
-#: purchasing/manage/suppliers.php:311 sales/manage/customers.php:352
+#: inventory/manage/items.php:587 inventory/manage/items.php:595
+#: purchasing/manage/suppliers.php:313 sales/manage/customers.php:353
 msgid "&Transactions"
 msgstr ""
 
 msgid "&Transactions"
 msgstr ""
 
-#: inventory/manage/items.php:588
+#: inventory/manage/items.php:590
 msgid "S&ales Pricing"
 msgstr ""
 
 msgid "S&ales Pricing"
 msgstr ""
 
-#: inventory/manage/items.php:589
+#: inventory/manage/items.php:591
 msgid "&Purchasing Pricing"
 msgstr ""
 
 msgid "&Purchasing Pricing"
 msgstr ""
 
-#: inventory/manage/items.php:594
+#: inventory/manage/items.php:596
 msgid "&Status"
 msgstr ""
 
 msgid "&Status"
 msgstr ""
 
@@ -9492,7 +9544,7 @@ msgstr ""
 
 #: manufacturing/work_order_add_finished.php:200
 #: purchasing/allocations/supplier_allocate.php:75
 
 #: manufacturing/work_order_add_finished.php:200
 #: purchasing/allocations/supplier_allocate.php:75
-#: sales/allocations/customer_allocate.php:73
+#: sales/allocations/customer_allocate.php:78
 msgid "Process"
 msgstr ""
 
 msgid "Process"
 msgstr ""
 
@@ -10087,7 +10139,7 @@ msgstr ""
 msgid "Issue to"
 msgstr ""
 
 msgid "Issue to"
 msgstr ""
 
-#: manufacturing/includes/db/work_order_produce_items_db.inc:94
+#: manufacturing/includes/db/work_order_produce_items_db.inc:95
 msgid "Production."
 msgstr ""
 
 msgid "Production."
 msgstr ""
 
@@ -10339,15 +10391,15 @@ msgstr ""
 msgid "Credits can only be applied to invoiced items."
 msgstr ""
 
 msgid "Credits can only be applied to invoiced items."
 msgstr ""
 
-#: purchasing/includes/ui/po_ui.inc:135 sales/sales_order_entry.php:728
+#: purchasing/includes/ui/po_ui.inc:135 sales/sales_order_entry.php:727
 msgid "Order Date:"
 msgstr ""
 
 msgid "Order Date:"
 msgstr ""
 
-#: purchasing/includes/ui/po_ui.inc:136 sales/sales_order_entry.php:715
+#: purchasing/includes/ui/po_ui.inc:136 sales/sales_order_entry.php:714
 msgid "Delivery Date:"
 msgstr ""
 
 msgid "Delivery Date:"
 msgstr ""
 
-#: purchasing/includes/ui/po_ui.inc:136 sales/sales_order_entry.php:709
+#: purchasing/includes/ui/po_ui.inc:136 sales/sales_order_entry.php:708
 msgid "Invoice Date:"
 msgstr ""
 
 msgid "Invoice Date:"
 msgstr ""
 
@@ -10414,7 +10466,7 @@ msgstr ""
 
 #: purchasing/includes/ui/po_ui.inc:283
 #: purchasing/allocations/supplier_allocate.php:74
 
 #: purchasing/includes/ui/po_ui.inc:283
 #: purchasing/allocations/supplier_allocate.php:74
-#: sales/allocations/customer_allocate.php:72
+#: sales/allocations/customer_allocate.php:77
 #: sales/includes/ui/sales_order_ui.inc:231
 msgid "Refresh"
 msgstr ""
 #: sales/includes/ui/sales_order_ui.inc:231
 msgid "Refresh"
 msgstr ""
@@ -10566,7 +10618,7 @@ msgstr ""
 msgid "Enter a new purchase order"
 msgstr ""
 
 msgid "Enter a new purchase order"
 msgstr ""
 
-#: purchasing/po_entry_items.php:228 sales/sales_order_entry.php:519
+#: purchasing/po_entry_items.php:228 sales/sales_order_entry.php:518
 msgid "Item description cannot be empty."
 msgstr ""
 
 msgid "Item description cannot be empty."
 msgstr ""
 
@@ -10642,7 +10694,7 @@ msgstr ""
 msgid "Required prepayment is greater than total invoice value."
 msgstr ""
 
 msgid "Required prepayment is greater than total invoice value."
 msgstr ""
 
-#: purchasing/po_entry_items.php:491 sales/sales_order_entry.php:732
+#: purchasing/po_entry_items.php:491 sales/sales_order_entry.php:731
 msgid "Place Order"
 msgstr ""
 
 msgid "Place Order"
 msgstr ""
 
@@ -10650,7 +10702,7 @@ msgstr ""
 msgid "Update Order"
 msgstr ""
 
 msgid "Update Order"
 msgstr ""
 
-#: purchasing/po_entry_items.php:493 sales/sales_order_entry.php:731
+#: purchasing/po_entry_items.php:493 sales/sales_order_entry.php:730
 msgid "Cancel Order"
 msgstr ""
 
 msgid "Cancel Order"
 msgstr ""
 
@@ -10674,7 +10726,7 @@ msgstr ""
 msgid "Update Invoice"
 msgstr ""
 
 msgid "Update Invoice"
 msgstr ""
 
-#: purchasing/po_entry_items.php:502 sales/sales_order_entry.php:712
+#: purchasing/po_entry_items.php:502 sales/sales_order_entry.php:711
 msgid "Cancel Invoice"
 msgstr ""
 
 msgid "Cancel Invoice"
 msgstr ""
 
@@ -11025,9 +11077,9 @@ msgstr ""
 
 #: purchasing/view/view_po.php:100
 #: purchasing/inquiry/supplier_allocation_inquiry.php:158
 
 #: purchasing/view/view_po.php:100
 #: purchasing/inquiry/supplier_allocation_inquiry.php:158
-#: purchasing/inquiry/supplier_inquiry.php:201
+#: purchasing/inquiry/supplier_inquiry.php:199
 #: sales/inquiry/customer_allocation_inquiry.php:167
 #: sales/inquiry/customer_allocation_inquiry.php:167
-#: sales/inquiry/customer_inquiry.php:229
+#: sales/inquiry/customer_inquiry.php:219
 #: sales/inquiry/sales_deliveries_view.php:195
 #: sales/inquiry/sales_orders_view.php:311
 msgid "Marked items are overdue."
 #: sales/inquiry/sales_deliveries_view.php:195
 #: sales/inquiry/sales_orders_view.php:311
 msgid "Marked items are overdue."
@@ -11081,7 +11133,7 @@ msgstr ""
 msgid "TOTAL INVOICE"
 msgstr ""
 
 msgid "TOTAL INVOICE"
 msgstr ""
 
-#: purchasing/view/view_supp_invoice.php:77 sales/view/view_invoice.php:172
+#: purchasing/view/view_supp_invoice.php:77 sales/view/view_invoice.php:175
 msgid "This invoice has been voided."
 msgstr ""
 
 msgid "This invoice has been voided."
 msgstr ""
 
@@ -11210,75 +11262,79 @@ msgstr ""
 msgid "Supplier status:"
 msgstr ""
 
 msgid "Supplier status:"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:172
+#: purchasing/manage/suppliers.php:173
 msgid "Update Supplier"
 msgstr ""
 
 msgid "Update Supplier"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:173
+#: purchasing/manage/suppliers.php:174
 msgid "Update supplier data"
 msgstr ""
 
 msgid "Update supplier data"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:174
+#: purchasing/manage/suppliers.php:175
 msgid "Select this supplier and return to document entry."
 msgstr ""
 
 msgid "Select this supplier and return to document entry."
 msgstr ""
 
-#: purchasing/manage/suppliers.php:175
+#: purchasing/manage/suppliers.php:176
 msgid "Delete Supplier"
 msgstr ""
 
 msgid "Delete Supplier"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:176
+#: purchasing/manage/suppliers.php:177
 msgid "Delete supplier data if have been never used"
 msgstr ""
 
 msgid "Delete supplier data if have been never used"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:180
+#: purchasing/manage/suppliers.php:181
 msgid "Add New Supplier Details"
 msgstr ""
 
 msgid "Add New Supplier Details"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:199
+#: purchasing/manage/suppliers.php:200
 msgid "The supplier name must be entered."
 msgstr ""
 
 msgid "The supplier name must be entered."
 msgstr ""
 
-#: purchasing/manage/suppliers.php:206
+#: purchasing/manage/suppliers.php:207
 msgid "The supplier short name must be entered."
 msgstr ""
 
 msgid "The supplier short name must be entered."
 msgstr ""
 
-#: purchasing/manage/suppliers.php:226
+#: purchasing/manage/suppliers.php:227
 msgid "Supplier has been updated."
 msgstr ""
 
 msgid "Supplier has been updated."
 msgstr ""
 
-#: purchasing/manage/suppliers.php:244
+#: purchasing/manage/suppliers.php:245
 msgid "A new supplier has been added."
 msgstr ""
 
 msgid "A new supplier has been added."
 msgstr ""
 
-#: purchasing/manage/suppliers.php:262
+#: purchasing/manage/suppliers.php:263
 msgid ""
 "Cannot delete this supplier because there are transactions that refer to "
 "this supplier."
 msgstr ""
 
 msgid ""
 "Cannot delete this supplier because there are transactions that refer to "
 "this supplier."
 msgstr ""
 
-#: purchasing/manage/suppliers.php:270
+#: purchasing/manage/suppliers.php:271
 msgid ""
 "Cannot delete the supplier record because purchase orders have been created "
 "against this supplier."
 msgstr ""
 
 msgid ""
 "Cannot delete the supplier record because purchase orders have been created "
 "against this supplier."
 msgstr ""
 
-#: purchasing/manage/suppliers.php:290
+#: purchasing/manage/suppliers.php:282
+msgid "Supplier has been deleted."
+msgstr ""
+
+#: purchasing/manage/suppliers.php:292
 #: purchasing/inquiry/po_search_completed.php:95
 #: purchasing/inquiry/po_search.php:76
 #: purchasing/inquiry/supplier_allocation_inquiry.php:48
 msgid "Select a supplier: "
 msgstr ""
 
 #: purchasing/inquiry/po_search_completed.php:95
 #: purchasing/inquiry/po_search.php:76
 #: purchasing/inquiry/supplier_allocation_inquiry.php:48
 msgid "Select a supplier: "
 msgstr ""
 
-#: purchasing/manage/suppliers.php:291
+#: purchasing/manage/suppliers.php:293
 msgid "New supplier"
 msgstr ""
 
 msgid "New supplier"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:310 sales/manage/customer_branches.php:311
-#: sales/manage/customers.php:351
+#: purchasing/manage/suppliers.php:312 sales/manage/customer_branches.php:311
+#: sales/manage/customers.php:352
 msgid "&Contacts"
 msgstr ""
 
 msgid "&Contacts"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:312
+#: purchasing/manage/suppliers.php:314
 msgid "Purchase &Orders"
 msgstr ""
 
 msgid "Purchase &Orders"
 msgstr ""
 
@@ -11347,43 +11403,43 @@ msgstr ""
 msgid "Supplier Inquiry"
 msgstr ""
 
 msgid "Supplier Inquiry"
 msgstr ""
 
-#: purchasing/inquiry/supplier_inquiry.php:49
-msgid "Select a supplier:"
-msgstr ""
-
-#: purchasing/inquiry/supplier_inquiry.php:70 reporting/rep102.php:118
-#: reporting/rep108.php:152 reporting/rep202.php:124 reporting/rep202.php:158
-#: sales/inquiry/customer_inquiry.php:73
+#: purchasing/inquiry/supplier_inquiry.php:46 reporting/rep102.php:118
+#: reporting/rep108.php:153 reporting/rep202.php:124 reporting/rep202.php:158
+#: sales/inquiry/customer_inquiry.php:118
 msgid "Over"
 msgstr ""
 
 msgid "Over"
 msgstr ""
 
-#: purchasing/inquiry/supplier_inquiry.php:74
-#: sales/inquiry/customer_inquiry.php:76
+#: purchasing/inquiry/supplier_inquiry.php:50
+#: sales/inquiry/customer_inquiry.php:121
 msgid "Terms"
 msgstr ""
 
 msgid "Terms"
 msgstr ""
 
-#: purchasing/inquiry/supplier_inquiry.php:74 reporting/rep102.php:121
-#: reporting/rep102.php:239 reporting/rep108.php:154 reporting/rep202.php:128
-#: reporting/rep202.php:247 reporting/rep451.php:70
-#: sales/inquiry/customer_inquiry.php:76
+#: purchasing/inquiry/supplier_inquiry.php:50 reporting/rep102.php:121
+#: reporting/rep102.php:239 reporting/rep108.php:155 reporting/rep202.php:128
+#: reporting/rep202.php:247 reporting/rep451.php:80
+#: sales/inquiry/customer_inquiry.php:121
 msgid "Current"
 msgstr ""
 
 msgid "Current"
 msgstr ""
 
-#: purchasing/inquiry/supplier_inquiry.php:75 reporting/rep102.php:122
-#: reporting/rep108.php:154 reporting/rep202.php:129
-#: sales/inquiry/customer_inquiry.php:77
+#: purchasing/inquiry/supplier_inquiry.php:51 reporting/rep102.php:122
+#: reporting/rep108.php:155 reporting/rep202.php:129
+#: sales/inquiry/customer_inquiry.php:122
 msgid "Total Balance"
 msgstr ""
 
 msgid "Total Balance"
 msgstr ""
 
-#: purchasing/inquiry/supplier_inquiry.php:133
-#: sales/inquiry/customer_inquiry.php:163
+#: purchasing/inquiry/supplier_inquiry.php:94
+#: sales/inquiry/customer_inquiry.php:74
 msgid "Credit This"
 msgstr ""
 
 msgid "Credit This"
 msgstr ""
 
-#: purchasing/inquiry/supplier_inquiry.php:155
+#: purchasing/inquiry/supplier_inquiry.php:109
 msgid "Print Remittance"
 msgstr ""
 
 msgid "Print Remittance"
 msgstr ""
 
+#: purchasing/inquiry/supplier_inquiry.php:137
+msgid "Select a supplier:"
+msgstr ""
+
 #: purchasing/inquiry/suppliers_list.php:53
 #: sales/inquiry/customers_list.php:54
 msgid "Tax ID"
 #: purchasing/inquiry/suppliers_list.php:53
 #: sales/inquiry/customers_list.php:54
 msgid "Tax ID"
@@ -11398,41 +11454,41 @@ msgid "Allocation of"
 msgstr ""
 
 #: purchasing/allocations/supplier_allocate.php:58
 msgstr ""
 
 #: purchasing/allocations/supplier_allocate.php:58
-#: sales/allocations/customer_allocate.php:55
+#: sales/allocations/customer_allocate.php:60
 msgid "Total:"
 msgstr ""
 
 #: purchasing/allocations/supplier_allocate.php:62
 msgid "Total:"
 msgstr ""
 
 #: purchasing/allocations/supplier_allocate.php:62
-#: sales/allocations/customer_allocate.php:59
+#: sales/allocations/customer_allocate.php:64
 msgid "Amount ot be settled:"
 msgstr ""
 
 #: purchasing/allocations/supplier_allocate.php:74
 msgid "Amount ot be settled:"
 msgstr ""
 
 #: purchasing/allocations/supplier_allocate.php:74
-#: sales/allocations/customer_allocate.php:72
+#: sales/allocations/customer_allocate.php:77
 msgid "Start again allocation of selected amount"
 msgstr ""
 
 #: purchasing/allocations/supplier_allocate.php:75
 msgid "Start again allocation of selected amount"
 msgstr ""
 
 #: purchasing/allocations/supplier_allocate.php:75
-#: sales/allocations/customer_allocate.php:73
+#: sales/allocations/customer_allocate.php:78
 msgid "Process allocations"
 msgstr ""
 
 #: purchasing/allocations/supplier_allocate.php:76
 #: purchasing/allocations/supplier_allocate.php:82
 msgid "Process allocations"
 msgstr ""
 
 #: purchasing/allocations/supplier_allocate.php:76
 #: purchasing/allocations/supplier_allocate.php:82
-#: sales/allocations/customer_allocate.php:74
-#: sales/allocations/customer_allocate.php:80
+#: sales/allocations/customer_allocate.php:79
+#: sales/allocations/customer_allocate.php:85
 msgid "Back to Allocations"
 msgstr ""
 
 #: purchasing/allocations/supplier_allocate.php:77
 #: purchasing/allocations/supplier_allocate.php:83
 msgid "Back to Allocations"
 msgstr ""
 
 #: purchasing/allocations/supplier_allocate.php:77
 #: purchasing/allocations/supplier_allocate.php:83
-#: sales/allocations/customer_allocate.php:74
-#: sales/allocations/customer_allocate.php:81
+#: sales/allocations/customer_allocate.php:79
+#: sales/allocations/customer_allocate.php:86
 msgid "Abandon allocations and return to selection of allocatable amounts"
 msgstr ""
 
 #: purchasing/allocations/supplier_allocate.php:81
 msgid "Abandon allocations and return to selection of allocatable amounts"
 msgstr ""
 
 #: purchasing/allocations/supplier_allocate.php:81
-#: sales/allocations/customer_allocate.php:78
+#: sales/allocations/customer_allocate.php:83
 msgid "There are no unsettled transactions to allocate."
 msgstr ""
 
 msgid "There are no unsettled transactions to allocate."
 msgstr ""
 
@@ -11455,7 +11511,7 @@ msgid "Allocate"
 msgstr ""
 
 #: purchasing/allocations/supplier_allocation_main.php:111
 msgstr ""
 
 #: purchasing/allocations/supplier_allocation_main.php:111
-#: sales/allocations/customer_allocation_main.php:104
+#: sales/allocations/customer_allocation_main.php:109
 msgid "Marked items are settled."
 msgstr ""
 
 msgid "Marked items are settled."
 msgstr ""
 
@@ -11492,11 +11548,11 @@ msgstr ""
 msgid "Customer Balances"
 msgstr ""
 
 msgid "Customer Balances"
 msgstr ""
 
-#: reporting/rep101.php:256 reporting/rep102.php:226 reporting/rep106.php:181
+#: reporting/rep101.php:262 reporting/rep102.php:226 reporting/rep106.php:181
 #: reporting/rep201.php:232 reporting/rep202.php:233 reporting/rep203.php:176
 #: reporting/rep204.php:148 reporting/rep301.php:249 reporting/rep304.php:212
 #: reporting/rep305.php:193 reporting/rep306.php:293 reporting/rep309.php:157
 #: reporting/rep201.php:232 reporting/rep202.php:233 reporting/rep203.php:176
 #: reporting/rep204.php:148 reporting/rep301.php:249 reporting/rep304.php:212
 #: reporting/rep305.php:193 reporting/rep306.php:293 reporting/rep309.php:157
-#: reporting/rep451.php:151
+#: reporting/rep451.php:164
 msgid "Grand Total"
 msgstr ""
 
 msgid "Grand Total"
 msgstr ""
 
@@ -11513,7 +11569,7 @@ msgid "Detailed Report"
 msgstr ""
 
 #: reporting/rep102.php:127 reporting/rep202.php:134 reporting/rep203.php:94
 msgstr ""
 
 #: reporting/rep102.php:127 reporting/rep202.php:134 reporting/rep203.php:94
-#: reporting/rep301.php:169 reporting/rep451.php:75
+#: reporting/rep301.php:169 reporting/rep451.php:85
 #: reporting/reports_main.php:37 reporting/reports_main.php:46
 #: reporting/reports_main.php:67 reporting/reports_main.php:83
 #: reporting/reports_main.php:92 reporting/reports_main.php:154
 #: reporting/reports_main.php:37 reporting/reports_main.php:46
 #: reporting/reports_main.php:67 reporting/reports_main.php:83
 #: reporting/reports_main.php:92 reporting/reports_main.php:154
@@ -11624,7 +11680,7 @@ msgstr ""
 
 #: reporting/rep104.php:109 reporting/rep301.php:164 reporting/rep303.php:120
 #: reporting/rep303.php:126 reporting/rep307.php:114 reporting/rep308.php:223
 
 #: reporting/rep104.php:109 reporting/rep301.php:164 reporting/rep303.php:120
 #: reporting/rep303.php:126 reporting/rep307.php:114 reporting/rep308.php:223
-#: reporting/rep451.php:70
+#: reporting/rep451.php:80
 msgid "UOM"
 msgstr ""
 
 msgid "UOM"
 msgstr ""
 
@@ -11654,7 +11710,7 @@ msgstr ""
 
 #: reporting/rep105.php:109 reporting/rep204.php:84
 #: sales/inquiry/customer_allocation_inquiry.php:149
 
 #: reporting/rep105.php:109 reporting/rep204.php:84
 #: sales/inquiry/customer_allocation_inquiry.php:149
-#: sales/inquiry/customer_inquiry.php:204
+#: sales/inquiry/customer_inquiry.php:195
 msgid "Order"
 msgstr ""
 
 msgid "Order"
 msgstr ""
 
@@ -11751,11 +11807,11 @@ msgstr ""
 msgid "Outstanding Transactions"
 msgstr ""
 
 msgid "Outstanding Transactions"
 msgstr ""
 
-#: reporting/rep108.php:169
+#: reporting/rep108.php:170
 msgid "Statement"
 msgstr ""
 
 msgid "Statement"
 msgstr ""
 
-#: reporting/rep108.php:169
+#: reporting/rep108.php:170
 msgid "as of"
 msgstr ""
 
 msgid "as of"
 msgstr ""
 
@@ -11847,7 +11903,7 @@ msgstr ""
 msgid "Total ex. Tax"
 msgstr ""
 
 msgid "Total ex. Tax"
 msgstr ""
 
-#: reporting/rep114.php:95 reporting/rep709.php:117 taxes/tax_groups.php:171
+#: reporting/rep114.php:95 reporting/rep709.php:117 taxes/tax_groups.php:174
 msgid "Tax"
 msgstr ""
 
 msgid "Tax"
 msgstr ""
 
@@ -12080,11 +12136,11 @@ msgstr ""
 msgid "WORK ORDER"
 msgstr ""
 
 msgid "WORK ORDER"
 msgstr ""
 
-#: reporting/rep451.php:70
+#: reporting/rep451.php:80
 msgid "Initial"
 msgstr ""
 
 msgid "Initial"
 msgstr ""
 
-#: reporting/rep451.php:79
+#: reporting/rep451.php:89
 msgid "Fixed Assets Valuation Report"
 msgstr ""
 
 msgid "Fixed Assets Valuation Report"
 msgstr ""
 
@@ -12169,7 +12225,7 @@ msgstr ""
 msgid "Close Balance"
 msgstr ""
 
 msgid "Close Balance"
 msgstr ""
 
-#: reporting/rep707.php:258
+#: reporting/rep707.php:260
 msgid "Profit and Loss Statement"
 msgstr ""
 
 msgid "Profit and Loss Statement"
 msgstr ""
 
@@ -12755,7 +12811,7 @@ msgstr ""
 msgid "DueDate"
 msgstr ""
 
 msgid "DueDate"
 msgstr ""
 
-#: reporting/includes/doctext.inc:271 reporting/includes/pdf_report.inc:1006
+#: reporting/includes/doctext.inc:271 reporting/includes/pdf_report.inc:1017
 msgid "You can pay through"
 msgstr ""
 
 msgid "You can pay through"
 msgstr ""
 
@@ -12769,12 +12825,12 @@ msgid ""
 msgstr ""
 
 #: reporting/includes/excel_report.inc:259
 msgstr ""
 
 #: reporting/includes/excel_report.inc:259
-#: reporting/includes/pdf_report.inc:317
+#: reporting/includes/pdf_report.inc:328
 msgid "Print Out Date"
 msgstr ""
 
 #: reporting/includes/excel_report.inc:265
 msgid "Print Out Date"
 msgstr ""
 
 #: reporting/includes/excel_report.inc:265
-#: reporting/includes/pdf_report.inc:326
+#: reporting/includes/pdf_report.inc:337
 msgid "Fiscal Year"
 msgstr ""
 
 msgid "Fiscal Year"
 msgstr ""
 
@@ -12783,12 +12839,12 @@ msgid "Report Date"
 msgstr ""
 
 #: reporting/includes/excel_report.inc:410
 msgstr ""
 
 #: reporting/includes/excel_report.inc:410
-#: reporting/includes/pdf_report.inc:590
+#: reporting/includes/pdf_report.inc:601
 msgid "Generated At"
 msgstr ""
 
 #: reporting/includes/excel_report.inc:416
 msgid "Generated At"
 msgstr ""
 
 #: reporting/includes/excel_report.inc:416
-#: reporting/includes/pdf_report.inc:599
+#: reporting/includes/pdf_report.inc:610
 msgid "Generated By"
 msgstr ""
 
 msgid "Generated By"
 msgstr ""
 
@@ -12800,47 +12856,47 @@ msgstr ""
 msgid "Domicile"
 msgstr ""
 
 msgid "Domicile"
 msgstr ""
 
-#: reporting/includes/header2.inc:146 reporting/includes/pdf_report.inc:353
-#: reporting/includes/pdf_report.inc:491 reporting/includes/pdf_report.inc:618
+#: reporting/includes/header2.inc:146 reporting/includes/pdf_report.inc:364
+#: reporting/includes/pdf_report.inc:502 reporting/includes/pdf_report.inc:629
 msgid "Page"
 msgstr ""
 
 msgid "Page"
 msgstr ""
 
-#: reporting/includes/pdf_report.inc:573
+#: reporting/includes/pdf_report.inc:584
 msgid "Report Period"
 msgstr ""
 
 msgid "Report Period"
 msgstr ""
 
-#: reporting/includes/pdf_report.inc:973
-#: reporting/includes/pdf_report.inc:1021
+#: reporting/includes/pdf_report.inc:984
+#: reporting/includes/pdf_report.inc:1032
 #, php-format
 msgid "You have no email contact defined for this type of document for '%s'."
 msgstr ""
 
 #, php-format
 msgid "You have no email contact defined for this type of document for '%s'."
 msgstr ""
 
-#: reporting/includes/pdf_report.inc:992
+#: reporting/includes/pdf_report.inc:1003
 msgid "Dear"
 msgstr ""
 
 msgid "Dear"
 msgstr ""
 
-#: reporting/includes/pdf_report.inc:993
+#: reporting/includes/pdf_report.inc:1004
 msgid "Attached you will find "
 msgstr ""
 
 msgid "Attached you will find "
 msgstr ""
 
-#: reporting/includes/pdf_report.inc:1009
+#: reporting/includes/pdf_report.inc:1020
 msgid "Kindest regards"
 msgstr ""
 
 msgid "Kindest regards"
 msgstr ""
 
-#: reporting/includes/pdf_report.inc:1024
+#: reporting/includes/pdf_report.inc:1035
 msgid "Sending document by email failed"
 msgstr ""
 
 msgid "Sending document by email failed"
 msgstr ""
 
-#: reporting/includes/pdf_report.inc:1024
-#: reporting/includes/pdf_report.inc:1027
+#: reporting/includes/pdf_report.inc:1035
+#: reporting/includes/pdf_report.inc:1038
 msgid "Email:"
 msgstr ""
 
 msgid "Email:"
 msgstr ""
 
-#: reporting/includes/pdf_report.inc:1027
+#: reporting/includes/pdf_report.inc:1038
 msgid "has been sent by email to destination."
 msgstr ""
 
 msgid "has been sent by email to destination."
 msgstr ""
 
-#: reporting/includes/pdf_report.inc:1056
+#: reporting/includes/pdf_report.inc:1067
 msgid "Report has been sent to network printer "
 msgstr ""
 
 msgid "Report has been sent to network printer "
 msgstr ""
 
@@ -13070,7 +13126,7 @@ msgstr ""
 msgid "Modifying Customer Credit Note #%d"
 msgstr ""
 
 msgid "Modifying Customer Credit Note #%d"
 msgstr ""
 
-#: sales/credit_note_entry.php:51 sales/sales_order_entry.php:706
+#: sales/credit_note_entry.php:51 sales/sales_order_entry.php:705
 msgid ""
 "There are no customers, or there are no customers with branches. Please "
 "define customers and customer branches."
 msgid ""
 "There are no customers, or there are no customers with branches. Please "
 "define customers and customer branches."
@@ -13427,7 +13483,7 @@ msgid "Process Dispatch"
 msgstr ""
 
 #: sales/customer_delivery.php:536 sales/customer_invoice.php:665
 msgstr ""
 
 #: sales/customer_delivery.php:536 sales/customer_invoice.php:665
-#: sales/sales_order_entry.php:753
+#: sales/sales_order_entry.php:752
 msgid "Check entered data and save document"
 msgstr ""
 
 msgid "Check entered data and save document"
 msgstr ""
 
@@ -13545,7 +13601,7 @@ msgstr ""
 msgid "Payment terms:"
 msgstr ""
 
 msgid "Payment terms:"
 msgstr ""
 
-#: sales/customer_invoice.php:512 sales/sales_order_entry.php:729
+#: sales/customer_invoice.php:512 sales/sales_order_entry.php:728
 msgid "Sales Order Items"
 msgstr ""
 
 msgid "Sales Order Items"
 msgstr ""
 
@@ -13863,152 +13919,152 @@ msgstr ""
 msgid "You need to define a cash account for your Sales Point."
 msgstr ""
 
 msgid "You need to define a cash account for your Sales Point."
 msgstr ""
 
-#: sales/sales_order_entry.php:478
+#: sales/sales_order_entry.php:479
 msgid ""
 "The reference number field has been increased. Please save the document "
 "again."
 msgstr ""
 
 msgid ""
 "The reference number field has been increased. Please save the document "
 "again."
 msgstr ""
 
-#: sales/sales_order_entry.php:524
+#: sales/sales_order_entry.php:523
 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 ""
 
 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 ""
 
-#: sales/sales_order_entry.php:528
+#: sales/sales_order_entry.php:527
 msgid "Price for inventory item must be entered and can not be less than 0"
 msgstr ""
 
 msgid "Price for inventory item must be entered and can not be less than 0"
 msgstr ""
 
-#: sales/sales_order_entry.php:535
+#: sales/sales_order_entry.php:534
 msgid ""
 "You attempting to make the quantity ordered a quantity less than has already "
 "been delivered. The quantity delivered cannot be modified retrospectively."
 msgstr ""
 
 msgid ""
 "You attempting to make the quantity ordered a quantity less than has already "
 "been delivered. The quantity delivered cannot be modified retrospectively."
 msgstr ""
 
-#: sales/sales_order_entry.php:553
+#: sales/sales_order_entry.php:552
 #, php-format
 msgid "Price %s is below Standard Cost %s"
 msgstr ""
 
 #, php-format
 msgid "Price %s is below Standard Cost %s"
 msgstr ""
 
-#: sales/sales_order_entry.php:578
+#: sales/sales_order_entry.php:577
 msgid ""
 "This item cannot be deleted because some of it has already been delivered."
 msgstr ""
 
 msgid ""
 "This item cannot be deleted because some of it has already been delivered."
 msgstr ""
 
-#: sales/sales_order_entry.php:607
+#: sales/sales_order_entry.php:606
 msgid "Direct delivery entry has been cancelled as requested."
 msgstr ""
 
 msgid "Direct delivery entry has been cancelled as requested."
 msgstr ""
 
-#: sales/sales_order_entry.php:608
+#: sales/sales_order_entry.php:607
 msgid "Enter a New Sales Delivery"
 msgstr ""
 
 msgid "Enter a New Sales Delivery"
 msgstr ""
 
-#: sales/sales_order_entry.php:610
+#: sales/sales_order_entry.php:609
 msgid "Direct invoice entry has been cancelled as requested."
 msgstr ""
 
 msgid "Direct invoice entry has been cancelled as requested."
 msgstr ""
 
-#: sales/sales_order_entry.php:611
+#: sales/sales_order_entry.php:610
 msgid "Enter a New Sales Invoice"
 msgstr ""
 
 msgid "Enter a New Sales Invoice"
 msgstr ""
 
-#: sales/sales_order_entry.php:616
+#: sales/sales_order_entry.php:615
 msgid "This sales quotation has been cancelled as requested."
 msgstr ""
 
 msgid "This sales quotation has been cancelled as requested."
 msgstr ""
 
-#: sales/sales_order_entry.php:617
+#: sales/sales_order_entry.php:616
 msgid "Enter a New Sales Quotation"
 msgstr ""
 
 msgid "Enter a New Sales Quotation"
 msgstr ""
 
-#: sales/sales_order_entry.php:624
+#: sales/sales_order_entry.php:623
 msgid "Undelivered part of order has been cancelled as requested."
 msgstr ""
 
 msgid "Undelivered part of order has been cancelled as requested."
 msgstr ""
 
-#: sales/sales_order_entry.php:625
+#: sales/sales_order_entry.php:624
 msgid "Select Another Sales Order for Edition"
 msgstr ""
 
 msgid "Select Another Sales Order for Edition"
 msgstr ""
 
-#: sales/sales_order_entry.php:629
+#: sales/sales_order_entry.php:628
 msgid "This sales order has been cancelled as requested."
 msgstr ""
 
 msgid "This sales order has been cancelled as requested."
 msgstr ""
 
-#: sales/sales_order_entry.php:630
+#: sales/sales_order_entry.php:629
 msgid "Enter a New Sales Order"
 msgstr ""
 
 msgid "Enter a New Sales Order"
 msgstr ""
 
-#: sales/sales_order_entry.php:710
+#: sales/sales_order_entry.php:709
 msgid "Sales Invoice Items"
 msgstr ""
 
 msgid "Sales Invoice Items"
 msgstr ""
 
-#: sales/sales_order_entry.php:711
+#: sales/sales_order_entry.php:710
 msgid "Enter Delivery Details and Confirm Invoice"
 msgstr ""
 
 msgid "Enter Delivery Details and Confirm Invoice"
 msgstr ""
 
-#: sales/sales_order_entry.php:713
+#: sales/sales_order_entry.php:712
 msgid "Place Invoice"
 msgstr ""
 
 msgid "Place Invoice"
 msgstr ""
 
-#: sales/sales_order_entry.php:716
+#: sales/sales_order_entry.php:715
 msgid "Delivery Note Items"
 msgstr ""
 
 msgid "Delivery Note Items"
 msgstr ""
 
-#: sales/sales_order_entry.php:717
+#: sales/sales_order_entry.php:716
 msgid "Enter Delivery Details and Confirm Dispatch"
 msgstr ""
 
 msgid "Enter Delivery Details and Confirm Dispatch"
 msgstr ""
 
-#: sales/sales_order_entry.php:718
+#: sales/sales_order_entry.php:717
 msgid "Cancel Delivery"
 msgstr ""
 
 msgid "Cancel Delivery"
 msgstr ""
 
-#: sales/sales_order_entry.php:719
+#: sales/sales_order_entry.php:718
 msgid "Place Delivery"
 msgstr ""
 
 msgid "Place Delivery"
 msgstr ""
 
-#: sales/sales_order_entry.php:721
+#: sales/sales_order_entry.php:720
 msgid "Quotation Date:"
 msgstr ""
 
 msgid "Quotation Date:"
 msgstr ""
 
-#: sales/sales_order_entry.php:722
+#: sales/sales_order_entry.php:721
 msgid "Sales Quotation Items"
 msgstr ""
 
 msgid "Sales Quotation Items"
 msgstr ""
 
-#: sales/sales_order_entry.php:723
+#: sales/sales_order_entry.php:722
 msgid "Enter Delivery Details and Confirm Quotation"
 msgstr ""
 
 msgid "Enter Delivery Details and Confirm Quotation"
 msgstr ""
 
-#: sales/sales_order_entry.php:724
+#: sales/sales_order_entry.php:723
 msgid "Cancel Quotation"
 msgstr ""
 
 msgid "Cancel Quotation"
 msgstr ""
 
-#: sales/sales_order_entry.php:725
+#: sales/sales_order_entry.php:724
 msgid "Place Quotation"
 msgstr ""
 
 msgid "Place Quotation"
 msgstr ""
 
-#: sales/sales_order_entry.php:726
+#: sales/sales_order_entry.php:725
 msgid "Commit Quotations Changes"
 msgstr ""
 
 msgid "Commit Quotations Changes"
 msgstr ""
 
-#: sales/sales_order_entry.php:730
+#: sales/sales_order_entry.php:729
 msgid "Enter Delivery Details and Confirm Order"
 msgstr ""
 
 msgid "Enter Delivery Details and Confirm Order"
 msgstr ""
 
-#: sales/sales_order_entry.php:733
+#: sales/sales_order_entry.php:732
 msgid "Commit Order Changes"
 msgstr ""
 
 msgid "Commit Order Changes"
 msgstr ""
 
-#: sales/sales_order_entry.php:755 sales/sales_order_entry.php:761
+#: sales/sales_order_entry.php:754 sales/sales_order_entry.php:760
 msgid ""
 "Cancels document entry or removes sales order when editing an old document"
 msgstr ""
 
 msgid ""
 "Cancels document entry or removes sales order when editing an old document"
 msgstr ""
 
-#: sales/sales_order_entry.php:756 sales/sales_order_entry.php:765
+#: sales/sales_order_entry.php:755 sales/sales_order_entry.php:764
 msgid "You are about to void this Document.\\nDo you want to continue?"
 msgstr ""
 
 msgid "You are about to void this Document.\\nDo you want to continue?"
 msgstr ""
 
-#: sales/sales_order_entry.php:759
+#: sales/sales_order_entry.php:758
 msgid "Validate changes and update document"
 msgstr ""
 
 msgid "Validate changes and update document"
 msgstr ""
 
-#: sales/sales_order_entry.php:763
+#: sales/sales_order_entry.php:762
 msgid ""
 "You are about to cancel undelivered part of this order.\\nDo you want to "
 "continue?"
 msgid ""
 "You are about to cancel undelivered part of this order.\\nDo you want to "
 "continue?"
@@ -14018,7 +14074,7 @@ msgstr ""
 msgid "Allocate Customer Payment or Credit Note"
 msgstr ""
 
 msgid "Allocate Customer Payment or Credit Note"
 msgstr ""
 
-#: sales/allocations/customer_allocate.php:50
+#: sales/allocations/customer_allocate.php:55
 #, php-format
 msgid "Allocation of %s # %d"
 msgstr ""
 #, php-format
 msgid "Allocation of %s # %d"
 msgstr ""
@@ -14028,9 +14084,9 @@ msgid "Customer Allocations"
 msgstr ""
 
 #: sales/allocations/customer_allocation_main.php:32
 msgstr ""
 
 #: sales/allocations/customer_allocation_main.php:32
-#: sales/manage/customer_branches.php:270 sales/manage/customers.php:329
+#: sales/manage/customer_branches.php:270 sales/manage/customers.php:330
 #: sales/inquiry/customer_allocation_inquiry.php:42
 #: sales/inquiry/customer_allocation_inquiry.php:42
-#: sales/inquiry/customer_inquiry.php:44
+#: sales/inquiry/customer_inquiry.php:154
 #: sales/inquiry/sales_deliveries_view.php:114
 #: sales/inquiry/sales_orders_view.php:232
 msgid "Select a customer: "
 #: sales/inquiry/sales_deliveries_view.php:114
 #: sales/inquiry/sales_orders_view.php:232
 msgid "Select a customer: "
@@ -14325,41 +14381,41 @@ msgstr ""
 msgid "&Add or Edit "
 msgstr ""
 
 msgid "&Add or Edit "
 msgstr ""
 
-#: sales/manage/customers.php:306
+#: sales/manage/customers.php:307
 msgid "Add New Customer"
 msgstr ""
 
 msgid "Add New Customer"
 msgstr ""
 
-#: sales/manage/customers.php:310
+#: sales/manage/customers.php:311
 msgid "Update Customer"
 msgstr ""
 
 msgid "Update Customer"
 msgstr ""
 
-#: sales/manage/customers.php:311
+#: sales/manage/customers.php:312
 msgid "Update customer data"
 msgstr ""
 
 msgid "Update customer data"
 msgstr ""
 
-#: sales/manage/customers.php:312
+#: sales/manage/customers.php:313
 msgid "Select this customer and return to document entry."
 msgstr ""
 
 msgid "Select this customer and return to document entry."
 msgstr ""
 
-#: sales/manage/customers.php:313
+#: sales/manage/customers.php:314
 msgid "Delete Customer"
 msgstr ""
 
 msgid "Delete Customer"
 msgstr ""
 
-#: sales/manage/customers.php:314
+#: sales/manage/customers.php:315
 msgid "Delete customer data if have been never used"
 msgstr ""
 
 msgid "Delete customer data if have been never used"
 msgstr ""
 
-#: sales/manage/customers.php:321
+#: sales/manage/customers.php:322
 msgid ""
 "There are no sales types defined. Please define at least one sales type "
 "before adding a customer."
 msgstr ""
 
 msgid ""
 "There are no sales types defined. Please define at least one sales type "
 "before adding a customer."
 msgstr ""
 
-#: sales/manage/customers.php:330
+#: sales/manage/customers.php:331
 msgid "New customer"
 msgstr ""
 
 msgid "New customer"
 msgstr ""
 
-#: sales/manage/customers.php:353
+#: sales/manage/customers.php:354
 msgid "Sales &Orders"
 msgstr ""
 
 msgid "Sales &Orders"
 msgstr ""
 
@@ -14738,6 +14794,10 @@ msgstr ""
 msgid "There are no line items on this invoice."
 msgstr ""
 
 msgid "There are no line items on this invoice."
 msgstr ""
 
+#: sales/view/view_invoice.php:171
+msgid "PREPAYMENT AMOUNT INVOICED"
+msgstr ""
+
 #: sales/view/view_receipt.php:24
 msgid "View Customer Payment"
 msgstr ""
 #: sales/view/view_receipt.php:24
 msgid "View Customer Payment"
 msgstr ""
@@ -14841,17 +14901,12 @@ msgstr ""
 msgid "Customer Transactions"
 msgstr ""
 
 msgid "Customer Transactions"
 msgstr ""
 
-#: sales/inquiry/customer_inquiry.php:68
-msgid "CUSTOMER ACCOUNT IS ON HOLD"
-msgstr ""
-
-#: sales/inquiry/customer_inquiry.php:182
+#: sales/inquiry/customer_inquiry.php:93
 msgid "Print Receipt"
 msgstr ""
 
 msgid "Print Receipt"
 msgstr ""
 
-#: sales/inquiry/customer_inquiry.php:213
-#: sales/inquiry/customer_inquiry.php:226
-msgid "RB"
+#: sales/inquiry/customer_inquiry.php:113
+msgid "CUSTOMER ACCOUNT IS ON HOLD"
 msgstr ""
 
 #: sales/inquiry/sales_deliveries_view.php:29
 msgstr ""
 
 #: sales/inquiry/sales_deliveries_view.php:29
@@ -14977,7 +15032,7 @@ msgid ""
 "browser tab. You cannot edit more than one sales document at once."
 msgstr ""
 
 "browser tab. You cannot edit more than one sales document at once."
 msgstr ""
 
-#: sales/includes/db/custalloc_db.inc:381
+#: sales/includes/db/custalloc_db.inc:382
 msgid ""
 "Unsuspected overallocation happened due to sparse credit notes exists for "
 "this invoice.\n"
 msgid ""
 "Unsuspected overallocation happened due to sparse credit notes exists for "
 "this invoice.\n"
@@ -15195,34 +15250,34 @@ msgstr ""
 msgid "The tax group name cannot be empty."
 msgstr ""
 
 msgid "The tax group name cannot be empty."
 msgstr ""
 
-#: taxes/tax_groups.php:60
+#: taxes/tax_groups.php:63
 msgid "Selected tax group has been updated"
 msgstr ""
 
 msgid "Selected tax group has been updated"
 msgstr ""
 
-#: taxes/tax_groups.php:65
+#: taxes/tax_groups.php:68
 msgid "New tax group has been added"
 msgstr ""
 
 msgid "New tax group has been added"
 msgstr ""
 
-#: taxes/tax_groups.php:80
+#: taxes/tax_groups.php:83
 msgid ""
 "Cannot delete this tax group because customer branches been created "
 "referring to it."
 msgstr ""
 
 msgid ""
 "Cannot delete this tax group because customer branches been created "
 "referring to it."
 msgstr ""
 
-#: taxes/tax_groups.php:86
+#: taxes/tax_groups.php:89
 msgid ""
 "Cannot delete this tax group because suppliers been created referring to it."
 msgstr ""
 
 msgid ""
 "Cannot delete this tax group because suppliers been created referring to it."
 msgstr ""
 
-#: taxes/tax_groups.php:103
+#: taxes/tax_groups.php:106
 msgid "Selected tax group has been deleted"
 msgstr ""
 
 msgid "Selected tax group has been deleted"
 msgstr ""
 
-#: taxes/tax_groups.php:166
+#: taxes/tax_groups.php:169
 msgid "Select the taxes that are included in this group."
 msgstr ""
 
 msgid "Select the taxes that are included in this group."
 msgstr ""
 
-#: taxes/tax_groups.php:171
+#: taxes/tax_groups.php:174
 msgid "Shipping Tax"
 msgstr ""
 
 msgid "Shipping Tax"
 msgstr ""
 
@@ -15356,7 +15411,7 @@ msgid "Upgrade from version 2.2 to 2.3"
 msgstr ""
 
 #: sql/alter2.4.php:23
 msgstr ""
 
 #: sql/alter2.4.php:23
-msgid "Upgrade from version 2.3 to 2.4RC1"
+msgid "Upgrade from version 2.3 to 2.4"
 msgstr ""
 
 #: sql/alter2.4.php:31 sql/alter2.4rc1.php:31
 msgstr ""
 
 #: sql/alter2.4.php:31 sql/alter2.4rc1.php:31
@@ -15367,22 +15422,22 @@ msgstr ""
 msgid "Text collation optimization:"
 msgstr ""
 
 msgid "Text collation optimization:"
 msgstr ""
 
-#: sql/alter2.4.php:83
+#: sql/alter2.4.php:89
 msgid "Cannot update config_db.php file."
 msgstr ""
 
 msgid "Cannot update config_db.php file."
 msgstr ""
 
-#: sql/alter2.4.php:122
+#: sql/alter2.4.php:128
 #, php-format
 msgid ""
 "Cannot update work orders costs:\n"
 "%s"
 msgstr ""
 
 #, php-format
 msgid ""
 "Cannot update work orders costs:\n"
 "%s"
 msgstr ""
 
-#: sql/alter2.4.php:215
+#: sql/alter2.4.php:221
 msgid "Convertion to utf8 done."
 msgstr ""
 
 msgid "Convertion to utf8 done."
 msgstr ""
 
-#: sql/alter2.4.php:254
+#: sql/alter2.4.php:260
 #, php-format
 msgid "Cannot drop column in %s table: %s"
 msgstr ""
 #, php-format
 msgid "Cannot drop column in %s table: %s"
 msgstr ""