X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=lang%2Fnew_language_template%2FLC_MESSAGES%2Fempty.po;h=daf8c9538ac9f25f43118609c42cb330040566af;hb=2a950ced3fa450dd1ea34dc2349e783a047e10af;hp=58e9072be739fa9f38b069140eacd9a2ef64dc46;hpb=5ca2c65e90a35612773bcb24298832879a4347e3;p=fa-stable.git

diff --git a/lang/new_language_template/LC_MESSAGES/empty.po b/lang/new_language_template/LC_MESSAGES/empty.po
index 58e9072b..daf8c953 100644
--- 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: 2011-03-31 10:51+0200\n"
+"POT-Creation-Date: 2012-09-15 09:38+0200\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"
@@ -21,62 +21,69 @@ msgstr ""
 msgid "Main  Menu"
 msgstr ""
 
-#: frontaccounting.php:75 access/logout.php:17 themes/default/renderer.php:52
-#: themes/default/renderer.php:78
+#: frontaccounting.php:75 access/logout.php:18 themes/default/renderer.php:52
+#: themes/default/renderer.php:78 themes/default/renderer.php:53
+#: themes/default/renderer.php:82
 msgid "Logout"
 msgstr ""
 
-#: access/login.php:13
+#: access/login.php:13 admin/db/login.php:13
 msgid "Restricted access"
 msgstr ""
 
-#: access/login.php:33
+#: access/login.php:27 admin/db/login.php:28
 msgid "Login as user: demouser and password: password"
 msgstr ""
 
-#: access/login.php:37
+#: access/login.php:31 admin/db/login.php:32
 msgid "Please login here"
 msgstr ""
 
-#: access/login.php:45 access/login.php:75
+#: access/login.php:39 access/login.php:69 admin/db/login.php:40
+#: admin/db/login.php:70 access/login.php:49 access/login.php:79
 msgid "Authorization timeout"
 msgstr ""
 
-#: access/login.php:45 access/login.php:82
+#: access/login.php:39 access/login.php:76 admin/db/login.php:40
+#: admin/db/login.php:77 access/login.php:49 access/login.php:86
 msgid "Login"
 msgstr ""
 
-#: access/login.php:82 admin/inst_upgrade.php:137
+#: access/login.php:76 admin/inst_upgrade.php:137 admin/db/login.php:77
+#: access/login.php:86
 msgid "Version"
 msgstr ""
 
-#: access/login.php:85
+#: access/login.php:79 admin/db/login.php:80 access/login.php:89
 msgid "User name"
 msgstr ""
 
-#: access/login.php:89 admin/change_current_user_password.php:78
-#: admin/users.php:191
+#: access/login.php:83 admin/change_current_user_password.php:78
+#: admin/users.php:191 admin/db/login.php:84 access/login.php:93
 msgid "Password:"
 msgstr ""
 
-#: access/login.php:98 admin/create_coy.php:240 admin/create_coy.php:319
+#: access/login.php:92 admin/create_coy.php:249 admin/create_coy.php:331
+#: admin/db/login.php:93 access/login.php:103 access/login.php:110
+#: admin/create_coy.php:253 admin/create_coy.php:336
 msgid "Company"
 msgstr ""
 
-#: access/login.php:107
+#: access/login.php:101 admin/db/login.php:102 access/login.php:117
 msgid "Login -->"
 msgstr ""
 
-#: access/login.php:136 admin/display_prefs.php:111
-#: themes/default/renderer.php:123
+#: access/login.php:132 admin/display_prefs.php:111 admin/db/login.php:133
+#: themes/default/renderer.php:123 access/login.php:148
+#: themes/default/renderer.php:127
 msgid "Theme:"
 msgstr ""
 
-#: access/logout.php:28
+#: access/logout.php:29
 msgid "Thank you for using"
 msgstr ""
 
-#: access/logout.php:39
+#: access/logout.php:40
 msgid "Click here to Login Again."
 msgstr ""
 
@@ -84,37 +91,37 @@ msgstr ""
 msgid "Attach Documents"
 msgstr ""
 
-#: admin/attachments.php:119
+#: admin/attachments.php:123 admin/attachments.php:121
 msgid "Attachment has been inserted."
 msgstr ""
 
-#: admin/attachments.php:125
+#: admin/attachments.php:129 admin/attachments.php:127
 msgid "Attachment has been updated."
 msgstr ""
 
-#: admin/attachments.php:137
+#: admin/attachments.php:141 admin/attachments.php:140
 msgid "Attachment has been deleted."
 msgstr ""
 
-#: admin/attachments.php:155 admin/view_print_transaction.php:72
-#: gl/inquiry/journal_inquiry.php:47
+#: admin/attachments.php:159 admin/view_print_transaction.php:72
+#: admin/void_transaction.php:157 gl/inquiry/journal_inquiry.php:47
 #: inventory/includes/item_adjustments_ui.inc:47
 #: manufacturing/work_order_add_finished.php:203
 #: manufacturing/work_order_costs.php:150
-#: manufacturing/work_order_entry.php:378
-#: manufacturing/work_order_entry.php:386
+#: manufacturing/work_order_entry.php:379
+#: manufacturing/work_order_entry.php:387
 #: manufacturing/includes/work_order_issue_ui.inc:161
-#: sales/inquiry/customer_allocation_inquiry.php:47
+#: sales/inquiry/customer_allocation_inquiry.php:47 admin/attachments.php:158
 msgid "Type:"
 msgstr ""
 
-#: admin/attachments.php:167 admin/view_print_transaction.php:126
-#: admin/void_transaction.php:164 dimensions/inquiry/search_dimensions.php:127
+#: admin/attachments.php:171 admin/view_print_transaction.php:126
+#: admin/void_transaction.php:181 dimensions/inquiry/search_dimensions.php:127
 #: dimensions/view/view_dimension.php:54 gl/bank_account_reconcile.php:234
-#: gl/inquiry/bank_inquiry.php:67 gl/inquiry/gl_account_inquiry.php:125
-#: gl/inquiry/journal_inquiry.php:120 gl/inquiry/journal_inquiry.php:133
+#: gl/inquiry/bank_inquiry.php:70 gl/inquiry/gl_account_inquiry.php:126
+#: gl/inquiry/journal_inquiry.php:127 gl/inquiry/journal_inquiry.php:140
 #: includes/ui/allocation_cart.inc:263
-#: inventory/inquiry/stock_movements.php:76
+#: inventory/inquiry/stock_movements.php:81
 #: manufacturing/search_work_orders.php:159
 #: manufacturing/includes/manufacturing_ui.inc:157
 #: manufacturing/includes/manufacturing_ui.inc:200
@@ -123,24 +130,27 @@ msgstr ""
 #: manufacturing/includes/manufacturing_ui.inc:280
 #: manufacturing/includes/manufacturing_ui.inc:331
 #: purchasing/view/view_po.php:115 purchasing/view/view_po.php:140
-#: purchasing/inquiry/po_search_completed.php:116
+#: purchasing/inquiry/po_search_completed.php:121
 #: purchasing/inquiry/po_search.php:130
-#: purchasing/inquiry/supplier_allocation_inquiry.php:126
-#: purchasing/inquiry/supplier_inquiry.php:163
+#: purchasing/inquiry/supplier_allocation_inquiry.php:127
+#: purchasing/inquiry/supplier_inquiry.php:169
+#: purchasing/inquiry/supplier_inquiry.php.orig:163
 #: purchasing/allocations/supplier_allocation_main.php:95
 #: reporting/rep101.php:130 reporting/rep201.php:118 reporting/rep203.php:91
-#: reporting/rep601.php:76 reporting/rep704.php:78 reporting/rep704.php:81
-#: reporting/rep704.php:84 reporting/rep710.php:76
-#: reporting/includes/doctext.inc:110 reporting/includes/doctext.inc:118
+#: reporting/rep601.php:76 reporting/rep704.php:79 reporting/rep704.php:82
+#: reporting/rep704.php:85 reporting/rep710.php:76
+#: reporting/includes/doctext.inc:145 reporting/includes/doctext.inc:186
+#: reporting/includes/doctext.inc:224
 #: sales/allocations/customer_allocation_main.php:94
 #: sales/view/view_sales_order.php:96 sales/view/view_sales_order.php:129
 #: sales/view/view_sales_order.php:161
-#: sales/inquiry/customer_allocation_inquiry.php:142
-#: sales/inquiry/customer_inquiry.php:213
+#: sales/inquiry/customer_allocation_inquiry.php:145
+#: sales/inquiry/customer_inquiry.php:225
+#: sales/inquiry/customer_inquiry.php.orig:225 admin/attachments.php:170
 msgid "#"
 msgstr ""
 
-#: admin/attachments.php:167 admin/attachments.php:217
+#: admin/attachments.php:171 admin/attachments.php:221
 #: admin/crm_categories.php:88 admin/inst_upgrade.php:137
 #: admin/payment_terms.php:127 admin/printers.php:84
 #: admin/print_profiles.php:148 gl/inquiry/tax_inquiry.php:82
@@ -154,41 +164,47 @@ msgstr ""
 #: purchasing/includes/ui/invoice_ui.inc:483
 #: purchasing/po_receive_items.php:62 reporting/rep104.php:109
 #: reporting/rep105.php:112 reporting/rep204.php:82 reporting/rep303.php:109
-#: reporting/rep303.php:115 reporting/rep304.php:114 reporting/rep305.php:95
-#: reporting/rep401.php:69 sales/create_recurrent_invoices.php:98
-#: sales/manage/credit_status.php:97 sales/manage/recurrent_invoices.php:85
-#: sales/inquiry/sales_orders_view.php:284
-#: sales/inquiry/sales_orders_view.php:288 taxes/tax_groups.php:146
-#: taxes/tax_types.php:115
+#: reporting/rep303.php:115 reporting/rep304.php:112 reporting/rep305.php:95
+#: reporting/rep401.php:69 sales/create_recurrent_invoices.php:115
+#: sales/manage/credit_status.php:97 sales/manage/recurrent_invoices.php:102
+#: sales/inquiry/sales_orders_view.php:295
+#: sales/inquiry/sales_orders_view.php:299
+#: sales/inquiry/sales_orders_view.php.orig:293
+#: sales/inquiry/sales_orders_view.php.orig:297 taxes/tax_groups.php:124
+#: taxes/tax_types.php:115 admin/attachments.php:170 admin/attachments.php:220
+#: reporting/rep305.php:98 sales/create_recurrent_invoices.php:132
 msgid "Description"
 msgstr ""
 
-#: admin/attachments.php:167 admin/backups.php:60 admin/backups.php:142
+#: admin/attachments.php:171 admin/backups.php:63 admin/backups.php:149
+#: admin/attachments.php:170
 msgid "Filename"
 msgstr ""
 
-#: admin/attachments.php:167
+#: admin/attachments.php:171 admin/attachments.php:170
 msgid "Size"
 msgstr ""
 
-#: admin/attachments.php:167
+#: admin/attachments.php:171 admin/attachments.php:170
 msgid "Filetype"
 msgstr ""
 
-#: admin/attachments.php:167
+#: admin/attachments.php:171 admin/attachments.php:170
 msgid "Date Uploaded"
 msgstr ""
 
-#: admin/attachments.php:182 admin/create_coy.php:264
+#: admin/attachments.php:186 admin/create_coy.php:273
 #: admin/crm_categories.php:106 admin/fiscalyears.php:164
-#: admin/inst_lang.php:100 admin/payment_terms.php:142 admin/printers.php:96
+#: admin/inst_lang.php:100 admin/inst_lang.php.orig:100
+#: admin/payment_terms.php:142 admin/printers.php:96
 #: admin/shipping_companies.php:106 admin/tags.php:140 admin/users.php:144
 #: dimensions/inquiry/search_dimensions.php:120
-#: gl/inquiry/journal_inquiry.php:111 gl/manage/bank_accounts.php:126
-#: gl/manage/currencies.php:166 gl/manage/exchange_rates.php:94
-#: gl/manage/gl_account_classes.php:132 gl/manage/gl_account_types.php:148
-#: gl/manage/gl_quick_entries.php:196 gl/manage/gl_quick_entries.php:295
-#: gl/includes/ui/gl_bank_ui.inc:155 gl/includes/ui/gl_journal_ui.inc:122
+#: gl/inquiry/journal_inquiry.php:118 gl/manage/bank_accounts.php:130
+#: gl/manage/bank_accounts.php.orig:130 gl/manage/currencies.php:164
+#: gl/manage/exchange_rates.php:94 gl/manage/gl_account_classes.php:132
+#: gl/manage/gl_account_types.php:154 gl/manage/gl_quick_entries.php:196
+#: gl/manage/gl_quick_entries.php:295 gl/includes/ui/gl_bank_ui.inc:184
+#: gl/includes/ui/gl_bank_ui.inc.orig:166 gl/includes/ui/gl_journal_ui.inc:122
 #: includes/ui/contacts_view.inc:64 includes/ui/simple_crud_class.inc:52
 #: inventory/prices.php:145 inventory/purchasing_data.php:146
 #: inventory/includes/item_adjustments_ui.inc:87
@@ -200,44 +216,50 @@ msgstr ""
 #: manufacturing/manage/bom_edit.php:86
 #: manufacturing/manage/work_centres.php:114
 #: manufacturing/includes/work_order_issue_ui.inc:58
-#: purchasing/includes/ui/invoice_ui.inc:521
+#: purchasing/includes/ui/invoice_ui.inc:520
 #: purchasing/includes/ui/po_ui.inc:266
-#: purchasing/inquiry/po_search_completed.php:101
+#: purchasing/inquiry/po_search_completed.php:106
 #: purchasing/inquiry/po_search.php:87 sales/manage/credit_status.php:119
 #: sales/manage/customer_branches.php:159
-#: sales/manage/recurrent_invoices.php:113 sales/manage/sales_areas.php:103
+#: sales/manage/recurrent_invoices.php:130 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/customer_inquiry.php:186
+#: sales/inquiry/customer_inquiry.php:198
+#: sales/inquiry/customer_inquiry.php.orig:198
 #: sales/inquiry/sales_deliveries_view.php:154
-#: sales/inquiry/sales_orders_view.php:123
+#: sales/inquiry/sales_orders_view.php:128
+#: sales/inquiry/sales_orders_view.php.orig:126
 #: sales/includes/ui/sales_credit_ui.inc:197
 #: sales/includes/ui/sales_order_ui.inc:202 taxes/item_tax_types.php:139
-#: taxes/tax_groups.php:168 taxes/tax_types.php:132
+#: taxes/tax_groups.php:142 taxes/tax_types.php:132 admin/attachments.php:185
+#: sales/includes/ui/sales_order_ui.inc:206 admin/create_coy.php:277
 msgid "Edit"
 msgstr ""
 
-#: admin/attachments.php:183 gl/inquiry/journal_inquiry.php:128
+#: admin/attachments.php:187 gl/inquiry/journal_inquiry.php:135
+#: admin/attachments.php:186
 msgid "View"
 msgstr ""
 
-#: admin/attachments.php:184
+#: admin/attachments.php:188 admin/attachments.php:187
 msgid "Download"
 msgstr ""
 
-#: admin/attachments.php:185 admin/create_coy.php:265
+#: admin/attachments.php:189 admin/create_coy.php:274
 #: admin/crm_categories.php:110 admin/fiscalyears.php:166
-#: admin/inst_chart.php:80 admin/inst_lang.php:109 admin/inst_module.php:144
+#: admin/inst_chart.php:80 admin/inst_lang.php:109
+#: admin/inst_lang.php.orig:109 admin/inst_module.php:144
 #: admin/inst_theme.php:102 admin/payment_terms.php:143 admin/printers.php:97
 #: admin/shipping_companies.php:107 admin/tags.php:141 admin/users.php:146
-#: gl/gl_budget.php:137 gl/manage/bank_accounts.php:127
-#: gl/manage/currencies.php:168 gl/manage/exchange_rates.php:99
-#: gl/manage/gl_account_classes.php:133 gl/manage/gl_account_types.php:149
-#: gl/manage/gl_quick_entries.php:197 gl/manage/gl_quick_entries.php:296
-#: gl/includes/ui/gl_bank_ui.inc:157 gl/includes/ui/gl_journal_ui.inc:124
-#: includes/ui/contacts_view.inc:67 includes/ui/simple_crud_class.inc:54
-#: includes/ui/ui_input.inc:281 inventory/prices.php:146
-#: inventory/purchasing_data.php:147
+#: gl/gl_budget.php:137 gl/manage/bank_accounts.php:131
+#: gl/manage/bank_accounts.php.orig:131 gl/manage/currencies.php:166
+#: gl/manage/exchange_rates.php:99 gl/manage/gl_account_classes.php:133
+#: gl/manage/gl_account_types.php:155 gl/manage/gl_quick_entries.php:197
+#: gl/manage/gl_quick_entries.php:296 gl/includes/ui/gl_bank_ui.inc:186
+#: gl/includes/ui/gl_bank_ui.inc.orig:168 gl/includes/ui/gl_journal_ui.inc:124
+#: includes/ui/contacts_view.inc:67 includes/ui/radio.ui_input.inc:284
+#: includes/ui/simple_crud_class.inc:54 includes/ui/ui_input.inc:284
+#: inventory/prices.php:146 inventory/purchasing_data.php:147
 #: inventory/includes/item_adjustments_ui.inc:89
 #: inventory/includes/stock_transfers_ui.inc:81
 #: inventory/manage/item_categories.php:122
@@ -249,144 +271,154 @@ msgstr ""
 #: purchasing/includes/ui/invoice_ui.inc:284
 #: purchasing/includes/ui/po_ui.inc:268 sales/manage/credit_status.php:120
 #: sales/manage/customer_branches.php:163
-#: sales/manage/recurrent_invoices.php:114 sales/manage/sales_areas.php:104
+#: sales/manage/recurrent_invoices.php:131 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:204 taxes/item_tax_types.php:140
-#: taxes/tax_groups.php:169 taxes/tax_types.php:133
+#: taxes/tax_groups.php:143 taxes/tax_types.php:133 admin/attachments.php:188
+#: sales/includes/ui/sales_order_ui.inc:208 admin/create_coy.php:278
+#: includes/ui/ui_input.inc:285
 msgid "Delete"
 msgstr ""
 
-#: admin/attachments.php:211 admin/attachments.php:216
+#: admin/attachments.php:215 admin/attachments.php:220
+#: admin/attachments.php:214 admin/attachments.php:219
 msgid "Transaction #"
 msgstr ""
 
-#: admin/attachments.php:218
+#: admin/attachments.php:222 admin/attachments.php:221
 msgid "Attached File"
 msgstr ""
 
-#: admin/backups.php:21 admin/backups.php:111
+#: admin/backups.php:21 admin/backups.php:40 admin/backups.php:114
+#: admin/backups.php:142 admin/backups.php:155 admin/backups.php:173
 msgid "Select backup file first."
 msgstr ""
 
-#: admin/backups.php:40
+#: admin/backups.php:43
 msgid "Backup and Restore Database"
 msgstr ""
 
-#: admin/backups.php:47
+#: admin/backups.php:50
 msgid "Backup paths have not been set correctly."
 msgstr ""
 
-#: admin/backups.php:48
+#: admin/backups.php:51
 msgid "Please contact System Administrator."
 msgstr ""
 
-#: admin/backups.php:49
+#: admin/backups.php:52
 msgid "cannot find backup directory"
 msgstr ""
 
-#: admin/backups.php:59
+#: admin/backups.php:62
 msgid "Backup successfully generated."
 msgstr ""
 
-#: admin/backups.php:62
+#: admin/backups.php:65
 msgid "Database backup failed."
 msgstr ""
 
-#: admin/backups.php:95 admin/create_coy.php:252 admin/fiscalyears.php:155
-#: admin/inst_lang.php:85 admin/inst_lang.php:97
+#: admin/backups.php:98 admin/create_coy.php:261 admin/fiscalyears.php:155
+#: admin/inst_lang.php:85 admin/inst_lang.php:97 admin/inst_lang.php.orig:85
+#: admin/inst_lang.php.orig:97 admin/void_transaction.php:125
 #: dimensions/inquiry/search_dimensions.php:107
-#: gl/manage/bank_accounts.php:123 gl/manage/currencies.php:164
-#: gl/manage/gl_account_classes.php:127 gl/manage/gl_quick_entries.php:230
-#: includes/system_tests.inc:38 includes/system_tests.inc:113
-#: includes/system_tests.inc:126 includes/ui/ui_lists.inc:1638
-#: purchasing/manage/suppliers.php:123 reporting/rep101.php:126
-#: reporting/rep102.php:106 reporting/rep104.php:103 reporting/rep106.php:73
-#: reporting/rep201.php:114 reporting/rep202.php:108 reporting/rep203.php:87
+#: gl/manage/bank_accounts.php:127 gl/manage/bank_accounts.php.orig:127
+#: gl/manage/currencies.php:162 gl/manage/gl_account_classes.php:127
+#: gl/manage/gl_quick_entries.php:230 includes/system_tests.inc:38
+#: includes/system_tests.inc:113 includes/system_tests.inc:126
+#: includes/ui/sav.ui_lists.inc:1649 includes/ui/ui_lists.inc:1670
+#: purchasing/manage/suppliers.php:120 reporting/rep101.php:126
+#: reporting/rep102.php:112 reporting/rep102.php:114 reporting/rep104.php:103
+#: reporting/rep106.php:73 reporting/rep114.php:73 reporting/rep201.php:114
+#: reporting/rep202.php:116 reporting/rep202.php:118 reporting/rep203.php:87
 #: reporting/rep303.php:101 reporting/rep303.php:105 reporting/rep501.php:109
 #: sales/manage/sales_points.php:94 sales/manage/sales_points.php:95
 #: sales/manage/sales_types.php:119 taxes/item_tax_types.php:129
-#: taxes/tax_groups.php:161
+#: taxes/tax_groups.php:139 admin/create_coy.php:265
 msgid "No"
 msgstr ""
 
-#: admin/backups.php:135
+#: admin/backups.php:139
 msgid "Restore backup completed."
 msgstr ""
 
-#: admin/backups.php:141
+#: admin/backups.php:148
 msgid "File successfully deleted."
 msgstr ""
 
-#: admin/backups.php:146
+#: admin/backups.php:153
 msgid "Can't delete backup file."
 msgstr ""
 
-#: admin/backups.php:155
+#: admin/backups.php:165
 msgid "You can only upload *.sql backup files"
 msgstr ""
 
-#: admin/backups.php:161
+#: admin/backups.php:171
 msgid "File was not uploaded into the system."
 msgstr ""
 
-#: admin/backups.php:167
+#: admin/backups.php:180
 msgid "Create backup"
 msgstr ""
 
-#: admin/backups.php:168 sales/includes/ui/sales_order_ui.inc:589
-#: sales/includes/ui/sales_order_ui.inc:636
+#: admin/backups.php:181 sales/includes/ui/sales_order_ui.inc:589
+#: sales/includes/ui/sales_order_ui.inc:637
+#: sales/includes/ui/sales_order_ui.inc:593
+#: sales/includes/ui/sales_order_ui.inc:641
 msgid "Comments:"
 msgstr ""
 
-#: admin/backups.php:169
+#: admin/backups.php:182
 msgid "Compression:"
 msgstr ""
 
-#: admin/backups.php:171
+#: admin/backups.php:184
 msgid "Create Backup"
 msgstr ""
 
-#: admin/backups.php:173
+#: admin/backups.php:186
 msgid "Backup scripts maintenance"
 msgstr ""
 
-#: admin/backups.php:179
+#: admin/backups.php:192
 msgid "View Backup"
 msgstr ""
 
-#: admin/backups.php:180
+#: admin/backups.php:193
 msgid "Download Backup"
 msgstr ""
 
-#: admin/backups.php:181
+#: admin/backups.php:194
 msgid "Restore Backup"
 msgstr ""
 
-#: admin/backups.php:182
+#: admin/backups.php:195
 msgid ""
 "You are about to restore database from backup file.\n"
 "Do you want to continue?"
 msgstr ""
 
-#: admin/backups.php:184
+#: admin/backups.php:197
 msgid "Delete Backup"
 msgstr ""
 
-#: admin/backups.php:186
+#: admin/backups.php:199
 #, php-format
 msgid ""
 "You are about to remove selected backup file.\n"
 "Do you want to continue ?"
 msgstr ""
 
-#: admin/backups.php:192
+#: admin/backups.php:205
 msgid "Upload file"
 msgstr ""
 
 #: admin/change_current_user_password.php:16
 #: admin/change_current_user_password.php:85 themes/default/renderer.php:72
+#: themes/default/renderer.php:76
 msgid "Change password"
 msgstr ""
 
@@ -423,6 +455,7 @@ msgid "Enter your new password in the fields."
 msgstr ""
 
 #: admin/company_preferences.php:16 applications/setup.php:18
+#: applications/setup.php.orig:18
 msgid "Company Setup"
 msgstr ""
 
@@ -440,17 +473,17 @@ msgid ""
 "expected"
 msgstr ""
 
-#: admin/company_preferences.php:59 inventory/manage/items.php:74
+#: admin/company_preferences.php:59 inventory/manage/items.php:85
 msgid ""
 "The file size is over the maximum allowed. The maximum size allowed in KB is"
 msgstr ""
 
-#: admin/company_preferences.php:64 inventory/manage/items.php:79
+#: admin/company_preferences.php:64 inventory/manage/items.php:75
 msgid "Only graphics files can be uploaded"
 msgstr ""
 
 #: admin/company_preferences.php:72 admin/company_preferences.php:93
-#: inventory/manage/items.php:87
+#: inventory/manage/items.php:93
 msgid "The existing image could not be removed"
 msgstr ""
 
@@ -458,157 +491,167 @@ msgstr ""
 msgid "Error uploading logo file"
 msgstr ""
 
-#: admin/company_preferences.php:116
+#: admin/company_preferences.php:115
 msgid "Company setup has been updated."
 msgstr ""
 
-#: admin/company_preferences.php:160
+#: admin/company_preferences.php:159
 msgid "Name (to appear on reports):"
 msgstr ""
 
-#: admin/company_preferences.php:161 admin/shipping_companies.php:142
+#: admin/company_preferences.php:160 admin/shipping_companies.php:142
 #: includes/ui/contacts_view.inc:109 inventory/manage/locations.php:202
-#: sales/manage/customers.php:203 sales/includes/ui/sales_order_ui.inc:627
+#: sales/manage/customers.php:231 sales/manage/customers.php.orig:228
+#: sales/includes/ui/sales_order_ui.inc:628
+#: sales/includes/ui/sales_order_ui.inc:632
 msgid "Address:"
 msgstr ""
 
-#: admin/company_preferences.php:162
+#: admin/company_preferences.php:161
 msgid "Domicile:"
 msgstr ""
 
-#: admin/company_preferences.php:164 admin/shipping_companies.php:138
-#: purchasing/manage/suppliers.php:105 sales/manage/customer_branches.php:260
+#: admin/company_preferences.php:163 admin/shipping_companies.php:138
+#: purchasing/manage/suppliers.php:129 sales/manage/customer_branches.php:260
 msgid "Phone Number:"
 msgstr ""
 
-#: admin/company_preferences.php:165 includes/ui/contacts_view.inc:104
-#: purchasing/manage/suppliers.php:107 sales/manage/customer_branches.php:262
+#: admin/company_preferences.php:164 includes/ui/contacts_view.inc:104
+#: purchasing/manage/suppliers.php:159 sales/manage/customer_branches.php:262
+#: sales/manage/customers.php:254 sales/manage/customers.php.orig:251
 msgid "Fax Number:"
 msgstr ""
 
-#: admin/company_preferences.php:166 admin/users.php:202
+#: admin/company_preferences.php:165 admin/users.php:202
 msgid "Email Address:"
 msgstr ""
 
-#: admin/company_preferences.php:168
+#: admin/company_preferences.php:167
 msgid "Official Company Number:"
 msgstr ""
 
-#: admin/company_preferences.php:169 purchasing/manage/suppliers.php:88
-#: sales/manage/customers.php:205
+#: admin/company_preferences.php:168 purchasing/manage/suppliers.php:94
+#: sales/manage/customers.php:233 sales/manage/customers.php.orig:230
 msgid "GSTNo:"
 msgstr ""
 
-#: admin/company_preferences.php:171
+#: admin/company_preferences.php:170
 msgid "Home Currency:"
 msgstr ""
 
-#: admin/company_preferences.php:172 gl/gl_budget.php:63
+#: admin/company_preferences.php:171 gl/gl_budget.php:63
 msgid "Fiscal Year:"
 msgstr ""
 
-#: admin/company_preferences.php:173
+#: admin/company_preferences.php:172
 msgid "Tax Periods:"
 msgstr ""
 
-#: admin/company_preferences.php:173
+#: admin/company_preferences.php:172
 msgid "Months."
 msgstr ""
 
-#: admin/company_preferences.php:174
+#: admin/company_preferences.php:173
 msgid "Tax Last Period:"
 msgstr ""
 
-#: admin/company_preferences.php:174
+#: admin/company_preferences.php:173
 msgid "Months back."
 msgstr ""
 
-#: admin/company_preferences.php:178
+#: admin/company_preferences.php:177
 msgid "Company Logo:"
 msgstr ""
 
-#: admin/company_preferences.php:179
+#: admin/company_preferences.php:178
 msgid "New Company Logo (.jpg)"
 msgstr ""
 
-#: admin/company_preferences.php:180
+#: admin/company_preferences.php:179
 msgid "Delete Company Logo:"
 msgstr ""
 
-#: admin/company_preferences.php:182
+#: admin/company_preferences.php:181
 msgid "Use Dimensions:"
 msgstr ""
 
-#: admin/company_preferences.php:183
+#: admin/company_preferences.php:182
 msgid "Base for auto price calculations:"
 msgstr ""
 
-#: admin/company_preferences.php:184
+#: admin/company_preferences.php:183
 msgid "No base price list"
 msgstr ""
 
-#: admin/company_preferences.php:185
+#: admin/company_preferences.php:184
 msgid "Add Price from Std Cost:"
 msgstr ""
 
-#: admin/company_preferences.php:187
+#: admin/company_preferences.php:186
 msgid "Round to nearest:"
 msgstr ""
 
-#: admin/company_preferences.php:190
+#: admin/company_preferences.php:189
 msgid "Search Item List"
 msgstr ""
 
-#: admin/company_preferences.php:191
+#: admin/company_preferences.php:190
 msgid "Search Customer List"
 msgstr ""
 
-#: admin/company_preferences.php:192
+#: admin/company_preferences.php:191
 msgid "Search Supplier List"
 msgstr ""
 
-#: admin/company_preferences.php:194
+#: admin/company_preferences.php:193
 msgid "Automatic Revaluation Currency Accounts"
 msgstr ""
 
-#: admin/company_preferences.php:195
+#: admin/company_preferences.php:194
 msgid "Time Zone on Reports"
 msgstr ""
 
-#: admin/company_preferences.php:196
+#: admin/company_preferences.php:195
 msgid "Login Timeout:"
 msgstr ""
 
-#: admin/company_preferences.php:196
+#: admin/company_preferences.php:195
 msgid "seconds"
 msgstr ""
 
-#: admin/company_preferences.php:197
+#: admin/company_preferences.php:196
 msgid "Version Id"
 msgstr ""
 
-#: admin/company_preferences.php:202 admin/display_prefs.php:142
+#: admin/company_preferences.php:201 admin/display_prefs.php:142
 #: admin/forms_setup.php:61 admin/gl_setup.php:221 admin/inst_chart.php:74
-#: admin/inst_lang.php:103 admin/inst_module.php:138 admin/inst_module.php:156
+#: admin/inst_lang.php:103 admin/inst_lang.php.orig:103
+#: admin/inst_module.php:138 admin/inst_module.php:156
 #: admin/inst_module.php:199 admin/inst_theme.php:96
-#: dimensions/dimension_entry.php:293 gl/gl_bank.php:390 gl/gl_budget.php:135
-#: gl/manage/gl_quick_entries.php:60 gl/includes/ui/gl_bank_ui.inc:246
-#: gl/includes/ui/gl_journal_ui.inc:221 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:203 includes/ui/ui_input.inc:894
-#: inventory/adjustments.php:233 inventory/cost_update.php:119
-#: inventory/reorder_level.php:97 inventory/transfers.php:236
-#: inventory/includes/item_adjustments_ui.inc:157
+#: dimensions/dimension_entry.php:293 gl/gl_bank.php:401 gl/gl_budget.php:135
+#: gl/manage/gl_quick_entries.php:60 gl/includes/ui/gl_bank_ui.inc:275
+#: gl/includes/ui/gl_bank_ui.inc.orig:257 gl/includes/ui/gl_journal_ui.inc:221
+#: includes/ui/db_pager_view.inc:174 includes/ui/radio.ui_input.inc:206
+#: includes/ui/radio.ui_input.inc:901 includes/ui/simple_crud_class.inc:56
+#: includes/ui/simple_crud_class.inc:227 includes/ui/ui_input.inc:206
+#: includes/ui/ui_input.inc:900 inventory/adjustments.php:235
+#: inventory/cost_update.php:116 inventory/reorder_level.php:97
+#: inventory/transfers.php:236 inventory/includes/item_adjustments_ui.inc:157
 #: inventory/includes/stock_transfers_ui.inc:137
-#: inventory/manage/sales_kits.php:208 manufacturing/work_order_entry.php:458
+#: inventory/manage/sales_kits.php:208 manufacturing/work_order_entry.php:459
 #: manufacturing/includes/work_order_issue_ui.inc:131
 #: purchasing/includes/ui/po_ui.inc:299 purchasing/includes/ui/po_ui.inc:442
-#: purchasing/po_receive_items.php:333 sales/credit_note_entry.php:280
-#: sales/customer_credit_invoice.php:380 sales/customer_delivery.php:520
-#: sales/customer_invoice.php:559 sales/inquiry/sales_orders_view.php:312
+#: purchasing/po_receive_items.php:333 sales/credit_note_entry.php:282
+#: sales/customer_credit_invoice.php:382 sales/customer_delivery.php:523
+#: sales/customer_invoice.php:580 sales/inquiry/sales_orders_view.php:323
+#: sales/inquiry/sales_orders_view.php.orig:321
 #: sales/includes/ui/sales_credit_ui.inc:293
 #: sales/includes/ui/sales_order_ui.inc:237
-#: sales/includes/ui/sales_order_ui.inc:555
+#: sales/includes/ui/sales_order_ui.inc:555 sales/credit_note_entry.php:284
+#: sales/customer_credit_invoice.php:380 sales/customer_invoice.php:582
+#: sales/includes/ui/sales_order_ui.inc:241
+#: sales/includes/ui/sales_order_ui.inc:559 gl/gl_bank.php:403
+#: includes/ui/ui_input.inc:207 includes/ui/ui_input.inc:904
 msgid "Update"
 msgstr ""
 
@@ -616,162 +659,175 @@ msgstr ""
 msgid "Create/Update Company"
 msgstr ""
 
-#: admin/create_coy.php:45
+#: admin/create_coy.php:46 admin/create_coy.php:52
 msgid "Database settings are not specified."
 msgstr ""
 
-#: admin/create_coy.php:56
+#: admin/create_coy.php:62
 msgid "This database settings are already used by another company."
 msgstr ""
 
-#: admin/create_coy.php:61
+#: admin/create_coy.php:67
 msgid ""
 "You cannot have table set without prefix together with prefixed sets in the "
 "same database."
 msgstr ""
 
-#: admin/create_coy.php:119
+#: admin/create_coy.php:127
 msgid "Error creating Database: "
 msgstr ""
 
-#: admin/create_coy.php:119
+#: admin/create_coy.php:127
 msgid ", Please create it manually"
 msgstr ""
 
-#: admin/create_coy.php:123
+#: admin/create_coy.php:131
 msgid "Cannot create new company due to bugs in sql file."
 msgstr ""
 
-#: admin/create_coy.php:136 admin/create_coy.php:203
+#: admin/create_coy.php:145 admin/create_coy.php:212 admin/create_coy.php:149
+#: admin/create_coy.php:216
 msgid "Cannot open the configuration file - "
 msgstr ""
 
-#: admin/create_coy.php:138 admin/create_coy.php:205
+#: admin/create_coy.php:147 admin/create_coy.php:214 admin/create_coy.php:151
+#: admin/create_coy.php:218
 msgid "Cannot write to the configuration file - "
 msgstr ""
 
-#: admin/create_coy.php:140 admin/create_coy.php:176 admin/create_coy.php:207
+#: admin/create_coy.php:149 admin/create_coy.php:185 admin/create_coy.php:216
+#: admin/create_coy.php:153 admin/create_coy.php:189 admin/create_coy.php:220
 msgid "The configuration file "
 msgstr ""
 
-#: admin/create_coy.php:140 admin/create_coy.php:176 admin/create_coy.php:207
-#: admin/db/maintenance_db.inc:248
+#: admin/create_coy.php:149 admin/create_coy.php:185 admin/create_coy.php:216
+#: admin/db/maintenance_db.inc:250 admin/db/maintenance_db.inc.orig:248
+#: admin/create_coy.php:153 admin/create_coy.php:189 admin/create_coy.php:220
 msgid ""
 " is not writable. Change its permissions so it is, then re-run the operation."
 msgstr ""
 
-#: admin/create_coy.php:152
+#: admin/create_coy.php:161 admin/create_coy.php:165
 msgid "New company has been created."
 msgstr ""
 
-#: admin/create_coy.php:152
+#: admin/create_coy.php:161 admin/create_coy.php:165
 msgid "Company has been updated."
 msgstr ""
 
-#: admin/create_coy.php:169
+#: admin/create_coy.php:178 admin/create_coy.php:182
 msgid ""
 "Broken company subdirectories system. You have to remove this company "
 "manually."
 msgstr ""
 
-#: admin/create_coy.php:185
+#: admin/create_coy.php:194 admin/create_coy.php:198
 msgid "Cannot rename subdirectory to temporary name."
 msgstr ""
 
-#: admin/create_coy.php:191
+#: admin/create_coy.php:200 admin/create_coy.php:204
 msgid "Cannot rename company subdirectory"
 msgstr ""
 
-#: admin/create_coy.php:197
+#: admin/create_coy.php:206 admin/create_coy.php:210
 msgid "Error removing Database: "
 msgstr ""
 
-#: admin/create_coy.php:197
+#: admin/create_coy.php:206 admin/create_coy.php:210
 msgid ", please remove it manually"
 msgstr ""
 
-#: admin/create_coy.php:216
+#: admin/create_coy.php:225 admin/create_coy.php:229
 msgid "Cannot remove temporary renamed company data directory "
 msgstr ""
 
-#: admin/create_coy.php:219
+#: admin/create_coy.php:228 admin/create_coy.php:232
 msgid "Selected company has been deleted"
 msgstr ""
 
-#: admin/create_coy.php:233
+#: admin/create_coy.php:242 admin/create_coy.php:246
 msgid "Are you sure you want to delete company no. "
 msgstr ""
 
-#: admin/create_coy.php:240
+#: admin/create_coy.php:249 admin/create_coy.php:253
 msgid "Database Host"
 msgstr ""
 
-#: admin/create_coy.php:240 admin/create_coy.php:321
+#: admin/create_coy.php:249 admin/create_coy.php:336 admin/create_coy.php:342
+#: admin/create_coy.php:253 admin/create_coy.php:341 admin/create_coy.php:347
 msgid "Database User"
 msgstr ""
 
-#: admin/create_coy.php:241 admin/create_coy.php:324
+#: admin/create_coy.php:250 admin/create_coy.php:338 admin/create_coy.php:343
+#: admin/create_coy.php:254 admin/create_coy.php:348
 msgid "Database Name"
 msgstr ""
 
-#: admin/create_coy.php:241 admin/create_coy.php:326 admin/create_coy.php:328
+#: admin/create_coy.php:250 admin/create_coy.php:339 admin/create_coy.php:344
+#: admin/create_coy.php:254 admin/create_coy.php:349
 msgid "Table Pref"
 msgstr ""
 
-#: admin/create_coy.php:241 admin/create_coy.php:329 admin/inst_lang.php:36
-#: admin/print_profiles.php:162
+#: admin/create_coy.php:250 admin/create_coy.php:346 admin/inst_lang.php:36
+#: admin/inst_lang.php.orig:36 admin/print_profiles.php:162
+#: admin/create_coy.php:254 admin/create_coy.php:351
 msgid "Default"
 msgstr ""
 
-#: admin/create_coy.php:250 admin/fiscalyears.php:159 admin/inst_lang.php:85
-#: admin/inst_lang.php:97 dimensions/inquiry/search_dimensions.php:107
-#: gl/manage/bank_accounts.php:121 gl/manage/currencies.php:164
-#: gl/manage/gl_account_classes.php:127 gl/manage/gl_quick_entries.php:230
-#: includes/system_tests.inc:38 includes/system_tests.inc:113
-#: includes/system_tests.inc:126 includes/ui/ui_lists.inc:1639
-#: purchasing/manage/suppliers.php:123 reporting/rep101.php:125
-#: reporting/rep102.php:105 reporting/rep104.php:105 reporting/rep106.php:75
-#: reporting/rep201.php:113 reporting/rep202.php:107 reporting/rep203.php:86
+#: admin/create_coy.php:259 admin/fiscalyears.php:159 admin/inst_lang.php:85
+#: admin/inst_lang.php:97 admin/inst_lang.php.orig:85
+#: admin/inst_lang.php.orig:97 dimensions/inquiry/search_dimensions.php:107
+#: gl/manage/bank_accounts.php:125 gl/manage/bank_accounts.php.orig:125
+#: gl/manage/currencies.php:162 gl/manage/gl_account_classes.php:127
+#: gl/manage/gl_quick_entries.php:230 includes/system_tests.inc:38
+#: includes/system_tests.inc:113 includes/system_tests.inc:126
+#: includes/ui/sav.ui_lists.inc:1650 includes/ui/ui_lists.inc:1671
+#: purchasing/manage/suppliers.php:120 reporting/rep101.php:125
+#: reporting/rep102.php:111 reporting/rep102.php:113 reporting/rep104.php:105
+#: reporting/rep106.php:75 reporting/rep114.php:75 reporting/rep201.php:113
+#: reporting/rep202.php:115 reporting/rep202.php:117 reporting/rep203.php:86
 #: reporting/rep303.php:96 reporting/rep303.php:104 reporting/rep501.php:107
 #: sales/manage/sales_points.php:94 sales/manage/sales_points.php:95
 #: sales/manage/sales_types.php:119 taxes/item_tax_types.php:133
-#: taxes/tax_groups.php:159
+#: taxes/tax_groups.php:137 admin/create_coy.php:263
 msgid "Yes"
 msgstr ""
 
-#: admin/create_coy.php:278
+#: admin/create_coy.php:288 admin/create_coy.php:292
 msgid "The marked company is the current company which cannot be deleted."
 msgstr ""
 
-#: admin/create_coy.php:320 admin/printers.php:84
+#: admin/create_coy.php:335 admin/create_coy.php:341 admin/printers.php:84
+#: admin/create_coy.php:340 admin/create_coy.php:346
 msgid "Host"
 msgstr ""
 
-#: admin/create_coy.php:323
+#: admin/create_coy.php:337 admin/create_coy.php:342
 msgid "Database Password"
 msgstr ""
 
-#: admin/create_coy.php:326 admin/inst_chart.php:68 admin/inst_chart.php:70
-#: admin/inst_lang.php:87 admin/inst_lang.php:90 admin/inst_module.php:127
+#: admin/create_coy.php:339 admin/inst_chart.php:68 admin/inst_chart.php:70
+#: admin/inst_lang.php:87 admin/inst_lang.php:90 admin/inst_lang.php.orig:87
+#: admin/inst_lang.php.orig:90 admin/inst_module.php:127
 #: admin/inst_theme.php:91 admin/inst_theme.php:93 admin/inst_upgrade.php:149
-#: gl/manage/gl_account_types.php:184 includes/ui/allocation_cart.inc:286
-#: taxes/tax_groups.php:221
+#: gl/manage/gl_account_types.php:190 includes/ui/allocation_cart.inc:286
+#: admin/create_coy.php:344
 msgid "None"
 msgstr ""
 
-#: admin/create_coy.php:331
+#: admin/create_coy.php:350 admin/create_coy.php:355
 msgid "Database Script"
 msgstr ""
 
-#: admin/create_coy.php:333
+#: admin/create_coy.php:351 admin/create_coy.php:356
 msgid "New script Admin Password"
 msgstr ""
 
-#: admin/create_coy.php:336 gl/gl_budget.php:136
+#: admin/create_coy.php:355 gl/gl_budget.php:136 admin/create_coy.php:360
 msgid "Save"
 msgstr ""
 
-#: admin/create_coy.php:360
+#: admin/create_coy.php:377 admin/create_coy.php:382
 msgid "Create a new company"
 msgstr ""
 
@@ -886,6 +942,7 @@ msgid "Decimal Separator:"
 msgstr ""
 
 #: admin/display_prefs.php:98 admin/inst_lang.php:35
+#: admin/inst_lang.php.orig:35
 msgid "Language"
 msgstr ""
 
@@ -894,7 +951,7 @@ msgid "Language:"
 msgstr ""
 
 #: admin/display_prefs.php:103 applications/setup.php:42
-#: includes/sysnames.inc:94
+#: applications/setup.php.orig:42 includes/sysnames.inc:94
 msgid "Miscellaneous"
 msgstr ""
 
@@ -1016,7 +1073,8 @@ msgid "Fiscal Year End"
 msgstr ""
 
 #: admin/fiscalyears.php:138 dimensions/inquiry/search_dimensions.php:133
-#: dimensions/inquiry/search_dimensions.php:139 includes/ui/ui_lists.inc:648
+#: dimensions/inquiry/search_dimensions.php:139
+#: includes/ui/sav.ui_lists.inc:659 includes/ui/ui_lists.inc:676
 #: manufacturing/search_work_orders.php:108 reporting/rep501.php:85
 #: reporting/rep710.php:109 reporting/includes/excel_report.inc:234
 #: reporting/includes/pdf_report.inc:266
@@ -1145,7 +1203,7 @@ msgid "Receivable Account:"
 msgstr ""
 
 #: admin/gl_setup.php:162 admin/gl_setup.php:200
-#: inventory/manage/item_categories.php:192 inventory/manage/items.php:364
+#: inventory/manage/item_categories.php:192 inventory/manage/items.php:354
 #: sales/manage/customer_branches.php:250
 msgid "Sales Account:"
 msgstr ""
@@ -1190,7 +1248,7 @@ msgstr ""
 msgid "Payable Account:"
 msgstr ""
 
-#: admin/gl_setup.php:190 purchasing/manage/suppliers.php:129
+#: admin/gl_setup.php:190 purchasing/manage/suppliers.php:126
 msgid "Purchase Discount Account:"
 msgstr ""
 
@@ -1202,7 +1260,7 @@ msgstr ""
 msgid "No postings on GRN"
 msgstr ""
 
-#: admin/gl_setup.php:194 reporting/reports_main.php:161
+#: admin/gl_setup.php:194 reporting/reports_main.php:175
 msgid "Inventory"
 msgstr ""
 
@@ -1219,23 +1277,23 @@ msgid "Items Defaults"
 msgstr ""
 
 #: admin/gl_setup.php:202 inventory/manage/item_categories.php:202
-#: inventory/manage/items.php:368
+#: inventory/manage/items.php:358
 msgid "Inventory Account:"
 msgstr ""
 
 #: admin/gl_setup.php:204 inventory/manage/item_categories.php:196
-#: inventory/manage/item_categories.php:204 inventory/manage/items.php:369
-#: inventory/manage/items.php:374
+#: inventory/manage/item_categories.php:204 inventory/manage/items.php:359
+#: inventory/manage/items.php:364
 msgid "C.O.G.S. Account:"
 msgstr ""
 
 #: admin/gl_setup.php:206 inventory/manage/item_categories.php:205
-#: inventory/manage/items.php:370
+#: inventory/manage/items.php:360
 msgid "Inventory Adjustments Account:"
 msgstr ""
 
 #: admin/gl_setup.php:208 inventory/manage/item_categories.php:209
-#: inventory/manage/items.php:381
+#: inventory/manage/items.php:371
 msgid "Item Assembly Costs Account:"
 msgstr ""
 
@@ -1259,27 +1317,31 @@ msgstr ""
 msgid "Chart"
 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:155
+#: admin/inst_chart.php:50 admin/inst_lang.php:36 admin/inst_lang.php.orig:36
+#: admin/inst_module.php:105 admin/inst_theme.php:74
+#: admin/inst_upgrade.php:155
 msgid "Installed"
 msgstr ""
 
-#: admin/inst_chart.php:50 admin/inst_lang.php:36 admin/inst_module.php:105
-#: admin/inst_theme.php:74 inventory/inquiry/stock_status.php:70
-#: reporting/rep303.php:102
+#: admin/inst_chart.php:50 admin/inst_lang.php:36 admin/inst_lang.php.orig:36
+#: admin/inst_module.php:105 admin/inst_theme.php:74
+#: inventory/inquiry/stock_status.php:77 reporting/rep303.php:102
 msgid "Available"
 msgstr ""
 
 #: admin/inst_chart.php:50 admin/inst_lang.php:35 admin/inst_lang.php:218
+#: admin/inst_lang.php.orig:35 admin/inst_lang.php.orig:218
 msgid "Encoding"
 msgstr ""
 
 #: admin/inst_chart.php:69 admin/inst_chart.php:71 admin/inst_lang.php:88
-#: admin/inst_module.php:128 admin/inst_module.php:129 admin/inst_theme.php:92
+#: admin/inst_lang.php.orig:88 admin/inst_module.php:128
+#: admin/inst_module.php:129 admin/inst_theme.php:92
 msgid "Unknown"
 msgstr ""
 
-#: admin/inst_chart.php:74 admin/inst_lang.php:103 admin/inst_module.php:133
+#: admin/inst_chart.php:74 admin/inst_lang.php:103
+#: admin/inst_lang.php.orig:103 admin/inst_module.php:133
 #: admin/inst_module.php:138 admin/inst_theme.php:96
 #: admin/inst_upgrade.php:137
 msgid "Install"
@@ -1296,11 +1358,11 @@ msgid ""
 "Do you want to continue ?"
 msgstr ""
 
-#: admin/inst_lang.php:23
+#: admin/inst_lang.php:23 admin/inst_lang.php.orig:23
 msgid "Install/Update Languages"
 msgstr ""
 
-#: admin/inst_lang.php:35 admin/printers.php:84
+#: admin/inst_lang.php:35 admin/inst_lang.php.orig:35 admin/printers.php:84
 #: admin/shipping_companies.php:91 dimensions/dimension_entry.php:271
 #: dimensions/inquiry/search_dimensions.php:129
 #: dimensions/view/view_dimension.php:54
@@ -1309,77 +1371,80 @@ msgstr ""
 #: purchasing/includes/ui/invoice_ui.inc:245
 #: purchasing/includes/ui/invoice_ui.inc:247
 #: purchasing/includes/ui/invoice_ui.inc:249 reporting/rep501.php:85
-#: reporting/rep709.php:107 sales/manage/customer_branches.php:294
-#: sales/manage/sales_people.php:99 taxes/item_tax_types.php:117
+#: reporting/rep709.php:109 reporting/rep709.php:110
+#: sales/manage/customer_branches.php:294 sales/manage/sales_people.php:99
+#: taxes/item_tax_types.php:117
 msgid "Name"
 msgstr ""
 
-#: admin/inst_lang.php:35 admin/inst_lang.php:220
+#: admin/inst_lang.php:35 admin/inst_lang.php:220 admin/inst_lang.php.orig:35
+#: admin/inst_lang.php.orig:220
 msgid "Right To Left"
 msgstr ""
 
-#: admin/inst_lang.php:47
+#: admin/inst_lang.php:47 admin/inst_lang.php.orig:47
 msgid "Supported"
 msgstr ""
 
-#: admin/inst_lang.php:49
+#: admin/inst_lang.php:49 admin/inst_lang.php.orig:49
 msgid "Display also languages not supported by server locales"
 msgstr ""
 
-#: admin/inst_lang.php:100
+#: admin/inst_lang.php:100 admin/inst_lang.php.orig:100
 msgid "Edit non standard language configuration"
 msgstr ""
 
-#: admin/inst_lang.php:104
+#: admin/inst_lang.php:104 admin/inst_lang.php.orig:104
 msgid "Upload and install latest language package"
 msgstr ""
 
-#: admin/inst_lang.php:111
+#: admin/inst_lang.php:111 admin/inst_lang.php.orig:111
 #, php-format
 msgid ""
 "You are about to remove language \\'%s\\'.\n"
 "Do you want to continue ?"
 msgstr ""
 
-#: admin/inst_lang.php:118
+#: admin/inst_lang.php:118 admin/inst_lang.php.orig:118
 msgid "The marked language is the current language which cannot be deleted."
 msgstr ""
 
-#: admin/inst_lang.php:120
+#: admin/inst_lang.php:120 admin/inst_lang.php.orig:120
 msgid "Update default"
 msgstr ""
 
-#: admin/inst_lang.php:122
+#: admin/inst_lang.php:122 admin/inst_lang.php.orig:122
 msgid "Add new language manually"
 msgstr ""
 
-#: admin/inst_lang.php:135
+#: admin/inst_lang.php:135 admin/inst_lang.php.orig:135
 msgid "Language name, code nor encoding cannot be empty"
 msgstr ""
 
-#: admin/inst_lang.php:140
+#: admin/inst_lang.php:140 admin/inst_lang.php.orig:140
 msgid ""
 "Standard package for this language is already installed. If you want to "
 "install this language manually, uninstall standard language package first."
 msgstr ""
 
-#: admin/inst_lang.php:216
+#: admin/inst_lang.php:216 admin/inst_lang.php.orig:216
 msgid "Language Code"
 msgstr ""
 
-#: admin/inst_lang.php:217
+#: admin/inst_lang.php:217 admin/inst_lang.php.orig:217
 msgid "Language Name"
 msgstr ""
 
-#: admin/inst_lang.php:221
+#: admin/inst_lang.php:221 admin/inst_lang.php.orig:221
 msgid "Default Language"
 msgstr ""
 
 #: admin/inst_lang.php:223 admin/inst_lang.php:224
+#: admin/inst_lang.php.orig:223 admin/inst_lang.php.orig:224
 msgid "Language File"
 msgstr ""
 
-#: admin/inst_lang.php:227
+#: admin/inst_lang.php:227 admin/inst_lang.php.orig:227
 msgid "Select your language files from your local harddisk."
 msgstr ""
 
@@ -1407,8 +1472,9 @@ msgstr ""
 msgid "Install third-party extension."
 msgstr ""
 
-#: admin/inst_module.php:169 includes/ui/ui_lists.inc:648
-#: includes/ui/ui_lists.inc:2120 reporting/includes/excel_report.inc:232
+#: admin/inst_module.php:169 includes/ui/sav.ui_lists.inc:659
+#: includes/ui/sav.ui_lists.inc:2131 includes/ui/ui_lists.inc:676
+#: includes/ui/ui_lists.inc:2152 reporting/includes/excel_report.inc:232
 #: reporting/includes/pdf_report.inc:264
 msgid "Active"
 msgstr ""
@@ -1502,7 +1568,7 @@ msgstr ""
 msgid "Save database and perform upgrade"
 msgstr ""
 
-#: admin/payment_terms.php:16 reporting/includes/doctext.inc:58
+#: admin/payment_terms.php:16 reporting/includes/doctext.inc:242
 #: sales/view/view_invoice.php:74 sales/view/view_sales_order.php:78
 msgid "Payment Terms"
 msgstr ""
@@ -1543,27 +1609,30 @@ msgstr ""
 #: dimensions/inquiry/search_dimensions.php:75
 #: dimensions/inquiry/search_dimensions.php:130
 #: dimensions/view/view_dimension.php:54 gl/bank_account_reconcile.php:233
-#: gl/inquiry/bank_inquiry.php:67 gl/inquiry/gl_account_inquiry.php:125
-#: gl/inquiry/journal_inquiry.php:122 gl/inquiry/tax_inquiry.php:82
-#: gl/manage/bank_accounts.php:102 gl/manage/gl_quick_entries.php:186
-#: gl/view/accrual_trans.php:52 gl/includes/ui/gl_bank_ui.inc:80
-#: includes/ui/ui_view.inc:480 inventory/inquiry/stock_movements.php:76
+#: gl/inquiry/bank_inquiry.php:70 gl/inquiry/gl_account_inquiry.php:126
+#: gl/inquiry/journal_inquiry.php:129 gl/inquiry/tax_inquiry.php:82
+#: gl/manage/bank_accounts.php:106 gl/manage/bank_accounts.php.orig:106
+#: gl/manage/gl_quick_entries.php:186 gl/view/accrual_trans.php:52
+#: gl/includes/ui/gl_bank_ui.inc:92 gl/includes/ui/gl_bank_ui.inc.orig:80
+#: includes/ui/ui_view.inc:488 inventory/inquiry/stock_movements.php:81
 #: inventory/manage/item_categories.php:98
 #: manufacturing/search_work_orders.php:161
 #: 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:125
-#: purchasing/inquiry/supplier_inquiry.php:162 reporting/rep102.php:124
-#: reporting/rep202.php:127 reporting/rep501.php:85 reporting/rep601.php:76
-#: reporting/rep702.php:58 reporting/rep704.php:78 reporting/rep704.php:81
-#: reporting/rep704.php:84 reporting/rep709.php:103 reporting/rep710.php:76
-#: reporting/rep710.php:84 reporting/reports_main.php:237
-#: reporting/reports_main.php:384 reporting/includes/doctext.inc:44
-#: reporting/includes/doctext.inc:54
-#: sales/inquiry/customer_allocation_inquiry.php:141
-#: sales/inquiry/customer_inquiry.php:212
+#: purchasing/inquiry/supplier_allocation_inquiry.php:126
+#: purchasing/inquiry/supplier_inquiry.php:168
+#: purchasing/inquiry/supplier_inquiry.php.orig:162 reporting/rep102.php:132
+#: reporting/rep202.php:137 reporting/rep501.php:85 reporting/rep601.php:76
+#: reporting/rep702.php:58 reporting/rep704.php:79 reporting/rep704.php:82
+#: reporting/rep704.php:85 reporting/rep709.php:105 reporting/rep710.php:76
+#: reporting/rep710.php:84 reporting/reports_main.php:252
+#: reporting/reports_main.php:399 reporting/includes/doctext.inc:140
+#: reporting/includes/doctext.inc:181 reporting/includes/doctext.inc:200
+#: sales/inquiry/customer_allocation_inquiry.php:144
+#: sales/inquiry/customer_inquiry.php:224
+#: sales/inquiry/customer_inquiry.php.orig:224
 msgid "Type"
 msgstr ""
 
@@ -1755,9 +1824,11 @@ msgstr ""
 msgid "Role:"
 msgstr ""
 
-#: admin/security_roles.php:180 gl/manage/gl_accounts.php:199
-#: inventory/manage/items.php:253 purchasing/manage/suppliers.php:281
-#: sales/manage/customers.php:282
+#: admin/security_roles.php:180 gl/manage/gl_accounts.php:198
+#: gl/manage/gl_accounts.php.orig:198 inventory/manage/items.php:433
+#: purchasing/manage/suppliers.php:289 sales/manage/customers.php:324
+#: sales/manage/customers.php.orig:321 sales/manage/customers.php:326
+#: gl/manage/gl_accounts.php:199
 msgid "Show inactive:"
 msgstr ""
 
@@ -1797,29 +1868,31 @@ msgstr ""
 msgid "Delete This Role"
 msgstr ""
 
-#: admin/security_roles.php:249 admin/void_transaction.php:212
-#: gl/manage/gl_quick_entries.php:61 gl/includes/ui/gl_bank_ui.inc:248
-#: gl/includes/ui/gl_journal_ui.inc:223 includes/ui/simple_crud_class.inc:58
-#: includes/ui/simple_crud_class.inc:231 includes/ui/ui_controls.inc:562
-#: includes/ui/ui_controls.inc.orig:561 includes/ui/ui_input.inc:206
-#: inventory/includes/item_adjustments_ui.inc:159
+#: admin/security_roles.php:249 admin/void_transaction.php:229
+#: gl/manage/gl_quick_entries.php:61 gl/includes/ui/gl_bank_ui.inc:277
+#: gl/includes/ui/gl_bank_ui.inc.orig:259 gl/includes/ui/gl_journal_ui.inc:223
+#: includes/ui/radio.ui_input.inc:209 includes/ui/simple_crud_class.inc:58
+#: includes/ui/simple_crud_class.inc:231 includes/ui/ui_controls.inc:587
+#: includes/ui/ui_input.inc:209 inventory/includes/item_adjustments_ui.inc:159
 #: inventory/includes/stock_transfers_ui.inc:139
-#: inventory/manage/items.php:426
+#: inventory/manage/items.php:416
 #: manufacturing/includes/work_order_issue_ui.inc:133
 #: purchasing/includes/ui/po_ui.inc:444
 #: sales/includes/ui/sales_credit_ui.inc:295
 #: sales/includes/ui/sales_order_ui.inc:557
+#: sales/includes/ui/sales_order_ui.inc:561 includes/ui/ui_input.inc:210
 msgid "Cancel"
 msgstr ""
 
-#: admin/security_roles.php:249 inventory/manage/items.php:426
+#: admin/security_roles.php:249 inventory/manage/items.php:416
 msgid "Cancel Edition"
 msgstr ""
 
-#: admin/shipping_companies.php:15 reporting/includes/doctext.inc:32
-#: sales/customer_credit_invoice.php:254 sales/customer_delivery.php:365
-#: sales/customer_invoice.php:407 sales/view/view_credit.php:74
-#: sales/view/view_dispatch.php:92 sales/view/view_invoice.php:91
+#: admin/shipping_companies.php:15 sales/customer_credit_invoice.php:256
+#: sales/customer_delivery.php:368 sales/customer_invoice.php:420
+#: sales/view/view_credit.php:74 sales/view/view_dispatch.php:92
+#: sales/view/view_invoice.php:91 sales/customer_credit_invoice.php:254
+#: sales/customer_invoice.php:422
 msgid "Shipping Company"
 msgstr ""
 
@@ -1864,24 +1937,24 @@ msgid "Secondary Phone"
 msgstr ""
 
 #: admin/shipping_companies.php:91 inventory/manage/locations.php:146
-#: reporting/includes/doctext.inc:77
 msgid "Address"
 msgstr ""
 
-#: admin/shipping_companies.php:134 gl/manage/gl_account_types.php:182
-#: gl/includes/ui/gl_bank_ui.inc:55 inventory/manage/items.php:309
-#: manufacturing/manage/work_centres.php:137
+#: admin/shipping_companies.php:134 gl/manage/gl_account_types.php:188
+#: gl/includes/ui/gl_bank_ui.inc:56 gl/includes/ui/gl_bank_ui.inc.orig:55
+#: inventory/manage/items.php:299 manufacturing/manage/work_centres.php:137
 msgid "Name:"
 msgstr ""
 
-#: admin/shipping_companies.php:136 purchasing/manage/suppliers.php:104
+#: admin/shipping_companies.php:136 purchasing/manage/suppliers.php:158
 #: sales/manage/customer_branches.php:259
 msgid "Contact Person:"
 msgstr ""
 
 #: admin/shipping_companies.php:140 includes/ui/contacts_view.inc:103
-#: inventory/manage/locations.php:205 purchasing/manage/suppliers.php:106
-#: sales/manage/customer_branches.php:261
+#: inventory/manage/locations.php:205 purchasing/manage/suppliers.php:130
+#: sales/manage/customer_branches.php:261 sales/manage/customers.php:253
+#: sales/manage/customers.php.orig:250
 msgid "Secondary Phone Number:"
 msgstr ""
 
@@ -1893,11 +1966,11 @@ msgstr ""
 msgid "Unspecified tag type"
 msgstr ""
 
-#: admin/tags.php:40 reporting/reports_main.php:258
-#: reporting/reports_main.php:266 reporting/reports_main.php:277
-#: reporting/reports_main.php:305 reporting/reports_main.php:312
-#: reporting/reports_main.php:322 reporting/reports_main.php:347
-#: reporting/reports_main.php:353 reporting/reports_main.php:362
+#: admin/tags.php:40 reporting/reports_main.php:273
+#: reporting/reports_main.php:281 reporting/reports_main.php:292
+#: reporting/reports_main.php:320 reporting/reports_main.php:327
+#: reporting/reports_main.php:337 reporting/reports_main.php:362
+#: reporting/reports_main.php:368 reporting/reports_main.php:377
 msgid "Account Tags"
 msgstr ""
 
@@ -1972,7 +2045,7 @@ msgstr ""
 
 #: admin/users.php:114 includes/ui/contacts_view.inc:41
 #: inventory/manage/locations.php:146 reporting/rep106.php:86
-#: reporting/includes/header2.inc:86 sales/manage/sales_people.php:99
+#: reporting/includes/header2.inc:98 sales/manage/sales_people.php:99
 msgid "Phone"
 msgstr ""
 
@@ -2018,12 +2091,13 @@ msgid "View or Print Transactions"
 msgstr ""
 
 #: admin/view_print_transaction.php:43 admin/view_print_transaction.php:45
-#: admin/view_print_transaction.php:129 includes/ui/ui_controls.inc:172
-#: includes/ui/ui_controls.inc.orig:172
-#: purchasing/inquiry/po_search_completed.php:108
-#: purchasing/inquiry/po_search.php:93 sales/inquiry/customer_inquiry.php:197
+#: admin/view_print_transaction.php:129 includes/ui/ui_controls.inc:188
+#: purchasing/inquiry/po_search_completed.php:113
+#: purchasing/inquiry/po_search.php:93 sales/inquiry/customer_inquiry.php:209
+#: sales/inquiry/customer_inquiry.php.orig:209
 #: sales/inquiry/sales_deliveries_view.php:160
-#: sales/inquiry/sales_orders_view.php:116
+#: sales/inquiry/sales_orders_view.php:119
+#: sales/inquiry/sales_orders_view.php.orig:117
 msgid "Print"
 msgstr ""
 
@@ -2031,26 +2105,29 @@ msgstr ""
 msgid "Only documents can be printed."
 msgstr ""
 
-#: admin/view_print_transaction.php:79
+#: admin/view_print_transaction.php:79 admin/void_transaction.php:166
 msgid "from #:"
 msgstr ""
 
-#: admin/view_print_transaction.php:81
+#: admin/view_print_transaction.php:81 admin/void_transaction.php:168
 msgid "to #:"
 msgstr ""
 
-#: admin/view_print_transaction.php:83
+#: admin/view_print_transaction.php:83 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:453
-#: purchasing/inquiry/po_search_completed.php:74
+#: purchasing/inquiry/po_search_completed.php:77
 #: purchasing/inquiry/po_search.php:76
 #: purchasing/inquiry/supplier_allocation_inquiry.php:57
-#: purchasing/inquiry/supplier_inquiry.php:54
+#: purchasing/inquiry/supplier_inquiry.php:58
+#: purchasing/inquiry/supplier_inquiry.php.orig:54
 #: sales/inquiry/customer_allocation_inquiry.php:51
-#: sales/inquiry/customer_inquiry.php:54
+#: sales/inquiry/customer_inquiry.php:58
+#: sales/inquiry/customer_inquiry.php.orig:58
 #: sales/inquiry/sales_deliveries_view.php:116
-#: sales/inquiry/sales_orders_view.php:238
+#: sales/inquiry/sales_orders_view.php:247
+#: sales/inquiry/sales_orders_view.php.orig:245
 msgid "Search"
 msgstr ""
 
@@ -2066,13 +2143,13 @@ msgid ""
 "zero."
 msgstr ""
 
-#: admin/view_print_transaction.php:127 admin/void_transaction.php:165
+#: admin/view_print_transaction.php:127 admin/void_transaction.php:182
 #: dimensions/inquiry/search_dimensions.php:128
 #: dimensions/view/view_dimension.php:54 gl/bank_account_reconcile.php:235
-#: gl/inquiry/bank_inquiry.php:67 gl/inquiry/journal_inquiry.php:124
+#: 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:75
 #: gl/view/gl_payment_view.php:73 gl/view/gl_trans_view.php:35
-#: includes/ui/contacts_view.inc:41 inventory/inquiry/stock_movements.php:76
+#: includes/ui/contacts_view.inc:41 inventory/inquiry/stock_movements.php:81
 #: 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
@@ -2086,43 +2163,47 @@ msgstr ""
 #: purchasing/includes/ui/po_ui.inc:314 purchasing/view/view_po.php:115
 #: purchasing/view/view_supp_credit.php:43
 #: purchasing/view/view_supp_invoice.php:46
-#: purchasing/view/view_supp_payment.php:70
-#: purchasing/inquiry/po_search_completed.php:117
+#: purchasing/view/view_supp_payment.php:73
+#: purchasing/inquiry/po_search_completed.php:122
 #: purchasing/inquiry/po_search.php:131
-#: purchasing/inquiry/supplier_allocation_inquiry.php:127
-#: purchasing/inquiry/supplier_inquiry.php:164
+#: purchasing/inquiry/supplier_allocation_inquiry.php:128
+#: purchasing/inquiry/supplier_inquiry.php:170
+#: purchasing/inquiry/supplier_inquiry.php.orig:164
 #: purchasing/allocations/supplier_allocation_main.php:96
 #: reporting/rep501.php:85 reporting/rep601.php:76 reporting/rep702.php:51
-#: reporting/includes/doctext.inc:47 sales/customer_credit_invoice.php:245
-#: sales/customer_credit_invoice.php:247 sales/customer_delivery.php:345
-#: sales/customer_delivery.php:347 sales/customer_invoice.php:386
-#: sales/customer_invoice.php:388
+#: reporting/includes/doctext.inc:199 sales/customer_credit_invoice.php:247
+#: sales/customer_credit_invoice.php:249 sales/customer_delivery.php:348
+#: sales/customer_delivery.php:350 sales/customer_invoice.php:392
+#: sales/customer_invoice.php:394
 #: sales/allocations/customer_allocation_main.php:95
 #: sales/view/view_dispatch.php:85 sales/view/view_invoice.php:84
 #: sales/view/view_receipt.php:50 sales/view/view_sales_order.php:81
-#: sales/inquiry/customer_allocation_inquiry.php:143
-#: sales/inquiry/customer_inquiry.php:215
+#: sales/inquiry/customer_allocation_inquiry.php:146
+#: sales/inquiry/customer_inquiry.php:227
+#: sales/inquiry/customer_inquiry.php.orig:227
 #: sales/inquiry/sales_deliveries_view.php:184
 #: sales/includes/ui/sales_credit_ui.inc:85
 #: sales/includes/ui/sales_credit_ui.inc:87
 #: sales/includes/ui/sales_order_ui.inc:373
+#: sales/customer_credit_invoice.php:245 sales/customer_invoice.php:396
+#: sales/includes/ui/sales_order_ui.inc:377
 msgid "Reference"
 msgstr ""
 
-#: admin/view_print_transaction.php:128 admin/void_transaction.php:166
+#: admin/view_print_transaction.php:128 admin/void_transaction.php:183
 #: dimensions/inquiry/search_dimensions.php:131
 #: dimensions/view/view_dimension.php:54 gl/accruals.php:90
 #: gl/accruals.php:195 gl/bank_account_reconcile.php:236
-#: gl/inquiry/bank_inquiry.php:67 gl/inquiry/gl_account_inquiry.php:125
-#: gl/inquiry/journal_inquiry.php:121 gl/view/accrual_trans.php:52
+#: gl/inquiry/bank_inquiry.php:70 gl/inquiry/gl_account_inquiry.php:126
+#: gl/inquiry/journal_inquiry.php:128 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:263 includes/ui/ui_view.inc:480
-#: inventory/inquiry/stock_movements.php:76
+#: includes/ui/allocation_cart.inc:263 includes/ui/ui_view.inc:488
+#: inventory/inquiry/stock_movements.php:81
 #: inventory/view/view_adjustment.php:45 inventory/view/view_transfer.php:47
 #: manufacturing/search_work_orders.php:166
-#: manufacturing/work_order_entry.php:418
-#: manufacturing/work_order_entry.php:424
+#: manufacturing/work_order_entry.php:419
+#: manufacturing/work_order_entry.php:425
 #: manufacturing/view/wo_production_view.php:45
 #: manufacturing/includes/manufacturing_ui.inc:157
 #: manufacturing/includes/manufacturing_ui.inc:200
@@ -2132,24 +2213,26 @@ msgstr ""
 #: manufacturing/includes/manufacturing_ui.inc:332
 #: purchasing/includes/ui/invoice_ui.inc:103
 #: purchasing/includes/ui/po_ui.inc:328 purchasing/view/view_po.php:140
-#: purchasing/inquiry/supplier_allocation_inquiry.php:130
-#: purchasing/inquiry/supplier_inquiry.php:167
+#: purchasing/inquiry/supplier_allocation_inquiry.php:131
+#: purchasing/inquiry/supplier_inquiry.php:173
+#: purchasing/inquiry/supplier_inquiry.php.orig:167
 #: purchasing/allocations/supplier_allocation_main.php:97
 #: reporting/rep101.php:130 reporting/rep201.php:118 reporting/rep501.php:85
-#: reporting/rep601.php:76 reporting/rep704.php:78 reporting/rep704.php:81
-#: reporting/rep704.php:84 reporting/rep709.php:107 reporting/rep710.php:75
-#: reporting/includes/doctext.inc:15 reporting/includes/doctext.inc:110
-#: reporting/includes/doctext.inc:118 sales/customer_delivery.php:375
-#: sales/customer_invoice.php:417
+#: reporting/rep601.php:76 reporting/rep704.php:79 reporting/rep704.php:82
+#: reporting/rep704.php:85 reporting/rep709.php:109 reporting/rep710.php:75
+#: reporting/includes/doctext.inc:145 reporting/includes/doctext.inc:186
+#: reporting/includes/doctext.inc:224 reporting/includes/header2.inc:135
+#: sales/customer_delivery.php:378 sales/customer_invoice.php:430
 #: sales/allocations/customer_allocation_main.php:96
 #: sales/view/view_credit.php:69 sales/view/view_sales_order.php:96
 #: sales/view/view_sales_order.php:129 sales/view/view_sales_order.php:161
-#: sales/inquiry/customer_allocation_inquiry.php:145
-#: sales/inquiry/customer_inquiry.php:216
+#: sales/inquiry/customer_allocation_inquiry.php:148
+#: sales/inquiry/customer_inquiry.php:228
+#: sales/inquiry/customer_inquiry.php.orig:228 sales/customer_invoice.php:432
 msgid "Date"
 msgstr ""
 
-#: admin/view_print_transaction.php:130 admin/void_transaction.php:167
+#: admin/view_print_transaction.php:130 admin/void_transaction.php:184
 #: includes/ui/ui_view.inc:51
 msgid "GL"
 msgstr ""
@@ -2158,163 +2241,257 @@ msgstr ""
 msgid "Void a Transaction"
 msgstr ""
 
-#: admin/void_transaction.php:119 admin/void_transaction.php:168
-#: includes/ui/ui_input.inc:136 includes/ui/ui_input.inc:277
-#: includes/ui/ui_lists.inc:20
+#: admin/void_transaction.php:126 admin/void_transaction.php:185
+#: includes/ui/radio.ui_input.inc:136 includes/ui/radio.ui_input.inc:280
+#: includes/ui/sav.ui_lists.inc:20 includes/ui/ui_input.inc:136
+#: includes/ui/ui_input.inc:280 includes/ui/ui_lists.inc:20
+#: includes/ui/ui_input.inc:137 includes/ui/ui_input.inc:281
 msgid "Select"
 msgstr ""
 
-#: admin/void_transaction.php:151
-msgid "Transaction Type:"
-msgstr ""
-
-#: admin/void_transaction.php:187
+#: admin/void_transaction.php:204
 msgid "Transaction #:"
 msgstr ""
 
-#: admin/void_transaction.php:189
+#: admin/void_transaction.php:206
 msgid "Voiding Date:"
 msgstr ""
 
-#: admin/void_transaction.php:191 dimensions/dimension_entry.php:283
-#: gl/bank_transfer.php:91 gl/inquiry/journal_inquiry.php:56
-#: gl/manage/revaluate_currencies.php:103 includes/ui/ui_view.inc:308
+#: admin/void_transaction.php:208 dimensions/dimension_entry.php:283
+#: gl/bank_transfer.php:93 gl/inquiry/journal_inquiry.php:56
+#: gl/manage/revaluate_currencies.php:106 includes/ui/ui_view.inc:308
 #: manufacturing/work_order_add_finished.php:210
-#: manufacturing/work_order_entry.php:450
+#: manufacturing/work_order_entry.php:451
 #: manufacturing/work_order_release.php:100
-#: purchasing/includes/ui/invoice_ui.inc:161 purchasing/po_entry_items.php:511
-#: purchasing/supplier_payment.php:308 sales/customer_payments.php:291
+#: purchasing/includes/ui/invoice_ui.inc:161 purchasing/po_entry_items.php:518
+#: purchasing/supplier_payment.php:313 sales/customer_payments.php:411
+#: gl/bank_transfer.php:98 purchasing/po_entry_items.php:522
+#: purchasing/supplier_payment.php:316 sales/customer_payments.php:414
+#: sales/customer_payments.php.orig:413
 msgid "Memo:"
 msgstr ""
 
-#: admin/void_transaction.php:196 admin/void_transaction.php:205
+#: admin/void_transaction.php:213 admin/void_transaction.php:222
 msgid "Void Transaction"
 msgstr ""
 
-#: admin/void_transaction.php:201 admin/void_transaction.php:280
+#: admin/void_transaction.php:218 admin/void_transaction.php:297
 msgid "The entered transaction does not exist or cannot be voided."
 msgstr ""
 
-#: admin/void_transaction.php:209
+#: admin/void_transaction.php:226
 msgid ""
 "Are you sure you want to void this transaction ? This action cannot be "
 "undone."
 msgstr ""
 
-#: admin/void_transaction.php:211 includes/ui/ui_controls.inc:561
-#: includes/ui/ui_controls.inc.orig:560
+#: admin/void_transaction.php:228 includes/ui/ui_controls.inc:586
 msgid "Proceed"
 msgstr ""
 
-#: admin/void_transaction.php:225
+#: admin/void_transaction.php:242
 msgid "The selected transaction was closed for edition and cannot be voided."
 msgstr ""
 
-#: admin/void_transaction.php:231 gl/accruals.php:32 gl/bank_transfer.php:108
-#: gl/gl_journal.php:154 gl/manage/exchange_rates.php:33
-#: gl/manage/revaluate_currencies.php:50
+#: admin/void_transaction.php:248 gl/accruals.php:32 gl/bank_transfer.php:110
+#: gl/gl_journal.php:156 gl/manage/exchange_rates.php:33
+#: gl/manage/revaluate_currencies.php:53
 #: manufacturing/work_order_add_finished.php:98
 #: manufacturing/work_order_costs.php:83 purchasing/po_receive_items.php:174
-#: purchasing/supplier_payment.php:179 sales/customer_credit_invoice.php:89
-#: sales/sales_order_entry.php:341
+#: purchasing/supplier_payment.php:179 sales/customer_credit_invoice.php:91
+#: sales/sales_order_entry.php:340 sales/manage/recurrent_invoices.php:41
+#: sales/manage/recurrent_invoices.php:46
+#: sales/manage/recurrent_invoices.php:51 gl/bank_transfer.php:115
+#: purchasing/supplier_payment.php:174 sales/sales_order_entry.php:349
+#: sales/sales_order_entry.php.orig:348
 msgid "The entered date is invalid."
 msgstr ""
 
-#: admin/void_transaction.php:237 gl/accruals.php:38 gl/bank_transfer.php:114
-#: gl/gl_bank.php:256 gl/gl_journal.php:160
-#: gl/manage/revaluate_currencies.php:56 inventory/adjustments.php:114
+#: admin/void_transaction.php:254 gl/accruals.php:38 gl/bank_transfer.php:116
+#: gl/gl_bank.php:267 gl/gl_journal.php:162
+#: gl/manage/revaluate_currencies.php:59 inventory/adjustments.php:116
 #: inventory/transfers.php:111 manufacturing/work_order_add_finished.php:104
 #: manufacturing/work_order_costs.php:89
-#: manufacturing/work_order_entry.php:159
+#: manufacturing/work_order_entry.php:160
 #: manufacturing/work_order_issue.php:85 purchasing/supplier_credit.php:176
 #: purchasing/supplier_invoice.php:174 purchasing/supplier_payment.php:185
-#: sales/create_recurrent_invoices.php:92 sales/credit_note_entry.php:159
-#: sales/customer_credit_invoice.php:93 sales/customer_payments.php:100
+#: sales/create_recurrent_invoices.php:108 sales/credit_note_entry.php:161
+#: sales/customer_credit_invoice.php:95 sales/customer_payments.php:145
+#: sales/create_recurrent_invoices.php:119 sales/credit_note_entry.php:157
+#: gl/bank_transfer.php:121 purchasing/supplier_payment.php:180
+#: sales/customer_payments.php.orig:145
 msgid "The entered date is not in fiscal year."
 msgstr ""
 
-#: admin/void_transaction.php:244
+#: admin/void_transaction.php:261
 msgid "The transaction number is expected to be numeric and greater than zero."
 msgstr ""
 
-#: admin/void_transaction.php:261
+#: admin/void_transaction.php:278
 msgid "The selected transaction has already been voided."
 msgstr ""
 
-#: admin/void_transaction.php:274
+#: admin/void_transaction.php:291
 msgid "Selected transaction has been voided."
 msgstr ""
 
-#: admin/db/fiscalyears_db.inc:124
+#: admin/db/current_user.inc:96 includes/current_user.inc:87
+#: includes/ldap.current_user.inc:96 includes/current_user.inc:89
+msgid ""
+"Before software upgrade you have to include old $security_groups and "
+"$security_headings arrays from old config.php file to the new one."
+msgstr ""
+
+#: admin/db/current_user.inc:97 includes/current_user.inc:88
+#: includes/ldap.current_user.inc:97 includes/ui/ui_controls.inc:190
+#: includes/ui/ui_view.inc:843 includes/ui/ui_view.inc:844
+#: includes/current_user.inc:90
+msgid "Back"
+msgstr ""
+
+#: admin/db/current_user.inc:107 includes/current_user.inc:98
+#: includes/ldap.current_user.inc:107 includes/current_user.inc:100
+msgid "System is available for site admin only until full database upgrade"
+msgstr ""
+
+#: admin/db/current_user.inc:445 includes/current_user.inc:450
+#: includes/ldap.current_user.inc:544 includes/current_user.inc:452
+msgid "Requesting data..."
+msgstr ""
+
+#: admin/db/fiscalyears_db.inc:136
 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:129
+#: admin/db/fiscalyears_db.inc:141
 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/db/fiscalyears_db.inc:154 admin/db/fiscalyears_db.inc:156
+#: admin/db/fiscalyears_db.inc:166 admin/db/fiscalyears_db.inc:168
 msgid "Closing Year"
 msgstr ""
 
-#: admin/db/fiscalyears_db.inc:202 reporting/rep101.php:175
+#: admin/db/fiscalyears_db.inc:214 reporting/rep101.php:175
 #: reporting/rep201.php:167 reporting/rep706.php:181
 msgid "Open Balance"
 msgstr ""
 
-#: admin/db/maintenance_db.inc:150
+#: admin/db/maintenance_db.inc:152 admin/db/maintenance_db.inc.orig:150
 #, php-format
 msgid "Cannot open the extension setup file '%s' for writing."
 msgstr ""
 
-#: admin/db/maintenance_db.inc:158
+#: admin/db/maintenance_db.inc:160 admin/db/maintenance_db.inc.orig:158
 #, php-format
 msgid "Cannot write to the extensions setup file '%s'."
 msgstr ""
 
-#: admin/db/maintenance_db.inc:176
+#: admin/db/maintenance_db.inc:178 admin/db/maintenance_db.inc.orig:176
 msgid "Cannot update system extensions list."
 msgstr ""
 
-#: admin/db/maintenance_db.inc:194
+#: admin/db/maintenance_db.inc:196 admin/db/maintenance_db.inc.orig:194
 #, php-format
 msgid "Cannot update extensions list for company '%s'."
 msgstr ""
 
-#: admin/db/maintenance_db.inc:231
+#: admin/db/maintenance_db.inc:233 admin/db/maintenance_db.inc.orig:231
 msgid "Cannot open the languages file - "
 msgstr ""
 
-#: admin/db/maintenance_db.inc:238
+#: admin/db/maintenance_db.inc:240 admin/db/maintenance_db.inc.orig:238
 msgid "Cannot write to the language file - "
 msgstr ""
 
-#: admin/db/maintenance_db.inc:248
+#: admin/db/maintenance_db.inc:250 admin/db/maintenance_db.inc.orig:248
 msgid "The language files folder "
 msgstr ""
 
-#: admin/db/maintenance_db.inc:386
+#: admin/db/maintenance_db.inc:389 admin/db/maintenance_db.inc.orig:387
+#: admin/db/connect_db2.inc:156
 #, php-format
 msgid "SQL script execution failed in line %d: %s"
 msgstr ""
 
-#: admin/db/users_db.inc:196
+#: admin/db/session.inc:133 includes/session.inc:133
+#: includes/session.inc.ldap.inc:39
+msgid "Incorrect Password"
+msgstr ""
+
+#: admin/db/session.inc:134 includes/session.inc:134
+#: includes/session.inc.ldap.inc:40
+msgid "The user and password combination is not valid for the system."
+msgstr ""
+
+#: admin/db/session.inc:136 includes/session.inc:136
+#: includes/session.inc.ldap.inc:42
+msgid ""
+"If you are not an authorized user, please contact your system administrator "
+"to obtain an account to enable you to use the system."
+msgstr ""
+
+#: admin/db/session.inc:137 includes/session.inc:137
+#: includes/session.inc.ldap.inc:43
+msgid "Try again"
+msgstr ""
+
+#: admin/db/session.inc:156 includes/session.inc:156
+#: includes/session.inc.ldap.inc:62 includes/session.inc:216
+msgid "Security settings have not been defined for your user account."
+msgstr ""
+
+#: admin/db/session.inc:157 includes/session.inc:157
+#: includes/session.inc.ldap.inc:63 includes/session.inc:217
+msgid "Please contact your system administrator."
+msgstr ""
+
+#: admin/db/session.inc:158 includes/session.inc:158
+#: includes/session.inc.ldap.inc:64 includes/session.inc:218
+msgid ""
+"Please remove $security_groups and $security_headings arrays from config.php "
+"file!"
+msgstr ""
+
+#: admin/db/session.inc:160 includes/session.inc:160
+#: includes/session.inc.ldap.inc:66 includes/session.inc:220
+msgid ""
+"Access to application has been blocked until database upgrade is completed "
+"by system administrator."
+msgstr ""
+
+#: admin/db/session.inc:174 includes/session.inc:174
+#: includes/session.inc.ldap.inc:80 includes/session.inc:234
+msgid ""
+"The security settings on your account do not permit you to access this "
+"function"
+msgstr ""
+
+#: admin/db/session.inc:183 includes/session.inc:183
+#: includes/session.inc.ldap.inc:89 includes/session.inc:243
+msgid ""
+"System is blocked after source upgrade until database is updated on System/"
+"Software Upgrade page"
+msgstr ""
+
+#: admin/db/users_db.inc:210 admin/db/users_db.inc.orig:210
 msgid "user online"
 msgstr ""
 
-#: admin/db/users_db.inc:196
+#: admin/db/users_db.inc:210 admin/db/users_db.inc.orig:210
 msgid "users online"
 msgstr ""
 
-#: admin/db/voiding_db.inc:107
-#: manufacturing/includes/db/work_orders_db.inc:494
-#: manufacturing/includes/db/work_orders_db.inc:519
+#: admin/db/voiding_db.inc:114
+#: manufacturing/includes/db/work_orders_db.inc:446
+#: manufacturing/includes/db/work_orders_db.inc:462
 #: sales/includes/db/sales_invoice_db.inc:205
+#: sales/includes/db/sales_invoice_db.inc.orig:208
+#: sales/includes/db/sales_invoice_db.inc:206
 msgid "Voided."
 msgstr ""
 
@@ -2405,7 +2582,7 @@ msgstr ""
 #: applications/customers.php:61 applications/dimensions.php:34
 #: applications/generalledger.php:55 applications/inventory.php:32
 #: applications/manufacturing.php:34 applications/setup.php:54
-#: applications/suppliers.php:50
+#: applications/setup.php.orig:54 applications/suppliers.php:50
 msgid "Maintenance"
 msgstr ""
 
@@ -2513,8 +2690,8 @@ msgstr ""
 msgid "Ta&x Inquiry"
 msgstr ""
 
-#: applications/generalledger.php:44 reporting/reports_main.php:282
-#: reporting/reports_main.php:327 reporting/reports_main.php:367
+#: applications/generalledger.php:44 reporting/reports_main.php:297
+#: reporting/reports_main.php:342 reporting/reports_main.php:382
 msgid "Trial &Balance"
 msgstr ""
 
@@ -2647,6 +2824,7 @@ msgid "&Manufacturing"
 msgstr ""
 
 #: applications/manufacturing.php:19 sales/sales_order_entry.php:112
+#: sales/sales_order_entry.php:120 sales/sales_order_entry.php.orig:120
 msgid "Work &Order Entry"
 msgstr ""
 
@@ -2679,115 +2857,115 @@ msgstr ""
 msgid "&Work Centres"
 msgstr ""
 
-#: applications/setup.php:16
+#: applications/setup.php:16 applications/setup.php.orig:16
 msgid "S&etup"
 msgstr ""
 
-#: applications/setup.php:19
+#: applications/setup.php:19 applications/setup.php.orig:19
 msgid "&Company Setup"
 msgstr ""
 
-#: applications/setup.php:21
+#: applications/setup.php:21 applications/setup.php.orig:21
 msgid "&User Accounts Setup"
 msgstr ""
 
-#: applications/setup.php:23
+#: applications/setup.php:23 applications/setup.php.orig:23
 msgid "&Access Setup"
 msgstr ""
 
-#: applications/setup.php:25
+#: applications/setup.php:25 applications/setup.php.orig:25
 msgid "&Display Setup"
 msgstr ""
 
-#: applications/setup.php:27
+#: applications/setup.php:27 applications/setup.php.orig:27
 msgid "&Forms Setup"
 msgstr ""
 
-#: applications/setup.php:29
+#: applications/setup.php:29 applications/setup.php.orig:29
 msgid "&Taxes"
 msgstr ""
 
-#: applications/setup.php:31
+#: applications/setup.php:31 applications/setup.php.orig:31
 msgid "Tax &Groups"
 msgstr ""
 
-#: applications/setup.php:33
+#: applications/setup.php:33 applications/setup.php.orig:33
 msgid "Item Ta&x Types"
 msgstr ""
 
-#: applications/setup.php:35
+#: applications/setup.php:35 applications/setup.php.orig:35
 msgid "System and &General GL Setup"
 msgstr ""
 
-#: applications/setup.php:37
+#: applications/setup.php:37 applications/setup.php.orig:37
 msgid "&Fiscal Years"
 msgstr ""
 
-#: applications/setup.php:39
+#: applications/setup.php:39 applications/setup.php.orig:39
 msgid "&Print Profiles"
 msgstr ""
 
-#: applications/setup.php:43
+#: applications/setup.php:43 applications/setup.php.orig:43
 msgid "Pa&yment Terms"
 msgstr ""
 
-#: applications/setup.php:45
+#: applications/setup.php:45 applications/setup.php.orig:45
 msgid "Shi&pping Company"
 msgstr ""
 
-#: applications/setup.php:47
+#: applications/setup.php:47 applications/setup.php.orig:47
 msgid "&Points of Sale"
 msgstr ""
 
-#: applications/setup.php:49
+#: applications/setup.php:49 applications/setup.php.orig:49
 msgid "&Printers"
 msgstr ""
 
-#: applications/setup.php:51
+#: applications/setup.php:51 applications/setup.php.orig:51
 msgid "Contact &Categories"
 msgstr ""
 
-#: applications/setup.php:55
+#: applications/setup.php:55 applications/setup.php.orig:55
 msgid "&Void a Transaction"
 msgstr ""
 
-#: applications/setup.php:57
+#: applications/setup.php:57 applications/setup.php.orig:57
 msgid "View or &Print Transactions"
 msgstr ""
 
-#: applications/setup.php:59
+#: applications/setup.php:59 applications/setup.php.orig:59
 msgid "&Attach Documents"
 msgstr ""
 
-#: applications/setup.php:61
+#: applications/setup.php:61 applications/setup.php.orig:61
 msgid "System &Diagnostics"
 msgstr ""
 
-#: applications/setup.php:64
+#: applications/setup.php:64 applications/setup.php.orig:64
 msgid "&Backup and Restore"
 msgstr ""
 
-#: applications/setup.php:66
+#: applications/setup.php:66 applications/setup.php.orig:66
 msgid "Create/Update &Companies"
 msgstr ""
 
-#: applications/setup.php:68
+#: applications/setup.php:68 applications/setup.php.orig:68
 msgid "Install/Update &Languages"
 msgstr ""
 
-#: applications/setup.php:70
+#: applications/setup.php:70 applications/setup.php.orig:70
 msgid "Install/Activate &Extensions"
 msgstr ""
 
-#: applications/setup.php:72
+#: applications/setup.php:72 applications/setup.php.orig:72
 msgid "Install/Activate &Themes"
 msgstr ""
 
-#: applications/setup.php:74
+#: applications/setup.php:74 applications/setup.php.orig:74
 msgid "Install/Activate &Chart of Accounts"
 msgstr ""
 
-#: applications/setup.php:76
+#: applications/setup.php:76 applications/setup.php.orig:76
 msgid "Software &Upgrade"
 msgstr ""
 
@@ -2879,17 +3057,26 @@ msgstr ""
 msgid "The dimension reference must be entered."
 msgstr ""
 
-#: dimensions/dimension_entry.php:123 gl/bank_transfer.php:160
-#: gl/gl_bank.php:244 gl/gl_journal.php:174
-#: gl/manage/revaluate_currencies.php:69 inventory/adjustments.php:101
+#: dimensions/dimension_entry.php:123 gl/bank_transfer.php:171
+#: gl/gl_bank.php:255 gl/gl_journal.php:176
+#: gl/manage/revaluate_currencies.php:72 inventory/adjustments.php:103
 #: inventory/transfers.php:99 manufacturing/work_order_add_finished.php:84
-#: manufacturing/work_order_entry.php:138
+#: manufacturing/work_order_entry.php:139
 #: manufacturing/work_order_issue.php:98 purchasing/po_entry_items.php:363
 #: purchasing/po_receive_items.php:195 purchasing/supplier_credit.php:156
 #: purchasing/supplier_invoice.php:154 purchasing/supplier_payment.php:208
-#: sales/credit_note_entry.php:149 sales/customer_credit_invoice.php:106
-#: sales/customer_delivery.php:169 sales/customer_invoice.php:280
-#: sales/customer_payments.php:112 sales/sales_order_entry.php:410
+#: sales/credit_note_entry.php:151 sales/customer_credit_invoice.php:108
+#: sales/customer_delivery.php:172 sales/customer_invoice.php:286
+#: sales/customer_payments.php:158 sales/customer_payments.php:165
+#: sales/customer_payments.php:246 sales/sales_order_entry.php:409
+#: sales/create_recurrent_invoices.php:55 sales/credit_note_entry.php:181
+#: sales/customer_credit_invoice.php:205 sales/customer_delivery.php:312
+#: sales/customer_invoice.php:319 sales/sales_order_entry.php:430
+#: gl/bank_transfer.php:176 purchasing/po_entry_items.php:366
+#: purchasing/supplier_payment.php:203 sales/customer_payments.php:248
+#: sales/customer_payments.php.orig:158 sales/customer_payments.php.orig:165
+#: sales/customer_payments.php.orig:248 sales/sales_order_entry.php:441
+#: sales/sales_order_entry.php.orig:440
 msgid "The entered reference is already in use."
 msgstr ""
 
@@ -2897,8 +3084,9 @@ msgstr ""
 msgid "The dimension name must be entered."
 msgstr ""
 
-#: dimensions/dimension_entry.php:138 manufacturing/work_order_entry.php:153
-#: manufacturing/work_order_entry.php:233 purchasing/po_entry_items.php:235
+#: dimensions/dimension_entry.php:138 manufacturing/work_order_entry.php:154
+#: manufacturing/work_order_entry.php:234 purchasing/po_entry_items.php:235
+#: purchasing/po_entry_items.php:238
 msgid "The date entered is in an invalid format."
 msgstr ""
 
@@ -2919,21 +3107,21 @@ msgid "Dimension Reference:"
 msgstr ""
 
 #: dimensions/dimension_entry.php:277 reporting/reports_main.php:34
-#: reporting/reports_main.php:67 reporting/reports_main.php:75
-#: reporting/reports_main.php:121 reporting/reports_main.php:184
-#: reporting/reports_main.php:192 reporting/reports_main.php:224
-#: reporting/reports_main.php:235 reporting/reports_main.php:246
-#: reporting/reports_main.php:262 reporting/reports_main.php:272
-#: reporting/reports_main.php:283 reporting/reports_main.php:295
-#: reporting/reports_main.php:309 reporting/reports_main.php:318
-#: reporting/reports_main.php:328 reporting/reports_main.php:339
-#: reporting/reports_main.php:351 reporting/reports_main.php:359
-#: reporting/reports_main.php:368 reporting/reports_main.php:376
-#: reporting/reports_main.php:382
+#: reporting/reports_main.php:60 reporting/reports_main.php:74
+#: reporting/reports_main.php:82 reporting/reports_main.php:134
+#: reporting/reports_main.php:199 reporting/reports_main.php:207
+#: reporting/reports_main.php:239 reporting/reports_main.php:250
+#: reporting/reports_main.php:261 reporting/reports_main.php:277
+#: reporting/reports_main.php:287 reporting/reports_main.php:298
+#: reporting/reports_main.php:310 reporting/reports_main.php:324
+#: reporting/reports_main.php:333 reporting/reports_main.php:343
+#: reporting/reports_main.php:354 reporting/reports_main.php:366
+#: reporting/reports_main.php:374 reporting/reports_main.php:383
+#: reporting/reports_main.php:391 reporting/reports_main.php:397
 msgid "Start Date"
 msgstr ""
 
-#: dimensions/dimension_entry.php:279 manufacturing/work_order_entry.php:419
+#: dimensions/dimension_entry.php:279 manufacturing/work_order_entry.php:420
 msgid "Date Required By"
 msgstr ""
 
@@ -2989,59 +3177,63 @@ msgid "Balance for this Dimension"
 msgstr ""
 
 #: dimensions/includes/dimensions_ui.inc:31 gl/accruals.php:90
-#: gl/inquiry/gl_account_inquiry.php:128 gl/inquiry/gl_trial_balance.php:173
+#: gl/inquiry/gl_account_inquiry.php:129 gl/inquiry/gl_trial_balance.php:171
 #: gl/manage/gl_quick_entries.php:241 gl/manage/gl_quick_entries.php:333
 #: includes/sysnames.inc:164 purchasing/includes/ui/invoice_ui.inc:245
 #: purchasing/includes/ui/invoice_ui.inc:247
-#: purchasing/includes/ui/invoice_ui.inc:249 reporting/rep701.php:106
+#: purchasing/includes/ui/invoice_ui.inc:249 reporting/rep701.php:109
 #: reporting/rep705.php:234 reporting/rep706.php:181 reporting/rep707.php:206
-#: reporting/rep708.php:80
+#: reporting/rep708.php:179
 msgid "Account"
 msgstr ""
 
 #: dimensions/includes/dimensions_ui.inc:31 gl/accruals.php:98
-#: gl/bank_account_reconcile.php:237 gl/inquiry/bank_inquiry.php:68
-#: gl/inquiry/gl_account_inquiry.php:140 gl/inquiry/gl_account_inquiry.php:142
-#: gl/inquiry/gl_trial_balance.php:179 gl/inquiry/gl_trial_balance.php:181
-#: gl/inquiry/gl_trial_balance.php:183 gl/view/accrual_trans.php:60
+#: gl/bank_account_reconcile.php:237 gl/inquiry/bank_inquiry.php:71
+#: gl/inquiry/gl_account_inquiry.php:141 gl/inquiry/gl_account_inquiry.php:143
+#: gl/inquiry/gl_trial_balance.php:177 gl/inquiry/gl_trial_balance.php:179
+#: gl/inquiry/gl_trial_balance.php:181 gl/view/accrual_trans.php:60
 #: gl/view/gl_trans_view.php:64 gl/view/gl_trans_view.php:67
 #: gl/view/gl_trans_view.php:70 gl/includes/ui/gl_journal_ui.inc:84
 #: gl/includes/ui/gl_journal_ui.inc:87 gl/includes/ui/gl_journal_ui.inc:90
-#: purchasing/inquiry/supplier_allocation_inquiry.php:133
-#: purchasing/inquiry/supplier_inquiry.php:170 reporting/rep601.php:77
-#: reporting/rep702.php:52 reporting/rep704.php:79 reporting/rep704.php:82
-#: reporting/rep704.php:85 reporting/rep708.php:80 reporting/rep708.php:81
-#: sales/inquiry/customer_allocation_inquiry.php:149
-#: sales/inquiry/customer_inquiry.php:221
+#: purchasing/inquiry/supplier_allocation_inquiry.php:134
+#: purchasing/inquiry/supplier_inquiry.php:176
+#: purchasing/inquiry/supplier_inquiry.php.orig:170 reporting/rep601.php:77
+#: reporting/rep702.php:52 reporting/rep704.php:80 reporting/rep704.php:83
+#: reporting/rep704.php:86 reporting/rep708.php:179 reporting/rep708.php:180
+#: sales/inquiry/customer_allocation_inquiry.php:152
+#: sales/inquiry/customer_inquiry.php:233
+#: sales/inquiry/customer_inquiry.php.orig:233
 msgid "Debit"
 msgstr ""
 
 #: dimensions/includes/dimensions_ui.inc:31 gl/accruals.php:98
-#: gl/bank_account_reconcile.php:238 gl/inquiry/bank_inquiry.php:68
-#: gl/inquiry/gl_account_inquiry.php:140 gl/inquiry/gl_account_inquiry.php:142
-#: gl/inquiry/gl_trial_balance.php:180 gl/inquiry/gl_trial_balance.php:182
-#: gl/inquiry/gl_trial_balance.php:184 gl/view/accrual_trans.php:60
+#: gl/bank_account_reconcile.php:238 gl/inquiry/bank_inquiry.php:71
+#: gl/inquiry/gl_account_inquiry.php:141 gl/inquiry/gl_account_inquiry.php:143
+#: gl/inquiry/gl_trial_balance.php:178 gl/inquiry/gl_trial_balance.php:180
+#: gl/inquiry/gl_trial_balance.php:182 gl/view/accrual_trans.php:60
 #: gl/view/gl_trans_view.php:64 gl/view/gl_trans_view.php:67
 #: gl/view/gl_trans_view.php:70 gl/includes/ui/gl_journal_ui.inc:84
 #: gl/includes/ui/gl_journal_ui.inc:87 gl/includes/ui/gl_journal_ui.inc:90
 #: includes/sysnames.inc:85
-#: purchasing/inquiry/supplier_allocation_inquiry.php:134
-#: purchasing/inquiry/supplier_inquiry.php:171 reporting/rep601.php:77
-#: reporting/rep702.php:52 reporting/rep704.php:79 reporting/rep704.php:82
-#: reporting/rep704.php:85 reporting/rep708.php:80 reporting/rep708.php:81
-#: sales/inquiry/customer_allocation_inquiry.php:150
-#: sales/inquiry/customer_inquiry.php:222
+#: purchasing/inquiry/supplier_allocation_inquiry.php:135
+#: purchasing/inquiry/supplier_inquiry.php:177
+#: purchasing/inquiry/supplier_inquiry.php.orig:171 reporting/rep601.php:77
+#: reporting/rep702.php:52 reporting/rep704.php:80 reporting/rep704.php:83
+#: reporting/rep704.php:86 reporting/rep708.php:179 reporting/rep708.php:180
+#: sales/inquiry/customer_allocation_inquiry.php:153
+#: sales/inquiry/customer_inquiry.php:234
+#: sales/inquiry/customer_inquiry.php.orig:234
 msgid "Credit"
 msgstr ""
 
 #: dimensions/includes/dimensions_ui.inc:45
-#: dimensions/inquiry/search_dimensions.php:134 gl/inquiry/bank_inquiry.php:68
-#: gl/inquiry/gl_account_inquiry.php:140 gl/inquiry/gl_trial_balance.php:177
-#: purchasing/inquiry/supplier_allocation_inquiry.php:136
+#: dimensions/inquiry/search_dimensions.php:134 gl/inquiry/bank_inquiry.php:71
+#: gl/inquiry/gl_account_inquiry.php:141 gl/inquiry/gl_trial_balance.php:175
+#: purchasing/inquiry/supplier_allocation_inquiry.php:137
 #: reporting/rep203.php:92 reporting/rep204.php:82 reporting/rep601.php:77
-#: reporting/rep701.php:106 reporting/rep704.php:79 reporting/rep704.php:82
-#: reporting/rep704.php:85 reporting/rep708.php:72
-#: sales/inquiry/customer_allocation_inquiry.php:152
+#: reporting/rep701.php:109 reporting/rep704.php:80 reporting/rep704.php:83
+#: reporting/rep704.php:86 reporting/rep708.php:172
+#: sales/inquiry/customer_allocation_inquiry.php:155
 msgid "Balance"
 msgstr ""
 
@@ -3053,53 +3245,63 @@ msgstr ""
 msgid "Search Dimensions"
 msgstr ""
 
-#: dimensions/inquiry/search_dimensions.php:73 gl/bank_transfer.php:89
-#: gl/inquiry/journal_inquiry.php:45 gl/manage/revaluate_currencies.php:102
-#: gl/includes/ui/gl_bank_ui.inc:101 gl/includes/ui/gl_journal_ui.inc:30
-#: includes/ui/contacts_view.inc:94
+#: dimensions/inquiry/search_dimensions.php:73 gl/bank_transfer.php:91
+#: gl/inquiry/journal_inquiry.php:45 gl/manage/revaluate_currencies.php:105
+#: gl/includes/ui/gl_bank_ui.inc:26 gl/includes/ui/gl_bank_ui.inc.orig:25
+#: gl/includes/ui/gl_journal_ui.inc:30 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/work_order_add_finished.php:198
-#: manufacturing/work_order_entry.php:377
-#: manufacturing/work_order_entry.php:384
+#: manufacturing/work_order_entry.php:378
+#: manufacturing/work_order_entry.php:385
 #: manufacturing/includes/work_order_issue_ui.inc:156
 #: purchasing/includes/ui/invoice_ui.inc:92
 #: purchasing/includes/ui/po_ui.inc:159 purchasing/includes/ui/po_ui.inc:164
-#: purchasing/supplier_payment.php:281 sales/customer_payments.php:258
+#: purchasing/supplier_payment.php:286 sales/customer_payments.php:380
+#: gl/bank_transfer.php:74 gl/bank_transfer.php:79
+#: purchasing/supplier_payment.php:289 sales/customer_payments.php:383
+#: sales/customer_payments.php.orig:382
 msgid "Reference:"
 msgstr ""
 
 #: dimensions/inquiry/search_dimensions.php:75
-#: includes/ui/allocation_cart.inc:284 includes/ui/ui_lists.inc:1887
-#: reporting/rep101.php:112 reporting/rep102.php:88 reporting/rep104.php:95
-#: reporting/rep104.php:99 reporting/rep105.php:93 reporting/rep105.php:97
-#: reporting/rep201.php:100 reporting/rep202.php:90 reporting/rep203.php:72
-#: reporting/rep204.php:75 reporting/rep301.php:87 reporting/rep301.php:94
-#: reporting/rep302.php:103 reporting/rep302.php:110 reporting/rep303.php:84
-#: reporting/rep303.php:91 reporting/rep304.php:96 reporting/rep304.php:103
-#: reporting/rep304.php:108 reporting/rep702.php:59 reporting/rep710.php:84
-#: reporting/rep710.php:85
+#: includes/ui/allocation_cart.inc:284 includes/ui/sav.ui_lists.inc:1898
+#: includes/ui/ui_lists.inc:1919 reporting/rep101.php:112
+#: reporting/rep102.php:94 reporting/rep104.php:95 reporting/rep104.php:99
+#: reporting/rep105.php:93 reporting/rep105.php:97 reporting/rep201.php:100
+#: reporting/rep202.php:98 reporting/rep203.php:72 reporting/rep204.php:75
+#: reporting/rep301.php:90 reporting/rep301.php:97 reporting/rep302.php:103
+#: reporting/rep302.php:110 reporting/rep303.php:84 reporting/rep303.php:91
+#: reporting/rep304.php:96 reporting/rep304.php:101 reporting/rep304.php:106
+#: reporting/rep702.php:59 reporting/rep710.php:84 reporting/rep710.php:85
 msgid "All"
 msgstr ""
 
-#: dimensions/inquiry/search_dimensions.php:76 gl/inquiry/bank_inquiry.php:46
-#: gl/inquiry/gl_trial_balance.php:51 gl/inquiry/journal_inquiry.php:48
-#: gl/inquiry/profit_loss.php:163 gl/includes/ui/gl_bank_ui.inc:23
-#: gl/includes/ui/gl_bank_ui.inc:50 inventory/inquiry/stock_movements.php:58
+#: dimensions/inquiry/search_dimensions.php:76 gl/inquiry/bank_inquiry.php:49
+#: gl/inquiry/gl_trial_balance.php:49 gl/inquiry/journal_inquiry.php:48
+#: gl/inquiry/profit_loss.php:163 gl/includes/ui/gl_bank_ui.inc:51
+#: gl/includes/ui/gl_bank_ui.inc:117 gl/includes/ui/gl_bank_ui.inc.orig:50
+#: gl/includes/ui/gl_bank_ui.inc.orig:105
+#: inventory/inquiry/stock_movements.php:62
 #: purchasing/inquiry/supplier_allocation_inquiry.php:50
-#: purchasing/inquiry/supplier_inquiry.php:49
-#: sales/inquiry/customer_inquiry.php:46
+#: purchasing/inquiry/supplier_inquiry.php:53
+#: purchasing/inquiry/supplier_inquiry.php.orig:49
+#: sales/inquiry/customer_inquiry.php:50
+#: sales/inquiry/customer_inquiry.php.orig:50
 msgid "From:"
 msgstr ""
 
-#: dimensions/inquiry/search_dimensions.php:77 gl/inquiry/bank_inquiry.php:47
-#: gl/inquiry/gl_trial_balance.php:52 gl/inquiry/journal_inquiry.php:49
-#: gl/inquiry/profit_loss.php:164 gl/includes/ui/gl_bank_ui.inc:23
-#: inventory/inquiry/stock_movements.php:59
+#: dimensions/inquiry/search_dimensions.php:77 gl/inquiry/bank_inquiry.php:50
+#: gl/inquiry/gl_trial_balance.php:50 gl/inquiry/journal_inquiry.php:49
+#: gl/inquiry/profit_loss.php:164 gl/includes/ui/gl_bank_ui.inc:117
+#: gl/includes/ui/gl_bank_ui.inc.orig:105
+#: inventory/inquiry/stock_movements.php:63
 #: purchasing/inquiry/supplier_allocation_inquiry.php:51
-#: purchasing/inquiry/supplier_inquiry.php:50
-#: sales/inquiry/customer_inquiry.php:47
+#: purchasing/inquiry/supplier_inquiry.php:54
+#: purchasing/inquiry/supplier_inquiry.php.orig:50
+#: sales/inquiry/customer_inquiry.php:51
+#: sales/inquiry/customer_inquiry.php.orig:51
 msgid "To:"
 msgstr ""
 
@@ -3118,15 +3320,20 @@ msgstr ""
 #: purchasing/includes/ui/invoice_ui.inc:112
 #: purchasing/view/view_supp_credit.php:48
 #: purchasing/view/view_supp_invoice.php:51
-#: purchasing/inquiry/supplier_allocation_inquiry.php:131
-#: purchasing/inquiry/supplier_inquiry.php:168 reporting/rep101.php:130
+#: purchasing/inquiry/supplier_allocation_inquiry.php:132
+#: purchasing/inquiry/supplier_inquiry.php:174
+#: purchasing/inquiry/supplier_inquiry.php.orig:168 reporting/rep101.php:130
 #: reporting/rep201.php:118 reporting/rep203.php:91 reporting/rep501.php:85
-#: reporting/includes/doctext.inc:40 reporting/includes/doctext.inc:110
-#: sales/customer_invoice.php:424 sales/view/view_dispatch.php:97
-#: sales/view/view_invoice.php:96
-#: sales/inquiry/customer_allocation_inquiry.php:146
-#: sales/inquiry/customer_inquiry.php:217
-#: sales/includes/ui/sales_order_ui.inc:595
+#: reporting/includes/doctext.inc:100 reporting/includes/doctext.inc:122
+#: reporting/includes/doctext.inc:143 reporting/includes/doctext.inc:145
+#: reporting/includes/doctext.inc:166 reporting/includes/doctext.inc:184
+#: reporting/includes/doctext.inc:186 sales/customer_invoice.php:437
+#: sales/view/view_dispatch.php:97 sales/view/view_invoice.php:96
+#: sales/inquiry/customer_allocation_inquiry.php:149
+#: sales/inquiry/customer_inquiry.php:229
+#: sales/inquiry/customer_inquiry.php.orig:229
+#: sales/includes/ui/sales_order_ui.inc:596 sales/customer_invoice.php:439
+#: sales/includes/ui/sales_order_ui.inc:600
 msgid "Due Date"
 msgstr ""
 
@@ -3146,27 +3353,29 @@ msgstr ""
 msgid "This dimension is closed."
 msgstr ""
 
-#: dimensions/view/view_dimension.php:84 gl/inquiry/gl_account_inquiry.php:70
-#: gl/inquiry/tax_inquiry.php:61 purchasing/inquiry/po_search_completed.php:62
+#: dimensions/view/view_dimension.php:84 gl/inquiry/gl_account_inquiry.php:71
+#: gl/inquiry/tax_inquiry.php:61 purchasing/inquiry/po_search_completed.php:65
 #: 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:221
+#: sales/inquiry/sales_orders_view.php:229
+#: sales/inquiry/sales_orders_view.php.orig:227
 msgid "from:"
 msgstr ""
 
-#: dimensions/view/view_dimension.php:85 gl/inquiry/gl_account_inquiry.php:71
-#: gl/inquiry/tax_inquiry.php:62 purchasing/inquiry/po_search_completed.php:63
+#: dimensions/view/view_dimension.php:85 gl/inquiry/gl_account_inquiry.php:72
+#: gl/inquiry/tax_inquiry.php:62 purchasing/inquiry/po_search_completed.php:66
 #: 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:222
+#: sales/inquiry/sales_orders_view.php:230
+#: sales/inquiry/sales_orders_view.php.orig:228
 msgid "to:"
 msgstr ""
 
-#: dimensions/view/view_dimension.php:86 gl/inquiry/balance_sheet.php:132
-#: gl/inquiry/bank_inquiry.php:49 gl/inquiry/gl_account_inquiry.php:84
-#: gl/inquiry/gl_trial_balance.php:60 gl/inquiry/profit_loss.php:178
+#: dimensions/view/view_dimension.php:86 gl/inquiry/balance_sheet.php:131
+#: gl/inquiry/bank_inquiry.php:52 gl/inquiry/gl_account_inquiry.php:85
+#: gl/inquiry/gl_trial_balance.php:58 gl/inquiry/profit_loss.php:178
 #: gl/inquiry/tax_inquiry.php:63
 msgid "Show"
 msgstr ""
@@ -3196,60 +3405,71 @@ msgstr ""
 
 #: gl/accruals.php:92 gl/accruals.php:94 gl/accruals.php:203
 #: gl/accruals.php:205 gl/gl_budget.php:71 gl/gl_budget.php:72
-#: gl/gl_budget.php:76 gl/inquiry/balance_sheet.php:129
-#: gl/inquiry/balance_sheet.php:131 gl/inquiry/gl_account_inquiry.php:78
-#: gl/inquiry/gl_account_inquiry.php:80 gl/inquiry/gl_account_inquiry.php:133
-#: gl/inquiry/gl_account_inquiry.php:135 gl/inquiry/gl_trial_balance.php:54
-#: gl/inquiry/gl_trial_balance.php:56 gl/inquiry/profit_loss.php:174
+#: gl/gl_budget.php:76 gl/inquiry/balance_sheet.php:128
+#: gl/inquiry/balance_sheet.php:130 gl/inquiry/gl_account_inquiry.php:79
+#: gl/inquiry/gl_account_inquiry.php:81 gl/inquiry/gl_account_inquiry.php:134
+#: gl/inquiry/gl_account_inquiry.php:136 gl/inquiry/gl_trial_balance.php:52
+#: gl/inquiry/gl_trial_balance.php:54 gl/inquiry/profit_loss.php:174
 #: gl/inquiry/profit_loss.php:176 gl/manage/gl_quick_entries.php:261
 #: gl/manage/gl_quick_entries.php:263 gl/manage/gl_quick_entries.php:343
 #: gl/manage/gl_quick_entries.php:345 gl/view/accrual_trans.php:54
 #: gl/view/accrual_trans.php:56 gl/view/gl_deposit_view.php:99
 #: gl/view/gl_deposit_view.php:102 gl/view/gl_payment_view.php:98
 #: gl/view/gl_payment_view.php:101 gl/view/gl_trans_view.php:63
-#: gl/view/gl_trans_view.php:66 gl/includes/ui/gl_bank_ui.inc:121
-#: gl/includes/ui/gl_bank_ui.inc:122 gl/includes/ui/gl_bank_ui.inc:124
-#: gl/includes/ui/gl_journal_ui.inc:83 gl/includes/ui/gl_journal_ui.inc:84
-#: gl/includes/ui/gl_journal_ui.inc:86 includes/sysnames.inc:43
-#: includes/sysnames.inc:165 inventory/manage/item_categories.php:216
-#: inventory/manage/item_categories.php:218 inventory/manage/items.php:353
-#: inventory/manage/items.php:355 purchasing/includes/ui/invoice_ui.inc:245
+#: gl/view/gl_trans_view.php:66 gl/includes/ui/gl_bank_ui.inc:150
+#: gl/includes/ui/gl_bank_ui.inc:151 gl/includes/ui/gl_bank_ui.inc:153
+#: gl/includes/ui/gl_bank_ui.inc.orig:132
+#: gl/includes/ui/gl_bank_ui.inc.orig:133
+#: gl/includes/ui/gl_bank_ui.inc.orig:135 gl/includes/ui/gl_journal_ui.inc:83
+#: gl/includes/ui/gl_journal_ui.inc:84 gl/includes/ui/gl_journal_ui.inc:86
+#: includes/sysnames.inc:43 includes/sysnames.inc:165
+#: inventory/manage/item_categories.php:216
+#: inventory/manage/item_categories.php:218 inventory/manage/items.php:343
+#: inventory/manage/items.php:345 purchasing/includes/ui/invoice_ui.inc:245
 #: purchasing/includes/ui/invoice_ui.inc:247
-#: purchasing/manage/suppliers.php:135 purchasing/manage/suppliers.php:136
-#: purchasing/manage/suppliers.php:138 reporting/rep501.php:90
-#: reporting/rep704.php:78 reporting/rep704.php:81 reporting/rep704.php:92
-#: reporting/rep704.php:94 reporting/rep704.php:102 reporting/rep705.php:245
+#: purchasing/manage/suppliers.php:137 purchasing/manage/suppliers.php:138
+#: purchasing/manage/suppliers.php:140 reporting/rep501.php:90
+#: reporting/rep704.php:79 reporting/rep704.php:82 reporting/rep704.php:93
+#: reporting/rep704.php:95 reporting/rep704.php:103 reporting/rep705.php:245
 #: reporting/rep705.php:247 reporting/rep705.php:258 reporting/rep706.php:190
 #: reporting/rep706.php:192 reporting/rep706.php:200 reporting/rep707.php:214
-#: reporting/rep707.php:216 reporting/rep707.php:224 reporting/rep708.php:89
-#: reporting/rep708.php:91 reporting/rep708.php:98
-#: reporting/reports_main.php:250 reporting/reports_main.php:251
-#: reporting/reports_main.php:256 reporting/reports_main.php:257
-#: reporting/reports_main.php:264 reporting/reports_main.php:265
-#: reporting/reports_main.php:275 reporting/reports_main.php:276
-#: reporting/reports_main.php:287 reporting/reports_main.php:288
-#: reporting/reports_main.php:299 reporting/reports_main.php:304
-#: reporting/reports_main.php:311 reporting/reports_main.php:321
-#: reporting/reports_main.php:332 sales/customer_delivery.php:392
-#: sales/customer_delivery.php:400 sales/customer_invoice.php:399
-#: sales/customer_invoice.php:426 sales/manage/customers.php:234
-#: sales/manage/customers.php:236 sales/includes/ui/sales_credit_ui.inc:132
+#: reporting/rep707.php:216 reporting/rep707.php:224 reporting/rep708.php:188
+#: reporting/rep708.php:190 reporting/rep708.php:197
+#: reporting/reports_main.php:265 reporting/reports_main.php:266
+#: reporting/reports_main.php:271 reporting/reports_main.php:272
+#: reporting/reports_main.php:279 reporting/reports_main.php:280
+#: reporting/reports_main.php:290 reporting/reports_main.php:291
+#: reporting/reports_main.php:302 reporting/reports_main.php:303
+#: reporting/reports_main.php:314 reporting/reports_main.php:319
+#: reporting/reports_main.php:326 reporting/reports_main.php:336
+#: reporting/reports_main.php:347 sales/customer_delivery.php:395
+#: sales/customer_delivery.php:403 sales/customer_invoice.php:407
+#: sales/customer_invoice.php:445 sales/manage/customers.php:269
+#: sales/manage/customers.php:271 sales/manage/customers.php.orig:266
+#: sales/manage/customers.php.orig:268
+#: sales/includes/ui/sales_credit_ui.inc:132
 #: sales/includes/ui/sales_credit_ui.inc:137
 #: sales/includes/ui/sales_order_ui.inc:451
-#: sales/includes/ui/sales_order_ui.inc:456
+#: sales/includes/ui/sales_order_ui.inc:456 sales/customer_invoice.php:409
+#: sales/customer_invoice.php:447 sales/manage/customers.php:270
+#: sales/manage/customers.php:272 sales/includes/ui/sales_order_ui.inc:455
+#: sales/includes/ui/sales_order_ui.inc:460
 msgid "Dimension"
 msgstr ""
 
 #: gl/accruals.php:98 gl/accruals.php:213
-#: gl/inquiry/gl_account_inquiry.php:140 gl/inquiry/gl_account_inquiry.php:142
-#: gl/inquiry/journal_inquiry.php:126 gl/view/accrual_trans.php:60
+#: gl/inquiry/gl_account_inquiry.php:141 gl/inquiry/gl_account_inquiry.php:143
+#: gl/inquiry/journal_inquiry.php:133 gl/view/accrual_trans.php:60
 #: gl/view/gl_deposit_view.php:100 gl/view/gl_deposit_view.php:103
 #: gl/view/gl_deposit_view.php:106 gl/view/gl_payment_view.php:99
 #: gl/view/gl_payment_view.php:102 gl/view/gl_payment_view.php:105
 #: gl/view/gl_trans_view.php:64 gl/view/gl_trans_view.php:67
-#: gl/view/gl_trans_view.php:70 gl/includes/ui/gl_bank_ui.inc:122
-#: gl/includes/ui/gl_bank_ui.inc:125 gl/includes/ui/gl_bank_ui.inc:128
-#: gl/includes/ui/gl_bank_ui.inc:268 gl/includes/ui/gl_journal_ui.inc:84
+#: gl/view/gl_trans_view.php:70 gl/includes/ui/gl_bank_ui.inc:151
+#: gl/includes/ui/gl_bank_ui.inc:154 gl/includes/ui/gl_bank_ui.inc:157
+#: gl/includes/ui/gl_bank_ui.inc:297 gl/includes/ui/gl_bank_ui.inc.orig:133
+#: gl/includes/ui/gl_bank_ui.inc.orig:136
+#: gl/includes/ui/gl_bank_ui.inc.orig:139
+#: gl/includes/ui/gl_bank_ui.inc.orig:279 gl/includes/ui/gl_journal_ui.inc:84
 #: gl/includes/ui/gl_journal_ui.inc:87 gl/includes/ui/gl_journal_ui.inc:90
 #: gl/includes/ui/gl_journal_ui.inc:240
 #: inventory/includes/item_adjustments_ui.inc:181
@@ -3258,8 +3478,9 @@ msgstr ""
 #: purchasing/includes/ui/invoice_ui.inc:245
 #: purchasing/includes/ui/invoice_ui.inc:247
 #: purchasing/includes/ui/invoice_ui.inc:249
-#: sales/customer_credit_invoice.php:364 sales/customer_delivery.php:516
-#: sales/customer_invoice.php:555 sales/includes/ui/sales_credit_ui.inc:339
+#: sales/customer_credit_invoice.php:366 sales/customer_delivery.php:519
+#: sales/customer_invoice.php:576 sales/includes/ui/sales_credit_ui.inc:339
+#: sales/customer_credit_invoice.php:364 sales/customer_invoice.php:578
 msgid "Memo"
 msgstr ""
 
@@ -3280,8 +3501,9 @@ msgid "Bi-weekly"
 msgstr ""
 
 #: gl/accruals.php:182 gl/manage/gl_quick_entries.php:240
-#: gl/includes/ui/gl_journal_ui.inc:57 sales/create_recurrent_invoices.php:98
-#: sales/manage/recurrent_invoices.php:85
+#: gl/includes/ui/gl_journal_ui.inc:57 sales/create_recurrent_invoices.php:115
+#: sales/manage/recurrent_invoices.php:102
+#: sales/create_recurrent_invoices.php:132
 msgid "Monthly"
 msgstr ""
 
@@ -3302,7 +3524,7 @@ msgid "Revenue / Cost Account"
 msgstr ""
 
 #: gl/accruals.php:208 gl/gl_budget.php:91 gl/gl_budget.php:93
-#: gl/inquiry/journal_inquiry.php:125 gl/inquiry/tax_inquiry.php:82
+#: gl/inquiry/journal_inquiry.php:132 gl/inquiry/tax_inquiry.php:82
 #: gl/manage/gl_quick_entries.php:261 gl/manage/gl_quick_entries.php:263
 #: gl/manage/gl_quick_entries.php:265 gl/manage/gl_quick_entries.php:339
 #: gl/view/bank_transfer_view.php:70 gl/view/bank_transfer_view.php:80
@@ -3310,18 +3532,22 @@ msgstr ""
 #: gl/view/gl_deposit_view.php:103 gl/view/gl_deposit_view.php:106
 #: gl/view/gl_payment_view.php:65 gl/view/gl_payment_view.php:99
 #: gl/view/gl_payment_view.php:102 gl/view/gl_payment_view.php:105
-#: gl/includes/ui/gl_bank_ui.inc:122 gl/includes/ui/gl_bank_ui.inc:125
-#: gl/includes/ui/gl_bank_ui.inc:128 includes/sysnames.inc:132
-#: includes/ui/allocation_cart.inc:263 includes/ui/ui_lists.inc:1152
+#: gl/includes/ui/gl_bank_ui.inc:151 gl/includes/ui/gl_bank_ui.inc:154
+#: gl/includes/ui/gl_bank_ui.inc:157 gl/includes/ui/gl_bank_ui.inc.orig:133
+#: gl/includes/ui/gl_bank_ui.inc.orig:136
+#: gl/includes/ui/gl_bank_ui.inc.orig:139 includes/sysnames.inc:132
+#: includes/ui/allocation_cart.inc:263 includes/ui/sav.ui_lists.inc:1163
+#: includes/ui/ui_lists.inc:1184
 #: manufacturing/includes/manufacturing_ui.inc:236
 #: purchasing/includes/ui/invoice_ui.inc:245
 #: purchasing/includes/ui/invoice_ui.inc:247
 #: purchasing/includes/ui/invoice_ui.inc:249
 #: purchasing/view/view_supp_payment.php:60
-#: purchasing/view/view_supp_payment.php:69 reporting/rep102.php:228
-#: reporting/rep202.php:234 reporting/rep706.php:303 reporting/rep707.php:321
-#: reporting/rep710.php:76 reporting/includes/doctext.inc:152
-#: sales/view/view_receipt.php:44
+#: purchasing/view/view_supp_payment.php:72 reporting/rep102.php:241
+#: reporting/rep107.php:182 reporting/rep109.php:191 reporting/rep110.php:195
+#: reporting/rep111.php:178 reporting/rep113.php:181 reporting/rep202.php:249
+#: reporting/rep209.php:197 reporting/rep706.php:303 reporting/rep707.php:321
+#: reporting/rep710.php:76 sales/view/view_receipt.php:44
 msgid "Amount"
 msgstr ""
 
@@ -3353,9 +3579,9 @@ msgstr ""
 msgid "Reconcile Bank Account"
 msgstr ""
 
-#: gl/bank_account_reconcile.php:35 gl/bank_transfer.php:30 gl/gl_bank.php:48
+#: gl/bank_account_reconcile.php:35 gl/bank_transfer.php:30 gl/gl_bank.php:49
 #: gl/inquiry/bank_inquiry.php:30 purchasing/supplier_payment.php:42
-#: sales/customer_payments.php:39
+#: sales/customer_payments.php:39 sales/customer_payments.php.orig:39
 msgid "There are no bank accounts defined in the system."
 msgstr ""
 
@@ -3367,8 +3593,8 @@ msgstr ""
 msgid "Reconcile this transaction"
 msgstr ""
 
-#: gl/bank_account_reconcile.php:166 gl/inquiry/bank_inquiry.php:44
-#: gl/inquiry/gl_account_inquiry.php:69
+#: gl/bank_account_reconcile.php:166 gl/inquiry/bank_inquiry.php:47
+#: gl/inquiry/gl_account_inquiry.php:70
 msgid "Account:"
 msgstr ""
 
@@ -3408,11 +3634,11 @@ msgstr ""
 msgid "Date of bank statement to reconcile"
 msgstr ""
 
-#: gl/bank_account_reconcile.php:239 gl/inquiry/bank_inquiry.php:68
-#: gl/inquiry/gl_account_inquiry.php:140 gl/inquiry/gl_account_inquiry.php:142
+#: gl/bank_account_reconcile.php:239 gl/inquiry/bank_inquiry.php:71
+#: gl/inquiry/gl_account_inquiry.php:141 gl/inquiry/gl_account_inquiry.php:143
 #: gl/view/accrual_trans.php:60 gl/view/gl_trans_view.php:36
-#: reporting/rep601.php:76 reporting/rep704.php:79 reporting/rep704.php:81
-#: reporting/rep704.php:84
+#: reporting/rep601.php:76 reporting/rep704.php:80 reporting/rep704.php:82
+#: reporting/rep704.php:85
 msgid "Person/Item"
 msgstr ""
 
@@ -3424,11 +3650,11 @@ msgstr ""
 msgid "Transfer between Bank Accounts"
 msgstr ""
 
-#: gl/bank_transfer.php:39 gl/manage/revaluate_currencies.php:34
+#: gl/bank_transfer.php:39 gl/manage/revaluate_currencies.php:35
 msgid "Transfer has been entered"
 msgstr ""
 
-#: gl/bank_transfer.php:41 gl/manage/revaluate_currencies.php:36
+#: gl/bank_transfer.php:41 gl/manage/revaluate_currencies.php:37
 msgid "&View the GL Journal Entries for this Transfer"
 msgstr ""
 
@@ -3440,164 +3666,193 @@ msgstr ""
 msgid "From Account:"
 msgstr ""
 
-#: gl/bank_transfer.php:68
+#: gl/bank_transfer.php:70
 msgid "To Account:"
 msgstr ""
 
-#: gl/bank_transfer.php:70
+#: gl/bank_transfer.php:72 gl/bank_transfer.php:77
 msgid "Transfer Date:"
 msgstr ""
 
-#: gl/bank_transfer.php:76 gl/bank_transfer.php:83
-#: sales/customer_payments.php:289
+#: gl/bank_transfer.php:78 gl/bank_transfer.php:85
+#: sales/customer_payments.php:409 gl/bank_transfer.php:82
+#: gl/bank_transfer.php:89 gl/bank_transfer.php:87 gl/bank_transfer.php:94
+#: sales/customer_payments.php:412 sales/customer_payments.php.orig:411
 msgid "Amount:"
 msgstr ""
 
-#: gl/bank_transfer.php:77 gl/bank_transfer.php:84
-#: purchasing/supplier_payment.php:294 sales/customer_payments.php:274
+#: gl/bank_transfer.php:79 gl/bank_transfer.php:86
+#: purchasing/supplier_payment.php:299 sales/customer_payments.php:394
+#: gl/bank_transfer.php:83 gl/bank_transfer.php:90 gl/bank_transfer.php:88
+#: gl/bank_transfer.php:95 purchasing/supplier_payment.php:302
+#: sales/customer_payments.php:397 sales/customer_payments.php.orig:396
 msgid "Bank Charge:"
 msgstr ""
 
-#: gl/bank_transfer.php:95
+#: gl/bank_transfer.php:97 gl/bank_transfer.php:102
 msgid "Enter Transfer"
 msgstr ""
 
-#: gl/bank_transfer.php:121 gl/bank_transfer.php:142
+#: gl/bank_transfer.php:123 gl/bank_transfer.php:153
 #: purchasing/supplier_payment.php:130 purchasing/supplier_payment.php:136
+#: gl/bank_transfer.php:128 gl/bank_transfer.php:158
+#: purchasing/supplier_payment.php:125 purchasing/supplier_payment.php:131
 msgid "The entered amount is invalid or less than zero."
 msgstr ""
 
-#: gl/bank_transfer.php:126 gl/gl_bank.php:222
+#: gl/bank_transfer.php:128 gl/gl_bank.php:225 gl/bank_transfer.php:133
 msgid "The total bank amount cannot be 0."
 msgstr ""
 
-#: gl/bank_transfer.php:135
+#: gl/bank_transfer.php:139 gl/bank_transfer.php:144
 #, php-format
 msgid "The total bank amount exceeds allowed limit (%s) for source account."
 msgstr ""
 
-#: gl/bank_transfer.php:147 purchasing/supplier_payment.php:144
-#: sales/customer_payments.php:131
+#: gl/bank_transfer.php:145 gl/gl_bank.php:242 gl/bank_transfer.php:150
+#, php-format
+msgid ""
+"The bank transaction would result in exceed of authorized overdraft limit "
+"for transaction: %s #%s on %s."
+msgstr ""
+
+#: gl/bank_transfer.php:158 purchasing/supplier_payment.php:144
+#: sales/customer_payments.php:184 gl/bank_transfer.php:163
+#: purchasing/supplier_payment.php:139 sales/customer_payments.php.orig:184
 msgid ""
 "The Bank Charge Account has not been set in System and General GL Setup."
 msgstr ""
 
-#: gl/bank_transfer.php:153 gl/gl_bank.php:238 gl/gl_journal.php:166
-#: gl/manage/revaluate_currencies.php:62 inventory/adjustments.php:94
+#: gl/bank_transfer.php:164 gl/gl_bank.php:249 gl/gl_journal.php:168
+#: gl/manage/revaluate_currencies.php:65 inventory/adjustments.php:96
 #: inventory/transfers.php:93 manufacturing/work_order_add_finished.php:77
-#: manufacturing/work_order_entry.php:131
+#: manufacturing/work_order_entry.php:132
 #: manufacturing/work_order_issue.php:91 purchasing/po_receive_items.php:188
-#: purchasing/supplier_payment.php:201 sales/credit_note_entry.php:145
-#: sales/customer_credit_invoice.php:100 sales/customer_delivery.php:163
-#: sales/customer_invoice.php:274 sales/customer_payments.php:106
-#: sales/sales_order_entry.php:404
+#: purchasing/supplier_payment.php:201 sales/credit_note_entry.php:147
+#: sales/customer_credit_invoice.php:102 sales/customer_delivery.php:166
+#: sales/customer_invoice.php:280 sales/customer_payments.php:151
+#: sales/sales_order_entry.php:403 gl/bank_transfer.php:169
+#: purchasing/supplier_payment.php:196 sales/customer_payments.php.orig:151
+#: sales/sales_order_entry.php:412 sales/sales_order_entry.php.orig:411
 msgid "You must enter a reference."
 msgstr ""
 
-#: gl/bank_transfer.php:167
+#: gl/bank_transfer.php:178 gl/bank_transfer.php:183
 msgid "The source and destination bank accouts cannot be the same."
 msgstr ""
 
-#: gl/gl_bank.php:33
+#: gl/gl_bank.php:34
 msgid "Bank Account Payment Entry"
 msgstr ""
 
-#: gl/gl_bank.php:36
+#: gl/gl_bank.php:37
 msgid "Bank Account Deposit Entry"
 msgstr ""
 
-#: gl/gl_bank.php:39
+#: gl/gl_bank.php:40
 msgid "Modify Bank Account Entry"
 msgstr ""
 
-#: gl/gl_bank.php:42
+#: gl/gl_bank.php:43
 msgid "Modify Bank Deposit Entry"
 msgstr ""
 
-#: gl/gl_bank.php:72
+#: gl/gl_bank.php:73
 #, php-format
 msgid "Payment %d has been entered"
 msgstr ""
 
-#: gl/gl_bank.php:74 gl/gl_bank.php:90
+#: gl/gl_bank.php:75 gl/gl_bank.php:93
 msgid "&View the GL Postings for this Payment"
 msgstr ""
 
-#: gl/gl_bank.php:76 gl/gl_bank.php:92
+#: gl/gl_bank.php:77 gl/gl_bank.php:95
 msgid "Enter Another &Payment"
 msgstr ""
 
-#: gl/gl_bank.php:78 gl/gl_bank.php:94
+#: gl/gl_bank.php:79 gl/gl_bank.php:97
 msgid "Enter A &Deposit"
 msgstr ""
 
-#: gl/gl_bank.php:104
+#: gl/gl_bank.php:81 gl/gl_journal.php:61 inventory/adjustments.php:50
+#: manufacturing/work_order_entry.php:68 purchasing/po_entry_items.php:109
+#: purchasing/po_entry_items.php:133 purchasing/supplier_credit.php:49
+#: purchasing/supplier_invoice.php:52 sales/credit_note_entry.php:77
+#: sales/customer_credit_invoice.php:62 sales/customer_invoice.php:66
+#: sales/sales_order_entry.php:226 purchasing/po_entry_items.php:112
+#: purchasing/po_entry_items.php:136 sales/sales_order_entry.php:234
+#: sales/sales_order_entry.php.orig:234
+msgid "Add an Attachment"
+msgstr ""
+
+#: gl/gl_bank.php:107
 #, php-format
 msgid "Deposit %d has been entered"
 msgstr ""
 
-#: gl/gl_bank.php:106
+#: gl/gl_bank.php:109
 msgid "View the GL Postings for this Deposit"
 msgstr ""
 
-#: gl/gl_bank.php:108
+#: gl/gl_bank.php:111
 msgid "Enter Another Deposit"
 msgstr ""
 
-#: gl/gl_bank.php:110
+#: gl/gl_bank.php:113
 msgid "Enter A Payment"
 msgstr ""
 
-#: gl/gl_bank.php:121
+#: gl/gl_bank.php:124
 msgid "&View the GL Postings for this Deposit"
 msgstr ""
 
-#: gl/gl_bank.php:123
+#: gl/gl_bank.php:126
 msgid "Enter Another &Deposit"
 msgstr ""
 
-#: gl/gl_bank.php:125
+#: gl/gl_bank.php:128
 msgid "Enter A &Payment"
 msgstr ""
 
-#: gl/gl_bank.php:216
+#: gl/gl_bank.php:219
 msgid "You must enter at least one payment line."
 msgstr ""
 
-#: gl/gl_bank.php:231 purchasing/supplier_payment.php:194
+#: gl/gl_bank.php:236 purchasing/supplier_payment.php:194
+#: purchasing/supplier_payment.php:189
 #, php-format
 msgid "The total bank amount exceeds allowed limit (%s)."
 msgstr ""
 
-#: gl/gl_bank.php:250
+#: gl/gl_bank.php:261
 msgid "The entered date for the payment is invalid."
 msgstr ""
 
-#: gl/gl_bank.php:262
+#: gl/gl_bank.php:273
 msgid "You have to select customer and customer branch."
 msgstr ""
 
-#: gl/gl_bank.php:266
+#: gl/gl_bank.php:277
 msgid "You have to select supplier."
 msgstr ""
 
-#: gl/gl_bank.php:312
+#: gl/gl_bank.php:323 gl/gl_bank.php:325
 msgid "The amount entered is not a valid number or is less than zero."
 msgstr ""
 
-#: gl/gl_bank.php:384
+#: gl/gl_bank.php:395 gl/gl_bank.php:397
 msgid "Payment Items"
 msgstr ""
 
-#: gl/gl_bank.php:384
+#: gl/gl_bank.php:395 gl/gl_bank.php:397
 msgid "Deposit Items"
 msgstr ""
 
-#: gl/gl_bank.php:392
+#: gl/gl_bank.php:403 gl/gl_bank.php:405
 msgid "Process Payment"
 msgstr ""
 
-#: gl/gl_bank.php:392
+#: gl/gl_bank.php:403 gl/gl_bank.php:405
 msgid "Process Deposit"
 msgstr ""
 
@@ -3606,6 +3861,7 @@ msgid "Budget Entry"
 msgstr ""
 
 #: gl/gl_budget.php:26 gl/manage/gl_accounts.php:23
+#: gl/manage/gl_accounts.php.orig:23
 msgid ""
 "There are no account groups defined. Please define at least one account "
 "group before entering accounts."
@@ -3619,7 +3875,9 @@ msgstr ""
 msgid "The Budget has been deleted."
 msgstr ""
 
-#: gl/gl_budget.php:64 gl/manage/gl_accounts.php:231
+#: gl/gl_budget.php:64 gl/manage/gl_accounts.php:230
+#: gl/manage/gl_accounts.php:240 gl/manage/gl_accounts.php.orig:230
+#: gl/manage/gl_accounts.php.orig:240 gl/manage/gl_accounts.php:231
 #: gl/manage/gl_accounts.php:241
 msgid "Account Code:"
 msgstr ""
@@ -3630,14 +3888,15 @@ msgstr ""
 
 #: gl/gl_budget.php:91 gl/gl_budget.php:93 gl/inquiry/profit_loss.php:231
 #: gl/manage/gl_quick_entries.php:240 reporting/rep101.php:136
-#: reporting/rep105.php:116 reporting/rep106.php:90 reporting/rep201.php:124
-#: reporting/rep304.php:121 reporting/rep305.php:100 reporting/rep601.php:82
-#: reporting/rep702.php:57 reporting/rep704.php:90 reporting/rep704.php:100
-#: reporting/rep704.php:108 reporting/rep706.php:181 reporting/rep706.php:189
-#: reporting/rep706.php:199 reporting/rep706.php:207 reporting/rep707.php:206
-#: reporting/rep707.php:213 reporting/rep707.php:223 reporting/rep707.php:231
-#: reporting/rep708.php:88 reporting/rep708.php:97 reporting/rep708.php:104
-#: reporting/rep709.php:102 reporting/rep710.php:83
+#: reporting/rep105.php:116 reporting/rep106.php:90 reporting/rep114.php:88
+#: reporting/rep201.php:124 reporting/rep304.php:119 reporting/rep305.php:100
+#: reporting/rep601.php:82 reporting/rep702.php:57 reporting/rep704.php:91
+#: reporting/rep704.php:101 reporting/rep704.php:109 reporting/rep706.php:181
+#: reporting/rep706.php:189 reporting/rep706.php:199 reporting/rep706.php:207
+#: reporting/rep707.php:206 reporting/rep707.php:213 reporting/rep707.php:223
+#: reporting/rep707.php:231 reporting/rep708.php:187 reporting/rep708.php:196
+#: reporting/rep708.php:203 reporting/rep709.php:104 reporting/rep710.php:83
+#: reporting/rep305.php:103
 msgid "Period"
 msgstr ""
 
@@ -3649,38 +3908,43 @@ msgstr ""
 msgid "Last Year"
 msgstr ""
 
-#: gl/gl_budget.php:127 gl/inquiry/balance_sheet.php:99
-#: gl/inquiry/balance_sheet.php:206 gl/inquiry/balance_sheet.php:237
-#: gl/inquiry/gl_trial_balance.php:212 gl/inquiry/profit_loss.php:115
+#: gl/gl_budget.php:127 gl/inquiry/balance_sheet.php:98
+#: gl/inquiry/balance_sheet.php:205 gl/inquiry/balance_sheet.php:236
+#: gl/inquiry/gl_trial_balance.php:210 gl/inquiry/profit_loss.php:115
 #: gl/inquiry/profit_loss.php:283 gl/view/gl_deposit_view.php:132
 #: gl/view/gl_payment_view.php:131 gl/view/gl_trans_view.php:106
-#: gl/includes/ui/gl_bank_ui.inc:171 gl/includes/ui/gl_journal_ui.inc:141
+#: gl/includes/ui/gl_bank_ui.inc:200 gl/includes/ui/gl_bank_ui.inc.orig:182
+#: gl/includes/ui/gl_journal_ui.inc:141
 #: inventory/includes/item_adjustments_ui.inc:63
 #: inventory/includes/item_adjustments_ui.inc:102
 #: manufacturing/includes/manufacturing_ui.inc:178
 #: purchasing/includes/ui/invoice_ui.inc:309
 #: purchasing/includes/ui/invoice_ui.inc:474
-#: purchasing/includes/ui/invoice_ui.inc:545
+#: purchasing/includes/ui/invoice_ui.inc:544
 #: purchasing/po_receive_items.php:63 purchasing/view/view_po.php:140
 #: purchasing/allocations/supplier_allocation_main.php:100
-#: reporting/rep101.php:237 reporting/rep106.php:82 reporting/rep106.php:120
-#: reporting/rep106.php:168 reporting/rep201.php:221 reporting/rep203.php:92
-#: reporting/rep203.php:167 reporting/rep204.php:109 reporting/rep204.php:137
-#: reporting/rep301.php:126 reporting/rep301.php:163 reporting/rep304.php:144
-#: reporting/rep304.php:186 reporting/rep305.php:95 reporting/rep305.php:119
-#: reporting/rep305.php:176 reporting/rep702.php:138 reporting/rep705.php:152
-#: reporting/rep705.php:309 reporting/rep706.php:106 reporting/rep706.php:249
-#: reporting/rep706.php:284 reporting/rep707.php:115 reporting/rep707.php:291
-#: reporting/rep708.php:182 reporting/includes/doctext.inc:105
-#: reporting/includes/doctext.inc:113 sales/customer_credit_invoice.php:281
-#: sales/customer_delivery.php:430 sales/customer_invoice.php:447
+#: reporting/rep101.php:237 reporting/rep106.php:82 reporting/rep106.php:115
+#: reporting/rep106.php:158 reporting/rep114.php:156 reporting/rep201.php:221
+#: reporting/rep203.php:92 reporting/rep203.php:167 reporting/rep204.php:109
+#: reporting/rep204.php:137 reporting/rep301.php:130 reporting/rep301.php:167
+#: reporting/rep304.php:142 reporting/rep304.php:184 reporting/rep305.php:95
+#: reporting/rep305.php:119 reporting/rep305.php:176 reporting/rep702.php:138
+#: reporting/rep705.php:152 reporting/rep705.php:309 reporting/rep706.php:106
+#: reporting/rep706.php:249 reporting/rep706.php:284 reporting/rep707.php:115
+#: reporting/rep707.php:291 reporting/rep708.php:235
+#: reporting/includes/doctext.inc:30 reporting/includes/doctext.inc:170
+#: sales/customer_credit_invoice.php:283 sales/customer_delivery.php:433
+#: sales/customer_invoice.php:468
 #: sales/allocations/customer_allocation_main.php:99
 #: sales/view/view_credit.php:91 sales/view/view_dispatch.php:113
 #: sales/view/view_invoice.php:114 sales/view/view_sales_order.php:96
 #: sales/view/view_sales_order.php:129 sales/view/view_sales_order.php:161
 #: sales/view/view_sales_order.php:202
 #: sales/includes/ui/sales_credit_ui.inc:168
-#: sales/includes/ui/sales_order_ui.inc:142
+#: sales/includes/ui/sales_order_ui.inc:142 reporting/rep305.php:98
+#: reporting/rep305.php:122 reporting/rep305.php:178
+#: sales/customer_credit_invoice.php:281 sales/customer_invoice.php:470
+#: sales/includes/ui/sales_order_ui.inc:146
 msgid "Total"
 msgstr ""
 
@@ -3697,7 +3961,7 @@ msgstr ""
 msgid "Journal entry has been entered"
 msgstr ""
 
-#: gl/gl_journal.php:56 gl/gl_journal.php:69
+#: gl/gl_journal.php:56 gl/gl_journal.php:71
 msgid "&View this Journal Entry"
 msgstr ""
 
@@ -3705,69 +3969,70 @@ msgstr ""
 msgid "Enter &New Journal Entry"
 msgstr ""
 
-#: gl/gl_journal.php:67
+#: gl/gl_journal.php:69
 msgid "Journal entry has been updated"
 msgstr ""
 
-#: gl/gl_journal.php:71
+#: gl/gl_journal.php:73
 msgid "Return to Journal &Inquiry"
 msgstr ""
 
-#: gl/gl_journal.php:84
+#: gl/gl_journal.php:86
 msgid ""
 "You can edit directly only journal entries created via Journal Entry page."
 msgstr ""
 
-#: gl/gl_journal.php:85
+#: gl/gl_journal.php:87
 msgid "Entry &New Journal Entry"
 msgstr ""
 
-#: gl/gl_journal.php:141
+#: gl/gl_journal.php:143
 msgid "You must enter at least one journal line."
 msgstr ""
 
-#: gl/gl_journal.php:147
+#: gl/gl_journal.php:149
 msgid ""
 "The journal must balance (debits equal to credits) before it can be "
 "processed."
 msgstr ""
 
-#: gl/gl_journal.php:209 gl/gl_journal.php:216
+#: gl/gl_journal.php:211 gl/gl_journal.php:218
 msgid "Dimension is closed."
 msgstr ""
 
-#: gl/gl_journal.php:223
+#: gl/gl_journal.php:225
 msgid "You must enter either a debit amount or a credit amount."
 msgstr ""
 
-#: gl/gl_journal.php:230
+#: gl/gl_journal.php:232
 msgid "The debit amount entered is not a valid number or is less than zero."
 msgstr ""
 
-#: gl/gl_journal.php:235
+#: gl/gl_journal.php:237
 msgid "The credit amount entered is not a valid number or is less than zero."
 msgstr ""
 
-#: gl/gl_journal.php:241 includes/ui/ui_view.inc:647
+#: gl/gl_journal.php:243 includes/ui/ui_view.inc:672
 #: purchasing/supplier_credit.php:119 purchasing/supplier_invoice.php:119
+#: includes/ui/ui_view.inc:673
 msgid "Cannot post to GL account used by more than one tax type."
 msgstr ""
 
-#: gl/gl_journal.php:248
+#: gl/gl_journal.php:250
 msgid ""
 "You cannot make a journal entry for a bank account. Please use one of the "
 "banking functions for bank transactions."
 msgstr ""
 
-#: gl/gl_journal.php:327
+#: gl/gl_journal.php:329
 msgid "Rows"
 msgstr ""
 
-#: gl/gl_journal.php:333
+#: gl/gl_journal.php:335
 msgid "Process Journal Entry"
 msgstr ""
 
-#: gl/gl_journal.php:334
+#: gl/gl_journal.php:336
 msgid "Process journal entry only if debits equal to credits"
 msgstr ""
 
@@ -3775,26 +4040,26 @@ msgstr ""
 msgid "Balance Sheet Drilldown"
 msgstr ""
 
-#: gl/inquiry/balance_sheet.php:127
+#: gl/inquiry/balance_sheet.php:126
 msgid "As at:"
 msgstr ""
 
-#: gl/inquiry/balance_sheet.php:229 gl/inquiry/profit_loss.php:294
+#: gl/inquiry/balance_sheet.php:228 gl/inquiry/profit_loss.php:294
 #: reporting/rep705.php:319 reporting/rep706.php:272 reporting/rep706.php:297
 #: reporting/rep707.php:303 reporting/rep707.php:309
 msgid "Calculated Return"
 msgstr ""
 
-#: gl/inquiry/balance_sheet.php:237 includes/sysnames.inc:120
+#: gl/inquiry/balance_sheet.php:236 includes/sysnames.inc:120
 #: reporting/rep706.php:284
 msgid "Liabilities"
 msgstr ""
 
-#: gl/inquiry/balance_sheet.php:237 reporting/rep706.php:284
+#: gl/inquiry/balance_sheet.php:236 reporting/rep706.php:284
 msgid " and "
 msgstr ""
 
-#: gl/inquiry/balance_sheet.php:237 reporting/rep706.php:284
+#: gl/inquiry/balance_sheet.php:236 reporting/rep706.php:284
 msgid "Equities"
 msgstr ""
 
@@ -3802,71 +4067,89 @@ msgstr ""
 msgid "Bank Statement"
 msgstr ""
 
-#: gl/inquiry/bank_inquiry.php:75 gl/inquiry/gl_account_inquiry.php:161
-#: reporting/rep601.php:99 reporting/rep704.php:137
+#: gl/inquiry/bank_inquiry.php:78 gl/inquiry/gl_account_inquiry.php:162
+#: reporting/rep601.php:99 reporting/rep704.php:138
 msgid "Opening Balance"
 msgstr ""
 
-#: gl/inquiry/bank_inquiry.php:120 gl/inquiry/gl_account_inquiry.php:210
-#: gl/inquiry/gl_trial_balance.php:222 reporting/rep601.php:150
-#: reporting/rep704.php:185 reporting/rep708.php:191
+#: gl/inquiry/bank_inquiry.php:123 gl/inquiry/gl_account_inquiry.php:211
+#: gl/inquiry/gl_trial_balance.php:220 reporting/rep601.php:150
+#: reporting/rep704.php:186 reporting/rep708.php:244
 msgid "Ending Balance"
 msgstr ""
 
-#: gl/inquiry/gl_account_inquiry.php:30
+#: gl/inquiry/gl_account_inquiry.php:31
 msgid "General Ledger Inquiry"
 msgstr ""
 
-#: gl/inquiry/gl_account_inquiry.php:69
+#: gl/inquiry/gl_account_inquiry.php:70
 msgid "All Accounts"
 msgstr ""
 
-#: gl/inquiry/gl_account_inquiry.php:82
+#: gl/inquiry/gl_account_inquiry.php:83
 msgid "Amount min:"
 msgstr ""
 
-#: gl/inquiry/gl_account_inquiry.php:83
+#: gl/inquiry/gl_account_inquiry.php:84
 msgid "Amount max:"
 msgstr ""
 
-#: gl/inquiry/gl_account_inquiry.php:219
+#: gl/inquiry/gl_account_inquiry.php:220
 msgid ""
 "No general ledger transactions have been created for the specified criteria."
 msgstr ""
 
-#: gl/inquiry/gl_trial_balance.php:28 reporting/rep708.php:107
+#: gl/inquiry/gl_trial_balance.php:28 reporting/rep708.php:206
 msgid "Trial Balance"
 msgstr ""
 
-#: gl/inquiry/gl_trial_balance.php:57
+#: gl/inquiry/gl_trial_balance.php:55
 msgid "No zero values"
 msgstr ""
 
-#: gl/inquiry/gl_trial_balance.php:58 reporting/reports_main.php:286
-#: reporting/reports_main.php:331 reporting/reports_main.php:371
+#: gl/inquiry/gl_trial_balance.php:56 reporting/reports_main.php:301
+#: reporting/reports_main.php:346 reporting/reports_main.php:386
 msgid "Only balances"
 msgstr ""
 
-#: gl/inquiry/gl_trial_balance.php:161
+#: gl/inquiry/gl_trial_balance.php:90 gl/inquiry/gl_trial_balance.php:142
+#: reporting/rep706.php:302 reporting/rep707.php:320 reporting/rep708.php:51
+#: reporting/rep708.php:117 sales/create_recurrent_invoices.php:115
+#: sales/manage/recurrent_invoices.php:102
+#: sales/create_recurrent_invoices.php:132
+msgid "Group"
+msgstr ""
+
+#: gl/inquiry/gl_trial_balance.php:159
 msgid "The from date cannot be bigger than the fiscal year end."
 msgstr ""
 
-#: gl/inquiry/gl_trial_balance.php:174 gl/manage/bank_accounts.php:102
-#: gl/view/gl_trans_view.php:63 gl/view/gl_trans_view.php:66
-#: gl/view/gl_trans_view.php:69 reporting/rep701.php:106
-#: reporting/rep702.php:51 reporting/rep705.php:234 reporting/rep706.php:181
-#: reporting/rep707.php:206 reporting/rep708.php:80
+#: gl/inquiry/gl_trial_balance.php:172 gl/manage/bank_accounts.php:106
+#: gl/manage/bank_accounts.php.orig:106 gl/view/gl_trans_view.php:63
+#: gl/view/gl_trans_view.php:66 gl/view/gl_trans_view.php:69
+#: reporting/rep701.php:109 reporting/rep702.php:51 reporting/rep705.php:234
+#: reporting/rep706.php:181 reporting/rep707.php:206 reporting/rep708.php:179
 msgid "Account Name"
 msgstr ""
 
-#: gl/inquiry/gl_trial_balance.php:175 reporting/rep708.php:72
+#: gl/inquiry/gl_trial_balance.php:173 reporting/rep708.php:172
 msgid "Brought Forward"
 msgstr ""
 
-#: gl/inquiry/gl_trial_balance.php:176 reporting/rep708.php:72
+#: gl/inquiry/gl_trial_balance.php:174 reporting/rep708.php:172
 msgid "This Period"
 msgstr ""
 
+#: gl/inquiry/gl_trial_balance.php:193
+msgid "Class"
+msgstr ""
+
+#: gl/inquiry/gl_trial_balance.php:228 reporting/rep708.php:265
+msgid ""
+"The Opening Balance is not in balance, probably due to a non closed Previous "
+"Fiscalyear."
+msgstr ""
+
 #: gl/inquiry/journal_inquiry.php:27
 msgid "Journal Inquiry"
 msgstr ""
@@ -3883,12 +4166,12 @@ msgstr ""
 msgid "Enter memo fragment or leave empty"
 msgstr ""
 
-#: gl/inquiry/journal_inquiry.php:123
+#: gl/inquiry/journal_inquiry.php:130
 msgid "Trans #"
 msgstr ""
 
-#: gl/inquiry/journal_inquiry.php:127 reporting/rep710.php:75
-#: reporting/rep710.php:85 reporting/reports_main.php:385
+#: gl/inquiry/journal_inquiry.php:134 reporting/rep710.php:75
+#: reporting/rep710.php:85 reporting/reports_main.php:400
 msgid "User"
 msgstr ""
 
@@ -3897,22 +4180,25 @@ msgid "Profit & Loss Drilldown"
 msgstr ""
 
 #: gl/inquiry/profit_loss.php:168 reporting/rep707.php:206
-#: reporting/includes/reports_classes.inc:235
+#: reporting/includes/reports_classes.inc:234
+#: reporting/includes/reports_classes.inc:238
 msgid "Accumulated"
 msgstr ""
 
 #: gl/inquiry/profit_loss.php:168 reporting/rep707.php:251
-#: reporting/includes/reports_classes.inc:235
+#: reporting/includes/reports_classes.inc:234
+#: reporting/includes/reports_classes.inc:238
 msgid "Period Y-1"
 msgstr ""
 
 #: gl/inquiry/profit_loss.php:168 reporting/rep707.php:242
-#: reporting/includes/reports_classes.inc:235
+#: reporting/includes/reports_classes.inc:234
+#: reporting/includes/reports_classes.inc:238
 msgid "Budget"
 msgstr ""
 
-#: gl/inquiry/profit_loss.php:169 reporting/reports_main.php:274
-#: reporting/reports_main.php:320 reporting/reports_main.php:361
+#: gl/inquiry/profit_loss.php:169 reporting/reports_main.php:289
+#: reporting/reports_main.php:335 reporting/reports_main.php:376
 msgid "Compare to"
 msgstr ""
 
@@ -3928,11 +4214,13 @@ msgstr ""
 msgid "Tax Inquiry"
 msgstr ""
 
-#: gl/inquiry/tax_inquiry.php:82 reporting/rep709.php:168
+#: gl/inquiry/tax_inquiry.php:82 reporting/rep709.php:172
+#: reporting/rep709.php:176
 msgid "Outputs"
 msgstr ""
 
-#: gl/inquiry/tax_inquiry.php:82 reporting/rep709.php:168
+#: gl/inquiry/tax_inquiry.php:82 reporting/rep709.php:172
+#: reporting/rep709.php:176
 msgid "Inputs"
 msgstr ""
 
@@ -3940,7 +4228,8 @@ msgstr ""
 msgid "Charged on sales"
 msgstr ""
 
-#: gl/inquiry/tax_inquiry.php:100 reporting/rep709.php:168
+#: gl/inquiry/tax_inquiry.php:100 reporting/rep709.php:172
+#: reporting/rep709.php:176
 msgid "Output Tax"
 msgstr ""
 
@@ -3948,7 +4237,8 @@ msgstr ""
 msgid "Paid on purchases"
 msgstr ""
 
-#: gl/inquiry/tax_inquiry.php:106 reporting/rep709.php:168
+#: gl/inquiry/tax_inquiry.php:106 reporting/rep709.php:172
+#: reporting/rep709.php:176
 msgid "Input Tax"
 msgstr ""
 
@@ -3956,124 +4246,145 @@ msgstr ""
 msgid "Net payable or collectible"
 msgstr ""
 
-#: gl/inquiry/tax_inquiry.php:119 reporting/rep709.php:199
+#: gl/inquiry/tax_inquiry.php:119 reporting/rep709.php:203
+#: reporting/rep709.php:207
 msgid "Total payable or refund"
 msgstr ""
 
-#: gl/manage/bank_accounts.php:16 reporting/reports_main.php:223
+#: gl/manage/bank_accounts.php:16 gl/manage/bank_accounts.php.orig:16
+#: reporting/reports_main.php:238
 msgid "Bank Accounts"
 msgstr ""
 
-#: gl/manage/bank_accounts.php:33
+#: gl/manage/bank_accounts.php:33 gl/manage/bank_accounts.php.orig:33
 msgid "The bank account name cannot be empty."
 msgstr ""
 
-#: gl/manage/bank_accounts.php:47
+#: gl/manage/bank_accounts.php:39 gl/manage/bank_accounts.php.orig:39
+msgid "The GL account selected is already in use. Select another GL account."
+msgstr ""
+
+#: gl/manage/bank_accounts.php:52 gl/manage/bank_accounts.php.orig:52
 msgid "Bank account has been updated"
 msgstr ""
 
-#: gl/manage/bank_accounts.php:56
+#: gl/manage/bank_accounts.php:61 gl/manage/bank_accounts.php.orig:61
 msgid "New bank account has been added"
 msgstr ""
 
-#: gl/manage/bank_accounts.php:72
+#: gl/manage/bank_accounts.php:76 gl/manage/bank_accounts.php.orig:76
 msgid ""
 "Cannot delete this bank account because transactions have been created using "
 "this account."
 msgstr ""
 
-#: gl/manage/bank_accounts.php:78
+#: gl/manage/bank_accounts.php:82 gl/manage/bank_accounts.php.orig:82
 msgid ""
 "Cannot delete this bank account because POS definitions have been created "
 "using this account."
 msgstr ""
 
-#: gl/manage/bank_accounts.php:83
+#: gl/manage/bank_accounts.php:87 gl/manage/bank_accounts.php.orig:87
 msgid "Selected bank account has been deleted"
 msgstr ""
 
-#: gl/manage/bank_accounts.php:102 gl/view/bank_transfer_view.php:69
-#: gl/view/bank_transfer_view.php:78 gl/view/gl_deposit_view.php:66
-#: gl/view/gl_payment_view.php:64 inventory/prices.php:133
-#: inventory/purchasing_data.php:129 purchasing/view/view_supp_credit.php:49
+#: gl/manage/bank_accounts.php:106 gl/manage/bank_accounts.php.orig:106
+#: gl/view/bank_transfer_view.php:69 gl/view/bank_transfer_view.php:78
+#: gl/view/gl_deposit_view.php:66 gl/view/gl_payment_view.php:64
+#: inventory/prices.php:133 inventory/purchasing_data.php:129
+#: purchasing/view/view_supp_credit.php:49
 #: purchasing/view/view_supp_invoice.php:53
-#: purchasing/inquiry/po_search_completed.php:122
+#: purchasing/inquiry/po_search_completed.php:127
 #: purchasing/inquiry/po_search.php:136
-#: purchasing/inquiry/supplier_allocation_inquiry.php:132
-#: purchasing/inquiry/supplier_allocation_inquiry.php:142
-#: purchasing/inquiry/supplier_inquiry.php:72
-#: purchasing/inquiry/supplier_inquiry.php:169
-#: purchasing/inquiry/supplier_inquiry.php:180
+#: purchasing/inquiry/supplier_allocation_inquiry.php:133
+#: purchasing/inquiry/supplier_allocation_inquiry.php:143
+#: purchasing/inquiry/supplier_inquiry.php:76
+#: purchasing/inquiry/supplier_inquiry.php:175
+#: purchasing/inquiry/supplier_inquiry.php:186
+#: purchasing/inquiry/supplier_inquiry.php.orig:72
+#: purchasing/inquiry/supplier_inquiry.php.orig:169
+#: purchasing/inquiry/supplier_inquiry.php.orig:180
 #: purchasing/allocations/supplier_allocation_main.php:99
 #: purchasing/allocations/supplier_allocation_main.php:107
-#: reporting/rep101.php:138 reporting/rep102.php:123 reporting/rep102.php:128
-#: reporting/rep104.php:114 reporting/rep201.php:126 reporting/rep202.php:126
-#: reporting/rep203.php:99 sales/customer_credit_invoice.php:237
-#: sales/customer_delivery.php:337 sales/customer_invoice.php:396
+#: reporting/rep101.php:138 reporting/rep102.php:131 reporting/rep102.php:137
+#: reporting/rep104.php:114 reporting/rep201.php:126 reporting/rep202.php:136
+#: reporting/rep203.php:99 sales/customer_credit_invoice.php:239
+#: sales/customer_delivery.php:340 sales/customer_invoice.php:402
 #: sales/allocations/customer_allocation_main.php:98
 #: sales/allocations/customer_allocation_main.php:106
 #: sales/view/view_credit.php:70 sales/view/view_dispatch.php:86
 #: sales/view/view_invoice.php:85
-#: sales/inquiry/customer_allocation_inquiry.php:148
-#: sales/inquiry/customer_allocation_inquiry.php:158
-#: sales/inquiry/customer_inquiry.php:76
-#: sales/inquiry/customer_inquiry.php:220
-#: sales/inquiry/customer_inquiry.php:233
+#: sales/inquiry/customer_allocation_inquiry.php:151
+#: sales/inquiry/customer_allocation_inquiry.php:161
+#: sales/inquiry/customer_inquiry.php:80
+#: sales/inquiry/customer_inquiry.php:232
+#: sales/inquiry/customer_inquiry.php:245
+#: sales/inquiry/customer_inquiry.php.orig:80
+#: sales/inquiry/customer_inquiry.php.orig:232
+#: sales/inquiry/customer_inquiry.php.orig:245
 #: sales/inquiry/sales_deliveries_view.php:189
-#: sales/inquiry/sales_orders_view.php:263
-#: sales/inquiry/sales_orders_view.php:277
+#: sales/inquiry/sales_orders_view.php:272
+#: sales/inquiry/sales_orders_view.php:286
+#: sales/inquiry/sales_orders_view.php.orig:270
+#: sales/inquiry/sales_orders_view.php.orig:284
+#: sales/customer_credit_invoice.php:237 sales/customer_invoice.php:404
 msgid "Currency"
 msgstr ""
 
-#: gl/manage/bank_accounts.php:102
+#: gl/manage/bank_accounts.php:106 gl/manage/bank_accounts.php.orig:106
 msgid "GL Account"
 msgstr ""
 
-#: gl/manage/bank_accounts.php:103 reporting/includes/doctext.inc:79
+#: gl/manage/bank_accounts.php:107 gl/manage/bank_accounts.php.orig:107
+#: reporting/includes/doctext.inc:247
 msgid "Bank"
 msgstr ""
 
-#: gl/manage/bank_accounts.php:103 includes/ui/ui_view.inc:480
+#: gl/manage/bank_accounts.php:107 gl/manage/bank_accounts.php.orig:107
+#: includes/ui/ui_view.inc:488
 msgid "Number"
 msgstr ""
 
-#: gl/manage/bank_accounts.php:103
+#: gl/manage/bank_accounts.php:107 gl/manage/bank_accounts.php.orig:107
 msgid "Bank Address"
 msgstr ""
 
-#: gl/manage/bank_accounts.php:103
+#: gl/manage/bank_accounts.php:107 gl/manage/bank_accounts.php.orig:107
 msgid "Dflt"
 msgstr ""
 
-#: gl/manage/bank_accounts.php:159
+#: gl/manage/bank_accounts.php:163 gl/manage/bank_accounts.php.orig:163
 msgid "Bank Account Name:"
 msgstr ""
 
-#: gl/manage/bank_accounts.php:163 gl/manage/bank_accounts.php:167
+#: gl/manage/bank_accounts.php:167 gl/manage/bank_accounts.php:171
+#: gl/manage/bank_accounts.php.orig:167 gl/manage/bank_accounts.php.orig:171
 msgid "Account Type:"
 msgstr ""
 
-#: gl/manage/bank_accounts.php:171 gl/manage/bank_accounts.php:175
+#: gl/manage/bank_accounts.php:175 gl/manage/bank_accounts.php:179
+#: gl/manage/bank_accounts.php.orig:175 gl/manage/bank_accounts.php.orig:179
 msgid "Bank Account Currency:"
 msgstr ""
 
-#: gl/manage/bank_accounts.php:178
+#: gl/manage/bank_accounts.php:182 gl/manage/bank_accounts.php.orig:182
 msgid "Default currency account:"
 msgstr ""
 
-#: gl/manage/bank_accounts.php:181 gl/manage/bank_accounts.php:183
+#: gl/manage/bank_accounts.php:185 gl/manage/bank_accounts.php:187
+#: gl/manage/bank_accounts.php.orig:185 gl/manage/bank_accounts.php.orig:187
 msgid "Bank Account GL Code:"
 msgstr ""
 
-#: gl/manage/bank_accounts.php:185
+#: gl/manage/bank_accounts.php:189 gl/manage/bank_accounts.php.orig:189
 msgid "Bank Name:"
 msgstr ""
 
-#: gl/manage/bank_accounts.php:186
+#: gl/manage/bank_accounts.php:190 gl/manage/bank_accounts.php.orig:190
 msgid "Bank Account Number:"
 msgstr ""
 
-#: gl/manage/bank_accounts.php:187
+#: gl/manage/bank_accounts.php:191 gl/manage/bank_accounts.php.orig:191
 msgid "Bank Address:"
 msgstr ""
 
@@ -4105,83 +4416,83 @@ msgstr ""
 msgid "New currency has been added"
 msgstr ""
 
-#: gl/manage/currencies.php:94
+#: gl/manage/currencies.php:92
 msgid ""
 "Cannot delete this currency, because customer accounts have been created "
 "referring to this currency."
 msgstr ""
 
-#: gl/manage/currencies.php:100
+#: gl/manage/currencies.php:98
 msgid ""
 "Cannot delete this currency, because supplier accounts have been created "
 "referring to this currency."
 msgstr ""
 
-#: gl/manage/currencies.php:106
+#: gl/manage/currencies.php:104
 msgid ""
 "Cannot delete this currency, because the company preferences uses this "
 "currency."
 msgstr ""
 
-#: gl/manage/currencies.php:113
+#: gl/manage/currencies.php:111
 msgid ""
 "Cannot delete this currency, because thre are bank accounts that use this "
 "currency."
 msgstr ""
 
-#: gl/manage/currencies.php:128
+#: gl/manage/currencies.php:126
 msgid "Selected currency has been deleted"
 msgstr ""
 
-#: gl/manage/currencies.php:141
+#: gl/manage/currencies.php:139
 msgid "Abbreviation"
 msgstr ""
 
-#: gl/manage/currencies.php:141
+#: gl/manage/currencies.php:139
 msgid "Symbol"
 msgstr ""
 
-#: gl/manage/currencies.php:141
+#: gl/manage/currencies.php:139
 msgid "Currency Name"
 msgstr ""
 
-#: gl/manage/currencies.php:142
+#: gl/manage/currencies.php:140
 msgid "Hundredths name"
 msgstr ""
 
-#: gl/manage/currencies.php:142
+#: gl/manage/currencies.php:140
 msgid "Country"
 msgstr ""
 
-#: gl/manage/currencies.php:142
+#: gl/manage/currencies.php:140
 msgid "Auto update"
 msgstr ""
 
-#: gl/manage/currencies.php:177
+#: gl/manage/currencies.php:175
 msgid "The marked currency is the home currency which cannot be deleted."
 msgstr ""
 
-#: gl/manage/currencies.php:203 gl/manage/currencies.php:208
+#: gl/manage/currencies.php:201 gl/manage/currencies.php:206
 msgid "Currency Abbreviation:"
 msgstr ""
 
-#: gl/manage/currencies.php:211
+#: gl/manage/currencies.php:209
 msgid "Currency Symbol:"
 msgstr ""
 
-#: gl/manage/currencies.php:212
+#: gl/manage/currencies.php:210
 msgid "Currency Name:"
 msgstr ""
 
-#: gl/manage/currencies.php:213
+#: gl/manage/currencies.php:211
 msgid "Hundredths Name:"
 msgstr ""
 
-#: gl/manage/currencies.php:214
+#: gl/manage/currencies.php:212
 msgid "Country:"
 msgstr ""
 
-#: gl/manage/currencies.php:215
+#: gl/manage/currencies.php:213
 msgid "Automatic exchange rate update:"
 msgstr ""
 
@@ -4207,7 +4518,7 @@ msgid "Exchange Rate:"
 msgstr ""
 
 #: gl/manage/exchange_rates.php:142
-msgid "Get current ECB rate"
+msgid "Get current rate from"
 msgstr ""
 
 #: gl/manage/exchange_rates.php:148
@@ -4274,7 +4585,7 @@ msgstr ""
 msgid "Class Name"
 msgstr ""
 
-#: gl/manage/gl_account_classes.php:110 gl/manage/gl_account_types.php:122
+#: gl/manage/gl_account_classes.php:110 gl/manage/gl_account_types.php:128
 msgid "Class Type"
 msgstr ""
 
@@ -4291,119 +4602,142 @@ msgstr ""
 msgid "Class Name:"
 msgstr ""
 
-#: gl/manage/gl_account_classes.php:171 gl/manage/gl_account_types.php:186
+#: gl/manage/gl_account_classes.php:171 gl/manage/gl_account_types.php:192
 msgid "Class Type:"
 msgstr ""
 
-#: gl/manage/gl_accounts.php:16 reporting/rep701.php:112
+#: gl/manage/gl_accounts.php:16 gl/manage/gl_accounts.php.orig:16
+#: reporting/rep701.php:115
 msgid "Chart of Accounts"
 msgstr ""
 
-#: gl/manage/gl_accounts.php:53
+#: gl/manage/gl_accounts.php:53 gl/manage/gl_accounts.php.orig:53
 msgid "The account code must be entered."
 msgstr ""
 
-#: gl/manage/gl_accounts.php:59
+#: gl/manage/gl_accounts.php:59 gl/manage/gl_accounts.php.orig:59
 msgid "The account name cannot be empty."
 msgstr ""
 
-#: gl/manage/gl_accounts.php:65
+#: gl/manage/gl_accounts.php:65 gl/manage/gl_accounts.php.orig:65
 msgid "The account code must be numeric."
 msgstr ""
 
-#: gl/manage/gl_accounts.php:81
+#: gl/manage/gl_accounts.php:81 gl/manage/gl_accounts.php.orig:81
+#: gl/manage/gl_accounts.php:80
 msgid "The account belongs to a bank account and cannot be inactivated."
 msgstr ""
 
-#: gl/manage/gl_accounts.php:90
+#: gl/manage/gl_accounts.php:90 gl/manage/gl_accounts.php.orig:90
+#: gl/manage/gl_accounts.php:89
 msgid "Account data has been updated."
 msgstr ""
 
-#: gl/manage/gl_accounts.php:99
+#: gl/manage/gl_accounts.php:99 gl/manage/gl_accounts.php.orig:99
+#: gl/manage/gl_accounts.php:98
 msgid "New account has been added."
 msgstr ""
 
+#: gl/manage/gl_accounts.php:116 gl/manage/gl_accounts.php.orig:116
 #: gl/manage/gl_accounts.php:117
 msgid ""
 "Cannot delete this account because transactions have been created using this "
 "account."
 msgstr ""
 
+#: gl/manage/gl_accounts.php:122 gl/manage/gl_accounts.php.orig:122
 #: gl/manage/gl_accounts.php:123
 msgid ""
 "Cannot delete this account because it is used as one of the company default "
 "GL accounts."
 msgstr ""
 
+#: gl/manage/gl_accounts.php:128 gl/manage/gl_accounts.php.orig:128
 #: gl/manage/gl_accounts.php:129
 msgid "Cannot delete this account because it is used by a bank account."
 msgstr ""
 
+#: gl/manage/gl_accounts.php:134 gl/manage/gl_accounts.php.orig:134
 #: gl/manage/gl_accounts.php:135
 msgid ""
 "Cannot delete this account because it is used by one or more Item Categories."
 msgstr ""
 
+#: gl/manage/gl_accounts.php:140 gl/manage/gl_accounts.php.orig:140
 #: gl/manage/gl_accounts.php:141
 msgid "Cannot delete this account because it is used by one or more Items."
 msgstr ""
 
+#: gl/manage/gl_accounts.php:146 gl/manage/gl_accounts.php.orig:146
 #: gl/manage/gl_accounts.php:147
 msgid "Cannot delete this account because it is used by one or more Taxes."
 msgstr ""
 
+#: gl/manage/gl_accounts.php:152 gl/manage/gl_accounts.php.orig:152
 #: gl/manage/gl_accounts.php:153
 msgid ""
 "Cannot delete this account because it is used by one or more Customer "
 "Branches."
 msgstr ""
 
+#: gl/manage/gl_accounts.php:158 gl/manage/gl_accounts.php.orig:158
 #: gl/manage/gl_accounts.php:159
 msgid "Cannot delete this account because it is used by one or more suppliers."
 msgstr ""
 
+#: gl/manage/gl_accounts.php:164 gl/manage/gl_accounts.php.orig:164
 #: gl/manage/gl_accounts.php:165
 msgid ""
 "Cannot delete this account because it is used by one or more Quick Entry "
 "Lines."
 msgstr ""
 
+#: gl/manage/gl_accounts.php:182 gl/manage/gl_accounts.php.orig:182
 #: gl/manage/gl_accounts.php:183
 msgid "Selected account has been deleted"
 msgstr ""
 
+#: gl/manage/gl_accounts.php:197 gl/manage/gl_accounts.php.orig:197
 #: gl/manage/gl_accounts.php:198
 msgid "New account"
 msgstr ""
 
+#: gl/manage/gl_accounts.php:243 gl/manage/gl_accounts.php.orig:243
 #: gl/manage/gl_accounts.php:244
 msgid "Account Code 2:"
 msgstr ""
 
+#: gl/manage/gl_accounts.php:245 gl/manage/gl_accounts.php.orig:245
 #: gl/manage/gl_accounts.php:246
 msgid "Account Name:"
 msgstr ""
 
+#: gl/manage/gl_accounts.php:247 gl/manage/gl_accounts.php.orig:247
 #: gl/manage/gl_accounts.php:248
 msgid "Account Group:"
 msgstr ""
 
+#: gl/manage/gl_accounts.php:249 gl/manage/gl_accounts.php.orig:249
 #: gl/manage/gl_accounts.php:250
 msgid "Account Tags:"
 msgstr ""
 
+#: gl/manage/gl_accounts.php:251 gl/manage/gl_accounts.php.orig:251
 #: gl/manage/gl_accounts.php:252
 msgid "Account status:"
 msgstr ""
 
+#: gl/manage/gl_accounts.php:256 gl/manage/gl_accounts.php.orig:256
 #: gl/manage/gl_accounts.php:257
 msgid "Add Account"
 msgstr ""
 
+#: gl/manage/gl_accounts.php:260 gl/manage/gl_accounts.php.orig:260
 #: gl/manage/gl_accounts.php:261
 msgid "Update Account"
 msgstr ""
 
+#: gl/manage/gl_accounts.php:261 gl/manage/gl_accounts.php.orig:261
 #: gl/manage/gl_accounts.php:262
 msgid "Delete account"
 msgstr ""
@@ -4420,51 +4754,55 @@ msgstr ""
 msgid "The account group name cannot be empty."
 msgstr ""
 
-#: gl/manage/gl_account_types.php:43
+#: gl/manage/gl_account_types.php:42
+msgid "This account group id is already in use."
+msgstr ""
+
+#: gl/manage/gl_account_types.php:50
 msgid "You cannot set an account group to be a subgroup of itself."
 msgstr ""
 
-#: gl/manage/gl_account_types.php:61
+#: gl/manage/gl_account_types.php:68
 msgid "Selected account type has been updated"
 msgstr ""
 
-#: gl/manage/gl_account_types.php:66
+#: gl/manage/gl_account_types.php:73
 msgid "New account type has been added"
 msgstr ""
 
-#: gl/manage/gl_account_types.php:83
+#: gl/manage/gl_account_types.php:89
 msgid ""
 "Cannot delete this account group because GL accounts have been created "
 "referring to it."
 msgstr ""
 
-#: gl/manage/gl_account_types.php:89
+#: gl/manage/gl_account_types.php:95
 msgid ""
 "Cannot delete this account group because GL account groups have been created "
 "referring to it."
 msgstr ""
 
-#: gl/manage/gl_account_types.php:105
+#: gl/manage/gl_account_types.php:111
 msgid "Selected account group has been deleted"
 msgstr ""
 
-#: gl/manage/gl_account_types.php:122
+#: gl/manage/gl_account_types.php:128
 msgid "Group ID"
 msgstr ""
 
-#: gl/manage/gl_account_types.php:122 sales/manage/sales_groups.php:85
+#: gl/manage/gl_account_types.php:128 sales/manage/sales_groups.php:85
 msgid "Group Name"
 msgstr ""
 
-#: gl/manage/gl_account_types.php:122
+#: gl/manage/gl_account_types.php:128
 msgid "Subgroup Of"
 msgstr ""
 
-#: gl/manage/gl_account_types.php:181
+#: gl/manage/gl_account_types.php:187
 msgid "ID:"
 msgstr ""
 
-#: gl/manage/gl_account_types.php:184
+#: gl/manage/gl_account_types.php:190
 msgid "Subgroup Of:"
 msgstr ""
 
@@ -4472,8 +4810,9 @@ msgstr ""
 msgid "Quick Entries"
 msgstr ""
 
-#: gl/manage/gl_quick_entries.php:58 includes/ui/simple_crud_class.inc:221
-#: includes/ui/ui_input.inc:201
+#: gl/manage/gl_quick_entries.php:58 includes/ui/radio.ui_input.inc:204
+#: includes/ui/simple_crud_class.inc:221 includes/ui/ui_input.inc:204
+#: includes/ui/ui_input.inc:205
 msgid "Add new"
 msgstr ""
 
@@ -4559,8 +4898,8 @@ msgstr ""
 msgid "Posted"
 msgstr ""
 
-#: gl/manage/gl_quick_entries.php:329 sales/customer_delivery.php:430
-#: sales/customer_invoice.php:447
+#: gl/manage/gl_quick_entries.php:329 sales/customer_delivery.php:433
+#: sales/customer_invoice.php:468 sales/customer_invoice.php:470
 msgid "Tax Type"
 msgstr ""
 
@@ -4572,15 +4911,20 @@ msgstr ""
 msgid "Revaluation of Currency Accounts"
 msgstr ""
 
-#: gl/manage/revaluate_currencies.php:31
+#: gl/manage/revaluate_currencies.php:32
 msgid "No Revaluation was needed"
 msgstr ""
 
-#: gl/manage/revaluate_currencies.php:101
+#: gl/manage/revaluate_currencies.php:40
+#, php-format
+msgid "%d Journal Entries for AR/AP accounts have been added"
+msgstr ""
+
+#: gl/manage/revaluate_currencies.php:104
 msgid "Date for Revaluation:"
 msgstr ""
 
-#: gl/manage/revaluate_currencies.php:106
+#: gl/manage/revaluate_currencies.php:109
 msgid "Revaluate Currencies"
 msgstr ""
 
@@ -4623,11 +4967,12 @@ msgstr ""
 msgid "GL Deposit"
 msgstr ""
 
-#: gl/view/gl_deposit_view.php:71 gl/includes/db/gl_db_banking.inc:104
-#: reporting/reports_main.php:81 reporting/reports_main.php:88
-#: reporting/reports_main.php:95 reporting/reports_main.php:107
-#: reporting/reports_main.php:114 reporting/reports_main.php:149
-#: reporting/reports_main.php:155 reporting/reports_main.php:204
+#: gl/view/gl_deposit_view.php:71 gl/includes/db/gl_db_banking.inc:212
+#: reporting/reports_main.php:88 reporting/reports_main.php:95
+#: reporting/reports_main.php:102 reporting/reports_main.php:114
+#: reporting/reports_main.php:121 reporting/reports_main.php:127
+#: reporting/reports_main.php:163 reporting/reports_main.php:169
+#: reporting/reports_main.php:219
 msgid "From"
 msgstr ""
 
@@ -4655,18 +5000,23 @@ msgstr ""
 #: gl/view/gl_deposit_view.php:105 gl/view/gl_payment_view.php:98
 #: gl/view/gl_payment_view.php:101 gl/view/gl_payment_view.php:104
 #: gl/view/gl_trans_view.php:63 gl/view/gl_trans_view.php:66
-#: gl/view/gl_trans_view.php:69 gl/includes/ui/gl_bank_ui.inc:121
-#: gl/includes/ui/gl_bank_ui.inc:124 gl/includes/ui/gl_bank_ui.inc:127
-#: gl/includes/ui/gl_journal_ui.inc:83 gl/includes/ui/gl_journal_ui.inc:86
-#: gl/includes/ui/gl_journal_ui.inc:89 reporting/rep701.php:106
+#: gl/view/gl_trans_view.php:69 gl/includes/ui/gl_bank_ui.inc:150
+#: gl/includes/ui/gl_bank_ui.inc:153 gl/includes/ui/gl_bank_ui.inc:156
+#: gl/includes/ui/gl_bank_ui.inc.orig:132
+#: gl/includes/ui/gl_bank_ui.inc.orig:135
+#: gl/includes/ui/gl_bank_ui.inc.orig:138 gl/includes/ui/gl_journal_ui.inc:83
+#: gl/includes/ui/gl_journal_ui.inc:86 gl/includes/ui/gl_journal_ui.inc:89
+#: reporting/rep701.php:109
 msgid "Account Code"
 msgstr ""
 
 #: gl/view/gl_deposit_view.php:99 gl/view/gl_deposit_view.php:102
 #: gl/view/gl_deposit_view.php:105 gl/view/gl_payment_view.php:98
 #: gl/view/gl_payment_view.php:101 gl/view/gl_payment_view.php:104
-#: gl/includes/ui/gl_bank_ui.inc:121 gl/includes/ui/gl_bank_ui.inc:124
-#: gl/includes/ui/gl_bank_ui.inc:127 gl/includes/ui/gl_journal_ui.inc:83
+#: gl/includes/ui/gl_bank_ui.inc:150 gl/includes/ui/gl_bank_ui.inc:153
+#: gl/includes/ui/gl_bank_ui.inc:156 gl/includes/ui/gl_bank_ui.inc.orig:132
+#: gl/includes/ui/gl_bank_ui.inc.orig:135
+#: gl/includes/ui/gl_bank_ui.inc.orig:138 gl/includes/ui/gl_journal_ui.inc:83
 #: gl/includes/ui/gl_journal_ui.inc:86 gl/includes/ui/gl_journal_ui.inc:89
 msgid "Account Description"
 msgstr ""
@@ -4683,12 +5033,12 @@ msgstr ""
 msgid "Pay To"
 msgstr ""
 
-#: gl/view/gl_payment_view.php:70 purchasing/view/view_supp_payment.php:61
-#: sales/view/view_receipt.php:48
+#: gl/view/gl_payment_view.php:70 purchasing/view/view_supp_payment.php:64
+#: purchasing/view/view_supp_payment.php:78 sales/view/view_receipt.php:48
 msgid "Payment Type"
 msgstr ""
 
-#: gl/view/gl_payment_view.php:79 purchasing/view/view_supp_payment.php:76
+#: gl/view/gl_payment_view.php:79 purchasing/view/view_supp_payment.php:85
 msgid "This payment has been voided."
 msgstr ""
 
@@ -4717,24 +5067,30 @@ msgid "This transaction has been voided."
 msgstr ""
 
 #: gl/includes/db/gl_db_banking.inc:44 gl/includes/db/gl_db_banking.inc:47
+#: gl/includes/db/gl_db_banking.inc:59 gl/includes/db/gl_db_banking.inc:62
 msgid "Exchange Variance"
 msgstr ""
 
-#: gl/includes/db/gl_db_banking.inc:104 reporting/reports_main.php:82
-#: reporting/reports_main.php:89 reporting/reports_main.php:96
-#: reporting/reports_main.php:108 reporting/reports_main.php:115
-#: reporting/reports_main.php:150 reporting/reports_main.php:156
-#: reporting/reports_main.php:205
+#: gl/includes/db/gl_db_banking.inc:212 reporting/reports_main.php:89
+#: reporting/reports_main.php:96 reporting/reports_main.php:103
+#: reporting/reports_main.php:115 reporting/reports_main.php:122
+#: reporting/reports_main.php:128 reporting/reports_main.php:164
+#: reporting/reports_main.php:170 reporting/reports_main.php:220
 msgid "To"
 msgstr ""
 
-#: gl/includes/db/gl_db_rates.inc:129
+#: gl/includes/db/gl_db_banking.inc:428
+msgid "Document reentered."
+msgstr ""
+
+#: gl/includes/db/gl_db_rates.inc:130
 #, php-format
 msgid ""
 "Cannot retrieve currency rate from %s page. Please set the rate manually."
 msgstr ""
 
-#: gl/includes/ui/gl_bank_ui.inc:25 gl/includes/ui/gl_journal_ui.inc:27
+#: gl/includes/ui/gl_bank_ui.inc:24 gl/includes/ui/gl_bank_ui.inc.orig:23
+#: gl/includes/ui/gl_journal_ui.inc:27
 #: inventory/includes/item_adjustments_ui.inc:39
 #: inventory/includes/stock_transfers_ui.inc:42
 #: manufacturing/work_order_add_finished.php:208
@@ -4745,52 +5101,66 @@ msgstr ""
 msgid "Date:"
 msgstr ""
 
-#: gl/includes/ui/gl_bank_ui.inc:50
+#: gl/includes/ui/gl_bank_ui.inc:51 gl/includes/ui/gl_bank_ui.inc.orig:50
 msgid "Pay To:"
 msgstr ""
 
-#: gl/includes/ui/gl_bank_ui.inc:55
+#: gl/includes/ui/gl_bank_ui.inc:56 gl/includes/ui/gl_bank_ui.inc.orig:55
 msgid "To the Order of:"
 msgstr ""
 
-#: gl/includes/ui/gl_bank_ui.inc:62 inventory/purchasing_data.php:184
-#: inventory/purchasing_data.php:188 purchasing/includes/ui/invoice_ui.inc:73
+#: gl/includes/ui/gl_bank_ui.inc:63 gl/includes/ui/gl_bank_ui.inc.orig:62
+#: inventory/purchasing_data.php:184 inventory/purchasing_data.php:188
+#: purchasing/includes/ui/invoice_ui.inc:73
 #: purchasing/includes/ui/invoice_ui.inc:80
 #: purchasing/includes/ui/po_ui.inc:120 purchasing/includes/ui/po_ui.inc:125
 msgid "Supplier:"
 msgstr ""
 
-#: gl/includes/ui/gl_bank_ui.inc:65 sales/manage/recurrent_invoices.php:151
+#: gl/includes/ui/gl_bank_ui.inc:66 gl/includes/ui/gl_bank_ui.inc.orig:65
+#: sales/manage/recurrent_invoices.php:169
 #: sales/includes/ui/sales_credit_ui.inc:29
 #: sales/includes/ui/sales_order_ui.inc:278
+#: sales/includes/ui/sales_order_ui.inc:282
 msgid "Customer:"
 msgstr ""
 
-#: gl/includes/ui/gl_bank_ui.inc:69 sales/customer_payments.php:239
-#: sales/manage/recurrent_invoices.php:154
+#: gl/includes/ui/gl_bank_ui.inc:70 gl/includes/ui/gl_bank_ui.inc.orig:69
+#: sales/customer_payments.php:360 sales/manage/recurrent_invoices.php:172
 #: sales/includes/ui/sales_credit_ui.inc:37
 #: sales/includes/ui/sales_order_ui.inc:285
+#: sales/includes/ui/sales_order_ui.inc:289 sales/customer_payments.php:363
+#: sales/customer_payments.php.orig:362
 msgid "Branch:"
 msgstr ""
 
-#: gl/includes/ui/gl_bank_ui.inc:87 gl/includes/ui/gl_journal_ui.inc:58
-#: gl/includes/ui/gl_journal_ui.inc:62
+#: gl/includes/ui/gl_bank_ui.inc:84 gl/includes/ui/gl_bank_ui.inc:87
+#: sales/customer_payments.php:369 sales/customer_payments.php:372
+#: sales/customer_payments.php.orig:371
+msgid "This customer account is on hold."
+msgstr ""
+
+#: gl/includes/ui/gl_bank_ui.inc:99 gl/includes/ui/gl_bank_ui.inc.orig:87
+#: gl/includes/ui/gl_journal_ui.inc:58 gl/includes/ui/gl_journal_ui.inc:62
 #: purchasing/includes/ui/invoice_ui.inc:231
 msgid "Go"
 msgstr ""
 
-#: gl/includes/ui/gl_bank_ui.inc:156 includes/ui/simple_crud_class.inc:52
+#: gl/includes/ui/gl_bank_ui.inc:185 gl/includes/ui/gl_bank_ui.inc.orig:167
+#: includes/ui/simple_crud_class.inc:52
 #: inventory/includes/item_adjustments_ui.inc:88
 #: inventory/includes/stock_transfers_ui.inc:80
 #: manufacturing/includes/work_order_issue_ui.inc:59
-#: purchasing/includes/ui/invoice_ui.inc:521
+#: purchasing/includes/ui/invoice_ui.inc:520
 #: purchasing/includes/ui/po_ui.inc:267
 #: sales/includes/ui/sales_credit_ui.inc:198
 #: sales/includes/ui/sales_order_ui.inc:203
+#: sales/includes/ui/sales_order_ui.inc:207
 msgid "Edit document line"
 msgstr ""
 
-#: gl/includes/ui/gl_bank_ui.inc:158 includes/ui/simple_crud_class.inc:54
+#: gl/includes/ui/gl_bank_ui.inc:187 gl/includes/ui/gl_bank_ui.inc.orig:169
+#: includes/ui/simple_crud_class.inc:54
 #: inventory/includes/item_adjustments_ui.inc:90
 #: inventory/includes/stock_transfers_ui.inc:82
 #: manufacturing/includes/work_order_issue_ui.inc:61
@@ -4798,48 +5168,54 @@ msgstr ""
 #: purchasing/includes/ui/po_ui.inc:269
 #: sales/includes/ui/sales_credit_ui.inc:200
 #: sales/includes/ui/sales_order_ui.inc:205
+#: sales/includes/ui/sales_order_ui.inc:209
 msgid "Remove line from document"
 msgstr ""
 
-#: gl/includes/ui/gl_bank_ui.inc:247 gl/includes/ui/gl_journal_ui.inc:222
-#: includes/ui/simple_crud_class.inc:56
+#: gl/includes/ui/gl_bank_ui.inc:276 gl/includes/ui/gl_bank_ui.inc.orig:258
+#: gl/includes/ui/gl_journal_ui.inc:222 includes/ui/simple_crud_class.inc:56
 #: inventory/includes/item_adjustments_ui.inc:158
 #: inventory/includes/stock_transfers_ui.inc:138
 #: manufacturing/includes/work_order_issue_ui.inc:132
 #: purchasing/includes/ui/po_ui.inc:443
 #: sales/includes/ui/sales_credit_ui.inc:294
 #: sales/includes/ui/sales_order_ui.inc:556
+#: sales/includes/ui/sales_order_ui.inc:560
 msgid "Confirm changes"
 msgstr ""
 
-#: gl/includes/ui/gl_bank_ui.inc:249 gl/includes/ui/gl_journal_ui.inc:224
-#: includes/ui/simple_crud_class.inc:58
+#: gl/includes/ui/gl_bank_ui.inc:278 gl/includes/ui/gl_bank_ui.inc.orig:260
+#: gl/includes/ui/gl_journal_ui.inc:224 includes/ui/simple_crud_class.inc:58
 #: inventory/includes/item_adjustments_ui.inc:160
 #: inventory/includes/stock_transfers_ui.inc:140
 #: manufacturing/includes/work_order_issue_ui.inc:134
 #: purchasing/includes/ui/po_ui.inc:445
 #: sales/includes/ui/sales_credit_ui.inc:296
 #: sales/includes/ui/sales_order_ui.inc:558
+#: sales/includes/ui/sales_order_ui.inc:562
 msgid "Cancel changes"
 msgstr ""
 
-#: gl/includes/ui/gl_bank_ui.inc:254 gl/includes/ui/gl_journal_ui.inc:228
+#: gl/includes/ui/gl_bank_ui.inc:283 gl/includes/ui/gl_bank_ui.inc.orig:265
+#: gl/includes/ui/gl_journal_ui.inc:228
 #: inventory/includes/item_adjustments_ui.inc:166
 #: inventory/includes/stock_transfers_ui.inc:146
 #: manufacturing/includes/work_order_issue_ui.inc:140
 #: purchasing/includes/ui/po_ui.inc:451
 #: sales/includes/ui/sales_credit_ui.inc:302
 #: sales/includes/ui/sales_order_ui.inc:564
+#: sales/includes/ui/sales_order_ui.inc:568
 msgid "Add Item"
 msgstr ""
 
-#: gl/includes/ui/gl_bank_ui.inc:255
+#: gl/includes/ui/gl_bank_ui.inc:284 gl/includes/ui/gl_bank_ui.inc.orig:266
 #: inventory/includes/item_adjustments_ui.inc:167
 #: inventory/includes/stock_transfers_ui.inc:147
 #: manufacturing/includes/work_order_issue_ui.inc:141
 #: purchasing/includes/ui/po_ui.inc:452
 #: sales/includes/ui/sales_credit_ui.inc:303
 #: sales/includes/ui/sales_order_ui.inc:565
+#: sales/includes/ui/sales_order_ui.inc:569
 msgid "Add new item to document"
 msgstr ""
 
@@ -4931,8 +5307,8 @@ msgstr ""
 msgid "Dimensions configuration"
 msgstr ""
 
-#: includes/access_levels.inc:72 inventory/manage/items.php:351
-#: reporting/reports_main.php:208
+#: includes/access_levels.inc:72 inventory/manage/items.php:341
+#: reporting/reports_main.php:223
 msgid "Dimensions"
 msgstr ""
 
@@ -5404,49 +5780,30 @@ msgstr ""
 msgid "GL reports and inquiries"
 msgstr ""
 
-#: includes/banking.inc:100
+#: includes/banking.inc:100 includes/data_checks.inc:52
 #, php-format
 msgid ""
 "Cannot retrieve exchange rate for currency %s as of %s. Please add exchange "
 "rate manually on Exchange Rates page."
 msgstr ""
 
-#: includes/current_user.inc:79
-msgid ""
-"Before software upgrade you have to include old $security_groups and "
-"$security_headings arrays from old config.php file to the new one."
-msgstr ""
-
-#: includes/current_user.inc:80 includes/ui/ui_controls.inc:174
-#: includes/ui/ui_controls.inc.orig:174 includes/ui/ui_view.inc:843
-msgid "Back"
-msgstr ""
-
-#: includes/current_user.inc:90
-msgid "System is available for site admin only until full database upgrade"
-msgstr ""
-
-#: includes/current_user.inc:428
-msgid "Requesting data..."
-msgstr ""
-
-#: includes/errors.inc:76
+#: includes/errors.inc:123
 msgid "in file"
 msgstr ""
 
-#: includes/errors.inc:76
+#: includes/errors.inc:123
 msgid "at line "
 msgstr ""
 
-#: includes/errors.inc:123
+#: includes/errors.inc:177
 msgid "Debug mode database warning:"
 msgstr ""
 
-#: includes/errors.inc:125
+#: includes/errors.inc:179
 msgid "DATABASE ERROR :"
 msgstr ""
 
-#: includes/errors.inc:156
+#: includes/errors.inc:210
 msgid ""
 "The entered information is a duplicate. Please go back and enter different "
 "values."
@@ -5461,109 +5818,64 @@ msgstr ""
 msgid "No key field '%s' in file '%s'"
 msgstr ""
 
-#: includes/packages.inc:295
+#: includes/packages.inc:295 includes/packages.inc:329
+#, php-format
+msgid "Cannot delete outdated '%s' file."
+msgstr ""
+
+#: includes/packages.inc:299
 msgid "Release file in repository is invalid, or public key is outdated."
 msgstr ""
 
-#: includes/packages.inc:311
+#: includes/packages.inc:316
 msgid "Repository version does not match application version."
 msgstr ""
 
-#: includes/packages.inc:325
+#: includes/packages.inc:333
 #, php-format
 msgid ""
 "Security alert: broken index file in repository '%s'. Please inform "
 "repository administrator about this issue."
 msgstr ""
 
-#: includes/packages.inc:358
+#: includes/packages.inc:366
 #, php-format
 msgid ""
 "Security alert: broken package '%s' in repository. Please inform repository "
 "administrator about this issue."
 msgstr ""
 
-#: includes/packages.inc:613 includes/packages.inc:664
+#: includes/packages.inc:621 includes/packages.inc:672
 #, php-format
 msgid "Package '%s' not found."
 msgstr ""
 
-#: includes/session.inc:39
-msgid "Incorrect Password"
+#: includes/sysnames.inc:23 includes/sysnames.inc:148
+msgid "Bank Payment"
 msgstr ""
 
-#: includes/session.inc:40
-msgid "The user and password combination is not valid for the system."
+#: includes/sysnames.inc:24 includes/sysnames.inc:147
+msgid "Bank Deposit"
 msgstr ""
 
-#: includes/session.inc:42
-msgid ""
-"If you are not an authorized user, please contact your system administrator "
-"to obtain an account to enable you to use the system."
+#: includes/sysnames.inc:25
+msgid "Funds Transfer"
 msgstr ""
 
-#: includes/session.inc:43
-msgid "Try again"
+#: includes/sysnames.inc:26
+msgid "Sales Invoice"
 msgstr ""
 
-#: includes/session.inc:62
-msgid "Security settings have not been defined for your user account."
+#: includes/sysnames.inc:27 sales/credit_note_entry.php:37
+msgid "Customer Credit Note"
 msgstr ""
 
-#: includes/session.inc:63
-msgid "Please contact your system administrator."
+#: includes/sysnames.inc:28
+msgid "Customer Payment"
 msgstr ""
 
-#: includes/session.inc:64
-msgid ""
-"Please remove $security_groups and $security_headings arrays from config.php "
-"file!"
-msgstr ""
-
-#: includes/session.inc:66
-msgid ""
-"Access to application has been blocked until database upgrade is completed "
-"by system administrator."
-msgstr ""
-
-#: includes/session.inc:80
-msgid ""
-"The security settings on your account do not permit you to access this "
-"function"
-msgstr ""
-
-#: includes/session.inc:89
-msgid ""
-"System is blocked after source upgrade until database is updated on System/"
-"Software Upgrade page"
-msgstr ""
-
-#: includes/sysnames.inc:23 includes/sysnames.inc:148
-msgid "Bank Payment"
-msgstr ""
-
-#: includes/sysnames.inc:24 includes/sysnames.inc:147
-msgid "Bank Deposit"
-msgstr ""
-
-#: includes/sysnames.inc:25
-msgid "Funds Transfer"
-msgstr ""
-
-#: includes/sysnames.inc:26
-msgid "Sales Invoice"
-msgstr ""
-
-#: includes/sysnames.inc:27 sales/credit_note_entry.php:37
-msgid "Customer Credit Note"
-msgstr ""
-
-#: includes/sysnames.inc:28
-msgid "Customer Payment"
-msgstr ""
-
-#: includes/sysnames.inc:29
-msgid "Delivery Note"
+#: includes/sysnames.inc:29
+msgid "Delivery Note"
 msgstr ""
 
 #: includes/sysnames.inc:30
@@ -5607,12 +5919,16 @@ msgstr ""
 msgid "Work Order Production"
 msgstr ""
 
-#: includes/sysnames.inc:40 sales/inquiry/sales_orders_view.php:134
-#: sales/inquiry/sales_orders_view.php:156
+#: includes/sysnames.inc:40 sales/inquiry/sales_orders_view.php:139
+#: sales/inquiry/sales_orders_view.php:161
+#: sales/inquiry/sales_orders_view.php.orig:137
+#: sales/inquiry/sales_orders_view.php.orig:159
 msgid "Sales Order"
 msgstr ""
 
-#: includes/sysnames.inc:41 sales/sales_order_entry.php:613
+#: includes/sysnames.inc:41 sales/sales_order_entry.php:614
+#: sales/sales_order_entry.php:618 sales/sales_order_entry.php:629
+#: sales/sales_order_entry.php.orig:628
 msgid "Sales Quotation"
 msgstr ""
 
@@ -5648,7 +5964,8 @@ msgstr ""
 msgid "CP"
 msgstr ""
 
-#: includes/sysnames.inc:54 sales/customer_invoice.php:450
+#: includes/sysnames.inc:54 sales/customer_invoice.php:471
+#: sales/customer_invoice.php:473
 msgid "DN"
 msgstr ""
 
@@ -5677,6 +5994,7 @@ msgid "SP"
 msgstr ""
 
 #: includes/sysnames.inc:61 reporting/rep204.php:82 reporting/rep305.php:95
+#: reporting/rep305.php:98
 msgid "GRN"
 msgstr ""
 
@@ -5736,24 +6054,30 @@ msgstr ""
 msgid "Cash"
 msgstr ""
 
-#: includes/sysnames.inc:96 reporting/rep101.php:137 reporting/rep102.php:115
-#: reporting/rep102.php:122 reporting/rep105.php:107 reporting/rep106.php:81
-#: reporting/rep304.php:114 reporting/rep304.php:124
+#: includes/sysnames.inc:96 reporting/rep101.php:137 reporting/rep102.php:123
+#: reporting/rep102.php:130 reporting/rep105.php:107 reporting/rep106.php:81
+#: reporting/rep114.php:93 reporting/rep304.php:112 reporting/rep304.php:122
 #: reporting/reports_main.php:32 reporting/reports_main.php:36
-#: reporting/reports_main.php:43 reporting/reports_main.php:101
-#: reporting/reports_main.php:188 sales/create_recurrent_invoices.php:98
-#: sales/customer_credit_invoice.php:235 sales/customer_delivery.php:335
-#: sales/customer_invoice.php:372
+#: reporting/reports_main.php:43 reporting/reports_main.php:108
+#: reporting/reports_main.php:203 sales/create_recurrent_invoices.php:115
+#: sales/customer_credit_invoice.php:237 sales/customer_delivery.php:338
+#: sales/customer_invoice.php:378
 #: sales/allocations/customer_allocation_main.php:97
 #: sales/allocations/customer_allocation_main.php:105
-#: sales/manage/recurrent_invoices.php:85 sales/view/view_credit.php:47
-#: sales/inquiry/customer_allocation_inquiry.php:147
-#: sales/inquiry/customer_allocation_inquiry.php:157
-#: sales/inquiry/customer_inquiry.php:218
-#: sales/inquiry/customer_inquiry.php:232
+#: sales/manage/recurrent_invoices.php:102 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:230
+#: sales/inquiry/customer_inquiry.php:244
+#: sales/inquiry/customer_inquiry.php.orig:230
+#: sales/inquiry/customer_inquiry.php.orig:244
 #: sales/inquiry/sales_deliveries_view.php:180
-#: sales/inquiry/sales_orders_view.php:255
-#: sales/inquiry/sales_orders_view.php:269
+#: sales/inquiry/sales_orders_view.php:264
+#: sales/inquiry/sales_orders_view.php:278
+#: sales/inquiry/sales_orders_view.php.orig:262
+#: sales/inquiry/sales_orders_view.php.orig:276
+#: sales/create_recurrent_invoices.php:132
+#: sales/customer_credit_invoice.php:235 sales/customer_invoice.php:380
 msgid "Customer"
 msgstr ""
 
@@ -5762,19 +6086,21 @@ msgstr ""
 #: purchasing/includes/ui/po_ui.inc:316
 #: purchasing/view/view_supp_credit.php:42
 #: purchasing/view/view_supp_invoice.php:45
-#: purchasing/inquiry/po_search_completed.php:118
+#: purchasing/inquiry/po_search_completed.php:123
 #: purchasing/inquiry/po_search.php:132
-#: purchasing/inquiry/supplier_allocation_inquiry.php:128
-#: purchasing/inquiry/supplier_allocation_inquiry.php:141
-#: purchasing/inquiry/supplier_inquiry.php:165
-#: purchasing/inquiry/supplier_inquiry.php:179
+#: purchasing/inquiry/supplier_allocation_inquiry.php:129
+#: purchasing/inquiry/supplier_allocation_inquiry.php:142
+#: purchasing/inquiry/supplier_inquiry.php:171
+#: purchasing/inquiry/supplier_inquiry.php:185
+#: purchasing/inquiry/supplier_inquiry.php.orig:165
+#: purchasing/inquiry/supplier_inquiry.php.orig:179
 #: purchasing/allocations/supplier_allocation_main.php:98
 #: purchasing/allocations/supplier_allocation_main.php:106
-#: reporting/rep201.php:125 reporting/rep202.php:118 reporting/rep202.php:125
+#: reporting/rep201.php:125 reporting/rep202.php:128 reporting/rep202.php:135
 #: reporting/rep203.php:98 reporting/rep204.php:88
-#: reporting/reports_main.php:119 reporting/reports_main.php:123
-#: reporting/reports_main.php:130 reporting/reports_main.php:139
-#: reporting/reports_main.php:145
+#: reporting/reports_main.php:132 reporting/reports_main.php:136
+#: reporting/reports_main.php:143 reporting/reports_main.php:153
+#: reporting/reports_main.php:159
 msgid "Supplier"
 msgstr ""
 
@@ -6031,7 +6357,7 @@ 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:358 includes/system_tests.inc:366
 #, php-format
 msgid "'%s' is not writeable"
 msgstr ""
@@ -6095,70 +6421,73 @@ msgstr ""
 msgid "Extensions system"
 msgstr ""
 
-#: includes/system_tests.inc:363
+#: includes/system_tests.inc:363 includes/system_tests.inc:371
 msgid "Extensions configuration files and directories should be writeable"
 msgstr ""
 
-#: includes/system_tests.inc:375
+#: includes/system_tests.inc:375 includes/system_tests.inc:384
 #, php-format
 msgid "Non-standard theme directory '%s' is not writable"
 msgstr ""
 
-#: includes/system_tests.inc:385
+#: includes/system_tests.inc:385 includes/system_tests.inc:394
 msgid ""
 "OpenSSL PHP extension have to be enabled to use extension repository system."
 msgstr ""
 
-#: includes/system_tests.inc:388
+#: includes/system_tests.inc:388 includes/system_tests.inc:397
 msgid ""
 "OpenSSL have to be available on your server to use extension repository "
 "system."
 msgstr ""
 
-#: includes/system_tests.inc:411
+#: includes/system_tests.inc:411 includes/system_tests.inc:420
 msgid "Test"
 msgstr ""
 
-#: includes/system_tests.inc:411
+#: includes/system_tests.inc:411 includes/system_tests.inc:420
 msgid "Test type"
 msgstr ""
 
 #: includes/system_tests.inc:411 includes/ui/view_package.php:37
-#: reporting/rep204.php:83 reporting/rep301.php:100
+#: reporting/rep204.php:83 reporting/rep301.php:103
+#: includes/system_tests.inc:420
 msgid "Value"
 msgstr ""
 
 #: includes/system_tests.inc:411 reporting/reports_main.php:39
-#: reporting/reports_main.php:48 reporting/reports_main.php:56
-#: reporting/reports_main.php:64 reporting/reports_main.php:72
-#: reporting/reports_main.php:78 reporting/reports_main.php:86
-#: reporting/reports_main.php:93 reporting/reports_main.php:99
-#: reporting/reports_main.php:105 reporting/reports_main.php:112
-#: reporting/reports_main.php:117 reporting/reports_main.php:126
-#: reporting/reports_main.php:135 reporting/reports_main.php:142
-#: reporting/reports_main.php:146 reporting/reports_main.php:153
-#: reporting/reports_main.php:159 reporting/reports_main.php:167
-#: reporting/reports_main.php:172 reporting/reports_main.php:181
-#: reporting/reports_main.php:189 reporting/reports_main.php:194
-#: reporting/reports_main.php:201 reporting/reports_main.php:207
-#: reporting/reports_main.php:215 reporting/reports_main.php:226
-#: reporting/reports_main.php:232 reporting/reports_main.php:238
-#: reporting/reports_main.php:252 reporting/reports_main.php:259
-#: reporting/reports_main.php:269 reporting/reports_main.php:280
-#: reporting/reports_main.php:289 reporting/reports_main.php:300
-#: reporting/reports_main.php:306 reporting/reports_main.php:315
-#: reporting/reports_main.php:325 reporting/reports_main.php:333
-#: reporting/reports_main.php:343 reporting/reports_main.php:348
-#: reporting/reports_main.php:356 reporting/reports_main.php:365
-#: reporting/reports_main.php:372 reporting/reports_main.php:379
-#: reporting/reports_main.php:386 reporting/includes/excel_report.inc:295
+#: reporting/reports_main.php:49 reporting/reports_main.php:57
+#: reporting/reports_main.php:63 reporting/reports_main.php:71
+#: reporting/reports_main.php:79 reporting/reports_main.php:85
+#: reporting/reports_main.php:93 reporting/reports_main.php:100
+#: reporting/reports_main.php:106 reporting/reports_main.php:112
+#: reporting/reports_main.php:119 reporting/reports_main.php:125
+#: reporting/reports_main.php:130 reporting/reports_main.php:139
+#: reporting/reports_main.php:149 reporting/reports_main.php:156
+#: reporting/reports_main.php:160 reporting/reports_main.php:167
+#: reporting/reports_main.php:173 reporting/reports_main.php:182
+#: reporting/reports_main.php:187 reporting/reports_main.php:196
+#: reporting/reports_main.php:204 reporting/reports_main.php:209
+#: reporting/reports_main.php:216 reporting/reports_main.php:222
+#: reporting/reports_main.php:230 reporting/reports_main.php:241
+#: reporting/reports_main.php:247 reporting/reports_main.php:253
+#: reporting/reports_main.php:267 reporting/reports_main.php:274
+#: reporting/reports_main.php:284 reporting/reports_main.php:295
+#: reporting/reports_main.php:304 reporting/reports_main.php:315
+#: reporting/reports_main.php:321 reporting/reports_main.php:330
+#: reporting/reports_main.php:340 reporting/reports_main.php:348
+#: reporting/reports_main.php:358 reporting/reports_main.php:363
+#: reporting/reports_main.php:371 reporting/reports_main.php:380
+#: reporting/reports_main.php:387 reporting/reports_main.php:394
+#: reporting/reports_main.php:401 reporting/includes/excel_report.inc:295
 #: reporting/includes/excel_report.inc:428
-#: reporting/includes/pdf_report.inc:346 reporting/includes/pdf_report.inc:617
-#: sales/view/view_sales_order.php:85
+#: reporting/includes/pdf_report.inc:346 reporting/includes/pdf_report.inc:618
+#: sales/view/view_sales_order.php:85 includes/system_tests.inc:420
+#: reporting/includes/pdf_report.inc:619
 msgid "Comments"
 msgstr ""
 
-#: includes/system_tests.inc:435
+#: includes/system_tests.inc:435 includes/system_tests.inc:444
 msgid "Ok"
 msgstr ""
 
@@ -6168,39 +6497,19 @@ msgid ""
 "trail record."
 msgstr ""
 
-#: includes/db/inventory_db.inc:285 includes/db/inventory_db.inc:286
-msgid "new_sales_cost"
-msgstr ""
-
-#: includes/db/inventory_db.inc:287
-msgid "Sales Diff"
-msgstr ""
-
-#: includes/db/inventory_db.inc:299
-msgid "new_purchase_cost"
-msgstr ""
-
-#: includes/db/inventory_db.inc:300
-msgid "purchase_diff"
-msgstr ""
-
-#: includes/db/inventory_db.inc:304
-msgid "Final diff"
-msgstr ""
-
-#: includes/db/inventory_db.inc:318
+#: includes/db/inventory_db.inc:252
 msgid "Cost was "
 msgstr ""
 
-#: includes/db/inventory_db.inc:318
+#: includes/db/inventory_db.inc:252
 msgid " changed to "
 msgstr ""
 
-#: includes/db/inventory_db.inc:318
+#: includes/db/inventory_db.inc:252
 msgid " for item "
 msgstr ""
 
-#: includes/db/inventory_db.inc:360
+#: includes/db/inventory_db.inc:292
 msgid "Zero/negative inventory handling"
 msgstr ""
 
@@ -6210,13 +6519,16 @@ msgstr ""
 msgid "Transaction Type"
 msgstr ""
 
-#: includes/ui/allocation_cart.inc:263 reporting/rep704.php:78
-#: reporting/rep704.php:81 reporting/rep704.php:84 reporting/rep709.php:107
+#: includes/ui/allocation_cart.inc:263 reporting/rep704.php:79
+#: reporting/rep704.php:82 reporting/rep704.php:85 reporting/rep709.php:109
 #: sales/view/view_credit.php:68 sales/view/view_sales_order.php:96
 #: sales/view/view_sales_order.php:129 sales/view/view_sales_order.php:161
-#: sales/inquiry/sales_orders_view.php:218
-#: sales/inquiry/sales_orders_view.php:254
-#: sales/inquiry/sales_orders_view.php:268
+#: sales/inquiry/sales_orders_view.php:226
+#: sales/inquiry/sales_orders_view.php:263
+#: sales/inquiry/sales_orders_view.php:277
+#: sales/inquiry/sales_orders_view.php.orig:224
+#: sales/inquiry/sales_orders_view.php.orig:261
+#: sales/inquiry/sales_orders_view.php.orig:275
 msgid "Ref"
 msgstr ""
 
@@ -6224,20 +6536,22 @@ msgstr ""
 msgid "Other Allocations"
 msgstr ""
 
-#: includes/ui/allocation_cart.inc:264 includes/ui/ui_view.inc:481
-#: reporting/includes/doctext.inc:110
+#: includes/ui/allocation_cart.inc:264 includes/ui/ui_view.inc:489
+#: reporting/includes/doctext.inc:145 reporting/includes/doctext.inc:186
 msgid "This Allocation"
 msgstr ""
 
 #: includes/ui/allocation_cart.inc:264 includes/ui/allocation_cart.inc:311
-#: includes/ui/ui_view.inc:481
+#: includes/ui/ui_view.inc:489
 #: purchasing/allocations/supplier_allocation_main.php:101
-#: reporting/includes/doctext.inc:110 reporting/includes/doctext.inc:168
+#: reporting/rep112.php:153 reporting/rep210.php:166
+#: reporting/includes/doctext.inc:145 reporting/includes/doctext.inc:186
 #: sales/allocations/customer_allocation_main.php:100
 msgid "Left to Allocate"
 msgstr ""
 
-#: includes/ui/allocation_cart.inc:294 reporting/includes/doctext.inc:167
+#: includes/ui/allocation_cart.inc:294 reporting/rep112.php:150
+#: reporting/rep210.php:163
 msgid "Total Allocated"
 msgstr ""
 
@@ -6264,7 +6578,7 @@ msgid "Sec Phone"
 msgstr ""
 
 #: includes/ui/contacts_view.inc:41 reporting/rep103.php:223
-#: reporting/includes/header2.inc:92 sales/manage/sales_people.php:99
+#: reporting/includes/header2.inc:104 sales/manage/sales_people.php:99
 msgid "Fax"
 msgstr ""
 
@@ -6288,17 +6602,19 @@ msgstr ""
 msgid "Contact active for:"
 msgstr ""
 
-#: includes/ui/contacts_view.inc:102
+#: includes/ui/contacts_view.inc:102 sales/manage/customers.php:252
+#: sales/manage/customers.php.orig:249
 msgid "Phone:"
 msgstr ""
 
 #: includes/ui/contacts_view.inc:105 inventory/manage/locations.php:207
-#: purchasing/manage/suppliers.php:108 sales/manage/customer_branches.php:263
+#: purchasing/manage/suppliers.php:160 sales/manage/customer_branches.php:263
+#: sales/manage/customers.php:255 sales/manage/customers.php.orig:252
 #: sales/manage/sales_people.php:158
 msgid "E-mail:"
 msgstr ""
 
-#: includes/ui/contacts_view.inc:110 purchasing/manage/suppliers.php:109
+#: includes/ui/contacts_view.inc:110 purchasing/manage/suppliers.php:161
 #: sales/manage/customer_branches.php:264
 msgid "Document Language:"
 msgstr ""
@@ -6323,7 +6639,8 @@ msgstr ""
 msgid "You have to select at least one category."
 msgstr ""
 
-#: includes/ui/db_pager_view.inc:166 includes/ui/ui_input.inc:892
+#: includes/ui/db_pager_view.inc:166 includes/ui/radio.ui_input.inc:899
+#: includes/ui/ui_input.inc:898 includes/ui/ui_input.inc:902
 msgid "Show also Inactive"
 msgstr ""
 
@@ -6352,234 +6669,271 @@ msgstr ""
 msgid "No records"
 msgstr ""
 
-#: includes/ui/simple_crud_class.inc:227 includes/ui/ui_input.inc:203
+#: includes/ui/radio.ui_input.inc:206 includes/ui/simple_crud_class.inc:227
+#: includes/ui/ui_input.inc:206 includes/ui/ui_input.inc:207
 msgid "Submit changes"
 msgstr ""
 
-#: includes/ui/simple_crud_class.inc:229 includes/ui/ui_input.inc:204
+#: includes/ui/radio.ui_input.inc:207 includes/ui/simple_crud_class.inc:229
+#: includes/ui/ui_input.inc:207 includes/ui/ui_input.inc:208
 msgid "Clone"
 msgstr ""
 
-#: includes/ui/simple_crud_class.inc:229 includes/ui/ui_input.inc:205
+#: includes/ui/radio.ui_input.inc:208 includes/ui/simple_crud_class.inc:229
+#: includes/ui/ui_input.inc:208 includes/ui/ui_input.inc:209
 msgid "Edit new record with current data"
 msgstr ""
 
-#: includes/ui/simple_crud_class.inc:231 includes/ui/ui_input.inc:206
+#: includes/ui/radio.ui_input.inc:209 includes/ui/simple_crud_class.inc:231
+#: includes/ui/ui_input.inc:209 includes/ui/ui_input.inc:210
 msgid "Cancel edition"
 msgstr ""
 
-#: includes/ui/ui_controls.inc:123 includes/ui/ui_controls.inc.orig:123
-msgid "You should automatically be forwarded."
-msgstr ""
-
-#: includes/ui/ui_controls.inc:124 includes/ui/ui_controls.inc.orig:124
-msgid "If this does not happen"
-msgstr ""
-
-#: includes/ui/ui_controls.inc:124 includes/ui/ui_controls.inc.orig:124
-msgid "click here"
-msgstr ""
-
-#: includes/ui/ui_controls.inc:124 includes/ui/ui_controls.inc.orig:124
-msgid "to continue"
-msgstr ""
-
-#: includes/ui/ui_controls.inc:171 includes/ui/ui_controls.inc.orig:171
-msgid "View Attachment"
-msgstr ""
-
-#: includes/ui/ui_controls.inc:174 includes/ui/ui_controls.inc.orig:174
-msgid "Close"
-msgstr ""
-
-#: includes/ui/ui_controls.inc:425 includes/ui/ui_controls.inc.orig:425
-#: sales/manage/customers.php:16
-msgid "Customers"
-msgstr ""
-
-#: includes/ui/ui_controls.inc:427 includes/ui/ui_controls.inc.orig:427
-msgid "Branches"
-msgstr ""
-
-#: includes/ui/ui_controls.inc:429 includes/ui/ui_controls.inc.orig:429
-#: purchasing/manage/suppliers.php:16
-msgid "Suppliers"
-msgstr ""
-
-#: includes/ui/ui_controls.inc:431 includes/ui/ui_controls.inc.orig:431
-#: inventory/transfers.php:230 inventory/manage/items.php:16
-msgid "Items"
-msgstr ""
-
-#: includes/ui/ui_controls.inc:576 includes/ui/ui_controls.inc.orig:575
-msgid "Entered data has not been saved yet.\\nDo you want to abandon changes?"
-msgstr ""
-
-#: includes/ui/ui_input.inc:621 reporting/includes/reports_classes.inc:216
+#: includes/ui/radio.ui_input.inc:628 includes/ui/ui_input.inc:627
+#: reporting/includes/reports_classes.inc:216 includes/ui/ui_input.inc:631
+#: reporting/includes/reports_classes.inc:219
 msgid "Click Here to Pick up the date"
 msgstr ""
 
-#: includes/ui/ui_input.inc:904 includes/ui/ui_lists.inc:2120
-#: reporting/rep301.php:148 reporting/rep302.php:166 reporting/rep303.php:170
-#: reporting/rep304.php:168 reporting/rep304.php:172
-#: sales/manage/customer_branches.php:302
+#: includes/ui/radio.ui_input.inc:911 includes/ui/sav.ui_lists.inc:2131
+#: includes/ui/ui_input.inc:910 includes/ui/ui_lists.inc:2152
+#: reporting/rep301.php:152 reporting/rep302.php:166 reporting/rep303.php:170
+#: reporting/rep304.php:166 reporting/rep304.php:170
+#: sales/manage/customer_branches.php:302 includes/ui/ui_input.inc:914
 msgid "Inactive"
 msgstr ""
 
-#: includes/ui/ui_input.inc:914 includes/ui/ui_input.inc:926
+#: includes/ui/radio.ui_input.inc:921 includes/ui/radio.ui_input.inc:933
+#: includes/ui/ui_input.inc:920 includes/ui/ui_input.inc:932
+#: includes/ui/ui_input.inc:924 includes/ui/ui_input.inc:936
 msgid "Current Credit:"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:17
+#: includes/ui/radio.ui_input.inc:947 includes/ui/ui_input.inc:946
+#: includes/ui/ui_input.inc:950
+msgid "Bank Balance:"
+msgstr ""
+
+#: includes/ui/sav.ui_lists.inc:17 includes/ui/ui_lists.inc:17
 msgid "Set filter"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:100
+#: includes/ui/sav.ui_lists.inc:100 includes/ui/ui_lists.inc:100
 msgid "Press Space tab for search pattern entry"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:104
+#: includes/ui/sav.ui_lists.inc:104 includes/ui/ui_lists.inc:104
 msgid "Enter code fragment to search or * for all"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:105
+#: includes/ui/sav.ui_lists.inc:105 includes/ui/ui_lists.inc:105
 msgid "Enter description fragment to search or * for all"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:438 includes/ui/ui_lists.inc:1356
+#: includes/ui/sav.ui_lists.inc:449 includes/ui/sav.ui_lists.inc:1367
+#: includes/ui/ui_lists.inc:453 includes/ui/ui_lists.inc:1388
 msgid "All Suppliers"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:442
+#: includes/ui/sav.ui_lists.inc:453 includes/ui/ui_lists.inc:457
 msgid "Press Space tab to filter by name fragment"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:443
+#: includes/ui/sav.ui_lists.inc:454 includes/ui/ui_lists.inc:458
 msgid "Select supplier"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:487
+#: includes/ui/sav.ui_lists.inc:498 includes/ui/ui_lists.inc:505
 msgid "All Customers"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:491
+#: includes/ui/sav.ui_lists.inc:502 includes/ui/ui_lists.inc:509
 msgid "Press Space tab to filter by name fragment; F2 - entry new customer"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:492
+#: includes/ui/sav.ui_lists.inc:503 includes/ui/ui_lists.inc:510
 msgid "Select customer"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:535
+#: includes/ui/sav.ui_lists.inc:546 includes/ui/ui_lists.inc:558
 msgid "All branches"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:538
+#: includes/ui/sav.ui_lists.inc:549 includes/ui/ui_lists.inc:561
 msgid "Select customer branch"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:573
+#: includes/ui/sav.ui_lists.inc:584 includes/ui/ui_lists.inc:601
 msgid "All Locations"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:725 includes/ui/ui_lists.inc:790
+#: includes/ui/sav.ui_lists.inc:736 includes/ui/sav.ui_lists.inc:801
+#: includes/ui/ui_lists.inc:753 includes/ui/ui_lists.inc:822
 msgid "All Items"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:1263
+#: includes/ui/sav.ui_lists.inc:1274 includes/ui/ui_lists.inc:1295
 msgid "All Sales Types"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:1592
+#: includes/ui/sav.ui_lists.inc:1603 includes/ui/ui_lists.inc:1624
 msgid "Use Item Sales Accounts"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:1904 includes/ui/ui_lists.inc:1921
-#: includes/ui/ui_lists.inc:1938
+#: includes/ui/sav.ui_lists.inc:1915 includes/ui/sav.ui_lists.inc:1932
+#: includes/ui/sav.ui_lists.inc:1949 includes/ui/ui_lists.inc:1936
+#: includes/ui/ui_lists.inc:1953 includes/ui/ui_lists.inc:1970
 msgid "All Types"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:1905 sales/view/view_sales_order.php:127
+#: includes/ui/sav.ui_lists.inc:1916 includes/ui/ui_lists.inc:1937
+#: sales/view/view_sales_order.php:127
 msgid "Sales Invoices"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:1906 includes/ui/ui_lists.inc:1923
-#: includes/ui/ui_lists.inc:1941
+#: includes/ui/sav.ui_lists.inc:1917 includes/ui/sav.ui_lists.inc:1934
+#: includes/ui/sav.ui_lists.inc:1952 includes/ui/ui_lists.inc:1938
+#: includes/ui/ui_lists.inc:1955 includes/ui/ui_lists.inc:1973
 msgid "Overdue Invoices"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:1907 includes/ui/ui_lists.inc:1924
-#: includes/ui/ui_lists.inc:1942
+#: includes/ui/sav.ui_lists.inc:1918 includes/ui/sav.ui_lists.inc:1935
+#: includes/ui/sav.ui_lists.inc:1953 includes/ui/ui_lists.inc:1939
+#: includes/ui/ui_lists.inc:1956 includes/ui/ui_lists.inc:1974
+#: includes/ui/ui_view.inc:484
 msgid "Payments"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:1908 includes/ui/ui_lists.inc:1925
-#: includes/ui/ui_lists.inc:1943 sales/view/view_sales_order.php:158
+#: includes/ui/sav.ui_lists.inc:1919 includes/ui/sav.ui_lists.inc:1936
+#: includes/ui/sav.ui_lists.inc:1954 includes/ui/ui_lists.inc:1940
+#: includes/ui/ui_lists.inc:1957 includes/ui/ui_lists.inc:1975
+#: sales/view/view_sales_order.php:158
 msgid "Credit Notes"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:1909 sales/view/view_sales_order.php:93
+#: includes/ui/sav.ui_lists.inc:1920 includes/ui/ui_lists.inc:1941
+#: sales/view/view_sales_order.php:93
 msgid "Delivery Notes"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:1922 includes/ui/ui_lists.inc:1940
+#: includes/ui/sav.ui_lists.inc:1933 includes/ui/sav.ui_lists.inc:1951
+#: includes/ui/ui_lists.inc:1954 includes/ui/ui_lists.inc:1972
 msgid "Invoices"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:1926 includes/ui/ui_lists.inc:1944
+#: includes/ui/sav.ui_lists.inc:1937 includes/ui/sav.ui_lists.inc:1955
+#: includes/ui/ui_lists.inc:1958 includes/ui/ui_lists.inc:1976
 msgid "Overdue Credit Notes"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:1939
+#: includes/ui/sav.ui_lists.inc:1950 includes/ui/ui_lists.inc:1971
 msgid "GRNs"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:1957
+#: includes/ui/sav.ui_lists.inc:1968 includes/ui/ui_lists.inc:1989
 msgid "Automatically put balance on back order"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:1958
+#: includes/ui/sav.ui_lists.inc:1969 includes/ui/ui_lists.inc:1990
 msgid "Cancel any quantites not delivered"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:1975
+#: includes/ui/sav.ui_lists.inc:1986 includes/ui/ui_lists.inc:2007
 msgid "Items Returned to Inventory Location"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:1976
+#: includes/ui/sav.ui_lists.inc:1987 includes/ui/ui_lists.inc:2008
 msgid "Items Written Off"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2146
+#: includes/ui/sav.ui_lists.inc:2157 includes/ui/ui_lists.inc:2178
 msgid "New role"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2204
+#: includes/ui/sav.ui_lists.inc:2215 includes/ui/ui_lists.inc:2236
 msgid "No tags defined."
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2204
+#: includes/ui/sav.ui_lists.inc:2215 includes/ui/ui_lists.inc:2236
 msgid "No active tags defined."
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2242
+#: includes/ui/sav.ui_lists.inc:2253 includes/ui/ui_lists.inc:2274
 #, php-format
 msgid "Activated for '%s'"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2245
+#: includes/ui/sav.ui_lists.inc:2256 includes/ui/ui_lists.inc:2277
 msgid "Available and/or installed"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2315
+#: includes/ui/sav.ui_lists.inc:2326 includes/ui/ui_lists.inc:2347
 msgid "Standard new company American COA (4 digit)"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2317
+#: includes/ui/sav.ui_lists.inc:2328 includes/ui/ui_lists.inc:2349
 msgid "Standard American COA (4 digit) with demo data"
 msgstr ""
 
-#: includes/ui/ui_msgs.inc:66
+#: includes/ui/sav.ui_lists.inc:2349 includes/ui/ui_lists.inc:2370
+msgid "No payment Link"
+msgstr ""
+
+#: includes/ui/ui_controls.inc:72
+msgid "Request from outside of this page is forbidden."
+msgstr ""
+
+#: includes/ui/ui_controls.inc:73
+msgid "CSRF attack detected from: "
+msgstr ""
+
+#: includes/ui/ui_controls.inc:139
+msgid "You should automatically be forwarded."
+msgstr ""
+
+#: includes/ui/ui_controls.inc:140
+msgid "If this does not happen"
+msgstr ""
+
+#: includes/ui/ui_controls.inc:140
+msgid "click here"
+msgstr ""
+
+#: includes/ui/ui_controls.inc:140
+msgid "to continue"
+msgstr ""
+
+#: includes/ui/ui_controls.inc:187
+msgid "View Attachment"
+msgstr ""
+
+#: includes/ui/ui_controls.inc:190
+msgid "Close"
+msgstr ""
+
+#: includes/ui/ui_controls.inc:450 sales/manage/customers.php:23
+#: sales/manage/customers.php.orig:20
+msgid "Customers"
+msgstr ""
+
+#: includes/ui/ui_controls.inc:452
+msgid "Branches"
+msgstr ""
+
+#: includes/ui/ui_controls.inc:454 purchasing/manage/suppliers.php:22
+msgid "Suppliers"
+msgstr ""
+
+#: includes/ui/ui_controls.inc:456 inventory/transfers.php:230
+#: inventory/manage/items.php:21
+msgid "Items"
+msgstr ""
+
+#: includes/ui/ui_controls.inc:601
+msgid "Entered data has not been saved yet.\\nDo you want to abandon changes?"
+msgstr ""
+
+#: includes/ui/ui_msgs.inc:63
 msgid "in units of : "
 msgstr ""
 
@@ -6587,123 +6941,127 @@ msgstr ""
 msgid "Date Voided:"
 msgstr ""
 
-#: includes/ui/ui_view.inc:404 reporting/rep107.php:173
-#: reporting/rep109.php:182 reporting/rep110.php:184 reporting/rep113.php:173
-#: reporting/rep209.php:188
+#: includes/ui/ui_view.inc:407 reporting/rep107.php:173
+#: reporting/rep109.php:182 reporting/rep110.php:186 reporting/rep111.php:169
+#: reporting/rep113.php:172 reporting/rep209.php:188
 msgid "Total Tax Excluded"
 msgstr ""
 
-#: includes/ui/ui_view.inc:410 includes/ui/ui_view.inc:426
-#: includes/ui/ui_view.inc:444 reporting/includes/doctext.inc:151
+#: includes/ui/ui_view.inc:413 includes/ui/ui_view.inc:432
+#: includes/ui/ui_view.inc:451 reporting/rep107.php:182
+#: reporting/rep109.php:191 reporting/rep110.php:195 reporting/rep111.php:178
+#: reporting/rep113.php:181 reporting/rep209.php:197
 msgid "Included"
 msgstr ""
 
-#: includes/ui/ui_view.inc:476
-#: purchasing/inquiry/supplier_allocation_inquiry.php:99
+#: includes/ui/ui_view.inc:484
+#: purchasing/inquiry/supplier_allocation_inquiry.php:100
 msgid "Allocations"
 msgstr ""
 
-#: includes/ui/ui_view.inc:480 reporting/includes/doctext.inc:110
+#: includes/ui/ui_view.inc:488 reporting/includes/doctext.inc:145
+#: reporting/includes/doctext.inc:186
 msgid "Total Amount"
 msgstr ""
 
-#: includes/ui/ui_view.inc:504
+#: includes/ui/ui_view.inc:512 includes/ui/ui_view.inc:513
 msgid "Total Allocated:"
 msgstr ""
 
-#: includes/ui/ui_view.inc:508
+#: includes/ui/ui_view.inc:516 includes/ui/ui_view.inc:517
 msgid "Left to Allocate:"
 msgstr ""
 
-#: includes/ui/ui_view.inc:544
+#: includes/ui/ui_view.inc:569 includes/ui/ui_view.inc:570
 msgid "No Quick Entries are defined."
 msgstr ""
 
-#: includes/ui/ui_view.inc:572
+#: includes/ui/ui_view.inc:597 includes/ui/ui_view.inc:598
 msgid "No Quick Entry lines are defined."
 msgstr ""
 
-#: includes/ui/ui_view.inc:754 purchasing/includes/ui/invoice_ui.inc:452
+#: includes/ui/ui_view.inc:779 purchasing/includes/ui/invoice_ui.inc:452
+#: includes/ui/ui_view.inc:780
 msgid "and"
 msgstr ""
 
-#: includes/ui/ui_view.inc:840
+#: includes/ui/ui_view.inc:840 includes/ui/ui_view.inc:841
 msgid "January"
 msgstr ""
 
-#: includes/ui/ui_view.inc:840
+#: includes/ui/ui_view.inc:840 includes/ui/ui_view.inc:841
 msgid "February"
 msgstr ""
 
-#: includes/ui/ui_view.inc:840
+#: includes/ui/ui_view.inc:840 includes/ui/ui_view.inc:841
 msgid "March"
 msgstr ""
 
-#: includes/ui/ui_view.inc:840
+#: includes/ui/ui_view.inc:840 includes/ui/ui_view.inc:841
 msgid "April"
 msgstr ""
 
-#: includes/ui/ui_view.inc:840
+#: includes/ui/ui_view.inc:840 includes/ui/ui_view.inc:841
 msgid "May"
 msgstr ""
 
-#: includes/ui/ui_view.inc:840
+#: includes/ui/ui_view.inc:840 includes/ui/ui_view.inc:841
 msgid "June"
 msgstr ""
 
-#: includes/ui/ui_view.inc:840
+#: includes/ui/ui_view.inc:840 includes/ui/ui_view.inc:841
 msgid "July"
 msgstr ""
 
-#: includes/ui/ui_view.inc:840
+#: includes/ui/ui_view.inc:840 includes/ui/ui_view.inc:841
 msgid "August"
 msgstr ""
 
-#: includes/ui/ui_view.inc:840
+#: includes/ui/ui_view.inc:840 includes/ui/ui_view.inc:841
 msgid "September"
 msgstr ""
 
-#: includes/ui/ui_view.inc:840
+#: includes/ui/ui_view.inc:840 includes/ui/ui_view.inc:841
 msgid "October"
 msgstr ""
 
-#: includes/ui/ui_view.inc:840
+#: includes/ui/ui_view.inc:840 includes/ui/ui_view.inc:841
 msgid "November"
 msgstr ""
 
-#: includes/ui/ui_view.inc:840
+#: includes/ui/ui_view.inc:840 includes/ui/ui_view.inc:841
 msgid "December"
 msgstr ""
 
-#: includes/ui/ui_view.inc:841
+#: includes/ui/ui_view.inc:841 includes/ui/ui_view.inc:842
 msgid "Su"
 msgstr ""
 
-#: includes/ui/ui_view.inc:841
+#: includes/ui/ui_view.inc:841 includes/ui/ui_view.inc:842
 msgid "Mo"
 msgstr ""
 
-#: includes/ui/ui_view.inc:841
+#: includes/ui/ui_view.inc:841 includes/ui/ui_view.inc:842
 msgid "Tu"
 msgstr ""
 
-#: includes/ui/ui_view.inc:841
+#: includes/ui/ui_view.inc:841 includes/ui/ui_view.inc:842
 msgid "We"
 msgstr ""
 
-#: includes/ui/ui_view.inc:841
+#: includes/ui/ui_view.inc:841 includes/ui/ui_view.inc:842
 msgid "Th"
 msgstr ""
 
-#: includes/ui/ui_view.inc:841
+#: includes/ui/ui_view.inc:841 includes/ui/ui_view.inc:842
 msgid "Fr"
 msgstr ""
 
-#: includes/ui/ui_view.inc:841
+#: includes/ui/ui_view.inc:841 includes/ui/ui_view.inc:842
 msgid "Sa"
 msgstr ""
 
-#: includes/ui/ui_view.inc:842
+#: includes/ui/ui_view.inc:842 includes/ui/ui_view.inc:843
 msgid "W"
 msgstr ""
 
@@ -6797,34 +7155,35 @@ msgstr ""
 msgid "Enter &Another Adjustment"
 msgstr ""
 
-#: inventory/adjustments.php:88 inventory/transfers.php:87
-#: sales/sales_order_entry.php:351
+#: inventory/adjustments.php:90 inventory/transfers.php:87
+#: sales/sales_order_entry.php:350 sales/sales_order_entry.php:359
+#: sales/sales_order_entry.php.orig:358
 msgid "You must enter at least one non empty item line."
 msgstr ""
 
-#: inventory/adjustments.php:108 inventory/transfers.php:105
+#: inventory/adjustments.php:110 inventory/transfers.php:105
 msgid "The entered date for the adjustment is invalid."
 msgstr ""
 
-#: inventory/adjustments.php:122
+#: inventory/adjustments.php:124
 msgid ""
 "The adjustment cannot be processed because an adjustment item would cause a "
 "negative inventory balance :"
 msgstr ""
 
-#: inventory/adjustments.php:152 manufacturing/work_order_issue.php:141
+#: inventory/adjustments.php:154 manufacturing/work_order_issue.php:141
 msgid "The quantity entered is negative or invalid."
 msgstr ""
 
-#: inventory/adjustments.php:159 manufacturing/work_order_issue.php:148
+#: inventory/adjustments.php:161 manufacturing/work_order_issue.php:148
 msgid "The entered standard cost is negative or invalid."
 msgstr ""
 
-#: inventory/adjustments.php:228
+#: inventory/adjustments.php:230
 msgid "Adjustment Items"
 msgstr ""
 
-#: inventory/adjustments.php:234
+#: inventory/adjustments.php:236
 msgid "Process Adjustment"
 msgstr ""
 
@@ -6856,24 +7215,25 @@ msgstr ""
 
 #: inventory/cost_update.php:85 inventory/prices.php:56
 #: inventory/purchasing_data.php:101 inventory/reorder_level.php:43
-#: inventory/inquiry/stock_movements.php:49
-#: inventory/inquiry/stock_status.php:41 inventory/manage/item_codes.php:105
-#: manufacturing/work_order_entry.php:395
-#: manufacturing/work_order_entry.php:400 purchasing/inquiry/po_search.php:74
+#: inventory/inquiry/stock_movements.php:53
+#: inventory/inquiry/stock_status.php:47 inventory/manage/item_codes.php:105
+#: manufacturing/work_order_entry.php:396
+#: manufacturing/work_order_entry.php:401 purchasing/inquiry/po_search.php:74
 #: sales/inquiry/sales_deliveries_view.php:114
-#: sales/inquiry/sales_orders_view.php:233
+#: sales/inquiry/sales_orders_view.php:241
+#: sales/inquiry/sales_orders_view.php.orig:239
 msgid "Item:"
 msgstr ""
 
-#: inventory/cost_update.php:105
+#: inventory/cost_update.php:102
 msgid "Standard Material Cost Per Unit"
 msgstr ""
 
-#: inventory/cost_update.php:108
+#: inventory/cost_update.php:105
 msgid "Standard Labour Cost Per Unit"
 msgstr ""
 
-#: inventory/cost_update.php:109
+#: inventory/cost_update.php:106
 msgid "Standard Overhead Cost Per Unit"
 msgstr ""
 
@@ -6881,8 +7241,8 @@ msgstr ""
 msgid "Inventory Item Sales prices"
 msgstr ""
 
-#: inventory/prices.php:27 inventory/inquiry/stock_movements.php:30
-#: inventory/inquiry/stock_status.php:34 inventory/manage/sales_kits.php:24
+#: inventory/prices.php:27 inventory/inquiry/stock_movements.php:32
+#: inventory/inquiry/stock_status.php:37 inventory/manage/sales_kits.php:24
 #: manufacturing/inquiry/where_used_inquiry.php:21
 #: sales/credit_note_entry.php:49
 msgid "There are no items defined in the system."
@@ -6911,9 +7271,10 @@ msgid "The selected price has been deleted."
 msgstr ""
 
 #: inventory/prices.php:133 reporting/rep104.php:116
-#: sales/customer_delivery.php:352 sales/customer_invoice.php:394
+#: sales/customer_delivery.php:355 sales/customer_invoice.php:400
 #: sales/view/view_credit.php:73 sales/view/view_dispatch.php:93
 #: sales/view/view_invoice.php:92 sales/includes/ui/sales_credit_ui.inc:102
+#: sales/customer_invoice.php:402
 msgid "Sales Type"
 msgstr ""
 
@@ -6921,12 +7282,13 @@ msgstr ""
 #: purchasing/includes/ui/invoice_ui.inc:484
 #: purchasing/po_receive_items.php:63 purchasing/view/view_grn.php:41
 #: purchasing/view/view_po.php:45 reporting/rep104.php:109
-#: reporting/includes/doctext.inc:105 reporting/includes/doctext.inc:113
-#: sales/customer_credit_invoice.php:281 sales/customer_delivery.php:430
-#: sales/customer_invoice.php:447 sales/view/view_credit.php:91
+#: reporting/includes/doctext.inc:30 reporting/includes/doctext.inc:170
+#: sales/customer_credit_invoice.php:283 sales/customer_delivery.php:433
+#: sales/customer_invoice.php:468 sales/view/view_credit.php:91
 #: sales/view/view_dispatch.php:113 sales/view/view_invoice.php:114
 #: sales/view/view_sales_order.php:202
 #: sales/includes/ui/sales_credit_ui.inc:168
+#: sales/customer_credit_invoice.php:281 sales/customer_invoice.php:470
 msgid "Price"
 msgstr ""
 
@@ -6959,12 +7321,13 @@ msgid "Supplier Purchasing Data"
 msgstr ""
 
 #: inventory/purchasing_data.php:23 purchasing/po_entry_items.php:64
+#: purchasing/po_entry_items.php:67
 msgid "There are no purchasable inventory items defined in the system."
 msgstr ""
 
 #: inventory/purchasing_data.php:24 purchasing/po_entry_items.php:62
 #: purchasing/supplier_credit.php:32 purchasing/supplier_invoice.php:32
-#: purchasing/supplier_payment.php:40
+#: purchasing/supplier_payment.php:40 purchasing/po_entry_items.php:65
 msgid "There are no suppliers defined in the system."
 msgstr ""
 
@@ -7037,31 +7400,35 @@ msgid ""
 "manufactured items)."
 msgstr ""
 
-#: inventory/reorder_level.php:57 inventory/inquiry/stock_status.php:65
-#: inventory/inquiry/stock_status.php:69
+#: inventory/reorder_level.php:57 inventory/inquiry/stock_status.php:72
+#: inventory/inquiry/stock_status.php:76
 #: manufacturing/search_work_orders.php:162
 #: manufacturing/inquiry/where_used_inquiry.php:45
 #: manufacturing/manage/bom_edit.php:70
-#: purchasing/inquiry/po_search_completed.php:119
-#: purchasing/inquiry/po_search_completed.php:129
+#: purchasing/inquiry/po_search_completed.php:124
+#: purchasing/inquiry/po_search_completed.php:134
 #: purchasing/inquiry/po_search.php:133 purchasing/inquiry/po_search.php:144
-#: reporting/rep105.php:118 reporting/rep301.php:106 reporting/rep302.php:130
-#: reporting/rep303.php:122 reporting/rep304.php:123
-#: reporting/reports_main.php:165 reporting/reports_main.php:171
-#: reporting/reports_main.php:176 reporting/reports_main.php:187
+#: reporting/rep105.php:118 reporting/rep301.php:110 reporting/rep302.php:130
+#: reporting/rep303.php:122 reporting/rep304.php:121
+#: reporting/reports_main.php:180 reporting/reports_main.php:186
+#: reporting/reports_main.php:191 reporting/reports_main.php:202
 #: sales/manage/sales_points.php:84
 msgid "Location"
 msgstr ""
 
-#: inventory/reorder_level.php:57 inventory/inquiry/stock_movements.php:77
-#: inventory/inquiry/stock_status.php:69 purchasing/supplier_credit.php:203
-#: sales/sales_order_entry.php:491 sales/includes/ui/sales_order_ui.inc:175
+#: inventory/reorder_level.php:57 inventory/inquiry/stock_movements.php:82
+#: inventory/inquiry/stock_status.php:76 purchasing/supplier_credit.php:203
+#: sales/sales_order_entry.php:492 sales/includes/ui/sales_order_ui.inc:175
+#: sales/sales_order_entry.php:496 sales/includes/ui/sales_order_ui.inc:179
+#: sales/sales_order_entry.php:507 sales/sales_order_entry.php.orig:506
 msgid "Quantity On Hand"
 msgstr ""
 
-#: inventory/reorder_level.php:57 inventory/inquiry/stock_status.php:69
+#: inventory/reorder_level.php:57 inventory/inquiry/stock_status.php:76
 #: sales/includes/db/sales_order_db.inc:110
 #: sales/includes/db/sales_order_db.inc:263
+#: sales/includes/db/sales_order_db.inc.orig:110
+#: sales/includes/db/sales_order_db.inc.orig:263
 msgid "Re-Order Level"
 msgstr ""
 
@@ -7111,9 +7478,10 @@ msgid "For Part :"
 msgstr ""
 
 #: inventory/includes/item_adjustments_ui.inc:34
-#: manufacturing/work_order_entry.php:209 purchasing/inquiry/po_search.php:67
+#: manufacturing/work_order_entry.php:210 purchasing/inquiry/po_search.php:67
 #: sales/inquiry/sales_deliveries_view.php:107
-#: sales/inquiry/sales_orders_view.php:224
+#: sales/inquiry/sales_orders_view.php:232
+#: sales/inquiry/sales_orders_view.php.orig:230
 msgid "Location:"
 msgstr ""
 
@@ -7134,13 +7502,15 @@ msgstr ""
 #: manufacturing/includes/work_order_issue_ui.inc:33
 #: purchasing/includes/ui/po_ui.inc:236 purchasing/po_receive_items.php:62
 #: purchasing/view/view_grn.php:40 purchasing/view/view_po.php:45
-#: reporting/includes/doctext.inc:104 reporting/includes/doctext.inc:107
-#: reporting/includes/doctext.inc:112 sales/customer_credit_invoice.php:280
-#: sales/customer_delivery.php:428 sales/customer_invoice.php:446
+#: reporting/includes/doctext.inc:29 reporting/includes/doctext.inc:169
+#: reporting/includes/doctext.inc:206 sales/customer_credit_invoice.php:282
+#: sales/customer_delivery.php:431 sales/customer_invoice.php:467
 #: sales/view/view_credit.php:90 sales/view/view_dispatch.php:112
 #: sales/view/view_invoice.php:113 sales/view/view_sales_order.php:201
 #: sales/includes/ui/sales_credit_ui.inc:167
 #: sales/includes/ui/sales_order_ui.inc:140
+#: sales/customer_credit_invoice.php:280 sales/customer_invoice.php:469
+#: sales/includes/ui/sales_order_ui.inc:144
 msgid "Item Code"
 msgstr ""
 
@@ -7148,14 +7518,16 @@ msgstr ""
 #: inventory/includes/stock_transfers_ui.inc:60
 #: manufacturing/includes/work_order_issue_ui.inc:33
 #: purchasing/includes/ui/po_ui.inc:236 purchasing/view/view_grn.php:40
-#: purchasing/view/view_po.php:45 reporting/includes/doctext.inc:104
-#: reporting/includes/doctext.inc:107 reporting/includes/doctext.inc:112
-#: sales/customer_credit_invoice.php:280 sales/customer_delivery.php:428
-#: sales/customer_invoice.php:446 sales/view/view_credit.php:90
+#: purchasing/view/view_po.php:45 reporting/includes/doctext.inc:29
+#: reporting/includes/doctext.inc:169 reporting/includes/doctext.inc:206
+#: sales/customer_credit_invoice.php:282 sales/customer_delivery.php:431
+#: sales/customer_invoice.php:467 sales/view/view_credit.php:90
 #: sales/view/view_dispatch.php:112 sales/view/view_invoice.php:113
 #: sales/view/view_sales_order.php:201
 #: sales/includes/ui/sales_credit_ui.inc:167
 #: sales/includes/ui/sales_order_ui.inc:140
+#: sales/customer_credit_invoice.php:280 sales/customer_invoice.php:469
+#: sales/includes/ui/sales_order_ui.inc:144
 msgid "Item Description"
 msgstr ""
 
@@ -7171,14 +7543,15 @@ msgstr ""
 #: manufacturing/includes/work_order_issue_ui.inc:33
 #: purchasing/includes/ui/invoice_ui.inc:484
 #: purchasing/includes/ui/po_ui.inc:236 purchasing/view/view_grn.php:40
-#: purchasing/view/view_po.php:45 reporting/rep301.php:100
+#: purchasing/view/view_po.php:45 reporting/rep301.php:103
 #: reporting/rep303.php:109 reporting/rep303.php:115 reporting/rep401.php:69
-#: reporting/includes/doctext.inc:49 reporting/includes/doctext.inc:105
-#: reporting/includes/doctext.inc:112 sales/view/view_credit.php:90
+#: reporting/includes/doctext.inc:29 reporting/includes/doctext.inc:170
+#: reporting/includes/doctext.inc:203 sales/view/view_credit.php:90
 #: sales/view/view_dispatch.php:112 sales/view/view_invoice.php:113
 #: sales/view/view_sales_order.php:201
 #: sales/includes/ui/sales_credit_ui.inc:167
 #: sales/includes/ui/sales_order_ui.inc:140
+#: sales/includes/ui/sales_order_ui.inc:144
 msgid "Quantity"
 msgstr ""
 
@@ -7187,24 +7560,25 @@ msgstr ""
 #: inventory/manage/item_units.php:94
 #: manufacturing/includes/work_order_issue_ui.inc:34
 #: purchasing/includes/ui/po_ui.inc:237 purchasing/view/view_grn.php:41
-#: purchasing/view/view_po.php:45 reporting/includes/doctext.inc:105
-#: reporting/includes/doctext.inc:113 sales/view/view_credit.php:91
+#: purchasing/view/view_po.php:45 reporting/includes/doctext.inc:30
+#: reporting/includes/doctext.inc:170 sales/view/view_credit.php:91
 #: sales/view/view_dispatch.php:113 sales/view/view_invoice.php:114
 #: sales/view/view_sales_order.php:201
 #: sales/includes/ui/sales_credit_ui.inc:167
 #: sales/includes/ui/sales_order_ui.inc:142
+#: sales/includes/ui/sales_order_ui.inc:146
 msgid "Unit"
 msgstr ""
 
 #: inventory/includes/item_adjustments_ui.inc:63
 #: inventory/view/view_adjustment.php:57
 #: manufacturing/includes/manufacturing_ui.inc:29
-#: manufacturing/includes/work_order_issue_ui.inc:34 reporting/rep301.php:100
+#: manufacturing/includes/work_order_issue_ui.inc:34 reporting/rep301.php:103
 msgid "Unit Cost"
 msgstr ""
 
 #: inventory/includes/stock_transfers_ui.inc:35
-#: inventory/inquiry/stock_movements.php:56
+#: inventory/inquiry/stock_movements.php:60
 #: manufacturing/includes/work_order_issue_ui.inc:164
 msgid "From Location:"
 msgstr ""
@@ -7243,59 +7617,61 @@ msgid ""
 "\t\t\t\tusing this item as component"
 msgstr ""
 
-#: inventory/inquiry/stock_movements.php:27
+#: inventory/inquiry/stock_movements.php:28
 msgid "Inventory Item Movement"
 msgstr ""
 
-#: inventory/inquiry/stock_movements.php:61
+#: inventory/inquiry/stock_movements.php:65
 msgid "Show Movements"
 msgstr ""
 
-#: inventory/inquiry/stock_movements.php:61
+#: inventory/inquiry/stock_movements.php:65
 #: purchasing/includes/ui/invoice_ui.inc:453
 #: purchasing/inquiry/supplier_allocation_inquiry.php:57
-#: purchasing/inquiry/supplier_inquiry.php:54
+#: purchasing/inquiry/supplier_inquiry.php:58
+#: purchasing/inquiry/supplier_inquiry.php.orig:54
 #: sales/inquiry/customer_allocation_inquiry.php:51
-#: sales/inquiry/customer_inquiry.php:54
+#: sales/inquiry/customer_inquiry.php:58
+#: sales/inquiry/customer_inquiry.php.orig:58
 msgid "Refresh Inquiry"
 msgstr ""
 
-#: inventory/inquiry/stock_movements.php:76
+#: inventory/inquiry/stock_movements.php:81
 msgid "Detail"
 msgstr ""
 
-#: inventory/inquiry/stock_movements.php:77
+#: inventory/inquiry/stock_movements.php:82
 msgid "Quantity In"
 msgstr ""
 
-#: inventory/inquiry/stock_movements.php:77
+#: inventory/inquiry/stock_movements.php:82
 msgid "Quantity Out"
 msgstr ""
 
-#: inventory/inquiry/stock_movements.php:92
+#: inventory/inquiry/stock_movements.php:97
 msgid "Quantity on hand before"
 msgstr ""
 
-#: inventory/inquiry/stock_movements.php:180
+#: inventory/inquiry/stock_movements.php:185
 msgid "Quantity on hand after"
 msgstr ""
 
-#: inventory/inquiry/stock_status.php:18 inventory/inquiry/stock_status.php:20
+#: inventory/inquiry/stock_status.php:19 inventory/inquiry/stock_status.php:21
 msgid "Inventory Item Status"
 msgstr ""
 
-#: inventory/inquiry/stock_status.php:55
+#: inventory/inquiry/stock_status.php:62
 msgid ""
 "This is a service and cannot have a stock holding, only the total quantity "
 "on outstanding sales orders is shown."
 msgstr ""
 
-#: inventory/inquiry/stock_status.php:65 inventory/inquiry/stock_status.php:70
+#: inventory/inquiry/stock_status.php:72 inventory/inquiry/stock_status.php:77
 #: reporting/rep303.php:109 reporting/rep303.php:115
 msgid "Demand"
 msgstr ""
 
-#: inventory/inquiry/stock_status.php:70 reporting/rep303.php:109
+#: inventory/inquiry/stock_status.php:77 reporting/rep303.php:109
 #: reporting/rep303.php:115
 msgid "On Order"
 msgstr ""
@@ -7334,8 +7710,9 @@ msgstr ""
 #: inventory/manage/sales_kits.php:40 inventory/view/view_adjustment.php:57
 #: inventory/view/view_transfer.php:56 manufacturing/view/wo_issue_view.php:77
 #: manufacturing/manage/bom_edit.php:71 purchasing/po_receive_items.php:62
-#: sales/customer_credit_invoice.php:280 sales/customer_delivery.php:429
-#: sales/customer_invoice.php:446
+#: sales/customer_credit_invoice.php:282 sales/customer_delivery.php:432
+#: sales/customer_invoice.php:467 sales/customer_credit_invoice.php:280
+#: sales/customer_invoice.php:469
 msgid "Units"
 msgstr ""
 
@@ -7367,19 +7744,19 @@ msgstr ""
 msgid "Default values for new items"
 msgstr ""
 
-#: inventory/manage/item_categories.php:184 inventory/manage/items.php:336
+#: inventory/manage/item_categories.php:184 inventory/manage/items.php:326
 msgid "Item Tax Type:"
 msgstr ""
 
-#: inventory/manage/item_categories.php:186 inventory/manage/items.php:338
+#: inventory/manage/item_categories.php:186 inventory/manage/items.php:328
 msgid "Item Type:"
 msgstr ""
 
-#: inventory/manage/item_categories.php:188 inventory/manage/items.php:340
+#: inventory/manage/item_categories.php:188 inventory/manage/items.php:330
 msgid "Units of Measure:"
 msgstr ""
 
-#: inventory/manage/item_categories.php:190 inventory/manage/items.php:344
+#: inventory/manage/item_categories.php:190 inventory/manage/items.php:334
 msgid "Exclude from sales:"
 msgstr ""
 
@@ -7387,7 +7764,9 @@ msgstr ""
 msgid "Foreign Item Codes"
 msgstr ""
 
-#: inventory/manage/item_codes.php:23 sales/sales_order_entry.php:658
+#: inventory/manage/item_codes.php:23 sales/sales_order_entry.php:659
+#: sales/sales_order_entry.php:663 sales/sales_order_entry.php:674
+#: sales/sales_order_entry.php.orig:673
 msgid "There are no inventory items defined in the system."
 msgstr ""
 
@@ -7399,7 +7778,7 @@ msgstr ""
 msgid "Item code description cannot be empty."
 msgstr ""
 
-#: inventory/manage/item_codes.php:55 inventory/manage/items.php:150
+#: inventory/manage/item_codes.php:55 inventory/manage/items.php:156
 #: inventory/manage/sales_kits.php:88
 msgid "This item code is already assigned to stock item or sale kit."
 msgstr ""
@@ -7421,9 +7800,9 @@ msgid "EAN/UPC Code"
 msgstr ""
 
 #: inventory/manage/item_codes.php:125 reporting/rep104.php:115
-#: reporting/rep105.php:117 reporting/rep301.php:100 reporting/rep301.php:105
+#: reporting/rep105.php:117 reporting/rep301.php:103 reporting/rep301.php:109
 #: reporting/rep302.php:122 reporting/rep302.php:129 reporting/rep303.php:121
-#: reporting/rep304.php:114 reporting/rep304.php:122
+#: reporting/rep304.php:112 reporting/rep304.php:120
 msgid "Category"
 msgstr ""
 
@@ -7433,77 +7812,71 @@ msgstr ""
 
 #: inventory/manage/item_codes.php:179 inventory/manage/sales_kits.php:245
 #: manufacturing/work_order_add_finished.php:206
-#: manufacturing/work_order_entry.php:423
+#: manufacturing/work_order_entry.php:424
 #: manufacturing/manage/bom_edit.php:228
 msgid "Quantity:"
 msgstr ""
 
-#: inventory/manage/item_codes.php:180 inventory/manage/items.php:311
+#: inventory/manage/item_codes.php:180 inventory/manage/items.php:301
 #: inventory/manage/movement_types.php:129 inventory/manage/sales_kits.php:206
 #: inventory/manage/sales_kits.php:232
 #: manufacturing/manage/work_centres.php:138
-#: sales/manage/credit_status.php:145 sales/manage/recurrent_invoices.php:147
-#: taxes/item_tax_types.php:173 taxes/tax_groups.php:204
+#: sales/manage/credit_status.php:145 sales/manage/recurrent_invoices.php:165
+#: taxes/item_tax_types.php:173 taxes/tax_groups.php:167
 #: taxes/tax_types.php:158
 msgid "Description:"
 msgstr ""
 
-#: inventory/manage/item_codes.php:181 inventory/manage/items.php:313
+#: inventory/manage/item_codes.php:181 inventory/manage/items.php:303
 #: inventory/manage/sales_kits.php:207 inventory/manage/sales_kits.php:233
 msgid "Category:"
 msgstr ""
 
-#: inventory/manage/items.php:69
-msgid "Only jpg files are supported - a file extension of .jpg is expected"
+#: inventory/manage/items.php:80
+msgid ""
+"Only graphics files are supported - a file extension of .jpg, .png or .gif "
+"is expected"
 msgstr ""
 
-#: inventory/manage/items.php:100
+#: inventory/manage/items.php:106
 msgid ""
 "There are no item categories defined in the system. At least one item "
 "category is required to add a item."
 msgstr ""
 
-#: inventory/manage/items.php:102
+#: inventory/manage/items.php:108
 msgid ""
 "There are no item tax types defined in the system. At least one item tax "
 "type is required to add a item."
 msgstr ""
 
-#: inventory/manage/items.php:129
+#: inventory/manage/items.php:135
 msgid "The item name must be entered."
 msgstr ""
 
-#: inventory/manage/items.php:135
+#: inventory/manage/items.php:141
 msgid "The item code cannot be empty"
 msgstr ""
 
-#: inventory/manage/items.php:143
+#: inventory/manage/items.php:149
 msgid ""
 "The item code cannot contain any of the following characters -  & + OR a "
 "space OR quotes"
 msgstr ""
 
-#: inventory/manage/items.php:179
+#: inventory/manage/items.php:185
 msgid "Item has been updated."
 msgstr ""
 
-#: inventory/manage/items.php:192
+#: inventory/manage/items.php:198
 msgid "A new item has been added."
 msgstr ""
 
-#: inventory/manage/items.php:234
+#: inventory/manage/items.php:241
 msgid "Selected item has been deleted."
 msgstr ""
 
-#: inventory/manage/items.php:250
-msgid "Select an item:"
-msgstr ""
-
-#: inventory/manage/items.php:251
-msgid "New item"
-msgstr ""
-
-#: inventory/manage/items.php:268 inventory/view/view_adjustment.php:56
+#: inventory/manage/items.php:258 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/view/wo_issue_view.php:44
@@ -7513,58 +7886,82 @@ msgstr ""
 msgid "Item"
 msgstr ""
 
-#: inventory/manage/items.php:273 inventory/manage/items.php:304
+#: inventory/manage/items.php:263 inventory/manage/items.php:294
 msgid "Item Code:"
 msgstr ""
 
-#: inventory/manage/items.php:342
+#: inventory/manage/items.php:332
 msgid "Editable description:"
 msgstr ""
 
-#: inventory/manage/items.php:362 sales/manage/customer_branches.php:248
+#: inventory/manage/items.php:352 sales/manage/customer_branches.php:248
 msgid "GL Accounts"
 msgstr ""
 
-#: inventory/manage/items.php:385
+#: inventory/manage/items.php:375
 msgid "Other"
 msgstr ""
 
-#: inventory/manage/items.php:388
+#: inventory/manage/items.php:378
 msgid "Image File (.jpg)"
 msgstr ""
 
-#: inventory/manage/items.php:403
+#: inventory/manage/items.php:393
 msgid "No image"
 msgstr ""
 
-#: inventory/manage/items.php:408
+#: inventory/manage/items.php:398
 msgid "Delete Image:"
 msgstr ""
 
-#: inventory/manage/items.php:410
+#: inventory/manage/items.php:400
 msgid "Item status:"
 msgstr ""
 
-#: inventory/manage/items.php:416
+#: inventory/manage/items.php:406
 msgid "Insert New Item"
 msgstr ""
 
-#: inventory/manage/items.php:420
+#: inventory/manage/items.php:410
 msgid "Update Item"
 msgstr ""
 
-#: inventory/manage/items.php:423
+#: inventory/manage/items.php:413
 msgid "Select this items and return to document entry."
 msgstr ""
 
-#: inventory/manage/items.php:424
+#: inventory/manage/items.php:414
 msgid "Clone This Item"
 msgstr ""
 
-#: inventory/manage/items.php:425
+#: inventory/manage/items.php:415
 msgid "Delete This Item"
 msgstr ""
 
+#: inventory/manage/items.php:430
+msgid "Select an item:"
+msgstr ""
+
+#: inventory/manage/items.php:431
+msgid "New item"
+msgstr ""
+
+#: inventory/manage/items.php:454 purchasing/manage/suppliers.php:306
+#: sales/manage/customer_branches.php:322 sales/manage/customers.php:342
+#: sales/manage/customers.php.orig:339 sales/manage/customers.php:344
+msgid "&General settings"
+msgstr ""
+
+#: inventory/manage/items.php:455 purchasing/manage/suppliers.php:308
+#: sales/manage/customers.php:344 sales/manage/customers.php.orig:341
+#: sales/manage/customers.php:346
+msgid "&Transactions"
+msgstr ""
+
+#: inventory/manage/items.php:456
+msgid "&Status"
+msgstr ""
+
 #: inventory/manage/item_units.php:16
 msgid "Units of Measure"
 msgstr ""
@@ -7830,7 +8227,7 @@ msgstr ""
 #: inventory/view/view_transfer.php:40 manufacturing/view/wo_issue_view.php:44
 #: manufacturing/includes/manufacturing_ui.inc:29
 #: manufacturing/includes/manufacturing_ui.inc:83
-#: reporting/includes/doctext.inc:108
+#: reporting/includes/doctext.inc:207
 msgid "From Location"
 msgstr ""
 
@@ -7851,15 +8248,16 @@ msgid "at Location:"
 msgstr ""
 
 #: manufacturing/search_work_orders.php:76
-#: purchasing/inquiry/po_search_completed.php:72
+#: purchasing/inquiry/po_search_completed.php:75
 msgid "for item:"
 msgstr ""
 
 #: manufacturing/search_work_orders.php:78
-#: purchasing/inquiry/po_search_completed.php:74
+#: purchasing/inquiry/po_search_completed.php:77
 #: purchasing/inquiry/po_search.php:76
 #: sales/inquiry/sales_deliveries_view.php:116
-#: sales/inquiry/sales_orders_view.php:238
+#: sales/inquiry/sales_orders_view.php:247
+#: sales/inquiry/sales_orders_view.php.orig:245
 msgid "Select documents"
 msgstr ""
 
@@ -7886,7 +8284,8 @@ msgstr ""
 #: manufacturing/search_work_orders.php:167
 #: manufacturing/includes/manufacturing_ui.inc:277
 #: manufacturing/includes/manufacturing_ui.inc:281
-#: reporting/includes/doctext.inc:46 sales/inquiry/sales_orders_view.php:259
+#: reporting/includes/doctext.inc:205 sales/inquiry/sales_orders_view.php:268
+#: sales/inquiry/sales_orders_view.php.orig:266
 msgid "Required By"
 msgstr ""
 
@@ -7927,7 +8326,7 @@ msgstr ""
 
 #: manufacturing/work_order_add_finished.php:65
 #: manufacturing/work_order_costs.php:64
-#: manufacturing/work_order_entry.php:340
+#: manufacturing/work_order_entry.php:341
 #: 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."
@@ -8029,107 +8428,107 @@ msgstr ""
 msgid "Email this Work Order"
 msgstr ""
 
-#: manufacturing/work_order_entry.php:79
+#: manufacturing/work_order_entry.php:80
 msgid "The work order been updated."
 msgstr ""
 
-#: manufacturing/work_order_entry.php:89
+#: manufacturing/work_order_entry.php:90
 msgid "Work order has been deleted."
 msgstr ""
 
-#: manufacturing/work_order_entry.php:99
+#: manufacturing/work_order_entry.php:100
 msgid ""
 "This work order has been closed. There can be no more issues against it."
 msgstr ""
 
-#: manufacturing/work_order_entry.php:109
+#: manufacturing/work_order_entry.php:110
 msgid "Enter a new work order"
 msgstr ""
 
-#: manufacturing/work_order_entry.php:110
+#: manufacturing/work_order_entry.php:111
 msgid "Select an existing work order"
 msgstr ""
 
-#: manufacturing/work_order_entry.php:146
+#: manufacturing/work_order_entry.php:147
 msgid "The quantity entered is invalid or less than zero."
 msgstr ""
 
-#: manufacturing/work_order_entry.php:168
+#: manufacturing/work_order_entry.php:169
 msgid "The selected item to manufacture does not have a bom."
 msgstr ""
 
-#: manufacturing/work_order_entry.php:177
+#: manufacturing/work_order_entry.php:178
 msgid "The labour cost entered is invalid or less than zero."
 msgstr ""
 
-#: manufacturing/work_order_entry.php:185
+#: manufacturing/work_order_entry.php:186
 msgid "The cost entered is invalid or less than zero."
 msgstr ""
 
-#: manufacturing/work_order_entry.php:208
+#: manufacturing/work_order_entry.php:209
 msgid ""
 "The work order cannot be processed because there is an insufficient quantity "
 "for component:"
 msgstr ""
 
-#: manufacturing/work_order_entry.php:222
+#: manufacturing/work_order_entry.php:223
 msgid ""
 "The selected item cannot be unassembled because there is insufficient stock."
 msgstr ""
 
-#: manufacturing/work_order_entry.php:248
+#: manufacturing/work_order_entry.php:249
 msgid ""
 "The quantity cannot be changed to be less than the quantity already "
 "manufactured for this order."
 msgstr ""
 
-#: manufacturing/work_order_entry.php:297
+#: manufacturing/work_order_entry.php:298
 msgid ""
 "This work order cannot be deleted because it has already been processed."
 msgstr ""
 
-#: manufacturing/work_order_entry.php:348
+#: manufacturing/work_order_entry.php:349
 msgid "This work order is closed and cannot be edited."
 msgstr ""
 
-#: manufacturing/work_order_entry.php:396
-#: manufacturing/work_order_entry.php:404
+#: manufacturing/work_order_entry.php:397
+#: manufacturing/work_order_entry.php:405
 msgid "Destination Location:"
 msgstr ""
 
-#: manufacturing/work_order_entry.php:415
+#: manufacturing/work_order_entry.php:416
 msgid "Quantity Required:"
 msgstr ""
 
-#: manufacturing/work_order_entry.php:417
+#: manufacturing/work_order_entry.php:418
 msgid "Quantity Manufactured:"
 msgstr ""
 
-#: manufacturing/work_order_entry.php:436
+#: manufacturing/work_order_entry.php:437
 msgid "Credit Labour Account"
 msgstr ""
 
-#: manufacturing/work_order_entry.php:443
+#: manufacturing/work_order_entry.php:444
 msgid "Credit Overhead Account"
 msgstr ""
 
-#: manufacturing/work_order_entry.php:448
+#: manufacturing/work_order_entry.php:449
 msgid "Released On:"
 msgstr ""
 
-#: manufacturing/work_order_entry.php:458
+#: manufacturing/work_order_entry.php:459
 msgid "Save changes to work order"
 msgstr ""
 
-#: manufacturing/work_order_entry.php:461
+#: manufacturing/work_order_entry.php:462
 msgid "Close This Work Order"
 msgstr ""
 
-#: manufacturing/work_order_entry.php:463
+#: manufacturing/work_order_entry.php:464
 msgid "Delete This Work Order"
 msgstr ""
 
-#: manufacturing/work_order_entry.php:469
+#: manufacturing/work_order_entry.php:470
 msgid "Add Workorder"
 msgstr ""
 
@@ -8276,7 +8675,7 @@ msgstr ""
 msgid "BOM for item:"
 msgstr ""
 
-#: manufacturing/view/work_order_view.php:56 reporting/rep409.php:93
+#: manufacturing/view/work_order_view.php:56 reporting/rep409.php:91
 msgid "Work Order Requirements"
 msgstr ""
 
@@ -8327,7 +8726,7 @@ msgstr ""
 #: manufacturing/manage/bom_edit.php:71
 #: manufacturing/includes/manufacturing_ui.inc:28
 #: manufacturing/includes/manufacturing_ui.inc:83
-#: reporting/includes/doctext.inc:108
+#: reporting/includes/doctext.inc:207
 msgid "Work Centre"
 msgstr ""
 
@@ -8430,17 +8829,17 @@ msgid "There are no Requirements for this Order."
 msgstr ""
 
 #: manufacturing/includes/manufacturing_ui.inc:84
-#: reporting/includes/doctext.inc:108
+#: reporting/includes/doctext.inc:207
 msgid "Unit Quantity"
 msgstr ""
 
 #: manufacturing/includes/manufacturing_ui.inc:84
-#: reporting/includes/doctext.inc:108
+#: reporting/includes/doctext.inc:207
 msgid "Total Quantity"
 msgstr ""
 
 #: manufacturing/includes/manufacturing_ui.inc:84
-#: reporting/includes/doctext.inc:108
+#: reporting/includes/doctext.inc:207
 msgid "Units Issued"
 msgstr ""
 
@@ -8472,14 +8871,14 @@ msgstr ""
 #: manufacturing/includes/manufacturing_ui.inc:276
 #: manufacturing/includes/manufacturing_ui.inc:280
 #: manufacturing/includes/manufacturing_ui.inc:331
-#: reporting/includes/doctext.inc:45
+#: reporting/includes/doctext.inc:201
 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:48
+#: reporting/includes/doctext.inc:202
 msgid "Into Location"
 msgstr ""
 
@@ -8528,23 +8927,25 @@ msgstr ""
 msgid "Reversed the production "
 msgstr ""
 
-#: manufacturing/includes/db/work_orders_db.inc:306
+#: manufacturing/includes/db/work_orders_db.inc:278
 #: purchasing/includes/db/po_db.inc:116
-#: sales/includes/db/cust_trans_db.inc:109
+#: sales/includes/db/cust_trans_db.inc:111
 #: sales/includes/db/sales_order_db.inc:249
+#: sales/includes/db/sales_order_db.inc.orig:249
+#: sales/includes/db/cust_trans_db.inc.orig:111
 msgid "Updated."
 msgstr ""
 
-#: manufacturing/includes/db/work_orders_db.inc:328
+#: manufacturing/includes/db/work_orders_db.inc:297
 msgid "Canceled."
 msgstr ""
 
-#: manufacturing/includes/db/work_orders_db.inc:404
+#: manufacturing/includes/db/work_orders_db.inc:373
 msgid "Released."
 msgstr ""
 
-#: manufacturing/includes/db/work_orders_db.inc:493
-#: manufacturing/includes/db/work_orders_db.inc:518
+#: manufacturing/includes/db/work_orders_db.inc:445
+#: manufacturing/includes/db/work_orders_db.inc:461
 msgid "Voiding Work Order Trans # "
 msgstr ""
 
@@ -8556,18 +8957,19 @@ msgstr ""
 msgid "Produced"
 msgstr ""
 
-#: purchasing/includes/db/invoice_db.inc:279
+#: purchasing/includes/db/invoice_db.inc:284
 msgid "Supplier invoice adjustment for zero inventory of "
 msgstr ""
 
-#: purchasing/includes/db/invoice_db.inc:279 reporting/rep106.php:81
+#: purchasing/includes/db/invoice_db.inc:284 reporting/rep106.php:81
 #: sales/inquiry/sales_deliveries_view.php:166
-#: sales/inquiry/sales_orders_view.php:142
+#: sales/inquiry/sales_orders_view.php:147
+#: sales/inquiry/sales_orders_view.php.orig:145
 msgid "Invoice"
 msgstr ""
 
-#: purchasing/includes/db/invoice_db.inc:679
-#: purchasing/includes/db/invoice_db.inc:681
+#: purchasing/includes/db/invoice_db.inc:690
+#: purchasing/includes/db/invoice_db.inc:692
 msgid "GRN Removal"
 msgstr ""
 
@@ -8597,9 +8999,10 @@ msgstr ""
 #: purchasing/includes/ui/po_ui.inc:344
 #: purchasing/view/view_supp_credit.php:44
 #: purchasing/view/view_supp_invoice.php:47
-#: purchasing/inquiry/po_search_completed.php:120
+#: purchasing/inquiry/po_search_completed.php:125
 #: purchasing/inquiry/po_search.php:134
-#: purchasing/inquiry/supplier_inquiry.php:166
+#: purchasing/inquiry/supplier_inquiry.php:172
+#: purchasing/inquiry/supplier_inquiry.php.orig:166
 msgid "Supplier's Reference"
 msgstr ""
 
@@ -8622,12 +9025,14 @@ msgid "Terms:"
 msgstr ""
 
 #: purchasing/includes/ui/invoice_ui.inc:126
-#: purchasing/manage/suppliers.php:92 purchasing/manage/suppliers.php:97
+#: purchasing/manage/suppliers.php:98 purchasing/manage/suppliers.php:103
 msgid "Supplier's Currency:"
 msgstr ""
 
 #: purchasing/includes/ui/invoice_ui.inc:130
-#: purchasing/manage/suppliers.php:99 sales/manage/customer_branches.php:246
+#: purchasing/manage/suppliers.php:105 sales/manage/customer_branches.php:246
+#: sales/manage/customers.php:292 sales/manage/customers.php.orig:289
+#: sales/manage/customers.php:294
 msgid "Tax Group:"
 msgstr ""
 
@@ -8640,8 +9045,9 @@ msgid "Invoice Total:"
 msgstr ""
 
 #: purchasing/includes/ui/invoice_ui.inc:156
-#: sales/customer_credit_invoice.php:330
+#: sales/customer_credit_invoice.php:332
 #: sales/includes/ui/sales_credit_ui.inc:233
+#: sales/customer_credit_invoice.php:330
 msgid "Credit Note Total"
 msgstr ""
 
@@ -8678,7 +9084,8 @@ msgstr ""
 msgid "Add to Credit Note"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:396 sales/customer_invoice.php:501
+#: purchasing/includes/ui/invoice_ui.inc:396 sales/customer_invoice.php:522
+#: sales/customer_invoice.php:524
 msgid "Remove"
 msgstr ""
 
@@ -8690,11 +9097,10 @@ msgid ""
 msgstr ""
 
 #: purchasing/includes/ui/invoice_ui.inc:398
-#, 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 ?"
+"You are about to remove all yet non-invoiced items from selected delivery "
+"line. This operation also irreversibly changes related order line. Do you "
+"want to continue ?"
 msgstr ""
 
 #: purchasing/includes/ui/invoice_ui.inc:429
@@ -8723,14 +9129,11 @@ msgstr ""
 
 #: purchasing/includes/ui/invoice_ui.inc:471
 #: purchasing/includes/ui/invoice_ui.inc:483
-#: sales/inquiry/sales_orders_view.php:150
+#: sales/inquiry/sales_orders_view.php:155
+#: sales/inquiry/sales_orders_view.php.orig:153
 msgid "Delivery"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:471
-msgid "Sequence #"
-msgstr ""
-
 #: purchasing/includes/ui/invoice_ui.inc:471
 msgid "P.O."
 msgstr ""
@@ -8755,12 +9158,14 @@ msgstr ""
 #: purchasing/includes/ui/invoice_ui.inc:473
 #: purchasing/includes/ui/po_ui.inc:238
 #: sales/includes/ui/sales_order_ui.inc:142
+#: sales/includes/ui/sales_order_ui.inc:146
 msgid "Price after Tax"
 msgstr ""
 
 #: purchasing/includes/ui/invoice_ui.inc:473
 #: purchasing/includes/ui/po_ui.inc:238
 #: sales/includes/ui/sales_order_ui.inc:142
+#: sales/includes/ui/sales_order_ui.inc:146
 msgid "Price before Tax"
 msgstr ""
 
@@ -8772,19 +9177,19 @@ msgstr ""
 msgid "Line Value"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:552
+#: purchasing/includes/ui/invoice_ui.inc:551
 msgid ""
 "There are no outstanding items received from this supplier that have not "
 "been invoiced by them."
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:555
+#: purchasing/includes/ui/invoice_ui.inc:554
 msgid ""
 "There are no received items for the selected supplier that have been "
 "invoiced."
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:556
+#: purchasing/includes/ui/invoice_ui.inc:555
 msgid "Credits can only be applied to invoiced items."
 msgstr ""
 
@@ -8792,15 +9197,21 @@ msgstr ""
 msgid "Supplier Currency:"
 msgstr ""
 
-#: purchasing/includes/ui/po_ui.inc:178 sales/sales_order_entry.php:682
+#: purchasing/includes/ui/po_ui.inc:178 sales/sales_order_entry.php:683
+#: sales/sales_order_entry.php:687 sales/sales_order_entry.php:698
+#: sales/sales_order_entry.php.orig:697
 msgid "Order Date:"
 msgstr ""
 
-#: purchasing/includes/ui/po_ui.inc:179 sales/sales_order_entry.php:669
+#: purchasing/includes/ui/po_ui.inc:179 sales/sales_order_entry.php:670
+#: sales/sales_order_entry.php:674 sales/sales_order_entry.php:685
+#: sales/sales_order_entry.php.orig:684
 msgid "Delivery Date:"
 msgstr ""
 
-#: purchasing/includes/ui/po_ui.inc:179 sales/sales_order_entry.php:663
+#: purchasing/includes/ui/po_ui.inc:179 sales/sales_order_entry.php:664
+#: sales/sales_order_entry.php:668 sales/sales_order_entry.php:679
+#: sales/sales_order_entry.php.orig:678
 msgid "Invoice Date:"
 msgstr ""
 
@@ -8835,7 +9246,8 @@ msgid "Received"
 msgstr ""
 
 #: purchasing/includes/ui/po_ui.inc:238
-#: sales/includes/ui/sales_order_ui.inc:610
+#: sales/includes/ui/sales_order_ui.inc:611
+#: sales/includes/ui/sales_order_ui.inc:615
 msgid "Required Delivery Date"
 msgstr ""
 
@@ -8845,18 +9257,22 @@ msgid "Line Total"
 msgstr ""
 
 #: purchasing/includes/ui/po_ui.inc:289 purchasing/po_receive_items.php:114
-#: reporting/includes/doctext.inc:149 sales/customer_credit_invoice.php:322
-#: sales/customer_delivery.php:498 sales/customer_invoice.php:542
-#: sales/view/view_dispatch.php:146 sales/view/view_invoice.php:148
-#: sales/includes/ui/sales_credit_ui.inc:217
+#: reporting/rep107.php:148 reporting/rep109.php:151 reporting/rep110.php:161
+#: reporting/rep111.php:138 reporting/rep113.php:147 reporting/rep209.php:167
+#: sales/customer_credit_invoice.php:324 sales/customer_delivery.php:501
+#: sales/customer_invoice.php:563 sales/view/view_dispatch.php:146
+#: sales/view/view_invoice.php:148 sales/includes/ui/sales_credit_ui.inc:217
 #: sales/includes/ui/sales_order_ui.inc:229
+#: sales/customer_credit_invoice.php:322 sales/customer_invoice.php:565
+#: sales/includes/ui/sales_order_ui.inc:233
 msgid "Sub-total"
 msgstr ""
 
 #: purchasing/includes/ui/po_ui.inc:298 purchasing/po_receive_items.php:122
 #: purchasing/view/view_grn.php:79 purchasing/view/view_po.php:93
-#: sales/customer_delivery.php:505 sales/view/view_sales_order.php:244
+#: sales/customer_delivery.php:508 sales/view/view_sales_order.php:244
 #: sales/includes/ui/sales_order_ui.inc:236
+#: sales/includes/ui/sales_order_ui.inc:240
 msgid "Amount Total"
 msgstr ""
 
@@ -8864,236 +9280,258 @@ msgstr ""
 #: purchasing/allocations/supplier_allocate.php:64
 #: sales/allocations/customer_allocate.php:63
 #: sales/includes/ui/sales_order_ui.inc:237
+#: sales/includes/ui/sales_order_ui.inc:241
 msgid "Refresh"
 msgstr ""
 
-#: purchasing/po_entry_items.php:38
+#: purchasing/po_entry_items.php:38 purchasing/po_entry_items.php:41
 msgid "Modify Purchase Order #"
 msgstr ""
 
-#: purchasing/po_entry_items.php:43
+#: purchasing/po_entry_items.php:43 purchasing/po_entry_items.php:46
 msgid "Purchase Order Entry"
 msgstr ""
 
-#: purchasing/po_entry_items.php:48
+#: purchasing/po_entry_items.php:48 purchasing/po_entry_items.php:51
 msgid "Direct GRN Entry"
 msgstr ""
 
-#: purchasing/po_entry_items.php:53
+#: purchasing/po_entry_items.php:53 purchasing/po_entry_items.php:56
 msgid "Direct Purchase Invoice Entry"
 msgstr ""
 
-#: purchasing/po_entry_items.php:74
+#: purchasing/po_entry_items.php:74 purchasing/po_entry_items.php:77
 msgid "Purchase Order has been entered"
 msgstr ""
 
-#: purchasing/po_entry_items.php:76
+#: purchasing/po_entry_items.php:76 purchasing/po_entry_items.php:79
 msgid "Purchase Order has been updated"
 msgstr ""
 
-#: purchasing/po_entry_items.php:77
+#: purchasing/po_entry_items.php:77 purchasing/po_entry_items.php:80
 msgid "&View this order"
 msgstr ""
 
 #: purchasing/po_entry_items.php:79 sales/sales_order_entry.php:105
-#: sales/sales_order_entry.php:125
+#: sales/sales_order_entry.php:125 purchasing/po_entry_items.php:82
+#: sales/sales_order_entry.php:113 sales/sales_order_entry.php:133
+#: sales/sales_order_entry.php.orig:113 sales/sales_order_entry.php.orig:133
 msgid "&Print This Order"
 msgstr ""
 
 #: purchasing/po_entry_items.php:81 sales/sales_order_entry.php:106
-#: sales/sales_order_entry.php:126
+#: sales/sales_order_entry.php:126 purchasing/po_entry_items.php:84
+#: sales/sales_order_entry.php:114 sales/sales_order_entry.php:134
+#: sales/sales_order_entry.php.orig:114 sales/sales_order_entry.php.orig:134
 msgid "&Email This Order"
 msgstr ""
 
-#: purchasing/po_entry_items.php:83
+#: purchasing/po_entry_items.php:83 purchasing/po_entry_items.php:86
 msgid "&Receive Items on this Purchase Order"
 msgstr ""
 
-#: purchasing/po_entry_items.php:85
+#: purchasing/po_entry_items.php:85 purchasing/po_entry_items.php:88
 msgid "Enter &Another Purchase Order"
 msgstr ""
 
-#: purchasing/po_entry_items.php:87
+#: purchasing/po_entry_items.php:87 purchasing/po_entry_items.php:90
 msgid "Select An &Outstanding Purchase Order"
 msgstr ""
 
-#: purchasing/po_entry_items.php:96
+#: purchasing/po_entry_items.php:96 purchasing/po_entry_items.php:99
 msgid "Direct GRN has been entered"
 msgstr ""
 
-#: purchasing/po_entry_items.php:98
+#: purchasing/po_entry_items.php:98 purchasing/po_entry_items.php:101
 msgid "&View this GRN"
 msgstr ""
 
 #: purchasing/po_entry_items.php:102 purchasing/po_receive_items.php:40
+#: purchasing/po_entry_items.php:105
 msgid "View the GL Journal Entries for this Delivery"
 msgstr ""
 
 #: purchasing/po_entry_items.php:107 purchasing/po_receive_items.php:42
+#: purchasing/po_entry_items.php:110
 msgid "Entry purchase &invoice for this receival"
 msgstr ""
 
-#: purchasing/po_entry_items.php:109 purchasing/po_entry_items.php:133
-#: purchasing/supplier_credit.php:49 purchasing/supplier_invoice.php:52
-msgid "Add an Attachment"
-msgstr ""
-
-#: purchasing/po_entry_items.php:112
+#: purchasing/po_entry_items.php:112 purchasing/po_entry_items.php:115
 msgid "Enter &Another GRN"
 msgstr ""
 
-#: purchasing/po_entry_items.php:121
+#: purchasing/po_entry_items.php:121 purchasing/po_entry_items.php:124
 msgid "Direct Purchase Invoice has been entered"
 msgstr ""
 
-#: purchasing/po_entry_items.php:123
+#: purchasing/po_entry_items.php:123 purchasing/po_entry_items.php:126
 msgid "&View this Invoice"
 msgstr ""
 
 #: purchasing/po_entry_items.php:128 purchasing/supplier_invoice.php:46
+#: purchasing/po_entry_items.php:131
 msgid "View the GL Journal Entries for this Invoice"
 msgstr ""
 
 #: purchasing/po_entry_items.php:130 purchasing/supplier_invoice.php:48
+#: purchasing/po_entry_items.php:133
 msgid "Entry supplier &payment for this invoice"
 msgstr ""
 
-#: purchasing/po_entry_items.php:136
+#: purchasing/po_entry_items.php:136 purchasing/po_entry_items.php:139
 msgid "Enter &Another Direct Invoice"
 msgstr ""
 
-#: purchasing/po_entry_items.php:168
+#: purchasing/po_entry_items.php:168 purchasing/po_entry_items.php:171
 msgid ""
 "This item cannot be deleted because some of it has already been received."
 msgstr ""
 
-#: purchasing/po_entry_items.php:183
+#: purchasing/po_entry_items.php:183 purchasing/po_entry_items.php:186
 msgid ""
 "This order cannot be cancelled because some of it has already been received."
 msgstr ""
 
-#: purchasing/po_entry_items.php:184
+#: purchasing/po_entry_items.php:184 purchasing/po_entry_items.php:187
 msgid ""
 "The line item quantities may be modified to quantities more than already "
 "received. prices cannot be altered for lines that have already been received "
 "and quantities cannot be reduced below the quantity already received."
 msgstr ""
 
-#: purchasing/po_entry_items.php:199
+#: purchasing/po_entry_items.php:199 purchasing/po_entry_items.php:202
 msgid "This purchase order has been cancelled."
 msgstr ""
 
-#: purchasing/po_entry_items.php:201
+#: purchasing/po_entry_items.php:201 purchasing/po_entry_items.php:204
 msgid "Enter a new purchase order"
 msgstr ""
 
-#: purchasing/po_entry_items.php:213 sales/sales_order_entry.php:463
+#: purchasing/po_entry_items.php:213 sales/sales_order_entry.php:464
+#: sales/sales_order_entry.php:468 purchasing/po_entry_items.php:216
+#: sales/sales_order_entry.php:479 sales/sales_order_entry.php.orig:478
 msgid "Item description cannot be empty."
 msgstr ""
 
-#: purchasing/po_entry_items.php:223
+#: purchasing/po_entry_items.php:223 purchasing/po_entry_items.php:226
 msgid "The quantity of the order item must be numeric and not less than "
 msgstr ""
 
-#: purchasing/po_entry_items.php:230
+#: purchasing/po_entry_items.php:230 purchasing/po_entry_items.php:233
 msgid "The price entered must be numeric and not less than zero."
 msgstr ""
 
-#: purchasing/po_entry_items.php:254
+#: purchasing/po_entry_items.php:254 purchasing/po_entry_items.php:257
 msgid ""
 "You are attempting to make the quantity ordered a quantity less than has "
 "already been invoiced or received.  This is prohibited."
 msgstr ""
 
-#: purchasing/po_entry_items.php:255
+#: purchasing/po_entry_items.php:255 purchasing/po_entry_items.php:258
 msgid ""
 "The quantity received can only be modified by entering a negative receipt "
 "and the quantity invoiced can only be reduced by entering a credit note "
 "against this item."
 msgstr ""
 
-#: purchasing/po_entry_items.php:283
+#: purchasing/po_entry_items.php:283 purchasing/po_entry_items.php:286
 msgid "The selected item is already on this order."
 msgstr ""
 
-#: purchasing/po_entry_items.php:310
+#: purchasing/po_entry_items.php:310 purchasing/po_entry_items.php:313
 msgid ""
 "The selected item does not exist or it is a kit part and therefore cannot be "
 "purchased."
 msgstr ""
 
-#: purchasing/po_entry_items.php:326 purchasing/supplier_invoice.php:352
-#: purchasing/supplier_payment.php:118
+#: purchasing/po_entry_items.php:326 purchasing/supplier_invoice.php:343
+#: purchasing/supplier_payment.php:118 purchasing/po_entry_items.php:329
+#: purchasing/supplier_payment.php:113
 msgid "There is no supplier selected."
 msgstr ""
 
-#: purchasing/po_entry_items.php:333
+#: purchasing/po_entry_items.php:333 purchasing/po_entry_items.php:336
 msgid "The entered order date is invalid."
 msgstr ""
 
 #: purchasing/po_entry_items.php:340 purchasing/po_receive_items.php:181
-#: sales/sales_order_entry.php:346
+#: sales/sales_order_entry.php:345 purchasing/po_entry_items.php:343
+#: sales/sales_order_entry.php:354 sales/sales_order_entry.php.orig:353
 msgid "The entered date is not in fiscal year"
 msgstr ""
 
-#: purchasing/po_entry_items.php:347
+#: purchasing/po_entry_items.php:347 purchasing/po_entry_items.php:350
 msgid "The entered due date is invalid."
 msgstr ""
 
-#: purchasing/po_entry_items.php:356
+#: purchasing/po_entry_items.php:356 purchasing/po_entry_items.php:359
 msgid "There is no reference entered for this purchase order."
 msgstr ""
 
 #: purchasing/po_entry_items.php:371 purchasing/supplier_invoice.php:161
+#: purchasing/po_entry_items.php:374
 msgid "You must enter a supplier's invoice reference."
 msgstr ""
 
-#: purchasing/po_entry_items.php:377
+#: purchasing/po_entry_items.php:378 purchasing/supplier_invoice.php:187
+#: purchasing/po_entry_items.php:381
+msgid ""
+"This invoice number has already been entered. It cannot be entered again."
+msgstr ""
+
+#: purchasing/po_entry_items.php:384 purchasing/po_entry_items.php:387
 msgid "There is no delivery address specified."
 msgstr ""
 
-#: purchasing/po_entry_items.php:383
+#: purchasing/po_entry_items.php:390 purchasing/po_entry_items.php:393
 msgid "There is no location specified to move any items into."
 msgstr ""
 
-#: purchasing/po_entry_items.php:390
+#: purchasing/po_entry_items.php:397 purchasing/po_entry_items.php:401
 msgid ""
 "The order cannot be placed because there are no lines entered on this order."
 msgstr ""
 
-#: purchasing/po_entry_items.php:516 sales/sales_order_entry.php:686
+#: purchasing/po_entry_items.php:523 sales/sales_order_entry.php:687
+#: sales/sales_order_entry.php:691 purchasing/po_entry_items.php:527
+#: sales/sales_order_entry.php:702 sales/sales_order_entry.php.orig:701
 msgid "Place Order"
 msgstr ""
 
-#: purchasing/po_entry_items.php:517
+#: purchasing/po_entry_items.php:524 purchasing/po_entry_items.php:528
 msgid "Update Order"
 msgstr ""
 
-#: purchasing/po_entry_items.php:518 sales/sales_order_entry.php:685
+#: purchasing/po_entry_items.php:525 sales/sales_order_entry.php:686
+#: sales/sales_order_entry.php:690 purchasing/po_entry_items.php:529
+#: sales/sales_order_entry.php:701 sales/sales_order_entry.php.orig:700
 msgid "Cancel Order"
 msgstr ""
 
-#: purchasing/po_entry_items.php:520
+#: purchasing/po_entry_items.php:527 purchasing/po_entry_items.php:531
 msgid "Process GRN"
 msgstr ""
 
-#: purchasing/po_entry_items.php:521
+#: purchasing/po_entry_items.php:528 purchasing/po_entry_items.php:532
 msgid "Update GRN"
 msgstr ""
 
-#: purchasing/po_entry_items.php:522
+#: purchasing/po_entry_items.php:529 purchasing/po_entry_items.php:533
 msgid "Cancel GRN"
 msgstr ""
 
-#: purchasing/po_entry_items.php:525 sales/customer_invoice.php:561
+#: purchasing/po_entry_items.php:532 sales/customer_invoice.php:582
+#: sales/customer_invoice.php:584 purchasing/po_entry_items.php:536
 msgid "Process Invoice"
 msgstr ""
 
-#: purchasing/po_entry_items.php:526
+#: purchasing/po_entry_items.php:533 purchasing/po_entry_items.php:537
 msgid "Update Invoice"
 msgstr ""
 
-#: purchasing/po_entry_items.php:527 sales/sales_order_entry.php:666
+#: purchasing/po_entry_items.php:534 sales/sales_order_entry.php:667
+#: sales/sales_order_entry.php:671 purchasing/po_entry_items.php:538
+#: sales/sales_order_entry.php:682 sales/sales_order_entry.php.orig:681
 msgid "Cancel Invoice"
 msgstr ""
 
@@ -9120,17 +9558,17 @@ msgid ""
 msgstr ""
 
 #: purchasing/po_receive_items.php:62 reporting/rep105.php:112
-#: sales/customer_delivery.php:429
+#: sales/customer_delivery.php:432
 msgid "Ordered"
 msgstr ""
 
 #: purchasing/po_receive_items.php:63 reporting/rep101.php:131
-#: reporting/rep105.php:113 reporting/rep105.php:167 reporting/rep201.php:119
-#: reporting/includes/doctext.inc:119
+#: reporting/rep105.php:113 reporting/rep105.php:162 reporting/rep201.php:119
+#: reporting/includes/doctext.inc:225
 msgid "Outstanding"
 msgstr ""
 
-#: purchasing/po_receive_items.php:63 sales/customer_delivery.php:430
+#: purchasing/po_receive_items.php:63 sales/customer_delivery.php:433
 msgid "This Delivery"
 msgstr ""
 
@@ -9286,11 +9724,6 @@ msgid ""
 "incorrect format."
 msgstr ""
 
-#: purchasing/supplier_invoice.php:187
-msgid ""
-"This invoice number has already been entered. It cannot be entered again."
-msgstr ""
-
 #: purchasing/supplier_invoice.php:224
 msgid "The quantity to invoice must be numeric and greater than zero."
 msgstr ""
@@ -9318,12 +9751,12 @@ msgid ""
 "necessary."
 msgstr ""
 
-#: purchasing/supplier_invoice.php:334
+#: purchasing/supplier_invoice.php:325
 #, php-format
 msgid "All yet non-invoiced items on delivery line # %d has been removed."
 msgstr ""
 
-#: purchasing/supplier_invoice.php:376
+#: purchasing/supplier_invoice.php:367
 msgid "Enter Invoice"
 msgstr ""
 
@@ -9331,70 +9764,74 @@ msgstr ""
 msgid "Supplier Payment Entry"
 msgstr ""
 
-#: purchasing/supplier_payment.php:89
+#: purchasing/supplier_payment.php:90 purchasing/supplier_payment.php:85
 msgid "Invalid purchase invoice number."
 msgstr ""
 
-#: purchasing/supplier_payment.php:96
+#: purchasing/supplier_payment.php:96 purchasing/supplier_payment.php:91
 msgid "Payment has been sucessfully entered"
 msgstr ""
 
-#: purchasing/supplier_payment.php:98
+#: purchasing/supplier_payment.php:98 purchasing/supplier_payment.php:93
 msgid "&Print This Remittance"
 msgstr ""
 
-#: purchasing/supplier_payment.php:99
+#: purchasing/supplier_payment.php:99 purchasing/supplier_payment.php:94
 msgid "&Email This Remittance"
 msgstr ""
 
-#: purchasing/supplier_payment.php:101
+#: purchasing/supplier_payment.php:101 purchasing/supplier_payment.php:96
 msgid "View the GL &Journal Entries for this Payment"
 msgstr ""
 
-#: purchasing/supplier_payment.php:105
+#: purchasing/supplier_payment.php:105 purchasing/supplier_payment.php:100
 msgid "Enter another supplier &payment"
 msgstr ""
 
-#: purchasing/supplier_payment.php:152 sales/customer_payments.php:139
+#: purchasing/supplier_payment.php:152 sales/customer_payments.php:192
+#: purchasing/supplier_payment.php:147 sales/customer_payments.php.orig:192
 msgid "The exchange rate must be numeric and greater than zero."
 msgstr ""
 
-#: purchasing/supplier_payment.php:164
+#: purchasing/supplier_payment.php:164 purchasing/supplier_payment.php:159
 msgid "The entered discount is invalid or less than zero."
 msgstr ""
 
-#: purchasing/supplier_payment.php:172
+#: purchasing/supplier_payment.php:172 purchasing/supplier_payment.php:167
 msgid ""
 "The total of the amount and the discount is zero or negative. Please enter "
 "positive values."
 msgstr ""
 
-#: purchasing/supplier_payment.php:273
+#: purchasing/supplier_payment.php:273 purchasing/supplier_payment.php:270
 msgid "Payment To:"
 msgstr ""
 
-#: purchasing/supplier_payment.php:277
+#: purchasing/supplier_payment.php:280 purchasing/supplier_payment.php:283
 msgid "From Bank Account:"
 msgstr ""
 
-#: purchasing/supplier_payment.php:283
+#: purchasing/supplier_payment.php:288
 #: purchasing/view/view_supp_payment.php:55
+#: purchasing/supplier_payment.php:291
 msgid "Date Paid"
 msgstr ""
 
-#: purchasing/supplier_payment.php:306 sales/customer_payments.php:287
+#: purchasing/supplier_payment.php:311 sales/customer_payments.php:407
+#: purchasing/supplier_payment.php:314 sales/customer_payments.php:410
+#: sales/customer_payments.php.orig:409
 msgid "Amount of Discount:"
 msgstr ""
 
-#: purchasing/supplier_payment.php:307
+#: purchasing/supplier_payment.php:312 purchasing/supplier_payment.php:315
 msgid "Amount of Payment:"
 msgstr ""
 
-#: purchasing/supplier_payment.php:313
+#: purchasing/supplier_payment.php:318 purchasing/supplier_payment.php:321
 msgid "The amount and discount are in the bank account's currency."
 msgstr ""
 
-#: purchasing/supplier_payment.php:316
+#: purchasing/supplier_payment.php:321 purchasing/supplier_payment.php:324
 msgid "Enter Payment"
 msgstr ""
 
@@ -9412,8 +9849,8 @@ msgstr ""
 msgid "Line Details"
 msgstr ""
 
-#: purchasing/view/view_grn.php:40 reporting/includes/doctext.inc:36
-#: reporting/includes/doctext.inc:105
+#: purchasing/view/view_grn.php:40 reporting/includes/doctext.inc:65
+#: reporting/includes/doctext.inc:170 reporting/includes/doctext.inc:222
 #: sales/inquiry/sales_deliveries_view.php:186
 msgid "Delivery Date"
 msgstr ""
@@ -9442,12 +9879,15 @@ msgid "Requested By"
 msgstr ""
 
 #: purchasing/view/view_po.php:100
-#: purchasing/inquiry/supplier_allocation_inquiry.php:147
-#: purchasing/inquiry/supplier_inquiry.php:187
-#: sales/inquiry/customer_allocation_inquiry.php:162
-#: sales/inquiry/customer_inquiry.php:239
+#: purchasing/inquiry/supplier_allocation_inquiry.php:148
+#: purchasing/inquiry/supplier_inquiry.php:193
+#: purchasing/inquiry/supplier_inquiry.php.orig:187
+#: sales/inquiry/customer_allocation_inquiry.php:165
+#: sales/inquiry/customer_inquiry.php:251
+#: sales/inquiry/customer_inquiry.php.orig:251
 #: sales/inquiry/sales_deliveries_view.php:206
-#: sales/inquiry/sales_orders_view.php:307
+#: sales/inquiry/sales_orders_view.php:318
+#: sales/inquiry/sales_orders_view.php.orig:316
 msgid "Marked items are overdue."
 msgstr ""
 
@@ -9474,7 +9914,8 @@ msgstr ""
 
 #: purchasing/view/view_supp_credit.php:47
 #: purchasing/view/view_supp_invoice.php:50
-#: sales/customer_credit_invoice.php:268 sales/view/view_invoice.php:95
+#: sales/customer_credit_invoice.php:270 sales/view/view_invoice.php:95
+#: sales/customer_credit_invoice.php:268
 msgid "Invoice Date"
 msgstr ""
 
@@ -9494,7 +9935,7 @@ msgstr ""
 msgid "SUPPLIER INVOICE"
 msgstr ""
 
-#: purchasing/view/view_supp_invoice.php:72 reporting/includes/doctext.inc:153
+#: purchasing/view/view_supp_invoice.php:72 reporting/rep107.php:196
 #: sales/view/view_invoice.php:164
 msgid "TOTAL INVOICE"
 msgstr ""
@@ -9519,201 +9960,213 @@ msgstr ""
 msgid "Payment Currency"
 msgstr ""
 
-#: purchasing/view/view_supp_payment.php:66
+#: purchasing/view/view_supp_payment.php:62 sales/customer_delivery.php:433
+#: sales/customer_invoice.php:468 sales/view/view_receipt.php:45
+#: sales/view/view_sales_order.php:202 sales/customer_invoice.php:470
+msgid "Discount"
+msgstr ""
+
+#: purchasing/view/view_supp_payment.php:69
 msgid "Supplier's Currency"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:21 sales/manage/customer_branches.php:33
+#: purchasing/manage/suppliers.php:27 sales/manage/customer_branches.php:33
 msgid ""
 "There are no tax groups defined in the system. At least one tax group is "
 "required before proceeding."
 msgstr ""
 
-#: purchasing/manage/suppliers.php:83
+#: purchasing/manage/suppliers.php:89
 msgid "Basic Data"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:85
+#: purchasing/manage/suppliers.php:91
 msgid "Supplier Name:"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:86
+#: purchasing/manage/suppliers.php:92
 msgid "Supplier Short Name:"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:89
+#: purchasing/manage/suppliers.php:95
 msgid "Website:"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:100
+#: purchasing/manage/suppliers.php:106
 msgid "Our Customer No:"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:103
-msgid "Contact Data"
-msgstr ""
-
-#: purchasing/manage/suppliers.php:109
-msgid "System default"
-msgstr ""
-
-#: purchasing/manage/suppliers.php:111
+#: purchasing/manage/suppliers.php:108
 msgid "Purchasing"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:112
+#: purchasing/manage/suppliers.php:109
 msgid "Bank Name/Account:"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:113 sales/manage/customers.php:228
+#: purchasing/manage/suppliers.php:110 sales/manage/customers.php:263
+#: sales/manage/customers.php.orig:260 sales/manage/customers.php:264
 msgid "Credit Limit:"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:114 sales/manage/customers.php:230
+#: purchasing/manage/suppliers.php:111 sales/manage/customers.php:265
+#: sales/manage/customers.php.orig:262 sales/manage/customers.php:266
 msgid "Payment Terms:"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:120 purchasing/manage/suppliers.php:123
+#: purchasing/manage/suppliers.php:117 purchasing/manage/suppliers.php:120
 msgid "Prices contain tax included:"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:125 reporting/rep704.php:91
-#: reporting/rep704.php:101 reporting/rep704.php:109
+#: purchasing/manage/suppliers.php:122 reporting/rep704.php:92
+#: reporting/rep704.php:102 reporting/rep704.php:110
 msgid "Accounts"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:126
+#: purchasing/manage/suppliers.php:123
 msgid "Accounts Payable Account:"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:127
+#: purchasing/manage/suppliers.php:124
 msgid "Purchase Account:"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:128
+#: purchasing/manage/suppliers.php:125
 msgid "Use Item Inventory/COGS Account"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:146 sales/manage/customer_branches.php:266
+#: purchasing/manage/suppliers.php:128 purchasing/manage/suppliers.php:157
+msgid "Contact Data"
+msgstr ""
+
+#: purchasing/manage/suppliers.php:148 sales/manage/customer_branches.php:266
 msgid "Addresses"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:147 sales/manage/customer_branches.php:267
+#: purchasing/manage/suppliers.php:149 sales/manage/customer_branches.php:267
 msgid "Mailing Address:"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:148
+#: purchasing/manage/suppliers.php:150
 msgid "Physical Address:"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:150
+#: purchasing/manage/suppliers.php:152
 msgid "General"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:151 sales/manage/customer_branches.php:269
-#: sales/manage/customers.php:251
+#: purchasing/manage/suppliers.php:153 sales/manage/customer_branches.php:269
+#: sales/manage/customers.php:286 sales/manage/customers.php.orig:283
+#: sales/manage/customers.php:287
 msgid "General Notes:"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:153
+#: purchasing/manage/suppliers.php:155
 msgid "Supplier status:"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:160
+#: purchasing/manage/suppliers.php:161
+msgid "System default"
+msgstr ""
+
+#: purchasing/manage/suppliers.php:168
 msgid "Update Supplier"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:161
+#: purchasing/manage/suppliers.php:169
 msgid "Update supplier data"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:162
+#: purchasing/manage/suppliers.php:170
 msgid "Select this supplier and return to document entry."
 msgstr ""
 
-#: purchasing/manage/suppliers.php:163
+#: purchasing/manage/suppliers.php:171
 msgid "Delete Supplier"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:164
+#: purchasing/manage/suppliers.php:172
 msgid "Delete supplier data if have been never used"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:168
+#: purchasing/manage/suppliers.php:176
 msgid "Add New Supplier Details"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:187
+#: purchasing/manage/suppliers.php:195
 msgid "The supplier name must be entered."
 msgstr ""
 
-#: purchasing/manage/suppliers.php:194
+#: purchasing/manage/suppliers.php:202
 msgid "The supplier short name must be entered."
 msgstr ""
 
-#: purchasing/manage/suppliers.php:214
+#: purchasing/manage/suppliers.php:222
 msgid "Supplier has been updated."
 msgstr ""
 
-#: purchasing/manage/suppliers.php:232
+#: purchasing/manage/suppliers.php:240
 msgid "A new supplier has been added."
 msgstr ""
 
-#: purchasing/manage/suppliers.php:250
+#: purchasing/manage/suppliers.php:258
 msgid ""
 "Cannot delete this supplier because there are transactions that refer to "
 "this supplier."
 msgstr ""
 
-#: purchasing/manage/suppliers.php:258
+#: purchasing/manage/suppliers.php:266
 msgid ""
 "Cannot delete the supplier record because purchase orders have been created "
 "against this supplier."
 msgstr ""
 
-#: purchasing/manage/suppliers.php:279
+#: purchasing/manage/suppliers.php:287
 #: purchasing/inquiry/supplier_allocation_inquiry.php:48
 msgid "Select a supplier: "
 msgstr ""
 
-#: purchasing/manage/suppliers.php:280
+#: purchasing/manage/suppliers.php:288
 msgid "New supplier"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:298 sales/manage/customer_branches.php:322
-#: sales/manage/customers.php:300
-msgid "&General settings"
+#: purchasing/manage/suppliers.php:307 sales/manage/customer_branches.php:323
+#: sales/manage/customers.php:343 sales/manage/customers.php.orig:340
+#: sales/manage/customers.php:345
+msgid "&Contacts"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:299 sales/manage/customer_branches.php:323
-#: sales/manage/customers.php:301
-msgid "&Contacts"
+#: purchasing/manage/suppliers.php:309
+msgid "Purchase &Orders"
 msgstr ""
 
-#: purchasing/inquiry/po_search_completed.php:24
+#: purchasing/inquiry/po_search_completed.php:26
 msgid "Search Purchase Orders"
 msgstr ""
 
-#: purchasing/inquiry/po_search_completed.php:60
+#: purchasing/inquiry/po_search_completed.php:63
 #: purchasing/inquiry/po_search.php:62
 #: sales/inquiry/sales_deliveries_view.php:103
-#: sales/inquiry/sales_orders_view.php:217
+#: sales/inquiry/sales_orders_view.php:225
+#: sales/inquiry/sales_orders_view.php.orig:223
 msgid "#:"
 msgstr ""
 
-#: purchasing/inquiry/po_search_completed.php:65
+#: purchasing/inquiry/po_search_completed.php:68
 msgid "into location:"
 msgstr ""
 
-#: purchasing/inquiry/po_search_completed.php:121
+#: purchasing/inquiry/po_search_completed.php:126
 #: purchasing/inquiry/po_search.php:135
-#: sales/inquiry/sales_orders_view.php:258
+#: sales/inquiry/sales_orders_view.php:267
+#: sales/inquiry/sales_orders_view.php.orig:265
 msgid "Order Date"
 msgstr ""
 
-#: purchasing/inquiry/po_search_completed.php:123
+#: purchasing/inquiry/po_search_completed.php:128
 #: purchasing/inquiry/po_search.php:137
-#: sales/inquiry/sales_orders_view.php:261
+#: sales/inquiry/sales_orders_view.php:270
+#: sales/inquiry/sales_orders_view.php.orig:268
 msgid "Order Total"
 msgstr ""
 
@@ -9738,68 +10191,92 @@ msgstr ""
 msgid "show settled:"
 msgstr ""
 
-#: purchasing/inquiry/supplier_allocation_inquiry.php:129
+#: purchasing/inquiry/supplier_allocation_inquiry.php:103
+msgid "Pay"
+msgstr ""
+
+#: purchasing/inquiry/supplier_allocation_inquiry.php:130
 msgid "Supp Reference"
 msgstr ""
 
-#: purchasing/inquiry/supplier_allocation_inquiry.php:135
+#: purchasing/inquiry/supplier_allocation_inquiry.php:136
 #: reporting/rep101.php:131 reporting/rep201.php:119
-#: reporting/includes/doctext.inc:119
-#: sales/inquiry/customer_allocation_inquiry.php:151
+#: reporting/includes/doctext.inc:225
+#: sales/inquiry/customer_allocation_inquiry.php:154
 msgid "Allocated"
 msgstr ""
 
-#: purchasing/inquiry/supplier_inquiry.php:25
+#: purchasing/inquiry/supplier_inquiry.php:27
+#: purchasing/inquiry/supplier_inquiry.php.orig:25
 msgid "Supplier Inquiry"
 msgstr ""
 
-#: purchasing/inquiry/supplier_inquiry.php:47
+#: purchasing/inquiry/supplier_inquiry.php:51
+#: purchasing/inquiry/supplier_inquiry.php.orig:47
 msgid "Select a supplier:"
 msgstr ""
 
-#: purchasing/inquiry/supplier_inquiry.php:66
-#: purchasing/inquiry/supplier_inquiry.php:67
-#: purchasing/inquiry/supplier_inquiry.php:68 reporting/rep102.php:110
-#: reporting/rep102.php:111 reporting/rep102.php:112 reporting/rep102.php:227
-#: reporting/rep202.php:112 reporting/rep202.php:113 reporting/rep202.php:114
-#: reporting/rep202.php:143 reporting/rep202.php:144 reporting/rep202.php:145
-#: reporting/rep202.php:233 reporting/includes/doctext.inc:181
-#: sales/create_recurrent_invoices.php:98
-#: sales/manage/recurrent_invoices.php:85
-#: sales/inquiry/customer_inquiry.php:71 sales/inquiry/customer_inquiry.php:72
-#: sales/inquiry/customer_inquiry.php:73
+#: purchasing/inquiry/supplier_inquiry.php:70
+#: purchasing/inquiry/supplier_inquiry.php:71
+#: purchasing/inquiry/supplier_inquiry.php:72
+#: purchasing/inquiry/supplier_inquiry.php.orig:66
+#: purchasing/inquiry/supplier_inquiry.php.orig:67
+#: purchasing/inquiry/supplier_inquiry.php.orig:68 reporting/rep102.php:118
+#: reporting/rep102.php:119 reporting/rep102.php:120 reporting/rep102.php:240
+#: reporting/rep108.php:150 reporting/rep108.php:151 reporting/rep108.php:152
+#: reporting/rep202.php:122 reporting/rep202.php:123 reporting/rep202.php:124
+#: reporting/rep202.php:154 reporting/rep202.php:155 reporting/rep202.php:156
+#: reporting/rep202.php:248 sales/create_recurrent_invoices.php:115
+#: sales/manage/recurrent_invoices.php:102
+#: sales/inquiry/customer_inquiry.php:75 sales/inquiry/customer_inquiry.php:76
+#: sales/inquiry/customer_inquiry.php:77
+#: sales/inquiry/customer_inquiry.php.orig:75
+#: sales/inquiry/customer_inquiry.php.orig:76
+#: sales/inquiry/customer_inquiry.php.orig:77
+#: sales/create_recurrent_invoices.php:132
 msgid "Days"
 msgstr ""
 
-#: purchasing/inquiry/supplier_inquiry.php:68 reporting/rep102.php:112
-#: reporting/rep202.php:114 reporting/rep202.php:145
-#: reporting/includes/doctext.inc:182 sales/inquiry/customer_inquiry.php:73
+#: purchasing/inquiry/supplier_inquiry.php:72
+#: purchasing/inquiry/supplier_inquiry.php.orig:68 reporting/rep102.php:120
+#: reporting/rep108.php:152 reporting/rep202.php:124 reporting/rep202.php:156
+#: sales/inquiry/customer_inquiry.php:77
+#: sales/inquiry/customer_inquiry.php.orig:77
 msgid "Over"
 msgstr ""
 
-#: purchasing/inquiry/supplier_inquiry.php:72
-#: sales/inquiry/customer_inquiry.php:76
+#: purchasing/inquiry/supplier_inquiry.php:76
+#: purchasing/inquiry/supplier_inquiry.php.orig:72
+#: sales/inquiry/customer_inquiry.php:80
+#: sales/inquiry/customer_inquiry.php.orig:80
 msgid "Terms"
 msgstr ""
 
-#: purchasing/inquiry/supplier_inquiry.php:72 reporting/rep102.php:115
-#: reporting/rep102.php:225 reporting/rep202.php:118 reporting/rep202.php:231
-#: reporting/includes/doctext.inc:177 sales/inquiry/customer_inquiry.php:76
+#: purchasing/inquiry/supplier_inquiry.php:76
+#: purchasing/inquiry/supplier_inquiry.php.orig:72 reporting/rep102.php:123
+#: reporting/rep102.php:238 reporting/rep108.php:154 reporting/rep202.php:128
+#: reporting/rep202.php:246 sales/inquiry/customer_inquiry.php:80
+#: sales/inquiry/customer_inquiry.php.orig:80
 msgid "Current"
 msgstr ""
 
-#: purchasing/inquiry/supplier_inquiry.php:73 reporting/rep102.php:116
-#: reporting/rep202.php:119 reporting/includes/doctext.inc:178
-#: sales/inquiry/customer_inquiry.php:77
+#: purchasing/inquiry/supplier_inquiry.php:77
+#: purchasing/inquiry/supplier_inquiry.php.orig:73 reporting/rep102.php:124
+#: reporting/rep108.php:154 reporting/rep202.php:129
+#: sales/inquiry/customer_inquiry.php:81
+#: sales/inquiry/customer_inquiry.php.orig:81
 msgid "Total Balance"
 msgstr ""
 
-#: purchasing/inquiry/supplier_inquiry.php:127
-#: sales/inquiry/customer_inquiry.php:158
+#: purchasing/inquiry/supplier_inquiry.php:133
+#: purchasing/inquiry/supplier_inquiry.php.orig:127
+#: sales/inquiry/customer_inquiry.php:164
+#: sales/inquiry/customer_inquiry.php.orig:164
 msgid "Credit This"
 msgstr ""
 
-#: purchasing/inquiry/supplier_inquiry.php:149
+#: purchasing/inquiry/supplier_inquiry.php:155
+#: purchasing/inquiry/supplier_inquiry.php.orig:149
 msgid "Print Remittance"
 msgstr ""
 
@@ -9868,32 +10345,32 @@ msgstr ""
 msgid "Marked items are settled."
 msgstr ""
 
-#: reporting/rep101.php:120 reporting/rep102.php:100 reporting/rep202.php:102
-#: reporting/rep203.php:81
+#: reporting/rep101.php:120 reporting/rep102.php:106 reporting/rep114.php:103
+#: reporting/rep202.php:110 reporting/rep203.php:81
 msgid "Balances in Home Currency"
 msgstr ""
 
 #: reporting/rep101.php:130 reporting/rep201.php:118 reporting/rep203.php:91
-#: reporting/rep709.php:107 reporting/includes/doctext.inc:110
-#: reporting/includes/doctext.inc:118
+#: reporting/rep709.php:109 reporting/includes/doctext.inc:145
+#: reporting/includes/doctext.inc:186 reporting/includes/doctext.inc:224
 msgid "Trans Type"
 msgstr ""
 
 #: reporting/rep101.php:130 reporting/rep201.php:118
-#: reporting/includes/doctext.inc:118
+#: reporting/includes/doctext.inc:224
 msgid "Charges"
 msgstr ""
 
 #: reporting/rep101.php:130 reporting/rep201.php:119
-#: reporting/includes/doctext.inc:119
+#: reporting/includes/doctext.inc:225
 msgid "Credits"
 msgstr ""
 
-#: reporting/rep101.php:139 reporting/rep102.php:125 reporting/rep201.php:127
-#: reporting/rep202.php:128 reporting/rep203.php:100 reporting/rep303.php:124
-#: reporting/reports_main.php:38 reporting/reports_main.php:46
-#: reporting/reports_main.php:125 reporting/reports_main.php:133
-#: reporting/reports_main.php:141 reporting/reports_main.php:180
+#: reporting/rep101.php:139 reporting/rep102.php:134 reporting/rep201.php:127
+#: reporting/rep202.php:139 reporting/rep203.php:100 reporting/rep303.php:124
+#: reporting/reports_main.php:38 reporting/reports_main.php:47
+#: reporting/reports_main.php:138 reporting/reports_main.php:147
+#: reporting/reports_main.php:155 reporting/reports_main.php:195
 msgid "Suppress Zeros"
 msgstr ""
 
@@ -9901,42 +10378,49 @@ msgstr ""
 msgid "Customer Balances"
 msgstr ""
 
-#: reporting/rep101.php:244 reporting/rep102.php:211 reporting/rep106.php:177
-#: reporting/rep201.php:231 reporting/rep202.php:216 reporting/rep203.php:177
-#: reporting/rep204.php:144 reporting/rep301.php:172 reporting/rep304.php:193
-#: reporting/rep305.php:181
+#: reporting/rep101.php:244 reporting/rep102.php:224 reporting/rep106.php:167
+#: reporting/rep201.php:231 reporting/rep202.php:231 reporting/rep203.php:177
+#: reporting/rep204.php:144 reporting/rep301.php:176 reporting/rep304.php:191
+#: reporting/rep305.php:181 reporting/rep305.php:183
 msgid "Grand Total"
 msgstr ""
 
-#: reporting/rep102.php:94 reporting/rep106.php:91 reporting/rep202.php:96
-#: reporting/rep709.php:91 reporting/reports_main.php:45
-#: reporting/reports_main.php:77 reporting/reports_main.php:132
-#: reporting/reports_main.php:166 reporting/reports_main.php:378
+#: reporting/rep102.php:100 reporting/rep106.php:91 reporting/rep202.php:104
+#: reporting/rep709.php:93 reporting/reports_main.php:46
+#: reporting/reports_main.php:84 reporting/reports_main.php:146
+#: reporting/reports_main.php:181 reporting/reports_main.php:393
 msgid "Summary Only"
 msgstr ""
 
-#: reporting/rep102.php:96 reporting/rep202.php:98 reporting/rep709.php:93
+#: reporting/rep102.php:102 reporting/rep202.php:106 reporting/rep709.php:95
 msgid "Detailed Report"
 msgstr ""
 
-#: reporting/rep102.php:121 reporting/rep202.php:124 reporting/rep203.php:97
-#: reporting/reports_main.php:35 reporting/reports_main.php:42
-#: reporting/reports_main.php:68 reporting/reports_main.php:76
-#: reporting/reports_main.php:122 reporting/reports_main.php:129
-#: reporting/reports_main.php:138 reporting/reports_main.php:185
-#: reporting/reports_main.php:193 reporting/reports_main.php:225
-#: reporting/reports_main.php:236 reporting/reports_main.php:247
-#: reporting/reports_main.php:263 reporting/reports_main.php:273
-#: reporting/reports_main.php:284 reporting/reports_main.php:296
-#: reporting/reports_main.php:310 reporting/reports_main.php:319
-#: reporting/reports_main.php:329 reporting/reports_main.php:340
-#: reporting/reports_main.php:352 reporting/reports_main.php:360
-#: reporting/reports_main.php:369 reporting/reports_main.php:377
-#: reporting/reports_main.php:383
+#: reporting/rep102.php:129 reporting/rep202.php:134 reporting/rep203.php:97
+#: reporting/rep301.php:108 reporting/reports_main.php:35
+#: reporting/reports_main.php:42 reporting/reports_main.php:61
+#: reporting/reports_main.php:75 reporting/reports_main.php:83
+#: reporting/reports_main.php:135 reporting/reports_main.php:142
+#: reporting/reports_main.php:152 reporting/reports_main.php:178
+#: reporting/reports_main.php:200 reporting/reports_main.php:208
+#: reporting/reports_main.php:240 reporting/reports_main.php:251
+#: reporting/reports_main.php:262 reporting/reports_main.php:278
+#: reporting/reports_main.php:288 reporting/reports_main.php:299
+#: reporting/reports_main.php:311 reporting/reports_main.php:325
+#: reporting/reports_main.php:334 reporting/reports_main.php:344
+#: reporting/reports_main.php:355 reporting/reports_main.php:367
+#: reporting/reports_main.php:375 reporting/reports_main.php:384
+#: reporting/reports_main.php:392 reporting/reports_main.php:398
 msgid "End Date"
 msgstr ""
 
-#: reporting/rep102.php:129
+#: reporting/rep102.php:133 reporting/rep202.php:138
+#: reporting/reports_main.php:45 reporting/reports_main.php:110
+#: reporting/reports_main.php:145
+msgid "Show Also Allocated"
+msgstr ""
+
+#: reporting/rep102.php:138
 msgid "Aged Customer Analysis"
 msgstr ""
 
@@ -9972,16 +10456,16 @@ msgstr ""
 msgid "Branch Delivery Address"
 msgstr ""
 
-#: reporting/rep103.php:142 reporting/reports_main.php:51
+#: reporting/rep103.php:142 reporting/reports_main.php:52
 msgid "Activity Since"
 msgstr ""
 
-#: reporting/rep103.php:143 reporting/reports_main.php:52
+#: reporting/rep103.php:143 reporting/reports_main.php:53
 #: sales/manage/sales_areas.php:16
 msgid "Sales Areas"
 msgstr ""
 
-#: reporting/rep103.php:144 reporting/reports_main.php:53
+#: reporting/rep103.php:144 reporting/reports_main.php:54
 msgid "Sales Folk"
 msgstr ""
 
@@ -9997,7 +10481,7 @@ msgstr ""
 msgid "Customers in"
 msgstr ""
 
-#: reporting/rep103.php:196 sales/includes/ui/sales_order_ui.inc:413
+#: reporting/rep103.php:196
 msgid "Price List"
 msgstr ""
 
@@ -10013,7 +10497,7 @@ msgstr ""
 msgid "Category/Items"
 msgstr ""
 
-#: reporting/rep104.php:109 reporting/rep301.php:100 reporting/rep303.php:109
+#: reporting/rep104.php:109 reporting/rep301.php:103 reporting/rep303.php:109
 #: reporting/rep303.php:115
 msgid "UOM"
 msgstr ""
@@ -10022,7 +10506,7 @@ msgstr ""
 msgid "GP %"
 msgstr ""
 
-#: reporting/rep104.php:117 reporting/reports_main.php:63
+#: reporting/rep104.php:117 reporting/reports_main.php:70
 msgid "Show GP %"
 msgstr ""
 
@@ -10038,24 +10522,33 @@ msgstr ""
 msgid "All Orders"
 msgstr ""
 
-#: reporting/rep105.php:103 reporting/reports_main.php:71
+#: reporting/rep105.php:103 reporting/reports_main.php:78
 msgid "Back Orders Only"
 msgstr ""
 
 #: reporting/rep105.php:107 reporting/rep204.php:82
-#: sales/inquiry/customer_allocation_inquiry.php:144
-#: sales/inquiry/customer_inquiry.php:214
+#: sales/inquiry/customer_allocation_inquiry.php:147
+#: sales/inquiry/customer_inquiry.php:226
+#: sales/inquiry/customer_inquiry.php.orig:226
 msgid "Order"
 msgstr ""
 
-#: reporting/rep105.php:107 reporting/rep106.php:81
-#: reporting/includes/doctext.inc:165 sales/create_recurrent_invoices.php:98
-#: sales/customer_credit_invoice.php:236 sales/customer_delivery.php:336
-#: sales/customer_invoice.php:373 sales/manage/recurrent_invoices.php:85
-#: sales/view/view_credit.php:58 sales/inquiry/customer_inquiry.php:219
+#: reporting/rep105.php:107 reporting/rep106.php:81 reporting/rep112.php:176
+#: sales/create_recurrent_invoices.php:115
+#: sales/customer_credit_invoice.php:238 sales/customer_delivery.php:339
+#: sales/customer_invoice.php:379 sales/manage/customers.php:251
+#: sales/manage/customers.php:289 sales/manage/customers.php.orig:248
+#: sales/manage/customers.php.orig:286 sales/manage/recurrent_invoices.php:102
+#: sales/view/view_credit.php:58 sales/inquiry/customer_inquiry.php:231
+#: sales/inquiry/customer_inquiry.php.orig:231
 #: sales/inquiry/sales_deliveries_view.php:182
-#: sales/inquiry/sales_orders_view.php:256
-#: sales/inquiry/sales_orders_view.php:270
+#: sales/inquiry/sales_orders_view.php:265
+#: sales/inquiry/sales_orders_view.php:279
+#: sales/inquiry/sales_orders_view.php.orig:263
+#: sales/inquiry/sales_orders_view.php.orig:277
+#: sales/create_recurrent_invoices.php:132
+#: sales/customer_credit_invoice.php:236 sales/customer_invoice.php:381
+#: sales/manage/customers.php:290
 msgid "Branch"
 msgstr ""
 
@@ -10075,8 +10568,8 @@ msgstr ""
 msgid "Loc"
 msgstr ""
 
-#: reporting/rep105.php:112 sales/customer_delivery.php:429
-#: sales/customer_invoice.php:446
+#: reporting/rep105.php:112 sales/customer_delivery.php:432
+#: sales/customer_invoice.php:467 sales/customer_invoice.php:469
 msgid "Invoiced"
 msgstr ""
 
@@ -10102,7 +10595,7 @@ msgstr ""
 msgid "Salesman"
 msgstr ""
 
-#: reporting/rep106.php:86 reporting/includes/header2.inc:98
+#: reporting/rep106.php:86 reporting/includes/header2.inc:110
 #: sales/manage/sales_people.php:99
 msgid "Email"
 msgstr ""
@@ -10115,55 +10608,135 @@ msgstr ""
 msgid "Salesman Listing"
 msgstr ""
 
-#: reporting/rep107.php:66 reporting/rep107.php:91 reporting/rep107.php:96
-#: reporting/includes/doctext.inc:94
+#: reporting/rep107.php:66 reporting/rep107.php:89 reporting/rep107.php:94
+#: reporting/includes/doctext.inc:105
 msgid "INVOICE"
 msgstr ""
 
+#: reporting/rep107.php:151 reporting/rep109.php:154 reporting/rep110.php:164
+#: reporting/rep111.php:141 reporting/rep113.php:150
+#: sales/view/view_credit.php:138 sales/view/view_dispatch.php:155
+#: sales/view/view_invoice.php:157 sales/view/view_sales_order.php:227
+#: sales/includes/ui/sales_credit_ui.inc:222
+msgid "Shipping"
+msgstr ""
+
 #: reporting/rep108.php:84 reporting/rep108.php:115
-#: reporting/includes/doctext.inc:117
+#: reporting/includes/doctext.inc:216
 msgid "STATEMENT"
 msgstr ""
 
+#: reporting/rep108.php:126
+msgid "Outstanding Transactions"
+msgstr ""
+
+#: reporting/rep108.php:169
+msgid "Statement"
+msgstr ""
+
+#: reporting/rep108.php:169
+msgid "as of"
+msgstr ""
+
 #: reporting/rep109.php:65 reporting/rep109.php:93 reporting/rep109.php:99
-#: reporting/includes/doctext.inc:92
+#: reporting/includes/doctext.inc:53
 msgid "SALES ORDER"
 msgstr ""
 
 #: reporting/rep109.php:67 reporting/rep109.php:88 reporting/rep109.php:99
-#: reporting/includes/doctext.inc:92
+#: reporting/includes/doctext.inc:53
 msgid "QUOTE"
 msgstr ""
 
+#: reporting/rep109.php:160 reporting/rep111.php:147
+msgid "TOTAL ORDER EX VAT"
+msgstr ""
+
+#: reporting/rep109.php:206 reporting/rep111.php:193
+msgid "TOTAL ORDER VAT INCL."
+msgstr ""
+
 #: reporting/rep110.php:68
 msgid "DELIVERY"
 msgstr ""
 
 #: reporting/rep110.php:70 reporting/rep110.php:97
-#: reporting/includes/doctext.inc:90
+#: reporting/includes/doctext.inc:70
 msgid "PACKING SLIP"
 msgstr ""
 
 #: reporting/rep110.php:92 reporting/rep110.php:103
-#: reporting/includes/doctext.inc:90
+#: reporting/includes/doctext.inc:70
 msgid "DELIVERY NOTE"
 msgstr ""
 
-#: reporting/rep111.php:60 reporting/rep111.php:85
-#: reporting/includes/doctext.inc:86
+#: reporting/rep110.php:208
+msgid "TOTAL DELIVERY INCL. VAT"
+msgstr ""
+
+#: reporting/rep111.php:61 reporting/rep111.php:86
+#: reporting/includes/doctext.inc:38
 msgid "SALES QUOTATION"
 msgstr ""
 
-#: reporting/rep112.php:92 reporting/rep112.php:112
-#: reporting/includes/doctext.inc:100
+#: reporting/rep112.php:92 reporting/rep112.php:113
+#: reporting/includes/doctext.inc:176
 msgid "RECEIPT"
 msgstr ""
 
+#: reporting/rep112.php:122 reporting/rep210.php:136
+msgid "As advance / full / part / payment towards:"
+msgstr ""
+
+#: reporting/rep112.php:157
+msgid "TOTAL RECEIPT"
+msgstr ""
+
+#: reporting/rep112.php:167
+msgid "Received / Sign"
+msgstr ""
+
+#: reporting/rep112.php:169
+msgid "By Cash / Cheque* / Draft No."
+msgstr ""
+
+#: reporting/rep112.php:171
+msgid "Dated"
+msgstr ""
+
+#: reporting/rep112.php:174
+msgid "Drawn on Bank"
+msgstr ""
+
 #: reporting/rep113.php:66 reporting/rep113.php:91 reporting/rep113.php:96
-#: reporting/includes/doctext.inc:102
+#: reporting/includes/doctext.inc:91
 msgid "CREDIT NOTE"
 msgstr ""
 
+#: reporting/rep113.php:194 sales/view/view_credit.php:143
+msgid "TOTAL CREDIT"
+msgstr ""
+
+#: reporting/rep114.php:85
+msgid "Sales Summary Report"
+msgstr ""
+
+#: reporting/rep114.php:89 reporting/reports_main.php:62
+msgid "Tax Id Only"
+msgstr ""
+
+#: reporting/rep114.php:93
+msgid "Tax Id"
+msgstr ""
+
+#: reporting/rep114.php:93
+msgid "Total ex. Tax"
+msgstr ""
+
+#: reporting/rep114.php:93 reporting/rep709.php:110 taxes/tax_groups.php:177
+msgid "Tax"
+msgstr ""
+
 #: reporting/rep201.php:108
 msgid "Balances in Home currency"
 msgstr ""
@@ -10172,11 +10745,11 @@ msgstr ""
 msgid "Supplier Balances"
 msgstr ""
 
-#: reporting/rep202.php:131
+#: reporting/rep202.php:142
 msgid "currency"
 msgstr ""
 
-#: reporting/rep202.php:132
+#: reporting/rep202.php:143
 msgid "Aged Supplier Analysis"
 msgstr ""
 
@@ -10201,16 +10774,24 @@ msgid "Outstanding GRNs Report"
 msgstr ""
 
 #: reporting/rep209.php:88 reporting/rep209.php:107 reporting/rep209.php:112
-#: reporting/includes/doctext.inc:88
+#: reporting/includes/doctext.inc:149
 msgid "PURCHASE ORDER"
 msgstr ""
 
-#: reporting/rep210.php:94 reporting/rep210.php:121 reporting/rep210.php:126
-#: reporting/includes/doctext.inc:98
+#: reporting/rep209.php:211
+msgid "TOTAL PO"
+msgstr ""
+
+#: reporting/rep210.php:94 reporting/rep210.php:122 reporting/rep210.php:127
+#: reporting/includes/doctext.inc:129
 msgid "REMITTANCE"
 msgstr ""
 
-#: reporting/rep301.php:108
+#: reporting/rep210.php:171
+msgid "TOTAL REMITTANCE"
+msgstr ""
+
+#: reporting/rep301.php:112
 msgid "Inventory Valuation Report"
 msgstr ""
 
@@ -10239,6 +10820,7 @@ msgid "Shortage"
 msgstr ""
 
 #: reporting/rep303.php:109 reporting/rep303.php:115 reporting/rep305.php:95
+#: reporting/rep305.php:98
 msgid "Stock ID"
 msgstr ""
 
@@ -10254,44 +10836,45 @@ msgstr ""
 msgid "Stock Check Sheets"
 msgstr ""
 
-#: reporting/rep304.php:114 reporting/rep305.php:95
+#: reporting/rep304.php:112 reporting/rep305.php:95 reporting/rep305.php:98
 msgid "Qty"
 msgstr ""
 
-#: reporting/rep304.php:114 sales/manage/customer_branches.php:240
-#: sales/manage/customers.php:224
+#: reporting/rep304.php:112 sales/manage/customer_branches.php:240
+#: sales/manage/customers.php:259 sales/manage/customers.php.orig:256
+#: sales/manage/customers.php:260
 msgid "Sales"
 msgstr ""
 
-#: reporting/rep304.php:114
+#: reporting/rep304.php:112
 msgid "Cost"
 msgstr ""
 
-#: reporting/rep304.php:114
+#: reporting/rep304.php:112
 msgid "Contribution"
 msgstr ""
 
-#: reporting/rep304.php:126
+#: reporting/rep304.php:124
 msgid "Inventory Sales Report"
 msgstr ""
 
-#: reporting/rep305.php:95
+#: reporting/rep305.php:95 reporting/rep305.php:98
 msgid "PO No"
 msgstr ""
 
-#: reporting/rep305.php:95
+#: reporting/rep305.php:95 reporting/rep305.php:98
 msgid "Inv"
 msgstr ""
 
-#: reporting/rep305.php:95
+#: reporting/rep305.php:95 reporting/rep305.php:98
 msgid "Inv Price"
 msgstr ""
 
-#: reporting/rep305.php:95
+#: reporting/rep305.php:95 reporting/rep305.php:98
 msgid "PO Price"
 msgstr ""
 
-#: reporting/rep305.php:102
+#: reporting/rep305.php:102 reporting/rep305.php:105
 msgid "GRN Valuation Report"
 msgstr ""
 
@@ -10303,19 +10886,15 @@ msgstr ""
 msgid "Bill of Material Listing"
 msgstr ""
 
-#: reporting/rep409.php:60 reporting/rep409.php:79 reporting/rep409.php:84
-#: reporting/includes/doctext.inc:96
+#: reporting/rep409.php:58 reporting/rep409.php:77 reporting/rep409.php:82
+#: reporting/includes/doctext.inc:192
 msgid "WORK ORDER"
 msgstr ""
 
-#: reporting/rep409.php:134
+#: reporting/rep409.php:132
 msgid "Insufficient stock"
 msgstr ""
 
-#: reporting/rep409.php:147 reporting/includes/doctext.inc:138
-msgid "Work Order No."
-msgstr ""
-
 #: reporting/rep501.php:85
 msgid "YTD"
 msgstr ""
@@ -10324,7 +10903,7 @@ msgstr ""
 msgid "Dimension Summary"
 msgstr ""
 
-#: reporting/rep601.php:83 reporting/includes/doctext.inc:72
+#: reporting/rep601.php:83 reporting/includes/doctext.inc:247
 msgid "Bank Account"
 msgstr ""
 
@@ -10352,13 +10931,13 @@ msgstr ""
 msgid "List of Journal Entries"
 msgstr ""
 
-#: reporting/rep704.php:66
+#: reporting/rep704.php:67
 msgid "GL Account Transactions"
 msgstr ""
 
 #: reporting/rep705.php:243 reporting/rep705.php:256 reporting/rep705.php:267
-#: reporting/reports_main.php:255 reporting/reports_main.php:303
-#: reporting/reports_main.php:346
+#: reporting/reports_main.php:270 reporting/reports_main.php:318
+#: reporting/reports_main.php:361
 msgid "Year"
 msgstr ""
 
@@ -10380,47 +10959,31 @@ msgstr ""
 msgid "Close Balance"
 msgstr ""
 
-#: reporting/rep706.php:302 reporting/rep707.php:320
-#: sales/create_recurrent_invoices.php:98
-#: sales/manage/recurrent_invoices.php:85
-msgid "Group"
-msgstr ""
-
 #: reporting/rep707.php:254
 msgid "Profit and Loss Statement"
 msgstr ""
 
-#: reporting/rep708.php:212
-msgid ""
-"The Opening Balance is not in balance, probably due to a non closed Previous "
-"Fiscalyear."
-msgstr ""
-
-#: reporting/rep709.php:89
+#: reporting/rep709.php:91
 msgid "Tax Report"
 msgstr ""
 
-#: reporting/rep709.php:107
+#: reporting/rep709.php:109
 msgid "Branch Name"
 msgstr ""
 
-#: reporting/rep709.php:108
+#: reporting/rep709.php:110
 msgid "Net"
 msgstr ""
 
-#: reporting/rep709.php:108 taxes/item_tax_types.php:185
+#: reporting/rep709.php:110 taxes/item_tax_types.php:185
 msgid "Rate"
 msgstr ""
 
-#: reporting/rep709.php:108 taxes/tax_groups.php:214
-msgid "Tax"
-msgstr ""
-
-#: reporting/rep709.php:168
+#: reporting/rep709.php:172 reporting/rep709.php:176
 msgid "Tax Rate"
 msgstr ""
 
-#: reporting/rep709.php:168
+#: reporting/rep709.php:172 reporting/rep709.php:176
 msgid "Net Tax"
 msgstr ""
 
@@ -10436,7 +10999,7 @@ msgstr ""
 msgid "Action"
 msgstr ""
 
-#: reporting/rep710.php:87 reporting/reports_main.php:381
+#: reporting/rep710.php:87 reporting/reports_main.php:396
 msgid "Audit Trail"
 msgstr ""
 
@@ -10453,34 +11016,34 @@ msgid "Customer &Balances"
 msgstr ""
 
 #: reporting/reports_main.php:37 reporting/reports_main.php:44
-#: reporting/reports_main.php:59 reporting/reports_main.php:83
-#: reporting/reports_main.php:90 reporting/reports_main.php:102
-#: reporting/reports_main.php:109 reporting/reports_main.php:116
-#: reporting/reports_main.php:124 reporting/reports_main.php:131
-#: reporting/reports_main.php:140 reporting/reports_main.php:151
-#: reporting/reports_main.php:157
+#: reporting/reports_main.php:66 reporting/reports_main.php:90
+#: reporting/reports_main.php:97 reporting/reports_main.php:109
+#: reporting/reports_main.php:116 reporting/reports_main.php:123
+#: reporting/reports_main.php:129 reporting/reports_main.php:137
+#: reporting/reports_main.php:144 reporting/reports_main.php:154
+#: reporting/reports_main.php:165 reporting/reports_main.php:171
 msgid "Currency Filter"
 msgstr ""
 
-#: reporting/reports_main.php:40 reporting/reports_main.php:49
-#: reporting/reports_main.php:57 reporting/reports_main.php:65
-#: reporting/reports_main.php:73 reporting/reports_main.php:79
-#: reporting/reports_main.php:127 reporting/reports_main.php:136
-#: reporting/reports_main.php:143 reporting/reports_main.php:147
-#: reporting/reports_main.php:168 reporting/reports_main.php:173
-#: reporting/reports_main.php:182 reporting/reports_main.php:190
-#: reporting/reports_main.php:195 reporting/reports_main.php:202
-#: reporting/reports_main.php:216 reporting/reports_main.php:227
-#: reporting/reports_main.php:233 reporting/reports_main.php:239
-#: reporting/reports_main.php:253 reporting/reports_main.php:260
-#: reporting/reports_main.php:270 reporting/reports_main.php:281
-#: reporting/reports_main.php:290 reporting/reports_main.php:301
-#: reporting/reports_main.php:307 reporting/reports_main.php:316
-#: reporting/reports_main.php:326 reporting/reports_main.php:334
-#: reporting/reports_main.php:344 reporting/reports_main.php:349
-#: reporting/reports_main.php:357 reporting/reports_main.php:366
-#: reporting/reports_main.php:373 reporting/reports_main.php:380
-#: reporting/reports_main.php:387
+#: reporting/reports_main.php:40 reporting/reports_main.php:50
+#: reporting/reports_main.php:58 reporting/reports_main.php:64
+#: reporting/reports_main.php:72 reporting/reports_main.php:80
+#: reporting/reports_main.php:86 reporting/reports_main.php:140
+#: reporting/reports_main.php:150 reporting/reports_main.php:157
+#: reporting/reports_main.php:161 reporting/reports_main.php:183
+#: reporting/reports_main.php:188 reporting/reports_main.php:197
+#: reporting/reports_main.php:205 reporting/reports_main.php:210
+#: reporting/reports_main.php:217 reporting/reports_main.php:231
+#: reporting/reports_main.php:242 reporting/reports_main.php:248
+#: reporting/reports_main.php:254 reporting/reports_main.php:268
+#: reporting/reports_main.php:275 reporting/reports_main.php:285
+#: reporting/reports_main.php:296 reporting/reports_main.php:305
+#: reporting/reports_main.php:316 reporting/reports_main.php:322
+#: reporting/reports_main.php:331 reporting/reports_main.php:341
+#: reporting/reports_main.php:349 reporting/reports_main.php:359
+#: reporting/reports_main.php:364 reporting/reports_main.php:372
+#: reporting/reports_main.php:381 reporting/reports_main.php:388
+#: reporting/reports_main.php:395 reporting/reports_main.php:402
 msgid "Destination"
 msgstr ""
 
@@ -10488,474 +11051,407 @@ msgstr ""
 msgid "&Aged Customer Analysis"
 msgstr ""
 
-#: reporting/reports_main.php:47 reporting/reports_main.php:134
-#: reporting/reports_main.php:268 reporting/reports_main.php:279
-#: reporting/reports_main.php:314 reporting/reports_main.php:324
-#: reporting/reports_main.php:355 reporting/reports_main.php:364
+#: reporting/reports_main.php:48 reporting/reports_main.php:148
+#: reporting/reports_main.php:283 reporting/reports_main.php:294
+#: reporting/reports_main.php:329 reporting/reports_main.php:339
+#: reporting/reports_main.php:370 reporting/reports_main.php:379
 msgid "Graphics"
 msgstr ""
 
-#: reporting/reports_main.php:50
+#: reporting/reports_main.php:51
 msgid "Customer &Detail Listing"
 msgstr ""
 
-#: reporting/reports_main.php:54
+#: reporting/reports_main.php:55
 msgid "Activity Greater Than"
 msgstr ""
 
-#: reporting/reports_main.php:55
+#: reporting/reports_main.php:56
 msgid "Activity Less Than"
 msgstr ""
 
-#: reporting/reports_main.php:58
+#: reporting/reports_main.php:59
+msgid "Sales &Summary Report"
+msgstr ""
+
+#: reporting/reports_main.php:65
 msgid "&Price Listing"
 msgstr ""
 
-#: reporting/reports_main.php:60 reporting/reports_main.php:69
-#: reporting/reports_main.php:164 reporting/reports_main.php:170
-#: reporting/reports_main.php:175 reporting/reports_main.php:186
+#: reporting/reports_main.php:67 reporting/reports_main.php:76
+#: reporting/reports_main.php:179 reporting/reports_main.php:185
+#: reporting/reports_main.php:190 reporting/reports_main.php:201
 msgid "Inventory Category"
 msgstr ""
 
-#: reporting/reports_main.php:61 sales/manage/sales_types.php:16
+#: reporting/reports_main.php:68 sales/manage/sales_types.php:16
 msgid "Sales Types"
 msgstr ""
 
-#: reporting/reports_main.php:62 reporting/reports_main.php:177
+#: reporting/reports_main.php:69 reporting/reports_main.php:192
 msgid "Show Pictures"
 msgstr ""
 
-#: reporting/reports_main.php:66
+#: reporting/reports_main.php:73
 msgid "&Order Status Listing"
 msgstr ""
 
-#: reporting/reports_main.php:70
+#: reporting/reports_main.php:77
 msgid "Stock Location"
 msgstr ""
 
-#: reporting/reports_main.php:74
+#: reporting/reports_main.php:81
 msgid "&Salesman Listing"
 msgstr ""
 
-#: reporting/reports_main.php:80
+#: reporting/reports_main.php:87
 msgid "Print &Invoices"
 msgstr ""
 
-#: reporting/reports_main.php:84 reporting/reports_main.php:91
-#: reporting/reports_main.php:97
+#: reporting/reports_main.php:91 reporting/reports_main.php:98
+#: reporting/reports_main.php:104
 msgid "email Customers"
 msgstr ""
 
-#: reporting/reports_main.php:85 reporting/reports_main.php:92
+#: reporting/reports_main.php:92 reporting/reports_main.php:99
 msgid "Payment Link"
 msgstr ""
 
-#: reporting/reports_main.php:87
+#: reporting/reports_main.php:94
 msgid "Print &Credit Notes"
 msgstr ""
 
-#: reporting/reports_main.php:94
+#: reporting/reports_main.php:101
 msgid "Print &Deliveries"
 msgstr ""
 
-#: reporting/reports_main.php:98
+#: reporting/reports_main.php:105
 msgid "Print as Packing Slip"
 msgstr ""
 
-#: reporting/reports_main.php:100
+#: reporting/reports_main.php:107
 msgid "Print &Statements"
 msgstr ""
 
-#: reporting/reports_main.php:103
-msgid "Show Outstanding Only"
-msgstr ""
-
-#: reporting/reports_main.php:104 reporting/reports_main.php:110
-#: reporting/reports_main.php:152 reporting/reports_main.php:158
+#: reporting/reports_main.php:111 reporting/reports_main.php:117
+#: reporting/reports_main.php:124 reporting/reports_main.php:166
+#: reporting/reports_main.php:172
 msgid "Email Customers"
 msgstr ""
 
-#: reporting/reports_main.php:106
+#: reporting/reports_main.php:113
 msgid "&Print Sales Orders"
 msgstr ""
 
-#: reporting/reports_main.php:111
+#: reporting/reports_main.php:118
 msgid "Print as Quote"
 msgstr ""
 
-#: reporting/reports_main.php:113
+#: reporting/reports_main.php:120
+msgid "&Print Sales Quotations"
+msgstr ""
+
+#: reporting/reports_main.php:126
 msgid "Print Receipts"
 msgstr ""
 
-#: reporting/reports_main.php:120
+#: reporting/reports_main.php:133
 msgid "Supplier &Balances"
 msgstr ""
 
-#: reporting/reports_main.php:128
+#: reporting/reports_main.php:141
 msgid "&Aged Supplier Analyses"
 msgstr ""
 
-#: reporting/reports_main.php:137
+#: reporting/reports_main.php:151
 msgid "&Payment Report"
 msgstr ""
 
-#: reporting/reports_main.php:144
+#: reporting/reports_main.php:158
 msgid "Outstanding &GRNs Report"
 msgstr ""
 
-#: reporting/reports_main.php:148
+#: reporting/reports_main.php:162
 msgid "Print Purchase &Orders"
 msgstr ""
 
-#: reporting/reports_main.php:154
+#: reporting/reports_main.php:168
 msgid "Print Remittances"
 msgstr ""
 
-#: reporting/reports_main.php:163
+#: reporting/reports_main.php:177
 msgid "Inventory &Valuation Report"
 msgstr ""
 
-#: reporting/reports_main.php:169
+#: reporting/reports_main.php:184
 msgid "Inventory &Planning Report"
 msgstr ""
 
-#: reporting/reports_main.php:174
+#: reporting/reports_main.php:189
 msgid "Stock &Check Sheets"
 msgstr ""
 
-#: reporting/reports_main.php:178
+#: reporting/reports_main.php:193
 msgid "Inventory Column"
 msgstr ""
 
-#: reporting/reports_main.php:179
+#: reporting/reports_main.php:194
 msgid "Show Shortage"
 msgstr ""
 
-#: reporting/reports_main.php:183
+#: reporting/reports_main.php:198
 msgid "Inventory &Sales Report"
 msgstr ""
 
-#: reporting/reports_main.php:191
+#: reporting/reports_main.php:206
 msgid "&GRN Valuation Report"
 msgstr ""
 
-#: reporting/reports_main.php:197
+#: reporting/reports_main.php:212
 msgid "Manufacturing"
 msgstr ""
 
-#: reporting/reports_main.php:198
+#: reporting/reports_main.php:213
 msgid "&Bill of Material Listing"
 msgstr ""
 
-#: reporting/reports_main.php:199
+#: reporting/reports_main.php:214
 msgid "From product"
 msgstr ""
 
-#: reporting/reports_main.php:200
+#: reporting/reports_main.php:215
 msgid "To product"
 msgstr ""
 
-#: reporting/reports_main.php:203
+#: reporting/reports_main.php:218
 msgid "Print &Work Orders"
 msgstr ""
 
-#: reporting/reports_main.php:206
+#: reporting/reports_main.php:221
 msgid "Email Locations"
 msgstr ""
 
-#: reporting/reports_main.php:211
+#: reporting/reports_main.php:226
 msgid "Dimension &Summary"
 msgstr ""
 
-#: reporting/reports_main.php:212
+#: reporting/reports_main.php:227
 msgid "From Dimension"
 msgstr ""
 
-#: reporting/reports_main.php:213
+#: reporting/reports_main.php:228
 msgid "To Dimension"
 msgstr ""
 
-#: reporting/reports_main.php:214
+#: reporting/reports_main.php:229
 msgid "Show Balance"
 msgstr ""
 
-#: reporting/reports_main.php:221
+#: reporting/reports_main.php:236
 msgid "Banking"
 msgstr ""
 
-#: reporting/reports_main.php:222
+#: reporting/reports_main.php:237
 msgid "Bank &Statement"
 msgstr ""
 
-#: reporting/reports_main.php:229
+#: reporting/reports_main.php:244
 msgid "General Ledger"
 msgstr ""
 
-#: reporting/reports_main.php:230
+#: reporting/reports_main.php:245
 msgid "Chart of &Accounts"
 msgstr ""
 
-#: reporting/reports_main.php:231
+#: reporting/reports_main.php:246
 msgid "Show Balances"
 msgstr ""
 
-#: reporting/reports_main.php:234
+#: reporting/reports_main.php:249
 msgid "List of &Journal Entries"
 msgstr ""
 
-#: reporting/reports_main.php:245 reporting/reports_main.php:294
-#: reporting/reports_main.php:338
+#: reporting/reports_main.php:260 reporting/reports_main.php:309
+#: reporting/reports_main.php:353
 msgid "GL Account &Transactions"
 msgstr ""
 
-#: reporting/reports_main.php:248 reporting/reports_main.php:297
-#: reporting/reports_main.php:341
+#: reporting/reports_main.php:263 reporting/reports_main.php:312
+#: reporting/reports_main.php:356
 msgid "From Account"
 msgstr ""
 
-#: reporting/reports_main.php:249 reporting/reports_main.php:298
-#: reporting/reports_main.php:342
+#: reporting/reports_main.php:264 reporting/reports_main.php:313
+#: reporting/reports_main.php:357
 msgid "To Account"
 msgstr ""
 
-#: reporting/reports_main.php:254 reporting/reports_main.php:302
-#: reporting/reports_main.php:345
+#: reporting/reports_main.php:269 reporting/reports_main.php:317
+#: reporting/reports_main.php:360
 msgid "Annual &Expense Breakdown"
 msgstr ""
 
-#: reporting/reports_main.php:261 reporting/reports_main.php:308
-#: reporting/reports_main.php:350
+#: reporting/reports_main.php:276 reporting/reports_main.php:323
+#: reporting/reports_main.php:365
 msgid "&Balance Sheet"
 msgstr ""
 
-#: reporting/reports_main.php:267 reporting/reports_main.php:278
-#: reporting/reports_main.php:313 reporting/reports_main.php:323
-#: reporting/reports_main.php:354 reporting/reports_main.php:363
+#: reporting/reports_main.php:282 reporting/reports_main.php:293
+#: reporting/reports_main.php:328 reporting/reports_main.php:338
+#: reporting/reports_main.php:369 reporting/reports_main.php:378
 msgid "Decimal values"
 msgstr ""
 
-#: reporting/reports_main.php:271 reporting/reports_main.php:317
-#: reporting/reports_main.php:358
+#: reporting/reports_main.php:286 reporting/reports_main.php:332
+#: reporting/reports_main.php:373
 msgid "&Profit and Loss Statement"
 msgstr ""
 
-#: reporting/reports_main.php:285 reporting/reports_main.php:330
-#: reporting/reports_main.php:370
+#: reporting/reports_main.php:300 reporting/reports_main.php:345
+#: reporting/reports_main.php:385
 msgid "Zero values"
 msgstr ""
 
-#: reporting/reports_main.php:375
+#: reporting/reports_main.php:390
 msgid "Ta&x Report"
 msgstr ""
 
-#: reporting/includes/doctext.inc:14
-msgid "Cust no"
-msgstr ""
-
-#: reporting/includes/doctext.inc:18
-msgid "Order To"
-msgstr ""
-
-#: reporting/includes/doctext.inc:20
-msgid "Deliver To"
-msgstr ""
-
-#: reporting/includes/doctext.inc:22 reporting/includes/doctext.inc:29
+#: reporting/includes/doctext.inc:18 reporting/includes/doctext.inc:134
 #: sales/view/view_dispatch.php:51 sales/view/view_invoice.php:51
 msgid "Charge To"
 msgstr ""
 
-#: reporting/includes/doctext.inc:27
-msgid "With thanks from"
-msgstr ""
-
-#: reporting/includes/doctext.inc:30 sales/view/view_dispatch.php:74
+#: reporting/includes/doctext.inc:23 sales/view/view_dispatch.php:74
 msgid "Delivered To"
 msgstr ""
 
-#: reporting/includes/doctext.inc:34 sales/view/view_sales_order.php:69
-#: sales/inquiry/sales_orders_view.php:273
-#: sales/includes/ui/sales_order_ui.inc:605
-msgid "Valid until"
-msgstr ""
-
-#: reporting/includes/doctext.inc:38
-msgid "To Be Invoiced Before"
-msgstr ""
-
-#: reporting/includes/doctext.inc:41
-msgid "Your Ref"
-msgstr ""
-
-#: reporting/includes/doctext.inc:56 sales/manage/customer_branches.php:296
-msgid "Sales Person"
-msgstr ""
-
-#: reporting/includes/doctext.inc:57
-msgid "Your VAT no."
-msgstr ""
-
-#: reporting/includes/doctext.inc:59
-msgid "Customers Reference"
-msgstr ""
-
-#: reporting/includes/doctext.inc:60 sales/view/view_dispatch.php:87
-#: sales/view/view_invoice.php:86
-msgid "Our Order No"
-msgstr ""
-
-#: reporting/includes/doctext.inc:62
-msgid "Our VAT No."
-msgstr ""
-
-#: reporting/includes/doctext.inc:63
-msgid "Domicile"
-msgstr ""
-
-#: reporting/includes/doctext.inc:68
-msgid "* Subject to Realisation of the Cheque."
-msgstr ""
-
-#: reporting/includes/doctext.inc:70
-msgid "All amounts stated in"
-msgstr ""
-
-#: reporting/includes/doctext.inc:74
-msgid "Please quote Invoice no. when paying. All amounts stated in"
-msgstr ""
-
-#: reporting/includes/doctext.inc:75
-msgid "Please quote Credit no. when paying. All amounts stated in"
-msgstr ""
-
-#: reporting/includes/doctext.inc:78
-msgid "Phone/Fax/Email"
-msgstr ""
-
-#: reporting/includes/doctext.inc:80 reporting/includes/doctext.inc:127
-msgid "You can pay through"
-msgstr ""
-
-#: reporting/includes/doctext.inc:113 sales/customer_credit_invoice.php:281
+#: reporting/includes/doctext.inc:30 sales/customer_credit_invoice.php:283
 #: sales/view/view_credit.php:91 sales/view/view_dispatch.php:113
 #: sales/view/view_invoice.php:114 sales/includes/ui/sales_credit_ui.inc:168
 #: sales/includes/ui/sales_order_ui.inc:142
+#: sales/customer_credit_invoice.php:281
+#: sales/includes/ui/sales_order_ui.inc:146
 msgid "Discount %"
 msgstr ""
 
-#: reporting/includes/doctext.inc:118
-msgid "DueDate"
-msgstr ""
-
-#: reporting/includes/doctext.inc:124
-msgid "Dear"
+#: reporting/includes/doctext.inc:33
+msgid "All amounts stated in"
 msgstr ""
 
-#: reporting/includes/doctext.inc:125
-msgid "Attached you will find "
+#: reporting/includes/doctext.inc:39
+msgid "Quotation No."
 msgstr ""
 
-#: reporting/includes/doctext.inc:126
-msgid "Kindest regards"
+#: reporting/includes/doctext.inc:44 reporting/includes/doctext.inc:61
+#: reporting/includes/doctext.inc:82 reporting/includes/doctext.inc:96
+#: reporting/includes/doctext.inc:118 reporting/includes/doctext.inc:139
+#: reporting/includes/doctext.inc:162 reporting/includes/doctext.inc:180
+#: reporting/includes/doctext.inc:218
+msgid "Customers Reference"
 msgstr ""
 
-#: reporting/includes/doctext.inc:131 reporting/includes/doctext.inc:140
-msgid "Delivery Note No."
+#: reporting/includes/doctext.inc:45 reporting/includes/doctext.inc:62
+#: reporting/includes/doctext.inc:83 reporting/includes/doctext.inc:97
+#: reporting/includes/doctext.inc:119 reporting/includes/doctext.inc:163
+#: reporting/includes/doctext.inc:219 sales/manage/customer_branches.php:296
+msgid "Sales Person"
 msgstr ""
 
-#: reporting/includes/doctext.inc:132
-msgid "Receipt No."
+#: reporting/includes/doctext.inc:46 reporting/includes/doctext.inc:63
+#: reporting/includes/doctext.inc:84 reporting/includes/doctext.inc:98
+#: reporting/includes/doctext.inc:120 reporting/includes/doctext.inc:141
+#: reporting/includes/doctext.inc:164 reporting/includes/doctext.inc:182
+#: reporting/includes/doctext.inc:220
+msgid "Your VAT no."
 msgstr ""
 
-#: reporting/includes/doctext.inc:133
-msgid "Remittance No."
+#: reporting/includes/doctext.inc:47
+msgid "Our Quotation No"
 msgstr ""
 
-#: reporting/includes/doctext.inc:134
-msgid "Purchase Order No."
+#: reporting/includes/doctext.inc:48 sales/view/view_sales_order.php:69
+#: sales/inquiry/sales_orders_view.php:282
+#: sales/inquiry/sales_orders_view.php.orig:280
+#: sales/includes/ui/sales_order_ui.inc:606
+#: sales/includes/ui/sales_order_ui.inc:610
+msgid "Valid until"
 msgstr ""
 
-#: reporting/includes/doctext.inc:135 reporting/includes/doctext.inc:141
+#: reporting/includes/doctext.inc:54
 msgid "Order No."
 msgstr ""
 
-#: reporting/includes/doctext.inc:136
-msgid "Quotation No."
-msgstr ""
-
-#: reporting/includes/doctext.inc:137
-msgid "Invoice No."
-msgstr ""
-
-#: reporting/includes/doctext.inc:138
-msgid "Credit No."
+#: reporting/includes/doctext.inc:64 reporting/includes/doctext.inc:85
+#: reporting/includes/doctext.inc:99 reporting/includes/doctext.inc:142
+#: reporting/includes/doctext.inc:165 reporting/includes/doctext.inc:183
+#: reporting/includes/doctext.inc:221 sales/view/view_dispatch.php:87
+#: sales/view/view_invoice.php:86
+msgid "Our Order No"
 msgstr ""
 
-#: reporting/includes/doctext.inc:150 sales/view/view_credit.php:138
-#: sales/view/view_dispatch.php:155 sales/view/view_invoice.php:157
-#: sales/view/view_sales_order.php:227
-#: sales/includes/ui/sales_credit_ui.inc:222
-msgid "Shipping"
+#: reporting/includes/doctext.inc:71 reporting/includes/doctext.inc:121
+msgid "Delivery Note No."
 msgstr ""
 
-#: reporting/includes/doctext.inc:153 sales/view/view_credit.php:143
-msgid "TOTAL CREDIT"
+#: reporting/includes/doctext.inc:86
+msgid "To Be Invoiced Before"
 msgstr ""
 
-#: reporting/includes/doctext.inc:154
-msgid "TOTAL ORDER EX VAT"
+#: reporting/includes/doctext.inc:92
+msgid "Credit No."
 msgstr ""
 
-#: reporting/includes/doctext.inc:155
-msgid "TOTAL ORDER VAT INCL."
+#: reporting/includes/doctext.inc:93
+msgid "Please quote Credit no. when paying. All amounts stated in"
 msgstr ""
 
-#: reporting/includes/doctext.inc:156
-msgid "TOTAL PO"
+#: reporting/includes/doctext.inc:106
+msgid "Invoice No."
 msgstr ""
 
-#: reporting/includes/doctext.inc:157
-msgid "TOTAL DELIVERY INCL. VAT"
+#: reporting/includes/doctext.inc:108
+msgid "Please quote Invoice no. when paying. All amounts stated in"
 msgstr ""
 
-#: reporting/includes/doctext.inc:161
-msgid "As advance / full / part / payment towards:"
+#: reporting/includes/doctext.inc:130
+msgid "Remittance No."
 msgstr ""
 
-#: reporting/includes/doctext.inc:162
-msgid "By Cash / Cheque* / Draft No."
+#: reporting/includes/doctext.inc:131 reporting/includes/doctext.inc:151
+msgid "Order To"
 msgstr ""
 
-#: reporting/includes/doctext.inc:163
-msgid "Dated"
+#: reporting/includes/doctext.inc:150
+msgid "Purchase Order No."
 msgstr ""
 
-#: reporting/includes/doctext.inc:164
-msgid "Drawn on Bank"
+#: reporting/includes/doctext.inc:154
+msgid "Deliver To"
 msgstr ""
 
-#: reporting/includes/doctext.inc:166
-msgid "Received / Sign"
+#: reporting/includes/doctext.inc:177
+msgid "Receipt No."
 msgstr ""
 
-#: reporting/includes/doctext.inc:170
-msgid "TOTAL RECEIPT"
+#: reporting/includes/doctext.inc:178
+msgid "With thanks from"
 msgstr ""
 
-#: reporting/includes/doctext.inc:172
-msgid "TOTAL REMITTANCE"
+#: reporting/includes/doctext.inc:193
+msgid "Work Order No."
 msgstr ""
 
-#: reporting/includes/doctext.inc:176
-msgid "Outstanding Transactions"
+#: reporting/includes/doctext.inc:224
+msgid "DueDate"
 msgstr ""
 
-#: reporting/includes/doctext.inc:179
-msgid "Statement"
+#: reporting/includes/doctext.inc:259 reporting/includes/pdf_report.inc:1013
+#: reporting/includes/pdf_report.inc:1014
+msgid "You can pay through"
 msgstr ""
 
-#: reporting/includes/doctext.inc:180
-msgid "as of"
+#: reporting/includes/doctext.inc:263
+msgid "* Subject to Realisation of the Cheque."
 msgstr ""
 
 #: reporting/includes/excel_report.inc:67 reporting/includes/pdf_report.inc:80
@@ -10978,41 +11474,76 @@ msgid "Report Date"
 msgstr ""
 
 #: reporting/includes/excel_report.inc:413
-#: reporting/includes/pdf_report.inc:599
+#: reporting/includes/pdf_report.inc:600 reporting/includes/pdf_report.inc:601
 msgid "Generated At"
 msgstr ""
 
 #: reporting/includes/excel_report.inc:419
-#: reporting/includes/pdf_report.inc:608
+#: reporting/includes/pdf_report.inc:609 reporting/includes/pdf_report.inc:610
 msgid "Generated By"
 msgstr ""
 
-#: reporting/includes/header2.inc:150 reporting/includes/pdf_report.inc:352
-#: reporting/includes/pdf_report.inc:499 reporting/includes/pdf_report.inc:627
+#: reporting/includes/header2.inc:122
+msgid "Our VAT No."
+msgstr ""
+
+#: reporting/includes/header2.inc:128
+msgid "Domicile"
+msgstr ""
+
+#: reporting/includes/header2.inc:143 reporting/includes/pdf_report.inc:352
+#: reporting/includes/pdf_report.inc:500 reporting/includes/pdf_report.inc:628
+#: reporting/includes/pdf_report.inc:501 reporting/includes/pdf_report.inc:629
 msgid "Page"
 msgstr ""
 
-#: reporting/includes/pdf_report.inc:582
+#: reporting/includes/pdf_report.inc:583 reporting/includes/pdf_report.inc:584
 msgid "Report Period"
 msgstr ""
 
-#: reporting/includes/pdf_report.inc:980
+#: reporting/includes/pdf_report.inc:980 reporting/includes/pdf_report.inc:981
 msgid "You have no email contact defined for this type of document"
 msgstr ""
 
-#: reporting/includes/pdf_report.inc:1022
+#: reporting/includes/pdf_report.inc:999
+#: reporting/includes/pdf_report.inc:1000
+msgid "Dear"
+msgstr ""
+
+#: reporting/includes/pdf_report.inc:1000
+#: reporting/includes/pdf_report.inc:1001
+msgid "Attached you will find "
+msgstr ""
+
+#: reporting/includes/pdf_report.inc:1016
+#: reporting/includes/pdf_report.inc:1017
+msgid "Kindest regards"
+msgstr ""
+
+#: reporting/includes/pdf_report.inc:1028
+#: reporting/includes/pdf_report.inc:1029
 msgid "There is no contact email set for this document type."
 msgstr ""
 
-#: reporting/includes/pdf_report.inc:1024
+#: reporting/includes/pdf_report.inc:1031
+#: reporting/includes/pdf_report.inc:1032
 msgid "Sending document by email failed"
 msgstr ""
 
-#: reporting/includes/pdf_report.inc:1027
+#: reporting/includes/pdf_report.inc:1031
+#: reporting/includes/pdf_report.inc:1034
+#: reporting/includes/pdf_report.inc:1032
+#: reporting/includes/pdf_report.inc:1035
+msgid "Email:"
+msgstr ""
+
+#: reporting/includes/pdf_report.inc:1034
+#: reporting/includes/pdf_report.inc:1035
 msgid "has been sent by email to destination."
 msgstr ""
 
-#: reporting/includes/pdf_report.inc:1057
+#: reporting/includes/pdf_report.inc:1064
+#: reporting/includes/pdf_report.inc:1065
 msgid "Report has been sent to network printer "
 msgstr ""
 
@@ -11064,114 +11595,163 @@ msgstr ""
 msgid "No Currency Filter"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:224
-msgid "No payment Link"
-msgstr ""
-
-#: reporting/includes/reports_classes.inc:228
+#: reporting/includes/reports_classes.inc:227
+#: reporting/includes/reports_classes.inc:231
 msgid "PDF/Printer"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:239
+#: reporting/includes/reports_classes.inc:238
+#: reporting/includes/reports_classes.inc:242
 msgid "No Graphics"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:239
+#: reporting/includes/reports_classes.inc:238
+#: reporting/includes/reports_classes.inc:242
 msgid "Vertical bars"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:239
+#: reporting/includes/reports_classes.inc:238
+#: reporting/includes/reports_classes.inc:242
 msgid "Horizontal bars"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:240
+#: reporting/includes/reports_classes.inc:239
+#: reporting/includes/reports_classes.inc:243
 msgid "Dots"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:240
+#: reporting/includes/reports_classes.inc:239
+#: reporting/includes/reports_classes.inc:243
 msgid "Lines"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:240
+#: reporting/includes/reports_classes.inc:239
+#: reporting/includes/reports_classes.inc:243
 msgid "Pie"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:240
+#: reporting/includes/reports_classes.inc:239
+#: reporting/includes/reports_classes.inc:243
 msgid "Donut"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:244
+#: reporting/includes/reports_classes.inc:243
+#: reporting/includes/reports_classes.inc:246
 #: reporting/includes/reports_classes.inc:247
+#: reporting/includes/reports_classes.inc:250
 msgid "No Type Filter"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:257
+#: reporting/includes/reports_classes.inc:256
+#: reporting/includes/reports_classes.inc:260
 msgid "No Account Group Filter"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:272
-#: reporting/includes/reports_classes.inc:278
-#: reporting/includes/reports_classes.inc:284
+#: reporting/includes/reports_classes.inc:271
+#: reporting/includes/reports_classes.inc:277
+#: reporting/includes/reports_classes.inc:283
+#: reporting/includes/reports_classes.inc:275
+#: reporting/includes/reports_classes.inc:281
+#: reporting/includes/reports_classes.inc:287
 msgid "No Dimension Filter"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:290
+#: reporting/includes/reports_classes.inc:289
+#: reporting/includes/reports_classes.inc:293
 msgid "No Customer Filter"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:298
+#: reporting/includes/reports_classes.inc:297
+#: reporting/includes/reports_classes.inc:301
 msgid "No Supplier Filter"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:381
+#: reporting/includes/reports_classes.inc:379
+#: reporting/includes/reports_classes.inc:383
 msgid "No Location Filter"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:384
+#: reporting/includes/reports_classes.inc:382
+#: reporting/includes/reports_classes.inc:386
 msgid "No Category Filter"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:393
+#: reporting/includes/reports_classes.inc:391
+#: reporting/includes/reports_classes.inc:395
 msgid "No Sales Folk Filter"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:400
+#: reporting/includes/reports_classes.inc:398
+#: reporting/includes/reports_classes.inc:402
 msgid "No Users Filter"
 msgstr ""
 
 #: sales/create_recurrent_invoices.php:24
+#: sales/create_recurrent_invoices.php:26
 msgid "Create and Print Recurrent Invoices"
 msgstr ""
 
-#: sales/create_recurrent_invoices.php:98
-#: sales/manage/recurrent_invoices.php:85
+#: sales/create_recurrent_invoices.php:40
+#: sales/create_recurrent_invoices.php:42
+#, php-format
+msgid "Recurrent Invoice covers period %s - %s."
+msgstr ""
+
+#: sales/create_recurrent_invoices.php:97
+#: sales/create_recurrent_invoices.php:108
+#, php-format
+msgid "%s recurrent invoice(s) created, # %s - # %s."
+msgstr ""
+
+#: sales/create_recurrent_invoices.php:102
+#: sales/create_recurrent_invoices.php:113
+#, php-format
+msgid "&Print Recurrent Invoices # %s - # %s"
+msgstr ""
+
+#: sales/create_recurrent_invoices.php:104
+#: sales/create_recurrent_invoices.php:115
+#, php-format
+msgid "&Email Recurrent Invoices # %s - # %s"
+msgstr ""
+
+#: sales/create_recurrent_invoices.php:115
+#: sales/manage/recurrent_invoices.php:102
+#: sales/create_recurrent_invoices.php:132
 msgid "Template No"
 msgstr ""
 
-#: sales/create_recurrent_invoices.php:98
-#: sales/manage/recurrent_invoices.php:85
+#: sales/create_recurrent_invoices.php:115
+#: sales/manage/recurrent_invoices.php:102
+#: sales/create_recurrent_invoices.php:132
 msgid "Begin"
 msgstr ""
 
-#: sales/create_recurrent_invoices.php:98
-#: sales/manage/recurrent_invoices.php:85
+#: sales/create_recurrent_invoices.php:115
+#: sales/manage/recurrent_invoices.php:102
+#: sales/create_recurrent_invoices.php:132
 msgid "End"
 msgstr ""
 
-#: sales/create_recurrent_invoices.php:98
-#: sales/manage/recurrent_invoices.php:85
+#: sales/create_recurrent_invoices.php:115
+#: sales/manage/recurrent_invoices.php:102
+#: sales/manage/recurrent_invoices.php:185
+#: sales/create_recurrent_invoices.php:132
 msgid "Last Created"
 msgstr ""
 
-#: sales/create_recurrent_invoices.php:142
+#: sales/create_recurrent_invoices.php:156
+#: sales/create_recurrent_invoices.php:173
 msgid "Create Invoices"
 msgstr ""
 
-#: sales/create_recurrent_invoices.php:149
+#: sales/create_recurrent_invoices.php:164
+#: sales/create_recurrent_invoices.php:181
 msgid "Marked items are due."
 msgstr ""
 
-#: sales/create_recurrent_invoices.php:151
+#: sales/create_recurrent_invoices.php:166
+#: sales/create_recurrent_invoices.php:183
 msgid "No recurrent invoices are due."
 msgstr ""
 
@@ -11180,7 +11760,9 @@ msgstr ""
 msgid "Modifying Customer Credit Note #%d"
 msgstr ""
 
-#: sales/credit_note_entry.php:51 sales/sales_order_entry.php:660
+#: sales/credit_note_entry.php:51 sales/sales_order_entry.php:661
+#: sales/sales_order_entry.php:665 sales/sales_order_entry.php:676
+#: sales/sales_order_entry.php.orig:675
 msgid ""
 "There are no customers, or there are no customers with branches. Please "
 "define customers and customer branches."
@@ -11204,7 +11786,7 @@ msgid "&Email This Credit Invoice"
 msgstr ""
 
 #: sales/credit_note_entry.php:73 sales/customer_credit_invoice.php:60
-#: sales/customer_credit_invoice.php:75
+#: sales/customer_credit_invoice.php:77
 msgid "View the GL &Journal Entries for this Credit Note"
 msgstr ""
 
@@ -11212,39 +11794,40 @@ msgstr ""
 msgid "Enter Another &Credit Note"
 msgstr ""
 
-#: sales/credit_note_entry.php:155
+#: sales/credit_note_entry.php:157 sales/credit_note_entry.php:153
 msgid "The entered date for the credit note is invalid."
 msgstr ""
 
-#: sales/credit_note_entry.php:172
+#: sales/credit_note_entry.php:174 sales/credit_note_entry.php:170
 msgid ""
 "For credit notes created to write off the stock, a general ledger account is "
 "required to be selected."
 msgstr ""
 
-#: sales/credit_note_entry.php:173
+#: sales/credit_note_entry.php:175 sales/credit_note_entry.php:171
 msgid ""
 "Please select an account to write the cost of the stock off to, then click "
 "on Process again."
 msgstr ""
 
-#: sales/credit_note_entry.php:193
+#: sales/credit_note_entry.php:195 sales/credit_note_entry.php:197
 msgid "The quantity must be greater than zero."
 msgstr ""
 
-#: sales/credit_note_entry.php:198
+#: sales/credit_note_entry.php:200 sales/credit_note_entry.php:202
 msgid "The entered price is negative or invalid."
 msgstr ""
 
-#: sales/credit_note_entry.php:203
+#: sales/credit_note_entry.php:205 sales/credit_note_entry.php:207
 msgid "The entered discount percent is negative, greater than 100 or invalid."
 msgstr ""
 
-#: sales/credit_note_entry.php:271
+#: sales/credit_note_entry.php:273 sales/credit_note_entry.php:275
 msgid "Credit Note Items"
 msgstr ""
 
-#: sales/credit_note_entry.php:281 sales/customer_credit_invoice.php:382
+#: sales/credit_note_entry.php:283 sales/customer_credit_invoice.php:384
+#: sales/credit_note_entry.php:285 sales/customer_credit_invoice.php:382
 msgid "Process Credit Note"
 msgstr ""
 
@@ -11261,73 +11844,77 @@ msgstr ""
 msgid "Credit Note has been processed"
 msgstr ""
 
-#: sales/customer_credit_invoice.php:55 sales/customer_credit_invoice.php:70
+#: sales/customer_credit_invoice.php:55 sales/customer_credit_invoice.php:72
 msgid "&View This Credit Note"
 msgstr ""
 
-#: sales/customer_credit_invoice.php:57 sales/customer_credit_invoice.php:72
+#: sales/customer_credit_invoice.php:57 sales/customer_credit_invoice.php:74
 msgid "&Print This Credit Note"
 msgstr ""
 
-#: sales/customer_credit_invoice.php:58 sales/customer_credit_invoice.php:73
+#: sales/customer_credit_invoice.php:58 sales/customer_credit_invoice.php:75
 msgid "&Email This Credit Note"
 msgstr ""
 
-#: sales/customer_credit_invoice.php:68
+#: sales/customer_credit_invoice.php:70
 msgid "Credit Note has been updated"
 msgstr ""
 
-#: sales/customer_credit_invoice.php:112
+#: sales/customer_credit_invoice.php:114 sales/customer_credit_invoice.php:109
 msgid "The entered shipping cost is invalid or less than zero."
 msgstr ""
 
-#: sales/customer_credit_invoice.php:117 sales/customer_credit_invoice.php:139
+#: sales/customer_credit_invoice.php:119 sales/customer_credit_invoice.php:141
+#: sales/customer_credit_invoice.php:114 sales/customer_credit_invoice.php:136
 msgid ""
 "Selected quantity cannot be less than zero nor more than quantity not "
 "credited yet."
 msgstr ""
 
-#: sales/customer_credit_invoice.php:137
+#: sales/customer_credit_invoice.php:139 sales/customer_credit_invoice.php:134
 msgid ""
 "This page can only be opened if an invoice has been selected for crediting."
 msgstr ""
 
-#: sales/customer_credit_invoice.php:249
+#: sales/customer_credit_invoice.php:251 sales/customer_credit_invoice.php:249
 msgid "Crediting Invoice"
 msgstr ""
 
-#: sales/customer_credit_invoice.php:270
+#: sales/customer_credit_invoice.php:272 sales/customer_credit_invoice.php:270
 msgid "Credit Note Date"
 msgstr ""
 
-#: sales/customer_credit_invoice.php:280
+#: sales/customer_credit_invoice.php:282 sales/customer_credit_invoice.php:280
 msgid "Invoiced Quantity"
 msgstr ""
 
-#: sales/customer_credit_invoice.php:281
+#: sales/customer_credit_invoice.php:283 sales/customer_credit_invoice.php:281
 msgid "Credit Quantity"
 msgstr ""
 
-#: sales/customer_credit_invoice.php:315
+#: sales/customer_credit_invoice.php:317 sales/customer_credit_invoice.php:315
 msgid "Credit Shipping Cost"
 msgstr ""
 
-#: sales/customer_credit_invoice.php:348
+#: sales/customer_credit_invoice.php:350
 #: sales/includes/ui/sales_credit_ui.inc:323
+#: sales/customer_credit_invoice.php:348
 msgid "Credit Note Type"
 msgstr ""
 
-#: sales/customer_credit_invoice.php:356
+#: sales/customer_credit_invoice.php:358
 #: sales/includes/ui/sales_credit_ui.inc:331
+#: sales/customer_credit_invoice.php:356
 msgid "Items Returned to Location"
 msgstr ""
 
-#: sales/customer_credit_invoice.php:361
+#: sales/customer_credit_invoice.php:363
 #: sales/includes/ui/sales_credit_ui.inc:336
+#: sales/customer_credit_invoice.php:361
 msgid "Write off the cost of the items to"
 msgstr ""
 
-#: sales/customer_credit_invoice.php:380
+#: sales/customer_credit_invoice.php:382 sales/customer_credit_invoice.php:380
 msgid "Update credit value for quantities entered"
 msgstr ""
 
@@ -11341,35 +11928,42 @@ msgid "Deliver Items for a Sales Order"
 msgstr ""
 
 #: sales/customer_delivery.php:50 sales/sales_order_entry.php:175
+#: sales/sales_order_entry.php:183 sales/sales_order_entry.php.orig:183
 #, php-format
 msgid "Delivery # %d has been entered."
 msgstr ""
 
 #: sales/customer_delivery.php:52 sales/sales_order_entry.php:177
+#: sales/sales_order_entry.php:185 sales/sales_order_entry.php.orig:185
 msgid "&View This Delivery"
 msgstr ""
 
 #: sales/customer_delivery.php:54 sales/customer_delivery.php:75
-#: sales/sales_order_entry.php:179
+#: sales/sales_order_entry.php:179 sales/sales_order_entry.php:187
+#: sales/sales_order_entry.php.orig:187
 msgid "&Print Delivery Note"
 msgstr ""
 
 #: sales/customer_delivery.php:55 sales/customer_delivery.php:76
-#: sales/sales_order_entry.php:180
+#: sales/sales_order_entry.php:180 sales/sales_order_entry.php:188
+#: sales/sales_order_entry.php.orig:188
 msgid "&Email Delivery Note"
 msgstr ""
 
 #: sales/customer_delivery.php:56 sales/customer_delivery.php:77
-#: sales/sales_order_entry.php:181
+#: sales/sales_order_entry.php:181 sales/sales_order_entry.php:189
+#: sales/sales_order_entry.php.orig:189
 msgid "P&rint as Packing Slip"
 msgstr ""
 
 #: sales/customer_delivery.php:57 sales/customer_delivery.php:78
-#: sales/sales_order_entry.php:182
+#: sales/sales_order_entry.php:182 sales/sales_order_entry.php:190
+#: sales/sales_order_entry.php.orig:190
 msgid "E&mail as Packing Slip"
 msgstr ""
 
 #: sales/customer_delivery.php:59 sales/sales_order_entry.php:185
+#: sales/sales_order_entry.php:193 sales/sales_order_entry.php.orig:193
 msgid "View the GL Journal Entries for this Dispatch"
 msgstr ""
 
@@ -11406,122 +12000,128 @@ msgstr ""
 msgid "This order has no items. There is nothing to delivery."
 msgstr ""
 
-#: sales/customer_delivery.php:107
+#: sales/customer_delivery.php:110
 msgid "Select a different delivery"
 msgstr ""
 
-#: sales/customer_delivery.php:108
+#: sales/customer_delivery.php:111
 msgid "This delivery has all items invoiced. There is nothing to modify."
 msgstr ""
 
-#: sales/customer_delivery.php:118
+#: sales/customer_delivery.php:121
 msgid ""
 "This page can only be opened if an order or delivery note has been selected. "
 "Please select it first."
 msgstr ""
 
-#: sales/customer_delivery.php:120
+#: sales/customer_delivery.php:123
 msgid "Select a Sales Order to Delivery"
 msgstr ""
 
-#: sales/customer_delivery.php:129
+#: sales/customer_delivery.php:132
 msgid ""
 "Selected quantity cannot be less than quantity invoiced nor more than "
 "quantity\tnot dispatched on sales order."
 msgstr ""
 
-#: sales/customer_delivery.php:132
+#: sales/customer_delivery.php:135
 msgid "Freight cost cannot be less than zero"
 msgstr ""
 
-#: sales/customer_delivery.php:144
+#: sales/customer_delivery.php:147
 msgid "The entered date of delivery is invalid."
 msgstr ""
 
-#: sales/customer_delivery.php:150
+#: sales/customer_delivery.php:153
 msgid "The entered date of delivery is not in fiscal year."
 msgstr ""
 
-#: sales/customer_delivery.php:156
+#: sales/customer_delivery.php:159
 msgid "The entered dead-line for invoice is invalid."
 msgstr ""
 
-#: sales/customer_delivery.php:179 sales/customer_invoice.php:291
+#: sales/customer_delivery.php:182 sales/customer_invoice.php:297
+#: sales/customer_delivery.php:176 sales/customer_invoice.php:291
 msgid "The entered shipping value is not numeric."
 msgstr ""
 
-#: sales/customer_delivery.php:185
+#: sales/customer_delivery.php:188 sales/customer_delivery.php:182
 msgid "There are no item quantities on this delivery note."
 msgstr ""
 
-#: sales/customer_delivery.php:288 sales/sales_order_entry.php:489
-#: sales/includes/ui/sales_order_ui.inc:244
+#: sales/customer_delivery.php:291 sales/sales_order_entry.php:490
+#: sales/includes/ui/sales_order_ui.inc:244 sales/customer_delivery.php:285
+#: sales/sales_order_entry.php:494 sales/includes/ui/sales_order_ui.inc:248
+#: sales/sales_order_entry.php:505 sales/sales_order_entry.php.orig:504
 msgid ""
 "The delivery cannot be processed because there is an insufficient quantity "
 "for item:"
 msgstr ""
 
-#: sales/customer_delivery.php:350
+#: sales/customer_delivery.php:353
 msgid "For Sales Order"
 msgstr ""
 
-#: sales/customer_delivery.php:359
+#: sales/customer_delivery.php:362
 msgid "Delivery From"
 msgstr ""
 
-#: sales/customer_delivery.php:408
+#: sales/customer_delivery.php:411
 msgid "Invoice Dead-line"
 msgstr ""
 
-#: sales/customer_delivery.php:418 sales/customer_invoice.php:436
+#: sales/customer_delivery.php:421 sales/customer_invoice.php:457
 #: sales/includes/ui/sales_order_ui.inc:82
-#: sales/includes/ui/sales_order_ui.inc:368
+#: sales/includes/ui/sales_order_ui.inc:368 sales/customer_invoice.php:459
+#: sales/includes/ui/sales_order_ui.inc:84
+#: sales/includes/ui/sales_order_ui.inc:372
 msgid ""
 "The selected customer account is currently on hold. Please contact the "
 "credit control personnel to discuss."
 msgstr ""
 
-#: sales/customer_delivery.php:423
+#: sales/customer_delivery.php:426
 msgid "Delivery Items"
 msgstr ""
 
-#: sales/customer_delivery.php:429
+#: sales/customer_delivery.php:432
 msgid "Max. delivery"
 msgstr ""
 
-#: sales/customer_delivery.php:429 sales/customer_invoice.php:446
-#: sales/includes/ui/sales_order_ui.inc:141
+#: sales/customer_delivery.php:432 sales/customer_invoice.php:467
+#: sales/includes/ui/sales_order_ui.inc:141 sales/customer_invoice.php:469
+#: sales/includes/ui/sales_order_ui.inc:145
 msgid "Delivered"
 msgstr ""
 
-#: sales/customer_delivery.php:430 sales/customer_invoice.php:447
-#: sales/view/view_receipt.php:45 sales/view/view_sales_order.php:202
-msgid "Discount"
-msgstr ""
-
-#: sales/customer_delivery.php:490 sales/customer_invoice.php:531
+#: sales/customer_delivery.php:493 sales/customer_invoice.php:552
+#: sales/customer_invoice.php:554
 msgid "Shipping Cost"
 msgstr ""
 
-#: sales/customer_delivery.php:510 sales/includes/ui/sales_order_ui.inc:242
+#: sales/customer_delivery.php:513 sales/includes/ui/sales_order_ui.inc:242
+#: sales/includes/ui/sales_order_ui.inc:246
 msgid ""
 "Marked items have insufficient quantities in stock as on day of delivery."
 msgstr ""
 
-#: sales/customer_delivery.php:514
+#: sales/customer_delivery.php:517
 msgid "Action For Balance"
 msgstr ""
 
-#: sales/customer_delivery.php:521 sales/customer_invoice.php:560
+#: sales/customer_delivery.php:524 sales/customer_invoice.php:581
+#: sales/customer_invoice.php:583
 msgid "Refresh document page"
 msgstr ""
 
-#: sales/customer_delivery.php:522
+#: sales/customer_delivery.php:525
 msgid "Process Dispatch"
 msgstr ""
 
-#: sales/customer_delivery.php:523 sales/customer_invoice.php:562
-#: sales/sales_order_entry.php:708
+#: sales/customer_delivery.php:526 sales/customer_invoice.php:583
+#: sales/sales_order_entry.php:709 sales/customer_invoice.php:585
+#: sales/sales_order_entry.php:713 sales/sales_order_entry.php:724
+#: sales/sales_order_entry.php.orig:723
 msgid "Check entered data and save document"
 msgstr ""
 
@@ -11542,20 +12142,22 @@ msgstr ""
 msgid "Selected deliveries has been processed"
 msgstr ""
 
-#: sales/customer_invoice.php:57 sales/customer_invoice.php:75
-#: sales/sales_order_entry.php:204
+#: sales/customer_invoice.php:57 sales/customer_invoice.php:77
+#: sales/sales_order_entry.php:204 sales/sales_order_entry.php:212
+#: sales/sales_order_entry.php.orig:212
 msgid "&View This Invoice"
 msgstr ""
 
-#: sales/customer_invoice.php:59 sales/customer_invoice.php:77
+#: sales/customer_invoice.php:59 sales/customer_invoice.php:79
 msgid "&Print This Invoice"
 msgstr ""
 
-#: sales/customer_invoice.php:60 sales/customer_invoice.php:78
+#: sales/customer_invoice.php:60 sales/customer_invoice.php:80
 msgid "&Email This Invoice"
 msgstr ""
 
 #: sales/customer_invoice.php:62 sales/sales_order_entry.php:217
+#: sales/sales_order_entry.php:225 sales/sales_order_entry.php.orig:225
 msgid "View the GL &Journal Entries for this Invoice"
 msgstr ""
 
@@ -11563,26 +12165,26 @@ msgstr ""
 msgid "Select Another &Delivery For Invoicing"
 msgstr ""
 
-#: sales/customer_invoice.php:73
+#: sales/customer_invoice.php:75
 #, php-format
 msgid "Sales Invoice # %d has been updated."
 msgstr ""
 
-#: sales/customer_invoice.php:80
+#: sales/customer_invoice.php:82
 msgid "Select Another &Invoice to Modify"
 msgstr ""
 
-#: sales/customer_invoice.php:119
+#: sales/customer_invoice.php:121
 msgid "Select a different delivery to invoice"
 msgstr ""
 
-#: sales/customer_invoice.php:120
+#: sales/customer_invoice.php:122
 msgid ""
 "There are no delivered items with a quantity left to invoice. There is "
 "nothing left to invoice."
 msgstr ""
 
-#: sales/customer_invoice.php:129
+#: sales/customer_invoice.php:131
 msgid ""
 "There are no delivery notes for this invoice.<br>\n"
 "\t\tMost likely this invoice was created in Front Accounting version prior "
@@ -11590,450 +12192,553 @@ msgid ""
 "\t\tand therefore can not be modified."
 msgstr ""
 
-#: sales/customer_invoice.php:138
+#: sales/customer_invoice.php:140
 msgid ""
 "All quantities on this invoice has been credited. There is nothing to modify "
 "on this invoice"
 msgstr ""
 
-#: sales/customer_invoice.php:144
+#: sales/customer_invoice.php:146
 msgid ""
 "This page can only be opened after delivery selection. Please select "
 "delivery to invoicing first."
 msgstr ""
 
-#: sales/customer_invoice.php:146
+#: sales/customer_invoice.php:148
 msgid "Select Delivery to Invoice"
 msgstr ""
 
-#: sales/customer_invoice.php:151 sales/customer_invoice.php:302
+#: sales/customer_invoice.php:153 sales/customer_invoice.php:308
+#: sales/customer_invoice.php:302
 msgid ""
 "Selected quantity cannot be less than quantity credited nor more than "
 "quantity not invoiced yet."
 msgstr ""
 
-#: sales/customer_invoice.php:255
+#: sales/customer_invoice.php:261
 msgid "The entered invoice date is invalid."
 msgstr ""
 
-#: sales/customer_invoice.php:261
+#: sales/customer_invoice.php:267
 msgid "The entered invoice date is not in fiscal year."
 msgstr ""
 
-#: sales/customer_invoice.php:267
+#: sales/customer_invoice.php:273
 msgid "The entered invoice due date is invalid."
 msgstr ""
 
-#: sales/customer_invoice.php:297
+#: sales/customer_invoice.php:303 sales/customer_invoice.php:297
 msgid "There are no item quantities on this invoice."
 msgstr ""
 
-#: sales/customer_invoice.php:377
+#: sales/customer_invoice.php:383 sales/customer_invoice.php:385
 msgid "Payment terms:"
 msgstr ""
 
-#: sales/customer_invoice.php:380 sales/includes/ui/sales_order_ui.inc:405
-#: sales/includes/ui/sales_order_ui.inc:409
+#: sales/customer_invoice.php:386 sales/includes/ui/sales_order_ui.inc:405
+#: sales/includes/ui/sales_order_ui.inc:409 sales/customer_invoice.php:388
+#: sales/includes/ui/sales_order_ui.inc:413
 msgid "Payment:"
 msgstr ""
 
-#: sales/customer_invoice.php:442
+#: sales/customer_invoice.php:463 sales/customer_invoice.php:465
 msgid "Invoice Items"
 msgstr ""
 
-#: sales/customer_invoice.php:447
+#: sales/customer_invoice.php:468 sales/customer_invoice.php:470
 msgid "This Invoice"
 msgstr ""
 
-#: sales/customer_invoice.php:455
+#: sales/customer_invoice.php:476 sales/customer_invoice.php:478
 msgid "Credited"
 msgstr ""
 
-#: sales/customer_invoice.php:549
+#: sales/customer_invoice.php:570 sales/customer_invoice.php:572
 msgid "Invoice Total"
 msgstr ""
 
-#: sales/customer_payments.php:33
+#: sales/customer_payments.php:33 sales/customer_payments.php.orig:33
 msgid "Customer Payment Entry"
 msgstr ""
 
-#: sales/customer_payments.php:37
+#: sales/customer_payments.php:37 sales/customer_payments.php.orig:37
 msgid "There are no customers defined in the system."
 msgstr ""
 
-#: sales/customer_payments.php:62
+#: sales/customer_payments.php:68 sales/customer_payments.php.orig:68
+msgid "Invalid sales invoice number."
+msgstr ""
+
+#: sales/customer_payments.php:92 sales/customer_payments.php.orig:92
 msgid "The customer payment has been successfully entered."
 msgstr ""
 
-#: sales/customer_payments.php:64
+#: sales/customer_payments.php:94 sales/customer_payments.php:109
+#: sales/customer_payments.php.orig:94 sales/customer_payments.php.orig:109
 msgid "&Print This Receipt"
 msgstr ""
 
-#: sales/customer_payments.php:66
+#: sales/customer_payments.php:96 sales/customer_payments.php:111
+#: sales/customer_payments.php.orig:96 sales/customer_payments.php.orig:111
 msgid "&View the GL Journal Entries for this Customer Payment"
 msgstr ""
 
-#: sales/customer_payments.php:70
+#: sales/customer_payments.php:100 sales/customer_payments.php:115
+#: sales/customer_payments.php.orig:100 sales/customer_payments.php.orig:115
 msgid "Enter Another &Customer Payment"
 msgstr ""
 
-#: sales/customer_payments.php:83 sales/sales_order_entry.php:328
+#: sales/customer_payments.php:107 sales/customer_payments.php.orig:107
+msgid "The customer payment has been successfully updated."
+msgstr ""
+
+#: sales/customer_payments.php:128 sales/sales_order_entry.php:327
+#: sales/customer_payments.php.orig:128 sales/sales_order_entry.php:336
+#: sales/sales_order_entry.php.orig:335
 msgid "There is no customer selected."
 msgstr ""
 
-#: sales/customer_payments.php:90 sales/sales_order_entry.php:335
+#: sales/customer_payments.php:135 sales/sales_order_entry.php:334
+#: sales/customer_payments.php.orig:135 sales/sales_order_entry.php:343
+#: sales/sales_order_entry.php.orig:342
 msgid "This customer has no branch defined."
 msgstr ""
 
-#: sales/customer_payments.php:96
+#: sales/customer_payments.php:141 sales/customer_payments.php.orig:141
 msgid "The entered date is invalid. Please enter a valid date for the payment."
 msgstr ""
 
-#: sales/customer_payments.php:118 sales/customer_payments.php:124
+#: sales/customer_payments.php:171 sales/customer_payments.php:177
+#: sales/customer_payments.php.orig:171 sales/customer_payments.php.orig:177
 msgid "The entered amount is invalid or negative and cannot be processed."
 msgstr ""
 
-#: sales/customer_payments.php:150
+#: sales/customer_payments.php:203 sales/customer_payments.php.orig:203
 msgid "The entered discount is not a valid number."
 msgstr ""
 
-#: sales/customer_payments.php:157
+#: sales/customer_payments.php:210 sales/customer_payments.php.orig:210
 msgid ""
 "The balance of the amount and discout is zero or negative. Please enter "
 "valid amounts."
 msgstr ""
 
-#: sales/customer_payments.php:234
+#: sales/customer_payments.php:341 sales/customer_payments.php:343
+#: sales/customer_payments.php:338 sales/customer_payments.php:340
+#: sales/customer_payments.php.orig:343 sales/customer_payments.php.orig:345
 msgid "From Customer:"
 msgstr ""
 
-#: sales/customer_payments.php:249
-msgid "This customer account is on hold."
-msgstr ""
-
-#: sales/customer_payments.php:255
+#: sales/customer_payments.php:378 sales/customer_payments.php:381
+#: sales/customer_payments.php.orig:380
 msgid "Into Bank Account:"
 msgstr ""
 
-#: sales/customer_payments.php:262
+#: sales/customer_payments.php:384 sales/customer_payments.php:387
+#: sales/customer_payments.php.orig:386
 msgid "Date of Deposit:"
 msgstr ""
 
-#: sales/customer_payments.php:286
+#: sales/customer_payments.php:406 sales/customer_payments.php:409
+#: sales/customer_payments.php.orig:408
 msgid "Customer prompt payment discount :"
 msgstr ""
 
-#: sales/customer_payments.php:295
+#: sales/customer_payments.php:415 sales/customer_payments.php:418
+#: sales/customer_payments.php.orig:417
 msgid "Amount and discount are in customer's currency."
 msgstr ""
 
-#: sales/customer_payments.php:299
+#: sales/customer_payments.php:420 sales/customer_payments.php:423
+#: sales/customer_payments.php.orig:422
+msgid "Update Payment"
+msgstr ""
+
+#: sales/customer_payments.php:422 sales/customer_payments.php:425
+#: sales/customer_payments.php.orig:424
 msgid "Add Payment"
 msgstr ""
 
-#: sales/sales_order_entry.php:56
+#: sales/sales_order_entry.php:56 sales/sales_order_entry.php:64
+#: sales/sales_order_entry.php.orig:64
 msgid "Direct Sales Delivery"
 msgstr ""
 
-#: sales/sales_order_entry.php:61
+#: sales/sales_order_entry.php:61 sales/sales_order_entry.php:69
+#: sales/sales_order_entry.php.orig:69
 msgid "Direct Sales Invoice"
 msgstr ""
 
-#: sales/sales_order_entry.php:67
+#: sales/sales_order_entry.php:67 sales/sales_order_entry.php:75
+#: sales/sales_order_entry.php.orig:75
 #, php-format
 msgid "Modifying Sales Order # %d"
 msgstr ""
 
-#: sales/sales_order_entry.php:73
+#: sales/sales_order_entry.php:73 sales/sales_order_entry.php:81
+#: sales/sales_order_entry.php.orig:81
 #, php-format
 msgid "Modifying Sales Quotation # %d"
 msgstr ""
 
-#: sales/sales_order_entry.php:78
+#: sales/sales_order_entry.php:78 sales/sales_order_entry.php:86
+#: sales/sales_order_entry.php.orig:86
 msgid "New Sales Order Entry"
 msgstr ""
 
-#: sales/sales_order_entry.php:82
+#: sales/sales_order_entry.php:82 sales/sales_order_entry.php:90
+#: sales/sales_order_entry.php.orig:90
 msgid "New Sales Quotation Entry"
 msgstr ""
 
-#: sales/sales_order_entry.php:85
+#: sales/sales_order_entry.php:85 sales/sales_order_entry.php:93
+#: sales/sales_order_entry.php.orig:93
 msgid "Sales Order Entry"
 msgstr ""
 
-#: sales/sales_order_entry.php:101
+#: sales/sales_order_entry.php:101 sales/sales_order_entry.php:109
+#: sales/sales_order_entry.php.orig:109
 #, php-format
 msgid "Order # %d has been entered."
 msgstr ""
 
 #: sales/sales_order_entry.php:103 sales/sales_order_entry.php:123
+#: sales/sales_order_entry.php:111 sales/sales_order_entry.php:131
+#: sales/sales_order_entry.php.orig:111 sales/sales_order_entry.php.orig:131
 msgid "&View This Order"
 msgstr ""
 
-#: sales/sales_order_entry.php:109
+#: sales/sales_order_entry.php:109 sales/sales_order_entry.php:117
+#: sales/sales_order_entry.php.orig:117
 msgid "Make &Delivery Against This Order"
 msgstr ""
 
-#: sales/sales_order_entry.php:114
+#: sales/sales_order_entry.php:114 sales/sales_order_entry.php:122
+#: sales/sales_order_entry.php.orig:122
 msgid "Enter a &New Order"
 msgstr ""
 
-#: sales/sales_order_entry.php:121
+#: sales/sales_order_entry.php:121 sales/sales_order_entry.php:129
+#: sales/sales_order_entry.php.orig:129
 #, php-format
 msgid "Order # %d has been updated."
 msgstr ""
 
-#: sales/sales_order_entry.php:129
+#: sales/sales_order_entry.php:129 sales/sales_order_entry.php:137
+#: sales/sales_order_entry.php.orig:137
 msgid "Confirm Order Quantities and Make &Delivery"
 msgstr ""
 
-#: sales/sales_order_entry.php:132
+#: sales/sales_order_entry.php:132 sales/sales_order_entry.php:140
+#: sales/sales_order_entry.php.orig:140
 msgid "Select A Different &Order"
 msgstr ""
 
-#: sales/sales_order_entry.php:139
+#: sales/sales_order_entry.php:139 sales/sales_order_entry.php:147
+#: sales/sales_order_entry.php.orig:147
 #, php-format
 msgid "Quotation # %d has been entered."
 msgstr ""
 
 #: sales/sales_order_entry.php:141 sales/sales_order_entry.php:159
+#: sales/sales_order_entry.php:149 sales/sales_order_entry.php:167
+#: sales/sales_order_entry.php.orig:149 sales/sales_order_entry.php.orig:167
 msgid "&View This Quotation"
 msgstr ""
 
 #: sales/sales_order_entry.php:143 sales/sales_order_entry.php:161
+#: sales/sales_order_entry.php:151 sales/sales_order_entry.php:169
+#: sales/sales_order_entry.php.orig:151 sales/sales_order_entry.php.orig:169
 msgid "&Print This Quotation"
 msgstr ""
 
 #: sales/sales_order_entry.php:144 sales/sales_order_entry.php:162
+#: sales/sales_order_entry.php:152 sales/sales_order_entry.php:170
+#: sales/sales_order_entry.php.orig:152 sales/sales_order_entry.php.orig:170
 msgid "&Email This Quotation"
 msgstr ""
 
 #: sales/sales_order_entry.php:147 sales/sales_order_entry.php:165
+#: sales/sales_order_entry.php:155 sales/sales_order_entry.php:173
+#: sales/sales_order_entry.php.orig:155 sales/sales_order_entry.php.orig:173
 msgid "Make &Sales Order Against This Quotation"
 msgstr ""
 
-#: sales/sales_order_entry.php:150
+#: sales/sales_order_entry.php:150 sales/sales_order_entry.php:158
+#: sales/sales_order_entry.php.orig:158
 msgid "Enter a New &Quotation"
 msgstr ""
 
-#: sales/sales_order_entry.php:157
+#: sales/sales_order_entry.php:157 sales/sales_order_entry.php:165
+#: sales/sales_order_entry.php.orig:165
 #, php-format
 msgid "Quotation # %d has been updated."
 msgstr ""
 
-#: sales/sales_order_entry.php:168
+#: sales/sales_order_entry.php:168 sales/sales_order_entry.php:176
+#: sales/sales_order_entry.php.orig:176
 msgid "Select A Different &Quotation"
 msgstr ""
 
-#: sales/sales_order_entry.php:187
+#: sales/sales_order_entry.php:187 sales/sales_order_entry.php:195
+#: sales/sales_order_entry.php.orig:195
 msgid "Make &Invoice Against This Delivery"
 msgstr ""
 
-#: sales/sales_order_entry.php:191
+#: sales/sales_order_entry.php:191 sales/sales_order_entry.php:199
+#: sales/sales_order_entry.php.orig:199
 msgid "Enter a New Template &Delivery"
 msgstr ""
 
-#: sales/sales_order_entry.php:194
+#: sales/sales_order_entry.php:194 sales/sales_order_entry.php:202
+#: sales/sales_order_entry.php.orig:202
 msgid "Enter a &New Delivery"
 msgstr ""
 
-#: sales/sales_order_entry.php:202
+#: sales/sales_order_entry.php:202 sales/sales_order_entry.php:210
+#: sales/sales_order_entry.php.orig:210
 #, php-format
 msgid "Invoice # %d has been entered."
 msgstr ""
 
-#: sales/sales_order_entry.php:206
+#: sales/sales_order_entry.php:206 sales/sales_order_entry.php:214
+#: sales/sales_order_entry.php.orig:214
 msgid "&Print Sales Invoice"
 msgstr ""
 
-#: sales/sales_order_entry.php:207
+#: sales/sales_order_entry.php:207 sales/sales_order_entry.php:215
+#: sales/sales_order_entry.php.orig:215
 msgid "&Email Sales Invoice"
 msgstr ""
 
-#: sales/sales_order_entry.php:215
+#: sales/sales_order_entry.php:215 sales/sales_order_entry.php:223
+#: sales/sales_order_entry.php.orig:223
 msgid "Print &Receipt"
 msgstr ""
 
-#: sales/sales_order_entry.php:220
+#: sales/sales_order_entry.php:220 sales/sales_order_entry.php:228
+#: sales/sales_order_entry.php.orig:228
 msgid "Enter a &New Template Invoice"
 msgstr ""
 
-#: sales/sales_order_entry.php:223
+#: sales/sales_order_entry.php:223 sales/sales_order_entry.php:231
+#: sales/sales_order_entry.php.orig:231
 msgid "Enter a &New Direct Invoice"
 msgstr ""
 
-#: sales/sales_order_entry.php:357
+#: sales/sales_order_entry.php:356 sales/sales_order_entry.php:365
+#: sales/sales_order_entry.php.orig:364
 msgid ""
 "You must enter the person or company to whom delivery should be made to."
 msgstr ""
 
-#: sales/sales_order_entry.php:364
+#: sales/sales_order_entry.php:363 sales/sales_order_entry.php:372
+#: sales/sales_order_entry.php.orig:371
 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:373
+#: sales/sales_order_entry.php:372 sales/sales_order_entry.php:381
+#: sales/sales_order_entry.php.orig:380
 msgid "The shipping cost entered is expected to be numeric."
 msgstr ""
 
-#: sales/sales_order_entry.php:379
+#: sales/sales_order_entry.php:378 sales/sales_order_entry.php:387
+#: sales/sales_order_entry.php.orig:386
 msgid "The Valid date is invalid."
 msgstr ""
 
-#: sales/sales_order_entry.php:381
+#: sales/sales_order_entry.php:380 sales/sales_order_entry.php:389
+#: sales/sales_order_entry.php.orig:388
 msgid "The delivery date is invalid."
 msgstr ""
 
-#: sales/sales_order_entry.php:388
+#: sales/sales_order_entry.php:387 sales/sales_order_entry.php:396
+#: sales/sales_order_entry.php.orig:395
 msgid "The requested valid date is before the date of the quotation."
 msgstr ""
 
-#: sales/sales_order_entry.php:390
+#: sales/sales_order_entry.php:389 sales/sales_order_entry.php:398
+#: sales/sales_order_entry.php.orig:397
 msgid "The requested delivery date is before the date of the order."
 msgstr ""
 
-#: sales/sales_order_entry.php:399
+#: sales/sales_order_entry.php:398 sales/sales_order_entry.php:407
+#: sales/sales_order_entry.php.orig:406
 msgid "You need to define a cash account for your Sales Point."
 msgstr ""
 
-#: sales/sales_order_entry.php:468
+#: sales/sales_order_entry.php:469 sales/sales_order_entry.php:473
+#: sales/sales_order_entry.php:484 sales/sales_order_entry.php.orig:483
 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:472
+#: sales/sales_order_entry.php:473 sales/sales_order_entry.php:477
+#: sales/sales_order_entry.php:488 sales/sales_order_entry.php.orig:487
 msgid "Price for inventory item must be entered and can not be less than 0"
 msgstr ""
 
-#: sales/sales_order_entry.php:479
+#: sales/sales_order_entry.php:480 sales/sales_order_entry.php:484
+#: sales/sales_order_entry.php:495 sales/sales_order_entry.php.orig:494
 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:510
+#: sales/sales_order_entry.php:511 sales/sales_order_entry.php:515
+#: sales/sales_order_entry.php:526 sales/sales_order_entry.php.orig:525
 #, php-format
 msgid "Price %s is below Standard Cost %s"
 msgstr ""
 
-#: sales/sales_order_entry.php:535
+#: sales/sales_order_entry.php:536 sales/sales_order_entry.php:540
+#: sales/sales_order_entry.php:551 sales/sales_order_entry.php.orig:550
 msgid ""
 "This item cannot be deleted because some of it has already been delivered."
 msgstr ""
 
-#: sales/sales_order_entry.php:564
+#: sales/sales_order_entry.php:565 sales/sales_order_entry.php:569
+#: sales/sales_order_entry.php:580 sales/sales_order_entry.php.orig:579
 msgid "Direct delivery entry has been cancelled as requested."
 msgstr ""
 
-#: sales/sales_order_entry.php:565
+#: sales/sales_order_entry.php:566 sales/sales_order_entry.php:570
+#: sales/sales_order_entry.php:581 sales/sales_order_entry.php.orig:580
 msgid "Enter a New Sales Delivery"
 msgstr ""
 
-#: sales/sales_order_entry.php:568
+#: sales/sales_order_entry.php:569 sales/sales_order_entry.php:573
+#: sales/sales_order_entry.php:584 sales/sales_order_entry.php.orig:583
 msgid "Direct invoice entry has been cancelled as requested."
 msgstr ""
 
-#: sales/sales_order_entry.php:569
+#: sales/sales_order_entry.php:570 sales/sales_order_entry.php:574
+#: sales/sales_order_entry.php:585 sales/sales_order_entry.php.orig:584
 msgid "Enter a New Sales Invoice"
 msgstr ""
 
-#: sales/sales_order_entry.php:574
+#: sales/sales_order_entry.php:575 sales/sales_order_entry.php:579
+#: sales/sales_order_entry.php:590 sales/sales_order_entry.php.orig:589
 msgid ""
 "This order cannot be cancelled because some of it has already been invoiced "
 "or dispatched. However, the line item quantities may be modified."
 msgstr ""
 
-#: sales/sales_order_entry.php:579
+#: sales/sales_order_entry.php:580 sales/sales_order_entry.php:584
+#: sales/sales_order_entry.php:595 sales/sales_order_entry.php.orig:594
 msgid "This sales quotation has been cancelled as requested."
 msgstr ""
 
-#: sales/sales_order_entry.php:580
+#: sales/sales_order_entry.php:581 sales/sales_order_entry.php:585
+#: sales/sales_order_entry.php:596 sales/sales_order_entry.php.orig:595
 msgid "Enter a New Sales Quotation"
 msgstr ""
 
-#: sales/sales_order_entry.php:584
+#: sales/sales_order_entry.php:585 sales/sales_order_entry.php:589
+#: sales/sales_order_entry.php:600 sales/sales_order_entry.php.orig:599
 msgid "This sales order has been cancelled as requested."
 msgstr ""
 
-#: sales/sales_order_entry.php:585
+#: sales/sales_order_entry.php:586 sales/sales_order_entry.php:590
+#: sales/sales_order_entry.php:601 sales/sales_order_entry.php.orig:600
 msgid "Enter a New Sales Order"
 msgstr ""
 
-#: sales/sales_order_entry.php:664
+#: sales/sales_order_entry.php:665 sales/sales_order_entry.php:669
+#: sales/sales_order_entry.php:680 sales/sales_order_entry.php.orig:679
 msgid "Sales Invoice Items"
 msgstr ""
 
-#: sales/sales_order_entry.php:665
+#: sales/sales_order_entry.php:666 sales/sales_order_entry.php:670
+#: sales/sales_order_entry.php:681 sales/sales_order_entry.php.orig:680
 msgid "Enter Delivery Details and Confirm Invoice"
 msgstr ""
 
-#: sales/sales_order_entry.php:667
+#: sales/sales_order_entry.php:668 sales/sales_order_entry.php:672
+#: sales/sales_order_entry.php:683 sales/sales_order_entry.php.orig:682
 msgid "Place Invoice"
 msgstr ""
 
-#: sales/sales_order_entry.php:670
+#: sales/sales_order_entry.php:671 sales/sales_order_entry.php:675
+#: sales/sales_order_entry.php:686 sales/sales_order_entry.php.orig:685
 msgid "Delivery Note Items"
 msgstr ""
 
-#: sales/sales_order_entry.php:671
+#: sales/sales_order_entry.php:672 sales/sales_order_entry.php:676
+#: sales/sales_order_entry.php:687 sales/sales_order_entry.php.orig:686
 msgid "Enter Delivery Details and Confirm Dispatch"
 msgstr ""
 
-#: sales/sales_order_entry.php:672
+#: sales/sales_order_entry.php:673 sales/sales_order_entry.php:677
+#: sales/sales_order_entry.php:688 sales/sales_order_entry.php.orig:687
 msgid "Cancel Delivery"
 msgstr ""
 
-#: sales/sales_order_entry.php:673
+#: sales/sales_order_entry.php:674 sales/sales_order_entry.php:678
+#: sales/sales_order_entry.php:689 sales/sales_order_entry.php.orig:688
 msgid "Place Delivery"
 msgstr ""
 
-#: sales/sales_order_entry.php:675
+#: sales/sales_order_entry.php:676 sales/sales_order_entry.php:680
+#: sales/sales_order_entry.php:691 sales/sales_order_entry.php.orig:690
 msgid "Quotation Date:"
 msgstr ""
 
-#: sales/sales_order_entry.php:676
+#: sales/sales_order_entry.php:677 sales/sales_order_entry.php:681
+#: sales/sales_order_entry.php:692 sales/sales_order_entry.php.orig:691
 msgid "Sales Quotation Items"
 msgstr ""
 
-#: sales/sales_order_entry.php:677
+#: sales/sales_order_entry.php:678 sales/sales_order_entry.php:682
+#: sales/sales_order_entry.php:693 sales/sales_order_entry.php.orig:692
 msgid "Enter Delivery Details and Confirm Quotation"
 msgstr ""
 
-#: sales/sales_order_entry.php:678
+#: sales/sales_order_entry.php:679 sales/sales_order_entry.php:683
+#: sales/sales_order_entry.php:694 sales/sales_order_entry.php.orig:693
 msgid "Cancel Quotation"
 msgstr ""
 
-#: sales/sales_order_entry.php:679
+#: sales/sales_order_entry.php:680 sales/sales_order_entry.php:684
+#: sales/sales_order_entry.php:695 sales/sales_order_entry.php.orig:694
 msgid "Place Quotation"
 msgstr ""
 
-#: sales/sales_order_entry.php:680
+#: sales/sales_order_entry.php:681 sales/sales_order_entry.php:685
+#: sales/sales_order_entry.php:696 sales/sales_order_entry.php.orig:695
 msgid "Commit Quotations Changes"
 msgstr ""
 
-#: sales/sales_order_entry.php:683
+#: sales/sales_order_entry.php:684 sales/sales_order_entry.php:688
+#: sales/sales_order_entry.php:699 sales/sales_order_entry.php.orig:698
 msgid "Sales Order Items"
 msgstr ""
 
-#: sales/sales_order_entry.php:684
+#: sales/sales_order_entry.php:685 sales/sales_order_entry.php:689
+#: sales/sales_order_entry.php:700 sales/sales_order_entry.php.orig:699
 msgid "Enter Delivery Details and Confirm Order"
 msgstr ""
 
-#: sales/sales_order_entry.php:687
+#: sales/sales_order_entry.php:688 sales/sales_order_entry.php:692
+#: sales/sales_order_entry.php:703 sales/sales_order_entry.php.orig:702
 msgid "Commit Order Changes"
 msgstr ""
 
-#: sales/sales_order_entry.php:709
+#: sales/sales_order_entry.php:710 sales/sales_order_entry.php:714
+#: sales/sales_order_entry.php:725 sales/sales_order_entry.php.orig:724
 msgid "You are about to void this Document.\\nDo you want to continue?"
 msgstr ""
 
-#: sales/sales_order_entry.php:712
+#: sales/sales_order_entry.php:713 sales/sales_order_entry.php:717
+#: sales/sales_order_entry.php:728 sales/sales_order_entry.php.orig:727
 msgid "Validate changes and update document"
 msgstr ""
 
-#: sales/sales_order_entry.php:716
+#: sales/sales_order_entry.php:717 sales/sales_order_entry.php:721
+#: sales/sales_order_entry.php:732 sales/sales_order_entry.php.orig:731
 msgid ""
 "Cancels document entry or removes sales order when editing an old document"
 msgstr ""
@@ -12052,10 +12757,13 @@ msgid "Customer Allocations"
 msgstr ""
 
 #: sales/allocations/customer_allocation_main.php:32
-#: sales/manage/customer_branches.php:280 sales/manage/customers.php:280
+#: sales/manage/customer_branches.php:280 sales/manage/customers.php:322
+#: sales/manage/customers.php.orig:319
 #: sales/inquiry/customer_allocation_inquiry.php:42
-#: sales/inquiry/customer_inquiry.php:44
-#: sales/inquiry/sales_orders_view.php:234
+#: sales/inquiry/customer_inquiry.php:48
+#: sales/inquiry/customer_inquiry.php.orig:48
+#: sales/inquiry/sales_orders_view.php:243
+#: sales/inquiry/sales_orders_view.php.orig:241 sales/manage/customers.php:324
 msgid "Select a customer: "
 msgstr ""
 
@@ -12177,24 +12885,26 @@ msgstr ""
 msgid "Branch Short Name:"
 msgstr ""
 
-#: sales/manage/customer_branches.php:241
+#: sales/manage/customer_branches.php:241 sales/manage/customers.php:290
+#: sales/manage/customers.php.orig:287 sales/manage/customers.php:256
 msgid "Sales Person:"
 msgstr ""
 
-#: sales/manage/customer_branches.php:242
+#: sales/manage/customer_branches.php:242 sales/manage/customers.php:291
+#: sales/manage/customers.php.orig:288 sales/manage/customers.php:293
 msgid "Sales Area:"
 msgstr ""
 
 #: sales/manage/customer_branches.php:243
-#: sales/manage/recurrent_invoices.php:156
+#: sales/manage/recurrent_invoices.php:174
 msgid "Sales Group:"
 msgstr ""
 
-#: sales/manage/customer_branches.php:244
+#: sales/manage/customer_branches.php:244 sales/manage/customers.php:291
 msgid "Default Inventory Location:"
 msgstr ""
 
-#: sales/manage/customer_branches.php:245
+#: sales/manage/customer_branches.php:245 sales/manage/customers.php:292
 msgid "Default Shipping Company:"
 msgstr ""
 
@@ -12237,147 +12947,174 @@ msgstr ""
 
 #: sales/manage/customer_branches.php:319
 #: sales/includes/ui/sales_order_ui.inc:299
+#: sales/includes/ui/sales_order_ui.inc:303
 msgid ""
 "The selected customer does not have any branches. Please create at least one "
 "branch."
 msgstr ""
 
-#: sales/manage/customers.php:35
+#: sales/manage/customers.php:42 sales/manage/customers.php.orig:39
 msgid "The customer name cannot be empty."
 msgstr ""
 
-#: sales/manage/customers.php:42
+#: sales/manage/customers.php:49 sales/manage/customers.php.orig:46
 msgid "The customer short name cannot be empty."
 msgstr ""
 
-#: sales/manage/customers.php:49
+#: sales/manage/customers.php:56 sales/manage/customers.php.orig:53
 msgid "The credit limit must be numeric and not less than zero."
 msgstr ""
 
-#: sales/manage/customers.php:56
+#: sales/manage/customers.php:63 sales/manage/customers.php.orig:60
 msgid ""
 "The payment discount must be numeric and is expected to be less than 100% "
 "and greater than or equal to 0."
 msgstr ""
 
-#: sales/manage/customers.php:63
+#: sales/manage/customers.php:70 sales/manage/customers.php.orig:67
 msgid ""
 "The discount percentage must be numeric and is expected to be less than 100% "
 "and greater than or equal to 0."
 msgstr ""
 
-#: sales/manage/customers.php:91
+#: sales/manage/customers.php:98 sales/manage/customers.php.orig:95
 msgid "Customer has been updated."
 msgstr ""
 
-#: sales/manage/customers.php:105
+#: sales/manage/customers.php:127 sales/manage/customers.php.orig:124
 msgid "A new customer has been added."
 msgstr ""
 
-#: sales/manage/customers.php:127
+#: sales/manage/customers.php:130 sales/manage/customers.php.orig:127
+msgid ""
+"A default Branch has been automatically created, please check default Branch "
+"values by using link below."
+msgstr ""
+
+#: sales/manage/customers.php:153 sales/manage/customers.php.orig:150
 msgid ""
 "This customer cannot be deleted because there are transactions that refer to "
 "it."
 msgstr ""
 
-#: sales/manage/customers.php:134
+#: sales/manage/customers.php:160 sales/manage/customers.php.orig:157
 msgid ""
 "Cannot delete the customer record because orders have been created against "
 "it."
 msgstr ""
 
-#: sales/manage/customers.php:141
+#: sales/manage/customers.php:167 sales/manage/customers.php.orig:164
 msgid ""
 "Cannot delete this customer because there are branch records set up against "
 "it."
 msgstr ""
 
-#: sales/manage/customers.php:152
+#: sales/manage/customers.php:178 sales/manage/customers.php.orig:175
 msgid "Selected customer has been deleted."
 msgstr ""
 
-#: sales/manage/customers.php:199
+#: sales/manage/customers.php:227 sales/manage/customers.php.orig:224
 msgid "Name and Address"
 msgstr ""
 
-#: sales/manage/customers.php:201
+#: sales/manage/customers.php:229 sales/manage/customers.php.orig:226
 msgid "Customer Name:"
 msgstr ""
 
-#: sales/manage/customers.php:202
+#: sales/manage/customers.php:230 sales/manage/customers.php.orig:227
 msgid "Customer Short Name:"
 msgstr ""
 
-#: sales/manage/customers.php:210 sales/manage/customers.php:214
+#: sales/manage/customers.php:238 sales/manage/customers.php:242
+#: sales/manage/customers.php.orig:235 sales/manage/customers.php.orig:239
 msgid "Customer's Currency:"
 msgstr ""
 
-#: sales/manage/customers.php:217
+#: sales/manage/customers.php:245 sales/manage/customers.php.orig:242
 msgid "Sales Type/Price List:"
 msgstr ""
 
-#: sales/manage/customers.php:220
+#: sales/manage/customers.php:248 sales/manage/customers.php.orig:245
 msgid "Customer status:"
 msgstr ""
 
-#: sales/manage/customers.php:226
+#: sales/manage/customers.php:261 sales/manage/customers.php.orig:258
+#: sales/manage/customers.php:262
 msgid "Discount Percent:"
 msgstr ""
 
-#: sales/manage/customers.php:227
+#: sales/manage/customers.php:262 sales/manage/customers.php.orig:259
+#: sales/manage/customers.php:263
 msgid "Prompt Payment Discount Percent:"
 msgstr ""
 
-#: sales/manage/customers.php:231
+#: sales/manage/customers.php:266 sales/manage/customers.php.orig:263
+#: sales/manage/customers.php:267
 msgid "Credit Status:"
 msgstr ""
 
-#: sales/manage/customers.php:244
+#: sales/manage/customers.php:279 sales/manage/customers.php.orig:276
+#: sales/manage/customers.php:280
 msgid "Customer branches"
 msgstr ""
 
-#: sales/manage/customers.php:246
+#: sales/manage/customers.php:281 sales/manage/customers.php.orig:278
+#: sales/manage/customers.php:282
 msgid "Select or &Add"
 msgstr ""
 
-#: sales/manage/customers.php:246
+#: sales/manage/customers.php:281 sales/manage/customers.php.orig:278
+#: sales/manage/customers.php:282
 msgid "&Add or Edit "
 msgstr ""
 
-#: sales/manage/customers.php:257
+#: sales/manage/customers.php:299 sales/manage/customers.php.orig:296
+#: sales/manage/customers.php:301
 msgid "Add New Customer"
 msgstr ""
 
-#: sales/manage/customers.php:261
+#: sales/manage/customers.php:303 sales/manage/customers.php.orig:300
+#: sales/manage/customers.php:305
 msgid "Update Customer"
 msgstr ""
 
-#: sales/manage/customers.php:262
+#: sales/manage/customers.php:304 sales/manage/customers.php.orig:301
+#: sales/manage/customers.php:306
 msgid "Update customer data"
 msgstr ""
 
-#: sales/manage/customers.php:263
+#: sales/manage/customers.php:305 sales/manage/customers.php.orig:302
+#: sales/manage/customers.php:307
 msgid "Select this customer and return to document entry."
 msgstr ""
 
-#: sales/manage/customers.php:264
+#: sales/manage/customers.php:306 sales/manage/customers.php.orig:303
+#: sales/manage/customers.php:308
 msgid "Delete Customer"
 msgstr ""
 
-#: sales/manage/customers.php:265
+#: sales/manage/customers.php:307 sales/manage/customers.php.orig:304
+#: sales/manage/customers.php:309
 msgid "Delete customer data if have been never used"
 msgstr ""
 
-#: sales/manage/customers.php:272
+#: sales/manage/customers.php:314 sales/manage/customers.php.orig:311
+#: sales/manage/customers.php:316
 msgid ""
 "There are no sales types defined. Please define at least one sales type "
 "before adding a customer."
 msgstr ""
 
-#: sales/manage/customers.php:281
+#: sales/manage/customers.php:323 sales/manage/customers.php.orig:320
+#: sales/manage/customers.php:325
 msgid "New customer"
 msgstr ""
 
+#: sales/manage/customers.php:345 sales/manage/customers.php.orig:342
+#: sales/manage/customers.php:347
+msgid "Sales &Orders"
+msgstr ""
+
 #: sales/manage/recurrent_invoices.php:24
 msgid "Recurrent Invoices"
 msgstr ""
@@ -12387,35 +13124,35 @@ msgstr ""
 msgid "The area description cannot be empty."
 msgstr ""
 
-#: sales/manage/recurrent_invoices.php:46
+#: sales/manage/recurrent_invoices.php:63
 msgid "Selected recurrent invoice has been updated"
 msgstr ""
 
-#: sales/manage/recurrent_invoices.php:52
+#: sales/manage/recurrent_invoices.php:69
 msgid "New recurrent invoice has been added"
 msgstr ""
 
-#: sales/manage/recurrent_invoices.php:69
+#: sales/manage/recurrent_invoices.php:86
 msgid "Selected recurrent invoice has been deleted"
 msgstr ""
 
-#: sales/manage/recurrent_invoices.php:149
+#: sales/manage/recurrent_invoices.php:167
 msgid "Template:"
 msgstr ""
 
-#: sales/manage/recurrent_invoices.php:158
+#: sales/manage/recurrent_invoices.php:176
 msgid "Days:"
 msgstr ""
 
-#: sales/manage/recurrent_invoices.php:160
+#: sales/manage/recurrent_invoices.php:178
 msgid "Monthly:"
 msgstr ""
 
-#: sales/manage/recurrent_invoices.php:162
+#: sales/manage/recurrent_invoices.php:180
 msgid "Begin:"
 msgstr ""
 
-#: sales/manage/recurrent_invoices.php:164
+#: sales/manage/recurrent_invoices.php:182
 msgid "End:"
 msgstr ""
 
@@ -12499,6 +13236,12 @@ msgstr ""
 msgid "New sales person data have been added"
 msgstr ""
 
+#: sales/manage/sales_people.php:76
+msgid ""
+"Cannot delete this sales-person because branches are set up referring to "
+"this sales-person - first alter the branches concerned."
+msgstr ""
+
 #: sales/manage/sales_people.php:81
 msgid "Selected sales person data have been deleted"
 msgstr ""
@@ -12791,20 +13534,29 @@ msgstr ""
 msgid "Allocation"
 msgstr ""
 
-#: sales/inquiry/customer_inquiry.php:26
+#: sales/inquiry/customer_allocation_inquiry.php:116
+msgid "Payment"
+msgstr ""
+
+#: sales/inquiry/customer_inquiry.php:28
+#: sales/inquiry/customer_inquiry.php.orig:28
 msgid "Customer Transactions"
 msgstr ""
 
-#: sales/inquiry/customer_inquiry.php:68
+#: sales/inquiry/customer_inquiry.php:72
+#: sales/inquiry/customer_inquiry.php.orig:72
 msgid "CUSTOMER ACCOUNT IS ON HOLD"
 msgstr ""
 
-#: sales/inquiry/customer_inquiry.php:193
+#: sales/inquiry/customer_inquiry.php:205
+#: sales/inquiry/customer_inquiry.php.orig:205
 msgid "Print Receipt"
 msgstr ""
 
-#: sales/inquiry/customer_inquiry.php:223
-#: sales/inquiry/customer_inquiry.php:236
+#: sales/inquiry/customer_inquiry.php:235
+#: sales/inquiry/customer_inquiry.php:248
+#: sales/inquiry/customer_inquiry.php.orig:235
+#: sales/inquiry/customer_inquiry.php.orig:248
 msgid "RB"
 msgstr ""
 
@@ -12847,69 +13599,86 @@ msgstr ""
 msgid "Batch Invoicing"
 msgstr ""
 
-#: sales/inquiry/sales_orders_view.php:46
+#: sales/inquiry/sales_orders_view.php:40
+#: sales/inquiry/sales_orders_view.php.orig:48
 msgid "Search Outstanding Sales Orders"
 msgstr ""
 
-#: sales/inquiry/sales_orders_view.php:51
+#: sales/inquiry/sales_orders_view.php:45
+#: sales/inquiry/sales_orders_view.php.orig:53
 msgid "Search Template for Invoicing"
 msgstr ""
 
-#: sales/inquiry/sales_orders_view.php:56
+#: sales/inquiry/sales_orders_view.php:50
+#: sales/inquiry/sales_orders_view.php.orig:58
 msgid "Select Template for Delivery"
 msgstr ""
 
-#: sales/inquiry/sales_orders_view.php:61
+#: sales/inquiry/sales_orders_view.php:55
+#: sales/inquiry/sales_orders_view.php.orig:63
 msgid "Search All Sales Orders"
 msgstr ""
 
-#: sales/inquiry/sales_orders_view.php:67
+#: sales/inquiry/sales_orders_view.php:61
+#: sales/inquiry/sales_orders_view.php.orig:69
 msgid "Search All Sales Quotations"
 msgstr ""
 
-#: sales/inquiry/sales_orders_view.php:131
+#: sales/inquiry/sales_orders_view.php:136
+#: sales/inquiry/sales_orders_view.php.orig:134
 msgid "Dispatch"
 msgstr ""
 
-#: sales/inquiry/sales_orders_view.php:171
+#: sales/inquiry/sales_orders_view.php:178
+#: sales/inquiry/sales_orders_view.php.orig:176
 msgid "Set this order as a template for direct deliveries/invoices"
 msgstr ""
 
-#: sales/inquiry/sales_orders_view.php:236
+#: sales/inquiry/sales_orders_view.php:245
+#: sales/inquiry/sales_orders_view.php.orig:243
 msgid "Show All:"
 msgstr ""
 
-#: sales/inquiry/sales_orders_view.php:253
+#: sales/inquiry/sales_orders_view.php:262
+#: sales/inquiry/sales_orders_view.php.orig:260
 msgid "Order #"
 msgstr ""
 
-#: sales/inquiry/sales_orders_view.php:257
-#: sales/inquiry/sales_orders_view.php:271
+#: sales/inquiry/sales_orders_view.php:266
+#: sales/inquiry/sales_orders_view.php:280
+#: sales/inquiry/sales_orders_view.php.orig:264
+#: sales/inquiry/sales_orders_view.php.orig:278
 msgid "Cust Order Ref"
 msgstr ""
 
-#: sales/inquiry/sales_orders_view.php:260
-#: sales/inquiry/sales_orders_view.php:274
+#: sales/inquiry/sales_orders_view.php:269
+#: sales/inquiry/sales_orders_view.php:283
+#: sales/inquiry/sales_orders_view.php.orig:267
+#: sales/inquiry/sales_orders_view.php.orig:281
 msgid "Delivery To"
 msgstr ""
 
-#: sales/inquiry/sales_orders_view.php:267
+#: sales/inquiry/sales_orders_view.php:276
+#: sales/inquiry/sales_orders_view.php.orig:274
 msgid "Quote #"
 msgstr ""
 
-#: sales/inquiry/sales_orders_view.php:272
+#: sales/inquiry/sales_orders_view.php:281
+#: sales/inquiry/sales_orders_view.php.orig:279
 msgid "Quote Date"
 msgstr ""
 
-#: sales/inquiry/sales_orders_view.php:275
+#: sales/inquiry/sales_orders_view.php:284
+#: sales/inquiry/sales_orders_view.php.orig:282
 msgid "Quote Total"
 msgstr ""
 
-#: sales/inquiry/sales_orders_view.php:300
+#: sales/inquiry/sales_orders_view.php:311
+#: sales/inquiry/sales_orders_view.php.orig:309
 msgid "Tmpl"
 msgstr ""
 
-#: sales/includes/cart_class.inc:346
+#: sales/includes/cart_class.inc:347 sales/includes/cart_class.inc:352
 msgid "You have to enter valid stock code or nonempty description"
 msgstr ""
 
@@ -12919,7 +13688,7 @@ msgid ""
 "browser tab. You cannot edit more than one sales document at once."
 msgstr ""
 
-#: sales/includes/db/custalloc_db.inc:265
+#: sales/includes/db/custalloc_db.inc:292
 msgid ""
 "Unsuspected overallocation happened due to sparse credit notes exists for "
 "this invoice.\n"
@@ -12928,40 +13697,52 @@ msgid ""
 msgstr ""
 
 #: sales/includes/db/sales_invoice_db.inc:173
+#: sales/includes/db/sales_invoice_db.inc.orig:176
+#: sales/includes/db/sales_invoice_db.inc:174
 msgid "Cash invoice"
 msgstr ""
 
 #: sales/includes/db/sales_order_db.inc:107
 #: sales/includes/db/sales_order_db.inc:259
+#: sales/includes/db/sales_order_db.inc.orig:107
+#: sales/includes/db/sales_order_db.inc.orig:259
 msgid "Stocks below Re-Order Level at "
 msgstr ""
 
 #: sales/includes/db/sales_order_db.inc:110
 #: sales/includes/db/sales_order_db.inc:264
+#: sales/includes/db/sales_order_db.inc.orig:110
+#: sales/includes/db/sales_order_db.inc.orig:264
 msgid "Below"
 msgstr ""
 
 #: sales/includes/db/sales_order_db.inc:111
 #: sales/includes/db/sales_order_db.inc:265
+#: sales/includes/db/sales_order_db.inc.orig:111
+#: sales/includes/db/sales_order_db.inc.orig:265
 msgid "Please reorder"
 msgstr ""
 
 #: sales/includes/db/sales_order_db.inc:139
+#: sales/includes/db/sales_order_db.inc.orig:139
 msgid "Deleted."
 msgstr ""
 
 #: sales/includes/ui/sales_credit_ui.inc:94
 #: sales/includes/ui/sales_order_ui.inc:379
+#: sales/includes/ui/sales_order_ui.inc:383
 msgid "Customer Currency:"
 msgstr ""
 
 #: sales/includes/ui/sales_credit_ui.inc:112
-#: sales/includes/ui/sales_order_ui.inc:638
+#: sales/includes/ui/sales_order_ui.inc:639
+#: sales/includes/ui/sales_order_ui.inc:643
 msgid "Shipping Company:"
 msgstr ""
 
 #: sales/includes/ui/sales_credit_ui.inc:114
 #: sales/includes/ui/sales_order_ui.inc:386
+#: sales/includes/ui/sales_order_ui.inc:390
 msgid "Customer Discount:"
 msgstr ""
 
@@ -12970,102 +13751,129 @@ msgid "This item is already on this document. You have been warned."
 msgstr ""
 
 #: sales/includes/ui/sales_order_ui.inc:104
+#: sales/includes/ui/sales_order_ui.inc:106
 msgid ""
 "The selected customer and branch are not valid, or the customer does not "
 "have any branches."
 msgstr ""
 
 #: sales/includes/ui/sales_order_ui.inc:224
+#: sales/includes/ui/sales_order_ui.inc:228
 msgid "Shipping Charge"
 msgstr ""
 
 #: sales/includes/ui/sales_order_ui.inc:297
+#: sales/includes/ui/sales_order_ui.inc:301
 msgid "No customer found for entered text."
 msgstr ""
 
 #: sales/includes/ui/sales_order_ui.inc:323
+#: sales/includes/ui/sales_order_ui.inc:327
 #, php-format
 msgid "Customer's payment terms '%s' cannot be selected on this POS"
 msgstr ""
 
 #: sales/includes/ui/sales_order_ui.inc:373
+#: sales/includes/ui/sales_order_ui.inc:377
 msgid "Reference number unique for this document type"
 msgstr ""
 
+#: sales/includes/ui/sales_order_ui.inc:413
 #: sales/includes/ui/sales_order_ui.inc:415
+#: sales/includes/ui/sales_order_ui.inc:417
+#: sales/includes/ui/sales_order_ui.inc:419
 msgid "Price List:"
 msgstr ""
 
 #: sales/includes/ui/sales_order_ui.inc:432
+#: sales/includes/ui/sales_order_ui.inc:436
 msgid "Date of order receive"
 msgstr ""
 
 #: sales/includes/ui/sales_order_ui.inc:582
+#: sales/includes/ui/sales_order_ui.inc:586
 msgid "Cash payment"
 msgstr ""
 
 #: sales/includes/ui/sales_order_ui.inc:585
-#: sales/includes/ui/sales_order_ui.inc:616
+#: sales/includes/ui/sales_order_ui.inc:617
+#: sales/includes/ui/sales_order_ui.inc:589
+#: sales/includes/ui/sales_order_ui.inc:621
 msgid "Deliver from Location:"
 msgstr ""
 
 #: sales/includes/ui/sales_order_ui.inc:588
+#: sales/includes/ui/sales_order_ui.inc:592
 msgid "Cash account:"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:594
+#: sales/includes/ui/sales_order_ui.inc:595
+#: sales/includes/ui/sales_order_ui.inc:599
 msgid "Delivery Details"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:599
+#: sales/includes/ui/sales_order_ui.inc:600
+#: sales/includes/ui/sales_order_ui.inc:604
 msgid "Invoice Delivery Details"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:600
+#: sales/includes/ui/sales_order_ui.inc:601
+#: sales/includes/ui/sales_order_ui.inc:605
 msgid "Invoice before"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:604
+#: sales/includes/ui/sales_order_ui.inc:605
+#: sales/includes/ui/sales_order_ui.inc:609
 msgid "Quotation Delivery Details"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:609
+#: sales/includes/ui/sales_order_ui.inc:610
+#: sales/includes/ui/sales_order_ui.inc:614
 msgid "Order Delivery Details"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:622
+#: sales/includes/ui/sales_order_ui.inc:623
+#: sales/includes/ui/sales_order_ui.inc:627
 msgid "Enter requested day of delivery"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:623
+#: sales/includes/ui/sales_order_ui.inc:624
+#: sales/includes/ui/sales_order_ui.inc:628
 msgid "Enter Valid until Date"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:624
+#: sales/includes/ui/sales_order_ui.inc:625
+#: sales/includes/ui/sales_order_ui.inc:629
 msgid "Deliver To:"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:625
+#: sales/includes/ui/sales_order_ui.inc:626
+#: sales/includes/ui/sales_order_ui.inc:630
 msgid "Additional identifier for delivery e.g. name of receiving person"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:628
+#: sales/includes/ui/sales_order_ui.inc:629
+#: sales/includes/ui/sales_order_ui.inc:633
 msgid "Delivery address. Default is address of customer branch"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:632
+#: sales/includes/ui/sales_order_ui.inc:633
+#: sales/includes/ui/sales_order_ui.inc:637
 msgid "Contact Phone Number:"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:633
+#: sales/includes/ui/sales_order_ui.inc:634
+#: sales/includes/ui/sales_order_ui.inc:638
 msgid "Phone number of ordering person. Defaults to branch phone number"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:634
+#: sales/includes/ui/sales_order_ui.inc:635
+#: sales/includes/ui/sales_order_ui.inc:639
 msgid "Customer Reference:"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:635
+#: sales/includes/ui/sales_order_ui.inc:636
+#: sales/includes/ui/sales_order_ui.inc:640
 msgid "Customer reference number for this order (if any)"
 msgstr ""
 
@@ -13134,45 +13942,41 @@ msgstr ""
 msgid "The tax group name cannot be empty."
 msgstr ""
 
-#: taxes/tax_groups.php:84
+#: taxes/tax_groups.php:61
 msgid "Selected tax group has been updated"
 msgstr ""
 
-#: taxes/tax_groups.php:89
+#: taxes/tax_groups.php:66
 msgid "New tax group has been added"
 msgstr ""
 
-#: taxes/tax_groups.php:104
+#: taxes/tax_groups.php:81
 msgid ""
 "Cannot delete this tax group because customer branches been created "
 "referring to it."
 msgstr ""
 
-#: taxes/tax_groups.php:110
+#: taxes/tax_groups.php:87
 msgid ""
 "Cannot delete this tax group because suppliers been created referring to it."
 msgstr ""
 
-#: taxes/tax_groups.php:127
+#: taxes/tax_groups.php:104
 msgid "Selected tax group has been deleted"
 msgstr ""
 
-#: taxes/tax_groups.php:146
+#: taxes/tax_groups.php:124
 msgid "Shipping Tax"
 msgstr ""
 
-#: taxes/tax_groups.php:205
+#: taxes/tax_groups.php:168
 msgid "Tax applied to Shipping:"
 msgstr ""
 
-#: taxes/tax_groups.php:209
+#: taxes/tax_groups.php:172
 msgid "Select the taxes that are included in this group."
 msgstr ""
 
-#: taxes/tax_groups.php:214
-msgid "Rate (%)"
-msgstr ""
-
 #: taxes/tax_types.php:16
 msgid "Tax Types"
 msgstr ""
@@ -13236,15 +14040,16 @@ msgstr ""
 msgid "Purchasing GL Account:"
 msgstr ""
 
-#: themes/default/renderer.php:27
+#: themes/default/renderer.php:27 themes/default/renderer.php:28
 msgid "Main Menu"
 msgstr ""
 
 #: themes/default/renderer.php:53 themes/default/renderer.php:76
+#: themes/default/renderer.php:54 themes/default/renderer.php:80
 msgid "Help"
 msgstr ""
 
-#: themes/default/renderer.php:71
+#: themes/default/renderer.php:71 themes/default/renderer.php:75
 msgid "Preferences"
 msgstr ""
 
@@ -13288,7 +14093,7 @@ msgstr ""
 msgid "Cannot store next sales order reference."
 msgstr ""
 
-#: sql/alter2.2.php:246
+#: sql/alter2.2.php:250
 msgid ""
 "Cannot upgrade extensions system: file /modules/installed_modules.php is not "
 "writeable"
@@ -13297,3 +14102,36 @@ msgstr ""
 #: sql/alter2.3.php:20
 msgid "Upgrade from version 2.2 to 2.3"
 msgstr ""
+
+#: admin/attachments.php:84
+msgid "No transaction has been selected."
+msgstr ""
+
+#: admin/attachments.php:86
+msgid "Select attachment file."
+msgstr ""
+
+#: sales/create_recurrent_invoices.php:127
+msgid "Invoice date:"
+msgstr ""
+
+#: access/login.php:36
+msgid "Too many failed login attempts.<br>Please wait a while or try later."
+msgstr ""
+
+#: admin/create_coy.php:293
+msgid ""
+"If no Admin Password is entered, the new Admin Password will be "
+"'<b>password</b>' by default "
+msgstr ""
+
+#: gl/manage/gl_accounts.php:102
+msgid "Account not added, possible duplicate Account Code."
+msgstr ""
+
+#: includes/session.inc:185
+#, php-format
+msgid ""
+"Brute force attack on account '%s' detected. Access for non-logged users "
+"temporarily blocked."
+msgstr ""