X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=lang%2Fnew_language_template%2FLC_MESSAGES%2Fempty.po;h=2d37b0bf6d4c1c09c3843baaf63c26132a1cc464;hb=47ec8984593ac1d72e3eb6300a8475b012044e21;hp=eea1175a06f6e06926111c09c22bad8476e0bab2;hpb=bddad130a5ceed77e6346d512b98da803afc4c54;p=fa-stable.git

diff --git a/lang/new_language_template/LC_MESSAGES/empty.po b/lang/new_language_template/LC_MESSAGES/empty.po
index eea1175a..2d37b0bf 100644
--- a/lang/new_language_template/LC_MESSAGES/empty.po
+++ b/lang/new_language_template/LC_MESSAGES/empty.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-05-08 15:48+0200\n"
+"POT-Creation-Date: 2014-06-07 23:23+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -21,12 +21,12 @@ msgstr ""
 msgid "Main  Menu"
 msgstr ""
 
-#: frontaccounting.php:75 access/logout.php:18 themes/default/renderer.php:70
+#: frontaccounting.php:75 access/logout.php:21 themes/default/renderer.php:70
 #: themes/default/renderer.php:83
 msgid "Logout"
 msgstr ""
 
-#: access/login.php:13
+#: access/login.php:13 access/password_reset.php:13
 msgid "Restricted access"
 msgstr ""
 
@@ -38,53 +38,75 @@ msgstr ""
 msgid "Please login here"
 msgstr ""
 
-#: access/login.php:36
+#: access/login.php:33
+msgid "or"
+msgstr ""
+
+#: access/login.php:33
+msgid "request new password"
+msgstr ""
+
+#: access/login.php:39
 msgid "Too many failed login attempts.<br>Please wait a while or try later."
 msgstr ""
 
-#: access/login.php:49 access/login.php:80
+#: access/login.php:52 access/login.php:83
 msgid "Authorization timeout"
 msgstr ""
 
-#: access/login.php:49 access/login.php:87
+#: access/login.php:52 access/login.php:90
 msgid "Login"
 msgstr ""
 
-#: access/login.php:87 admin/inst_upgrade.php:137
+#: access/login.php:90 access/password_reset.php:61 admin/inst_upgrade.php:137
 msgid "Version"
 msgstr ""
 
-#: access/login.php:90
+#: access/login.php:93
 msgid "User name"
 msgstr ""
 
-#: access/login.php:94 admin/change_current_user_password.php:78
-#: admin/users.php:191
+#: access/login.php:97 admin/users.php:191
 msgid "Password:"
 msgstr ""
 
-#: access/login.php:104 access/login.php:111 admin/create_coy.php:253
+#: access/login.php:107 access/login.php:114 access/password_reset.php:70
+#: access/password_reset.php:77 admin/create_coy.php:253
 #: admin/create_coy.php:336
 msgid "Company"
 msgstr ""
 
-#: access/login.php:118
+#: access/login.php:121
 msgid "Login -->"
 msgstr ""
 
-#: access/login.php:149 admin/display_prefs.php:112
-#: themes/default/renderer.php:129
+#: access/login.php:152 access/password_reset.php:108
+#: admin/display_prefs.php:112 themes/default/renderer.php:129
 msgid "Theme:"
 msgstr ""
 
-#: access/logout.php:29
+#: access/logout.php:32
 msgid "Thank you for using"
 msgstr ""
 
-#: access/logout.php:40
+#: access/logout.php:43
 msgid "Click here to Login Again."
 msgstr ""
 
+#: access/password_reset.php:31 access/password_reset.php:61
+msgid "Password reset"
+msgstr ""
+
+#: access/password_reset.php:63 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 ""
+
+#: access/password_reset.php:83
+msgid "Send password -->"
+msgstr ""
+
 #: admin/attachments.php:74
 msgid "Attach Documents"
 msgstr ""
@@ -97,19 +119,19 @@ msgstr ""
 msgid "Select attachment file."
 msgstr ""
 
-#: admin/attachments.php:125
+#: admin/attachments.php:128
 msgid "Attachment has been inserted."
 msgstr ""
 
-#: admin/attachments.php:131
+#: admin/attachments.php:134
 msgid "Attachment has been updated."
 msgstr ""
 
-#: admin/attachments.php:146
+#: admin/attachments.php:149
 msgid "Attachment has been deleted."
 msgstr ""
 
-#: admin/attachments.php:164 admin/view_print_transaction.php:72
+#: admin/attachments.php:167 admin/view_print_transaction.php:72
 #: admin/void_transaction.php:157 gl/inquiry/journal_inquiry.php:47
 #: inventory/includes/item_adjustments_ui.inc:47
 #: manufacturing/work_order_add_finished.php:203
@@ -121,19 +143,18 @@ msgstr ""
 msgid "Type:"
 msgstr ""
 
-#: admin/attachments.php:180 admin/create_coy.php:277
-#: admin/crm_categories.php:106 admin/fiscalyears.php:164
+#: admin/attachments.php:183 admin/create_coy.php:277
+#: admin/crm_categories.php:115 admin/fiscalyears.php:164
 #: admin/inst_lang.php:100 admin/payment_terms.php:142 admin/printers.php:96
 #: admin/shipping_companies.php:106 admin/tags.php:140 admin/users.php:144
 #: dimensions/inquiry/search_dimensions.php:120
 #: gl/inquiry/journal_inquiry.php:118 gl/manage/bank_accounts.php:130
-#: gl/manage/bank_accounts.php.orig:130 gl/manage/currencies.php:164
-#: gl/manage/exchange_rates.php:94 gl/manage/gl_account_classes.php:132
-#: gl/manage/gl_account_types.php:154 gl/manage/gl_quick_entries.php:196
-#: gl/manage/gl_quick_entries.php:295 gl/includes/ui/gl_bank_ui.inc:185
-#: gl/includes/ui/gl_bank_ui.inc.orig:166 gl/includes/ui/gl_journal_ui.inc:122
+#: gl/manage/currencies.php:164 gl/manage/exchange_rates.php:94
+#: gl/manage/gl_account_classes.php:132 gl/manage/gl_account_types.php:154
+#: gl/manage/gl_quick_entries.php:196 gl/manage/gl_quick_entries.php:295
+#: gl/includes/ui/gl_bank_ui.inc:186 gl/includes/ui/gl_journal_ui.inc:122
 #: includes/ui/contacts_view.inc:64 includes/ui/simple_crud_class.inc:52
-#: inventory/prices.php:161 inventory/purchasing_data.php:166
+#: 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
@@ -143,15 +164,15 @@ 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:520
-#: purchasing/includes/ui/po_ui.inc:265
+#: purchasing/includes/ui/invoice_ui.inc:533
+#: purchasing/includes/ui/po_ui.inc:263
 #: purchasing/inquiry/po_search_completed.php:106
 #: purchasing/inquiry/po_search.php:87 sales/manage/credit_status.php:119
 #: sales/manage/customer_branches.php:159
 #: sales/manage/recurrent_invoices.php:130 sales/manage/sales_areas.php:103
 #: sales/manage/sales_groups.php:99 sales/manage/sales_people.php:119
 #: sales/manage/sales_points.php:99 sales/manage/sales_types.php:121
-#: sales/inquiry/customer_inquiry.php:198
+#: sales/inquiry/customer_inquiry.php:192
 #: sales/inquiry/sales_deliveries_view.php:154
 #: sales/inquiry/sales_orders_view.php:128
 #: sales/includes/ui/sales_credit_ui.inc:197
@@ -160,28 +181,27 @@ msgstr ""
 msgid "Edit"
 msgstr ""
 
-#: admin/attachments.php:185 gl/inquiry/journal_inquiry.php:135
+#: admin/attachments.php:188 gl/inquiry/journal_inquiry.php:135
 msgid "View"
 msgstr ""
 
-#: admin/attachments.php:190
+#: admin/attachments.php:193
 msgid "Download"
 msgstr ""
 
-#: admin/attachments.php:195 admin/create_coy.php:278
-#: admin/crm_categories.php:110 admin/fiscalyears.php:166
+#: admin/attachments.php:198 admin/create_coy.php:278
+#: admin/crm_categories.php:119 admin/fiscalyears.php:166
 #: admin/inst_chart.php:80 admin/inst_lang.php:109 admin/inst_module.php:143
 #: admin/inst_theme.php:102 admin/payment_terms.php:143 admin/printers.php:97
 #: admin/shipping_companies.php:107 admin/tags.php:141 admin/users.php:146
 #: gl/gl_budget.php:137 gl/manage/bank_accounts.php:131
-#: gl/manage/bank_accounts.php.orig:131 gl/manage/currencies.php:166
-#: gl/manage/exchange_rates.php:99 gl/manage/gl_account_classes.php:133
-#: gl/manage/gl_account_types.php:155 gl/manage/gl_quick_entries.php:197
-#: gl/manage/gl_quick_entries.php:296 gl/includes/ui/gl_bank_ui.inc:187
-#: gl/includes/ui/gl_bank_ui.inc.orig:168 gl/includes/ui/gl_journal_ui.inc:124
-#: includes/ui/contacts_view.inc:67 includes/ui/radio.ui_input.inc:284
-#: includes/ui/simple_crud_class.inc:54 includes/ui/ui_input.inc:285
-#: inventory/prices.php:162 inventory/purchasing_data.php:167
+#: gl/manage/currencies.php:166 gl/manage/exchange_rates.php:99
+#: gl/manage/gl_account_classes.php:133 gl/manage/gl_account_types.php:155
+#: gl/manage/gl_quick_entries.php:197 gl/manage/gl_quick_entries.php:296
+#: gl/includes/ui/gl_bank_ui.inc:188 gl/includes/ui/gl_journal_ui.inc:124
+#: includes/ui/contacts_view.inc:67 includes/ui/simple_crud_class.inc:54
+#: includes/ui/ui_input.inc:285 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
@@ -190,8 +210,8 @@ msgstr ""
 #: inventory/manage/sales_kits.php:56 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:284
-#: purchasing/includes/ui/po_ui.inc:267 sales/manage/credit_status.php:120
+#: purchasing/includes/ui/invoice_ui.inc:297
+#: purchasing/includes/ui/po_ui.inc:265 sales/manage/credit_status.php:120
 #: sales/manage/customer_branches.php:163
 #: sales/manage/recurrent_invoices.php:131 sales/manage/sales_areas.php:104
 #: sales/manage/sales_groups.php:100 sales/manage/sales_people.php:120
@@ -202,12 +222,12 @@ msgstr ""
 msgid "Delete"
 msgstr ""
 
-#: admin/attachments.php:202 admin/view_print_transaction.php:126
+#: admin/attachments.php:205 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:234
 #: gl/inquiry/bank_inquiry.php:70 gl/inquiry/gl_account_inquiry.php:126
 #: gl/inquiry/journal_inquiry.php:127 gl/inquiry/journal_inquiry.php:140
-#: includes/ui/allocation_cart.inc:263
+#: includes/ui/allocation_cart.inc:288 includes/ui/mk.allocation_cart.inc:288
 #: inventory/inquiry/stock_movements.php:82
 #: manufacturing/search_work_orders.php:159
 #: manufacturing/includes/manufacturing_ui.inc:157
@@ -222,7 +242,7 @@ msgstr ""
 #: purchasing/inquiry/supplier_allocation_inquiry.php:127
 #: purchasing/inquiry/supplier_inquiry.php:169
 #: purchasing/allocations/supplier_allocation_main.php:95
-#: reporting/rep101.php:133 reporting/rep201.php:122 reporting/rep203.php:93
+#: reporting/rep101.php:118 reporting/rep201.php:110 reporting/rep203.php:93
 #: reporting/rep306.php:141 reporting/rep601.php:79 reporting/rep704.php:83
 #: reporting/rep704.php:86 reporting/rep704.php:89 reporting/rep710.php:78
 #: reporting/includes/doctext.inc:145 reporting/includes/doctext.inc:186
@@ -230,13 +250,13 @@ msgstr ""
 #: sales/allocations/customer_allocation_main.php:94
 #: sales/view/view_sales_order.php:96 sales/view/view_sales_order.php:129
 #: sales/view/view_sales_order.php:161
-#: sales/inquiry/customer_allocation_inquiry.php:144
-#: sales/inquiry/customer_inquiry.php:225
+#: sales/inquiry/customer_allocation_inquiry.php:145
+#: sales/inquiry/customer_inquiry.php:218
 msgid "#"
 msgstr ""
 
-#: admin/attachments.php:203 admin/attachments.php:247
-#: admin/crm_categories.php:88 admin/inst_upgrade.php:137
+#: admin/attachments.php:206 admin/attachments.php:250
+#: admin/crm_categories.php:97 admin/inst_upgrade.php:137
 #: admin/payment_terms.php:127 admin/printers.php:84
 #: admin/print_profiles.php:148 gl/inquiry/tax_inquiry.php:82
 #: gl/manage/gl_quick_entries.php:186 gl/manage/gl_quick_entries.php:224
@@ -245,11 +265,11 @@ msgstr ""
 #: 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:471
-#: purchasing/includes/ui/invoice_ui.inc:483
+#: purchasing/includes/ui/invoice_ui.inc:484
+#: purchasing/includes/ui/invoice_ui.inc:496
 #: 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:100
+#: 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
@@ -260,27 +280,27 @@ msgstr ""
 msgid "Description"
 msgstr ""
 
-#: admin/attachments.php:204 admin/backups.php:63 admin/backups.php:149
+#: admin/attachments.php:207 admin/backups.php:63 admin/backups.php:149
 msgid "Filename"
 msgstr ""
 
-#: admin/attachments.php:205
+#: admin/attachments.php:208
 msgid "Size"
 msgstr ""
 
-#: admin/attachments.php:206
+#: admin/attachments.php:209
 msgid "Filetype"
 msgstr ""
 
-#: admin/attachments.php:207
+#: admin/attachments.php:210
 msgid "Date Uploaded"
 msgstr ""
 
-#: admin/attachments.php:241 admin/attachments.php:246
+#: admin/attachments.php:244 admin/attachments.php:249
 msgid "Transaction #"
 msgstr ""
 
-#: admin/attachments.php:248
+#: admin/attachments.php:251
 msgid "Attached File"
 msgstr ""
 
@@ -316,14 +336,13 @@ msgstr ""
 #: admin/backups.php:98 admin/create_coy.php:265 admin/fiscalyears.php:155
 #: admin/inst_lang.php:85 admin/inst_lang.php:97
 #: admin/void_transaction.php:125 dimensions/inquiry/search_dimensions.php:107
-#: gl/manage/bank_accounts.php:127 gl/manage/bank_accounts.php.orig:127
-#: gl/manage/currencies.php:162 gl/manage/gl_account_classes.php:127
-#: gl/manage/gl_quick_entries.php:230 includes/system_tests.inc:38
-#: includes/system_tests.inc:113 includes/system_tests.inc:126
-#: includes/ui/sav.ui_lists.inc:1649 includes/ui/ui_lists.inc:1672
-#: purchasing/manage/suppliers.php:120 reporting/rep101.php:129
+#: gl/manage/bank_accounts.php:127 gl/manage/currencies.php:162
+#: gl/manage/gl_account_classes.php:127 gl/manage/gl_quick_entries.php:230
+#: includes/system_tests.inc:38 includes/system_tests.inc:113
+#: includes/system_tests.inc:126 includes/ui/ui_lists.inc:1675
+#: purchasing/manage/suppliers.php:121 reporting/rep101.php:114
 #: reporting/rep102.php:114 reporting/rep102.php:116 reporting/rep104.php:105
-#: reporting/rep106.php:75 reporting/rep114.php:74 reporting/rep201.php:118
+#: reporting/rep106.php:75 reporting/rep114.php:74 reporting/rep201.php:106
 #: reporting/rep202.php:118 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
@@ -360,8 +379,8 @@ msgstr ""
 msgid "Create backup"
 msgstr ""
 
-#: admin/backups.php:181 sales/includes/ui/sales_order_ui.inc:595
-#: sales/includes/ui/sales_order_ui.inc:643
+#: admin/backups.php:181 sales/includes/ui/sales_order_ui.inc:594
+#: sales/includes/ui/sales_order_ui.inc:642
 msgid "Comments:"
 msgstr ""
 
@@ -411,39 +430,51 @@ msgid "Upload file"
 msgstr ""
 
 #: admin/change_current_user_password.php:16
-#: admin/change_current_user_password.php:85 themes/default/renderer.php:77
+#: admin/change_current_user_password.php:99 themes/default/renderer.php:77
 msgid "Change password"
 msgstr ""
 
-#: admin/change_current_user_password.php:28 admin/users.php:40
+#: 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/users.php:47
+#: 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/users.php:180
+#: 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 ""
 
@@ -493,7 +524,7 @@ msgstr ""
 
 #: 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/includes/ui/sales_order_ui.inc:634
+#: sales/manage/customers.php:234 sales/includes/ui/sales_order_ui.inc:633
 msgid "Address:"
 msgstr ""
 
@@ -502,13 +533,13 @@ msgid "Domicile:"
 msgstr ""
 
 #: admin/company_preferences.php:168 admin/shipping_companies.php:138
-#: purchasing/manage/suppliers.php:129 sales/manage/customer_branches.php:260
+#: purchasing/manage/suppliers.php:130 sales/manage/customer_branches.php:260
 msgid "Phone Number:"
 msgstr ""
 
 #: admin/company_preferences.php:169 includes/ui/contacts_view.inc:104
-#: purchasing/manage/suppliers.php:159 sales/manage/customer_branches.php:262
-#: sales/manage/customers.php:254
+#: purchasing/manage/suppliers.php:160 sales/manage/customer_branches.php:262
+#: sales/manage/customers.php:258
 msgid "Fax Number:"
 msgstr ""
 
@@ -525,7 +556,7 @@ msgid "Official Company Number:"
 msgstr ""
 
 #: admin/company_preferences.php:175 purchasing/manage/suppliers.php:94
-#: sales/manage/customers.php:233
+#: sales/manage/customers.php:236
 msgid "GSTNo:"
 msgstr ""
 
@@ -621,25 +652,24 @@ msgstr ""
 #: admin/forms_setup.php:61 admin/gl_setup.php:226 admin/inst_chart.php:74
 #: admin/inst_lang.php:103 admin/inst_module.php:137 admin/inst_module.php:155
 #: admin/inst_module.php:198 admin/inst_theme.php:96
-#: dimensions/dimension_entry.php:293 gl/gl_bank.php:403 gl/gl_budget.php:135
-#: gl/manage/gl_quick_entries.php:60 gl/includes/ui/gl_bank_ui.inc:276
-#: gl/includes/ui/gl_bank_ui.inc.orig:257 gl/includes/ui/gl_journal_ui.inc:221
-#: includes/ui/db_pager_view.inc:174 includes/ui/radio.ui_input.inc:206
-#: includes/ui/radio.ui_input.inc:901 includes/ui/simple_crud_class.inc:56
-#: includes/ui/simple_crud_class.inc:227 includes/ui/ui_input.inc:207
-#: includes/ui/ui_input.inc:905 inventory/adjustments.php:233
-#: inventory/cost_update.php:138 inventory/reorder_level.php:114
-#: inventory/transfers.php:234 inventory/includes/item_adjustments_ui.inc:157
+#: dimensions/dimension_entry.php:293 gl/gl_bank.php:414 gl/gl_budget.php:135
+#: gl/manage/gl_quick_entries.php:60 gl/includes/ui/gl_bank_ui.inc:277
+#: gl/includes/ui/gl_journal_ui.inc:221 includes/ui/db_pager_view.inc:174
+#: includes/ui/simple_crud_class.inc:56 includes/ui/simple_crud_class.inc:227
+#: includes/ui/ui_input.inc:207 includes/ui/ui_input.inc:905
+#: 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:298 purchasing/includes/ui/po_ui.inc:441
-#: purchasing/po_receive_items.php:333 sales/credit_note_entry.php:284
-#: sales/customer_credit_invoice.php:380 sales/customer_delivery.php:531
-#: sales/customer_invoice.php:582 sales/inquiry/sales_orders_view.php:323
+#: purchasing/includes/ui/po_ui.inc:296 purchasing/includes/ui/po_ui.inc:439
+#: purchasing/po_receive_items.php:334 sales/credit_note_entry.php:284
+#: sales/customer_credit_invoice.php:380 sales/customer_delivery.php:533
+#: sales/customer_invoice.php:591 sales/inquiry/sales_orders_view.php:323
 #: sales/includes/ui/sales_credit_ui.inc:293
 #: sales/includes/ui/sales_order_ui.inc:243
-#: sales/includes/ui/sales_order_ui.inc:561
+#: sales/includes/ui/sales_order_ui.inc:560
 msgid "Update"
 msgstr ""
 
@@ -756,14 +786,13 @@ msgstr ""
 
 #: admin/create_coy.php:263 admin/fiscalyears.php:159 admin/inst_lang.php:85
 #: admin/inst_lang.php:97 dimensions/inquiry/search_dimensions.php:107
-#: gl/manage/bank_accounts.php:125 gl/manage/bank_accounts.php.orig:125
-#: gl/manage/currencies.php:162 gl/manage/gl_account_classes.php:127
-#: gl/manage/gl_quick_entries.php:230 includes/system_tests.inc:38
-#: includes/system_tests.inc:113 includes/system_tests.inc:126
-#: includes/ui/sav.ui_lists.inc:1650 includes/ui/ui_lists.inc:1673
-#: purchasing/manage/suppliers.php:120 reporting/rep101.php:128
+#: gl/manage/bank_accounts.php:125 gl/manage/currencies.php:162
+#: gl/manage/gl_account_classes.php:127 gl/manage/gl_quick_entries.php:230
+#: includes/system_tests.inc:38 includes/system_tests.inc:113
+#: includes/system_tests.inc:126 includes/ui/ui_lists.inc:1676
+#: purchasing/manage/suppliers.php:121 reporting/rep101.php:113
 #: reporting/rep102.php:113 reporting/rep102.php:115 reporting/rep104.php:107
-#: reporting/rep106.php:77 reporting/rep114.php:76 reporting/rep201.php:117
+#: reporting/rep106.php:77 reporting/rep114.php:76 reporting/rep201.php:105
 #: reporting/rep202.php:117 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
@@ -793,7 +822,8 @@ msgstr ""
 #: admin/create_coy.php:344 admin/inst_chart.php:68 admin/inst_chart.php:70
 #: admin/inst_lang.php:87 admin/inst_lang.php:90 admin/inst_module.php:126
 #: admin/inst_theme.php:91 admin/inst_theme.php:93 admin/inst_upgrade.php:149
-#: gl/manage/gl_account_types.php:190 includes/ui/allocation_cart.inc:286
+#: gl/manage/gl_account_types.php:190 includes/ui/allocation_cart.inc:314
+#: includes/ui/mk.allocation_cart.inc:314
 msgid "None"
 msgstr ""
 
@@ -829,39 +859,39 @@ 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 sales/manage/customer_branches.php:293
+#: admin/crm_categories.php:97 sales/manage/customer_branches.php:293
 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 ""
 
@@ -1054,8 +1084,7 @@ msgid "Fiscal Year End"
 msgstr ""
 
 #: admin/fiscalyears.php:138 dimensions/inquiry/search_dimensions.php:133
-#: dimensions/inquiry/search_dimensions.php:139
-#: includes/ui/sav.ui_lists.inc:659 includes/ui/ui_lists.inc:676
+#: dimensions/inquiry/search_dimensions.php:139 includes/ui/ui_lists.inc:676
 #: manufacturing/search_work_orders.php:108 reporting/rep501.php:87
 #: reporting/rep710.php:113 reporting/includes/excel_report.inc:234
 #: reporting/includes/pdf_report.inc:266
@@ -1236,7 +1265,7 @@ msgstr ""
 msgid "Payable Account:"
 msgstr ""
 
-#: admin/gl_setup.php:195 purchasing/manage/suppliers.php:126
+#: admin/gl_setup.php:195 purchasing/manage/suppliers.php:127
 msgid "Purchase Discount Account:"
 msgstr ""
 
@@ -1316,7 +1345,7 @@ msgstr ""
 msgid "Available"
 msgstr ""
 
-#: admin/inst_chart.php:50 admin/inst_lang.php:35 admin/inst_lang.php:218
+#: admin/inst_chart.php:50 admin/inst_lang.php:35 admin/inst_lang.php:220
 msgid "Encoding"
 msgstr ""
 
@@ -1352,16 +1381,16 @@ msgstr ""
 #: dimensions/view/view_dimension.php:55
 #: inventory/manage/item_categories.php:98
 #: manufacturing/manage/work_centres.php:101
-#: purchasing/includes/ui/invoice_ui.inc:245
-#: purchasing/includes/ui/invoice_ui.inc:247
-#: purchasing/includes/ui/invoice_ui.inc:249 reporting/rep501.php:87
+#: purchasing/includes/ui/invoice_ui.inc:258
+#: purchasing/includes/ui/invoice_ui.inc:260
+#: purchasing/includes/ui/invoice_ui.inc:262 reporting/rep501.php:87
 #: reporting/rep709.php:111 reporting/rep709.php:112
 #: sales/manage/customer_branches.php:294 sales/manage/sales_people.php:99
 #: taxes/item_tax_types.php:117
 msgid "Name"
 msgstr ""
 
-#: admin/inst_lang.php:35 admin/inst_lang.php:220
+#: admin/inst_lang.php:35 admin/inst_lang.php:222
 msgid "Right To Left"
 msgstr ""
 
@@ -1410,23 +1439,23 @@ msgid ""
 "install this language manually, uninstall standard language package first."
 msgstr ""
 
-#: admin/inst_lang.php:216
+#: admin/inst_lang.php:218
 msgid "Language Code"
 msgstr ""
 
-#: admin/inst_lang.php:217
+#: admin/inst_lang.php:219
 msgid "Language Name"
 msgstr ""
 
-#: admin/inst_lang.php:221
+#: admin/inst_lang.php:223
 msgid "Default Language"
 msgstr ""
 
-#: admin/inst_lang.php:223 admin/inst_lang.php:224
+#: admin/inst_lang.php:225 admin/inst_lang.php:226
 msgid "Language File"
 msgstr ""
 
-#: admin/inst_lang.php:227
+#: admin/inst_lang.php:229
 msgid "Select your language files from your local harddisk."
 msgstr ""
 
@@ -1454,9 +1483,8 @@ msgstr ""
 msgid "Install third-party extension."
 msgstr ""
 
-#: admin/inst_module.php:168 includes/ui/sav.ui_lists.inc:659
-#: includes/ui/sav.ui_lists.inc:2131 includes/ui/ui_lists.inc:676
-#: includes/ui/ui_lists.inc:2153 reporting/includes/excel_report.inc:232
+#: admin/inst_module.php:168 includes/ui/ui_lists.inc:676
+#: includes/ui/ui_lists.inc:2156 reporting/includes/excel_report.inc:232
 #: reporting/includes/pdf_report.inc:264
 msgid "Active"
 msgstr ""
@@ -1593,10 +1621,9 @@ msgstr ""
 #: dimensions/view/view_dimension.php:55 gl/bank_account_reconcile.php:233
 #: gl/inquiry/bank_inquiry.php:70 gl/inquiry/gl_account_inquiry.php:126
 #: gl/inquiry/journal_inquiry.php:129 gl/inquiry/tax_inquiry.php:82
-#: gl/manage/bank_accounts.php:106 gl/manage/bank_accounts.php.orig:106
-#: gl/manage/gl_quick_entries.php:186 gl/view/accrual_trans.php:52
-#: gl/includes/ui/gl_bank_ui.inc:92 gl/includes/ui/gl_bank_ui.inc.orig:80
-#: includes/ui/ui_view.inc:489 inventory/inquiry/stock_movements.php:82
+#: gl/manage/bank_accounts.php:106 gl/manage/gl_quick_entries.php:186
+#: gl/view/accrual_trans.php:52 gl/includes/ui/gl_bank_ui.inc:93
+#: includes/ui/ui_view.inc:547 inventory/inquiry/stock_movements.php:82
 #: inventory/manage/item_categories.php:98
 #: manufacturing/search_work_orders.php:161
 #: manufacturing/includes/manufacturing_ui.inc:236
@@ -1611,8 +1638,8 @@ msgstr ""
 #: reporting/rep710.php:86 reporting/reports_main.php:327
 #: reporting/reports_main.php:491 reporting/includes/doctext.inc:140
 #: reporting/includes/doctext.inc:181 reporting/includes/doctext.inc:200
-#: sales/inquiry/customer_allocation_inquiry.php:143
-#: sales/inquiry/customer_inquiry.php:224
+#: sales/inquiry/customer_allocation_inquiry.php:144
+#: sales/inquiry/customer_inquiry.php:217
 msgid "Type"
 msgstr ""
 
@@ -1805,8 +1832,8 @@ msgid "Role:"
 msgstr ""
 
 #: admin/security_roles.php:180 gl/manage/gl_accounts.php:199
-#: gl/manage/gl_accounts.php.orig:198 inventory/manage/items.php:433
-#: purchasing/manage/suppliers.php:289 sales/manage/customers.php:326
+#: inventory/manage/items.php:433 purchasing/manage/suppliers.php:290
+#: sales/manage/customers.php:330
 msgid "Show inactive:"
 msgstr ""
 
@@ -1847,17 +1874,16 @@ msgid "Delete This Role"
 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:278
-#: gl/includes/ui/gl_bank_ui.inc.orig:259 gl/includes/ui/gl_journal_ui.inc:223
-#: includes/ui/radio.ui_input.inc:209 includes/ui/simple_crud_class.inc:58
-#: includes/ui/simple_crud_class.inc:231 includes/ui/ui_controls.inc:587
+#: gl/manage/gl_quick_entries.php:61 gl/includes/ui/gl_bank_ui.inc:279
+#: gl/includes/ui/gl_journal_ui.inc:223 includes/ui/simple_crud_class.inc:58
+#: includes/ui/simple_crud_class.inc:231 includes/ui/ui_controls.inc:589
 #: includes/ui/ui_input.inc:210 inventory/includes/item_adjustments_ui.inc:159
 #: inventory/includes/stock_transfers_ui.inc:139
 #: inventory/manage/items.php:416
 #: manufacturing/includes/work_order_issue_ui.inc:133
-#: purchasing/includes/ui/po_ui.inc:443
+#: purchasing/includes/ui/po_ui.inc:441
 #: sales/includes/ui/sales_credit_ui.inc:295
-#: sales/includes/ui/sales_order_ui.inc:563
+#: sales/includes/ui/sales_order_ui.inc:562
 msgid "Cancel"
 msgstr ""
 
@@ -1866,7 +1892,7 @@ msgid "Cancel Edition"
 msgstr ""
 
 #: admin/shipping_companies.php:15 sales/customer_credit_invoice.php:254
-#: sales/customer_delivery.php:368 sales/customer_invoice.php:422
+#: sales/customer_delivery.php:368 sales/customer_invoice.php:431
 #: sales/view/view_credit.php:74 sales/view/view_dispatch.php:92
 #: sales/view/view_invoice.php:91
 msgid "Shipping Company"
@@ -1917,19 +1943,19 @@ msgid "Address"
 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:55
-#: inventory/manage/items.php:299 manufacturing/manage/work_centres.php:137
+#: gl/includes/ui/gl_bank_ui.inc:57 inventory/manage/items.php:299
+#: manufacturing/manage/work_centres.php:137
 msgid "Name:"
 msgstr ""
 
-#: admin/shipping_companies.php:136 purchasing/manage/suppliers.php:158
+#: admin/shipping_companies.php:136 purchasing/manage/suppliers.php:159
 #: sales/manage/customer_branches.php:259
 msgid "Contact Person:"
 msgstr ""
 
 #: admin/shipping_companies.php:140 includes/ui/contacts_view.inc:103
-#: inventory/manage/locations.php:205 purchasing/manage/suppliers.php:130
-#: sales/manage/customer_branches.php:261 sales/manage/customers.php:253
+#: inventory/manage/locations.php:205 purchasing/manage/suppliers.php:131
+#: sales/manage/customer_branches.php:261 sales/manage/customers.php:257
 msgid "Secondary Phone Number:"
 msgstr ""
 
@@ -2068,7 +2094,7 @@ msgstr ""
 #: admin/view_print_transaction.php:43 admin/view_print_transaction.php:45
 #: admin/view_print_transaction.php:129 includes/ui/ui_controls.inc:188
 #: purchasing/inquiry/po_search_completed.php:113
-#: purchasing/inquiry/po_search.php:93 sales/inquiry/customer_inquiry.php:209
+#: purchasing/inquiry/po_search.php:93 sales/inquiry/customer_inquiry.php:202
 #: sales/inquiry/sales_deliveries_view.php:160
 #: sales/inquiry/sales_orders_view.php:119
 msgid "Print"
@@ -2089,7 +2115,7 @@ msgstr ""
 #: admin/view_print_transaction.php:83 admin/void_transaction.php:170
 #: dimensions/inquiry/search_dimensions.php:88
 #: gl/inquiry/journal_inquiry.php:53 manufacturing/search_work_orders.php:78
-#: purchasing/includes/ui/invoice_ui.inc:453
+#: purchasing/includes/ui/invoice_ui.inc:466
 #: purchasing/inquiry/po_search_completed.php:77
 #: purchasing/inquiry/po_search.php:76
 #: purchasing/inquiry/supplier_allocation_inquiry.php:57
@@ -2117,8 +2143,8 @@ msgstr ""
 #: dimensions/inquiry/search_dimensions.php:128
 #: dimensions/view/view_dimension.php:55 gl/bank_account_reconcile.php:235
 #: gl/inquiry/bank_inquiry.php:70 gl/inquiry/journal_inquiry.php:131
-#: gl/view/bank_transfer_view.php:86 gl/view/gl_deposit_view.php:75
-#: gl/view/gl_payment_view.php:73 gl/view/gl_trans_view.php:35
+#: gl/view/bank_transfer_view.php:86 gl/view/gl_deposit_view.php:80
+#: gl/view/gl_payment_view.php:78 gl/view/gl_trans_view.php:35
 #: includes/ui/contacts_view.inc:41 inventory/inquiry/stock_movements.php:82
 #: inventory/view/view_adjustment.php:44 inventory/view/view_transfer.php:44
 #: manufacturing/search_work_orders.php:160
@@ -2129,8 +2155,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:313 purchasing/view/view_po.php:115
+#: purchasing/includes/ui/grn_ui.inc:32 purchasing/includes/ui/grn_ui.inc:64
+#: purchasing/includes/ui/po_ui.inc:311 purchasing/view/view_po.php:115
 #: purchasing/view/view_supp_credit.php:43
 #: purchasing/view/view_supp_invoice.php:46
 #: purchasing/view/view_supp_payment.php:73
@@ -2142,17 +2168,17 @@ msgstr ""
 #: reporting/rep501.php:87 reporting/rep601.php:79 reporting/rep702.php:53
 #: reporting/includes/doctext.inc:199 sales/customer_credit_invoice.php:245
 #: sales/customer_credit_invoice.php:247 sales/customer_delivery.php:348
-#: sales/customer_delivery.php:350 sales/customer_invoice.php:394
-#: sales/customer_invoice.php:396
+#: sales/customer_delivery.php:350 sales/customer_invoice.php:403
+#: sales/customer_invoice.php:405
 #: sales/allocations/customer_allocation_main.php:95
 #: sales/view/view_dispatch.php:85 sales/view/view_invoice.php:84
-#: sales/view/view_receipt.php:50 sales/view/view_sales_order.php:81
-#: sales/inquiry/customer_allocation_inquiry.php:145
-#: sales/inquiry/customer_inquiry.php:227
+#: sales/view/view_receipt.php:39 sales/view/view_sales_order.php:81
+#: sales/inquiry/customer_allocation_inquiry.php:146
+#: sales/inquiry/customer_inquiry.php:220
 #: 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:379
+#: sales/includes/ui/sales_order_ui.inc:378
 msgid "Reference"
 msgstr ""
 
@@ -2164,8 +2190,8 @@ msgstr ""
 #: gl/inquiry/journal_inquiry.php:128 gl/view/accrual_trans.php:52
 #: gl/view/bank_transfer_view.php:83 gl/view/gl_deposit_view.php:68
 #: gl/view/gl_payment_view.php:66 gl/view/gl_trans_view.php:36
-#: includes/ui/allocation_cart.inc:263 includes/ui/ui_view.inc:489
-#: inventory/inquiry/stock_movements.php:84
+#: includes/ui/allocation_cart.inc:288 includes/ui/mk.allocation_cart.inc:288
+#: includes/ui/ui_view.inc:547 inventory/inquiry/stock_movements.php:84
 #: inventory/view/view_adjustment.php:45 inventory/view/view_transfer.php:47
 #: manufacturing/search_work_orders.php:166
 #: manufacturing/work_order_entry.php:419
@@ -2177,23 +2203,23 @@ 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:103
-#: purchasing/includes/ui/po_ui.inc:327 purchasing/view/view_po.php:140
+#: purchasing/includes/ui/invoice_ui.inc:116
+#: purchasing/includes/ui/po_ui.inc:325 purchasing/view/view_po.php:140
 #: purchasing/inquiry/supplier_allocation_inquiry.php:131
 #: purchasing/inquiry/supplier_inquiry.php:173
 #: purchasing/allocations/supplier_allocation_main.php:97
-#: reporting/rep101.php:133 reporting/rep201.php:122 reporting/rep306.php:141
+#: reporting/rep101.php:118 reporting/rep201.php:110 reporting/rep306.php:141
 #: reporting/rep501.php:87 reporting/rep601.php:79 reporting/rep704.php:83
 #: reporting/rep704.php:86 reporting/rep704.php:89 reporting/rep709.php:111
 #: reporting/rep710.php:77 reporting/includes/doctext.inc:145
 #: reporting/includes/doctext.inc:186 reporting/includes/doctext.inc:224
 #: reporting/includes/header2.inc:135 sales/customer_delivery.php:378
-#: sales/customer_invoice.php:432
+#: sales/customer_invoice.php:441
 #: sales/allocations/customer_allocation_main.php:96
 #: sales/view/view_credit.php:69 sales/view/view_sales_order.php:96
 #: sales/view/view_sales_order.php:129 sales/view/view_sales_order.php:161
-#: sales/inquiry/customer_allocation_inquiry.php:147
-#: sales/inquiry/customer_inquiry.php:228
+#: sales/inquiry/customer_allocation_inquiry.php:148
+#: sales/inquiry/customer_inquiry.php:221
 msgid "Date"
 msgstr ""
 
@@ -2207,9 +2233,8 @@ msgid "Void a Transaction"
 msgstr ""
 
 #: admin/void_transaction.php:126 admin/void_transaction.php:185
-#: includes/ui/radio.ui_input.inc:136 includes/ui/radio.ui_input.inc:280
-#: includes/ui/sav.ui_lists.inc:20 includes/ui/ui_input.inc:137
-#: includes/ui/ui_input.inc:281 includes/ui/ui_lists.inc:20
+#: includes/ui/ui_input.inc:137 includes/ui/ui_input.inc:281
+#: includes/ui/ui_lists.inc:20
 msgid "Select"
 msgstr ""
 
@@ -2223,12 +2248,12 @@ msgstr ""
 
 #: admin/void_transaction.php:208 dimensions/dimension_entry.php:283
 #: gl/bank_transfer.php:98 gl/inquiry/journal_inquiry.php:56
-#: gl/manage/revaluate_currencies.php:106 includes/ui/ui_view.inc:308
+#: gl/manage/revaluate_currencies.php:106 includes/ui/ui_view.inc:344
 #: manufacturing/work_order_add_finished.php:210
 #: manufacturing/work_order_entry.php:451
 #: manufacturing/work_order_release.php:103
-#: purchasing/includes/ui/invoice_ui.inc:161 purchasing/po_entry_items.php:523
-#: purchasing/supplier_payment.php:321 sales/customer_payments.php:398
+#: purchasing/includes/ui/invoice_ui.inc:174 purchasing/po_entry_items.php:529
+#: purchasing/supplier_payment.php:325 sales/customer_payments.php:399
 msgid "Memo:"
 msgstr ""
 
@@ -2246,7 +2271,7 @@ msgid ""
 "undone."
 msgstr ""
 
-#: admin/void_transaction.php:228 includes/ui/ui_controls.inc:586
+#: admin/void_transaction.php:228 includes/ui/ui_controls.inc:588
 msgid "Proceed"
 msgstr ""
 
@@ -2259,23 +2284,23 @@ msgstr ""
 #: gl/manage/revaluate_currencies.php:53
 #: manufacturing/work_order_add_finished.php:98
 #: manufacturing/work_order_costs.php:83 purchasing/po_receive_items.php:174
-#: purchasing/supplier_payment.php:175 sales/customer_credit_invoice.php:91
-#: sales/sales_order_entry.php:349 sales/manage/recurrent_invoices.php:41
+#: purchasing/supplier_payment.php:185 sales/customer_credit_invoice.php:91
+#: sales/sales_order_entry.php:353 sales/manage/recurrent_invoices.php:41
 #: sales/manage/recurrent_invoices.php:46
 #: sales/manage/recurrent_invoices.php:51
 msgid "The entered date is invalid."
 msgstr ""
 
 #: admin/void_transaction.php:254 gl/accruals.php:38 gl/bank_transfer.php:121
-#: gl/gl_bank.php:267 gl/gl_journal.php:162
+#: gl/gl_bank.php:266 gl/gl_journal.php:162
 #: gl/manage/revaluate_currencies.php:59 inventory/adjustments.php:114
 #: inventory/transfers.php:109 manufacturing/work_order_add_finished.php:104
 #: manufacturing/work_order_costs.php:89
 #: manufacturing/work_order_entry.php:160
-#: manufacturing/work_order_issue.php:83 purchasing/supplier_credit.php:176
-#: purchasing/supplier_invoice.php:174 purchasing/supplier_payment.php:181
-#: sales/create_recurrent_invoices.php:121 sales/credit_note_entry.php:157
-#: sales/customer_credit_invoice.php:95 sales/customer_payments.php:151
+#: manufacturing/work_order_issue.php:83 purchasing/supplier_credit.php:186
+#: purchasing/supplier_invoice.php:185 sales/create_recurrent_invoices.php:121
+#: sales/credit_note_entry.php:157 sales/customer_credit_invoice.php:95
+#: sales/customer_payments.php:156
 msgid "The entered date is not in fiscal year."
 msgstr ""
 
@@ -2291,6 +2316,10 @@ msgstr ""
 msgid "Selected transaction has been voided."
 msgstr ""
 
+#: admin/db/attachments_db.inc:67
+msgid "Attached File:"
+msgstr ""
+
 #: admin/db/fiscalyears_db.inc:136
 msgid ""
 "The Retained Earnings Account or the Profit and Loss Year Account has not "
@@ -2301,8 +2330,8 @@ msgstr ""
 msgid "Closing Year"
 msgstr ""
 
-#: admin/db/fiscalyears_db.inc:214 reporting/rep101.php:189
-#: reporting/rep201.php:182 reporting/rep706.php:185
+#: admin/db/fiscalyears_db.inc:219 reporting/rep101.php:175
+#: reporting/rep201.php:170 reporting/rep706.php:185
 msgid "Open Balance"
 msgstr ""
 
@@ -2342,18 +2371,18 @@ msgstr ""
 msgid "SQL script execution failed in line %d: %s"
 msgstr ""
 
-#: admin/db/users_db.inc:210
+#: admin/db/users_db.inc:221
 msgid "user online"
 msgstr ""
 
-#: admin/db/users_db.inc:210
+#: admin/db/users_db.inc:221
 msgid "users online"
 msgstr ""
 
 #: admin/db/voiding_db.inc:114
 #: manufacturing/includes/db/work_orders_db.inc:446
 #: manufacturing/includes/db/work_orders_db.inc:462
-#: sales/includes/db/sales_invoice_db.inc:206
+#: sales/includes/db/sales_invoice_db.inc:208
 msgid "Voided."
 msgstr ""
 
@@ -2919,17 +2948,17 @@ msgid "The dimension reference must be entered."
 msgstr ""
 
 #: dimensions/dimension_entry.php:123 gl/bank_transfer.php:176
-#: gl/gl_bank.php:255 gl/gl_journal.php:176
+#: gl/gl_bank.php:254 gl/gl_journal.php:176
 #: gl/manage/revaluate_currencies.php:72 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:96 purchasing/po_entry_items.php:366
-#: purchasing/po_receive_items.php:195 purchasing/supplier_credit.php:156
-#: purchasing/supplier_invoice.php:154 purchasing/supplier_payment.php:204
+#: purchasing/po_receive_items.php:195 purchasing/supplier_credit.php:166
+#: purchasing/supplier_invoice.php:165 purchasing/supplier_payment.php:214
 #: sales/create_recurrent_invoices.php:57 sales/credit_note_entry.php:181
 #: sales/customer_credit_invoice.php:205 sales/customer_delivery.php:312
-#: sales/customer_invoice.php:319 sales/customer_payments.php:164
-#: sales/customer_payments.php:171 sales/sales_order_entry.php:441
+#: sales/customer_invoice.php:328 sales/customer_payments.php:169
+#: sales/customer_payments.php:176 sales/sales_order_entry.php:445
 msgid "The entered reference is already in use."
 msgstr ""
 
@@ -3016,9 +3045,9 @@ msgid "Delete unused dimension"
 msgstr ""
 
 #: dimensions/dimension_entry.php:302 includes/ui/simple_crud_class.inc:225
-#: purchasing/includes/ui/invoice_ui.inc:186
-#: purchasing/includes/ui/invoice_ui.inc:392
-#: purchasing/includes/ui/invoice_ui.inc:394
+#: purchasing/includes/ui/invoice_ui.inc:199
+#: purchasing/includes/ui/invoice_ui.inc:405
+#: purchasing/includes/ui/invoice_ui.inc:407
 msgid "Add"
 msgstr ""
 
@@ -3033,9 +3062,9 @@ msgstr ""
 #: dimensions/includes/dimensions_ui.inc:31 gl/accruals.php:90
 #: gl/inquiry/gl_account_inquiry.php:129 gl/inquiry/gl_trial_balance.php:185
 #: gl/manage/gl_quick_entries.php:241 gl/manage/gl_quick_entries.php:333
-#: includes/sysnames.inc:164 purchasing/includes/ui/invoice_ui.inc:245
-#: purchasing/includes/ui/invoice_ui.inc:247
-#: purchasing/includes/ui/invoice_ui.inc:249 reporting/rep701.php:111
+#: includes/sysnames.inc:164 purchasing/includes/ui/invoice_ui.inc:258
+#: purchasing/includes/ui/invoice_ui.inc:260
+#: purchasing/includes/ui/invoice_ui.inc:262 reporting/rep701.php:111
 #: reporting/rep705.php:238 reporting/rep706.php:185 reporting/rep707.php:210
 #: reporting/rep708.php:192
 msgid "Account"
@@ -3053,8 +3082,8 @@ msgstr ""
 #: purchasing/inquiry/supplier_inquiry.php:176 reporting/rep601.php:80
 #: 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:151
-#: sales/inquiry/customer_inquiry.php:233
+#: sales/inquiry/customer_allocation_inquiry.php:152
+#: sales/inquiry/customer_inquiry.php:226
 msgid "Debit"
 msgstr ""
 
@@ -3071,8 +3100,8 @@ msgstr ""
 #: purchasing/inquiry/supplier_inquiry.php:177 reporting/rep601.php:80
 #: 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:152
-#: sales/inquiry/customer_inquiry.php:234
+#: sales/inquiry/customer_allocation_inquiry.php:153
+#: sales/inquiry/customer_inquiry.php:227
 msgid "Credit"
 msgstr ""
 
@@ -3080,11 +3109,11 @@ 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:189
 #: purchasing/inquiry/supplier_allocation_inquiry.php:137
-#: reporting/rep101.php:137 reporting/rep201.php:126 reporting/rep203.php:94
+#: 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/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:154
+#: sales/inquiry/customer_allocation_inquiry.php:155
 msgid "Balance"
 msgstr ""
 
@@ -3098,8 +3127,8 @@ msgstr ""
 
 #: dimensions/inquiry/search_dimensions.php:73 gl/bank_transfer.php:79
 #: gl/inquiry/journal_inquiry.php:45 gl/manage/revaluate_currencies.php:105
-#: gl/includes/ui/gl_bank_ui.inc:26 gl/includes/ui/gl_bank_ui.inc.orig:25
-#: gl/includes/ui/gl_journal_ui.inc:30 includes/ui/contacts_view.inc:94
+#: gl/includes/ui/gl_bank_ui.inc:26 gl/includes/ui/gl_journal_ui.inc:30
+#: includes/ui/contacts_view.inc:94
 #: inventory/includes/item_adjustments_ui.inc:35
 #: inventory/includes/stock_transfers_ui.inc:40
 #: manufacturing/search_work_orders.php:67
@@ -3107,17 +3136,17 @@ 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:92
-#: purchasing/includes/ui/po_ui.inc:158 purchasing/includes/ui/po_ui.inc:163
-#: purchasing/supplier_payment.php:294 sales/customer_payments.php:367
+#: purchasing/includes/ui/invoice_ui.inc:105
+#: purchasing/includes/ui/po_ui.inc:176 purchasing/includes/ui/po_ui.inc:181
+#: purchasing/supplier_payment.php:298 sales/customer_payments.php:368
 msgid "Reference:"
 msgstr ""
 
 #: dimensions/inquiry/search_dimensions.php:75
-#: includes/ui/allocation_cart.inc:284 includes/ui/sav.ui_lists.inc:1898
-#: includes/ui/ui_lists.inc:1920 reporting/rep101.php:115
+#: includes/ui/allocation_cart.inc:312 includes/ui/mk.allocation_cart.inc:312
+#: includes/ui/ui_lists.inc:1923 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:104
+#: 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
@@ -3131,10 +3160,8 @@ msgstr ""
 
 #: dimensions/inquiry/search_dimensions.php:76 gl/inquiry/bank_inquiry.php:49
 #: gl/inquiry/gl_trial_balance.php:54 gl/inquiry/journal_inquiry.php:48
-#: gl/inquiry/profit_loss.php:168 gl/includes/ui/gl_bank_ui.inc:51
-#: gl/includes/ui/gl_bank_ui.inc:118 gl/includes/ui/gl_bank_ui.inc.orig:50
-#: gl/includes/ui/gl_bank_ui.inc.orig:105
-#: inventory/inquiry/stock_movements.php:62
+#: 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:62
 #: purchasing/inquiry/supplier_allocation_inquiry.php:50
 #: purchasing/inquiry/supplier_inquiry.php:53
 #: sales/inquiry/customer_inquiry.php:50
@@ -3143,8 +3170,7 @@ msgstr ""
 
 #: dimensions/inquiry/search_dimensions.php:77 gl/inquiry/bank_inquiry.php:50
 #: gl/inquiry/gl_trial_balance.php:55 gl/inquiry/journal_inquiry.php:49
-#: gl/inquiry/profit_loss.php:169 gl/includes/ui/gl_bank_ui.inc.orig:105
-#: inventory/inquiry/stock_movements.php:63
+#: gl/inquiry/profit_loss.php:169 inventory/inquiry/stock_movements.php:63
 #: purchasing/inquiry/supplier_allocation_inquiry.php:51
 #: purchasing/inquiry/supplier_inquiry.php:54
 #: sales/inquiry/customer_inquiry.php:51
@@ -3162,21 +3188,22 @@ msgid "Only Open:"
 msgstr ""
 
 #: dimensions/inquiry/search_dimensions.php:132
-#: dimensions/view/view_dimension.php:55 includes/ui/allocation_cart.inc:263
-#: purchasing/includes/ui/invoice_ui.inc:112
+#: dimensions/view/view_dimension.php:55 includes/ui/allocation_cart.inc:288
+#: includes/ui/mk.allocation_cart.inc:288
+#: purchasing/includes/ui/invoice_ui.inc:125
 #: purchasing/view/view_supp_credit.php:48
 #: purchasing/view/view_supp_invoice.php:51
 #: purchasing/inquiry/supplier_allocation_inquiry.php:132
-#: purchasing/inquiry/supplier_inquiry.php:174 reporting/rep101.php:133
-#: reporting/rep201.php:122 reporting/rep203.php:93 reporting/rep501.php:87
+#: purchasing/inquiry/supplier_inquiry.php:174 reporting/rep101.php:118
+#: reporting/rep201.php:110 reporting/rep203.php:93 reporting/rep501.php:87
 #: reporting/includes/doctext.inc:100 reporting/includes/doctext.inc:122
 #: reporting/includes/doctext.inc:143 reporting/includes/doctext.inc:145
 #: reporting/includes/doctext.inc:184 reporting/includes/doctext.inc:186
-#: sales/customer_invoice.php:439 sales/view/view_dispatch.php:97
+#: sales/customer_invoice.php:448 sales/view/view_dispatch.php:97
 #: sales/view/view_invoice.php:96
-#: sales/inquiry/customer_allocation_inquiry.php:148
-#: sales/inquiry/customer_inquiry.php:229
-#: sales/includes/ui/sales_order_ui.inc:602
+#: sales/inquiry/customer_allocation_inquiry.php:149
+#: sales/inquiry/customer_inquiry.php:222
+#: sales/includes/ui/sales_order_ui.inc:601
 msgid "Due Date"
 msgstr ""
 
@@ -3254,22 +3281,19 @@ msgstr ""
 #: 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_trans_view.php:63
-#: gl/view/gl_trans_view.php:66 gl/includes/ui/gl_bank_ui.inc:151
-#: gl/includes/ui/gl_bank_ui.inc:152 gl/includes/ui/gl_bank_ui.inc:154
-#: gl/includes/ui/gl_bank_ui.inc.orig:132
-#: gl/includes/ui/gl_bank_ui.inc.orig:133
-#: gl/includes/ui/gl_bank_ui.inc.orig:135 gl/includes/ui/gl_journal_ui.inc:83
-#: gl/includes/ui/gl_journal_ui.inc:84 gl/includes/ui/gl_journal_ui.inc:86
-#: includes/sysnames.inc:43 includes/sysnames.inc:165
-#: inventory/manage/item_categories.php:216
+#: gl/view/accrual_trans.php:56 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:63
+#: gl/view/gl_trans_view.php:66 gl/includes/ui/gl_bank_ui.inc:152
+#: gl/includes/ui/gl_bank_ui.inc:153 gl/includes/ui/gl_bank_ui.inc:155
+#: gl/includes/ui/gl_journal_ui.inc:83 gl/includes/ui/gl_journal_ui.inc:84
+#: gl/includes/ui/gl_journal_ui.inc:86 includes/sysnames.inc:43
+#: includes/sysnames.inc:165 inventory/manage/item_categories.php:216
 #: inventory/manage/item_categories.php:218 inventory/manage/items.php:343
-#: inventory/manage/items.php:345 purchasing/includes/ui/invoice_ui.inc:245
-#: purchasing/includes/ui/invoice_ui.inc:247
-#: purchasing/manage/suppliers.php:137 purchasing/manage/suppliers.php:138
-#: purchasing/manage/suppliers.php:140 reporting/rep103.php:243
+#: inventory/manage/items.php:345 purchasing/includes/ui/invoice_ui.inc:258
+#: purchasing/includes/ui/invoice_ui.inc:260
+#: purchasing/manage/suppliers.php:138 purchasing/manage/suppliers.php:139
+#: purchasing/manage/suppliers.php:141 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
@@ -3285,38 +3309,35 @@ msgstr ""
 #: reporting/reports_main.php:395 reporting/reports_main.php:401
 #: reporting/reports_main.php:409 reporting/reports_main.php:420
 #: reporting/reports_main.php:432 sales/customer_delivery.php:395
-#: sales/customer_delivery.php:403 sales/customer_invoice.php:409
-#: sales/customer_invoice.php:447 sales/manage/customers.php:270
-#: sales/manage/customers.php:272 sales/includes/ui/sales_credit_ui.inc:132
+#: sales/customer_delivery.php:403 sales/customer_invoice.php:418
+#: sales/customer_invoice.php:456 sales/manage/customers.php:274
+#: sales/manage/customers.php:276 sales/includes/ui/sales_credit_ui.inc:132
 #: sales/includes/ui/sales_credit_ui.inc:137
-#: sales/includes/ui/sales_order_ui.inc:457
-#: sales/includes/ui/sales_order_ui.inc:462
+#: sales/includes/ui/sales_order_ui.inc:456
+#: sales/includes/ui/sales_order_ui.inc:461
 msgid "Dimension"
 msgstr ""
 
 #: gl/accruals.php:98 gl/accruals.php:213 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:64 gl/view/gl_trans_view.php:67
-#: gl/view/gl_trans_view.php:70 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_bank_ui.inc:298 gl/includes/ui/gl_bank_ui.inc.orig:133
-#: gl/includes/ui/gl_bank_ui.inc.orig:136
-#: gl/includes/ui/gl_bank_ui.inc.orig:139
-#: gl/includes/ui/gl_bank_ui.inc.orig:279 gl/includes/ui/gl_journal_ui.inc:84
+#: gl/view/gl_trans_view.php:70 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:84
 #: gl/includes/ui/gl_journal_ui.inc:87 gl/includes/ui/gl_journal_ui.inc:90
 #: gl/includes/ui/gl_journal_ui.inc:240
 #: inventory/includes/item_adjustments_ui.inc:181
 #: inventory/includes/stock_transfers_ui.inc:161
 #: manufacturing/includes/work_order_issue_ui.inc:169
-#: purchasing/includes/ui/invoice_ui.inc:245
-#: purchasing/includes/ui/invoice_ui.inc:247
-#: purchasing/includes/ui/invoice_ui.inc:249
-#: sales/customer_credit_invoice.php:364 sales/customer_delivery.php:527
-#: sales/customer_invoice.php:578 sales/includes/ui/sales_credit_ui.inc:339
+#: purchasing/includes/ui/invoice_ui.inc:258
+#: purchasing/includes/ui/invoice_ui.inc:260
+#: purchasing/includes/ui/invoice_ui.inc:262
+#: sales/customer_credit_invoice.php:364 sales/customer_delivery.php:529
+#: sales/customer_invoice.php:587 sales/includes/ui/sales_credit_ui.inc:339
 msgid "Memo"
 msgstr ""
 
@@ -3363,20 +3384,18 @@ msgstr ""
 #: gl/manage/gl_quick_entries.php:261 gl/manage/gl_quick_entries.php:263
 #: gl/manage/gl_quick_entries.php:265 gl/manage/gl_quick_entries.php:339
 #: gl/view/bank_transfer_view.php:70 gl/view/bank_transfer_view.php:80
-#: 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_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:152 gl/includes/ui/gl_bank_ui.inc:155
-#: gl/includes/ui/gl_bank_ui.inc:158 gl/includes/ui/gl_bank_ui.inc.orig:133
-#: gl/includes/ui/gl_bank_ui.inc.orig:136
-#: gl/includes/ui/gl_bank_ui.inc.orig:139 includes/sysnames.inc:132
-#: includes/ui/allocation_cart.inc:263 includes/ui/sav.ui_lists.inc:1163
-#: includes/ui/ui_lists.inc:1184
+#: gl/view/gl_deposit_view.php:67 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: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:132
+#: includes/ui/allocation_cart.inc:288 includes/ui/mk.allocation_cart.inc:288
+#: includes/ui/ui_lists.inc:1187
 #: manufacturing/includes/manufacturing_ui.inc:236
-#: purchasing/includes/ui/invoice_ui.inc:245
-#: purchasing/includes/ui/invoice_ui.inc:247
-#: purchasing/includes/ui/invoice_ui.inc:249
+#: purchasing/includes/ui/invoice_ui.inc:258
+#: purchasing/includes/ui/invoice_ui.inc:260
+#: purchasing/includes/ui/invoice_ui.inc:262
 #: purchasing/view/view_supp_payment.php:60
 #: purchasing/view/view_supp_payment.php:72 reporting/rep102.php:245
 #: reporting/rep107.php:184 reporting/rep109.php:189 reporting/rep110.php:193
@@ -3416,7 +3435,7 @@ msgstr ""
 
 #: gl/bank_account_reconcile.php:35 gl/bank_transfer.php:30 gl/gl_bank.php:49
 #: gl/inquiry/bank_inquiry.php:30 purchasing/supplier_payment.php:42
-#: sales/customer_payments.php:39
+#: sales/customer_payments.php:38
 msgid "There are no bank accounts defined in the system."
 msgstr ""
 
@@ -3510,25 +3529,29 @@ msgid "Transfer Date:"
 msgstr ""
 
 #: gl/bank_transfer.php:87 gl/bank_transfer.php:94
-#: sales/customer_payments.php:396
+#: sales/customer_payments.php:397
 msgid "Amount:"
 msgstr ""
 
 #: gl/bank_transfer.php:88 gl/bank_transfer.php:95
-#: purchasing/supplier_payment.php:307 sales/customer_payments.php:381
+#: purchasing/supplier_payment.php:313 sales/customer_payments.php:383
 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:126 purchasing/supplier_payment.php:132
+#: gl/bank_transfer.php:128 gl/bank_transfer.php:158 gl/bank_transfer.php:190
+#: purchasing/supplier_payment.php:135 purchasing/supplier_payment.php:141
 msgid "The entered amount is invalid or less than zero."
 msgstr ""
 
-#: gl/bank_transfer.php:133 gl/gl_bank.php:225
+#: gl/bank_transfer.php:133 gl/gl_bank.php:224
 msgid "The total bank amount cannot be 0."
 msgstr ""
 
@@ -3537,28 +3560,28 @@ msgstr ""
 msgid "The total bank amount exceeds allowed limit (%s) for source account."
 msgstr ""
 
-#: gl/bank_transfer.php:150 gl/gl_bank.php:242
+#: gl/bank_transfer.php:150 gl/gl_bank.php:241
 #, php-format
 msgid ""
 "The bank transaction would result in exceed of authorized overdraft limit "
 "for transaction: %s #%s on %s."
 msgstr ""
 
-#: gl/bank_transfer.php:163 purchasing/supplier_payment.php:140
-#: sales/customer_payments.php:190
+#: gl/bank_transfer.php:163 purchasing/supplier_payment.php:149
+#: sales/customer_payments.php:195
 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:249 gl/gl_journal.php:168
+#: gl/bank_transfer.php:169 gl/gl_bank.php:248 gl/gl_journal.php:168
 #: gl/manage/revaluate_currencies.php:65 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:89 purchasing/po_receive_items.php:188
-#: purchasing/supplier_payment.php:197 sales/credit_note_entry.php:147
+#: purchasing/supplier_payment.php:207 sales/credit_note_entry.php:147
 #: sales/customer_credit_invoice.php:102 sales/customer_delivery.php:166
-#: sales/customer_invoice.php:280 sales/customer_payments.php:157
-#: sales/sales_order_entry.php:412
+#: sales/customer_invoice.php:289 sales/customer_payments.php:162
+#: sales/sales_order_entry.php:416
 msgid "You must enter a reference."
 msgstr ""
 
@@ -3566,6 +3589,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 ""
@@ -3582,109 +3609,117 @@ msgstr ""
 msgid "Modify Bank Deposit Entry"
 msgstr ""
 
-#: gl/gl_bank.php:73
+#: gl/gl_bank.php:74
 #, php-format
 msgid "Payment %d has been entered"
 msgstr ""
 
-#: gl/gl_bank.php:75 gl/gl_bank.php:93
+#: gl/gl_bank.php:76 gl/gl_bank.php:94
 msgid "&View the GL Postings for this Payment"
 msgstr ""
 
-#: gl/gl_bank.php:77 gl/gl_bank.php:95
+#: gl/gl_bank.php:78 gl/gl_bank.php:96
 msgid "Enter Another &Payment"
 msgstr ""
 
-#: gl/gl_bank.php:79 gl/gl_bank.php:97
+#: gl/gl_bank.php:80 gl/gl_bank.php:98
 msgid "Enter A &Deposit"
 msgstr ""
 
-#: gl/gl_bank.php:81 gl/gl_journal.php:61 inventory/adjustments.php:50
+#: gl/gl_bank.php:82 gl/gl_journal.php:61 inventory/adjustments.php:50
 #: manufacturing/work_order_entry.php:68 purchasing/po_entry_items.php:112
 #: purchasing/po_entry_items.php:136 purchasing/supplier_credit.php:49
-#: purchasing/supplier_invoice.php:52 sales/credit_note_entry.php:77
-#: sales/customer_credit_invoice.php:62 sales/customer_invoice.php:66
-#: sales/sales_order_entry.php:234
+#: purchasing/supplier_invoice.php:53 sales/credit_note_entry.php:77
+#: sales/customer_credit_invoice.php:62 sales/customer_invoice.php:75
+#: sales/sales_order_entry.php:237
 msgid "Add an Attachment"
 msgstr ""
 
-#: gl/gl_bank.php:91
+#: gl/gl_bank.php:92
 #, php-format
 msgid "Payment %d has been modified"
 msgstr ""
 
-#: gl/gl_bank.php:107
+#: gl/gl_bank.php:108
 #, php-format
 msgid "Deposit %d has been entered"
 msgstr ""
 
-#: gl/gl_bank.php:109
+#: gl/gl_bank.php:110
 msgid "View the GL Postings for this Deposit"
 msgstr ""
 
-#: gl/gl_bank.php:111
+#: gl/gl_bank.php:112
 msgid "Enter Another Deposit"
 msgstr ""
 
-#: gl/gl_bank.php:113
+#: gl/gl_bank.php:114
 msgid "Enter A Payment"
 msgstr ""
 
-#: gl/gl_bank.php:122
+#: gl/gl_bank.php:123
 #, php-format
 msgid "Deposit %d has been modified"
 msgstr ""
 
-#: gl/gl_bank.php:124
+#: gl/gl_bank.php:125
 msgid "&View the GL Postings for this Deposit"
 msgstr ""
 
-#: gl/gl_bank.php:126
+#: gl/gl_bank.php:127
 msgid "Enter Another &Deposit"
 msgstr ""
 
-#: gl/gl_bank.php:128
+#: gl/gl_bank.php:129
 msgid "Enter A &Payment"
 msgstr ""
 
-#: gl/gl_bank.php:219
+#: gl/gl_bank.php:218
 msgid "You must enter at least one payment line."
 msgstr ""
 
-#: gl/gl_bank.php:236 purchasing/supplier_payment.php:190
+#: gl/gl_bank.php:235 purchasing/supplier_payment.php:200
 #, php-format
 msgid "The total bank amount exceeds allowed limit (%s)."
 msgstr ""
 
-#: gl/gl_bank.php:261
+#: gl/gl_bank.php:260
 msgid "The entered date for the payment is invalid."
 msgstr ""
 
-#: gl/gl_bank.php:273
+#: gl/gl_bank.php:272
 msgid "You have to select customer and customer branch."
 msgstr ""
 
-#: gl/gl_bank.php:277
+#: gl/gl_bank.php:276
 msgid "You have to select supplier."
 msgstr ""
 
-#: gl/gl_bank.php:325
+#: gl/gl_bank.php:284
+msgid "Settled amount have to be positive number."
+msgstr ""
+
+#: gl/gl_bank.php:330
 msgid "The amount entered is not a valid number or is less than zero."
 msgstr ""
 
-#: gl/gl_bank.php:397
+#: gl/gl_bank.php:336 gl/manage/exchange_rates.php:39
+msgid "The exchange rate cannot be zero or a negative number."
+msgstr ""
+
+#: gl/gl_bank.php:408
 msgid "Payment Items"
 msgstr ""
 
-#: gl/gl_bank.php:397
+#: gl/gl_bank.php:408
 msgid "Deposit Items"
 msgstr ""
 
-#: gl/gl_bank.php:405
+#: gl/gl_bank.php:416
 msgid "Process Payment"
 msgstr ""
 
-#: gl/gl_bank.php:405
+#: gl/gl_bank.php:416
 msgid "Process Deposit"
 msgstr ""
 
@@ -3693,7 +3728,6 @@ msgid "Budget Entry"
 msgstr ""
 
 #: gl/gl_budget.php:26 gl/manage/gl_accounts.php:23
-#: gl/manage/gl_accounts.php.orig:23
 msgid ""
 "There are no account groups defined. Please define at least one account "
 "group before entering accounts."
@@ -3708,8 +3742,7 @@ msgid "The Budget has been deleted."
 msgstr ""
 
 #: gl/gl_budget.php:64 gl/manage/gl_accounts.php:231
-#: gl/manage/gl_accounts.php:241 gl/manage/gl_accounts.php.orig:230
-#: gl/manage/gl_accounts.php.orig:240
+#: gl/manage/gl_accounts.php:241
 msgid "Account Code:"
 msgstr ""
 
@@ -3718,9 +3751,9 @@ msgid "Get"
 msgstr ""
 
 #: gl/gl_budget.php:91 gl/gl_budget.php:93 gl/inquiry/profit_loss.php:236
-#: gl/manage/gl_quick_entries.php:240 reporting/rep101.php:141
+#: gl/manage/gl_quick_entries.php:240 reporting/rep101.php:126
 #: reporting/rep105.php:118 reporting/rep106.php:92 reporting/rep114.php:90
-#: reporting/rep201.php:130 reporting/rep304.php:121 reporting/rep305.php:105
+#: 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/rep702.php:59
 #: reporting/rep704.php:95 reporting/rep704.php:105 reporting/rep704.php:113
@@ -3743,33 +3776,32 @@ msgstr ""
 #: gl/gl_budget.php:127 gl/inquiry/balance_sheet.php:98
 #: gl/inquiry/balance_sheet.php:205 gl/inquiry/balance_sheet.php:236
 #: gl/inquiry/gl_trial_balance.php:224 gl/inquiry/profit_loss.php:115
-#: gl/inquiry/profit_loss.php:288 gl/view/gl_deposit_view.php:132
-#: gl/view/gl_payment_view.php:131 gl/view/gl_trans_view.php:106
-#: gl/includes/ui/gl_bank_ui.inc:201 gl/includes/ui/gl_bank_ui.inc.orig:182
-#: gl/includes/ui/gl_journal_ui.inc:141
+#: 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:106
+#: gl/includes/ui/gl_bank_ui.inc:202 gl/includes/ui/gl_journal_ui.inc:141
 #: inventory/includes/item_adjustments_ui.inc:63
 #: inventory/includes/item_adjustments_ui.inc:102
 #: manufacturing/includes/manufacturing_ui.inc:178
-#: purchasing/includes/ui/invoice_ui.inc:309
-#: purchasing/includes/ui/invoice_ui.inc:474
-#: purchasing/includes/ui/invoice_ui.inc:544
+#: purchasing/includes/ui/invoice_ui.inc:322
+#: purchasing/includes/ui/invoice_ui.inc:487
+#: purchasing/includes/ui/invoice_ui.inc:557
 #: purchasing/po_receive_items.php:63 purchasing/view/view_po.php:140
 #: purchasing/allocations/supplier_allocation_main.php:100
-#: reporting/rep101.php:252 reporting/rep106.php:84 reporting/rep106.php:119
-#: reporting/rep106.php:162 reporting/rep114.php:161 reporting/rep201.php:237
+#: 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:100
-#: reporting/rep305.php:126 reporting/rep305.php:182 reporting/rep306.php:141
-#: reporting/rep306.php:177 reporting/rep306.php:197 reporting/rep306.php:213
-#: reporting/rep306.php:262 reporting/rep306.php:277 reporting/rep306.php:288
+#: 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:315 reporting/rep706.php:106
 #: reporting/rep706.php:255 reporting/rep706.php:290 reporting/rep707.php:115
 #: reporting/rep707.php:297 reporting/rep708.php:253
 #: reporting/includes/doctext.inc:30 reporting/includes/doctext.inc:170
 #: sales/customer_credit_invoice.php:281 sales/customer_delivery.php:433
-#: sales/customer_invoice.php:470
+#: sales/customer_invoice.php:479
 #: sales/allocations/customer_allocation_main.php:99
 #: sales/view/view_credit.php:91 sales/view/view_dispatch.php:113
 #: sales/view/view_invoice.php:114 sales/view/view_sales_order.php:96
@@ -3844,8 +3876,8 @@ msgstr ""
 msgid "The credit amount entered is not a valid number or is less than zero."
 msgstr ""
 
-#: gl/gl_journal.php:243 includes/ui/ui_view.inc:674
-#: purchasing/supplier_credit.php:119 purchasing/supplier_invoice.php:119
+#: gl/gl_journal.php:243 includes/ui/ui_view.inc:732
+#: purchasing/supplier_credit.php:128 purchasing/supplier_invoice.php:129
 msgid "Cannot post to GL account used by more than one tax type."
 msgstr ""
 
@@ -3903,7 +3935,7 @@ msgstr ""
 msgid "Opening Balance"
 msgstr ""
 
-#: gl/inquiry/bank_inquiry.php:124 gl/inquiry/gl_account_inquiry.php:211
+#: gl/inquiry/bank_inquiry.php:124 gl/inquiry/gl_account_inquiry.php:213
 #: gl/inquiry/gl_trial_balance.php:234 reporting/rep601.php:157
 #: reporting/rep704.php:192 reporting/rep708.php:262
 msgid "Ending Balance"
@@ -3925,7 +3957,7 @@ msgstr ""
 msgid "Amount max:"
 msgstr ""
 
-#: gl/inquiry/gl_account_inquiry.php:220
+#: gl/inquiry/gl_account_inquiry.php:222
 msgid ""
 "No general ledger transactions have been created for the specified criteria."
 msgstr ""
@@ -3955,10 +3987,10 @@ msgid "The from date cannot be bigger than the fiscal year end."
 msgstr ""
 
 #: gl/inquiry/gl_trial_balance.php:186 gl/manage/bank_accounts.php:106
-#: gl/manage/bank_accounts.php.orig:106 gl/view/gl_trans_view.php:63
-#: gl/view/gl_trans_view.php:66 gl/view/gl_trans_view.php:69
-#: reporting/rep701.php:111 reporting/rep702.php:53 reporting/rep705.php:238
-#: reporting/rep706.php:185 reporting/rep707.php:210 reporting/rep708.php:192
+#: gl/view/gl_trans_view.php:63 gl/view/gl_trans_view.php:66
+#: gl/view/gl_trans_view.php:69 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 ""
 
@@ -4073,48 +4105,46 @@ msgstr ""
 msgid "Total payable or refund"
 msgstr ""
 
-#: gl/manage/bank_accounts.php:16 gl/manage/bank_accounts.php.orig:16
-#: reporting/reports_main.php:310
+#: gl/manage/bank_accounts.php:16 reporting/reports_main.php:310
 msgid "Bank Accounts"
 msgstr ""
 
-#: gl/manage/bank_accounts.php:33 gl/manage/bank_accounts.php.orig:33
+#: gl/manage/bank_accounts.php:33
 msgid "The bank account name cannot be empty."
 msgstr ""
 
-#: gl/manage/bank_accounts.php:39 gl/manage/bank_accounts.php.orig:39
+#: gl/manage/bank_accounts.php:39
 msgid "The GL account selected is already in use. Select another GL account."
 msgstr ""
 
-#: gl/manage/bank_accounts.php:52 gl/manage/bank_accounts.php.orig:52
+#: gl/manage/bank_accounts.php:52
 msgid "Bank account has been updated"
 msgstr ""
 
-#: gl/manage/bank_accounts.php:61 gl/manage/bank_accounts.php.orig:61
+#: gl/manage/bank_accounts.php:61
 msgid "New bank account has been added"
 msgstr ""
 
-#: gl/manage/bank_accounts.php:76 gl/manage/bank_accounts.php.orig:76
+#: gl/manage/bank_accounts.php:76
 msgid ""
 "Cannot delete this bank account because transactions have been created using "
 "this account."
 msgstr ""
 
-#: gl/manage/bank_accounts.php:82 gl/manage/bank_accounts.php.orig:82
+#: gl/manage/bank_accounts.php:82
 msgid ""
 "Cannot delete this bank account because POS definitions have been created "
 "using this account."
 msgstr ""
 
-#: gl/manage/bank_accounts.php:87 gl/manage/bank_accounts.php.orig:87
+#: gl/manage/bank_accounts.php:87
 msgid "Selected bank account has been deleted"
 msgstr ""
 
-#: gl/manage/bank_accounts.php:106 gl/manage/bank_accounts.php.orig:106
-#: gl/view/bank_transfer_view.php:69 gl/view/bank_transfer_view.php:78
-#: gl/view/gl_deposit_view.php:66 gl/view/gl_payment_view.php:64
-#: inventory/prices.php:149 inventory/purchasing_data.php:149
-#: purchasing/view/view_supp_credit.php:49
+#: gl/manage/bank_accounts.php:106 gl/view/bank_transfer_view.php:69
+#: gl/view/bank_transfer_view.php:78 gl/view/gl_deposit_view.php:66
+#: gl/view/gl_payment_view.php:64 inventory/prices.php:146
+#: inventory/purchasing_data.php:147 purchasing/view/view_supp_credit.php:49
 #: purchasing/view/view_supp_invoice.php:53
 #: purchasing/inquiry/po_search_completed.php:127
 #: purchasing/inquiry/po_search.php:136
@@ -4125,80 +4155,75 @@ msgstr ""
 #: purchasing/inquiry/supplier_inquiry.php:186
 #: purchasing/allocations/supplier_allocation_main.php:99
 #: purchasing/allocations/supplier_allocation_main.php:107
-#: reporting/rep101.php:143 reporting/rep102.php:133 reporting/rep102.php:139
-#: reporting/rep103.php:232 reporting/rep104.php:116 reporting/rep201.php:132
+#: 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:340
-#: sales/customer_invoice.php:404
+#: sales/customer_invoice.php:413
 #: sales/allocations/customer_allocation_main.php:98
 #: sales/allocations/customer_allocation_main.php:106
 #: sales/view/view_credit.php:70 sales/view/view_dispatch.php:86
 #: sales/view/view_invoice.php:85
-#: sales/inquiry/customer_allocation_inquiry.php:150
-#: sales/inquiry/customer_allocation_inquiry.php:160
+#: sales/inquiry/customer_allocation_inquiry.php:151
+#: sales/inquiry/customer_allocation_inquiry.php:161
 #: sales/inquiry/customer_inquiry.php:80
-#: sales/inquiry/customer_inquiry.php:232
-#: sales/inquiry/customer_inquiry.php:245
+#: sales/inquiry/customer_inquiry.php:225
+#: sales/inquiry/customer_inquiry.php:238
 #: sales/inquiry/sales_deliveries_view.php:189
 #: sales/inquiry/sales_orders_view.php:272
 #: sales/inquiry/sales_orders_view.php:286
 msgid "Currency"
 msgstr ""
 
-#: gl/manage/bank_accounts.php:106 gl/manage/bank_accounts.php.orig:106
+#: gl/manage/bank_accounts.php:106
 msgid "GL Account"
 msgstr ""
 
-#: gl/manage/bank_accounts.php:107 gl/manage/bank_accounts.php.orig:107
-#: reporting/includes/doctext.inc:247
+#: gl/manage/bank_accounts.php:107 reporting/includes/doctext.inc:247
 msgid "Bank"
 msgstr ""
 
-#: gl/manage/bank_accounts.php:107 gl/manage/bank_accounts.php.orig:107
-#: includes/ui/ui_view.inc:489
+#: gl/manage/bank_accounts.php:107 includes/ui/ui_view.inc:547
 msgid "Number"
 msgstr ""
 
-#: gl/manage/bank_accounts.php:107 gl/manage/bank_accounts.php.orig:107
+#: gl/manage/bank_accounts.php:107
 msgid "Bank Address"
 msgstr ""
 
-#: gl/manage/bank_accounts.php:107 gl/manage/bank_accounts.php.orig:107
+#: gl/manage/bank_accounts.php:107
 msgid "Dflt"
 msgstr ""
 
-#: gl/manage/bank_accounts.php:163 gl/manage/bank_accounts.php.orig:163
+#: gl/manage/bank_accounts.php:163
 msgid "Bank Account Name:"
 msgstr ""
 
 #: gl/manage/bank_accounts.php:167 gl/manage/bank_accounts.php:171
-#: gl/manage/bank_accounts.php.orig:167 gl/manage/bank_accounts.php.orig:171
 msgid "Account Type:"
 msgstr ""
 
 #: gl/manage/bank_accounts.php:175 gl/manage/bank_accounts.php:179
-#: gl/manage/bank_accounts.php.orig:175 gl/manage/bank_accounts.php.orig:179
 msgid "Bank Account Currency:"
 msgstr ""
 
-#: gl/manage/bank_accounts.php:182 gl/manage/bank_accounts.php.orig:182
+#: gl/manage/bank_accounts.php:182
 msgid "Default currency account:"
 msgstr ""
 
 #: gl/manage/bank_accounts.php:185 gl/manage/bank_accounts.php:187
-#: gl/manage/bank_accounts.php.orig:185 gl/manage/bank_accounts.php.orig:187
 msgid "Bank Account GL Code:"
 msgstr ""
 
-#: gl/manage/bank_accounts.php:189 gl/manage/bank_accounts.php.orig:189
+#: gl/manage/bank_accounts.php:189
 msgid "Bank Name:"
 msgstr ""
 
-#: gl/manage/bank_accounts.php:190 gl/manage/bank_accounts.php.orig:190
+#: gl/manage/bank_accounts.php:190
 msgid "Bank Account Number:"
 msgstr ""
 
-#: gl/manage/bank_accounts.php:191 gl/manage/bank_accounts.php.orig:191
+#: gl/manage/bank_accounts.php:191
 msgid "Bank Address:"
 msgstr ""
 
@@ -4314,10 +4339,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 ""
@@ -4326,8 +4347,7 @@ msgstr ""
 msgid "Date to Use From:"
 msgstr ""
 
-#: gl/manage/exchange_rates.php:141 includes/ui/ui_view.inc:288
-#: includes/ui/ui_view.inc:290
+#: gl/manage/exchange_rates.php:141 includes/ui/ui_view.inc:325
 msgid "Exchange Rate:"
 msgstr ""
 
@@ -4420,32 +4440,31 @@ msgstr ""
 msgid "Class Type:"
 msgstr ""
 
-#: gl/manage/gl_accounts.php:16 gl/manage/gl_accounts.php.orig:16
-#: reporting/rep701.php:117
+#: gl/manage/gl_accounts.php:16 reporting/rep701.php:117
 msgid "Chart of Accounts"
 msgstr ""
 
-#: gl/manage/gl_accounts.php:53 gl/manage/gl_accounts.php.orig:53
+#: gl/manage/gl_accounts.php:53
 msgid "The account code must be entered."
 msgstr ""
 
-#: gl/manage/gl_accounts.php:59 gl/manage/gl_accounts.php.orig:59
+#: gl/manage/gl_accounts.php:59
 msgid "The account name cannot be empty."
 msgstr ""
 
-#: gl/manage/gl_accounts.php:65 gl/manage/gl_accounts.php.orig:65
+#: gl/manage/gl_accounts.php:65
 msgid "The account code must be numeric."
 msgstr ""
 
-#: gl/manage/gl_accounts.php:80 gl/manage/gl_accounts.php.orig:81
+#: gl/manage/gl_accounts.php:80
 msgid "The account belongs to a bank account and cannot be inactivated."
 msgstr ""
 
-#: gl/manage/gl_accounts.php:89 gl/manage/gl_accounts.php.orig:90
+#: gl/manage/gl_accounts.php:89
 msgid "Account data has been updated."
 msgstr ""
 
-#: gl/manage/gl_accounts.php:98 gl/manage/gl_accounts.php.orig:99
+#: gl/manage/gl_accounts.php:98
 msgid "New account has been added."
 msgstr ""
 
@@ -4453,88 +4472,88 @@ msgstr ""
 msgid "Account not added, possible duplicate Account Code."
 msgstr ""
 
-#: gl/manage/gl_accounts.php:117 gl/manage/gl_accounts.php.orig:116
+#: gl/manage/gl_accounts.php:117
 msgid ""
 "Cannot delete this account because transactions have been created using this "
 "account."
 msgstr ""
 
-#: gl/manage/gl_accounts.php:123 gl/manage/gl_accounts.php.orig:122
+#: gl/manage/gl_accounts.php:123
 msgid ""
 "Cannot delete this account because it is used as one of the company default "
 "GL accounts."
 msgstr ""
 
-#: gl/manage/gl_accounts.php:129 gl/manage/gl_accounts.php.orig:128
+#: gl/manage/gl_accounts.php:129
 msgid "Cannot delete this account because it is used by a bank account."
 msgstr ""
 
-#: gl/manage/gl_accounts.php:135 gl/manage/gl_accounts.php.orig:134
+#: gl/manage/gl_accounts.php:135
 msgid ""
 "Cannot delete this account because it is used by one or more Item Categories."
 msgstr ""
 
-#: gl/manage/gl_accounts.php:141 gl/manage/gl_accounts.php.orig:140
+#: gl/manage/gl_accounts.php:141
 msgid "Cannot delete this account because it is used by one or more Items."
 msgstr ""
 
-#: gl/manage/gl_accounts.php:147 gl/manage/gl_accounts.php.orig:146
+#: gl/manage/gl_accounts.php:147
 msgid "Cannot delete this account because it is used by one or more Taxes."
 msgstr ""
 
-#: gl/manage/gl_accounts.php:153 gl/manage/gl_accounts.php.orig:152
+#: gl/manage/gl_accounts.php:153
 msgid ""
 "Cannot delete this account because it is used by one or more Customer "
 "Branches."
 msgstr ""
 
-#: gl/manage/gl_accounts.php:159 gl/manage/gl_accounts.php.orig:158
+#: gl/manage/gl_accounts.php:159
 msgid "Cannot delete this account because it is used by one or more suppliers."
 msgstr ""
 
-#: gl/manage/gl_accounts.php:165 gl/manage/gl_accounts.php.orig:164
+#: gl/manage/gl_accounts.php:165
 msgid ""
 "Cannot delete this account because it is used by one or more Quick Entry "
 "Lines."
 msgstr ""
 
-#: gl/manage/gl_accounts.php:183 gl/manage/gl_accounts.php.orig:182
+#: gl/manage/gl_accounts.php:183
 msgid "Selected account has been deleted"
 msgstr ""
 
-#: gl/manage/gl_accounts.php:198 gl/manage/gl_accounts.php.orig:197
+#: gl/manage/gl_accounts.php:198
 msgid "New account"
 msgstr ""
 
-#: gl/manage/gl_accounts.php:244 gl/manage/gl_accounts.php.orig:243
+#: gl/manage/gl_accounts.php:244
 msgid "Account Code 2:"
 msgstr ""
 
-#: gl/manage/gl_accounts.php:246 gl/manage/gl_accounts.php.orig:245
+#: gl/manage/gl_accounts.php:246
 msgid "Account Name:"
 msgstr ""
 
-#: gl/manage/gl_accounts.php:248 gl/manage/gl_accounts.php.orig:247
+#: gl/manage/gl_accounts.php:248
 msgid "Account Group:"
 msgstr ""
 
-#: gl/manage/gl_accounts.php:250 gl/manage/gl_accounts.php.orig:249
+#: gl/manage/gl_accounts.php:250
 msgid "Account Tags:"
 msgstr ""
 
-#: gl/manage/gl_accounts.php:252 gl/manage/gl_accounts.php.orig:251
+#: gl/manage/gl_accounts.php:252
 msgid "Account status:"
 msgstr ""
 
-#: gl/manage/gl_accounts.php:257 gl/manage/gl_accounts.php.orig:256
+#: gl/manage/gl_accounts.php:257
 msgid "Add Account"
 msgstr ""
 
-#: gl/manage/gl_accounts.php:261 gl/manage/gl_accounts.php.orig:260
+#: gl/manage/gl_accounts.php:261
 msgid "Update Account"
 msgstr ""
 
-#: gl/manage/gl_accounts.php:262 gl/manage/gl_accounts.php.orig:261
+#: gl/manage/gl_accounts.php:262
 msgid "Delete account"
 msgstr ""
 
@@ -4610,8 +4629,8 @@ msgstr ""
 msgid "Quick Entries"
 msgstr ""
 
-#: gl/manage/gl_quick_entries.php:58 includes/ui/radio.ui_input.inc:204
-#: includes/ui/simple_crud_class.inc:221 includes/ui/ui_input.inc:205
+#: gl/manage/gl_quick_entries.php:58 includes/ui/simple_crud_class.inc:221
+#: includes/ui/ui_input.inc:205
 msgid "Add new"
 msgstr ""
 
@@ -4698,7 +4717,7 @@ msgid "Posted"
 msgstr ""
 
 #: gl/manage/gl_quick_entries.php:329 sales/customer_delivery.php:433
-#: sales/customer_invoice.php:470
+#: sales/customer_invoice.php:479
 msgid "Tax Type"
 msgstr ""
 
@@ -4766,7 +4785,7 @@ msgstr ""
 msgid "GL Deposit"
 msgstr ""
 
-#: gl/view/gl_deposit_view.php:71 gl/includes/db/gl_db_banking.inc:212
+#: gl/view/gl_deposit_view.php:71 gl/includes/db/gl_db_banking.inc:213
 #: reporting/reports_main.php:96 reporting/reports_main.php:106
 #: reporting/reports_main.php:114 reporting/reports_main.php:128
 #: reporting/reports_main.php:136 reporting/reports_main.php:143
@@ -4775,47 +4794,50 @@ msgstr ""
 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:63 gl/view/gl_trans_view.php:66
-#: gl/view/gl_trans_view.php:69 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:132
-#: gl/includes/ui/gl_bank_ui.inc.orig:135
-#: gl/includes/ui/gl_bank_ui.inc.orig:138 gl/includes/ui/gl_journal_ui.inc:83
-#: gl/includes/ui/gl_journal_ui.inc:86 gl/includes/ui/gl_journal_ui.inc:89
-#: reporting/rep701.php:111
+#: gl/view/gl_trans_view.php:69 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:83 gl/includes/ui/gl_journal_ui.inc:86
+#: gl/includes/ui/gl_journal_ui.inc:89 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: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:132
-#: gl/includes/ui/gl_bank_ui.inc.orig:135
-#: gl/includes/ui/gl_bank_ui.inc.orig:138 gl/includes/ui/gl_journal_ui.inc:83
+#: gl/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:83
 #: gl/includes/ui/gl_journal_ui.inc:86 gl/includes/ui/gl_journal_ui.inc:89
 msgid "Account Description"
 msgstr ""
@@ -4832,20 +4854,20 @@ msgstr ""
 msgid "Pay To"
 msgstr ""
 
-#: gl/view/gl_payment_view.php:70 purchasing/view/view_supp_payment.php:64
-#: purchasing/view/view_supp_payment.php:78 sales/view/view_receipt.php:48
+#: 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:50
 msgid "Payment Type"
 msgstr ""
 
-#: gl/view/gl_payment_view.php:79 purchasing/view/view_supp_payment.php:85
+#: 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 ""
 
@@ -4866,11 +4888,12 @@ msgid "This transaction has been voided."
 msgstr ""
 
 #: gl/includes/db/gl_db_banking.inc:44 gl/includes/db/gl_db_banking.inc:47
-#: gl/includes/db/gl_db_banking.inc:59 gl/includes/db/gl_db_banking.inc:62
+#: gl/includes/db/gl_db_banking.inc:60 gl/includes/db/gl_db_banking.inc:63
+#: gl/includes/db/gl_db_banking.inc:256
 msgid "Exchange Variance"
 msgstr ""
 
-#: gl/includes/db/gl_db_banking.inc:212 reporting/reports_main.php:97
+#: gl/includes/db/gl_db_banking.inc:213 reporting/reports_main.php:97
 #: reporting/reports_main.php:107 reporting/reports_main.php:115
 #: reporting/reports_main.php:129 reporting/reports_main.php:137
 #: reporting/reports_main.php:144 reporting/reports_main.php:193
@@ -4878,145 +4901,141 @@ msgstr ""
 msgid "To"
 msgstr ""
 
-#: gl/includes/db/gl_db_banking.inc:428
+#: gl/includes/db/gl_db_banking.inc:445
 msgid "Document reentered."
 msgstr ""
 
-#: gl/includes/db/gl_db_rates.inc:139
-#, php-format
-msgid ""
-"Cannot retrieve currency rate from %s page. Please set the rate manually."
-msgstr ""
-
 #: gl/includes/db/gl_db_trans.inc:93
 #, php-format
 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:23
-#: gl/includes/ui/gl_journal_ui.inc:27
+#: gl/includes/ui/gl_bank_ui.inc:24 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:152
-#: purchasing/allocations/supplier_allocate.php:53
-#: sales/allocations/customer_allocate.php:52
+#: 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:50
+#: 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:55
+#: 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:62
-#: inventory/purchasing_data.php:210 inventory/purchasing_data.php:214
-#: purchasing/includes/ui/invoice_ui.inc:73
-#: purchasing/includes/ui/invoice_ui.inc:80
-#: purchasing/includes/ui/po_ui.inc:119 purchasing/includes/ui/po_ui.inc:124
+#: gl/includes/ui/gl_bank_ui.inc:64 inventory/purchasing_data.php:208
+#: inventory/purchasing_data.php:212 purchasing/includes/ui/invoice_ui.inc:86
+#: purchasing/includes/ui/invoice_ui.inc:93
+#: purchasing/includes/ui/po_ui.inc:127 purchasing/includes/ui/po_ui.inc:132
 msgid "Supplier:"
 msgstr ""
 
-#: gl/includes/ui/gl_bank_ui.inc:66 gl/includes/ui/gl_bank_ui.inc.orig:65
-#: sales/manage/recurrent_invoices.php:169
+#: 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:284
 msgid "Customer:"
 msgstr ""
 
-#: gl/includes/ui/gl_bank_ui.inc:70 gl/includes/ui/gl_bank_ui.inc.orig:69
-#: sales/customer_payments.php:347 sales/manage/recurrent_invoices.php:172
+#: gl/includes/ui/gl_bank_ui.inc:71 sales/customer_payments.php:345
+#: sales/manage/recurrent_invoices.php:172
 #: sales/includes/ui/sales_credit_ui.inc:37
 #: sales/includes/ui/sales_order_ui.inc:291
 msgid "Branch:"
 msgstr ""
 
-#: gl/includes/ui/gl_bank_ui.inc:84 gl/includes/ui/gl_bank_ui.inc:87
-#: sales/customer_payments.php:356
+#: gl/includes/ui/gl_bank_ui.inc:85 gl/includes/ui/gl_bank_ui.inc:88
+#: sales/customer_payments.php:361
 msgid "This customer account is on hold."
 msgstr ""
 
-#: gl/includes/ui/gl_bank_ui.inc:99 gl/includes/ui/gl_bank_ui.inc.orig:87
-#: gl/includes/ui/gl_journal_ui.inc:58 gl/includes/ui/gl_journal_ui.inc:62
-#: purchasing/includes/ui/invoice_ui.inc:231
+#: 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:244
 msgid "Go"
 msgstr ""
 
-#: gl/includes/ui/gl_bank_ui.inc:118
+#: gl/includes/ui/gl_bank_ui.inc:120
 msgid "Into:"
 msgstr ""
 
-#: gl/includes/ui/gl_bank_ui.inc:186 gl/includes/ui/gl_bank_ui.inc.orig:167
-#: includes/ui/simple_crud_class.inc:52
+#: 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:520
-#: purchasing/includes/ui/po_ui.inc:266
+#: purchasing/includes/ui/invoice_ui.inc:533
+#: purchasing/includes/ui/po_ui.inc:264
 #: sales/includes/ui/sales_credit_ui.inc:198
 #: sales/includes/ui/sales_order_ui.inc:209
 msgid "Edit document line"
 msgstr ""
 
-#: gl/includes/ui/gl_bank_ui.inc:188 gl/includes/ui/gl_bank_ui.inc.orig:169
-#: includes/ui/simple_crud_class.inc:54
+#: 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:285
-#: purchasing/includes/ui/po_ui.inc:268
+#: purchasing/includes/ui/invoice_ui.inc:298
+#: purchasing/includes/ui/po_ui.inc:266
 #: sales/includes/ui/sales_credit_ui.inc:200
 #: sales/includes/ui/sales_order_ui.inc:211
 msgid "Remove line from document"
 msgstr ""
 
-#: gl/includes/ui/gl_bank_ui.inc:277 gl/includes/ui/gl_bank_ui.inc.orig:258
-#: gl/includes/ui/gl_journal_ui.inc:222 includes/ui/simple_crud_class.inc:56
+#: gl/includes/ui/gl_bank_ui.inc:278 gl/includes/ui/gl_journal_ui.inc:222
+#: includes/ui/simple_crud_class.inc:56
 #: inventory/includes/item_adjustments_ui.inc:158
 #: inventory/includes/stock_transfers_ui.inc:138
 #: manufacturing/includes/work_order_issue_ui.inc:132
-#: purchasing/includes/ui/po_ui.inc:442
+#: purchasing/includes/ui/po_ui.inc:440
 #: sales/includes/ui/sales_credit_ui.inc:294
-#: sales/includes/ui/sales_order_ui.inc:562
+#: sales/includes/ui/sales_order_ui.inc:561
 msgid "Confirm changes"
 msgstr ""
 
-#: gl/includes/ui/gl_bank_ui.inc:279 gl/includes/ui/gl_bank_ui.inc.orig:260
-#: gl/includes/ui/gl_journal_ui.inc:224 includes/ui/simple_crud_class.inc:58
+#: gl/includes/ui/gl_bank_ui.inc:280 gl/includes/ui/gl_journal_ui.inc:224
+#: includes/ui/simple_crud_class.inc:58
 #: inventory/includes/item_adjustments_ui.inc:160
 #: inventory/includes/stock_transfers_ui.inc:140
 #: manufacturing/includes/work_order_issue_ui.inc:134
-#: purchasing/includes/ui/po_ui.inc:444
+#: purchasing/includes/ui/po_ui.inc:442
 #: sales/includes/ui/sales_credit_ui.inc:296
-#: sales/includes/ui/sales_order_ui.inc:564
+#: sales/includes/ui/sales_order_ui.inc:563
 msgid "Cancel changes"
 msgstr ""
 
-#: gl/includes/ui/gl_bank_ui.inc:284 gl/includes/ui/gl_bank_ui.inc.orig:265
-#: gl/includes/ui/gl_journal_ui.inc:228
+#: gl/includes/ui/gl_bank_ui.inc:285 gl/includes/ui/gl_journal_ui.inc:228
 #: inventory/includes/item_adjustments_ui.inc:166
 #: inventory/includes/stock_transfers_ui.inc:146
 #: manufacturing/includes/work_order_issue_ui.inc:140
-#: purchasing/includes/ui/po_ui.inc:450
+#: purchasing/includes/ui/po_ui.inc:448
 #: sales/includes/ui/sales_credit_ui.inc:302
-#: sales/includes/ui/sales_order_ui.inc:570
+#: sales/includes/ui/sales_order_ui.inc:569
 msgid "Add Item"
 msgstr ""
 
-#: gl/includes/ui/gl_bank_ui.inc:285 gl/includes/ui/gl_bank_ui.inc.orig:266
+#: 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:451
+#: purchasing/includes/ui/po_ui.inc:449
 #: sales/includes/ui/sales_credit_ui.inc:303
-#: sales/includes/ui/sales_order_ui.inc:571
+#: sales/includes/ui/sales_order_ui.inc:570
 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 ""
@@ -5585,22 +5604,26 @@ msgid ""
 "rate manually on Exchange Rates page."
 msgstr ""
 
-#: includes/current_user.inc:91 includes/ldap.current_user.inc:96
+#: includes/current_user.inc:91
 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:92 includes/ldap.current_user.inc:97
-#: includes/ui/ui_controls.inc:190 includes/ui/ui_view.inc:845
+#: includes/current_user.inc:92 includes/ui/ui_controls.inc:190
+#: includes/ui/ui_view.inc:903
 msgid "Back"
 msgstr ""
 
-#: includes/current_user.inc:102 includes/ldap.current_user.inc:107
+#: includes/current_user.inc:102
 msgid "System is available for site admin only until full database upgrade"
 msgstr ""
 
-#: includes/current_user.inc:523 includes/ldap.current_user.inc:544
+#: includes/current_user.inc:153
+msgid "New password for"
+msgstr ""
+
+#: includes/current_user.inc:549
 msgid "Requesting data..."
 msgstr ""
 
@@ -5620,7 +5643,7 @@ msgstr ""
 msgid "DATABASE ERROR :"
 msgstr ""
 
-#: includes/errors.inc:212
+#: includes/errors.inc:216
 msgid ""
 "The entered information is a duplicate. Please go back and enter different "
 "values."
@@ -5676,58 +5699,78 @@ msgstr ""
 msgid "Package '%s' not found."
 msgstr ""
 
-#: includes/session.inc:132 includes/session.inc.ldap.inc:39
+#: includes/session.inc:136
 msgid "Incorrect Password"
 msgstr ""
 
-#: includes/session.inc:133 includes/session.inc.ldap.inc:40
+#: includes/session.inc:137
 msgid "The user and password combination is not valid for the system."
 msgstr ""
 
-#: includes/session.inc:135 includes/session.inc.ldap.inc:42
+#: includes/session.inc:139 includes/session.inc:154
 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:136 includes/session.inc.ldap.inc:43
+#: includes/session.inc:140 includes/session.inc:155
 msgid "Try again"
 msgstr ""
 
-#: includes/session.inc:176
+#: includes/session.inc:151
+msgid "Incorrect Email"
+msgstr ""
+
+#: includes/session.inc:152
+msgid "The email address does not exist in the system."
+msgstr ""
+
+#: includes/session.inc:166
+msgid "New password sent"
+msgstr ""
+
+#: includes/session.inc:167
+msgid "A new password has been sent to your mailbox."
+msgstr ""
+
+#: includes/session.inc:169
+msgid "Login here"
+msgstr ""
+
+#: includes/session.inc:209
 #, php-format
 msgid ""
 "Brute force attack on account '%s' detected. Access for non-logged users "
 "temporarily blocked."
 msgstr ""
 
-#: includes/session.inc:207 includes/session.inc.ldap.inc:62
+#: includes/session.inc:240
 msgid "Security settings have not been defined for your user account."
 msgstr ""
 
-#: includes/session.inc:208 includes/session.inc.ldap.inc:63
+#: includes/session.inc:241
 msgid "Please contact your system administrator."
 msgstr ""
 
-#: includes/session.inc:209 includes/session.inc.ldap.inc:64
+#: includes/session.inc:242
 msgid ""
 "Please remove $security_groups and $security_headings arrays from config.php "
 "file!"
 msgstr ""
 
-#: includes/session.inc:211 includes/session.inc.ldap.inc:66
+#: includes/session.inc:244
 msgid ""
 "Access to application has been blocked until database upgrade is completed "
 "by system administrator."
 msgstr ""
 
-#: includes/session.inc:225 includes/session.inc.ldap.inc:80
+#: includes/session.inc:258
 msgid ""
 "The security settings on your account do not permit you to access this "
 "function"
 msgstr ""
 
-#: includes/session.inc:234 includes/session.inc.ldap.inc:89
+#: includes/session.inc:267
 msgid ""
 "System is blocked after source upgrade until database is updated on System/"
 "Software Upgrade page"
@@ -5769,7 +5812,7 @@ msgstr ""
 msgid "Inventory Adjustment"
 msgstr ""
 
-#: includes/sysnames.inc:32 purchasing/includes/ui/po_ui.inc:322
+#: includes/sysnames.inc:32 purchasing/includes/ui/po_ui.inc:320
 #: purchasing/view/view_po.php:30
 msgid "Purchase Order"
 msgstr ""
@@ -5807,7 +5850,7 @@ msgstr ""
 msgid "Sales Order"
 msgstr ""
 
-#: includes/sysnames.inc:41 sales/sales_order_entry.php:636
+#: includes/sysnames.inc:41 sales/sales_order_entry.php:641
 msgid "Sales Quotation"
 msgstr ""
 
@@ -5843,7 +5886,7 @@ msgstr ""
 msgid "CP"
 msgstr ""
 
-#: includes/sysnames.inc:54 sales/customer_invoice.php:473
+#: includes/sysnames.inc:54 sales/customer_invoice.php:482
 msgid "DN"
 msgstr ""
 
@@ -5871,7 +5914,7 @@ msgstr ""
 msgid "SP"
 msgstr ""
 
-#: includes/sysnames.inc:61 reporting/rep204.php:84 reporting/rep305.php:100
+#: includes/sysnames.inc:61 reporting/rep204.php:84 reporting/rep305.php:101
 msgid "GRN"
 msgstr ""
 
@@ -5931,7 +5974,7 @@ msgstr ""
 msgid "Cash"
 msgstr ""
 
-#: includes/sysnames.inc:96 reporting/rep101.php:142 reporting/rep102.php:125
+#: includes/sysnames.inc:96 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
@@ -5939,14 +5982,14 @@ msgstr ""
 #: reporting/reports_main.php:121 reporting/reports_main.php:237
 #: sales/create_recurrent_invoices.php:134
 #: sales/customer_credit_invoice.php:235 sales/customer_delivery.php:338
-#: sales/customer_invoice.php:380
+#: sales/customer_invoice.php:389
 #: 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:149
-#: sales/inquiry/customer_allocation_inquiry.php:159
-#: sales/inquiry/customer_inquiry.php:230
-#: sales/inquiry/customer_inquiry.php:244
+#: sales/inquiry/customer_allocation_inquiry.php:150
+#: sales/inquiry/customer_allocation_inquiry.php:160
+#: sales/inquiry/customer_inquiry.php:223
+#: sales/inquiry/customer_inquiry.php:237
 #: sales/inquiry/sales_deliveries_view.php:180
 #: sales/inquiry/sales_orders_view.php:264
 #: sales/inquiry/sales_orders_view.php:278
@@ -5954,8 +5997,8 @@ msgid "Customer"
 msgstr ""
 
 #: includes/sysnames.inc:97 includes/sysnames.inc:172
-#: inventory/purchasing_data.php:149 purchasing/includes/ui/grn_ui.inc:20
-#: purchasing/includes/ui/po_ui.inc:315
+#: inventory/purchasing_data.php:147 purchasing/includes/ui/grn_ui.inc:20
+#: purchasing/includes/ui/grn_ui.inc:52 purchasing/includes/ui/po_ui.inc:313
 #: purchasing/view/view_supp_credit.php:42
 #: purchasing/view/view_supp_invoice.php:45
 #: purchasing/inquiry/po_search_completed.php:123
@@ -5966,7 +6009,7 @@ msgstr ""
 #: purchasing/inquiry/supplier_inquiry.php:185
 #: purchasing/allocations/supplier_allocation_main.php:98
 #: purchasing/allocations/supplier_allocation_main.php:106
-#: reporting/rep201.php:131 reporting/rep202.php:130 reporting/rep202.php:137
+#: 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:162
@@ -6120,7 +6163,7 @@ msgstr ""
 msgid "Apr"
 msgstr ""
 
-#: includes/sysnames.inc:187 includes/ui/ui_view.inc:842
+#: includes/sysnames.inc:187 includes/ui/ui_view.inc:900
 msgid "May"
 msgstr ""
 
@@ -6402,7 +6445,7 @@ msgstr ""
 #: reporting/reports_main.php:485 reporting/reports_main.php:493
 #: reporting/includes/excel_report.inc:295
 #: reporting/includes/excel_report.inc:428
-#: reporting/includes/pdf_report.inc:346 reporting/includes/pdf_report.inc:619
+#: reporting/includes/pdf_report.inc:346 reporting/includes/pdf_report.inc:618
 #: sales/view/view_sales_order.php:85
 msgid "Comments"
 msgstr ""
@@ -6417,64 +6460,75 @@ msgid ""
 "trail record."
 msgstr ""
 
-#: includes/db/inventory_db.inc:252
+#: includes/db/inventory_db.inc:253
 #: inventory/includes/db/items_trans_db.inc:60
 #, php-format
 msgid "Cost was %s changed to %s x quantity on hand for item '%s'"
 msgstr ""
 
-#: includes/db/inventory_db.inc:293
+#: includes/db/inventory_db.inc:294
 msgid "Zero/negative inventory handling"
 msgstr ""
 
-#: includes/ui/allocation_cart.inc:263
+#: includes/ui/allocation_cart.inc:286 includes/ui/mk.allocation_cart.inc:286
+#, php-format
+msgid "Allocated amounts in %s:"
+msgstr ""
+
+#: includes/ui/allocation_cart.inc:288 includes/ui/mk.allocation_cart.inc:288
 #: purchasing/allocations/supplier_allocation_main.php:94
 #: sales/allocations/customer_allocation_main.php:93
 msgid "Transaction Type"
 msgstr ""
 
-#: includes/ui/allocation_cart.inc:263 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:96
-#: sales/view/view_sales_order.php:129 sales/view/view_sales_order.php:161
-#: sales/inquiry/sales_orders_view.php:226
+#: includes/ui/allocation_cart.inc:288 includes/ui/mk.allocation_cart.inc:288
+msgid "Supplier Ref"
+msgstr ""
+
+#: includes/ui/allocation_cart.inc:288 includes/ui/mk.allocation_cart.inc:288
+#: 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:96 sales/view/view_sales_order.php:129
+#: sales/view/view_sales_order.php:161 sales/inquiry/sales_orders_view.php:226
 #: sales/inquiry/sales_orders_view.php:263
 #: sales/inquiry/sales_orders_view.php:277
 msgid "Ref"
 msgstr ""
 
-#: includes/ui/allocation_cart.inc:264
+#: includes/ui/allocation_cart.inc:289 includes/ui/mk.allocation_cart.inc:289
 msgid "Other Allocations"
 msgstr ""
 
-#: includes/ui/allocation_cart.inc:264 includes/ui/ui_view.inc:490
-#: reporting/includes/doctext.inc:145 reporting/includes/doctext.inc:186
-msgid "This Allocation"
-msgstr ""
-
-#: includes/ui/allocation_cart.inc:264 includes/ui/allocation_cart.inc:311
-#: includes/ui/ui_view.inc:490
+#: includes/ui/allocation_cart.inc:289 includes/ui/allocation_cart.inc:342
+#: includes/ui/mk.allocation_cart.inc:289
+#: includes/ui/mk.allocation_cart.inc:343 includes/ui/ui_view.inc:548
 #: purchasing/allocations/supplier_allocation_main.php:101
-#: reporting/rep112.php:156 reporting/rep210.php:163
+#: reporting/rep112.php:157 reporting/rep210.php:164
 #: reporting/includes/doctext.inc:145 reporting/includes/doctext.inc:186
 #: sales/allocations/customer_allocation_main.php:100
 msgid "Left to Allocate"
 msgstr ""
 
-#: includes/ui/allocation_cart.inc:294 reporting/rep112.php:153
-#: reporting/rep210.php:160
+#: includes/ui/allocation_cart.inc:289 includes/ui/mk.allocation_cart.inc:289
+#: includes/ui/ui_view.inc:548 reporting/includes/doctext.inc:145
+#: reporting/includes/doctext.inc:186
+msgid "This Allocation"
+msgstr ""
+
+#: includes/ui/allocation_cart.inc:322 includes/ui/mk.allocation_cart.inc:322
+#: reporting/rep112.php:154 reporting/rep210.php:161
 msgid "Total Allocated"
 msgstr ""
 
-#: includes/ui/allocation_cart.inc:331
+#: includes/ui/allocation_cart.inc:363 includes/ui/mk.allocation_cart.inc:364
 msgid "The entry for one or more amounts is invalid or negative."
 msgstr ""
 
-#: includes/ui/allocation_cart.inc:340
+#: includes/ui/allocation_cart.inc:374 includes/ui/mk.allocation_cart.inc:375
 msgid "At least one transaction is overallocated."
 msgstr ""
 
-#: includes/ui/allocation_cart.inc:358
+#: includes/ui/allocation_cart.inc:393 includes/ui/mk.allocation_cart.inc:395
 msgid ""
 "These allocations cannot be processed because the amount allocated is more "
 "than the total amount left to allocate."
@@ -6514,17 +6568,17 @@ msgstr ""
 msgid "Contact active for:"
 msgstr ""
 
-#: includes/ui/contacts_view.inc:102 sales/manage/customers.php:252
+#: includes/ui/contacts_view.inc:102 sales/manage/customers.php:256
 msgid "Phone:"
 msgstr ""
 
 #: includes/ui/contacts_view.inc:105 inventory/manage/locations.php:207
-#: purchasing/manage/suppliers.php:160 sales/manage/customer_branches.php:263
-#: sales/manage/customers.php:255 sales/manage/sales_people.php:158
+#: purchasing/manage/suppliers.php:161 sales/manage/customer_branches.php:263
+#: sales/manage/customers.php:259 sales/manage/sales_people.php:158
 msgid "E-mail:"
 msgstr ""
 
-#: includes/ui/contacts_view.inc:110 purchasing/manage/suppliers.php:161
+#: includes/ui/contacts_view.inc:110 purchasing/manage/suppliers.php:162
 #: sales/manage/customer_branches.php:264
 msgid "Document Language:"
 msgstr ""
@@ -6537,20 +6591,19 @@ 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/radio.ui_input.inc:899
-#: includes/ui/ui_input.inc:903
+#: includes/ui/db_pager_view.inc:166 includes/ui/ui_input.inc:903
 msgid "Show also Inactive"
 msgstr ""
 
@@ -6579,390 +6632,374 @@ msgstr ""
 msgid "No records"
 msgstr ""
 
-#: includes/ui/radio.ui_input.inc:206 includes/ui/simple_crud_class.inc:227
-#: includes/ui/ui_input.inc:207
+#: includes/ui/simple_crud_class.inc:227 includes/ui/ui_input.inc:207
 msgid "Submit changes"
 msgstr ""
 
-#: includes/ui/radio.ui_input.inc:207 includes/ui/simple_crud_class.inc:229
-#: includes/ui/ui_input.inc:208
+#: includes/ui/simple_crud_class.inc:229 includes/ui/ui_input.inc:208
 msgid "Clone"
 msgstr ""
 
-#: includes/ui/radio.ui_input.inc:208 includes/ui/simple_crud_class.inc:229
-#: includes/ui/ui_input.inc:209
+#: includes/ui/simple_crud_class.inc:229 includes/ui/ui_input.inc:209
 msgid "Edit new record with current data"
 msgstr ""
 
-#: includes/ui/radio.ui_input.inc:209 includes/ui/simple_crud_class.inc:231
-#: includes/ui/ui_input.inc:210
+#: includes/ui/simple_crud_class.inc:231 includes/ui/ui_input.inc:210
 msgid "Cancel edition"
 msgstr ""
 
-#: includes/ui/radio.ui_input.inc:628 includes/ui/ui_input.inc:631
-#: reporting/includes/reports_classes.inc:219
+#: includes/ui/ui_controls.inc:72
+msgid "Request from outside of this page is forbidden."
+msgstr ""
+
+#: includes/ui/ui_controls.inc:73
+msgid "CSRF attack detected from: "
+msgstr ""
+
+#: includes/ui/ui_controls.inc:139
+msgid "You should automatically be forwarded."
+msgstr ""
+
+#: includes/ui/ui_controls.inc:140
+msgid "If this does not happen"
+msgstr ""
+
+#: includes/ui/ui_controls.inc:140
+msgid "click here"
+msgstr ""
+
+#: includes/ui/ui_controls.inc:140
+msgid "to continue"
+msgstr ""
+
+#: includes/ui/ui_controls.inc:190
+msgid "Close"
+msgstr ""
+
+#: includes/ui/ui_controls.inc:452 sales/manage/customers.php:23
+msgid "Customers"
+msgstr ""
+
+#: includes/ui/ui_controls.inc:454
+msgid "Branches"
+msgstr ""
+
+#: includes/ui/ui_controls.inc:456 purchasing/manage/suppliers.php:22
+msgid "Suppliers"
+msgstr ""
+
+#: includes/ui/ui_controls.inc:458 inventory/transfers.php:228
+#: inventory/manage/items.php:21 reporting/reports_main.php:253
+msgid "Items"
+msgstr ""
+
+#: includes/ui/ui_controls.inc:603
+msgid "Entered data has not been saved yet.\\nDo you want to abandon changes?"
+msgstr ""
+
+#: includes/ui/ui_input.inc:631 reporting/includes/reports_classes.inc:219
 msgid "Click Here to Pick up the date"
 msgstr ""
 
-#: includes/ui/radio.ui_input.inc:911 includes/ui/sav.ui_lists.inc:2131
-#: includes/ui/ui_input.inc:915 includes/ui/ui_lists.inc:2153
+#: includes/ui/ui_input.inc:915 includes/ui/ui_lists.inc:2156
 #: reporting/rep301.php:155 reporting/rep302.php:170 reporting/rep303.php:184
-#: reporting/rep304.php:170 reporting/rep304.php:174 reporting/rep306.php:236
-#: reporting/rep306.php:243 sales/manage/customer_branches.php:302
+#: reporting/rep304.php:170 reporting/rep304.php:174 reporting/rep306.php:235
+#: reporting/rep306.php:242 sales/manage/customer_branches.php:302
 msgid "Inactive"
 msgstr ""
 
-#: includes/ui/radio.ui_input.inc:921 includes/ui/radio.ui_input.inc:933
 #: includes/ui/ui_input.inc:925 includes/ui/ui_input.inc:937
 msgid "Current Credit:"
 msgstr ""
 
-#: includes/ui/radio.ui_input.inc:947 includes/ui/ui_input.inc:951
+#: includes/ui/ui_input.inc:951
 msgid "Bank Balance:"
 msgstr ""
 
-#: includes/ui/sav.ui_lists.inc:17 includes/ui/ui_lists.inc:17
+#: includes/ui/ui_lists.inc:17
 msgid "Set filter"
 msgstr ""
 
-#: includes/ui/sav.ui_lists.inc:100 includes/ui/ui_lists.inc:100
+#: includes/ui/ui_lists.inc:100
 msgid "Press Space tab for search pattern entry"
 msgstr ""
 
-#: includes/ui/sav.ui_lists.inc:104 includes/ui/ui_lists.inc:104
+#: includes/ui/ui_lists.inc:104
 msgid "Enter code fragment to search or * for all"
 msgstr ""
 
-#: includes/ui/sav.ui_lists.inc:105 includes/ui/ui_lists.inc:105
+#: includes/ui/ui_lists.inc:105
 msgid "Enter description fragment to search or * for all"
 msgstr ""
 
-#: includes/ui/sav.ui_lists.inc:449 includes/ui/sav.ui_lists.inc:1367
-#: includes/ui/ui_lists.inc:453 includes/ui/ui_lists.inc:1388
+#: includes/ui/ui_lists.inc:453 includes/ui/ui_lists.inc:1391
 msgid "All Suppliers"
 msgstr ""
 
-#: includes/ui/sav.ui_lists.inc:453 includes/ui/ui_lists.inc:457
+#: includes/ui/ui_lists.inc:457
 msgid "Press Space tab to filter by name fragment"
 msgstr ""
 
-#: includes/ui/sav.ui_lists.inc:454 includes/ui/ui_lists.inc:458
+#: includes/ui/ui_lists.inc:458
 msgid "Select supplier"
 msgstr ""
 
-#: includes/ui/sav.ui_lists.inc:498 includes/ui/ui_lists.inc:505
+#: includes/ui/ui_lists.inc:505
 msgid "All Customers"
 msgstr ""
 
-#: includes/ui/sav.ui_lists.inc:502 includes/ui/ui_lists.inc:509
+#: includes/ui/ui_lists.inc:509
 msgid "Press Space tab to filter by name fragment; F2 - entry new customer"
 msgstr ""
 
-#: includes/ui/sav.ui_lists.inc:503 includes/ui/ui_lists.inc:510
+#: includes/ui/ui_lists.inc:510
 msgid "Select customer"
 msgstr ""
 
-#: includes/ui/sav.ui_lists.inc:546 includes/ui/ui_lists.inc:558
+#: includes/ui/ui_lists.inc:558
 msgid "All branches"
 msgstr ""
 
-#: includes/ui/sav.ui_lists.inc:549 includes/ui/ui_lists.inc:561
+#: includes/ui/ui_lists.inc:561
 msgid "Select customer branch"
 msgstr ""
 
-#: includes/ui/sav.ui_lists.inc:584 includes/ui/ui_lists.inc:601
+#: includes/ui/ui_lists.inc:601
 msgid "All Locations"
 msgstr ""
 
-#: includes/ui/sav.ui_lists.inc:736 includes/ui/sav.ui_lists.inc:801
 #: includes/ui/ui_lists.inc:753 includes/ui/ui_lists.inc:822
 msgid "All Items"
 msgstr ""
 
-#: includes/ui/sav.ui_lists.inc:1274 includes/ui/ui_lists.inc:1295
+#: includes/ui/ui_lists.inc:1298
 msgid "All Sales Types"
 msgstr ""
 
-#: includes/ui/sav.ui_lists.inc:1603 includes/ui/ui_lists.inc:1626
+#: includes/ui/ui_lists.inc:1629
 msgid "Use Item Sales Accounts"
 msgstr ""
 
-#: includes/ui/sav.ui_lists.inc:1915 includes/ui/sav.ui_lists.inc:1932
-#: includes/ui/sav.ui_lists.inc:1949 includes/ui/ui_lists.inc:1937
-#: includes/ui/ui_lists.inc:1954 includes/ui/ui_lists.inc:1971
+#: includes/ui/ui_lists.inc:1940 includes/ui/ui_lists.inc:1957
+#: includes/ui/ui_lists.inc:1974
 msgid "All Types"
 msgstr ""
 
-#: includes/ui/sav.ui_lists.inc:1916 includes/ui/ui_lists.inc:1938
-#: sales/view/view_sales_order.php:127
+#: includes/ui/ui_lists.inc:1941 sales/view/view_sales_order.php:127
 msgid "Sales Invoices"
 msgstr ""
 
-#: includes/ui/sav.ui_lists.inc:1917 includes/ui/sav.ui_lists.inc:1934
-#: includes/ui/sav.ui_lists.inc:1952 includes/ui/ui_lists.inc:1939
-#: includes/ui/ui_lists.inc:1956 includes/ui/ui_lists.inc:1974
+#: includes/ui/ui_lists.inc:1942 includes/ui/ui_lists.inc:1959
+#: includes/ui/ui_lists.inc:1977
 msgid "Overdue Invoices"
 msgstr ""
 
-#: includes/ui/sav.ui_lists.inc:1918 includes/ui/sav.ui_lists.inc:1935
-#: includes/ui/sav.ui_lists.inc:1953 includes/ui/ui_lists.inc:1940
-#: includes/ui/ui_lists.inc:1957 includes/ui/ui_lists.inc:1975
-#: includes/ui/ui_view.inc:485
+#: includes/ui/ui_lists.inc:1943 includes/ui/ui_lists.inc:1960
+#: includes/ui/ui_lists.inc:1978 includes/ui/ui_view.inc:543
 msgid "Payments"
 msgstr ""
 
-#: includes/ui/sav.ui_lists.inc:1919 includes/ui/sav.ui_lists.inc:1936
-#: includes/ui/sav.ui_lists.inc:1954 includes/ui/ui_lists.inc:1941
-#: includes/ui/ui_lists.inc:1958 includes/ui/ui_lists.inc:1976
-#: sales/view/view_sales_order.php:158
+#: includes/ui/ui_lists.inc:1944 includes/ui/ui_lists.inc:1961
+#: includes/ui/ui_lists.inc:1979 sales/view/view_sales_order.php:158
 msgid "Credit Notes"
 msgstr ""
 
-#: includes/ui/sav.ui_lists.inc:1920 includes/ui/ui_lists.inc:1942
-#: sales/view/view_sales_order.php:93
+#: includes/ui/ui_lists.inc:1945 sales/view/view_sales_order.php:93
 msgid "Delivery Notes"
 msgstr ""
 
-#: includes/ui/sav.ui_lists.inc:1933 includes/ui/sav.ui_lists.inc:1951
-#: includes/ui/ui_lists.inc:1955 includes/ui/ui_lists.inc:1973
+#: includes/ui/ui_lists.inc:1958 includes/ui/ui_lists.inc:1976
 msgid "Invoices"
 msgstr ""
 
-#: includes/ui/sav.ui_lists.inc:1937 includes/ui/sav.ui_lists.inc:1955
-#: includes/ui/ui_lists.inc:1959 includes/ui/ui_lists.inc:1977
+#: includes/ui/ui_lists.inc:1962 includes/ui/ui_lists.inc:1980
 msgid "Overdue Credit Notes"
 msgstr ""
 
-#: includes/ui/sav.ui_lists.inc:1950 includes/ui/ui_lists.inc:1972
+#: includes/ui/ui_lists.inc:1975
 msgid "GRNs"
 msgstr ""
 
-#: includes/ui/sav.ui_lists.inc:1968 includes/ui/ui_lists.inc:1990
+#: includes/ui/ui_lists.inc:1993
 msgid "Automatically put balance on back order"
 msgstr ""
 
-#: includes/ui/sav.ui_lists.inc:1969 includes/ui/ui_lists.inc:1991
+#: includes/ui/ui_lists.inc:1994
 msgid "Cancel any quantites not delivered"
 msgstr ""
 
-#: includes/ui/sav.ui_lists.inc:1986 includes/ui/ui_lists.inc:2008
+#: includes/ui/ui_lists.inc:2011
 msgid "Items Returned to Inventory Location"
 msgstr ""
 
-#: includes/ui/sav.ui_lists.inc:1987 includes/ui/ui_lists.inc:2009
+#: includes/ui/ui_lists.inc:2012
 msgid "Items Written Off"
 msgstr ""
 
-#: includes/ui/sav.ui_lists.inc:2157 includes/ui/ui_lists.inc:2179
+#: includes/ui/ui_lists.inc:2182
 msgid "New role"
 msgstr ""
 
-#: includes/ui/sav.ui_lists.inc:2215 includes/ui/ui_lists.inc:2231
+#: includes/ui/ui_lists.inc:2234
 msgid "No tags defined."
 msgstr ""
 
-#: includes/ui/sav.ui_lists.inc:2215 includes/ui/ui_lists.inc:2231
+#: includes/ui/ui_lists.inc:2234
 msgid "No active tags defined."
 msgstr ""
 
-#: includes/ui/sav.ui_lists.inc:2253 includes/ui/ui_lists.inc:2269
+#: includes/ui/ui_lists.inc:2272
 #, php-format
 msgid "Activated for '%s'"
 msgstr ""
 
-#: includes/ui/sav.ui_lists.inc:2256 includes/ui/ui_lists.inc:2272
+#: includes/ui/ui_lists.inc:2275
 msgid "Available and/or installed"
 msgstr ""
 
-#: includes/ui/sav.ui_lists.inc:2326 includes/ui/ui_lists.inc:2342
+#: includes/ui/ui_lists.inc:2345
 msgid "Standard new company American COA (4 digit)"
 msgstr ""
 
-#: includes/ui/sav.ui_lists.inc:2328 includes/ui/ui_lists.inc:2344
+#: includes/ui/ui_lists.inc:2347
 msgid "Standard American COA (4 digit) with demo data"
 msgstr ""
 
-#: includes/ui/sav.ui_lists.inc:2349 includes/ui/ui_lists.inc:2365
+#: includes/ui/ui_lists.inc:2368
 msgid "No payment Link"
 msgstr ""
 
-#: includes/ui/ui_controls.inc:72
-msgid "Request from outside of this page is forbidden."
-msgstr ""
-
-#: includes/ui/ui_controls.inc:73
-msgid "CSRF attack detected from: "
-msgstr ""
-
-#: includes/ui/ui_controls.inc:139
-msgid "You should automatically be forwarded."
-msgstr ""
-
-#: includes/ui/ui_controls.inc:140
-msgid "If this does not happen"
-msgstr ""
-
-#: includes/ui/ui_controls.inc:140
-msgid "click here"
-msgstr ""
-
-#: includes/ui/ui_controls.inc:140
-msgid "to continue"
-msgstr ""
-
-#: includes/ui/ui_controls.inc:187
-msgid "View Attachment"
-msgstr ""
-
-#: includes/ui/ui_controls.inc:190
-msgid "Close"
-msgstr ""
-
-#: includes/ui/ui_controls.inc:450 sales/manage/customers.php:23
-msgid "Customers"
-msgstr ""
-
-#: includes/ui/ui_controls.inc:452
-msgid "Branches"
-msgstr ""
-
-#: includes/ui/ui_controls.inc:454 purchasing/manage/suppliers.php:22
-msgid "Suppliers"
-msgstr ""
-
-#: includes/ui/ui_controls.inc:456 inventory/transfers.php:228
-#: inventory/manage/items.php:21 reporting/reports_main.php:253
-msgid "Items"
-msgstr ""
-
-#: includes/ui/ui_controls.inc:601
-msgid "Entered data has not been saved yet.\\nDo you want to abandon changes?"
-msgstr ""
-
 #: includes/ui/ui_msgs.inc:63
 msgid "in units of : "
 msgstr ""
 
-#: 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
 msgid "Date Voided:"
 msgstr ""
 
-#: includes/ui/ui_view.inc:407 reporting/rep107.php:175
+#: includes/ui/ui_view.inc:443 reporting/rep107.php:175
 #: reporting/rep109.php:180 reporting/rep110.php:184 reporting/rep111.php:165
 #: reporting/rep113.php:169 reporting/rep209.php:183
 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:184
-#: reporting/rep109.php:189 reporting/rep110.php:193 reporting/rep111.php:174
-#: reporting/rep113.php:178 reporting/rep209.php:192
+#: includes/ui/ui_view.inc:449 includes/ui/ui_view.inc:468
+#: includes/ui/ui_view.inc:492 includes/ui/ui_view.inc:509
+#: reporting/rep107.php:184 reporting/rep109.php:189 reporting/rep110.php:193
+#: reporting/rep111.php:174 reporting/rep113.php:178 reporting/rep209.php:192
 msgid "Included"
 msgstr ""
 
-#: includes/ui/ui_view.inc:485
+#: includes/ui/ui_view.inc:543
 #: purchasing/inquiry/supplier_allocation_inquiry.php:100
 msgid "Allocations"
 msgstr ""
 
-#: includes/ui/ui_view.inc:489 reporting/includes/doctext.inc:145
+#: includes/ui/ui_view.inc:547 reporting/includes/doctext.inc:145
 #: reporting/includes/doctext.inc:186
 msgid "Total Amount"
 msgstr ""
 
-#: includes/ui/ui_view.inc:514
+#: includes/ui/ui_view.inc:572
 msgid "Total Allocated:"
 msgstr ""
 
-#: includes/ui/ui_view.inc:518
+#: includes/ui/ui_view.inc:576
 msgid "Left to Allocate:"
 msgstr ""
 
-#: includes/ui/ui_view.inc:571
+#: includes/ui/ui_view.inc:629
 msgid "No Quick Entries are defined."
 msgstr ""
 
-#: includes/ui/ui_view.inc:599
+#: includes/ui/ui_view.inc:657
 msgid "No Quick Entry lines are defined."
 msgstr ""
 
-#: includes/ui/ui_view.inc:781 purchasing/includes/ui/invoice_ui.inc:452
+#: includes/ui/ui_view.inc:839 purchasing/includes/ui/invoice_ui.inc:465
 msgid "and"
 msgstr ""
 
-#: includes/ui/ui_view.inc:842
+#: includes/ui/ui_view.inc:900
 msgid "January"
 msgstr ""
 
-#: includes/ui/ui_view.inc:842
+#: includes/ui/ui_view.inc:900
 msgid "February"
 msgstr ""
 
-#: includes/ui/ui_view.inc:842
+#: includes/ui/ui_view.inc:900
 msgid "March"
 msgstr ""
 
-#: includes/ui/ui_view.inc:842
+#: includes/ui/ui_view.inc:900
 msgid "April"
 msgstr ""
 
-#: includes/ui/ui_view.inc:842
+#: includes/ui/ui_view.inc:900
 msgid "June"
 msgstr ""
 
-#: includes/ui/ui_view.inc:842
+#: includes/ui/ui_view.inc:900
 msgid "July"
 msgstr ""
 
-#: includes/ui/ui_view.inc:842
+#: includes/ui/ui_view.inc:900
 msgid "August"
 msgstr ""
 
-#: includes/ui/ui_view.inc:842
+#: includes/ui/ui_view.inc:900
 msgid "September"
 msgstr ""
 
-#: includes/ui/ui_view.inc:842
+#: includes/ui/ui_view.inc:900
 msgid "October"
 msgstr ""
 
-#: includes/ui/ui_view.inc:842
+#: includes/ui/ui_view.inc:900
 msgid "November"
 msgstr ""
 
-#: includes/ui/ui_view.inc:842
+#: includes/ui/ui_view.inc:900
 msgid "December"
 msgstr ""
 
-#: includes/ui/ui_view.inc:843
+#: includes/ui/ui_view.inc:901
 msgid "Su"
 msgstr ""
 
-#: includes/ui/ui_view.inc:843
+#: includes/ui/ui_view.inc:901
 msgid "Mo"
 msgstr ""
 
-#: includes/ui/ui_view.inc:843
+#: includes/ui/ui_view.inc:901
 msgid "Tu"
 msgstr ""
 
-#: includes/ui/ui_view.inc:843
+#: includes/ui/ui_view.inc:901
 msgid "We"
 msgstr ""
 
-#: includes/ui/ui_view.inc:843
+#: includes/ui/ui_view.inc:901
 msgid "Th"
 msgstr ""
 
-#: includes/ui/ui_view.inc:843
+#: includes/ui/ui_view.inc:901
 msgid "Fr"
 msgstr ""
 
-#: includes/ui/ui_view.inc:843
+#: includes/ui/ui_view.inc:901
 msgid "Sa"
 msgstr ""
 
-#: includes/ui/ui_view.inc:844
+#: includes/ui/ui_view.inc:902
 msgid "W"
 msgstr ""
 
@@ -7057,7 +7094,7 @@ msgid "Enter &Another Adjustment"
 msgstr ""
 
 #: inventory/adjustments.php:88 inventory/transfers.php:85
-#: sales/sales_order_entry.php:359
+#: sales/sales_order_entry.php:363
 msgid "You must enter at least one non empty item line."
 msgstr ""
 
@@ -7113,8 +7150,8 @@ msgstr ""
 msgid "View the GL Journal Entries for this Cost Update"
 msgstr ""
 
-#: inventory/cost_update.php:97 inventory/prices.php:64
-#: inventory/purchasing_data.php:119 inventory/reorder_level.php:51
+#: inventory/cost_update.php:95 inventory/prices.php:61
+#: inventory/purchasing_data.php:117 inventory/reorder_level.php:48
 #: inventory/inquiry/stock_movements.php:53
 #: inventory/inquiry/stock_status.php:47 inventory/manage/item_codes.php:105
 #: manufacturing/work_order_entry.php:396
@@ -7124,15 +7161,15 @@ msgstr ""
 msgid "Item:"
 msgstr ""
 
-#: inventory/cost_update.php:118
+#: inventory/cost_update.php:116
 msgid "Standard Material Cost Per Unit"
 msgstr ""
 
-#: inventory/cost_update.php:127
+#: inventory/cost_update.php:125
 msgid "Standard Labour Cost Per Unit"
 msgstr ""
 
-#: inventory/cost_update.php:128
+#: inventory/cost_update.php:126
 msgid "Standard Overhead Cost Per Unit"
 msgstr ""
 
@@ -7153,69 +7190,69 @@ msgid ""
 "entering pricing."
 msgstr ""
 
-#: inventory/prices.php:80
+#: inventory/prices.php:77
 msgid "The price entered must be numeric."
 msgstr ""
 
-#: inventory/prices.php:86
+#: inventory/prices.php:83
 msgid ""
 "The sales pricing for this item, sales type and currency has already been "
 "added."
 msgstr ""
 
-#: inventory/prices.php:99
+#: inventory/prices.php:96
 msgid "This price has been updated."
 msgstr ""
 
-#: inventory/prices.php:107
+#: inventory/prices.php:104
 msgid "The new price has been added."
 msgstr ""
 
-#: inventory/prices.php:121
+#: inventory/prices.php:118
 msgid "The selected price has been deleted."
 msgstr ""
 
-#: inventory/prices.php:149 reporting/rep104.php:118
-#: sales/customer_delivery.php:355 sales/customer_invoice.php:402
+#: inventory/prices.php:146 reporting/rep104.php:118
+#: sales/customer_delivery.php:355 sales/customer_invoice.php:411
 #: sales/view/view_credit.php:73 sales/view/view_dispatch.php:93
 #: sales/view/view_invoice.php:92 sales/includes/ui/sales_credit_ui.inc:102
 msgid "Sales Type"
 msgstr ""
 
-#: inventory/prices.php:149 inventory/purchasing_data.php:149
-#: purchasing/includes/ui/invoice_ui.inc:484
+#: inventory/prices.php:146 inventory/purchasing_data.php:147
+#: purchasing/includes/ui/invoice_ui.inc:497
 #: purchasing/po_receive_items.php:63 purchasing/view/view_grn.php:41
 #: purchasing/view/view_po.php:45 reporting/rep104.php:111
 #: reporting/includes/doctext.inc:30 reporting/includes/doctext.inc:170
 #: sales/customer_credit_invoice.php:281 sales/customer_delivery.php:433
-#: sales/customer_invoice.php:470 sales/view/view_credit.php:91
+#: sales/customer_invoice.php:479 sales/view/view_credit.php:91
 #: sales/view/view_dispatch.php:113 sales/view/view_invoice.php:114
 #: sales/view/view_sales_order.php:202
 #: sales/includes/ui/sales_credit_ui.inc:168
 msgid "Price"
 msgstr ""
 
-#: inventory/prices.php:171
+#: inventory/prices.php:168
 msgid "There are no prices set up for this part."
 msgstr ""
 
-#: inventory/prices.php:195
+#: inventory/prices.php:192
 msgid "Currency:"
 msgstr ""
 
-#: inventory/prices.php:197
+#: inventory/prices.php:194
 msgid "Sales Type:"
 msgstr ""
 
-#: inventory/prices.php:205 inventory/purchasing_data.php:217
+#: inventory/prices.php:202 inventory/purchasing_data.php:215
 msgid "Price:"
 msgstr ""
 
-#: inventory/prices.php:205
+#: inventory/prices.php:202
 msgid "per"
 msgstr ""
 
-#: inventory/prices.php:209
+#: inventory/prices.php:206
 msgid "The price is calculated."
 msgstr ""
 
@@ -7264,35 +7301,35 @@ msgstr ""
 msgid "The purchasing data item has been sucessfully deleted."
 msgstr ""
 
-#: inventory/purchasing_data.php:134
+#: inventory/purchasing_data.php:132
 msgid "Entered item is not defined. Please re-enter."
 msgstr ""
 
-#: inventory/purchasing_data.php:143
+#: inventory/purchasing_data.php:141
 msgid "There is no purchasing data set up for the part selected"
 msgstr ""
 
-#: inventory/purchasing_data.php:150
+#: inventory/purchasing_data.php:148
 msgid "Supplier's Unit"
 msgstr ""
 
-#: inventory/purchasing_data.php:150
+#: inventory/purchasing_data.php:148
 msgid "Conversion Factor"
 msgstr ""
 
-#: inventory/purchasing_data.php:150
+#: inventory/purchasing_data.php:148
 msgid "Supplier's Description"
 msgstr ""
 
-#: inventory/purchasing_data.php:218
+#: inventory/purchasing_data.php:216
 msgid "Suppliers Unit of Measure:"
 msgstr ""
 
-#: inventory/purchasing_data.php:224
+#: inventory/purchasing_data.php:222
 msgid "Conversion Factor (to our UOM):"
 msgstr ""
 
-#: inventory/purchasing_data.php:226
+#: inventory/purchasing_data.php:224
 msgid "Supplier's Code or Description:"
 msgstr ""
 
@@ -7306,7 +7343,7 @@ msgid ""
 "manufactured items)."
 msgstr ""
 
-#: inventory/reorder_level.php:68 inventory/inquiry/stock_movements.php:83
+#: inventory/reorder_level.php:65 inventory/inquiry/stock_movements.php:83
 #: inventory/inquiry/stock_status.php:72 inventory/inquiry/stock_status.php:76
 #: manufacturing/search_work_orders.php:162
 #: manufacturing/inquiry/where_used_inquiry.php:45
@@ -7324,19 +7361,18 @@ msgstr ""
 msgid "Location"
 msgstr ""
 
-#: inventory/reorder_level.php:68 inventory/inquiry/stock_movements.php:84
-#: inventory/inquiry/stock_status.php:76 purchasing/supplier_credit.php:203
-#: sales/sales_order_entry.php:514 sales/includes/ui/sales_order_ui.inc:181
+#: inventory/reorder_level.php:65 inventory/inquiry/stock_movements.php:84
+#: inventory/inquiry/stock_status.php:76 purchasing/supplier_credit.php:213
+#: sales/sales_order_entry.php:518 sales/includes/ui/sales_order_ui.inc:181
 msgid "Quantity On Hand"
 msgstr ""
 
-#: inventory/reorder_level.php:68 inventory/inquiry/stock_status.php:76
-#: sales/includes/db/sales_order_db.inc:110
-#: sales/includes/db/sales_order_db.inc:263
+#: inventory/reorder_level.php:65 inventory/includes/inventory_db.inc:72
+#: inventory/inquiry/stock_status.php:76
 msgid "Re-Order Level"
 msgstr ""
 
-#: inventory/reorder_level.php:92
+#: inventory/reorder_level.php:89
 msgid "Reorder levels has been updated."
 msgstr ""
 
@@ -7378,6 +7414,18 @@ msgstr ""
 msgid "Process Transfer"
 msgstr ""
 
+#: inventory/includes/inventory_db.inc:69
+msgid "Stocks below Re-Order Level at "
+msgstr ""
+
+#: inventory/includes/inventory_db.inc:72
+msgid "Below"
+msgstr ""
+
+#: inventory/includes/inventory_db.inc:73
+msgid "Please reorder"
+msgstr ""
+
 #: inventory/includes/item_adjustments_ui.inc:20
 #: inventory/includes/stock_transfers_ui.inc:20
 #: manufacturing/includes/work_order_issue_ui.inc:20
@@ -7407,11 +7455,11 @@ 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:235 purchasing/po_receive_items.php:62
+#: purchasing/includes/ui/po_ui.inc:233 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:169
 #: reporting/includes/doctext.inc:206 sales/customer_credit_invoice.php:280
-#: sales/customer_delivery.php:431 sales/customer_invoice.php:469
+#: sales/customer_delivery.php:431 sales/customer_invoice.php:478
 #: sales/view/view_credit.php:90 sales/view/view_dispatch.php:112
 #: sales/view/view_invoice.php:113 sales/view/view_sales_order.php:201
 #: sales/includes/ui/sales_credit_ui.inc:167
@@ -7422,11 +7470,11 @@ 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:235 purchasing/view/view_grn.php:40
+#: purchasing/includes/ui/po_ui.inc:233 purchasing/view/view_grn.php:40
 #: purchasing/view/view_po.php:45 reporting/includes/doctext.inc:29
 #: reporting/includes/doctext.inc:169 reporting/includes/doctext.inc:206
 #: sales/customer_credit_invoice.php:280 sales/customer_delivery.php:431
-#: sales/customer_invoice.php:469 sales/view/view_credit.php:90
+#: sales/customer_invoice.php:478 sales/view/view_credit.php:90
 #: sales/view/view_dispatch.php:112 sales/view/view_invoice.php:113
 #: sales/view/view_sales_order.php:201
 #: sales/includes/ui/sales_credit_ui.inc:167
@@ -7444,8 +7492,8 @@ 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:484
-#: purchasing/includes/ui/po_ui.inc:235 purchasing/view/view_grn.php:40
+#: purchasing/includes/ui/invoice_ui.inc:497
+#: purchasing/includes/ui/po_ui.inc:233 purchasing/view/view_grn.php:40
 #: purchasing/view/view_po.php:45 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:170
@@ -7461,7 +7509,7 @@ 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:236 purchasing/view/view_grn.php:41
+#: purchasing/includes/ui/po_ui.inc:234 purchasing/view/view_grn.php:41
 #: purchasing/view/view_po.php:45 reporting/includes/doctext.inc:30
 #: reporting/includes/doctext.inc:170 sales/view/view_credit.php:91
 #: sales/view/view_dispatch.php:113 sales/view/view_invoice.php:114
@@ -7527,7 +7575,7 @@ msgid "Show Movements"
 msgstr ""
 
 #: inventory/inquiry/stock_movements.php:65
-#: purchasing/includes/ui/invoice_ui.inc:453
+#: purchasing/includes/ui/invoice_ui.inc:466
 #: purchasing/inquiry/supplier_allocation_inquiry.php:57
 #: purchasing/inquiry/supplier_inquiry.php:58
 #: sales/inquiry/customer_allocation_inquiry.php:51
@@ -7610,7 +7658,7 @@ msgstr ""
 #: inventory/view/view_transfer.php:56 manufacturing/view/wo_issue_view.php:77
 #: manufacturing/manage/bom_edit.php:71 purchasing/po_receive_items.php:62
 #: sales/customer_credit_invoice.php:280 sales/customer_delivery.php:432
-#: sales/customer_invoice.php:469
+#: sales/customer_invoice.php:478
 msgid "Units"
 msgstr ""
 
@@ -7662,7 +7710,7 @@ msgstr ""
 msgid "Foreign Item Codes"
 msgstr ""
 
-#: inventory/manage/item_codes.php:23 sales/sales_order_entry.php:681
+#: inventory/manage/item_codes.php:23 sales/sales_order_entry.php:686
 msgid "There are no inventory items defined in the system."
 msgstr ""
 
@@ -7779,8 +7827,8 @@ msgstr ""
 #: 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:471
-#: purchasing/includes/ui/invoice_ui.inc:483 reporting/rep204.php:84
+#: purchasing/includes/ui/invoice_ui.inc:484
+#: purchasing/includes/ui/invoice_ui.inc:496 reporting/rep204.php:84
 #: reporting/rep306.php:152
 msgid "Item"
 msgstr ""
@@ -7845,8 +7893,8 @@ msgstr ""
 msgid "New item"
 msgstr ""
 
-#: inventory/manage/items.php:454 purchasing/manage/suppliers.php:306
-#: sales/manage/customer_branches.php:322 sales/manage/customers.php:344
+#: inventory/manage/items.php:454 purchasing/manage/suppliers.php:307
+#: sales/manage/customer_branches.php:322 sales/manage/customers.php:348
 msgid "&General settings"
 msgstr ""
 
@@ -7858,8 +7906,8 @@ msgstr ""
 msgid "&Purchasing Pricing"
 msgstr ""
 
-#: inventory/manage/items.php:459 purchasing/manage/suppliers.php:308
-#: sales/manage/customers.php:346
+#: inventory/manage/items.php:459 purchasing/manage/suppliers.php:309
+#: sales/manage/customers.php:350
 msgid "&Transactions"
 msgstr ""
 
@@ -8269,8 +8317,8 @@ msgid "Return Items to Work Order"
 msgstr ""
 
 #: manufacturing/work_order_add_finished.php:214
-#: purchasing/allocations/supplier_allocate.php:64
-#: sales/allocations/customer_allocate.php:63
+#: purchasing/allocations/supplier_allocate.php:74
+#: sales/allocations/customer_allocate.php:72
 msgid "Process"
 msgstr ""
 
@@ -8833,7 +8881,7 @@ msgstr ""
 #: manufacturing/includes/db/work_orders_db.inc:278
 #: purchasing/includes/db/po_db.inc:116
 #: sales/includes/db/cust_trans_db.inc:111
-#: sales/includes/db/sales_order_db.inc:249
+#: sales/includes/db/sales_order_db.inc:204
 msgid "Updated."
 msgstr ""
 
@@ -8858,45 +8906,42 @@ msgstr ""
 msgid "Produced"
 msgstr ""
 
-#: purchasing/includes/db/invoice_db.inc:282
+#: purchasing/includes/db/invoice_db.inc:311
 msgid "Supplier invoice adjustment for zero inventory of "
 msgstr ""
 
-#: purchasing/includes/db/invoice_db.inc:282 reporting/rep106.php:83
+#: purchasing/includes/db/invoice_db.inc:311 reporting/rep106.php:83
 #: sales/inquiry/sales_deliveries_view.php:166
 #: sales/inquiry/sales_orders_view.php:147
 msgid "Invoice"
 msgstr ""
 
-#: purchasing/includes/db/invoice_db.inc:681
-#: purchasing/includes/db/invoice_db.inc:683
+#: purchasing/includes/db/invoice_db.inc:659
+#: purchasing/includes/db/invoice_db.inc:661
 msgid "GRN Removal"
 msgstr ""
 
-#: purchasing/includes/ui/grn_ui.inc:23 purchasing/includes/ui/po_ui.inc:318
-#: sales/view/view_sales_order.php:74
+#: purchasing/includes/ui/grn_ui.inc:23 purchasing/includes/ui/grn_ui.inc:55
+#: purchasing/includes/ui/po_ui.inc:316 sales/view/view_sales_order.php:74
 msgid "Order Currency"
 msgstr ""
 
-#: purchasing/includes/ui/grn_ui.inc:25
+#: 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 sales/view/view_sales_order.php:67
+#: purchasing/includes/ui/grn_ui.inc:28 purchasing/includes/ui/grn_ui.inc:59
+#: sales/view/view_sales_order.php: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:333 purchasing/includes/ui/po_ui.inc:338
+#: purchasing/includes/ui/grn_ui.inc:33 purchasing/includes/ui/grn_ui.inc:69
+#: purchasing/includes/ui/po_ui.inc:331 purchasing/includes/ui/po_ui.inc:336
 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:343
+#: purchasing/includes/ui/grn_ui.inc:34 purchasing/includes/ui/grn_ui.inc:79
+#: purchasing/includes/ui/po_ui.inc:341
 #: purchasing/view/view_supp_credit.php:44
 #: purchasing/view/view_supp_invoice.php:47
 #: purchasing/inquiry/po_search_completed.php:125
@@ -8906,263 +8951,268 @@ msgstr ""
 msgid "Supplier's Reference"
 msgstr ""
 
-#: purchasing/includes/ui/grn_ui.inc:62 purchasing/includes/ui/po_ui.inc:347
-#: sales/view/view_sales_order.php:79
+#: purchasing/includes/ui/grn_ui.inc:38 purchasing/includes/ui/grn_ui.inc:81
+#: purchasing/includes/ui/po_ui.inc:345 sales/view/view_sales_order.php:79
 msgid "Delivery Address"
 msgstr ""
 
-#: purchasing/includes/ui/grn_ui.inc:65 purchasing/includes/ui/po_ui.inc:351
+#: purchasing/includes/ui/grn_ui.inc:41 purchasing/includes/ui/grn_ui.inc:84
+#: purchasing/includes/ui/po_ui.inc:349
 msgid "Order Comments"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:96
-#: purchasing/includes/ui/invoice_ui.inc:99
+#: purchasing/includes/ui/grn_ui.inc:74
+msgid "Date Items Received"
+msgstr ""
+
+#: purchasing/includes/ui/invoice_ui.inc:109
+#: purchasing/includes/ui/invoice_ui.inc:112
 msgid "Supplier's Ref.:"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:114
+#: purchasing/includes/ui/invoice_ui.inc:127
 msgid "Terms:"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:126
-#: purchasing/manage/suppliers.php:98 purchasing/manage/suppliers.php:103
+#: purchasing/includes/ui/invoice_ui.inc:139
+#: purchasing/manage/suppliers.php:99 purchasing/manage/suppliers.php:104
 msgid "Supplier's Currency:"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:130
-#: purchasing/manage/suppliers.php:105 sales/manage/customer_branches.php:246
-#: sales/manage/customers.php:294
+#: purchasing/includes/ui/invoice_ui.inc:143
+#: purchasing/manage/suppliers.php:106 sales/manage/customer_branches.php:246
+#: sales/manage/customers.php:298
 msgid "Tax Group:"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:145
+#: purchasing/includes/ui/invoice_ui.inc:158
 msgid "Sub-total:"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:153
+#: purchasing/includes/ui/invoice_ui.inc:166
 msgid "Invoice Total:"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:156
+#: purchasing/includes/ui/invoice_ui.inc:169
 #: 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:187
+#: purchasing/includes/ui/invoice_ui.inc:200
 msgid "Add GL Line"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:188
+#: purchasing/includes/ui/invoice_ui.inc:201
 msgid "Reset"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:189
-#: purchasing/po_receive_items.php:334
+#: purchasing/includes/ui/invoice_ui.inc:202
+#: purchasing/po_receive_items.php:335
 msgid "Clear all GL entry fields"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:207
+#: purchasing/includes/ui/invoice_ui.inc:220
 msgid "GL Items for this Invoice"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:209
+#: purchasing/includes/ui/invoice_ui.inc:222
 msgid "GL Items for this Credit Note"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:219
+#: purchasing/includes/ui/invoice_ui.inc:232
 msgid "Quick Entry:"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:392
+#: purchasing/includes/ui/invoice_ui.inc:405
 msgid "Add to Invoice"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:394
+#: purchasing/includes/ui/invoice_ui.inc:407
 msgid "Add to Credit Note"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:396 sales/customer_invoice.php:524
+#: purchasing/includes/ui/invoice_ui.inc:409 sales/customer_invoice.php:533
 msgid "Remove"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:396
-#: purchasing/includes/ui/invoice_ui.inc:431
+#: purchasing/includes/ui/invoice_ui.inc:409
+#: purchasing/includes/ui/invoice_ui.inc:444
 msgid ""
 "WARNING! Be careful with removal. The operation is executed immediately and "
 "cannot be undone !!!"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:398
+#: purchasing/includes/ui/invoice_ui.inc:411
 msgid ""
 "You are about to remove all yet non-invoiced items from selected delivery "
 "line. This operation also irreversibly changes related order line. Do you "
 "want to continue ?"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:429
+#: purchasing/includes/ui/invoice_ui.inc:442
 msgid "Items Received Yet to be Invoiced"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:434
+#: purchasing/includes/ui/invoice_ui.inc:447
 msgid "Delivery Item Selected For Adding To A Supplier Credit Note"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:439
+#: purchasing/includes/ui/invoice_ui.inc:452
 msgid "Received Items Charged on this Invoice"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:441
+#: purchasing/includes/ui/invoice_ui.inc:454
 msgid "Received Items Credited on this Note"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:451
+#: purchasing/includes/ui/invoice_ui.inc:464
 msgid "Received between"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:462
+#: purchasing/includes/ui/invoice_ui.inc:475
 msgid "Add All Items"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:471
-#: purchasing/includes/ui/invoice_ui.inc:483 reporting/rep308.php:149
+#: purchasing/includes/ui/invoice_ui.inc:484
+#: purchasing/includes/ui/invoice_ui.inc:496 reporting/rep308.php:149
 #: sales/inquiry/sales_orders_view.php:155
 msgid "Delivery"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:471
+#: purchasing/includes/ui/invoice_ui.inc:484
 msgid "P.O."
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:472
+#: purchasing/includes/ui/invoice_ui.inc:485
 msgid "Received On"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:472 purchasing/view/view_po.php:46
+#: purchasing/includes/ui/invoice_ui.inc:485 purchasing/view/view_po.php:46
 msgid "Quantity Received"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:472 purchasing/view/view_grn.php:41
+#: purchasing/includes/ui/invoice_ui.inc:485 purchasing/view/view_grn.php:41
 #: purchasing/view/view_po.php:46
 msgid "Quantity Invoiced"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:473
+#: purchasing/includes/ui/invoice_ui.inc:486
 msgid "Qty Yet To Invoice"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:473
-#: purchasing/includes/ui/po_ui.inc:237
+#: purchasing/includes/ui/invoice_ui.inc:486
+#: purchasing/includes/ui/po_ui.inc:235
 #: sales/includes/ui/sales_order_ui.inc:146
 msgid "Price after Tax"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:473
-#: purchasing/includes/ui/po_ui.inc:237
+#: purchasing/includes/ui/invoice_ui.inc:486
+#: purchasing/includes/ui/po_ui.inc:235
 #: sales/includes/ui/sales_order_ui.inc:146
 msgid "Price before Tax"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:479
+#: purchasing/includes/ui/invoice_ui.inc:492
 msgid "Qty Yet To Credit"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:484
+#: purchasing/includes/ui/invoice_ui.inc:497
 msgid "Line Value"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:551
+#: purchasing/includes/ui/invoice_ui.inc:564
 msgid ""
 "There are no outstanding items received from this supplier that have not "
 "been invoiced by them."
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:554
+#: purchasing/includes/ui/invoice_ui.inc:567
 msgid ""
 "There are no received items for the selected supplier that have been "
 "invoiced."
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:555
+#: purchasing/includes/ui/invoice_ui.inc:568
 msgid "Credits can only be applied to invoiced items."
 msgstr ""
 
-#: purchasing/includes/ui/po_ui.inc:148
-msgid "Supplier Currency:"
-msgstr ""
-
-#: purchasing/includes/ui/po_ui.inc:177 sales/sales_order_entry.php:705
+#: purchasing/includes/ui/po_ui.inc:154 sales/sales_order_entry.php:710
 msgid "Order Date:"
 msgstr ""
 
-#: purchasing/includes/ui/po_ui.inc:178 sales/sales_order_entry.php:692
+#: purchasing/includes/ui/po_ui.inc:155 sales/sales_order_entry.php:697
 msgid "Delivery Date:"
 msgstr ""
 
-#: purchasing/includes/ui/po_ui.inc:178 sales/sales_order_entry.php:686
+#: purchasing/includes/ui/po_ui.inc:155 sales/sales_order_entry.php:691
 msgid "Invoice Date:"
 msgstr ""
 
-#: purchasing/includes/ui/po_ui.inc:189
+#: purchasing/includes/ui/po_ui.inc:168
+msgid "Supplier Currency:"
+msgstr ""
+
+#: purchasing/includes/ui/po_ui.inc:187
 msgid "Due Date:"
 msgstr ""
 
-#: purchasing/includes/ui/po_ui.inc:191
+#: purchasing/includes/ui/po_ui.inc:189
 msgid "Supplier's Reference:"
 msgstr ""
 
-#: purchasing/includes/ui/po_ui.inc:192
+#: purchasing/includes/ui/po_ui.inc:190
 msgid "Receive Into:"
 msgstr ""
 
-#: purchasing/includes/ui/po_ui.inc:217
+#: purchasing/includes/ui/po_ui.inc:215
 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:221
+#: purchasing/includes/ui/po_ui.inc:219
 msgid "Deliver to:"
 msgstr ""
 
-#: purchasing/includes/ui/po_ui.inc:230
+#: purchasing/includes/ui/po_ui.inc:228
 msgid "Order Items"
 msgstr ""
 
-#: purchasing/includes/ui/po_ui.inc:236 purchasing/po_receive_items.php:62
+#: purchasing/includes/ui/po_ui.inc:234 purchasing/po_receive_items.php:62
 msgid "Received"
 msgstr ""
 
-#: purchasing/includes/ui/po_ui.inc:237
-#: sales/includes/ui/sales_order_ui.inc:617
+#: purchasing/includes/ui/po_ui.inc:235
+#: sales/includes/ui/sales_order_ui.inc:616
 msgid "Required Delivery Date"
 msgstr ""
 
-#: purchasing/includes/ui/po_ui.inc:237 purchasing/view/view_grn.php:41
+#: purchasing/includes/ui/po_ui.inc:235 purchasing/view/view_grn.php:41
 #: purchasing/view/view_po.php:46
 msgid "Line Total"
 msgstr ""
 
-#: purchasing/includes/ui/po_ui.inc:288 purchasing/po_receive_items.php:114
+#: purchasing/includes/ui/po_ui.inc:286 purchasing/po_receive_items.php:114
 #: reporting/rep107.php:150 reporting/rep109.php:149 reporting/rep110.php:159
 #: reporting/rep111.php:134 reporting/rep113.php:144 reporting/rep209.php:162
-#: sales/customer_credit_invoice.php:322 sales/customer_delivery.php:509
-#: sales/customer_invoice.php:565 sales/view/view_dispatch.php:146
+#: sales/customer_credit_invoice.php:322 sales/customer_delivery.php:511
+#: sales/customer_invoice.php:574 sales/view/view_dispatch.php:146
 #: sales/view/view_invoice.php:148 sales/includes/ui/sales_credit_ui.inc:217
 #: sales/includes/ui/sales_order_ui.inc:235
 msgid "Sub-total"
 msgstr ""
 
-#: purchasing/includes/ui/po_ui.inc:297 purchasing/po_receive_items.php:122
+#: purchasing/includes/ui/po_ui.inc:295 purchasing/po_receive_items.php:122
 #: purchasing/view/view_grn.php:79 purchasing/view/view_po.php:93
-#: sales/customer_delivery.php:516 sales/view/view_sales_order.php:244
+#: sales/customer_delivery.php:518 sales/view/view_sales_order.php:244
 #: sales/includes/ui/sales_order_ui.inc:242
 msgid "Amount Total"
 msgstr ""
 
-#: purchasing/includes/ui/po_ui.inc:298
-#: purchasing/allocations/supplier_allocate.php:63
-#: sales/allocations/customer_allocate.php:62
+#: purchasing/includes/ui/po_ui.inc:296
+#: purchasing/allocations/supplier_allocate.php:73
+#: sales/allocations/customer_allocate.php:71
 #: sales/includes/ui/sales_order_ui.inc:243
 msgid "Refresh"
 msgstr ""
@@ -9282,7 +9332,7 @@ msgstr ""
 msgid "Enter a new purchase order"
 msgstr ""
 
-#: purchasing/po_entry_items.php:216 sales/sales_order_entry.php:486
+#: purchasing/po_entry_items.php:216 sales/sales_order_entry.php:490
 msgid "Item description cannot be empty."
 msgstr ""
 
@@ -9317,8 +9367,8 @@ msgid ""
 "purchased."
 msgstr ""
 
-#: purchasing/po_entry_items.php:329 purchasing/supplier_invoice.php:343
-#: purchasing/supplier_payment.php:114
+#: purchasing/po_entry_items.php:329 purchasing/supplier_invoice.php:355
+#: purchasing/supplier_payment.php:123
 msgid "There is no supplier selected."
 msgstr ""
 
@@ -9327,7 +9377,7 @@ msgid "The entered order date is invalid."
 msgstr ""
 
 #: purchasing/po_entry_items.php:343 purchasing/po_receive_items.php:181
-#: sales/sales_order_entry.php:354
+#: sales/sales_order_entry.php:358
 msgid "The entered date is not in fiscal year"
 msgstr ""
 
@@ -9339,11 +9389,11 @@ msgstr ""
 msgid "There is no reference entered for this purchase order."
 msgstr ""
 
-#: purchasing/po_entry_items.php:374 purchasing/supplier_invoice.php:161
+#: purchasing/po_entry_items.php:374 purchasing/supplier_invoice.php:172
 msgid "You must enter a supplier's invoice reference."
 msgstr ""
 
-#: purchasing/po_entry_items.php:381 purchasing/supplier_invoice.php:187
+#: purchasing/po_entry_items.php:381 purchasing/supplier_invoice.php:198
 msgid ""
 "This invoice number has already been entered. It cannot be entered again."
 msgstr ""
@@ -9361,39 +9411,39 @@ msgid ""
 "The order cannot be placed because there are no lines entered on this order."
 msgstr ""
 
-#: purchasing/po_entry_items.php:528 sales/sales_order_entry.php:709
+#: purchasing/po_entry_items.php:534 sales/sales_order_entry.php:714
 msgid "Place Order"
 msgstr ""
 
-#: purchasing/po_entry_items.php:529
+#: purchasing/po_entry_items.php:535
 msgid "Update Order"
 msgstr ""
 
-#: purchasing/po_entry_items.php:530 sales/sales_order_entry.php:708
+#: purchasing/po_entry_items.php:536 sales/sales_order_entry.php:713
 msgid "Cancel Order"
 msgstr ""
 
-#: purchasing/po_entry_items.php:532
+#: purchasing/po_entry_items.php:538
 msgid "Process GRN"
 msgstr ""
 
-#: purchasing/po_entry_items.php:533
+#: purchasing/po_entry_items.php:539
 msgid "Update GRN"
 msgstr ""
 
-#: purchasing/po_entry_items.php:534
+#: purchasing/po_entry_items.php:540
 msgid "Cancel GRN"
 msgstr ""
 
-#: purchasing/po_entry_items.php:537 sales/customer_invoice.php:584
+#: purchasing/po_entry_items.php:543 sales/customer_invoice.php:593
 msgid "Process Invoice"
 msgstr ""
 
-#: purchasing/po_entry_items.php:538
+#: purchasing/po_entry_items.php:544
 msgid "Update Invoice"
 msgstr ""
 
-#: purchasing/po_entry_items.php:539 sales/sales_order_entry.php:689
+#: purchasing/po_entry_items.php:545 sales/sales_order_entry.php:694
 msgid "Cancel Invoice"
 msgstr ""
 
@@ -9424,8 +9474,8 @@ msgstr ""
 msgid "Ordered"
 msgstr ""
 
-#: purchasing/po_receive_items.php:63 reporting/rep101.php:134
-#: reporting/rep105.php:115 reporting/rep105.php:166 reporting/rep201.php:123
+#: purchasing/po_receive_items.php:63 reporting/rep101.php:119
+#: reporting/rep105.php:115 reporting/rep105.php:166 reporting/rep201.php:111
 #: reporting/includes/doctext.inc:225
 msgid "Outstanding"
 msgstr ""
@@ -9467,11 +9517,11 @@ msgstr ""
 msgid "Re-Read the updated purchase order for receiving goods against"
 msgstr ""
 
-#: purchasing/po_receive_items.php:329
+#: purchasing/po_receive_items.php:330
 msgid "Items to Receive"
 msgstr ""
 
-#: purchasing/po_receive_items.php:334
+#: purchasing/po_receive_items.php:335
 msgid "Process Receive Items"
 msgstr ""
 
@@ -9491,66 +9541,66 @@ msgstr ""
 msgid "Enter Another Credit Note"
 msgstr ""
 
-#: purchasing/supplier_credit.php:102 purchasing/supplier_invoice.php:102
+#: purchasing/supplier_credit.php:111 purchasing/supplier_invoice.php:112
 msgid ""
 "The account code entered is not a valid code, this line cannot be added to "
 "the transaction."
 msgstr ""
 
-#: purchasing/supplier_credit.php:112 purchasing/supplier_invoice.php:112
+#: purchasing/supplier_credit.php:121 purchasing/supplier_invoice.php:122
 msgid ""
 "The amount entered is not numeric. This line cannot be added to the "
 "transaction."
 msgstr ""
 
-#: purchasing/supplier_credit.php:142
+#: purchasing/supplier_credit.php:152
 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:149
+#: purchasing/supplier_credit.php:159
 msgid "You must enter an credit note reference."
 msgstr ""
 
-#: purchasing/supplier_credit.php:163
+#: purchasing/supplier_credit.php:173
 msgid "You must enter a supplier's credit note reference."
 msgstr ""
 
-#: purchasing/supplier_credit.php:170
+#: purchasing/supplier_credit.php:180
 msgid ""
 "The credit note as entered cannot be processed because the date entered is "
 "not valid."
 msgstr ""
 
-#: purchasing/supplier_credit.php:182 purchasing/supplier_invoice.php:180
+#: purchasing/supplier_credit.php:192 purchasing/supplier_invoice.php:191
 msgid ""
 "The invoice as entered cannot be processed because the due date is in an "
 "incorrect format."
 msgstr ""
 
-#: purchasing/supplier_credit.php:189
+#: purchasing/supplier_credit.php:199
 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:201
+#: purchasing/supplier_credit.php:211
 msgid ""
 "The return cannot be processed because there is an insufficient quantity for "
 "item:"
 msgstr ""
 
-#: purchasing/supplier_credit.php:244
+#: purchasing/supplier_credit.php:254
 msgid "The quantity to credit must be numeric and greater than zero."
 msgstr ""
 
-#: purchasing/supplier_credit.php:251
+#: purchasing/supplier_credit.php:261
 msgid "The price is either not numeric or negative."
 msgstr ""
 
-#: purchasing/supplier_credit.php:353
+#: purchasing/supplier_credit.php:363
 msgid "Enter Credit Note"
 msgstr ""
 
@@ -9566,46 +9616,46 @@ msgstr ""
 msgid "View this Invoice"
 msgstr ""
 
-#: purchasing/supplier_invoice.php:50
+#: purchasing/supplier_invoice.php:51
 msgid "Enter Another Invoice"
 msgstr ""
 
-#: purchasing/supplier_invoice.php:141
+#: purchasing/supplier_invoice.php:152
 msgid ""
 "The invoice cannot be processed because the there are no items or values on "
 "the invoice.  Invoices are expected to have a charge."
 msgstr ""
 
-#: purchasing/supplier_invoice.php:147
+#: purchasing/supplier_invoice.php:158
 msgid "You must enter an invoice reference."
 msgstr ""
 
-#: purchasing/supplier_invoice.php:168
+#: purchasing/supplier_invoice.php:179
 msgid ""
 "The invoice as entered cannot be processed because the invoice date is in an "
 "incorrect format."
 msgstr ""
 
-#: purchasing/supplier_invoice.php:224
+#: purchasing/supplier_invoice.php:235
 msgid "The quantity to invoice must be numeric and greater than zero."
 msgstr ""
 
-#: purchasing/supplier_invoice.php:231
+#: purchasing/supplier_invoice.php:242
 msgid "The price is not numeric."
 msgstr ""
 
-#: purchasing/supplier_invoice.php:244
+#: purchasing/supplier_invoice.php:255
 msgid ""
 "The price being invoiced is more than the purchase order price by more than "
 "the allowed over-charge percentage. The system is set up to prohibit this. "
 "See the system administrator to modify the set up parameters if necessary."
 msgstr ""
 
-#: purchasing/supplier_invoice.php:245 purchasing/supplier_invoice.php:258
+#: purchasing/supplier_invoice.php:256 purchasing/supplier_invoice.php:269
 msgid "The over-charge percentage allowance is :"
 msgstr ""
 
-#: purchasing/supplier_invoice.php:257
+#: purchasing/supplier_invoice.php:268
 msgid ""
 "The quantity being invoiced is more than the outstanding quantity by more "
 "than the allowed over-charge percentage. The system is set up to prohibit "
@@ -9613,12 +9663,12 @@ msgid ""
 "necessary."
 msgstr ""
 
-#: purchasing/supplier_invoice.php:325
+#: purchasing/supplier_invoice.php:337
 #, php-format
 msgid "All yet non-invoiced items on delivery line # %d has been removed."
 msgstr ""
 
-#: purchasing/supplier_invoice.php:367
+#: purchasing/supplier_invoice.php:379
 msgid "Enter Invoice"
 msgstr ""
 
@@ -9626,53 +9676,74 @@ msgstr ""
 msgid "Supplier Payment Entry"
 msgstr ""
 
-#: purchasing/supplier_payment.php:85
+#: purchasing/supplier_payment.php:92
 msgid "Invalid purchase invoice number."
 msgstr ""
 
-#: purchasing/supplier_payment.php:91
+#: purchasing/supplier_payment.php:98
 msgid "Payment has been sucessfully entered"
 msgstr ""
 
-#: purchasing/supplier_payment.php:93
+#: purchasing/supplier_payment.php:100
 msgid "&Print This Remittance"
 msgstr ""
 
-#: purchasing/supplier_payment.php:94
+#: purchasing/supplier_payment.php:101
 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
 msgid "View the GL &Journal Entries for this Payment"
 msgstr ""
 
-#: purchasing/supplier_payment.php:98
-msgid "Select Another &Supplier Transaction for Payment"
+#: purchasing/supplier_payment.php:106
+msgid "Enter another supplier &payment"
 msgstr ""
 
-#: purchasing/supplier_payment.php:101
-msgid "Enter Another Supplier &Payment"
+#: 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:148 sales/customer_payments.php:198
-msgid "The exchange rate must be numeric and greater than zero."
+#: purchasing/supplier_payment.php:110 sales/customer_payments.php:107
+msgid "Bank Account &Transfer"
 msgstr ""
 
-#: purchasing/supplier_payment.php:160
+#: purchasing/supplier_payment.php:162
 msgid "The entered discount is invalid or less than zero."
 msgstr ""
 
-#: purchasing/supplier_payment.php:168
+#: purchasing/supplier_payment.php:170
 msgid ""
 "The total of the amount and the discount is zero or negative. Please enter "
 "positive values."
 msgstr ""
 
+#: purchasing/supplier_payment.php:177
+msgid "The entered bank amount is zero or negative."
+msgstr ""
+
+#: purchasing/supplier_payment.php:191
+msgid ""
+"The entered date is out of fiscal year or is closed for further data entry."
+msgstr ""
+
 #: purchasing/supplier_payment.php:275
 msgid "Payment To:"
 msgstr ""
 
-#: purchasing/supplier_payment.php:288
+#: purchasing/supplier_payment.php:290
 msgid "From Bank Account:"
 msgstr ""
 
@@ -9681,19 +9752,19 @@ msgstr ""
 msgid "Date Paid"
 msgstr ""
 
-#: purchasing/supplier_payment.php:319 sales/customer_payments.php:394
-msgid "Amount of Discount:"
+#: purchasing/supplier_payment.php:310
+msgid "Bank Amount:"
 msgstr ""
 
-#: purchasing/supplier_payment.php:320
-msgid "Amount of Payment:"
+#: purchasing/supplier_payment.php:323 sales/customer_payments.php:395
+msgid "Amount of Discount:"
 msgstr ""
 
-#: purchasing/supplier_payment.php:326
-msgid "The amount and discount are in the bank account's currency."
+#: purchasing/supplier_payment.php:324
+msgid "Amount of Payment:"
 msgstr ""
 
-#: purchasing/supplier_payment.php:329
+#: purchasing/supplier_payment.php:328
 msgid "Enter Payment"
 msgstr ""
 
@@ -9743,8 +9814,8 @@ msgstr ""
 #: purchasing/view/view_po.php:100
 #: purchasing/inquiry/supplier_allocation_inquiry.php:148
 #: purchasing/inquiry/supplier_inquiry.php:193
-#: sales/inquiry/customer_allocation_inquiry.php:164
-#: sales/inquiry/customer_inquiry.php:251
+#: sales/inquiry/customer_allocation_inquiry.php:165
+#: sales/inquiry/customer_inquiry.php:244
 #: sales/inquiry/sales_deliveries_view.php:206
 #: sales/inquiry/sales_orders_view.php:318
 msgid "Marked items are overdue."
@@ -9814,12 +9885,13 @@ msgstr ""
 msgid "To Supplier"
 msgstr ""
 
-#: purchasing/view/view_supp_payment.php:59 sales/view/view_receipt.php:43
+#: purchasing/view/view_supp_payment.php:59
 msgid "Payment Currency"
 msgstr ""
 
-#: purchasing/view/view_supp_payment.php:62 sales/customer_delivery.php:433
-#: sales/customer_invoice.php:470 sales/view/view_receipt.php:45
+#: purchasing/view/view_supp_payment.php:62 reporting/rep112.php:162
+#: reporting/rep210.php:171 sales/customer_delivery.php:433
+#: sales/customer_invoice.php:479 sales/view/view_receipt.php:45
 #: sales/view/view_sales_order.php:202
 msgid "Discount"
 msgstr ""
@@ -9850,148 +9922,148 @@ msgstr ""
 msgid "Website:"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:106
+#: purchasing/manage/suppliers.php:107
 msgid "Our Customer No:"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:108
+#: purchasing/manage/suppliers.php:109
 msgid "Purchasing"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:109
+#: purchasing/manage/suppliers.php:110
 msgid "Bank Name/Account:"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:110 sales/manage/customers.php:264
+#: purchasing/manage/suppliers.php:111 sales/manage/customers.php:268
 msgid "Credit Limit:"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:111 sales/manage/customers.php:266
+#: purchasing/manage/suppliers.php:112 sales/manage/customers.php:270
 msgid "Payment Terms:"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:117 purchasing/manage/suppliers.php:120
+#: purchasing/manage/suppliers.php:118 purchasing/manage/suppliers.php:121
 msgid "Prices contain tax included:"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:122 reporting/rep704.php:96
+#: purchasing/manage/suppliers.php:123 reporting/rep704.php:96
 #: reporting/rep704.php:106 reporting/rep704.php:114
 msgid "Accounts"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:123
+#: purchasing/manage/suppliers.php:124
 msgid "Accounts Payable Account:"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:124
+#: purchasing/manage/suppliers.php:125
 msgid "Purchase Account:"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:125
+#: purchasing/manage/suppliers.php:126
 msgid "Use Item Inventory/COGS Account"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:128 purchasing/manage/suppliers.php:157
+#: purchasing/manage/suppliers.php:129 purchasing/manage/suppliers.php:158
 msgid "Contact Data"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:148 sales/manage/customer_branches.php:266
+#: purchasing/manage/suppliers.php:149 sales/manage/customer_branches.php:266
 msgid "Addresses"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:149 reporting/rep205.php:102
+#: purchasing/manage/suppliers.php:150 reporting/rep205.php:102
 #: sales/manage/customer_branches.php:267
 msgid "Mailing Address:"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:150
+#: purchasing/manage/suppliers.php:151
 msgid "Physical Address:"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:152
+#: purchasing/manage/suppliers.php:153
 msgid "General"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:153 sales/manage/customer_branches.php:269
-#: sales/manage/customers.php:287
+#: purchasing/manage/suppliers.php:154 sales/manage/customer_branches.php:269
+#: sales/manage/customers.php:291
 msgid "General Notes:"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:155
+#: purchasing/manage/suppliers.php:156
 msgid "Supplier status:"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:161
+#: purchasing/manage/suppliers.php:162
 msgid "System default"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:168
+#: purchasing/manage/suppliers.php:169
 msgid "Update Supplier"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:169
+#: purchasing/manage/suppliers.php:170
 msgid "Update supplier data"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:170
+#: purchasing/manage/suppliers.php:171
 msgid "Select this supplier and return to document entry."
 msgstr ""
 
-#: purchasing/manage/suppliers.php:171
+#: purchasing/manage/suppliers.php:172
 msgid "Delete Supplier"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:172
+#: purchasing/manage/suppliers.php:173
 msgid "Delete supplier data if have been never used"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:176
+#: purchasing/manage/suppliers.php:177
 msgid "Add New Supplier Details"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:195
+#: purchasing/manage/suppliers.php:196
 msgid "The supplier name must be entered."
 msgstr ""
 
-#: purchasing/manage/suppliers.php:202
+#: purchasing/manage/suppliers.php:203
 msgid "The supplier short name must be entered."
 msgstr ""
 
-#: purchasing/manage/suppliers.php:222
+#: purchasing/manage/suppliers.php:223
 msgid "Supplier has been updated."
 msgstr ""
 
-#: purchasing/manage/suppliers.php:240
+#: purchasing/manage/suppliers.php:241
 msgid "A new supplier has been added."
 msgstr ""
 
-#: purchasing/manage/suppliers.php:258
+#: purchasing/manage/suppliers.php:259
 msgid ""
 "Cannot delete this supplier because there are transactions that refer to "
 "this supplier."
 msgstr ""
 
-#: purchasing/manage/suppliers.php:266
+#: purchasing/manage/suppliers.php:267
 msgid ""
 "Cannot delete the supplier record because purchase orders have been created "
 "against this supplier."
 msgstr ""
 
-#: purchasing/manage/suppliers.php:287
+#: purchasing/manage/suppliers.php:288
 #: purchasing/inquiry/supplier_allocation_inquiry.php:48
 msgid "Select a supplier: "
 msgstr ""
 
-#: purchasing/manage/suppliers.php:288
+#: purchasing/manage/suppliers.php:289
 msgid "New supplier"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:307 sales/manage/customer_branches.php:323
-#: sales/manage/customers.php:345
+#: purchasing/manage/suppliers.php:308 sales/manage/customer_branches.php:323
+#: sales/manage/customers.php:349
 msgid "&Contacts"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:309
+#: purchasing/manage/suppliers.php:310
 msgid "Purchase &Orders"
 msgstr ""
 
@@ -10052,9 +10124,9 @@ msgid "Supp Reference"
 msgstr ""
 
 #: purchasing/inquiry/supplier_allocation_inquiry.php:136
-#: reporting/rep101.php:134 reporting/rep201.php:123
+#: reporting/rep101.php:119 reporting/rep201.php:111
 #: reporting/includes/doctext.inc:225
-#: sales/inquiry/customer_allocation_inquiry.php:153
+#: sales/inquiry/customer_allocation_inquiry.php:154
 msgid "Allocated"
 msgstr ""
 
@@ -10116,41 +10188,46 @@ msgstr ""
 msgid "Allocate Supplier Payment or Credit Note"
 msgstr ""
 
-#: purchasing/allocations/supplier_allocate.php:49
+#: purchasing/allocations/supplier_allocate.php:52
 msgid "Allocation of"
 msgstr ""
 
-#: purchasing/allocations/supplier_allocate.php:54
-#: sales/allocations/customer_allocate.php:53
+#: purchasing/allocations/supplier_allocate.php:58
+#: sales/allocations/customer_allocate.php:55
 msgid "Total:"
 msgstr ""
 
-#: purchasing/allocations/supplier_allocate.php:63
-#: sales/allocations/customer_allocate.php:62
+#: 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:64
-#: sales/allocations/customer_allocate.php:63
+#: purchasing/allocations/supplier_allocate.php:74
+#: sales/allocations/customer_allocate.php:72
 msgid "Process allocations"
 msgstr ""
 
-#: purchasing/allocations/supplier_allocate.php:65
-#: purchasing/allocations/supplier_allocate.php:71
-#: sales/allocations/customer_allocate.php:64
-#: sales/allocations/customer_allocate.php:70
+#: 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:66
-#: purchasing/allocations/supplier_allocate.php:72
-#: sales/allocations/customer_allocate.php:64
-#: sales/allocations/customer_allocate.php:71
+#: 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:70
-#: sales/allocations/customer_allocate.php:68
+#: purchasing/allocations/supplier_allocate.php:80
+#: sales/allocations/customer_allocate.php:77
 msgid "There are no unsettled transactions to allocate."
 msgstr ""
 
@@ -10177,28 +10254,28 @@ msgstr ""
 msgid "Marked items are settled."
 msgstr ""
 
-#: reporting/rep101.php:123 reporting/rep102.php:108 reporting/rep114.php:108
+#: 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:133 reporting/rep201.php:122 reporting/rep203.php:93
+#: reporting/rep101.php:118 reporting/rep201.php:110 reporting/rep203.php:93
 #: reporting/rep709.php:111 reporting/includes/doctext.inc:145
 #: reporting/includes/doctext.inc:186 reporting/includes/doctext.inc:224
 msgid "Trans Type"
 msgstr ""
 
-#: reporting/rep101.php:133 reporting/rep201.php:122
+#: reporting/rep101.php:118 reporting/rep201.php:110
 #: reporting/includes/doctext.inc:224
 msgid "Charges"
 msgstr ""
 
-#: reporting/rep101.php:133 reporting/rep201.php:123
+#: reporting/rep101.php:118 reporting/rep201.php:111
 #: reporting/includes/doctext.inc:225
 msgid "Credits"
 msgstr ""
 
-#: reporting/rep101.php:144 reporting/rep102.php:136 reporting/rep201.php:133
+#: 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
@@ -10206,14 +10283,14 @@ msgstr ""
 msgid "Suppress Zeros"
 msgstr ""
 
-#: reporting/rep101.php:146
+#: reporting/rep101.php:131
 msgid "Customer Balances"
 msgstr ""
 
-#: reporting/rep101.php:259 reporting/rep102.php:228 reporting/rep106.php:171
-#: reporting/rep201.php:247 reporting/rep202.php:235 reporting/rep203.php:181
+#: 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:187 reporting/rep306.php:294 reporting/rep309.php:158
+#: reporting/rep305.php:188 reporting/rep306.php:293 reporting/rep309.php:158
 msgid "Grand Total"
 msgstr ""
 
@@ -10332,11 +10409,6 @@ msgstr ""
 msgid "Turnover"
 msgstr ""
 
-#: 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:111
 msgid "Category/Items"
 msgstr ""
@@ -10371,17 +10443,17 @@ msgid "Back Orders Only"
 msgstr ""
 
 #: reporting/rep105.php:109 reporting/rep204.php:84
-#: sales/inquiry/customer_allocation_inquiry.php:146
-#: sales/inquiry/customer_inquiry.php:226
+#: sales/inquiry/customer_allocation_inquiry.php:147
+#: sales/inquiry/customer_inquiry.php:219
 msgid "Order"
 msgstr ""
 
-#: reporting/rep105.php:109 reporting/rep106.php:83 reporting/rep112.php:179
+#: reporting/rep105.php:109 reporting/rep106.php:83 reporting/rep112.php:187
 #: sales/create_recurrent_invoices.php:134
 #: sales/customer_credit_invoice.php:236 sales/customer_delivery.php:339
-#: sales/customer_invoice.php:381 sales/manage/customers.php:251
-#: sales/manage/customers.php:290 sales/manage/recurrent_invoices.php:102
-#: sales/view/view_credit.php:58 sales/inquiry/customer_inquiry.php:231
+#: sales/customer_invoice.php:390 sales/manage/customers.php:255
+#: sales/manage/customers.php:294 sales/manage/recurrent_invoices.php:102
+#: sales/view/view_credit.php:58 sales/inquiry/customer_inquiry.php:224
 #: sales/inquiry/sales_deliveries_view.php:182
 #: sales/inquiry/sales_orders_view.php:265
 #: sales/inquiry/sales_orders_view.php:279
@@ -10405,8 +10477,8 @@ msgid "Loc"
 msgstr ""
 
 #: reporting/rep105.php:114 sales/customer_delivery.php:432
-#: sales/customer_invoice.php:469
-msgid "Invoiced"
+#: sales/customer_invoice.php:478 sales/includes/ui/sales_order_ui.inc:145
+msgid "Delivered"
 msgstr ""
 
 #: reporting/rep105.php:121
@@ -10508,31 +10580,31 @@ msgstr ""
 msgid "SALES QUOTATION"
 msgstr ""
 
-#: reporting/rep112.php:94 reporting/includes/doctext.inc:176
+#: reporting/rep112.php:95 reporting/includes/doctext.inc:176
 msgid "RECEIPT"
 msgstr ""
 
-#: reporting/rep112.php:125 reporting/rep210.php:133
+#: reporting/rep112.php:126 reporting/rep210.php:134
 msgid "As advance / full / part / payment towards:"
 msgstr ""
 
-#: reporting/rep112.php:160
+#: reporting/rep112.php:167
 msgid "TOTAL RECEIPT"
 msgstr ""
 
-#: reporting/rep112.php:170
+#: reporting/rep112.php:178
 msgid "Received / Sign"
 msgstr ""
 
-#: reporting/rep112.php:172
+#: reporting/rep112.php:180
 msgid "By Cash / Cheque* / Draft No."
 msgstr ""
 
-#: reporting/rep112.php:174
+#: reporting/rep112.php:182
 msgid "Dated"
 msgstr ""
 
-#: reporting/rep112.php:177
+#: reporting/rep112.php:185
 msgid "Drawn on Bank"
 msgstr ""
 
@@ -10565,11 +10637,11 @@ msgstr ""
 msgid "Tax"
 msgstr ""
 
-#: reporting/rep201.php:112
+#: reporting/rep201.php:100
 msgid "Balances in Home currency"
 msgstr ""
 
-#: reporting/rep201.php:135
+#: reporting/rep201.php:123
 msgid "Supplier Balances"
 msgstr ""
 
@@ -10626,12 +10698,12 @@ msgstr ""
 msgid "TOTAL PO"
 msgstr ""
 
-#: reporting/rep210.php:95 reporting/rep210.php:117
+#: reporting/rep210.php:96 reporting/rep210.php:118
 #: reporting/includes/doctext.inc:129
 msgid "REMITTANCE"
 msgstr ""
 
-#: reporting/rep210.php:168
+#: reporting/rep210.php:177
 msgid "TOTAL REMITTANCE"
 msgstr ""
 
@@ -10663,7 +10735,7 @@ msgstr ""
 msgid "Shortage"
 msgstr ""
 
-#: reporting/rep303.php:121 reporting/rep303.php:127 reporting/rep305.php:100
+#: reporting/rep303.php:121 reporting/rep303.php:127 reporting/rep305.php:101
 msgid "Stock ID"
 msgstr ""
 
@@ -10679,13 +10751,13 @@ msgstr ""
 msgid "Stock Check Sheets"
 msgstr ""
 
-#: reporting/rep304.php:114 reporting/rep305.php:100 reporting/rep306.php:141
+#: reporting/rep304.php:114 reporting/rep305.php:101 reporting/rep306.php:141
 #: reporting/rep309.php:98
 msgid "Qty"
 msgstr ""
 
 #: reporting/rep304.php:114 reporting/rep309.php:98
-#: sales/manage/customer_branches.php:240 sales/manage/customers.php:260
+#: sales/manage/customer_branches.php:240 sales/manage/customers.php:264
 msgid "Sales"
 msgstr ""
 
@@ -10701,23 +10773,23 @@ msgstr ""
 msgid "Inventory Sales Report"
 msgstr ""
 
-#: reporting/rep305.php:100
+#: reporting/rep305.php:101
 msgid "PO No"
 msgstr ""
 
-#: reporting/rep305.php:100
+#: reporting/rep305.php:101
 msgid "Inv"
 msgstr ""
 
-#: reporting/rep305.php:100
+#: reporting/rep305.php:101
 msgid "Inv Price"
 msgstr ""
 
-#: reporting/rep305.php:100
+#: reporting/rep305.php:101
 msgid "PO Price"
 msgstr ""
 
-#: reporting/rep305.php:107
+#: reporting/rep305.php:108
 msgid "GRN Valuation Report"
 msgstr ""
 
@@ -11070,8 +11142,7 @@ msgid "Print &Statements"
 msgstr ""
 
 #: reporting/reports_main.php:124 reporting/reports_main.php:131
-#: reporting/reports_main.php:139 reporting/reports_main.php:195
-#: reporting/reports_main.php:202
+#: reporting/reports_main.php:139
 msgid "Email Customers"
 msgstr ""
 
@@ -11115,6 +11186,10 @@ msgstr ""
 msgid "Print Purchase &Orders"
 msgstr ""
 
+#: reporting/reports_main.php:195 reporting/reports_main.php:202
+msgid "Email Suppliers"
+msgstr ""
+
 #: reporting/reports_main.php:198
 msgid "Print Remittances"
 msgstr ""
@@ -11325,7 +11400,7 @@ msgstr ""
 
 #: reporting/includes/doctext.inc:48 sales/view/view_sales_order.php:69
 #: sales/inquiry/sales_orders_view.php:282
-#: sales/includes/ui/sales_order_ui.inc:612
+#: sales/includes/ui/sales_order_ui.inc:611
 msgid "Valid until"
 msgstr ""
 
@@ -11396,7 +11471,7 @@ msgstr ""
 msgid "DueDate"
 msgstr ""
 
-#: reporting/includes/doctext.inc:259 reporting/includes/pdf_report.inc:1020
+#: reporting/includes/doctext.inc:259 reporting/includes/pdf_report.inc:1019
 msgid "You can pay through"
 msgstr ""
 
@@ -11424,12 +11499,12 @@ msgid "Report Date"
 msgstr ""
 
 #: reporting/includes/excel_report.inc:413
-#: reporting/includes/pdf_report.inc:601
+#: reporting/includes/pdf_report.inc:600
 msgid "Generated At"
 msgstr ""
 
 #: reporting/includes/excel_report.inc:419
-#: reporting/includes/pdf_report.inc:610
+#: reporting/includes/pdf_report.inc:609
 msgid "Generated By"
 msgstr ""
 
@@ -11442,46 +11517,46 @@ msgid "Domicile"
 msgstr ""
 
 #: reporting/includes/header2.inc:143 reporting/includes/pdf_report.inc:352
-#: reporting/includes/pdf_report.inc:501 reporting/includes/pdf_report.inc:629
+#: reporting/includes/pdf_report.inc:501 reporting/includes/pdf_report.inc:628
 msgid "Page"
 msgstr ""
 
-#: reporting/includes/pdf_report.inc:584
+#: reporting/includes/pdf_report.inc:583
 msgid "Report Period"
 msgstr ""
 
-#: reporting/includes/pdf_report.inc:987
-#: reporting/includes/pdf_report.inc:1035
+#: reporting/includes/pdf_report.inc:986
+#: reporting/includes/pdf_report.inc:1034
 #, php-format
 msgid "You have no email contact defined for this type of document for '%s'."
 msgstr ""
 
-#: reporting/includes/pdf_report.inc:1006
+#: reporting/includes/pdf_report.inc:1005
 msgid "Dear"
 msgstr ""
 
-#: reporting/includes/pdf_report.inc:1007
+#: reporting/includes/pdf_report.inc:1006
 msgid "Attached you will find "
 msgstr ""
 
-#: reporting/includes/pdf_report.inc:1023
+#: reporting/includes/pdf_report.inc:1022
 msgid "Kindest regards"
 msgstr ""
 
-#: reporting/includes/pdf_report.inc:1038
+#: reporting/includes/pdf_report.inc:1037
 msgid "Sending document by email failed"
 msgstr ""
 
-#: reporting/includes/pdf_report.inc:1038
-#: reporting/includes/pdf_report.inc:1041
+#: reporting/includes/pdf_report.inc:1037
+#: reporting/includes/pdf_report.inc:1040
 msgid "Email:"
 msgstr ""
 
-#: reporting/includes/pdf_report.inc:1041
+#: reporting/includes/pdf_report.inc:1040
 msgid "has been sent by email to destination."
 msgstr ""
 
-#: reporting/includes/pdf_report.inc:1071
+#: reporting/includes/pdf_report.inc:1070
 msgid "Report has been sent to network printer "
 msgstr ""
 
@@ -11678,7 +11753,7 @@ msgstr ""
 msgid "Modifying Customer Credit Note #%d"
 msgstr ""
 
-#: sales/credit_note_entry.php:51 sales/sales_order_entry.php:683
+#: sales/credit_note_entry.php:51 sales/sales_order_entry.php:688
 msgid ""
 "There are no customers, or there are no customers with branches. Please "
 "define customers and customer branches."
@@ -11944,7 +12019,7 @@ msgstr ""
 msgid "The entered dead-line for invoice is invalid."
 msgstr ""
 
-#: sales/customer_delivery.php:176 sales/customer_invoice.php:291
+#: sales/customer_delivery.php:176 sales/customer_invoice.php:300
 msgid "The entered shipping value is not numeric."
 msgstr ""
 
@@ -11952,7 +12027,7 @@ msgstr ""
 msgid "There are no item quantities on this delivery note."
 msgstr ""
 
-#: sales/customer_delivery.php:285 sales/sales_order_entry.php:512
+#: sales/customer_delivery.php:285 sales/sales_order_entry.php:516
 #: sales/includes/ui/sales_order_ui.inc:250
 msgid ""
 "The delivery cannot be processed because there is an insufficient quantity "
@@ -11971,7 +12046,7 @@ msgstr ""
 msgid "Invoice Dead-line"
 msgstr ""
 
-#: sales/customer_delivery.php:421 sales/customer_invoice.php:459
+#: sales/customer_delivery.php:421 sales/customer_invoice.php:468
 #: sales/includes/ui/sales_order_ui.inc:84
 #: sales/includes/ui/sales_order_ui.inc:374
 msgid ""
@@ -11987,43 +12062,42 @@ msgstr ""
 msgid "Max. delivery"
 msgstr ""
 
-#: sales/customer_delivery.php:432 sales/customer_invoice.php:469
-#: sales/includes/ui/sales_order_ui.inc:145
-msgid "Delivered"
+#: sales/customer_delivery.php:432 sales/customer_invoice.php:478
+msgid "Invoiced"
 msgstr ""
 
-#: sales/customer_delivery.php:501 sales/customer_invoice.php:554
+#: sales/customer_delivery.php:503 sales/customer_invoice.php:563
 msgid "Shipping Cost"
 msgstr ""
 
-#: sales/customer_delivery.php:521 sales/includes/ui/sales_order_ui.inc:248
+#: sales/customer_delivery.php:523 sales/includes/ui/sales_order_ui.inc:248
 msgid ""
 "Marked items have insufficient quantities in stock as on day of delivery."
 msgstr ""
 
-#: sales/customer_delivery.php:525
+#: sales/customer_delivery.php:527
 msgid "Action For Balance"
 msgstr ""
 
-#: sales/customer_delivery.php:532 sales/customer_delivery.php:534
-#: sales/customer_delivery.php:537 sales/customer_invoice.php:583
+#: sales/customer_delivery.php:534 sales/customer_delivery.php:536
+#: sales/customer_delivery.php:539 sales/customer_invoice.php:592
 msgid "Refresh document page"
 msgstr ""
 
-#: sales/customer_delivery.php:534
+#: sales/customer_delivery.php:536
 msgid "Reset quantity"
 msgstr ""
 
-#: sales/customer_delivery.php:537
+#: sales/customer_delivery.php:539
 msgid "Clear quantity"
 msgstr ""
 
-#: sales/customer_delivery.php:539
+#: sales/customer_delivery.php:541
 msgid "Process Dispatch"
 msgstr ""
 
-#: sales/customer_delivery.php:540 sales/customer_invoice.php:585
-#: sales/sales_order_entry.php:731
+#: sales/customer_delivery.php:542 sales/customer_invoice.php:594
+#: sales/sales_order_entry.php:736
 msgid "Check entered data and save document"
 msgstr ""
 
@@ -12044,16 +12118,16 @@ msgstr ""
 msgid "Selected deliveries has been processed"
 msgstr ""
 
-#: sales/customer_invoice.php:57 sales/customer_invoice.php:77
+#: sales/customer_invoice.php:57 sales/customer_invoice.php:86
 #: sales/sales_order_entry.php:212
 msgid "&View This Invoice"
 msgstr ""
 
-#: sales/customer_invoice.php:59 sales/customer_invoice.php:79
+#: sales/customer_invoice.php:59 sales/customer_invoice.php:88
 msgid "&Print This Invoice"
 msgstr ""
 
-#: sales/customer_invoice.php:60 sales/customer_invoice.php:80
+#: sales/customer_invoice.php:60 sales/customer_invoice.php:89
 msgid "&Email This Invoice"
 msgstr ""
 
@@ -12065,26 +12139,30 @@ msgstr ""
 msgid "Select Another &Delivery For Invoicing"
 msgstr ""
 
-#: sales/customer_invoice.php:75
+#: sales/customer_invoice.php:72 sales/sales_order_entry.php:235
+msgid "Entry &customer payment for this invoice"
+msgstr ""
+
+#: sales/customer_invoice.php:84
 #, php-format
 msgid "Sales Invoice # %d has been updated."
 msgstr ""
 
-#: sales/customer_invoice.php:82
+#: sales/customer_invoice.php:91
 msgid "Select Another &Invoice to Modify"
 msgstr ""
 
-#: sales/customer_invoice.php:121
+#: sales/customer_invoice.php:130
 msgid "Select a different delivery to invoice"
 msgstr ""
 
-#: sales/customer_invoice.php:122
+#: sales/customer_invoice.php:131
 msgid ""
 "There are no delivered items with a quantity left to invoice. There is "
 "nothing left to invoice."
 msgstr ""
 
-#: sales/customer_invoice.php:131
+#: sales/customer_invoice.php:140
 msgid ""
 "There are no delivery notes for this invoice.<br>\n"
 "\t\tMost likely this invoice was created in Front Accounting version prior "
@@ -12092,163 +12170,171 @@ msgid ""
 "\t\tand therefore can not be modified."
 msgstr ""
 
-#: sales/customer_invoice.php:140
+#: sales/customer_invoice.php:149
 msgid ""
 "All quantities on this invoice has been credited. There is nothing to modify "
 "on this invoice"
 msgstr ""
 
-#: sales/customer_invoice.php:146
+#: sales/customer_invoice.php:155
 msgid ""
 "This page can only be opened after delivery selection. Please select "
 "delivery to invoicing first."
 msgstr ""
 
-#: sales/customer_invoice.php:148
+#: sales/customer_invoice.php:157
 msgid "Select Delivery to Invoice"
 msgstr ""
 
-#: sales/customer_invoice.php:153 sales/customer_invoice.php:302
+#: sales/customer_invoice.php:162 sales/customer_invoice.php:311
 msgid ""
 "Selected quantity cannot be less than quantity credited nor more than "
 "quantity not invoiced yet."
 msgstr ""
 
-#: sales/customer_invoice.php:261
+#: sales/customer_invoice.php:270
 msgid "The entered invoice date is invalid."
 msgstr ""
 
-#: sales/customer_invoice.php:267
+#: sales/customer_invoice.php:276
 msgid "The entered invoice date is not in fiscal year."
 msgstr ""
 
-#: sales/customer_invoice.php:273
+#: sales/customer_invoice.php:282
 msgid "The entered invoice due date is invalid."
 msgstr ""
 
-#: sales/customer_invoice.php:297
+#: sales/customer_invoice.php:306
 msgid "There are no item quantities on this invoice."
 msgstr ""
 
-#: sales/customer_invoice.php:385
+#: sales/customer_invoice.php:394
 msgid "Payment terms:"
 msgstr ""
 
-#: sales/customer_invoice.php:388 sales/includes/ui/sales_order_ui.inc:411
-#: sales/includes/ui/sales_order_ui.inc:415
+#: sales/customer_invoice.php:397 sales/includes/ui/sales_order_ui.inc:410
+#: sales/includes/ui/sales_order_ui.inc:414
 msgid "Payment:"
 msgstr ""
 
-#: sales/customer_invoice.php:465
+#: sales/customer_invoice.php:474
 msgid "Invoice Items"
 msgstr ""
 
-#: sales/customer_invoice.php:470
+#: sales/customer_invoice.php:479
 msgid "This Invoice"
 msgstr ""
 
-#: sales/customer_invoice.php:478
+#: sales/customer_invoice.php:487
 msgid "Credited"
 msgstr ""
 
-#: sales/customer_invoice.php:572
+#: sales/customer_invoice.php:581
 msgid "Invoice Total"
 msgstr ""
 
-#: sales/customer_payments.php:33
+#: sales/customer_payments.php:32
 msgid "Customer Payment Entry"
 msgstr ""
 
-#: sales/customer_payments.php:37
+#: sales/customer_payments.php:36
 msgid "There are no customers defined in the system."
 msgstr ""
 
-#: sales/customer_payments.php:68
+#: sales/customer_payments.php:70
 msgid "Invalid sales invoice number."
 msgstr ""
 
-#: sales/customer_payments.php:94
+#: sales/customer_payments.php:97
 msgid "The customer payment has been successfully entered."
 msgstr ""
 
-#: sales/customer_payments.php:96 sales/customer_payments.php:113
+#: sales/customer_payments.php:99 sales/customer_payments.php:118
 msgid "&Print This Receipt"
 msgstr ""
 
-#: sales/customer_payments.php:98 sales/customer_payments.php:115
-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:102
-msgid "Select Another &Customer Transaction for Payment"
+#: sales/customer_payments.php:103 sales/customer_payments.php:126
+msgid "Enter Another &Customer Payment"
 msgstr ""
 
-#: sales/customer_payments.php:104 sales/customer_payments.php:121
-msgid "Enter Another &Customer Payment"
+#: sales/customer_payments.php:105
+msgid "Enter Payment to &Supplier"
 msgstr ""
 
-#: sales/customer_payments.php:111
+#: sales/customer_payments.php:109 sales/customer_payments.php:120
+msgid "&View the GL Journal Entries for this Customer Payment"
+msgstr ""
+
+#: sales/customer_payments.php:116
 msgid "The customer payment has been successfully updated."
 msgstr ""
 
-#: sales/customer_payments.php:119
+#: sales/customer_payments.php:124
 msgid "Select Another Customer Payment for &Edition"
 msgstr ""
 
-#: sales/customer_payments.php:134 sales/sales_order_entry.php:336
+#: sales/customer_payments.php:139 sales/sales_order_entry.php:340
 msgid "There is no customer selected."
 msgstr ""
 
-#: sales/customer_payments.php:141 sales/sales_order_entry.php:343
+#: sales/customer_payments.php:146 sales/sales_order_entry.php:347
 msgid "This customer has no branch defined."
 msgstr ""
 
-#: sales/customer_payments.php:147
+#: sales/customer_payments.php:152
 msgid "The entered date is invalid. Please enter a valid date for the payment."
 msgstr ""
 
-#: sales/customer_payments.php:177 sales/customer_payments.php:183
+#: sales/customer_payments.php:182 sales/customer_payments.php:188
 msgid "The entered amount is invalid or negative and cannot be processed."
 msgstr ""
 
-#: sales/customer_payments.php:209
+#: sales/customer_payments.php:214
 msgid "The entered discount is not a valid number."
 msgstr ""
 
-#: sales/customer_payments.php:216
+#: sales/customer_payments.php:221
 msgid ""
-"The balance of the amount and discout is zero or negative. Please enter "
+"The balance of the amount and discount is zero or negative. Please enter "
 "valid amounts."
 msgstr ""
 
-#: sales/customer_payments.php:334 sales/customer_payments.php:336
-msgid "From Customer:"
+#: sales/customer_payments.php:228
+msgid "The entered payment amount is zero or negative."
 msgstr ""
 
-#: sales/customer_payments.php:365
+#: sales/customer_payments.php:335
 msgid "Into Bank Account:"
 msgstr ""
 
-#: sales/customer_payments.php:371
+#: sales/customer_payments.php:338 sales/customer_payments.php:340
+msgid "From Customer:"
+msgstr ""
+
+#: sales/customer_payments.php:366
 msgid "Date of Deposit:"
 msgstr ""
 
+#: sales/customer_payments.php:380
+msgid "Payment Amount:"
+msgstr ""
+
 #: sales/customer_payments.php:393
 msgid "Customer prompt payment discount :"
 msgstr ""
 
-#: sales/customer_payments.php:402
-msgid "Amount and discount are in customer's currency."
+#: sales/customer_payments.php:403
+msgid "Add Payment"
 msgstr ""
 
-#: sales/customer_payments.php:407
+#: sales/customer_payments.php:405
 msgid "Update Payment"
 msgstr ""
 
-#: sales/customer_payments.php:409
-msgid "Add Payment"
-msgstr ""
-
 #: sales/sales_order_entry.php:64
 msgid "Direct Sales Delivery"
 msgstr ""
@@ -12380,201 +12466,201 @@ msgstr ""
 msgid "Enter a &New Direct Invoice"
 msgstr ""
 
-#: sales/sales_order_entry.php:365
+#: sales/sales_order_entry.php:369
 msgid ""
 "You must enter the person or company to whom delivery should be made to."
 msgstr ""
 
-#: sales/sales_order_entry.php:372
+#: sales/sales_order_entry.php:376
 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:381
+#: sales/sales_order_entry.php:385
 msgid "The shipping cost entered is expected to be numeric."
 msgstr ""
 
-#: sales/sales_order_entry.php:387
+#: sales/sales_order_entry.php:391
 msgid "The Valid date is invalid."
 msgstr ""
 
-#: sales/sales_order_entry.php:389
+#: sales/sales_order_entry.php:393
 msgid "The delivery date is invalid."
 msgstr ""
 
-#: sales/sales_order_entry.php:396
+#: sales/sales_order_entry.php:400
 msgid "The requested valid date is before the date of the quotation."
 msgstr ""
 
-#: sales/sales_order_entry.php:398
+#: sales/sales_order_entry.php:402
 msgid "The requested delivery date is before the date of the order."
 msgstr ""
 
-#: sales/sales_order_entry.php:407
+#: sales/sales_order_entry.php:411
 msgid "You need to define a cash account for your Sales Point."
 msgstr ""
 
-#: sales/sales_order_entry.php:445
+#: sales/sales_order_entry.php:449
 msgid ""
 "The reference number field has been increased. Please save the document "
 "again."
 msgstr ""
 
-#: sales/sales_order_entry.php:491
+#: sales/sales_order_entry.php:495
 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:495
+#: sales/sales_order_entry.php:499
 msgid "Price for inventory item must be entered and can not be less than 0"
 msgstr ""
 
-#: sales/sales_order_entry.php:502
+#: sales/sales_order_entry.php:506
 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:533
+#: sales/sales_order_entry.php:537
 #, php-format
 msgid "Price %s is below Standard Cost %s"
 msgstr ""
 
-#: sales/sales_order_entry.php:558
+#: sales/sales_order_entry.php:562
 msgid ""
 "This item cannot be deleted because some of it has already been delivered."
 msgstr ""
 
-#: sales/sales_order_entry.php:587
+#: sales/sales_order_entry.php:591
 msgid "Direct delivery entry has been cancelled as requested."
 msgstr ""
 
-#: sales/sales_order_entry.php:588
+#: sales/sales_order_entry.php:592
 msgid "Enter a New Sales Delivery"
 msgstr ""
 
-#: sales/sales_order_entry.php:590
+#: sales/sales_order_entry.php:594
 msgid "Direct invoice entry has been cancelled as requested."
 msgstr ""
 
-#: sales/sales_order_entry.php:591
+#: sales/sales_order_entry.php:595
 msgid "Enter a New Sales Invoice"
 msgstr ""
 
-#: sales/sales_order_entry.php:595
+#: sales/sales_order_entry.php:600
 msgid "This sales quotation has been cancelled as requested."
 msgstr ""
 
-#: sales/sales_order_entry.php:596
+#: sales/sales_order_entry.php:601
 msgid "Enter a New Sales Quotation"
 msgstr ""
 
-#: sales/sales_order_entry.php:603
+#: sales/sales_order_entry.php:608
 msgid "Undelivered part of order has been cancelled as requested."
 msgstr ""
 
-#: sales/sales_order_entry.php:604
+#: sales/sales_order_entry.php:609
 msgid "Select Another Sales Order for Edition"
 msgstr ""
 
-#: sales/sales_order_entry.php:608
+#: sales/sales_order_entry.php:613
 msgid "This sales order has been cancelled as requested."
 msgstr ""
 
-#: sales/sales_order_entry.php:609
+#: sales/sales_order_entry.php:614
 msgid "Enter a New Sales Order"
 msgstr ""
 
-#: sales/sales_order_entry.php:687
+#: sales/sales_order_entry.php:692
 msgid "Sales Invoice Items"
 msgstr ""
 
-#: sales/sales_order_entry.php:688
+#: sales/sales_order_entry.php:693
 msgid "Enter Delivery Details and Confirm Invoice"
 msgstr ""
 
-#: sales/sales_order_entry.php:690
+#: sales/sales_order_entry.php:695
 msgid "Place Invoice"
 msgstr ""
 
-#: sales/sales_order_entry.php:693
+#: sales/sales_order_entry.php:698
 msgid "Delivery Note Items"
 msgstr ""
 
-#: sales/sales_order_entry.php:694
+#: sales/sales_order_entry.php:699
 msgid "Enter Delivery Details and Confirm Dispatch"
 msgstr ""
 
-#: sales/sales_order_entry.php:695
+#: sales/sales_order_entry.php:700
 msgid "Cancel Delivery"
 msgstr ""
 
-#: sales/sales_order_entry.php:696
+#: sales/sales_order_entry.php:701
 msgid "Place Delivery"
 msgstr ""
 
-#: sales/sales_order_entry.php:698
+#: sales/sales_order_entry.php:703
 msgid "Quotation Date:"
 msgstr ""
 
-#: sales/sales_order_entry.php:699
+#: sales/sales_order_entry.php:704
 msgid "Sales Quotation Items"
 msgstr ""
 
-#: sales/sales_order_entry.php:700
+#: sales/sales_order_entry.php:705
 msgid "Enter Delivery Details and Confirm Quotation"
 msgstr ""
 
-#: sales/sales_order_entry.php:701
+#: sales/sales_order_entry.php:706
 msgid "Cancel Quotation"
 msgstr ""
 
-#: sales/sales_order_entry.php:702
+#: sales/sales_order_entry.php:707
 msgid "Place Quotation"
 msgstr ""
 
-#: sales/sales_order_entry.php:703
+#: sales/sales_order_entry.php:708
 msgid "Commit Quotations Changes"
 msgstr ""
 
-#: sales/sales_order_entry.php:706
+#: sales/sales_order_entry.php:711
 msgid "Sales Order Items"
 msgstr ""
 
-#: sales/sales_order_entry.php:707
+#: sales/sales_order_entry.php:712
 msgid "Enter Delivery Details and Confirm Order"
 msgstr ""
 
-#: sales/sales_order_entry.php:710
+#: sales/sales_order_entry.php:715
 msgid "Commit Order Changes"
 msgstr ""
 
-#: sales/sales_order_entry.php:732
-msgid "You are about to void this Document.\\nDo you want to continue?"
+#: sales/sales_order_entry.php:738 sales/sales_order_entry.php:744
+msgid ""
+"Cancels document entry or removes sales order when editing an old document"
 msgstr ""
 
-#: sales/sales_order_entry.php:735
-msgid ""
-"You are about to cancel undelivered part of this order.\\nDo you want to "
-"continue?"
+#: sales/sales_order_entry.php:739 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:737
+#: sales/sales_order_entry.php:742
 msgid "Validate changes and update document"
 msgstr ""
 
-#: sales/sales_order_entry.php:741
+#: sales/sales_order_entry.php:746
 msgid ""
-"Cancels document entry or removes sales order when editing an old document"
+"You are about to cancel undelivered part of this order.\\nDo you want to "
+"continue?"
 msgstr ""
 
 #: sales/allocations/customer_allocate.php:28
 msgid "Allocate Customer Payment or Credit Note"
 msgstr ""
 
-#: sales/allocations/customer_allocate.php:47
+#: sales/allocations/customer_allocate.php:50
 #, php-format
 msgid "Allocation of %s # %d"
 msgstr ""
@@ -12584,7 +12670,7 @@ msgid "Customer Allocations"
 msgstr ""
 
 #: sales/allocations/customer_allocation_main.php:32
-#: sales/manage/customer_branches.php:280 sales/manage/customers.php:324
+#: sales/manage/customer_branches.php:280 sales/manage/customers.php:328
 #: sales/inquiry/customer_allocation_inquiry.php:42
 #: sales/inquiry/customer_inquiry.php:48
 #: sales/inquiry/sales_orders_view.php:243
@@ -12709,11 +12795,11 @@ msgstr ""
 msgid "Branch Short Name:"
 msgstr ""
 
-#: sales/manage/customer_branches.php:241 sales/manage/customers.php:256
+#: sales/manage/customer_branches.php:241 sales/manage/customers.php:260
 msgid "Sales Person:"
 msgstr ""
 
-#: sales/manage/customer_branches.php:242 sales/manage/customers.php:293
+#: sales/manage/customer_branches.php:242 sales/manage/customers.php:297
 msgid "Sales Area:"
 msgstr ""
 
@@ -12722,11 +12808,11 @@ msgstr ""
 msgid "Sales Group:"
 msgstr ""
 
-#: sales/manage/customer_branches.php:244 sales/manage/customers.php:291
+#: sales/manage/customer_branches.php:244 sales/manage/customers.php:295
 msgid "Default Inventory Location:"
 msgstr ""
 
-#: sales/manage/customer_branches.php:245 sales/manage/customers.php:292
+#: sales/manage/customer_branches.php:245 sales/manage/customers.php:296
 msgid "Default Shipping Company:"
 msgstr ""
 
@@ -12802,121 +12888,121 @@ msgstr ""
 msgid "Customer has been updated."
 msgstr ""
 
-#: sales/manage/customers.php:127
+#: sales/manage/customers.php:130
 msgid "A new customer has been added."
 msgstr ""
 
-#: sales/manage/customers.php:130
+#: sales/manage/customers.php:133
 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
 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
 msgid ""
 "Cannot delete the customer record because orders have been created against "
 "it."
 msgstr ""
 
-#: sales/manage/customers.php:167
+#: sales/manage/customers.php:170
 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
 msgid "Selected customer has been deleted."
 msgstr ""
 
-#: sales/manage/customers.php:227
+#: sales/manage/customers.php:230
 msgid "Name and Address"
 msgstr ""
 
-#: sales/manage/customers.php:229
+#: sales/manage/customers.php:232
 msgid "Customer Name:"
 msgstr ""
 
-#: sales/manage/customers.php:230
+#: sales/manage/customers.php:233
 msgid "Customer Short Name:"
 msgstr ""
 
-#: sales/manage/customers.php:238 sales/manage/customers.php:242
+#: sales/manage/customers.php:242 sales/manage/customers.php:246
 msgid "Customer's Currency:"
 msgstr ""
 
-#: sales/manage/customers.php:245
+#: sales/manage/customers.php:249
 msgid "Sales Type/Price List:"
 msgstr ""
 
-#: sales/manage/customers.php:248
+#: sales/manage/customers.php:252
 msgid "Customer status:"
 msgstr ""
 
-#: sales/manage/customers.php:262
+#: sales/manage/customers.php:266
 msgid "Discount Percent:"
 msgstr ""
 
-#: sales/manage/customers.php:263
+#: sales/manage/customers.php:267
 msgid "Prompt Payment Discount Percent:"
 msgstr ""
 
-#: sales/manage/customers.php:267
+#: sales/manage/customers.php:271
 msgid "Credit Status:"
 msgstr ""
 
-#: sales/manage/customers.php:280
+#: sales/manage/customers.php:284
 msgid "Customer branches"
 msgstr ""
 
-#: sales/manage/customers.php:282
+#: sales/manage/customers.php:286
 msgid "Select or &Add"
 msgstr ""
 
-#: sales/manage/customers.php:282
+#: sales/manage/customers.php:286
 msgid "&Add or Edit "
 msgstr ""
 
-#: sales/manage/customers.php:301
+#: sales/manage/customers.php:305
 msgid "Add New Customer"
 msgstr ""
 
-#: sales/manage/customers.php:305
+#: sales/manage/customers.php:309
 msgid "Update Customer"
 msgstr ""
 
-#: sales/manage/customers.php:306
+#: sales/manage/customers.php:310
 msgid "Update customer data"
 msgstr ""
 
-#: sales/manage/customers.php:307
+#: sales/manage/customers.php:311
 msgid "Select this customer and return to document entry."
 msgstr ""
 
-#: sales/manage/customers.php:308
+#: sales/manage/customers.php:312
 msgid "Delete Customer"
 msgstr ""
 
-#: sales/manage/customers.php:309
+#: sales/manage/customers.php:313
 msgid "Delete customer data if have been never used"
 msgstr ""
 
-#: sales/manage/customers.php:316
+#: sales/manage/customers.php:320
 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:329
 msgid "New customer"
 msgstr ""
 
-#: sales/manage/customers.php:347
+#: sales/manage/customers.php:351
 msgid "Sales &Orders"
 msgstr ""
 
@@ -13276,12 +13362,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
@@ -13358,12 +13452,12 @@ msgstr ""
 msgid "CUSTOMER ACCOUNT IS ON HOLD"
 msgstr ""
 
-#: sales/inquiry/customer_inquiry.php:205
+#: sales/inquiry/customer_inquiry.php:198
 msgid "Print Receipt"
 msgstr ""
 
-#: sales/inquiry/customer_inquiry.php:235
-#: sales/inquiry/customer_inquiry.php:248
+#: sales/inquiry/customer_inquiry.php:228
+#: sales/inquiry/customer_inquiry.php:241
 msgid "RB"
 msgstr ""
 
@@ -13468,7 +13562,7 @@ msgstr ""
 msgid "Tmpl"
 msgstr ""
 
-#: sales/includes/cart_class.inc:377
+#: sales/includes/cart_class.inc:378
 msgid "You have to enter valid stock code or nonempty description"
 msgstr ""
 
@@ -13478,7 +13572,7 @@ msgid ""
 "browser tab. You cannot edit more than one sales document at once."
 msgstr ""
 
-#: sales/includes/db/custalloc_db.inc:292
+#: sales/includes/db/custalloc_db.inc:303
 msgid ""
 "Unsuspected overallocation happened due to sparse credit notes exists for "
 "this invoice.\n"
@@ -13486,41 +13580,26 @@ msgid ""
 "charges."
 msgstr ""
 
-#: sales/includes/db/sales_invoice_db.inc:174
+#: sales/includes/db/sales_invoice_db.inc:176
 msgid "Cash invoice"
 msgstr ""
 
-#: sales/includes/db/sales_order_db.inc:107
-#: sales/includes/db/sales_order_db.inc:259
-msgid "Stocks below Re-Order Level at "
-msgstr ""
-
-#: sales/includes/db/sales_order_db.inc:110
-#: sales/includes/db/sales_order_db.inc:264
-msgid "Below"
-msgstr ""
-
-#: sales/includes/db/sales_order_db.inc:111
-#: sales/includes/db/sales_order_db.inc:265
-msgid "Please reorder"
-msgstr ""
-
-#: sales/includes/db/sales_order_db.inc:139
+#: sales/includes/db/sales_order_db.inc:101
 msgid "Deleted."
 msgstr ""
 
 #: sales/includes/ui/sales_credit_ui.inc:94
-#: sales/includes/ui/sales_order_ui.inc:385
+#: sales/includes/ui/sales_order_ui.inc:384
 msgid "Customer Currency:"
 msgstr ""
 
 #: sales/includes/ui/sales_credit_ui.inc:112
-#: sales/includes/ui/sales_order_ui.inc:645
+#: sales/includes/ui/sales_order_ui.inc:644
 msgid "Shipping Company:"
 msgstr ""
 
 #: sales/includes/ui/sales_credit_ui.inc:114
-#: sales/includes/ui/sales_order_ui.inc:392
+#: sales/includes/ui/sales_order_ui.inc:391
 msgid "Customer Discount:"
 msgstr ""
 
@@ -13547,85 +13626,85 @@ msgstr ""
 msgid "Customer's payment terms '%s' cannot be selected on this POS"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:379
+#: sales/includes/ui/sales_order_ui.inc:378
 msgid "Reference number unique for this document type"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:419
-#: sales/includes/ui/sales_order_ui.inc:421
+#: sales/includes/ui/sales_order_ui.inc:418
+#: sales/includes/ui/sales_order_ui.inc:420
 msgid "Price List:"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:438
+#: sales/includes/ui/sales_order_ui.inc:437
 msgid "Date of order receive"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:588
+#: sales/includes/ui/sales_order_ui.inc:587
 msgid "Cash payment"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:591
-#: sales/includes/ui/sales_order_ui.inc:623
+#: sales/includes/ui/sales_order_ui.inc:590
+#: sales/includes/ui/sales_order_ui.inc:622
 msgid "Deliver from Location:"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:594
+#: sales/includes/ui/sales_order_ui.inc:593
 msgid "Cash account:"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:601
+#: sales/includes/ui/sales_order_ui.inc:600
 msgid "Delivery Details"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:606
+#: sales/includes/ui/sales_order_ui.inc:605
 msgid "Invoice Delivery Details"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:607
+#: sales/includes/ui/sales_order_ui.inc:606
 msgid "Invoice before"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:611
+#: sales/includes/ui/sales_order_ui.inc:610
 msgid "Quotation Delivery Details"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:616
+#: sales/includes/ui/sales_order_ui.inc:615
 msgid "Order Delivery Details"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:629
+#: sales/includes/ui/sales_order_ui.inc:628
 msgid "Enter requested day of delivery"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:630
+#: sales/includes/ui/sales_order_ui.inc:629
 msgid "Enter Valid until Date"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:631
+#: sales/includes/ui/sales_order_ui.inc:630
 msgid "Deliver To:"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:632
+#: sales/includes/ui/sales_order_ui.inc:631
 msgid "Additional identifier for delivery e.g. name of receiving person"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:635
+#: sales/includes/ui/sales_order_ui.inc:634
 msgid "Delivery address. Default is address of customer branch"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:639
+#: sales/includes/ui/sales_order_ui.inc:638
 msgid "Contact Phone Number:"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:640
+#: sales/includes/ui/sales_order_ui.inc:639
 msgid "Phone number of ordering person. Defaults to branch phone number"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:641
+#: sales/includes/ui/sales_order_ui.inc:640
 msgid "Customer Reference:"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:642
+#: sales/includes/ui/sales_order_ui.inc:641
 msgid "Customer reference number for this order (if any)"
 msgstr ""