Merged changes from stable branch up to 2.3.23.

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

diff --git a/lang/new_language_template/LC_MESSAGES/empty.po b/lang/new_language_template/LC_MESSAGES/empty.po
index 40932dd23787ca73ab45be74de586022c8ee7e84..79b341939561e4c63b8e00ac45434efa0bcd663b 100644 (file)
--- a/lang/new_language_template/LC_MESSAGES/empty.po
+++ b/lang/new_language_template/LC_MESSAGES/empty.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-25 16:46+0100\n"
+"POT-Creation-Date: 2015-03-25 10:46+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"
@@ -24,8 +24,7 @@ msgstr ""
 
 #: ../frontaccounting.php:75
 #: ../access/logout.php:21
-#: ../themes/default/renderer.php:70
-#: ../themes/default/renderer.php:83
+#: ../themes/default/renderer.php:68
 msgid "Logout"
 msgstr ""
 
@@ -54,37 +53,37 @@ msgstr ""
 msgid "Too many failed login attempts.<br>Please wait a while or try later."
 msgstr ""
 
-#: ../access/login.php:52
-#: ../access/login.php:83
+#: ../access/login.php:53
+#: ../access/login.php:84
 msgid "Authorization timeout"
 msgstr ""
 
-#: ../access/login.php:52
-#: ../access/login.php:90
+#: ../access/login.php:53
+#: ../access/login.php:91
 msgid "Login"
 msgstr ""
 
-#: ../access/login.php:90
+#: ../access/login.php:91
 #: ../access/password_reset.php:61
-#: ../admin/inst_upgrade.php:141
 msgid "Version"
 msgstr ""
 
-#: ../access/login.php:93
+#: ../access/login.php:94
 msgid "User name"
 msgstr ""
 
-#: ../access/login.php:97
+#: ../access/login.php:98
 #: ../admin/users.php:200
 msgid "Password:"
 msgstr ""
 
 #: ../access/login.php:107
 #: ../access/login.php:114
-#: ../access/password_reset.php:70
-#: ../access/password_reset.php:77
-#: ../admin/create_coy.php:253
-#: ../admin/create_coy.php:336
+#: ../access/password_reset.php:69
+#: ../access/password_reset.php:76
+#: ../admin/create_coy.php:257
+#: ../admin/create_coy.php:340
+#: ../admin/inst_upgrade.php:63
 #: ../includes/sysnames.inc:194
 msgid "Company"
 msgstr ""
@@ -94,9 +93,8 @@ msgid "Login -->"
 msgstr ""
 
 #: ../access/login.php:156
-#: ../access/password_reset.php:108
-#: ../admin/display_prefs.php:112
-#: ../themes/default/renderer.php:129
+#: ../access/password_reset.php:107
+#: ../admin/display_prefs.php:123
 msgid "Theme:"
 msgstr ""
 
@@ -114,15 +112,15 @@ msgid "Password reset"
 msgstr ""
 
 #: ../access/password_reset.php:63
-#: ../reporting/rep103.php:277
-#: ../reporting/rep106.php:88
+#: ../reporting/rep103.php:276
+#: ../reporting/rep106.php:95
 #: ../reporting/rep205.php:195
 #: ../reporting/includes/header2.inc:113
 #: ../sales/manage/sales_people.php:99
 msgid "Email"
 msgstr ""
 
-#: ../access/password_reset.php:83
+#: ../access/password_reset.php:82
 msgid "Send password -->"
 msgstr ""
 
@@ -156,16 +154,16 @@ msgstr ""
 #: ../inventory/includes/item_adjustments_ui.inc:47
 #: ../manufacturing/work_order_add_finished.php:200
 #: ../manufacturing/work_order_costs.php:136
-#: ../manufacturing/work_order_entry.php:377
-#: ../manufacturing/work_order_entry.php:385
+#: ../manufacturing/work_order_entry.php:378
+#: ../manufacturing/work_order_entry.php:386
 #: ../manufacturing/includes/work_order_issue_ui.inc:168
 #: ../sales/inquiry/customer_allocation_inquiry.php:47
 msgid "Type:"
 msgstr ""
 
 #: ../admin/attachments.php:183
-#: ../admin/create_coy.php:277
-#: ../admin/crm_categories.php:115
+#: ../admin/create_coy.php:281
+#: ../admin/crm_categories.php:106
 #: ../admin/fiscalyears.php:164
 #: ../admin/inst_lang.php:100
 #: ../admin/payment_terms.php:142
@@ -174,7 +172,6 @@ msgstr ""
 #: ../admin/tags.php:140
 #: ../admin/users.php:153
 #: ../dimensions/inquiry/search_dimensions.php:120
-#: ../gl/inquiry/journal_inquiry.php:118
 #: ../gl/manage/bank_accounts.php:133
 #: ../gl/manage/currencies.php:164
 #: ../gl/manage/exchange_rates.php:94
@@ -183,10 +180,10 @@ msgstr ""
 #: ../gl/manage/gl_quick_entries.php:196
 #: ../gl/manage/gl_quick_entries.php:295
 #: ../gl/includes/ui/gl_bank_ui.inc:186
-#: ../gl/includes/ui/gl_journal_ui.inc:134
+#: ../gl/includes/ui/gl_journal_ui.inc:132
 #: ../includes/ui/contacts_view.inc:64
 #: ../includes/ui/simple_crud_class.inc:52
-#: ../includes/ui/ui_input.inc:961
+#: ../includes/ui/ui_view.inc:1468
 #: ../inventory/prices.php:159
 #: ../inventory/purchasing_data.php:165
 #: ../inventory/includes/item_adjustments_ui.inc:91
@@ -197,36 +194,28 @@ msgstr ""
 #: ../inventory/manage/locations.php:161
 #: ../inventory/manage/movement_types.php:106
 #: ../inventory/manage/sales_kits.php:55
-#: ../manufacturing/search_work_orders.php:109
 #: ../manufacturing/manage/bom_edit.php:86
 #: ../manufacturing/manage/work_centres.php:114
 #: ../manufacturing/includes/work_order_issue_ui.inc:63
-#: ../purchasing/includes/ui/invoice_ui.inc:557
-#: ../purchasing/includes/ui/po_ui.inc:275
-#: ../purchasing/inquiry/po_search_completed.php:108
-#: ../purchasing/inquiry/po_search.php:89
+#: ../purchasing/includes/ui/po_ui.inc:248
 #: ../sales/manage/credit_status.php:119
-#: ../sales/manage/customer_branches.php:159
-#: ../sales/manage/recurrent_invoices.php:130
+#: ../sales/manage/customer_branches.php:154
+#: ../sales/manage/recurrent_invoices.php:136
 #: ../sales/manage/sales_areas.php:103
 #: ../sales/manage/sales_groups.php:99
 #: ../sales/manage/sales_people.php:119
 #: ../sales/manage/sales_points.php:99
 #: ../sales/manage/sales_types.php:121
-#: ../sales/inquiry/sales_deliveries_view.php:156
-#: ../sales/inquiry/sales_orders_view.php:136
 #: ../sales/includes/ui/sales_credit_ui.inc:197
-#: ../sales/includes/ui/sales_order_ui.inc:197
+#: ../sales/includes/ui/sales_order_ui.inc:198
 #: ../taxes/item_tax_types.php:139
-#: ../taxes/sav.tax_types.php:211
-#: ../taxes/sav.tax_types.php:262
 #: ../taxes/tax_groups.php:137
 #: ../taxes/tax_types.php:132
 msgid "Edit"
 msgstr ""
 
 #: ../admin/attachments.php:188
-#: ../gl/inquiry/journal_inquiry.php:135
+#: ../gl/inquiry/journal_inquiry.php:107
 msgid "View"
 msgstr ""
 
@@ -235,13 +224,13 @@ msgid "Download"
 msgstr ""
 
 #: ../admin/attachments.php:198
-#: ../admin/create_coy.php:278
-#: ../admin/crm_categories.php:119
+#: ../admin/create_coy.php:282
+#: ../admin/crm_categories.php:110
 #: ../admin/fiscalyears.php:166
 #: ../admin/inst_chart.php:80
 #: ../admin/inst_lang.php:109
 #: ../admin/inst_module.php:143
-#: ../admin/inst_theme.php:102
+#: ../admin/inst_theme.php:83
 #: ../admin/payment_terms.php:143
 #: ../admin/printers.php:97
 #: ../admin/shipping_companies.php:107
@@ -256,10 +245,10 @@ msgstr ""
 #: ../gl/manage/gl_quick_entries.php:197
 #: ../gl/manage/gl_quick_entries.php:296
 #: ../gl/includes/ui/gl_bank_ui.inc:188
-#: ../gl/includes/ui/gl_journal_ui.inc:136
+#: ../gl/includes/ui/gl_journal_ui.inc:134
 #: ../includes/ui/contacts_view.inc:67
 #: ../includes/ui/simple_crud_class.inc:54
-#: ../includes/ui/ui_input.inc:286
+#: ../includes/ui/ui_input.inc:287
 #: ../inventory/prices.php:160
 #: ../inventory/purchasing_data.php:166
 #: ../inventory/includes/item_adjustments_ui.inc:93
@@ -273,20 +262,18 @@ msgstr ""
 #: ../manufacturing/manage/bom_edit.php:87
 #: ../manufacturing/manage/work_centres.php:115
 #: ../manufacturing/includes/work_order_issue_ui.inc:65
-#: ../purchasing/includes/ui/invoice_ui.inc:319
-#: ../purchasing/includes/ui/po_ui.inc:277
+#: ../purchasing/includes/ui/po_ui.inc:250
 #: ../sales/manage/credit_status.php:120
-#: ../sales/manage/customer_branches.php:163
-#: ../sales/manage/recurrent_invoices.php:131
+#: ../sales/manage/customer_branches.php:158
+#: ../sales/manage/recurrent_invoices.php:137
 #: ../sales/manage/sales_areas.php:104
 #: ../sales/manage/sales_groups.php:100
 #: ../sales/manage/sales_people.php:120
 #: ../sales/manage/sales_points.php:100
 #: ../sales/manage/sales_types.php:122
 #: ../sales/includes/ui/sales_credit_ui.inc:199
-#: ../sales/includes/ui/sales_order_ui.inc:199
+#: ../sales/includes/ui/sales_order_ui.inc:200
 #: ../taxes/item_tax_types.php:140
-#: ../taxes/sav.tax_types.php:212
 #: ../taxes/tax_groups.php:138
 #: ../taxes/tax_types.php:133
 msgid "Delete"
@@ -295,16 +282,16 @@ msgstr ""
 #: ../admin/attachments.php:205
 #: ../admin/view_print_transaction.php:126
 #: ../admin/void_transaction.php:181
-#: ../dimensions/inquiry/search_dimensions.php:127
+#: ../dimensions/inquiry/search_dimensions.php:128
 #: ../dimensions/view/view_dimension.php:55
 #: ../gl/bank_account_reconcile.php:232
-#: ../gl/inquiry/bank_inquiry.php:70
+#: ../gl/inquiry/bank_inquiry.php:71
 #: ../gl/inquiry/gl_account_inquiry.php:126
-#: ../gl/inquiry/journal_inquiry.php:127
-#: ../gl/inquiry/journal_inquiry.php:140
+#: ../gl/inquiry/journal_inquiry.php:99
+#: ../gl/inquiry/journal_inquiry.php:112
 #: ../includes/ui/allocation_cart.inc:290
 #: ../inventory/inquiry/stock_movements.php:78
-#: ../manufacturing/search_work_orders.php:159
+#: ../manufacturing/search_work_orders.php:165
 #: ../manufacturing/includes/manufacturing_ui.inc:157
 #: ../manufacturing/includes/manufacturing_ui.inc:200
 #: ../manufacturing/includes/manufacturing_ui.inc:236
@@ -313,9 +300,9 @@ msgstr ""
 #: ../manufacturing/includes/manufacturing_ui.inc:331
 #: ../purchasing/view/view_po.php:115
 #: ../purchasing/view/view_po.php:140
-#: ../purchasing/inquiry/po_search_completed.php:123
-#: ../purchasing/inquiry/po_search.php:132
-#: ../purchasing/inquiry/supplier_allocation_inquiry.php:127
+#: ../purchasing/inquiry/po_search_completed.php:122
+#: ../purchasing/inquiry/po_search.php:117
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:128
 #: ../purchasing/inquiry/supplier_inquiry.php:174
 #: ../purchasing/allocations/supplier_allocation_main.php:95
 #: ../reporting/rep101.php:118
@@ -328,29 +315,26 @@ msgstr ""
 #: ../reporting/rep704.php:86
 #: ../reporting/rep704.php:89
 #: ../reporting/rep710.php:78
-#: ../reporting/includes/doctext.inc:167
-#: ../reporting/includes/doctext.inc:208
-#: ../reporting/includes/doctext.inc:246
+#: ../reporting/includes/doctext.inc:166
+#: ../reporting/includes/doctext.inc:207
+#: ../reporting/includes/doctext.inc:245
 #: ../sales/allocations/customer_allocation_main.php:94
 #: ../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:145
-#: ../sales/inquiry/customer_inquiry.php:201
 msgid "#"
 msgstr ""
 
 #: ../admin/attachments.php:206
 #: ../admin/attachments.php:250
-#: ../admin/crm_categories.php:97
-#: ../admin/inst_upgrade.php:141
+#: ../admin/crm_categories.php:88
 #: ../admin/payment_terms.php:127
 #: ../admin/printers.php:84
 #: ../admin/print_profiles.php:148
 #: ../gl/inquiry/tax_inquiry.php:82
 #: ../gl/manage/gl_quick_entries.php:186
 #: ../gl/manage/gl_quick_entries.php:224
-#: ../includes/ui/view_package.php:32
 #: ../inventory/manage/item_codes.php:125
 #: ../inventory/manage/item_units.php:94
 #: ../inventory/manage/movement_types.php:95
@@ -359,8 +343,6 @@ msgstr ""
 #: ../inventory/view/view_transfer.php:56
 #: ../manufacturing/manage/bom_edit.php:70
 #: ../manufacturing/includes/manufacturing_ui.inc:28
-#: ../purchasing/includes/ui/invoice_ui.inc:507
-#: ../purchasing/includes/ui/invoice_ui.inc:519
 #: ../purchasing/po_receive_items.php:62
 #: ../reporting/rep104.php:111
 #: ../reporting/rep105.php:114
@@ -376,18 +358,17 @@ msgstr ""
 #: ../reporting/rep401.php:71
 #: ../sales/create_recurrent_invoices.php:134
 #: ../sales/manage/credit_status.php:97
-#: ../sales/manage/recurrent_invoices.php:102
-#: ../sales/inquiry/sales_orders_view.php:318
-#: ../sales/inquiry/sales_orders_view.php:322
-#: ../taxes/sav.tax_types.php:190
+#: ../sales/manage/recurrent_invoices.php:108
+#: ../sales/inquiry/sales_orders_view.php:281
+#: ../sales/inquiry/sales_orders_view.php:285
 #: ../taxes/tax_groups.php:123
 #: ../taxes/tax_types.php:115
 msgid "Description"
 msgstr ""
 
 #: ../admin/attachments.php:207
-#: ../admin/backups.php:63
-#: ../admin/backups.php:149
+#: ../admin/backups.php:67
+#: ../admin/backups.php:152
 msgid "Filename"
 msgstr ""
 
@@ -414,10 +395,10 @@ msgstr ""
 
 #: ../admin/backups.php:21
 #: ../admin/backups.php:40
-#: ../admin/backups.php:114
-#: ../admin/backups.php:142
-#: ../admin/backups.php:155
-#: ../admin/backups.php:173
+#: ../admin/backups.php:118
+#: ../admin/backups.php:145
+#: ../admin/backups.php:158
+#: ../admin/backups.php:176
 msgid "Select backup file first."
 msgstr ""
 
@@ -425,28 +406,28 @@ msgstr ""
 msgid "Backup and Restore Database"
 msgstr ""
 
-#: ../admin/backups.php:50
+#: ../admin/backups.php:52
 msgid "Backup paths have not been set correctly."
 msgstr ""
 
-#: ../admin/backups.php:51
+#: ../admin/backups.php:53
 msgid "Please contact System Administrator."
 msgstr ""
 
-#: ../admin/backups.php:52
+#: ../admin/backups.php:54
 msgid "cannot find backup directory"
 msgstr ""
 
-#: ../admin/backups.php:62
+#: ../admin/backups.php:66
 msgid "Backup successfully generated."
 msgstr ""
 
-#: ../admin/backups.php:65
+#: ../admin/backups.php:69
 msgid "Database backup failed."
 msgstr ""
 
-#: ../admin/backups.php:98
-#: ../admin/create_coy.php:265
+#: ../admin/backups.php:102
+#: ../admin/create_coy.php:269
 #: ../admin/fiscalyears.php:155
 #: ../admin/inst_lang.php:85
 #: ../admin/inst_lang.php:97
@@ -458,13 +439,13 @@ msgstr ""
 #: ../includes/system_tests.inc:38
 #: ../includes/system_tests.inc:113
 #: ../includes/system_tests.inc:126
-#: ../includes/ui/ui_lists.inc:1681
+#: ../includes/ui/ui_lists.inc:1670
 #: ../purchasing/manage/suppliers.php:123
 #: ../reporting/rep101.php:114
 #: ../reporting/rep102.php:114
 #: ../reporting/rep102.php:116
 #: ../reporting/rep104.php:105
-#: ../reporting/rep106.php:75
+#: ../reporting/rep106.php:82
 #: ../reporting/rep114.php:74
 #: ../reporting/rep201.php:106
 #: ../reporting/rep202.php:118
@@ -482,88 +463,85 @@ msgstr ""
 msgid "No"
 msgstr ""
 
-#: ../admin/backups.php:139
+#: ../admin/backups.php:142
 msgid "Restore backup completed."
 msgstr ""
 
-#: ../admin/backups.php:148
+#: ../admin/backups.php:151
 msgid "File successfully deleted."
 msgstr ""
 
-#: ../admin/backups.php:153
+#: ../admin/backups.php:156
 msgid "Can't delete backup file."
 msgstr ""
 
-#: ../admin/backups.php:165
+#: ../admin/backups.php:168
 msgid "You can only upload *.sql backup files"
 msgstr ""
 
-#: ../admin/backups.php:168
+#: ../admin/backups.php:171
 msgid "File uploaded to backup directory"
 msgstr ""
 
-#: ../admin/backups.php:171
+#: ../admin/backups.php:174
 msgid "File was not uploaded into the system."
 msgstr ""
 
-#: ../admin/backups.php:180
+#: ../admin/backups.php:183
 msgid "Create backup"
 msgstr ""
 
-#: ../admin/backups.php:181
-#: ../sales/includes/ui/sales_order_ui.inc:580
-#: ../sales/includes/ui/sales_order_ui.inc:636
+#: ../admin/backups.php:184
 msgid "Comments:"
 msgstr ""
 
-#: ../admin/backups.php:182
+#: ../admin/backups.php:185
 msgid "Compression:"
 msgstr ""
 
-#: ../admin/backups.php:184
+#: ../admin/backups.php:187
 msgid "Create Backup"
 msgstr ""
 
-#: ../admin/backups.php:186
+#: ../admin/backups.php:189
 msgid "Backup scripts maintenance"
 msgstr ""
 
-#: ../admin/backups.php:192
+#: ../admin/backups.php:195
 msgid "View Backup"
 msgstr ""
 
-#: ../admin/backups.php:193
+#: ../admin/backups.php:196
 msgid "Download Backup"
 msgstr ""
 
-#: ../admin/backups.php:194
+#: ../admin/backups.php:197
 msgid "Restore Backup"
 msgstr ""
 
-#: ../admin/backups.php:195
+#: ../admin/backups.php:198
 msgid ""
 "You are about to restore database from backup file.\n"
 "Do you want to continue?"
 msgstr ""
 
-#: ../admin/backups.php:197
+#: ../admin/backups.php:200
 msgid "Delete Backup"
 msgstr ""
 
-#: ../admin/backups.php:199
+#: ../admin/backups.php:202
 #, php-format
 msgid ""
 "You are about to remove selected backup file.\n"
 "Do you want to continue ?"
 msgstr ""
 
-#: ../admin/backups.php:205
+#: ../admin/backups.php:208
 msgid "Upload file"
 msgstr ""
 
 #: ../admin/change_current_user_password.php:16
 #: ../admin/change_current_user_password.php:99
-#: ../themes/default/renderer.php:77
 msgid "Change password"
 msgstr ""
 
@@ -619,207 +597,214 @@ msgstr ""
 msgid "Company Setup"
 msgstr ""
 
-#: ../admin/company_preferences.php:31
+#: ../admin/company_preferences.php:29
 msgid "Login timeout must be positive number not less than 10."
 msgstr ""
 
-#: ../admin/company_preferences.php:38
+#: ../admin/company_preferences.php:36
 msgid "The company name must be entered."
 msgstr ""
 
-#: ../admin/company_preferences.php:54
+#: ../admin/company_preferences.php:52
 msgid ""
 "Only jpg and png files are supported - a file extension of .jpg or .png is "
 "expected"
 msgstr ""
 
-#: ../admin/company_preferences.php:59
+#: ../admin/company_preferences.php:57
 #: ../inventory/manage/items.php:86
 msgid ""
 "The file size is over the maximum allowed. The maximum size allowed in KB is"
 msgstr ""
 
-#: ../admin/company_preferences.php:64
+#: ../admin/company_preferences.php:62
 #: ../inventory/manage/items.php:76
 #: ../inventory/manage/items.php:91
 msgid "Only graphics files can be uploaded"
 msgstr ""
 
-#: ../admin/company_preferences.php:72
-#: ../admin/company_preferences.php:93
+#: ../admin/company_preferences.php:70
+#: ../admin/company_preferences.php:91
 #: ../inventory/manage/items.php:99
 msgid "The existing image could not be removed"
 msgstr ""
 
-#: ../admin/company_preferences.php:82
+#: ../admin/company_preferences.php:80
 msgid "Error uploading logo file"
 msgstr ""
 
-#: ../admin/company_preferences.php:116
+#: ../admin/company_preferences.php:114
 msgid "Company setup has been updated."
 msgstr ""
 
-#: ../admin/company_preferences.php:164
+#: ../admin/company_preferences.php:173
 msgid "Name (to appear on reports):"
 msgstr ""
 
-#: ../admin/company_preferences.php:165
+#: ../admin/company_preferences.php:174
 #: ../admin/shipping_companies.php:142
 #: ../includes/ui/contacts_view.inc:109
 #: ../inventory/manage/locations.php:202
 #: ../sales/manage/customers.php:234
-#: ../sales/includes/ui/sales_order_ui.inc:627
 msgid "Address:"
 msgstr ""
 
-#: ../admin/company_preferences.php:166
+#: ../admin/company_preferences.php:175
 msgid "Domicile:"
 msgstr ""
 
-#: ../admin/company_preferences.php:168
+#: ../admin/company_preferences.php:177
 #: ../admin/shipping_companies.php:138
 #: ../purchasing/manage/suppliers.php:137
-#: ../sales/manage/customer_branches.php:262
+#: ../sales/manage/customer_branches.php:249
 msgid "Phone Number:"
 msgstr ""
 
-#: ../admin/company_preferences.php:169
+#: ../admin/company_preferences.php:178
 #: ../includes/ui/contacts_view.inc:104
 #: ../purchasing/manage/suppliers.php:140
-#: ../sales/manage/customer_branches.php:264
+#: ../sales/manage/customer_branches.php:251
 #: ../sales/manage/customers.php:258
 msgid "Fax Number:"
 msgstr ""
 
-#: ../admin/company_preferences.php:170
+#: ../admin/company_preferences.php:179
 #: ../admin/users.php:211
 msgid "Email Address:"
 msgstr ""
 
-#: ../admin/company_preferences.php:172
+#: ../admin/company_preferences.php:181
 msgid "BCC Address for all outgoing mails:"
 msgstr ""
 
-#: ../admin/company_preferences.php:174
+#: ../admin/company_preferences.php:183
 msgid "Official Company Number:"
 msgstr ""
 
-#: ../admin/company_preferences.php:175
+#: ../admin/company_preferences.php:184
 #: ../purchasing/manage/suppliers.php:96
 #: ../sales/manage/customers.php:236
 msgid "GSTNo:"
 msgstr ""
 
-#: ../admin/company_preferences.php:177
-msgid "Home Currency:"
-msgstr ""
-
-#: ../admin/company_preferences.php:178
+#: ../admin/company_preferences.php:186
 #: ../gl/gl_budget.php:63
 msgid "Fiscal Year:"
 msgstr ""
 
-#: ../admin/company_preferences.php:179
+#: ../admin/company_preferences.php:187
 msgid "Tax Periods:"
 msgstr ""
 
-#: ../admin/company_preferences.php:179
+#: ../admin/company_preferences.php:187
 msgid "Months."
 msgstr ""
 
-#: ../admin/company_preferences.php:180
+#: ../admin/company_preferences.php:188
 msgid "Tax Last Period:"
 msgstr ""
 
-#: ../admin/company_preferences.php:180
+#: ../admin/company_preferences.php:188
 msgid "Months back."
 msgstr ""
 
-#: ../admin/company_preferences.php:184
+#: ../admin/company_preferences.php:189
+msgid "Put alternative Tax Include on Docs"
+msgstr ""
+
+#: ../admin/company_preferences.php:190
+msgid "Suppress Tax Rates on Docs"
+msgstr ""
+
+#: ../admin/company_preferences.php:194
 msgid "Company Logo:"
 msgstr ""
 
-#: ../admin/company_preferences.php:185
+#: ../admin/company_preferences.php:195
 msgid "New Company Logo (.jpg)"
 msgstr ""
 
-#: ../admin/company_preferences.php:186
+#: ../admin/company_preferences.php:196
 msgid "Delete Company Logo:"
 msgstr ""
 
-#: ../admin/company_preferences.php:188
+#: ../admin/company_preferences.php:198
 msgid "Use Dimensions:"
 msgstr ""
 
-#: ../admin/company_preferences.php:189
+#: ../admin/company_preferences.php:199
 msgid "Base for auto price calculations:"
 msgstr ""
 
-#: ../admin/company_preferences.php:190
+#: ../admin/company_preferences.php:200
 msgid "No base price list"
 msgstr ""
 
-#: ../admin/company_preferences.php:191
+#: ../admin/company_preferences.php:201
 msgid "Add Price from Std Cost:"
 msgstr ""
 
-#: ../admin/company_preferences.php:193
+#: ../admin/company_preferences.php:203
 msgid "Round to nearest:"
 msgstr ""
 
-#: ../admin/company_preferences.php:196
+#: ../admin/company_preferences.php:206
 msgid "Search Item List"
 msgstr ""
 
-#: ../admin/company_preferences.php:197
+#: ../admin/company_preferences.php:207
 msgid "Search Customer List"
 msgstr ""
 
-#: ../admin/company_preferences.php:198
+#: ../admin/company_preferences.php:208
 msgid "Search Supplier List"
 msgstr ""
 
-#: ../admin/company_preferences.php:200
+#: ../admin/company_preferences.php:210
+msgid "Home Currency:"
+msgstr ""
+
+#: ../admin/company_preferences.php:211
 msgid "Automatic Revaluation Currency Accounts"
 msgstr ""
 
-#: ../admin/company_preferences.php:201
+#: ../admin/company_preferences.php:212
 msgid "Time Zone on Reports"
 msgstr ""
 
-#: ../admin/company_preferences.php:202
+#: ../admin/company_preferences.php:213
 msgid "Login Timeout:"
 msgstr ""
 
-#: ../admin/company_preferences.php:202
+#: ../admin/company_preferences.php:213
 msgid "seconds"
 msgstr ""
 
-#: ../admin/company_preferences.php:203
+#: ../admin/company_preferences.php:214
 msgid "Version Id"
 msgstr ""
 
-#: ../admin/company_preferences.php:208
-#: ../admin/display_prefs.php:145
+#: ../admin/company_preferences.php:219
+#: ../admin/display_prefs.php:160
 #: ../admin/forms_setup.php:61
-#: ../admin/gl_setup.php:249
+#: ../admin/gl_setup.php:309
 #: ../admin/inst_chart.php:74
 #: ../admin/inst_lang.php:103
 #: ../admin/inst_module.php:137
 #: ../admin/inst_module.php:155
 #: ../admin/inst_module.php:198
-#: ../admin/inst_theme.php:96
+#: ../admin/inst_theme.php:77
 #: ../dimensions/dimension_entry.php:293
 #: ../gl/gl_bank.php:417
 #: ../gl/gl_budget.php:135
 #: ../gl/manage/gl_quick_entries.php:60
 #: ../gl/includes/ui/gl_bank_ui.inc:277
-#: ../gl/includes/ui/gl_journal_ui.inc:257
+#: ../gl/includes/ui/gl_journal_ui.inc:256
 #: ../includes/ui/db_pager_view.inc:174
 #: ../includes/ui/simple_crud_class.inc:56
 #: ../includes/ui/simple_crud_class.inc:227
-#: ../includes/ui/ui_input.inc:208
-#: ../includes/ui/ui_input.inc:906
+#: ../includes/ui/ui_input.inc:209
+#: ../includes/ui/ui_input.inc:907
 #: ../inventory/adjustments.php:234
 #: ../inventory/cost_update.php:134
 #: ../inventory/reorder_level.php:112
@@ -829,18 +814,15 @@ msgstr ""
 #: ../inventory/manage/sales_kits.php:208
 #: ../manufacturing/work_order_entry.php:457
 #: ../manufacturing/includes/work_order_issue_ui.inc:138
-#: ../purchasing/includes/ui/po_ui.inc:308
-#: ../purchasing/includes/ui/po_ui.inc:459
+#: ../purchasing/includes/ui/po_ui.inc:281
+#: ../purchasing/includes/ui/po_ui.inc:432
 #: ../purchasing/po_receive_items.php:332
 #: ../sales/credit_note_entry.php:284
-#: ../sales/customer_credit_invoice.php:380
-#: ../sales/customer_delivery.php:563
-#: ../sales/customer_invoice.php:693
-#: ../sales/inquiry/sales_orders_view.php:350
+#: ../sales/customer_credit_invoice.php:381
+#: ../sales/customer_delivery.php:528
+#: ../sales/inquiry/sales_orders_view.php:313
 #: ../sales/includes/ui/sales_credit_ui.inc:293
-#: ../sales/includes/ui/sales_order_ui.inc:232
-#: ../sales/includes/ui/sales_order_ui.inc:546
-#: ../taxes/sav.tax_types.php:255
+#: ../sales/includes/ui/sales_order_ui.inc:233
 msgid "Update"
 msgstr ""
 
@@ -871,106 +853,110 @@ msgstr ""
 msgid ", Please create it manually"
 msgstr ""
 
-#: ../admin/create_coy.php:131
+#: ../admin/create_coy.php:133
 msgid "Cannot create new company due to bugs in sql file."
 msgstr ""
 
-#: ../admin/create_coy.php:149
-#: ../admin/create_coy.php:216
+#: ../admin/create_coy.php:152
+#: ../admin/create_coy.php:219
 msgid "Cannot open the configuration file - "
 msgstr ""
 
-#: ../admin/create_coy.php:151
-#: ../admin/create_coy.php:218
+#: ../admin/create_coy.php:154
+#: ../admin/create_coy.php:221
 msgid "Cannot write to the configuration file - "
 msgstr ""
 
-#: ../admin/create_coy.php:153
-#: ../admin/create_coy.php:189
-#: ../admin/create_coy.php:220
+#: ../admin/create_coy.php:156
+#: ../admin/create_coy.php:191
+#: ../admin/create_coy.php:223
 msgid "The configuration file "
 msgstr ""
 
-#: ../admin/create_coy.php:153
-#: ../admin/create_coy.php:189
-#: ../admin/create_coy.php:220
+#: ../admin/create_coy.php:156
+#: ../admin/create_coy.php:191
+#: ../admin/create_coy.php:223
 #: ../admin/db/maintenance_db.inc:250
 msgid ""
 " is not writable. Change its permissions so it is, then re-run the operation."
 msgstr ""
 
-#: ../admin/create_coy.php:165
+#: ../admin/create_coy.php:168
 msgid "New company has been created."
 msgstr ""
 
-#: ../admin/create_coy.php:165
+#: ../admin/create_coy.php:168
 msgid "Company has been updated."
 msgstr ""
 
-#: ../admin/create_coy.php:182
+#: ../admin/create_coy.php:184
 msgid ""
 "Broken company subdirectories system. You have to remove this company "
 "manually."
 msgstr ""
 
-#: ../admin/create_coy.php:198
+#: ../admin/create_coy.php:200
 msgid "Cannot rename subdirectory to temporary name."
 msgstr ""
 
-#: ../admin/create_coy.php:204
+#: ../admin/create_coy.php:206
 msgid "Cannot rename company subdirectory"
 msgstr ""
 
-#: ../admin/create_coy.php:210
+#: ../admin/create_coy.php:212
 msgid "Error removing Database: "
 msgstr ""
 
-#: ../admin/create_coy.php:210
+#: ../admin/create_coy.php:212
 msgid ", please remove it manually"
 msgstr ""
 
-#: ../admin/create_coy.php:229
+#: ../admin/create_coy.php:232
 msgid "Cannot remove temporary renamed company data directory "
 msgstr ""
 
-#: ../admin/create_coy.php:232
+#: ../admin/create_coy.php:235
 msgid "Selected company has been deleted"
 msgstr ""
 
-#: ../admin/create_coy.php:246
+#: ../admin/create_coy.php:250
 msgid "Are you sure you want to delete company no. "
 msgstr ""
 
-#: ../admin/create_coy.php:253
+#: ../admin/create_coy.php:257
 msgid "Database Host"
 msgstr ""
 
-#: ../admin/create_coy.php:253
-#: ../admin/create_coy.php:341
-#: ../admin/create_coy.php:347
+#: ../admin/create_coy.php:257
+#: ../admin/create_coy.php:345
+#: ../admin/create_coy.php:351
 msgid "Database User"
 msgstr ""
 
-#: ../admin/create_coy.php:254
-#: ../admin/create_coy.php:343
-#: ../admin/create_coy.php:348
+#: ../admin/create_coy.php:258
+#: ../admin/create_coy.php:347
+#: ../admin/create_coy.php:352
 msgid "Database Name"
 msgstr ""
 
-#: ../admin/create_coy.php:254
-#: ../admin/create_coy.php:344
-#: ../admin/create_coy.php:349
+#: ../admin/create_coy.php:258
+#: ../admin/create_coy.php:348
+#: ../admin/create_coy.php:353
 msgid "Table Pref"
 msgstr ""
 
-#: ../admin/create_coy.php:254
-#: ../admin/create_coy.php:351
+#: ../admin/create_coy.php:258
+#: ../admin/create_coy.php:355
 #: ../admin/inst_lang.php:36
 #: ../admin/print_profiles.php:162
+#: ../purchasing/includes/ui/invoice_ui.inc:132
+#: ../purchasing/includes/ui/invoice_ui.inc:135
+#: ../purchasing/includes/ui/po_ui.inc:176
+#: ../purchasing/includes/ui/po_ui.inc:178
 msgid "Default"
 msgstr ""
 
-#: ../admin/create_coy.php:263
+#: ../admin/create_coy.php:267
 #: ../admin/fiscalyears.php:159
 #: ../admin/inst_lang.php:85
 #: ../admin/inst_lang.php:97
@@ -982,13 +968,13 @@ msgstr ""
 #: ../includes/system_tests.inc:38
 #: ../includes/system_tests.inc:113
 #: ../includes/system_tests.inc:126
-#: ../includes/ui/ui_lists.inc:1682
+#: ../includes/ui/ui_lists.inc:1671
 #: ../purchasing/manage/suppliers.php:123
 #: ../reporting/rep101.php:113
 #: ../reporting/rep102.php:113
 #: ../reporting/rep102.php:115
 #: ../reporting/rep104.php:107
-#: ../reporting/rep106.php:77
+#: ../reporting/rep106.php:84
 #: ../reporting/rep114.php:76
 #: ../reporting/rep201.php:105
 #: ../reporting/rep202.php:117
@@ -1005,55 +991,53 @@ msgstr ""
 msgid "Yes"
 msgstr ""
 
-#: ../admin/create_coy.php:292
+#: ../admin/create_coy.php:296
 msgid "The marked company is the current company which cannot be deleted."
 msgstr ""
 
-#: ../admin/create_coy.php:293
+#: ../admin/create_coy.php:297
 msgid ""
 "If no Admin Password is entered, the new Admin Password will be "
 "'<b>password</b>' by default "
 msgstr ""
 
-#: ../admin/create_coy.php:340
-#: ../admin/create_coy.php:346
+#: ../admin/create_coy.php:344
+#: ../admin/create_coy.php:350
 #: ../admin/printers.php:84
 msgid "Host"
 msgstr ""
 
-#: ../admin/create_coy.php:342
+#: ../admin/create_coy.php:346
 msgid "Database Password"
 msgstr ""
 
-#: ../admin/create_coy.php:344
+#: ../admin/create_coy.php:348
 #: ../admin/inst_chart.php:68
 #: ../admin/inst_chart.php:70
 #: ../admin/inst_lang.php:87
 #: ../admin/inst_lang.php:90
 #: ../admin/inst_module.php:126
-#: ../admin/inst_theme.php:91
-#: ../admin/inst_theme.php:93
-#: ../admin/inst_upgrade.php:153
+#: ../admin/inst_theme.php:72
+#: ../admin/inst_theme.php:74
 #: ../gl/manage/gl_account_types.php:190
 #: ../includes/ui/allocation_cart.inc:316
-#: ../taxes/sav.tax_types.php:168
 msgid "None"
 msgstr ""
 
-#: ../admin/create_coy.php:355
+#: ../admin/create_coy.php:359
 msgid "Database Script"
 msgstr ""
 
-#: ../admin/create_coy.php:356
+#: ../admin/create_coy.php:360
 msgid "New script Admin Password"
 msgstr ""
 
-#: ../admin/create_coy.php:360
+#: ../admin/create_coy.php:364
 #: ../gl/gl_budget.php:136
 msgid "Save"
 msgstr ""
 
-#: ../admin/create_coy.php:382
+#: ../admin/create_coy.php:386
 msgid "Create a new company"
 msgstr ""
 
@@ -1073,42 +1057,42 @@ msgstr ""
 msgid "New contact category has been added"
 msgstr ""
 
-#: ../admin/crm_categories.php:71
+#: ../admin/crm_categories.php:62
 msgid "Cannot delete this category because there are contacts related to it."
 msgstr ""
 
-#: ../admin/crm_categories.php:77
+#: ../admin/crm_categories.php:68
 msgid "Category has been deleted"
 msgstr ""
 
-#: ../admin/crm_categories.php:97
+#: ../admin/crm_categories.php:88
 msgid "Category Type"
 msgstr ""
 
-#: ../admin/crm_categories.php:97
+#: ../admin/crm_categories.php:88
 msgid "Category Subtype"
 msgstr ""
 
-#: ../admin/crm_categories.php:97
-#: ../sales/manage/customer_branches.php:295
+#: ../admin/crm_categories.php:88
+#: ../sales/manage/customer_branches.php:279
 msgid "Short Name"
 msgstr ""
 
-#: ../admin/crm_categories.php:144
-#: ../admin/crm_categories.php:148
+#: ../admin/crm_categories.php:135
+#: ../admin/crm_categories.php:139
 msgid "Contact Category Type:"
 msgstr ""
 
-#: ../admin/crm_categories.php:145
-#: ../admin/crm_categories.php:149
+#: ../admin/crm_categories.php:136
+#: ../admin/crm_categories.php:140
 msgid "Contact Category Subtype:"
 msgstr ""
 
-#: ../admin/crm_categories.php:152
+#: ../admin/crm_categories.php:143
 msgid "Category Short Name:"
 msgstr ""
 
-#: ../admin/crm_categories.php:153
+#: ../admin/crm_categories.php:144
 msgid "Category Description:"
 msgstr ""
 
@@ -1120,137 +1104,176 @@ msgstr ""
 msgid "Query size must be integer and greater than zero."
 msgstr ""
 
-#: ../admin/display_prefs.php:60
+#: ../admin/display_prefs.php:61
 msgid ""
 "Display settings have been updated. Keep in mind that changed settings are "
 "restored on every login in demo mode."
 msgstr ""
 
-#: ../admin/display_prefs.php:62
+#: ../admin/display_prefs.php:63
 msgid "Display settings have been updated."
 msgstr ""
 
-#: ../admin/display_prefs.php:71
+#: ../admin/display_prefs.php:72
 msgid "Decimal Places"
 msgstr ""
 
-#: ../admin/display_prefs.php:73
+#: ../admin/display_prefs.php:74
 msgid "Prices/Amounts:"
 msgstr ""
 
-#: ../admin/display_prefs.php:74
+#: ../admin/display_prefs.php:75
 msgid "Quantities:"
 msgstr ""
 
-#: ../admin/display_prefs.php:75
+#: ../admin/display_prefs.php:76
 msgid "Exchange Rates:"
 msgstr ""
 
-#: ../admin/display_prefs.php:76
+#: ../admin/display_prefs.php:77
 msgid "Percentages:"
 msgstr ""
 
-#: ../admin/display_prefs.php:78
-msgid "Dateformat and Separators"
+#: ../admin/display_prefs.php:79
+msgid "Date Format and Separators"
 msgstr ""
 
-#: ../admin/display_prefs.php:80
-msgid "Dateformat:"
+#: ../admin/display_prefs.php:81
+msgid "Date Format:"
 msgstr ""
 
-#: ../admin/display_prefs.php:82
+#: ../admin/display_prefs.php:83
 msgid "Date Separator:"
 msgstr ""
 
-#: ../admin/display_prefs.php:87
+#: ../admin/display_prefs.php:88
 msgid "Thousand Separator:"
 msgstr ""
 
-#: ../admin/display_prefs.php:92
+#: ../admin/display_prefs.php:93
 msgid "Decimal Separator:"
 msgstr ""
 
-#: ../admin/display_prefs.php:99
-#: ../admin/inst_lang.php:35
-msgid "Language"
+#: ../admin/display_prefs.php:98
+msgid "Use Date Picker"
 msgstr ""
 
-#: ../admin/display_prefs.php:101
-#: ../admin/users.php:215
-msgid "Language:"
+#: ../admin/display_prefs.php:103
+msgid "Reports"
+msgstr ""
+
+#: ../admin/display_prefs.php:105
+msgid "Save Report Selection Days:"
+msgstr ""
+
+#: ../admin/display_prefs.php:107
+msgid "Default Report Destination:"
+msgstr ""
+
+#: ../admin/display_prefs.php:108
+msgid "Excel"
+msgstr ""
+
+#: ../admin/display_prefs.php:108
+#: ../reporting/includes/reports_classes.inc:234
+msgid "PDF/Printer"
+msgstr ""
+
+#: ../admin/display_prefs.php:110
+msgid "Default Report Orientation:"
+msgstr ""
+
+#: ../admin/display_prefs.php:111
+#: ../reporting/includes/reports_classes.inc:241
+msgid "Landscape"
+msgstr ""
+
+#: ../admin/display_prefs.php:111
+#: ../reporting/includes/reports_classes.inc:241
+msgid "Portrait"
 msgstr ""
 
-#: ../admin/display_prefs.php:104
+#: ../admin/display_prefs.php:115
 #: ../applications/setup.php:42
 #: ../includes/sysnames.inc:94
 msgid "Miscellaneous"
 msgstr ""
 
-#: ../admin/display_prefs.php:106
+#: ../admin/display_prefs.php:117
 msgid "Show hints for new users:"
 msgstr ""
 
-#: ../admin/display_prefs.php:108
+#: ../admin/display_prefs.php:119
 msgid "Show GL Information:"
 msgstr ""
 
-#: ../admin/display_prefs.php:110
+#: ../admin/display_prefs.php:121
 msgid "Show Item Codes:"
 msgstr ""
 
-#: ../admin/display_prefs.php:117
+#: ../admin/display_prefs.php:128
 msgid "Page Size:"
 msgstr ""
 
-#: ../admin/display_prefs.php:119
+#: ../admin/display_prefs.php:130
 msgid "Start-up Tab"
 msgstr ""
 
-#: ../admin/display_prefs.php:127
+#: ../admin/display_prefs.php:138
 #: ../admin/users.php:219
 msgid "Printing profile"
 msgstr ""
 
-#: ../admin/display_prefs.php:128
+#: ../admin/display_prefs.php:139
 #: ../admin/users.php:220
 msgid "Browser printing support"
 msgstr ""
 
-#: ../admin/display_prefs.php:130
+#: ../admin/display_prefs.php:141
 msgid "Use popup window to display reports:"
 msgstr ""
 
-#: ../admin/display_prefs.php:131
+#: ../admin/display_prefs.php:142
 #: ../admin/users.php:223
 msgid "Set this option to on if your browser directly supports pdf files"
 msgstr ""
 
-#: ../admin/display_prefs.php:133
+#: ../admin/display_prefs.php:144
 msgid "Use icons instead of text links:"
 msgstr ""
 
-#: ../admin/display_prefs.php:134
+#: ../admin/display_prefs.php:145
 msgid "Set this option to on for using icons instead of text links"
 msgstr ""
 
-#: ../admin/display_prefs.php:136
-msgid "Query page size:"
-msgstr ""
-
-#: ../admin/display_prefs.php:138
+#: ../admin/display_prefs.php:147
 msgid "Remember last document date:"
 msgstr ""
 
-#: ../admin/display_prefs.php:139
+#: ../admin/display_prefs.php:148
 msgid ""
 "If set document date is remembered on subsequent documents, otherwise "
 "default is current date"
 msgstr ""
 
-#: ../admin/display_prefs.php:141
+#: ../admin/display_prefs.php:150
+msgid "Query page size:"
+msgstr ""
+
+#: ../admin/display_prefs.php:152
 msgid "Transaction days:"
 msgstr ""
 
+#: ../admin/display_prefs.php:154
+#: ../admin/inst_lang.php:35
+msgid "Language"
+msgstr ""
+
+#: ../admin/display_prefs.php:156
+#: ../admin/users.php:215
+msgid "Language:"
+msgstr ""
+
 #: ../admin/fiscalyears.php:25
 msgid "Fiscal Years"
 msgstr ""
@@ -1311,16 +1334,16 @@ msgid "Fiscal Year End"
 msgstr ""
 
 #: ../admin/fiscalyears.php:138
-#: ../dimensions/inquiry/search_dimensions.php:133
-#: ../dimensions/inquiry/search_dimensions.php:139
-#: ../includes/ui/ui_input.inc:959
-#: ../includes/ui/ui_lists.inc:677
-#: ../manufacturing/search_work_orders.php:108
+#: ../dimensions/inquiry/search_dimensions.php:134
+#: ../dimensions/inquiry/search_dimensions.php:140
+#: ../includes/ui/ui_lists.inc:671
+#: ../includes/ui/ui_view.inc:1467
+#: ../manufacturing/search_work_orders.php:114
 #: ../reporting/rep402.php:103
 #: ../reporting/rep501.php:87
 #: ../reporting/rep710.php:113
 #: ../reporting/includes/excel_report.inc:234
-#: ../reporting/includes/pdf_report.inc:266
+#: ../reporting/includes/pdf_report.inc:267
 msgid "Closed"
 msgstr ""
 
@@ -1382,192 +1405,286 @@ msgstr ""
 msgid "The past due days interval allowance must be between 0 and 100."
 msgstr ""
 
-#: ../admin/gl_setup.php:52
+#: ../admin/gl_setup.php:55
 msgid "Before GRN Clearing Account can be changed all GRNs have to be invoiced"
 msgstr ""
 
-#: ../admin/gl_setup.php:59
-#: ../admin/db/fiscalyears_db.inc:141
+#: ../admin/gl_setup.php:62
+#: ../admin/db/fiscalyears_db.inc:139
 msgid ""
 "The Retained Earnings Account should be a Balance Account or the Profit and "
 "Loss Year Account should be an Expense Account (preferred the last one in "
 "the Expense Class)"
 msgstr ""
 
-#: ../admin/gl_setup.php:80
+#: ../admin/gl_setup.php:85
 msgid "The general GL setup has been updated."
 msgstr ""
 
-#: ../admin/gl_setup.php:150
+#: ../admin/gl_setup.php:197
 msgid "General GL"
 msgstr ""
 
-#: ../admin/gl_setup.php:152
+#: ../admin/gl_setup.php:199
 msgid "Past Due Days Interval:"
 msgstr ""
 
-#: ../admin/gl_setup.php:152
-#: ../admin/gl_setup.php:192
-#: ../admin/gl_setup.php:194
-#: ../admin/gl_setup.php:202
-#: ../admin/gl_setup.php:220
-#: ../admin/gl_setup.php:242
+#: ../admin/gl_setup.php:199
+#: ../admin/gl_setup.php:245
+#: ../admin/gl_setup.php:247
+#: ../admin/gl_setup.php:255
+#: ../admin/gl_setup.php:273
+#: ../admin/gl_setup.php:303
 #: ../admin/payment_terms.php:140
 msgid "days"
 msgstr ""
 
-#: ../admin/gl_setup.php:154
+#: ../admin/gl_setup.php:201
+msgid "Accounts Type:"
+msgstr ""
+
+#: ../admin/gl_setup.php:203
 msgid "Retained Earnings:"
 msgstr ""
 
-#: ../admin/gl_setup.php:156
+#: ../admin/gl_setup.php:205
 msgid "Profit/Loss Year:"
 msgstr ""
 
-#: ../admin/gl_setup.php:158
+#: ../admin/gl_setup.php:207
 msgid "Exchange Variances Account:"
 msgstr ""
 
-#: ../admin/gl_setup.php:160
+#: ../admin/gl_setup.php:209
 #: ../gl/manage/bank_accounts.php:193
 msgid "Bank Charges Account:"
 msgstr ""
 
-#: ../admin/gl_setup.php:162
+#: ../admin/gl_setup.php:211
 msgid "Tax Algorithm:"
 msgstr ""
 
-#: ../admin/gl_setup.php:166
+#: ../admin/gl_setup.php:215
 msgid "Customers and Sales"
 msgstr ""
 
-#: ../admin/gl_setup.php:168
+#: ../admin/gl_setup.php:217
 msgid "Default Credit Limit:"
 msgstr ""
 
-#: ../admin/gl_setup.php:170
+#: ../admin/gl_setup.php:219
+msgid "Invoice Identification:"
+msgstr ""
+
+#: ../admin/gl_setup.php:219
+#: ../gl/manage/bank_accounts.php:110
+#: ../includes/ui/ui_view.inc:548
+msgid "Number"
+msgstr ""
+
+#: ../admin/gl_setup.php:219
+#: ../admin/view_print_transaction.php:127
+#: ../admin/void_transaction.php:182
+#: ../dimensions/inquiry/search_dimensions.php:129
+#: ../dimensions/view/view_dimension.php:55
+#: ../gl/bank_account_reconcile.php:233
+#: ../gl/inquiry/bank_inquiry.php:71
+#: ../gl/inquiry/journal_inquiry.php:103
+#: ../gl/view/bank_transfer_view.php:86
+#: ../gl/view/gl_deposit_view.php:80
+#: ../gl/view/gl_payment_view.php:78
+#: ../gl/view/gl_trans_view.php:35
+#: ../includes/ui/contacts_view.inc:41
+#: ../inventory/inquiry/stock_movements.php:78
+#: ../inventory/view/view_adjustment.php:44
+#: ../inventory/view/view_transfer.php:44
+#: ../manufacturing/search_work_orders.php:166
+#: ../manufacturing/view/wo_issue_view.php:43
+#: ../manufacturing/view/wo_production_view.php:44
+#: ../manufacturing/includes/manufacturing_ui.inc:157
+#: ../manufacturing/includes/manufacturing_ui.inc:200
+#: ../manufacturing/includes/manufacturing_ui.inc:276
+#: ../manufacturing/includes/manufacturing_ui.inc:280
+#: ../manufacturing/includes/manufacturing_ui.inc:331
+#: ../purchasing/includes/ui/grn_ui.inc:32
+#: ../purchasing/includes/ui/grn_ui.inc:64
+#: ../purchasing/includes/ui/po_ui.inc:296
+#: ../purchasing/view/view_po.php:115
+#: ../purchasing/view/view_supp_credit.php:43
+#: ../purchasing/view/view_supp_invoice.php:47
+#: ../purchasing/view/view_supp_payment.php:73
+#: ../purchasing/inquiry/po_search_completed.php:123
+#: ../purchasing/inquiry/po_search.php:118
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:129
+#: ../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:245
+#: ../sales/customer_credit_invoice.php:247
+#: ../sales/customer_delivery.php:337
+#: ../sales/customer_delivery.php:339
+#: ../sales/customer_invoice.php:464
+#: ../sales/customer_invoice.php:466
+#: ../sales/allocations/customer_allocation_main.php:95
+#: ../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:146
+#: ../sales/inquiry/sales_deliveries_view.php:173
+#: ../sales/includes/ui/sales_credit_ui.inc:85
+#: ../sales/includes/ui/sales_credit_ui.inc:87
+#: ../sales/includes/ui/sales_order_ui.inc:365
+msgid "Reference"
+msgstr ""
+
+#: ../admin/gl_setup.php:221
 msgid "Accumulate batch shipping:"
 msgstr ""
 
-#: ../admin/gl_setup.php:172
+#: ../admin/gl_setup.php:223
+msgid "Print Item Image on Quote:"
+msgstr ""
+
+#: ../admin/gl_setup.php:225
 msgid "Legal Text on Invoice:"
 msgstr ""
 
-#: ../admin/gl_setup.php:174
+#: ../admin/gl_setup.php:227
 msgid "Shipping Charged Account:"
 msgstr ""
 
-#: ../admin/gl_setup.php:176
+#: ../admin/gl_setup.php:229
 msgid "Deferred Income Account:"
 msgstr ""
 
-#: ../admin/gl_setup.php:177
+#: ../admin/gl_setup.php:230
 msgid "Not used"
 msgstr ""
 
-#: ../admin/gl_setup.php:181
+#: ../admin/gl_setup.php:234
 msgid "Customers and Sales Defaults"
 msgstr ""
 
-#: ../admin/gl_setup.php:183
+#: ../admin/gl_setup.php:236
 msgid "Receivable Account:"
 msgstr ""
 
-#: ../admin/gl_setup.php:185
-#: ../admin/gl_setup.php:228
+#: ../admin/gl_setup.php:238
+#: ../admin/gl_setup.php:289
 #: ../inventory/manage/item_categories.php:196
 #: ../inventory/manage/items.php:365
-#: ../sales/manage/customer_branches.php:251
+#: ../sales/manage/customer_branches.php:238
 msgid "Sales Account:"
 msgstr ""
 
-#: ../admin/gl_setup.php:188
-#: ../sales/manage/customer_branches.php:252
+#: ../admin/gl_setup.php:241
+#: ../sales/manage/customer_branches.php:239
 msgid "Sales Discount Account:"
 msgstr ""
 
-#: ../admin/gl_setup.php:190
-#: ../sales/manage/customer_branches.php:254
+#: ../admin/gl_setup.php:243
+#: ../sales/manage/customer_branches.php:241
 msgid "Prompt Payment Discount Account:"
 msgstr ""
 
-#: ../admin/gl_setup.php:192
+#: ../admin/gl_setup.php:245
 msgid "Quote Valid Days:"
 msgstr ""
 
-#: ../admin/gl_setup.php:194
+#: ../admin/gl_setup.php:247
 msgid "Delivery Required By:"
 msgstr ""
 
-#: ../admin/gl_setup.php:200
+#: ../admin/gl_setup.php:253
 msgid "Dimension Defaults"
 msgstr ""
 
-#: ../admin/gl_setup.php:202
+#: ../admin/gl_setup.php:255
 msgid "Dimension Required By After:"
 msgstr ""
 
-#: ../admin/gl_setup.php:206
+#: ../admin/gl_setup.php:259
 msgid "Suppliers and Purchasing"
 msgstr ""
 
-#: ../admin/gl_setup.php:208
+#: ../admin/gl_setup.php:261
 msgid "Delivery Over-Receive Allowance:"
 msgstr ""
 
-#: ../admin/gl_setup.php:210
+#: ../admin/gl_setup.php:263
 msgid "Invoice Over-Charge Allowance:"
 msgstr ""
 
-#: ../admin/gl_setup.php:212
+#: ../admin/gl_setup.php:265
 msgid "Suppliers and Purchasing Defaults"
 msgstr ""
 
-#: ../admin/gl_setup.php:214
+#: ../admin/gl_setup.php:267
 msgid "Payable Account:"
 msgstr ""
 
-#: ../admin/gl_setup.php:216
+#: ../admin/gl_setup.php:269
 #: ../purchasing/manage/suppliers.php:133
 msgid "Purchase Discount Account:"
 msgstr ""
 
-#: ../admin/gl_setup.php:218
+#: ../admin/gl_setup.php:271
 msgid "GRN Clearing Account:"
 msgstr ""
 
-#: ../admin/gl_setup.php:218
+#: ../admin/gl_setup.php:271
 msgid "No postings on GRN"
 msgstr ""
 
-#: ../admin/gl_setup.php:220
+#: ../admin/gl_setup.php:273
 msgid "Receival Required By:"
 msgstr ""
 
-#: ../admin/gl_setup.php:222
+#: ../admin/gl_setup.php:275
+msgid "Show PO item codes:"
+msgstr ""
+
+#: ../admin/gl_setup.php:277
 #: ../reporting/reports_main.php:206
 msgid "Inventory"
 msgstr ""
 
-#: ../admin/gl_setup.php:224
+#: ../admin/gl_setup.php:279
 msgid "Allow Negative Inventory:"
 msgstr ""
 
-#: ../admin/gl_setup.php:225
+#: ../admin/gl_setup.php:280
 msgid "Warning:  This may cause a delay in GL postings"
 msgstr ""
 
-#: ../admin/gl_setup.php:227
+#: ../admin/gl_setup.php:282
+msgid "No zero-amounts (Service):"
+msgstr ""
+
+#: ../admin/gl_setup.php:284
+msgid "Location Notifications:"
+msgstr ""
+
+#: ../admin/gl_setup.php:286
+msgid "Allow Negative Prices:"
+msgstr ""
+
+#: ../admin/gl_setup.php:288
 msgid "Items Defaults"
 msgstr ""
 
-#: ../admin/gl_setup.php:230
+#: ../admin/gl_setup.php:291
 #: ../inventory/manage/item_categories.php:206
 #: ../inventory/manage/items.php:369
 msgid "Inventory Account:"
 msgstr ""
 
-#: ../admin/gl_setup.php:232
+#: ../admin/gl_setup.php:293
 #: ../inventory/manage/item_categories.php:200
 #: ../inventory/manage/item_categories.php:208
 #: ../inventory/manage/items.php:370
@@ -1575,23 +1692,23 @@ msgstr ""
 msgid "C.O.G.S. Account:"
 msgstr ""
 
-#: ../admin/gl_setup.php:234
+#: ../admin/gl_setup.php:295
 #: ../inventory/manage/item_categories.php:209
 #: ../inventory/manage/items.php:371
 msgid "Inventory Adjustments Account:"
 msgstr ""
 
-#: ../admin/gl_setup.php:236
+#: ../admin/gl_setup.php:297
 #: ../inventory/manage/item_categories.php:213
 #: ../inventory/manage/items.php:382
 msgid "Item Assembly Costs Account:"
 msgstr ""
 
-#: ../admin/gl_setup.php:240
+#: ../admin/gl_setup.php:301
 msgid "Manufacturing Defaults"
 msgstr ""
 
-#: ../admin/gl_setup.php:242
+#: ../admin/gl_setup.php:303
 msgid "Work Order Required By After:"
 msgstr ""
 
@@ -1610,15 +1727,14 @@ msgstr ""
 #: ../admin/inst_chart.php:50
 #: ../admin/inst_lang.php:36
 #: ../admin/inst_module.php:105
-#: ../admin/inst_theme.php:74
-#: ../admin/inst_upgrade.php:159
+#: ../admin/inst_theme.php:55
 msgid "Installed"
 msgstr ""
 
 #: ../admin/inst_chart.php:50
 #: ../admin/inst_lang.php:36
 #: ../admin/inst_module.php:105
-#: ../admin/inst_theme.php:74
+#: ../admin/inst_theme.php:55
 #: ../inventory/inquiry/stock_status.php:71
 #: ../reporting/rep303.php:114
 msgid "Available"
@@ -1635,7 +1751,7 @@ msgstr ""
 #: ../admin/inst_lang.php:88
 #: ../admin/inst_module.php:127
 #: ../admin/inst_module.php:128
-#: ../admin/inst_theme.php:92
+#: ../admin/inst_theme.php:73
 #: ../includes/sysnames.inc:193
 msgid "Unknown"
 msgstr ""
@@ -1644,20 +1760,19 @@ msgstr ""
 #: ../admin/inst_lang.php:103
 #: ../admin/inst_module.php:132
 #: ../admin/inst_module.php:137
-#: ../admin/inst_theme.php:96
-#: ../admin/inst_upgrade.php:141
+#: ../admin/inst_theme.php:77
 msgid "Install"
 msgstr ""
 
 #: ../admin/inst_chart.php:75
 #: ../admin/inst_module.php:138
-#: ../admin/inst_theme.php:97
+#: ../admin/inst_theme.php:78
 msgid "Upload and install latest extension package"
 msgstr ""
 
 #: ../admin/inst_chart.php:82
 #: ../admin/inst_module.php:145
-#: ../admin/inst_theme.php:104
+#: ../admin/inst_theme.php:85
 #, php-format
 msgid ""
 "You are about to remove package \\'%s\\'.\n"
@@ -1672,17 +1787,14 @@ msgstr ""
 #: ../admin/printers.php:84
 #: ../admin/shipping_companies.php:91
 #: ../dimensions/dimension_entry.php:271
-#: ../dimensions/inquiry/search_dimensions.php:129
+#: ../dimensions/inquiry/search_dimensions.php:130
 #: ../dimensions/view/view_dimension.php:55
 #: ../inventory/manage/item_categories.php:98
 #: ../manufacturing/manage/work_centres.php:101
-#: ../purchasing/includes/ui/invoice_ui.inc:280
-#: ../purchasing/includes/ui/invoice_ui.inc:282
-#: ../purchasing/includes/ui/invoice_ui.inc:284
 #: ../reporting/rep501.php:87
 #: ../reporting/rep709.php:116
 #: ../reporting/rep709.php:117
-#: ../sales/manage/customer_branches.php:296
+#: ../sales/manage/customer_branches.php:280
 #: ../sales/manage/sales_people.php:99
 #: ../taxes/item_tax_types.php:117
 msgid "Name"
@@ -1787,10 +1899,10 @@ msgid "Install third-party extension."
 msgstr ""
 
 #: ../admin/inst_module.php:168
-#: ../includes/ui/ui_lists.inc:677
-#: ../includes/ui/ui_lists.inc:2162
+#: ../includes/ui/ui_lists.inc:671
+#: ../includes/ui/ui_lists.inc:2148
 #: ../reporting/includes/excel_report.inc:232
-#: ../reporting/includes/pdf_report.inc:264
+#: ../reporting/includes/pdf_report.inc:265
 msgid "Active"
 msgstr ""
 
@@ -1810,81 +1922,77 @@ msgstr ""
 msgid "Install Themes"
 msgstr ""
 
-#: ../admin/inst_theme.php:59
+#: ../admin/inst_theme.php:40
 msgid "Selected theme has been successfully deleted"
 msgstr ""
 
-#: ../admin/inst_theme.php:74
+#: ../admin/inst_theme.php:55
 msgid "Theme"
 msgstr ""
 
-#: ../admin/inst_upgrade.php:16
+#: ../admin/inst_upgrade.php:19
 msgid "Software Upgrade"
 msgstr ""
 
-#: ../admin/inst_upgrade.php:72
-#, php-format
-msgid "Database upgrade for company '%s' (%s:%s*) started..."
+#: ../admin/inst_upgrade.php:35
+msgid "Select company to be upgraded."
 msgstr ""
 
-#: ../admin/inst_upgrade.php:83
-msgid "Database upgrade finished."
+#: ../admin/inst_upgrade.php:43
+msgid "Company upgraded successfully."
 msgstr ""
 
-#: ../admin/inst_upgrade.php:86
-msgid ""
-"Upgrade cannot be done because database has been already partially upgraded. "
-"Please downgrade database to clean previous version or try forced upgrade."
+#: ../admin/inst_upgrade.php:63
+msgid "Table set"
 msgstr ""
 
-#: ../admin/inst_upgrade.php:104
-msgid "Cannot connect to database for company"
+#: ../admin/inst_upgrade.php:63
+msgid "Current version"
 msgstr ""
 
-#: ../admin/inst_upgrade.php:117
-#, php-format
-msgid "Database upgrade to version %s failed for company '%s'."
+#: ../admin/inst_upgrade.php:63
+msgid "Last log"
 msgstr ""
 
-#: ../admin/inst_upgrade.php:120
-msgid "You should restore company database from latest backup file"
+#: ../admin/inst_upgrade.php:63
+#: ../admin/inst_upgrade.php:115
+msgid "Upgrade"
 msgstr ""
 
-#: ../admin/inst_upgrade.php:133
-msgid "All companies data has been successfully updated"
+#: ../admin/inst_upgrade.php:82
+msgid "View log"
 msgstr ""
 
-#: ../admin/inst_upgrade.php:141
-msgid "Sql file"
+#: ../admin/inst_upgrade.php:83
+msgid "Clear"
 msgstr ""
 
-#: ../admin/inst_upgrade.php:142
-msgid "Force upgrade"
+#: ../admin/inst_upgrade.php:83
+msgid "Clear log"
 msgstr ""
 
-#: ../admin/inst_upgrade.php:165
-#, php-format
-msgid "Partially installed (%s)"
+#: ../admin/inst_upgrade.php:84
+msgid "Do you really want to clear this upgrade log?"
 msgstr ""
 
-#: ../admin/inst_upgrade.php:174
-msgid ""
-"Database upgrades marked as partially installed cannot be installed "
-"automatically.\n"
-"You have to clean database manually to enable them, or try to perform forced "
-"upgrade."
+#: ../admin/inst_upgrade.php:94
+msgid "Up to date"
 msgstr ""
 
-#: ../admin/inst_upgrade.php:178
-msgid "Upgrade system"
+#: ../admin/inst_upgrade.php:111
+msgid "All company database schemes are up to date."
 msgstr ""
 
-#: ../admin/inst_upgrade.php:178
+#: ../admin/inst_upgrade.php:114
+msgid "Select company for incremental upgrade."
+msgstr ""
+
+#: ../admin/inst_upgrade.php:115
 msgid "Save database and perform upgrade"
 msgstr ""
 
 #: ../admin/payment_terms.php:16
-#: ../reporting/includes/doctext.inc:41
+#: ../reporting/includes/doctext.inc:40
 #: ../sales/view/view_invoice.php:76
 #: ../sales/view/view_sales_order.php:82
 #: ../sales/view/view_sales_order.php:90
@@ -1926,27 +2034,27 @@ msgstr ""
 #: ../admin/payment_terms.php:127
 #: ../dimensions/dimension_entry.php:275
 #: ../dimensions/inquiry/search_dimensions.php:75
-#: ../dimensions/inquiry/search_dimensions.php:130
+#: ../dimensions/inquiry/search_dimensions.php:131
 #: ../dimensions/view/view_dimension.php:55
 #: ../gl/bank_account_reconcile.php:231
-#: ../gl/inquiry/bank_inquiry.php:70
+#: ../gl/inquiry/bank_inquiry.php:71
 #: ../gl/inquiry/gl_account_inquiry.php:126
-#: ../gl/inquiry/journal_inquiry.php:129
+#: ../gl/inquiry/journal_inquiry.php:101
 #: ../gl/inquiry/tax_inquiry.php:82
 #: ../gl/manage/bank_accounts.php:109
 #: ../gl/manage/gl_quick_entries.php:186
 #: ../gl/view/accrual_trans.php:52
 #: ../gl/includes/ui/gl_bank_ui.inc:93
-#: ../includes/ui/ui_view.inc:547
+#: ../includes/ui/ui_view.inc:548
 #: ../inventory/inquiry/stock_movements.php:78
 #: ../inventory/manage/item_categories.php:98
-#: ../manufacturing/search_work_orders.php:161
+#: ../manufacturing/search_work_orders.php:167
 #: ../manufacturing/view/wo_costs_view.php:46
 #: ../manufacturing/includes/manufacturing_ui.inc:236
 #: ../manufacturing/includes/manufacturing_ui.inc:276
 #: ../manufacturing/includes/manufacturing_ui.inc:280
 #: ../manufacturing/includes/manufacturing_ui.inc:331
-#: ../purchasing/inquiry/supplier_allocation_inquiry.php:126
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:127
 #: ../purchasing/inquiry/supplier_inquiry.php:173
 #: ../reporting/rep102.php:134
 #: ../reporting/rep202.php:139
@@ -1963,11 +2071,10 @@ msgstr ""
 #: ../reporting/rep710.php:86
 #: ../reporting/reports_main.php:340
 #: ../reporting/reports_main.php:504
-#: ../reporting/includes/doctext.inc:162
-#: ../reporting/includes/doctext.inc:203
-#: ../reporting/includes/doctext.inc:222
+#: ../reporting/includes/doctext.inc:161
+#: ../reporting/includes/doctext.inc:202
+#: ../reporting/includes/doctext.inc:221
 #: ../sales/inquiry/customer_allocation_inquiry.php:144
-#: ../sales/inquiry/customer_inquiry.php:200
 msgid "Type"
 msgstr ""
 
@@ -2165,8 +2272,8 @@ msgstr ""
 #: ../admin/security_roles.php:180
 #: ../gl/manage/gl_accounts.php:198
 #: ../inventory/manage/items.php:444
-#: ../purchasing/manage/suppliers.php:293
-#: ../sales/manage/customers.php:330
+#: ../purchasing/manage/suppliers.php:295
+#: ../sales/manage/customers.php:331
 msgid "Show inactive:"
 msgstr ""
 
@@ -2211,21 +2318,17 @@ msgstr ""
 #: ../admin/void_transaction.php:229
 #: ../gl/manage/gl_quick_entries.php:61
 #: ../gl/includes/ui/gl_bank_ui.inc:279
-#: ../gl/includes/ui/gl_journal_ui.inc:259
+#: ../gl/includes/ui/gl_journal_ui.inc:258
 #: ../includes/ui/simple_crud_class.inc:58
 #: ../includes/ui/simple_crud_class.inc:231
-#: ../includes/ui/ui_controls.inc:596
-#: ../includes/ui/ui_input.inc:211
+#: ../includes/ui/ui_controls.inc:597
+#: ../includes/ui/ui_input.inc:212
 #: ../inventory/includes/item_adjustments_ui.inc:165
 #: ../inventory/includes/stock_transfers_ui.inc:145
 #: ../inventory/manage/items.php:427
 #: ../manufacturing/includes/work_order_issue_ui.inc:140
-#: ../purchasing/includes/ui/po_ui.inc:461
+#: ../purchasing/includes/ui/po_ui.inc:434
 #: ../sales/includes/ui/sales_credit_ui.inc:295
-#: ../sales/includes/ui/sales_order_ui.inc:548
-#: ../taxes/sav.tax_types.php:173
-#: ../taxes/sav.tax_types.php:253
-#: ../taxes/sav.tax_types.php:256
 msgid "Cancel"
 msgstr ""
 
@@ -2236,8 +2339,8 @@ msgstr ""
 
 #: ../admin/shipping_companies.php:15
 #: ../sales/customer_credit_invoice.php:254
-#: ../sales/customer_delivery.php:392
-#: ../sales/customer_invoice.php:497
+#: ../sales/customer_delivery.php:357
+#: ../sales/customer_invoice.php:492
 #: ../sales/view/view_credit.php:74
 #: ../sales/view/view_dispatch.php:92
 #: ../sales/view/view_invoice.php:92
@@ -2300,7 +2403,7 @@ msgstr ""
 
 #: ../admin/shipping_companies.php:136
 #: ../purchasing/manage/suppliers.php:136
-#: ../sales/manage/customer_branches.php:261
+#: ../sales/manage/customer_branches.php:248
 msgid "Contact Person:"
 msgstr ""
 
@@ -2308,7 +2411,7 @@ msgstr ""
 #: ../includes/ui/contacts_view.inc:103
 #: ../inventory/manage/locations.php:205
 #: ../purchasing/manage/suppliers.php:138
-#: ../sales/manage/customer_branches.php:263
+#: ../sales/manage/customer_branches.php:250
 #: ../sales/manage/customers.php:257
 msgid "Secondary Phone Number:"
 msgstr ""
@@ -2412,14 +2515,14 @@ msgstr ""
 #: ../admin/users.php:123
 #: ../includes/ui/contacts_view.inc:41
 #: ../inventory/manage/locations.php:146
-#: ../reporting/rep106.php:88
+#: ../reporting/rep106.php:95
 #: ../reporting/includes/header2.inc:101
 #: ../sales/manage/sales_people.php:99
 msgid "Phone"
 msgstr ""
 
 #: ../admin/users.php:124
-#: ../sales/manage/customer_branches.php:302
+#: ../sales/manage/customer_branches.php:286
 #: ../sales/view/view_sales_order.php:96
 msgid "E-mail"
 msgstr ""
@@ -2463,12 +2566,11 @@ msgstr ""
 #: ../admin/view_print_transaction.php:43
 #: ../admin/view_print_transaction.php:45
 #: ../admin/view_print_transaction.php:129
-#: ../includes/ui/ui_controls.inc:195
-#: ../purchasing/inquiry/po_search_completed.php:115
-#: ../purchasing/inquiry/po_search.php:95
-#: ../sales/inquiry/customer_inquiry.php:185
-#: ../sales/inquiry/sales_deliveries_view.php:162
-#: ../sales/inquiry/sales_orders_view.php:125
+#: ../includes/ui/ui_controls.inc:196
+#: ../purchasing/inquiry/po_search_completed.php:113
+#: ../purchasing/inquiry/po_search.php:94
+#: ../sales/inquiry/sales_deliveries_view.php:148
+#: ../sales/inquiry/sales_orders_view.php:102
 msgid "Print"
 msgstr ""
 
@@ -2490,16 +2592,14 @@ msgstr ""
 #: ../admin/void_transaction.php:170
 #: ../dimensions/inquiry/search_dimensions.php:88
 #: ../gl/inquiry/journal_inquiry.php:53
-#: ../manufacturing/search_work_orders.php:78
-#: ../purchasing/includes/ui/invoice_ui.inc:489
-#: ../purchasing/inquiry/po_search_completed.php:77
+#: ../manufacturing/search_work_orders.php:84
+#: ../purchasing/inquiry/po_search_completed.php:78
 #: ../purchasing/inquiry/po_search.php:78
 #: ../purchasing/inquiry/supplier_allocation_inquiry.php:57
 #: ../purchasing/inquiry/supplier_inquiry.php:55
 #: ../sales/inquiry/customer_allocation_inquiry.php:51
-#: ../sales/inquiry/customer_inquiry.php:54
-#: ../sales/inquiry/sales_deliveries_view.php:118
-#: ../sales/inquiry/sales_orders_view.php:270
+#: ../sales/inquiry/sales_deliveries_view.php:116
+#: ../sales/inquiry/sales_orders_view.php:232
 msgid "Search"
 msgstr ""
 
@@ -2515,89 +2615,29 @@ msgid ""
 "zero."
 msgstr ""
 
-#: ../admin/view_print_transaction.php:127
-#: ../admin/void_transaction.php:182
-#: ../dimensions/inquiry/search_dimensions.php:128
-#: ../dimensions/view/view_dimension.php:55
-#: ../gl/bank_account_reconcile.php:233
-#: ../gl/inquiry/bank_inquiry.php:70
-#: ../gl/inquiry/journal_inquiry.php:131
-#: ../gl/view/bank_transfer_view.php:86
-#: ../gl/view/gl_deposit_view.php:80
-#: ../gl/view/gl_payment_view.php:78
-#: ../gl/view/gl_trans_view.php:35
-#: ../includes/ui/contacts_view.inc:41
-#: ../inventory/inquiry/stock_movements.php:78
-#: ../inventory/view/view_adjustment.php:44
-#: ../inventory/view/view_transfer.php:44
-#: ../manufacturing/search_work_orders.php:160
-#: ../manufacturing/view/wo_issue_view.php:43
-#: ../manufacturing/view/wo_production_view.php:44
-#: ../manufacturing/includes/manufacturing_ui.inc:157
-#: ../manufacturing/includes/manufacturing_ui.inc:200
-#: ../manufacturing/includes/manufacturing_ui.inc:276
-#: ../manufacturing/includes/manufacturing_ui.inc:280
-#: ../manufacturing/includes/manufacturing_ui.inc:331
-#: ../purchasing/includes/ui/grn_ui.inc:32
-#: ../purchasing/includes/ui/grn_ui.inc:64
-#: ../purchasing/includes/ui/po_ui.inc:323
-#: ../purchasing/view/view_po.php:115
-#: ../purchasing/view/view_supp_credit.php:43
-#: ../purchasing/view/view_supp_invoice.php:47
-#: ../purchasing/view/view_supp_payment.php:73
-#: ../purchasing/inquiry/po_search_completed.php:124
-#: ../purchasing/inquiry/po_search.php:133
-#: ../purchasing/inquiry/supplier_allocation_inquiry.php:128
-#: ../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:221
-#: ../sales/customer_credit_invoice.php:245
-#: ../sales/customer_credit_invoice.php:247
-#: ../sales/customer_delivery.php:372
-#: ../sales/customer_delivery.php:374
-#: ../sales/customer_invoice.php:469
-#: ../sales/customer_invoice.php:471
-#: ../sales/allocations/customer_allocation_main.php:95
-#: ../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:146
-#: ../sales/inquiry/customer_inquiry.php:203
-#: ../sales/inquiry/sales_deliveries_view.php:186
-#: ../sales/includes/ui/sales_credit_ui.inc:85
-#: ../sales/includes/ui/sales_credit_ui.inc:87
-#: ../sales/includes/ui/sales_order_ui.inc:364
-msgid "Reference"
-msgstr ""
-
 #: ../admin/view_print_transaction.php:128
 #: ../admin/void_transaction.php:183
-#: ../dimensions/inquiry/search_dimensions.php:131
+#: ../dimensions/inquiry/search_dimensions.php:132
 #: ../dimensions/view/view_dimension.php:55
 #: ../gl/accruals.php:94
 #: ../gl/accruals.php:199
 #: ../gl/bank_account_reconcile.php:234
-#: ../gl/inquiry/bank_inquiry.php:70
+#: ../gl/inquiry/bank_inquiry.php:71
 #: ../gl/inquiry/gl_account_inquiry.php:126
-#: ../gl/inquiry/journal_inquiry.php:128
+#: ../gl/inquiry/journal_inquiry.php:100
 #: ../gl/view/accrual_trans.php:52
 #: ../gl/view/bank_transfer_view.php:83
 #: ../gl/view/gl_deposit_view.php:68
 #: ../gl/view/gl_payment_view.php:66
 #: ../gl/view/gl_trans_view.php:36
 #: ../includes/ui/allocation_cart.inc:290
-#: ../includes/ui/ui_view.inc:547
+#: ../includes/ui/ui_view.inc:548
 #: ../inventory/inquiry/stock_movements.php:80
 #: ../inventory/view/view_adjustment.php:45
 #: ../inventory/view/view_transfer.php:47
-#: ../manufacturing/search_work_orders.php:166
-#: ../manufacturing/work_order_entry.php:417
-#: ../manufacturing/work_order_entry.php:423
+#: ../manufacturing/search_work_orders.php:172
+#: ../manufacturing/work_order_entry.php:418
+#: ../manufacturing/work_order_entry.php:424
 #: ../manufacturing/view/wo_costs_view.php:46
 #: ../manufacturing/view/wo_production_view.php:45
 #: ../manufacturing/includes/manufacturing_ui.inc:157
@@ -2606,14 +2646,14 @@ msgstr ""
 #: ../manufacturing/includes/manufacturing_ui.inc:277
 #: ../manufacturing/includes/manufacturing_ui.inc:281
 #: ../manufacturing/includes/manufacturing_ui.inc:332
-#: ../purchasing/includes/ui/invoice_ui.inc:129
-#: ../purchasing/includes/ui/po_ui.inc:337
+#: ../purchasing/includes/ui/invoice_ui.inc:139
+#: ../purchasing/includes/ui/po_ui.inc:310
 #: ../purchasing/view/view_po.php:140
-#: ../purchasing/inquiry/supplier_allocation_inquiry.php:131
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:132
 #: ../purchasing/inquiry/supplier_inquiry.php:178
 #: ../purchasing/allocations/supplier_allocation_main.php:97
 #: ../reporting/rep101.php:118
-#: ../reporting/rep107.php:202
+#: ../reporting/rep107.php:205
 #: ../reporting/rep201.php:110
 #: ../reporting/rep306.php:141
 #: ../reporting/rep402.php:103
@@ -2625,19 +2665,18 @@ msgstr ""
 #: ../reporting/rep704.php:89
 #: ../reporting/rep709.php:116
 #: ../reporting/rep710.php:77
-#: ../reporting/includes/doctext.inc:167
-#: ../reporting/includes/doctext.inc:208
-#: ../reporting/includes/doctext.inc:246
+#: ../reporting/includes/doctext.inc:166
+#: ../reporting/includes/doctext.inc:207
+#: ../reporting/includes/doctext.inc:245
 #: ../reporting/includes/header2.inc:138
-#: ../sales/customer_delivery.php:402
-#: ../sales/customer_invoice.php:512
+#: ../sales/customer_delivery.php:367
+#: ../sales/customer_invoice.php:507
 #: ../sales/allocations/customer_allocation_main.php:96
 #: ../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:148
-#: ../sales/inquiry/customer_inquiry.php:204
 msgid "Date"
 msgstr ""
 
@@ -2653,8 +2692,8 @@ msgstr ""
 
 #: ../admin/void_transaction.php:126
 #: ../admin/void_transaction.php:185
-#: ../includes/ui/ui_input.inc:138
-#: ../includes/ui/ui_input.inc:282
+#: ../includes/ui/ui_input.inc:139
+#: ../includes/ui/ui_input.inc:283
 #: ../includes/ui/ui_lists.inc:20
 msgid "Select"
 msgstr ""
@@ -2673,7 +2712,7 @@ msgstr ""
 
 #: ../admin/void_transaction.php:208
 #: ../dimensions/dimension_entry.php:283
-#: ../gl/bank_transfer.php:98
+#: ../gl/bank_transfer.php:137
 #: ../gl/inquiry/journal_inquiry.php:56
 #: ../gl/manage/revaluate_currencies.php:106
 #: ../includes/ui/ui_view.inc:344
@@ -2681,12 +2720,10 @@ msgstr ""
 #: ../manufacturing/work_order_costs.php:146
 #: ../manufacturing/work_order_entry.php:449
 #: ../manufacturing/work_order_release.php:103
-#: ../purchasing/includes/ui/invoice_ui.inc:195
-#: ../purchasing/includes/ui/po_ui.inc:494
+#: ../purchasing/includes/ui/po_ui.inc:467
 #: ../purchasing/po_entry_items.php:485
 #: ../purchasing/supplier_payment.php:325
-#: ../sales/customer_invoice.php:689
-#: ../sales/customer_payments.php:402
+#: ../sales/customer_payments.php:403
 msgid "Memo:"
 msgstr ""
 
@@ -2707,7 +2744,7 @@ msgid ""
 msgstr ""
 
 #: ../admin/void_transaction.php:228
-#: ../includes/ui/ui_controls.inc:595
+#: ../includes/ui/ui_controls.inc:596
 msgid "Proceed"
 msgstr ""
 
@@ -2717,7 +2754,7 @@ msgstr ""
 
 #: ../admin/void_transaction.php:248
 #: ../gl/accruals.php:32
-#: ../gl/bank_transfer.php:115
+#: ../gl/bank_transfer.php:159
 #: ../gl/gl_journal.php:162
 #: ../gl/manage/close_period.php:34
 #: ../gl/manage/exchange_rates.php:33
@@ -2727,10 +2764,10 @@ msgstr ""
 #: ../purchasing/po_receive_items.php:174
 #: ../purchasing/supplier_payment.php:185
 #: ../sales/customer_credit_invoice.php:91
-#: ../sales/sales_order_entry.php:366
-#: ../sales/manage/recurrent_invoices.php:41
-#: ../sales/manage/recurrent_invoices.php:46
-#: ../sales/manage/recurrent_invoices.php:51
+#: ../sales/sales_order_entry.php:363
+#: ../sales/manage/recurrent_invoices.php:47
+#: ../sales/manage/recurrent_invoices.php:52
+#: ../sales/manage/recurrent_invoices.php:57
 msgid "The entered date is invalid."
 msgstr ""
 
@@ -2754,18 +2791,18 @@ msgstr ""
 msgid "Attached File:"
 msgstr ""
 
-#: ../admin/db/fiscalyears_db.inc:136
+#: ../admin/db/fiscalyears_db.inc:134
 msgid ""
 "The Retained Earnings Account or the Profit and Loss Year Account has not "
 "been set in System and General GL Setup"
 msgstr ""
 
+#: ../admin/db/fiscalyears_db.inc:164
 #: ../admin/db/fiscalyears_db.inc:166
-#: ../admin/db/fiscalyears_db.inc:168
 msgid "Closing Year"
 msgstr ""
 
-#: ../admin/db/fiscalyears_db.inc:219
+#: ../admin/db/fiscalyears_db.inc:217
 #: ../reporting/rep101.php:173
 #: ../reporting/rep201.php:165
 #: ../reporting/rep706.php:185
@@ -2803,13 +2840,13 @@ msgstr ""
 msgid "The language files folder "
 msgstr ""
 
-#: ../admin/db/maintenance_db.inc:391
+#: ../admin/db/maintenance_db.inc:392
 msgid ""
 "This is new format backup file which cannot be restored on database not "
 "migrated to utf8."
 msgstr ""
 
-#: ../admin/db/maintenance_db.inc:473
+#: ../admin/db/maintenance_db.inc:476
 #, php-format
 msgid "SQL script execution failed in line %d: %s"
 msgstr ""
@@ -2823,7 +2860,7 @@ msgid "users online"
 msgstr ""
 
 #: ../admin/db/voiding_db.inc:114
-#: ../sales/includes/db/sales_invoice_db.inc:251
+#: ../sales/includes/db/sales_invoice_db.inc:252
 msgid "Voided."
 msgstr ""
 
@@ -3412,7 +3449,7 @@ msgid "The dimension reference must be entered."
 msgstr ""
 
 #: ../dimensions/dimension_entry.php:123
-#: ../gl/bank_transfer.php:176
+#: ../gl/bank_transfer.php:243
 #: ../gl/gl_bank.php:257
 #: ../gl/gl_journal.php:182
 #: ../gl/manage/revaluate_currencies.php:72
@@ -3421,7 +3458,6 @@ msgstr ""
 #: ../manufacturing/work_order_add_finished.php:84
 #: ../manufacturing/work_order_entry.php:139
 #: ../manufacturing/work_order_issue.php:97
-#: ../manufacturing/work_order_issue.php.orig:97
 #: ../purchasing/po_entry_items.php:365
 #: ../purchasing/po_receive_items.php:193
 #: ../purchasing/supplier_credit.php:182
@@ -3430,11 +3466,11 @@ msgstr ""
 #: ../sales/create_recurrent_invoices.php:57
 #: ../sales/credit_note_entry.php:181
 #: ../sales/customer_credit_invoice.php:205
-#: ../sales/customer_delivery.php:334
-#: ../sales/customer_invoice.php:388
-#: ../sales/customer_payments.php:169
-#: ../sales/customer_payments.php:176
-#: ../sales/sales_order_entry.php:475
+#: ../sales/customer_delivery.php:299
+#: ../sales/customer_invoice.php:383
+#: ../sales/customer_payments.php:170
+#: ../sales/customer_payments.php:177
+#: ../sales/sales_order_entry.php:464
 msgid "The entered reference is already in use."
 msgstr ""
 
@@ -3499,7 +3535,7 @@ msgid "Start Date"
 msgstr ""
 
 #: ../dimensions/dimension_entry.php:279
-#: ../manufacturing/work_order_entry.php:418
+#: ../manufacturing/work_order_entry.php:419
 msgid "Date Required By"
 msgstr ""
 
@@ -3541,10 +3577,6 @@ msgstr ""
 
 #: ../dimensions/dimension_entry.php:302
 #: ../includes/ui/simple_crud_class.inc:225
-#: ../purchasing/includes/ui/invoice_ui.inc:221
-#: ../purchasing/includes/ui/invoice_ui.inc:427
-#: ../purchasing/includes/ui/invoice_ui.inc:429
-#: ../taxes/sav.tax_types.php:172
 msgid "Add"
 msgstr ""
 
@@ -3563,9 +3595,6 @@ msgstr ""
 #: ../gl/manage/gl_quick_entries.php:241
 #: ../gl/manage/gl_quick_entries.php:333
 #: ../includes/sysnames.inc:165
-#: ../purchasing/includes/ui/invoice_ui.inc:280
-#: ../purchasing/includes/ui/invoice_ui.inc:282
-#: ../purchasing/includes/ui/invoice_ui.inc:284
 #: ../reporting/rep701.php:111
 #: ../reporting/rep705.php:238
 #: ../reporting/rep706.php:185
@@ -3577,7 +3606,7 @@ msgstr ""
 #: ../dimensions/includes/dimensions_ui.inc:31
 #: ../gl/accruals.php:102
 #: ../gl/bank_account_reconcile.php:235
-#: ../gl/inquiry/bank_inquiry.php:71
+#: ../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
@@ -3587,10 +3616,10 @@ msgstr ""
 #: ../gl/view/gl_trans_view.php:69
 #: ../gl/view/gl_trans_view.php:72
 #: ../gl/view/gl_trans_view.php:75
-#: ../gl/includes/ui/gl_journal_ui.inc:87
-#: ../gl/includes/ui/gl_journal_ui.inc:90
-#: ../gl/includes/ui/gl_journal_ui.inc:93
-#: ../purchasing/inquiry/supplier_allocation_inquiry.php:134
+#: ../gl/includes/ui/gl_journal_ui.inc:85
+#: ../gl/includes/ui/gl_journal_ui.inc:88
+#: ../gl/includes/ui/gl_journal_ui.inc:91
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:135
 #: ../purchasing/inquiry/supplier_inquiry.php:181
 #: ../reporting/rep601.php:80
 #: ../reporting/rep602.php:81
@@ -3601,14 +3630,13 @@ msgstr ""
 #: ../reporting/rep708.php:192
 #: ../reporting/rep708.php:193
 #: ../sales/inquiry/customer_allocation_inquiry.php:152
-#: ../sales/inquiry/customer_inquiry.php:209
 msgid "Debit"
 msgstr ""
 
 #: ../dimensions/includes/dimensions_ui.inc:31
 #: ../gl/accruals.php:102
 #: ../gl/bank_account_reconcile.php:236
-#: ../gl/inquiry/bank_inquiry.php:71
+#: ../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
@@ -3618,11 +3646,11 @@ msgstr ""
 #: ../gl/view/gl_trans_view.php:69
 #: ../gl/view/gl_trans_view.php:72
 #: ../gl/view/gl_trans_view.php:75
-#: ../gl/includes/ui/gl_journal_ui.inc:87
-#: ../gl/includes/ui/gl_journal_ui.inc:90
-#: ../gl/includes/ui/gl_journal_ui.inc:93
+#: ../gl/includes/ui/gl_journal_ui.inc:85
+#: ../gl/includes/ui/gl_journal_ui.inc:88
+#: ../gl/includes/ui/gl_journal_ui.inc:91
 #: ../includes/sysnames.inc:85
-#: ../purchasing/inquiry/supplier_allocation_inquiry.php:135
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:136
 #: ../purchasing/inquiry/supplier_inquiry.php:182
 #: ../reporting/rep601.php:80
 #: ../reporting/rep602.php:81
@@ -3633,16 +3661,15 @@ msgstr ""
 #: ../reporting/rep708.php:192
 #: ../reporting/rep708.php:193
 #: ../sales/inquiry/customer_allocation_inquiry.php:153
-#: ../sales/inquiry/customer_inquiry.php:210
 msgid "Credit"
 msgstr ""
 
 #: ../dimensions/includes/dimensions_ui.inc:45
-#: ../dimensions/inquiry/search_dimensions.php:134
-#: ../gl/inquiry/bank_inquiry.php:71
+#: ../dimensions/inquiry/search_dimensions.php:135
+#: ../gl/inquiry/bank_inquiry.php:72
 #: ../gl/inquiry/gl_account_inquiry.php:141
 #: ../gl/inquiry/gl_trial_balance.php:188
-#: ../purchasing/inquiry/supplier_allocation_inquiry.php:137
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:138
 #: ../reporting/rep101.php:122
 #: ../reporting/rep201.php:114
 #: ../reporting/rep203.php:94
@@ -3668,31 +3695,31 @@ msgid "Search Dimensions"
 msgstr ""
 
 #: ../dimensions/inquiry/search_dimensions.php:73
-#: ../gl/bank_transfer.php:79
+#: ../gl/bank_transfer.php:118
 #: ../gl/inquiry/journal_inquiry.php:45
 #: ../gl/manage/revaluate_currencies.php:105
 #: ../gl/includes/ui/gl_bank_ui.inc:26
-#: ../gl/includes/ui/gl_journal_ui.inc:30
+#: ../gl/includes/ui/gl_journal_ui.inc:31
 #: ../includes/ui/contacts_view.inc:94
 #: ../inventory/includes/item_adjustments_ui.inc:35
 #: ../inventory/includes/stock_transfers_ui.inc:40
-#: ../manufacturing/search_work_orders.php:67
+#: ../manufacturing/search_work_orders.php:68
 #: ../manufacturing/work_order_add_finished.php:195
 #: ../manufacturing/work_order_costs.php:134
-#: ../manufacturing/work_order_entry.php:376
-#: ../manufacturing/work_order_entry.php:383
+#: ../manufacturing/work_order_entry.php:377
+#: ../manufacturing/work_order_entry.php:384
 #: ../manufacturing/includes/work_order_issue_ui.inc:163
-#: ../purchasing/includes/ui/invoice_ui.inc:119
-#: ../purchasing/includes/ui/po_ui.inc:188
-#: ../purchasing/includes/ui/po_ui.inc:193
+#: ../purchasing/includes/ui/invoice_ui.inc:123
+#: ../purchasing/includes/ui/po_ui.inc:160
+#: ../purchasing/includes/ui/po_ui.inc:165
 #: ../purchasing/supplier_payment.php:298
-#: ../sales/customer_payments.php:371
+#: ../sales/customer_payments.php:372
 msgid "Reference:"
 msgstr ""
 
 #: ../dimensions/inquiry/search_dimensions.php:75
 #: ../includes/ui/allocation_cart.inc:314
-#: ../includes/ui/ui_lists.inc:1929
+#: ../includes/ui/ui_lists.inc:1918
 #: ../reporting/rep101.php:100
 #: ../reporting/rep102.php:96
 #: ../reporting/rep104.php:97
@@ -3730,7 +3757,7 @@ msgid "All"
 msgstr ""
 
 #: ../dimensions/inquiry/search_dimensions.php:76
-#: ../gl/inquiry/bank_inquiry.php:49
+#: ../gl/inquiry/bank_inquiry.php:50
 #: ../gl/inquiry/gl_trial_balance.php:54
 #: ../gl/inquiry/journal_inquiry.php:48
 #: ../gl/inquiry/profit_loss.php:168
@@ -3739,60 +3766,56 @@ msgstr ""
 #: ../inventory/inquiry/stock_movements.php:58
 #: ../purchasing/inquiry/supplier_allocation_inquiry.php:50
 #: ../purchasing/inquiry/supplier_inquiry.php:50
-#: ../sales/inquiry/customer_inquiry.php:46
 msgid "From:"
 msgstr ""
 
 #: ../dimensions/inquiry/search_dimensions.php:77
-#: ../gl/inquiry/bank_inquiry.php:50
+#: ../gl/inquiry/bank_inquiry.php:51
 #: ../gl/inquiry/gl_trial_balance.php:55
 #: ../gl/inquiry/journal_inquiry.php:49
 #: ../gl/inquiry/profit_loss.php:169
 #: ../inventory/inquiry/stock_movements.php:59
 #: ../purchasing/inquiry/supplier_allocation_inquiry.php:51
 #: ../purchasing/inquiry/supplier_inquiry.php:51
-#: ../sales/inquiry/customer_inquiry.php:47
 msgid "To:"
 msgstr ""
 
 #: ../dimensions/inquiry/search_dimensions.php:79
-#: ../manufacturing/search_work_orders.php:71
+#: ../manufacturing/search_work_orders.php:77
 msgid "Only Overdue:"
 msgstr ""
 
 #: ../dimensions/inquiry/search_dimensions.php:83
-#: ../manufacturing/search_work_orders.php:74
+#: ../manufacturing/search_work_orders.php:80
 msgid "Only Open:"
 msgstr ""
 
-#: ../dimensions/inquiry/search_dimensions.php:132
+#: ../dimensions/inquiry/search_dimensions.php:133
 #: ../dimensions/view/view_dimension.php:55
 #: ../includes/ui/allocation_cart.inc:290
-#: ../purchasing/includes/ui/invoice_ui.inc:138
+#: ../purchasing/includes/ui/invoice_ui.inc:148
 #: ../purchasing/view/view_supp_credit.php:48
 #: ../purchasing/view/view_supp_invoice.php:52
-#: ../purchasing/inquiry/supplier_allocation_inquiry.php:132
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:133
 #: ../purchasing/inquiry/supplier_inquiry.php:179
 #: ../reporting/rep101.php:118
 #: ../reporting/rep201.php:110
 #: ../reporting/rep203.php:93
 #: ../reporting/rep501.php:87
-#: ../reporting/includes/doctext.inc:112
-#: ../reporting/includes/doctext.inc:144
-#: ../reporting/includes/doctext.inc:165
-#: ../reporting/includes/doctext.inc:167
-#: ../reporting/includes/doctext.inc:206
-#: ../reporting/includes/doctext.inc:208
-#: ../sales/customer_invoice.php:519
+#: ../reporting/includes/doctext.inc:111
+#: ../reporting/includes/doctext.inc:143
+#: ../reporting/includes/doctext.inc:164
+#: ../reporting/includes/doctext.inc:166
+#: ../reporting/includes/doctext.inc:205
+#: ../reporting/includes/doctext.inc:207
+#: ../sales/customer_invoice.php:514
 #: ../sales/view/view_dispatch.php:97
 #: ../sales/view/view_invoice.php:96
 #: ../sales/inquiry/customer_allocation_inquiry.php:149
-#: ../sales/inquiry/customer_inquiry.php:205
-#: ../sales/includes/ui/sales_order_ui.inc:587
 msgid "Due Date"
 msgstr ""
 
-#: ../dimensions/inquiry/search_dimensions.php:143
+#: ../dimensions/inquiry/search_dimensions.php:144
 msgid "Marked dimensions are overdue."
 msgstr ""
 
@@ -3811,31 +3834,31 @@ msgstr ""
 #: ../dimensions/view/view_dimension.php:85
 #: ../gl/inquiry/gl_account_inquiry.php:71
 #: ../gl/inquiry/tax_inquiry.php:61
-#: ../purchasing/inquiry/po_search_completed.php:62
+#: ../purchasing/inquiry/po_search_completed.php:63
 #: ../purchasing/inquiry/po_search.php:64
 #: ../sales/inquiry/customer_allocation_inquiry.php:44
-#: ../sales/inquiry/sales_deliveries_view.php:104
-#: ../sales/inquiry/sales_orders_view.php:251
+#: ../sales/inquiry/sales_deliveries_view.php:102
+#: ../sales/inquiry/sales_orders_view.php:213
 msgid "from:"
 msgstr ""
 
 #: ../dimensions/view/view_dimension.php:86
 #: ../gl/inquiry/gl_account_inquiry.php:72
 #: ../gl/inquiry/tax_inquiry.php:62
-#: ../purchasing/inquiry/po_search_completed.php:63
+#: ../purchasing/inquiry/po_search_completed.php:64
 #: ../purchasing/inquiry/po_search.php:65
 #: ../sales/inquiry/customer_allocation_inquiry.php:45
-#: ../sales/inquiry/sales_deliveries_view.php:105
-#: ../sales/inquiry/sales_orders_view.php:252
+#: ../sales/inquiry/sales_deliveries_view.php:103
+#: ../sales/inquiry/sales_orders_view.php:214
 msgid "to:"
 msgstr ""
 
 #: ../dimensions/view/view_dimension.php:87
 #: ../gl/inquiry/balance_sheet.php:131
-#: ../gl/inquiry/bank_inquiry.php:52
+#: ../gl/inquiry/bank_inquiry.php:53
 #: ../gl/inquiry/gl_account_inquiry.php:85
 #: ../gl/inquiry/gl_trial_balance.php:63
-#: ../gl/inquiry/profit_loss.php:183
+#: ../gl/inquiry/profit_loss.php:181
 #: ../gl/inquiry/tax_inquiry.php:63
 msgid "Show"
 msgstr ""
@@ -3846,7 +3869,7 @@ msgid "Revenue / Cost Accruals"
 msgstr ""
 
 #: ../gl/accruals.php:38
-#: ../gl/bank_transfer.php:121
+#: ../gl/bank_transfer.php:165
 #: ../gl/gl_bank.php:269
 #: ../gl/gl_journal.php:168
 #: ../gl/manage/revaluate_currencies.php:59
@@ -3856,7 +3879,6 @@ msgstr ""
 #: ../manufacturing/work_order_costs.php:86
 #: ../manufacturing/work_order_entry.php:160
 #: ../manufacturing/work_order_issue.php:84
-#: ../manufacturing/work_order_issue.php.orig:84
 #: ../purchasing/po_entry_items.php:342
 #: ../purchasing/po_receive_items.php:179
 #: ../purchasing/supplier_credit.php:202
@@ -3866,9 +3888,9 @@ msgstr ""
 #: ../sales/credit_note_entry.php:157
 #: ../sales/customer_credit_invoice.php:95
 #: ../sales/customer_delivery.php:165
-#: ../sales/customer_invoice.php:327
-#: ../sales/customer_payments.php:156
-#: ../sales/sales_order_entry.php:371
+#: ../sales/customer_invoice.php:322
+#: ../sales/customer_payments.php:157
+#: ../sales/sales_order_entry.php:368
 msgid ""
 "The entered date is out of fiscal year or is closed for further data entry."
 msgstr ""
@@ -3907,8 +3929,8 @@ msgstr ""
 #: ../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:177
 #: ../gl/inquiry/profit_loss.php:179
-#: ../gl/inquiry/profit_loss.php:181
 #: ../gl/manage/gl_quick_entries.php:261
 #: ../gl/manage/gl_quick_entries.php:263
 #: ../gl/manage/gl_quick_entries.php:343
@@ -3924,22 +3946,22 @@ msgstr ""
 #: ../gl/includes/ui/gl_bank_ui.inc:152
 #: ../gl/includes/ui/gl_bank_ui.inc:153
 #: ../gl/includes/ui/gl_bank_ui.inc:155
-#: ../gl/includes/ui/gl_journal_ui.inc:86
+#: ../gl/includes/ui/gl_journal_ui.inc:84
+#: ../gl/includes/ui/gl_journal_ui.inc:85
 #: ../gl/includes/ui/gl_journal_ui.inc:87
-#: ../gl/includes/ui/gl_journal_ui.inc:89
 #: ../includes/sysnames.inc:43
 #: ../includes/sysnames.inc:166
 #: ../inventory/manage/item_categories.php:220
 #: ../inventory/manage/item_categories.php:222
 #: ../inventory/manage/items.php:354
 #: ../inventory/manage/items.php:356
-#: ../purchasing/includes/ui/invoice_ui.inc:280
-#: ../purchasing/includes/ui/invoice_ui.inc:282
-#: ../purchasing/manage/suppliers.php:147
-#: ../purchasing/manage/suppliers.php:148
+#: ../purchasing/includes/ui/invoice_ui.inc:132
+#: ../purchasing/includes/ui/po_ui.inc:176
+#: ../purchasing/manage/suppliers.php:149
 #: ../purchasing/manage/suppliers.php:150
-#: ../reporting/rep103.php:243
-#: ../reporting/rep103.php:255
+#: ../purchasing/manage/suppliers.php:152
+#: ../reporting/rep103.php:242
+#: ../reporting/rep103.php:254
 #: ../reporting/rep205.php:161
 #: ../reporting/rep205.php:173
 #: ../reporting/rep501.php:92
@@ -3975,25 +3997,23 @@ msgstr ""
 #: ../reporting/reports_main.php:422
 #: ../reporting/reports_main.php:433
 #: ../reporting/reports_main.php:445
-#: ../sales/customer_delivery.php:419
-#: ../sales/customer_delivery.php:427
-#: ../sales/customer_invoice.php:484
-#: ../sales/customer_invoice.php:527
-#: ../sales/manage/customers.php:274
-#: ../sales/manage/customers.php:276
+#: ../sales/customer_delivery.php:384
+#: ../sales/customer_delivery.php:392
+#: ../sales/customer_invoice.php:479
+#: ../sales/customer_invoice.php:522
+#: ../sales/manage/customers.php:275
+#: ../sales/manage/customers.php:277
 #: ../sales/includes/ui/sales_credit_ui.inc:132
 #: ../sales/includes/ui/sales_credit_ui.inc:137
-#: ../sales/includes/ui/sales_order_ui.inc:442
-#: ../sales/includes/ui/sales_order_ui.inc:447
 msgid "Dimension"
 msgstr ""
 
 #: ../gl/accruals.php:102
 #: ../gl/accruals.php:217
-#: ../gl/inquiry/bank_inquiry.php:71
+#: ../gl/inquiry/bank_inquiry.php:72
 #: ../gl/inquiry/gl_account_inquiry.php:141
 #: ../gl/inquiry/gl_account_inquiry.php:143
-#: ../gl/inquiry/journal_inquiry.php:133
+#: ../gl/inquiry/journal_inquiry.php:105
 #: ../gl/view/accrual_trans.php:60
 #: ../gl/view/gl_deposit_view.php:105
 #: ../gl/view/gl_deposit_view.php:108
@@ -4008,19 +4028,16 @@ msgstr ""
 #: ../gl/includes/ui/gl_bank_ui.inc:156
 #: ../gl/includes/ui/gl_bank_ui.inc:159
 #: ../gl/includes/ui/gl_bank_ui.inc:312
-#: ../gl/includes/ui/gl_journal_ui.inc:87
-#: ../gl/includes/ui/gl_journal_ui.inc:90
-#: ../gl/includes/ui/gl_journal_ui.inc:93
-#: ../gl/includes/ui/gl_journal_ui.inc:276
+#: ../gl/includes/ui/gl_journal_ui.inc:85
+#: ../gl/includes/ui/gl_journal_ui.inc:88
+#: ../gl/includes/ui/gl_journal_ui.inc:91
+#: ../gl/includes/ui/gl_journal_ui.inc:275
 #: ../inventory/includes/item_adjustments_ui.inc:187
 #: ../inventory/includes/stock_transfers_ui.inc:167
 #: ../manufacturing/view/wo_costs_view.php:46
 #: ../manufacturing/includes/work_order_issue_ui.inc:176
-#: ../purchasing/includes/ui/invoice_ui.inc:280
-#: ../purchasing/includes/ui/invoice_ui.inc:282
-#: ../purchasing/includes/ui/invoice_ui.inc:284
 #: ../sales/customer_credit_invoice.php:364
-#: ../sales/customer_delivery.php:559
+#: ../sales/customer_delivery.php:524
 #: ../sales/includes/ui/sales_credit_ui.inc:339
 msgid "Memo"
 msgstr ""
@@ -4043,9 +4060,9 @@ msgstr ""
 
 #: ../gl/accruals.php:186
 #: ../gl/manage/gl_quick_entries.php:240
-#: ../gl/includes/ui/gl_journal_ui.inc:57
+#: ../gl/includes/ui/gl_journal_ui.inc:55
 #: ../sales/create_recurrent_invoices.php:134
-#: ../sales/manage/recurrent_invoices.php:102
+#: ../sales/manage/recurrent_invoices.php:108
 msgid "Monthly"
 msgstr ""
 
@@ -4068,7 +4085,7 @@ msgstr ""
 #: ../gl/accruals.php:212
 #: ../gl/gl_budget.php:91
 #: ../gl/gl_budget.php:93
-#: ../gl/inquiry/journal_inquiry.php:132
+#: ../gl/inquiry/journal_inquiry.php:104
 #: ../gl/inquiry/tax_inquiry.php:82
 #: ../gl/manage/gl_quick_entries.php:261
 #: ../gl/manage/gl_quick_entries.php:263
@@ -4089,25 +4106,22 @@ msgstr ""
 #: ../gl/includes/ui/gl_bank_ui.inc:159
 #: ../includes/sysnames.inc:133
 #: ../includes/ui/allocation_cart.inc:290
-#: ../includes/ui/ui_lists.inc:1187
+#: ../includes/ui/ui_lists.inc:1179
 #: ../manufacturing/view/wo_costs_view.php:46
 #: ../manufacturing/includes/manufacturing_ui.inc:236
-#: ../purchasing/includes/ui/invoice_ui.inc:280
-#: ../purchasing/includes/ui/invoice_ui.inc:282
-#: ../purchasing/includes/ui/invoice_ui.inc:284
 #: ../purchasing/view/view_supp_payment.php:60
 #: ../purchasing/view/view_supp_payment.php:72
-#: ../reporting/rep102.php:245
-#: ../reporting/rep107.php:204
-#: ../reporting/rep107.php:265
-#: ../reporting/rep109.php:195
-#: ../reporting/rep110.php:193
-#: ../reporting/rep111.php:192
-#: ../reporting/rep113.php:178
-#: ../reporting/rep202.php:253
-#: ../reporting/rep209.php:195
-#: ../reporting/rep706.php:309
-#: ../reporting/rep707.php:327
+#: ../reporting/rep102.php:244
+#: ../reporting/rep107.php:207
+#: ../reporting/rep107.php:268
+#: ../reporting/rep109.php:196
+#: ../reporting/rep110.php:192
+#: ../reporting/rep111.php:194
+#: ../reporting/rep113.php:181
+#: ../reporting/rep202.php:252
+#: ../reporting/rep209.php:198
+#: ../reporting/rep706.php:308
+#: ../reporting/rep707.php:326
 #: ../reporting/rep710.php:78
 #: ../sales/view/view_receipt.php:44
 msgid "Amount"
@@ -4142,9 +4156,9 @@ msgid "Reconcile Bank Account"
 msgstr ""
 
 #: ../gl/bank_account_reconcile.php:35
-#: ../gl/bank_transfer.php:30
+#: ../gl/bank_transfer.php:37
 #: ../gl/gl_bank.php:49
-#: ../gl/inquiry/bank_inquiry.php:30
+#: ../gl/inquiry/bank_inquiry.php:31
 #: ../purchasing/supplier_payment.php:42
 #: ../sales/customer_payments.php:38
 msgid "There are no bank accounts defined in the system."
@@ -4159,7 +4173,7 @@ msgid "Reconcile this transaction"
 msgstr ""
 
 #: ../gl/bank_account_reconcile.php:164
-#: ../gl/inquiry/bank_inquiry.php:47
+#: ../gl/inquiry/bank_inquiry.php:48
 #: ../gl/inquiry/gl_account_inquiry.php:70
 msgid "Account:"
 msgstr ""
@@ -4169,7 +4183,6 @@ msgid "Bank Statement:"
 msgstr ""
 
 #: ../gl/bank_account_reconcile.php:167
-#: ../taxes/sav.tax_types.php:183
 msgid "New"
 msgstr ""
 
@@ -4203,7 +4216,7 @@ msgid "Date of bank statement to reconcile"
 msgstr ""
 
 #: ../gl/bank_account_reconcile.php:237
-#: ../gl/inquiry/bank_inquiry.php:71
+#: ../gl/inquiry/bank_inquiry.php:72
 #: ../gl/inquiry/gl_account_inquiry.php:141
 #: ../gl/inquiry/gl_account_inquiry.php:143
 #: ../gl/view/accrual_trans.php:60
@@ -4219,91 +4232,114 @@ msgstr ""
 msgid "Reconcile"
 msgstr ""
 
-#: ../gl/bank_transfer.php:28
-msgid "Transfer between Bank Accounts"
+#: ../gl/bank_transfer.php:30
+msgid "Modify Bank Account Transfer"
+msgstr ""
+
+#: ../gl/bank_transfer.php:32
+msgid "Bank Account Transfer Entry"
 msgstr ""
 
-#: ../gl/bank_transfer.php:39
+#: ../gl/bank_transfer.php:46
 #: ../gl/manage/revaluate_currencies.php:35
 msgid "Transfer has been entered"
 msgstr ""
 
-#: ../gl/bank_transfer.php:41
+#: ../gl/bank_transfer.php:48
 #: ../gl/manage/revaluate_currencies.php:37
 msgid "&View the GL Journal Entries for this Transfer"
 msgstr ""
 
-#: ../gl/bank_transfer.php:43
+#: ../gl/bank_transfer.php:50
 msgid "Enter &Another Transfer"
 msgstr ""
 
-#: ../gl/bank_transfer.php:66
+#: ../gl/bank_transfer.php:105
 msgid "From Account:"
 msgstr ""
 
-#: ../gl/bank_transfer.php:70
+#: ../gl/bank_transfer.php:109
 msgid "To Account:"
 msgstr ""
 
-#: ../gl/bank_transfer.php:77
+#: ../gl/bank_transfer.php:116
 msgid "Transfer Date:"
 msgstr ""
 
-#: ../gl/bank_transfer.php:87
-#: ../gl/bank_transfer.php:94
-#: ../sales/customer_payments.php:400
+#: ../gl/bank_transfer.php:126
+#: ../gl/bank_transfer.php:133
+#: ../sales/customer_payments.php:401
 msgid "Amount:"
 msgstr ""
 
-#: ../gl/bank_transfer.php:88
-#: ../gl/bank_transfer.php:95
+#: ../gl/bank_transfer.php:127
+#: ../gl/bank_transfer.php:134
 #: ../purchasing/supplier_payment.php:313
-#: ../sales/customer_payments.php:386
+#: ../sales/customer_payments.php:387
 msgid "Bank Charge:"
 msgstr ""
 
-#: ../gl/bank_transfer.php:90
+#: ../gl/bank_transfer.php:129
 msgid "Incoming Amount:"
 msgstr ""
 
-#: ../gl/bank_transfer.php:102
+#: ../gl/bank_transfer.php:143
+msgid "Modify Transfer"
+msgstr ""
+
+#: ../gl/bank_transfer.php:145
 msgid "Enter Transfer"
 msgstr ""
 
-#: ../gl/bank_transfer.php:128
-#: ../gl/bank_transfer.php:158
-#: ../gl/bank_transfer.php:190
+#: ../gl/bank_transfer.php:172
+#: ../gl/bank_transfer.php:226
+#: ../gl/bank_transfer.php:257
 #: ../purchasing/supplier_payment.php:135
 #: ../purchasing/supplier_payment.php:141
 msgid "The entered amount is invalid or less than zero."
 msgstr ""
 
-#: ../gl/bank_transfer.php:133
+#: ../gl/bank_transfer.php:177
 #: ../gl/gl_bank.php:227
 msgid "The total bank amount cannot be 0."
 msgstr ""
 
-#: ../gl/bank_transfer.php:144
+#: ../gl/bank_transfer.php:193
 #, php-format
-msgid "The total bank amount exceeds allowed limit (%s) for source account."
+msgid ""
+"This bank transfer change would result in exceeding authorized overdraft "
+"limit (%s) of the account '%s'"
 msgstr ""
 
-#: ../gl/bank_transfer.php:150
-#: ../gl/gl_bank.php:244
+#: ../gl/bank_transfer.php:198
 #, php-format
 msgid ""
-"The bank transaction would result in exceed of authorized overdraft limit "
-"for transaction: %s #%s on %s."
+"This bank transfer change would result in exceeding authorized overdraft "
+"limit on '%s' for transaction: %s #%s on %s."
+msgstr ""
+
+#: ../gl/bank_transfer.php:210
+#, php-format
+msgid ""
+"This bank transfer would result in exceeding authorized overdraft limit of "
+"the account (%s)"
+msgstr ""
+
+#: ../gl/bank_transfer.php:215
+#, php-format
+msgid ""
+"This bank transfer would result in exceeding authorized overdraft limit for "
+"transaction: %s #%s on %s."
 msgstr ""
 
-#: ../gl/bank_transfer.php:163
+#: ../gl/bank_transfer.php:231
 #: ../purchasing/supplier_payment.php:149
-#: ../sales/customer_payments.php:195
+#: ../sales/customer_payments.php:196
 msgid ""
 "The Bank Charge Account has not been set in System and General GL Setup."
 msgstr ""
 
-#: ../gl/bank_transfer.php:169
+#: ../gl/bank_transfer.php:237
 #: ../gl/gl_bank.php:251
 #: ../gl/gl_journal.php:174
 #: ../gl/manage/revaluate_currencies.php:65
@@ -4312,23 +4348,22 @@ msgstr ""
 #: ../manufacturing/work_order_add_finished.php:77
 #: ../manufacturing/work_order_entry.php:132
 #: ../manufacturing/work_order_issue.php:90
-#: ../manufacturing/work_order_issue.php.orig:90
 #: ../purchasing/po_receive_items.php:186
 #: ../purchasing/supplier_payment.php:207
 #: ../sales/credit_note_entry.php:147
 #: ../sales/customer_credit_invoice.php:102
 #: ../sales/customer_delivery.php:178
-#: ../sales/customer_invoice.php:341
-#: ../sales/customer_payments.php:162
-#: ../sales/sales_order_entry.php:446
+#: ../sales/customer_invoice.php:336
+#: ../sales/customer_payments.php:163
+#: ../sales/sales_order_entry.php:435
 msgid "You must enter a reference."
 msgstr ""
 
-#: ../gl/bank_transfer.php:183
+#: ../gl/bank_transfer.php:250
 msgid "The source and destination bank accouts cannot be the same."
 msgstr ""
 
-#: ../gl/bank_transfer.php:195
+#: ../gl/bank_transfer.php:262
 msgid "The incomming bank amount cannot be 0."
 msgstr ""
 
@@ -4378,8 +4413,8 @@ msgstr ""
 #: ../purchasing/supplier_invoice.php:76
 #: ../sales/credit_note_entry.php:77
 #: ../sales/customer_credit_invoice.php:62
-#: ../sales/customer_invoice.php:78
-#: ../sales/sales_order_entry.php:243
+#: ../sales/customer_invoice.php:73
+#: ../sales/sales_order_entry.php:240
 msgid "Add an Attachment"
 msgstr ""
 
@@ -4432,6 +4467,13 @@ msgstr ""
 msgid "The total bank amount exceeds allowed limit (%s)."
 msgstr ""
 
+#: ../gl/gl_bank.php:244
+#, php-format
+msgid ""
+"The bank transaction would result in exceed of authorized overdraft limit "
+"for transaction: %s #%s on %s."
+msgstr ""
+
 #: ../gl/gl_bank.php:263
 msgid "The entered date for the payment is invalid."
 msgstr ""
@@ -4499,17 +4541,17 @@ msgid "Account Code:"
 msgstr ""
 
 #: ../gl/gl_budget.php:84
-#: ../gl/manage/exchange_rates.php:142
+#: ../gl/manage/exchange_rates.php:143
 msgid "Get"
 msgstr ""
 
 #: ../gl/gl_budget.php:91
 #: ../gl/gl_budget.php:93
-#: ../gl/inquiry/profit_loss.php:236
+#: ../gl/inquiry/profit_loss.php:235
 #: ../gl/manage/gl_quick_entries.php:240
 #: ../reporting/rep101.php:126
 #: ../reporting/rep105.php:118
-#: ../reporting/rep106.php:92
+#: ../reporting/rep106.php:99
 #: ../reporting/rep114.php:90
 #: ../reporting/rep201.php:118
 #: ../reporting/rep304.php:121
@@ -4555,25 +4597,22 @@ msgstr ""
 #: ../gl/inquiry/balance_sheet.php:236
 #: ../gl/inquiry/gl_trial_balance.php:223
 #: ../gl/inquiry/profit_loss.php:115
-#: ../gl/inquiry/profit_loss.php:288
+#: ../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:115
 #: ../gl/includes/ui/gl_bank_ui.inc:202
-#: ../gl/includes/ui/gl_journal_ui.inc:153
+#: ../gl/includes/ui/gl_journal_ui.inc:151
 #: ../inventory/includes/item_adjustments_ui.inc:63
 #: ../inventory/includes/item_adjustments_ui.inc:106
 #: ../manufacturing/includes/manufacturing_ui.inc:178
-#: ../purchasing/includes/ui/invoice_ui.inc:344
-#: ../purchasing/includes/ui/invoice_ui.inc:510
-#: ../purchasing/includes/ui/invoice_ui.inc:581
 #: ../purchasing/po_receive_items.php:63
 #: ../purchasing/view/view_po.php:140
 #: ../purchasing/allocations/supplier_allocation_main.php:100
 #: ../reporting/rep101.php:234
-#: ../reporting/rep106.php:84
-#: ../reporting/rep106.php:119
-#: ../reporting/rep106.php:162
+#: ../reporting/rep106.php:91
+#: ../reporting/rep106.php:126
+#: ../reporting/rep106.php:169
 #: ../reporting/rep114.php:161
 #: ../reporting/rep201.php:224
 #: ../reporting/rep203.php:94
@@ -4606,12 +4645,10 @@ msgstr ""
 #: ../reporting/rep707.php:115
 #: ../reporting/rep707.php:297
 #: ../reporting/rep708.php:253
-#: ../reporting/includes/doctext.inc:30
-#: ../reporting/includes/doctext.inc:192
+#: ../reporting/includes/doctext.inc:32
+#: ../reporting/includes/doctext.inc:191
 #: ../sales/customer_credit_invoice.php:281
-#: ../sales/customer_delivery.php:457
-#: ../sales/customer_invoice.php:551
-#: ../sales/customer_invoice.php:554
+#: ../sales/customer_delivery.php:422
 #: ../sales/allocations/customer_allocation_main.php:99
 #: ../sales/view/view_credit.php:91
 #: ../sales/view/view_dispatch.php:113
@@ -4621,7 +4658,7 @@ msgstr ""
 #: ../sales/view/view_sales_order.php:179
 #: ../sales/view/view_sales_order.php:220
 #: ../sales/includes/ui/sales_credit_ui.inc:168
-#: ../sales/includes/ui/sales_order_ui.inc:148
+#: ../sales/includes/ui/sales_order_ui.inc:149
 msgid "Total"
 msgstr ""
 
@@ -4671,7 +4708,6 @@ msgid "You must enter at least one journal line."
 msgstr ""
 
 #: ../gl/gl_journal.php:155
-#: ../includes/ui/gl_cart.inc:128
 msgid ""
 "The journal must balance (debits equal to credits) before it can be "
 "processed."
@@ -4695,7 +4731,7 @@ msgid "The credit amount entered is not a valid number or is less than zero."
 msgstr ""
 
 #: ../gl/gl_journal.php:249
-#: ../includes/ui/ui_view.inc:733
+#: ../includes/ui/ui_view.inc:734
 #: ../purchasing/supplier_credit.php:144
 #: ../purchasing/supplier_invoice.php:154
 msgid "Cannot post to GL account used by more than one tax type."
@@ -4728,7 +4764,7 @@ msgid "As at:"
 msgstr ""
 
 #: ../gl/inquiry/balance_sheet.php:228
-#: ../gl/inquiry/profit_loss.php:299
+#: ../gl/inquiry/profit_loss.php:298
 #: ../reporting/rep705.php:325
 #: ../reporting/rep706.php:278
 #: ../reporting/rep706.php:303
@@ -4753,12 +4789,12 @@ msgstr ""
 msgid "Equities"
 msgstr ""
 
-#: ../gl/inquiry/bank_inquiry.php:28
+#: ../gl/inquiry/bank_inquiry.php:29
 #: ../reporting/rep601.php:72
 msgid "Bank Statement"
 msgstr ""
 
-#: ../gl/inquiry/bank_inquiry.php:78
+#: ../gl/inquiry/bank_inquiry.php:79
 #: ../gl/inquiry/gl_account_inquiry.php:162
 #: ../reporting/rep601.php:104
 #: ../reporting/rep602.php:103
@@ -4766,7 +4802,7 @@ msgstr ""
 msgid "Opening Balance"
 msgstr ""
 
-#: ../gl/inquiry/bank_inquiry.php:124
+#: ../gl/inquiry/bank_inquiry.php:128
 #: ../gl/inquiry/gl_account_inquiry.php:213
 #: ../gl/inquiry/gl_trial_balance.php:233
 #: ../reporting/rep601.php:157
@@ -4815,12 +4851,12 @@ msgstr ""
 
 #: ../gl/inquiry/gl_trial_balance.php:93
 #: ../gl/inquiry/gl_trial_balance.php:154
-#: ../reporting/rep706.php:308
-#: ../reporting/rep707.php:326
+#: ../reporting/rep706.php:307
+#: ../reporting/rep707.php:325
 #: ../reporting/rep708.php:51
 #: ../reporting/rep708.php:126
 #: ../sales/create_recurrent_invoices.php:134
-#: ../sales/manage/recurrent_invoices.php:102
+#: ../sales/manage/recurrent_invoices.php:108
 msgid "Group"
 msgstr ""
 
@@ -4880,11 +4916,11 @@ msgstr ""
 msgid "Enter memo fragment or leave empty"
 msgstr ""
 
-#: ../gl/inquiry/journal_inquiry.php:130
+#: ../gl/inquiry/journal_inquiry.php:102
 msgid "Trans #"
 msgstr ""
 
-#: ../gl/inquiry/journal_inquiry.php:134
+#: ../gl/inquiry/journal_inquiry.php:106
 #: ../reporting/rep710.php:77
 #: ../reporting/rep710.php:87
 #: ../reporting/reports_main.php:505
@@ -4895,36 +4931,36 @@ msgstr ""
 msgid "Profit & Loss Drilldown"
 msgstr ""
 
-#: ../gl/inquiry/profit_loss.php:173
+#: ../gl/inquiry/profit_loss.php:171
 #: ../reporting/rep707.php:210
 #: ../reporting/includes/reports_classes.inc:248
 msgid "Accumulated"
 msgstr ""
 
-#: ../gl/inquiry/profit_loss.php:173
+#: ../gl/inquiry/profit_loss.php:171
 #: ../reporting/rep707.php:255
 #: ../reporting/includes/reports_classes.inc:248
 msgid "Period Y-1"
 msgstr ""
 
-#: ../gl/inquiry/profit_loss.php:173
+#: ../gl/inquiry/profit_loss.php:171
 #: ../reporting/rep707.php:246
 #: ../reporting/includes/reports_classes.inc:248
 msgid "Budget"
 msgstr ""
 
-#: ../gl/inquiry/profit_loss.php:174
+#: ../gl/inquiry/profit_loss.php:172
 #: ../reporting/reports_main.php:381
 #: ../reporting/reports_main.php:432
 #: ../reporting/reports_main.php:478
 msgid "Compare to"
 msgstr ""
 
-#: ../gl/inquiry/profit_loss.php:235
+#: ../gl/inquiry/profit_loss.php:234
 msgid "Group/Account Name"
 msgstr ""
 
-#: ../gl/inquiry/profit_loss.php:238
+#: ../gl/inquiry/profit_loss.php:237
 #: ../reporting/rep707.php:210
 msgid "Achieved %"
 msgstr ""
@@ -4981,7 +5017,9 @@ msgid "The bank account name cannot be empty."
 msgstr ""
 
 #: ../gl/manage/bank_accounts.php:39
-msgid "The GL account selected is already in use. Select another GL account."
+msgid ""
+"The GL account selected is already in use or has transactions. Select "
+"another empty GL account."
 msgstr ""
 
 #: ../gl/manage/bank_accounts.php:52
@@ -5017,10 +5055,10 @@ msgstr ""
 #: ../inventory/purchasing_data.php:148
 #: ../purchasing/view/view_supp_credit.php:49
 #: ../purchasing/view/view_supp_invoice.php:54
-#: ../purchasing/inquiry/po_search_completed.php:129
-#: ../purchasing/inquiry/po_search.php:138
-#: ../purchasing/inquiry/supplier_allocation_inquiry.php:133
-#: ../purchasing/inquiry/supplier_allocation_inquiry.php:143
+#: ../purchasing/inquiry/po_search_completed.php:128
+#: ../purchasing/inquiry/po_search.php:123
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:134
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:144
 #: ../purchasing/inquiry/supplier_inquiry.php:73
 #: ../purchasing/inquiry/supplier_inquiry.php:180
 #: ../purchasing/inquiry/supplier_inquiry.php:192
@@ -5029,15 +5067,15 @@ msgstr ""
 #: ../reporting/rep101.php:128
 #: ../reporting/rep102.php:133
 #: ../reporting/rep102.php:139
-#: ../reporting/rep103.php:232
+#: ../reporting/rep103.php:231
 #: ../reporting/rep104.php:116
 #: ../reporting/rep201.php:120
 #: ../reporting/rep202.php:138
 #: ../reporting/rep203.php:101
 #: ../reporting/rep205.php:150
 #: ../sales/customer_credit_invoice.php:237
-#: ../sales/customer_delivery.php:364
-#: ../sales/customer_invoice.php:479
+#: ../sales/customer_delivery.php:329
+#: ../sales/customer_invoice.php:474
 #: ../sales/allocations/customer_allocation_main.php:98
 #: ../sales/allocations/customer_allocation_main.php:106
 #: ../sales/view/view_credit.php:70
@@ -5045,12 +5083,9 @@ msgstr ""
 #: ../sales/view/view_invoice.php:86
 #: ../sales/inquiry/customer_allocation_inquiry.php:151
 #: ../sales/inquiry/customer_allocation_inquiry.php:161
-#: ../sales/inquiry/customer_inquiry.php:76
-#: ../sales/inquiry/customer_inquiry.php:208
-#: ../sales/inquiry/customer_inquiry.php:221
-#: ../sales/inquiry/sales_deliveries_view.php:191
-#: ../sales/inquiry/sales_orders_view.php:295
-#: ../sales/inquiry/sales_orders_view.php:309
+#: ../sales/inquiry/sales_deliveries_view.php:178
+#: ../sales/inquiry/sales_orders_view.php:258
+#: ../sales/inquiry/sales_orders_view.php:272
 msgid "Currency"
 msgstr ""
 
@@ -5059,15 +5094,10 @@ msgid "GL Account"
 msgstr ""
 
 #: ../gl/manage/bank_accounts.php:110
-#: ../reporting/includes/doctext.inc:260
+#: ../reporting/includes/doctext.inc:259
 msgid "Bank"
 msgstr ""
 
-#: ../gl/manage/bank_accounts.php:110
-#: ../includes/ui/ui_view.inc:547
-msgid "Number"
-msgstr ""
-
 #: ../gl/manage/bank_accounts.php:110
 msgid "Bank Address"
 msgstr ""
@@ -5104,7 +5134,8 @@ msgid "Bank Name:"
 msgstr ""
 
 #: ../gl/manage/bank_accounts.php:195
-#: ../sales/manage/customer_branches.php:255
+#: ../sales/manage/customer_branches.php:242
+#: ../sales/manage/customers.php:260
 msgid "Bank Account Number:"
 msgstr ""
 
@@ -5270,41 +5301,41 @@ msgstr ""
 msgid "The exchange rate for the date is already there."
 msgstr ""
 
-#: ../gl/manage/exchange_rates.php:127
-#: ../gl/manage/exchange_rates.php:133
+#: ../gl/manage/exchange_rates.php:128
+#: ../gl/manage/exchange_rates.php:134
 msgid "Date to Use From:"
 msgstr ""
 
-#: ../gl/manage/exchange_rates.php:141
+#: ../gl/manage/exchange_rates.php:142
 #: ../includes/ui/ui_view.inc:325
 msgid "Exchange Rate:"
 msgstr ""
 
-#: ../gl/manage/exchange_rates.php:142
+#: ../gl/manage/exchange_rates.php:143
 msgid "Get current rate from"
 msgstr ""
 
-#: ../gl/manage/exchange_rates.php:148
+#: ../gl/manage/exchange_rates.php:149
 msgid "Exchange rates are entered against the company currency."
 msgstr ""
 
-#: ../gl/manage/exchange_rates.php:179
+#: ../gl/manage/exchange_rates.php:180
 msgid "Select a currency :"
 msgstr ""
 
-#: ../gl/manage/exchange_rates.php:195
+#: ../gl/manage/exchange_rates.php:196
 msgid "Date to Use From"
 msgstr ""
 
-#: ../gl/manage/exchange_rates.php:196
+#: ../gl/manage/exchange_rates.php:197
 msgid "Exchange Rate"
 msgstr ""
 
-#: ../gl/manage/exchange_rates.php:205
+#: ../gl/manage/exchange_rates.php:206
 msgid "The selected currency is the company currency."
 msgstr ""
 
-#: ../gl/manage/exchange_rates.php:206
+#: ../gl/manage/exchange_rates.php:207
 msgid ""
 "The company currency is the base currency so exchange rates cannot be set "
 "for it."
@@ -5564,8 +5595,7 @@ msgstr ""
 
 #: ../gl/manage/gl_quick_entries.php:58
 #: ../includes/ui/simple_crud_class.inc:221
-#: ../includes/ui/ui_input.inc:206
-#: ../taxes/sav.tax_types.php:252
+#: ../includes/ui/ui_input.inc:207
 msgid "Add new"
 msgstr ""
 
@@ -5622,7 +5652,7 @@ msgid "Balance Based"
 msgstr ""
 
 #: ../gl/manage/gl_quick_entries.php:240
-#: ../gl/includes/ui/gl_journal_ui.inc:57
+#: ../gl/includes/ui/gl_journal_ui.inc:55
 msgid "Yearly"
 msgstr ""
 
@@ -5655,9 +5685,7 @@ msgid "Posted"
 msgstr ""
 
 #: ../gl/manage/gl_quick_entries.php:329
-#: ../sales/customer_delivery.php:457
-#: ../sales/customer_invoice.php:551
-#: ../sales/customer_invoice.php:554
+#: ../sales/customer_delivery.php:422
 msgid "Tax Type"
 msgstr ""
 
@@ -5786,9 +5814,9 @@ msgstr ""
 #: ../gl/includes/ui/gl_bank_ui.inc:152
 #: ../gl/includes/ui/gl_bank_ui.inc:155
 #: ../gl/includes/ui/gl_bank_ui.inc:158
-#: ../gl/includes/ui/gl_journal_ui.inc:86
-#: ../gl/includes/ui/gl_journal_ui.inc:89
-#: ../gl/includes/ui/gl_journal_ui.inc:92
+#: ../gl/includes/ui/gl_journal_ui.inc:84
+#: ../gl/includes/ui/gl_journal_ui.inc:87
+#: ../gl/includes/ui/gl_journal_ui.inc:90
 #: ../reporting/rep701.php:111
 msgid "Account Code"
 msgstr ""
@@ -5802,9 +5830,9 @@ msgstr ""
 #: ../gl/includes/ui/gl_bank_ui.inc:152
 #: ../gl/includes/ui/gl_bank_ui.inc:155
 #: ../gl/includes/ui/gl_bank_ui.inc:158
-#: ../gl/includes/ui/gl_journal_ui.inc:86
-#: ../gl/includes/ui/gl_journal_ui.inc:89
-#: ../gl/includes/ui/gl_journal_ui.inc:92
+#: ../gl/includes/ui/gl_journal_ui.inc:84
+#: ../gl/includes/ui/gl_journal_ui.inc:87
+#: ../gl/includes/ui/gl_journal_ui.inc:90
 msgid "Account Description"
 msgstr ""
 
@@ -5846,7 +5874,7 @@ msgid "General Ledger Transaction Details"
 msgstr ""
 
 #: ../gl/view/gl_trans_view.php:39
-#: ../gl/includes/ui/gl_journal_ui.inc:97
+#: ../gl/includes/ui/gl_journal_ui.inc:95
 msgid "Counterparty"
 msgstr ""
 
@@ -5883,8 +5911,8 @@ msgstr ""
 msgid "To"
 msgstr ""
 
-#: ../gl/includes/db/gl_db_banking.inc:444
-#: ../purchasing/includes/db/invoice_db.inc:136
+#: ../gl/includes/db/gl_db_banking.inc:518
+#: ../purchasing/includes/db/invoice_db.inc:138
 msgid "Document reentered."
 msgstr ""
 
@@ -5894,7 +5922,7 @@ msgid "Rounding error %s encountered for trans_type:%s,trans_no:%s"
 msgstr ""
 
 #: ../gl/includes/ui/gl_bank_ui.inc:24
-#: ../gl/includes/ui/gl_journal_ui.inc:27
+#: ../gl/includes/ui/gl_journal_ui.inc:28
 #: ../inventory/includes/item_adjustments_ui.inc:39
 #: ../inventory/includes/stock_transfers_ui.inc:42
 #: ../manufacturing/work_order_add_finished.php:205
@@ -5916,39 +5944,38 @@ msgstr ""
 #: ../gl/includes/ui/gl_bank_ui.inc:64
 #: ../inventory/purchasing_data.php:208
 #: ../inventory/purchasing_data.php:212
-#: ../purchasing/includes/ui/invoice_ui.inc:95
-#: ../purchasing/includes/ui/invoice_ui.inc:103
-#: ../purchasing/includes/ui/invoice_ui.inc:105
-#: ../purchasing/includes/ui/po_ui.inc:137
-#: ../purchasing/includes/ui/po_ui.inc:142
+#: ../purchasing/includes/ui/invoice_ui.inc:99
+#: ../purchasing/includes/ui/invoice_ui.inc:107
+#: ../purchasing/includes/ui/invoice_ui.inc:109
+#: ../purchasing/includes/ui/po_ui.inc:110
+#: ../purchasing/includes/ui/po_ui.inc:115
 msgid "Supplier:"
 msgstr ""
 
 #: ../gl/includes/ui/gl_bank_ui.inc:67
-#: ../sales/manage/recurrent_invoices.php:169
+#: ../sales/manage/recurrent_invoices.php:175
 #: ../sales/includes/ui/sales_credit_ui.inc:29
-#: ../sales/includes/ui/sales_order_ui.inc:270
+#: ../sales/includes/ui/sales_order_ui.inc:271
 msgid "Customer:"
 msgstr ""
 
 #: ../gl/includes/ui/gl_bank_ui.inc:71
-#: ../sales/customer_payments.php:348
-#: ../sales/manage/recurrent_invoices.php:172
+#: ../sales/customer_payments.php:349
+#: ../sales/manage/recurrent_invoices.php:178
 #: ../sales/includes/ui/sales_credit_ui.inc:37
-#: ../sales/includes/ui/sales_order_ui.inc:277
+#: ../sales/includes/ui/sales_order_ui.inc:278
 msgid "Branch:"
 msgstr ""
 
 #: ../gl/includes/ui/gl_bank_ui.inc:85
 #: ../gl/includes/ui/gl_bank_ui.inc:88
-#: ../sales/customer_payments.php:364
+#: ../sales/customer_payments.php:365
 msgid "This customer account is on hold."
 msgstr ""
 
 #: ../gl/includes/ui/gl_bank_ui.inc:101
-#: ../gl/includes/ui/gl_journal_ui.inc:58
-#: ../gl/includes/ui/gl_journal_ui.inc:62
-#: ../purchasing/includes/ui/invoice_ui.inc:266
+#: ../gl/includes/ui/gl_journal_ui.inc:56
+#: ../gl/includes/ui/gl_journal_ui.inc:60
 msgid "Go"
 msgstr ""
 
@@ -5961,10 +5988,9 @@ msgstr ""
 #: ../inventory/includes/item_adjustments_ui.inc:92
 #: ../inventory/includes/stock_transfers_ui.inc:84
 #: ../manufacturing/includes/work_order_issue_ui.inc:64
-#: ../purchasing/includes/ui/invoice_ui.inc:557
-#: ../purchasing/includes/ui/po_ui.inc:276
+#: ../purchasing/includes/ui/po_ui.inc:249
 #: ../sales/includes/ui/sales_credit_ui.inc:198
-#: ../sales/includes/ui/sales_order_ui.inc:198
+#: ../sales/includes/ui/sales_order_ui.inc:199
 msgid "Edit document line"
 msgstr ""
 
@@ -5973,45 +5999,41 @@ msgstr ""
 #: ../inventory/includes/item_adjustments_ui.inc:94
 #: ../inventory/includes/stock_transfers_ui.inc:86
 #: ../manufacturing/includes/work_order_issue_ui.inc:66
-#: ../purchasing/includes/ui/invoice_ui.inc:320
-#: ../purchasing/includes/ui/po_ui.inc:278
+#: ../purchasing/includes/ui/po_ui.inc:251
 #: ../sales/includes/ui/sales_credit_ui.inc:200
-#: ../sales/includes/ui/sales_order_ui.inc:200
+#: ../sales/includes/ui/sales_order_ui.inc:201
 msgid "Remove line from document"
 msgstr ""
 
 #: ../gl/includes/ui/gl_bank_ui.inc:278
-#: ../gl/includes/ui/gl_journal_ui.inc:258
+#: ../gl/includes/ui/gl_journal_ui.inc:257
 #: ../includes/ui/simple_crud_class.inc:56
 #: ../inventory/includes/item_adjustments_ui.inc:164
 #: ../inventory/includes/stock_transfers_ui.inc:144
 #: ../manufacturing/includes/work_order_issue_ui.inc:139
-#: ../purchasing/includes/ui/po_ui.inc:460
+#: ../purchasing/includes/ui/po_ui.inc:433
 #: ../sales/includes/ui/sales_credit_ui.inc:294
-#: ../sales/includes/ui/sales_order_ui.inc:547
 msgid "Confirm changes"
 msgstr ""
 
 #: ../gl/includes/ui/gl_bank_ui.inc:280
-#: ../gl/includes/ui/gl_journal_ui.inc:260
+#: ../gl/includes/ui/gl_journal_ui.inc:259
 #: ../includes/ui/simple_crud_class.inc:58
 #: ../inventory/includes/item_adjustments_ui.inc:166
 #: ../inventory/includes/stock_transfers_ui.inc:146
 #: ../manufacturing/includes/work_order_issue_ui.inc:141
-#: ../purchasing/includes/ui/po_ui.inc:462
+#: ../purchasing/includes/ui/po_ui.inc:435
 #: ../sales/includes/ui/sales_credit_ui.inc:296
-#: ../sales/includes/ui/sales_order_ui.inc:549
 msgid "Cancel changes"
 msgstr ""
 
 #: ../gl/includes/ui/gl_bank_ui.inc:285
-#: ../gl/includes/ui/gl_journal_ui.inc:264
+#: ../gl/includes/ui/gl_journal_ui.inc:263
 #: ../inventory/includes/item_adjustments_ui.inc:172
 #: ../inventory/includes/stock_transfers_ui.inc:152
 #: ../manufacturing/includes/work_order_issue_ui.inc:147
-#: ../purchasing/includes/ui/po_ui.inc:468
+#: ../purchasing/includes/ui/po_ui.inc:441
 #: ../sales/includes/ui/sales_credit_ui.inc:302
-#: ../sales/includes/ui/sales_order_ui.inc:555
 msgid "Add Item"
 msgstr ""
 
@@ -6019,9 +6041,8 @@ msgstr ""
 #: ../inventory/includes/item_adjustments_ui.inc:173
 #: ../inventory/includes/stock_transfers_ui.inc:153
 #: ../manufacturing/includes/work_order_issue_ui.inc:148
-#: ../purchasing/includes/ui/po_ui.inc:469
+#: ../purchasing/includes/ui/po_ui.inc:442
 #: ../sales/includes/ui/sales_credit_ui.inc:303
-#: ../sales/includes/ui/sales_order_ui.inc:556
 msgid "Add new item to document"
 msgstr ""
 
@@ -6033,33 +6054,33 @@ msgstr ""
 msgid "Settled AP Amount:"
 msgstr ""
 
-#: ../gl/includes/ui/gl_journal_ui.inc:38
+#: ../gl/includes/ui/gl_journal_ui.inc:36
 msgid "Reverse Transaction:"
 msgstr ""
 
-#: ../gl/includes/ui/gl_journal_ui.inc:46
+#: ../gl/includes/ui/gl_journal_ui.inc:44
 #: ../includes/sysnames.inc:98
 msgid "Quick Entry"
 msgstr ""
 
-#: ../gl/includes/ui/gl_journal_ui.inc:57
+#: ../gl/includes/ui/gl_journal_ui.inc:55
 msgid "balance from account"
 msgstr ""
 
-#: ../gl/includes/ui/gl_journal_ui.inc:135
+#: ../gl/includes/ui/gl_journal_ui.inc:133
 msgid "Edit journal line"
 msgstr ""
 
-#: ../gl/includes/ui/gl_journal_ui.inc:137
+#: ../gl/includes/ui/gl_journal_ui.inc:135
 msgid "Remove line from journal"
 msgstr ""
 
-#: ../gl/includes/ui/gl_journal_ui.inc:200
-#: ../gl/includes/ui/gl_journal_ui.inc:232
+#: ../gl/includes/ui/gl_journal_ui.inc:198
+#: ../gl/includes/ui/gl_journal_ui.inc:230
 msgid "[Select account]"
 msgstr ""
 
-#: ../gl/includes/ui/gl_journal_ui.inc:265
+#: ../gl/includes/ui/gl_journal_ui.inc:264
 msgid "Add new line to journal"
 msgstr ""
 
@@ -6613,7 +6634,7 @@ msgstr ""
 msgid "GL reports and inquiries"
 msgstr ""
 
-#: ../includes/banking.inc:100
+#: ../includes/banking.inc:42
 #: ../includes/data_checks.inc:52
 #, php-format
 msgid ""
@@ -6628,8 +6649,8 @@ msgid ""
 msgstr ""
 
 #: ../includes/current_user.inc:102
-#: ../includes/ui/ui_controls.inc:197
-#: ../includes/ui/ui_view.inc:904
+#: ../includes/ui/ui_controls.inc:198
+#: ../includes/ui/ui_view.inc:906
 msgid "Back"
 msgstr ""
 
@@ -6637,11 +6658,11 @@ msgstr ""
 msgid "System is available for site admin only until full database upgrade"
 msgstr ""
 
-#: ../includes/current_user.inc:163
+#: ../includes/current_user.inc:164
 msgid "New password for"
 msgstr ""
 
-#: ../includes/current_user.inc:570
+#: ../includes/current_user.inc:618
 msgid "Requesting data..."
 msgstr ""
 
@@ -6654,29 +6675,29 @@ msgstr ""
 msgid "You have no edit access to transactions created by other users."
 msgstr ""
 
-#: ../includes/errors.inc:126
+#: ../includes/errors.inc:124
 msgid "in file"
 msgstr ""
 
-#: ../includes/errors.inc:126
+#: ../includes/errors.inc:124
 msgid "at line "
 msgstr ""
 
-#: ../includes/errors.inc:180
+#: ../includes/errors.inc:178
 msgid "Debug mode database warning:"
 msgstr ""
 
-#: ../includes/errors.inc:182
+#: ../includes/errors.inc:180
 msgid "DATABASE ERROR :"
 msgstr ""
 
-#: ../includes/errors.inc:217
+#: ../includes/errors.inc:213
 msgid ""
 "The entered information is a duplicate. Please go back and enter different "
 "values."
 msgstr ""
 
-#: ../includes/main.inc:44
+#: ../includes/main.inc:49
 msgid "This page is usable only with javascript enabled browsers."
 msgstr ""
 
@@ -6790,19 +6811,19 @@ msgid ""
 "file!"
 msgstr ""
 
-#: ../includes/session.inc:244
+#: ../includes/session.inc:245
 msgid ""
 "Access to application has been blocked until database upgrade is completed "
 "by system administrator."
 msgstr ""
 
-#: ../includes/session.inc:258
+#: ../includes/session.inc:259
 msgid ""
 "The security settings on your account do not permit you to access this "
 "function"
 msgstr ""
 
-#: ../includes/session.inc:267
+#: ../includes/session.inc:268
 msgid ""
 "System is blocked after source upgrade until database is updated on System/"
 "Software Upgrade page"
@@ -6848,7 +6869,7 @@ msgid "Inventory Adjustment"
 msgstr ""
 
 #: ../includes/sysnames.inc:32
-#: ../purchasing/includes/ui/po_ui.inc:332
+#: ../purchasing/includes/ui/po_ui.inc:305
 #: ../purchasing/view/view_po.php:30
 msgid "Purchase Order"
 msgstr ""
@@ -6886,13 +6907,13 @@ msgid "Work Order Production"
 msgstr ""
 
 #: ../includes/sysnames.inc:40
-#: ../sales/inquiry/sales_orders_view.php:151
-#: ../sales/inquiry/sales_orders_view.php:173
+#: ../sales/inquiry/sales_orders_view.php:123
+#: ../sales/inquiry/sales_orders_view.php:145
 msgid "Sales Order"
 msgstr ""
 
 #: ../includes/sysnames.inc:41
-#: ../sales/sales_order_entry.php:658
+#: ../sales/sales_order_entry.php:647
 msgid "Sales Quotation"
 msgstr ""
 
@@ -6929,7 +6950,6 @@ msgid "CP"
 msgstr ""
 
 #: ../includes/sysnames.inc:54
-#: ../sales/customer_invoice.php:556
 msgid "DN"
 msgstr ""
 
@@ -7027,7 +7047,7 @@ msgstr ""
 #: ../reporting/rep102.php:125
 #: ../reporting/rep102.php:132
 #: ../reporting/rep105.php:109
-#: ../reporting/rep106.php:83
+#: ../reporting/rep106.php:90
 #: ../reporting/rep114.php:95
 #: ../reporting/rep304.php:114
 #: ../reporting/rep304.php:124
@@ -7039,19 +7059,17 @@ msgstr ""
 #: ../reporting/reports_main.php:237
 #: ../sales/create_recurrent_invoices.php:134
 #: ../sales/customer_credit_invoice.php:235
-#: ../sales/customer_delivery.php:362
-#: ../sales/customer_invoice.php:455
+#: ../sales/customer_delivery.php:327
+#: ../sales/customer_invoice.php:450
 #: ../sales/allocations/customer_allocation_main.php:97
 #: ../sales/allocations/customer_allocation_main.php:105
-#: ../sales/manage/recurrent_invoices.php:102
+#: ../sales/manage/recurrent_invoices.php:108
 #: ../sales/view/view_credit.php:47
 #: ../sales/inquiry/customer_allocation_inquiry.php:150
 #: ../sales/inquiry/customer_allocation_inquiry.php:160
-#: ../sales/inquiry/customer_inquiry.php:206
-#: ../sales/inquiry/customer_inquiry.php:220
-#: ../sales/inquiry/sales_deliveries_view.php:182
-#: ../sales/inquiry/sales_orders_view.php:287
-#: ../sales/inquiry/sales_orders_view.php:301
+#: ../sales/inquiry/sales_deliveries_view.php:169
+#: ../sales/inquiry/sales_orders_view.php:250
+#: ../sales/inquiry/sales_orders_view.php:264
 msgid "Customer"
 msgstr ""
 
@@ -7061,13 +7079,13 @@ msgstr ""
 #: ../inventory/purchasing_data.php:148
 #: ../purchasing/includes/ui/grn_ui.inc:20
 #: ../purchasing/includes/ui/grn_ui.inc:52
-#: ../purchasing/includes/ui/po_ui.inc:325
+#: ../purchasing/includes/ui/po_ui.inc:298
 #: ../purchasing/view/view_supp_credit.php:42
 #: ../purchasing/view/view_supp_invoice.php:46
-#: ../purchasing/inquiry/po_search_completed.php:125
-#: ../purchasing/inquiry/po_search.php:134
-#: ../purchasing/inquiry/supplier_allocation_inquiry.php:129
-#: ../purchasing/inquiry/supplier_allocation_inquiry.php:142
+#: ../purchasing/inquiry/po_search_completed.php:124
+#: ../purchasing/inquiry/po_search.php:119
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:130
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:143
 #: ../purchasing/inquiry/supplier_inquiry.php:176
 #: ../purchasing/inquiry/supplier_inquiry.php:191
 #: ../purchasing/allocations/supplier_allocation_main.php:98
@@ -7185,7 +7203,7 @@ msgid "Supplier Invoice/Credit"
 msgstr ""
 
 #: ../includes/sysnames.inc:157
-#: ../manufacturing/search_work_orders.php:165
+#: ../manufacturing/search_work_orders.php:171
 #: ../manufacturing/includes/manufacturing_ui.inc:278
 #: ../reporting/rep402.php:103
 msgid "Manufactured"
@@ -7248,7 +7266,7 @@ msgid "Apr"
 msgstr ""
 
 #: ../includes/sysnames.inc:200
-#: ../includes/ui/ui_view.inc:901
+#: ../includes/ui/ui_view.inc:903
 msgid "May"
 msgstr ""
 
@@ -7376,144 +7394,143 @@ msgstr ""
 msgid "To switch debugging on set $go_debug>0 in config.php file"
 msgstr ""
 
-#: ../includes/system_tests.inc:137
+#: ../includes/system_tests.inc:138
 msgid "Error logging"
 msgstr ""
 
-#: ../includes/system_tests.inc:145
+#: ../includes/system_tests.inc:146
 msgid "Disabled"
 msgstr ""
 
-#: ../includes/system_tests.inc:148
+#: ../includes/system_tests.inc:149
 msgid "To switch error logging set $error_logging in config.php file"
 msgstr ""
 
-#: ../includes/system_tests.inc:151
+#: ../includes/system_tests.inc:152
 msgid "Log file is not writeable"
 msgstr ""
 
-#: ../includes/system_tests.inc:161
+#: ../includes/system_tests.inc:162
 msgid "Current database version"
 msgstr ""
 
-#: ../includes/system_tests.inc:165
+#: ../includes/system_tests.inc:166
 msgid "Database structure seems to be not upgraded to current version"
 msgstr ""
 
-#: ../includes/system_tests.inc:180
+#: ../includes/system_tests.inc:181
 msgid "Company subdirectories consistency"
 msgstr ""
 
-#: ../includes/system_tests.inc:193
-#: ../includes/system_tests.inc:200
-#: ../includes/system_tests.inc:208
-#: ../includes/system_tests.inc:225
-#: ../includes/system_tests.inc:340
-#: ../includes/system_tests.inc:349
-#: ../includes/system_tests.inc:358
-#: ../includes/system_tests.inc:366
+#: ../includes/system_tests.inc:194
+#: ../includes/system_tests.inc:201
+#: ../includes/system_tests.inc:209
+#: ../includes/system_tests.inc:226
+#: ../includes/system_tests.inc:341
+#: ../includes/system_tests.inc:350
+#: ../includes/system_tests.inc:359
+#: ../includes/system_tests.inc:367
 #, php-format
 msgid "'%s' is not writeable"
 msgstr ""
 
-#: ../includes/system_tests.inc:221
+#: ../includes/system_tests.inc:222
 msgid "Temporary directory"
 msgstr ""
 
-#: ../includes/system_tests.inc:233
+#: ../includes/system_tests.inc:234
 msgid "Language configuration consistency"
 msgstr ""
 
-#: ../includes/system_tests.inc:242
+#: ../includes/system_tests.inc:243
 msgid "Languages folder should be writeable."
 msgstr ""
 
-#: ../includes/system_tests.inc:251
+#: ../includes/system_tests.inc:252
 msgid "Languages configuration file should be writeable."
 msgstr ""
 
-#: ../includes/system_tests.inc:270
+#: ../includes/system_tests.inc:271
 #, php-format
 msgid "Missing %s translation file."
 msgstr ""
 
-#: ../includes/system_tests.inc:275
+#: ../includes/system_tests.inc:276
 #, php-format
 msgid "Missing system locale: %s"
 msgstr ""
 
-#: ../includes/system_tests.inc:288
+#: ../includes/system_tests.inc:289
 msgid "Main config file"
 msgstr ""
 
-#: ../includes/system_tests.inc:295
-#: ../includes/system_tests.inc:317
+#: ../includes/system_tests.inc:296
+#: ../includes/system_tests.inc:318
 #, php-format
 msgid "Can't write '%s' file. Check FA directory write permissions."
 msgstr ""
 
-#: ../includes/system_tests.inc:296
-#: ../includes/system_tests.inc:318
+#: ../includes/system_tests.inc:297
+#: ../includes/system_tests.inc:319
 #, php-format
 msgid "'%s' file exists."
 msgstr ""
 
-#: ../includes/system_tests.inc:300
+#: ../includes/system_tests.inc:301
 #, php-format
 msgid "'%s' file should be read-only"
 msgstr ""
 
-#: ../includes/system_tests.inc:309
+#: ../includes/system_tests.inc:310
 msgid "Database auth file"
 msgstr ""
 
-#: ../includes/system_tests.inc:322
+#: ../includes/system_tests.inc:323
 #, php-format
 msgid ""
 "'%s' file should be read-only if you do not plan to add or change companies"
 msgstr ""
 
-#: ../includes/system_tests.inc:333
+#: ../includes/system_tests.inc:334
 msgid "Extensions system"
 msgstr ""
 
-#: ../includes/system_tests.inc:371
+#: ../includes/system_tests.inc:372
 msgid "Extensions configuration files and directories should be writeable"
 msgstr ""
 
-#: ../includes/system_tests.inc:384
+#: ../includes/system_tests.inc:385
 #, php-format
 msgid "Non-standard theme directory '%s' is not writable"
 msgstr ""
 
-#: ../includes/system_tests.inc:394
+#: ../includes/system_tests.inc:395
 msgid ""
 "OpenSSL PHP extension have to be enabled to use extension repository system."
 msgstr ""
 
-#: ../includes/system_tests.inc:397
+#: ../includes/system_tests.inc:398
 msgid ""
 "OpenSSL have to be available on your server to use extension repository "
 "system."
 msgstr ""
 
-#: ../includes/system_tests.inc:420
+#: ../includes/system_tests.inc:421
 msgid "Test"
 msgstr ""
 
-#: ../includes/system_tests.inc:420
+#: ../includes/system_tests.inc:421
 msgid "Test type"
 msgstr ""
 
-#: ../includes/system_tests.inc:420
-#: ../includes/ui/view_package.php:47
+#: ../includes/system_tests.inc:421
 #: ../reporting/rep204.php:85
 #: ../reporting/rep301.php:169
 #: ../reporting/rep308.php:231
 msgid "Value"
 msgstr ""
 
-#: ../includes/system_tests.inc:420
+#: ../includes/system_tests.inc:421
 #: ../reporting/reports_main.php:40
 #: ../reporting/reports_main.php:51
 #: ../reporting/reports_main.php:60
@@ -7571,24 +7588,24 @@ msgstr ""
 #: ../reporting/reports_main.php:506
 #: ../reporting/includes/excel_report.inc:295
 #: ../reporting/includes/excel_report.inc:428
-#: ../reporting/includes/pdf_report.inc:346
-#: ../reporting/includes/pdf_report.inc:618
+#: ../reporting/includes/pdf_report.inc:347
+#: ../reporting/includes/pdf_report.inc:620
 #: ../sales/view/view_sales_order.php:98
 msgid "Comments"
 msgstr ""
 
-#: ../includes/system_tests.inc:444
+#: ../includes/system_tests.inc:445
 msgid "Ok"
 msgstr ""
 
-#: ../includes/db/audit_trail_db.inc:99
+#: ../includes/db/audit_trail_db.inc:102
 msgid ""
 "Some transactions journal GL postings were not indexed due to lack of audit "
 "trail record."
 msgstr ""
 
 #: ../includes/db/inventory_db.inc:284
-#: ../inventory/includes/db/items_trans_db.inc:66
+#: ../inventory/includes/db/items_trans_db.inc:60
 #, php-format
 msgid "Cost was %s changed to %s x quantity on hand for item '%s'"
 msgstr ""
@@ -7621,9 +7638,9 @@ msgstr ""
 #: ../sales/view/view_sales_order.php:109
 #: ../sales/view/view_sales_order.php:142
 #: ../sales/view/view_sales_order.php:179
-#: ../sales/inquiry/sales_orders_view.php:248
-#: ../sales/inquiry/sales_orders_view.php:286
-#: ../sales/inquiry/sales_orders_view.php:300
+#: ../sales/inquiry/sales_orders_view.php:210
+#: ../sales/inquiry/sales_orders_view.php:249
+#: ../sales/inquiry/sales_orders_view.php:263
 msgid "Ref"
 msgstr ""
 
@@ -7633,26 +7650,22 @@ msgstr ""
 
 #: ../includes/ui/allocation_cart.inc:291
 #: ../includes/ui/allocation_cart.inc:344
-#: ../includes/ui/ui_view.inc:548
+#: ../includes/ui/ui_view.inc:549
 #: ../purchasing/allocations/supplier_allocation_main.php:101
-#: ../reporting/rep112.php:145
-#: ../reporting/rep210.php:152
-#: ../reporting/includes/doctext.inc:167
-#: ../reporting/includes/doctext.inc:208
+#: ../reporting/includes/doctext.inc:166
+#: ../reporting/includes/doctext.inc:207
 #: ../sales/allocations/customer_allocation_main.php:100
 msgid "Left to Allocate"
 msgstr ""
 
 #: ../includes/ui/allocation_cart.inc:291
-#: ../includes/ui/ui_view.inc:548
-#: ../reporting/includes/doctext.inc:167
-#: ../reporting/includes/doctext.inc:208
+#: ../includes/ui/ui_view.inc:549
+#: ../reporting/includes/doctext.inc:166
+#: ../reporting/includes/doctext.inc:207
 msgid "This Allocation"
 msgstr ""
 
 #: ../includes/ui/allocation_cart.inc:324
-#: ../reporting/rep112.php:142
-#: ../reporting/rep210.php:149
 msgid "Total Allocated"
 msgstr ""
 
@@ -7679,7 +7692,7 @@ msgid "Sec Phone"
 msgstr ""
 
 #: ../includes/ui/contacts_view.inc:41
-#: ../reporting/rep103.php:266
+#: ../reporting/rep103.php:265
 #: ../reporting/rep205.php:184
 #: ../reporting/includes/header2.inc:107
 #: ../sales/manage/sales_people.php:99
@@ -7714,7 +7727,7 @@ msgstr ""
 #: ../includes/ui/contacts_view.inc:105
 #: ../inventory/manage/locations.php:207
 #: ../purchasing/manage/suppliers.php:141
-#: ../sales/manage/customer_branches.php:265
+#: ../sales/manage/customer_branches.php:252
 #: ../sales/manage/customers.php:259
 #: ../sales/manage/sales_people.php:158
 msgid "E-mail:"
@@ -7722,12 +7735,12 @@ msgstr ""
 
 #: ../includes/ui/contacts_view.inc:110
 #: ../purchasing/manage/suppliers.php:142
-#: ../sales/manage/customer_branches.php:266
+#: ../sales/manage/customer_branches.php:253
 msgid "Document Language:"
 msgstr ""
 
 #: ../includes/ui/contacts_view.inc:110
-#: ../sales/manage/customer_branches.php:266
+#: ../sales/manage/customer_branches.php:253
 msgid "Customer default"
 msgstr ""
 
@@ -7748,7 +7761,7 @@ msgid "You have to select at least one category."
 msgstr ""
 
 #: ../includes/ui/db_pager_view.inc:166
-#: ../includes/ui/ui_input.inc:904
+#: ../includes/ui/ui_input.inc:905
 msgid "Show also Inactive"
 msgstr ""
 
@@ -7778,69 +7791,68 @@ msgid "No records"
 msgstr ""
 
 #: ../includes/ui/simple_crud_class.inc:227
-#: ../includes/ui/ui_input.inc:208
-#: ../taxes/sav.tax_types.php:255
+#: ../includes/ui/ui_input.inc:209
 msgid "Submit changes"
 msgstr ""
 
 #: ../includes/ui/simple_crud_class.inc:229
-#: ../includes/ui/ui_input.inc:209
+#: ../includes/ui/ui_input.inc:210
 msgid "Clone"
 msgstr ""
 
 #: ../includes/ui/simple_crud_class.inc:229
-#: ../includes/ui/ui_input.inc:210
+#: ../includes/ui/ui_input.inc:211
 msgid "Edit new record with current data"
 msgstr ""
 
 #: ../includes/ui/simple_crud_class.inc:231
-#: ../includes/ui/ui_input.inc:211
+#: ../includes/ui/ui_input.inc:212
 msgid "Cancel edition"
 msgstr ""
 
-#: ../includes/ui/ui_controls.inc:79
+#: ../includes/ui/ui_controls.inc:80
 msgid "Request from outside of this page is forbidden."
 msgstr ""
 
-#: ../includes/ui/ui_controls.inc:80
+#: ../includes/ui/ui_controls.inc:81
 msgid "CSRF attack detected from: "
 msgstr ""
 
-#: ../includes/ui/ui_controls.inc:146
+#: ../includes/ui/ui_controls.inc:147
 msgid "You should automatically be forwarded."
 msgstr ""
 
-#: ../includes/ui/ui_controls.inc:147
+#: ../includes/ui/ui_controls.inc:148
 msgid "If this does not happen"
 msgstr ""
 
-#: ../includes/ui/ui_controls.inc:147
+#: ../includes/ui/ui_controls.inc:148
 msgid "click here"
 msgstr ""
 
-#: ../includes/ui/ui_controls.inc:147
+#: ../includes/ui/ui_controls.inc:148
 msgid "to continue"
 msgstr ""
 
-#: ../includes/ui/ui_controls.inc:197
+#: ../includes/ui/ui_controls.inc:198
 msgid "Close"
 msgstr ""
 
-#: ../includes/ui/ui_controls.inc:459
+#: ../includes/ui/ui_controls.inc:460
 #: ../sales/manage/customers.php:23
 msgid "Customers"
 msgstr ""
 
-#: ../includes/ui/ui_controls.inc:461
+#: ../includes/ui/ui_controls.inc:462
 msgid "Branches"
 msgstr ""
 
-#: ../includes/ui/ui_controls.inc:463
+#: ../includes/ui/ui_controls.inc:464
 #: ../purchasing/manage/suppliers.php:22
 msgid "Suppliers"
 msgstr ""
 
-#: ../includes/ui/ui_controls.inc:465
+#: ../includes/ui/ui_controls.inc:466
 #: ../inventory/transfers.php:224
 #: ../inventory/manage/items.php:22
 #: ../reporting/rep402.php:108
@@ -7849,17 +7861,17 @@ msgstr ""
 msgid "Items"
 msgstr ""
 
-#: ../includes/ui/ui_controls.inc:610
+#: ../includes/ui/ui_controls.inc:611
 msgid "Entered data has not been saved yet.\\nDo you want to abandon changes?"
 msgstr ""
 
-#: ../includes/ui/ui_input.inc:632
+#: ../includes/ui/ui_input.inc:633
 #: ../reporting/includes/reports_classes.inc:222
 msgid "Click Here to Pick up the date"
 msgstr ""
 
-#: ../includes/ui/ui_input.inc:916
-#: ../includes/ui/ui_lists.inc:2162
+#: ../includes/ui/ui_input.inc:917
+#: ../includes/ui/ui_lists.inc:2148
 #: ../reporting/rep301.php:229
 #: ../reporting/rep302.php:170
 #: ../reporting/rep303.php:184
@@ -7867,16 +7879,16 @@ msgstr ""
 #: ../reporting/rep304.php:174
 #: ../reporting/rep306.php:235
 #: ../reporting/rep306.php:242
-#: ../sales/manage/customer_branches.php:304
+#: ../sales/manage/customer_branches.php:288
 msgid "Inactive"
 msgstr ""
 
-#: ../includes/ui/ui_input.inc:926
-#: ../includes/ui/ui_input.inc:938
+#: ../includes/ui/ui_input.inc:927
+#: ../includes/ui/ui_input.inc:939
 msgid "Current Credit:"
 msgstr ""
 
-#: ../includes/ui/ui_input.inc:972
+#: ../includes/ui/ui_input.inc:953
 msgid "Bank Balance:"
 msgstr ""
 
@@ -7884,169 +7896,181 @@ msgstr ""
 msgid "Set filter"
 msgstr ""
 
-#: ../includes/ui/ui_lists.inc:100
+#: ../includes/ui/ui_lists.inc:98
 msgid "Press Space tab for search pattern entry"
 msgstr ""
 
-#: ../includes/ui/ui_lists.inc:104
+#: ../includes/ui/ui_lists.inc:102
 msgid "Enter code fragment to search or * for all"
 msgstr ""
 
-#: ../includes/ui/ui_lists.inc:105
+#: ../includes/ui/ui_lists.inc:103
 msgid "Enter description fragment to search or * for all"
 msgstr ""
 
-#: ../includes/ui/ui_lists.inc:454
-#: ../includes/ui/ui_lists.inc:1391
+#: ../includes/ui/ui_lists.inc:451
+#: ../includes/ui/ui_lists.inc:1382
 msgid "All Suppliers"
 msgstr ""
 
-#: ../includes/ui/ui_lists.inc:458
+#: ../includes/ui/ui_lists.inc:455
 msgid "Press Space tab to filter by name fragment"
 msgstr ""
 
-#: ../includes/ui/ui_lists.inc:459
+#: ../includes/ui/ui_lists.inc:456
 msgid "Select supplier"
 msgstr ""
 
-#: ../includes/ui/ui_lists.inc:507
+#: ../includes/ui/ui_lists.inc:503
 msgid "All Customers"
 msgstr ""
 
-#: ../includes/ui/ui_lists.inc:511
+#: ../includes/ui/ui_lists.inc:507
 msgid "Press Space tab to filter by name fragment; F2 - entry new customer"
 msgstr ""
 
-#: ../includes/ui/ui_lists.inc:512
+#: ../includes/ui/ui_lists.inc:508
 msgid "Select customer"
 msgstr ""
 
-#: ../includes/ui/ui_lists.inc:559
+#: ../includes/ui/ui_lists.inc:554
 msgid "All branches"
 msgstr ""
 
-#: ../includes/ui/ui_lists.inc:562
+#: ../includes/ui/ui_lists.inc:557
 msgid "Select customer branch"
 msgstr ""
 
-#: ../includes/ui/ui_lists.inc:602
+#: ../includes/ui/ui_lists.inc:596
 msgid "All Locations"
 msgstr ""
 
-#: ../includes/ui/ui_lists.inc:754
-#: ../includes/ui/ui_lists.inc:822
+#: ../includes/ui/ui_lists.inc:747
+#: ../includes/ui/ui_lists.inc:814
 msgid "All Items"
 msgstr ""
 
-#: ../includes/ui/ui_lists.inc:1298
+#: ../includes/ui/ui_lists.inc:1290
 msgid "All Sales Types"
 msgstr ""
 
-#: ../includes/ui/ui_lists.inc:1635
+#: ../includes/ui/ui_lists.inc:1624
 msgid "Use Item Sales Accounts"
 msgstr ""
 
-#: ../includes/ui/ui_lists.inc:1946
-#: ../includes/ui/ui_lists.inc:1963
-#: ../includes/ui/ui_lists.inc:1980
+#: ../includes/ui/ui_lists.inc:1934
+#: ../includes/ui/ui_lists.inc:1950
+#: ../includes/ui/ui_lists.inc:1966
 msgid "All Types"
 msgstr ""
 
-#: ../includes/ui/ui_lists.inc:1947
+#: ../includes/ui/ui_lists.inc:1935
 #: ../sales/view/view_sales_order.php:140
 msgid "Sales Invoices"
 msgstr ""
 
-#: ../includes/ui/ui_lists.inc:1948
-#: ../includes/ui/ui_lists.inc:1965
-#: ../includes/ui/ui_lists.inc:1983
+#: ../includes/ui/ui_lists.inc:1936
+#: ../includes/ui/ui_lists.inc:1952
+#: ../includes/ui/ui_lists.inc:1969
 msgid "Overdue Invoices"
 msgstr ""
 
-#: ../includes/ui/ui_lists.inc:1949
-#: ../includes/ui/ui_lists.inc:1966
-#: ../includes/ui/ui_lists.inc:1984
-#: ../includes/ui/ui_view.inc:610
-#: ../includes/ui/ui_view.inc:614
+#: ../includes/ui/ui_lists.inc:1937
+#: ../includes/ui/ui_lists.inc:1953
+#: ../includes/ui/ui_lists.inc:1970
+#: ../includes/ui/ui_view.inc:611
+#: ../includes/ui/ui_view.inc:615
 msgid "Payments"
 msgstr ""
 
-#: ../includes/ui/ui_lists.inc:1950
-#: ../includes/ui/ui_lists.inc:1967
-#: ../includes/ui/ui_lists.inc:1985
+#: ../includes/ui/ui_lists.inc:1938
+#: ../includes/ui/ui_lists.inc:1954
+#: ../includes/ui/ui_lists.inc:1971
 #: ../sales/view/view_sales_order.php:176
 msgid "Credit Notes"
 msgstr ""
 
-#: ../includes/ui/ui_lists.inc:1951
+#: ../includes/ui/ui_lists.inc:1939
 #: ../sales/view/view_sales_order.php:106
 msgid "Delivery Notes"
 msgstr ""
 
-#: ../includes/ui/ui_lists.inc:1964
-#: ../includes/ui/ui_lists.inc:1982
+#: ../includes/ui/ui_lists.inc:1951
+#: ../includes/ui/ui_lists.inc:1968
 msgid "Invoices"
 msgstr ""
 
-#: ../includes/ui/ui_lists.inc:1968
-#: ../includes/ui/ui_lists.inc:1986
+#: ../includes/ui/ui_lists.inc:1955
+#: ../includes/ui/ui_lists.inc:1972
 msgid "Overdue Credit Notes"
 msgstr ""
 
-#: ../includes/ui/ui_lists.inc:1981
+#: ../includes/ui/ui_lists.inc:1967
 msgid "GRNs"
 msgstr ""
 
-#: ../includes/ui/ui_lists.inc:1999
+#: ../includes/ui/ui_lists.inc:1985
 msgid "Automatically put balance on back order"
 msgstr ""
 
-#: ../includes/ui/ui_lists.inc:2000
+#: ../includes/ui/ui_lists.inc:1986
 msgid "Cancel any quantites not delivered"
 msgstr ""
 
-#: ../includes/ui/ui_lists.inc:2017
+#: ../includes/ui/ui_lists.inc:2003
 msgid "Items Returned to Inventory Location"
 msgstr ""
 
-#: ../includes/ui/ui_lists.inc:2018
+#: ../includes/ui/ui_lists.inc:2004
 msgid "Items Written Off"
 msgstr ""
 
-#: ../includes/ui/ui_lists.inc:2188
+#: ../includes/ui/ui_lists.inc:2173
 msgid "New role"
 msgstr ""
 
-#: ../includes/ui/ui_lists.inc:2240
+#: ../includes/ui/ui_lists.inc:2225
 msgid "No tags defined."
 msgstr ""
 
-#: ../includes/ui/ui_lists.inc:2240
+#: ../includes/ui/ui_lists.inc:2225
 msgid "No active tags defined."
 msgstr ""
 
-#: ../includes/ui/ui_lists.inc:2278
+#: ../includes/ui/ui_lists.inc:2263
 #, php-format
 msgid "Activated for '%s'"
 msgstr ""
 
-#: ../includes/ui/ui_lists.inc:2281
+#: ../includes/ui/ui_lists.inc:2266
 msgid "Available and/or installed"
 msgstr ""
 
-#: ../includes/ui/ui_lists.inc:2351
+#: ../includes/ui/ui_lists.inc:2336
 msgid "Standard new company American COA (4 digit)"
 msgstr ""
 
-#: ../includes/ui/ui_lists.inc:2353
+#: ../includes/ui/ui_lists.inc:2338
 msgid "Standard American COA (4 digit) with demo data"
 msgstr ""
 
-#: ../includes/ui/ui_lists.inc:2374
+#: ../includes/ui/ui_lists.inc:2359
 msgid "No payment Link"
 msgstr ""
 
-#: ../includes/ui/ui_msgs.inc:63
+#: ../includes/ui/ui_lists.inc:2445
+msgid "Numeric"
+msgstr ""
+
+#: ../includes/ui/ui_lists.inc:2445
+msgid "Alpha Numeric"
+msgstr ""
+
+#: ../includes/ui/ui_lists.inc:2445
+msgid "ALPHA NUMERIC"
+msgstr ""
+
+#: ../includes/ui/ui_msgs.inc:68
 msgid "in units of : "
 msgstr ""
 
@@ -8061,201 +8085,142 @@ msgstr ""
 msgid "Date Voided:"
 msgstr ""
 
-#: ../includes/ui/ui_view.inc:443
-#: ../reporting/rep107.php:256
-#: ../reporting/rep109.php:186
-#: ../reporting/rep110.php:184
-#: ../reporting/rep111.php:183
-#: ../reporting/rep113.php:169
-#: ../reporting/rep209.php:186
+#: ../includes/ui/ui_view.inc:444
+#: ../reporting/rep107.php:259
+#: ../reporting/rep109.php:187
+#: ../reporting/rep110.php:183
+#: ../reporting/rep111.php:185
+#: ../reporting/rep113.php:172
+#: ../reporting/rep209.php:189
 msgid "Total Tax Excluded"
 msgstr ""
 
-#: ../includes/ui/ui_view.inc:449
-#: ../includes/ui/ui_view.inc:468
-#: ../includes/ui/ui_view.inc:492
-#: ../includes/ui/ui_view.inc:509
-#: ../reporting/rep107.php:265
-#: ../reporting/rep109.php:195
-#: ../reporting/rep110.php:193
-#: ../reporting/rep111.php:192
-#: ../reporting/rep113.php:178
-#: ../reporting/rep209.php:195
+#: ../includes/ui/ui_view.inc:450
+#: ../includes/ui/ui_view.inc:469
+#: ../includes/ui/ui_view.inc:493
+#: ../includes/ui/ui_view.inc:510
+#: ../reporting/rep107.php:268
+#: ../reporting/rep109.php:196
+#: ../reporting/rep110.php:192
+#: ../reporting/rep111.php:194
+#: ../reporting/rep113.php:181
+#: ../reporting/rep209.php:198
 msgid "Included"
 msgstr ""
 
-#: ../includes/ui/ui_view.inc:547
-#: ../reporting/includes/doctext.inc:167
-#: ../reporting/includes/doctext.inc:208
+#: ../includes/ui/ui_view.inc:548
+#: ../reporting/includes/doctext.inc:166
+#: ../reporting/includes/doctext.inc:207
 msgid "Total Amount"
 msgstr ""
 
-#: ../includes/ui/ui_view.inc:571
+#: ../includes/ui/ui_view.inc:572
 msgid "Total Allocated:"
 msgstr ""
 
-#: ../includes/ui/ui_view.inc:577
+#: ../includes/ui/ui_view.inc:578
 msgid "Left to Allocate:"
 msgstr ""
 
-#: ../includes/ui/ui_view.inc:593
-#: ../includes/ui/ui_view.inc:597
+#: ../includes/ui/ui_view.inc:594
+#: ../includes/ui/ui_view.inc:598
 #: ../purchasing/inquiry/supplier_allocation_inquiry.php:100
 msgid "Allocations"
 msgstr ""
 
-#: ../includes/ui/ui_view.inc:610
-#: ../includes/ui/ui_view.inc:614
+#: ../includes/ui/ui_view.inc:611
+#: ../includes/ui/ui_view.inc:615
 msgid "Pre-Payments"
 msgstr ""
 
-#: ../includes/ui/ui_view.inc:630
+#: ../includes/ui/ui_view.inc:631
 msgid "No Quick Entries are defined."
 msgstr ""
 
-#: ../includes/ui/ui_view.inc:658
+#: ../includes/ui/ui_view.inc:659
 msgid "No Quick Entry lines are defined."
 msgstr ""
 
-#: ../includes/ui/ui_view.inc:840
-#: ../purchasing/includes/ui/invoice_ui.inc:488
+#: ../includes/ui/ui_view.inc:841
 msgid "and"
 msgstr ""
 
-#: ../includes/ui/ui_view.inc:901
+#: ../includes/ui/ui_view.inc:903
 msgid "January"
 msgstr ""
 
-#: ../includes/ui/ui_view.inc:901
+#: ../includes/ui/ui_view.inc:903
 msgid "February"
 msgstr ""
 
-#: ../includes/ui/ui_view.inc:901
+#: ../includes/ui/ui_view.inc:903
 msgid "March"
 msgstr ""
 
-#: ../includes/ui/ui_view.inc:901
+#: ../includes/ui/ui_view.inc:903
 msgid "April"
 msgstr ""
 
-#: ../includes/ui/ui_view.inc:901
+#: ../includes/ui/ui_view.inc:903
 msgid "June"
 msgstr ""
 
-#: ../includes/ui/ui_view.inc:901
+#: ../includes/ui/ui_view.inc:903
 msgid "July"
 msgstr ""
 
-#: ../includes/ui/ui_view.inc:901
+#: ../includes/ui/ui_view.inc:903
 msgid "August"
 msgstr ""
 
-#: ../includes/ui/ui_view.inc:901
+#: ../includes/ui/ui_view.inc:903
 msgid "September"
 msgstr ""
 
-#: ../includes/ui/ui_view.inc:901
+#: ../includes/ui/ui_view.inc:903
 msgid "October"
 msgstr ""
 
-#: ../includes/ui/ui_view.inc:901
+#: ../includes/ui/ui_view.inc:903
 msgid "November"
 msgstr ""
 
-#: ../includes/ui/ui_view.inc:901
+#: ../includes/ui/ui_view.inc:903
 msgid "December"
 msgstr ""
 
-#: ../includes/ui/ui_view.inc:902
+#: ../includes/ui/ui_view.inc:904
 msgid "Su"
 msgstr ""
 
-#: ../includes/ui/ui_view.inc:902
+#: ../includes/ui/ui_view.inc:904
 msgid "Mo"
 msgstr ""
 
-#: ../includes/ui/ui_view.inc:902
+#: ../includes/ui/ui_view.inc:904
 msgid "Tu"
 msgstr ""
 
-#: ../includes/ui/ui_view.inc:902
+#: ../includes/ui/ui_view.inc:904
 msgid "We"
 msgstr ""
 
-#: ../includes/ui/ui_view.inc:902
+#: ../includes/ui/ui_view.inc:904
 msgid "Th"
 msgstr ""
 
-#: ../includes/ui/ui_view.inc:902
+#: ../includes/ui/ui_view.inc:904
 msgid "Fr"
 msgstr ""
 
-#: ../includes/ui/ui_view.inc:902
+#: ../includes/ui/ui_view.inc:904
 msgid "Sa"
 msgstr ""
 
-#: ../includes/ui/ui_view.inc:903
+#: ../includes/ui/ui_view.inc:905
 msgid "W"
 msgstr ""
 
-#: ../includes/ui/view_package.php:17
-msgid "Package Details"
-msgstr ""
-
-#: ../includes/ui/view_package.php:24
-msgid ""
-"The script must be called with a valid package id to review the info for."
-msgstr ""
-
-#: ../includes/ui/view_package.php:29
-msgid "Available version"
-msgstr ""
-
-#: ../includes/ui/view_package.php:30
-msgid "Package type"
-msgstr ""
-
-#: ../includes/ui/view_package.php:31
-msgid "Package content"
-msgstr ""
-
-#: ../includes/ui/view_package.php:33
-msgid "Author"
-msgstr ""
-
-#: ../includes/ui/view_package.php:34
-msgid "Home page"
-msgstr ""
-
-#: ../includes/ui/view_package.php:35
-msgid "Package maintainer"
-msgstr ""
-
-#: ../includes/ui/view_package.php:36
-msgid "Installation path"
-msgstr ""
-
-#: ../includes/ui/view_package.php:37
-msgid "Minimal software versions"
-msgstr ""
-
-#: ../includes/ui/view_package.php:38
-msgid "Right to left"
-msgstr ""
-
-#: ../includes/ui/view_package.php:39
-msgid "Charset encoding"
-msgstr ""
-
-#: ../includes/ui/view_package.php:44
-#, php-format
-msgid "Content information for package '%s'"
-msgstr ""
-
-#: ../includes/ui/view_package.php:47
-msgid "Property"
-msgstr ""
-
 #: ../inventory/adjustments.php:28
 msgid "Item Adjustments Note"
 msgstr ""
@@ -8291,7 +8256,7 @@ msgstr ""
 
 #: ../inventory/adjustments.php:88
 #: ../inventory/transfers.php:84
-#: ../sales/sales_order_entry.php:376
+#: ../sales/sales_order_entry.php:373
 msgid "You must enter at least one non empty item line."
 msgstr ""
 
@@ -8306,12 +8271,12 @@ msgid ""
 msgstr ""
 
 #: ../inventory/adjustments.php:153
-#: ../manufacturing/work_order_issue.php.orig:141
+#: ../manufacturing/work_order_issue.php:139
 msgid "The quantity entered is negative or invalid."
 msgstr ""
 
 #: ../inventory/adjustments.php:160
-#: ../manufacturing/work_order_issue.php.orig:148
+#: ../manufacturing/work_order_issue.php:146
 msgid "The entered standard cost is negative or invalid."
 msgstr ""
 
@@ -8356,11 +8321,11 @@ msgstr ""
 #: ../inventory/inquiry/stock_movements.php:49
 #: ../inventory/inquiry/stock_status.php:41
 #: ../inventory/manage/item_codes.php:105
-#: ../manufacturing/work_order_entry.php:394
-#: ../manufacturing/work_order_entry.php:399
+#: ../manufacturing/work_order_entry.php:395
+#: ../manufacturing/work_order_entry.php:400
 #: ../purchasing/inquiry/po_search.php:74
-#: ../sales/inquiry/sales_deliveries_view.php:114
-#: ../sales/inquiry/sales_orders_view.php:263
+#: ../sales/inquiry/sales_deliveries_view.php:112
+#: ../sales/inquiry/sales_orders_view.php:225
 msgid "Item:"
 msgstr ""
 
@@ -8419,8 +8384,8 @@ msgstr ""
 
 #: ../inventory/prices.php:147
 #: ../reporting/rep104.php:118
-#: ../sales/customer_delivery.php:379
-#: ../sales/customer_invoice.php:477
+#: ../sales/customer_delivery.php:344
+#: ../sales/customer_invoice.php:472
 #: ../sales/view/view_credit.php:73
 #: ../sales/view/view_dispatch.php:93
 #: ../sales/view/view_invoice.php:93
@@ -8430,17 +8395,14 @@ msgstr ""
 
 #: ../inventory/prices.php:147
 #: ../inventory/purchasing_data.php:148
-#: ../purchasing/includes/ui/invoice_ui.inc:520
 #: ../purchasing/po_receive_items.php:63
 #: ../purchasing/view/view_grn.php:41
 #: ../purchasing/view/view_po.php:45
 #: ../reporting/rep104.php:111
-#: ../reporting/includes/doctext.inc:30
-#: ../reporting/includes/doctext.inc:192
+#: ../reporting/includes/doctext.inc:32
+#: ../reporting/includes/doctext.inc:191
 #: ../sales/customer_credit_invoice.php:281
-#: ../sales/customer_delivery.php:457
-#: ../sales/customer_invoice.php:551
-#: ../sales/customer_invoice.php:554
+#: ../sales/customer_delivery.php:422
 #: ../sales/view/view_credit.php:91
 #: ../sales/view/view_dispatch.php:113
 #: ../sales/view/view_invoice.php:116
@@ -8570,13 +8532,13 @@ msgstr ""
 #: ../inventory/inquiry/stock_movements.php:79
 #: ../inventory/inquiry/stock_status.php:66
 #: ../inventory/inquiry/stock_status.php:70
-#: ../manufacturing/search_work_orders.php:162
+#: ../manufacturing/search_work_orders.php:168
 #: ../manufacturing/inquiry/where_used_inquiry.php:45
 #: ../manufacturing/manage/bom_edit.php:70
-#: ../purchasing/inquiry/po_search_completed.php:126
-#: ../purchasing/inquiry/po_search_completed.php:136
-#: ../purchasing/inquiry/po_search.php:135
-#: ../purchasing/inquiry/po_search.php:146
+#: ../purchasing/inquiry/po_search_completed.php:125
+#: ../purchasing/inquiry/po_search_completed.php:135
+#: ../purchasing/inquiry/po_search.php:120
+#: ../purchasing/inquiry/po_search.php:131
 #: ../reporting/rep105.php:120
 #: ../reporting/rep301.php:176
 #: ../reporting/rep302.php:132
@@ -8602,15 +8564,13 @@ msgstr ""
 #: ../inventory/reorder_level.php:67
 #: ../inventory/inquiry/stock_movements.php:80
 #: ../inventory/inquiry/stock_status.php:70
-#: ../purchasing/supplier_credit.php:228
+#: ../purchasing/supplier_credit.php:222
 msgid "Quantity On Hand"
 msgstr ""
 
 #: ../inventory/reorder_level.php:67
 #: ../inventory/includes/inventory_db.inc:72
 #: ../inventory/inquiry/stock_status.php:70
-#: ../sales/includes/db/old.sales_order_db.inc:110
-#: ../sales/includes/db/old.sales_order_db.inc:263
 msgid "Re-Order Level"
 msgstr ""
 
@@ -8657,20 +8617,14 @@ msgid "Process Transfer"
 msgstr ""
 
 #: ../inventory/includes/inventory_db.inc:69
-#: ../sales/includes/db/old.sales_order_db.inc:107
-#: ../sales/includes/db/old.sales_order_db.inc:259
 msgid "Stocks below Re-Order Level at "
 msgstr ""
 
 #: ../inventory/includes/inventory_db.inc:72
-#: ../sales/includes/db/old.sales_order_db.inc:110
-#: ../sales/includes/db/old.sales_order_db.inc:264
 msgid "Below"
 msgstr ""
 
 #: ../inventory/includes/inventory_db.inc:73
-#: ../sales/includes/db/old.sales_order_db.inc:111
-#: ../sales/includes/db/old.sales_order_db.inc:265
 msgid "Please reorder"
 msgstr ""
 
@@ -8684,8 +8638,8 @@ msgstr ""
 #: ../inventory/includes/item_adjustments_ui.inc:34
 #: ../manufacturing/work_order_entry.php:209
 #: ../purchasing/inquiry/po_search.php:67
-#: ../sales/inquiry/sales_deliveries_view.php:107
-#: ../sales/inquiry/sales_orders_view.php:254
+#: ../sales/inquiry/sales_deliveries_view.php:105
+#: ../sales/inquiry/sales_orders_view.php:216
 msgid "Location:"
 msgstr ""
 
@@ -8704,45 +8658,41 @@ msgstr ""
 #: ../inventory/includes/item_adjustments_ui.inc:62
 #: ../inventory/includes/stock_transfers_ui.inc:60
 #: ../manufacturing/includes/work_order_issue_ui.inc:33
-#: ../purchasing/includes/ui/po_ui.inc:245
+#: ../purchasing/includes/ui/po_ui.inc:218
 #: ../purchasing/po_receive_items.php:62
 #: ../purchasing/view/view_grn.php:40
 #: ../purchasing/view/view_po.php:45
-#: ../reporting/includes/doctext.inc:29
-#: ../reporting/includes/doctext.inc:191
-#: ../reporting/includes/doctext.inc:228
+#: ../reporting/includes/doctext.inc:31
+#: ../reporting/includes/doctext.inc:190
+#: ../reporting/includes/doctext.inc:227
 #: ../sales/customer_credit_invoice.php:280
-#: ../sales/customer_delivery.php:455
-#: ../sales/customer_invoice.php:550
-#: ../sales/customer_invoice.php:553
+#: ../sales/customer_delivery.php:420
 #: ../sales/view/view_credit.php:90
 #: ../sales/view/view_dispatch.php:112
 #: ../sales/view/view_invoice.php:115
 #: ../sales/view/view_sales_order.php:219
 #: ../sales/includes/ui/sales_credit_ui.inc:167
-#: ../sales/includes/ui/sales_order_ui.inc:146
+#: ../sales/includes/ui/sales_order_ui.inc:147
 msgid "Item Code"
 msgstr ""
 
 #: ../inventory/includes/item_adjustments_ui.inc:62
 #: ../inventory/includes/stock_transfers_ui.inc:60
 #: ../manufacturing/includes/work_order_issue_ui.inc:33
-#: ../purchasing/includes/ui/po_ui.inc:245
+#: ../purchasing/includes/ui/po_ui.inc:218
 #: ../purchasing/view/view_grn.php:40
 #: ../purchasing/view/view_po.php:45
-#: ../reporting/includes/doctext.inc:29
-#: ../reporting/includes/doctext.inc:191
-#: ../reporting/includes/doctext.inc:228
+#: ../reporting/includes/doctext.inc:31
+#: ../reporting/includes/doctext.inc:190
+#: ../reporting/includes/doctext.inc:227
 #: ../sales/customer_credit_invoice.php:280
-#: ../sales/customer_delivery.php:455
-#: ../sales/customer_invoice.php:550
-#: ../sales/customer_invoice.php:553
+#: ../sales/customer_delivery.php:420
 #: ../sales/view/view_credit.php:90
 #: ../sales/view/view_dispatch.php:112
 #: ../sales/view/view_invoice.php:115
 #: ../sales/view/view_sales_order.php:219
 #: ../sales/includes/ui/sales_credit_ui.inc:167
-#: ../sales/includes/ui/sales_order_ui.inc:146
+#: ../sales/includes/ui/sales_order_ui.inc:147
 msgid "Item Description"
 msgstr ""
 
@@ -8758,24 +8708,22 @@ msgstr ""
 #: ../manufacturing/includes/manufacturing_ui.inc:157
 #: ../manufacturing/includes/manufacturing_ui.inc:332
 #: ../manufacturing/includes/work_order_issue_ui.inc:33
-#: ../purchasing/includes/ui/invoice_ui.inc:520
-#: ../purchasing/includes/ui/po_ui.inc:245
+#: ../purchasing/includes/ui/po_ui.inc:218
 #: ../purchasing/view/view_grn.php:40
 #: ../purchasing/view/view_po.php:45
 #: ../reporting/rep301.php:169
 #: ../reporting/rep303.php:121
 #: ../reporting/rep303.php:127
 #: ../reporting/rep401.php:71
-#: ../reporting/includes/doctext.inc:29
-#: ../reporting/includes/doctext.inc:192
-#: ../reporting/includes/doctext.inc:225
-#: ../sales/customer_invoice.php:550
+#: ../reporting/includes/doctext.inc:31
+#: ../reporting/includes/doctext.inc:191
+#: ../reporting/includes/doctext.inc:224
 #: ../sales/view/view_credit.php:90
 #: ../sales/view/view_dispatch.php:112
 #: ../sales/view/view_invoice.php:115
 #: ../sales/view/view_sales_order.php:219
 #: ../sales/includes/ui/sales_credit_ui.inc:167
-#: ../sales/includes/ui/sales_order_ui.inc:146
+#: ../sales/includes/ui/sales_order_ui.inc:147
 msgid "Quantity"
 msgstr ""
 
@@ -8783,17 +8731,17 @@ msgstr ""
 #: ../inventory/includes/stock_transfers_ui.inc:60
 #: ../inventory/manage/item_units.php:94
 #: ../manufacturing/includes/work_order_issue_ui.inc:34
-#: ../purchasing/includes/ui/po_ui.inc:246
+#: ../purchasing/includes/ui/po_ui.inc:219
 #: ../purchasing/view/view_grn.php:41
 #: ../purchasing/view/view_po.php:45
-#: ../reporting/includes/doctext.inc:30
-#: ../reporting/includes/doctext.inc:192
+#: ../reporting/includes/doctext.inc:32
+#: ../reporting/includes/doctext.inc:191
 #: ../sales/view/view_credit.php:91
 #: ../sales/view/view_dispatch.php:113
 #: ../sales/view/view_invoice.php:116
 #: ../sales/view/view_sales_order.php:219
 #: ../sales/includes/ui/sales_credit_ui.inc:167
-#: ../sales/includes/ui/sales_order_ui.inc:148
+#: ../sales/includes/ui/sales_order_ui.inc:149
 msgid "Unit"
 msgstr ""
 
@@ -8864,11 +8812,9 @@ msgid "Show Movements"
 msgstr ""
 
 #: ../inventory/inquiry/stock_movements.php:61
-#: ../purchasing/includes/ui/invoice_ui.inc:489
 #: ../purchasing/inquiry/supplier_allocation_inquiry.php:57
 #: ../purchasing/inquiry/supplier_inquiry.php:55
 #: ../sales/inquiry/customer_allocation_inquiry.php:51
-#: ../sales/inquiry/customer_inquiry.php:54
 msgid "Refresh Inquiry"
 msgstr ""
 
@@ -8956,9 +8902,7 @@ msgstr ""
 #: ../manufacturing/manage/bom_edit.php:71
 #: ../purchasing/po_receive_items.php:62
 #: ../sales/customer_credit_invoice.php:280
-#: ../sales/customer_delivery.php:456
-#: ../sales/customer_invoice.php:550
-#: ../sales/customer_invoice.php:553
+#: ../sales/customer_delivery.php:421
 msgid "Units"
 msgstr ""
 
@@ -9020,7 +8964,7 @@ msgid "Foreign Item Codes"
 msgstr ""
 
 #: ../inventory/manage/item_codes.php:23
-#: ../sales/sales_order_entry.php:703
+#: ../sales/sales_order_entry.php:692
 msgid "There are no inventory items defined in the system."
 msgstr ""
 
@@ -9082,7 +9026,7 @@ msgstr ""
 #: ../inventory/manage/item_codes.php:179
 #: ../inventory/manage/sales_kits.php:245
 #: ../manufacturing/work_order_add_finished.php:203
-#: ../manufacturing/work_order_entry.php:422
+#: ../manufacturing/work_order_entry.php:423
 #: ../manufacturing/manage/bom_edit.php:228
 msgid "Quantity:"
 msgstr ""
@@ -9094,9 +9038,8 @@ msgstr ""
 #: ../inventory/manage/sales_kits.php:232
 #: ../manufacturing/manage/work_centres.php:138
 #: ../sales/manage/credit_status.php:145
-#: ../sales/manage/recurrent_invoices.php:165
+#: ../sales/manage/recurrent_invoices.php:171
 #: ../taxes/item_tax_types.php:173
-#: ../taxes/sav.tax_types.php:241
 #: ../taxes/tax_groups.php:162
 #: ../taxes/tax_types.php:158
 msgid "Description:"
@@ -9157,11 +9100,9 @@ msgstr ""
 #: ../inventory/view/view_adjustment.php:56
 #: ../inventory/view/view_transfer.php:39
 #: ../inventory/view/view_transfer.php:56
-#: ../manufacturing/search_work_orders.php:163
+#: ../manufacturing/search_work_orders.php:169
 #: ../manufacturing/view/wo_issue_view.php:44
 #: ../manufacturing/view/wo_production_view.php:45
-#: ../purchasing/includes/ui/invoice_ui.inc:507
-#: ../purchasing/includes/ui/invoice_ui.inc:519
 #: ../reporting/rep204.php:84
 #: ../reporting/rep306.php:152
 #: ../reporting/rep402.php:103
@@ -9178,7 +9119,7 @@ msgid "Editable description:"
 msgstr ""
 
 #: ../inventory/manage/items.php:363
-#: ../sales/manage/customer_branches.php:249
+#: ../sales/manage/customer_branches.php:236
 msgid "GL Accounts"
 msgstr ""
 
@@ -9231,9 +9172,9 @@ msgid "New item"
 msgstr ""
 
 #: ../inventory/manage/items.php:465
-#: ../purchasing/manage/suppliers.php:310
-#: ../sales/manage/customer_branches.php:324
-#: ../sales/manage/customers.php:348
+#: ../purchasing/manage/suppliers.php:312
+#: ../sales/manage/customer_branches.php:306
+#: ../sales/manage/customers.php:350
 msgid "&General settings"
 msgstr ""
 
@@ -9246,8 +9187,8 @@ msgid "&Purchasing Pricing"
 msgstr ""
 
 #: ../inventory/manage/items.php:470
-#: ../purchasing/manage/suppliers.php:312
-#: ../sales/manage/customers.php:350
+#: ../purchasing/manage/suppliers.php:314
+#: ../sales/manage/customers.php:352
 msgid "&Transactions"
 msgstr ""
 
@@ -9530,7 +9471,7 @@ msgstr ""
 #: ../manufacturing/view/wo_issue_view.php:44
 #: ../manufacturing/includes/manufacturing_ui.inc:29
 #: ../manufacturing/includes/manufacturing_ui.inc:83
-#: ../reporting/includes/doctext.inc:229
+#: ../reporting/includes/doctext.inc:228
 msgid "From Location"
 msgstr ""
 
@@ -9546,54 +9487,62 @@ msgstr ""
 msgid "Search Work Orders"
 msgstr ""
 
-#: ../manufacturing/search_work_orders.php:69
+#: ../manufacturing/search_work_orders.php:67
+#: ../purchasing/inquiry/po_search_completed.php:61
+#: ../purchasing/inquiry/po_search.php:62
+#: ../sales/inquiry/sales_deliveries_view.php:101
+#: ../sales/inquiry/sales_orders_view.php:209
+msgid "#:"
+msgstr ""
+
+#: ../manufacturing/search_work_orders.php:70
 msgid "at Location:"
 msgstr ""
 
-#: ../manufacturing/search_work_orders.php:76
-#: ../purchasing/inquiry/po_search_completed.php:72
+#: ../manufacturing/search_work_orders.php:82
+#: ../purchasing/inquiry/po_search_completed.php:73
 msgid "for item:"
 msgstr ""
 
-#: ../manufacturing/search_work_orders.php:78
-#: ../purchasing/inquiry/po_search_completed.php:77
+#: ../manufacturing/search_work_orders.php:84
+#: ../purchasing/inquiry/po_search_completed.php:78
 #: ../purchasing/inquiry/po_search.php:78
-#: ../sales/inquiry/sales_deliveries_view.php:118
-#: ../sales/inquiry/sales_orders_view.php:270
+#: ../sales/inquiry/sales_deliveries_view.php:116
+#: ../sales/inquiry/sales_orders_view.php:232
 msgid "Select documents"
 msgstr ""
 
-#: ../manufacturing/search_work_orders.php:117
+#: ../manufacturing/search_work_orders.php:122
 msgid "Release"
 msgstr ""
 
-#: ../manufacturing/search_work_orders.php:120
+#: ../manufacturing/search_work_orders.php:125
 msgid "Issue"
 msgstr ""
 
-#: ../manufacturing/search_work_orders.php:127
+#: ../manufacturing/search_work_orders.php:132
 msgid "Produce"
 msgstr ""
 
-#: ../manufacturing/search_work_orders.php:140
+#: ../manufacturing/search_work_orders.php:145
 msgid "Costs"
 msgstr ""
 
-#: ../manufacturing/search_work_orders.php:164
+#: ../manufacturing/search_work_orders.php:170
 #: ../reporting/rep402.php:103
 msgid "Required"
 msgstr ""
 
-#: ../manufacturing/search_work_orders.php:167
+#: ../manufacturing/search_work_orders.php:173
 #: ../manufacturing/includes/manufacturing_ui.inc:277
 #: ../manufacturing/includes/manufacturing_ui.inc:281
 #: ../reporting/rep402.php:103
-#: ../reporting/includes/doctext.inc:227
-#: ../sales/inquiry/sales_orders_view.php:291
+#: ../reporting/includes/doctext.inc:226
+#: ../sales/inquiry/sales_orders_view.php:254
 msgid "Required By"
 msgstr ""
 
-#: ../manufacturing/search_work_orders.php:176
+#: ../manufacturing/search_work_orders.php:182
 msgid "Marked orders are overdue."
 msgstr ""
 
@@ -9609,7 +9558,6 @@ msgstr ""
 #: ../manufacturing/work_order_costs.php:45
 #: ../manufacturing/work_order_entry.php:56
 #: ../manufacturing/work_order_issue.php:40
-#: ../manufacturing/work_order_issue.php.orig:40
 #: ../manufacturing/work_order_release.php:75
 msgid "View this Work Order"
 msgstr ""
@@ -9617,7 +9565,6 @@ msgstr ""
 #: ../manufacturing/work_order_add_finished.php:48
 #: ../manufacturing/work_order_entry.php:64
 #: ../manufacturing/work_order_issue.php:42
-#: ../manufacturing/work_order_issue.php.orig:42
 msgid "View the GL Journal Entries for this Work Order"
 msgstr ""
 
@@ -9629,13 +9576,12 @@ msgstr ""
 #: ../manufacturing/work_order_add_finished.php:52
 #: ../manufacturing/work_order_costs.php:49
 #: ../manufacturing/work_order_issue.php:44
-#: ../manufacturing/work_order_issue.php.orig:44
 msgid "Select another &Work Order to Process"
 msgstr ""
 
 #: ../manufacturing/work_order_add_finished.php:65
 #: ../manufacturing/work_order_costs.php:62
-#: ../manufacturing/work_order_entry.php:339
+#: ../manufacturing/work_order_entry.php:340
 #: ../manufacturing/includes/db/work_order_issues_db.inc:30
 #: ../manufacturing/includes/db/work_order_produce_items_db.inc:27
 msgid "The order number sent is not valid."
@@ -9791,25 +9737,25 @@ msgid ""
 "manufactured for this order."
 msgstr ""
 
-#: ../manufacturing/work_order_entry.php:296
+#: ../manufacturing/work_order_entry.php:297
 msgid ""
 "This work order cannot be deleted because it has already been processed."
 msgstr ""
 
-#: ../manufacturing/work_order_entry.php:347
+#: ../manufacturing/work_order_entry.php:348
 msgid "This work order is closed and cannot be edited."
 msgstr ""
 
-#: ../manufacturing/work_order_entry.php:395
-#: ../manufacturing/work_order_entry.php:403
+#: ../manufacturing/work_order_entry.php:396
+#: ../manufacturing/work_order_entry.php:404
 msgid "Destination Location:"
 msgstr ""
 
-#: ../manufacturing/work_order_entry.php:414
+#: ../manufacturing/work_order_entry.php:415
 msgid "Quantity Required:"
 msgstr ""
 
-#: ../manufacturing/work_order_entry.php:416
+#: ../manufacturing/work_order_entry.php:417
 msgid "Quantity Manufactured:"
 msgstr ""
 
@@ -9842,45 +9788,42 @@ msgid "Add Workorder"
 msgstr ""
 
 #: ../manufacturing/work_order_issue.php:31
-#: ../manufacturing/work_order_issue.php.orig:31
 msgid "Issue Items to Work Order"
 msgstr ""
 
 #: ../manufacturing/work_order_issue.php:38
-#: ../manufacturing/work_order_issue.php.orig:38
 msgid "The work order issue has been entered."
 msgstr ""
 
 #: ../manufacturing/work_order_issue.php:78
-#: ../manufacturing/work_order_issue.php.orig:78
 msgid "The entered date for the issue is invalid."
 msgstr ""
 
-#: ../manufacturing/work_order_issue.php.orig:106
+#: ../manufacturing/work_order_issue.php:105
 msgid ""
-"The issue cannot be processed because an entered item would cause a negative "
-"inventory balance :"
+"The issue cannot be processed because it would cause negative inventory "
+"balance for marked items as of document date or later."
 msgstr ""
 
-#: ../manufacturing/work_order_issue.php.orig:124
+#: ../manufacturing/work_order_issue.php:122
 msgid ""
 "The process cannot be completed because there is an insufficient total "
 "quantity for a component."
 msgstr ""
 
-#: ../manufacturing/work_order_issue.php.orig:125
+#: ../manufacturing/work_order_issue.php:123
 msgid "Component is :"
 msgstr ""
 
-#: ../manufacturing/work_order_issue.php.orig:126
+#: ../manufacturing/work_order_issue.php:124
 msgid "From location :"
 msgstr ""
 
-#: ../manufacturing/work_order_issue.php.orig:219
+#: ../manufacturing/work_order_issue.php:217
 msgid "Items to Issue"
 msgstr ""
 
-#: ../manufacturing/work_order_issue.php.orig:225
+#: ../manufacturing/work_order_issue.php:223
 msgid "Process Issue"
 msgstr ""
 
@@ -10049,7 +9992,7 @@ msgstr ""
 #: ../manufacturing/manage/bom_edit.php:71
 #: ../manufacturing/includes/manufacturing_ui.inc:28
 #: ../manufacturing/includes/manufacturing_ui.inc:83
-#: ../reporting/includes/doctext.inc:229
+#: ../reporting/includes/doctext.inc:228
 msgid "Work Centre"
 msgstr ""
 
@@ -10153,17 +10096,17 @@ msgid "There are no Requirements for this Order."
 msgstr ""
 
 #: ../manufacturing/includes/manufacturing_ui.inc:84
-#: ../reporting/includes/doctext.inc:229
+#: ../reporting/includes/doctext.inc:228
 msgid "Unit Quantity"
 msgstr ""
 
 #: ../manufacturing/includes/manufacturing_ui.inc:84
-#: ../reporting/includes/doctext.inc:229
+#: ../reporting/includes/doctext.inc:228
 msgid "Total Quantity"
 msgstr ""
 
 #: ../manufacturing/includes/manufacturing_ui.inc:84
-#: ../reporting/includes/doctext.inc:229
+#: ../reporting/includes/doctext.inc:228
 msgid "Units Issued"
 msgstr ""
 
@@ -10195,14 +10138,14 @@ msgstr ""
 #: ../manufacturing/includes/manufacturing_ui.inc:276
 #: ../manufacturing/includes/manufacturing_ui.inc:280
 #: ../manufacturing/includes/manufacturing_ui.inc:331
-#: ../reporting/includes/doctext.inc:223
+#: ../reporting/includes/doctext.inc:222
 msgid "Manufactured Item"
 msgstr ""
 
 #: ../manufacturing/includes/manufacturing_ui.inc:277
 #: ../manufacturing/includes/manufacturing_ui.inc:281
 #: ../manufacturing/includes/manufacturing_ui.inc:332
-#: ../reporting/includes/doctext.inc:224
+#: ../reporting/includes/doctext.inc:223
 msgid "Into Location"
 msgstr ""
 
@@ -10255,19 +10198,18 @@ msgstr ""
 msgid "Reversed the production "
 msgstr ""
 
-#: ../manufacturing/includes/db/work_orders_db.inc.orig:79
-#: ../purchasing/includes/db/po_db.inc:123
+#: ../manufacturing/includes/db/work_orders_db.inc:79
+#: ../purchasing/includes/db/po_db.inc:161
 #: ../sales/includes/db/cust_trans_db.inc:114
-#: ../sales/includes/db/old.sales_order_db.inc:249
 #: ../sales/includes/db/sales_order_db.inc:213
 msgid "Updated."
 msgstr ""
 
-#: ../manufacturing/includes/db/work_orders_db.inc.orig:100
+#: ../manufacturing/includes/db/work_orders_db.inc:100
 msgid "Canceled."
 msgstr ""
 
-#: ../manufacturing/includes/db/work_orders_db.inc.orig:176
+#: ../manufacturing/includes/db/work_orders_db.inc:176
 msgid "Released."
 msgstr ""
 
@@ -10279,29 +10221,29 @@ msgstr ""
 msgid "Produced"
 msgstr ""
 
-#: ../purchasing/includes/purchasing_db.inc:219
+#: ../purchasing/includes/purchasing_db.inc:221
 msgid "Payment for:"
 msgstr ""
 
-#: ../purchasing/includes/db/invoice_db.inc:334
+#: ../purchasing/includes/db/invoice_db.inc:338
 msgid "Supplier invoice adjustment for zero inventory of "
 msgstr ""
 
-#: ../purchasing/includes/db/invoice_db.inc:334
-#: ../reporting/rep106.php:83
-#: ../sales/inquiry/sales_deliveries_view.php:168
-#: ../sales/inquiry/sales_orders_view.php:159
+#: ../purchasing/includes/db/invoice_db.inc:338
+#: ../reporting/rep106.php:90
+#: ../sales/inquiry/sales_deliveries_view.php:154
+#: ../sales/inquiry/sales_orders_view.php:131
 msgid "Invoice"
 msgstr ""
 
-#: ../purchasing/includes/db/invoice_db.inc:693
-#: ../purchasing/includes/db/invoice_db.inc:695
+#: ../purchasing/includes/db/invoice_db.inc:690
+#: ../purchasing/includes/db/invoice_db.inc:692
 msgid "GRN Removal"
 msgstr ""
 
 #: ../purchasing/includes/ui/grn_ui.inc:23
 #: ../purchasing/includes/ui/grn_ui.inc:55
-#: ../purchasing/includes/ui/po_ui.inc:328
+#: ../purchasing/includes/ui/po_ui.inc:301
 #: ../sales/view/view_sales_order.php:74
 msgid "Order Currency"
 msgstr ""
@@ -10319,34 +10261,34 @@ msgstr ""
 
 #: ../purchasing/includes/ui/grn_ui.inc:33
 #: ../purchasing/includes/ui/grn_ui.inc:69
-#: ../purchasing/includes/ui/po_ui.inc:343
-#: ../purchasing/includes/ui/po_ui.inc:348
+#: ../purchasing/includes/ui/po_ui.inc:316
+#: ../purchasing/includes/ui/po_ui.inc:321
 msgid "Deliver Into Location"
 msgstr ""
 
 #: ../purchasing/includes/ui/grn_ui.inc:34
 #: ../purchasing/includes/ui/grn_ui.inc:79
-#: ../purchasing/includes/ui/po_ui.inc:353
+#: ../purchasing/includes/ui/po_ui.inc:326
 #: ../purchasing/view/view_supp_credit.php:44
 #: ../purchasing/view/view_supp_invoice.php:48
-#: ../purchasing/inquiry/po_search_completed.php:127
-#: ../purchasing/inquiry/po_search.php:136
+#: ../purchasing/inquiry/po_search_completed.php:126
+#: ../purchasing/inquiry/po_search.php:121
 #: ../purchasing/inquiry/supplier_inquiry.php:177
-#: ../reporting/includes/doctext.inc:164
-#: ../reporting/includes/doctext.inc:187
+#: ../reporting/includes/doctext.inc:163
+#: ../reporting/includes/doctext.inc:186
 msgid "Supplier's Reference"
 msgstr ""
 
 #: ../purchasing/includes/ui/grn_ui.inc:38
 #: ../purchasing/includes/ui/grn_ui.inc:81
-#: ../purchasing/includes/ui/po_ui.inc:357
+#: ../purchasing/includes/ui/po_ui.inc:330
 #: ../sales/view/view_sales_order.php:92
 msgid "Delivery Address"
 msgstr ""
 
 #: ../purchasing/includes/ui/grn_ui.inc:41
 #: ../purchasing/includes/ui/grn_ui.inc:84
-#: ../purchasing/includes/ui/po_ui.inc:369
+#: ../purchasing/includes/ui/po_ui.inc:342
 msgid "Order Comments"
 msgstr ""
 
@@ -10354,319 +10296,166 @@ msgstr ""
 msgid "Date Items Received"
 msgstr ""
 
-#: ../purchasing/includes/ui/invoice_ui.inc:123
+#: ../purchasing/includes/ui/invoice_ui.inc:127
 msgid "Source Invoices:"
 msgstr ""
 
-#: ../purchasing/includes/ui/invoice_ui.inc:125
+#: ../purchasing/includes/ui/invoice_ui.inc:129
 msgid "Supplier's Ref.:"
 msgstr ""
 
-#: ../purchasing/includes/ui/invoice_ui.inc:140
+#: ../purchasing/includes/ui/invoice_ui.inc:135
+#: ../purchasing/includes/ui/po_ui.inc:178
+msgid "Dimension 2"
+msgstr ""
+
+#: ../purchasing/includes/ui/invoice_ui.inc:150
 msgid "Terms:"
 msgstr ""
 
-#: ../purchasing/includes/ui/invoice_ui.inc:152
+#: ../purchasing/includes/ui/invoice_ui.inc:162
 #: ../purchasing/manage/suppliers.php:101
 #: ../purchasing/manage/suppliers.php:106
 msgid "Supplier's Currency:"
 msgstr ""
 
-#: ../purchasing/includes/ui/invoice_ui.inc:156
+#: ../purchasing/includes/ui/invoice_ui.inc:166
 #: ../purchasing/manage/suppliers.php:108
-#: ../sales/manage/customer_branches.php:247
-#: ../sales/manage/customers.php:298
+#: ../sales/manage/customer_branches.php:234
+#: ../sales/manage/customers.php:299
 msgid "Tax Group:"
 msgstr ""
 
-#: ../purchasing/includes/ui/invoice_ui.inc:174
-msgid "Sub-total:"
-msgstr ""
-
-#: ../purchasing/includes/ui/invoice_ui.inc:182
-msgid "Invoice Total:"
-msgstr ""
-
-#: ../purchasing/includes/ui/invoice_ui.inc:185
-#: ../sales/customer_credit_invoice.php:330
-#: ../sales/includes/ui/sales_credit_ui.inc:233
-msgid "Credit Note Total"
-msgstr ""
-
-#: ../purchasing/includes/ui/invoice_ui.inc:190
-#: ../purchasing/includes/ui/po_ui.inc:489
-#: ../purchasing/po_entry_items.php:481
-msgid "Tax algorithm:"
-msgstr ""
-
-#: ../purchasing/includes/ui/invoice_ui.inc:222
-msgid "Add GL Line"
-msgstr ""
-
-#: ../purchasing/includes/ui/invoice_ui.inc:223
-msgid "Reset"
-msgstr ""
-
-#: ../purchasing/includes/ui/invoice_ui.inc:224
-#: ../purchasing/po_receive_items.php:333
-msgid "Clear all GL entry fields"
-msgstr ""
-
-#: ../purchasing/includes/ui/invoice_ui.inc:242
-msgid "GL Items for this Invoice"
-msgstr ""
-
-#: ../purchasing/includes/ui/invoice_ui.inc:244
-msgid "GL Items for this Credit Note"
-msgstr ""
-
-#: ../purchasing/includes/ui/invoice_ui.inc:254
-msgid "Quick Entry:"
-msgstr ""
-
-#: ../purchasing/includes/ui/invoice_ui.inc:427
-msgid "Add to Invoice"
-msgstr ""
-
-#: ../purchasing/includes/ui/invoice_ui.inc:429
-msgid "Add to Credit Note"
-msgstr ""
-
-#: ../purchasing/includes/ui/invoice_ui.inc:431
-#: ../sales/customer_invoice.php:612
-msgid "Remove"
-msgstr ""
-
-#: ../purchasing/includes/ui/invoice_ui.inc:431
-#: ../purchasing/includes/ui/invoice_ui.inc:466
-msgid ""
-"WARNING! Be careful with removal. The operation is executed immediately and "
-"cannot be undone !!!"
-msgstr ""
-
-#: ../purchasing/includes/ui/invoice_ui.inc:433
-#, php-format
-msgid ""
-"You are about to remove all yet non-invoiced items from delivery line #%d. "
-"This operation also irreversibly changes related order line. Do you want to "
-"continue ?"
-msgstr ""
-
-#: ../purchasing/includes/ui/invoice_ui.inc:464
-msgid "Items Received Yet to be Invoiced"
-msgstr ""
-
-#: ../purchasing/includes/ui/invoice_ui.inc:469
-msgid "Delivery Item Selected For Adding To A Supplier Credit Note"
-msgstr ""
-
-#: ../purchasing/includes/ui/invoice_ui.inc:474
-msgid "Received Items Charged on this Invoice"
-msgstr ""
-
-#: ../purchasing/includes/ui/invoice_ui.inc:476
-msgid "Received Items Credited on this Note"
-msgstr ""
-
-#: ../purchasing/includes/ui/invoice_ui.inc:486
-msgid "Received between"
-msgstr ""
-
-#: ../purchasing/includes/ui/invoice_ui.inc:498
-msgid "Add All Items"
-msgstr ""
-
-#: ../purchasing/includes/ui/invoice_ui.inc:507
-#: ../purchasing/includes/ui/invoice_ui.inc:519
-#: ../reporting/rep308.php:230
-#: ../sales/inquiry/sales_orders_view.php:167
-msgid "Delivery"
-msgstr ""
-
-#: ../purchasing/includes/ui/invoice_ui.inc:507
-msgid "Sequence #"
-msgstr ""
-
-#: ../purchasing/includes/ui/invoice_ui.inc:507
-msgid "P.O."
-msgstr ""
-
-#: ../purchasing/includes/ui/invoice_ui.inc:508
-msgid "Received On"
-msgstr ""
-
-#: ../purchasing/includes/ui/invoice_ui.inc:508
-#: ../purchasing/view/view_po.php:46
-msgid "Quantity Received"
-msgstr ""
-
-#: ../purchasing/includes/ui/invoice_ui.inc:508
-#: ../purchasing/view/view_grn.php:41
-#: ../purchasing/view/view_po.php:46
-msgid "Quantity Invoiced"
-msgstr ""
-
-#: ../purchasing/includes/ui/invoice_ui.inc:509
-msgid "Qty Yet To Invoice"
-msgstr ""
-
-#: ../purchasing/includes/ui/invoice_ui.inc:509
-#: ../purchasing/includes/ui/po_ui.inc:247
-#: ../sales/includes/ui/sales_order_ui.inc:148
-msgid "Price after Tax"
-msgstr ""
-
-#: ../purchasing/includes/ui/invoice_ui.inc:509
-#: ../purchasing/includes/ui/po_ui.inc:247
-#: ../sales/includes/ui/sales_order_ui.inc:148
-msgid "Price before Tax"
-msgstr ""
-
-#: ../purchasing/includes/ui/invoice_ui.inc:515
-msgid "Qty Yet To Credit"
-msgstr ""
-
-#: ../purchasing/includes/ui/invoice_ui.inc:520
-msgid "Line Value"
-msgstr ""
-
-#: ../purchasing/includes/ui/invoice_ui.inc:588
-msgid ""
-"There are no outstanding items received from this supplier that have not "
-"been invoiced by them."
-msgstr ""
-
-#: ../purchasing/includes/ui/invoice_ui.inc:591
-msgid ""
-"There are no received items for the selected supplier that have been "
-"invoiced."
-msgstr ""
-
-#: ../purchasing/includes/ui/invoice_ui.inc:592
-msgid "Credits can only be applied to invoiced items."
-msgstr ""
-
-#: ../purchasing/includes/ui/po_ui.inc:166
-#: ../sales/sales_order_entry.php:727
+#: ../purchasing/includes/ui/po_ui.inc:139
+#: ../sales/sales_order_entry.php:716
 msgid "Order Date:"
 msgstr ""
 
-#: ../purchasing/includes/ui/po_ui.inc:167
-#: ../sales/sales_order_entry.php:714
+#: ../purchasing/includes/ui/po_ui.inc:140
+#: ../sales/sales_order_entry.php:703
 msgid "Delivery Date:"
 msgstr ""
 
-#: ../purchasing/includes/ui/po_ui.inc:167
-#: ../sales/sales_order_entry.php:708
+#: ../purchasing/includes/ui/po_ui.inc:140
+#: ../sales/sales_order_entry.php:697
 msgid "Invoice Date:"
 msgstr ""
 
-#: ../purchasing/includes/ui/po_ui.inc:180
+#: ../purchasing/includes/ui/po_ui.inc:153
 msgid "Supplier Currency:"
 msgstr ""
 
-#: ../purchasing/includes/ui/po_ui.inc:199
+#: ../purchasing/includes/ui/po_ui.inc:171
 msgid "Due Date:"
 msgstr ""
 
-#: ../purchasing/includes/ui/po_ui.inc:201
+#: ../purchasing/includes/ui/po_ui.inc:173
 msgid "Supplier's Reference:"
 msgstr ""
 
-#: ../purchasing/includes/ui/po_ui.inc:202
+#: ../purchasing/includes/ui/po_ui.inc:179
 msgid "Receive Into:"
 msgstr ""
 
-#: ../purchasing/includes/ui/po_ui.inc:227
+#: ../purchasing/includes/ui/po_ui.inc:200
 msgid ""
 "The default stock location set up for this user is not a currently defined "
 "stock location. Your system administrator needs to amend your user record."
 msgstr ""
 
-#: ../purchasing/includes/ui/po_ui.inc:231
+#: ../purchasing/includes/ui/po_ui.inc:204
 msgid "Deliver to:"
 msgstr ""
 
-#: ../purchasing/includes/ui/po_ui.inc:240
+#: ../purchasing/includes/ui/po_ui.inc:213
 msgid "Order Items"
 msgstr ""
 
-#: ../purchasing/includes/ui/po_ui.inc:246
+#: ../purchasing/includes/ui/po_ui.inc:219
 #: ../purchasing/po_receive_items.php:62
 msgid "Received"
 msgstr ""
 
-#: ../purchasing/includes/ui/po_ui.inc:247
-#: ../sales/includes/ui/sales_order_ui.inc:602
+#: ../purchasing/includes/ui/po_ui.inc:220
 msgid "Required Delivery Date"
 msgstr ""
 
-#: ../purchasing/includes/ui/po_ui.inc:247
+#: ../purchasing/includes/ui/po_ui.inc:220
+#: ../sales/includes/ui/sales_order_ui.inc:149
+msgid "Price after Tax"
+msgstr ""
+
+#: ../purchasing/includes/ui/po_ui.inc:220
+#: ../sales/includes/ui/sales_order_ui.inc:149
+msgid "Price before Tax"
+msgstr ""
+
+#: ../purchasing/includes/ui/po_ui.inc:220
 #: ../purchasing/view/view_grn.php:41
 #: ../purchasing/view/view_po.php:46
 msgid "Line Total"
 msgstr ""
 
-#: ../purchasing/includes/ui/po_ui.inc:298
+#: ../purchasing/includes/ui/po_ui.inc:271
 #: ../purchasing/po_receive_items.php:114
-#: ../reporting/rep107.php:231
-#: ../reporting/rep109.php:155
-#: ../reporting/rep110.php:159
-#: ../reporting/rep111.php:152
-#: ../reporting/rep113.php:144
-#: ../reporting/rep209.php:162
+#: ../reporting/rep107.php:234
+#: ../reporting/rep109.php:156
+#: ../reporting/rep110.php:158
+#: ../reporting/rep111.php:154
+#: ../reporting/rep113.php:147
+#: ../reporting/rep209.php:165
 #: ../sales/customer_credit_invoice.php:322
-#: ../sales/customer_delivery.php:541
-#: ../sales/customer_invoice.php:656
+#: ../sales/customer_delivery.php:506
 #: ../sales/view/view_dispatch.php:146
 #: ../sales/view/view_invoice.php:150
 #: ../sales/includes/ui/sales_credit_ui.inc:217
-#: ../sales/includes/ui/sales_order_ui.inc:224
+#: ../sales/includes/ui/sales_order_ui.inc:225
 msgid "Sub-total"
 msgstr ""
 
-#: ../purchasing/includes/ui/po_ui.inc:307
+#: ../purchasing/includes/ui/po_ui.inc:280
 #: ../purchasing/po_receive_items.php:122
 #: ../purchasing/view/view_grn.php:79
 #: ../purchasing/view/view_po.php:93
-#: ../sales/customer_delivery.php:548
+#: ../sales/customer_delivery.php:513
 #: ../sales/view/view_sales_order.php:262
-#: ../sales/includes/ui/sales_order_ui.inc:231
+#: ../sales/includes/ui/sales_order_ui.inc:232
 msgid "Amount Total"
 msgstr ""
 
-#: ../purchasing/includes/ui/po_ui.inc:308
+#: ../purchasing/includes/ui/po_ui.inc:281
 #: ../purchasing/allocations/supplier_allocate.php:74
 #: ../sales/allocations/customer_allocate.php:72
-#: ../sales/includes/ui/sales_order_ui.inc:232
+#: ../sales/includes/ui/sales_order_ui.inc:233
 msgid "Refresh"
 msgstr ""
 
-#: ../purchasing/includes/ui/po_ui.inc:363
+#: ../purchasing/includes/ui/po_ui.inc:336
 #: ../sales/view/view_sales_order.php:83
 msgid "Required Pre-Payment"
 msgstr ""
 
-#: ../purchasing/includes/ui/po_ui.inc:364
+#: ../purchasing/includes/ui/po_ui.inc:337
 msgid "Pre-Payments Allocated"
 msgstr ""
 
-#: ../purchasing/includes/ui/po_ui.inc:490
+#: ../purchasing/includes/ui/po_ui.inc:462
+#: ../purchasing/po_entry_items.php:481
+msgid "Tax algorithm:"
+msgstr ""
+
+#: ../purchasing/includes/ui/po_ui.inc:463
 #: ../purchasing/po_entry_items.php:482
-#: ../sales/customer_invoice.php:463
-#: ../sales/includes/ui/sales_order_ui.inc:398
-#: ../sales/includes/ui/sales_order_ui.inc:400
+#: ../sales/customer_invoice.php:458
 msgid "Payment:"
 msgstr ""
 
-#: ../purchasing/includes/ui/po_ui.inc:490
+#: ../purchasing/includes/ui/po_ui.inc:463
 #: ../purchasing/po_entry_items.php:482
 msgid "Delayed"
 msgstr ""
 
-#: ../purchasing/includes/ui/po_ui.inc:492
-#: ../sales/includes/ui/sales_order_ui.inc:613
-#: ../sales/includes/ui/sales_order_ui.inc:615
+#: ../purchasing/includes/ui/po_ui.inc:465
 msgid "Pre-Payment Required:"
 msgstr ""
 
@@ -10787,7 +10576,7 @@ msgid "Enter a new purchase order"
 msgstr ""
 
 #: ../purchasing/po_entry_items.php:216
-#: ../sales/sales_order_entry.php:520
+#: ../sales/sales_order_entry.php:509
 msgid "Item description cannot be empty."
 msgstr ""
 
@@ -10823,7 +10612,7 @@ msgid ""
 msgstr ""
 
 #: ../purchasing/po_entry_items.php:329
-#: ../purchasing/supplier_invoice.php:394
+#: ../purchasing/supplier_invoice.php:393
 #: ../purchasing/supplier_payment.php:123
 msgid "There is no supplier selected."
 msgstr ""
@@ -10869,7 +10658,7 @@ msgid "Required prepayment is greater than total invoice value."
 msgstr ""
 
 #: ../purchasing/po_entry_items.php:490
-#: ../sales/sales_order_entry.php:731
+#: ../sales/sales_order_entry.php:720
 msgid "Place Order"
 msgstr ""
 
@@ -10878,7 +10667,7 @@ msgid "Update Order"
 msgstr ""
 
 #: ../purchasing/po_entry_items.php:492
-#: ../sales/sales_order_entry.php:730
+#: ../sales/sales_order_entry.php:719
 msgid "Cancel Order"
 msgstr ""
 
@@ -10895,7 +10684,6 @@ msgid "Cancel GRN"
 msgstr ""
 
 #: ../purchasing/po_entry_items.php:499
-#: ../sales/customer_invoice.php:695
 msgid "Process Invoice"
 msgstr ""
 
@@ -10904,7 +10692,7 @@ msgid "Update Invoice"
 msgstr ""
 
 #: ../purchasing/po_entry_items.php:501
-#: ../sales/sales_order_entry.php:711
+#: ../sales/sales_order_entry.php:700
 msgid "Cancel Invoice"
 msgstr ""
 
@@ -10932,7 +10720,7 @@ msgstr ""
 
 #: ../purchasing/po_receive_items.php:62
 #: ../reporting/rep105.php:114
-#: ../sales/customer_delivery.php:456
+#: ../sales/customer_delivery.php:421
 msgid "Ordered"
 msgstr ""
 
@@ -10941,12 +10729,12 @@ msgstr ""
 #: ../reporting/rep105.php:115
 #: ../reporting/rep105.php:166
 #: ../reporting/rep201.php:111
-#: ../reporting/includes/doctext.inc:247
+#: ../reporting/includes/doctext.inc:246
 msgid "Outstanding"
 msgstr ""
 
 #: ../purchasing/po_receive_items.php:63
-#: ../sales/customer_delivery.php:457
+#: ../sales/customer_delivery.php:422
 msgid "This Delivery"
 msgstr ""
 
@@ -10992,6 +10780,10 @@ msgstr ""
 msgid "Process Receive Items"
 msgstr ""
 
+#: ../purchasing/po_receive_items.php:333
+msgid "Clear all GL entry fields"
+msgstr ""
+
 #: ../purchasing/supplier_credit.php:77
 msgid "Supplier credit note has been processed."
 msgstr ""
@@ -11049,28 +10841,21 @@ msgid ""
 "incorrect format."
 msgstr ""
 
-#: ../purchasing/supplier_credit.php:215
-msgid ""
-"The credit note total as entered is less than the sum of the the general "
-"ledger entires (if any) and the charges for goods received. There must be a "
-"mistake somewhere, the credit note as entered will not be processed."
-msgstr ""
-
-#: ../purchasing/supplier_credit.php:226
+#: ../purchasing/supplier_credit.php:220
 msgid ""
 "The return cannot be processed because there is an insufficient quantity for "
 "item:"
 msgstr ""
 
-#: ../purchasing/supplier_credit.php:269
+#: ../purchasing/supplier_credit.php:263
 msgid "The quantity to credit must be numeric and greater than zero."
 msgstr ""
 
-#: ../purchasing/supplier_credit.php:276
+#: ../purchasing/supplier_credit.php:270
 msgid "The price is either not numeric or negative."
 msgstr ""
 
-#: ../purchasing/supplier_credit.php:378
+#: ../purchasing/supplier_credit.php:372
 msgid "Enter Credit Note"
 msgstr ""
 
@@ -11115,27 +10900,27 @@ msgid ""
 "incorrect format."
 msgstr ""
 
-#: ../purchasing/supplier_invoice.php:265
+#: ../purchasing/supplier_invoice.php:264
 msgid "The quantity to invoice must be numeric and greater than zero."
 msgstr ""
 
-#: ../purchasing/supplier_invoice.php:272
+#: ../purchasing/supplier_invoice.php:271
 msgid "The price is not numeric."
 msgstr ""
 
-#: ../purchasing/supplier_invoice.php:285
+#: ../purchasing/supplier_invoice.php:284
 msgid ""
 "The price being invoiced is more than the purchase order price by more than "
 "the allowed over-charge percentage. The system is set up to prohibit this. "
 "See the system administrator to modify the set up parameters if necessary."
 msgstr ""
 
-#: ../purchasing/supplier_invoice.php:286
-#: ../purchasing/supplier_invoice.php:299
+#: ../purchasing/supplier_invoice.php:285
+#: ../purchasing/supplier_invoice.php:298
 msgid "The over-charge percentage allowance is :"
 msgstr ""
 
-#: ../purchasing/supplier_invoice.php:298
+#: ../purchasing/supplier_invoice.php:297
 msgid ""
 "The quantity being invoiced is more than the outstanding quantity by more "
 "than the allowed over-charge percentage. The system is set up to prohibit "
@@ -11143,12 +10928,12 @@ msgid ""
 "necessary."
 msgstr ""
 
-#: ../purchasing/supplier_invoice.php:376
+#: ../purchasing/supplier_invoice.php:375
 #, php-format
 msgid "All yet non-invoiced items on delivery line # %d has been removed."
 msgstr ""
 
-#: ../purchasing/supplier_invoice.php:418
+#: ../purchasing/supplier_invoice.php:417
 msgid "Enter Invoice"
 msgstr ""
 
@@ -11185,7 +10970,7 @@ msgid "Enter another supplier &payment"
 msgstr ""
 
 #: ../purchasing/supplier_payment.php:107
-#: ../sales/customer_payments.php:106
+#: ../sales/customer_payments.php:107
 msgid "Enter Other &Payment"
 msgstr ""
 
@@ -11194,12 +10979,12 @@ msgid "Enter &Customer Payment"
 msgstr ""
 
 #: ../purchasing/supplier_payment.php:109
-#: ../sales/customer_payments.php:104
+#: ../sales/customer_payments.php:105
 msgid "Enter Other &Deposit"
 msgstr ""
 
 #: ../purchasing/supplier_payment.php:110
-#: ../sales/customer_payments.php:107
+#: ../sales/customer_payments.php:108
 msgid "Bank Account &Transfer"
 msgstr ""
 
@@ -11235,7 +11020,7 @@ msgid "Bank Amount:"
 msgstr ""
 
 #: ../purchasing/supplier_payment.php:323
-#: ../sales/customer_payments.php:398
+#: ../sales/customer_payments.php:399
 msgid "Amount of Discount:"
 msgstr ""
 
@@ -11263,13 +11048,18 @@ msgid "Line Details"
 msgstr ""
 
 #: ../purchasing/view/view_grn.php:40
-#: ../reporting/includes/doctext.inc:77
-#: ../reporting/includes/doctext.inc:192
-#: ../reporting/includes/doctext.inc:244
-#: ../sales/inquiry/sales_deliveries_view.php:188
+#: ../reporting/includes/doctext.inc:76
+#: ../reporting/includes/doctext.inc:191
+#: ../reporting/includes/doctext.inc:243
+#: ../sales/inquiry/sales_deliveries_view.php:175
 msgid "Delivery Date"
 msgstr ""
 
+#: ../purchasing/view/view_grn.php:41
+#: ../purchasing/view/view_po.php:46
+msgid "Quantity Invoiced"
+msgstr ""
+
 #: ../purchasing/view/view_grn.php:70
 #: ../purchasing/view/view_po.php:84
 #: ../purchasing/view/view_supp_credit.php:60
@@ -11295,13 +11085,16 @@ msgstr ""
 msgid "Requested By"
 msgstr ""
 
+#: ../purchasing/view/view_po.php:46
+msgid "Quantity Received"
+msgstr ""
+
 #: ../purchasing/view/view_po.php:100
-#: ../purchasing/inquiry/supplier_allocation_inquiry.php:148
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:149
 #: ../purchasing/inquiry/supplier_inquiry.php:197
 #: ../sales/inquiry/customer_allocation_inquiry.php:165
-#: ../sales/inquiry/customer_inquiry.php:227
-#: ../sales/inquiry/sales_deliveries_view.php:208
-#: ../sales/inquiry/sales_orders_view.php:345
+#: ../sales/inquiry/sales_deliveries_view.php:195
+#: ../sales/inquiry/sales_orders_view.php:308
 msgid "Marked items are overdue."
 msgstr ""
 
@@ -11330,7 +11123,7 @@ msgstr ""
 
 #: ../purchasing/view/view_supp_credit.php:47
 #: ../purchasing/view/view_supp_invoice.php:51
-#: ../reporting/includes/doctext.inc:141
+#: ../reporting/includes/doctext.inc:140
 #: ../sales/customer_credit_invoice.php:268
 #: ../sales/view/view_invoice.php:100
 msgid "Invoice Date"
@@ -11354,8 +11147,8 @@ msgid "SUPPLIER INVOICE"
 msgstr ""
 
 #: ../purchasing/view/view_supp_invoice.php:73
-#: ../reporting/rep107.php:280
-#: ../reporting/rep107.php:286
+#: ../reporting/rep107.php:283
+#: ../reporting/rep107.php:289
 #: ../sales/view/view_invoice.php:166
 msgid "TOTAL INVOICE"
 msgstr ""
@@ -11382,11 +11175,7 @@ msgid "Payment Currency"
 msgstr ""
 
 #: ../purchasing/view/view_supp_payment.php:62
-#: ../reporting/rep112.php:150
-#: ../reporting/rep210.php:159
-#: ../sales/customer_delivery.php:457
-#: ../sales/customer_invoice.php:551
-#: ../sales/customer_invoice.php:554
+#: ../sales/customer_delivery.php:422
 #: ../sales/view/view_receipt.php:45
 #: ../sales/view/view_sales_order.php:220
 msgid "Discount"
@@ -11432,12 +11221,12 @@ msgid "Bank Name/Account:"
 msgstr ""
 
 #: ../purchasing/manage/suppliers.php:113
-#: ../sales/manage/customers.php:268
+#: ../sales/manage/customers.php:269
 msgid "Credit Limit:"
 msgstr ""
 
 #: ../purchasing/manage/suppliers.php:114
-#: ../sales/manage/customers.php:270
+#: ../sales/manage/customers.php:271
 msgid "Payment Terms:"
 msgstr ""
 
@@ -11478,133 +11267,126 @@ msgstr ""
 msgid "System default"
 msgstr ""
 
-#: ../purchasing/manage/suppliers.php:159
-#: ../sales/manage/customer_branches.php:268
+#: ../purchasing/manage/suppliers.php:161
+#: ../sales/manage/customer_branches.php:255
 msgid "Addresses"
 msgstr ""
 
-#: ../purchasing/manage/suppliers.php:160
+#: ../purchasing/manage/suppliers.php:162
 #: ../reporting/rep205.php:102
-#: ../sales/manage/customer_branches.php:269
+#: ../sales/manage/customer_branches.php:256
 msgid "Mailing Address:"
 msgstr ""
 
-#: ../purchasing/manage/suppliers.php:161
+#: ../purchasing/manage/suppliers.php:163
 msgid "Physical Address:"
 msgstr ""
 
-#: ../purchasing/manage/suppliers.php:163
+#: ../purchasing/manage/suppliers.php:165
 msgid "General"
 msgstr ""
 
-#: ../purchasing/manage/suppliers.php:164
-#: ../sales/manage/customer_branches.php:271
-#: ../sales/manage/customers.php:291
+#: ../purchasing/manage/suppliers.php:166
+#: ../sales/manage/customer_branches.php:258
+#: ../sales/manage/customers.php:292
 msgid "General Notes:"
 msgstr ""
 
-#: ../purchasing/manage/suppliers.php:166
+#: ../purchasing/manage/suppliers.php:168
 msgid "Supplier status:"
 msgstr ""
 
-#: ../purchasing/manage/suppliers.php:172
+#: ../purchasing/manage/suppliers.php:174
 msgid "Update Supplier"
 msgstr ""
 
-#: ../purchasing/manage/suppliers.php:173
+#: ../purchasing/manage/suppliers.php:175
 msgid "Update supplier data"
 msgstr ""
 
-#: ../purchasing/manage/suppliers.php:174
+#: ../purchasing/manage/suppliers.php:176
 msgid "Select this supplier and return to document entry."
 msgstr ""
 
-#: ../purchasing/manage/suppliers.php:175
+#: ../purchasing/manage/suppliers.php:177
 msgid "Delete Supplier"
 msgstr ""
 
-#: ../purchasing/manage/suppliers.php:176
+#: ../purchasing/manage/suppliers.php:178
 msgid "Delete supplier data if have been never used"
 msgstr ""
 
-#: ../purchasing/manage/suppliers.php:180
+#: ../purchasing/manage/suppliers.php:182
 msgid "Add New Supplier Details"
 msgstr ""
 
-#: ../purchasing/manage/suppliers.php:199
+#: ../purchasing/manage/suppliers.php:201
 msgid "The supplier name must be entered."
 msgstr ""
 
-#: ../purchasing/manage/suppliers.php:206
+#: ../purchasing/manage/suppliers.php:208
 msgid "The supplier short name must be entered."
 msgstr ""
 
-#: ../purchasing/manage/suppliers.php:226
+#: ../purchasing/manage/suppliers.php:228
 msgid "Supplier has been updated."
 msgstr ""
 
-#: ../purchasing/manage/suppliers.php:244
+#: ../purchasing/manage/suppliers.php:246
 msgid "A new supplier has been added."
 msgstr ""
 
-#: ../purchasing/manage/suppliers.php:262
+#: ../purchasing/manage/suppliers.php:264
 msgid ""
 "Cannot delete this supplier because there are transactions that refer to "
 "this supplier."
 msgstr ""
 
-#: ../purchasing/manage/suppliers.php:270
+#: ../purchasing/manage/suppliers.php:272
 msgid ""
 "Cannot delete the supplier record because purchase orders have been created "
 "against this supplier."
 msgstr ""
 
-#: ../purchasing/manage/suppliers.php:291
-#: ../purchasing/inquiry/po_search_completed.php:75
+#: ../purchasing/manage/suppliers.php:293
+#: ../purchasing/inquiry/po_search_completed.php:76
 #: ../purchasing/inquiry/po_search.php:76
 #: ../purchasing/inquiry/supplier_allocation_inquiry.php:48
 msgid "Select a supplier: "
 msgstr ""
 
-#: ../purchasing/manage/suppliers.php:292
+#: ../purchasing/manage/suppliers.php:294
 msgid "New supplier"
 msgstr ""
 
-#: ../purchasing/manage/suppliers.php:311
-#: ../sales/manage/customer_branches.php:325
-#: ../sales/manage/customers.php:349
+#: ../purchasing/manage/suppliers.php:313
+#: ../sales/manage/customer_branches.php:307
+#: ../sales/manage/customers.php:351
 msgid "&Contacts"
 msgstr ""
 
-#: ../purchasing/manage/suppliers.php:313
+#: ../purchasing/manage/suppliers.php:315
 msgid "Purchase &Orders"
 msgstr ""
 
-#: ../purchasing/inquiry/po_search_completed.php:24
+#: ../purchasing/inquiry/po_search_completed.php:25
 msgid "Search Purchase Orders"
 msgstr ""
 
-#: ../purchasing/inquiry/po_search_completed.php:60
-#: ../purchasing/inquiry/po_search.php:62
-#: ../sales/inquiry/sales_deliveries_view.php:103
-#: ../sales/inquiry/sales_orders_view.php:247
-msgid "#:"
-msgstr ""
-
-#: ../purchasing/inquiry/po_search_completed.php:65
+#: ../purchasing/inquiry/po_search_completed.php:66
 msgid "into location:"
 msgstr ""
 
-#: ../purchasing/inquiry/po_search_completed.php:128
-#: ../purchasing/inquiry/po_search.php:137
-#: ../reporting/includes/doctext.inc:188
-#: ../sales/inquiry/sales_orders_view.php:290
+#: ../purchasing/inquiry/po_search_completed.php:127
+#: ../purchasing/inquiry/po_search.php:122
+#: ../reporting/includes/doctext.inc:187
+#: ../sales/inquiry/sales_orders_view.php:253
 msgid "Order Date"
 msgstr ""
 
-#: ../purchasing/inquiry/po_search_completed.php:130
-#: ../purchasing/inquiry/po_search.php:139
-#: ../sales/inquiry/sales_orders_view.php:293
+#: ../purchasing/inquiry/po_search_completed.php:129
+#: ../purchasing/inquiry/po_search.php:124
+#: ../sales/inquiry/sales_orders_view.php:256
 msgid "Order Total"
 msgstr ""
 
@@ -11612,11 +11394,11 @@ msgstr ""
 msgid "Search Outstanding Purchase Orders"
 msgstr ""
 
-#: ../purchasing/inquiry/po_search.php:100
+#: ../purchasing/inquiry/po_search.php:99
 msgid "Receive"
 msgstr ""
 
-#: ../purchasing/inquiry/po_search.php:150
+#: ../purchasing/inquiry/po_search.php:135
 msgid "Marked orders have overdue items."
 msgstr ""
 
@@ -11633,14 +11415,14 @@ msgstr ""
 msgid "Pay"
 msgstr ""
 
-#: ../purchasing/inquiry/supplier_allocation_inquiry.php:130
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:131
 msgid "Supp Reference"
 msgstr ""
 
-#: ../purchasing/inquiry/supplier_allocation_inquiry.php:136
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:137
 #: ../reporting/rep101.php:119
 #: ../reporting/rep201.php:111
-#: ../reporting/includes/doctext.inc:247
+#: ../reporting/includes/doctext.inc:246
 #: ../sales/inquiry/customer_allocation_inquiry.php:154
 msgid "Allocated"
 msgstr ""
@@ -11659,59 +11441,51 @@ msgstr ""
 #: ../reporting/rep102.php:120
 #: ../reporting/rep102.php:121
 #: ../reporting/rep102.php:122
-#: ../reporting/rep102.php:244
-#: ../reporting/rep108.php:151
-#: ../reporting/rep108.php:152
-#: ../reporting/rep108.php:153
+#: ../reporting/rep102.php:243
+#: ../reporting/rep108.php:154
+#: ../reporting/rep108.php:155
+#: ../reporting/rep108.php:156
 #: ../reporting/rep202.php:124
 #: ../reporting/rep202.php:125
 #: ../reporting/rep202.php:126
 #: ../reporting/rep202.php:158
 #: ../reporting/rep202.php:159
 #: ../reporting/rep202.php:160
-#: ../reporting/rep202.php:252
+#: ../reporting/rep202.php:251
 #: ../sales/create_recurrent_invoices.php:134
-#: ../sales/manage/recurrent_invoices.php:102
-#: ../sales/inquiry/customer_inquiry.php:71
-#: ../sales/inquiry/customer_inquiry.php:72
-#: ../sales/inquiry/customer_inquiry.php:73
+#: ../sales/manage/recurrent_invoices.php:108
 msgid "Days"
 msgstr ""
 
 #: ../purchasing/inquiry/supplier_inquiry.php:69
 #: ../reporting/rep102.php:122
-#: ../reporting/rep108.php:153
+#: ../reporting/rep108.php:156
 #: ../reporting/rep202.php:126
 #: ../reporting/rep202.php:160
-#: ../sales/inquiry/customer_inquiry.php:73
 msgid "Over"
 msgstr ""
 
 #: ../purchasing/inquiry/supplier_inquiry.php:73
-#: ../sales/inquiry/customer_inquiry.php:76
 msgid "Terms"
 msgstr ""
 
 #: ../purchasing/inquiry/supplier_inquiry.php:73
 #: ../reporting/rep102.php:125
-#: ../reporting/rep102.php:242
-#: ../reporting/rep108.php:155
+#: ../reporting/rep102.php:241
+#: ../reporting/rep108.php:158
 #: ../reporting/rep202.php:130
-#: ../reporting/rep202.php:250
-#: ../sales/inquiry/customer_inquiry.php:76
+#: ../reporting/rep202.php:249
 msgid "Current"
 msgstr ""
 
 #: ../purchasing/inquiry/supplier_inquiry.php:74
 #: ../reporting/rep102.php:126
-#: ../reporting/rep108.php:155
+#: ../reporting/rep108.php:158
 #: ../reporting/rep202.php:131
-#: ../sales/inquiry/customer_inquiry.php:77
 msgid "Total Balance"
 msgstr ""
 
 #: ../purchasing/inquiry/supplier_inquiry.php:133
-#: ../sales/inquiry/customer_inquiry.php:162
 msgid "Credit This"
 msgstr ""
 
@@ -11801,21 +11575,21 @@ msgstr ""
 #: ../reporting/rep201.php:110
 #: ../reporting/rep203.php:93
 #: ../reporting/rep709.php:116
-#: ../reporting/includes/doctext.inc:167
-#: ../reporting/includes/doctext.inc:208
-#: ../reporting/includes/doctext.inc:246
+#: ../reporting/includes/doctext.inc:166
+#: ../reporting/includes/doctext.inc:207
+#: ../reporting/includes/doctext.inc:245
 msgid "Trans Type"
 msgstr ""
 
 #: ../reporting/rep101.php:118
 #: ../reporting/rep201.php:110
-#: ../reporting/includes/doctext.inc:246
+#: ../reporting/includes/doctext.inc:245
 msgid "Charges"
 msgstr ""
 
 #: ../reporting/rep101.php:118
 #: ../reporting/rep201.php:111
-#: ../reporting/includes/doctext.inc:247
+#: ../reporting/includes/doctext.inc:246
 msgid "Credits"
 msgstr ""
 
@@ -11840,7 +11614,7 @@ msgstr ""
 
 #: ../reporting/rep101.php:241
 #: ../reporting/rep102.php:228
-#: ../reporting/rep106.php:171
+#: ../reporting/rep106.php:178
 #: ../reporting/rep201.php:234
 #: ../reporting/rep202.php:235
 #: ../reporting/rep203.php:181
@@ -11854,7 +11628,7 @@ msgid "Grand Total"
 msgstr ""
 
 #: ../reporting/rep102.php:102
-#: ../reporting/rep106.php:93
+#: ../reporting/rep106.php:100
 #: ../reporting/rep202.php:106
 #: ../reporting/rep709.php:100
 #: ../reporting/reports_main.php:48
@@ -11922,86 +11696,86 @@ msgstr ""
 msgid "Aged Customer Analysis"
 msgstr ""
 
-#: ../reporting/rep103.php:134
+#: ../reporting/rep103.php:133
 msgid "All Areas"
 msgstr ""
 
-#: ../reporting/rep103.php:138
+#: ../reporting/rep103.php:137
 msgid "All Sales Folk"
 msgstr ""
 
-#: ../reporting/rep103.php:142
+#: ../reporting/rep103.php:141
 #: ../reporting/rep205.php:89
 msgid "Greater than "
 msgstr ""
 
-#: ../reporting/rep103.php:146
+#: ../reporting/rep103.php:145
 #: ../reporting/rep205.php:93
 msgid "Less than "
 msgstr ""
 
-#: ../reporting/rep103.php:155
+#: ../reporting/rep103.php:154
 msgid "Customer Postal Address"
 msgstr ""
 
-#: ../reporting/rep103.php:155
+#: ../reporting/rep103.php:154
 msgid "Price/Turnover"
 msgstr ""
 
-#: ../reporting/rep103.php:155
+#: ../reporting/rep103.php:154
 msgid "Branch Contact Information"
 msgstr ""
 
-#: ../reporting/rep103.php:156
+#: ../reporting/rep103.php:155
 msgid "Branch Delivery Address"
 msgstr ""
 
-#: ../reporting/rep103.php:161
+#: ../reporting/rep103.php:160
 #: ../reporting/rep205.php:108
 #: ../reporting/reports_main.php:55
 #: ../reporting/reports_main.php:185
 msgid "Activity Since"
 msgstr ""
 
-#: ../reporting/rep103.php:162
+#: ../reporting/rep103.php:161
 #: ../reporting/reports_main.php:56
 #: ../sales/manage/sales_areas.php:16
 msgid "Sales Areas"
 msgstr ""
 
-#: ../reporting/rep103.php:163
+#: ../reporting/rep103.php:162
 #: ../reporting/reports_main.php:57
 msgid "Sales Folk"
 msgstr ""
 
-#: ../reporting/rep103.php:164
+#: ../reporting/rep103.php:163
 #: ../reporting/rep205.php:109
 msgid "Activity"
 msgstr ""
 
-#: ../reporting/rep103.php:166
+#: ../reporting/rep103.php:165
 msgid "Customer Details Listing"
 msgstr ""
 
-#: ../reporting/rep103.php:197
+#: ../reporting/rep103.php:196
 msgid "Customers in"
 msgstr ""
 
-#: ../reporting/rep103.php:218
+#: ../reporting/rep103.php:217
 msgid "Price List"
 msgstr ""
 
-#: ../reporting/rep103.php:246
+#: ../reporting/rep103.php:245
 #: ../reporting/rep205.php:164
 msgid "Ph"
 msgstr ""
 
-#: ../reporting/rep103.php:261
+#: ../reporting/rep103.php:260
 #: ../reporting/rep205.php:179
 msgid "Gereral Notes:"
 msgstr ""
 
-#: ../reporting/rep103.php:270
+#: ../reporting/rep103.php:269
 #: ../reporting/rep205.php:102
 #: ../reporting/rep205.php:188
 msgid "Turnover"
@@ -12049,30 +11823,27 @@ msgstr ""
 #: ../reporting/rep105.php:109
 #: ../reporting/rep204.php:84
 #: ../sales/inquiry/customer_allocation_inquiry.php:147
-#: ../sales/inquiry/customer_inquiry.php:202
 msgid "Order"
 msgstr ""
 
 #: ../reporting/rep105.php:109
-#: ../reporting/rep106.php:83
-#: ../reporting/rep112.php:175
+#: ../reporting/rep106.php:90
 #: ../sales/create_recurrent_invoices.php:134
 #: ../sales/customer_credit_invoice.php:236
-#: ../sales/customer_delivery.php:363
-#: ../sales/customer_invoice.php:456
+#: ../sales/customer_delivery.php:328
+#: ../sales/customer_invoice.php:451
 #: ../sales/manage/customers.php:255
-#: ../sales/manage/customers.php:294
-#: ../sales/manage/recurrent_invoices.php:102
+#: ../sales/manage/customers.php:295
+#: ../sales/manage/recurrent_invoices.php:108
 #: ../sales/view/view_credit.php:58
-#: ../sales/inquiry/customer_inquiry.php:207
-#: ../sales/inquiry/sales_deliveries_view.php:184
-#: ../sales/inquiry/sales_orders_view.php:288
-#: ../sales/inquiry/sales_orders_view.php:302
+#: ../sales/inquiry/sales_deliveries_view.php:171
+#: ../sales/inquiry/sales_orders_view.php:251
+#: ../sales/inquiry/sales_orders_view.php:265
 msgid "Branch"
 msgstr ""
 
 #: ../reporting/rep105.php:109
-#: ../reporting/rep106.php:83
+#: ../reporting/rep106.php:90
 msgid "Customer Ref"
 msgstr ""
 
@@ -12090,9 +11861,8 @@ msgid "Loc"
 msgstr ""
 
 #: ../reporting/rep105.php:114
-#: ../sales/customer_delivery.php:456
-#: ../sales/customer_invoice.php:553
-#: ../sales/includes/ui/sales_order_ui.inc:147
+#: ../sales/customer_delivery.php:421
+#: ../sales/includes/ui/sales_order_ui.inc:148
 msgid "Delivered"
 msgstr ""
 
@@ -12104,55 +11874,55 @@ msgstr ""
 msgid "Order Status Listing"
 msgstr ""
 
-#: ../reporting/rep106.php:84
+#: ../reporting/rep106.php:91
 msgid "Inv Date"
 msgstr ""
 
-#: ../reporting/rep106.php:84
-#: ../reporting/rep106.php:88
-#: ../reporting/rep106.php:89
+#: ../reporting/rep106.php:91
+#: ../reporting/rep106.php:95
+#: ../reporting/rep106.php:96
 #: ../sales/manage/sales_people.php:99
 #: ../sales/manage/sales_people.php:159
 #: ../sales/manage/sales_people.php:161
 msgid "Provision"
 msgstr ""
 
-#: ../reporting/rep106.php:88
+#: ../reporting/rep106.php:95
 msgid "Salesman"
 msgstr ""
 
-#: ../reporting/rep106.php:89
+#: ../reporting/rep106.php:96
 #: ../sales/manage/sales_people.php:99
 msgid "Break Pt."
 msgstr ""
 
-#: ../reporting/rep106.php:97
+#: ../reporting/rep106.php:104
 msgid "Salesman Listing"
 msgstr ""
 
 #: ../reporting/rep107.php:88
-#: ../reporting/rep107.php:111
-#: ../reporting/includes/doctext.inc:118
+#: ../reporting/rep107.php:114
+#: ../reporting/includes/doctext.inc:117
 msgid "INVOICE"
 msgstr ""
 
-#: ../reporting/rep107.php:196
+#: ../reporting/rep107.php:199
 msgid "Prepayments invoiced to this order up to day:"
 msgstr ""
 
-#: ../reporting/rep107.php:203
+#: ../reporting/rep107.php:206
 msgid "Invoice reference"
 msgstr ""
 
-#: ../reporting/rep107.php:220
+#: ../reporting/rep107.php:223
 msgid "Total payments:"
 msgstr ""
 
-#: ../reporting/rep107.php:234
-#: ../reporting/rep109.php:158
-#: ../reporting/rep110.php:162
-#: ../reporting/rep111.php:155
-#: ../reporting/rep113.php:147
+#: ../reporting/rep107.php:237
+#: ../reporting/rep109.php:159
+#: ../reporting/rep110.php:161
+#: ../reporting/rep111.php:157
+#: ../reporting/rep113.php:150
 #: ../sales/view/view_credit.php:138
 #: ../sales/view/view_dispatch.php:155
 #: ../sales/view/view_invoice.php:159
@@ -12161,114 +11931,89 @@ msgstr ""
 msgid "Shipping"
 msgstr ""
 
-#: ../reporting/rep107.php:280
-#: ../reporting/rep109.php:210
-#: ../reporting/rep111.php:207
+#: ../reporting/rep107.php:283
+#: ../reporting/rep109.php:211
+#: ../reporting/rep111.php:209
 msgid "TOTAL ORDER VAT INCL."
 msgstr ""
 
-#: ../reporting/rep107.php:286
+#: ../reporting/rep107.php:289
 msgid "THIS INVOICE"
 msgstr ""
 
 #: ../reporting/rep108.php:85
-#: ../reporting/rep108.php:110
-#: ../reporting/includes/doctext.inc:238
+#: ../reporting/rep108.php:113
+#: ../reporting/includes/doctext.inc:237
 msgid "STATEMENT"
 msgstr ""
 
-#: ../reporting/rep108.php:127
+#: ../reporting/rep108.php:130
 msgid "Outstanding Transactions"
 msgstr ""
 
-#: ../reporting/rep108.php:170
+#: ../reporting/rep108.php:173
 msgid "Statement"
 msgstr ""
 
-#: ../reporting/rep108.php:170
+#: ../reporting/rep108.php:173
 msgid "as of"
 msgstr ""
 
-#: ../reporting/rep109.php:66
-#: ../reporting/rep109.php:94
-#: ../reporting/rep109.php:99
-#: ../reporting/includes/doctext.inc:65
+#: ../reporting/rep109.php:64
+#: ../reporting/rep109.php:95
+#: ../reporting/rep109.php:100
+#: ../reporting/includes/doctext.inc:64
 msgid "SALES ORDER"
 msgstr ""
 
-#: ../reporting/rep109.php:68
-#: ../reporting/rep109.php:89
-#: ../reporting/rep109.php:99
-#: ../reporting/includes/doctext.inc:65
+#: ../reporting/rep109.php:66
+#: ../reporting/rep109.php:90
+#: ../reporting/rep109.php:100
+#: ../reporting/includes/doctext.inc:64
 msgid "QUOTE"
 msgstr ""
 
-#: ../reporting/rep109.php:164
-#: ../reporting/rep111.php:161
+#: ../reporting/rep109.php:165
+#: ../reporting/rep111.php:163
 msgid "TOTAL ORDER EX VAT"
 msgstr ""
 
-#: ../reporting/rep110.php:70
+#: ../reporting/rep110.php:69
 msgid "DELIVERY"
 msgstr ""
 
-#: ../reporting/rep110.php:72
-#: ../reporting/rep110.php:93
-#: ../reporting/includes/doctext.inc:82
+#: ../reporting/rep110.php:71
+#: ../reporting/rep110.php:92
+#: ../reporting/includes/doctext.inc:81
 msgid "PACKING SLIP"
 msgstr ""
 
-#: ../reporting/rep110.php:88
-#: ../reporting/includes/doctext.inc:82
+#: ../reporting/rep110.php:87
+#: ../reporting/includes/doctext.inc:81
 msgid "DELIVERY NOTE"
 msgstr ""
 
-#: ../reporting/rep110.php:206
+#: ../reporting/rep110.php:205
 msgid "TOTAL DELIVERY INCL. VAT"
 msgstr ""
 
 #: ../reporting/rep111.php:64
-#: ../reporting/includes/doctext.inc:50
+#: ../reporting/includes/doctext.inc:49
 msgid "SALES QUOTATION"
 msgstr ""
 
 #: ../reporting/rep112.php:83
-#: ../reporting/includes/doctext.inc:198
+#: ../reporting/includes/doctext.inc:197
 msgid "RECEIPT"
 msgstr ""
 
-#: ../reporting/rep112.php:114
-#: ../reporting/rep210.php:122
-msgid "As advance / full / part / payment towards:"
-msgstr ""
-
-#: ../reporting/rep112.php:155
-msgid "TOTAL RECEIPT"
-msgstr ""
-
-#: ../reporting/rep112.php:166
-msgid "Received / Sign"
-msgstr ""
-
-#: ../reporting/rep112.php:168
-msgid "By Cash / Cheque* / Draft No."
-msgstr ""
-
-#: ../reporting/rep112.php:170
-msgid "Dated"
-msgstr ""
-
-#: ../reporting/rep112.php:173
-msgid "Drawn on Bank"
-msgstr ""
-
 #: ../reporting/rep113.php:67
-#: ../reporting/rep113.php:86
-#: ../reporting/includes/doctext.inc:103
+#: ../reporting/rep113.php:89
+#: ../reporting/includes/doctext.inc:102
 msgid "CREDIT NOTE"
 msgstr ""
 
-#: ../reporting/rep113.php:191
+#: ../reporting/rep113.php:194
 #: ../sales/view/view_credit.php:143
 msgid "TOTAL CREDIT"
 msgstr ""
@@ -12349,25 +12094,20 @@ msgid "Tax_Id"
 msgstr ""
 
 #: ../reporting/rep209.php:87
-#: ../reporting/rep209.php:100
-#: ../reporting/includes/doctext.inc:171
+#: ../reporting/rep209.php:103
+#: ../reporting/includes/doctext.inc:170
 msgid "PURCHASE ORDER"
 msgstr ""
 
-#: ../reporting/rep209.php:209
+#: ../reporting/rep209.php:212
 msgid "TOTAL PO"
 msgstr ""
 
 #: ../reporting/rep210.php:84
-#: ../reporting/rep210.php:106
-#: ../reporting/includes/doctext.inc:151
+#: ../reporting/includes/doctext.inc:150
 msgid "REMITTANCE"
 msgstr ""
 
-#: ../reporting/rep210.php:165
-msgid "TOTAL REMITTANCE"
-msgstr ""
-
 #: ../reporting/rep301.php:178
 msgid "Inventory Valuation Report"
 msgstr ""
@@ -12423,8 +12163,8 @@ msgstr ""
 
 #: ../reporting/rep304.php:114
 #: ../reporting/rep309.php:98
-#: ../sales/manage/customer_branches.php:241
-#: ../sales/manage/customers.php:264
+#: ../sales/manage/customer_branches.php:228
+#: ../sales/manage/customers.php:265
 msgid "Sales"
 msgstr ""
 
@@ -12485,6 +12225,11 @@ msgstr ""
 msgid "StockIn"
 msgstr ""
 
+#: ../reporting/rep308.php:230
+#: ../sales/inquiry/sales_orders_view.php:139
+msgid "Delivery"
+msgstr ""
+
 #: ../reporting/rep308.php:230
 msgid "ClosingStock"
 msgstr ""
@@ -12537,7 +12282,7 @@ msgstr ""
 
 #: ../reporting/rep409.php:59
 #: ../reporting/rep409.php:72
-#: ../reporting/includes/doctext.inc:214
+#: ../reporting/includes/doctext.inc:213
 msgid "WORK ORDER"
 msgstr ""
 
@@ -12555,7 +12300,7 @@ msgstr ""
 
 #: ../reporting/rep601.php:86
 #: ../reporting/rep602.php:87
-#: ../reporting/includes/doctext.inc:260
+#: ../reporting/includes/doctext.inc:259
 msgid "Bank Account"
 msgstr ""
 
@@ -13155,46 +12900,57 @@ msgstr ""
 msgid "Ta&x Report"
 msgstr ""
 
-#: ../reporting/includes/doctext.inc:18
-#: ../reporting/includes/doctext.inc:156
+#: ../reporting/includes/doctext.inc:20
+#: ../reporting/includes/doctext.inc:155
 #: ../sales/view/view_dispatch.php:51
 #: ../sales/view/view_invoice.php:53
 msgid "Charge To"
 msgstr ""
 
-#: ../reporting/includes/doctext.inc:23
+#: ../reporting/includes/doctext.inc:25
 #: ../sales/view/view_dispatch.php:74
 msgid "Delivered To"
 msgstr ""
 
-#: ../reporting/includes/doctext.inc:30
+#: ../reporting/includes/doctext.inc:32
 #: ../sales/customer_credit_invoice.php:281
 #: ../sales/view/view_credit.php:91
 #: ../sales/view/view_dispatch.php:113
 #: ../sales/view/view_invoice.php:116
 #: ../sales/includes/ui/sales_credit_ui.inc:168
-#: ../sales/includes/ui/sales_order_ui.inc:148
+#: ../sales/includes/ui/sales_order_ui.inc:149
 msgid "Discount %"
 msgstr ""
 
-#: ../reporting/includes/doctext.inc:33
+#: ../reporting/includes/doctext.inc:35
 msgid "All amounts stated in"
 msgstr ""
 
-#: ../reporting/includes/doctext.inc:51
+#: ../reporting/includes/doctext.inc:50
 msgid "Quotation No."
 msgstr ""
 
+#: ../reporting/includes/doctext.inc:55
+#: ../reporting/includes/doctext.inc:72
+#: ../reporting/includes/doctext.inc:93
+#: ../reporting/includes/doctext.inc:107
+#: ../reporting/includes/doctext.inc:130
+#: ../reporting/includes/doctext.inc:160
+#: ../reporting/includes/doctext.inc:183
+#: ../reporting/includes/doctext.inc:201
+#: ../reporting/includes/doctext.inc:239
+msgid "Customer's Reference"
+msgstr ""
+
 #: ../reporting/includes/doctext.inc:56
 #: ../reporting/includes/doctext.inc:73
 #: ../reporting/includes/doctext.inc:94
 #: ../reporting/includes/doctext.inc:108
 #: ../reporting/includes/doctext.inc:131
-#: ../reporting/includes/doctext.inc:161
 #: ../reporting/includes/doctext.inc:184
-#: ../reporting/includes/doctext.inc:202
 #: ../reporting/includes/doctext.inc:240
-msgid "Customer's Reference"
+#: ../sales/manage/customer_branches.php:282
+msgid "Sales Person"
 msgstr ""
 
 #: ../reporting/includes/doctext.inc:57
@@ -13202,149 +12958,137 @@ msgstr ""
 #: ../reporting/includes/doctext.inc:95
 #: ../reporting/includes/doctext.inc:109
 #: ../reporting/includes/doctext.inc:132
+#: ../reporting/includes/doctext.inc:162
 #: ../reporting/includes/doctext.inc:185
+#: ../reporting/includes/doctext.inc:203
 #: ../reporting/includes/doctext.inc:241
-#: ../sales/manage/customer_branches.php:298
-msgid "Sales Person"
-msgstr ""
-
-#: ../reporting/includes/doctext.inc:58
-#: ../reporting/includes/doctext.inc:75
-#: ../reporting/includes/doctext.inc:96
-#: ../reporting/includes/doctext.inc:110
-#: ../reporting/includes/doctext.inc:133
-#: ../reporting/includes/doctext.inc:163
-#: ../reporting/includes/doctext.inc:186
-#: ../reporting/includes/doctext.inc:204
-#: ../reporting/includes/doctext.inc:242
 msgid "Your VAT no."
 msgstr ""
 
-#: ../reporting/includes/doctext.inc:59
+#: ../reporting/includes/doctext.inc:58
 msgid "Our Quotation No"
 msgstr ""
 
-#: ../reporting/includes/doctext.inc:60
+#: ../reporting/includes/doctext.inc:59
 #: ../sales/view/view_sales_order.php:69
-#: ../sales/inquiry/sales_orders_view.php:305
-#: ../sales/includes/ui/sales_order_ui.inc:597
+#: ../sales/inquiry/sales_orders_view.php:268
 msgid "Valid until"
 msgstr ""
 
-#: ../reporting/includes/doctext.inc:65
+#: ../reporting/includes/doctext.inc:64
 msgid "PREPAYMENT ORDER"
 msgstr ""
 
-#: ../reporting/includes/doctext.inc:66
+#: ../reporting/includes/doctext.inc:65
 msgid "Order No."
 msgstr ""
 
-#: ../reporting/includes/doctext.inc:76
-#: ../reporting/includes/doctext.inc:97
-#: ../reporting/includes/doctext.inc:111
-#: ../reporting/includes/doctext.inc:138
-#: ../reporting/includes/doctext.inc:205
-#: ../reporting/includes/doctext.inc:243
+#: ../reporting/includes/doctext.inc:75
+#: ../reporting/includes/doctext.inc:96
+#: ../reporting/includes/doctext.inc:110
+#: ../reporting/includes/doctext.inc:137
+#: ../reporting/includes/doctext.inc:204
+#: ../reporting/includes/doctext.inc:242
 #: ../sales/view/view_dispatch.php:87
 #: ../sales/view/view_invoice.php:87
 msgid "Our Order No"
 msgstr ""
 
-#: ../reporting/includes/doctext.inc:83
+#: ../reporting/includes/doctext.inc:82
 msgid "Delivery Note No."
 msgstr ""
 
-#: ../reporting/includes/doctext.inc:98
+#: ../reporting/includes/doctext.inc:97
 msgid "To Be Invoiced Before"
 msgstr ""
 
-#: ../reporting/includes/doctext.inc:104
+#: ../reporting/includes/doctext.inc:103
 msgid "Credit No."
 msgstr ""
 
-#: ../reporting/includes/doctext.inc:105
+#: ../reporting/includes/doctext.inc:104
 msgid "Please quote Credit no. when paying. All amounts stated in"
 msgstr ""
 
-#: ../reporting/includes/doctext.inc:117
+#: ../reporting/includes/doctext.inc:116
 msgid "PREPAYMENT INVOICE"
 msgstr ""
 
-#: ../reporting/includes/doctext.inc:118
+#: ../reporting/includes/doctext.inc:117
 msgid "FINAL INVOICE"
 msgstr ""
 
-#: ../reporting/includes/doctext.inc:119
+#: ../reporting/includes/doctext.inc:118
 msgid "Invoice No."
 msgstr ""
 
-#: ../reporting/includes/doctext.inc:121
+#: ../reporting/includes/doctext.inc:120
 msgid "Please quote Invoice no. when paying. All amounts stated in"
 msgstr ""
 
-#: ../reporting/includes/doctext.inc:137
+#: ../reporting/includes/doctext.inc:136
 msgid "Date of Payment"
 msgstr ""
 
-#: ../reporting/includes/doctext.inc:143
+#: ../reporting/includes/doctext.inc:142
 msgid "Date of Sale"
 msgstr ""
 
-#: ../reporting/includes/doctext.inc:152
+#: ../reporting/includes/doctext.inc:151
 msgid "Remittance No."
 msgstr ""
 
-#: ../reporting/includes/doctext.inc:153
-#: ../reporting/includes/doctext.inc:173
+#: ../reporting/includes/doctext.inc:152
+#: ../reporting/includes/doctext.inc:172
 msgid "Order To"
 msgstr ""
 
-#: ../reporting/includes/doctext.inc:172
+#: ../reporting/includes/doctext.inc:171
 msgid "Purchase Order No."
 msgstr ""
 
-#: ../reporting/includes/doctext.inc:176
+#: ../reporting/includes/doctext.inc:175
 msgid "Deliver To"
 msgstr ""
 
-#: ../reporting/includes/doctext.inc:199
+#: ../reporting/includes/doctext.inc:198
 msgid "Receipt No."
 msgstr ""
 
-#: ../reporting/includes/doctext.inc:200
+#: ../reporting/includes/doctext.inc:199
 msgid "With thanks from"
 msgstr ""
 
-#: ../reporting/includes/doctext.inc:215
+#: ../reporting/includes/doctext.inc:214
 msgid "Work Order No."
 msgstr ""
 
-#: ../reporting/includes/doctext.inc:246
+#: ../reporting/includes/doctext.inc:245
 msgid "DueDate"
 msgstr ""
 
-#: ../reporting/includes/doctext.inc:272
-#: ../reporting/includes/pdf_report.inc:1019
+#: ../reporting/includes/doctext.inc:271
+#: ../reporting/includes/pdf_report.inc:1021
 msgid "You can pay through"
 msgstr ""
 
-#: ../reporting/includes/doctext.inc:276
+#: ../reporting/includes/doctext.inc:275
 msgid "* Subject to Realisation of the Cheque."
 msgstr ""
 
-#: ../reporting/includes/excel_report.inc:67
-#: ../reporting/includes/pdf_report.inc:80
+#: ../reporting/includes/excel_report.inc:68
+#: ../reporting/includes/pdf_report.inc:81
 msgid ""
 "The security settings on your account do not permit you to print this report"
 msgstr ""
 
 #: ../reporting/includes/excel_report.inc:262
-#: ../reporting/includes/pdf_report.inc:316
+#: ../reporting/includes/pdf_report.inc:317
 msgid "Print Out Date"
 msgstr ""
 
 #: ../reporting/includes/excel_report.inc:268
-#: ../reporting/includes/pdf_report.inc:325
+#: ../reporting/includes/pdf_report.inc:326
 msgid "Fiscal Year"
 msgstr ""
 
@@ -13353,12 +13097,12 @@ msgid "Report Date"
 msgstr ""
 
 #: ../reporting/includes/excel_report.inc:413
-#: ../reporting/includes/pdf_report.inc:600
+#: ../reporting/includes/pdf_report.inc:602
 msgid "Generated At"
 msgstr ""
 
 #: ../reporting/includes/excel_report.inc:419
-#: ../reporting/includes/pdf_report.inc:609
+#: ../reporting/includes/pdf_report.inc:611
 msgid "Generated By"
 msgstr ""
 
@@ -13370,49 +13114,49 @@ msgstr ""
 msgid "Domicile"
 msgstr ""
 
-#: ../reporting/includes/header2.inc:146
-#: ../reporting/includes/pdf_report.inc:352
-#: ../reporting/includes/pdf_report.inc:501
-#: ../reporting/includes/pdf_report.inc:628
+#: ../reporting/includes/header2.inc:147
+#: ../reporting/includes/pdf_report.inc:353
+#: ../reporting/includes/pdf_report.inc:503
+#: ../reporting/includes/pdf_report.inc:630
 msgid "Page"
 msgstr ""
 
-#: ../reporting/includes/pdf_report.inc:583
+#: ../reporting/includes/pdf_report.inc:585
 msgid "Report Period"
 msgstr ""
 
-#: ../reporting/includes/pdf_report.inc:986
-#: ../reporting/includes/pdf_report.inc:1034
+#: ../reporting/includes/pdf_report.inc:988
+#: ../reporting/includes/pdf_report.inc:1036
 #, php-format
 msgid "You have no email contact defined for this type of document for '%s'."
 msgstr ""
 
-#: ../reporting/includes/pdf_report.inc:1005
+#: ../reporting/includes/pdf_report.inc:1007
 msgid "Dear"
 msgstr ""
 
-#: ../reporting/includes/pdf_report.inc:1006
+#: ../reporting/includes/pdf_report.inc:1008
 msgid "Attached you will find "
 msgstr ""
 
-#: ../reporting/includes/pdf_report.inc:1022
+#: ../reporting/includes/pdf_report.inc:1024
 msgid "Kindest regards"
 msgstr ""
 
-#: ../reporting/includes/pdf_report.inc:1037
+#: ../reporting/includes/pdf_report.inc:1039
 msgid "Sending document by email failed"
 msgstr ""
 
-#: ../reporting/includes/pdf_report.inc:1037
-#: ../reporting/includes/pdf_report.inc:1040
+#: ../reporting/includes/pdf_report.inc:1039
+#: ../reporting/includes/pdf_report.inc:1042
 msgid "Email:"
 msgstr ""
 
-#: ../reporting/includes/pdf_report.inc:1040
+#: ../reporting/includes/pdf_report.inc:1042
 msgid "has been sent by email to destination."
 msgstr ""
 
-#: ../reporting/includes/pdf_report.inc:1070
+#: ../reporting/includes/pdf_report.inc:1072
 msgid "Report has been sent to network printer "
 msgstr ""
 
@@ -13464,18 +13208,6 @@ msgstr ""
 msgid "No Currency Filter"
 msgstr ""
 
-#: ../reporting/includes/reports_classes.inc:234
-msgid "PDF/Printer"
-msgstr ""
-
-#: ../reporting/includes/reports_classes.inc:241
-msgid "Portrait"
-msgstr ""
-
-#: ../reporting/includes/reports_classes.inc:241
-msgid "Landscape"
-msgstr ""
-
 #: ../reporting/includes/reports_classes.inc:252
 msgid "No Graphics"
 msgstr ""
@@ -13572,23 +13304,23 @@ msgid "Invoice date:"
 msgstr ""
 
 #: ../sales/create_recurrent_invoices.php:134
-#: ../sales/manage/recurrent_invoices.php:102
+#: ../sales/manage/recurrent_invoices.php:108
 msgid "Template No"
 msgstr ""
 
 #: ../sales/create_recurrent_invoices.php:134
-#: ../sales/manage/recurrent_invoices.php:102
+#: ../sales/manage/recurrent_invoices.php:108
 msgid "Begin"
 msgstr ""
 
 #: ../sales/create_recurrent_invoices.php:134
-#: ../sales/manage/recurrent_invoices.php:102
+#: ../sales/manage/recurrent_invoices.php:108
 msgid "End"
 msgstr ""
 
 #: ../sales/create_recurrent_invoices.php:134
-#: ../sales/manage/recurrent_invoices.php:102
-#: ../sales/manage/recurrent_invoices.php:185
+#: ../sales/manage/recurrent_invoices.php:108
+#: ../sales/manage/recurrent_invoices.php:191
 msgid "Last Created"
 msgstr ""
 
@@ -13610,7 +13342,7 @@ msgid "Modifying Customer Credit Note #%d"
 msgstr ""
 
 #: ../sales/credit_note_entry.php:51
-#: ../sales/sales_order_entry.php:705
+#: ../sales/sales_order_entry.php:694
 msgid ""
 "There are no customers, or there are no customers with branches. Please "
 "define customers and customer branches."
@@ -13676,7 +13408,7 @@ msgid "Credit Note Items"
 msgstr ""
 
 #: ../sales/credit_note_entry.php:285
-#: ../sales/customer_credit_invoice.php:382
+#: ../sales/customer_credit_invoice.php:383
 msgid "Process Credit Note"
 msgstr ""
 
@@ -13748,6 +13480,11 @@ msgstr ""
 msgid "Credit Shipping Cost"
 msgstr ""
 
+#: ../sales/customer_credit_invoice.php:330
+#: ../sales/includes/ui/sales_credit_ui.inc:233
+msgid "Credit Note Total"
+msgstr ""
+
 #: ../sales/customer_credit_invoice.php:348
 #: ../sales/includes/ui/sales_credit_ui.inc:323
 msgid "Credit Note Type"
@@ -13763,7 +13500,7 @@ msgstr ""
 msgid "Write off the cost of the items to"
 msgstr ""
 
-#: ../sales/customer_credit_invoice.php:380
+#: ../sales/customer_credit_invoice.php:381
 msgid "Update credit value for quantities entered"
 msgstr ""
 
@@ -13842,7 +13579,7 @@ msgid "Select A Different Delivery"
 msgstr ""
 
 #: ../sales/customer_delivery.php:94
-#: ../sales/customer_invoice.php:161
+#: ../sales/customer_invoice.php:156
 msgid ""
 "You have to set Deferred Income Account in GL Setup to entry prepayment "
 "invoices."
@@ -13900,7 +13637,7 @@ msgid "The entered dead-line for invoice is invalid."
 msgstr ""
 
 #: ../sales/customer_delivery.php:188
-#: ../sales/customer_invoice.php:354
+#: ../sales/customer_invoice.php:349
 msgid "The entered shipping value is not numeric."
 msgstr ""
 
@@ -13914,83 +13651,73 @@ msgid ""
 "for: "
 msgstr ""
 
-#: ../sales/customer_delivery.php:305
-msgid ""
-"The delivery cannot be processed because there is an insufficient quantity "
-"for item:"
-msgstr ""
-
-#: ../sales/customer_delivery.php:377
+#: ../sales/customer_delivery.php:342
 msgid "For Sales Order"
 msgstr ""
 
-#: ../sales/customer_delivery.php:386
+#: ../sales/customer_delivery.php:351
 msgid "Delivery From"
 msgstr ""
 
-#: ../sales/customer_delivery.php:435
+#: ../sales/customer_delivery.php:400
 msgid "Invoice Dead-line"
 msgstr ""
 
-#: ../sales/customer_delivery.php:445
-#: ../sales/customer_invoice.php:539
+#: ../sales/customer_delivery.php:410
+#: ../sales/customer_invoice.php:534
 #: ../sales/includes/ui/sales_order_ui.inc:84
-#: ../sales/includes/ui/sales_order_ui.inc:360
+#: ../sales/includes/ui/sales_order_ui.inc:361
 msgid ""
 "The selected customer account is currently on hold. Please contact the "
 "credit control personnel to discuss."
 msgstr ""
 
-#: ../sales/customer_delivery.php:450
+#: ../sales/customer_delivery.php:415
 msgid "Delivery Items"
 msgstr ""
 
-#: ../sales/customer_delivery.php:456
+#: ../sales/customer_delivery.php:421
 msgid "Max. delivery"
 msgstr ""
 
-#: ../sales/customer_delivery.php:456
-#: ../sales/customer_invoice.php:553
+#: ../sales/customer_delivery.php:421
 msgid "Invoiced"
 msgstr ""
 
-#: ../sales/customer_delivery.php:533
-#: ../sales/customer_invoice.php:642
+#: ../sales/customer_delivery.php:498
 msgid "Shipping Cost"
 msgstr ""
 
-#: ../sales/customer_delivery.php:553
-#: ../sales/includes/ui/sales_order_ui.inc:237
+#: ../sales/customer_delivery.php:518
+#: ../sales/includes/ui/sales_order_ui.inc:238
 msgid ""
 "Marked items have insufficient quantities in stock as on day of delivery."
 msgstr ""
 
-#: ../sales/customer_delivery.php:557
+#: ../sales/customer_delivery.php:522
 msgid "Action For Balance"
 msgstr ""
 
-#: ../sales/customer_delivery.php:564
-#: ../sales/customer_delivery.php:566
-#: ../sales/customer_delivery.php:569
-#: ../sales/customer_invoice.php:694
+#: ../sales/customer_delivery.php:529
+#: ../sales/customer_delivery.php:531
+#: ../sales/customer_delivery.php:534
 msgid "Refresh document page"
 msgstr ""
 
-#: ../sales/customer_delivery.php:566
+#: ../sales/customer_delivery.php:531
 msgid "Reset quantity"
 msgstr ""
 
-#: ../sales/customer_delivery.php:569
+#: ../sales/customer_delivery.php:534
 msgid "Clear quantity"
 msgstr ""
 
-#: ../sales/customer_delivery.php:571
+#: ../sales/customer_delivery.php:536
 msgid "Process Dispatch"
 msgstr ""
 
-#: ../sales/customer_delivery.php:572
-#: ../sales/customer_invoice.php:696
-#: ../sales/sales_order_entry.php:752
+#: ../sales/customer_delivery.php:537
+#: ../sales/sales_order_entry.php:741
 msgid "Check entered data and save document"
 msgstr ""
 
@@ -14016,23 +13743,23 @@ msgid "Selected deliveries has been processed"
 msgstr ""
 
 #: ../sales/customer_invoice.php:60
-#: ../sales/customer_invoice.php:89
+#: ../sales/customer_invoice.php:84
 #: ../sales/sales_order_entry.php:218
 msgid "&View This Invoice"
 msgstr ""
 
 #: ../sales/customer_invoice.php:62
-#: ../sales/customer_invoice.php:91
+#: ../sales/customer_invoice.php:86
 msgid "&Print This Invoice"
 msgstr ""
 
 #: ../sales/customer_invoice.php:63
-#: ../sales/customer_invoice.php:92
+#: ../sales/customer_invoice.php:87
 msgid "&Email This Invoice"
 msgstr ""
 
 #: ../sales/customer_invoice.php:65
-#: ../sales/sales_order_entry.php:231
+#: ../sales/sales_order_entry.php:228
 msgid "View the GL &Journal Entries for this Invoice"
 msgstr ""
 
@@ -14040,117 +13767,89 @@ msgstr ""
 msgid "Select Another &Delivery For Invoicing"
 msgstr ""
 
-#: ../sales/customer_invoice.php:75
-#: ../sales/sales_order_entry.php:241
+#: ../sales/customer_invoice.php:70
+#: ../sales/sales_order_entry.php:238
 msgid "Entry &customer payment for this invoice"
 msgstr ""
 
-#: ../sales/customer_invoice.php:87
+#: ../sales/customer_invoice.php:82
 #, php-format
 msgid "Sales Invoice # %d has been updated."
 msgstr ""
 
-#: ../sales/customer_invoice.php:94
+#: ../sales/customer_invoice.php:89
 msgid "Select Another &Invoice to Modify"
 msgstr ""
 
-#: ../sales/customer_invoice.php:133
+#: ../sales/customer_invoice.php:128
 msgid "Select a different delivery to invoice"
 msgstr ""
 
-#: ../sales/customer_invoice.php:134
+#: ../sales/customer_invoice.php:129
 msgid ""
 "There are no delivered items with a quantity left to invoice. There is "
 "nothing left to invoice."
 msgstr ""
 
-#: ../sales/customer_invoice.php:155
+#: ../sales/customer_invoice.php:150
 msgid ""
 "All quantities on this invoice has been credited. There is nothing to modify "
 "on this invoice"
 msgstr ""
 
-#: ../sales/customer_invoice.php:169
+#: ../sales/customer_invoice.php:164
 msgid ""
 "Please select correct Sales Order Prepayment to be invoiced and try again."
 msgstr ""
 
-#: ../sales/customer_invoice.php:200
+#: ../sales/customer_invoice.php:195
 msgid ""
 "This page can only be opened after delivery selection. Please select "
 "delivery to invoicing first."
 msgstr ""
 
-#: ../sales/customer_invoice.php:202
+#: ../sales/customer_invoice.php:197
 msgid "Select Delivery to Invoice"
 msgstr ""
 
-#: ../sales/customer_invoice.php:207
-#: ../sales/customer_invoice.php:365
+#: ../sales/customer_invoice.php:202
+#: ../sales/customer_invoice.php:360
 msgid ""
 "Selected quantity cannot be less than quantity credited nor more than "
 "quantity not invoiced yet."
 msgstr ""
 
-#: ../sales/customer_invoice.php:321
+#: ../sales/customer_invoice.php:316
 msgid "The entered invoice date is invalid."
 msgstr ""
 
-#: ../sales/customer_invoice.php:334
+#: ../sales/customer_invoice.php:329
 msgid "The entered invoice due date is invalid."
 msgstr ""
 
-#: ../sales/customer_invoice.php:360
+#: ../sales/customer_invoice.php:355
 msgid "There are no item quantities on this invoice."
 msgstr ""
 
-#: ../sales/customer_invoice.php:370
+#: ../sales/customer_invoice.php:365
 msgid ""
 "There is no non-invoiced payments for this order. If you want to issue final "
 "invoice, select delayed or cash payment terms."
 msgstr ""
 
-#: ../sales/customer_invoice.php:460
+#: ../sales/customer_invoice.php:455
 msgid "Payment terms:"
 msgstr ""
 
-#: ../sales/customer_invoice.php:545
-#: ../sales/sales_order_entry.php:728
+#: ../sales/customer_invoice.php:540
+#: ../sales/sales_order_entry.php:717
 msgid "Sales Order Items"
 msgstr ""
 
-#: ../sales/customer_invoice.php:545
+#: ../sales/customer_invoice.php:540
 msgid "Invoice Items"
 msgstr ""
 
-#: ../sales/customer_invoice.php:554
-msgid "This Invoice"
-msgstr ""
-
-#: ../sales/customer_invoice.php:561
-msgid "Credited"
-msgstr ""
-
-#: ../sales/customer_invoice.php:663
-msgid "Invoice Total"
-msgstr ""
-
-#: ../sales/customer_invoice.php:672
-msgid "Sales order:"
-msgstr ""
-
-#: ../sales/customer_invoice.php:684
-msgid "Payments received:"
-msgstr ""
-
-#: ../sales/customer_invoice.php:685
-msgid "Invoiced here:"
-msgstr ""
-
-#: ../sales/customer_invoice.php:686
-msgid "Left to be invoiced:"
-msgstr ""
-
 #: ../sales/customer_payments.php:32
 msgid "Customer Payment Entry"
 msgstr ""
@@ -14159,104 +13858,104 @@ msgstr ""
 msgid "There are no customers defined in the system."
 msgstr ""
 
-#: ../sales/customer_payments.php:70
+#: ../sales/customer_payments.php:71
 msgid "Invalid sales invoice number."
 msgstr ""
 
-#: ../sales/customer_payments.php:97
+#: ../sales/customer_payments.php:98
 msgid "The customer payment has been successfully entered."
 msgstr ""
 
-#: ../sales/customer_payments.php:99
-#: ../sales/customer_payments.php:118
+#: ../sales/customer_payments.php:100
+#: ../sales/customer_payments.php:119
 msgid "&Print This Receipt"
 msgstr ""
 
-#: ../sales/customer_payments.php:101
+#: ../sales/customer_payments.php:102
 msgid "&View this Customer Payment"
 msgstr ""
 
-#: ../sales/customer_payments.php:103
-#: ../sales/customer_payments.php:126
+#: ../sales/customer_payments.php:104
+#: ../sales/customer_payments.php:127
 msgid "Enter Another &Customer Payment"
 msgstr ""
 
-#: ../sales/customer_payments.php:105
+#: ../sales/customer_payments.php:106
 msgid "Enter Payment to &Supplier"
 msgstr ""
 
-#: ../sales/customer_payments.php:109
-#: ../sales/customer_payments.php:120
+#: ../sales/customer_payments.php:110
+#: ../sales/customer_payments.php:121
 msgid "&View the GL Journal Entries for this Customer Payment"
 msgstr ""
 
-#: ../sales/customer_payments.php:116
+#: ../sales/customer_payments.php:117
 msgid "The customer payment has been successfully updated."
 msgstr ""
 
-#: ../sales/customer_payments.php:124
+#: ../sales/customer_payments.php:125
 msgid "Select Another Customer Payment for &Edition"
 msgstr ""
 
-#: ../sales/customer_payments.php:139
-#: ../sales/sales_order_entry.php:353
+#: ../sales/customer_payments.php:140
+#: ../sales/sales_order_entry.php:350
 msgid "There is no customer selected."
 msgstr ""
 
-#: ../sales/customer_payments.php:146
-#: ../sales/sales_order_entry.php:360
+#: ../sales/customer_payments.php:147
+#: ../sales/sales_order_entry.php:357
 msgid "This customer has no branch defined."
 msgstr ""
 
-#: ../sales/customer_payments.php:152
+#: ../sales/customer_payments.php:153
 msgid "The entered date is invalid. Please enter a valid date for the payment."
 msgstr ""
 
-#: ../sales/customer_payments.php:182
-#: ../sales/customer_payments.php:188
+#: ../sales/customer_payments.php:183
+#: ../sales/customer_payments.php:189
 msgid "The entered amount is invalid or negative and cannot be processed."
 msgstr ""
 
-#: ../sales/customer_payments.php:214
+#: ../sales/customer_payments.php:215
 msgid "The entered discount is not a valid number."
 msgstr ""
 
-#: ../sales/customer_payments.php:221
+#: ../sales/customer_payments.php:222
 msgid ""
 "The balance of the amount and discount is zero or negative. Please enter "
 "valid amounts."
 msgstr ""
 
-#: ../sales/customer_payments.php:228
+#: ../sales/customer_payments.php:229
 msgid "The entered payment amount is zero or negative."
 msgstr ""
 
-#: ../sales/customer_payments.php:332
+#: ../sales/customer_payments.php:333
 msgid "Into Bank Account:"
 msgstr ""
 
-#: ../sales/customer_payments.php:335
-#: ../sales/customer_payments.php:337
+#: ../sales/customer_payments.php:336
+#: ../sales/customer_payments.php:338
 msgid "From Customer:"
 msgstr ""
 
-#: ../sales/customer_payments.php:369
+#: ../sales/customer_payments.php:370
 msgid "Date of Deposit:"
 msgstr ""
 
-#: ../sales/customer_payments.php:383
+#: ../sales/customer_payments.php:384
 msgid "Payment Amount:"
 msgstr ""
 
-#: ../sales/customer_payments.php:396
+#: ../sales/customer_payments.php:397
 msgid "Customer prompt payment discount :"
 msgstr ""
 
-#: ../sales/customer_payments.php:406
+#: ../sales/customer_payments.php:407
 msgid "Add Payment"
 msgstr ""
 
-#: ../sales/customer_payments.php:408
+#: ../sales/customer_payments.php:409
 msgid "Update Payment"
 msgstr ""
 
@@ -14384,212 +14083,211 @@ msgstr ""
 msgid "&Email Sales Invoice"
 msgstr ""
 
-#: ../sales/sales_order_entry.php:229
+#: ../sales/sales_order_entry.php:226
 msgid "Print &Receipt"
 msgstr ""
 
-#: ../sales/sales_order_entry.php:234
+#: ../sales/sales_order_entry.php:231
 msgid "Enter a &New Template Invoice"
 msgstr ""
 
-#: ../sales/sales_order_entry.php:237
+#: ../sales/sales_order_entry.php:234
 msgid "Enter a &New Direct Invoice"
 msgstr ""
 
-#: ../sales/sales_order_entry.php:383
-msgid "Pre-payment required have to be positive and less than total amount."
+#: ../sales/sales_order_entry.php:379
+msgid ""
+"This document cannot be processed because there is insufficient quantity for "
+"items marked."
 msgstr ""
 
-#: ../sales/sales_order_entry.php:388
-#: ../sales/sales_order_entry.php:402
-msgid ""
-"You must enter the person or company to whom delivery should be made to."
+#: ../sales/sales_order_entry.php:385
+msgid "Pre-payment required have to be positive and less than total amount."
 msgstr ""
 
-#: ../sales/sales_order_entry.php:395
+#: ../sales/sales_order_entry.php:390
 msgid ""
-"This document cannot be processed because there is insufficient quantity for "
-"items marked."
+"You must enter the person or company to whom delivery should be made to."
 msgstr ""
 
-#: ../sales/sales_order_entry.php:407
+#: ../sales/sales_order_entry.php:396
 msgid ""
 "You should enter the street address in the box provided. Orders cannot be "
 "accepted without a valid street address."
 msgstr ""
 
-#: ../sales/sales_order_entry.php:416
+#: ../sales/sales_order_entry.php:405
 msgid "The shipping cost entered is expected to be numeric."
 msgstr ""
 
-#: ../sales/sales_order_entry.php:422
+#: ../sales/sales_order_entry.php:411
 msgid "The Valid date is invalid."
 msgstr ""
 
-#: ../sales/sales_order_entry.php:424
+#: ../sales/sales_order_entry.php:413
 msgid "The delivery date is invalid."
 msgstr ""
 
-#: ../sales/sales_order_entry.php:430
+#: ../sales/sales_order_entry.php:419
 msgid "The requested valid date is before the date of the quotation."
 msgstr ""
 
-#: ../sales/sales_order_entry.php:432
+#: ../sales/sales_order_entry.php:421
 msgid "The requested delivery date is before the date of the order."
 msgstr ""
 
-#: ../sales/sales_order_entry.php:441
+#: ../sales/sales_order_entry.php:430
 msgid "You need to define a cash account for your Sales Point."
 msgstr ""
 
-#: ../sales/sales_order_entry.php:479
+#: ../sales/sales_order_entry.php:468
 msgid ""
 "The reference number field has been increased. Please save the document "
 "again."
 msgstr ""
 
-#: ../sales/sales_order_entry.php:525
+#: ../sales/sales_order_entry.php:514
 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:529
+#: ../sales/sales_order_entry.php:518
 msgid "Price for inventory item must be entered and can not be less than 0"
 msgstr ""
 
-#: ../sales/sales_order_entry.php:536
+#: ../sales/sales_order_entry.php:525
 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:554
+#: ../sales/sales_order_entry.php:543
 #, php-format
 msgid "Price %s is below Standard Cost %s"
 msgstr ""
 
-#: ../sales/sales_order_entry.php:579
+#: ../sales/sales_order_entry.php:568
 msgid ""
 "This item cannot be deleted because some of it has already been delivered."
 msgstr ""
 
-#: ../sales/sales_order_entry.php:608
+#: ../sales/sales_order_entry.php:597
 msgid "Direct delivery entry has been cancelled as requested."
 msgstr ""
 
-#: ../sales/sales_order_entry.php:609
+#: ../sales/sales_order_entry.php:598
 msgid "Enter a New Sales Delivery"
 msgstr ""
 
-#: ../sales/sales_order_entry.php:611
+#: ../sales/sales_order_entry.php:600
 msgid "Direct invoice entry has been cancelled as requested."
 msgstr ""
 
-#: ../sales/sales_order_entry.php:612
+#: ../sales/sales_order_entry.php:601
 msgid "Enter a New Sales Invoice"
 msgstr ""
 
-#: ../sales/sales_order_entry.php:617
+#: ../sales/sales_order_entry.php:606
 msgid "This sales quotation has been cancelled as requested."
 msgstr ""
 
-#: ../sales/sales_order_entry.php:618
+#: ../sales/sales_order_entry.php:607
 msgid "Enter a New Sales Quotation"
 msgstr ""
 
-#: ../sales/sales_order_entry.php:625
+#: ../sales/sales_order_entry.php:614
 msgid "Undelivered part of order has been cancelled as requested."
 msgstr ""
 
-#: ../sales/sales_order_entry.php:626
+#: ../sales/sales_order_entry.php:615
 msgid "Select Another Sales Order for Edition"
 msgstr ""
 
-#: ../sales/sales_order_entry.php:630
+#: ../sales/sales_order_entry.php:619
 msgid "This sales order has been cancelled as requested."
 msgstr ""
 
-#: ../sales/sales_order_entry.php:631
+#: ../sales/sales_order_entry.php:620
 msgid "Enter a New Sales Order"
 msgstr ""
 
-#: ../sales/sales_order_entry.php:709
+#: ../sales/sales_order_entry.php:698
 msgid "Sales Invoice Items"
 msgstr ""
 
-#: ../sales/sales_order_entry.php:710
+#: ../sales/sales_order_entry.php:699
 msgid "Enter Delivery Details and Confirm Invoice"
 msgstr ""
 
-#: ../sales/sales_order_entry.php:712
+#: ../sales/sales_order_entry.php:701
 msgid "Place Invoice"
 msgstr ""
 
-#: ../sales/sales_order_entry.php:715
+#: ../sales/sales_order_entry.php:704
 msgid "Delivery Note Items"
 msgstr ""
 
-#: ../sales/sales_order_entry.php:716
+#: ../sales/sales_order_entry.php:705
 msgid "Enter Delivery Details and Confirm Dispatch"
 msgstr ""
 
-#: ../sales/sales_order_entry.php:717
+#: ../sales/sales_order_entry.php:706
 msgid "Cancel Delivery"
 msgstr ""
 
-#: ../sales/sales_order_entry.php:718
+#: ../sales/sales_order_entry.php:707
 msgid "Place Delivery"
 msgstr ""
 
-#: ../sales/sales_order_entry.php:720
+#: ../sales/sales_order_entry.php:709
 msgid "Quotation Date:"
 msgstr ""
 
-#: ../sales/sales_order_entry.php:721
+#: ../sales/sales_order_entry.php:710
 msgid "Sales Quotation Items"
 msgstr ""
 
-#: ../sales/sales_order_entry.php:722
+#: ../sales/sales_order_entry.php:711
 msgid "Enter Delivery Details and Confirm Quotation"
 msgstr ""
 
-#: ../sales/sales_order_entry.php:723
+#: ../sales/sales_order_entry.php:712
 msgid "Cancel Quotation"
 msgstr ""
 
-#: ../sales/sales_order_entry.php:724
+#: ../sales/sales_order_entry.php:713
 msgid "Place Quotation"
 msgstr ""
 
-#: ../sales/sales_order_entry.php:725
+#: ../sales/sales_order_entry.php:714
 msgid "Commit Quotations Changes"
 msgstr ""
 
-#: ../sales/sales_order_entry.php:729
+#: ../sales/sales_order_entry.php:718
 msgid "Enter Delivery Details and Confirm Order"
 msgstr ""
 
-#: ../sales/sales_order_entry.php:732
+#: ../sales/sales_order_entry.php:721
 msgid "Commit Order Changes"
 msgstr ""
 
-#: ../sales/sales_order_entry.php:754
-#: ../sales/sales_order_entry.php:760
+#: ../sales/sales_order_entry.php:743
+#: ../sales/sales_order_entry.php:749
 msgid ""
 "Cancels document entry or removes sales order when editing an old document"
 msgstr ""
 
-#: ../sales/sales_order_entry.php:755
-#: ../sales/sales_order_entry.php:764
+#: ../sales/sales_order_entry.php:744
+#: ../sales/sales_order_entry.php:753
 msgid "You are about to void this Document.\\nDo you want to continue?"
 msgstr ""
 
-#: ../sales/sales_order_entry.php:758
+#: ../sales/sales_order_entry.php:747
 msgid "Validate changes and update document"
 msgstr ""
 
-#: ../sales/sales_order_entry.php:762
+#: ../sales/sales_order_entry.php:751
 msgid ""
 "You are about to cancel undelivered part of this order.\\nDo you want to "
 "continue?"
@@ -14609,12 +14307,12 @@ msgid "Customer Allocations"
 msgstr ""
 
 #: ../sales/allocations/customer_allocation_main.php:32
-#: ../sales/manage/customer_branches.php:282
-#: ../sales/manage/customers.php:328
+#: ../sales/manage/customer_branches.php:266
+#: ../sales/manage/customers.php:329
 #: ../sales/inquiry/customer_allocation_inquiry.php:42
 #: ../sales/inquiry/customer_inquiry.php:44
-#: ../sales/inquiry/sales_deliveries_view.php:116
-#: ../sales/inquiry/sales_orders_view.php:266
+#: ../sales/inquiry/sales_deliveries_view.php:114
+#: ../sales/inquiry/sales_orders_view.php:228
 msgid "Select a customer: "
 msgstr ""
 
@@ -14696,110 +14394,106 @@ msgstr ""
 msgid "The Branch short name cannot be empty."
 msgstr ""
 
-#: ../sales/manage/customer_branches.php:88
+#: ../sales/manage/customer_branches.php:86
 msgid "Selected customer branch has been updated"
 msgstr ""
 
-#: ../sales/manage/customer_branches.php:106
+#: ../sales/manage/customer_branches.php:104
 msgid "New customer branch has been added"
 msgstr ""
 
-#: ../sales/manage/customer_branches.php:125
+#: ../sales/manage/customer_branches.php:120
 msgid ""
 "Cannot delete this branch because customer transactions have been created to "
 "this branch."
 msgstr ""
 
-#: ../sales/manage/customer_branches.php:132
+#: ../sales/manage/customer_branches.php:127
 msgid ""
 "Cannot delete this branch because sales orders exist for it. Purge old sales "
 "orders first."
 msgstr ""
 
-#: ../sales/manage/customer_branches.php:137
+#: ../sales/manage/customer_branches.php:132
 msgid "Selected customer branch has been deleted"
 msgstr ""
 
-#: ../sales/manage/customer_branches.php:218
+#: ../sales/manage/customer_branches.php:205
 msgid "Main Branch"
 msgstr ""
 
-#: ../sales/manage/customer_branches.php:237
+#: ../sales/manage/customer_branches.php:224
 msgid "Name and Contact"
 msgstr ""
 
-#: ../sales/manage/customer_branches.php:238
+#: ../sales/manage/customer_branches.php:225
 msgid "Branch Name:"
 msgstr ""
 
-#: ../sales/manage/customer_branches.php:239
+#: ../sales/manage/customer_branches.php:226
 msgid "Branch Short Name:"
 msgstr ""
 
-#: ../sales/manage/customer_branches.php:242
-#: ../sales/manage/customers.php:260
+#: ../sales/manage/customer_branches.php:229
+#: ../sales/manage/customers.php:261
 msgid "Sales Person:"
 msgstr ""
 
-#: ../sales/manage/customer_branches.php:243
-#: ../sales/manage/customers.php:297
+#: ../sales/manage/customer_branches.php:230
+#: ../sales/manage/customers.php:298
 msgid "Sales Area:"
 msgstr ""
 
-#: ../sales/manage/customer_branches.php:244
-#: ../sales/manage/recurrent_invoices.php:174
+#: ../sales/manage/customer_branches.php:231
+#: ../sales/manage/recurrent_invoices.php:180
 msgid "Sales Group:"
 msgstr ""
 
-#: ../sales/manage/customer_branches.php:245
-#: ../sales/manage/customers.php:295
+#: ../sales/manage/customer_branches.php:232
+#: ../sales/manage/customers.php:296
 msgid "Default Inventory Location:"
 msgstr ""
 
-#: ../sales/manage/customer_branches.php:246
-#: ../sales/manage/customers.php:296
+#: ../sales/manage/customer_branches.php:233
+#: ../sales/manage/customers.php:297
 msgid "Default Shipping Company:"
 msgstr ""
 
-#: ../sales/manage/customer_branches.php:253
+#: ../sales/manage/customer_branches.php:240
 msgid "Accounts Receivable Account:"
 msgstr ""
 
-#: ../sales/manage/customer_branches.php:260
+#: ../sales/manage/customer_branches.php:247
 msgid "General contact data"
 msgstr ""
 
-#: ../sales/manage/customer_branches.php:270
+#: ../sales/manage/customer_branches.php:257
 msgid "Billing Address:"
 msgstr ""
 
-#: ../sales/manage/customer_branches.php:274
-msgid "Disable this Branch:"
-msgstr ""
-
-#: ../sales/manage/customer_branches.php:297
-#: ../sales/inquiry/sales_deliveries_view.php:185
+#: ../sales/manage/customer_branches.php:281
+#: ../sales/inquiry/sales_deliveries_view.php:172
 msgid "Contact"
 msgstr ""
 
-#: ../sales/manage/customer_branches.php:299
+#: ../sales/manage/customer_branches.php:283
 msgid "Area"
 msgstr ""
 
-#: ../sales/manage/customer_branches.php:300
+#: ../sales/manage/customer_branches.php:284
 msgid "Phone No"
 msgstr ""
 
-#: ../sales/manage/customer_branches.php:301
+#: ../sales/manage/customer_branches.php:285
 msgid "Fax No"
 msgstr ""
 
-#: ../sales/manage/customer_branches.php:303
+#: ../sales/manage/customer_branches.php:287
 msgid "Tax Group"
 msgstr ""
 
-#: ../sales/manage/customer_branches.php:321
-#: ../sales/includes/ui/sales_order_ui.inc:291
+#: ../sales/manage/customer_branches.php:303
+#: ../sales/includes/ui/sales_order_ui.inc:292
 msgid ""
 "The selected customer does not have any branches. Please create at least one "
 "branch."
@@ -14890,65 +14584,65 @@ msgstr ""
 msgid "Customer status:"
 msgstr ""
 
-#: ../sales/manage/customers.php:266
+#: ../sales/manage/customers.php:267
 msgid "Discount Percent:"
 msgstr ""
 
-#: ../sales/manage/customers.php:267
+#: ../sales/manage/customers.php:268
 msgid "Prompt Payment Discount Percent:"
 msgstr ""
 
-#: ../sales/manage/customers.php:271
+#: ../sales/manage/customers.php:272
 msgid "Credit Status:"
 msgstr ""
 
-#: ../sales/manage/customers.php:284
+#: ../sales/manage/customers.php:285
 msgid "Customer branches"
 msgstr ""
 
-#: ../sales/manage/customers.php:286
+#: ../sales/manage/customers.php:287
 msgid "Select or &Add"
 msgstr ""
 
-#: ../sales/manage/customers.php:286
+#: ../sales/manage/customers.php:287
 msgid "&Add or Edit "
 msgstr ""
 
-#: ../sales/manage/customers.php:305
+#: ../sales/manage/customers.php:306
 msgid "Add New Customer"
 msgstr ""
 
-#: ../sales/manage/customers.php:309
+#: ../sales/manage/customers.php:310
 msgid "Update Customer"
 msgstr ""
 
-#: ../sales/manage/customers.php:310
+#: ../sales/manage/customers.php:311
 msgid "Update customer data"
 msgstr ""
 
-#: ../sales/manage/customers.php:311
+#: ../sales/manage/customers.php:312
 msgid "Select this customer and return to document entry."
 msgstr ""
 
-#: ../sales/manage/customers.php:312
+#: ../sales/manage/customers.php:313
 msgid "Delete Customer"
 msgstr ""
 
-#: ../sales/manage/customers.php:313
+#: ../sales/manage/customers.php:314
 msgid "Delete customer data if have been never used"
 msgstr ""
 
-#: ../sales/manage/customers.php:320
+#: ../sales/manage/customers.php:321
 msgid ""
 "There are no sales types defined. Please define at least one sales type "
 "before adding a customer."
 msgstr ""
 
-#: ../sales/manage/customers.php:329
+#: ../sales/manage/customers.php:330
 msgid "New customer"
 msgstr ""
 
-#: ../sales/manage/customers.php:351
+#: ../sales/manage/customers.php:353
 msgid "Sales &Orders"
 msgstr ""
 
@@ -14957,38 +14651,42 @@ msgid "Recurrent Invoices"
 msgstr ""
 
 #: ../sales/manage/recurrent_invoices.php:36
+msgid "No order has been selected as a template for recurrent invoicing."
+msgstr ""
+
+#: ../sales/manage/recurrent_invoices.php:42
 msgid "The invoice description cannot be empty."
 msgstr ""
 
-#: ../sales/manage/recurrent_invoices.php:63
+#: ../sales/manage/recurrent_invoices.php:69
 msgid "Selected recurrent invoice has been updated"
 msgstr ""
 
-#: ../sales/manage/recurrent_invoices.php:69
+#: ../sales/manage/recurrent_invoices.php:75
 msgid "New recurrent invoice has been added"
 msgstr ""
 
-#: ../sales/manage/recurrent_invoices.php:86
+#: ../sales/manage/recurrent_invoices.php:92
 msgid "Selected recurrent invoice has been deleted"
 msgstr ""
 
-#: ../sales/manage/recurrent_invoices.php:167
+#: ../sales/manage/recurrent_invoices.php:173
 msgid "Template:"
 msgstr ""
 
-#: ../sales/manage/recurrent_invoices.php:176
+#: ../sales/manage/recurrent_invoices.php:182
 msgid "Days:"
 msgstr ""
 
-#: ../sales/manage/recurrent_invoices.php:178
+#: ../sales/manage/recurrent_invoices.php:184
 msgid "Monthly:"
 msgstr ""
 
-#: ../sales/manage/recurrent_invoices.php:180
+#: ../sales/manage/recurrent_invoices.php:186
 msgid "Begin:"
 msgstr ""
 
-#: ../sales/manage/recurrent_invoices.php:182
+#: ../sales/manage/recurrent_invoices.php:188
 msgid "End:"
 msgstr ""
 
@@ -15415,19 +15113,6 @@ msgstr ""
 msgid "Customer Transactions"
 msgstr ""
 
-#: ../sales/inquiry/customer_inquiry.php:68
-msgid "CUSTOMER ACCOUNT IS ON HOLD"
-msgstr ""
-
-#: ../sales/inquiry/customer_inquiry.php:181
-msgid "Print Receipt"
-msgstr ""
-
-#: ../sales/inquiry/customer_inquiry.php:211
-#: ../sales/inquiry/customer_inquiry.php:224
-msgid "RB"
-msgstr ""
-
 #: ../sales/inquiry/sales_deliveries_view.php:29
 msgid "Search Not Invoiced Deliveries"
 msgstr ""
@@ -15436,34 +15121,34 @@ msgstr ""
 msgid "Search All Deliveries"
 msgstr ""
 
-#: ../sales/inquiry/sales_deliveries_view.php:70
+#: ../sales/inquiry/sales_deliveries_view.php:68
 msgid ""
 "For batch invoicing you should\n"
 "\t\t    select at least one delivery. All items must be dispatched to\n"
 "\t\t    the same customer branch."
 msgstr ""
 
-#: ../sales/inquiry/sales_deliveries_view.php:181
+#: ../sales/inquiry/sales_deliveries_view.php:168
 msgid "Delivery #"
 msgstr ""
 
-#: ../sales/inquiry/sales_deliveries_view.php:187
+#: ../sales/inquiry/sales_deliveries_view.php:174
 msgid "Cust Ref"
 msgstr ""
 
-#: ../sales/inquiry/sales_deliveries_view.php:189
+#: ../sales/inquiry/sales_deliveries_view.php:176
 msgid "Due By"
 msgstr ""
 
-#: ../sales/inquiry/sales_deliveries_view.php:190
+#: ../sales/inquiry/sales_deliveries_view.php:177
 msgid "Delivery Total"
 msgstr ""
 
-#: ../sales/inquiry/sales_deliveries_view.php:192
+#: ../sales/inquiry/sales_deliveries_view.php:179
 msgid "Batch"
 msgstr ""
 
-#: ../sales/inquiry/sales_deliveries_view.php:192
+#: ../sales/inquiry/sales_deliveries_view.php:179
 msgid "Batch Invoicing"
 msgstr ""
 
@@ -15491,57 +15176,57 @@ msgstr ""
 msgid "Search All Sales Quotations"
 msgstr ""
 
-#: ../sales/inquiry/sales_orders_view.php:148
+#: ../sales/inquiry/sales_orders_view.php:120
 msgid "Dispatch"
 msgstr ""
 
-#: ../sales/inquiry/sales_orders_view.php:191
+#: ../sales/inquiry/sales_orders_view.php:163
 msgid "Set this order as a template for direct deliveries/invoices"
 msgstr ""
 
-#: ../sales/inquiry/sales_orders_view.php:200
+#: ../sales/inquiry/sales_orders_view.php:172
 msgid "Prepayment Invoice"
 msgstr ""
 
-#: ../sales/inquiry/sales_orders_view.php:200
+#: ../sales/inquiry/sales_orders_view.php:172
 msgid "Final Invoice"
 msgstr ""
 
-#: ../sales/inquiry/sales_orders_view.php:268
+#: ../sales/inquiry/sales_orders_view.php:230
 msgid "Show All:"
 msgstr ""
 
-#: ../sales/inquiry/sales_orders_view.php:285
+#: ../sales/inquiry/sales_orders_view.php:248
 msgid "Order #"
 msgstr ""
 
-#: ../sales/inquiry/sales_orders_view.php:289
-#: ../sales/inquiry/sales_orders_view.php:303
+#: ../sales/inquiry/sales_orders_view.php:252
+#: ../sales/inquiry/sales_orders_view.php:266
 msgid "Cust Order Ref"
 msgstr ""
 
-#: ../sales/inquiry/sales_orders_view.php:292
-#: ../sales/inquiry/sales_orders_view.php:306
+#: ../sales/inquiry/sales_orders_view.php:255
+#: ../sales/inquiry/sales_orders_view.php:269
 msgid "Delivery To"
 msgstr ""
 
-#: ../sales/inquiry/sales_orders_view.php:299
+#: ../sales/inquiry/sales_orders_view.php:262
 msgid "Quote #"
 msgstr ""
 
-#: ../sales/inquiry/sales_orders_view.php:304
+#: ../sales/inquiry/sales_orders_view.php:267
 msgid "Quote Date"
 msgstr ""
 
-#: ../sales/inquiry/sales_orders_view.php:307
+#: ../sales/inquiry/sales_orders_view.php:270
 msgid "Quote Total"
 msgstr ""
 
-#: ../sales/inquiry/sales_orders_view.php:338
+#: ../sales/inquiry/sales_orders_view.php:301
 msgid "Tmpl"
 msgstr ""
 
-#: ../sales/includes/cart_class.inc:391
+#: ../sales/includes/cart_class.inc:396
 msgid "You have to enter valid stock code or nonempty description"
 msgstr ""
 
@@ -15559,27 +15244,25 @@ msgid ""
 "charges."
 msgstr ""
 
-#: ../sales/includes/db/old.sales_order_db.inc:139
-#: ../sales/includes/db/sales_order_db.inc:103
-msgid "Deleted."
+#: ../sales/includes/db/sales_invoice_db.inc:199
+msgid "Cash invoice"
 msgstr ""
 
-#: ../sales/includes/db/sales_invoice_db.inc:198
-msgid "Cash invoice"
+#: ../sales/includes/db/sales_order_db.inc:103
+msgid "Deleted."
 msgstr ""
 
 #: ../sales/includes/ui/sales_credit_ui.inc:94
-#: ../sales/includes/ui/sales_order_ui.inc:370
+#: ../sales/includes/ui/sales_order_ui.inc:371
 msgid "Customer Currency:"
 msgstr ""
 
 #: ../sales/includes/ui/sales_credit_ui.inc:112
-#: ../sales/includes/ui/sales_order_ui.inc:638
 msgid "Shipping Company:"
 msgstr ""
 
 #: ../sales/includes/ui/sales_credit_ui.inc:114
-#: ../sales/includes/ui/sales_order_ui.inc:377
+#: ../sales/includes/ui/sales_order_ui.inc:378
 msgid "Customer Discount:"
 msgstr ""
 
@@ -15593,101 +15276,23 @@ msgid ""
 "have any branches."
 msgstr ""
 
-#: ../sales/includes/ui/sales_order_ui.inc:219
+#: ../sales/includes/ui/sales_order_ui.inc:220
 msgid "Shipping Charge"
 msgstr ""
 
-#: ../sales/includes/ui/sales_order_ui.inc:289
+#: ../sales/includes/ui/sales_order_ui.inc:290
 msgid "No customer found for entered text."
 msgstr ""
 
-#: ../sales/includes/ui/sales_order_ui.inc:315
+#: ../sales/includes/ui/sales_order_ui.inc:316
 #, php-format
 msgid "Customer's payment terms '%s' cannot be selected on this POS"
 msgstr ""
 
-#: ../sales/includes/ui/sales_order_ui.inc:364
+#: ../sales/includes/ui/sales_order_ui.inc:365
 msgid "Reference number unique for this document type"
 msgstr ""
 
-#: ../sales/includes/ui/sales_order_ui.inc:404
-#: ../sales/includes/ui/sales_order_ui.inc:406
-msgid "Price List:"
-msgstr ""
-
-#: ../sales/includes/ui/sales_order_ui.inc:423
-msgid "Date of order receive"
-msgstr ""
-
-#: ../sales/includes/ui/sales_order_ui.inc:573
-msgid "Cash payment"
-msgstr ""
-
-#: ../sales/includes/ui/sales_order_ui.inc:576
-#: ../sales/includes/ui/sales_order_ui.inc:608
-msgid "Deliver from Location:"
-msgstr ""
-
-#: ../sales/includes/ui/sales_order_ui.inc:579
-msgid "Cash account:"
-msgstr ""
-
-#: ../sales/includes/ui/sales_order_ui.inc:586
-msgid "Delivery Details"
-msgstr ""
-
-#: ../sales/includes/ui/sales_order_ui.inc:591
-msgid "Invoice Delivery Details"
-msgstr ""
-
-#: ../sales/includes/ui/sales_order_ui.inc:592
-msgid "Invoice before"
-msgstr ""
-
-#: ../sales/includes/ui/sales_order_ui.inc:596
-msgid "Quotation Delivery Details"
-msgstr ""
-
-#: ../sales/includes/ui/sales_order_ui.inc:601
-msgid "Order Delivery Details"
-msgstr ""
-
-#: ../sales/includes/ui/sales_order_ui.inc:622
-msgid "Enter requested day of delivery"
-msgstr ""
-
-#: ../sales/includes/ui/sales_order_ui.inc:623
-msgid "Enter Valid until Date"
-msgstr ""
-
-#: ../sales/includes/ui/sales_order_ui.inc:624
-msgid "Deliver To:"
-msgstr ""
-
-#: ../sales/includes/ui/sales_order_ui.inc:625
-msgid "Additional identifier for delivery e.g. name of receiving person"
-msgstr ""
-
-#: ../sales/includes/ui/sales_order_ui.inc:628
-msgid "Delivery address. Default is address of customer branch"
-msgstr ""
-
-#: ../sales/includes/ui/sales_order_ui.inc:632
-msgid "Contact Phone Number:"
-msgstr ""
-
-#: ../sales/includes/ui/sales_order_ui.inc:633
-msgid "Phone number of ordering person. Defaults to branch phone number"
-msgstr ""
-
-#: ../sales/includes/ui/sales_order_ui.inc:634
-msgid "Customer Reference:"
-msgstr ""
-
-#: ../sales/includes/ui/sales_order_ui.inc:635
-msgid "Customer reference number for this order (if any)"
-msgstr ""
-
 #: ../taxes/item_tax_types.php:17
 msgid "Item Tax Types"
 msgstr ""
@@ -15740,199 +15345,142 @@ msgstr ""
 msgid "Is exempt"
 msgstr ""
 
-#: ../taxes/sav.tax_types.php:21
+#: ../taxes/tax_groups.php:17
+msgid "Tax Groups"
+msgstr ""
+
+#: ../taxes/tax_groups.php:27
+msgid ""
+"There are no tax types defined. Define tax types before defining tax groups."
+msgstr ""
+
+#: ../taxes/tax_groups.php:40
+msgid "The tax group name cannot be empty."
+msgstr ""
+
+#: ../taxes/tax_groups.php:60
+msgid "Selected tax group has been updated"
+msgstr ""
+
+#: ../taxes/tax_groups.php:65
+msgid "New tax group has been added"
+msgstr ""
+
+#: ../taxes/tax_groups.php:80
+msgid ""
+"Cannot delete this tax group because customer branches been created "
+"referring to it."
+msgstr ""
+
+#: ../taxes/tax_groups.php:86
+msgid ""
+"Cannot delete this tax group because suppliers been created referring to it."
+msgstr ""
+
+#: ../taxes/tax_groups.php:103
+msgid "Selected tax group has been deleted"
+msgstr ""
+
+#: ../taxes/tax_groups.php:166
+msgid "Select the taxes that are included in this group."
+msgstr ""
+
+#: ../taxes/tax_groups.php:171
+msgid "Shipping Tax"
+msgstr ""
+
 #: ../taxes/tax_types.php:16
 msgid "Tax Types"
 msgstr ""
 
-#: ../taxes/sav.tax_types.php:60
 #: ../taxes/tax_types.php:30
 msgid "The tax type name cannot be empty."
 msgstr ""
 
-#: ../taxes/sav.tax_types.php:66
 #: ../taxes/tax_types.php:36
 msgid "The default tax rate must be numeric and not less than zero."
 msgstr ""
 
-#: ../taxes/sav.tax_types.php:72
 #: ../taxes/tax_types.php:42
 msgid "Selected GL Accounts cannot be used by another tax type."
 msgstr ""
 
-#: ../taxes/sav.tax_types.php:86
 #: ../taxes/tax_types.php:56
 msgid "New tax type has been added"
 msgstr ""
 
-#: ../taxes/sav.tax_types.php:97
 #: ../taxes/tax_types.php:67
 msgid "Selected tax type has been updated"
 msgstr ""
 
-#: ../taxes/sav.tax_types.php:107
 #: ../taxes/tax_types.php:77
 msgid ""
 "Cannot delete this tax type because tax groups been created referring to it."
 msgstr ""
 
-#: ../taxes/sav.tax_types.php:141
 #: ../taxes/tax_types.php:94
 msgid "Selected tax type has been deleted"
 msgstr ""
 
-#: ../taxes/sav.tax_types.php:164
-msgid ""
-"Start new tax regulations span below, then select new span and edit tax "
-"rates as needed."
-msgstr ""
-
-#: ../taxes/sav.tax_types.php:167
-msgid "Tax span begin:"
-msgstr ""
-
-#: ../taxes/sav.tax_types.php:168
-msgid "Tax span end:"
-msgstr ""
-
-#: ../taxes/sav.tax_types.php:172
-msgid "Add new span"
-msgstr ""
-
-#: ../taxes/sav.tax_types.php:182
-msgid "Tax regulations span:"
-msgstr ""
-
-#: ../taxes/sav.tax_types.php:183
-msgid "Add new tax sub-period"
-msgstr ""
-
-#: ../taxes/sav.tax_types.php:187
 #: ../taxes/tax_types.php:112
 msgid ""
 "To avoid problems with manual journal entry all tax types should have unique "
 "Sales/Purchasing GL accounts."
 msgstr ""
 
-#: ../taxes/sav.tax_types.php:190
-msgid "Rate (%)"
+#: ../taxes/tax_types.php:115
+msgid "Default Rate (%)"
 msgstr ""
 
-#: ../taxes/sav.tax_types.php:190
 #: ../taxes/tax_types.php:116
 msgid "Sales GL Account"
 msgstr ""
 
-#: ../taxes/sav.tax_types.php:190
 #: ../taxes/tax_types.php:116
 msgid "Purchasing GL Account"
 msgstr ""
 
-#: ../taxes/sav.tax_types.php:205
-msgid "Exempt"
-msgstr ""
-
-#: ../taxes/sav.tax_types.php:242
 #: ../taxes/tax_types.php:159
 msgid "Default Rate:"
 msgstr ""
 
-#: ../taxes/sav.tax_types.php:244
 #: ../taxes/tax_types.php:161
 msgid "Sales GL Account:"
 msgstr ""
 
-#: ../taxes/sav.tax_types.php:245
 #: ../taxes/tax_types.php:162
 msgid "Purchasing GL Account:"
 msgstr ""
 
-#: ../taxes/sav.tax_types.php:262
-msgid "Edit selected span"
-msgstr ""
-
-#: ../taxes/tax_groups.php:17
-msgid "Tax Groups"
-msgstr ""
-
-#: ../taxes/tax_groups.php:27
-msgid ""
-"There are no tax types defined. Define tax types before defining tax groups."
-msgstr ""
-
-#: ../taxes/tax_groups.php:40
-msgid "The tax group name cannot be empty."
-msgstr ""
-
-#: ../taxes/tax_groups.php:60
-msgid "Selected tax group has been updated"
-msgstr ""
-
-#: ../taxes/tax_groups.php:65
-msgid "New tax group has been added"
-msgstr ""
-
-#: ../taxes/tax_groups.php:80
-msgid ""
-"Cannot delete this tax group because customer branches been created "
-"referring to it."
-msgstr ""
-
-#: ../taxes/tax_groups.php:86
-msgid ""
-"Cannot delete this tax group because suppliers been created referring to it."
-msgstr ""
-
-#: ../taxes/tax_groups.php:103
-msgid "Selected tax group has been deleted"
-msgstr ""
-
-#: ../taxes/tax_groups.php:166
-msgid "Select the taxes that are included in this group."
-msgstr ""
-
-#: ../taxes/tax_groups.php:171
-msgid "Shipping Tax"
-msgstr ""
-
-#: ../taxes/tax_types.php:115
-msgid "Default Rate (%)"
-msgstr ""
-
-#: ../themes/default/renderer.php:28
+#: ../themes/default/renderer.php:27
 msgid "Main Menu"
 msgstr ""
 
-#: ../themes/default/renderer.php:71
-#: ../themes/default/renderer.php:81
+#: ../themes/default/renderer.php:69
 msgid "Help"
 msgstr ""
 
-#: ../themes/default/renderer.php:76
-msgid "Preferences"
-msgstr ""
-
-#: ../sql/alter2.1.php:18
+#: ../sql/alter2.1.php:19
 msgid "Upgrade from version 2.0 to 2.1"
 msgstr ""
 
-#: ../sql/alter2.1.php:36
+#: ../sql/alter2.1.php:37
 msgid "Cannot retrieve bank accounts codes"
 msgstr ""
 
-#: ../sql/alter2.1.php:44
+#: ../sql/alter2.1.php:45
 msgid "Cannot update bank transactions"
 msgstr ""
 
-#: ../sql/alter2.1.php:53
+#: ../sql/alter2.1.php:54
 msgid "Cannot select stock identificators"
 msgstr ""
 
-#: ../sql/alter2.1.php:64
+#: ../sql/alter2.1.php:65
 msgid "Cannot insert stock id into item_codes"
 msgstr ""
 
-#: ../sql/alter2.1.php:140
+#: ../sql/alter2.1.php:144
 msgid ""
 "Seems that system upgrade to version 2.1 has \n"
 "\t\t\tbeen performed for this company already.<br> If something has gone \n"
@@ -15940,28 +15488,52 @@ msgid ""
 "\t\t\tdatabase restore from last backup file first."
 msgstr ""
 
-#: ../sql/alter2.2.php:23
+#: ../sql/alter2.2.php:24
 msgid "Upgrade from version 2.1/2.2beta to 2.2"
 msgstr ""
 
-#: ../sql/alter2.2.php:85
+#: ../sql/alter2.2.php:86
 msgid "Cannot query max sales order number."
 msgstr ""
 
-#: ../sql/alter2.2.php:96
+#: ../sql/alter2.2.php:97
 msgid "Cannot store next sales order reference."
 msgstr ""
 
-#: ../sql/alter2.2.php:251
+#: ../sql/alter2.2.php:221
 msgid ""
 "Cannot upgrade extensions system: file /modules/installed_modules.php is not "
 "writeable"
 msgstr ""
 
-#: ../sql/alter2.3.php:20
+#: ../sql/alter2.3.php:21
 msgid "Upgrade from version 2.2 to 2.3"
 msgstr ""
 
-#: ../sql/alter2.4.php:19
+#: ../sql/alter2.4.php:56
 msgid "Upgrade from version 2.3 to 2.4"
 msgstr ""
+
+#: ../sql/alter2.4.php:64
+msgid "Set optimal parameters and start upgrade:"
+msgstr ""
+
+#: ../sql/alter2.4.php:67
+msgid "Text collation optimization:"
+msgstr ""
+
+#: ../sql/alter2.4.php:133
+#, php-format
+msgid ""
+"Cannot update work orders costs:\n"
+"%s"
+msgstr ""
+
+#: ../sql/alter2.4.php:223
+msgid "Convertion to utf8 done."
+msgstr ""
+
+#: ../sql/alter2.4.php:260
+#, php-format
+msgid "Cannot drop column in %s table: %s"
+msgstr ""