Merged last changes from stable.

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

diff --git a/lang/new_language_template/LC_MESSAGES/empty.po b/lang/new_language_template/LC_MESSAGES/empty.po
index 39e655ec3c0380206533391d84694ea9b0135ff1..0adc91ca21c7f06e4f72babc5c8680882a7db1e8 100644 (file)
--- a/lang/new_language_template/LC_MESSAGES/empty.po
+++ b/lang/new_language_template/LC_MESSAGES/empty.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-09-18 14:10+0200\n"
+"POT-Creation-Date: 2013-10-27 08:46+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -24,8 +24,8 @@ msgstr ""
 
 #: ../frontaccounting.php:75
 #: ../access/logout.php:18
-#: ../themes/default/renderer.php:53
-#: ../themes/default/renderer.php:82
+#: ../themes/default/renderer.php:70
+#: ../themes/default/renderer.php:83
 msgid "Logout"
 msgstr ""
 
@@ -46,45 +46,44 @@ msgid "Too many failed login attempts.<br>Please wait a while or try later."
 msgstr ""
 
 #: ../access/login.php:49
-#: ../access/login.php:79
+#: ../access/login.php:80
 msgid "Authorization timeout"
 msgstr ""
 
 #: ../access/login.php:49
-#: ../access/login.php:86
+#: ../access/login.php:87
 msgid "Login"
 msgstr ""
 
-#: ../access/login.php:86
+#: ../access/login.php:87
 #: ../admin/inst_upgrade.php:141
 msgid "Version"
 msgstr ""
 
-#: ../access/login.php:89
+#: ../access/login.php:90
 msgid "User name"
 msgstr ""
 
-#: ../access/login.php:93
-#: ../admin/change_current_user_password.php:78
+#: ../access/login.php:94
 #: ../admin/users.php:191
 msgid "Password:"
 msgstr ""
 
-#: ../access/login.php:103
-#: ../access/login.php:110
+#: ../access/login.php:104
+#: ../access/login.php:111
 #: ../admin/create_coy.php:253
 #: ../admin/create_coy.php:336
 #: ../includes/sysnames.inc:194
 msgid "Company"
 msgstr ""
 
-#: ../access/login.php:117
+#: ../access/login.php:118
 msgid "Login -->"
 msgstr ""
 
-#: ../access/login.php:148
-#: ../admin/display_prefs.php:111
-#: ../themes/default/renderer.php:127
+#: ../access/login.php:149
+#: ../admin/display_prefs.php:112
+#: ../themes/default/renderer.php:129
 msgid "Theme:"
 msgstr ""
 
@@ -96,31 +95,31 @@ msgstr ""
 msgid "Click here to Login Again."
 msgstr ""
 
-#: ../admin/attachments.php:72
+#: ../admin/attachments.php:74
 msgid "Attach Documents"
 msgstr ""
 
-#: ../admin/attachments.php:84
-msgid "No transaction has been selected."
+#: ../admin/attachments.php:86
+msgid "Selected transaction does not exists."
 msgstr ""
 
-#: ../admin/attachments.php:86
+#: ../admin/attachments.php:88
 msgid "Select attachment file."
 msgstr ""
 
-#: ../admin/attachments.php:121
+#: ../admin/attachments.php:125
 msgid "Attachment has been inserted."
 msgstr ""
 
-#: ../admin/attachments.php:127
+#: ../admin/attachments.php:131
 msgid "Attachment has been updated."
 msgstr ""
 
-#: ../admin/attachments.php:140
+#: ../admin/attachments.php:146
 msgid "Attachment has been deleted."
 msgstr ""
 
-#: ../admin/attachments.php:158
+#: ../admin/attachments.php:164
 #: ../admin/view_print_transaction.php:72
 #: ../gl/inquiry/journal_inquiry.php:47
 #: ../inventory/includes/item_adjustments_ui.inc:47
@@ -130,125 +129,13 @@ msgstr ""
 #: ../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.orig:47
 msgid "Type:"
 msgstr ""
 
-#: ../admin/attachments.php:170
-#: ../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:232
-#: ../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:264
-#: ../inventory/inquiry/stock_movements.php:77
-#: ../inventory/inquiry/stock_movements.php.orig:79
-#: ../manufacturing/search_work_orders.php:159
-#: ../manufacturing/includes/manufacturing_ui.inc:157
-#: ../manufacturing/includes/manufacturing_ui.inc:200
-#: ../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/view/view_po.php:115
-#: ../purchasing/view/view_po.php:140
-#: ../purchasing/inquiry/po_search_completed.php:120
-#: ../purchasing/inquiry/po_search_completed.php.orig:119
-#: ../purchasing/inquiry/po_search.php:130
-#: ../purchasing/inquiry/supplier_allocation_inquiry.php:126
-#: ../purchasing/inquiry/supplier_inquiry.php:174
-#: ../purchasing/inquiry/supplier_inquiry.php.orig:171
-#: ../purchasing/allocations/supplier_allocation_main.php:95
-#: ../reporting/rep101.php:130
-#: ../reporting/rep201.php:118
-#: ../reporting/rep203.php:91
-#: ../reporting/rep601.php:76
-#: ../reporting/rep602.php:80
-#: ../reporting/rep704.php:79
-#: ../reporting/rep704.php:82
-#: ../reporting/rep704.php:85
-#: ../reporting/rep710.php:76
-#: ../reporting/includes/doctext.inc:167
-#: ../reporting/includes/doctext.inc:208
-#: ../reporting/includes/doctext.inc:246
-#: ../sales/allocations/customer_allocation_main.php:94
-#: ../sales/view/view_sales_order.php:109
-#: ../sales/view/view_sales_order.php:142
-#: ../sales/view/view_sales_order.php:179
-#: ../sales/view/view_sales_order.php.orig:96
-#: ../sales/view/view_sales_order.php.orig:129
-#: ../sales/view/view_sales_order.php.orig:161
-#: ../sales/inquiry/customer_allocation_inquiry.php:145
-#: ../sales/inquiry/customer_inquiry.php:201
-msgid "#"
-msgstr ""
-
-#: ../admin/attachments.php:170
-#: ../admin/attachments.php:220
-#: ../admin/crm_categories.php:88
-#: ../admin/inst_upgrade.php:141
-#: ../admin/payment_terms.php:127
-#: ../admin/printers.php:84
-#: ../admin/print_profiles.php:148
-#: ../gl/inquiry/tax_inquiry.php:82
-#: ../gl/manage/gl_quick_entries.php:186
-#: ../gl/manage/gl_quick_entries.php:224
-#: ../includes/ui/view_package.php:22
-#: ../inventory/manage/item_codes.php:125
-#: ../inventory/manage/item_units.php:94
-#: ../inventory/manage/movement_types.php:95
-#: ../inventory/manage/sales_kits.php:40
-#: ../inventory/view/view_adjustment.php:56
-#: ../inventory/view/view_transfer.php:56
-#: ../manufacturing/manage/bom_edit.php:70
-#: ../manufacturing/includes/manufacturing_ui.inc:28
-#: ../purchasing/includes/ui/invoice_ui.inc:492
-#: ../purchasing/includes/ui/invoice_ui.inc:504
-#: ../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:112
-#: ../reporting/rep305.php:98
-#: ../reporting/rep401.php:69
-#: ../sales/create_recurrent_invoices.php:132
-#: ../sales/manage/credit_status.php:97
-#: ../sales/manage/recurrent_invoices.php:102
-#: ../sales/inquiry/sales_orders_view.php:317
-#: ../sales/inquiry/sales_orders_view.php:321
-#: ../taxes/tax_groups.php:123
-#: ../taxes/tax_groups.php.orig:125
-#: ../taxes/tax_groups.php.sav:125
-#: ../taxes/tax_types.php:115
-msgid "Description"
-msgstr ""
-
-#: ../admin/attachments.php:170
-#: ../admin/backups.php:63
-#: ../admin/backups.php:149
-msgid "Filename"
-msgstr ""
-
-#: ../admin/attachments.php:170
-msgid "Size"
-msgstr ""
-
-#: ../admin/attachments.php:170
-msgid "Filetype"
-msgstr ""
-
-#: ../admin/attachments.php:170
-msgid "Date Uploaded"
-msgstr ""
-
-#: ../admin/attachments.php:185
+#: ../admin/attachments.php:180
 #: ../admin/create_coy.php:277
-#: ../admin/crm_categories.php:106
+#: ../admin/crm_categories.php:115
 #: ../admin/fiscalyears.php:164
 #: ../admin/inst_lang.php:100
 #: ../admin/payment_terms.php:142
@@ -265,15 +152,13 @@ msgstr ""
 #: ../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:158
+#: ../gl/includes/ui/gl_bank_ui.inc:186
 #: ../gl/includes/ui/gl_journal_ui.inc:134
 #: ../includes/ui/contacts_view.inc:64
 #: ../includes/ui/simple_crud_class.inc:52
-#: ../includes/ui/ui_input.inc:960
-#: ../inventory/prices.php:145
-#: ../inventory/purchasing_data.php:146
-#: ../inventory/purchasing_data.php.orig:75
+#: ../includes/ui/ui_input.inc:961
+#: ../inventory/prices.php:158
+#: ../inventory/purchasing_data.php:164
 #: ../inventory/includes/item_adjustments_ui.inc:87
 #: ../inventory/includes/stock_transfers_ui.inc:79
 #: ../inventory/manage/item_categories.php:121
@@ -286,8 +171,7 @@ 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:542
-#: ../purchasing/includes/ui/po_ui.inc:273
+#: ../purchasing/includes/ui/invoice_ui.inc.orig:542
 #: ../purchasing/includes/ui/po_ui.inc.orig:273
 #: ../purchasing/inquiry/po_search_completed.php:105
 #: ../purchasing/inquiry/po_search_completed.php.orig:104
@@ -301,33 +185,33 @@ msgstr ""
 #: ../sales/manage/sales_points.php:99
 #: ../sales/manage/sales_types.php:121
 #: ../sales/inquiry/sales_deliveries_view.php:154
-#: ../sales/inquiry/sales_orders_view.php:136
+#: ../sales/inquiry/sales_orders_view.php.orig:136
 #: ../sales/includes/ui/sales_credit_ui.inc:197
-#: ../sales/includes/ui/sales_order_ui.inc.orig:202
+#: ../sales/includes/ui/sales_order_ui.inc:209
 #: ../taxes/item_tax_types.php:139
+#: ../taxes/sav.tax_types.php:211
+#: ../taxes/sav.tax_types.php:262
 #: ../taxes/tax_groups.php:137
-#: ../taxes/tax_groups.php.orig:139
-#: ../taxes/tax_groups.php.sav:139
 #: ../taxes/tax_types.php:132
 msgid "Edit"
 msgstr ""
 
-#: ../admin/attachments.php:186
+#: ../admin/attachments.php:185
 #: ../gl/inquiry/journal_inquiry.php:135
 msgid "View"
 msgstr ""
 
-#: ../admin/attachments.php:187
+#: ../admin/attachments.php:190
 msgid "Download"
 msgstr ""
 
-#: ../admin/attachments.php:188
+#: ../admin/attachments.php:195
 #: ../admin/create_coy.php:278
-#: ../admin/crm_categories.php:110
+#: ../admin/crm_categories.php:119
 #: ../admin/fiscalyears.php:166
 #: ../admin/inst_chart.php:80
 #: ../admin/inst_lang.php:109
-#: ../admin/inst_module.php:144
+#: ../admin/inst_module.php:143
 #: ../admin/inst_theme.php:102
 #: ../admin/payment_terms.php:143
 #: ../admin/printers.php:97
@@ -342,15 +226,13 @@ msgstr ""
 #: ../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:160
+#: ../gl/includes/ui/gl_bank_ui.inc:188
 #: ../gl/includes/ui/gl_journal_ui.inc:136
 #: ../includes/ui/contacts_view.inc:67
 #: ../includes/ui/simple_crud_class.inc:54
 #: ../includes/ui/ui_input.inc:286
-#: ../inventory/prices.php:146
-#: ../inventory/purchasing_data.php:147
-#: ../inventory/purchasing_data.php.orig:80
+#: ../inventory/prices.php:159
+#: ../inventory/purchasing_data.php:165
 #: ../inventory/includes/item_adjustments_ui.inc:89
 #: ../inventory/includes/stock_transfers_ui.inc:81
 #: ../inventory/manage/item_categories.php:122
@@ -362,8 +244,7 @@ msgstr ""
 #: ../manufacturing/manage/bom_edit.php:87
 #: ../manufacturing/manage/work_centres.php:115
 #: ../manufacturing/includes/work_order_issue_ui.inc:60
-#: ../purchasing/includes/ui/invoice_ui.inc:304
-#: ../purchasing/includes/ui/po_ui.inc:275
+#: ../purchasing/includes/ui/invoice_ui.inc.orig:304
 #: ../purchasing/includes/ui/po_ui.inc.orig:275
 #: ../sales/manage/credit_status.php:120
 #: ../sales/manage/customer_branches.php:163
@@ -374,21 +255,132 @@ msgstr ""
 #: ../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.orig:204
+#: ../sales/includes/ui/sales_order_ui.inc:211
 #: ../taxes/item_tax_types.php:140
+#: ../taxes/sav.tax_types.php:212
 #: ../taxes/tax_groups.php:138
-#: ../taxes/tax_groups.php.orig:140
-#: ../taxes/tax_groups.php.sav:140
 #: ../taxes/tax_types.php:133
 msgid "Delete"
 msgstr ""
 
-#: ../admin/attachments.php:214
-#: ../admin/attachments.php:219
+#: ../admin/attachments.php:202
+#: ../admin/view_print_transaction.php:126
+#: ../admin/void_transaction.php:181
+#: ../dimensions/inquiry/search_dimensions.php:127
+#: ../dimensions/view/view_dimension.php:55
+#: ../gl/bank_account_reconcile.php:232
+#: ../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.orig:264
+#: ../inventory/inquiry/stock_movements.php:78
+#: ../manufacturing/search_work_orders.php:159
+#: ../manufacturing/includes/manufacturing_ui.inc:157
+#: ../manufacturing/includes/manufacturing_ui.inc:200
+#: ../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/view/view_po.php:115
+#: ../purchasing/view/view_po.php:140
+#: ../purchasing/inquiry/po_search_completed.php:120
+#: ../purchasing/inquiry/po_search_completed.php.orig:119
+#: ../purchasing/inquiry/po_search.php:130
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php.orig:126
+#: ../purchasing/inquiry/supplier_inquiry.php:174
+#: ../purchasing/allocations/supplier_allocation_main.php:95
+#: ../reporting/rep101.php:118
+#: ../reporting/rep201.php:110
+#: ../reporting/rep203.php:93
+#: ../reporting/rep306.php:141
+#: ../reporting/rep601.php:79
+#: ../reporting/rep602.php:80
+#: ../reporting/rep704.php:83
+#: ../reporting/rep704.php:86
+#: ../reporting/rep704.php:89
+#: ../reporting/rep710.php:78
+#: ../reporting/includes/doctext.inc:167
+#: ../reporting/includes/doctext.inc:208
+#: ../reporting/includes/doctext.inc:246
+#: ../sales/allocations/customer_allocation_main.php:94
+#: ../sales/view/view_sales_order.php:109
+#: ../sales/view/view_sales_order.php:142
+#: ../sales/view/view_sales_order.php:179
+#: ../sales/inquiry/customer_allocation_inquiry.php.orig:145
+#: ../sales/inquiry/customer_inquiry.php.orig:201
+msgid "#"
+msgstr ""
+
+#: ../admin/attachments.php:203
+#: ../admin/attachments.php:247
+#: ../admin/crm_categories.php:97
+#: ../admin/inst_upgrade.php:141
+#: ../admin/payment_terms.php:127
+#: ../admin/printers.php:84
+#: ../admin/print_profiles.php:148
+#: ../gl/inquiry/tax_inquiry.php:82
+#: ../gl/manage/gl_quick_entries.php:186
+#: ../gl/manage/gl_quick_entries.php:224
+#: ../includes/ui/view_package.php:32
+#: ../inventory/manage/item_codes.php:125
+#: ../inventory/manage/item_units.php:94
+#: ../inventory/manage/movement_types.php:95
+#: ../inventory/manage/sales_kits.php:40
+#: ../inventory/view/view_adjustment.php:56
+#: ../inventory/view/view_transfer.php:56
+#: ../manufacturing/manage/bom_edit.php:70
+#: ../manufacturing/includes/manufacturing_ui.inc:28
+#: ../purchasing/includes/ui/invoice_ui.inc.orig:492
+#: ../purchasing/includes/ui/invoice_ui.inc.orig:504
+#: ../purchasing/po_receive_items.php:62
+#: ../reporting/rep104.php:111
+#: ../reporting/rep105.php:114
+#: ../reporting/rep204.php:84
+#: ../reporting/rep303.php:121
+#: ../reporting/rep303.php:127
+#: ../reporting/rep304.php:114
+#: ../reporting/rep305.php:101
+#: ../reporting/rep306.php:141
+#: ../reporting/rep307.php:117
+#: ../reporting/rep308.php:149
+#: ../reporting/rep309.php:98
+#: ../reporting/rep401.php:71
+#: ../sales/create_recurrent_invoices.php:134
+#: ../sales/manage/credit_status.php:97
+#: ../sales/manage/recurrent_invoices.php:102
+#: ../sales/inquiry/sales_orders_view.php.orig:317
+#: ../sales/inquiry/sales_orders_view.php.orig:321
+#: ../taxes/sav.tax_types.php:190
+#: ../taxes/tax_groups.php:123
+#: ../taxes/tax_types.php:115
+msgid "Description"
+msgstr ""
+
+#: ../admin/attachments.php:204
+#: ../admin/backups.php:63
+#: ../admin/backups.php:149
+msgid "Filename"
+msgstr ""
+
+#: ../admin/attachments.php:205
+msgid "Size"
+msgstr ""
+
+#: ../admin/attachments.php:206
+msgid "Filetype"
+msgstr ""
+
+#: ../admin/attachments.php:207
+msgid "Date Uploaded"
+msgstr ""
+
+#: ../admin/attachments.php:241
+#: ../admin/attachments.php:246
 msgid "Transaction #"
 msgstr ""
 
-#: ../admin/attachments.php:221
+#: ../admin/attachments.php:248
 msgid "Attached File"
 msgstr ""
 
@@ -438,22 +430,22 @@ msgstr ""
 #: ../includes/system_tests.inc:38
 #: ../includes/system_tests.inc:113
 #: ../includes/system_tests.inc:126
-#: ../includes/ui/ui_lists.inc:1674
+#: ../includes/ui/ui_lists.inc:1679
 #: ../purchasing/manage/suppliers.php:122
-#: ../purchasing/manage/suppliers.php.orig:132
-#: ../reporting/rep101.php:126
-#: ../reporting/rep102.php:112
+#: ../purchasing/manage/suppliers.php.orig:122
+#: ../reporting/rep101.php:114
 #: ../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/rep102.php:116
+#: ../reporting/rep104.php:105
+#: ../reporting/rep106.php:75
+#: ../reporting/rep114.php:74
+#: ../reporting/rep201.php:106
 #: ../reporting/rep202.php:118
-#: ../reporting/rep203.php:87
-#: ../reporting/rep303.php:101
-#: ../reporting/rep303.php:105
-#: ../reporting/rep501.php:109
+#: ../reporting/rep202.php:120
+#: ../reporting/rep203.php:89
+#: ../reporting/rep303.php:113
+#: ../reporting/rep303.php:117
+#: ../reporting/rep501.php:113
 #: ../sales/manage/sales_points.php:94
 #: ../sales/manage/sales_points.php:95
 #: ../sales/manage/sales_types.php:119
@@ -477,6 +469,10 @@ msgstr ""
 msgid "You can only upload *.sql backup files"
 msgstr ""
 
+#: ../admin/backups.php:168
+msgid "File uploaded to backup directory"
+msgstr ""
+
 #: ../admin/backups.php:171
 msgid "File was not uploaded into the system."
 msgstr ""
@@ -486,8 +482,8 @@ msgid "Create backup"
 msgstr ""
 
 #: ../admin/backups.php:181
-#: ../sales/includes/ui/sales_order_ui.inc.orig:589
-#: ../sales/includes/ui/sales_order_ui.inc.orig:645
+#: ../sales/includes/ui/sales_order_ui.inc:595
+#: ../sales/includes/ui/sales_order_ui.inc:651
 msgid "Comments:"
 msgstr ""
 
@@ -537,43 +533,55 @@ msgid "Upload file"
 msgstr ""
 
 #: ../admin/change_current_user_password.php:16
-#: ../admin/change_current_user_password.php:85
-#: ../themes/default/renderer.php:76
+#: ../admin/change_current_user_password.php:99
+#: ../themes/default/renderer.php:77
 msgid "Change password"
 msgstr ""
 
-#: ../admin/change_current_user_password.php:28
+#: ../admin/change_current_user_password.php:33
+msgid "Invalid password entered."
+msgstr ""
+
+#: ../admin/change_current_user_password.php:40
 #: ../admin/users.php:40
 msgid "The password entered must be at least 4 characters long."
 msgstr ""
 
-#: ../admin/change_current_user_password.php:35
+#: ../admin/change_current_user_password.php:47
 #: ../admin/users.php:47
 msgid "The password cannot contain the user login."
 msgstr ""
 
-#: ../admin/change_current_user_password.php:42
+#: ../admin/change_current_user_password.php:54
 msgid "The passwords entered are not the same."
 msgstr ""
 
-#: ../admin/change_current_user_password.php:56
+#: ../admin/change_current_user_password.php:68
 msgid "Password cannot be changed in demo mode."
 msgstr ""
 
-#: ../admin/change_current_user_password.php:61
+#: ../admin/change_current_user_password.php:73
 msgid "Your password has been updated."
 msgstr ""
 
-#: ../admin/change_current_user_password.php:73
+#: ../admin/change_current_user_password.php:85
 #: ../admin/users.php:180
 msgid "User login:"
 msgstr ""
 
-#: ../admin/change_current_user_password.php:79
-msgid "Repeat password:"
+#: ../admin/change_current_user_password.php:91
+msgid "Current Password:"
+msgstr ""
+
+#: ../admin/change_current_user_password.php:92
+msgid "New Password:"
+msgstr ""
+
+#: ../admin/change_current_user_password.php:93
+msgid "Repeat New Password:"
 msgstr ""
 
-#: ../admin/change_current_user_password.php:81
+#: ../admin/change_current_user_password.php:95
 msgid "Enter your new password in the fields."
 msgstr ""
 
@@ -597,23 +605,20 @@ msgid ""
 msgstr ""
 
 #: ../admin/company_preferences.php:59
-#: ../inventory/manage/items.php:87
-#: ../inventory/manage/items.php.orig:85
+#: ../inventory/manage/items.php.orig:87
 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:77
-#: ../inventory/manage/items.php:92
-#: ../inventory/manage/items.php.orig:75
+#: ../inventory/manage/items.php.orig:77
+#: ../inventory/manage/items.php.orig:92
 msgid "Only graphics files can be uploaded"
 msgstr ""
 
 #: ../admin/company_preferences.php:72
 #: ../admin/company_preferences.php:93
-#: ../inventory/manage/items.php:100
-#: ../inventory/manage/items.php.orig:93
+#: ../inventory/manage/items.php.orig:100
 msgid "The existing image could not be removed"
 msgstr ""
 
@@ -621,195 +626,198 @@ msgstr ""
 msgid "Error uploading logo file"
 msgstr ""
 
-#: ../admin/company_preferences.php:115
+#: ../admin/company_preferences.php:116
 msgid "Company setup has been updated."
 msgstr ""
 
-#: ../admin/company_preferences.php:159
+#: ../admin/company_preferences.php:164
 msgid "Name (to appear on reports):"
 msgstr ""
 
-#: ../admin/company_preferences.php:160
+#: ../admin/company_preferences.php:165
 #: ../admin/shipping_companies.php:142
 #: ../includes/ui/contacts_view.inc:109
 #: ../inventory/manage/locations.php:202
-#: ../sales/manage/customers.php:231
+#: ../sales/manage/customers.php:234
 #: ../sales/manage/sav.customers.php:231
-#: ../sales/includes/ui/sales_order_ui.inc.orig:636
+#: ../sales/includes/ui/sales_order_ui.inc:642
 msgid "Address:"
 msgstr ""
 
-#: ../admin/company_preferences.php:161
+#: ../admin/company_preferences.php:166
 msgid "Domicile:"
 msgstr ""
 
-#: ../admin/company_preferences.php:163
+#: ../admin/company_preferences.php:168
 #: ../admin/shipping_companies.php:138
 #: ../purchasing/manage/suppliers.php:135
-#: ../purchasing/manage/suppliers.php.orig:114
+#: ../purchasing/manage/suppliers.php.orig:135
 #: ../sales/manage/customer_branches.php:262
 msgid "Phone Number:"
 msgstr ""
 
-#: ../admin/company_preferences.php:164
+#: ../admin/company_preferences.php:169
 #: ../includes/ui/contacts_view.inc:104
 #: ../purchasing/manage/suppliers.php:138
-#: ../purchasing/manage/suppliers.php.orig:116
+#: ../purchasing/manage/suppliers.php.orig:138
 #: ../sales/manage/customer_branches.php:264
-#: ../sales/manage/customers.php:254
+#: ../sales/manage/customers.php:257
 #: ../sales/manage/sav.customers.php:254
 msgid "Fax Number:"
 msgstr ""
 
-#: ../admin/company_preferences.php:165
+#: ../admin/company_preferences.php:170
 #: ../admin/users.php:202
 msgid "Email Address:"
 msgstr ""
 
-#: ../admin/company_preferences.php:167
+#: ../admin/company_preferences.php:172
+msgid "BCC Address for all outgoing mails:"
+msgstr ""
+
+#: ../admin/company_preferences.php:174
 msgid "Official Company Number:"
 msgstr ""
 
-#: ../admin/company_preferences.php:168
+#: ../admin/company_preferences.php:175
 #: ../purchasing/manage/suppliers.php:96
-#: ../purchasing/manage/suppliers.php.orig:97
-#: ../sales/manage/customers.php:233
+#: ../purchasing/manage/suppliers.php.orig:96
+#: ../sales/manage/customers.php:236
 #: ../sales/manage/sav.customers.php:233
 msgid "GSTNo:"
 msgstr ""
 
-#: ../admin/company_preferences.php:170
+#: ../admin/company_preferences.php:177
 msgid "Home Currency:"
 msgstr ""
 
-#: ../admin/company_preferences.php:171
+#: ../admin/company_preferences.php:178
 #: ../gl/gl_budget.php:63
 msgid "Fiscal Year:"
 msgstr ""
 
-#: ../admin/company_preferences.php:172
+#: ../admin/company_preferences.php:179
 msgid "Tax Periods:"
 msgstr ""
 
-#: ../admin/company_preferences.php:172
+#: ../admin/company_preferences.php:179
 msgid "Months."
 msgstr ""
 
-#: ../admin/company_preferences.php:173
+#: ../admin/company_preferences.php:180
 msgid "Tax Last Period:"
 msgstr ""
 
-#: ../admin/company_preferences.php:173
+#: ../admin/company_preferences.php:180
 msgid "Months back."
 msgstr ""
 
-#: ../admin/company_preferences.php:177
+#: ../admin/company_preferences.php:184
 msgid "Company Logo:"
 msgstr ""
 
-#: ../admin/company_preferences.php:178
+#: ../admin/company_preferences.php:185
 msgid "New Company Logo (.jpg)"
 msgstr ""
 
-#: ../admin/company_preferences.php:179
+#: ../admin/company_preferences.php:186
 msgid "Delete Company Logo:"
 msgstr ""
 
-#: ../admin/company_preferences.php:181
+#: ../admin/company_preferences.php:188
 msgid "Use Dimensions:"
 msgstr ""
 
-#: ../admin/company_preferences.php:182
+#: ../admin/company_preferences.php:189
 msgid "Base for auto price calculations:"
 msgstr ""
 
-#: ../admin/company_preferences.php:183
+#: ../admin/company_preferences.php:190
 msgid "No base price list"
 msgstr ""
 
-#: ../admin/company_preferences.php:184
+#: ../admin/company_preferences.php:191
 msgid "Add Price from Std Cost:"
 msgstr ""
 
-#: ../admin/company_preferences.php:186
+#: ../admin/company_preferences.php:193
 msgid "Round to nearest:"
 msgstr ""
 
-#: ../admin/company_preferences.php:189
+#: ../admin/company_preferences.php:196
 msgid "Search Item List"
 msgstr ""
 
-#: ../admin/company_preferences.php:190
+#: ../admin/company_preferences.php:197
 msgid "Search Customer List"
 msgstr ""
 
-#: ../admin/company_preferences.php:191
+#: ../admin/company_preferences.php:198
 msgid "Search Supplier List"
 msgstr ""
 
-#: ../admin/company_preferences.php:193
+#: ../admin/company_preferences.php:200
 msgid "Automatic Revaluation Currency Accounts"
 msgstr ""
 
-#: ../admin/company_preferences.php:194
+#: ../admin/company_preferences.php:201
 msgid "Time Zone on Reports"
 msgstr ""
 
-#: ../admin/company_preferences.php:195
+#: ../admin/company_preferences.php:202
 msgid "Login Timeout:"
 msgstr ""
 
-#: ../admin/company_preferences.php:195
+#: ../admin/company_preferences.php:202
 msgid "seconds"
 msgstr ""
 
-#: ../admin/company_preferences.php:196
+#: ../admin/company_preferences.php:203
 msgid "Version Id"
 msgstr ""
 
-#: ../admin/company_preferences.php:201
-#: ../admin/display_prefs.php:144
+#: ../admin/company_preferences.php:208
+#: ../admin/display_prefs.php:145
 #: ../admin/forms_setup.php:61
-#: ../admin/gl_setup.php.orig:235
+#: ../admin/gl_setup.php:241
 #: ../admin/inst_chart.php:74
 #: ../admin/inst_lang.php:103
-#: ../admin/inst_module.php:138
-#: ../admin/inst_module.php:156
-#: ../admin/inst_module.php:199
+#: ../admin/inst_module.php:137
+#: ../admin/inst_module.php:155
+#: ../admin/inst_module.php:198
 #: ../admin/inst_theme.php:96
 #: ../dimensions/dimension_entry.php:293
-#: ../gl/gl_bank.php:406
+#: ../gl/gl_bank.php:416
 #: ../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:249
+#: ../gl/includes/ui/gl_bank_ui.inc:277
 #: ../gl/includes/ui/gl_journal_ui.inc:257
 #: ../includes/ui/db_pager_view.inc:174
 #: ../includes/ui/simple_crud_class.inc:56
 #: ../includes/ui/simple_crud_class.inc:227
 #: ../includes/ui/ui_input.inc:208
-#: ../includes/ui/ui_input.inc:905
-#: ../inventory/adjustments.php:235
-#: ../inventory/cost_update.php:116
-#: ../inventory/reorder_level.php:97
-#: ../inventory/transfers.php:236
+#: ../includes/ui/ui_input.inc:906
+#: ../inventory/adjustments.php:233
+#: ../inventory/cost_update.php:136
+#: ../inventory/reorder_level.php:111
+#: ../inventory/transfers.php:234
 #: ../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:459
 #: ../manufacturing/includes/work_order_issue_ui.inc:131
-#: ../purchasing/includes/ui/po_ui.inc:306
 #: ../purchasing/includes/ui/po_ui.inc.orig:306
-#: ../purchasing/includes/ui/po_ui.inc.orig:457
-#: ../purchasing/po_receive_items.php:331
+#: ../purchasing/includes/ui/po_ui.inc.orig:455
+#: ../purchasing/po_receive_items.php:332
 #: ../sales/credit_note_entry.php:284
 #: ../sales/customer_credit_invoice.php:380
-#: ../sales/customer_delivery.php.orig:536
+#: ../sales/customer_delivery.php:547
 #: ../sales/customer_invoice.php:684
-#: ../sales/inquiry/sales_orders_view.php:349
+#: ../sales/inquiry/sales_orders_view.php.orig:349
 #: ../sales/includes/ui/sales_credit_ui.inc:293
-#: ../sales/includes/ui/sales_order_ui.inc.orig:237
-#: ../sales/includes/ui/sales_order_ui.inc.orig:555
+#: ../sales/includes/ui/sales_order_ui.inc:244
+#: ../sales/includes/ui/sales_order_ui.inc:561
+#: ../taxes/sav.tax_types.php:255
 msgid "Update"
 msgstr ""
 
@@ -951,22 +959,22 @@ msgstr ""
 #: ../includes/system_tests.inc:38
 #: ../includes/system_tests.inc:113
 #: ../includes/system_tests.inc:126
-#: ../includes/ui/ui_lists.inc:1675
+#: ../includes/ui/ui_lists.inc:1680
 #: ../purchasing/manage/suppliers.php:122
-#: ../purchasing/manage/suppliers.php.orig:132
-#: ../reporting/rep101.php:125
-#: ../reporting/rep102.php:111
+#: ../purchasing/manage/suppliers.php.orig:122
+#: ../reporting/rep101.php:113
 #: ../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/rep102.php:115
+#: ../reporting/rep104.php:107
+#: ../reporting/rep106.php:77
+#: ../reporting/rep114.php:76
+#: ../reporting/rep201.php:105
 #: ../reporting/rep202.php:117
-#: ../reporting/rep203.php:86
-#: ../reporting/rep303.php:96
-#: ../reporting/rep303.php:104
-#: ../reporting/rep501.php:107
+#: ../reporting/rep202.php:119
+#: ../reporting/rep203.php:88
+#: ../reporting/rep303.php:108
+#: ../reporting/rep303.php:116
+#: ../reporting/rep501.php:111
 #: ../sales/manage/sales_points.php:94
 #: ../sales/manage/sales_points.php:95
 #: ../sales/manage/sales_types.php:119
@@ -999,12 +1007,13 @@ msgstr ""
 #: ../admin/inst_chart.php:70
 #: ../admin/inst_lang.php:87
 #: ../admin/inst_lang.php:90
-#: ../admin/inst_module.php:127
+#: ../admin/inst_module.php:126
 #: ../admin/inst_theme.php:91
 #: ../admin/inst_theme.php:93
 #: ../admin/inst_upgrade.php:153
 #: ../gl/manage/gl_account_types.php:190
-#: ../includes/ui/allocation_cart.inc:288
+#: ../includes/ui/allocation_cart.inc.orig:288
+#: ../taxes/sav.tax_types.php:168
 msgid "None"
 msgstr ""
 
@@ -1041,42 +1050,42 @@ msgstr ""
 msgid "New contact category has been added"
 msgstr ""
 
-#: ../admin/crm_categories.php:62
+#: ../admin/crm_categories.php:71
 msgid "Cannot delete this category because there are contacts related to it."
 msgstr ""
 
-#: ../admin/crm_categories.php:68
+#: ../admin/crm_categories.php:77
 msgid "Category has been deleted"
 msgstr ""
 
-#: ../admin/crm_categories.php:88
-msgid "Type id"
+#: ../admin/crm_categories.php:97
+msgid "Category Type"
 msgstr ""
 
-#: ../admin/crm_categories.php:88
-msgid "Action id"
+#: ../admin/crm_categories.php:97
+msgid "Category Subtype"
 msgstr ""
 
-#: ../admin/crm_categories.php:88
+#: ../admin/crm_categories.php:97
 #: ../sales/manage/customer_branches.php:295
 msgid "Short Name"
 msgstr ""
 
-#: ../admin/crm_categories.php:135
-#: ../admin/crm_categories.php:139
+#: ../admin/crm_categories.php:144
+#: ../admin/crm_categories.php:148
 msgid "Contact Category Type:"
 msgstr ""
 
-#: ../admin/crm_categories.php:136
-#: ../admin/crm_categories.php:140
+#: ../admin/crm_categories.php:145
+#: ../admin/crm_categories.php:149
 msgid "Contact Category Subtype:"
 msgstr ""
 
-#: ../admin/crm_categories.php:143
+#: ../admin/crm_categories.php:152
 msgid "Category Short Name:"
 msgstr ""
 
-#: ../admin/crm_categories.php:144
+#: ../admin/crm_categories.php:153
 msgid "Category Description:"
 msgstr ""
 
@@ -1088,134 +1097,134 @@ msgstr ""
 msgid "Query size must be integer and greater than zero."
 msgstr ""
 
-#: ../admin/display_prefs.php:59
+#: ../admin/display_prefs.php:60
 msgid ""
 "Display settings have been updated. Keep in mind that changed settings are "
 "restored on every login in demo mode."
 msgstr ""
 
-#: ../admin/display_prefs.php:61
+#: ../admin/display_prefs.php:62
 msgid "Display settings have been updated."
 msgstr ""
 
-#: ../admin/display_prefs.php:70
+#: ../admin/display_prefs.php:71
 msgid "Decimal Places"
 msgstr ""
 
-#: ../admin/display_prefs.php:72
+#: ../admin/display_prefs.php:73
 msgid "Prices/Amounts:"
 msgstr ""
 
-#: ../admin/display_prefs.php:73
+#: ../admin/display_prefs.php:74
 msgid "Quantities:"
 msgstr ""
 
-#: ../admin/display_prefs.php:74
+#: ../admin/display_prefs.php:75
 msgid "Exchange Rates:"
 msgstr ""
 
-#: ../admin/display_prefs.php:75
+#: ../admin/display_prefs.php:76
 msgid "Percentages:"
 msgstr ""
 
-#: ../admin/display_prefs.php:77
+#: ../admin/display_prefs.php:78
 msgid "Dateformat and Separators"
 msgstr ""
 
-#: ../admin/display_prefs.php:79
+#: ../admin/display_prefs.php:80
 msgid "Dateformat:"
 msgstr ""
 
-#: ../admin/display_prefs.php:81
+#: ../admin/display_prefs.php:82
 msgid "Date Separator:"
 msgstr ""
 
-#: ../admin/display_prefs.php:86
+#: ../admin/display_prefs.php:87
 msgid "Thousand Separator:"
 msgstr ""
 
-#: ../admin/display_prefs.php:91
+#: ../admin/display_prefs.php:92
 msgid "Decimal Separator:"
 msgstr ""
 
-#: ../admin/display_prefs.php:98
+#: ../admin/display_prefs.php:99
 #: ../admin/inst_lang.php:35
 msgid "Language"
 msgstr ""
 
-#: ../admin/display_prefs.php:100
+#: ../admin/display_prefs.php:101
 #: ../admin/users.php:206
 msgid "Language:"
 msgstr ""
 
-#: ../admin/display_prefs.php:103
+#: ../admin/display_prefs.php:104
 #: ../applications/setup.php:42
 #: ../includes/sysnames.inc:94
 msgid "Miscellaneous"
 msgstr ""
 
-#: ../admin/display_prefs.php:105
+#: ../admin/display_prefs.php:106
 msgid "Show hints for new users:"
 msgstr ""
 
-#: ../admin/display_prefs.php:107
+#: ../admin/display_prefs.php:108
 msgid "Show GL Information:"
 msgstr ""
 
-#: ../admin/display_prefs.php:109
+#: ../admin/display_prefs.php:110
 msgid "Show Item Codes:"
 msgstr ""
 
-#: ../admin/display_prefs.php:116
+#: ../admin/display_prefs.php:117
 msgid "Page Size:"
 msgstr ""
 
-#: ../admin/display_prefs.php:118
+#: ../admin/display_prefs.php:119
 msgid "Start-up Tab"
 msgstr ""
 
-#: ../admin/display_prefs.php:126
+#: ../admin/display_prefs.php:127
 #: ../admin/users.php:210
 msgid "Printing profile"
 msgstr ""
 
-#: ../admin/display_prefs.php:127
+#: ../admin/display_prefs.php:128
 #: ../admin/users.php:211
 msgid "Browser printing support"
 msgstr ""
 
-#: ../admin/display_prefs.php:129
+#: ../admin/display_prefs.php:130
 msgid "Use popup window to display reports:"
 msgstr ""
 
-#: ../admin/display_prefs.php:130
+#: ../admin/display_prefs.php:131
 #: ../admin/users.php:214
 msgid "Set this option to on if your browser directly supports pdf files"
 msgstr ""
 
-#: ../admin/display_prefs.php:132
+#: ../admin/display_prefs.php:133
 msgid "Use icons instead of text links:"
 msgstr ""
 
-#: ../admin/display_prefs.php:133
+#: ../admin/display_prefs.php:134
 msgid "Set this option to on for using icons instead of text links"
 msgstr ""
 
-#: ../admin/display_prefs.php:135
+#: ../admin/display_prefs.php:136
 msgid "Query page size:"
 msgstr ""
 
-#: ../admin/display_prefs.php:137
+#: ../admin/display_prefs.php:138
 msgid "Remember last document date:"
 msgstr ""
 
-#: ../admin/display_prefs.php:138
+#: ../admin/display_prefs.php:139
 msgid ""
 "If set document date is remembered on subsequent documents, otherwise "
 "default is current date"
 msgstr ""
 
-#: ../admin/display_prefs.php:140
+#: ../admin/display_prefs.php:141
 msgid "Transaction days:"
 msgstr ""
 
@@ -1252,7 +1261,7 @@ msgid "New fiscal year has been added"
 msgstr ""
 
 #: ../admin/fiscalyears.php:102
-msgid "Cannot delete this fiscal year because thera are fiscal years before."
+msgid "Cannot delete this fiscal year because there are fiscal years before."
 msgstr ""
 
 #: ../admin/fiscalyears.php:107
@@ -1281,11 +1290,11 @@ msgstr ""
 #: ../admin/fiscalyears.php:138
 #: ../dimensions/inquiry/search_dimensions.php:133
 #: ../dimensions/inquiry/search_dimensions.php:139
-#: ../includes/ui/ui_input.inc:958
+#: ../includes/ui/ui_input.inc:959
 #: ../includes/ui/ui_lists.inc:675
 #: ../manufacturing/search_work_orders.php:108
-#: ../reporting/rep501.php:85
-#: ../reporting/rep710.php:109
+#: ../reporting/rep501.php:87
+#: ../reporting/rep710.php:113
 #: ../reporting/includes/excel_report.inc:234
 #: ../reporting/includes/pdf_report.inc:266
 msgid "Closed"
@@ -1334,231 +1343,226 @@ msgid "Next Reference"
 msgstr ""
 
 #: ../admin/gl_setup.php:16
-#: ../admin/gl_setup.php.orig:16
 msgid "System and General GL Setup"
 msgstr ""
 
 #: ../admin/gl_setup.php:30
-#: ../admin/gl_setup.php.orig:30
 msgid "The delivery over-receive allowance must be between 0 and 100."
 msgstr ""
 
 #: ../admin/gl_setup.php:37
-#: ../admin/gl_setup.php.orig:37
 msgid "The invoice over-charge allowance must be between 0 and 100."
 msgstr ""
 
 #: ../admin/gl_setup.php:44
-#: ../admin/gl_setup.php.orig:44
 msgid "The past due days interval allowance must be between 0 and 100."
 msgstr ""
 
 #: ../admin/gl_setup.php:52
-#: ../admin/gl_setup.php.orig:52
 msgid "Before GRN Clearing Account can be changed all GRNs have to be invoiced"
 msgstr ""
 
-#: ../admin/gl_setup.php:75
-#: ../admin/gl_setup.php.orig:75
+#: ../admin/gl_setup.php:59
+#: ../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/gl_setup.php:80
 msgid "The general GL setup has been updated."
 msgstr ""
 
-#: ../admin/gl_setup.php.orig:138
+#: ../admin/gl_setup.php:144
 msgid "General GL"
 msgstr ""
 
-#: ../admin/gl_setup.php.orig:140
+#: ../admin/gl_setup.php:146
 msgid "Past Due Days Interval:"
 msgstr ""
 
-#: ../admin/gl_setup.php.orig:140
-#: ../admin/gl_setup.php.orig:180
-#: ../admin/gl_setup.php.orig:188
-#: ../admin/gl_setup.php.orig:206
-#: ../admin/gl_setup.php.orig:228
+#: ../admin/gl_setup.php:146
+#: ../admin/gl_setup.php:186
+#: ../admin/gl_setup.php:194
+#: ../admin/gl_setup.php:212
+#: ../admin/gl_setup.php:234
 #: ../admin/payment_terms.php:140
 msgid "days"
 msgstr ""
 
-#: ../admin/gl_setup.php.orig:142
+#: ../admin/gl_setup.php:148
 msgid "Retained Earnings:"
 msgstr ""
 
-#: ../admin/gl_setup.php.orig:144
+#: ../admin/gl_setup.php:150
 msgid "Profit/Loss Year:"
 msgstr ""
 
-#: ../admin/gl_setup.php.orig:146
+#: ../admin/gl_setup.php:152
 msgid "Exchange Variances Account:"
 msgstr ""
 
-#: ../admin/gl_setup.php.orig:148
+#: ../admin/gl_setup.php:154
 #: ../gl/manage/bank_accounts.php:193
 msgid "Bank Charges Account:"
 msgstr ""
 
-#: ../admin/gl_setup.php.orig:150
+#: ../admin/gl_setup.php:156
 msgid "Tax Algorithm:"
 msgstr ""
 
-#: ../admin/gl_setup.php.orig:154
+#: ../admin/gl_setup.php:160
 msgid "Customers and Sales"
 msgstr ""
 
-#: ../admin/gl_setup.php.orig:156
+#: ../admin/gl_setup.php:162
 msgid "Default Credit Limit:"
 msgstr ""
 
-#: ../admin/gl_setup.php.orig:158
+#: ../admin/gl_setup.php:164
 msgid "Accumulate batch shipping:"
 msgstr ""
 
-#: ../admin/gl_setup.php.orig:160
+#: ../admin/gl_setup.php:166
 msgid "Legal Text on Invoice:"
 msgstr ""
 
-#: ../admin/gl_setup.php.orig:162
+#: ../admin/gl_setup.php:168
 msgid "Shipping Charged Account:"
 msgstr ""
 
-#: ../admin/gl_setup.php.orig:164
+#: ../admin/gl_setup.php:170
 msgid "Deferred Income Account:"
 msgstr ""
 
-#: ../admin/gl_setup.php.orig:165
+#: ../admin/gl_setup.php:171
 msgid "Not used"
 msgstr ""
 
-#: ../admin/gl_setup.php.orig:169
+#: ../admin/gl_setup.php:175
 msgid "Customers and Sales Defaults"
 msgstr ""
 
-#: ../admin/gl_setup.php.orig:171
+#: ../admin/gl_setup.php:177
 msgid "Receivable Account:"
 msgstr ""
 
-#: ../admin/gl_setup.php.orig:173
-#: ../admin/gl_setup.php.orig:214
-#: ../inventory/manage/item_categories.php:192
-#: ../inventory/manage/items.php:361
-#: ../inventory/manage/items.php.orig:354
+#: ../admin/gl_setup.php:179
+#: ../admin/gl_setup.php:220
+#: ../inventory/manage/item_categories.php:196
+#: ../inventory/manage/items.php.orig:366
 #: ../sales/manage/customer_branches.php:251
 msgid "Sales Account:"
 msgstr ""
 
-#: ../admin/gl_setup.php.orig:176
+#: ../admin/gl_setup.php:182
 #: ../sales/manage/customer_branches.php:252
 msgid "Sales Discount Account:"
 msgstr ""
 
-#: ../admin/gl_setup.php.orig:178
+#: ../admin/gl_setup.php:184
 #: ../sales/manage/customer_branches.php:254
 msgid "Prompt Payment Discount Account:"
 msgstr ""
 
-#: ../admin/gl_setup.php.orig:180
+#: ../admin/gl_setup.php:186
 msgid "Delivery Required By:"
 msgstr ""
 
-#: ../admin/gl_setup.php.orig:186
+#: ../admin/gl_setup.php:192
 msgid "Dimension Defaults"
 msgstr ""
 
-#: ../admin/gl_setup.php.orig:188
+#: ../admin/gl_setup.php:194
 msgid "Dimension Required By After:"
 msgstr ""
 
-#: ../admin/gl_setup.php.orig:192
+#: ../admin/gl_setup.php:198
 msgid "Suppliers and Purchasing"
 msgstr ""
 
-#: ../admin/gl_setup.php.orig:194
+#: ../admin/gl_setup.php:200
 msgid "Delivery Over-Receive Allowance:"
 msgstr ""
 
-#: ../admin/gl_setup.php.orig:196
+#: ../admin/gl_setup.php:202
 msgid "Invoice Over-Charge Allowance:"
 msgstr ""
 
-#: ../admin/gl_setup.php.orig:198
+#: ../admin/gl_setup.php:204
 msgid "Suppliers and Purchasing Defaults"
 msgstr ""
 
-#: ../admin/gl_setup.php.orig:200
+#: ../admin/gl_setup.php:206
 msgid "Payable Account:"
 msgstr ""
 
-#: ../admin/gl_setup.php.orig:202
+#: ../admin/gl_setup.php:208
 #: ../purchasing/manage/suppliers.php:132
-#: ../purchasing/manage/suppliers.php.orig:142
+#: ../purchasing/manage/suppliers.php.orig:132
 msgid "Purchase Discount Account:"
 msgstr ""
 
-#: ../admin/gl_setup.php.orig:204
+#: ../admin/gl_setup.php:210
 msgid "GRN Clearing Account:"
 msgstr ""
 
-#: ../admin/gl_setup.php.orig:204
+#: ../admin/gl_setup.php:210
 msgid "No postings on GRN"
 msgstr ""
 
-#: ../admin/gl_setup.php.orig:206
+#: ../admin/gl_setup.php:212
 msgid "Receival Required By:"
 msgstr ""
 
-#: ../admin/gl_setup.php.orig:208
-#: ../reporting/reports_main.php:175
+#: ../admin/gl_setup.php:214
 msgid "Inventory"
 msgstr ""
 
-#: ../admin/gl_setup.php.orig:210
+#: ../admin/gl_setup.php:216
 msgid "Allow Negative Inventory:"
 msgstr ""
 
-#: ../admin/gl_setup.php.orig:211
+#: ../admin/gl_setup.php:217
 msgid "Warning:  This may cause a delay in GL postings"
 msgstr ""
 
-#: ../admin/gl_setup.php.orig:213
+#: ../admin/gl_setup.php:219
 msgid "Items Defaults"
 msgstr ""
 
-#: ../admin/gl_setup.php.orig:216
-#: ../inventory/manage/item_categories.php:202
-#: ../inventory/manage/items.php:365
-#: ../inventory/manage/items.php.orig:358
+#: ../admin/gl_setup.php:222
+#: ../inventory/manage/item_categories.php:206
+#: ../inventory/manage/items.php.orig:370
 msgid "Inventory Account:"
 msgstr ""
 
-#: ../admin/gl_setup.php.orig:218
-#: ../inventory/manage/item_categories.php:196
-#: ../inventory/manage/item_categories.php:204
-#: ../inventory/manage/items.php:366
-#: ../inventory/manage/items.php:371
-#: ../inventory/manage/items.php.orig:359
-#: ../inventory/manage/items.php.orig:364
+#: ../admin/gl_setup.php:224
+#: ../inventory/manage/item_categories.php:200
+#: ../inventory/manage/item_categories.php:208
+#: ../inventory/manage/items.php.orig:371
+#: ../inventory/manage/items.php.orig:376
 msgid "C.O.G.S. Account:"
 msgstr ""
 
-#: ../admin/gl_setup.php.orig:220
-#: ../inventory/manage/item_categories.php:205
-#: ../inventory/manage/items.php:367
-#: ../inventory/manage/items.php.orig:360
+#: ../admin/gl_setup.php:226
+#: ../inventory/manage/item_categories.php:209
+#: ../inventory/manage/items.php.orig:372
 msgid "Inventory Adjustments Account:"
 msgstr ""
 
-#: ../admin/gl_setup.php.orig:222
-#: ../inventory/manage/item_categories.php:209
-#: ../inventory/manage/items.php:378
-#: ../inventory/manage/items.php.orig:371
+#: ../admin/gl_setup.php:228
+#: ../inventory/manage/item_categories.php:213
+#: ../inventory/manage/items.php.orig:383
 msgid "Item Assembly Costs Account:"
 msgstr ""
 
-#: ../admin/gl_setup.php.orig:226
+#: ../admin/gl_setup.php:232
 msgid "Manufacturing Defaults"
 msgstr ""
 
-#: ../admin/gl_setup.php.orig:228
+#: ../admin/gl_setup.php:234
 msgid "Work Order Required By After:"
 msgstr ""
 
@@ -1588,7 +1592,7 @@ msgstr ""
 #: ../admin/inst_theme.php:74
 #: ../inventory/inquiry/stock_status.php:71
 #: ../inventory/inquiry/stock_status.php.orig:77
-#: ../reporting/rep303.php:102
+#: ../reporting/rep303.php:114
 msgid "Available"
 msgstr ""
 
@@ -1601,8 +1605,8 @@ msgstr ""
 #: ../admin/inst_chart.php:69
 #: ../admin/inst_chart.php:71
 #: ../admin/inst_lang.php:88
+#: ../admin/inst_module.php:127
 #: ../admin/inst_module.php:128
-#: ../admin/inst_module.php:129
 #: ../admin/inst_theme.php:92
 #: ../includes/sysnames.inc:193
 msgid "Unknown"
@@ -1610,21 +1614,21 @@ msgstr ""
 
 #: ../admin/inst_chart.php:74
 #: ../admin/inst_lang.php:103
-#: ../admin/inst_module.php:133
-#: ../admin/inst_module.php:138
+#: ../admin/inst_module.php:132
+#: ../admin/inst_module.php:137
 #: ../admin/inst_theme.php:96
 #: ../admin/inst_upgrade.php:141
 msgid "Install"
 msgstr ""
 
 #: ../admin/inst_chart.php:75
-#: ../admin/inst_module.php:139
+#: ../admin/inst_module.php:138
 #: ../admin/inst_theme.php:97
 msgid "Upload and install latest extension package"
 msgstr ""
 
 #: ../admin/inst_chart.php:82
-#: ../admin/inst_module.php:146
+#: ../admin/inst_module.php:145
 #: ../admin/inst_theme.php:104
 #, php-format
 msgid ""
@@ -1641,15 +1645,15 @@ msgstr ""
 #: ../admin/shipping_companies.php:91
 #: ../dimensions/dimension_entry.php:271
 #: ../dimensions/inquiry/search_dimensions.php:129
-#: ../dimensions/view/view_dimension.php:54
+#: ../dimensions/view/view_dimension.php:55
 #: ../inventory/manage/item_categories.php:98
 #: ../manufacturing/manage/work_centres.php:101
-#: ../purchasing/includes/ui/invoice_ui.inc:265
-#: ../purchasing/includes/ui/invoice_ui.inc:267
-#: ../purchasing/includes/ui/invoice_ui.inc:269
-#: ../reporting/rep501.php:85
-#: ../reporting/rep709.php:109
-#: ../reporting/rep709.php:110
+#: ../purchasing/includes/ui/invoice_ui.inc.orig:265
+#: ../purchasing/includes/ui/invoice_ui.inc.orig:267
+#: ../purchasing/includes/ui/invoice_ui.inc.orig:269
+#: ../reporting/rep501.php:87
+#: ../reporting/rep709.php:111
+#: ../reporting/rep709.php:112
 #: ../sales/manage/customer_branches.php:296
 #: ../sales/manage/sales_people.php:99
 #: ../taxes/item_tax_types.php:117
@@ -1736,41 +1740,41 @@ msgid "Selected extension has been successfully deleted"
 msgstr ""
 
 #: ../admin/inst_module.php:104
-#: ../admin/inst_module.php:169
+#: ../admin/inst_module.php:168
 msgid "Extension"
 msgstr ""
 
 #: ../admin/inst_module.php:104
-#: ../admin/inst_module.php:169
+#: ../admin/inst_module.php:168
 msgid "Modules provided"
 msgstr ""
 
 #: ../admin/inst_module.php:104
-#: ../admin/inst_module.php:169
+#: ../admin/inst_module.php:168
 msgid "Options provided"
 msgstr ""
 
-#: ../admin/inst_module.php:133
+#: ../admin/inst_module.php:132
 msgid "Install third-party extension."
 msgstr ""
 
-#: ../admin/inst_module.php:169
+#: ../admin/inst_module.php:168
 #: ../includes/ui/ui_lists.inc:675
-#: ../includes/ui/ui_lists.inc:2156
+#: ../includes/ui/ui_lists.inc:2160
 #: ../reporting/includes/excel_report.inc:232
 #: ../reporting/includes/pdf_report.inc:264
 msgid "Active"
 msgstr ""
 
-#: ../admin/inst_module.php:232
+#: ../admin/inst_module.php:231
 msgid "Status change for some extensions failed."
 msgstr ""
 
-#: ../admin/inst_module.php:235
+#: ../admin/inst_module.php:234
 msgid "Current active extensions set has been saved."
 msgstr ""
 
-#: ../admin/inst_module.php:257
+#: ../admin/inst_module.php:256
 msgid "Extensions:"
 msgstr ""
 
@@ -1856,7 +1860,6 @@ msgstr ""
 #: ../sales/view/view_invoice.php:76
 #: ../sales/view/view_sales_order.php:82
 #: ../sales/view/view_sales_order.php:90
-#: ../sales/view/view_sales_order.php.orig:78
 msgid "Payment Terms"
 msgstr ""
 
@@ -1896,7 +1899,7 @@ msgstr ""
 #: ../dimensions/dimension_entry.php:275
 #: ../dimensions/inquiry/search_dimensions.php:75
 #: ../dimensions/inquiry/search_dimensions.php:130
-#: ../dimensions/view/view_dimension.php:54
+#: ../dimensions/view/view_dimension.php:55
 #: ../gl/bank_account_reconcile.php:231
 #: ../gl/inquiry/bank_inquiry.php:70
 #: ../gl/inquiry/gl_account_inquiry.php:126
@@ -1905,11 +1908,9 @@ msgstr ""
 #: ../gl/manage/bank_accounts.php:109
 #: ../gl/manage/gl_quick_entries.php:186
 #: ../gl/view/accrual_trans.php:52
-#: ../gl/includes/ui/gl_bank_ui.inc:92
-#: ../gl/includes/ui/gl_bank_ui.inc.orig:83
-#: ../includes/ui/ui_view.inc:488
-#: ../inventory/inquiry/stock_movements.php:77
-#: ../inventory/inquiry/stock_movements.php.orig:79
+#: ../gl/includes/ui/gl_bank_ui.inc:93
+#: ../includes/ui/ui_view.inc.orig:488
+#: ../inventory/inquiry/stock_movements.php:78
 #: ../inventory/manage/item_categories.php:98
 #: ../manufacturing/search_work_orders.php:161
 #: ../manufacturing/view/wo_costs_view.php:46
@@ -1917,28 +1918,25 @@ msgstr ""
 #: ../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_allocation_inquiry.php.orig:125
 #: ../purchasing/inquiry/supplier_inquiry.php:173
-#: ../purchasing/inquiry/supplier_inquiry.php.orig:170
-#: ../reporting/rep102.php:132
-#: ../reporting/rep202.php:137
-#: ../reporting/rep501.php:85
-#: ../reporting/rep601.php:76
+#: ../reporting/rep102.php:134
+#: ../reporting/rep202.php:139
+#: ../reporting/rep501.php:87
+#: ../reporting/rep601.php:79
 #: ../reporting/rep602.php:80
-#: ../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/rep702.php:60
+#: ../reporting/rep704.php:83
+#: ../reporting/rep704.php:86
+#: ../reporting/rep704.php:89
+#: ../reporting/rep709.php:107
+#: ../reporting/rep710.php:78
+#: ../reporting/rep710.php:86
 #: ../reporting/includes/doctext.inc:162
 #: ../reporting/includes/doctext.inc:203
 #: ../reporting/includes/doctext.inc:222
-#: ../sales/inquiry/customer_allocation_inquiry.php:144
-#: ../sales/inquiry/customer_inquiry.php:200
+#: ../sales/inquiry/customer_allocation_inquiry.php.orig:144
+#: ../sales/inquiry/customer_inquiry.php.orig:200
 msgid "Type"
 msgstr ""
 
@@ -2135,11 +2133,9 @@ msgstr ""
 
 #: ../admin/security_roles.php:180
 #: ../gl/manage/gl_accounts.php:198
-#: ../inventory/manage/items.php:440
-#: ../inventory/manage/items.php.orig:433
-#: ../purchasing/manage/suppliers.php:291
-#: ../purchasing/manage/suppliers.php.orig:294
-#: ../sales/manage/customers.php:326
+#: ../inventory/manage/items.php.orig:445
+#: ../purchasing/manage/suppliers.php.orig:291
+#: ../sales/manage/customers.php:329
 #: ../sales/manage/sav.customers.php:324
 msgid "Show inactive:"
 msgstr ""
@@ -2184,33 +2180,33 @@ msgstr ""
 #: ../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:251
+#: ../gl/includes/ui/gl_bank_ui.inc:279
 #: ../gl/includes/ui/gl_journal_ui.inc:259
 #: ../includes/ui/simple_crud_class.inc:58
 #: ../includes/ui/simple_crud_class.inc:231
-#: ../includes/ui/ui_controls.inc:594
+#: ../includes/ui/ui_controls.inc:596
 #: ../includes/ui/ui_input.inc:211
 #: ../inventory/includes/item_adjustments_ui.inc:159
 #: ../inventory/includes/stock_transfers_ui.inc:139
-#: ../inventory/manage/items.php:423
-#: ../inventory/manage/items.php.orig:416
+#: ../inventory/manage/items.php.orig:428
 #: ../manufacturing/includes/work_order_issue_ui.inc:133
-#: ../purchasing/includes/ui/po_ui.inc.orig:459
+#: ../purchasing/includes/ui/po_ui.inc.orig:457
 #: ../sales/includes/ui/sales_credit_ui.inc:295
-#: ../sales/includes/ui/sales_order_ui.inc.orig:557
+#: ../sales/includes/ui/sales_order_ui.inc:563
+#: ../taxes/sav.tax_types.php:173
+#: ../taxes/sav.tax_types.php:253
+#: ../taxes/sav.tax_types.php:256
 msgid "Cancel"
 msgstr ""
 
 #: ../admin/security_roles.php:249
-#: ../inventory/manage/items.php:423
-#: ../inventory/manage/items.php.orig:416
+#: ../inventory/manage/items.php.orig:428
 msgid "Cancel Edition"
 msgstr ""
 
 #: ../admin/shipping_companies.php:15
 #: ../sales/customer_credit_invoice.php:254
-#: ../sales/customer_delivery.php.orig:381
+#: ../sales/customer_delivery.php:382
 #: ../sales/customer_invoice.php:488
 #: ../sales/view/view_credit.php:74
 #: ../sales/view/view_dispatch.php:92
@@ -2266,16 +2262,13 @@ msgstr ""
 
 #: ../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:58
-#: ../inventory/manage/items.php:306
-#: ../inventory/manage/items.php.orig:299
+#: ../gl/includes/ui/gl_bank_ui.inc:57
+#: ../inventory/manage/items.php.orig:308
 #: ../manufacturing/manage/work_centres.php:137
 msgid "Name:"
 msgstr ""
 
 #: ../admin/shipping_companies.php:136
-#: ../purchasing/manage/suppliers.php.orig:113
 #: ../sales/manage/customer_branches.php:261
 msgid "Contact Person:"
 msgstr ""
@@ -2284,9 +2277,9 @@ msgstr ""
 #: ../includes/ui/contacts_view.inc:103
 #: ../inventory/manage/locations.php:205
 #: ../purchasing/manage/suppliers.php:136
-#: ../purchasing/manage/suppliers.php.orig:115
+#: ../purchasing/manage/suppliers.php.orig:136
 #: ../sales/manage/customer_branches.php:263
-#: ../sales/manage/customers.php:253
+#: ../sales/manage/customers.php:256
 #: ../sales/manage/sav.customers.php:253
 msgid "Secondary Phone Number:"
 msgstr ""
@@ -2300,15 +2293,6 @@ msgid "Unspecified tag type"
 msgstr ""
 
 #: ../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 ""
 
@@ -2386,7 +2370,7 @@ msgstr ""
 #: ../admin/users.php:114
 #: ../includes/ui/contacts_view.inc:41
 #: ../inventory/manage/locations.php:146
-#: ../reporting/rep106.php:86
+#: ../reporting/rep106.php:88
 #: ../reporting/includes/header2.inc:98
 #: ../sales/manage/sales_people.php:99
 msgid "Phone"
@@ -2395,7 +2379,6 @@ msgstr ""
 #: ../admin/users.php:115
 #: ../sales/manage/customer_branches.php:302
 #: ../sales/view/view_sales_order.php:96
-#: ../sales/view/view_sales_order.php.orig:83
 msgid "E-mail"
 msgstr ""
 
@@ -2442,9 +2425,10 @@ msgstr ""
 #: ../purchasing/inquiry/po_search_completed.php:112
 #: ../purchasing/inquiry/po_search_completed.php.orig:111
 #: ../purchasing/inquiry/po_search.php:93
-#: ../sales/inquiry/customer_inquiry.php:185
+#: ../sales/inquiry/customer_inquiry.php.orig:185
 #: ../sales/inquiry/sales_deliveries_view.php:160
 #: ../sales/inquiry/sales_orders_view.php:125
+#: ../sales/inquiry/sales_orders_view.php.orig:125
 msgid "Print"
 msgstr ""
 
@@ -2467,17 +2451,19 @@ msgstr ""
 #: ../dimensions/inquiry/search_dimensions.php:88
 #: ../gl/inquiry/journal_inquiry.php:53
 #: ../manufacturing/search_work_orders.php:78
-#: ../purchasing/includes/ui/invoice_ui.inc:474
+#: ../purchasing/includes/ui/invoice_ui.inc.orig:474
 #: ../purchasing/inquiry/po_search_completed.php:74
 #: ../purchasing/inquiry/po_search_completed.php.orig:75
 #: ../purchasing/inquiry/po_search.php:76
 #: ../purchasing/inquiry/supplier_allocation_inquiry.php:57
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php.orig:57
 #: ../purchasing/inquiry/supplier_inquiry.php:55
-#: ../purchasing/inquiry/supplier_inquiry.php.orig:55
 #: ../sales/inquiry/customer_allocation_inquiry.php:51
+#: ../sales/inquiry/customer_allocation_inquiry.php.orig:51
 #: ../sales/inquiry/customer_inquiry.php:54
+#: ../sales/inquiry/customer_inquiry.php.orig:54
 #: ../sales/inquiry/sales_deliveries_view.php:116
-#: ../sales/inquiry/sales_orders_view.php:269
+#: ../sales/inquiry/sales_orders_view.php.orig:269
 msgid "Search"
 msgstr ""
 
@@ -2496,17 +2482,16 @@ msgstr ""
 #: ../admin/view_print_transaction.php:127
 #: ../admin/void_transaction.php:182
 #: ../dimensions/inquiry/search_dimensions.php:128
-#: ../dimensions/view/view_dimension.php:54
+#: ../dimensions/view/view_dimension.php:55
 #: ../gl/bank_account_reconcile.php:233
 #: ../gl/inquiry/bank_inquiry.php:70
 #: ../gl/inquiry/journal_inquiry.php:131
 #: ../gl/view/bank_transfer_view.php:86
-#: ../gl/view/gl_deposit_view.php:75
-#: ../gl/view/gl_payment_view.php:73
+#: ../gl/view/gl_deposit_view.php:80
+#: ../gl/view/gl_payment_view.php:78
 #: ../gl/view/gl_trans_view.php:35
 #: ../includes/ui/contacts_view.inc:41
-#: ../inventory/inquiry/stock_movements.php:77
-#: ../inventory/inquiry/stock_movements.php.orig:79
+#: ../inventory/inquiry/stock_movements.php:78
 #: ../inventory/view/view_adjustment.php:44
 #: ../inventory/view/view_transfer.php:44
 #: ../manufacturing/search_work_orders.php:160
@@ -2517,9 +2502,8 @@ msgstr ""
 #: ../manufacturing/includes/manufacturing_ui.inc:276
 #: ../manufacturing/includes/manufacturing_ui.inc:280
 #: ../manufacturing/includes/manufacturing_ui.inc:331
-#: ../purchasing/includes/ui/grn_ui.inc:36
-#: ../purchasing/includes/ui/grn_ui.inc:53
-#: ../purchasing/includes/ui/po_ui.inc:321
+#: ../purchasing/includes/ui/grn_ui.inc:32
+#: ../purchasing/includes/ui/grn_ui.inc:64
 #: ../purchasing/includes/ui/po_ui.inc.orig:321
 #: ../purchasing/view/view_po.php:115
 #: ../purchasing/view/view_supp_credit.php:43
@@ -2528,40 +2512,38 @@ msgstr ""
 #: ../purchasing/inquiry/po_search_completed.php:121
 #: ../purchasing/inquiry/po_search_completed.php.orig:120
 #: ../purchasing/inquiry/po_search.php:131
-#: ../purchasing/inquiry/supplier_allocation_inquiry.php:127
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php.orig:127
 #: ../purchasing/inquiry/supplier_inquiry.php:175
-#: ../purchasing/inquiry/supplier_inquiry.php.orig:172
 #: ../purchasing/allocations/supplier_allocation_main.php:96
-#: ../reporting/rep501.php:85
-#: ../reporting/rep601.php:76
+#: ../reporting/rep501.php:87
+#: ../reporting/rep601.php:79
 #: ../reporting/rep602.php:80
-#: ../reporting/rep702.php:51
+#: ../reporting/rep702.php:53
 #: ../reporting/includes/doctext.inc:221
 #: ../sales/customer_credit_invoice.php:245
 #: ../sales/customer_credit_invoice.php:247
-#: ../sales/customer_delivery.php.orig:361
-#: ../sales/customer_delivery.php.orig:363
+#: ../sales/customer_delivery.php:362
+#: ../sales/customer_delivery.php:364
 #: ../sales/customer_invoice.php:460
 #: ../sales/customer_invoice.php:462
 #: ../sales/allocations/customer_allocation_main.php:95
 #: ../sales/view/view_dispatch.php:85
 #: ../sales/view/view_invoice.php:85
-#: ../sales/view/view_receipt.php:50
+#: ../sales/view/view_receipt.php:39
 #: ../sales/view/view_sales_order.php:94
-#: ../sales/view/view_sales_order.php.orig:81
-#: ../sales/inquiry/customer_allocation_inquiry.php:146
-#: ../sales/inquiry/customer_inquiry.php:203
+#: ../sales/inquiry/customer_allocation_inquiry.php.orig:146
+#: ../sales/inquiry/customer_inquiry.php.orig:203
 #: ../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.orig:373
+#: ../sales/includes/ui/sales_order_ui.inc:379
 msgid "Reference"
 msgstr ""
 
 #: ../admin/view_print_transaction.php:128
 #: ../admin/void_transaction.php:183
 #: ../dimensions/inquiry/search_dimensions.php:131
-#: ../dimensions/view/view_dimension.php:54
+#: ../dimensions/view/view_dimension.php:55
 #: ../gl/accruals.php:94
 #: ../gl/accruals.php:199
 #: ../gl/bank_account_reconcile.php:234
@@ -2573,10 +2555,9 @@ msgstr ""
 #: ../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:264
-#: ../includes/ui/ui_view.inc:488
-#: ../inventory/inquiry/stock_movements.php:77
-#: ../inventory/inquiry/stock_movements.php.orig:79
+#: ../includes/ui/allocation_cart.inc.orig:264
+#: ../includes/ui/ui_view.inc.orig:488
+#: ../inventory/inquiry/stock_movements.php:80
 #: ../inventory/view/view_adjustment.php:45
 #: ../inventory/view/view_transfer.php:47
 #: ../manufacturing/search_work_orders.php:166
@@ -2590,47 +2571,43 @@ msgstr ""
 #: ../manufacturing/includes/manufacturing_ui.inc:277
 #: ../manufacturing/includes/manufacturing_ui.inc:281
 #: ../manufacturing/includes/manufacturing_ui.inc:332
-#: ../purchasing/includes/ui/invoice_ui.inc:114
-#: ../purchasing/includes/ui/po_ui.inc:335
+#: ../purchasing/includes/ui/invoice_ui.inc.orig:114
 #: ../purchasing/includes/ui/po_ui.inc.orig:335
 #: ../purchasing/view/view_po.php:140
-#: ../purchasing/inquiry/supplier_allocation_inquiry.php:130
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php.orig:130
 #: ../purchasing/inquiry/supplier_inquiry.php:178
-#: ../purchasing/inquiry/supplier_inquiry.php.orig:175
 #: ../purchasing/allocations/supplier_allocation_main.php:97
-#: ../reporting/rep101.php:130
-#: ../reporting/rep107.php:192
-#: ../reporting/rep201.php:118
-#: ../reporting/rep501.php:85
-#: ../reporting/rep601.php:76
+#: ../reporting/rep101.php:118
+#: ../reporting/rep201.php:110
+#: ../reporting/rep306.php:141
+#: ../reporting/rep501.php:87
+#: ../reporting/rep601.php:79
 #: ../reporting/rep602.php:80
-#: ../reporting/rep704.php:79
-#: ../reporting/rep704.php:82
-#: ../reporting/rep704.php:85
-#: ../reporting/rep709.php:109
-#: ../reporting/rep710.php:75
+#: ../reporting/rep704.php:83
+#: ../reporting/rep704.php:86
+#: ../reporting/rep704.php:89
+#: ../reporting/rep709.php:111
+#: ../reporting/rep710.php:77
 #: ../reporting/includes/doctext.inc:167
 #: ../reporting/includes/doctext.inc:208
 #: ../reporting/includes/doctext.inc:246
 #: ../reporting/includes/header2.inc:135
-#: ../sales/customer_delivery.php.orig:391
+#: ../sales/customer_delivery.php:392
 #: ../sales/customer_invoice.php:503
 #: ../sales/allocations/customer_allocation_main.php:96
 #: ../sales/view/view_credit.php:69
 #: ../sales/view/view_sales_order.php:109
 #: ../sales/view/view_sales_order.php:142
 #: ../sales/view/view_sales_order.php:179
-#: ../sales/view/view_sales_order.php.orig:96
-#: ../sales/view/view_sales_order.php.orig:129
-#: ../sales/view/view_sales_order.php.orig:161
-#: ../sales/inquiry/customer_allocation_inquiry.php:148
-#: ../sales/inquiry/customer_inquiry.php:204
+#: ../sales/inquiry/customer_allocation_inquiry.php.orig:148
+#: ../sales/inquiry/customer_inquiry.php.orig:204
 msgid "Date"
 msgstr ""
 
 #: ../admin/view_print_transaction.php:130
 #: ../admin/void_transaction.php:184
 #: ../includes/ui/ui_view.inc:51
+#: ../includes/ui/ui_view.inc.orig:51
 msgid "GL"
 msgstr ""
 
@@ -2663,17 +2640,18 @@ msgstr ""
 #: ../gl/bank_transfer.php:98
 #: ../gl/inquiry/journal_inquiry.php:56
 #: ../gl/manage/revaluate_currencies.php:106
-#: ../includes/ui/ui_view.inc:308
+#: ../includes/ui/ui_view.inc:344
+#: ../includes/ui/ui_view.inc.orig:308
 #: ../manufacturing/work_order_add_finished.php:210
 #: ../manufacturing/work_order_costs.php:146
 #: ../manufacturing/work_order_entry.php:451
-#: ../manufacturing/work_order_release.php:100
-#: ../purchasing/includes/ui/invoice_ui.inc:180
-#: ../purchasing/includes/ui/po_ui.inc.orig:492
-#: ../purchasing/po_entry_items.php.orig:558
-#: ../purchasing/supplier_payment.php:316
+#: ../manufacturing/work_order_release.php:103
+#: ../purchasing/includes/ui/invoice_ui.inc.orig:180
+#: ../purchasing/includes/ui/po_ui.inc.orig:490
+#: ../purchasing/po_entry_items.php.orig:562
+#: ../purchasing/supplier_payment.php.orig:316
 #: ../sales/customer_invoice.php:680
-#: ../sales/customer_payments.php:413
+#: ../sales/customer_payments.php.orig:413
 msgid "Memo:"
 msgstr ""
 
@@ -2694,7 +2672,7 @@ msgid ""
 msgstr ""
 
 #: ../admin/void_transaction.php:228
-#: ../includes/ui/ui_controls.inc:593
+#: ../includes/ui/ui_controls.inc:595
 msgid "Proceed"
 msgstr ""
 
@@ -2707,15 +2685,15 @@ msgstr ""
 #: ../gl/bank_transfer.php:115
 #: ../gl/gl_journal.php:161
 #: ../gl/manage/close_period.php:34
-#: ../gl/manage/close_period.php.orig:34
 #: ../gl/manage/exchange_rates.php:33
 #: ../gl/manage/revaluate_currencies.php:53
 #: ../manufacturing/work_order_add_finished.php:98
 #: ../manufacturing/work_order_costs.php:80
 #: ../purchasing/po_receive_items.php:174
-#: ../purchasing/supplier_payment.php:174
+#: ../purchasing/supplier_payment.php:185
+#: ../purchasing/supplier_payment.php.orig:174
 #: ../sales/customer_credit_invoice.php:91
-#: ../sales/sales_order_entry.php:359
+#: ../sales/sales_order_entry.php:360
 #: ../sales/manage/recurrent_invoices.php:41
 #: ../sales/manage/recurrent_invoices.php:46
 #: ../sales/manage/recurrent_invoices.php:51
@@ -2744,13 +2722,6 @@ msgid ""
 "been set in System and General GL Setup"
 msgstr ""
 
-#: ../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:166
 #: ../admin/db/fiscalyears_db.inc:168
 msgid "Closing Year"
@@ -2758,8 +2729,8 @@ msgstr ""
 
 #: ../admin/db/fiscalyears_db.inc:214
 #: ../reporting/rep101.php:175
-#: ../reporting/rep201.php:167
-#: ../reporting/rep706.php:181
+#: ../reporting/rep201.php:170
+#: ../reporting/rep706.php:185
 msgid "Open Balance"
 msgstr ""
 
@@ -3028,9 +2999,6 @@ msgid "Ta&x Inquiry"
 msgstr ""
 
 #: ../applications/generalledger.php:44
-#: ../reporting/reports_main.php:297
-#: ../reporting/reports_main.php:342
-#: ../reporting/reports_main.php:382
 msgid "Trial &Balance"
 msgstr ""
 
@@ -3402,29 +3370,32 @@ msgstr ""
 
 #: ../dimensions/dimension_entry.php:123
 #: ../gl/bank_transfer.php:176
-#: ../gl/gl_bank.php:258
+#: ../gl/gl_bank.php:257
 #: ../gl/gl_journal.php:181
 #: ../gl/manage/revaluate_currencies.php:72
-#: ../inventory/adjustments.php:103
-#: ../inventory/transfers.php:99
+#: ../inventory/adjustments.php:101
+#: ../inventory/transfers.php:97
 #: ../manufacturing/work_order_add_finished.php:84
 #: ../manufacturing/work_order_entry.php:139
 #: ../manufacturing/work_order_issue.php:97
 #: ../purchasing/po_entry_items.php:368
-#: ../purchasing/po_entry_items.php.orig:365
+#: ../purchasing/po_entry_items.php.orig:368
 #: ../purchasing/po_receive_items.php:193
-#: ../purchasing/supplier_credit.php:173
+#: ../purchasing/supplier_credit.php:172
 #: ../purchasing/supplier_invoice.php:179
-#: ../purchasing/supplier_payment.php:203
-#: ../sales/create_recurrent_invoices.php:55
+#: ../purchasing/supplier_payment.php:214
+#: ../purchasing/supplier_payment.php.orig:203
+#: ../sales/create_recurrent_invoices.php:57
 #: ../sales/credit_note_entry.php:181
 #: ../sales/customer_credit_invoice.php:205
-#: ../sales/customer_delivery.php.orig:184
+#: ../sales/customer_delivery.php:324
 #: ../sales/customer_invoice.php:379
-#: ../sales/customer_payments.php:158
-#: ../sales/customer_payments.php:165
-#: ../sales/customer_payments.php:248
-#: ../sales/sales_order_entry.php:457
+#: ../sales/customer_payments.php:169
+#: ../sales/customer_payments.php:176
+#: ../sales/customer_payments.php.orig:158
+#: ../sales/customer_payments.php.orig:165
+#: ../sales/customer_payments.php.orig:248
+#: ../sales/sales_order_entry.php:458
 msgid "The entered reference is already in use."
 msgstr ""
 
@@ -3436,7 +3407,7 @@ msgstr ""
 #: ../manufacturing/work_order_entry.php:154
 #: ../manufacturing/work_order_entry.php:234
 #: ../purchasing/po_entry_items.php:241
-#: ../purchasing/po_entry_items.php.orig:238
+#: ../purchasing/po_entry_items.php.orig:241
 msgid "The date entered is in an invalid format."
 msgstr ""
 
@@ -3459,28 +3430,10 @@ msgstr ""
 
 #: ../dimensions/dimension_entry.php:277
 #: ../reporting/reports_main.php:34
-#: ../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
+#: ../reporting/reports_main.php:64
+#: ../reporting/reports_main.php:80
+#: ../reporting/reports_main.php:89
+#: ../reporting/reports_main.php:151
 msgid "Start Date"
 msgstr ""
 
@@ -3527,9 +3480,10 @@ msgstr ""
 
 #: ../dimensions/dimension_entry.php:302
 #: ../includes/ui/simple_crud_class.inc:225
-#: ../purchasing/includes/ui/invoice_ui.inc:206
-#: ../purchasing/includes/ui/invoice_ui.inc:412
-#: ../purchasing/includes/ui/invoice_ui.inc:414
+#: ../purchasing/includes/ui/invoice_ui.inc.orig:206
+#: ../purchasing/includes/ui/invoice_ui.inc.orig:412
+#: ../purchasing/includes/ui/invoice_ui.inc.orig:414
+#: ../taxes/sav.tax_types.php:172
 msgid "Add"
 msgstr ""
 
@@ -3544,18 +3498,17 @@ msgstr ""
 #: ../dimensions/includes/dimensions_ui.inc:31
 #: ../gl/accruals.php:94
 #: ../gl/inquiry/gl_account_inquiry.php:129
-#: ../gl/inquiry/gl_trial_balance.php:170
 #: ../gl/manage/gl_quick_entries.php:241
 #: ../gl/manage/gl_quick_entries.php:333
 #: ../includes/sysnames.inc:165
-#: ../purchasing/includes/ui/invoice_ui.inc:265
-#: ../purchasing/includes/ui/invoice_ui.inc:267
-#: ../purchasing/includes/ui/invoice_ui.inc:269
-#: ../reporting/rep701.php:109
-#: ../reporting/rep705.php:234
-#: ../reporting/rep706.php:181
-#: ../reporting/rep707.php:206
-#: ../reporting/rep708.php:179
+#: ../purchasing/includes/ui/invoice_ui.inc.orig:265
+#: ../purchasing/includes/ui/invoice_ui.inc.orig:267
+#: ../purchasing/includes/ui/invoice_ui.inc.orig:269
+#: ../reporting/rep701.php:111
+#: ../reporting/rep705.php:238
+#: ../reporting/rep706.php:185
+#: ../reporting/rep707.php:210
+#: ../reporting/rep708.php:192
 msgid "Account"
 msgstr ""
 
@@ -3565,9 +3518,6 @@ msgstr ""
 #: ../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:176
-#: ../gl/inquiry/gl_trial_balance.php:178
-#: ../gl/inquiry/gl_trial_balance.php:180
 #: ../gl/view/accrual_trans.php:60
 #: ../gl/view/gl_trans_view.php:69
 #: ../gl/view/gl_trans_view.php:72
@@ -3575,19 +3525,18 @@ msgstr ""
 #: ../gl/includes/ui/gl_journal_ui.inc:87
 #: ../gl/includes/ui/gl_journal_ui.inc:90
 #: ../gl/includes/ui/gl_journal_ui.inc:93
-#: ../purchasing/inquiry/supplier_allocation_inquiry.php:133
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php.orig:133
 #: ../purchasing/inquiry/supplier_inquiry.php:181
-#: ../purchasing/inquiry/supplier_inquiry.php.orig:178
-#: ../reporting/rep601.php:77
+#: ../reporting/rep601.php:80
 #: ../reporting/rep602.php:81
-#: ../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:209
+#: ../reporting/rep702.php:54
+#: ../reporting/rep704.php:84
+#: ../reporting/rep704.php:87
+#: ../reporting/rep704.php:90
+#: ../reporting/rep708.php:192
+#: ../reporting/rep708.php:193
+#: ../sales/inquiry/customer_allocation_inquiry.php.orig:152
+#: ../sales/inquiry/customer_inquiry.php.orig:209
 msgid "Debit"
 msgstr ""
 
@@ -3597,9 +3546,6 @@ msgstr ""
 #: ../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:69
 #: ../gl/view/gl_trans_view.php:72
@@ -3608,19 +3554,18 @@ msgstr ""
 #: ../gl/includes/ui/gl_journal_ui.inc:90
 #: ../gl/includes/ui/gl_journal_ui.inc:93
 #: ../includes/sysnames.inc:85
-#: ../purchasing/inquiry/supplier_allocation_inquiry.php:134
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php.orig:134
 #: ../purchasing/inquiry/supplier_inquiry.php:182
-#: ../purchasing/inquiry/supplier_inquiry.php.orig:179
-#: ../reporting/rep601.php:77
+#: ../reporting/rep601.php:80
 #: ../reporting/rep602.php:81
-#: ../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:210
+#: ../reporting/rep702.php:54
+#: ../reporting/rep704.php:84
+#: ../reporting/rep704.php:87
+#: ../reporting/rep704.php:90
+#: ../reporting/rep708.php:192
+#: ../reporting/rep708.php:193
+#: ../sales/inquiry/customer_allocation_inquiry.php.orig:153
+#: ../sales/inquiry/customer_inquiry.php.orig:210
 msgid "Credit"
 msgstr ""
 
@@ -3628,18 +3573,20 @@ msgstr ""
 #: ../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:174
-#: ../purchasing/inquiry/supplier_allocation_inquiry.php:136
-#: ../reporting/rep203.php:92
-#: ../reporting/rep204.php:82
-#: ../reporting/rep601.php:77
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php.orig:136
+#: ../reporting/rep101.php:122
+#: ../reporting/rep201.php:114
+#: ../reporting/rep203.php:94
+#: ../reporting/rep204.php:84
+#: ../reporting/rep307.php:117
+#: ../reporting/rep601.php:80
 #: ../reporting/rep602.php:81
-#: ../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
+#: ../reporting/rep701.php:111
+#: ../reporting/rep704.php:84
+#: ../reporting/rep704.php:87
+#: ../reporting/rep704.php:90
+#: ../reporting/rep708.php:185
+#: ../sales/inquiry/customer_allocation_inquiry.php.orig:155
 msgid "Balance"
 msgstr ""
 
@@ -3656,7 +3603,6 @@ msgstr ""
 #: ../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:104
 #: ../gl/includes/ui/gl_journal_ui.inc:30
 #: ../includes/ui/contacts_view.inc:94
 #: ../inventory/includes/item_adjustments_ui.inc:35
@@ -3667,75 +3613,78 @@ msgstr ""
 #: ../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:104
-#: ../purchasing/includes/ui/po_ui.inc:166
-#: ../purchasing/includes/ui/po_ui.inc:171
+#: ../purchasing/includes/ui/invoice_ui.inc.orig:104
 #: ../purchasing/includes/ui/po_ui.inc.orig:166
 #: ../purchasing/includes/ui/po_ui.inc.orig:171
-#: ../purchasing/supplier_payment.php:289
-#: ../sales/customer_payments.php:382
+#: ../purchasing/supplier_payment.php.orig:289
+#: ../sales/customer_payments.php.orig:382
 msgid "Reference:"
 msgstr ""
 
 #: ../dimensions/inquiry/search_dimensions.php:75
-#: ../includes/ui/allocation_cart.inc:286
-#: ../includes/ui/ui_lists.inc:1923
-#: ../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
+#: ../includes/ui/allocation_cart.inc.orig:286
+#: ../includes/ui/ui_lists.inc:1927
+#: ../reporting/rep101.php:100
+#: ../reporting/rep102.php:96
+#: ../reporting/rep104.php:97
+#: ../reporting/rep104.php:101
+#: ../reporting/rep105.php:95
+#: ../reporting/rep105.php:99
+#: ../reporting/rep201.php:92
+#: ../reporting/rep202.php:100
+#: ../reporting/rep203.php:74
+#: ../reporting/rep204.php:77
+#: ../reporting/rep301.php:92
+#: ../reporting/rep301.php:99
+#: ../reporting/rep302.php:105
+#: ../reporting/rep302.php:112
+#: ../reporting/rep303.php:96
+#: ../reporting/rep303.php:103
+#: ../reporting/rep304.php:98
+#: ../reporting/rep304.php:103
+#: ../reporting/rep304.php:108
+#: ../reporting/rep306.php:120
+#: ../reporting/rep306.php:125
+#: ../reporting/rep306.php:130
+#: ../reporting/rep306.php:135
+#: ../reporting/rep307.php:103
+#: ../reporting/rep307.php:110
+#: ../reporting/rep308.php:138
+#: ../reporting/rep308.php:143
+#: ../reporting/rep309.php:92
+#: ../reporting/rep702.php:61
+#: ../reporting/rep710.php:86
+#: ../reporting/rep710.php:87
 msgid "All"
 msgstr ""
 
 #: ../dimensions/inquiry/search_dimensions.php:76
 #: ../gl/inquiry/bank_inquiry.php:49
-#: ../gl/inquiry/gl_trial_balance.php:49
+#: ../gl/inquiry/gl_trial_balance.php:54
 #: ../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:23
-#: ../gl/includes/ui/gl_bank_ui.inc.orig:53
+#: ../gl/inquiry/profit_loss.php:168
+#: ../gl/includes/ui/gl_bank_ui.inc:52
+#: ../gl/includes/ui/gl_bank_ui.inc:120
 #: ../inventory/inquiry/stock_movements.php:58
-#: ../inventory/inquiry/stock_movements.php.orig:60
 #: ../purchasing/inquiry/supplier_allocation_inquiry.php:50
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php.orig:50
 #: ../purchasing/inquiry/supplier_inquiry.php:50
-#: ../purchasing/inquiry/supplier_inquiry.php.orig:50
 #: ../sales/inquiry/customer_inquiry.php:46
+#: ../sales/inquiry/customer_inquiry.php.orig:46
 msgid "From:"
 msgstr ""
 
 #: ../dimensions/inquiry/search_dimensions.php:77
 #: ../gl/inquiry/bank_inquiry.php:50
-#: ../gl/inquiry/gl_trial_balance.php:50
+#: ../gl/inquiry/gl_trial_balance.php:55
 #: ../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:23
+#: ../gl/inquiry/profit_loss.php:169
 #: ../inventory/inquiry/stock_movements.php:59
-#: ../inventory/inquiry/stock_movements.php.orig:61
 #: ../purchasing/inquiry/supplier_allocation_inquiry.php:51
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php.orig:51
 #: ../purchasing/inquiry/supplier_inquiry.php:51
-#: ../purchasing/inquiry/supplier_inquiry.php.orig:51
 #: ../sales/inquiry/customer_inquiry.php:47
+#: ../sales/inquiry/customer_inquiry.php.orig:47
 msgid "To:"
 msgstr ""
 
@@ -3750,31 +3699,29 @@ msgid "Only Open:"
 msgstr ""
 
 #: ../dimensions/inquiry/search_dimensions.php:132
-#: ../dimensions/view/view_dimension.php:54
-#: ../includes/ui/allocation_cart.inc:264
-#: ../purchasing/includes/ui/invoice_ui.inc:123
+#: ../dimensions/view/view_dimension.php:55
+#: ../includes/ui/allocation_cart.inc.orig:264
+#: ../purchasing/includes/ui/invoice_ui.inc.orig:123
 #: ../purchasing/view/view_supp_credit.php:48
 #: ../purchasing/view/view_supp_invoice.php:52
-#: ../purchasing/inquiry/supplier_allocation_inquiry.php:131
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php.orig:131
 #: ../purchasing/inquiry/supplier_inquiry.php:179
-#: ../purchasing/inquiry/supplier_inquiry.php.orig:176
-#: ../reporting/rep101.php:130
-#: ../reporting/rep201.php:118
-#: ../reporting/rep203.php:91
-#: ../reporting/rep501.php:85
+#: ../reporting/rep101.php:118
+#: ../reporting/rep201.php:110
+#: ../reporting/rep203.php:93
+#: ../reporting/rep501.php:87
 #: ../reporting/includes/doctext.inc:112
 #: ../reporting/includes/doctext.inc:144
 #: ../reporting/includes/doctext.inc:165
 #: ../reporting/includes/doctext.inc:167
-#: ../reporting/includes/doctext.inc:188
 #: ../reporting/includes/doctext.inc:206
 #: ../reporting/includes/doctext.inc:208
 #: ../sales/customer_invoice.php:510
 #: ../sales/view/view_dispatch.php:97
 #: ../sales/view/view_invoice.php:96
-#: ../sales/inquiry/customer_allocation_inquiry.php:149
-#: ../sales/inquiry/customer_inquiry.php:205
-#: ../sales/includes/ui/sales_order_ui.inc.orig:596
+#: ../sales/inquiry/customer_allocation_inquiry.php.orig:149
+#: ../sales/inquiry/customer_inquiry.php.orig:205
+#: ../sales/includes/ui/sales_order_ui.inc:602
 msgid "Due Date"
 msgstr ""
 
@@ -3786,44 +3733,46 @@ msgstr ""
 msgid "View Dimension"
 msgstr ""
 
-#: ../dimensions/view/view_dimension.php:48
+#: ../dimensions/view/view_dimension.php:49
 msgid "The dimension number sent is not valid."
 msgstr ""
 
-#: ../dimensions/view/view_dimension.php:72
+#: ../dimensions/view/view_dimension.php:73
 msgid "This dimension is closed."
 msgstr ""
 
-#: ../dimensions/view/view_dimension.php:84
+#: ../dimensions/view/view_dimension.php:85
 #: ../gl/inquiry/gl_account_inquiry.php:71
 #: ../gl/inquiry/tax_inquiry.php:61
 #: ../purchasing/inquiry/po_search_completed.php:62
 #: ../purchasing/inquiry/po_search_completed.php.orig:63
 #: ../purchasing/inquiry/po_search.php:64
 #: ../sales/inquiry/customer_allocation_inquiry.php:44
+#: ../sales/inquiry/customer_allocation_inquiry.php.orig:44
 #: ../sales/inquiry/sales_deliveries_view.php:104
-#: ../sales/inquiry/sales_orders_view.php:251
+#: ../sales/inquiry/sales_orders_view.php.orig:251
 msgid "from:"
 msgstr ""
 
-#: ../dimensions/view/view_dimension.php:85
+#: ../dimensions/view/view_dimension.php:86
 #: ../gl/inquiry/gl_account_inquiry.php:72
 #: ../gl/inquiry/tax_inquiry.php:62
 #: ../purchasing/inquiry/po_search_completed.php:63
 #: ../purchasing/inquiry/po_search_completed.php.orig:64
 #: ../purchasing/inquiry/po_search.php:65
 #: ../sales/inquiry/customer_allocation_inquiry.php:45
+#: ../sales/inquiry/customer_allocation_inquiry.php.orig:45
 #: ../sales/inquiry/sales_deliveries_view.php:105
-#: ../sales/inquiry/sales_orders_view.php:252
+#: ../sales/inquiry/sales_orders_view.php.orig:252
 msgid "to:"
 msgstr ""
 
-#: ../dimensions/view/view_dimension.php:86
+#: ../dimensions/view/view_dimension.php:87
 #: ../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/gl_trial_balance.php:63
+#: ../gl/inquiry/profit_loss.php:183
 #: ../gl/inquiry/tax_inquiry.php:63
 msgid "Show"
 msgstr ""
@@ -3835,29 +3784,30 @@ msgstr ""
 
 #: ../gl/accruals.php:38
 #: ../gl/bank_transfer.php:121
-#: ../gl/gl_bank.php:270
+#: ../gl/gl_bank.php:269
 #: ../gl/gl_journal.php:167
 #: ../gl/manage/revaluate_currencies.php:59
-#: ../inventory/adjustments.php:116
-#: ../inventory/transfers.php:111
+#: ../inventory/adjustments.php:114
+#: ../inventory/transfers.php:109
 #: ../manufacturing/work_order_add_finished.php:104
 #: ../manufacturing/work_order_costs.php:86
 #: ../manufacturing/work_order_entry.php:160
 #: ../manufacturing/work_order_issue.php:84
 #: ../purchasing/po_entry_items.php:345
-#: ../purchasing/po_entry_items.php.orig:342
+#: ../purchasing/po_entry_items.php.orig:345
 #: ../purchasing/po_receive_items.php:179
-#: ../purchasing/supplier_credit.php:193
+#: ../purchasing/supplier_credit.php:192
 #: ../purchasing/supplier_invoice.php:199
-#: ../purchasing/supplier_payment.php:180
-#: ../sales/create_recurrent_invoices.php:119
+#: ../purchasing/supplier_payment.php:191
+#: ../purchasing/supplier_payment.php.orig:180
+#: ../sales/create_recurrent_invoices.php:121
 #: ../sales/credit_note_entry.php:157
 #: ../sales/customer_credit_invoice.php:95
 #: ../sales/customer_delivery.php:165
-#: ../sales/customer_delivery.php.orig:165
 #: ../sales/customer_invoice.php:318
-#: ../sales/customer_payments.php:145
-#: ../sales/sales_order_entry.php:364
+#: ../sales/customer_payments.php:156
+#: ../sales/customer_payments.php.orig:145
+#: ../sales/sales_order_entry.php:365
 msgid ""
 "The entered date is out of fiscal year or is closed for further data entry."
 msgstr ""
@@ -3894,118 +3844,99 @@ msgstr ""
 #: ../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/inquiry/gl_trial_balance.php:57
+#: ../gl/inquiry/gl_trial_balance.php:59
+#: ../gl/inquiry/profit_loss.php:179
+#: ../gl/inquiry/profit_loss.php:181
 #: ../gl/manage/gl_quick_entries.php:261
 #: ../gl/manage/gl_quick_entries.php:263
 #: ../gl/manage/gl_quick_entries.php:343
 #: ../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_deposit_view.php:104
+#: ../gl/view/gl_deposit_view.php:107
+#: ../gl/view/gl_payment_view.php:103
+#: ../gl/view/gl_payment_view.php:106
 #: ../gl/view/gl_trans_view.php:68
 #: ../gl/view/gl_trans_view.php:71
-#: ../gl/includes/ui/gl_bank_ui.inc:150
-#: ../gl/includes/ui/gl_bank_ui.inc:151
+#: ../gl/includes/ui/gl_bank_ui.inc:152
 #: ../gl/includes/ui/gl_bank_ui.inc:153
-#: ../gl/includes/ui/gl_bank_ui.inc.orig:124
-#: ../gl/includes/ui/gl_bank_ui.inc.orig:125
-#: ../gl/includes/ui/gl_bank_ui.inc.orig:127
+#: ../gl/includes/ui/gl_bank_ui.inc:155
 #: ../gl/includes/ui/gl_journal_ui.inc:86
 #: ../gl/includes/ui/gl_journal_ui.inc:87
 #: ../gl/includes/ui/gl_journal_ui.inc:89
 #: ../includes/sysnames.inc:43
 #: ../includes/sysnames.inc:166
-#: ../inventory/manage/item_categories.php:216
-#: ../inventory/manage/item_categories.php:218
-#: ../inventory/manage/items.php:350
-#: ../inventory/manage/items.php:352
-#: ../inventory/manage/items.php.orig:343
-#: ../inventory/manage/items.php.orig:345
-#: ../purchasing/includes/ui/invoice_ui.inc:265
-#: ../purchasing/includes/ui/invoice_ui.inc:267
+#: ../inventory/manage/item_categories.php:220
+#: ../inventory/manage/item_categories.php:222
+#: ../inventory/manage/items.php.orig:355
+#: ../inventory/manage/items.php.orig:357
+#: ../purchasing/includes/ui/invoice_ui.inc.orig:265
+#: ../purchasing/includes/ui/invoice_ui.inc.orig:267
 #: ../purchasing/manage/suppliers.php:145
 #: ../purchasing/manage/suppliers.php:146
 #: ../purchasing/manage/suppliers.php:148
+#: ../purchasing/manage/suppliers.php.orig:145
+#: ../purchasing/manage/suppliers.php.orig:146
 #: ../purchasing/manage/suppliers.php.orig:148
-#: ../purchasing/manage/suppliers.php.orig:149
-#: ../purchasing/manage/suppliers.php.orig:151
-#: ../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: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.orig:408
-#: ../sales/customer_delivery.php.orig:416
+#: ../reporting/rep103.php:243
+#: ../reporting/rep103.php:255
+#: ../reporting/rep205.php:161
+#: ../reporting/rep205.php:173
+#: ../reporting/rep501.php:92
+#: ../reporting/rep704.php:83
+#: ../reporting/rep704.php:86
+#: ../reporting/rep704.php:97
+#: ../reporting/rep704.php:99
+#: ../reporting/rep704.php:107
+#: ../reporting/rep705.php:249
+#: ../reporting/rep705.php:251
+#: ../reporting/rep705.php:262
+#: ../reporting/rep706.php:194
+#: ../reporting/rep706.php:196
+#: ../reporting/rep706.php:204
+#: ../reporting/rep707.php:218
+#: ../reporting/rep707.php:220
+#: ../reporting/rep707.php:228
+#: ../reporting/rep708.php:201
+#: ../reporting/rep708.php:203
+#: ../reporting/rep708.php:210
+#: ../sales/customer_delivery.php:409
+#: ../sales/customer_delivery.php:417
 #: ../sales/customer_invoice.php:475
 #: ../sales/customer_invoice.php:518
-#: ../sales/manage/customers.php:270
-#: ../sales/manage/customers.php:272
+#: ../sales/manage/customers.php:273
+#: ../sales/manage/customers.php:275
 #: ../sales/manage/sav.customers.php:269
 #: ../sales/manage/sav.customers.php:271
 #: ../sales/includes/ui/sales_credit_ui.inc:132
 #: ../sales/includes/ui/sales_credit_ui.inc:137
-#: ../sales/includes/ui/sales_order_ui.inc.orig:451
-#: ../sales/includes/ui/sales_order_ui.inc.orig:456
+#: ../sales/includes/ui/sales_order_ui.inc:457
+#: ../sales/includes/ui/sales_order_ui.inc:462
 msgid "Dimension"
 msgstr ""
 
 #: ../gl/accruals.php:102
 #: ../gl/accruals.php:217
+#: ../gl/inquiry/bank_inquiry.php:71
 #: ../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_deposit_view.php:105
+#: ../gl/view/gl_deposit_view.php:108
+#: ../gl/view/gl_deposit_view.php:111
+#: ../gl/view/gl_payment_view.php:104
+#: ../gl/view/gl_payment_view.php:107
+#: ../gl/view/gl_payment_view.php:110
 #: ../gl/view/gl_trans_view.php:69
 #: ../gl/view/gl_trans_view.php:72
 #: ../gl/view/gl_trans_view.php:75
-#: ../gl/includes/ui/gl_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:125
-#: ../gl/includes/ui/gl_bank_ui.inc.orig:128
-#: ../gl/includes/ui/gl_bank_ui.inc.orig:131
-#: ../gl/includes/ui/gl_bank_ui.inc.orig:271
+#: ../gl/includes/ui/gl_bank_ui.inc:153
+#: ../gl/includes/ui/gl_bank_ui.inc:156
+#: ../gl/includes/ui/gl_bank_ui.inc:159
+#: ../gl/includes/ui/gl_bank_ui.inc:312
 #: ../gl/includes/ui/gl_journal_ui.inc:87
 #: ../gl/includes/ui/gl_journal_ui.inc:90
 #: ../gl/includes/ui/gl_journal_ui.inc:93
@@ -4014,11 +3945,11 @@ msgstr ""
 #: ../inventory/includes/stock_transfers_ui.inc:161
 #: ../manufacturing/view/wo_costs_view.php:46
 #: ../manufacturing/includes/work_order_issue_ui.inc:169
-#: ../purchasing/includes/ui/invoice_ui.inc:265
-#: ../purchasing/includes/ui/invoice_ui.inc:267
-#: ../purchasing/includes/ui/invoice_ui.inc:269
+#: ../purchasing/includes/ui/invoice_ui.inc.orig:265
+#: ../purchasing/includes/ui/invoice_ui.inc.orig:267
+#: ../purchasing/includes/ui/invoice_ui.inc.orig:269
 #: ../sales/customer_credit_invoice.php:364
-#: ../sales/customer_delivery.php.orig:532
+#: ../sales/customer_delivery.php:543
 #: ../sales/includes/ui/sales_credit_ui.inc:339
 msgid "Memo"
 msgstr ""
@@ -4042,7 +3973,7 @@ msgstr ""
 #: ../gl/accruals.php:186
 #: ../gl/manage/gl_quick_entries.php:240
 #: ../gl/includes/ui/gl_journal_ui.inc:57
-#: ../sales/create_recurrent_invoices.php:132
+#: ../sales/create_recurrent_invoices.php:134
 #: ../sales/manage/recurrent_invoices.php:102
 msgid "Monthly"
 msgstr ""
@@ -4075,41 +4006,36 @@ msgstr ""
 #: ../gl/view/bank_transfer_view.php:70
 #: ../gl/view/bank_transfer_view.php:80
 #: ../gl/view/gl_deposit_view.php:67
-#: ../gl/view/gl_deposit_view.php:100
-#: ../gl/view/gl_deposit_view.php:103
-#: ../gl/view/gl_deposit_view.php:106
+#: ../gl/view/gl_deposit_view.php:105
+#: ../gl/view/gl_deposit_view.php:108
+#: ../gl/view/gl_deposit_view.php:111
 #: ../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: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:125
-#: ../gl/includes/ui/gl_bank_ui.inc.orig:128
-#: ../gl/includes/ui/gl_bank_ui.inc.orig:131
+#: ../gl/view/gl_payment_view.php:104
+#: ../gl/view/gl_payment_view.php:107
+#: ../gl/view/gl_payment_view.php:110
+#: ../gl/includes/ui/gl_bank_ui.inc:153
+#: ../gl/includes/ui/gl_bank_ui.inc:156
+#: ../gl/includes/ui/gl_bank_ui.inc:159
 #: ../includes/sysnames.inc:133
-#: ../includes/ui/allocation_cart.inc:264
-#: ../includes/ui/ui_lists.inc:1182
+#: ../includes/ui/allocation_cart.inc.orig:264
+#: ../includes/ui/ui_lists.inc:1185
 #: ../manufacturing/view/wo_costs_view.php:46
 #: ../manufacturing/includes/manufacturing_ui.inc:236
-#: ../purchasing/includes/ui/invoice_ui.inc:265
-#: ../purchasing/includes/ui/invoice_ui.inc:267
-#: ../purchasing/includes/ui/invoice_ui.inc:269
+#: ../purchasing/includes/ui/invoice_ui.inc.orig:265
+#: ../purchasing/includes/ui/invoice_ui.inc.orig:267
+#: ../purchasing/includes/ui/invoice_ui.inc.orig:269
 #: ../purchasing/view/view_supp_payment.php:60
 #: ../purchasing/view/view_supp_payment.php:72
-#: ../reporting/rep102.php:241
-#: ../reporting/rep107.php:194
-#: ../reporting/rep107.php:251
-#: ../reporting/rep109.php:192
-#: ../reporting/rep110.php:195
-#: ../reporting/rep111.php:177
-#: ../reporting/rep113.php:181
-#: ../reporting/rep202.php:249
-#: ../reporting/rep209.php:200
-#: ../reporting/rep706.php:303
-#: ../reporting/rep707.php:321
-#: ../reporting/rep710.php:76
+#: ../reporting/rep102.php:245
+#: ../reporting/rep109.php:190
+#: ../reporting/rep110.php:193
+#: ../reporting/rep111.php:173
+#: ../reporting/rep113.php:178
+#: ../reporting/rep202.php:253
+#: ../reporting/rep209.php:195
+#: ../reporting/rep706.php:309
+#: ../reporting/rep707.php:327
+#: ../reporting/rep710.php:78
 #: ../sales/view/view_receipt.php:44
 msgid "Amount"
 msgstr ""
@@ -4147,7 +4073,9 @@ msgstr ""
 #: ../gl/gl_bank.php:49
 #: ../gl/inquiry/bank_inquiry.php:30
 #: ../purchasing/supplier_payment.php:42
-#: ../sales/customer_payments.php:39
+#: ../purchasing/supplier_payment.php.orig:42
+#: ../sales/customer_payments.php:38
+#: ../sales/customer_payments.php.orig:39
 msgid "There are no bank accounts defined in the system."
 msgstr ""
 
@@ -4170,7 +4098,7 @@ msgid "Bank Statement:"
 msgstr ""
 
 #: ../gl/bank_account_reconcile.php:167
-#: ../inventory/purchasing_data.php.orig:235
+#: ../taxes/sav.tax_types.php:183
 msgid "New"
 msgstr ""
 
@@ -4208,11 +4136,11 @@ msgstr ""
 #: ../gl/inquiry/gl_account_inquiry.php:141
 #: ../gl/inquiry/gl_account_inquiry.php:143
 #: ../gl/view/accrual_trans.php:60
-#: ../reporting/rep601.php:76
+#: ../reporting/rep601.php:79
 #: ../reporting/rep602.php:80
-#: ../reporting/rep704.php:80
-#: ../reporting/rep704.php:82
-#: ../reporting/rep704.php:85
+#: ../reporting/rep704.php:84
+#: ../reporting/rep704.php:86
+#: ../reporting/rep704.php:89
 msgid "Person/Item"
 msgstr ""
 
@@ -4252,30 +4180,37 @@ msgstr ""
 
 #: ../gl/bank_transfer.php:87
 #: ../gl/bank_transfer.php:94
-#: ../sales/customer_payments.php:411
+#: ../sales/customer_payments.php.orig:411
 msgid "Amount:"
 msgstr ""
 
 #: ../gl/bank_transfer.php:88
 #: ../gl/bank_transfer.php:95
-#: ../purchasing/supplier_payment.php:302
-#: ../sales/customer_payments.php:396
+#: ../purchasing/supplier_payment.php.orig:302
+#: ../sales/customer_payments.php.orig:396
 msgid "Bank Charge:"
 msgstr ""
 
+#: ../gl/bank_transfer.php:90
+msgid "Incoming Amount:"
+msgstr ""
+
 #: ../gl/bank_transfer.php:102
 msgid "Enter Transfer"
 msgstr ""
 
 #: ../gl/bank_transfer.php:128
 #: ../gl/bank_transfer.php:158
-#: ../purchasing/supplier_payment.php:125
-#: ../purchasing/supplier_payment.php:131
+#: ../gl/bank_transfer.php:190
+#: ../purchasing/supplier_payment.php:135
+#: ../purchasing/supplier_payment.php:141
+#: ../purchasing/supplier_payment.php.orig:125
+#: ../purchasing/supplier_payment.php.orig:131
 msgid "The entered amount is invalid or less than zero."
 msgstr ""
 
 #: ../gl/bank_transfer.php:133
-#: ../gl/gl_bank.php:228
+#: ../gl/gl_bank.php:227
 msgid "The total bank amount cannot be 0."
 msgstr ""
 
@@ -4285,7 +4220,7 @@ msgid "The total bank amount exceeds allowed limit (%s) for source account."
 msgstr ""
 
 #: ../gl/bank_transfer.php:150
-#: ../gl/gl_bank.php:245
+#: ../gl/gl_bank.php:244
 #, php-format
 msgid ""
 "The bank transaction would result in exceed of authorized overdraft limit "
@@ -4293,30 +4228,33 @@ msgid ""
 msgstr ""
 
 #: ../gl/bank_transfer.php:163
-#: ../purchasing/supplier_payment.php:139
-#: ../sales/customer_payments.php:184
+#: ../purchasing/supplier_payment.php:149
+#: ../purchasing/supplier_payment.php.orig:139
+#: ../sales/customer_payments.php:195
+#: ../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:169
-#: ../gl/gl_bank.php:252
+#: ../gl/gl_bank.php:251
 #: ../gl/gl_journal.php:173
 #: ../gl/manage/revaluate_currencies.php:65
-#: ../inventory/adjustments.php:96
-#: ../inventory/transfers.php:93
+#: ../inventory/adjustments.php:94
+#: ../inventory/transfers.php:91
 #: ../manufacturing/work_order_add_finished.php:77
 #: ../manufacturing/work_order_entry.php:132
 #: ../manufacturing/work_order_issue.php:90
 #: ../purchasing/po_receive_items.php:186
-#: ../purchasing/supplier_payment.php:196
+#: ../purchasing/supplier_payment.php:207
+#: ../purchasing/supplier_payment.php.orig:196
 #: ../sales/credit_note_entry.php:147
 #: ../sales/customer_credit_invoice.php:102
 #: ../sales/customer_delivery.php:178
-#: ../sales/customer_delivery.php.orig:178
 #: ../sales/customer_invoice.php:332
-#: ../sales/customer_payments.php:151
-#: ../sales/sales_order_entry.php:428
+#: ../sales/customer_payments.php:162
+#: ../sales/customer_payments.php.orig:151
+#: ../sales/sales_order_entry.php:429
 msgid "You must enter a reference."
 msgstr ""
 
@@ -4324,6 +4262,10 @@ msgstr ""
 msgid "The source and destination bank accouts cannot be the same."
 msgstr ""
 
+#: ../gl/bank_transfer.php:195
+msgid "The incomming bank amount cannot be 0."
+msgstr ""
+
 #: ../gl/gl_bank.php:34
 msgid "Bank Account Payment Entry"
 msgstr ""
@@ -4340,35 +4282,35 @@ msgstr ""
 msgid "Modify Bank Deposit Entry"
 msgstr ""
 
-#: ../gl/gl_bank.php:76
+#: ../gl/gl_bank.php:77
 #, php-format
 msgid "Payment %d has been entered"
 msgstr ""
 
-#: ../gl/gl_bank.php:78
-#: ../gl/gl_bank.php:96
+#: ../gl/gl_bank.php:79
+#: ../gl/gl_bank.php:97
 msgid "&View the GL Postings for this Payment"
 msgstr ""
 
-#: ../gl/gl_bank.php:80
-#: ../gl/gl_bank.php:98
+#: ../gl/gl_bank.php:81
+#: ../gl/gl_bank.php:99
 msgid "Enter Another &Payment"
 msgstr ""
 
-#: ../gl/gl_bank.php:82
-#: ../gl/gl_bank.php:100
+#: ../gl/gl_bank.php:83
+#: ../gl/gl_bank.php:101
 msgid "Enter A &Deposit"
 msgstr ""
 
-#: ../gl/gl_bank.php:84
+#: ../gl/gl_bank.php:85
 #: ../gl/gl_journal.php:63
 #: ../inventory/adjustments.php:50
 #: ../manufacturing/work_order_entry.php:68
 #: ../purchasing/po_entry_items.php:115
 #: ../purchasing/po_entry_items.php:139
-#: ../purchasing/po_entry_items.php.orig:112
-#: ../purchasing/po_entry_items.php.orig:136
-#: ../purchasing/supplier_credit.php:84
+#: ../purchasing/po_entry_items.php.orig:115
+#: ../purchasing/po_entry_items.php.orig:139
+#: ../purchasing/supplier_credit.php:83
 #: ../purchasing/supplier_invoice.php:75
 #: ../sales/credit_note_entry.php:77
 #: ../sales/customer_credit_invoice.php:62
@@ -4377,79 +4319,94 @@ msgstr ""
 msgid "Add an Attachment"
 msgstr ""
 
-#: ../gl/gl_bank.php:110
+#: ../gl/gl_bank.php:95
+#, php-format
+msgid "Payment %d has been modified"
+msgstr ""
+
+#: ../gl/gl_bank.php:111
 #, php-format
 msgid "Deposit %d has been entered"
 msgstr ""
 
-#: ../gl/gl_bank.php:112
+#: ../gl/gl_bank.php:113
 msgid "View the GL Postings for this Deposit"
 msgstr ""
 
-#: ../gl/gl_bank.php:114
+#: ../gl/gl_bank.php:115
 msgid "Enter Another Deposit"
 msgstr ""
 
-#: ../gl/gl_bank.php:116
+#: ../gl/gl_bank.php:117
 msgid "Enter A Payment"
 msgstr ""
 
-#: ../gl/gl_bank.php:125
+#: ../gl/gl_bank.php:126
 #, php-format
 msgid "Deposit %d has been modified"
 msgstr ""
 
-#: ../gl/gl_bank.php:127
+#: ../gl/gl_bank.php:128
 msgid "&View the GL Postings for this Deposit"
 msgstr ""
 
-#: ../gl/gl_bank.php:129
+#: ../gl/gl_bank.php:130
 msgid "Enter Another &Deposit"
 msgstr ""
 
-#: ../gl/gl_bank.php:131
+#: ../gl/gl_bank.php:132
 msgid "Enter A &Payment"
 msgstr ""
 
-#: ../gl/gl_bank.php:222
+#: ../gl/gl_bank.php:221
 msgid "You must enter at least one payment line."
 msgstr ""
 
-#: ../gl/gl_bank.php:239
-#: ../purchasing/supplier_payment.php:189
+#: ../gl/gl_bank.php:238
+#: ../purchasing/supplier_payment.php:200
+#: ../purchasing/supplier_payment.php.orig:189
 #, php-format
 msgid "The total bank amount exceeds allowed limit (%s)."
 msgstr ""
 
-#: ../gl/gl_bank.php:264
+#: ../gl/gl_bank.php:263
 msgid "The entered date for the payment is invalid."
 msgstr ""
 
-#: ../gl/gl_bank.php:276
+#: ../gl/gl_bank.php:275
 msgid "You have to select customer and customer branch."
 msgstr ""
 
-#: ../gl/gl_bank.php:280
+#: ../gl/gl_bank.php:279
 msgid "You have to select supplier."
 msgstr ""
 
-#: ../gl/gl_bank.php:328
+#: ../gl/gl_bank.php:287
+msgid "Settled amount have to be positive number."
+msgstr ""
+
+#: ../gl/gl_bank.php:332
 msgid "The amount entered is not a valid number or is less than zero."
 msgstr ""
 
-#: ../gl/gl_bank.php:400
+#: ../gl/gl_bank.php:338
+#: ../gl/manage/exchange_rates.php:39
+msgid "The exchange rate cannot be zero or a negative number."
+msgstr ""
+
+#: ../gl/gl_bank.php:410
 msgid "Payment Items"
 msgstr ""
 
-#: ../gl/gl_bank.php:400
+#: ../gl/gl_bank.php:410
 msgid "Deposit Items"
 msgstr ""
 
-#: ../gl/gl_bank.php:408
+#: ../gl/gl_bank.php:418
 msgid "Process Payment"
 msgstr ""
 
-#: ../gl/gl_bank.php:408
+#: ../gl/gl_bank.php:418
 msgid "Process Deposit"
 msgstr ""
 
@@ -4485,34 +4442,38 @@ msgstr ""
 
 #: ../gl/gl_budget.php:91
 #: ../gl/gl_budget.php:93
-#: ../gl/inquiry/profit_loss.php:231
+#: ../gl/inquiry/profit_loss.php:236
 #: ../gl/manage/gl_quick_entries.php:240
-#: ../reporting/rep101.php:136
-#: ../reporting/rep105.php:116
-#: ../reporting/rep106.php:90
-#: ../reporting/rep114.php:88
-#: ../reporting/rep201.php:124
-#: ../reporting/rep304.php:119
-#: ../reporting/rep305.php:103
-#: ../reporting/rep601.php:82
+#: ../reporting/rep101.php:126
+#: ../reporting/rep105.php:118
+#: ../reporting/rep106.php:92
+#: ../reporting/rep114.php:90
+#: ../reporting/rep201.php:118
+#: ../reporting/rep304.php:121
+#: ../reporting/rep305.php:106
+#: ../reporting/rep306.php:148
+#: ../reporting/rep307.php:122
+#: ../reporting/rep308.php:155
+#: ../reporting/rep309.php:103
+#: ../reporting/rep601.php:85
 #: ../reporting/rep602.php:86
-#: ../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/rep702.php:59
+#: ../reporting/rep704.php:95
+#: ../reporting/rep704.php:105
+#: ../reporting/rep704.php:113
+#: ../reporting/rep706.php:185
+#: ../reporting/rep706.php:193
+#: ../reporting/rep706.php:203
+#: ../reporting/rep706.php:211
+#: ../reporting/rep707.php:210
+#: ../reporting/rep707.php:217
+#: ../reporting/rep707.php:227
+#: ../reporting/rep707.php:235
+#: ../reporting/rep708.php:200
+#: ../reporting/rep708.php:209
+#: ../reporting/rep708.php:216
+#: ../reporting/rep709.php:106
+#: ../reporting/rep710.php:85
 msgid "Period"
 msgstr ""
 
@@ -4529,54 +4490,61 @@ msgstr ""
 #: ../gl/inquiry/balance_sheet.php:98
 #: ../gl/inquiry/balance_sheet.php:205
 #: ../gl/inquiry/balance_sheet.php:236
-#: ../gl/inquiry/gl_trial_balance.php:209
 #: ../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/inquiry/profit_loss.php:288
+#: ../gl/view/gl_deposit_view.php:137
+#: ../gl/view/gl_payment_view.php:136
 #: ../gl/view/gl_trans_view.php:115
-#: ../gl/includes/ui/gl_bank_ui.inc:200
-#: ../gl/includes/ui/gl_bank_ui.inc.orig:174
+#: ../gl/includes/ui/gl_bank_ui.inc:202
 #: ../gl/includes/ui/gl_journal_ui.inc:153
 #: ../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:329
-#: ../purchasing/includes/ui/invoice_ui.inc:495
-#: ../purchasing/includes/ui/invoice_ui.inc:566
+#: ../purchasing/includes/ui/invoice_ui.inc.orig:329
+#: ../purchasing/includes/ui/invoice_ui.inc.orig:495
+#: ../purchasing/includes/ui/invoice_ui.inc.orig:566
 #: ../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: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:98
-#: ../reporting/rep305.php:122
-#: ../reporting/rep305.php:178
-#: ../reporting/rep702.php:138
+#: ../reporting/rep101.php:234
+#: ../reporting/rep106.php:84
+#: ../reporting/rep106.php:119
+#: ../reporting/rep106.php:162
+#: ../reporting/rep114.php:161
+#: ../reporting/rep201.php:223
+#: ../reporting/rep203.php:94
+#: ../reporting/rep203.php:171
+#: ../reporting/rep204.php:113
+#: ../reporting/rep204.php:141
+#: ../reporting/rep301.php:133
+#: ../reporting/rep301.php:170
+#: ../reporting/rep304.php:146
+#: ../reporting/rep304.php:188
+#: ../reporting/rep305.php:101
+#: ../reporting/rep305.php:127
+#: ../reporting/rep305.php:183
+#: ../reporting/rep306.php:141
+#: ../reporting/rep306.php:176
+#: ../reporting/rep306.php:196
+#: ../reporting/rep306.php:212
+#: ../reporting/rep306.php:261
+#: ../reporting/rep306.php:276
+#: ../reporting/rep306.php:287
+#: ../reporting/rep309.php:126
+#: ../reporting/rep309.php:153
+#: ../reporting/rep702.php:142
 #: ../reporting/rep705.php:152
-#: ../reporting/rep705.php:309
+#: ../reporting/rep705.php:315
 #: ../reporting/rep706.php:106
-#: ../reporting/rep706.php:249
-#: ../reporting/rep706.php:284
+#: ../reporting/rep706.php:255
+#: ../reporting/rep706.php:290
 #: ../reporting/rep707.php:115
-#: ../reporting/rep707.php:291
-#: ../reporting/rep708.php:235
+#: ../reporting/rep707.php:297
+#: ../reporting/rep708.php:253
 #: ../reporting/includes/doctext.inc:30
 #: ../reporting/includes/doctext.inc:192
 #: ../sales/customer_credit_invoice.php:281
-#: ../sales/customer_delivery.php.orig:446
+#: ../sales/customer_delivery.php:447
 #: ../sales/customer_invoice.php:542
 #: ../sales/customer_invoice.php:545
 #: ../sales/allocations/customer_allocation_main.php:99
@@ -4587,12 +4555,8 @@ msgstr ""
 #: ../sales/view/view_sales_order.php:142
 #: ../sales/view/view_sales_order.php:179
 #: ../sales/view/view_sales_order.php:220
-#: ../sales/view/view_sales_order.php.orig:96
-#: ../sales/view/view_sales_order.php.orig:129
-#: ../sales/view/view_sales_order.php.orig:161
-#: ../sales/view/view_sales_order.php.orig:202
 #: ../sales/includes/ui/sales_credit_ui.inc:168
-#: ../sales/includes/ui/sales_order_ui.inc.orig:142
+#: ../sales/includes/ui/sales_order_ui.inc:147
 msgid "Total"
 msgstr ""
 
@@ -4666,8 +4630,8 @@ msgid "The credit amount entered is not a valid number or is less than zero."
 msgstr ""
 
 #: ../gl/gl_journal.php:248
-#: ../includes/ui/ui_view.inc:674
-#: ../purchasing/supplier_credit.php:136
+#: ../includes/ui/ui_view.inc.orig:674
+#: ../purchasing/supplier_credit.php:135
 #: ../purchasing/supplier_invoice.php:144
 msgid "Cannot post to GL account used by more than one tax type."
 msgstr ""
@@ -4699,51 +4663,50 @@ msgid "As at:"
 msgstr ""
 
 #: ../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
+#: ../gl/inquiry/profit_loss.php:299
+#: ../reporting/rep705.php:325
+#: ../reporting/rep706.php:278
+#: ../reporting/rep706.php:303
 #: ../reporting/rep707.php:309
+#: ../reporting/rep707.php:315
 msgid "Calculated Return"
 msgstr ""
 
 #: ../gl/inquiry/balance_sheet.php:236
 #: ../includes/sysnames.inc:121
-#: ../reporting/rep706.php:284
+#: ../reporting/rep706.php:290
 msgid "Liabilities"
 msgstr ""
 
 #: ../gl/inquiry/balance_sheet.php:236
-#: ../reporting/rep706.php:284
+#: ../reporting/rep706.php:290
 msgid " and "
 msgstr ""
 
 #: ../gl/inquiry/balance_sheet.php:236
-#: ../reporting/rep706.php:284
+#: ../reporting/rep706.php:290
 msgid "Equities"
 msgstr ""
 
 #: ../gl/inquiry/bank_inquiry.php:28
-#: ../reporting/rep601.php:69
+#: ../reporting/rep601.php:72
 msgid "Bank Statement"
 msgstr ""
 
 #: ../gl/inquiry/bank_inquiry.php:78
 #: ../gl/inquiry/gl_account_inquiry.php:162
-#: ../reporting/rep601.php:99
+#: ../reporting/rep601.php:104
 #: ../reporting/rep602.php:103
-#: ../reporting/rep704.php:138
+#: ../reporting/rep704.php:144
 msgid "Opening Balance"
 msgstr ""
 
-#: ../gl/inquiry/bank_inquiry.php:123
+#: ../gl/inquiry/bank_inquiry.php:124
 #: ../gl/inquiry/gl_account_inquiry.php:211
-#: ../gl/inquiry/gl_trial_balance.php:219
-#: ../reporting/rep601.php:150
+#: ../reporting/rep601.php:157
 #: ../reporting/rep602.php:157
-#: ../reporting/rep704.php:186
-#: ../reporting/rep708.php:244
+#: ../reporting/rep704.php:192
+#: ../reporting/rep708.php:262
 msgid "Ending Balance"
 msgstr ""
 
@@ -4769,71 +4732,18 @@ msgid ""
 msgstr ""
 
 #: ../gl/inquiry/gl_trial_balance.php:28
-#: ../reporting/rep708.php:206
+#: ../reporting/rep708.php:219
 msgid "Trial Balance"
 msgstr ""
 
-#: ../gl/inquiry/gl_trial_balance.php:55
+#: ../gl/inquiry/gl_trial_balance.php:60
 msgid "No zero values"
 msgstr ""
 
-#: ../gl/inquiry/gl_trial_balance.php:56
-#: ../reporting/reports_main.php:301
-#: ../reporting/reports_main.php:346
-#: ../reporting/reports_main.php:386
+#: ../gl/inquiry/gl_trial_balance.php:61
 msgid "Only balances"
 msgstr ""
 
-#: ../gl/inquiry/gl_trial_balance.php:88
-#: ../gl/inquiry/gl_trial_balance.php:140
-#: ../reporting/rep706.php:302
-#: ../reporting/rep707.php:320
-#: ../reporting/rep708.php:51
-#: ../reporting/rep708.php:117
-#: ../sales/create_recurrent_invoices.php:132
-#: ../sales/manage/recurrent_invoices.php:102
-msgid "Group"
-msgstr ""
-
-#: ../gl/inquiry/gl_trial_balance.php:158
-msgid "The from date cannot be bigger than the fiscal year end."
-msgstr ""
-
-#: ../gl/inquiry/gl_trial_balance.php:171
-#: ../gl/manage/bank_accounts.php:109
-#: ../gl/view/gl_trans_view.php:68
-#: ../gl/view/gl_trans_view.php:71
-#: ../gl/view/gl_trans_view.php:74
-#: ../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:172
-#: ../reporting/rep708.php:172
-msgid "Brought Forward"
-msgstr ""
-
-#: ../gl/inquiry/gl_trial_balance.php:173
-#: ../reporting/rep708.php:172
-msgid "This Period"
-msgstr ""
-
-#: ../gl/inquiry/gl_trial_balance.php:192
-msgid "Class"
-msgstr ""
-
-#: ../gl/inquiry/gl_trial_balance.php:227
-#: ../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 ""
@@ -4855,9 +4765,8 @@ msgid "Trans #"
 msgstr ""
 
 #: ../gl/inquiry/journal_inquiry.php:134
-#: ../reporting/rep710.php:75
-#: ../reporting/rep710.php:85
-#: ../reporting/reports_main.php:400
+#: ../reporting/rep710.php:77
+#: ../reporting/rep710.php:87
 msgid "User"
 msgstr ""
 
@@ -4865,37 +4774,34 @@ msgstr ""
 msgid "Profit & Loss Drilldown"
 msgstr ""
 
-#: ../gl/inquiry/profit_loss.php:168
-#: ../reporting/rep707.php:206
-#: ../reporting/includes/reports_classes.inc:238
+#: ../gl/inquiry/profit_loss.php:173
+#: ../reporting/rep707.php:210
+#: ../reporting/includes/reports_classes.inc:245
 msgid "Accumulated"
 msgstr ""
 
-#: ../gl/inquiry/profit_loss.php:168
-#: ../reporting/rep707.php:251
-#: ../reporting/includes/reports_classes.inc:238
+#: ../gl/inquiry/profit_loss.php:173
+#: ../reporting/rep707.php:255
+#: ../reporting/includes/reports_classes.inc:245
 msgid "Period Y-1"
 msgstr ""
 
-#: ../gl/inquiry/profit_loss.php:168
-#: ../reporting/rep707.php:242
-#: ../reporting/includes/reports_classes.inc:238
+#: ../gl/inquiry/profit_loss.php:173
+#: ../reporting/rep707.php:246
+#: ../reporting/includes/reports_classes.inc:245
 msgid "Budget"
 msgstr ""
 
-#: ../gl/inquiry/profit_loss.php:169
-#: ../reporting/reports_main.php:289
-#: ../reporting/reports_main.php:335
-#: ../reporting/reports_main.php:376
+#: ../gl/inquiry/profit_loss.php:174
 msgid "Compare to"
 msgstr ""
 
-#: ../gl/inquiry/profit_loss.php:230
+#: ../gl/inquiry/profit_loss.php:235
 msgid "Group/Account Name"
 msgstr ""
 
-#: ../gl/inquiry/profit_loss.php:233
-#: ../reporting/rep707.php:206
+#: ../gl/inquiry/profit_loss.php:238
+#: ../reporting/rep707.php:210
 msgid "Achieved %"
 msgstr ""
 
@@ -4904,12 +4810,12 @@ msgid "Tax Inquiry"
 msgstr ""
 
 #: ../gl/inquiry/tax_inquiry.php:82
-#: ../reporting/rep709.php:176
+#: ../reporting/rep709.php:183
 msgid "Outputs"
 msgstr ""
 
 #: ../gl/inquiry/tax_inquiry.php:82
-#: ../reporting/rep709.php:176
+#: ../reporting/rep709.php:183
 msgid "Inputs"
 msgstr ""
 
@@ -4918,7 +4824,7 @@ msgid "Charged on sales"
 msgstr ""
 
 #: ../gl/inquiry/tax_inquiry.php:100
-#: ../reporting/rep709.php:176
+#: ../reporting/rep709.php:183
 msgid "Output Tax"
 msgstr ""
 
@@ -4927,7 +4833,7 @@ msgid "Paid on purchases"
 msgstr ""
 
 #: ../gl/inquiry/tax_inquiry.php:106
-#: ../reporting/rep709.php:176
+#: ../reporting/rep709.php:183
 msgid "Input Tax"
 msgstr ""
 
@@ -4936,12 +4842,11 @@ msgid "Net payable or collectible"
 msgstr ""
 
 #: ../gl/inquiry/tax_inquiry.php:119
-#: ../reporting/rep709.php:207
+#: ../reporting/rep709.php:214
 msgid "Total payable or refund"
 msgstr ""
 
 #: ../gl/manage/bank_accounts.php:16
-#: ../reporting/reports_main.php:238
 msgid "Bank Accounts"
 msgstr ""
 
@@ -4977,51 +4882,64 @@ msgstr ""
 msgid "Selected bank account has been deleted"
 msgstr ""
 
+#: ../gl/manage/bank_accounts.php:109
+#: ../gl/view/gl_trans_view.php:68
+#: ../gl/view/gl_trans_view.php:71
+#: ../gl/view/gl_trans_view.php:74
+#: ../reporting/rep701.php:111
+#: ../reporting/rep702.php:53
+#: ../reporting/rep705.php:238
+#: ../reporting/rep706.php:185
+#: ../reporting/rep707.php:210
+#: ../reporting/rep708.php:192
+msgid "Account Name"
+msgstr ""
+
 #: ../gl/manage/bank_accounts.php:109
 #: ../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
+#: ../inventory/prices.php:146
+#: ../inventory/purchasing_data.php:147
 #: ../purchasing/view/view_supp_credit.php:49
 #: ../purchasing/view/view_supp_invoice.php:54
 #: ../purchasing/inquiry/po_search_completed.php:126
 #: ../purchasing/inquiry/po_search_completed.php.orig:125
 #: ../purchasing/inquiry/po_search.php:136
-#: ../purchasing/inquiry/supplier_allocation_inquiry.php:132
-#: ../purchasing/inquiry/supplier_allocation_inquiry.php:142
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php.orig:132
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php.orig:142
 #: ../purchasing/inquiry/supplier_inquiry.php:73
 #: ../purchasing/inquiry/supplier_inquiry.php:180
 #: ../purchasing/inquiry/supplier_inquiry.php:192
-#: ../purchasing/inquiry/supplier_inquiry.php.orig:73
-#: ../purchasing/inquiry/supplier_inquiry.php.orig:177
-#: ../purchasing/inquiry/supplier_inquiry.php.orig:189
 #: ../purchasing/allocations/supplier_allocation_main.php:99
 #: ../purchasing/allocations/supplier_allocation_main.php:107
-#: ../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
+#: ../reporting/rep101.php:128
+#: ../reporting/rep102.php:133
+#: ../reporting/rep102.php:139
+#: ../reporting/rep103.php:232
+#: ../reporting/rep104.php:116
+#: ../reporting/rep201.php:120
+#: ../reporting/rep202.php:138
+#: ../reporting/rep203.php:101
+#: ../reporting/rep205.php:150
 #: ../sales/customer_credit_invoice.php:237
-#: ../sales/customer_delivery.php.orig:353
+#: ../sales/customer_delivery.php:354
 #: ../sales/customer_invoice.php:470
 #: ../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:86
-#: ../sales/inquiry/customer_allocation_inquiry.php:151
-#: ../sales/inquiry/customer_allocation_inquiry.php:161
+#: ../sales/inquiry/customer_allocation_inquiry.php.orig:151
+#: ../sales/inquiry/customer_allocation_inquiry.php.orig:161
 #: ../sales/inquiry/customer_inquiry.php:76
-#: ../sales/inquiry/customer_inquiry.php:208
-#: ../sales/inquiry/customer_inquiry.php:221
+#: ../sales/inquiry/customer_inquiry.php.orig:76
+#: ../sales/inquiry/customer_inquiry.php.orig:208
+#: ../sales/inquiry/customer_inquiry.php.orig:221
 #: ../sales/inquiry/sales_deliveries_view.php:189
-#: ../sales/inquiry/sales_orders_view.php:294
-#: ../sales/inquiry/sales_orders_view.php:308
+#: ../sales/inquiry/sales_orders_view.php.orig:294
+#: ../sales/inquiry/sales_orders_view.php.orig:308
 msgid "Currency"
 msgstr ""
 
@@ -5035,7 +4953,7 @@ msgid "Bank"
 msgstr ""
 
 #: ../gl/manage/bank_accounts.php:110
-#: ../includes/ui/ui_view.inc:488
+#: ../includes/ui/ui_view.inc.orig:488
 msgid "Number"
 msgstr ""
 
@@ -5084,27 +5002,22 @@ msgid "Bank Address:"
 msgstr ""
 
 #: ../gl/manage/close_period.php:25
-#: ../gl/manage/close_period.php.orig:25
 msgid "Closing GL Transactions"
 msgstr ""
 
 #: ../gl/manage/close_period.php:40
-#: ../gl/manage/close_period.php.orig:40
 msgid "Selected date is not in fiscal year or the year is closed."
 msgstr ""
 
 #: ../gl/manage/close_period.php:47
-#: ../gl/manage/close_period.php.orig:47
 msgid "The entered date is earlier than date already selected as closing date."
 msgstr ""
 
 #: ../gl/manage/close_period.php:51
-#: ../gl/manage/close_period.php.orig:51
 msgid "You are not allowed to reopen already closed transactions."
 msgstr ""
 
 #: ../gl/manage/close_period.php:69
-#: ../gl/manage/close_period.php.orig:69
 #, php-format
 msgid ""
 "All transactions resulting in GL accounts changes up to %s has been closed "
@@ -5112,7 +5025,6 @@ msgid ""
 msgstr ""
 
 #: ../gl/manage/close_period.php:88
-#: ../gl/manage/close_period.php.orig:88
 msgid ""
 "Using this feature you can prevent entering new transactions <br>\n"
 "\tand disable edition of already entered transactions up to specified date."
@@ -5122,12 +5034,10 @@ msgid ""
 msgstr ""
 
 #: ../gl/manage/close_period.php:101
-#: ../gl/manage/close_period.php.orig:101
 msgid "End date of closing period:"
 msgstr ""
 
 #: ../gl/manage/close_period.php:104
-#: ../gl/manage/close_period.php.orig:104
 msgid "Close Transactions"
 msgstr ""
 
@@ -5245,10 +5155,6 @@ msgstr ""
 msgid "Exchange Rates"
 msgstr ""
 
-#: ../gl/manage/exchange_rates.php:39
-msgid "The exchange rate cannot be zero or a negative number."
-msgstr ""
-
 #: ../gl/manage/exchange_rates.php:45
 msgid "The exchange rate for the date is already there."
 msgstr ""
@@ -5259,13 +5165,14 @@ msgid "Date to Use From:"
 msgstr ""
 
 #: ../gl/manage/exchange_rates.php:141
-#: ../includes/ui/ui_view.inc:288
-#: ../includes/ui/ui_view.inc:290
+#: ../includes/ui/ui_view.inc:325
+#: ../includes/ui/ui_view.inc.orig:288
+#: ../includes/ui/ui_view.inc.orig:290
 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
@@ -5333,13 +5240,12 @@ msgid "Class Name"
 msgstr ""
 
 #: ../gl/manage/gl_account_classes.php:110
-#: ../gl/manage/gl_account_types.php:128
 msgid "Class Type"
 msgstr ""
 
 #: ../gl/manage/gl_account_classes.php:112
 #: ../gl/manage/gl_account_classes.php:169
-#: ../reporting/rep706.php:211
+#: ../reporting/rep706.php:215
 msgid "Balance Sheet"
 msgstr ""
 
@@ -5353,12 +5259,11 @@ msgid "Class Name:"
 msgstr ""
 
 #: ../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:115
+#: ../reporting/rep701.php:117
 msgid "Chart of Accounts"
 msgstr ""
 
@@ -5532,6 +5437,10 @@ msgstr ""
 msgid "Subgroup Of"
 msgstr ""
 
+#: ../gl/manage/gl_account_types.php:128
+msgid "Class"
+msgstr ""
+
 #: ../gl/manage/gl_account_types.php:187
 msgid "ID:"
 msgstr ""
@@ -5540,6 +5449,10 @@ msgstr ""
 msgid "Subgroup Of:"
 msgstr ""
 
+#: ../gl/manage/gl_account_types.php:192
+msgid "Class:"
+msgstr ""
+
 #: ../gl/manage/gl_quick_entries.php:16
 msgid "Quick Entries"
 msgstr ""
@@ -5547,6 +5460,7 @@ msgstr ""
 #: ../gl/manage/gl_quick_entries.php:58
 #: ../includes/ui/simple_crud_class.inc:221
 #: ../includes/ui/ui_input.inc:206
+#: ../taxes/sav.tax_types.php:252
 msgid "Add new"
 msgstr ""
 
@@ -5636,7 +5550,7 @@ msgid "Posted"
 msgstr ""
 
 #: ../gl/manage/gl_quick_entries.php:329
-#: ../sales/customer_delivery.php.orig:446
+#: ../sales/customer_delivery.php:447
 #: ../sales/customer_invoice.php:542
 #: ../sales/customer_invoice.php:545
 msgid "Tax Type"
@@ -5711,74 +5625,76 @@ msgid "GL Deposit"
 msgstr ""
 
 #: ../gl/view/gl_deposit_view.php:71
-#: ../gl/includes/db/gl_db_banking.inc:211
-#: ../reporting/reports_main.php:88
-#: ../reporting/reports_main.php:95
-#: ../reporting/reports_main.php:102
+#: ../gl/includes/db/gl_db_banking.inc:212
+#: ../reporting/reports_main.php:96
+#: ../reporting/reports_main.php:106
 #: ../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
+#: ../reporting/reports_main.php:128
+#: ../reporting/reports_main.php:136
+#: ../reporting/reports_main.php:143
+#: ../reporting/reports_main.php:192
 msgid "From"
 msgstr ""
 
-#: ../gl/view/gl_deposit_view.php:72
+#: ../gl/view/gl_deposit_view.php:74
+#: ../gl/view/gl_payment_view.php:72
+msgid "Settle currency"
+msgstr ""
+
+#: ../gl/view/gl_deposit_view.php:75
+#: ../gl/view/gl_payment_view.php:73
+msgid "Settled amount"
+msgstr ""
+
+#: ../gl/view/gl_deposit_view.php:77
 msgid "Deposit Type"
 msgstr ""
 
-#: ../gl/view/gl_deposit_view.php:81
+#: ../gl/view/gl_deposit_view.php:86
 msgid "This deposit has been voided."
 msgstr ""
 
-#: ../gl/view/gl_deposit_view.php:87
+#: ../gl/view/gl_deposit_view.php:92
 msgid "There are no items for this deposit."
 msgstr ""
 
-#: ../gl/view/gl_deposit_view.php:92
+#: ../gl/view/gl_deposit_view.php:97
 msgid "Items for this Deposit"
 msgstr ""
 
-#: ../gl/view/gl_deposit_view.php:94
-#: ../gl/view/gl_payment_view.php:92
-msgid "Item Amounts are Shown in :"
+#: ../gl/view/gl_deposit_view.php:99
+#: ../gl/view/gl_payment_view.php:97
+msgid "Item Amounts are Shown in:"
 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/view/gl_deposit_view.php:104
+#: ../gl/view/gl_deposit_view.php:107
+#: ../gl/view/gl_deposit_view.php:110
+#: ../gl/view/gl_payment_view.php:103
+#: ../gl/view/gl_payment_view.php:106
+#: ../gl/view/gl_payment_view.php:109
 #: ../gl/view/gl_trans_view.php:68
 #: ../gl/view/gl_trans_view.php:71
 #: ../gl/view/gl_trans_view.php:74
-#: ../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:124
-#: ../gl/includes/ui/gl_bank_ui.inc.orig:127
-#: ../gl/includes/ui/gl_bank_ui.inc.orig:130
+#: ../gl/includes/ui/gl_bank_ui.inc:152
+#: ../gl/includes/ui/gl_bank_ui.inc:155
+#: ../gl/includes/ui/gl_bank_ui.inc:158
 #: ../gl/includes/ui/gl_journal_ui.inc:86
 #: ../gl/includes/ui/gl_journal_ui.inc:89
 #: ../gl/includes/ui/gl_journal_ui.inc:92
-#: ../reporting/rep701.php:109
+#: ../reporting/rep701.php:111
 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: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:124
-#: ../gl/includes/ui/gl_bank_ui.inc.orig:127
-#: ../gl/includes/ui/gl_bank_ui.inc.orig:130
+#: ../gl/view/gl_deposit_view.php:104
+#: ../gl/view/gl_deposit_view.php:107
+#: ../gl/view/gl_deposit_view.php:110
+#: ../gl/view/gl_payment_view.php:103
+#: ../gl/view/gl_payment_view.php:106
+#: ../gl/view/gl_payment_view.php:109
+#: ../gl/includes/ui/gl_bank_ui.inc:152
+#: ../gl/includes/ui/gl_bank_ui.inc:155
+#: ../gl/includes/ui/gl_bank_ui.inc:158
 #: ../gl/includes/ui/gl_journal_ui.inc:86
 #: ../gl/includes/ui/gl_journal_ui.inc:89
 #: ../gl/includes/ui/gl_journal_ui.inc:92
@@ -5797,23 +5713,23 @@ msgstr ""
 msgid "Pay To"
 msgstr ""
 
-#: ../gl/view/gl_payment_view.php:70
+#: ../gl/view/gl_payment_view.php:75
 #: ../purchasing/view/view_supp_payment.php:64
 #: ../purchasing/view/view_supp_payment.php:78
-#: ../sales/view/view_receipt.php:48
+#: ../sales/view/view_receipt.php:50
 msgid "Payment Type"
 msgstr ""
 
-#: ../gl/view/gl_payment_view.php:79
+#: ../gl/view/gl_payment_view.php:84
 #: ../purchasing/view/view_supp_payment.php:85
 msgid "This payment has been voided."
 msgstr ""
 
-#: ../gl/view/gl_payment_view.php:85
+#: ../gl/view/gl_payment_view.php:90
 msgid "There are no items for this payment."
 msgstr ""
 
-#: ../gl/view/gl_payment_view.php:90
+#: ../gl/view/gl_payment_view.php:95
 msgid "Items for this Payment"
 msgstr ""
 
@@ -5841,181 +5757,173 @@ 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
+#: ../gl/includes/db/gl_db_banking.inc:60
+#: ../gl/includes/db/gl_db_banking.inc:63
+#: ../gl/includes/db/gl_db_banking.inc:255
 msgid "Exchange Variance"
 msgstr ""
 
-#: ../gl/includes/db/gl_db_banking.inc:211
-#: ../reporting/reports_main.php:89
-#: ../reporting/reports_main.php:96
-#: ../reporting/reports_main.php:103
+#: ../gl/includes/db/gl_db_banking.inc:212
+#: ../reporting/reports_main.php:97
+#: ../reporting/reports_main.php:107
 #: ../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
+#: ../reporting/reports_main.php:129
+#: ../reporting/reports_main.php:137
+#: ../reporting/reports_main.php:144
+#: ../reporting/reports_main.php:193
 msgid "To"
 msgstr ""
 
-#: ../gl/includes/db/gl_db_banking.inc:427
-#: ../purchasing/includes/db/invoice_db.inc:136
+#: ../gl/includes/db/gl_db_banking.inc:444
+#: ../purchasing/includes/db/invoice_db.inc.orig:136
 msgid "Document reentered."
 msgstr ""
 
-#: ../gl/includes/db/gl_db_rates.inc:130
+#: ../gl/includes/db/gl_db_trans.inc:96
 #, php-format
-msgid ""
-"Cannot retrieve currency rate from %s page. Please set the rate manually."
+msgid "Rounding error %s encountered for trans_type:%s,trans_no:%s"
 msgstr ""
 
 #: ../gl/includes/ui/gl_bank_ui.inc:24
-#: ../gl/includes/ui/gl_bank_ui.inc.orig:28
 #: ../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
 #: ../manufacturing/work_order_costs.php:133
-#: ../purchasing/allocations/supplier_allocate.php:54
-#: ../sales/allocations/customer_allocate.php:53
+#: ../purchasing/allocations/supplier_allocate.php:56
+#: ../sales/allocations/customer_allocate.php:54
 #: ../sales/includes/ui/sales_credit_ui.inc:121
 msgid "Date:"
 msgstr ""
 
-#: ../gl/includes/ui/gl_bank_ui.inc:51
-#: ../gl/includes/ui/gl_bank_ui.inc.orig:53
+#: ../gl/includes/ui/gl_bank_ui.inc:52
 msgid "Pay To:"
 msgstr ""
 
-#: ../gl/includes/ui/gl_bank_ui.inc:56
-#: ../gl/includes/ui/gl_bank_ui.inc.orig:58
+#: ../gl/includes/ui/gl_bank_ui.inc:57
 msgid "To the Order of:"
 msgstr ""
 
-#: ../gl/includes/ui/gl_bank_ui.inc:63
-#: ../gl/includes/ui/gl_bank_ui.inc.orig:65
-#: ../inventory/purchasing_data.php:184
-#: ../inventory/purchasing_data.php:188
-#: ../inventory/purchasing_data.php.orig:112
-#: ../purchasing/includes/ui/invoice_ui.inc:80
-#: ../purchasing/includes/ui/invoice_ui.inc:88
-#: ../purchasing/includes/ui/invoice_ui.inc:90
-#: ../purchasing/includes/ui/po_ui.inc:125
-#: ../purchasing/includes/ui/po_ui.inc:130
+#: ../gl/includes/ui/gl_bank_ui.inc:64
+#: ../inventory/purchasing_data.php:208
+#: ../inventory/purchasing_data.php:212
+#: ../purchasing/includes/ui/invoice_ui.inc.orig:80
+#: ../purchasing/includes/ui/invoice_ui.inc.orig:88
+#: ../purchasing/includes/ui/invoice_ui.inc.orig:90
 #: ../purchasing/includes/ui/po_ui.inc.orig:125
 #: ../purchasing/includes/ui/po_ui.inc.orig:130
 msgid "Supplier:"
 msgstr ""
 
-#: ../gl/includes/ui/gl_bank_ui.inc:66
-#: ../gl/includes/ui/gl_bank_ui.inc.orig:68
+#: ../gl/includes/ui/gl_bank_ui.inc:67
 #: ../sales/manage/recurrent_invoices.php:169
 #: ../sales/includes/ui/sales_credit_ui.inc:29
-#: ../sales/includes/ui/sales_order_ui.inc.orig:278
+#: ../sales/includes/ui/sales_order_ui.inc:285
 msgid "Customer:"
 msgstr ""
 
-#: ../gl/includes/ui/gl_bank_ui.inc:70
-#: ../gl/includes/ui/gl_bank_ui.inc.orig:72
-#: ../sales/customer_payments.php:363
+#: ../gl/includes/ui/gl_bank_ui.inc:71
+#: ../sales/customer_payments.php.orig:363
 #: ../sales/manage/recurrent_invoices.php:172
 #: ../sales/includes/ui/sales_credit_ui.inc:37
-#: ../sales/includes/ui/sales_order_ui.inc.orig:285
+#: ../sales/includes/ui/sales_order_ui.inc:292
 msgid "Branch:"
 msgstr ""
 
-#: ../gl/includes/ui/gl_bank_ui.inc:84
-#: ../gl/includes/ui/gl_bank_ui.inc:87
-#: ../sales/customer_payments.php:372
+#: ../gl/includes/ui/gl_bank_ui.inc:85
+#: ../gl/includes/ui/gl_bank_ui.inc:88
+#: ../sales/customer_payments.php.orig:372
 msgid "This customer account is on hold."
 msgstr ""
 
-#: ../gl/includes/ui/gl_bank_ui.inc:99
-#: ../gl/includes/ui/gl_bank_ui.inc.orig:90
+#: ../gl/includes/ui/gl_bank_ui.inc:101
 #: ../gl/includes/ui/gl_journal_ui.inc:58
 #: ../gl/includes/ui/gl_journal_ui.inc:62
-#: ../purchasing/includes/ui/invoice_ui.inc:251
+#: ../purchasing/includes/ui/invoice_ui.inc.orig:251
 msgid "Go"
 msgstr ""
 
-#: ../gl/includes/ui/gl_bank_ui.inc:185
-#: ../gl/includes/ui/gl_bank_ui.inc.orig:159
+#: ../gl/includes/ui/gl_bank_ui.inc:120
+msgid "Into:"
+msgstr ""
+
+#: ../gl/includes/ui/gl_bank_ui.inc:187
 #: ../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:542
-#: ../purchasing/includes/ui/po_ui.inc:274
+#: ../purchasing/includes/ui/invoice_ui.inc.orig:542
 #: ../purchasing/includes/ui/po_ui.inc.orig:274
 #: ../sales/includes/ui/sales_credit_ui.inc:198
-#: ../sales/includes/ui/sales_order_ui.inc.orig:203
+#: ../sales/includes/ui/sales_order_ui.inc:210
 msgid "Edit document line"
 msgstr ""
 
-#: ../gl/includes/ui/gl_bank_ui.inc:187
-#: ../gl/includes/ui/gl_bank_ui.inc.orig:161
+#: ../gl/includes/ui/gl_bank_ui.inc:189
 #: ../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
-#: ../purchasing/includes/ui/invoice_ui.inc:305
-#: ../purchasing/includes/ui/po_ui.inc:276
+#: ../purchasing/includes/ui/invoice_ui.inc.orig:305
 #: ../purchasing/includes/ui/po_ui.inc.orig:276
 #: ../sales/includes/ui/sales_credit_ui.inc:200
-#: ../sales/includes/ui/sales_order_ui.inc.orig:205
+#: ../sales/includes/ui/sales_order_ui.inc:212
 msgid "Remove line from document"
 msgstr ""
 
-#: ../gl/includes/ui/gl_bank_ui.inc:276
-#: ../gl/includes/ui/gl_bank_ui.inc.orig:250
+#: ../gl/includes/ui/gl_bank_ui.inc:278
 #: ../gl/includes/ui/gl_journal_ui.inc:258
 #: ../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.orig:458
+#: ../purchasing/includes/ui/po_ui.inc.orig:456
 #: ../sales/includes/ui/sales_credit_ui.inc:294
-#: ../sales/includes/ui/sales_order_ui.inc.orig:556
+#: ../sales/includes/ui/sales_order_ui.inc:562
 msgid "Confirm changes"
 msgstr ""
 
-#: ../gl/includes/ui/gl_bank_ui.inc:278
-#: ../gl/includes/ui/gl_bank_ui.inc.orig:252
+#: ../gl/includes/ui/gl_bank_ui.inc:280
 #: ../gl/includes/ui/gl_journal_ui.inc:260
 #: ../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.orig:460
+#: ../purchasing/includes/ui/po_ui.inc.orig:458
 #: ../sales/includes/ui/sales_credit_ui.inc:296
-#: ../sales/includes/ui/sales_order_ui.inc.orig:558
+#: ../sales/includes/ui/sales_order_ui.inc:564
 msgid "Cancel changes"
 msgstr ""
 
-#: ../gl/includes/ui/gl_bank_ui.inc:283
-#: ../gl/includes/ui/gl_bank_ui.inc.orig:257
+#: ../gl/includes/ui/gl_bank_ui.inc:285
 #: ../gl/includes/ui/gl_journal_ui.inc:264
 #: ../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.orig:466
+#: ../purchasing/includes/ui/po_ui.inc.orig:464
 #: ../sales/includes/ui/sales_credit_ui.inc:302
-#: ../sales/includes/ui/sales_order_ui.inc.orig:564
+#: ../sales/includes/ui/sales_order_ui.inc:570
 msgid "Add Item"
 msgstr ""
 
-#: ../gl/includes/ui/gl_bank_ui.inc:284
-#: ../gl/includes/ui/gl_bank_ui.inc.orig:258
+#: ../gl/includes/ui/gl_bank_ui.inc:286
 #: ../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.orig:467
+#: ../purchasing/includes/ui/po_ui.inc.orig:465
 #: ../sales/includes/ui/sales_credit_ui.inc:303
-#: ../sales/includes/ui/sales_order_ui.inc.orig:565
+#: ../sales/includes/ui/sales_order_ui.inc:571
 msgid "Add new item to document"
 msgstr ""
 
+#: ../gl/includes/ui/gl_bank_ui.inc:309
+msgid "Settled AR Amount:"
+msgstr ""
+
+#: ../gl/includes/ui/gl_bank_ui.inc:309
+msgid "Settled AP Amount:"
+msgstr ""
+
 #: ../gl/includes/ui/gl_journal_ui.inc:38
 msgid "Reverse Transaction:"
 msgstr ""
@@ -6111,9 +6019,7 @@ msgid "Dimensions configuration"
 msgstr ""
 
 #: ../includes/access_levels.inc:72
-#: ../inventory/manage/items.php:348
-#: ../inventory/manage/items.php.orig:341
-#: ../reporting/reports_main.php:223
+#: ../inventory/manage/items.php.orig:353
 msgid "Dimensions"
 msgstr ""
 
@@ -6605,23 +6511,23 @@ msgid ""
 "rate manually on Exchange Rates page."
 msgstr ""
 
-#: ../includes/current_user.inc.orig:97
+#: ../includes/current_user.inc:101
 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.orig:98
+#: ../includes/current_user.inc:102
 #: ../includes/ui/ui_controls.inc:197
-#: ../includes/ui/ui_view.inc:845
+#: ../includes/ui/ui_view.inc.orig:845
 msgid "Back"
 msgstr ""
 
-#: ../includes/current_user.inc.orig:108
+#: ../includes/current_user.inc:112
 msgid "System is available for site admin only until full database upgrade"
 msgstr ""
 
-#: ../includes/current_user.inc.orig:471
+#: ../includes/current_user.inc:544
 msgid "Requesting data..."
 msgstr ""
 
@@ -6634,23 +6540,23 @@ msgstr ""
 msgid "You have no edit access to transactions created by other users."
 msgstr ""
 
-#: ../includes/errors.inc:123
+#: ../includes/errors.inc:125
 msgid "in file"
 msgstr ""
 
-#: ../includes/errors.inc:123
+#: ../includes/errors.inc:125
 msgid "at line "
 msgstr ""
 
-#: ../includes/errors.inc:177
+#: ../includes/errors.inc:179
 msgid "Debug mode database warning:"
 msgstr ""
 
-#: ../includes/errors.inc:179
+#: ../includes/errors.inc:181
 msgid "DATABASE ERROR :"
 msgstr ""
 
-#: ../includes/errors.inc:210
+#: ../includes/errors.inc:212
 msgid ""
 "The entered information is a duplicate. Please go back and enter different "
 "values."
@@ -6660,97 +6566,118 @@ msgstr ""
 msgid "This page is usable only with javascript enabled browsers."
 msgstr ""
 
-#: ../includes/packages.inc:190
+#: ../includes/packages.inc:189
 #, php-format
 msgid "No key field '%s' in file '%s'"
 msgstr ""
 
-#: ../includes/packages.inc:295
-#: ../includes/packages.inc:329
+#: ../includes/packages.inc:294
+msgid "Cannot download repo index file."
+msgstr ""
+
+#: ../includes/packages.inc:306
+#: ../includes/packages.inc:343
 #, php-format
 msgid "Cannot delete outdated '%s' file."
 msgstr ""
 
-#: ../includes/packages.inc:299
+#: ../includes/packages.inc:310
 msgid "Release file in repository is invalid, or public key is outdated."
 msgstr ""
 
-#: ../includes/packages.inc:316
+#: ../includes/packages.inc:327
 msgid "Repository version does not match application version."
 msgstr ""
 
-#: ../includes/packages.inc:333
+#: ../includes/packages.inc:335
+#: ../includes/packages.inc:377
+#, php-format
+msgid "Cannot download '%s' file."
+msgstr ""
+
+#: ../includes/packages.inc:347
 #, php-format
 msgid ""
 "Security alert: broken index file in repository '%s'. Please inform "
 "repository administrator about this issue."
 msgstr ""
 
-#: ../includes/packages.inc:366
+#: ../includes/packages.inc:383
 #, php-format
 msgid ""
 "Security alert: broken package '%s' in repository. Please inform repository "
 "administrator about this issue."
 msgstr ""
 
-#: ../includes/packages.inc:621
-#: ../includes/packages.inc:672
+#: ../includes/packages.inc:638
+#: ../includes/packages.inc:699
 #, php-format
 msgid "Package '%s' not found."
 msgstr ""
 
-#: ../includes/session.inc:133
+#: ../includes/session.inc:136
+#: ../includes/session.inc.orig:132
 msgid "Incorrect Password"
 msgstr ""
 
-#: ../includes/session.inc:134
+#: ../includes/session.inc:137
+#: ../includes/session.inc.orig:133
 msgid "The user and password combination is not valid for the system."
 msgstr ""
 
-#: ../includes/session.inc:136
+#: ../includes/session.inc:139
+#: ../includes/session.inc.orig:135
 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 ""
 
-#: ../includes/session.inc:137
+#: ../includes/session.inc:140
+#: ../includes/session.inc.orig:136
 msgid "Try again"
 msgstr ""
 
-#: ../includes/session.inc:185
+#: ../includes/session.inc:180
+#: ../includes/session.inc.orig:176
 #, php-format
 msgid ""
 "Brute force attack on account '%s' detected. Access for non-logged users "
 "temporarily blocked."
 msgstr ""
 
-#: ../includes/session.inc:216
+#: ../includes/session.inc:211
+#: ../includes/session.inc.orig:207
 msgid "Security settings have not been defined for your user account."
 msgstr ""
 
-#: ../includes/session.inc:217
+#: ../includes/session.inc:212
+#: ../includes/session.inc.orig:208
 msgid "Please contact your system administrator."
 msgstr ""
 
-#: ../includes/session.inc:218
+#: ../includes/session.inc:213
+#: ../includes/session.inc.orig:209
 msgid ""
 "Please remove $security_groups and $security_headings arrays from config.php "
 "file!"
 msgstr ""
 
-#: ../includes/session.inc:220
+#: ../includes/session.inc:215
+#: ../includes/session.inc.orig:211
 msgid ""
 "Access to application has been blocked until database upgrade is completed "
 "by system administrator."
 msgstr ""
 
-#: ../includes/session.inc:234
+#: ../includes/session.inc:229
+#: ../includes/session.inc.orig:225
 msgid ""
 "The security settings on your account do not permit you to access this "
 "function"
 msgstr ""
 
-#: ../includes/session.inc:243
+#: ../includes/session.inc:238
+#: ../includes/session.inc.orig:234
 msgid ""
 "System is blocked after source upgrade until database is updated on System/"
 "Software Upgrade page"
@@ -6796,7 +6723,6 @@ msgid "Inventory Adjustment"
 msgstr ""
 
 #: ../includes/sysnames.inc:32
-#: ../purchasing/includes/ui/po_ui.inc:330
 #: ../purchasing/includes/ui/po_ui.inc.orig:330
 #: ../purchasing/view/view_po.php:30
 msgid "Purchase Order"
@@ -6808,6 +6734,7 @@ msgstr ""
 
 #: ../includes/sysnames.inc:34
 #: ../purchasing/supplier_credit.php:58
+#: ../purchasing/supplier_credit.php:62
 msgid "Supplier Credit Note"
 msgstr ""
 
@@ -6834,13 +6761,13 @@ msgid "Work Order Production"
 msgstr ""
 
 #: ../includes/sysnames.inc:40
-#: ../sales/inquiry/sales_orders_view.php:151
-#: ../sales/inquiry/sales_orders_view.php:173
+#: ../sales/inquiry/sales_orders_view.php.orig:151
+#: ../sales/inquiry/sales_orders_view.php.orig:173
 msgid "Sales Order"
 msgstr ""
 
 #: ../includes/sysnames.inc:41
-#: ../sales/sales_order_entry.php:645
+#: ../sales/sales_order_entry.php:653
 msgid "Sales Quotation"
 msgstr ""
 
@@ -6906,8 +6833,8 @@ msgid "SP"
 msgstr ""
 
 #: ../includes/sysnames.inc:61
-#: ../reporting/rep204.php:82
-#: ../reporting/rep305.php:98
+#: ../reporting/rep204.php:84
+#: ../reporting/rep305.php:101
 msgid "GRN"
 msgstr ""
 
@@ -6971,67 +6898,67 @@ msgstr ""
 
 #: ../includes/sysnames.inc:96
 #: ../includes/sysnames.inc:195
-#: ../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/rep101.php:127
+#: ../reporting/rep102.php:125
+#: ../reporting/rep102.php:132
+#: ../reporting/rep105.php:109
+#: ../reporting/rep106.php:83
+#: ../reporting/rep114.php:95
+#: ../reporting/rep304.php:114
+#: ../reporting/rep304.php:124
 #: ../reporting/reports_main.php:32
 #: ../reporting/reports_main.php:36
-#: ../reporting/reports_main.php:43
-#: ../reporting/reports_main.php:108
-#: ../reporting/reports_main.php:203
-#: ../sales/create_recurrent_invoices.php:132
+#: ../reporting/reports_main.php:45
+#: ../reporting/reports_main.php:102
+#: ../reporting/reports_main.php:121
+#: ../sales/create_recurrent_invoices.php:134
 #: ../sales/customer_credit_invoice.php:235
-#: ../sales/customer_delivery.php.orig:351
+#: ../sales/customer_delivery.php:352
 #: ../sales/customer_invoice.php:446
 #: ../sales/allocations/customer_allocation_main.php:97
 #: ../sales/allocations/customer_allocation_main.php:105
 #: ../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:206
-#: ../sales/inquiry/customer_inquiry.php:220
+#: ../sales/inquiry/customer_allocation_inquiry.php.orig:150
+#: ../sales/inquiry/customer_allocation_inquiry.php.orig:160
+#: ../sales/inquiry/customer_inquiry.php.orig:206
+#: ../sales/inquiry/customer_inquiry.php.orig:220
 #: ../sales/inquiry/sales_deliveries_view.php:180
-#: ../sales/inquiry/sales_orders_view.php:286
-#: ../sales/inquiry/sales_orders_view.php:300
+#: ../sales/inquiry/sales_orders_view.php.orig:286
+#: ../sales/inquiry/sales_orders_view.php.orig:300
 msgid "Customer"
 msgstr ""
 
 #: ../includes/sysnames.inc:97
 #: ../includes/sysnames.inc:173
 #: ../includes/sysnames.inc:196
-#: ../inventory/purchasing_data.php:129
+#: ../inventory/purchasing_data.php:147
 #: ../purchasing/includes/ui/grn_ui.inc:20
-#: ../purchasing/includes/ui/po_ui.inc:323
+#: ../purchasing/includes/ui/grn_ui.inc:52
 #: ../purchasing/includes/ui/po_ui.inc.orig:323
 #: ../purchasing/view/view_supp_credit.php:42
 #: ../purchasing/view/view_supp_invoice.php:46
 #: ../purchasing/inquiry/po_search_completed.php:122
 #: ../purchasing/inquiry/po_search_completed.php.orig:121
 #: ../purchasing/inquiry/po_search.php:132
-#: ../purchasing/inquiry/supplier_allocation_inquiry.php:128
-#: ../purchasing/inquiry/supplier_allocation_inquiry.php:141
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php.orig:128
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php.orig:141
 #: ../purchasing/inquiry/supplier_inquiry.php:176
 #: ../purchasing/inquiry/supplier_inquiry.php:191
-#: ../purchasing/inquiry/supplier_inquiry.php.orig:173
-#: ../purchasing/inquiry/supplier_inquiry.php.orig:188
 #: ../purchasing/allocations/supplier_allocation_main.php:98
 #: ../purchasing/allocations/supplier_allocation_main.php:106
-#: ../reporting/rep201.php:125
-#: ../reporting/rep202.php:128
-#: ../reporting/rep202.php:135
-#: ../reporting/rep203.php:98
-#: ../reporting/rep204.php:88
-#: ../reporting/reports_main.php:132
-#: ../reporting/reports_main.php:136
-#: ../reporting/reports_main.php:143
+#: ../reporting/rep201.php:119
+#: ../reporting/rep202.php:130
+#: ../reporting/rep202.php:137
+#: ../reporting/rep203.php:100
+#: ../reporting/rep204.php:90
+#: ../reporting/rep306.php:141
+#: ../reporting/rep306.php:151
+#: ../reporting/reports_main.php:149
 #: ../reporting/reports_main.php:153
-#: ../reporting/reports_main.php:159
+#: ../reporting/reports_main.php:162
+#: ../reporting/reports_main.php:173
+#: ../reporting/reports_main.php:180
 msgid "Supplier"
 msgstr ""
 
@@ -7177,11 +7104,61 @@ msgstr ""
 msgid "Taxes from totals"
 msgstr ""
 
+#: ../includes/sysnames.inc:200
+msgid "Jan"
+msgstr ""
+
+#: ../includes/sysnames.inc:200
+msgid "Feb"
+msgstr ""
+
+#: ../includes/sysnames.inc:200
+msgid "Mar"
+msgstr ""
+
+#: ../includes/sysnames.inc:200
+msgid "Apr"
+msgstr ""
+
+#: ../includes/sysnames.inc:200
+#: ../includes/ui/ui_view.inc.orig:842
+msgid "May"
+msgstr ""
+
+#: ../includes/sysnames.inc:200
+msgid "Jun"
+msgstr ""
+
+#: ../includes/sysnames.inc:200
+msgid "Jul"
+msgstr ""
+
+#: ../includes/sysnames.inc:200
+msgid "Aug"
+msgstr ""
+
+#: ../includes/sysnames.inc:200
+msgid "Sep"
+msgstr ""
+
+#: ../includes/sysnames.inc:200
+msgid "Oct"
+msgstr ""
+
+#: ../includes/sysnames.inc:200
+msgid "Nov"
+msgstr ""
+
+#: ../includes/sysnames.inc:200
+msgid "Dec"
+msgstr ""
+
 #: ../includes/system_tests.inc:15
 #: ../includes/ui/ui_view.inc:210
-#: ../reporting/rep705.php:250
-#: ../reporting/rep705.php:261
-#: ../reporting/rep705.php:270
+#: ../includes/ui/ui_view.inc.orig:210
+#: ../reporting/rep705.php:254
+#: ../reporting/rep705.php:265
+#: ../reporting/rep705.php:274
 msgid "Info"
 msgstr ""
 
@@ -7403,67 +7380,38 @@ msgid "Test type"
 msgstr ""
 
 #: ../includes/system_tests.inc:420
-#: ../includes/ui/view_package.php:37
-#: ../reporting/rep204.php:83
-#: ../reporting/rep301.php:103
+#: ../includes/ui/view_package.php:47
+#: ../reporting/rep204.php:85
+#: ../reporting/rep301.php:105
+#: ../reporting/rep308.php:150
 msgid "Value"
 msgstr ""
 
 #: ../includes/system_tests.inc:420
-#: ../reporting/reports_main.php:39
-#: ../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:40
+#: ../reporting/reports_main.php:51
+#: ../reporting/reports_main.php:60
+#: ../reporting/reports_main.php:67
+#: ../reporting/reports_main.php:76
 #: ../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:92
+#: ../reporting/reports_main.php:101
+#: ../reporting/reports_main.php:111
+#: ../reporting/reports_main.php:118
 #: ../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/reports_main.php:133
+#: ../reporting/reports_main.php:140
+#: ../reporting/reports_main.php:146
+#: ../reporting/reports_main.php:157
+#: ../reporting/reports_main.php:168
+#: ../reporting/reports_main.php:176
+#: ../reporting/reports_main.php:181
+#: ../reporting/reports_main.php:188
 #: ../reporting/includes/excel_report.inc:295
 #: ../reporting/includes/excel_report.inc:428
 #: ../reporting/includes/pdf_report.inc:346
 #: ../reporting/includes/pdf_report.inc:619
 #: ../sales/view/view_sales_order.php:98
-#: ../sales/view/view_sales_order.php.orig:85
 msgid "Comments"
 msgstr ""
 
@@ -7477,84 +7425,88 @@ msgid ""
 "trail record."
 msgstr ""
 
-#: ../includes/db/inventory_db.inc:252
+#: ../includes/db/inventory_db.inc:253
+#: ../inventory/includes/db/items_trans_db.inc:66
+#, php-format
+msgid "Cost was %s changed to %s x quantity on hand for item '%s'"
+msgstr ""
+
+#: ../includes/db/inventory_db.inc:294
+#: ../includes/db/inventory_db.inc.orig:292
+msgid "Zero/negative inventory handling"
+msgstr ""
+
+#: ../includes/db/inventory_db.inc.orig:252
 msgid "Cost was "
 msgstr ""
 
-#: ../includes/db/inventory_db.inc:252
+#: ../includes/db/inventory_db.inc.orig:252
 msgid " changed to "
 msgstr ""
 
-#: ../includes/db/inventory_db.inc:252
+#: ../includes/db/inventory_db.inc.orig:252
 msgid " for item "
 msgstr ""
 
-#: ../includes/db/inventory_db.inc:292
-msgid "Zero/negative inventory handling"
-msgstr ""
-
-#: ../includes/ui/allocation_cart.inc:264
+#: ../includes/ui/allocation_cart.inc.orig:264
 #: ../purchasing/allocations/supplier_allocation_main.php:94
 #: ../sales/allocations/customer_allocation_main.php:93
 msgid "Transaction Type"
 msgstr ""
 
-#: ../includes/ui/allocation_cart.inc:264
-#: ../reporting/rep704.php:79
-#: ../reporting/rep704.php:82
-#: ../reporting/rep704.php:85
-#: ../reporting/rep709.php:109
+#: ../includes/ui/allocation_cart.inc.orig:264
+#: ../reporting/rep704.php:83
+#: ../reporting/rep704.php:86
+#: ../reporting/rep704.php:89
+#: ../reporting/rep709.php:111
 #: ../sales/view/view_credit.php:68
 #: ../sales/view/view_sales_order.php:109
 #: ../sales/view/view_sales_order.php:142
 #: ../sales/view/view_sales_order.php:179
-#: ../sales/view/view_sales_order.php.orig:96
-#: ../sales/view/view_sales_order.php.orig:129
-#: ../sales/view/view_sales_order.php.orig:161
-#: ../sales/inquiry/sales_orders_view.php:248
-#: ../sales/inquiry/sales_orders_view.php:285
-#: ../sales/inquiry/sales_orders_view.php:299
+#: ../sales/inquiry/sales_orders_view.php.orig:248
+#: ../sales/inquiry/sales_orders_view.php.orig:285
+#: ../sales/inquiry/sales_orders_view.php.orig:299
 msgid "Ref"
 msgstr ""
 
-#: ../includes/ui/allocation_cart.inc:265
+#: ../includes/ui/allocation_cart.inc.orig:265
 msgid "Other Allocations"
 msgstr ""
 
-#: ../includes/ui/allocation_cart.inc:265
-#: ../includes/ui/ui_view.inc:489
+#: ../includes/ui/allocation_cart.inc.orig:265
+#: ../includes/ui/ui_view.inc.orig:489
 #: ../reporting/includes/doctext.inc:167
 #: ../reporting/includes/doctext.inc:208
 msgid "This Allocation"
 msgstr ""
 
-#: ../includes/ui/allocation_cart.inc:265
-#: ../includes/ui/allocation_cart.inc:314
-#: ../includes/ui/ui_view.inc:489
+#: ../includes/ui/allocation_cart.inc.orig:265
+#: ../includes/ui/allocation_cart.inc.orig:314
+#: ../includes/ui/ui_view.inc.orig:489
 #: ../purchasing/allocations/supplier_allocation_main.php:101
-#: ../reporting/rep112.php:141
-#: ../reporting/rep210.php:154
+#: ../reporting/rep112.php:145
+#: ../reporting/rep210.php:152
 #: ../reporting/includes/doctext.inc:167
 #: ../reporting/includes/doctext.inc:208
 #: ../sales/allocations/customer_allocation_main.php:100
 msgid "Left to Allocate"
 msgstr ""
 
-#: ../includes/ui/allocation_cart.inc:297
-#: ../reporting/rep112.php:138
-#: ../reporting/rep210.php:151
+#: ../includes/ui/allocation_cart.inc.orig:297
+#: ../reporting/rep112.php:142
+#: ../reporting/rep210.php:149
 msgid "Total Allocated"
 msgstr ""
 
-#: ../includes/ui/allocation_cart.inc:334
+#: ../includes/ui/allocation_cart.inc.orig:334
 msgid "The entry for one or more amounts is invalid or negative."
 msgstr ""
 
-#: ../includes/ui/allocation_cart.inc:343
+#: ../includes/ui/allocation_cart.inc.orig:343
 msgid "At least one transaction is overallocated."
 msgstr ""
 
-#: ../includes/ui/allocation_cart.inc:361
+#: ../includes/ui/allocation_cart.inc.orig:361
 msgid ""
 "These allocations cannot be processed because the amount allocated is more "
 "than the total amount left to allocate."
@@ -7569,7 +7521,8 @@ msgid "Sec Phone"
 msgstr ""
 
 #: ../includes/ui/contacts_view.inc:41
-#: ../reporting/rep103.php:223
+#: ../reporting/rep103.php:266
+#: ../reporting/rep205.php:184
 #: ../reporting/includes/header2.inc:104
 #: ../sales/manage/sales_people.php:99
 msgid "Fax"
@@ -7596,7 +7549,7 @@ msgid "Contact active for:"
 msgstr ""
 
 #: ../includes/ui/contacts_view.inc:102
-#: ../sales/manage/customers.php:252
+#: ../sales/manage/customers.php:255
 #: ../sales/manage/sav.customers.php:252
 msgid "Phone:"
 msgstr ""
@@ -7604,9 +7557,9 @@ msgstr ""
 #: ../includes/ui/contacts_view.inc:105
 #: ../inventory/manage/locations.php:207
 #: ../purchasing/manage/suppliers.php:139
-#: ../purchasing/manage/suppliers.php.orig:117
+#: ../purchasing/manage/suppliers.php.orig:139
 #: ../sales/manage/customer_branches.php:265
-#: ../sales/manage/customers.php:255
+#: ../sales/manage/customers.php:258
 #: ../sales/manage/sales_people.php:158
 #: ../sales/manage/sav.customers.php:255
 msgid "E-mail:"
@@ -7614,7 +7567,7 @@ msgstr ""
 
 #: ../includes/ui/contacts_view.inc:110
 #: ../purchasing/manage/suppliers.php:140
-#: ../purchasing/manage/suppliers.php.orig:118
+#: ../purchasing/manage/suppliers.php.orig:140
 #: ../sales/manage/customer_branches.php:266
 msgid "Document Language:"
 msgstr ""
@@ -7628,20 +7581,20 @@ msgstr ""
 msgid "Notes:"
 msgstr ""
 
-#: ../includes/ui/contacts_view.inc:132
+#: ../includes/ui/contacts_view.inc:131
 msgid "The contact name cannot be empty."
 msgstr ""
 
-#: ../includes/ui/contacts_view.inc:137
+#: ../includes/ui/contacts_view.inc:136
 msgid "Contact reference cannot be empty."
 msgstr ""
 
-#: ../includes/ui/contacts_view.inc:142
+#: ../includes/ui/contacts_view.inc:141
 msgid "You have to select at least one category."
 msgstr ""
 
 #: ../includes/ui/db_pager_view.inc:166
-#: ../includes/ui/ui_input.inc:903
+#: ../includes/ui/ui_input.inc:904
 msgid "Show also Inactive"
 msgstr ""
 
@@ -7672,6 +7625,7 @@ msgstr ""
 
 #: ../includes/ui/simple_crud_class.inc:227
 #: ../includes/ui/ui_input.inc:208
+#: ../taxes/sav.tax_types.php:255
 msgid "Submit changes"
 msgstr ""
 
@@ -7722,30 +7676,30 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
-#: ../includes/ui/ui_controls.inc:457
+#: ../includes/ui/ui_controls.inc:459
 #: ../sales/manage/customers.php:23
 #: ../sales/manage/sav.customers.php:23
 msgid "Customers"
 msgstr ""
 
-#: ../includes/ui/ui_controls.inc:459
+#: ../includes/ui/ui_controls.inc:461
 msgid "Branches"
 msgstr ""
 
-#: ../includes/ui/ui_controls.inc:461
+#: ../includes/ui/ui_controls.inc:463
 #: ../purchasing/manage/suppliers.php:22
-#: ../purchasing/manage/suppliers.php.orig:23
+#: ../purchasing/manage/suppliers.php.orig:22
 msgid "Suppliers"
 msgstr ""
 
-#: ../includes/ui/ui_controls.inc:463
-#: ../inventory/transfers.php:230
+#: ../includes/ui/ui_controls.inc:465
+#: ../inventory/transfers.php:228
 #: ../inventory/manage/items.php:22
-#: ../inventory/manage/items.php.orig:21
+#: ../inventory/manage/items.php.orig:22
 msgid "Items"
 msgstr ""
 
-#: ../includes/ui/ui_controls.inc:608
+#: ../includes/ui/ui_controls.inc:610
 msgid "Entered data has not been saved yet.\\nDo you want to abandon changes?"
 msgstr ""
 
@@ -7754,23 +7708,25 @@ msgstr ""
 msgid "Click Here to Pick up the date"
 msgstr ""
 
-#: ../includes/ui/ui_input.inc:915
-#: ../includes/ui/ui_lists.inc:2156
-#: ../reporting/rep301.php:152
-#: ../reporting/rep302.php:166
-#: ../reporting/rep303.php:170
-#: ../reporting/rep304.php:166
+#: ../includes/ui/ui_input.inc:916
+#: ../includes/ui/ui_lists.inc:2160
+#: ../reporting/rep301.php:155
+#: ../reporting/rep302.php:170
+#: ../reporting/rep303.php:184
 #: ../reporting/rep304.php:170
+#: ../reporting/rep304.php:174
+#: ../reporting/rep306.php:235
+#: ../reporting/rep306.php:242
 #: ../sales/manage/customer_branches.php:304
 msgid "Inactive"
 msgstr ""
 
-#: ../includes/ui/ui_input.inc:925
-#: ../includes/ui/ui_input.inc:937
+#: ../includes/ui/ui_input.inc:926
+#: ../includes/ui/ui_input.inc:938
 msgid "Current Credit:"
 msgstr ""
 
-#: ../includes/ui/ui_input.inc:971
+#: ../includes/ui/ui_input.inc:972
 msgid "Bank Balance:"
 msgstr ""
 
@@ -7791,7 +7747,7 @@ msgid "Enter description fragment to search or * for all"
 msgstr ""
 
 #: ../includes/ui/ui_lists.inc:453
-#: ../includes/ui/ui_lists.inc:1386
+#: ../includes/ui/ui_lists.inc:1389
 msgid "All Suppliers"
 msgstr ""
 
@@ -7832,114 +7788,111 @@ msgstr ""
 msgid "All Items"
 msgstr ""
 
-#: ../includes/ui/ui_lists.inc:1293
+#: ../includes/ui/ui_lists.inc:1296
 msgid "All Sales Types"
 msgstr ""
 
-#: ../includes/ui/ui_lists.inc:1628
+#: ../includes/ui/ui_lists.inc:1633
 msgid "Use Item Sales Accounts"
 msgstr ""
 
-#: ../includes/ui/ui_lists.inc:1940
-#: ../includes/ui/ui_lists.inc:1957
-#: ../includes/ui/ui_lists.inc:1974
+#: ../includes/ui/ui_lists.inc:1944
+#: ../includes/ui/ui_lists.inc:1961
+#: ../includes/ui/ui_lists.inc:1978
 msgid "All Types"
 msgstr ""
 
-#: ../includes/ui/ui_lists.inc:1941
+#: ../includes/ui/ui_lists.inc:1945
 #: ../sales/view/view_sales_order.php:140
-#: ../sales/view/view_sales_order.php.orig:127
 msgid "Sales Invoices"
 msgstr ""
 
-#: ../includes/ui/ui_lists.inc:1942
-#: ../includes/ui/ui_lists.inc:1959
-#: ../includes/ui/ui_lists.inc:1977
+#: ../includes/ui/ui_lists.inc:1946
+#: ../includes/ui/ui_lists.inc:1963
+#: ../includes/ui/ui_lists.inc:1981
 msgid "Overdue Invoices"
 msgstr ""
 
-#: ../includes/ui/ui_lists.inc:1943
-#: ../includes/ui/ui_lists.inc:1960
-#: ../includes/ui/ui_lists.inc:1978
-#: ../includes/ui/ui_view.inc:551
-#: ../includes/ui/ui_view.inc:555
+#: ../includes/ui/ui_lists.inc:1947
+#: ../includes/ui/ui_lists.inc:1964
+#: ../includes/ui/ui_lists.inc:1982
+#: ../includes/ui/ui_view.inc.orig:551
+#: ../includes/ui/ui_view.inc.orig:555
 msgid "Payments"
 msgstr ""
 
-#: ../includes/ui/ui_lists.inc:1944
-#: ../includes/ui/ui_lists.inc:1961
-#: ../includes/ui/ui_lists.inc:1979
+#: ../includes/ui/ui_lists.inc:1948
+#: ../includes/ui/ui_lists.inc:1965
+#: ../includes/ui/ui_lists.inc:1983
 #: ../sales/view/view_sales_order.php:176
-#: ../sales/view/view_sales_order.php.orig:158
 msgid "Credit Notes"
 msgstr ""
 
-#: ../includes/ui/ui_lists.inc:1945
+#: ../includes/ui/ui_lists.inc:1949
 #: ../sales/view/view_sales_order.php:106
-#: ../sales/view/view_sales_order.php.orig:93
 msgid "Delivery Notes"
 msgstr ""
 
-#: ../includes/ui/ui_lists.inc:1958
-#: ../includes/ui/ui_lists.inc:1976
+#: ../includes/ui/ui_lists.inc:1962
+#: ../includes/ui/ui_lists.inc:1980
 msgid "Invoices"
 msgstr ""
 
-#: ../includes/ui/ui_lists.inc:1962
-#: ../includes/ui/ui_lists.inc:1980
+#: ../includes/ui/ui_lists.inc:1966
+#: ../includes/ui/ui_lists.inc:1984
 msgid "Overdue Credit Notes"
 msgstr ""
 
-#: ../includes/ui/ui_lists.inc:1975
+#: ../includes/ui/ui_lists.inc:1979
 msgid "GRNs"
 msgstr ""
 
-#: ../includes/ui/ui_lists.inc:1993
+#: ../includes/ui/ui_lists.inc:1997
 msgid "Automatically put balance on back order"
 msgstr ""
 
-#: ../includes/ui/ui_lists.inc:1994
+#: ../includes/ui/ui_lists.inc:1998
 msgid "Cancel any quantites not delivered"
 msgstr ""
 
-#: ../includes/ui/ui_lists.inc:2011
+#: ../includes/ui/ui_lists.inc:2015
 msgid "Items Returned to Inventory Location"
 msgstr ""
 
-#: ../includes/ui/ui_lists.inc:2012
+#: ../includes/ui/ui_lists.inc:2016
 msgid "Items Written Off"
 msgstr ""
 
-#: ../includes/ui/ui_lists.inc:2182
+#: ../includes/ui/ui_lists.inc:2186
 msgid "New role"
 msgstr ""
 
-#: ../includes/ui/ui_lists.inc:2240
+#: ../includes/ui/ui_lists.inc:2238
 msgid "No tags defined."
 msgstr ""
 
-#: ../includes/ui/ui_lists.inc:2240
+#: ../includes/ui/ui_lists.inc:2238
 msgid "No active tags defined."
 msgstr ""
 
-#: ../includes/ui/ui_lists.inc:2278
+#: ../includes/ui/ui_lists.inc:2276
 #, php-format
 msgid "Activated for '%s'"
 msgstr ""
 
-#: ../includes/ui/ui_lists.inc:2281
+#: ../includes/ui/ui_lists.inc:2279
 msgid "Available and/or installed"
 msgstr ""
 
-#: ../includes/ui/ui_lists.inc:2351
+#: ../includes/ui/ui_lists.inc:2349
 msgid "Standard new company American COA (4 digit)"
 msgstr ""
 
-#: ../includes/ui/ui_lists.inc:2353
+#: ../includes/ui/ui_lists.inc:2351
 msgid "Standard American COA (4 digit) with demo data"
 msgstr ""
 
-#: ../includes/ui/ui_lists.inc:2374
+#: ../includes/ui/ui_lists.inc:2372
 msgid "No payment Link"
 msgstr ""
 
@@ -7947,205 +7900,212 @@ msgstr ""
 msgid "in units of : "
 msgstr ""
 
-#: ../includes/ui/ui_view.inc:306
+#: ../includes/ui/ui_view.inc:301
+#, php-format
+msgid ""
+"Cannot retrieve exchange rate for currency %s. Please adjust approximate "
+"rate if needed."
+msgstr ""
+
+#: ../includes/ui/ui_view.inc:342
+#: ../includes/ui/ui_view.inc.orig:306
 msgid "Date Voided:"
 msgstr ""
 
-#: ../includes/ui/ui_view.inc:407
-#: ../reporting/rep107.php:242
-#: ../reporting/rep109.php:183
-#: ../reporting/rep110.php:186
-#: ../reporting/rep111.php:168
-#: ../reporting/rep113.php:172
-#: ../reporting/rep209.php:191
+#: ../includes/ui/ui_view.inc:443
+#: ../includes/ui/ui_view.inc.orig:407
+#: ../reporting/rep109.php:181
+#: ../reporting/rep110.php:184
+#: ../reporting/rep111.php:164
+#: ../reporting/rep113.php:169
+#: ../reporting/rep209.php:186
 msgid "Total Tax Excluded"
 msgstr ""
 
-#: ../includes/ui/ui_view.inc:413
-#: ../includes/ui/ui_view.inc:432
-#: ../includes/ui/ui_view.inc:451
-#: ../reporting/rep107.php:251
-#: ../reporting/rep109.php:192
-#: ../reporting/rep110.php:195
-#: ../reporting/rep111.php:177
-#: ../reporting/rep113.php:181
-#: ../reporting/rep209.php:200
+#: ../includes/ui/ui_view.inc:449
+#: ../includes/ui/ui_view.inc:468
+#: ../includes/ui/ui_view.inc:492
+#: ../includes/ui/ui_view.inc:509
+#: ../includes/ui/ui_view.inc.orig:413
+#: ../includes/ui/ui_view.inc.orig:432
+#: ../includes/ui/ui_view.inc.orig:451
+#: ../reporting/rep109.php:190
+#: ../reporting/rep110.php:193
+#: ../reporting/rep111.php:173
+#: ../reporting/rep113.php:178
+#: ../reporting/rep209.php:195
 msgid "Included"
 msgstr ""
 
-#: ../includes/ui/ui_view.inc:488
+#: ../includes/ui/ui_view.inc.orig:488
 #: ../reporting/includes/doctext.inc:167
 #: ../reporting/includes/doctext.inc:208
 msgid "Total Amount"
 msgstr ""
 
-#: ../includes/ui/ui_view.inc:512
+#: ../includes/ui/ui_view.inc.orig:512
 msgid "Total Allocated:"
 msgstr ""
 
-#: ../includes/ui/ui_view.inc:518
+#: ../includes/ui/ui_view.inc.orig:518
 msgid "Left to Allocate:"
 msgstr ""
 
-#: ../includes/ui/ui_view.inc:534
-#: ../includes/ui/ui_view.inc:538
-#: ../purchasing/inquiry/supplier_allocation_inquiry.php:99
+#: ../includes/ui/ui_view.inc.orig:534
+#: ../includes/ui/ui_view.inc.orig:538
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php.orig:99
 msgid "Allocations"
 msgstr ""
 
-#: ../includes/ui/ui_view.inc:551
-#: ../includes/ui/ui_view.inc:555
+#: ../includes/ui/ui_view.inc.orig:551
+#: ../includes/ui/ui_view.inc.orig:555
 msgid "Pre-Payments"
 msgstr ""
 
-#: ../includes/ui/ui_view.inc:571
+#: ../includes/ui/ui_view.inc.orig:571
 msgid "No Quick Entries are defined."
 msgstr ""
 
-#: ../includes/ui/ui_view.inc:599
+#: ../includes/ui/ui_view.inc.orig:599
 msgid "No Quick Entry lines are defined."
 msgstr ""
 
-#: ../includes/ui/ui_view.inc:781
-#: ../purchasing/includes/ui/invoice_ui.inc:473
+#: ../includes/ui/ui_view.inc.orig:781
+#: ../purchasing/includes/ui/invoice_ui.inc.orig:473
 msgid "and"
 msgstr ""
 
-#: ../includes/ui/ui_view.inc:842
+#: ../includes/ui/ui_view.inc.orig:842
 msgid "January"
 msgstr ""
 
-#: ../includes/ui/ui_view.inc:842
+#: ../includes/ui/ui_view.inc.orig:842
 msgid "February"
 msgstr ""
 
-#: ../includes/ui/ui_view.inc:842
+#: ../includes/ui/ui_view.inc.orig:842
 msgid "March"
 msgstr ""
 
-#: ../includes/ui/ui_view.inc:842
+#: ../includes/ui/ui_view.inc.orig:842
 msgid "April"
 msgstr ""
 
-#: ../includes/ui/ui_view.inc:842
-msgid "May"
-msgstr ""
-
-#: ../includes/ui/ui_view.inc:842
+#: ../includes/ui/ui_view.inc.orig:842
 msgid "June"
 msgstr ""
 
-#: ../includes/ui/ui_view.inc:842
+#: ../includes/ui/ui_view.inc.orig:842
 msgid "July"
 msgstr ""
 
-#: ../includes/ui/ui_view.inc:842
+#: ../includes/ui/ui_view.inc.orig:842
 msgid "August"
 msgstr ""
 
-#: ../includes/ui/ui_view.inc:842
+#: ../includes/ui/ui_view.inc.orig:842
 msgid "September"
 msgstr ""
 
-#: ../includes/ui/ui_view.inc:842
+#: ../includes/ui/ui_view.inc.orig:842
 msgid "October"
 msgstr ""
 
-#: ../includes/ui/ui_view.inc:842
+#: ../includes/ui/ui_view.inc.orig:842
 msgid "November"
 msgstr ""
 
-#: ../includes/ui/ui_view.inc:842
+#: ../includes/ui/ui_view.inc.orig:842
 msgid "December"
 msgstr ""
 
-#: ../includes/ui/ui_view.inc:843
+#: ../includes/ui/ui_view.inc.orig:843
 msgid "Su"
 msgstr ""
 
-#: ../includes/ui/ui_view.inc:843
+#: ../includes/ui/ui_view.inc.orig:843
 msgid "Mo"
 msgstr ""
 
-#: ../includes/ui/ui_view.inc:843
+#: ../includes/ui/ui_view.inc.orig:843
 msgid "Tu"
 msgstr ""
 
-#: ../includes/ui/ui_view.inc:843
+#: ../includes/ui/ui_view.inc.orig:843
 msgid "We"
 msgstr ""
 
-#: ../includes/ui/ui_view.inc:843
+#: ../includes/ui/ui_view.inc.orig:843
 msgid "Th"
 msgstr ""
 
-#: ../includes/ui/ui_view.inc:843
+#: ../includes/ui/ui_view.inc.orig:843
 msgid "Fr"
 msgstr ""
 
-#: ../includes/ui/ui_view.inc:843
+#: ../includes/ui/ui_view.inc.orig:843
 msgid "Sa"
 msgstr ""
 
-#: ../includes/ui/ui_view.inc:844
+#: ../includes/ui/ui_view.inc.orig:844
 msgid "W"
 msgstr ""
 
-#: ../includes/ui/view_package.php:7
+#: ../includes/ui/view_package.php:17
 msgid "Package Details"
 msgstr ""
 
-#: ../includes/ui/view_package.php:14
+#: ../includes/ui/view_package.php:24
 msgid ""
 "The script must be called with a valid package id to review the info for."
 msgstr ""
 
-#: ../includes/ui/view_package.php:19
+#: ../includes/ui/view_package.php:29
 msgid "Available version"
 msgstr ""
 
-#: ../includes/ui/view_package.php:20
+#: ../includes/ui/view_package.php:30
 msgid "Package type"
 msgstr ""
 
-#: ../includes/ui/view_package.php:21
+#: ../includes/ui/view_package.php:31
 msgid "Package content"
 msgstr ""
 
-#: ../includes/ui/view_package.php:23
+#: ../includes/ui/view_package.php:33
 msgid "Author"
 msgstr ""
 
-#: ../includes/ui/view_package.php:24
+#: ../includes/ui/view_package.php:34
 msgid "Home page"
 msgstr ""
 
-#: ../includes/ui/view_package.php:25
+#: ../includes/ui/view_package.php:35
 msgid "Package maintainer"
 msgstr ""
 
-#: ../includes/ui/view_package.php:26
+#: ../includes/ui/view_package.php:36
 msgid "Installation path"
 msgstr ""
 
-#: ../includes/ui/view_package.php:27
+#: ../includes/ui/view_package.php:37
 msgid "Minimal software versions"
 msgstr ""
 
-#: ../includes/ui/view_package.php:28
+#: ../includes/ui/view_package.php:38
 msgid "Right to left"
 msgstr ""
 
-#: ../includes/ui/view_package.php:29
+#: ../includes/ui/view_package.php:39
 msgid "Charset encoding"
 msgstr ""
 
-#: ../includes/ui/view_package.php:34
+#: ../includes/ui/view_package.php:44
 #, php-format
 msgid "Content information for package '%s'"
 msgstr ""
 
-#: ../includes/ui/view_package.php:37
+#: ../includes/ui/view_package.php:47
 msgid "Property"
 msgstr ""
 
@@ -8182,73 +8142,71 @@ msgstr ""
 msgid "Enter &Another Adjustment"
 msgstr ""
 
-#: ../inventory/adjustments.php:90
-#: ../inventory/transfers.php:87
-#: ../sales/sales_order_entry.php:369
+#: ../inventory/adjustments.php:88
+#: ../inventory/transfers.php:85
+#: ../sales/sales_order_entry.php:370
 msgid "You must enter at least one non empty item line."
 msgstr ""
 
-#: ../inventory/adjustments.php:110
-#: ../inventory/transfers.php:105
+#: ../inventory/adjustments.php:108
 msgid "The entered date for the adjustment is invalid."
 msgstr ""
 
-#: ../inventory/adjustments.php:124
+#: ../inventory/adjustments.php:122
 msgid ""
 "The adjustment cannot be processed because an adjustment item would cause a "
 "negative inventory balance :"
 msgstr ""
 
-#: ../inventory/adjustments.php:154
+#: ../inventory/adjustments.php:152
 #: ../manufacturing/work_order_issue.php:141
 msgid "The quantity entered is negative or invalid."
 msgstr ""
 
-#: ../inventory/adjustments.php:161
+#: ../inventory/adjustments.php:159
 #: ../manufacturing/work_order_issue.php:148
 msgid "The entered standard cost is negative or invalid."
 msgstr ""
 
-#: ../inventory/adjustments.php:230
+#: ../inventory/adjustments.php:228
 msgid "Adjustment Items"
 msgstr ""
 
-#: ../inventory/adjustments.php:236
+#: ../inventory/adjustments.php:234
 msgid "Process Adjustment"
 msgstr ""
 
-#: ../inventory/cost_update.php:26
+#: ../inventory/cost_update.php:31
 msgid "Inventory Item Cost Update"
 msgstr ""
 
-#: ../inventory/cost_update.php:30
+#: ../inventory/cost_update.php:36
 msgid ""
 "There are no costable inventory items defined in the system (Purchased or "
 "manufactured items)."
 msgstr ""
 
-#: ../inventory/cost_update.php:51
+#: ../inventory/cost_update.php:57
 msgid "The entered cost is not numeric."
 msgstr ""
 
-#: ../inventory/cost_update.php:57
+#: ../inventory/cost_update.php:63
 msgid "The new cost is the same as the old cost. Cost was not updated."
 msgstr ""
 
-#: ../inventory/cost_update.php:67
+#: ../inventory/cost_update.php:73
 msgid "Cost has been updated."
 msgstr ""
 
-#: ../inventory/cost_update.php:71
+#: ../inventory/cost_update.php:77
 msgid "View the GL Journal Entries for this Cost Update"
 msgstr ""
 
-#: ../inventory/cost_update.php:85
-#: ../inventory/prices.php:56
-#: ../inventory/purchasing_data.php:101
-#: ../inventory/reorder_level.php:43
+#: ../inventory/cost_update.php:95
+#: ../inventory/prices.php:61
+#: ../inventory/purchasing_data.php:117
+#: ../inventory/reorder_level.php:48
 #: ../inventory/inquiry/stock_movements.php:49
-#: ../inventory/inquiry/stock_movements.php.orig:51
 #: ../inventory/inquiry/stock_status.php:41
 #: ../inventory/inquiry/stock_status.php.orig:47
 #: ../inventory/manage/item_codes.php:105
@@ -8256,29 +8214,28 @@ msgstr ""
 #: ../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:263
+#: ../sales/inquiry/sales_orders_view.php.orig:263
 msgid "Item:"
 msgstr ""
 
-#: ../inventory/cost_update.php:102
+#: ../inventory/cost_update.php:116
 msgid "Standard Material Cost Per Unit"
 msgstr ""
 
-#: ../inventory/cost_update.php:105
+#: ../inventory/cost_update.php:125
 msgid "Standard Labour Cost Per Unit"
 msgstr ""
 
-#: ../inventory/cost_update.php:106
+#: ../inventory/cost_update.php:126
 msgid "Standard Overhead Cost Per Unit"
 msgstr ""
 
-#: ../inventory/prices.php:16
+#: ../inventory/prices.php:26
 msgid "Inventory Item Sales prices"
 msgstr ""
 
-#: ../inventory/prices.php:27
+#: ../inventory/prices.php:30
 #: ../inventory/inquiry/stock_movements.php:29
-#: ../inventory/inquiry/stock_movements.php.orig:31
 #: ../inventory/inquiry/stock_status.php:32
 #: ../inventory/inquiry/stock_status.php.orig:37
 #: ../inventory/manage/sales_kits.php:24
@@ -8287,31 +8244,37 @@ msgstr ""
 msgid "There are no items defined in the system."
 msgstr ""
 
-#: ../inventory/prices.php:29
+#: ../inventory/prices.php:32
 msgid ""
 "There are no sales types in the system. Please set up sales types befor "
 "entering pricing."
 msgstr ""
 
-#: ../inventory/prices.php:70
+#: ../inventory/prices.php:77
 msgid "The price entered must be numeric."
 msgstr ""
 
 #: ../inventory/prices.php:83
+msgid ""
+"The sales pricing for this item, sales type and currency has already been "
+"added."
+msgstr ""
+
+#: ../inventory/prices.php:96
 msgid "This price has been updated."
 msgstr ""
 
-#: ../inventory/prices.php:91
+#: ../inventory/prices.php:104
 msgid "The new price has been added."
 msgstr ""
 
-#: ../inventory/prices.php:105
+#: ../inventory/prices.php:118
 msgid "The selected price has been deleted."
 msgstr ""
 
-#: ../inventory/prices.php:133
-#: ../reporting/rep104.php:116
-#: ../sales/customer_delivery.php.orig:368
+#: ../inventory/prices.php:146
+#: ../reporting/rep104.php:118
+#: ../sales/customer_delivery.php:369
 #: ../sales/customer_invoice.php:468
 #: ../sales/view/view_credit.php:73
 #: ../sales/view/view_dispatch.php:93
@@ -8320,224 +8283,149 @@ msgstr ""
 msgid "Sales Type"
 msgstr ""
 
-#: ../inventory/prices.php:133
-#: ../inventory/purchasing_data.php:129
-#: ../inventory/purchasing_data.php.orig:224
-#: ../purchasing/includes/ui/invoice_ui.inc:505
+#: ../inventory/prices.php:146
+#: ../inventory/purchasing_data.php:147
+#: ../purchasing/includes/ui/invoice_ui.inc.orig:505
 #: ../purchasing/po_receive_items.php:63
 #: ../purchasing/view/view_grn.php:41
 #: ../purchasing/view/view_po.php:45
-#: ../reporting/rep104.php:109
+#: ../reporting/rep104.php:111
 #: ../reporting/includes/doctext.inc:30
 #: ../reporting/includes/doctext.inc:192
 #: ../sales/customer_credit_invoice.php:281
-#: ../sales/customer_delivery.php.orig:446
+#: ../sales/customer_delivery.php:447
 #: ../sales/customer_invoice.php:542
 #: ../sales/customer_invoice.php:545
 #: ../sales/view/view_credit.php:91
 #: ../sales/view/view_dispatch.php:113
 #: ../sales/view/view_invoice.php:116
 #: ../sales/view/view_sales_order.php:220
-#: ../sales/view/view_sales_order.php.orig:202
 #: ../sales/includes/ui/sales_credit_ui.inc:168
 msgid "Price"
 msgstr ""
 
-#: ../inventory/prices.php:155
+#: ../inventory/prices.php:168
 msgid "There are no prices set up for this part."
 msgstr ""
 
-#: ../inventory/prices.php:174
-#: ../inventory/purchasing_data.php.orig:189
+#: ../inventory/prices.php:192
 msgid "Currency:"
 msgstr ""
 
-#: ../inventory/prices.php:176
+#: ../inventory/prices.php:194
 msgid "Sales Type:"
 msgstr ""
 
-#: ../inventory/prices.php:184
-#: ../inventory/purchasing_data.php:191
-#: ../inventory/purchasing_data.php.orig:193
+#: ../inventory/prices.php:202
+#: ../inventory/purchasing_data.php:215
 msgid "Price:"
 msgstr ""
 
-#: ../inventory/prices.php:184
+#: ../inventory/prices.php:202
 msgid "per"
 msgstr ""
 
-#: ../inventory/prices.php:188
+#: ../inventory/prices.php:206
 msgid "The price is calculated."
 msgstr ""
 
-#: ../inventory/purchasing_data.php:16
-#: ../inventory/purchasing_data.php.orig:17
+#: ../inventory/purchasing_data.php:25
 msgid "Supplier Purchasing Data"
 msgstr ""
 
-#: ../inventory/purchasing_data.php:23
-#: ../inventory/purchasing_data.php.orig:24
+#: ../inventory/purchasing_data.php:27
 #: ../purchasing/po_entry_items.php:70
-#: ../purchasing/po_entry_items.php.orig:67
+#: ../purchasing/po_entry_items.php.orig:70
 msgid "There are no purchasable inventory items defined in the system."
 msgstr ""
 
-#: ../inventory/purchasing_data.php:24
-#: ../inventory/purchasing_data.php.orig:25
+#: ../inventory/purchasing_data.php:28
 #: ../purchasing/po_entry_items.php:68
-#: ../purchasing/po_entry_items.php.orig:65
+#: ../purchasing/po_entry_items.php.orig:68
 #: ../purchasing/supplier_credit.php:31
 #: ../purchasing/supplier_invoice.php:30
 #: ../purchasing/supplier_payment.php:40
+#: ../purchasing/supplier_payment.php.orig:40
 msgid "There are no suppliers defined in the system."
 msgstr ""
 
-#: ../inventory/purchasing_data.php:38
-#: ../inventory/purchasing_data.php.orig:39
+#: ../inventory/purchasing_data.php:46
 #: ../inventory/manage/item_codes.php:35
 msgid "There is no item selected."
 msgstr ""
 
-#: ../inventory/purchasing_data.php:44
-#: ../inventory/purchasing_data.php.orig:45
+#: ../inventory/purchasing_data.php:52
 msgid "The price entered was not numeric."
 msgstr ""
 
-#: ../inventory/purchasing_data.php:50
-#: ../inventory/purchasing_data.php.orig:51
+#: ../inventory/purchasing_data.php:58
 msgid ""
 "The conversion factor entered was not numeric. The conversion factor is the "
 "number by which the price must be divided by to get the unit price in our "
 "unit of measure."
 msgstr ""
 
-#: ../inventory/purchasing_data.php:60
-#: ../inventory/purchasing_data.php.orig:61
+#: ../inventory/purchasing_data.php:64
+msgid "The purchasing data for this supplier has already been added."
+msgstr ""
+
+#: ../inventory/purchasing_data.php:73
 msgid "This supplier purchasing data has been added."
 msgstr ""
 
-#: ../inventory/purchasing_data.php:66
-#: ../inventory/purchasing_data.php.orig:67
+#: ../inventory/purchasing_data.php:79
 msgid "Supplier purchasing data has been updated."
 msgstr ""
 
-#: ../inventory/purchasing_data.php:77
-#: ../inventory/purchasing_data.php.orig:88
+#: ../inventory/purchasing_data.php:90
 msgid "The purchasing data item has been sucessfully deleted."
 msgstr ""
 
-#: ../inventory/purchasing_data.php:114
+#: ../inventory/purchasing_data.php:132
 msgid "Entered item is not defined. Please re-enter."
 msgstr ""
 
-#: ../inventory/purchasing_data.php:123
+#: ../inventory/purchasing_data.php:141
 msgid "There is no purchasing data set up for the part selected"
 msgstr ""
 
-#: ../inventory/purchasing_data.php:130
-#: ../inventory/purchasing_data.php.orig:222
+#: ../inventory/purchasing_data.php:148
 msgid "Supplier's Unit"
 msgstr ""
 
-#: ../inventory/purchasing_data.php:130
-#: ../inventory/purchasing_data.php.orig:223
+#: ../inventory/purchasing_data.php:148
 msgid "Conversion Factor"
 msgstr ""
 
-#: ../inventory/purchasing_data.php:130
+#: ../inventory/purchasing_data.php:148
 msgid "Supplier's Description"
 msgstr ""
 
-#: ../inventory/purchasing_data.php:192
-#: ../inventory/purchasing_data.php.orig:194
+#: ../inventory/purchasing_data.php:216
 msgid "Suppliers Unit of Measure:"
 msgstr ""
 
-#: ../inventory/purchasing_data.php:198
-#: ../inventory/purchasing_data.php.orig:200
+#: ../inventory/purchasing_data.php:222
 msgid "Conversion Factor (to our UOM):"
 msgstr ""
 
-#: ../inventory/purchasing_data.php:200
-#: ../inventory/purchasing_data.php.orig:202
+#: ../inventory/purchasing_data.php:224
 msgid "Supplier's Code or Description:"
 msgstr ""
 
-#: ../inventory/purchasing_data.php.orig:116
-msgid "Show all:"
-msgstr ""
-
-#: ../inventory/purchasing_data.php.orig:185
-msgid "Stock item:"
-msgstr ""
-
-#: ../inventory/purchasing_data.php.orig:219
-msgid "Supplier Code/Description"
-msgstr ""
-
-#: ../inventory/purchasing_data.php.orig:220
-#: ../inventory/includes/item_adjustments_ui.inc:62
-#: ../inventory/includes/stock_transfers_ui.inc:60
-#: ../manufacturing/includes/work_order_issue_ui.inc:33
-#: ../purchasing/includes/ui/po_ui.inc:243
-#: ../purchasing/includes/ui/po_ui.inc.orig:243
-#: ../purchasing/po_receive_items.php:62
-#: ../purchasing/view/view_grn.php:40
-#: ../purchasing/view/view_po.php:45
-#: ../reporting/includes/doctext.inc:29
-#: ../reporting/includes/doctext.inc:191
-#: ../reporting/includes/doctext.inc:228
-#: ../sales/customer_credit_invoice.php:280
-#: ../sales/customer_delivery.php.orig:444
-#: ../sales/customer_invoice.php:541
-#: ../sales/customer_invoice.php:544
-#: ../sales/view/view_credit.php:90
-#: ../sales/view/view_dispatch.php:112
-#: ../sales/view/view_invoice.php:115
-#: ../sales/view/view_sales_order.php:219
-#: ../sales/view/view_sales_order.php.orig:201
-#: ../sales/includes/ui/sales_credit_ui.inc:167
-#: ../sales/includes/ui/sales_order_ui.inc.orig:140
-msgid "Item Code"
-msgstr ""
-
-#: ../inventory/purchasing_data.php.orig:221
-#: ../inventory/includes/item_adjustments_ui.inc:62
-#: ../inventory/includes/stock_transfers_ui.inc:60
-#: ../manufacturing/includes/work_order_issue_ui.inc:33
-#: ../purchasing/includes/ui/po_ui.inc:243
-#: ../purchasing/includes/ui/po_ui.inc.orig:243
-#: ../purchasing/view/view_grn.php:40
-#: ../purchasing/view/view_po.php:45
-#: ../reporting/includes/doctext.inc:29
-#: ../reporting/includes/doctext.inc:191
-#: ../reporting/includes/doctext.inc:228
-#: ../sales/customer_credit_invoice.php:280
-#: ../sales/customer_delivery.php.orig:444
-#: ../sales/customer_invoice.php:541
-#: ../sales/customer_invoice.php:544
-#: ../sales/view/view_credit.php:90
-#: ../sales/view/view_dispatch.php:112
-#: ../sales/view/view_invoice.php:115
-#: ../sales/view/view_sales_order.php:219
-#: ../sales/view/view_sales_order.php.orig:201
-#: ../sales/includes/ui/sales_credit_ui.inc:167
-#: ../sales/includes/ui/sales_order_ui.inc.orig:140
-msgid "Item Description"
-msgstr ""
-
-#: ../inventory/reorder_level.php:16
+#: ../inventory/reorder_level.php:25
 msgid "Reorder Levels"
 msgstr ""
 
-#: ../inventory/reorder_level.php:24
+#: ../inventory/reorder_level.php:27
 #: ../inventory/transfers.php:32
 msgid ""
 "There are no inventory items defined in the system (Purchased or "
 "manufactured items)."
 msgstr ""
 
-#: ../inventory/reorder_level.php:57
+#: ../inventory/reorder_level.php:65
+#: ../inventory/inquiry/stock_movements.php:79
 #: ../inventory/inquiry/stock_status.php:66
 #: ../inventory/inquiry/stock_status.php:70
 #: ../inventory/inquiry/stock_status.php.orig:72
@@ -8551,43 +8439,40 @@ msgstr ""
 #: ../purchasing/inquiry/po_search_completed.php.orig:132
 #: ../purchasing/inquiry/po_search.php:133
 #: ../purchasing/inquiry/po_search.php:144
-#: ../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
+#: ../reporting/rep105.php:120
+#: ../reporting/rep301.php:112
+#: ../reporting/rep302.php:132
+#: ../reporting/rep303.php:134
+#: ../reporting/rep304.php:123
+#: ../reporting/rep306.php:150
+#: ../reporting/rep307.php:124
+#: ../reporting/rep308.php:157
 #: ../sales/manage/sales_points.php:84
 msgid "Location"
 msgstr ""
 
-#: ../inventory/reorder_level.php:57
-#: ../inventory/inquiry/stock_movements.php:78
-#: ../inventory/inquiry/stock_movements.php.orig:80
+#: ../inventory/reorder_level.php:65
+#: ../inventory/inquiry/stock_movements.php:80
 #: ../inventory/inquiry/stock_status.php:70
 #: ../inventory/inquiry/stock_status.php.orig:76
-#: ../purchasing/supplier_credit.php:220
-#: ../sales/sales_order_entry.php:523
-#: ../sales/includes/ui/sales_order_ui.inc.orig:175
+#: ../purchasing/supplier_credit.php:219
+#: ../sales/sales_order_entry.php:531
+#: ../sales/includes/ui/sales_order_ui.inc:182
 msgid "Quantity On Hand"
 msgstr ""
 
-#: ../inventory/reorder_level.php:57
+#: ../inventory/reorder_level.php:65
 #: ../inventory/inquiry/stock_status.php:70
 #: ../inventory/inquiry/stock_status.php.orig:76
 #: ../sales/includes/db/old.sales_order_db.inc:110
 #: ../sales/includes/db/old.sales_order_db.inc:263
 #: ../sales/includes/db/sales_order_db.inc:112
-#: ../sales/includes/db/sales_order_db.inc:275
 #: ../sales/includes/db/sales_order_db.inc.orig:112
 #: ../sales/includes/db/sales_order_db.inc.orig:275
 msgid "Re-Order Level"
 msgstr ""
 
-#: ../inventory/reorder_level.php:75
+#: ../inventory/reorder_level.php:89
 msgid "Reorder levels has been updated."
 msgstr ""
 
@@ -8607,21 +8492,25 @@ msgstr ""
 msgid "Enter &Another Inventory Transfer"
 msgstr ""
 
-#: ../inventory/transfers.php:117
+#: ../inventory/transfers.php:103
+msgid "The entered transfer date is invalid."
+msgstr ""
+
+#: ../inventory/transfers.php:115
 msgid "The locations to transfer from and to must be different."
 msgstr ""
 
-#: ../inventory/transfers.php:127
+#: ../inventory/transfers.php:125
 msgid ""
 "The quantity entered is greater than the available quantity for this item at "
 "the source location :"
 msgstr ""
 
-#: ../inventory/transfers.php:160
+#: ../inventory/transfers.php:158
 msgid "The quantity entered must be a positive number."
 msgstr ""
 
-#: ../inventory/transfers.php:237
+#: ../inventory/transfers.php:235
 msgid "Process Transfer"
 msgstr ""
 
@@ -8629,7 +8518,6 @@ msgstr ""
 #: ../inventory/includes/stock_transfers_ui.inc:20
 #: ../manufacturing/includes/work_order_issue_ui.inc:20
 #: ../sales/includes/ui/sales_order_ui.inc:60
-#: ../sales/includes/ui/sales_order_ui.inc.orig:60
 msgid "For Part :"
 msgstr ""
 
@@ -8637,7 +8525,7 @@ msgstr ""
 #: ../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:254
+#: ../sales/inquiry/sales_orders_view.php.orig:254
 msgid "Location:"
 msgstr ""
 
@@ -8653,6 +8541,51 @@ msgstr ""
 msgid "Negative Adjustment"
 msgstr ""
 
+#: ../inventory/includes/item_adjustments_ui.inc:62
+#: ../inventory/includes/stock_transfers_ui.inc:60
+#: ../manufacturing/includes/work_order_issue_ui.inc:33
+#: ../purchasing/includes/ui/po_ui.inc.orig:243
+#: ../purchasing/po_receive_items.php:62
+#: ../purchasing/view/view_grn.php:40
+#: ../purchasing/view/view_po.php:45
+#: ../reporting/includes/doctext.inc:29
+#: ../reporting/includes/doctext.inc:191
+#: ../reporting/includes/doctext.inc:228
+#: ../sales/customer_credit_invoice.php:280
+#: ../sales/customer_delivery.php:445
+#: ../sales/customer_invoice.php:541
+#: ../sales/customer_invoice.php:544
+#: ../sales/view/view_credit.php:90
+#: ../sales/view/view_dispatch.php:112
+#: ../sales/view/view_invoice.php:115
+#: ../sales/view/view_sales_order.php:219
+#: ../sales/includes/ui/sales_credit_ui.inc:167
+#: ../sales/includes/ui/sales_order_ui.inc:145
+msgid "Item Code"
+msgstr ""
+
+#: ../inventory/includes/item_adjustments_ui.inc:62
+#: ../inventory/includes/stock_transfers_ui.inc:60
+#: ../manufacturing/includes/work_order_issue_ui.inc:33
+#: ../purchasing/includes/ui/po_ui.inc.orig:243
+#: ../purchasing/view/view_grn.php:40
+#: ../purchasing/view/view_po.php:45
+#: ../reporting/includes/doctext.inc:29
+#: ../reporting/includes/doctext.inc:191
+#: ../reporting/includes/doctext.inc:228
+#: ../sales/customer_credit_invoice.php:280
+#: ../sales/customer_delivery.php:445
+#: ../sales/customer_invoice.php:541
+#: ../sales/customer_invoice.php:544
+#: ../sales/view/view_credit.php:90
+#: ../sales/view/view_dispatch.php:112
+#: ../sales/view/view_invoice.php:115
+#: ../sales/view/view_sales_order.php:219
+#: ../sales/includes/ui/sales_credit_ui.inc:167
+#: ../sales/includes/ui/sales_order_ui.inc:145
+msgid "Item Description"
+msgstr ""
+
 #: ../inventory/includes/item_adjustments_ui.inc:62
 #: ../inventory/includes/stock_transfers_ui.inc:60
 #: ../inventory/manage/item_codes.php:124
@@ -8665,15 +8598,14 @@ msgstr ""
 #: ../manufacturing/includes/manufacturing_ui.inc:157
 #: ../manufacturing/includes/manufacturing_ui.inc:332
 #: ../manufacturing/includes/work_order_issue_ui.inc:33
-#: ../purchasing/includes/ui/invoice_ui.inc:505
-#: ../purchasing/includes/ui/po_ui.inc:243
+#: ../purchasing/includes/ui/invoice_ui.inc.orig:505
 #: ../purchasing/includes/ui/po_ui.inc.orig:243
 #: ../purchasing/view/view_grn.php:40
 #: ../purchasing/view/view_po.php:45
-#: ../reporting/rep301.php:103
-#: ../reporting/rep303.php:109
-#: ../reporting/rep303.php:115
-#: ../reporting/rep401.php:69
+#: ../reporting/rep301.php:105
+#: ../reporting/rep303.php:121
+#: ../reporting/rep303.php:127
+#: ../reporting/rep401.php:71
 #: ../reporting/includes/doctext.inc:29
 #: ../reporting/includes/doctext.inc:192
 #: ../reporting/includes/doctext.inc:225
@@ -8682,9 +8614,8 @@ msgstr ""
 #: ../sales/view/view_dispatch.php:112
 #: ../sales/view/view_invoice.php:115
 #: ../sales/view/view_sales_order.php:219
-#: ../sales/view/view_sales_order.php.orig:201
 #: ../sales/includes/ui/sales_credit_ui.inc:167
-#: ../sales/includes/ui/sales_order_ui.inc.orig:140
+#: ../sales/includes/ui/sales_order_ui.inc:145
 msgid "Quantity"
 msgstr ""
 
@@ -8692,7 +8623,6 @@ msgstr ""
 #: ../inventory/includes/stock_transfers_ui.inc:60
 #: ../inventory/manage/item_units.php:94
 #: ../manufacturing/includes/work_order_issue_ui.inc:34
-#: ../purchasing/includes/ui/po_ui.inc:244
 #: ../purchasing/includes/ui/po_ui.inc.orig:244
 #: ../purchasing/view/view_grn.php:41
 #: ../purchasing/view/view_po.php:45
@@ -8702,9 +8632,8 @@ msgstr ""
 #: ../sales/view/view_dispatch.php:113
 #: ../sales/view/view_invoice.php:116
 #: ../sales/view/view_sales_order.php:219
-#: ../sales/view/view_sales_order.php.orig:201
 #: ../sales/includes/ui/sales_credit_ui.inc:167
-#: ../sales/includes/ui/sales_order_ui.inc.orig:142
+#: ../sales/includes/ui/sales_order_ui.inc:147
 msgid "Unit"
 msgstr ""
 
@@ -8712,13 +8641,12 @@ msgstr ""
 #: ../inventory/view/view_adjustment.php:57
 #: ../manufacturing/includes/manufacturing_ui.inc:29
 #: ../manufacturing/includes/work_order_issue_ui.inc:34
-#: ../reporting/rep301.php:103
+#: ../reporting/rep301.php:105
 msgid "Unit Cost"
 msgstr ""
 
 #: ../inventory/includes/stock_transfers_ui.inc:35
 #: ../inventory/inquiry/stock_movements.php:56
-#: ../inventory/inquiry/stock_movements.php.orig:58
 #: ../manufacturing/includes/work_order_issue_ui.inc:164
 msgid "From Location:"
 msgstr ""
@@ -8731,26 +8659,26 @@ msgstr ""
 msgid "Transfer Type:"
 msgstr ""
 
-#: ../inventory/includes/db/items_db.inc:119
+#: ../inventory/includes/db/items_db.inc:121
 msgid ""
 "Cannot delete this item because there are stock movements that refer to this "
 "item."
 msgstr ""
 
-#: ../inventory/includes/db/items_db.inc:122
+#: ../inventory/includes/db/items_db.inc:124
 msgid ""
 "Cannot delete this item record because there are bills of material that "
 "require this part as a component."
 msgstr ""
 
-#: ../inventory/includes/db/items_db.inc:125
-#: ../inventory/includes/db/items_db.inc:128
+#: ../inventory/includes/db/items_db.inc:127
+#: ../inventory/includes/db/items_db.inc:130
 msgid ""
 "Cannot delete this item because there are existing purchase order items for "
 "it."
 msgstr ""
 
-#: ../inventory/includes/db/items_db.inc:146
+#: ../inventory/includes/db/items_db.inc:148
 msgid ""
 "This item cannot be deleted because some code aliases \n"
 "\t\t\t\tor foreign codes was entered for it, or there are kits defined \n"
@@ -8758,48 +8686,44 @@ msgid ""
 msgstr ""
 
 #: ../inventory/inquiry/stock_movements.php:26
-#: ../inventory/inquiry/stock_movements.php.orig:27
 msgid "Inventory Item Movement"
 msgstr ""
 
 #: ../inventory/inquiry/stock_movements.php:61
-#: ../inventory/inquiry/stock_movements.php.orig:63
 msgid "Show Movements"
 msgstr ""
 
 #: ../inventory/inquiry/stock_movements.php:61
-#: ../inventory/inquiry/stock_movements.php.orig:63
-#: ../purchasing/includes/ui/invoice_ui.inc:474
+#: ../purchasing/includes/ui/invoice_ui.inc.orig:474
 #: ../purchasing/inquiry/supplier_allocation_inquiry.php:57
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php.orig:57
 #: ../purchasing/inquiry/supplier_inquiry.php:55
-#: ../purchasing/inquiry/supplier_inquiry.php.orig:55
 #: ../sales/inquiry/customer_allocation_inquiry.php:51
+#: ../sales/inquiry/customer_allocation_inquiry.php.orig:51
 #: ../sales/inquiry/customer_inquiry.php:54
+#: ../sales/inquiry/customer_inquiry.php.orig:54
 msgid "Refresh Inquiry"
 msgstr ""
 
-#: ../inventory/inquiry/stock_movements.php:77
-#: ../inventory/inquiry/stock_movements.php.orig:79
+#: ../inventory/inquiry/stock_movements.php:80
 msgid "Detail"
 msgstr ""
 
-#: ../inventory/inquiry/stock_movements.php:78
-#: ../inventory/inquiry/stock_movements.php.orig:80
+#: ../inventory/inquiry/stock_movements.php:80
+#: ../reporting/rep307.php:117
 msgid "Quantity In"
 msgstr ""
 
-#: ../inventory/inquiry/stock_movements.php:78
-#: ../inventory/inquiry/stock_movements.php.orig:80
+#: ../inventory/inquiry/stock_movements.php:80
+#: ../reporting/rep307.php:117
 msgid "Quantity Out"
 msgstr ""
 
-#: ../inventory/inquiry/stock_movements.php:93
-#: ../inventory/inquiry/stock_movements.php.orig:95
+#: ../inventory/inquiry/stock_movements.php:97
 msgid "Quantity on hand before"
 msgstr ""
 
-#: ../inventory/inquiry/stock_movements.php:181
-#: ../inventory/inquiry/stock_movements.php.orig:183
+#: ../inventory/inquiry/stock_movements.php:188
 msgid "Quantity on hand after"
 msgstr ""
 
@@ -8820,15 +8744,15 @@ msgstr ""
 #: ../inventory/inquiry/stock_status.php:71
 #: ../inventory/inquiry/stock_status.php.orig:72
 #: ../inventory/inquiry/stock_status.php.orig:77
-#: ../reporting/rep303.php:109
-#: ../reporting/rep303.php:115
+#: ../reporting/rep303.php:121
+#: ../reporting/rep303.php:127
 msgid "Demand"
 msgstr ""
 
 #: ../inventory/inquiry/stock_status.php:71
 #: ../inventory/inquiry/stock_status.php.orig:77
-#: ../reporting/rep303.php:109
-#: ../reporting/rep303.php:115
+#: ../reporting/rep303.php:121
+#: ../reporting/rep303.php:127
 msgid "On Order"
 msgstr ""
 
@@ -8871,7 +8795,7 @@ msgstr ""
 #: ../manufacturing/manage/bom_edit.php:71
 #: ../purchasing/po_receive_items.php:62
 #: ../sales/customer_credit_invoice.php:280
-#: ../sales/customer_delivery.php.orig:445
+#: ../sales/customer_delivery.php:446
 #: ../sales/customer_invoice.php:541
 #: ../sales/customer_invoice.php:544
 msgid "Units"
@@ -8897,44 +8821,45 @@ msgstr ""
 msgid "Assembly Account"
 msgstr ""
 
-#: ../inventory/manage/item_categories.php:180
+#: ../inventory/manage/item_categories.php:182
 msgid "Category Name:"
 msgstr ""
 
-#: ../inventory/manage/item_categories.php:182
+#: ../inventory/manage/item_categories.php:184
 msgid "Default values for new items"
 msgstr ""
 
-#: ../inventory/manage/item_categories.php:184
-#: ../inventory/manage/items.php:333
-#: ../inventory/manage/items.php.orig:326
+#: ../inventory/manage/item_categories.php:186
+#: ../inventory/manage/items.php.orig:336
 msgid "Item Tax Type:"
 msgstr ""
 
-#: ../inventory/manage/item_categories.php:186
-#: ../inventory/manage/items.php:335
-#: ../inventory/manage/items.php.orig:328
+#: ../inventory/manage/item_categories.php:188
+#: ../inventory/manage/items.php.orig:338
 msgid "Item Type:"
 msgstr ""
 
-#: ../inventory/manage/item_categories.php:188
-#: ../inventory/manage/items.php:337
-#: ../inventory/manage/items.php.orig:330
+#: ../inventory/manage/item_categories.php:190
+#: ../inventory/manage/items.php.orig:340
 msgid "Units of Measure:"
 msgstr ""
 
-#: ../inventory/manage/item_categories.php:190
-#: ../inventory/manage/items.php:341
-#: ../inventory/manage/items.php.orig:334
+#: ../inventory/manage/item_categories.php:192
+#: ../inventory/manage/items.php.orig:344
 msgid "Exclude from sales:"
 msgstr ""
 
+#: ../inventory/manage/item_categories.php:194
+#: ../inventory/manage/items.php.orig:346
+msgid "Exclude from purchases:"
+msgstr ""
+
 #: ../inventory/manage/item_codes.php:16
 msgid "Foreign Item Codes"
 msgstr ""
 
 #: ../inventory/manage/item_codes.php:23
-#: ../sales/sales_order_entry.php:690
+#: ../sales/sales_order_entry.php:698
 msgid "There are no inventory items defined in the system."
 msgstr ""
 
@@ -8948,8 +8873,7 @@ msgid "Item code description cannot be empty."
 msgstr ""
 
 #: ../inventory/manage/item_codes.php:55
-#: ../inventory/manage/items.php:163
-#: ../inventory/manage/items.php.orig:156
+#: ../inventory/manage/items.php.orig:164
 #: ../inventory/manage/sales_kits.php:88
 msgid "This item code is already assigned to stock item or sale kit."
 msgstr ""
@@ -8971,15 +8895,22 @@ msgid "EAN/UPC Code"
 msgstr ""
 
 #: ../inventory/manage/item_codes.php:125
-#: ../reporting/rep104.php:115
-#: ../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:112
-#: ../reporting/rep304.php:120
+#: ../reporting/rep104.php:117
+#: ../reporting/rep105.php:119
+#: ../reporting/rep301.php:105
+#: ../reporting/rep301.php:111
+#: ../reporting/rep302.php:124
+#: ../reporting/rep302.php:131
+#: ../reporting/rep303.php:133
+#: ../reporting/rep304.php:114
+#: ../reporting/rep304.php:122
+#: ../reporting/rep306.php:141
+#: ../reporting/rep306.php:149
+#: ../reporting/rep307.php:117
+#: ../reporting/rep307.php:123
+#: ../reporting/rep308.php:149
+#: ../reporting/rep308.php:156
+#: ../reporting/rep309.php:104
 msgid "Category"
 msgstr ""
 
@@ -8996,8 +8927,7 @@ msgid "Quantity:"
 msgstr ""
 
 #: ../inventory/manage/item_codes.php:180
-#: ../inventory/manage/items.php:308
-#: ../inventory/manage/items.php.orig:301
+#: ../inventory/manage/items.php.orig:310
 #: ../inventory/manage/movement_types.php:129
 #: ../inventory/manage/sales_kits.php:206
 #: ../inventory/manage/sales_kits.php:232
@@ -9005,187 +8935,155 @@ msgstr ""
 #: ../sales/manage/credit_status.php:145
 #: ../sales/manage/recurrent_invoices.php:165
 #: ../taxes/item_tax_types.php:173
+#: ../taxes/sav.tax_types.php:241
 #: ../taxes/tax_groups.php:162
-#: ../taxes/tax_groups.php.orig:164
-#: ../taxes/tax_groups.php.sav:164
 #: ../taxes/tax_types.php:158
 msgid "Description:"
 msgstr ""
 
 #: ../inventory/manage/item_codes.php:181
-#: ../inventory/manage/items.php:310
-#: ../inventory/manage/items.php.orig:303
+#: ../inventory/manage/items.php.orig:312
 #: ../inventory/manage/sales_kits.php:207
 #: ../inventory/manage/sales_kits.php:233
 msgid "Category:"
 msgstr ""
 
-#: ../inventory/manage/items.php:82
-#: ../inventory/manage/items.php.orig:80
+#: ../inventory/manage/items.php.orig:82
 msgid ""
 "Only graphics files are supported - a file extension of .jpg, .png or .gif "
 "is expected"
 msgstr ""
 
-#: ../inventory/manage/items.php:113
-#: ../inventory/manage/items.php.orig:106
+#: ../inventory/manage/items.php.orig:113
 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:115
-#: ../inventory/manage/items.php.orig:108
+#: ../inventory/manage/items.php.orig:115
 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:142
-#: ../inventory/manage/items.php.orig:135
+#: ../inventory/manage/items.php.orig:143
 msgid "The item name must be entered."
 msgstr ""
 
-#: ../inventory/manage/items.php:148
-#: ../inventory/manage/items.php.orig:141
+#: ../inventory/manage/items.php.orig:149
 msgid "The item code cannot be empty"
 msgstr ""
 
-#: ../inventory/manage/items.php:156
-#: ../inventory/manage/items.php.orig:149
+#: ../inventory/manage/items.php.orig:157
 msgid ""
 "The item code cannot contain any of the following characters -  & + OR a "
 "space OR quotes"
 msgstr ""
 
-#: ../inventory/manage/items.php:192
-#: ../inventory/manage/items.php.orig:185
+#: ../inventory/manage/items.php.orig:193
 msgid "Item has been updated."
 msgstr ""
 
-#: ../inventory/manage/items.php:205
-#: ../inventory/manage/items.php.orig:198
+#: ../inventory/manage/items.php.orig:206
 msgid "A new item has been added."
 msgstr ""
 
-#: ../inventory/manage/items.php:248
-#: ../inventory/manage/items.php.orig:241
+#: ../inventory/manage/items.php.orig:249
 msgid "Selected item has been deleted."
 msgstr ""
 
-#: ../inventory/manage/items.php:265
-#: ../inventory/manage/items.php.orig:258
+#: ../inventory/manage/items.php.orig:266
 #: ../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
 #: ../manufacturing/view/wo_production_view.php:45
-#: ../purchasing/includes/ui/invoice_ui.inc:492
-#: ../purchasing/includes/ui/invoice_ui.inc:504
-#: ../reporting/rep204.php:82
+#: ../purchasing/includes/ui/invoice_ui.inc.orig:492
+#: ../purchasing/includes/ui/invoice_ui.inc.orig:504
+#: ../reporting/rep204.php:84
+#: ../reporting/rep306.php:152
 msgid "Item"
 msgstr ""
 
-#: ../inventory/manage/items.php:270
-#: ../inventory/manage/items.php:301
-#: ../inventory/manage/items.php.orig:263
-#: ../inventory/manage/items.php.orig:294
+#: ../inventory/manage/items.php.orig:271
+#: ../inventory/manage/items.php.orig:303
 msgid "Item Code:"
 msgstr ""
 
-#: ../inventory/manage/items.php:339
-#: ../inventory/manage/items.php.orig:332
+#: ../inventory/manage/items.php.orig:342
 msgid "Editable description:"
 msgstr ""
 
-#: ../inventory/manage/items.php:359
-#: ../inventory/manage/items.php.orig:352
+#: ../inventory/manage/items.php.orig:364
 #: ../sales/manage/customer_branches.php:249
 msgid "GL Accounts"
 msgstr ""
 
-#: ../inventory/manage/items.php:382
-#: ../inventory/manage/items.php.orig:375
+#: ../inventory/manage/items.php.orig:387
 msgid "Other"
 msgstr ""
 
-#: ../inventory/manage/items.php:385
-#: ../inventory/manage/items.php.orig:378
+#: ../inventory/manage/items.php.orig:390
 msgid "Image File (.jpg)"
 msgstr ""
 
-#: ../inventory/manage/items.php:400
-#: ../inventory/manage/items.php.orig:393
+#: ../inventory/manage/items.php.orig:405
 msgid "No image"
 msgstr ""
 
-#: ../inventory/manage/items.php:405
-#: ../inventory/manage/items.php.orig:398
+#: ../inventory/manage/items.php.orig:410
 msgid "Delete Image:"
 msgstr ""
 
-#: ../inventory/manage/items.php:407
-#: ../inventory/manage/items.php.orig:400
+#: ../inventory/manage/items.php.orig:412
 msgid "Item status:"
 msgstr ""
 
-#: ../inventory/manage/items.php:413
-#: ../inventory/manage/items.php.orig:406
+#: ../inventory/manage/items.php.orig:418
 msgid "Insert New Item"
 msgstr ""
 
-#: ../inventory/manage/items.php:417
-#: ../inventory/manage/items.php.orig:410
+#: ../inventory/manage/items.php.orig:422
 msgid "Update Item"
 msgstr ""
 
-#: ../inventory/manage/items.php:420
-#: ../inventory/manage/items.php.orig:413
+#: ../inventory/manage/items.php.orig:425
 msgid "Select this items and return to document entry."
 msgstr ""
 
-#: ../inventory/manage/items.php:421
-#: ../inventory/manage/items.php.orig:414
+#: ../inventory/manage/items.php.orig:426
 msgid "Clone This Item"
 msgstr ""
 
-#: ../inventory/manage/items.php:422
-#: ../inventory/manage/items.php.orig:415
+#: ../inventory/manage/items.php.orig:427
 msgid "Delete This Item"
 msgstr ""
 
-#: ../inventory/manage/items.php:437
-#: ../inventory/manage/items.php.orig:430
+#: ../inventory/manage/items.php.orig:442
 msgid "Select an item:"
 msgstr ""
 
-#: ../inventory/manage/items.php:438
-#: ../inventory/manage/items.php.orig:431
+#: ../inventory/manage/items.php.orig:443
 msgid "New item"
 msgstr ""
 
-#: ../inventory/manage/items.php:461
-#: ../inventory/manage/items.php.orig:454
-#: ../purchasing/manage/suppliers.php:308
-#: ../purchasing/manage/suppliers.php.orig:311
+#: ../inventory/manage/items.php.orig:466
+#: ../purchasing/manage/suppliers.php.orig:308
 #: ../sales/manage/customer_branches.php:324
-#: ../sales/manage/customers.php:344
+#: ../sales/manage/customers.php:347
 #: ../sales/manage/sav.customers.php:342
 msgid "&General settings"
 msgstr ""
 
-#: ../inventory/manage/items.php:462
-#: ../inventory/manage/items.php.orig:455
-#: ../purchasing/manage/suppliers.php:310
-#: ../purchasing/manage/suppliers.php.orig:313
-#: ../sales/manage/customers.php:346
+#: ../inventory/manage/items.php.orig:467
+#: ../purchasing/manage/suppliers.php.orig:310
+#: ../sales/manage/customers.php:349
 #: ../sales/manage/sav.customers.php:344
 msgid "&Transactions"
 msgstr ""
 
-#: ../inventory/manage/items.php:463
-#: ../inventory/manage/items.php.orig:456
+#: ../inventory/manage/items.php.orig:468
 msgid "&Status"
 msgstr ""
 
@@ -9495,7 +9393,7 @@ msgstr ""
 #: ../purchasing/inquiry/po_search_completed.php.orig:75
 #: ../purchasing/inquiry/po_search.php:76
 #: ../sales/inquiry/sales_deliveries_view.php:116
-#: ../sales/inquiry/sales_orders_view.php:269
+#: ../sales/inquiry/sales_orders_view.php.orig:269
 msgid "Select documents"
 msgstr ""
 
@@ -9523,7 +9421,7 @@ msgstr ""
 #: ../manufacturing/includes/manufacturing_ui.inc:277
 #: ../manufacturing/includes/manufacturing_ui.inc:281
 #: ../reporting/includes/doctext.inc:227
-#: ../sales/inquiry/sales_orders_view.php:290
+#: ../sales/inquiry/sales_orders_view.php.orig:290
 msgid "Required By"
 msgstr ""
 
@@ -9543,12 +9441,12 @@ msgstr ""
 #: ../manufacturing/work_order_costs.php:45
 #: ../manufacturing/work_order_entry.php:56
 #: ../manufacturing/work_order_issue.php:40
-#: ../manufacturing/work_order_release.php:72
+#: ../manufacturing/work_order_release.php:75
 msgid "View this Work Order"
 msgstr ""
 
 #: ../manufacturing/work_order_add_finished.php:48
-#: ../manufacturing/work_order_entry.php:65
+#: ../manufacturing/work_order_entry.php:64
 #: ../manufacturing/work_order_issue.php:42
 msgid "View the GL Journal Entries for this Work Order"
 msgstr ""
@@ -9606,8 +9504,8 @@ msgid "Return Items to Work Order"
 msgstr ""
 
 #: ../manufacturing/work_order_add_finished.php:214
-#: ../purchasing/allocations/supplier_allocate.php:65
-#: ../sales/allocations/customer_allocate.php:64
+#: ../purchasing/allocations/supplier_allocate.php:74
+#: ../sales/allocations/customer_allocate.php:72
 msgid "Process"
 msgstr ""
 
@@ -9661,11 +9559,11 @@ msgid "The work order been added."
 msgstr ""
 
 #: ../manufacturing/work_order_entry.php:62
-msgid "Print this Work Order"
+msgid "&Print This Work Order"
 msgstr ""
 
-#: ../manufacturing/work_order_entry.php:64
-msgid "Email this Work Order"
+#: ../manufacturing/work_order_entry.php:63
+msgid "&Email This Work Order"
 msgstr ""
 
 #: ../manufacturing/work_order_entry.php:80
@@ -9820,34 +9718,34 @@ msgstr ""
 msgid "This work order has already been released."
 msgstr ""
 
-#: ../manufacturing/work_order_release.php:57
+#: ../manufacturing/work_order_release.php:60
 msgid ""
 "This Work Order cannot be released. The selected item to manufacture does "
 "not have a bom."
 msgstr ""
 
-#: ../manufacturing/work_order_release.php:70
+#: ../manufacturing/work_order_release.php:73
 msgid "The work order has been released to manufacturing."
 msgstr ""
 
-#: ../manufacturing/work_order_release.php:74
+#: ../manufacturing/work_order_release.php:77
 msgid "Select another &work order"
 msgstr ""
 
-#: ../manufacturing/work_order_release.php:95
+#: ../manufacturing/work_order_release.php:98
 msgid "Work Order #:"
 msgstr ""
 
-#: ../manufacturing/work_order_release.php:96
+#: ../manufacturing/work_order_release.php:99
 msgid "Work Order Reference:"
 msgstr ""
 
-#: ../manufacturing/work_order_release.php:98
+#: ../manufacturing/work_order_release.php:101
 #: ../manufacturing/includes/manufacturing_ui.inc:278
 msgid "Released Date"
 msgstr ""
 
-#: ../manufacturing/work_order_release.php:104
+#: ../manufacturing/work_order_release.php:107
 msgid "Release Work Order"
 msgstr ""
 
@@ -9892,8 +9790,8 @@ msgstr ""
 #: ../manufacturing/view/wo_issue_view.php:77
 #: ../manufacturing/includes/manufacturing_ui.inc:28
 #: ../manufacturing/includes/manufacturing_ui.inc:83
-#: ../reporting/rep401.php:69
-#: ../reporting/rep401.php:74
+#: ../reporting/rep401.php:71
+#: ../reporting/rep401.php:76
 msgid "Component"
 msgstr ""
 
@@ -9926,7 +9824,7 @@ msgid "BOM for item:"
 msgstr ""
 
 #: ../manufacturing/view/work_order_view.php:56
-#: ../reporting/rep409.php:91
+#: ../reporting/rep409.php:88
 msgid "Work Order Requirements"
 msgstr ""
 
@@ -9998,7 +9896,7 @@ msgid ""
 msgstr ""
 
 #: ../manufacturing/manage/bom_edit.php:70
-#: ../reporting/rep105.php:112
+#: ../reporting/rep105.php:114
 msgid "Code"
 msgstr ""
 
@@ -10179,81 +10077,74 @@ msgstr ""
 msgid "Reversed the production "
 msgstr ""
 
-#: ../manufacturing/includes/db/work_orders_db.inc:79
+#: ../manufacturing/includes/db/work_orders_db.inc.orig:79
 #: ../purchasing/includes/db/po_db.inc:123
-#: ../sales/includes/db/cust_trans_db.inc:114
+#: ../sales/includes/db/cust_trans_db.inc:118
+#: ../sales/includes/db/cust_trans_db.inc.orig:114
 #: ../sales/includes/db/old.sales_order_db.inc:249
-#: ../sales/includes/db/sales_order_db.inc:261
 #: ../sales/includes/db/sales_order_db.inc.orig:261
 msgid "Updated."
 msgstr ""
 
-#: ../manufacturing/includes/db/work_orders_db.inc:100
+#: ../manufacturing/includes/db/work_orders_db.inc.orig:100
 msgid "Canceled."
 msgstr ""
 
-#: ../manufacturing/includes/db/work_orders_db.inc:176
+#: ../manufacturing/includes/db/work_orders_db.inc.orig:176
 msgid "Released."
 msgstr ""
 
-#: ../manufacturing/includes/db/work_orders_quick_db.inc:89
+#: ../manufacturing/includes/db/work_orders_quick_db.inc.orig:89
 msgid "Quick production."
 msgstr ""
 
-#: ../manufacturing/includes/db/work_orders_quick_db.inc:169
+#: ../manufacturing/includes/db/work_orders_quick_db.inc.orig:169
 msgid "Produced"
 msgstr ""
 
-#: ../purchasing/includes/db/invoice_db.inc:298
+#: ../purchasing/includes/db/invoice_db.inc.orig:298
 msgid "Supplier invoice adjustment for zero inventory of "
 msgstr ""
 
-#: ../purchasing/includes/db/invoice_db.inc:298
-#: ../reporting/rep106.php:81
+#: ../purchasing/includes/db/invoice_db.inc.orig:298
+#: ../reporting/rep106.php:83
 #: ../sales/inquiry/sales_deliveries_view.php:166
-#: ../sales/inquiry/sales_orders_view.php:159
+#: ../sales/inquiry/sales_orders_view.php.orig:159
 msgid "Invoice"
 msgstr ""
 
-#: ../purchasing/includes/db/invoice_db.inc:716
-#: ../purchasing/includes/db/invoice_db.inc:718
+#: ../purchasing/includes/db/invoice_db.inc.orig:716
+#: ../purchasing/includes/db/invoice_db.inc.orig:718
 msgid "GRN Removal"
 msgstr ""
 
 #: ../purchasing/includes/ui/grn_ui.inc:23
-#: ../purchasing/includes/ui/po_ui.inc:326
+#: ../purchasing/includes/ui/grn_ui.inc:55
 #: ../purchasing/includes/ui/po_ui.inc.orig:326
 #: ../sales/view/view_sales_order.php:74
-#: ../sales/view/view_sales_order.php.orig:74
 msgid "Order Currency"
 msgstr ""
 
 #: ../purchasing/includes/ui/grn_ui.inc:25
+#: ../purchasing/includes/ui/grn_ui.inc:57
 msgid "For Purchase Order"
 msgstr ""
 
 #: ../purchasing/includes/ui/grn_ui.inc:28
+#: ../purchasing/includes/ui/grn_ui.inc:59
 #: ../sales/view/view_sales_order.php:67
-#: ../sales/view/view_sales_order.php.orig:67
 msgid "Ordered On"
 msgstr ""
 
-#: ../purchasing/includes/ui/grn_ui.inc:40
-#: ../purchasing/includes/ui/grn_ui.inc:54
-#: ../purchasing/includes/ui/po_ui.inc:341
-#: ../purchasing/includes/ui/po_ui.inc:346
+#: ../purchasing/includes/ui/grn_ui.inc:33
+#: ../purchasing/includes/ui/grn_ui.inc:69
 #: ../purchasing/includes/ui/po_ui.inc.orig:341
 #: ../purchasing/includes/ui/po_ui.inc.orig:346
 msgid "Deliver Into Location"
 msgstr ""
 
-#: ../purchasing/includes/ui/grn_ui.inc:46
-msgid "Date Items Received"
-msgstr ""
-
-#: ../purchasing/includes/ui/grn_ui.inc:49
-#: ../purchasing/includes/ui/grn_ui.inc:55
-#: ../purchasing/includes/ui/po_ui.inc:351
+#: ../purchasing/includes/ui/grn_ui.inc:34
+#: ../purchasing/includes/ui/grn_ui.inc:79
 #: ../purchasing/includes/ui/po_ui.inc.orig:351
 #: ../purchasing/view/view_supp_credit.php:44
 #: ../purchasing/view/view_supp_invoice.php:48
@@ -10261,119 +10152,123 @@ msgstr ""
 #: ../purchasing/inquiry/po_search_completed.php.orig:123
 #: ../purchasing/inquiry/po_search.php:134
 #: ../purchasing/inquiry/supplier_inquiry.php:177
-#: ../purchasing/inquiry/supplier_inquiry.php.orig:174
+#: ../reporting/includes/doctext.inc:164
+#: ../reporting/includes/doctext.inc:187
 msgid "Supplier's Reference"
 msgstr ""
 
-#: ../purchasing/includes/ui/grn_ui.inc:62
-#: ../purchasing/includes/ui/po_ui.inc:355
+#: ../purchasing/includes/ui/grn_ui.inc:38
+#: ../purchasing/includes/ui/grn_ui.inc:81
 #: ../purchasing/includes/ui/po_ui.inc.orig:355
 #: ../sales/view/view_sales_order.php:92
-#: ../sales/view/view_sales_order.php.orig:79
 msgid "Delivery Address"
 msgstr ""
 
-#: ../purchasing/includes/ui/grn_ui.inc:65
-#: ../purchasing/includes/ui/po_ui.inc:367
+#: ../purchasing/includes/ui/grn_ui.inc:41
+#: ../purchasing/includes/ui/grn_ui.inc:84
 #: ../purchasing/includes/ui/po_ui.inc.orig:367
 msgid "Order Comments"
 msgstr ""
 
-#: ../purchasing/includes/ui/invoice_ui.inc:108
+#: ../purchasing/includes/ui/grn_ui.inc:74
+msgid "Date Items Received"
+msgstr ""
+
+#: ../purchasing/includes/ui/invoice_ui.inc.orig:108
 msgid "Source Invoices:"
 msgstr ""
 
-#: ../purchasing/includes/ui/invoice_ui.inc:110
+#: ../purchasing/includes/ui/invoice_ui.inc.orig:110
 msgid "Supplier's Ref.:"
 msgstr ""
 
-#: ../purchasing/includes/ui/invoice_ui.inc:125
+#: ../purchasing/includes/ui/invoice_ui.inc.orig:125
 msgid "Terms:"
 msgstr ""
 
-#: ../purchasing/includes/ui/invoice_ui.inc:137
+#: ../purchasing/includes/ui/invoice_ui.inc.orig:137
 #: ../purchasing/manage/suppliers.php:100
 #: ../purchasing/manage/suppliers.php:105
-#: ../purchasing/manage/suppliers.php.orig:101
-#: ../purchasing/manage/suppliers.php.orig:106
+#: ../purchasing/manage/suppliers.php.orig:100
+#: ../purchasing/manage/suppliers.php.orig:105
 msgid "Supplier's Currency:"
 msgstr ""
 
-#: ../purchasing/includes/ui/invoice_ui.inc:141
+#: ../purchasing/includes/ui/invoice_ui.inc.orig:141
 #: ../purchasing/manage/suppliers.php:107
-#: ../purchasing/manage/suppliers.php.orig:108
+#: ../purchasing/manage/suppliers.php.orig:107
 #: ../sales/manage/customer_branches.php:247
-#: ../sales/manage/customers.php:294
+#: ../sales/manage/customers.php:297
 #: ../sales/manage/sav.customers.php:292
 msgid "Tax Group:"
 msgstr ""
 
-#: ../purchasing/includes/ui/invoice_ui.inc:159
+#: ../purchasing/includes/ui/invoice_ui.inc.orig:159
 msgid "Sub-total:"
 msgstr ""
 
-#: ../purchasing/includes/ui/invoice_ui.inc:167
+#: ../purchasing/includes/ui/invoice_ui.inc.orig:167
 msgid "Invoice Total:"
 msgstr ""
 
-#: ../purchasing/includes/ui/invoice_ui.inc:170
+#: ../purchasing/includes/ui/invoice_ui.inc.orig:170
 #: ../sales/customer_credit_invoice.php:330
 #: ../sales/includes/ui/sales_credit_ui.inc:233
 msgid "Credit Note Total"
 msgstr ""
 
-#: ../purchasing/includes/ui/invoice_ui.inc:175
-#: ../purchasing/includes/ui/po_ui.inc.orig:487
-#: ../purchasing/po_entry_items.php.orig:554
+#: ../purchasing/includes/ui/invoice_ui.inc.orig:175
+#: ../purchasing/includes/ui/po_ui.inc.orig:485
+#: ../purchasing/po_entry_items.php.orig:558
 msgid "Tax algorithm:"
 msgstr ""
 
-#: ../purchasing/includes/ui/invoice_ui.inc:207
+#: ../purchasing/includes/ui/invoice_ui.inc.orig:207
 msgid "Add GL Line"
 msgstr ""
 
-#: ../purchasing/includes/ui/invoice_ui.inc:208
+#: ../purchasing/includes/ui/invoice_ui.inc.orig:208
 msgid "Reset"
 msgstr ""
 
-#: ../purchasing/includes/ui/invoice_ui.inc:209
-#: ../purchasing/po_receive_items.php:332
+#: ../purchasing/includes/ui/invoice_ui.inc.orig:209
+#: ../purchasing/po_receive_items.php:333
 msgid "Clear all GL entry fields"
 msgstr ""
 
-#: ../purchasing/includes/ui/invoice_ui.inc:227
+#: ../purchasing/includes/ui/invoice_ui.inc.orig:227
 msgid "GL Items for this Invoice"
 msgstr ""
 
-#: ../purchasing/includes/ui/invoice_ui.inc:229
+#: ../purchasing/includes/ui/invoice_ui.inc.orig:229
 msgid "GL Items for this Credit Note"
 msgstr ""
 
-#: ../purchasing/includes/ui/invoice_ui.inc:239
+#: ../purchasing/includes/ui/invoice_ui.inc.orig:239
 msgid "Quick Entry:"
 msgstr ""
 
-#: ../purchasing/includes/ui/invoice_ui.inc:412
+#: ../purchasing/includes/ui/invoice_ui.inc.orig:412
 msgid "Add to Invoice"
 msgstr ""
 
-#: ../purchasing/includes/ui/invoice_ui.inc:414
+#: ../purchasing/includes/ui/invoice_ui.inc.orig:414
 msgid "Add to Credit Note"
 msgstr ""
 
-#: ../purchasing/includes/ui/invoice_ui.inc:416
+#: ../purchasing/includes/ui/invoice_ui.inc.orig:416
 #: ../sales/customer_invoice.php:603
 msgid "Remove"
 msgstr ""
 
-#: ../purchasing/includes/ui/invoice_ui.inc:416
-#: ../purchasing/includes/ui/invoice_ui.inc:451
+#: ../purchasing/includes/ui/invoice_ui.inc.orig:416
+#: ../purchasing/includes/ui/invoice_ui.inc.orig:451
 msgid ""
 "WARNING! Be careful with removal. The operation is executed immediately and "
 "cannot be undone !!!"
 msgstr ""
 
-#: ../purchasing/includes/ui/invoice_ui.inc:418
+#: ../purchasing/includes/ui/invoice_ui.inc.orig:418
 #, php-format
 msgid ""
 "You are about to remove all yet non-invoiced items from delivery line #%d. "
@@ -10381,376 +10276,355 @@ msgid ""
 "continue ?"
 msgstr ""
 
-#: ../purchasing/includes/ui/invoice_ui.inc:449
+#: ../purchasing/includes/ui/invoice_ui.inc.orig:449
 msgid "Items Received Yet to be Invoiced"
 msgstr ""
 
-#: ../purchasing/includes/ui/invoice_ui.inc:454
+#: ../purchasing/includes/ui/invoice_ui.inc.orig:454
 msgid "Delivery Item Selected For Adding To A Supplier Credit Note"
 msgstr ""
 
-#: ../purchasing/includes/ui/invoice_ui.inc:459
+#: ../purchasing/includes/ui/invoice_ui.inc.orig:459
 msgid "Received Items Charged on this Invoice"
 msgstr ""
 
-#: ../purchasing/includes/ui/invoice_ui.inc:461
+#: ../purchasing/includes/ui/invoice_ui.inc.orig:461
 msgid "Received Items Credited on this Note"
 msgstr ""
 
-#: ../purchasing/includes/ui/invoice_ui.inc:471
+#: ../purchasing/includes/ui/invoice_ui.inc.orig:471
 msgid "Received between"
 msgstr ""
 
-#: ../purchasing/includes/ui/invoice_ui.inc:483
+#: ../purchasing/includes/ui/invoice_ui.inc.orig:483
 msgid "Add All Items"
 msgstr ""
 
-#: ../purchasing/includes/ui/invoice_ui.inc:492
-#: ../purchasing/includes/ui/invoice_ui.inc:504
-#: ../sales/inquiry/sales_orders_view.php:167
+#: ../purchasing/includes/ui/invoice_ui.inc.orig:492
+#: ../purchasing/includes/ui/invoice_ui.inc.orig:504
+#: ../reporting/rep308.php:149
+#: ../sales/inquiry/sales_orders_view.php.orig:167
 msgid "Delivery"
 msgstr ""
 
-#: ../purchasing/includes/ui/invoice_ui.inc:492
+#: ../purchasing/includes/ui/invoice_ui.inc.orig:492
 msgid "Sequence #"
 msgstr ""
 
-#: ../purchasing/includes/ui/invoice_ui.inc:492
+#: ../purchasing/includes/ui/invoice_ui.inc.orig:492
 msgid "P.O."
 msgstr ""
 
-#: ../purchasing/includes/ui/invoice_ui.inc:493
+#: ../purchasing/includes/ui/invoice_ui.inc.orig:493
 msgid "Received On"
 msgstr ""
 
-#: ../purchasing/includes/ui/invoice_ui.inc:493
+#: ../purchasing/includes/ui/invoice_ui.inc.orig:493
 #: ../purchasing/view/view_po.php:46
 msgid "Quantity Received"
 msgstr ""
 
-#: ../purchasing/includes/ui/invoice_ui.inc:493
+#: ../purchasing/includes/ui/invoice_ui.inc.orig:493
 #: ../purchasing/view/view_grn.php:41
 #: ../purchasing/view/view_po.php:46
 msgid "Quantity Invoiced"
 msgstr ""
 
-#: ../purchasing/includes/ui/invoice_ui.inc:494
+#: ../purchasing/includes/ui/invoice_ui.inc.orig:494
 msgid "Qty Yet To Invoice"
 msgstr ""
 
-#: ../purchasing/includes/ui/invoice_ui.inc:494
-#: ../purchasing/includes/ui/po_ui.inc:245
+#: ../purchasing/includes/ui/invoice_ui.inc.orig:494
 #: ../purchasing/includes/ui/po_ui.inc.orig:245
-#: ../sales/includes/ui/sales_order_ui.inc.orig:142
+#: ../sales/includes/ui/sales_order_ui.inc:147
 msgid "Price after Tax"
 msgstr ""
 
-#: ../purchasing/includes/ui/invoice_ui.inc:494
-#: ../purchasing/includes/ui/po_ui.inc:245
+#: ../purchasing/includes/ui/invoice_ui.inc.orig:494
 #: ../purchasing/includes/ui/po_ui.inc.orig:245
-#: ../sales/includes/ui/sales_order_ui.inc.orig:142
+#: ../sales/includes/ui/sales_order_ui.inc:147
 msgid "Price before Tax"
 msgstr ""
 
-#: ../purchasing/includes/ui/invoice_ui.inc:500
+#: ../purchasing/includes/ui/invoice_ui.inc.orig:500
 msgid "Qty Yet To Credit"
 msgstr ""
 
-#: ../purchasing/includes/ui/invoice_ui.inc:505
+#: ../purchasing/includes/ui/invoice_ui.inc.orig:505
 msgid "Line Value"
 msgstr ""
 
-#: ../purchasing/includes/ui/invoice_ui.inc:573
+#: ../purchasing/includes/ui/invoice_ui.inc.orig:573
 msgid ""
 "There are no outstanding items received from this supplier that have not "
 "been invoiced by them."
 msgstr ""
 
-#: ../purchasing/includes/ui/invoice_ui.inc:576
+#: ../purchasing/includes/ui/invoice_ui.inc.orig:576
 msgid ""
 "There are no received items for the selected supplier that have been "
 "invoiced."
 msgstr ""
 
-#: ../purchasing/includes/ui/invoice_ui.inc:577
+#: ../purchasing/includes/ui/invoice_ui.inc.orig:577
 msgid "Credits can only be applied to invoiced items."
 msgstr ""
 
-#: ../purchasing/includes/ui/po_ui.inc:156
 #: ../purchasing/includes/ui/po_ui.inc.orig:156
 msgid "Supplier Currency:"
 msgstr ""
 
-#: ../purchasing/includes/ui/po_ui.inc:185
 #: ../purchasing/includes/ui/po_ui.inc.orig:185
-#: ../sales/sales_order_entry.php:714
+#: ../sales/sales_order_entry.php:722
 msgid "Order Date:"
 msgstr ""
 
-#: ../purchasing/includes/ui/po_ui.inc:186
 #: ../purchasing/includes/ui/po_ui.inc.orig:186
-#: ../sales/sales_order_entry.php:701
+#: ../sales/sales_order_entry.php:709
 msgid "Delivery Date:"
 msgstr ""
 
-#: ../purchasing/includes/ui/po_ui.inc:186
 #: ../purchasing/includes/ui/po_ui.inc.orig:186
-#: ../sales/sales_order_entry.php:695
+#: ../sales/sales_order_entry.php:703
 msgid "Invoice Date:"
 msgstr ""
 
-#: ../purchasing/includes/ui/po_ui.inc:197
 #: ../purchasing/includes/ui/po_ui.inc.orig:197
 msgid "Due Date:"
 msgstr ""
 
-#: ../purchasing/includes/ui/po_ui.inc:199
 #: ../purchasing/includes/ui/po_ui.inc.orig:199
 msgid "Supplier's Reference:"
 msgstr ""
 
-#: ../purchasing/includes/ui/po_ui.inc:200
 #: ../purchasing/includes/ui/po_ui.inc.orig:200
 msgid "Receive Into:"
 msgstr ""
 
-#: ../purchasing/includes/ui/po_ui.inc:225
 #: ../purchasing/includes/ui/po_ui.inc.orig:225
 msgid ""
 "The default stock location set up for this user is not a currently defined "
 "stock location. Your system administrator needs to amend your user record."
 msgstr ""
 
-#: ../purchasing/includes/ui/po_ui.inc:229
 #: ../purchasing/includes/ui/po_ui.inc.orig:229
 msgid "Deliver to:"
 msgstr ""
 
-#: ../purchasing/includes/ui/po_ui.inc:238
 #: ../purchasing/includes/ui/po_ui.inc.orig:238
 msgid "Order Items"
 msgstr ""
 
-#: ../purchasing/includes/ui/po_ui.inc:244
 #: ../purchasing/includes/ui/po_ui.inc.orig:244
 #: ../purchasing/po_receive_items.php:62
 msgid "Received"
 msgstr ""
 
-#: ../purchasing/includes/ui/po_ui.inc:245
 #: ../purchasing/includes/ui/po_ui.inc.orig:245
-#: ../sales/includes/ui/sales_order_ui.inc.orig:611
+#: ../sales/includes/ui/sales_order_ui.inc:617
 msgid "Required Delivery Date"
 msgstr ""
 
-#: ../purchasing/includes/ui/po_ui.inc:245
 #: ../purchasing/includes/ui/po_ui.inc.orig:245
 #: ../purchasing/view/view_grn.php:41
 #: ../purchasing/view/view_po.php:46
 msgid "Line Total"
 msgstr ""
 
-#: ../purchasing/includes/ui/po_ui.inc:296
 #: ../purchasing/includes/ui/po_ui.inc.orig:296
 #: ../purchasing/po_receive_items.php:114
-#: ../reporting/rep107.php:217
-#: ../reporting/rep109.php:152
-#: ../reporting/rep110.php:161
-#: ../reporting/rep111.php:137
-#: ../reporting/rep113.php:147
-#: ../reporting/rep209.php:167
+#: ../reporting/rep109.php:150
+#: ../reporting/rep110.php:159
+#: ../reporting/rep111.php:133
+#: ../reporting/rep113.php:144
+#: ../reporting/rep209.php:162
 #: ../sales/customer_credit_invoice.php:322
-#: ../sales/customer_delivery.php.orig:514
+#: ../sales/customer_delivery.php:525
 #: ../sales/customer_invoice.php:647
 #: ../sales/view/view_dispatch.php:146
 #: ../sales/view/view_invoice.php:150
 #: ../sales/includes/ui/sales_credit_ui.inc:217
-#: ../sales/includes/ui/sales_order_ui.inc.orig:229
+#: ../sales/includes/ui/sales_order_ui.inc:236
 msgid "Sub-total"
 msgstr ""
 
-#: ../purchasing/includes/ui/po_ui.inc:305
 #: ../purchasing/includes/ui/po_ui.inc.orig:305
 #: ../purchasing/po_receive_items.php:122
 #: ../purchasing/view/view_grn.php:79
 #: ../purchasing/view/view_po.php:93
-#: ../sales/customer_delivery.php.orig:521
+#: ../sales/customer_delivery.php:532
 #: ../sales/view/view_sales_order.php:262
-#: ../sales/view/view_sales_order.php.orig:244
-#: ../sales/includes/ui/sales_order_ui.inc.orig:236
+#: ../sales/includes/ui/sales_order_ui.inc:243
 msgid "Amount Total"
 msgstr ""
 
-#: ../purchasing/includes/ui/po_ui.inc:306
 #: ../purchasing/includes/ui/po_ui.inc.orig:306
-#: ../purchasing/allocations/supplier_allocate.php:64
-#: ../sales/allocations/customer_allocate.php:63
-#: ../sales/includes/ui/sales_order_ui.inc.orig:237
+#: ../purchasing/allocations/supplier_allocate.php:73
+#: ../sales/allocations/customer_allocate.php:71
+#: ../sales/includes/ui/sales_order_ui.inc:244
 msgid "Refresh"
 msgstr ""
 
-#: ../purchasing/includes/ui/po_ui.inc:361
 #: ../purchasing/includes/ui/po_ui.inc.orig:361
 #: ../sales/view/view_sales_order.php:83
 msgid "Required Pre-Payment"
 msgstr ""
 
-#: ../purchasing/includes/ui/po_ui.inc:362
 #: ../purchasing/includes/ui/po_ui.inc.orig:362
 msgid "Pre-Payments Allocated"
 msgstr ""
 
-#: ../purchasing/includes/ui/po_ui.inc.orig:488
-#: ../purchasing/po_entry_items.php.orig:555
+#: ../purchasing/includes/ui/po_ui.inc.orig:486
+#: ../purchasing/po_entry_items.php.orig:559
 #: ../sales/customer_invoice.php:454
-#: ../sales/includes/ui/sales_order_ui.inc.orig:407
-#: ../sales/includes/ui/sales_order_ui.inc.orig:409
+#: ../sales/includes/ui/sales_order_ui.inc:413
+#: ../sales/includes/ui/sales_order_ui.inc:415
 msgid "Payment:"
 msgstr ""
 
-#: ../purchasing/includes/ui/po_ui.inc.orig:488
-#: ../purchasing/po_entry_items.php.orig:555
+#: ../purchasing/includes/ui/po_ui.inc.orig:486
+#: ../purchasing/po_entry_items.php.orig:559
 msgid "Delayed"
 msgstr ""
 
-#: ../purchasing/includes/ui/po_ui.inc.orig:490
-#: ../sales/includes/ui/sales_order_ui.inc.orig:622
-#: ../sales/includes/ui/sales_order_ui.inc.orig:624
+#: ../purchasing/includes/ui/po_ui.inc.orig:488
+#: ../sales/includes/ui/sales_order_ui.inc:628
+#: ../sales/includes/ui/sales_order_ui.inc:630
 msgid "Pre-Payment Required:"
 msgstr ""
 
 #: ../purchasing/po_entry_items.php:41
-#: ../purchasing/po_entry_items.php.orig:38
+#: ../purchasing/po_entry_items.php.orig:41
 msgid "Modify Purchase Order #"
 msgstr ""
 
 #: ../purchasing/po_entry_items.php:46
-#: ../purchasing/po_entry_items.php.orig:43
+#: ../purchasing/po_entry_items.php.orig:46
 msgid "Purchase Order Entry"
 msgstr ""
 
 #: ../purchasing/po_entry_items.php:51
-#: ../purchasing/po_entry_items.php.orig:48
+#: ../purchasing/po_entry_items.php.orig:51
 msgid "Direct GRN Entry"
 msgstr ""
 
 #: ../purchasing/po_entry_items.php:56
-#: ../purchasing/po_entry_items.php.orig:53
+#: ../purchasing/po_entry_items.php.orig:56
 msgid "Direct Purchase Invoice Entry"
 msgstr ""
 
 #: ../purchasing/po_entry_items.php:80
-#: ../purchasing/po_entry_items.php.orig:77
+#: ../purchasing/po_entry_items.php.orig:80
 msgid "Purchase Order has been entered"
 msgstr ""
 
 #: ../purchasing/po_entry_items.php:82
-#: ../purchasing/po_entry_items.php.orig:79
+#: ../purchasing/po_entry_items.php.orig:82
 msgid "Purchase Order has been updated"
 msgstr ""
 
 #: ../purchasing/po_entry_items.php:83
-#: ../purchasing/po_entry_items.php.orig:80
+#: ../purchasing/po_entry_items.php.orig:83
 msgid "&View this order"
 msgstr ""
 
 #: ../purchasing/po_entry_items.php:85
-#: ../purchasing/po_entry_items.php.orig:82
+#: ../purchasing/po_entry_items.php.orig:85
 #: ../sales/sales_order_entry.php:119
 #: ../sales/sales_order_entry.php:139
 msgid "&Print This Order"
 msgstr ""
 
 #: ../purchasing/po_entry_items.php:87
-#: ../purchasing/po_entry_items.php.orig:84
+#: ../purchasing/po_entry_items.php.orig:87
 #: ../sales/sales_order_entry.php:120
 #: ../sales/sales_order_entry.php:140
 msgid "&Email This Order"
 msgstr ""
 
 #: ../purchasing/po_entry_items.php:89
-#: ../purchasing/po_entry_items.php.orig:86
+#: ../purchasing/po_entry_items.php.orig:89
 msgid "&Receive Items on this Purchase Order"
 msgstr ""
 
 #: ../purchasing/po_entry_items.php:91
-#: ../purchasing/po_entry_items.php.orig:88
+#: ../purchasing/po_entry_items.php.orig:91
 msgid "Enter &Another Purchase Order"
 msgstr ""
 
 #: ../purchasing/po_entry_items.php:93
-#: ../purchasing/po_entry_items.php.orig:90
+#: ../purchasing/po_entry_items.php.orig:93
 msgid "Select An &Outstanding Purchase Order"
 msgstr ""
 
 #: ../purchasing/po_entry_items.php:102
-#: ../purchasing/po_entry_items.php.orig:99
+#: ../purchasing/po_entry_items.php.orig:102
 msgid "Direct GRN has been entered"
 msgstr ""
 
 #: ../purchasing/po_entry_items.php:104
-#: ../purchasing/po_entry_items.php.orig:101
+#: ../purchasing/po_entry_items.php.orig:104
 msgid "&View this GRN"
 msgstr ""
 
 #: ../purchasing/po_entry_items.php:108
-#: ../purchasing/po_entry_items.php.orig:105
+#: ../purchasing/po_entry_items.php.orig:108
 #: ../purchasing/po_receive_items.php:40
 msgid "View the GL Journal Entries for this Delivery"
 msgstr ""
 
 #: ../purchasing/po_entry_items.php:113
-#: ../purchasing/po_entry_items.php.orig:110
+#: ../purchasing/po_entry_items.php.orig:113
 #: ../purchasing/po_receive_items.php:42
 msgid "Entry purchase &invoice for this receival"
 msgstr ""
 
 #: ../purchasing/po_entry_items.php:118
-#: ../purchasing/po_entry_items.php.orig:115
+#: ../purchasing/po_entry_items.php.orig:118
 msgid "Enter &Another GRN"
 msgstr ""
 
 #: ../purchasing/po_entry_items.php:127
-#: ../purchasing/po_entry_items.php.orig:124
+#: ../purchasing/po_entry_items.php.orig:127
 msgid "Direct Purchase Invoice has been entered"
 msgstr ""
 
 #: ../purchasing/po_entry_items.php:129
-#: ../purchasing/po_entry_items.php.orig:126
+#: ../purchasing/po_entry_items.php.orig:129
 msgid "&View this Invoice"
 msgstr ""
 
 #: ../purchasing/po_entry_items.php:134
-#: ../purchasing/po_entry_items.php.orig:131
+#: ../purchasing/po_entry_items.php.orig:134
 #: ../purchasing/supplier_invoice.php:69
 msgid "View the GL Journal Entries for this Invoice"
 msgstr ""
 
 #: ../purchasing/po_entry_items.php:136
-#: ../purchasing/po_entry_items.php.orig:133
+#: ../purchasing/po_entry_items.php.orig:136
 #: ../purchasing/supplier_invoice.php:71
 msgid "Entry supplier &payment for this invoice"
 msgstr ""
 
 #: ../purchasing/po_entry_items.php:142
-#: ../purchasing/po_entry_items.php.orig:139
+#: ../purchasing/po_entry_items.php.orig:142
 msgid "Enter &Another Direct Invoice"
 msgstr ""
 
 #: ../purchasing/po_entry_items.php:174
-#: ../purchasing/po_entry_items.php.orig:171
+#: ../purchasing/po_entry_items.php.orig:174
 msgid ""
 "This item cannot be deleted because some of it has already been received."
 msgstr ""
 
 #: ../purchasing/po_entry_items.php:189
-#: ../purchasing/po_entry_items.php.orig:186
+#: ../purchasing/po_entry_items.php.orig:189
 msgid ""
 "This order cannot be cancelled because some of it has already been received."
 msgstr ""
 
 #: ../purchasing/po_entry_items.php:190
-#: ../purchasing/po_entry_items.php.orig:187
+#: ../purchasing/po_entry_items.php.orig:190
 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 "
@@ -10758,40 +10632,40 @@ msgid ""
 msgstr ""
 
 #: ../purchasing/po_entry_items.php:205
-#: ../purchasing/po_entry_items.php.orig:202
+#: ../purchasing/po_entry_items.php.orig:205
 msgid "This purchase order has been cancelled."
 msgstr ""
 
 #: ../purchasing/po_entry_items.php:207
-#: ../purchasing/po_entry_items.php.orig:204
+#: ../purchasing/po_entry_items.php.orig:207
 msgid "Enter a new purchase order"
 msgstr ""
 
 #: ../purchasing/po_entry_items.php:219
-#: ../purchasing/po_entry_items.php.orig:216
-#: ../sales/sales_order_entry.php:495
+#: ../purchasing/po_entry_items.php.orig:219
+#: ../sales/sales_order_entry.php:503
 msgid "Item description cannot be empty."
 msgstr ""
 
 #: ../purchasing/po_entry_items.php:229
-#: ../purchasing/po_entry_items.php.orig:226
+#: ../purchasing/po_entry_items.php.orig:229
 msgid "The quantity of the order item must be numeric and not less than "
 msgstr ""
 
 #: ../purchasing/po_entry_items.php:236
-#: ../purchasing/po_entry_items.php.orig:233
+#: ../purchasing/po_entry_items.php.orig:236
 msgid "The price entered must be numeric and not less than zero."
 msgstr ""
 
 #: ../purchasing/po_entry_items.php:260
-#: ../purchasing/po_entry_items.php.orig:257
+#: ../purchasing/po_entry_items.php.orig:260
 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:261
-#: ../purchasing/po_entry_items.php.orig:258
+#: ../purchasing/po_entry_items.php.orig:261
 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 "
@@ -10799,114 +10673,115 @@ msgid ""
 msgstr ""
 
 #: ../purchasing/po_entry_items.php:289
-#: ../purchasing/po_entry_items.php.orig:286
+#: ../purchasing/po_entry_items.php.orig:289
 msgid "The selected item is already on this order."
 msgstr ""
 
 #: ../purchasing/po_entry_items.php:316
-#: ../purchasing/po_entry_items.php.orig:313
+#: ../purchasing/po_entry_items.php.orig:316
 msgid ""
 "The selected item does not exist or it is a kit part and therefore cannot be "
 "purchased."
 msgstr ""
 
 #: ../purchasing/po_entry_items.php:332
-#: ../purchasing/po_entry_items.php.orig:329
-#: ../purchasing/supplier_invoice.php:382
-#: ../purchasing/supplier_payment.php:113
+#: ../purchasing/po_entry_items.php.orig:332
+#: ../purchasing/supplier_invoice.php:384
+#: ../purchasing/supplier_payment.php:123
+#: ../purchasing/supplier_payment.php.orig:113
 msgid "There is no supplier selected."
 msgstr ""
 
 #: ../purchasing/po_entry_items.php:339
-#: ../purchasing/po_entry_items.php.orig:336
+#: ../purchasing/po_entry_items.php.orig:339
 msgid "The entered order date is invalid."
 msgstr ""
 
 #: ../purchasing/po_entry_items.php:352
-#: ../purchasing/po_entry_items.php.orig:349
+#: ../purchasing/po_entry_items.php.orig:352
 msgid "The entered due date is invalid."
 msgstr ""
 
 #: ../purchasing/po_entry_items.php:361
-#: ../purchasing/po_entry_items.php.orig:358
+#: ../purchasing/po_entry_items.php.orig:361
 msgid "There is no reference entered for this purchase order."
 msgstr ""
 
 #: ../purchasing/po_entry_items.php:376
-#: ../purchasing/po_entry_items.php.orig:373
+#: ../purchasing/po_entry_items.php.orig:376
 #: ../purchasing/supplier_invoice.php:186
 msgid "You must enter a supplier's invoice reference."
 msgstr ""
 
 #: ../purchasing/po_entry_items.php:383
-#: ../purchasing/po_entry_items.php.orig:380
+#: ../purchasing/po_entry_items.php.orig:383
 #: ../purchasing/supplier_invoice.php:212
 msgid ""
 "This invoice number has already been entered. It cannot be entered again."
 msgstr ""
 
 #: ../purchasing/po_entry_items.php:389
-#: ../purchasing/po_entry_items.php.orig:386
+#: ../purchasing/po_entry_items.php.orig:389
 msgid "There is no delivery address specified."
 msgstr ""
 
 #: ../purchasing/po_entry_items.php:395
-#: ../purchasing/po_entry_items.php.orig:392
+#: ../purchasing/po_entry_items.php.orig:395
 msgid "There is no location specified to move any items into."
 msgstr ""
 
 #: ../purchasing/po_entry_items.php:403
-#: ../purchasing/po_entry_items.php.orig:399
+#: ../purchasing/po_entry_items.php.orig:403
 msgid ""
 "The order cannot be placed because there are no lines entered on this order."
 msgstr ""
 
 #: ../purchasing/po_entry_items.php:408
-#: ../purchasing/po_entry_items.php.orig:404
+#: ../purchasing/po_entry_items.php.orig:408
 msgid "Required prepayment is greater than total invoice value."
 msgstr ""
 
-#: ../purchasing/po_entry_items.php.orig:492
+#: ../purchasing/po_entry_items.php.orig:496
 msgid "Payment for:"
 msgstr ""
 
-#: ../purchasing/po_entry_items.php.orig:563
-#: ../sales/sales_order_entry.php:718
+#: ../purchasing/po_entry_items.php.orig:567
+#: ../sales/sales_order_entry.php:726
 msgid "Place Order"
 msgstr ""
 
-#: ../purchasing/po_entry_items.php.orig:564
+#: ../purchasing/po_entry_items.php.orig:568
 msgid "Update Order"
 msgstr ""
 
-#: ../purchasing/po_entry_items.php.orig:565
-#: ../sales/sales_order_entry.php:717
+#: ../purchasing/po_entry_items.php.orig:569
+#: ../sales/sales_order_entry.php:725
 msgid "Cancel Order"
 msgstr ""
 
-#: ../purchasing/po_entry_items.php.orig:567
+#: ../purchasing/po_entry_items.php.orig:571
 msgid "Process GRN"
 msgstr ""
 
-#: ../purchasing/po_entry_items.php.orig:568
+#: ../purchasing/po_entry_items.php.orig:572
 msgid "Update GRN"
 msgstr ""
 
-#: ../purchasing/po_entry_items.php.orig:569
+#: ../purchasing/po_entry_items.php.orig:573
 msgid "Cancel GRN"
 msgstr ""
 
-#: ../purchasing/po_entry_items.php.orig:572
+#: ../purchasing/po_entry_items.php.orig:576
 #: ../sales/customer_invoice.php:686
 msgid "Process Invoice"
 msgstr ""
 
-#: ../purchasing/po_entry_items.php.orig:573
+#: ../purchasing/po_entry_items.php.orig:577
 msgid "Update Invoice"
 msgstr ""
 
-#: ../purchasing/po_entry_items.php.orig:574
-#: ../sales/sales_order_entry.php:698
+#: ../purchasing/po_entry_items.php.orig:578
+#: ../sales/sales_order_entry.php:706
 msgid "Cancel Invoice"
 msgstr ""
 
@@ -10933,22 +10808,22 @@ msgid ""
 msgstr ""
 
 #: ../purchasing/po_receive_items.php:62
-#: ../reporting/rep105.php:112
-#: ../sales/customer_delivery.php.orig:445
+#: ../reporting/rep105.php:114
+#: ../sales/customer_delivery.php:446
 msgid "Ordered"
 msgstr ""
 
 #: ../purchasing/po_receive_items.php:63
-#: ../reporting/rep101.php:131
-#: ../reporting/rep105.php:113
-#: ../reporting/rep105.php:162
-#: ../reporting/rep201.php:119
+#: ../reporting/rep101.php:119
+#: ../reporting/rep105.php:115
+#: ../reporting/rep105.php:166
+#: ../reporting/rep201.php:111
 #: ../reporting/includes/doctext.inc:247
 msgid "Outstanding"
 msgstr ""
 
 #: ../purchasing/po_receive_items.php:63
-#: ../sales/customer_delivery.php.orig:446
+#: ../sales/customer_delivery.php:447
 msgid "This Delivery"
 msgstr ""
 
@@ -10986,98 +10861,93 @@ msgstr ""
 msgid "Re-Read the updated purchase order for receiving goods against"
 msgstr ""
 
-#: ../purchasing/po_receive_items.php:327
+#: ../purchasing/po_receive_items.php:328
 msgid "Items to Receive"
 msgstr ""
 
-#: ../purchasing/po_receive_items.php:332
+#: ../purchasing/po_receive_items.php:333
 msgid "Process Receive Items"
 msgstr ""
 
-#: ../purchasing/supplier_credit.php:63
-#, php-format
-msgid "Modifying Supplier Credit # %d"
-msgstr ""
-
-#: ../purchasing/supplier_credit.php:78
+#: ../purchasing/supplier_credit.php:77
 msgid "Supplier credit note has been processed."
 msgstr ""
 
-#: ../purchasing/supplier_credit.php:79
+#: ../purchasing/supplier_credit.php:78
 msgid "View this Credit Note"
 msgstr ""
 
-#: ../purchasing/supplier_credit.php:81
+#: ../purchasing/supplier_credit.php:80
 msgid "View the GL Journal Entries for this Credit Note"
 msgstr ""
 
-#: ../purchasing/supplier_credit.php:83
+#: ../purchasing/supplier_credit.php:82
 msgid "Enter Another Credit Note"
 msgstr ""
 
-#: ../purchasing/supplier_credit.php:119
+#: ../purchasing/supplier_credit.php:118
 #: ../purchasing/supplier_invoice.php:127
 msgid ""
 "The account code entered is not a valid code, this line cannot be added to "
 "the transaction."
 msgstr ""
 
-#: ../purchasing/supplier_credit.php:129
+#: ../purchasing/supplier_credit.php:128
 #: ../purchasing/supplier_invoice.php:137
 msgid ""
 "The amount entered is not numeric. This line cannot be added to the "
 "transaction."
 msgstr ""
 
-#: ../purchasing/supplier_credit.php:159
+#: ../purchasing/supplier_credit.php:158
 msgid ""
 "The credit note cannot be processed because the there are no items or values "
 "on the invoice.  Credit notes are expected to have a charge."
 msgstr ""
 
-#: ../purchasing/supplier_credit.php:166
+#: ../purchasing/supplier_credit.php:165
 msgid "You must enter an credit note reference."
 msgstr ""
 
-#: ../purchasing/supplier_credit.php:180
+#: ../purchasing/supplier_credit.php:179
 msgid "You must enter a supplier's credit note reference."
 msgstr ""
 
-#: ../purchasing/supplier_credit.php:187
+#: ../purchasing/supplier_credit.php:186
 msgid ""
 "The credit note as entered cannot be processed because the date entered is "
 "not valid."
 msgstr ""
 
-#: ../purchasing/supplier_credit.php:199
+#: ../purchasing/supplier_credit.php:198
 #: ../purchasing/supplier_invoice.php:205
 msgid ""
 "The invoice as entered cannot be processed because the due date is in an "
 "incorrect format."
 msgstr ""
 
-#: ../purchasing/supplier_credit.php:206
+#: ../purchasing/supplier_credit.php:205
 msgid ""
 "The credit note total as entered is less than the sum of the the general "
 "ledger entires (if any) and the charges for goods received. There must be a "
 "mistake somewhere, the credit note as entered will not be processed."
 msgstr ""
 
-#: ../purchasing/supplier_credit.php:218
+#: ../purchasing/supplier_credit.php:217
 msgid ""
 "The return cannot be processed because there is an insufficient quantity for "
 "item:"
 msgstr ""
 
-#: ../purchasing/supplier_credit.php:262
+#: ../purchasing/supplier_credit.php:260
 msgid "The quantity to credit must be numeric and greater than zero."
 msgstr ""
 
-#: ../purchasing/supplier_credit.php:269
+#: ../purchasing/supplier_credit.php:267
 msgid "The price is either not numeric or negative."
 msgstr ""
 
-#: ../purchasing/supplier_credit.php:371
+#: ../purchasing/supplier_credit.php:369
 msgid "Enter Credit Note"
 msgstr ""
 
@@ -11146,85 +11016,122 @@ msgid ""
 "necessary."
 msgstr ""
 
-#: ../purchasing/supplier_invoice.php:364
+#: ../purchasing/supplier_invoice.php:366
 #, php-format
 msgid "All yet non-invoiced items on delivery line # %d has been removed."
 msgstr ""
 
-#: ../purchasing/supplier_invoice.php:406
+#: ../purchasing/supplier_invoice.php:408
 msgid "Enter Invoice"
 msgstr ""
 
 #: ../purchasing/supplier_payment.php:31
+#: ../purchasing/supplier_payment.php.orig:31
 msgid "Supplier Payment Entry"
 msgstr ""
 
-#: ../purchasing/supplier_payment.php:85
+#: ../purchasing/supplier_payment.php:92
+#: ../purchasing/supplier_payment.php.orig:85
 msgid "Invalid purchase invoice number."
 msgstr ""
 
-#: ../purchasing/supplier_payment.php:91
+#: ../purchasing/supplier_payment.php:98
+#: ../purchasing/supplier_payment.php.orig:91
 msgid "Payment has been sucessfully entered"
 msgstr ""
 
-#: ../purchasing/supplier_payment.php:93
+#: ../purchasing/supplier_payment.php:100
+#: ../purchasing/supplier_payment.php.orig:93
 msgid "&Print This Remittance"
 msgstr ""
 
-#: ../purchasing/supplier_payment.php:94
+#: ../purchasing/supplier_payment.php:101
+#: ../purchasing/supplier_payment.php.orig:94
 msgid "&Email This Remittance"
 msgstr ""
 
-#: ../purchasing/supplier_payment.php:96
+#: ../purchasing/supplier_payment.php:103
+msgid "View this Payment"
+msgstr ""
+
+#: ../purchasing/supplier_payment.php:104
+#: ../purchasing/supplier_payment.php.orig:96
 msgid "View the GL &Journal Entries for this Payment"
 msgstr ""
 
-#: ../purchasing/supplier_payment.php:100
+#: ../purchasing/supplier_payment.php:106
+#: ../purchasing/supplier_payment.php.orig:100
 msgid "Enter another supplier &payment"
 msgstr ""
 
-#: ../purchasing/supplier_payment.php:147
-#: ../sales/customer_payments.php:192
-msgid "The exchange rate must be numeric and greater than zero."
+#: ../purchasing/supplier_payment.php:107
+#: ../sales/customer_payments.php:106
+msgid "Enter Other &Payment"
+msgstr ""
+
+#: ../purchasing/supplier_payment.php:108
+msgid "Enter &Customer Payment"
+msgstr ""
+
+#: ../purchasing/supplier_payment.php:109
+#: ../sales/customer_payments.php:104
+msgid "Enter Other &Deposit"
+msgstr ""
+
+#: ../purchasing/supplier_payment.php:110
+#: ../sales/customer_payments.php:107
+msgid "Bank Account &Transfer"
 msgstr ""
 
-#: ../purchasing/supplier_payment.php:159
+#: ../purchasing/supplier_payment.php:162
+#: ../purchasing/supplier_payment.php.orig:159
 msgid "The entered discount is invalid or less than zero."
 msgstr ""
 
-#: ../purchasing/supplier_payment.php:167
+#: ../purchasing/supplier_payment.php:170
+#: ../purchasing/supplier_payment.php.orig:167
 msgid ""
 "The total of the amount and the discount is zero or negative. Please enter "
 "positive values."
 msgstr ""
 
-#: ../purchasing/supplier_payment.php:270
+#: ../purchasing/supplier_payment.php:177
+msgid "The entered bank amount is zero or negative."
+msgstr ""
+
+#: ../purchasing/supplier_payment.php:274
+#: ../purchasing/supplier_payment.php.orig:270
 msgid "Payment To:"
 msgstr ""
 
-#: ../purchasing/supplier_payment.php:283
+#: ../purchasing/supplier_payment.php.orig:147
+#: ../sales/customer_payments.php.orig:192
+msgid "The exchange rate must be numeric and greater than zero."
+msgstr ""
+
+#: ../purchasing/supplier_payment.php.orig:283
 msgid "From Bank Account:"
 msgstr ""
 
-#: ../purchasing/supplier_payment.php:291
+#: ../purchasing/supplier_payment.php.orig:291
 #: ../purchasing/view/view_supp_payment.php:55
 msgid "Date Paid"
 msgstr ""
 
-#: ../purchasing/supplier_payment.php:314
-#: ../sales/customer_payments.php:409
+#: ../purchasing/supplier_payment.php.orig:314
+#: ../sales/customer_payments.php.orig:409
 msgid "Amount of Discount:"
 msgstr ""
 
-#: ../purchasing/supplier_payment.php:315
+#: ../purchasing/supplier_payment.php.orig:315
 msgid "Amount of Payment:"
 msgstr ""
 
-#: ../purchasing/supplier_payment.php:321
+#: ../purchasing/supplier_payment.php.orig:321
 msgid "The amount and discount are in the bank account's currency."
 msgstr ""
 
-#: ../purchasing/supplier_payment.php:324
+#: ../purchasing/supplier_payment.php.orig:324
 msgid "Enter Payment"
 msgstr ""
 
@@ -11240,7 +11147,6 @@ msgstr ""
 #: ../purchasing/view/view_grn.php:37
 #: ../purchasing/view/view_po.php:41
 #: ../sales/view/view_sales_order.php:216
-#: ../sales/view/view_sales_order.php.orig:198
 msgid "Line Details"
 msgstr ""
 
@@ -11258,7 +11164,6 @@ msgstr ""
 #: ../purchasing/view/view_supp_invoice.php:66
 #: ../sales/view/view_credit.php:136
 #: ../sales/view/view_sales_order.php:252
-#: ../sales/view/view_sales_order.php.orig:234
 msgid "Sub Total"
 msgstr ""
 
@@ -11279,20 +11184,18 @@ msgid "Requested By"
 msgstr ""
 
 #: ../purchasing/view/view_po.php:100
-#: ../purchasing/inquiry/supplier_allocation_inquiry.php:147
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php.orig:147
 #: ../purchasing/inquiry/supplier_inquiry.php:197
-#: ../purchasing/inquiry/supplier_inquiry.php.orig:196
-#: ../sales/inquiry/customer_allocation_inquiry.php:165
-#: ../sales/inquiry/customer_inquiry.php:227
+#: ../sales/inquiry/customer_allocation_inquiry.php.orig:165
+#: ../sales/inquiry/customer_inquiry.php.orig:227
 #: ../sales/inquiry/sales_deliveries_view.php:206
-#: ../sales/inquiry/sales_orders_view.php:344
+#: ../sales/inquiry/sales_orders_view.php.orig:344
 msgid "Marked items are overdue."
 msgstr ""
 
 #: ../purchasing/view/view_po.php:113
 #: ../sales/view/view_invoice.php:98
 #: ../sales/view/view_sales_order.php:51
-#: ../sales/view/view_sales_order.php.orig:51
 msgid "Deliveries"
 msgstr ""
 
@@ -11302,7 +11205,6 @@ msgstr ""
 
 #: ../purchasing/view/view_po.php:138
 #: ../sales/view/view_sales_order.php:53
-#: ../sales/view/view_sales_order.php.orig:53
 msgid "Invoices/Credits"
 msgstr ""
 
@@ -11340,8 +11242,6 @@ msgid "SUPPLIER INVOICE"
 msgstr ""
 
 #: ../purchasing/view/view_supp_invoice.php:73
-#: ../reporting/rep107.php:266
-#: ../reporting/rep107.php:272
 #: ../sales/view/view_invoice.php:166
 msgid "TOTAL INVOICE"
 msgstr ""
@@ -11364,17 +11264,17 @@ msgid "To Supplier"
 msgstr ""
 
 #: ../purchasing/view/view_supp_payment.php:59
-#: ../sales/view/view_receipt.php:43
 msgid "Payment Currency"
 msgstr ""
 
 #: ../purchasing/view/view_supp_payment.php:62
-#: ../sales/customer_delivery.php.orig:446
+#: ../reporting/rep112.php:150
+#: ../reporting/rep210.php:159
+#: ../sales/customer_delivery.php:447
 #: ../sales/customer_invoice.php:542
 #: ../sales/customer_invoice.php:545
 #: ../sales/view/view_receipt.php:45
 #: ../sales/view/view_sales_order.php:220
-#: ../sales/view/view_sales_order.php.orig:202
 msgid "Discount"
 msgstr ""
 
@@ -11383,7 +11283,7 @@ msgid "Supplier's Currency"
 msgstr ""
 
 #: ../purchasing/manage/suppliers.php:27
-#: ../purchasing/manage/suppliers.php.orig:28
+#: ../purchasing/manage/suppliers.php.orig:27
 #: ../sales/manage/customer_branches.php:33
 msgid ""
 "There are no tax groups defined in the system. At least one tax group is "
@@ -11391,220 +11291,215 @@ msgid ""
 msgstr ""
 
 #: ../purchasing/manage/suppliers.php:91
-#: ../purchasing/manage/suppliers.php.orig:92
+#: ../purchasing/manage/suppliers.php.orig:91
 msgid "Basic Data"
 msgstr ""
 
 #: ../purchasing/manage/suppliers.php:93
-#: ../purchasing/manage/suppliers.php.orig:94
+#: ../purchasing/manage/suppliers.php.orig:93
 msgid "Supplier Name:"
 msgstr ""
 
 #: ../purchasing/manage/suppliers.php:94
-#: ../purchasing/manage/suppliers.php.orig:95
+#: ../purchasing/manage/suppliers.php.orig:94
 msgid "Supplier Short Name:"
 msgstr ""
 
 #: ../purchasing/manage/suppliers.php:97
-#: ../purchasing/manage/suppliers.php.orig:98
+#: ../purchasing/manage/suppliers.php.orig:97
 msgid "Website:"
 msgstr ""
 
 #: ../purchasing/manage/suppliers.php:108
-#: ../purchasing/manage/suppliers.php.orig:109
+#: ../purchasing/manage/suppliers.php.orig:108
 msgid "Our Customer No:"
 msgstr ""
 
 #: ../purchasing/manage/suppliers.php:110
-#: ../purchasing/manage/suppliers.php.orig:120
+#: ../purchasing/manage/suppliers.php.orig:110
 msgid "Purchasing"
 msgstr ""
 
 #: ../purchasing/manage/suppliers.php:111
-#: ../purchasing/manage/suppliers.php.orig:121
+#: ../purchasing/manage/suppliers.php.orig:111
 msgid "Bank Name/Account:"
 msgstr ""
 
 #: ../purchasing/manage/suppliers.php:112
-#: ../purchasing/manage/suppliers.php.orig:122
-#: ../sales/manage/customers.php:264
+#: ../purchasing/manage/suppliers.php.orig:112
+#: ../sales/manage/customers.php:267
 #: ../sales/manage/sav.customers.php:263
 msgid "Credit Limit:"
 msgstr ""
 
 #: ../purchasing/manage/suppliers.php:113
-#: ../purchasing/manage/suppliers.php.orig:123
-#: ../sales/manage/customers.php:266
+#: ../purchasing/manage/suppliers.php.orig:113
+#: ../sales/manage/customers.php:269
 #: ../sales/manage/sav.customers.php:265
 msgid "Payment Terms:"
 msgstr ""
 
 #: ../purchasing/manage/suppliers.php:119
 #: ../purchasing/manage/suppliers.php:122
-#: ../purchasing/manage/suppliers.php.orig:129
-#: ../purchasing/manage/suppliers.php.orig:132
+#: ../purchasing/manage/suppliers.php.orig:119
+#: ../purchasing/manage/suppliers.php.orig:122
 msgid "Prices contain tax included:"
 msgstr ""
 
 #: ../purchasing/manage/suppliers.php:124
-#: ../purchasing/manage/suppliers.php.orig:134
+#: ../purchasing/manage/suppliers.php.orig:124
 msgid "Tax Calculation Algorithm:"
 msgstr ""
 
 #: ../purchasing/manage/suppliers.php:128
-#: ../purchasing/manage/suppliers.php.orig:138
-#: ../reporting/rep704.php:92
-#: ../reporting/rep704.php:102
-#: ../reporting/rep704.php:110
+#: ../purchasing/manage/suppliers.php.orig:128
+#: ../reporting/rep704.php:96
+#: ../reporting/rep704.php:106
+#: ../reporting/rep704.php:114
 msgid "Accounts"
 msgstr ""
 
 #: ../purchasing/manage/suppliers.php:129
-#: ../purchasing/manage/suppliers.php.orig:139
+#: ../purchasing/manage/suppliers.php.orig:129
 msgid "Accounts Payable Account:"
 msgstr ""
 
 #: ../purchasing/manage/suppliers.php:130
-#: ../purchasing/manage/suppliers.php.orig:140
+#: ../purchasing/manage/suppliers.php.orig:130
 msgid "Purchase Account:"
 msgstr ""
 
 #: ../purchasing/manage/suppliers.php:131
-#: ../purchasing/manage/suppliers.php.orig:141
+#: ../purchasing/manage/suppliers.php.orig:131
 msgid "Use Item Inventory/COGS Account"
 msgstr ""
 
 #: ../purchasing/manage/suppliers.php:134
 #: ../purchasing/manage/suppliers.php:137
-#: ../purchasing/manage/suppliers.php.orig:112
+#: ../purchasing/manage/suppliers.php.orig:134
+#: ../purchasing/manage/suppliers.php.orig:137
 msgid "Contact Data"
 msgstr ""
 
 #: ../purchasing/manage/suppliers.php:140
-#: ../purchasing/manage/suppliers.php.orig:118
+#: ../purchasing/manage/suppliers.php.orig:140
 msgid "System default"
 msgstr ""
 
 #: ../purchasing/manage/suppliers.php:157
-#: ../purchasing/manage/suppliers.php.orig:159
+#: ../purchasing/manage/suppliers.php.orig:157
 #: ../sales/manage/customer_branches.php:268
 msgid "Addresses"
 msgstr ""
 
 #: ../purchasing/manage/suppliers.php:158
-#: ../purchasing/manage/suppliers.php.orig:160
+#: ../purchasing/manage/suppliers.php.orig:158
+#: ../reporting/rep205.php:102
 #: ../sales/manage/customer_branches.php:269
 msgid "Mailing Address:"
 msgstr ""
 
 #: ../purchasing/manage/suppliers.php:159
-#: ../purchasing/manage/suppliers.php.orig:161
+#: ../purchasing/manage/suppliers.php.orig:159
 msgid "Physical Address:"
 msgstr ""
 
 #: ../purchasing/manage/suppliers.php:161
-#: ../purchasing/manage/suppliers.php.orig:163
+#: ../purchasing/manage/suppliers.php.orig:161
 msgid "General"
 msgstr ""
 
 #: ../purchasing/manage/suppliers.php:162
-#: ../purchasing/manage/suppliers.php.orig:164
+#: ../purchasing/manage/suppliers.php.orig:162
 #: ../sales/manage/customer_branches.php:271
-#: ../sales/manage/customers.php:287
+#: ../sales/manage/customers.php:290
 #: ../sales/manage/sav.customers.php:286
 msgid "General Notes:"
 msgstr ""
 
 #: ../purchasing/manage/suppliers.php:164
-#: ../purchasing/manage/suppliers.php.orig:166
+#: ../purchasing/manage/suppliers.php.orig:164
 msgid "Supplier status:"
 msgstr ""
 
 #: ../purchasing/manage/suppliers.php:170
-#: ../purchasing/manage/suppliers.php.orig:173
+#: ../purchasing/manage/suppliers.php.orig:170
 msgid "Update Supplier"
 msgstr ""
 
 #: ../purchasing/manage/suppliers.php:171
-#: ../purchasing/manage/suppliers.php.orig:174
+#: ../purchasing/manage/suppliers.php.orig:171
 msgid "Update supplier data"
 msgstr ""
 
 #: ../purchasing/manage/suppliers.php:172
-#: ../purchasing/manage/suppliers.php.orig:175
+#: ../purchasing/manage/suppliers.php.orig:172
 msgid "Select this supplier and return to document entry."
 msgstr ""
 
 #: ../purchasing/manage/suppliers.php:173
-#: ../purchasing/manage/suppliers.php.orig:176
+#: ../purchasing/manage/suppliers.php.orig:173
 msgid "Delete Supplier"
 msgstr ""
 
 #: ../purchasing/manage/suppliers.php:174
-#: ../purchasing/manage/suppliers.php.orig:177
+#: ../purchasing/manage/suppliers.php.orig:174
 msgid "Delete supplier data if have been never used"
 msgstr ""
 
 #: ../purchasing/manage/suppliers.php:178
-#: ../purchasing/manage/suppliers.php.orig:181
+#: ../purchasing/manage/suppliers.php.orig:178
 msgid "Add New Supplier Details"
 msgstr ""
 
 #: ../purchasing/manage/suppliers.php:197
-#: ../purchasing/manage/suppliers.php.orig:200
+#: ../purchasing/manage/suppliers.php.orig:197
 msgid "The supplier name must be entered."
 msgstr ""
 
 #: ../purchasing/manage/suppliers.php:204
-#: ../purchasing/manage/suppliers.php.orig:207
+#: ../purchasing/manage/suppliers.php.orig:204
 msgid "The supplier short name must be entered."
 msgstr ""
 
-#: ../purchasing/manage/suppliers.php:224
-#: ../purchasing/manage/suppliers.php.orig:227
+#: ../purchasing/manage/suppliers.php.orig:224
 msgid "Supplier has been updated."
 msgstr ""
 
-#: ../purchasing/manage/suppliers.php:242
-#: ../purchasing/manage/suppliers.php.orig:245
+#: ../purchasing/manage/suppliers.php.orig:242
 msgid "A new supplier has been added."
 msgstr ""
 
-#: ../purchasing/manage/suppliers.php:260
-#: ../purchasing/manage/suppliers.php.orig:263
+#: ../purchasing/manage/suppliers.php.orig:260
 msgid ""
 "Cannot delete this supplier because there are transactions that refer to "
 "this supplier."
 msgstr ""
 
-#: ../purchasing/manage/suppliers.php:268
-#: ../purchasing/manage/suppliers.php.orig:271
+#: ../purchasing/manage/suppliers.php.orig:268
 msgid ""
 "Cannot delete the supplier record because purchase orders have been created "
 "against this supplier."
 msgstr ""
 
-#: ../purchasing/manage/suppliers.php:289
-#: ../purchasing/manage/suppliers.php.orig:292
+#: ../purchasing/manage/suppliers.php.orig:289
 #: ../purchasing/inquiry/supplier_allocation_inquiry.php:48
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php.orig:48
 msgid "Select a supplier: "
 msgstr ""
 
-#: ../purchasing/manage/suppliers.php:290
-#: ../purchasing/manage/suppliers.php.orig:293
+#: ../purchasing/manage/suppliers.php.orig:290
 msgid "New supplier"
 msgstr ""
 
-#: ../purchasing/manage/suppliers.php:309
-#: ../purchasing/manage/suppliers.php.orig:312
+#: ../purchasing/manage/suppliers.php.orig:309
 #: ../sales/manage/customer_branches.php:325
-#: ../sales/manage/customers.php:345
+#: ../sales/manage/customers.php:348
 #: ../sales/manage/sav.customers.php:343
 msgid "&Contacts"
 msgstr ""
 
-#: ../purchasing/manage/suppliers.php:311
-#: ../purchasing/manage/suppliers.php.orig:314
+#: ../purchasing/manage/suppliers.php.orig:311
 msgid "Purchase &Orders"
 msgstr ""
 
@@ -11617,7 +11512,7 @@ msgstr ""
 #: ../purchasing/inquiry/po_search_completed.php.orig:61
 #: ../purchasing/inquiry/po_search.php:62
 #: ../sales/inquiry/sales_deliveries_view.php:103
-#: ../sales/inquiry/sales_orders_view.php:247
+#: ../sales/inquiry/sales_orders_view.php.orig:247
 msgid "#:"
 msgstr ""
 
@@ -11629,14 +11524,15 @@ msgstr ""
 #: ../purchasing/inquiry/po_search_completed.php:125
 #: ../purchasing/inquiry/po_search_completed.php.orig:124
 #: ../purchasing/inquiry/po_search.php:135
-#: ../sales/inquiry/sales_orders_view.php:289
+#: ../reporting/includes/doctext.inc:188
+#: ../sales/inquiry/sales_orders_view.php.orig:289
 msgid "Order Date"
 msgstr ""
 
 #: ../purchasing/inquiry/po_search_completed.php:127
 #: ../purchasing/inquiry/po_search_completed.php.orig:126
 #: ../purchasing/inquiry/po_search.php:137
-#: ../sales/inquiry/sales_orders_view.php:292
+#: ../sales/inquiry/sales_orders_view.php.orig:292
 msgid "Order Total"
 msgstr ""
 
@@ -11653,108 +11549,108 @@ msgid "Marked orders have overdue items."
 msgstr ""
 
 #: ../purchasing/inquiry/supplier_allocation_inquiry.php:23
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php.orig:23
 msgid "Supplier Allocation Inquiry"
 msgstr ""
 
 #: ../purchasing/inquiry/supplier_allocation_inquiry.php:55
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php.orig:55
 #: ../sales/inquiry/customer_allocation_inquiry.php:49
+#: ../sales/inquiry/customer_allocation_inquiry.php.orig:49
 msgid "show settled:"
 msgstr ""
 
-#: ../purchasing/inquiry/supplier_allocation_inquiry.php:129
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php.orig:129
 msgid "Supp Reference"
 msgstr ""
 
-#: ../purchasing/inquiry/supplier_allocation_inquiry.php:135
-#: ../reporting/rep101.php:131
-#: ../reporting/rep201.php:119
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php.orig:135
+#: ../reporting/rep101.php:119
+#: ../reporting/rep201.php:111
 #: ../reporting/includes/doctext.inc:247
-#: ../sales/inquiry/customer_allocation_inquiry.php:154
+#: ../sales/inquiry/customer_allocation_inquiry.php.orig:154
 msgid "Allocated"
 msgstr ""
 
 #: ../purchasing/inquiry/supplier_inquiry.php:25
-#: ../purchasing/inquiry/supplier_inquiry.php.orig:25
 msgid "Supplier Inquiry"
 msgstr ""
 
 #: ../purchasing/inquiry/supplier_inquiry.php:48
-#: ../purchasing/inquiry/supplier_inquiry.php.orig:48
 msgid "Select a supplier:"
 msgstr ""
 
 #: ../purchasing/inquiry/supplier_inquiry.php:67
 #: ../purchasing/inquiry/supplier_inquiry.php:68
 #: ../purchasing/inquiry/supplier_inquiry.php:69
-#: ../purchasing/inquiry/supplier_inquiry.php.orig:67
-#: ../purchasing/inquiry/supplier_inquiry.php.orig:68
-#: ../purchasing/inquiry/supplier_inquiry.php.orig:69
-#: ../reporting/rep102.php:118
-#: ../reporting/rep102.php:119
 #: ../reporting/rep102.php:120
-#: ../reporting/rep102.php:240
-#: ../reporting/rep108.php:150
+#: ../reporting/rep102.php:121
+#: ../reporting/rep102.php:122
+#: ../reporting/rep102.php:244
 #: ../reporting/rep108.php:151
 #: ../reporting/rep108.php:152
-#: ../reporting/rep202.php:122
-#: ../reporting/rep202.php:123
+#: ../reporting/rep108.php:153
 #: ../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:132
+#: ../reporting/rep202.php:125
+#: ../reporting/rep202.php:126
+#: ../reporting/rep202.php:158
+#: ../reporting/rep202.php:159
+#: ../reporting/rep202.php:160
+#: ../reporting/rep202.php:252
+#: ../sales/create_recurrent_invoices.php:134
 #: ../sales/manage/recurrent_invoices.php:102
 #: ../sales/inquiry/customer_inquiry.php:71
 #: ../sales/inquiry/customer_inquiry.php:72
 #: ../sales/inquiry/customer_inquiry.php:73
+#: ../sales/inquiry/customer_inquiry.php.orig:71
+#: ../sales/inquiry/customer_inquiry.php.orig:72
+#: ../sales/inquiry/customer_inquiry.php.orig:73
 msgid "Days"
 msgstr ""
 
 #: ../purchasing/inquiry/supplier_inquiry.php:69
-#: ../purchasing/inquiry/supplier_inquiry.php.orig:69
-#: ../reporting/rep102.php:120
-#: ../reporting/rep108.php:152
-#: ../reporting/rep202.php:124
-#: ../reporting/rep202.php:156
+#: ../reporting/rep102.php:122
+#: ../reporting/rep108.php:153
+#: ../reporting/rep202.php:126
+#: ../reporting/rep202.php:160
 #: ../sales/inquiry/customer_inquiry.php:73
+#: ../sales/inquiry/customer_inquiry.php.orig:73
 msgid "Over"
 msgstr ""
 
 #: ../purchasing/inquiry/supplier_inquiry.php:73
-#: ../purchasing/inquiry/supplier_inquiry.php.orig:73
 #: ../sales/inquiry/customer_inquiry.php:76
+#: ../sales/inquiry/customer_inquiry.php.orig:76
 msgid "Terms"
 msgstr ""
 
 #: ../purchasing/inquiry/supplier_inquiry.php:73
-#: ../purchasing/inquiry/supplier_inquiry.php.orig:73
-#: ../reporting/rep102.php:123
-#: ../reporting/rep102.php:238
-#: ../reporting/rep108.php:154
-#: ../reporting/rep202.php:128
-#: ../reporting/rep202.php:246
+#: ../reporting/rep102.php:125
+#: ../reporting/rep102.php:242
+#: ../reporting/rep108.php:155
+#: ../reporting/rep202.php:130
+#: ../reporting/rep202.php:250
 #: ../sales/inquiry/customer_inquiry.php:76
+#: ../sales/inquiry/customer_inquiry.php.orig:76
 msgid "Current"
 msgstr ""
 
 #: ../purchasing/inquiry/supplier_inquiry.php:74
-#: ../purchasing/inquiry/supplier_inquiry.php.orig:74
-#: ../reporting/rep102.php:124
-#: ../reporting/rep108.php:154
-#: ../reporting/rep202.php:129
+#: ../reporting/rep102.php:126
+#: ../reporting/rep108.php:155
+#: ../reporting/rep202.php:131
 #: ../sales/inquiry/customer_inquiry.php:77
+#: ../sales/inquiry/customer_inquiry.php.orig:77
 msgid "Total Balance"
 msgstr ""
 
 #: ../purchasing/inquiry/supplier_inquiry.php:133
-#: ../purchasing/inquiry/supplier_inquiry.php.orig:130
 #: ../sales/inquiry/customer_inquiry.php:162
+#: ../sales/inquiry/customer_inquiry.php.orig:162
 msgid "Credit This"
 msgstr ""
 
 #: ../purchasing/inquiry/supplier_inquiry.php:155
-#: ../purchasing/inquiry/supplier_inquiry.php.orig:152
 msgid "Print Remittance"
 msgstr ""
 
@@ -11762,41 +11658,46 @@ msgstr ""
 msgid "Allocate Supplier Payment or Credit Note"
 msgstr ""
 
-#: ../purchasing/allocations/supplier_allocate.php:50
+#: ../purchasing/allocations/supplier_allocate.php:52
 msgid "Allocation of"
 msgstr ""
 
-#: ../purchasing/allocations/supplier_allocate.php:55
-#: ../sales/allocations/customer_allocate.php:54
+#: ../purchasing/allocations/supplier_allocate.php:58
+#: ../sales/allocations/customer_allocate.php:55
 msgid "Total:"
 msgstr ""
 
-#: ../purchasing/allocations/supplier_allocate.php:64
-#: ../sales/allocations/customer_allocate.php:63
+#: ../purchasing/allocations/supplier_allocate.php:62
+#: ../sales/allocations/customer_allocate.php:59
+msgid "Total in clearing currency:"
+msgstr ""
+
+#: ../purchasing/allocations/supplier_allocate.php:73
+#: ../sales/allocations/customer_allocate.php:71
 msgid "Start again allocation of selected amount"
 msgstr ""
 
-#: ../purchasing/allocations/supplier_allocate.php:65
-#: ../sales/allocations/customer_allocate.php:64
+#: ../purchasing/allocations/supplier_allocate.php:74
+#: ../sales/allocations/customer_allocate.php:72
 msgid "Process allocations"
 msgstr ""
 
-#: ../purchasing/allocations/supplier_allocate.php:66
-#: ../purchasing/allocations/supplier_allocate.php:72
-#: ../sales/allocations/customer_allocate.php:65
-#: ../sales/allocations/customer_allocate.php:71
+#: ../purchasing/allocations/supplier_allocate.php:75
+#: ../purchasing/allocations/supplier_allocate.php:81
+#: ../sales/allocations/customer_allocate.php:73
+#: ../sales/allocations/customer_allocate.php:79
 msgid "Back to Allocations"
 msgstr ""
 
-#: ../purchasing/allocations/supplier_allocate.php:67
-#: ../purchasing/allocations/supplier_allocate.php:73
-#: ../sales/allocations/customer_allocate.php:65
-#: ../sales/allocations/customer_allocate.php:72
+#: ../purchasing/allocations/supplier_allocate.php:76
+#: ../purchasing/allocations/supplier_allocate.php:82
+#: ../sales/allocations/customer_allocate.php:73
+#: ../sales/allocations/customer_allocate.php:80
 msgid "Abandon allocations and return to selection of allocatable amounts"
 msgstr ""
 
-#: ../purchasing/allocations/supplier_allocate.php:71
-#: ../sales/allocations/customer_allocate.php:69
+#: ../purchasing/allocations/supplier_allocate.php:80
+#: ../sales/allocations/customer_allocate.php:77
 msgid "There are no unsettled transactions to allocate."
 msgstr ""
 
@@ -11823,692 +11724,734 @@ msgstr ""
 msgid "Marked items are settled."
 msgstr ""
 
-#: ../reporting/rep101.php:120
-#: ../reporting/rep102.php:106
-#: ../reporting/rep114.php:103
-#: ../reporting/rep202.php:110
-#: ../reporting/rep203.php:81
+#: ../reporting/rep101.php:108
+#: ../reporting/rep102.php:108
+#: ../reporting/rep114.php:108
+#: ../reporting/rep202.php:112
+#: ../reporting/rep203.php:83
 msgid "Balances in Home Currency"
 msgstr ""
 
-#: ../reporting/rep101.php:130
-#: ../reporting/rep201.php:118
-#: ../reporting/rep203.php:91
-#: ../reporting/rep709.php:109
+#: ../reporting/rep101.php:118
+#: ../reporting/rep201.php:110
+#: ../reporting/rep203.php:93
+#: ../reporting/rep709.php:111
 #: ../reporting/includes/doctext.inc:167
 #: ../reporting/includes/doctext.inc:208
 #: ../reporting/includes/doctext.inc:246
 msgid "Trans Type"
 msgstr ""
 
-#: ../reporting/rep101.php:130
-#: ../reporting/rep201.php:118
+#: ../reporting/rep101.php:118
+#: ../reporting/rep201.php:110
 #: ../reporting/includes/doctext.inc:246
 msgid "Charges"
 msgstr ""
 
-#: ../reporting/rep101.php:130
-#: ../reporting/rep201.php:119
+#: ../reporting/rep101.php:118
+#: ../reporting/rep201.php:111
 #: ../reporting/includes/doctext.inc:247
 msgid "Credits"
 msgstr ""
 
-#: ../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
+#: ../reporting/rep101.php:129
+#: ../reporting/rep102.php:136
+#: ../reporting/rep201.php:121
+#: ../reporting/rep202.php:141
+#: ../reporting/rep203.php:102
+#: ../reporting/rep303.php:136
+#: ../reporting/reports_main.php:39
+#: ../reporting/reports_main.php:49
+#: ../reporting/reports_main.php:156
+#: ../reporting/reports_main.php:166
+#: ../reporting/reports_main.php:175
 msgid "Suppress Zeros"
 msgstr ""
 
-#: ../reporting/rep101.php:141
+#: ../reporting/rep101.php:131
 msgid "Customer Balances"
 msgstr ""
 
-#: ../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:183
+#: ../reporting/rep101.php:241
+#: ../reporting/rep102.php:228
+#: ../reporting/rep106.php:171
+#: ../reporting/rep201.php:233
+#: ../reporting/rep202.php:235
+#: ../reporting/rep203.php:181
+#: ../reporting/rep204.php:148
+#: ../reporting/rep301.php:179
+#: ../reporting/rep304.php:195
+#: ../reporting/rep305.php:188
+#: ../reporting/rep306.php:293
+#: ../reporting/rep309.php:158
 msgid "Grand Total"
 msgstr ""
 
-#: ../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:102
+#: ../reporting/rep106.php:93
 #: ../reporting/rep202.php:106
 #: ../reporting/rep709.php:95
+#: ../reporting/reports_main.php:48
+#: ../reporting/reports_main.php:91
+#: ../reporting/reports_main.php:165
+msgid "Summary Only"
+msgstr ""
+
+#: ../reporting/rep102.php:104
+#: ../reporting/rep202.php:108
+#: ../reporting/rep709.php:97
 msgid "Detailed Report"
 msgstr ""
 
-#: ../reporting/rep102.php:129
-#: ../reporting/rep202.php:134
-#: ../reporting/rep203.php:97
-#: ../reporting/rep301.php:108
+#: ../reporting/rep102.php:131
+#: ../reporting/rep202.php:136
+#: ../reporting/rep203.php:99
+#: ../reporting/rep301.php:110
 #: ../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:44
+#: ../reporting/reports_main.php:65
+#: ../reporting/reports_main.php:81
+#: ../reporting/reports_main.php:90
 #: ../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
+#: ../reporting/reports_main.php:161
+#: ../reporting/reports_main.php:172
 msgid "End Date"
 msgstr ""
 
-#: ../reporting/rep102.php:133
-#: ../reporting/rep202.php:138
-#: ../reporting/reports_main.php:45
-#: ../reporting/reports_main.php:110
-#: ../reporting/reports_main.php:145
+#: ../reporting/rep102.php:135
+#: ../reporting/rep202.php:140
+#: ../reporting/reports_main.php:47
+#: ../reporting/reports_main.php:123
+#: ../reporting/reports_main.php:164
 msgid "Show Also Allocated"
 msgstr ""
 
-#: ../reporting/rep102.php:138
+#: ../reporting/rep102.php:140
 msgid "Aged Customer Analysis"
 msgstr ""
 
-#: ../reporting/rep103.php:115
+#: ../reporting/rep103.php:134
 msgid "All Areas"
 msgstr ""
 
-#: ../reporting/rep103.php:119
+#: ../reporting/rep103.php:138
 msgid "All Sales Folk"
 msgstr ""
 
-#: ../reporting/rep103.php:123
+#: ../reporting/rep103.php:142
+#: ../reporting/rep205.php:89
 msgid "Greater than "
 msgstr ""
 
-#: ../reporting/rep103.php:127
+#: ../reporting/rep103.php:146
+#: ../reporting/rep205.php:93
 msgid "Less than "
 msgstr ""
 
-#: ../reporting/rep103.php:136
+#: ../reporting/rep103.php:155
 msgid "Customer Postal Address"
 msgstr ""
 
-#: ../reporting/rep103.php:136
+#: ../reporting/rep103.php:155
 msgid "Price/Turnover"
 msgstr ""
 
-#: ../reporting/rep103.php:136
+#: ../reporting/rep103.php:155
 msgid "Branch Contact Information"
 msgstr ""
 
-#: ../reporting/rep103.php:137
+#: ../reporting/rep103.php:156
 msgid "Branch Delivery Address"
 msgstr ""
 
-#: ../reporting/rep103.php:142
-#: ../reporting/reports_main.php:52
+#: ../reporting/rep103.php:161
+#: ../reporting/rep205.php:108
+#: ../reporting/reports_main.php:55
+#: ../reporting/reports_main.php:185
 msgid "Activity Since"
 msgstr ""
 
-#: ../reporting/rep103.php:143
-#: ../reporting/reports_main.php:53
+#: ../reporting/rep103.php:162
+#: ../reporting/reports_main.php:56
 #: ../sales/manage/sales_areas.php:16
 msgid "Sales Areas"
 msgstr ""
 
-#: ../reporting/rep103.php:144
-#: ../reporting/reports_main.php:54
+#: ../reporting/rep103.php:163
+#: ../reporting/reports_main.php:57
 msgid "Sales Folk"
 msgstr ""
 
-#: ../reporting/rep103.php:145
+#: ../reporting/rep103.php:164
+#: ../reporting/rep205.php:109
 msgid "Activity"
 msgstr ""
 
-#: ../reporting/rep103.php:147
+#: ../reporting/rep103.php:166
 msgid "Customer Details Listing"
 msgstr ""
 
-#: ../reporting/rep103.php:175
+#: ../reporting/rep103.php:197
 msgid "Customers in"
 msgstr ""
 
-#: ../reporting/rep103.php:196
+#: ../reporting/rep103.php:218
 msgid "Price List"
 msgstr ""
 
-#: ../reporting/rep103.php:207
+#: ../reporting/rep103.php:246
+#: ../reporting/rep205.php:164
+msgid "Ph"
+msgstr ""
+
+#: ../reporting/rep103.php:261
+#: ../reporting/rep205.php:179
+msgid "Gereral Notes:"
+msgstr ""
+
+#: ../reporting/rep103.php:270
+#: ../reporting/rep205.php:102
+#: ../reporting/rep205.php:188
 msgid "Turnover"
 msgstr ""
 
-#: ../reporting/rep103.php:216
-msgid "Ph"
+#: ../reporting/rep103.php:277
+#: ../reporting/rep106.php:88
+#: ../reporting/rep205.php:195
+#: ../reporting/includes/header2.inc:110
+#: ../sales/manage/sales_people.php:99
+msgid "Email"
 msgstr ""
 
-#: ../reporting/rep104.php:109
+#: ../reporting/rep104.php:111
 msgid "Category/Items"
 msgstr ""
 
-#: ../reporting/rep104.php:109
-#: ../reporting/rep301.php:103
-#: ../reporting/rep303.php:109
-#: ../reporting/rep303.php:115
+#: ../reporting/rep104.php:111
+#: ../reporting/rep301.php:105
+#: ../reporting/rep303.php:121
+#: ../reporting/rep303.php:127
+#: ../reporting/rep307.php:117
+#: ../reporting/rep308.php:149
 msgid "UOM"
 msgstr ""
 
-#: ../reporting/rep104.php:109
+#: ../reporting/rep104.php:111
 msgid "GP %"
 msgstr ""
 
-#: ../reporting/rep104.php:117
-#: ../reporting/reports_main.php:70
+#: ../reporting/rep104.php:119
+#: ../reporting/reports_main.php:75
 msgid "Show GP %"
 msgstr ""
 
-#: ../reporting/rep104.php:124
+#: ../reporting/rep104.php:126
 msgid "Price Listing"
 msgstr ""
 
-#: ../reporting/rep104.php:191
+#: ../reporting/rep104.php:195
 msgid "Sales Kits"
 msgstr ""
 
-#: ../reporting/rep105.php:101
+#: ../reporting/rep105.php:103
 msgid "All Orders"
 msgstr ""
 
-#: ../reporting/rep105.php:103
-#: ../reporting/reports_main.php:78
+#: ../reporting/rep105.php:105
+#: ../reporting/reports_main.php:84
 msgid "Back Orders Only"
 msgstr ""
 
-#: ../reporting/rep105.php:107
-#: ../reporting/rep204.php:82
-#: ../sales/inquiry/customer_allocation_inquiry.php:147
-#: ../sales/inquiry/customer_inquiry.php:202
+#: ../reporting/rep105.php:109
+#: ../reporting/rep204.php:84
+#: ../sales/inquiry/customer_allocation_inquiry.php.orig:147
+#: ../sales/inquiry/customer_inquiry.php.orig:202
 msgid "Order"
 msgstr ""
 
-#: ../reporting/rep105.php:107
-#: ../reporting/rep106.php:81
-#: ../reporting/rep112.php:164
-#: ../sales/create_recurrent_invoices.php:132
+#: ../reporting/rep105.php:109
+#: ../reporting/rep106.php:83
+#: ../reporting/rep112.php:175
+#: ../sales/create_recurrent_invoices.php:134
 #: ../sales/customer_credit_invoice.php:236
-#: ../sales/customer_delivery.php.orig:352
+#: ../sales/customer_delivery.php:353
 #: ../sales/customer_invoice.php:447
-#: ../sales/manage/customers.php:251
-#: ../sales/manage/customers.php:290
+#: ../sales/manage/customers.php:254
+#: ../sales/manage/customers.php:293
 #: ../sales/manage/recurrent_invoices.php:102
 #: ../sales/manage/sav.customers.php:251
 #: ../sales/manage/sav.customers.php:289
 #: ../sales/view/view_credit.php:58
-#: ../sales/inquiry/customer_inquiry.php:207
+#: ../sales/inquiry/customer_inquiry.php.orig:207
 #: ../sales/inquiry/sales_deliveries_view.php:182
-#: ../sales/inquiry/sales_orders_view.php:287
-#: ../sales/inquiry/sales_orders_view.php:301
+#: ../sales/inquiry/sales_orders_view.php.orig:287
+#: ../sales/inquiry/sales_orders_view.php.orig:301
 msgid "Branch"
 msgstr ""
 
-#: ../reporting/rep105.php:107
-#: ../reporting/rep106.php:81
+#: ../reporting/rep105.php:109
+#: ../reporting/rep106.php:83
 msgid "Customer Ref"
 msgstr ""
 
-#: ../reporting/rep105.php:108
+#: ../reporting/rep105.php:110
 msgid "Ord Date"
 msgstr ""
 
-#: ../reporting/rep105.php:108
+#: ../reporting/rep105.php:110
 msgid "Del Date"
 msgstr ""
 
-#: ../reporting/rep105.php:108
-#: ../reporting/rep401.php:69
+#: ../reporting/rep105.php:110
+#: ../reporting/rep401.php:71
 msgid "Loc"
 msgstr ""
 
-#: ../reporting/rep105.php:112
-#: ../sales/customer_delivery.php.orig:445
+#: ../reporting/rep105.php:114
+#: ../sales/customer_delivery.php:446
 #: ../sales/customer_invoice.php:544
-msgid "Invoiced"
+#: ../sales/includes/ui/sales_order_ui.inc:146
+msgid "Delivered"
 msgstr ""
 
-#: ../reporting/rep105.php:119
+#: ../reporting/rep105.php:121
 msgid "Selection"
 msgstr ""
 
-#: ../reporting/rep105.php:124
+#: ../reporting/rep105.php:125
 msgid "Order Status Listing"
 msgstr ""
 
-#: ../reporting/rep106.php:82
+#: ../reporting/rep106.php:84
 msgid "Inv Date"
 msgstr ""
 
-#: ../reporting/rep106.php:82
-#: ../reporting/rep106.php:86
-#: ../reporting/rep106.php:87
+#: ../reporting/rep106.php:84
+#: ../reporting/rep106.php:88
+#: ../reporting/rep106.php:89
 #: ../sales/manage/sales_people.php:99
 #: ../sales/manage/sales_people.php:159
 #: ../sales/manage/sales_people.php:161
 msgid "Provision"
 msgstr ""
 
-#: ../reporting/rep106.php:86
+#: ../reporting/rep106.php:88
 msgid "Salesman"
 msgstr ""
 
-#: ../reporting/rep106.php:86
-#: ../reporting/includes/header2.inc:110
-#: ../sales/manage/sales_people.php:99
-msgid "Email"
-msgstr ""
-
-#: ../reporting/rep106.php:87
+#: ../reporting/rep106.php:89
 #: ../sales/manage/sales_people.php:99
 msgid "Break Pt."
 msgstr ""
 
-#: ../reporting/rep106.php:96
+#: ../reporting/rep106.php:97
 msgid "Salesman Listing"
 msgstr ""
 
-#: ../reporting/rep107.php:85
-#: ../reporting/rep107.php:105
-#: ../reporting/includes/doctext.inc:118
-msgid "INVOICE"
+#: ../reporting/rep108.php:85
+#: ../reporting/rep108.php:110
+#: ../reporting/includes/doctext.inc:238
+msgid "STATEMENT"
 msgstr ""
 
-#: ../reporting/rep107.php:186
-msgid "Prepayments invoiced to this order up to day:"
+#: ../reporting/rep108.php:127
+msgid "Outstanding Transactions"
 msgstr ""
 
-#: ../reporting/rep107.php:193
-msgid "Invoice reference"
+#: ../reporting/rep108.php:170
+msgid "Statement"
 msgstr ""
 
-#: ../reporting/rep107.php:210
-msgid "Total payments:"
-msgstr ""
-
-#: ../reporting/rep107.php:220
-#: ../reporting/rep109.php:155
-#: ../reporting/rep110.php:164
-#: ../reporting/rep111.php:140
-#: ../reporting/rep113.php:150
-#: ../sales/view/view_credit.php:138
-#: ../sales/view/view_dispatch.php:155
-#: ../sales/view/view_invoice.php:159
-#: ../sales/view/view_sales_order.php:245
-#: ../sales/view/view_sales_order.php.orig:227
-#: ../sales/includes/ui/sales_credit_ui.inc:222
-msgid "Shipping"
-msgstr ""
-
-#: ../reporting/rep107.php:266
-#: ../reporting/rep109.php:207
-#: ../reporting/rep111.php:192
-msgid "TOTAL ORDER VAT INCL."
-msgstr ""
-
-#: ../reporting/rep107.php:272
-msgid "THIS INVOICE"
-msgstr ""
-
-#: ../reporting/rep108.php:84
-#: ../reporting/rep108.php:115
-#: ../reporting/includes/doctext.inc:238
-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"
+#: ../reporting/rep108.php:170
+msgid "as of"
 msgstr ""
 
 #: ../reporting/rep109.php:66
+#: ../reporting/rep109.php:89
 #: ../reporting/rep109.php:94
-#: ../reporting/rep109.php:100
 #: ../reporting/includes/doctext.inc:65
 msgid "SALES ORDER"
 msgstr ""
 
 #: ../reporting/rep109.php:68
-#: ../reporting/rep109.php:89
-#: ../reporting/rep109.php:100
+#: ../reporting/rep109.php:84
+#: ../reporting/rep109.php:94
 #: ../reporting/includes/doctext.inc:65
 msgid "QUOTE"
 msgstr ""
 
-#: ../reporting/rep109.php:161
-#: ../reporting/rep111.php:146
+#: ../reporting/rep109.php:153
+#: ../reporting/rep110.php:162
+#: ../reporting/rep111.php:136
+#: ../reporting/rep113.php:147
+#: ../sales/view/view_credit.php:138
+#: ../sales/view/view_dispatch.php:155
+#: ../sales/view/view_invoice.php:159
+#: ../sales/view/view_sales_order.php:245
+#: ../sales/includes/ui/sales_credit_ui.inc:222
+msgid "Shipping"
+msgstr ""
+
+#: ../reporting/rep109.php:159
+#: ../reporting/rep111.php:142
 msgid "TOTAL ORDER EX VAT"
 msgstr ""
 
-#: ../reporting/rep110.php:68
-msgid "DELIVERY"
+#: ../reporting/rep109.php:205
+#: ../reporting/rep111.php:188
+msgid "TOTAL ORDER VAT INCL."
 msgstr ""
 
 #: ../reporting/rep110.php:70
-#: ../reporting/rep110.php:97
+msgid "DELIVERY"
+msgstr ""
+
+#: ../reporting/rep110.php:72
+#: ../reporting/rep110.php:93
 #: ../reporting/includes/doctext.inc:82
 msgid "PACKING SLIP"
 msgstr ""
 
-#: ../reporting/rep110.php:92
-#: ../reporting/rep110.php:103
+#: ../reporting/rep110.php:88
 #: ../reporting/includes/doctext.inc:82
 msgid "DELIVERY NOTE"
 msgstr ""
 
-#: ../reporting/rep110.php:208
+#: ../reporting/rep110.php:206
 msgid "TOTAL DELIVERY INCL. VAT"
 msgstr ""
 
-#: ../reporting/rep111.php:61
-#: ../reporting/rep111.php:86
+#: ../reporting/rep111.php:60
 #: ../reporting/includes/doctext.inc:50
 msgid "SALES QUOTATION"
 msgstr ""
 
-#: ../reporting/rep112.php:80
-#: ../reporting/rep112.php:101
+#: ../reporting/rep112.php:83
 #: ../reporting/includes/doctext.inc:198
 msgid "RECEIPT"
 msgstr ""
 
-#: ../reporting/rep112.php:110
-#: ../reporting/rep210.php:124
+#: ../reporting/rep112.php:114
+#: ../reporting/rep210.php:122
 msgid "As advance / full / part / payment towards:"
 msgstr ""
 
-#: ../reporting/rep112.php:145
+#: ../reporting/rep112.php:155
 msgid "TOTAL RECEIPT"
 msgstr ""
 
-#: ../reporting/rep112.php:155
+#: ../reporting/rep112.php:166
 msgid "Received / Sign"
 msgstr ""
 
-#: ../reporting/rep112.php:157
+#: ../reporting/rep112.php:168
 msgid "By Cash / Cheque* / Draft No."
 msgstr ""
 
-#: ../reporting/rep112.php:159
+#: ../reporting/rep112.php:170
 msgid "Dated"
 msgstr ""
 
-#: ../reporting/rep112.php:162
+#: ../reporting/rep112.php:173
 msgid "Drawn on Bank"
 msgstr ""
 
-#: ../reporting/rep113.php:66
-#: ../reporting/rep113.php:91
-#: ../reporting/rep113.php:96
+#: ../reporting/rep113.php:67
+#: ../reporting/rep113.php:86
 #: ../reporting/includes/doctext.inc:103
 msgid "CREDIT NOTE"
 msgstr ""
 
-#: ../reporting/rep113.php:194
+#: ../reporting/rep113.php:191
 #: ../sales/view/view_credit.php:143
 msgid "TOTAL CREDIT"
 msgstr ""
 
-#: ../reporting/rep114.php:85
+#: ../reporting/rep114.php:87
 msgid "Sales Summary Report"
 msgstr ""
 
-#: ../reporting/rep114.php:89
-#: ../reporting/reports_main.php:62
+#: ../reporting/rep114.php:91
+#: ../reporting/reports_main.php:66
 msgid "Tax Id Only"
 msgstr ""
 
-#: ../reporting/rep114.php:93
+#: ../reporting/rep114.php:95
 msgid "Tax Id"
 msgstr ""
 
-#: ../reporting/rep114.php:93
+#: ../reporting/rep114.php:95
 msgid "Total ex. Tax"
 msgstr ""
 
-#: ../reporting/rep114.php:93
-#: ../reporting/rep709.php:110
+#: ../reporting/rep114.php:95
+#: ../reporting/rep709.php:112
 #: ../taxes/tax_groups.php:171
-#: ../taxes/tax_groups.php.orig:173
-#: ../taxes/tax_groups.php.sav:173
 msgid "Tax"
 msgstr ""
 
-#: ../reporting/rep201.php:108
+#: ../reporting/rep201.php:100
 msgid "Balances in Home currency"
 msgstr ""
 
-#: ../reporting/rep201.php:129
+#: ../reporting/rep201.php:123
 msgid "Supplier Balances"
 msgstr ""
 
-#: ../reporting/rep202.php:142
+#: ../reporting/rep202.php:144
 msgid "currency"
 msgstr ""
 
-#: ../reporting/rep202.php:143
+#: ../reporting/rep202.php:145
 msgid "Aged Supplier Analysis"
 msgstr ""
 
-#: ../reporting/rep203.php:102
+#: ../reporting/rep203.php:104
 msgid "Payment Report"
 msgstr ""
 
-#: ../reporting/rep204.php:82
+#: ../reporting/rep204.php:84
 msgid "Qty Recd"
 msgstr ""
 
-#: ../reporting/rep204.php:82
+#: ../reporting/rep204.php:84
 msgid "qty Inv"
 msgstr ""
 
-#: ../reporting/rep204.php:83
+#: ../reporting/rep204.php:85
 msgid "Act Price"
 msgstr ""
 
-#: ../reporting/rep204.php:90
+#: ../reporting/rep204.php:92
 msgid "Outstanding GRNs Report"
 msgstr ""
 
-#: ../reporting/rep209.php:88
-#: ../reporting/rep209.php:107
-#: ../reporting/rep209.php:112
+#: ../reporting/rep205.php:102
+msgid "Contact Information"
+msgstr ""
+
+#: ../reporting/rep205.php:103
+msgid "Physical Address"
+msgstr ""
+
+#: ../reporting/rep205.php:111
+msgid "Supplier Details Listing"
+msgstr ""
+
+#: ../reporting/rep205.php:139
+msgid "Tax_Id"
+msgstr ""
+
+#: ../reporting/rep209.php:87
+#: ../reporting/rep209.php:100
 #: ../reporting/includes/doctext.inc:171
 msgid "PURCHASE ORDER"
 msgstr ""
 
-#: ../reporting/rep209.php:214
+#: ../reporting/rep209.php:209
 msgid "TOTAL PO"
 msgstr ""
 
-#: ../reporting/rep210.php:82
-#: ../reporting/rep210.php:110
-#: ../reporting/rep210.php:115
+#: ../reporting/rep210.php:84
+#: ../reporting/rep210.php:106
 #: ../reporting/includes/doctext.inc:151
 msgid "REMITTANCE"
 msgstr ""
 
-#: ../reporting/rep210.php:159
+#: ../reporting/rep210.php:165
 msgid "TOTAL REMITTANCE"
 msgstr ""
 
-#: ../reporting/rep301.php:112
+#: ../reporting/rep301.php:114
 msgid "Inventory Valuation Report"
 msgstr ""
 
-#: ../reporting/rep302.php:123
+#: ../reporting/rep302.php:125
 msgid "QOH"
 msgstr ""
 
-#: ../reporting/rep302.php:123
+#: ../reporting/rep302.php:125
 msgid "Cust Ord"
 msgstr ""
 
-#: ../reporting/rep302.php:123
+#: ../reporting/rep302.php:125
 msgid "Supp Ord"
 msgstr ""
 
-#: ../reporting/rep302.php:123
+#: ../reporting/rep302.php:125
 msgid "Sugg Ord"
 msgstr ""
 
-#: ../reporting/rep302.php:132
+#: ../reporting/rep302.php:134
 msgid "Inventory Planning Report"
 msgstr ""
 
-#: ../reporting/rep303.php:97
+#: ../reporting/rep303.php:109
 msgid "Shortage"
 msgstr ""
 
-#: ../reporting/rep303.php:109
-#: ../reporting/rep303.php:115
-#: ../reporting/rep305.php:98
+#: ../reporting/rep303.php:121
+#: ../reporting/rep303.php:127
+#: ../reporting/rep305.php:101
 msgid "Stock ID"
 msgstr ""
 
-#: ../reporting/rep303.php:109
+#: ../reporting/rep303.php:121
 msgid "Check"
 msgstr ""
 
-#: ../reporting/rep303.php:123
+#: ../reporting/rep303.php:135
 msgid "Only Shortage"
 msgstr ""
 
-#: ../reporting/rep303.php:131
+#: ../reporting/rep303.php:143
 msgid "Stock Check Sheets"
 msgstr ""
 
-#: ../reporting/rep304.php:112
-#: ../reporting/rep305.php:98
+#: ../reporting/rep304.php:114
+#: ../reporting/rep305.php:101
+#: ../reporting/rep306.php:141
+#: ../reporting/rep309.php:98
 msgid "Qty"
 msgstr ""
 
-#: ../reporting/rep304.php:112
+#: ../reporting/rep304.php:114
+#: ../reporting/rep309.php:98
 #: ../sales/manage/customer_branches.php:241
-#: ../sales/manage/customers.php:260
+#: ../sales/manage/customers.php:263
 #: ../sales/manage/sav.customers.php:259
 msgid "Sales"
 msgstr ""
 
-#: ../reporting/rep304.php:112
+#: ../reporting/rep304.php:114
 msgid "Cost"
 msgstr ""
 
-#: ../reporting/rep304.php:112
+#: ../reporting/rep304.php:114
 msgid "Contribution"
 msgstr ""
 
-#: ../reporting/rep304.php:124
+#: ../reporting/rep304.php:126
 msgid "Inventory Sales Report"
 msgstr ""
 
-#: ../reporting/rep305.php:98
+#: ../reporting/rep305.php:101
 msgid "PO No"
 msgstr ""
 
-#: ../reporting/rep305.php:98
+#: ../reporting/rep305.php:101
 msgid "Inv"
 msgstr ""
 
-#: ../reporting/rep305.php:98
+#: ../reporting/rep305.php:101
 msgid "Inv Price"
 msgstr ""
 
-#: ../reporting/rep305.php:98
+#: ../reporting/rep305.php:101
 msgid "PO Price"
 msgstr ""
 
-#: ../reporting/rep305.php:105
+#: ../reporting/rep305.php:108
 msgid "GRN Valuation Report"
 msgstr ""
 
-#: ../reporting/rep401.php:69
+#: ../reporting/rep306.php:141
+#: ../reporting/rep309.php:98
+msgid "Unit Price"
+msgstr ""
+
+#: ../reporting/rep306.php:154
+msgid "Inventory Purchasing Report"
+msgstr ""
+
+#: ../reporting/rep307.php:117
+msgid "Opening"
+msgstr ""
+
+#: ../reporting/rep307.php:126
+msgid "Inventory Movements"
+msgstr ""
+
+#: ../reporting/rep308.php:149
+msgid "OpeningStock"
+msgstr ""
+
+#: ../reporting/rep308.php:149
+msgid "StockIn"
+msgstr ""
+
+#: ../reporting/rep308.php:149
+msgid "ClosingStock"
+msgstr ""
+
+#: ../reporting/rep308.php:150
+msgid "QTY"
+msgstr ""
+
+#: ../reporting/rep308.php:150
+#: ../reporting/rep709.php:112
+#: ../taxes/item_tax_types.php:185
+msgid "Rate"
+msgstr ""
+
+#: ../reporting/rep308.php:159
+msgid "Costed Inventory Movements"
+msgstr ""
+
+#: ../reporting/rep309.php:98
+msgid "Item/Category"
+msgstr ""
+
+#: ../reporting/rep309.php:98
+msgid "Remark"
+msgstr ""
+
+#: ../reporting/rep309.php:106
+msgid "Item Sales Summary Report"
+msgstr ""
+
+#: ../reporting/rep309.php:147
+msgid "Gift"
+msgstr ""
+
+#: ../reporting/rep401.php:71
 msgid "Wrk Ctr"
 msgstr ""
 
-#: ../reporting/rep401.php:76
+#: ../reporting/rep401.php:78
 msgid "Bill of Material Listing"
 msgstr ""
 
-#: ../reporting/rep409.php:58
-#: ../reporting/rep409.php:77
-#: ../reporting/rep409.php:82
+#: ../reporting/rep409.php:60
+#: ../reporting/rep409.php:73
 #: ../reporting/includes/doctext.inc:214
 msgid "WORK ORDER"
 msgstr ""
 
-#: ../reporting/rep409.php:132
+#: ../reporting/rep409.php:129
 msgid "Insufficient stock"
 msgstr ""
 
-#: ../reporting/rep501.php:85
+#: ../reporting/rep501.php:87
 msgid "YTD"
 msgstr ""
 
-#: ../reporting/rep501.php:92
+#: ../reporting/rep501.php:94
 msgid "Dimension Summary"
 msgstr ""
 
-#: ../reporting/rep601.php:83
+#: ../reporting/rep601.php:86
 #: ../reporting/rep602.php:87
 #: ../reporting/includes/doctext.inc:260
 msgid "Bank Account"
 msgstr ""
 
-#: ../reporting/rep601.php:144
+#: ../reporting/rep601.php:151
 #: ../reporting/rep602.php:151
 msgid "Total Debit / Credit"
 msgstr ""
 
-#: ../reporting/rep601.php:161
+#: ../reporting/rep601.php:168
 #: ../reporting/rep602.php:167
 msgid "Net Change"
 msgstr ""
@@ -12529,108 +12472,122 @@ msgstr ""
 msgid "Bank Balance"
 msgstr ""
 
-#: ../reporting/rep702.php:51
+#: ../reporting/rep702.php:53
 msgid "Type/Account"
 msgstr ""
 
-#: ../reporting/rep702.php:51
+#: ../reporting/rep702.php:53
 msgid "Date/Dim."
 msgstr ""
 
-#: ../reporting/rep702.php:52
+#: ../reporting/rep702.php:54
 msgid "Person/Item/Memo"
 msgstr ""
 
-#: ../reporting/rep702.php:62
+#: ../reporting/rep702.php:64
 msgid "List of Journal Entries"
 msgstr ""
 
-#: ../reporting/rep704.php:67
+#: ../reporting/rep704.php:71
 msgid "GL Account Transactions"
 msgstr ""
 
-#: ../reporting/rep705.php:243
-#: ../reporting/rep705.php:256
-#: ../reporting/rep705.php:267
-#: ../reporting/reports_main.php:270
-#: ../reporting/reports_main.php:318
-#: ../reporting/reports_main.php:361
+#: ../reporting/rep705.php:247
+#: ../reporting/rep705.php:260
+#: ../reporting/rep705.php:271
 msgid "Year"
 msgstr ""
 
-#: ../reporting/rep705.php:249
-#: ../reporting/rep705.php:260
-#: ../reporting/rep705.php:269
-#: ../reporting/rep706.php:194
-#: ../reporting/rep706.php:202
-#: ../reporting/rep706.php:208
-#: ../reporting/rep707.php:218
-#: ../reporting/rep707.php:226
-#: ../reporting/rep707.php:232
+#: ../reporting/rep705.php:253
+#: ../reporting/rep705.php:264
+#: ../reporting/rep705.php:273
+#: ../reporting/rep706.php:198
+#: ../reporting/rep706.php:206
+#: ../reporting/rep706.php:212
+#: ../reporting/rep707.php:222
+#: ../reporting/rep707.php:230
+#: ../reporting/rep707.php:236
 msgid "Tags"
 msgstr ""
 
-#: ../reporting/rep705.php:250
-#: ../reporting/rep705.php:261
-#: ../reporting/rep705.php:270
+#: ../reporting/rep705.php:254
+#: ../reporting/rep705.php:265
+#: ../reporting/rep705.php:274
 msgid "Amounts in thousands"
 msgstr ""
 
-#: ../reporting/rep705.php:274
+#: ../reporting/rep705.php:278
 msgid "Annual Expense Breakdown"
 msgstr ""
 
-#: ../reporting/rep706.php:182
+#: ../reporting/rep706.php:186
 msgid "Close Balance"
 msgstr ""
 
-#: ../reporting/rep707.php:254
+#: ../reporting/rep706.php:308
+#: ../reporting/rep707.php:326
+#: ../reporting/rep708.php:51
+#: ../reporting/rep708.php:126
+#: ../sales/create_recurrent_invoices.php:134
+#: ../sales/manage/recurrent_invoices.php:102
+msgid "Group"
+msgstr ""
+
+#: ../reporting/rep707.php:258
 msgid "Profit and Loss Statement"
 msgstr ""
 
-#: ../reporting/rep709.php:91
+#: ../reporting/rep708.php:185
+msgid "Brought Forward"
+msgstr ""
+
+#: ../reporting/rep708.php:185
+msgid "This Period"
+msgstr ""
+
+#: ../reporting/rep708.php:283
+msgid ""
+"The Opening Balance is not in balance, probably due to a non closed Previous "
+"Fiscalyear."
+msgstr ""
+
+#: ../reporting/rep709.php:93
 msgid "Tax Report"
 msgstr ""
 
-#: ../reporting/rep709.php:109
+#: ../reporting/rep709.php:111
 msgid "Branch Name"
 msgstr ""
 
-#: ../reporting/rep709.php:110
+#: ../reporting/rep709.php:112
 msgid "Net"
 msgstr ""
 
-#: ../reporting/rep709.php:110
-#: ../taxes/item_tax_types.php:185
-msgid "Rate"
-msgstr ""
-
-#: ../reporting/rep709.php:176
+#: ../reporting/rep709.php:183
 msgid "Tax Rate"
 msgstr ""
 
-#: ../reporting/rep709.php:176
+#: ../reporting/rep709.php:183
 msgid "Net Tax"
 msgstr ""
 
-#: ../reporting/rep710.php:75
+#: ../reporting/rep710.php:77
 msgid "Time"
 msgstr ""
 
-#: ../reporting/rep710.php:75
+#: ../reporting/rep710.php:77
 msgid "Trans Date"
 msgstr ""
 
-#: ../reporting/rep710.php:76
+#: ../reporting/rep710.php:78
 msgid "Action"
 msgstr ""
 
-#: ../reporting/rep710.php:87
-#: ../reporting/reports_main.php:396
+#: ../reporting/rep710.php:89
 msgid "Audit Trail"
 msgstr ""
 
-#: ../reporting/rep710.php:107
+#: ../reporting/rep710.php:111
 msgid "Changed"
 msgstr ""
 
@@ -12643,353 +12600,196 @@ msgid "Customer &Balances"
 msgstr ""
 
 #: ../reporting/reports_main.php:37
-#: ../reporting/reports_main.php:44
-#: ../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 "Show Balance"
+msgstr ""
+
+#: ../reporting/reports_main.php:38
+#: ../reporting/reports_main.php:46
+#: ../reporting/reports_main.php:71
+#: ../reporting/reports_main.php:98
+#: ../reporting/reports_main.php:108
+#: ../reporting/reports_main.php:122
+#: ../reporting/reports_main.php:130
+#: ../reporting/reports_main.php:138
+#: ../reporting/reports_main.php:145
+#: ../reporting/reports_main.php:155
+#: ../reporting/reports_main.php:163
+#: ../reporting/reports_main.php:174
+#: ../reporting/reports_main.php:194
 msgid "Currency Filter"
 msgstr ""
 
-#: ../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:41
+#: ../reporting/reports_main.php:52
+#: ../reporting/reports_main.php:61
+#: ../reporting/reports_main.php:68
+#: ../reporting/reports_main.php:77
 #: ../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:93
+#: ../reporting/reports_main.php:103
+#: ../reporting/reports_main.php:112
+#: ../reporting/reports_main.php:119
+#: ../reporting/reports_main.php:126
+#: ../reporting/reports_main.php:134
+#: ../reporting/reports_main.php:141
+#: ../reporting/reports_main.php:147
+#: ../reporting/reports_main.php:158
+#: ../reporting/reports_main.php:169
+#: ../reporting/reports_main.php:177
+#: ../reporting/reports_main.php:182
+#: ../reporting/reports_main.php:189
+msgid "Orientation"
+msgstr ""
+
+#: ../reporting/reports_main.php:42
+#: ../reporting/reports_main.php:53
+#: ../reporting/reports_main.php:62
+#: ../reporting/reports_main.php:69
+#: ../reporting/reports_main.php:78
+#: ../reporting/reports_main.php:87
+#: ../reporting/reports_main.php:94
+#: ../reporting/reports_main.php:159
+#: ../reporting/reports_main.php:170
+#: ../reporting/reports_main.php:178
 #: ../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
+#: ../reporting/reports_main.php:190
 msgid "Destination"
 msgstr ""
 
-#: ../reporting/reports_main.php:41
+#: ../reporting/reports_main.php:43
 msgid "&Aged Customer Analysis"
 msgstr ""
 
-#: ../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
+#: ../reporting/reports_main.php:50
+#: ../reporting/reports_main.php:167
 msgid "Graphics"
 msgstr ""
 
-#: ../reporting/reports_main.php:51
+#: ../reporting/reports_main.php:54
 msgid "Customer &Detail Listing"
 msgstr ""
 
-#: ../reporting/reports_main.php:55
+#: ../reporting/reports_main.php:58
+#: ../reporting/reports_main.php:186
 msgid "Activity Greater Than"
 msgstr ""
 
-#: ../reporting/reports_main.php:56
+#: ../reporting/reports_main.php:59
+#: ../reporting/reports_main.php:187
 msgid "Activity Less Than"
 msgstr ""
 
-#: ../reporting/reports_main.php:59
+#: ../reporting/reports_main.php:63
 msgid "Sales &Summary Report"
 msgstr ""
 
-#: ../reporting/reports_main.php:65
+#: ../reporting/reports_main.php:70
 msgid "&Price Listing"
 msgstr ""
 
-#: ../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
+#: ../reporting/reports_main.php:72
+#: ../reporting/reports_main.php:82
 msgid "Inventory Category"
 msgstr ""
 
-#: ../reporting/reports_main.php:68
+#: ../reporting/reports_main.php:73
 #: ../sales/manage/sales_types.php:16
 msgid "Sales Types"
 msgstr ""
 
-#: ../reporting/reports_main.php:69
-#: ../reporting/reports_main.php:192
+#: ../reporting/reports_main.php:74
 msgid "Show Pictures"
 msgstr ""
 
-#: ../reporting/reports_main.php:73
+#: ../reporting/reports_main.php:79
 msgid "&Order Status Listing"
 msgstr ""
 
-#: ../reporting/reports_main.php:77
+#: ../reporting/reports_main.php:83
 msgid "Stock Location"
 msgstr ""
 
-#: ../reporting/reports_main.php:81
+#: ../reporting/reports_main.php:88
 msgid "&Salesman Listing"
 msgstr ""
 
-#: ../reporting/reports_main.php:87
+#: ../reporting/reports_main.php:95
 msgid "Print &Invoices"
 msgstr ""
 
-#: ../reporting/reports_main.php:91
-#: ../reporting/reports_main.php:98
-#: ../reporting/reports_main.php:104
+#: ../reporting/reports_main.php:99
+#: ../reporting/reports_main.php:109
+#: ../reporting/reports_main.php:116
 msgid "email Customers"
 msgstr ""
 
-#: ../reporting/reports_main.php:92
-#: ../reporting/reports_main.php:99
+#: ../reporting/reports_main.php:100
+#: ../reporting/reports_main.php:110
 msgid "Payment Link"
 msgstr ""
 
-#: ../reporting/reports_main.php:94
+#: ../reporting/reports_main.php:105
 msgid "Print &Credit Notes"
 msgstr ""
 
-#: ../reporting/reports_main.php:101
+#: ../reporting/reports_main.php:113
 msgid "Print &Deliveries"
 msgstr ""
 
-#: ../reporting/reports_main.php:105
+#: ../reporting/reports_main.php:117
 msgid "Print as Packing Slip"
 msgstr ""
 
-#: ../reporting/reports_main.php:107
+#: ../reporting/reports_main.php:120
 msgid "Print &Statements"
 msgstr ""
 
-#: ../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
+#: ../reporting/reports_main.php:131
+#: ../reporting/reports_main.php:139
+#: ../reporting/reports_main.php:195
 msgid "Email Customers"
 msgstr ""
 
-#: ../reporting/reports_main.php:113
+#: ../reporting/reports_main.php:127
 msgid "&Print Sales Orders"
 msgstr ""
 
-#: ../reporting/reports_main.php:118
+#: ../reporting/reports_main.php:132
 msgid "Print as Quote"
 msgstr ""
 
-#: ../reporting/reports_main.php:120
+#: ../reporting/reports_main.php:135
 msgid "&Print Sales Quotations"
 msgstr ""
 
-#: ../reporting/reports_main.php:126
-msgid "Print Receipts"
-msgstr ""
-
-#: ../reporting/reports_main.php:133
-msgid "Supplier &Balances"
-msgstr ""
-
-#: ../reporting/reports_main.php:141
-msgid "&Aged Supplier Analyses"
-msgstr ""
-
-#: ../reporting/reports_main.php:151
-msgid "&Payment Report"
-msgstr ""
-
-#: ../reporting/reports_main.php:158
-msgid "Outstanding &GRNs Report"
-msgstr ""
-
-#: ../reporting/reports_main.php:162
-msgid "Print Purchase &Orders"
-msgstr ""
-
-#: ../reporting/reports_main.php:168
-msgid "Print Remi&ttances"
-msgstr ""
-
-#: ../reporting/reports_main.php:177
-msgid "Inventory &Valuation Report"
-msgstr ""
-
-#: ../reporting/reports_main.php:184
-msgid "Inventory &Planning Report"
-msgstr ""
-
-#: ../reporting/reports_main.php:189
-msgid "Stock &Check Sheets"
-msgstr ""
-
-#: ../reporting/reports_main.php:193
-msgid "Inventory Column"
-msgstr ""
-
-#: ../reporting/reports_main.php:194
-msgid "Show Shortage"
-msgstr ""
-
-#: ../reporting/reports_main.php:198
-msgid "Inventory &Sales Report"
-msgstr ""
-
-#: ../reporting/reports_main.php:206
-msgid "&GRN Valuation Report"
-msgstr ""
-
-#: ../reporting/reports_main.php:212
-msgid "Manufacturing"
-msgstr ""
-
-#: ../reporting/reports_main.php:213
-msgid "&Bill of Material Listing"
-msgstr ""
-
-#: ../reporting/reports_main.php:214
-msgid "From product"
-msgstr ""
-
-#: ../reporting/reports_main.php:215
-msgid "To product"
-msgstr ""
-
-#: ../reporting/reports_main.php:218
-msgid "Print &Work Orders"
-msgstr ""
-
-#: ../reporting/reports_main.php:221
-msgid "Email Locations"
-msgstr ""
-
-#: ../reporting/reports_main.php:226
-msgid "Dimension &Summary"
-msgstr ""
-
-#: ../reporting/reports_main.php:227
-msgid "From Dimension"
-msgstr ""
-
-#: ../reporting/reports_main.php:228
-msgid "To Dimension"
-msgstr ""
-
-#: ../reporting/reports_main.php:229
-msgid "Show Balance"
-msgstr ""
-
-#: ../reporting/reports_main.php:236
-msgid "Banking"
-msgstr ""
-
-#: ../reporting/reports_main.php:237
-msgid "Bank &Statement"
-msgstr ""
-
-#: ../reporting/reports_main.php:244
-msgid "General Ledger"
-msgstr ""
-
-#: ../reporting/reports_main.php:245
-msgid "Chart of &Accounts"
-msgstr ""
-
-#: ../reporting/reports_main.php:246
-msgid "Show Balances"
-msgstr ""
-
-#: ../reporting/reports_main.php:249
-msgid "List of &Journal Entries"
-msgstr ""
-
-#: ../reporting/reports_main.php:260
-#: ../reporting/reports_main.php:309
-#: ../reporting/reports_main.php:353
-msgid "GL Account &Transactions"
-msgstr ""
-
-#: ../reporting/reports_main.php:263
-#: ../reporting/reports_main.php:312
-#: ../reporting/reports_main.php:356
-msgid "From Account"
-msgstr ""
-
-#: ../reporting/reports_main.php:264
-#: ../reporting/reports_main.php:313
-#: ../reporting/reports_main.php:357
-msgid "To Account"
+#: ../reporting/reports_main.php:142
+msgid "Print Receipts"
 msgstr ""
 
-#: ../reporting/reports_main.php:269
-#: ../reporting/reports_main.php:317
-#: ../reporting/reports_main.php:360
-msgid "Annual &Expense Breakdown"
+#: ../reporting/reports_main.php:150
+msgid "Supplier &Balances"
 msgstr ""
 
-#: ../reporting/reports_main.php:276
-#: ../reporting/reports_main.php:323
-#: ../reporting/reports_main.php:365
-msgid "&Balance Sheet"
+#: ../reporting/reports_main.php:160
+msgid "&Aged Supplier Analyses"
 msgstr ""
 
-#: ../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"
+#: ../reporting/reports_main.php:171
+msgid "&Payment Report"
 msgstr ""
 
-#: ../reporting/reports_main.php:286
-#: ../reporting/reports_main.php:332
-#: ../reporting/reports_main.php:373
-msgid "&Profit and Loss Statement"
+#: ../reporting/reports_main.php:179
+msgid "Outstanding &GRNs Report"
 msgstr ""
 
-#: ../reporting/reports_main.php:300
-#: ../reporting/reports_main.php:345
-#: ../reporting/reports_main.php:385
-msgid "Zero values"
+#: ../reporting/reports_main.php:184
+msgid "Supplier &Detail Listing"
 msgstr ""
 
-#: ../reporting/reports_main.php:390
-msgid "Ta&x Report"
+#: ../reporting/reports_main.php:191
+msgid "Print Purchase &Orders"
 msgstr ""
 
 #: ../reporting/includes/doctext.inc:18
@@ -13010,7 +12810,7 @@ msgstr ""
 #: ../sales/view/view_dispatch.php:113
 #: ../sales/view/view_invoice.php:116
 #: ../sales/includes/ui/sales_credit_ui.inc:168
-#: ../sales/includes/ui/sales_order_ui.inc.orig:142
+#: ../sales/includes/ui/sales_order_ui.inc:147
 msgid "Discount %"
 msgstr ""
 
@@ -13031,7 +12831,7 @@ msgstr ""
 #: ../reporting/includes/doctext.inc:184
 #: ../reporting/includes/doctext.inc:202
 #: ../reporting/includes/doctext.inc:240
-msgid "Customers Reference"
+msgid "Customer's Reference"
 msgstr ""
 
 #: ../reporting/includes/doctext.inc:57
@@ -13063,9 +12863,8 @@ msgstr ""
 
 #: ../reporting/includes/doctext.inc:60
 #: ../sales/view/view_sales_order.php:69
-#: ../sales/view/view_sales_order.php.orig:69
-#: ../sales/inquiry/sales_orders_view.php:304
-#: ../sales/includes/ui/sales_order_ui.inc.orig:606
+#: ../sales/inquiry/sales_orders_view.php.orig:304
+#: ../sales/includes/ui/sales_order_ui.inc:612
 msgid "Valid until"
 msgstr ""
 
@@ -13081,8 +12880,6 @@ msgstr ""
 #: ../reporting/includes/doctext.inc:97
 #: ../reporting/includes/doctext.inc:111
 #: ../reporting/includes/doctext.inc:138
-#: ../reporting/includes/doctext.inc:164
-#: ../reporting/includes/doctext.inc:187
 #: ../reporting/includes/doctext.inc:205
 #: ../reporting/includes/doctext.inc:243
 #: ../sales/view/view_dispatch.php:87
@@ -13114,6 +12911,10 @@ msgstr ""
 msgid "FINAL INVOICE"
 msgstr ""
 
+#: ../reporting/includes/doctext.inc:118
+msgid "INVOICE"
+msgstr ""
+
 #: ../reporting/includes/doctext.inc:119
 msgid "Invoice No."
 msgstr ""
@@ -13164,7 +12965,7 @@ msgid "DueDate"
 msgstr ""
 
 #: ../reporting/includes/doctext.inc:272
-#: ../reporting/includes/pdf_report.inc:1014
+#: ../reporting/includes/pdf_report.inc:1020
 msgid "You can pay through"
 msgstr ""
 
@@ -13221,40 +13022,38 @@ msgstr ""
 msgid "Report Period"
 msgstr ""
 
-#: ../reporting/includes/pdf_report.inc:981
-msgid "You have no email contact defined for this type of document"
+#: ../reporting/includes/pdf_report.inc:987
+#: ../reporting/includes/pdf_report.inc:1035
+#, php-format
+msgid "You have no email contact defined for this type of document for '%s'."
 msgstr ""
 
-#: ../reporting/includes/pdf_report.inc:1000
+#: ../reporting/includes/pdf_report.inc:1006
 msgid "Dear"
 msgstr ""
 
-#: ../reporting/includes/pdf_report.inc:1001
+#: ../reporting/includes/pdf_report.inc:1007
 msgid "Attached you will find "
 msgstr ""
 
-#: ../reporting/includes/pdf_report.inc:1017
+#: ../reporting/includes/pdf_report.inc:1023
 msgid "Kindest regards"
 msgstr ""
 
-#: ../reporting/includes/pdf_report.inc:1029
-msgid "There is no contact email set for this document type."
-msgstr ""
-
-#: ../reporting/includes/pdf_report.inc:1032
+#: ../reporting/includes/pdf_report.inc:1038
 msgid "Sending document by email failed"
 msgstr ""
 
-#: ../reporting/includes/pdf_report.inc:1032
-#: ../reporting/includes/pdf_report.inc:1035
+#: ../reporting/includes/pdf_report.inc:1038
+#: ../reporting/includes/pdf_report.inc:1041
 msgid "Email:"
 msgstr ""
 
-#: ../reporting/includes/pdf_report.inc:1035
+#: ../reporting/includes/pdf_report.inc:1041
 msgid "has been sent by email to destination."
 msgstr ""
 
-#: ../reporting/includes/pdf_report.inc:1065
+#: ../reporting/includes/pdf_report.inc:1071
 msgid "Report has been sent to network printer "
 msgstr ""
 
@@ -13310,70 +13109,78 @@ msgstr ""
 msgid "PDF/Printer"
 msgstr ""
 
-#: ../reporting/includes/reports_classes.inc:242
+#: ../reporting/includes/reports_classes.inc:238
+msgid "Portrait"
+msgstr ""
+
+#: ../reporting/includes/reports_classes.inc:238
+msgid "Landscape"
+msgstr ""
+
+#: ../reporting/includes/reports_classes.inc:249
 msgid "No Graphics"
 msgstr ""
 
-#: ../reporting/includes/reports_classes.inc:242
+#: ../reporting/includes/reports_classes.inc:249
 msgid "Vertical bars"
 msgstr ""
 
-#: ../reporting/includes/reports_classes.inc:242
+#: ../reporting/includes/reports_classes.inc:249
 msgid "Horizontal bars"
 msgstr ""
 
-#: ../reporting/includes/reports_classes.inc:243
+#: ../reporting/includes/reports_classes.inc:250
 msgid "Dots"
 msgstr ""
 
-#: ../reporting/includes/reports_classes.inc:243
+#: ../reporting/includes/reports_classes.inc:250
 msgid "Lines"
 msgstr ""
 
-#: ../reporting/includes/reports_classes.inc:243
+#: ../reporting/includes/reports_classes.inc:250
 msgid "Pie"
 msgstr ""
 
-#: ../reporting/includes/reports_classes.inc:243
+#: ../reporting/includes/reports_classes.inc:250
 msgid "Donut"
 msgstr ""
 
-#: ../reporting/includes/reports_classes.inc:247
-#: ../reporting/includes/reports_classes.inc:250
+#: ../reporting/includes/reports_classes.inc:254
+#: ../reporting/includes/reports_classes.inc:257
 msgid "No Type Filter"
 msgstr ""
 
-#: ../reporting/includes/reports_classes.inc:260
+#: ../reporting/includes/reports_classes.inc:267
 msgid "No Account Group Filter"
 msgstr ""
 
-#: ../reporting/includes/reports_classes.inc:275
-#: ../reporting/includes/reports_classes.inc:281
-#: ../reporting/includes/reports_classes.inc:287
+#: ../reporting/includes/reports_classes.inc:282
+#: ../reporting/includes/reports_classes.inc:288
+#: ../reporting/includes/reports_classes.inc:294
 msgid "No Dimension Filter"
 msgstr ""
 
-#: ../reporting/includes/reports_classes.inc:293
+#: ../reporting/includes/reports_classes.inc:300
 msgid "No Customer Filter"
 msgstr ""
 
-#: ../reporting/includes/reports_classes.inc:301
+#: ../reporting/includes/reports_classes.inc:308
 msgid "No Supplier Filter"
 msgstr ""
 
-#: ../reporting/includes/reports_classes.inc:383
+#: ../reporting/includes/reports_classes.inc:393
 msgid "No Location Filter"
 msgstr ""
 
-#: ../reporting/includes/reports_classes.inc:386
+#: ../reporting/includes/reports_classes.inc:396
 msgid "No Category Filter"
 msgstr ""
 
-#: ../reporting/includes/reports_classes.inc:395
+#: ../reporting/includes/reports_classes.inc:405
 msgid "No Sales Folk Filter"
 msgstr ""
 
-#: ../reporting/includes/reports_classes.inc:402
+#: ../reporting/includes/reports_classes.inc:412
 msgid "No Users Filter"
 msgstr ""
 
@@ -13381,60 +13188,60 @@ msgstr ""
 msgid "Create and Print Recurrent Invoices"
 msgstr ""
 
-#: ../sales/create_recurrent_invoices.php:42
+#: ../sales/create_recurrent_invoices.php:44
 #, php-format
 msgid "Recurrent Invoice covers period %s - %s."
 msgstr ""
 
-#: ../sales/create_recurrent_invoices.php:108
+#: ../sales/create_recurrent_invoices.php:110
 #, php-format
 msgid "%s recurrent invoice(s) created, # %s - # %s."
 msgstr ""
 
-#: ../sales/create_recurrent_invoices.php:113
+#: ../sales/create_recurrent_invoices.php:115
 #, php-format
 msgid "&Print Recurrent Invoices # %s - # %s"
 msgstr ""
 
-#: ../sales/create_recurrent_invoices.php:115
+#: ../sales/create_recurrent_invoices.php:117
 #, php-format
 msgid "&Email Recurrent Invoices # %s - # %s"
 msgstr ""
 
-#: ../sales/create_recurrent_invoices.php:127
+#: ../sales/create_recurrent_invoices.php:129
 msgid "Invoice date:"
 msgstr ""
 
-#: ../sales/create_recurrent_invoices.php:132
+#: ../sales/create_recurrent_invoices.php:134
 #: ../sales/manage/recurrent_invoices.php:102
 msgid "Template No"
 msgstr ""
 
-#: ../sales/create_recurrent_invoices.php:132
+#: ../sales/create_recurrent_invoices.php:134
 #: ../sales/manage/recurrent_invoices.php:102
 msgid "Begin"
 msgstr ""
 
-#: ../sales/create_recurrent_invoices.php:132
+#: ../sales/create_recurrent_invoices.php:134
 #: ../sales/manage/recurrent_invoices.php:102
 msgid "End"
 msgstr ""
 
-#: ../sales/create_recurrent_invoices.php:132
+#: ../sales/create_recurrent_invoices.php:134
 #: ../sales/manage/recurrent_invoices.php:102
 #: ../sales/manage/recurrent_invoices.php:185
 msgid "Last Created"
 msgstr ""
 
-#: ../sales/create_recurrent_invoices.php:173
+#: ../sales/create_recurrent_invoices.php:175
 msgid "Create Invoices"
 msgstr ""
 
-#: ../sales/create_recurrent_invoices.php:181
+#: ../sales/create_recurrent_invoices.php:183
 msgid "Marked items are due."
 msgstr ""
 
-#: ../sales/create_recurrent_invoices.php:183
+#: ../sales/create_recurrent_invoices.php:185
 msgid "No recurrent invoices are due."
 msgstr ""
 
@@ -13444,7 +13251,7 @@ msgid "Modifying Customer Credit Note #%d"
 msgstr ""
 
 #: ../sales/credit_note_entry.php:51
-#: ../sales/sales_order_entry.php:692
+#: ../sales/sales_order_entry.php:700
 msgid ""
 "There are no customers, or there are no customers with branches. Please "
 "define customers and customer branches."
@@ -13602,100 +13409,80 @@ msgid "Update credit value for quantities entered"
 msgstr ""
 
 #: ../sales/customer_delivery.php:37
-#: ../sales/customer_delivery.php.orig:37
 #, php-format
 msgid "Modifying Delivery Note # %d."
 msgstr ""
 
 #: ../sales/customer_delivery.php:41
-#: ../sales/customer_delivery.php.orig:41
 msgid "Deliver Items for a Sales Order"
 msgstr ""
 
 #: ../sales/customer_delivery.php:50
-#: ../sales/customer_delivery.php.orig:50
 #: ../sales/sales_order_entry.php:189
 #, php-format
 msgid "Delivery # %d has been entered."
 msgstr ""
 
 #: ../sales/customer_delivery.php:52
-#: ../sales/customer_delivery.php.orig:52
 #: ../sales/sales_order_entry.php:191
 msgid "&View This Delivery"
 msgstr ""
 
 #: ../sales/customer_delivery.php:54
 #: ../sales/customer_delivery.php:76
-#: ../sales/customer_delivery.php.orig:54
-#: ../sales/customer_delivery.php.orig:76
 #: ../sales/sales_order_entry.php:193
 msgid "&Print Delivery Note"
 msgstr ""
 
 #: ../sales/customer_delivery.php:55
 #: ../sales/customer_delivery.php:77
-#: ../sales/customer_delivery.php.orig:55
-#: ../sales/customer_delivery.php.orig:77
 #: ../sales/sales_order_entry.php:194
 msgid "&Email Delivery Note"
 msgstr ""
 
 #: ../sales/customer_delivery.php:56
 #: ../sales/customer_delivery.php:78
-#: ../sales/customer_delivery.php.orig:56
-#: ../sales/customer_delivery.php.orig:78
 #: ../sales/sales_order_entry.php:195
 msgid "P&rint as Packing Slip"
 msgstr ""
 
 #: ../sales/customer_delivery.php:57
 #: ../sales/customer_delivery.php:79
-#: ../sales/customer_delivery.php.orig:57
-#: ../sales/customer_delivery.php.orig:79
 #: ../sales/sales_order_entry.php:196
 msgid "E&mail as Packing Slip"
 msgstr ""
 
 #: ../sales/customer_delivery.php:59
-#: ../sales/customer_delivery.php.orig:59
 #: ../sales/sales_order_entry.php:199
 msgid "View the GL Journal Entries for this Dispatch"
 msgstr ""
 
 #: ../sales/customer_delivery.php:62
-#: ../sales/customer_delivery.php.orig:62
 msgid "Invoice This Delivery"
 msgstr ""
 
 #: ../sales/customer_delivery.php:64
-#: ../sales/customer_delivery.php.orig:64
 msgid "Select Another Order For Dispatch"
 msgstr ""
 
 #: ../sales/customer_delivery.php:72
-#: ../sales/customer_delivery.php.orig:72
 #, php-format
 msgid "Delivery Note # %d has been updated."
 msgstr ""
 
 #: ../sales/customer_delivery.php:74
-#: ../sales/customer_delivery.php.orig:74
 msgid "View this delivery"
 msgstr ""
 
 #: ../sales/customer_delivery.php:82
-#: ../sales/customer_delivery.php.orig:82
 msgid "Confirm Delivery and Invoice"
 msgstr ""
 
 #: ../sales/customer_delivery.php:84
-#: ../sales/customer_delivery.php.orig:84
 msgid "Select A Different Delivery"
 msgstr ""
 
 #: ../sales/customer_delivery.php:94
-#: ../sales/customer_delivery.php.orig:94
 #: ../sales/customer_invoice.php:152
 msgid ""
 "You have to set Deferred Income Account in GL Setup to entry prepayment "
@@ -13703,151 +13490,144 @@ msgid ""
 msgstr ""
 
 #: ../sales/customer_delivery.php:97
-#: ../sales/customer_delivery.php.orig:97
 msgid "This order has no items. There is nothing to delivery."
 msgstr ""
 
 #: ../sales/customer_delivery.php:100
 #: ../sales/customer_delivery.php:105
-#: ../sales/customer_delivery.php.orig:100
-#: ../sales/customer_delivery.php.orig:105
 msgid "Select a different sales order to delivery"
 msgstr ""
 
 #: ../sales/customer_delivery.php:103
-#: ../sales/customer_delivery.php.orig:103
 msgid ""
 "This prepayment order is not yet ready for delivery due to insufficient "
 "amount received."
 msgstr ""
 
 #: ../sales/customer_delivery.php:122
-#: ../sales/customer_delivery.php.orig:122
 msgid "Select a different delivery"
 msgstr ""
 
 #: ../sales/customer_delivery.php:123
-#: ../sales/customer_delivery.php.orig:123
 msgid "This delivery has all items invoiced. There is nothing to modify."
 msgstr ""
 
 #: ../sales/customer_delivery.php:133
-#: ../sales/customer_delivery.php.orig:133
 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:135
-#: ../sales/customer_delivery.php.orig:135
 msgid "Select a Sales Order to Delivery"
 msgstr ""
 
 #: ../sales/customer_delivery.php:144
-#: ../sales/customer_delivery.php.orig:144
 msgid ""
 "Selected quantity cannot be less than quantity invoiced nor more than "
 "quantity\tnot dispatched on sales order."
 msgstr ""
 
 #: ../sales/customer_delivery.php:147
-#: ../sales/customer_delivery.php.orig:147
 msgid "Freight cost cannot be less than zero"
 msgstr ""
 
 #: ../sales/customer_delivery.php:159
-#: ../sales/customer_delivery.php.orig:159
 msgid "The entered date of delivery is invalid."
 msgstr ""
 
 #: ../sales/customer_delivery.php:171
-#: ../sales/customer_delivery.php.orig:171
 msgid "The entered dead-line for invoice is invalid."
 msgstr ""
 
 #: ../sales/customer_delivery.php:188
-#: ../sales/customer_delivery.php.orig:194
 #: ../sales/customer_invoice.php:345
 msgid "The entered shipping value is not numeric."
 msgstr ""
 
 #: ../sales/customer_delivery.php:194
-#: ../sales/customer_delivery.php.orig:200
 msgid "There are no item quantities on this delivery note."
 msgstr ""
 
 #: ../sales/customer_delivery.php:297
-#: ../sales/customer_delivery.php.orig:303
-#: ../sales/sales_order_entry.php:521
-#: ../sales/includes/ui/sales_order_ui.inc.orig:244
+#: ../sales/sales_order_entry.php:529
+#: ../sales/includes/ui/sales_order_ui.inc:251
 msgid ""
 "The delivery cannot be processed because there is an insufficient quantity "
 "for item:"
 msgstr ""
 
-#: ../sales/customer_delivery.php.orig:366
+#: ../sales/customer_delivery.php:367
 msgid "For Sales Order"
 msgstr ""
 
-#: ../sales/customer_delivery.php.orig:375
+#: ../sales/customer_delivery.php:376
 msgid "Delivery From"
 msgstr ""
 
-#: ../sales/customer_delivery.php.orig:424
+#: ../sales/customer_delivery.php:425
 msgid "Invoice Dead-line"
 msgstr ""
 
-#: ../sales/customer_delivery.php.orig:434
+#: ../sales/customer_delivery.php:435
 #: ../sales/customer_invoice.php:530
 #: ../sales/includes/ui/sales_order_ui.inc:84
-#: ../sales/includes/ui/sales_order_ui.inc.orig:82
-#: ../sales/includes/ui/sales_order_ui.inc.orig:368
+#: ../sales/includes/ui/sales_order_ui.inc:375
 msgid ""
 "The selected customer account is currently on hold. Please contact the "
 "credit control personnel to discuss."
 msgstr ""
 
-#: ../sales/customer_delivery.php.orig:439
+#: ../sales/customer_delivery.php:440
 msgid "Delivery Items"
 msgstr ""
 
-#: ../sales/customer_delivery.php.orig:445
+#: ../sales/customer_delivery.php:446
 msgid "Max. delivery"
 msgstr ""
 
-#: ../sales/customer_delivery.php.orig:445
+#: ../sales/customer_delivery.php:446
 #: ../sales/customer_invoice.php:544
-#: ../sales/includes/ui/sales_order_ui.inc.orig:141
-msgid "Delivered"
+msgid "Invoiced"
 msgstr ""
 
-#: ../sales/customer_delivery.php.orig:506
+#: ../sales/customer_delivery.php:517
 #: ../sales/customer_invoice.php:633
 msgid "Shipping Cost"
 msgstr ""
 
-#: ../sales/customer_delivery.php.orig:526
-#: ../sales/includes/ui/sales_order_ui.inc.orig:242
+#: ../sales/customer_delivery.php:537
+#: ../sales/includes/ui/sales_order_ui.inc:249
 msgid ""
 "Marked items have insufficient quantities in stock as on day of delivery."
 msgstr ""
 
-#: ../sales/customer_delivery.php.orig:530
+#: ../sales/customer_delivery.php:541
 msgid "Action For Balance"
 msgstr ""
 
-#: ../sales/customer_delivery.php.orig:537
+#: ../sales/customer_delivery.php:548
+#: ../sales/customer_delivery.php:550
+#: ../sales/customer_delivery.php:553
 #: ../sales/customer_invoice.php:685
 msgid "Refresh document page"
 msgstr ""
 
-#: ../sales/customer_delivery.php.orig:538
+#: ../sales/customer_delivery.php:550
+msgid "Reset quantity"
+msgstr ""
+
+#: ../sales/customer_delivery.php:553
+msgid "Clear quantity"
+msgstr ""
+
+#: ../sales/customer_delivery.php:555
 msgid "Process Dispatch"
 msgstr ""
 
-#: ../sales/customer_delivery.php.orig:539
+#: ../sales/customer_delivery.php:556
 #: ../sales/customer_invoice.php:687
-#: ../sales/sales_order_entry.php:739
+#: ../sales/sales_order_entry.php:747
 msgid "Check entered data and save document"
 msgstr ""
 
@@ -13967,7 +13747,7 @@ msgid "Payment terms:"
 msgstr ""
 
 #: ../sales/customer_invoice.php:536
-#: ../sales/sales_order_entry.php:715
+#: ../sales/sales_order_entry.php:723
 msgid "Sales Order Items"
 msgstr ""
 
@@ -14003,96 +13783,135 @@ msgstr ""
 msgid "Left to be invoiced:"
 msgstr ""
 
-#: ../sales/customer_payments.php:33
+#: ../sales/customer_payments.php:32
+#: ../sales/customer_payments.php.orig:33
 msgid "Customer Payment Entry"
 msgstr ""
 
-#: ../sales/customer_payments.php:37
+#: ../sales/customer_payments.php:36
+#: ../sales/customer_payments.php.orig:37
 msgid "There are no customers defined in the system."
 msgstr ""
 
-#: ../sales/customer_payments.php:68
+#: ../sales/customer_payments.php:70
+#: ../sales/customer_payments.php.orig:68
 msgid "Invalid sales invoice number."
 msgstr ""
 
-#: ../sales/customer_payments.php:92
+#: ../sales/customer_payments.php:97
+#: ../sales/customer_payments.php.orig:92
 msgid "The customer payment has been successfully entered."
 msgstr ""
 
-#: ../sales/customer_payments.php:94
-#: ../sales/customer_payments.php:109
+#: ../sales/customer_payments.php:99
+#: ../sales/customer_payments.php:118
+#: ../sales/customer_payments.php.orig:94
+#: ../sales/customer_payments.php.orig:109
 msgid "&Print This Receipt"
 msgstr ""
 
-#: ../sales/customer_payments.php:96
-#: ../sales/customer_payments.php:111
-msgid "&View the GL Journal Entries for this Customer Payment"
+#: ../sales/customer_payments.php:101
+msgid "&View this Customer Payment"
 msgstr ""
 
-#: ../sales/customer_payments.php:100
-#: ../sales/customer_payments.php:115
+#: ../sales/customer_payments.php:103
+#: ../sales/customer_payments.php:126
+#: ../sales/customer_payments.php.orig:100
+#: ../sales/customer_payments.php.orig:115
 msgid "Enter Another &Customer Payment"
 msgstr ""
 
-#: ../sales/customer_payments.php:107
+#: ../sales/customer_payments.php:105
+msgid "Enter Payment to &Supplier"
+msgstr ""
+
+#: ../sales/customer_payments.php:109
+#: ../sales/customer_payments.php:120
+#: ../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:116
+#: ../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:346
+#: ../sales/customer_payments.php:124
+msgid "Select Another Customer Payment for &Edition"
+msgstr ""
+
+#: ../sales/customer_payments.php:139
+#: ../sales/customer_payments.php.orig:128
+#: ../sales/sales_order_entry.php:347
 msgid "There is no customer selected."
 msgstr ""
 
-#: ../sales/customer_payments.php:135
-#: ../sales/sales_order_entry.php:353
+#: ../sales/customer_payments.php:146
+#: ../sales/customer_payments.php.orig:135
+#: ../sales/sales_order_entry.php:354
 msgid "This customer has no branch defined."
 msgstr ""
 
-#: ../sales/customer_payments.php:141
+#: ../sales/customer_payments.php:152
+#: ../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:171
-#: ../sales/customer_payments.php:177
+#: ../sales/customer_payments.php:182
+#: ../sales/customer_payments.php:188
+#: ../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:203
+#: ../sales/customer_payments.php:214
+#: ../sales/customer_payments.php.orig:203
 msgid "The entered discount is not a valid number."
 msgstr ""
 
-#: ../sales/customer_payments.php:210
+#: ../sales/customer_payments.php:221
+msgid ""
+"The balance of the amount and discount is zero or negative. Please enter "
+"valid amounts."
+msgstr ""
+
+#: ../sales/customer_payments.php:228
+msgid "The entered payment amount is zero or negative."
+msgstr ""
+
+#: ../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:338
-#: ../sales/customer_payments.php:340
+#: ../sales/customer_payments.php.orig:338
+#: ../sales/customer_payments.php.orig:340
 msgid "From Customer:"
 msgstr ""
 
-#: ../sales/customer_payments.php:381
+#: ../sales/customer_payments.php.orig:381
 msgid "Into Bank Account:"
 msgstr ""
 
-#: ../sales/customer_payments.php:386
+#: ../sales/customer_payments.php.orig:386
 msgid "Date of Deposit:"
 msgstr ""
 
-#: ../sales/customer_payments.php:408
+#: ../sales/customer_payments.php.orig:408
 msgid "Customer prompt payment discount :"
 msgstr ""
 
-#: ../sales/customer_payments.php:417
+#: ../sales/customer_payments.php.orig:417
 msgid "Amount and discount are in customer's currency."
 msgstr ""
 
-#: ../sales/customer_payments.php:422
+#: ../sales/customer_payments.php.orig:422
 msgid "Update Payment"
 msgstr ""
 
-#: ../sales/customer_payments.php:424
+#: ../sales/customer_payments.php.orig:424
 msgid "Add Payment"
 msgstr ""
 
@@ -14232,178 +14051,192 @@ msgstr ""
 msgid "Enter a &New Direct Invoice"
 msgstr ""
 
-#: ../sales/sales_order_entry.php:376
+#: ../sales/sales_order_entry.php:377
 msgid "Pre-payment required have to be positive and less than total amount."
 msgstr ""
 
-#: ../sales/sales_order_entry.php:381
+#: ../sales/sales_order_entry.php:382
 msgid ""
 "You must enter the person or company to whom delivery should be made to."
 msgstr ""
 
-#: ../sales/sales_order_entry.php:388
+#: ../sales/sales_order_entry.php:389
 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:397
+#: ../sales/sales_order_entry.php:398
 msgid "The shipping cost entered is expected to be numeric."
 msgstr ""
 
-#: ../sales/sales_order_entry.php:403
+#: ../sales/sales_order_entry.php:404
 msgid "The Valid date is invalid."
 msgstr ""
 
-#: ../sales/sales_order_entry.php:405
+#: ../sales/sales_order_entry.php:406
 msgid "The delivery date is invalid."
 msgstr ""
 
-#: ../sales/sales_order_entry.php:412
+#: ../sales/sales_order_entry.php:413
 msgid "The requested valid date is before the date of the quotation."
 msgstr ""
 
-#: ../sales/sales_order_entry.php:414
+#: ../sales/sales_order_entry.php:415
 msgid "The requested delivery date is before the date of the order."
 msgstr ""
 
-#: ../sales/sales_order_entry.php:423
+#: ../sales/sales_order_entry.php:424
 msgid "You need to define a cash account for your Sales Point."
 msgstr ""
 
-#: ../sales/sales_order_entry.php:500
+#: ../sales/sales_order_entry.php:462
+msgid ""
+"The reference number field has been increased. Please save the document "
+"again."
+msgstr ""
+
+#: ../sales/sales_order_entry.php:508
 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:504
+#: ../sales/sales_order_entry.php:512
 msgid "Price for inventory item must be entered and can not be less than 0"
 msgstr ""
 
-#: ../sales/sales_order_entry.php:511
+#: ../sales/sales_order_entry.php:519
 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:542
+#: ../sales/sales_order_entry.php:550
 #, php-format
 msgid "Price %s is below Standard Cost %s"
 msgstr ""
 
-#: ../sales/sales_order_entry.php:567
+#: ../sales/sales_order_entry.php:575
 msgid ""
 "This item cannot be deleted because some of it has already been delivered."
 msgstr ""
 
-#: ../sales/sales_order_entry.php:596
+#: ../sales/sales_order_entry.php:604
 msgid "Direct delivery entry has been cancelled as requested."
 msgstr ""
 
-#: ../sales/sales_order_entry.php:597
+#: ../sales/sales_order_entry.php:605
 msgid "Enter a New Sales Delivery"
 msgstr ""
 
-#: ../sales/sales_order_entry.php:600
+#: ../sales/sales_order_entry.php:607
 msgid "Direct invoice entry has been cancelled as requested."
 msgstr ""
 
-#: ../sales/sales_order_entry.php:601
+#: ../sales/sales_order_entry.php:608
 msgid "Enter a New Sales Invoice"
 msgstr ""
 
-#: ../sales/sales_order_entry.php:606
-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:611
+#: ../sales/sales_order_entry.php:612
 msgid "This sales quotation has been cancelled as requested."
 msgstr ""
 
-#: ../sales/sales_order_entry.php:612
+#: ../sales/sales_order_entry.php:613
 msgid "Enter a New Sales Quotation"
 msgstr ""
 
-#: ../sales/sales_order_entry.php:616
+#: ../sales/sales_order_entry.php:620
+msgid "Undelivered part of order has been cancelled as requested."
+msgstr ""
+
+#: ../sales/sales_order_entry.php:621
+msgid "Select Another Sales Order for Edition"
+msgstr ""
+
+#: ../sales/sales_order_entry.php:625
 msgid "This sales order has been cancelled as requested."
 msgstr ""
 
-#: ../sales/sales_order_entry.php:617
+#: ../sales/sales_order_entry.php:626
 msgid "Enter a New Sales Order"
 msgstr ""
 
-#: ../sales/sales_order_entry.php:696
+#: ../sales/sales_order_entry.php:704
 msgid "Sales Invoice Items"
 msgstr ""
 
-#: ../sales/sales_order_entry.php:697
+#: ../sales/sales_order_entry.php:705
 msgid "Enter Delivery Details and Confirm Invoice"
 msgstr ""
 
-#: ../sales/sales_order_entry.php:699
+#: ../sales/sales_order_entry.php:707
 msgid "Place Invoice"
 msgstr ""
 
-#: ../sales/sales_order_entry.php:702
+#: ../sales/sales_order_entry.php:710
 msgid "Delivery Note Items"
 msgstr ""
 
-#: ../sales/sales_order_entry.php:703
+#: ../sales/sales_order_entry.php:711
 msgid "Enter Delivery Details and Confirm Dispatch"
 msgstr ""
 
-#: ../sales/sales_order_entry.php:704
+#: ../sales/sales_order_entry.php:712
 msgid "Cancel Delivery"
 msgstr ""
 
-#: ../sales/sales_order_entry.php:705
+#: ../sales/sales_order_entry.php:713
 msgid "Place Delivery"
 msgstr ""
 
-#: ../sales/sales_order_entry.php:707
+#: ../sales/sales_order_entry.php:715
 msgid "Quotation Date:"
 msgstr ""
 
-#: ../sales/sales_order_entry.php:708
+#: ../sales/sales_order_entry.php:716
 msgid "Sales Quotation Items"
 msgstr ""
 
-#: ../sales/sales_order_entry.php:709
+#: ../sales/sales_order_entry.php:717
 msgid "Enter Delivery Details and Confirm Quotation"
 msgstr ""
 
-#: ../sales/sales_order_entry.php:710
+#: ../sales/sales_order_entry.php:718
 msgid "Cancel Quotation"
 msgstr ""
 
-#: ../sales/sales_order_entry.php:711
+#: ../sales/sales_order_entry.php:719
 msgid "Place Quotation"
 msgstr ""
 
-#: ../sales/sales_order_entry.php:712
+#: ../sales/sales_order_entry.php:720
 msgid "Commit Quotations Changes"
 msgstr ""
 
-#: ../sales/sales_order_entry.php:716
+#: ../sales/sales_order_entry.php:724
 msgid "Enter Delivery Details and Confirm Order"
 msgstr ""
 
-#: ../sales/sales_order_entry.php:719
+#: ../sales/sales_order_entry.php:727
 msgid "Commit Order Changes"
 msgstr ""
 
-#: ../sales/sales_order_entry.php:740
+#: ../sales/sales_order_entry.php:748
 msgid "You are about to void this Document.\\nDo you want to continue?"
 msgstr ""
 
-#: ../sales/sales_order_entry.php:743
+#: ../sales/sales_order_entry.php:751
+msgid ""
+"You are about to cancel undelivered part of this order.\\nDo you want to "
+"continue?"
+msgstr ""
+
+#: ../sales/sales_order_entry.php:753
 msgid "Validate changes and update document"
 msgstr ""
 
-#: ../sales/sales_order_entry.php:747
+#: ../sales/sales_order_entry.php:757
 msgid ""
 "Cancels document entry or removes sales order when editing an old document"
 msgstr ""
@@ -14412,7 +14245,7 @@ msgstr ""
 msgid "Allocate Customer Payment or Credit Note"
 msgstr ""
 
-#: ../sales/allocations/customer_allocate.php:48
+#: ../sales/allocations/customer_allocate.php:50
 #, php-format
 msgid "Allocation of %s # %d"
 msgstr ""
@@ -14423,11 +14256,13 @@ msgstr ""
 
 #: ../sales/allocations/customer_allocation_main.php:32
 #: ../sales/manage/customer_branches.php:282
-#: ../sales/manage/customers.php:324
+#: ../sales/manage/customers.php:327
 #: ../sales/manage/sav.customers.php:322
 #: ../sales/inquiry/customer_allocation_inquiry.php:42
+#: ../sales/inquiry/customer_allocation_inquiry.php.orig:42
 #: ../sales/inquiry/customer_inquiry.php:44
-#: ../sales/inquiry/sales_orders_view.php:265
+#: ../sales/inquiry/customer_inquiry.php.orig:44
+#: ../sales/inquiry/sales_orders_view.php.orig:265
 msgid "Select a customer: "
 msgstr ""
 
@@ -14550,13 +14385,13 @@ msgid "Branch Short Name:"
 msgstr ""
 
 #: ../sales/manage/customer_branches.php:242
-#: ../sales/manage/customers.php:256
+#: ../sales/manage/customers.php:259
 #: ../sales/manage/sav.customers.php:290
 msgid "Sales Person:"
 msgstr ""
 
 #: ../sales/manage/customer_branches.php:243
-#: ../sales/manage/customers.php:293
+#: ../sales/manage/customers.php:296
 #: ../sales/manage/sav.customers.php:291
 msgid "Sales Area:"
 msgstr ""
@@ -14567,12 +14402,12 @@ msgid "Sales Group:"
 msgstr ""
 
 #: ../sales/manage/customer_branches.php:245
-#: ../sales/manage/customers.php:291
+#: ../sales/manage/customers.php:294
 msgid "Default Inventory Location:"
 msgstr ""
 
 #: ../sales/manage/customer_branches.php:246
-#: ../sales/manage/customers.php:292
+#: ../sales/manage/customers.php:295
 msgid "Default Shipping Company:"
 msgstr ""
 
@@ -14614,7 +14449,7 @@ msgid "Tax Group"
 msgstr ""
 
 #: ../sales/manage/customer_branches.php:321
-#: ../sales/includes/ui/sales_order_ui.inc.orig:299
+#: ../sales/includes/ui/sales_order_ui.inc:306
 msgid ""
 "The selected customer does not have any branches. Please create at least one "
 "branch."
@@ -14654,149 +14489,149 @@ msgstr ""
 msgid "Customer has been updated."
 msgstr ""
 
-#: ../sales/manage/customers.php:127
+#: ../sales/manage/customers.php:130
 #: ../sales/manage/sav.customers.php:127
 msgid "A new customer has been added."
 msgstr ""
 
-#: ../sales/manage/customers.php:130
+#: ../sales/manage/customers.php:133
 #: ../sales/manage/sav.customers.php:130
 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:156
 #: ../sales/manage/sav.customers.php:153
 msgid ""
 "This customer cannot be deleted because there are transactions that refer to "
 "it."
 msgstr ""
 
-#: ../sales/manage/customers.php:160
+#: ../sales/manage/customers.php:163
 #: ../sales/manage/sav.customers.php:160
 msgid ""
 "Cannot delete the customer record because orders have been created against "
 "it."
 msgstr ""
 
-#: ../sales/manage/customers.php:167
+#: ../sales/manage/customers.php:170
 #: ../sales/manage/sav.customers.php:167
 msgid ""
 "Cannot delete this customer because there are branch records set up against "
 "it."
 msgstr ""
 
-#: ../sales/manage/customers.php:178
+#: ../sales/manage/customers.php:181
 #: ../sales/manage/sav.customers.php:178
 msgid "Selected customer has been deleted."
 msgstr ""
 
-#: ../sales/manage/customers.php:227
+#: ../sales/manage/customers.php:230
 #: ../sales/manage/sav.customers.php:227
 msgid "Name and Address"
 msgstr ""
 
-#: ../sales/manage/customers.php:229
+#: ../sales/manage/customers.php:232
 #: ../sales/manage/sav.customers.php:229
 msgid "Customer Name:"
 msgstr ""
 
-#: ../sales/manage/customers.php:230
+#: ../sales/manage/customers.php:233
 #: ../sales/manage/sav.customers.php:230
 msgid "Customer Short Name:"
 msgstr ""
 
-#: ../sales/manage/customers.php:238
-#: ../sales/manage/customers.php:242
+#: ../sales/manage/customers.php:241
+#: ../sales/manage/customers.php:245
 #: ../sales/manage/sav.customers.php:238
 #: ../sales/manage/sav.customers.php:242
 msgid "Customer's Currency:"
 msgstr ""
 
-#: ../sales/manage/customers.php:245
+#: ../sales/manage/customers.php:248
 #: ../sales/manage/sav.customers.php:245
 msgid "Sales Type/Price List:"
 msgstr ""
 
-#: ../sales/manage/customers.php:248
+#: ../sales/manage/customers.php:251
 #: ../sales/manage/sav.customers.php:248
 msgid "Customer status:"
 msgstr ""
 
-#: ../sales/manage/customers.php:262
+#: ../sales/manage/customers.php:265
 #: ../sales/manage/sav.customers.php:261
 msgid "Discount Percent:"
 msgstr ""
 
-#: ../sales/manage/customers.php:263
+#: ../sales/manage/customers.php:266
 #: ../sales/manage/sav.customers.php:262
 msgid "Prompt Payment Discount Percent:"
 msgstr ""
 
-#: ../sales/manage/customers.php:267
+#: ../sales/manage/customers.php:270
 #: ../sales/manage/sav.customers.php:266
 msgid "Credit Status:"
 msgstr ""
 
-#: ../sales/manage/customers.php:280
+#: ../sales/manage/customers.php:283
 #: ../sales/manage/sav.customers.php:279
 msgid "Customer branches"
 msgstr ""
 
-#: ../sales/manage/customers.php:282
+#: ../sales/manage/customers.php:285
 #: ../sales/manage/sav.customers.php:281
 msgid "Select or &Add"
 msgstr ""
 
-#: ../sales/manage/customers.php:282
+#: ../sales/manage/customers.php:285
 #: ../sales/manage/sav.customers.php:281
 msgid "&Add or Edit "
 msgstr ""
 
-#: ../sales/manage/customers.php:301
+#: ../sales/manage/customers.php:304
 #: ../sales/manage/sav.customers.php:299
 msgid "Add New Customer"
 msgstr ""
 
-#: ../sales/manage/customers.php:305
+#: ../sales/manage/customers.php:308
 #: ../sales/manage/sav.customers.php:303
 msgid "Update Customer"
 msgstr ""
 
-#: ../sales/manage/customers.php:306
+#: ../sales/manage/customers.php:309
 #: ../sales/manage/sav.customers.php:304
 msgid "Update customer data"
 msgstr ""
 
-#: ../sales/manage/customers.php:307
+#: ../sales/manage/customers.php:310
 #: ../sales/manage/sav.customers.php:305
 msgid "Select this customer and return to document entry."
 msgstr ""
 
-#: ../sales/manage/customers.php:308
+#: ../sales/manage/customers.php:311
 #: ../sales/manage/sav.customers.php:306
 msgid "Delete Customer"
 msgstr ""
 
-#: ../sales/manage/customers.php:309
+#: ../sales/manage/customers.php:312
 #: ../sales/manage/sav.customers.php:307
 msgid "Delete customer data if have been never used"
 msgstr ""
 
-#: ../sales/manage/customers.php:316
+#: ../sales/manage/customers.php:319
 #: ../sales/manage/sav.customers.php:314
 msgid ""
 "There are no sales types defined. Please define at least one sales type "
 "before adding a customer."
 msgstr ""
 
-#: ../sales/manage/customers.php:325
+#: ../sales/manage/customers.php:328
 #: ../sales/manage/sav.customers.php:323
 msgid "New customer"
 msgstr ""
 
-#: ../sales/manage/customers.php:347
+#: ../sales/manage/customers.php:350
 #: ../sales/manage/sav.customers.php:345
 msgid "Sales &Orders"
 msgstr ""
@@ -14806,9 +14641,7 @@ msgid "Recurrent Invoices"
 msgstr ""
 
 #: ../sales/manage/recurrent_invoices.php:36
-#: ../sales/manage/sales_areas.php:30
-#: ../sales/manage/sales_groups.php:30
-msgid "The area description cannot be empty."
+msgid "The invoice description cannot be empty."
 msgstr ""
 
 #: ../sales/manage/recurrent_invoices.php:63
@@ -14843,6 +14676,10 @@ msgstr ""
 msgid "End:"
 msgstr ""
 
+#: ../sales/manage/sales_areas.php:30
+msgid "The area description cannot be empty."
+msgstr ""
+
 #: ../sales/manage/sales_areas.php:39
 msgid "Selected sales area has been updated"
 msgstr ""
@@ -14873,6 +14710,10 @@ msgstr ""
 msgid "Sales Groups"
 msgstr ""
 
+#: ../sales/manage/sales_groups.php:30
+msgid "The sales group description cannot be empty."
+msgstr ""
+
 #: ../sales/manage/sales_groups.php:39
 msgid "Selected sales group has been updated"
 msgstr ""
@@ -15109,7 +14950,6 @@ msgstr ""
 #: ../sales/view/view_dispatch.php:91
 #: ../sales/view/view_invoice.php:91
 #: ../sales/view/view_sales_order.php:63
-#: ../sales/view/view_sales_order.php.orig:63
 msgid "Customer Order Ref."
 msgstr ""
 
@@ -15165,12 +15005,20 @@ msgstr ""
 msgid "From Customer"
 msgstr ""
 
-#: ../sales/view/view_receipt.php:39
+#: ../sales/view/view_receipt.php:40
+msgid "Date of Deposit"
+msgstr ""
+
+#: ../sales/view/view_receipt.php:43
+msgid "Customer Currency"
+msgstr ""
+
+#: ../sales/view/view_receipt.php:48
 msgid "Into Bank Account"
 msgstr ""
 
-#: ../sales/view/view_receipt.php:40
-msgid "Date of Deposit"
+#: ../sales/view/view_receipt.php:49
+msgid "Bank Amount"
 msgstr ""
 
 #: ../sales/view/view_receipt.php:56
@@ -15178,49 +15026,40 @@ msgid "This customer payment has been voided."
 msgstr ""
 
 #: ../sales/view/view_sales_order.php:28
-#: ../sales/view/view_sales_order.php.orig:28
 msgid "View Sales Quotation"
 msgstr ""
 
 #: ../sales/view/view_sales_order.php:29
-#: ../sales/view/view_sales_order.php.orig:29
 #, php-format
 msgid "Sales Quotation #%d"
 msgstr ""
 
 #: ../sales/view/view_sales_order.php:33
-#: ../sales/view/view_sales_order.php.orig:33
 msgid "View Sales Order"
 msgstr ""
 
 #: ../sales/view/view_sales_order.php:34
-#: ../sales/view/view_sales_order.php.orig:34
 #, php-format
 msgid "Sales Order #%d"
 msgstr ""
 
 #: ../sales/view/view_sales_order.php:49
-#: ../sales/view/view_sales_order.php.orig:49
 msgid "Order Information"
 msgstr ""
 
 #: ../sales/view/view_sales_order.php:60
-#: ../sales/view/view_sales_order.php.orig:60
 msgid "Customer Name"
 msgstr ""
 
 #: ../sales/view/view_sales_order.php:64
-#: ../sales/view/view_sales_order.php.orig:64
 msgid "Deliver To Branch"
 msgstr ""
 
 #: ../sales/view/view_sales_order.php:71
-#: ../sales/view/view_sales_order.php.orig:71
 msgid "Requested Delivery"
 msgstr ""
 
 #: ../sales/view/view_sales_order.php:75
-#: ../sales/view/view_sales_order.php.orig:75
 msgid "Deliver From Location"
 msgstr ""
 
@@ -15233,46 +15072,47 @@ msgid "All Payments Allocated"
 msgstr ""
 
 #: ../sales/view/view_sales_order.php:95
-#: ../sales/view/view_sales_order.php.orig:82
 msgid "Telephone"
 msgstr ""
 
 #: ../sales/view/view_sales_order.php:215
-#: ../sales/view/view_sales_order.php.orig:197
 msgid "This Sales Order is used as a Template."
 msgstr ""
 
 #: ../sales/view/view_sales_order.php:220
-#: ../sales/view/view_sales_order.php.orig:202
 msgid "Quantity Delivered"
 msgstr ""
 
 #: ../sales/inquiry/customer_allocation_inquiry.php:25
+#: ../sales/inquiry/customer_allocation_inquiry.php.orig:25
 msgid "Customer Allocation Inquiry"
 msgstr ""
 
 #: ../sales/inquiry/customer_allocation_inquiry.php:96
+#: ../sales/inquiry/customer_allocation_inquiry.php.orig:96
 msgid "Allocation"
 msgstr ""
 
-#: ../sales/inquiry/customer_allocation_inquiry.php:116
+#: ../sales/inquiry/customer_allocation_inquiry.php.orig:116
 msgid "Payment"
 msgstr ""
 
 #: ../sales/inquiry/customer_inquiry.php:26
+#: ../sales/inquiry/customer_inquiry.php.orig:26
 msgid "Customer Transactions"
 msgstr ""
 
 #: ../sales/inquiry/customer_inquiry.php:68
+#: ../sales/inquiry/customer_inquiry.php.orig:68
 msgid "CUSTOMER ACCOUNT IS ON HOLD"
 msgstr ""
 
-#: ../sales/inquiry/customer_inquiry.php:181
+#: ../sales/inquiry/customer_inquiry.php.orig:181
 msgid "Print Receipt"
 msgstr ""
 
-#: ../sales/inquiry/customer_inquiry.php:211
-#: ../sales/inquiry/customer_inquiry.php:224
+#: ../sales/inquiry/customer_inquiry.php.orig:211
+#: ../sales/inquiry/customer_inquiry.php.orig:224
 msgid "RB"
 msgstr ""
 
@@ -15316,76 +15156,82 @@ msgid "Batch Invoicing"
 msgstr ""
 
 #: ../sales/inquiry/sales_orders_view.php:44
+#: ../sales/inquiry/sales_orders_view.php.orig:44
 msgid "Search Outstanding Sales Orders"
 msgstr ""
 
 #: ../sales/inquiry/sales_orders_view.php:49
+#: ../sales/inquiry/sales_orders_view.php.orig:49
 msgid "Search Template for Invoicing"
 msgstr ""
 
 #: ../sales/inquiry/sales_orders_view.php:54
+#: ../sales/inquiry/sales_orders_view.php.orig:54
 msgid "Select Template for Delivery"
 msgstr ""
 
 #: ../sales/inquiry/sales_orders_view.php:59
+#: ../sales/inquiry/sales_orders_view.php.orig:59
 msgid "Invoicing Prepayment Orders"
 msgstr ""
 
 #: ../sales/inquiry/sales_orders_view.php:64
+#: ../sales/inquiry/sales_orders_view.php.orig:64
 msgid "Search All Sales Orders"
 msgstr ""
 
 #: ../sales/inquiry/sales_orders_view.php:70
+#: ../sales/inquiry/sales_orders_view.php.orig:70
 msgid "Search All Sales Quotations"
 msgstr ""
 
-#: ../sales/inquiry/sales_orders_view.php:148
+#: ../sales/inquiry/sales_orders_view.php.orig:148
 msgid "Dispatch"
 msgstr ""
 
-#: ../sales/inquiry/sales_orders_view.php:191
+#: ../sales/inquiry/sales_orders_view.php.orig:191
 msgid "Set this order as a template for direct deliveries/invoices"
 msgstr ""
 
-#: ../sales/inquiry/sales_orders_view.php:200
+#: ../sales/inquiry/sales_orders_view.php.orig:200
 msgid "Prepayment Invoice"
 msgstr ""
 
-#: ../sales/inquiry/sales_orders_view.php:200
+#: ../sales/inquiry/sales_orders_view.php.orig:200
 msgid "Final Invoice"
 msgstr ""
 
-#: ../sales/inquiry/sales_orders_view.php:267
+#: ../sales/inquiry/sales_orders_view.php.orig:267
 msgid "Show All:"
 msgstr ""
 
-#: ../sales/inquiry/sales_orders_view.php:284
+#: ../sales/inquiry/sales_orders_view.php.orig:284
 msgid "Order #"
 msgstr ""
 
-#: ../sales/inquiry/sales_orders_view.php:288
-#: ../sales/inquiry/sales_orders_view.php:302
+#: ../sales/inquiry/sales_orders_view.php.orig:288
+#: ../sales/inquiry/sales_orders_view.php.orig:302
 msgid "Cust Order Ref"
 msgstr ""
 
-#: ../sales/inquiry/sales_orders_view.php:291
-#: ../sales/inquiry/sales_orders_view.php:305
+#: ../sales/inquiry/sales_orders_view.php.orig:291
+#: ../sales/inquiry/sales_orders_view.php.orig:305
 msgid "Delivery To"
 msgstr ""
 
-#: ../sales/inquiry/sales_orders_view.php:298
+#: ../sales/inquiry/sales_orders_view.php.orig:298
 msgid "Quote #"
 msgstr ""
 
-#: ../sales/inquiry/sales_orders_view.php:303
+#: ../sales/inquiry/sales_orders_view.php.orig:303
 msgid "Quote Date"
 msgstr ""
 
-#: ../sales/inquiry/sales_orders_view.php:306
+#: ../sales/inquiry/sales_orders_view.php.orig:306
 msgid "Quote Total"
 msgstr ""
 
-#: ../sales/inquiry/sales_orders_view.php:337
+#: ../sales/inquiry/sales_orders_view.php.orig:337
 msgid "Tmpl"
 msgstr ""
 
@@ -15395,7 +15241,7 @@ msgid ""
 "browser tab. You cannot edit more than one sales document at once."
 msgstr ""
 
-#: ../sales/includes/db/custalloc_db.inc:351
+#: ../sales/includes/db/custalloc_db.inc.orig:351
 msgid ""
 "Unsuspected overallocation happened due to sparse credit notes exists for "
 "this invoice.\n"
@@ -15406,7 +15252,6 @@ msgstr ""
 #: ../sales/includes/db/old.sales_order_db.inc:107
 #: ../sales/includes/db/old.sales_order_db.inc:259
 #: ../sales/includes/db/sales_order_db.inc:109
-#: ../sales/includes/db/sales_order_db.inc:271
 #: ../sales/includes/db/sales_order_db.inc.orig:109
 #: ../sales/includes/db/sales_order_db.inc.orig:271
 msgid "Stocks below Re-Order Level at "
@@ -15415,7 +15260,6 @@ msgstr ""
 #: ../sales/includes/db/old.sales_order_db.inc:110
 #: ../sales/includes/db/old.sales_order_db.inc:264
 #: ../sales/includes/db/sales_order_db.inc:112
-#: ../sales/includes/db/sales_order_db.inc:276
 #: ../sales/includes/db/sales_order_db.inc.orig:112
 #: ../sales/includes/db/sales_order_db.inc.orig:276
 msgid "Below"
@@ -15424,7 +15268,6 @@ msgstr ""
 #: ../sales/includes/db/old.sales_order_db.inc:111
 #: ../sales/includes/db/old.sales_order_db.inc:265
 #: ../sales/includes/db/sales_order_db.inc:113
-#: ../sales/includes/db/sales_order_db.inc:277
 #: ../sales/includes/db/sales_order_db.inc.orig:113
 #: ../sales/includes/db/sales_order_db.inc.orig:277
 msgid "Please reorder"
@@ -15436,129 +15279,128 @@ msgstr ""
 msgid "Deleted."
 msgstr ""
 
+#: ../sales/includes/db/sales_invoice_db.inc:198
 #: ../sales/includes/db/sales_invoice_db.inc.orig:196
 msgid "Cash invoice"
 msgstr ""
 
 #: ../sales/includes/ui/sales_credit_ui.inc:94
-#: ../sales/includes/ui/sales_order_ui.inc.orig:379
+#: ../sales/includes/ui/sales_order_ui.inc:385
 msgid "Customer Currency:"
 msgstr ""
 
 #: ../sales/includes/ui/sales_credit_ui.inc:112
-#: ../sales/includes/ui/sales_order_ui.inc.orig:647
+#: ../sales/includes/ui/sales_order_ui.inc:653
 msgid "Shipping Company:"
 msgstr ""
 
 #: ../sales/includes/ui/sales_credit_ui.inc:114
-#: ../sales/includes/ui/sales_order_ui.inc.orig:386
+#: ../sales/includes/ui/sales_order_ui.inc:392
 msgid "Customer Discount:"
 msgstr ""
 
 #: ../sales/includes/ui/sales_order_ui.inc:61
-#: ../sales/includes/ui/sales_order_ui.inc.orig:61
 msgid "This item is already on this document. You have been warned."
 msgstr ""
 
 #: ../sales/includes/ui/sales_order_ui.inc:106
-#: ../sales/includes/ui/sales_order_ui.inc.orig:104
 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.orig:224
+#: ../sales/includes/ui/sales_order_ui.inc:231
 msgid "Shipping Charge"
 msgstr ""
 
-#: ../sales/includes/ui/sales_order_ui.inc.orig:297
+#: ../sales/includes/ui/sales_order_ui.inc:304
 msgid "No customer found for entered text."
 msgstr ""
 
-#: ../sales/includes/ui/sales_order_ui.inc.orig:323
+#: ../sales/includes/ui/sales_order_ui.inc:330
 #, php-format
 msgid "Customer's payment terms '%s' cannot be selected on this POS"
 msgstr ""
 
-#: ../sales/includes/ui/sales_order_ui.inc.orig:373
+#: ../sales/includes/ui/sales_order_ui.inc:379
 msgid "Reference number unique for this document type"
 msgstr ""
 
-#: ../sales/includes/ui/sales_order_ui.inc.orig:413
-#: ../sales/includes/ui/sales_order_ui.inc.orig:415
+#: ../sales/includes/ui/sales_order_ui.inc:419
+#: ../sales/includes/ui/sales_order_ui.inc:421
 msgid "Price List:"
 msgstr ""
 
-#: ../sales/includes/ui/sales_order_ui.inc.orig:432
+#: ../sales/includes/ui/sales_order_ui.inc:438
 msgid "Date of order receive"
 msgstr ""
 
-#: ../sales/includes/ui/sales_order_ui.inc.orig:582
+#: ../sales/includes/ui/sales_order_ui.inc:588
 msgid "Cash payment"
 msgstr ""
 
-#: ../sales/includes/ui/sales_order_ui.inc.orig:585
-#: ../sales/includes/ui/sales_order_ui.inc.orig:617
+#: ../sales/includes/ui/sales_order_ui.inc:591
+#: ../sales/includes/ui/sales_order_ui.inc:623
 msgid "Deliver from Location:"
 msgstr ""
 
-#: ../sales/includes/ui/sales_order_ui.inc.orig:588
+#: ../sales/includes/ui/sales_order_ui.inc:594
 msgid "Cash account:"
 msgstr ""
 
-#: ../sales/includes/ui/sales_order_ui.inc.orig:595
+#: ../sales/includes/ui/sales_order_ui.inc:601
 msgid "Delivery Details"
 msgstr ""
 
-#: ../sales/includes/ui/sales_order_ui.inc.orig:600
+#: ../sales/includes/ui/sales_order_ui.inc:606
 msgid "Invoice Delivery Details"
 msgstr ""
 
-#: ../sales/includes/ui/sales_order_ui.inc.orig:601
+#: ../sales/includes/ui/sales_order_ui.inc:607
 msgid "Invoice before"
 msgstr ""
 
-#: ../sales/includes/ui/sales_order_ui.inc.orig:605
+#: ../sales/includes/ui/sales_order_ui.inc:611
 msgid "Quotation Delivery Details"
 msgstr ""
 
-#: ../sales/includes/ui/sales_order_ui.inc.orig:610
+#: ../sales/includes/ui/sales_order_ui.inc:616
 msgid "Order Delivery Details"
 msgstr ""
 
-#: ../sales/includes/ui/sales_order_ui.inc.orig:631
+#: ../sales/includes/ui/sales_order_ui.inc:637
 msgid "Enter requested day of delivery"
 msgstr ""
 
-#: ../sales/includes/ui/sales_order_ui.inc.orig:632
+#: ../sales/includes/ui/sales_order_ui.inc:638
 msgid "Enter Valid until Date"
 msgstr ""
 
-#: ../sales/includes/ui/sales_order_ui.inc.orig:633
+#: ../sales/includes/ui/sales_order_ui.inc:639
 msgid "Deliver To:"
 msgstr ""
 
-#: ../sales/includes/ui/sales_order_ui.inc.orig:634
+#: ../sales/includes/ui/sales_order_ui.inc:640
 msgid "Additional identifier for delivery e.g. name of receiving person"
 msgstr ""
 
-#: ../sales/includes/ui/sales_order_ui.inc.orig:637
+#: ../sales/includes/ui/sales_order_ui.inc:643
 msgid "Delivery address. Default is address of customer branch"
 msgstr ""
 
-#: ../sales/includes/ui/sales_order_ui.inc.orig:641
+#: ../sales/includes/ui/sales_order_ui.inc:647
 msgid "Contact Phone Number:"
 msgstr ""
 
-#: ../sales/includes/ui/sales_order_ui.inc.orig:642
+#: ../sales/includes/ui/sales_order_ui.inc:648
 msgid "Phone number of ordering person. Defaults to branch phone number"
 msgstr ""
 
-#: ../sales/includes/ui/sales_order_ui.inc.orig:643
+#: ../sales/includes/ui/sales_order_ui.inc:649
 msgid "Customer Reference:"
 msgstr ""
 
-#: ../sales/includes/ui/sales_order_ui.inc.orig:644
+#: ../sales/includes/ui/sales_order_ui.inc:650
 msgid "Customer reference number for this order (if any)"
 msgstr ""
 
@@ -15614,143 +15456,175 @@ msgstr ""
 msgid "Is exempt"
 msgstr ""
 
-#: ../taxes/tax_groups.php:17
-#: ../taxes/tax_groups.php.orig:17
-#: ../taxes/tax_groups.php.sav:17
-msgid "Tax Groups"
-msgstr ""
-
-#: ../taxes/tax_groups.php:27
-#: ../taxes/tax_groups.php.orig:27
-#: ../taxes/tax_groups.php.sav:27
-msgid ""
-"There are no tax types defined. Define tax types before defining tax groups."
-msgstr ""
-
-#: ../taxes/tax_groups.php:40
-#: ../taxes/tax_groups.php.orig:40
-#: ../taxes/tax_groups.php.sav:40
-msgid "The tax group name cannot be empty."
-msgstr ""
-
-#: ../taxes/tax_groups.php:60
-#: ../taxes/tax_groups.php.orig:62
-#: ../taxes/tax_groups.php.sav:62
-msgid "Selected tax group has been updated"
-msgstr ""
-
-#: ../taxes/tax_groups.php:65
-#: ../taxes/tax_groups.php.orig:67
-#: ../taxes/tax_groups.php.sav:67
-msgid "New tax group has been added"
-msgstr ""
-
-#: ../taxes/tax_groups.php:80
-#: ../taxes/tax_groups.php.orig:82
-#: ../taxes/tax_groups.php.sav:82
-msgid ""
-"Cannot delete this tax group because customer branches been created "
-"referring to it."
-msgstr ""
-
-#: ../taxes/tax_groups.php:86
-#: ../taxes/tax_groups.php.orig:88
-#: ../taxes/tax_groups.php.sav:88
-msgid ""
-"Cannot delete this tax group because suppliers been created referring to it."
-msgstr ""
-
-#: ../taxes/tax_groups.php:103
-#: ../taxes/tax_groups.php.orig:105
-#: ../taxes/tax_groups.php.sav:105
-msgid "Selected tax group has been deleted"
-msgstr ""
-
-#: ../taxes/tax_groups.php:166
-#: ../taxes/tax_groups.php.orig:168
-#: ../taxes/tax_groups.php.sav:168
-msgid "Select the taxes that are included in this group."
-msgstr ""
-
-#: ../taxes/tax_groups.php:171
-#: ../taxes/tax_groups.php.orig:173
-#: ../taxes/tax_groups.php.sav:173
-msgid "Shipping Tax"
-msgstr ""
-
+#: ../taxes/sav.tax_types.php:21
 #: ../taxes/tax_types.php:16
 msgid "Tax Types"
 msgstr ""
 
+#: ../taxes/sav.tax_types.php:60
 #: ../taxes/tax_types.php:30
 msgid "The tax type name cannot be empty."
 msgstr ""
 
+#: ../taxes/sav.tax_types.php:66
 #: ../taxes/tax_types.php:36
 msgid "The default tax rate must be numeric and not less than zero."
 msgstr ""
 
+#: ../taxes/sav.tax_types.php:72
 #: ../taxes/tax_types.php:42
 msgid "Selected GL Accounts cannot be used by another tax type."
 msgstr ""
 
+#: ../taxes/sav.tax_types.php:86
 #: ../taxes/tax_types.php:56
 msgid "New tax type has been added"
 msgstr ""
 
+#: ../taxes/sav.tax_types.php:97
 #: ../taxes/tax_types.php:67
 msgid "Selected tax type has been updated"
 msgstr ""
 
+#: ../taxes/sav.tax_types.php:107
 #: ../taxes/tax_types.php:77
 msgid ""
 "Cannot delete this tax type because tax groups been created referring to it."
 msgstr ""
 
+#: ../taxes/sav.tax_types.php:141
 #: ../taxes/tax_types.php:94
 msgid "Selected tax type has been deleted"
 msgstr ""
 
+#: ../taxes/sav.tax_types.php:164
+msgid ""
+"Start new tax regulations span below, then select new span and edit tax "
+"rates as needed."
+msgstr ""
+
+#: ../taxes/sav.tax_types.php:167
+msgid "Tax span begin:"
+msgstr ""
+
+#: ../taxes/sav.tax_types.php:168
+msgid "Tax span end:"
+msgstr ""
+
+#: ../taxes/sav.tax_types.php:172
+msgid "Add new span"
+msgstr ""
+
+#: ../taxes/sav.tax_types.php:182
+msgid "Tax regulations span:"
+msgstr ""
+
+#: ../taxes/sav.tax_types.php:183
+msgid "Add new tax sub-period"
+msgstr ""
+
+#: ../taxes/sav.tax_types.php:187
 #: ../taxes/tax_types.php:112
 msgid ""
 "To avoid problems with manual journal entry all tax types should have unique "
 "Sales/Purchasing GL accounts."
 msgstr ""
 
-#: ../taxes/tax_types.php:115
-msgid "Default Rate (%)"
+#: ../taxes/sav.tax_types.php:190
+msgid "Rate (%)"
 msgstr ""
 
+#: ../taxes/sav.tax_types.php:190
 #: ../taxes/tax_types.php:116
 msgid "Sales GL Account"
 msgstr ""
 
+#: ../taxes/sav.tax_types.php:190
 #: ../taxes/tax_types.php:116
 msgid "Purchasing GL Account"
 msgstr ""
 
+#: ../taxes/sav.tax_types.php:205
+msgid "Exempt"
+msgstr ""
+
+#: ../taxes/sav.tax_types.php:242
 #: ../taxes/tax_types.php:159
 msgid "Default Rate:"
 msgstr ""
 
+#: ../taxes/sav.tax_types.php:244
 #: ../taxes/tax_types.php:161
 msgid "Sales GL Account:"
 msgstr ""
 
+#: ../taxes/sav.tax_types.php:245
 #: ../taxes/tax_types.php:162
 msgid "Purchasing GL Account:"
 msgstr ""
 
+#: ../taxes/sav.tax_types.php:262
+msgid "Edit selected span"
+msgstr ""
+
+#: ../taxes/tax_groups.php:17
+msgid "Tax Groups"
+msgstr ""
+
+#: ../taxes/tax_groups.php:27
+msgid ""
+"There are no tax types defined. Define tax types before defining tax groups."
+msgstr ""
+
+#: ../taxes/tax_groups.php:40
+msgid "The tax group name cannot be empty."
+msgstr ""
+
+#: ../taxes/tax_groups.php:60
+msgid "Selected tax group has been updated"
+msgstr ""
+
+#: ../taxes/tax_groups.php:65
+msgid "New tax group has been added"
+msgstr ""
+
+#: ../taxes/tax_groups.php:80
+msgid ""
+"Cannot delete this tax group because customer branches been created "
+"referring to it."
+msgstr ""
+
+#: ../taxes/tax_groups.php:86
+msgid ""
+"Cannot delete this tax group because suppliers been created referring to it."
+msgstr ""
+
+#: ../taxes/tax_groups.php:103
+msgid "Selected tax group has been deleted"
+msgstr ""
+
+#: ../taxes/tax_groups.php:166
+msgid "Select the taxes that are included in this group."
+msgstr ""
+
+#: ../taxes/tax_groups.php:171
+msgid "Shipping Tax"
+msgstr ""
+
+#: ../taxes/tax_types.php:115
+msgid "Default Rate (%)"
+msgstr ""
+
 #: ../themes/default/renderer.php:28
 msgid "Main Menu"
 msgstr ""
 
-#: ../themes/default/renderer.php:54
-#: ../themes/default/renderer.php:80
+#: ../themes/default/renderer.php:71
+#: ../themes/default/renderer.php:81
 msgid "Help"
 msgstr ""
 
-#: ../themes/default/renderer.php:75
+#: ../themes/default/renderer.php:76
 msgid "Preferences"
 msgstr ""