From: Janusz Dobrowolski <janusz@frontaccouting.eu>
Date: Fri, 23 Nov 2012 09:29:12 +0000 (+0100)
Subject: Added back links to allocation inquiries on final page of customer/supplier payment.
X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=commitdiff_plain;h=ed545f3d89547be00e0f216aa8217cf786a8a772;p=textcart.git

Added back links to allocation inquiries on final page of customer/supplier payment.
---

diff --git a/lang/new_language_template/LC_MESSAGES/empty.po b/lang/new_language_template/LC_MESSAGES/empty.po
index b223521..7014304 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: 2012-11-04 10:39+0100\n"
+"POT-Creation-Date: 2012-11-23 10:28+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -160,7 +160,7 @@ msgstr ""
 #: sales/inquiry/sales_orders_view.php:128
 #: sales/inquiry/sales_orders_view.php.orig:126
 #: sales/includes/ui/sales_credit_ui.inc:197
-#: sales/includes/ui/sales_order_ui.inc:206 taxes/item_tax_types.php:139
+#: sales/includes/ui/sales_order_ui.inc:207 taxes/item_tax_types.php:139
 #: taxes/tax_groups.php:142 taxes/tax_types.php:132
 msgid "Edit"
 msgstr ""
@@ -203,7 +203,7 @@ msgstr ""
 #: sales/manage/sales_groups.php:100 sales/manage/sales_people.php:120
 #: sales/manage/sales_points.php:100 sales/manage/sales_types.php:122
 #: sales/includes/ui/sales_credit_ui.inc:199
-#: sales/includes/ui/sales_order_ui.inc:208 taxes/item_tax_types.php:140
+#: sales/includes/ui/sales_order_ui.inc:209 taxes/item_tax_types.php:140
 #: taxes/tax_groups.php:143 taxes/tax_types.php:133
 msgid "Delete"
 msgstr ""
@@ -248,7 +248,7 @@ msgstr ""
 #: admin/payment_terms.php:127 admin/printers.php:84
 #: admin/print_profiles.php:148 gl/inquiry/tax_inquiry.php:82
 #: gl/manage/gl_quick_entries.php:186 gl/manage/gl_quick_entries.php:224
-#: includes/ui/view_package.php:22 inventory/manage/item_codes.php:125
+#: includes/ui/view_package.php:32 inventory/manage/item_codes.php:125
 #: inventory/manage/item_units.php:94 inventory/manage/movement_types.php:95
 #: inventory/manage/sales_kits.php:40 inventory/view/view_adjustment.php:56
 #: inventory/view/view_transfer.php:56 manufacturing/manage/bom_edit.php:70
@@ -365,8 +365,8 @@ msgstr ""
 msgid "Create backup"
 msgstr ""
 
-#: admin/backups.php:181 sales/includes/ui/sales_order_ui.inc:593
-#: sales/includes/ui/sales_order_ui.inc:641
+#: admin/backups.php:181 sales/includes/ui/sales_order_ui.inc:594
+#: sales/includes/ui/sales_order_ui.inc:642
 msgid "Comments:"
 msgstr ""
 
@@ -500,7 +500,7 @@ msgstr ""
 #: admin/company_preferences.php:160 admin/shipping_companies.php:142
 #: includes/ui/contacts_view.inc:109 inventory/manage/locations.php:202
 #: sales/manage/customers.php:231 sales/manage/customers.php.orig:228
-#: sales/includes/ui/sales_order_ui.inc:632
+#: sales/includes/ui/sales_order_ui.inc:633
 msgid "Address:"
 msgstr ""
 
@@ -621,7 +621,7 @@ msgid "Version Id"
 msgstr ""
 
 #: admin/company_preferences.php:201 admin/display_prefs.php:143
-#: admin/forms_setup.php:61 admin/gl_setup.php:221 admin/inst_chart.php:74
+#: admin/forms_setup.php:61 admin/gl_setup.php:226 admin/inst_chart.php:74
 #: admin/inst_lang.php:103 admin/inst_lang.php.orig:103
 #: admin/inst_module.php:138 admin/inst_module.php:156
 #: admin/inst_module.php:199 admin/inst_theme.php:96
@@ -643,8 +643,8 @@ msgstr ""
 #: sales/customer_invoice.php:582 sales/inquiry/sales_orders_view.php:323
 #: sales/inquiry/sales_orders_view.php.orig:321
 #: sales/includes/ui/sales_credit_ui.inc:293
-#: sales/includes/ui/sales_order_ui.inc:241
-#: sales/includes/ui/sales_order_ui.inc:559
+#: sales/includes/ui/sales_order_ui.inc:242
+#: sales/includes/ui/sales_order_ui.inc:560
 msgid "Update"
 msgstr ""
 
@@ -1130,167 +1130,174 @@ msgstr ""
 msgid "Before GRN Clearing Account can be changed all GRNs have to be invoiced"
 msgstr ""
 
-#: admin/gl_setup.php:75
+#: admin/gl_setup.php:59 admin/db/fiscalyears_db.inc:141
+msgid ""
+"The Retained Earnings Account should be a Balance Account or the Profit and "
+"Loss Year Account should be an Expense Account (preferred the last one in "
+"the Expense Class)"
+msgstr ""
+
+#: admin/gl_setup.php:80
 msgid "The general GL setup has been updated."
 msgstr ""
 
-#: admin/gl_setup.php:132
+#: admin/gl_setup.php:137
 msgid "General GL"
 msgstr ""
 
-#: admin/gl_setup.php:134
+#: admin/gl_setup.php:139
 msgid "Past Due Days Interval:"
 msgstr ""
 
-#: admin/gl_setup.php:134 admin/gl_setup.php:169 admin/gl_setup.php:177
-#: admin/gl_setup.php:214 admin/payment_terms.php:140
+#: admin/gl_setup.php:139 admin/gl_setup.php:174 admin/gl_setup.php:182
+#: admin/gl_setup.php:219 admin/payment_terms.php:140
 msgid "days"
 msgstr ""
 
-#: admin/gl_setup.php:136
+#: admin/gl_setup.php:141
 msgid "Retained Earnings:"
 msgstr ""
 
-#: admin/gl_setup.php:138
+#: admin/gl_setup.php:143
 msgid "Profit/Loss Year:"
 msgstr ""
 
-#: admin/gl_setup.php:140
+#: admin/gl_setup.php:145
 msgid "Exchange Variances Account:"
 msgstr ""
 
-#: admin/gl_setup.php:142
+#: admin/gl_setup.php:147
 msgid "Bank Charges Account:"
 msgstr ""
 
-#: admin/gl_setup.php:146
+#: admin/gl_setup.php:151
 msgid "Customers and Sales"
 msgstr ""
 
-#: admin/gl_setup.php:148
+#: admin/gl_setup.php:153
 msgid "Default Credit Limit:"
 msgstr ""
 
-#: admin/gl_setup.php:150
+#: admin/gl_setup.php:155
 msgid "Accumulate batch shipping:"
 msgstr ""
 
-#: admin/gl_setup.php:152
+#: admin/gl_setup.php:157
 msgid "Legal Text on Invoice:"
 msgstr ""
 
-#: admin/gl_setup.php:154
+#: admin/gl_setup.php:159
 msgid "Shipping Charged Account:"
 msgstr ""
 
-#: admin/gl_setup.php:158
+#: admin/gl_setup.php:163
 msgid "Customers and Sales Defaults"
 msgstr ""
 
-#: admin/gl_setup.php:160
+#: admin/gl_setup.php:165
 msgid "Receivable Account:"
 msgstr ""
 
-#: admin/gl_setup.php:162 admin/gl_setup.php:200
+#: admin/gl_setup.php:167 admin/gl_setup.php:205
 #: inventory/manage/item_categories.php:192 inventory/manage/items.php:354
 #: sales/manage/customer_branches.php:250
 msgid "Sales Account:"
 msgstr ""
 
-#: admin/gl_setup.php:165 sales/manage/customer_branches.php:251
+#: admin/gl_setup.php:170 sales/manage/customer_branches.php:251
 msgid "Sales Discount Account:"
 msgstr ""
 
-#: admin/gl_setup.php:167 sales/manage/customer_branches.php:253
+#: admin/gl_setup.php:172 sales/manage/customer_branches.php:253
 msgid "Prompt Payment Discount Account:"
 msgstr ""
 
-#: admin/gl_setup.php:169
+#: admin/gl_setup.php:174
 msgid "Delivery Required By:"
 msgstr ""
 
-#: admin/gl_setup.php:175
+#: admin/gl_setup.php:180
 msgid "Dimension Defaults"
 msgstr ""
 
-#: admin/gl_setup.php:177
+#: admin/gl_setup.php:182
 msgid "Dimension Required By After:"
 msgstr ""
 
-#: admin/gl_setup.php:180
+#: admin/gl_setup.php:185
 msgid "Suppliers and Purchasing"
 msgstr ""
 
-#: admin/gl_setup.php:182
+#: admin/gl_setup.php:187
 msgid "Delivery Over-Receive Allowance:"
 msgstr ""
 
-#: admin/gl_setup.php:184
+#: admin/gl_setup.php:189
 msgid "Invoice Over-Charge Allowance:"
 msgstr ""
 
-#: admin/gl_setup.php:186
+#: admin/gl_setup.php:191
 msgid "Suppliers and Purchasing Defaults"
 msgstr ""
 
-#: admin/gl_setup.php:188
+#: admin/gl_setup.php:193
 msgid "Payable Account:"
 msgstr ""
 
-#: admin/gl_setup.php:190 purchasing/manage/suppliers.php:126
+#: admin/gl_setup.php:195 purchasing/manage/suppliers.php:126
 msgid "Purchase Discount Account:"
 msgstr ""
 
-#: admin/gl_setup.php:192
+#: admin/gl_setup.php:197
 msgid "GRN Clearing Account:"
 msgstr ""
 
-#: admin/gl_setup.php:192
+#: admin/gl_setup.php:197
 msgid "No postings on GRN"
 msgstr ""
 
-#: admin/gl_setup.php:194 reporting/reports_main.php:175
+#: admin/gl_setup.php:199 reporting/reports_main.php:175
 msgid "Inventory"
 msgstr ""
 
-#: admin/gl_setup.php:196
+#: admin/gl_setup.php:201
 msgid "Allow Negative Inventory:"
 msgstr ""
 
-#: admin/gl_setup.php:197
+#: admin/gl_setup.php:202
 msgid "Warning:  This may cause a delay in GL postings"
 msgstr ""
 
-#: admin/gl_setup.php:199
+#: admin/gl_setup.php:204
 msgid "Items Defaults"
 msgstr ""
 
-#: admin/gl_setup.php:202 inventory/manage/item_categories.php:202
+#: admin/gl_setup.php:207 inventory/manage/item_categories.php:202
 #: inventory/manage/items.php:358
 msgid "Inventory Account:"
 msgstr ""
 
-#: admin/gl_setup.php:204 inventory/manage/item_categories.php:196
+#: admin/gl_setup.php:209 inventory/manage/item_categories.php:196
 #: inventory/manage/item_categories.php:204 inventory/manage/items.php:359
 #: inventory/manage/items.php:364
 msgid "C.O.G.S. Account:"
 msgstr ""
 
-#: admin/gl_setup.php:206 inventory/manage/item_categories.php:205
+#: admin/gl_setup.php:211 inventory/manage/item_categories.php:205
 #: inventory/manage/items.php:360
 msgid "Inventory Adjustments Account:"
 msgstr ""
 
-#: admin/gl_setup.php:208 inventory/manage/item_categories.php:209
+#: admin/gl_setup.php:213 inventory/manage/item_categories.php:209
 #: inventory/manage/items.php:371
 msgid "Item Assembly Costs Account:"
 msgstr ""
 
-#: admin/gl_setup.php:212
+#: admin/gl_setup.php:217
 msgid "Manufacturing Defaults"
 msgstr ""
 
-#: admin/gl_setup.php:214
+#: admin/gl_setup.php:219
 msgid "Work Order Required By After:"
 msgstr ""
 
@@ -1867,7 +1874,7 @@ msgstr ""
 #: manufacturing/includes/work_order_issue_ui.inc:133
 #: purchasing/includes/ui/po_ui.inc:444
 #: sales/includes/ui/sales_credit_ui.inc:295
-#: sales/includes/ui/sales_order_ui.inc:561
+#: sales/includes/ui/sales_order_ui.inc:562
 msgid "Cancel"
 msgstr ""
 
@@ -2170,7 +2177,7 @@ msgstr ""
 #: 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:377
+#: sales/includes/ui/sales_order_ui.inc:378
 msgid "Reference"
 msgstr ""
 
@@ -2247,8 +2254,7 @@ msgstr ""
 #: manufacturing/work_order_entry.php:451
 #: manufacturing/work_order_release.php:100
 #: purchasing/includes/ui/invoice_ui.inc:161 purchasing/po_entry_items.php:522
-#: purchasing/supplier_payment.php:316 sales/customer_payments.php:414
-#: sales/customer_payments.php.orig:413
+#: purchasing/supplier_payment.php:317 sales/customer_payments.php:418
 msgid "Memo:"
 msgstr ""
 
@@ -2279,9 +2285,8 @@ 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:174 sales/customer_credit_invoice.php:91
-#: sales/sales_order_entry.php:349 sales/sales_order_entry.php.orig:349
-#: sales/manage/recurrent_invoices.php:41
+#: purchasing/supplier_payment.php:175 sales/customer_credit_invoice.php:91
+#: sales/sales_order_entry.php:349 sales/manage/recurrent_invoices.php:41
 #: sales/manage/recurrent_invoices.php:46
 #: sales/manage/recurrent_invoices.php:51
 msgid "The entered date is invalid."
@@ -2294,10 +2299,9 @@ msgstr ""
 #: 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:180
+#: purchasing/supplier_invoice.php:174 purchasing/supplier_payment.php:181
 #: sales/create_recurrent_invoices.php:119 sales/credit_note_entry.php:157
-#: sales/customer_credit_invoice.php:95 sales/customer_payments.php:145
-#: sales/customer_payments.php.orig:145
+#: sales/customer_credit_invoice.php:95 sales/customer_payments.php:149
 msgid "The entered date is not in fiscal year."
 msgstr ""
 
@@ -2319,25 +2323,25 @@ msgstr ""
 msgid "SQL script execution failed in line %d: %s"
 msgstr ""
 
-#: admin/db/current_user.inc:96 includes/current_user.inc:89
+#: admin/db/current_user.inc:96 includes/current_user.inc:90
 #: includes/ldap.current_user.inc:96
 msgid ""
 "Before software upgrade you have to include old $security_groups and "
 "$security_headings arrays from old config.php file to the new one."
 msgstr ""
 
-#: admin/db/current_user.inc:97 includes/current_user.inc:90
+#: admin/db/current_user.inc:97 includes/current_user.inc:91
 #: includes/ldap.current_user.inc:97 includes/ui/ui_controls.inc:190
 #: includes/ui/ui_view.inc:844
 msgid "Back"
 msgstr ""
 
-#: admin/db/current_user.inc:107 includes/current_user.inc:100
+#: admin/db/current_user.inc:107 includes/current_user.inc:101
 #: includes/ldap.current_user.inc:107
 msgid "System is available for site admin only until full database upgrade"
 msgstr ""
 
-#: admin/db/current_user.inc:445 includes/current_user.inc:520
+#: admin/db/current_user.inc:445 includes/current_user.inc:521
 #: includes/ldap.current_user.inc:544
 msgid "Requesting data..."
 msgstr ""
@@ -2348,13 +2352,6 @@ msgid ""
 "been set in System and General GL Setup"
 msgstr ""
 
-#: admin/db/fiscalyears_db.inc:141
-msgid ""
-"The Retained Earnings Account should be a Balance Account or the Profit and "
-"Loss Year Account should be an Expense Account (preferred the last one in "
-"the Expense Class)"
-msgstr ""
-
 #: admin/db/fiscalyears_db.inc:166 admin/db/fiscalyears_db.inc:168
 msgid "Closing Year"
 msgstr ""
@@ -2395,60 +2392,60 @@ msgstr ""
 msgid "The language files folder "
 msgstr ""
 
-#: admin/db/session.inc:133 includes/session.inc:133
+#: admin/db/session.inc:133 includes/session.inc:132
 #: includes/session.inc.ldap.inc:39
 msgid "Incorrect Password"
 msgstr ""
 
-#: admin/db/session.inc:134 includes/session.inc:134
+#: admin/db/session.inc:134 includes/session.inc:133
 #: includes/session.inc.ldap.inc:40
 msgid "The user and password combination is not valid for the system."
 msgstr ""
 
-#: admin/db/session.inc:136 includes/session.inc:136
+#: admin/db/session.inc:136 includes/session.inc:135
 #: includes/session.inc.ldap.inc:42
 msgid ""
 "If you are not an authorized user, please contact your system administrator "
 "to obtain an account to enable you to use the system."
 msgstr ""
 
-#: admin/db/session.inc:137 includes/session.inc:137
+#: admin/db/session.inc:137 includes/session.inc:136
 #: includes/session.inc.ldap.inc:43
 msgid "Try again"
 msgstr ""
 
-#: admin/db/session.inc:156 includes/session.inc:216
+#: admin/db/session.inc:156 includes/session.inc:207
 #: includes/session.inc.ldap.inc:62
 msgid "Security settings have not been defined for your user account."
 msgstr ""
 
-#: admin/db/session.inc:157 includes/session.inc:217
+#: admin/db/session.inc:157 includes/session.inc:208
 #: includes/session.inc.ldap.inc:63
 msgid "Please contact your system administrator."
 msgstr ""
 
-#: admin/db/session.inc:158 includes/session.inc:218
+#: admin/db/session.inc:158 includes/session.inc:209
 #: includes/session.inc.ldap.inc:64
 msgid ""
 "Please remove $security_groups and $security_headings arrays from config.php "
 "file!"
 msgstr ""
 
-#: admin/db/session.inc:160 includes/session.inc:220
+#: admin/db/session.inc:160 includes/session.inc:211
 #: includes/session.inc.ldap.inc:66
 msgid ""
 "Access to application has been blocked until database upgrade is completed "
 "by system administrator."
 msgstr ""
 
-#: admin/db/session.inc:174 includes/session.inc:234
+#: admin/db/session.inc:174 includes/session.inc:225
 #: includes/session.inc.ldap.inc:80
 msgid ""
 "The security settings on your account do not permit you to access this "
 "function"
 msgstr ""
 
-#: admin/db/session.inc:183 includes/session.inc:243
+#: admin/db/session.inc:183 includes/session.inc:234
 #: includes/session.inc.ldap.inc:89
 msgid ""
 "System is blocked after source upgrade until database is updated on System/"
@@ -2799,7 +2796,6 @@ msgid "&Manufacturing"
 msgstr ""
 
 #: applications/manufacturing.php:19 sales/sales_order_entry.php:120
-#: sales/sales_order_entry.php.orig:120
 msgid "Work &Order Entry"
 msgstr ""
 
@@ -3039,14 +3035,12 @@ msgstr ""
 #: 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:203
+#: purchasing/supplier_invoice.php:154 purchasing/supplier_payment.php:204
 #: sales/create_recurrent_invoices.php:55 sales/credit_note_entry.php:181
 #: sales/customer_credit_invoice.php:205 sales/customer_delivery.php:312
-#: sales/customer_invoice.php:319 sales/customer_payments.php:158
-#: sales/customer_payments.php:165 sales/customer_payments.php:248
-#: sales/customer_payments.php.orig:158 sales/customer_payments.php.orig:165
-#: sales/customer_payments.php.orig:248 sales/sales_order_entry.php:441
-#: sales/sales_order_entry.php.orig:441
+#: sales/customer_invoice.php:319 sales/customer_payments.php:162
+#: sales/customer_payments.php:169 sales/customer_payments.php:252
+#: sales/sales_order_entry.php:441
 msgid "The entered reference is already in use."
 msgstr ""
 
@@ -3227,8 +3221,7 @@ msgstr ""
 #: manufacturing/includes/work_order_issue_ui.inc:156
 #: purchasing/includes/ui/invoice_ui.inc:92
 #: purchasing/includes/ui/po_ui.inc:159 purchasing/includes/ui/po_ui.inc:164
-#: purchasing/supplier_payment.php:289 sales/customer_payments.php:383
-#: sales/customer_payments.php.orig:382
+#: purchasing/supplier_payment.php:290 sales/customer_payments.php:387
 msgid "Reference:"
 msgstr ""
 
@@ -3299,7 +3292,7 @@ msgstr ""
 #: sales/inquiry/customer_allocation_inquiry.php:149
 #: sales/inquiry/customer_inquiry.php:229
 #: sales/inquiry/customer_inquiry.php.orig:229
-#: sales/includes/ui/sales_order_ui.inc:600
+#: sales/includes/ui/sales_order_ui.inc:601
 msgid "Due Date"
 msgstr ""
 
@@ -3415,8 +3408,8 @@ msgstr ""
 #: sales/manage/customers.php.orig:268
 #: sales/includes/ui/sales_credit_ui.inc:132
 #: sales/includes/ui/sales_credit_ui.inc:137
-#: sales/includes/ui/sales_order_ui.inc:455
-#: sales/includes/ui/sales_order_ui.inc:460
+#: sales/includes/ui/sales_order_ui.inc:456
+#: sales/includes/ui/sales_order_ui.inc:461
 msgid "Dimension"
 msgstr ""
 
@@ -3542,7 +3535,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.orig:39
+#: sales/customer_payments.php:39
 msgid "There are no bank accounts defined in the system."
 msgstr ""
 
@@ -3636,13 +3629,12 @@ msgid "Transfer Date:"
 msgstr ""
 
 #: gl/bank_transfer.php:87 gl/bank_transfer.php:94
-#: sales/customer_payments.php:412 sales/customer_payments.php.orig:411
+#: sales/customer_payments.php:416
 msgid "Amount:"
 msgstr ""
 
 #: gl/bank_transfer.php:88 gl/bank_transfer.php:95
-#: purchasing/supplier_payment.php:302 sales/customer_payments.php:397
-#: sales/customer_payments.php.orig:396
+#: purchasing/supplier_payment.php:303 sales/customer_payments.php:401
 msgid "Bank Charge:"
 msgstr ""
 
@@ -3651,7 +3643,7 @@ msgid "Enter Transfer"
 msgstr ""
 
 #: gl/bank_transfer.php:128 gl/bank_transfer.php:158
-#: purchasing/supplier_payment.php:125 purchasing/supplier_payment.php:131
+#: purchasing/supplier_payment.php:126 purchasing/supplier_payment.php:132
 msgid "The entered amount is invalid or less than zero."
 msgstr ""
 
@@ -3671,8 +3663,8 @@ msgid ""
 "for transaction: %s #%s on %s."
 msgstr ""
 
-#: gl/bank_transfer.php:163 purchasing/supplier_payment.php:139
-#: sales/customer_payments.php:184 sales/customer_payments.php.orig:184
+#: gl/bank_transfer.php:163 purchasing/supplier_payment.php:140
+#: sales/customer_payments.php:188
 msgid ""
 "The Bank Charge Account has not been set in System and General GL Setup."
 msgstr ""
@@ -3682,11 +3674,10 @@ msgstr ""
 #: 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:196 sales/credit_note_entry.php:147
+#: purchasing/supplier_payment.php:197 sales/credit_note_entry.php:147
 #: sales/customer_credit_invoice.php:102 sales/customer_delivery.php:166
-#: sales/customer_invoice.php:280 sales/customer_payments.php:151
-#: sales/customer_payments.php.orig:151 sales/sales_order_entry.php:412
-#: sales/sales_order_entry.php.orig:412
+#: sales/customer_invoice.php:280 sales/customer_payments.php:155
+#: sales/sales_order_entry.php:412
 msgid "You must enter a reference."
 msgstr ""
 
@@ -3732,7 +3723,7 @@ msgstr ""
 #: 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 sales/sales_order_entry.php.orig:234
+#: sales/sales_order_entry.php:234
 msgid "Add an Attachment"
 msgstr ""
 
@@ -3769,7 +3760,7 @@ msgstr ""
 msgid "You must enter at least one payment line."
 msgstr ""
 
-#: gl/gl_bank.php:236 purchasing/supplier_payment.php:189
+#: gl/gl_bank.php:236 purchasing/supplier_payment.php:190
 #, php-format
 msgid "The total bank amount exceeds allowed limit (%s)."
 msgstr ""
@@ -5039,20 +5030,19 @@ msgstr ""
 #: gl/includes/ui/gl_bank_ui.inc:66 gl/includes/ui/gl_bank_ui.inc.orig:65
 #: sales/manage/recurrent_invoices.php:169
 #: sales/includes/ui/sales_credit_ui.inc:29
-#: sales/includes/ui/sales_order_ui.inc:282
+#: sales/includes/ui/sales_order_ui.inc:283
 msgid "Customer:"
 msgstr ""
 
 #: gl/includes/ui/gl_bank_ui.inc:70 gl/includes/ui/gl_bank_ui.inc.orig:69
-#: sales/customer_payments.php:363 sales/customer_payments.php.orig:362
-#: sales/manage/recurrent_invoices.php:172
+#: sales/customer_payments.php:367 sales/manage/recurrent_invoices.php:172
 #: sales/includes/ui/sales_credit_ui.inc:37
-#: sales/includes/ui/sales_order_ui.inc:289
+#: sales/includes/ui/sales_order_ui.inc:290
 msgid "Branch:"
 msgstr ""
 
 #: gl/includes/ui/gl_bank_ui.inc:84 gl/includes/ui/gl_bank_ui.inc:87
-#: sales/customer_payments.php:372 sales/customer_payments.php.orig:371
+#: sales/customer_payments.php:376
 msgid "This customer account is on hold."
 msgstr ""
 
@@ -5070,7 +5060,7 @@ msgstr ""
 #: purchasing/includes/ui/invoice_ui.inc:520
 #: purchasing/includes/ui/po_ui.inc:267
 #: sales/includes/ui/sales_credit_ui.inc:198
-#: sales/includes/ui/sales_order_ui.inc:207
+#: sales/includes/ui/sales_order_ui.inc:208
 msgid "Edit document line"
 msgstr ""
 
@@ -5082,7 +5072,7 @@ msgstr ""
 #: purchasing/includes/ui/invoice_ui.inc:285
 #: purchasing/includes/ui/po_ui.inc:269
 #: sales/includes/ui/sales_credit_ui.inc:200
-#: sales/includes/ui/sales_order_ui.inc:209
+#: sales/includes/ui/sales_order_ui.inc:210
 msgid "Remove line from document"
 msgstr ""
 
@@ -5093,7 +5083,7 @@ msgstr ""
 #: manufacturing/includes/work_order_issue_ui.inc:132
 #: purchasing/includes/ui/po_ui.inc:443
 #: sales/includes/ui/sales_credit_ui.inc:294
-#: sales/includes/ui/sales_order_ui.inc:560
+#: sales/includes/ui/sales_order_ui.inc:561
 msgid "Confirm changes"
 msgstr ""
 
@@ -5104,7 +5094,7 @@ msgstr ""
 #: manufacturing/includes/work_order_issue_ui.inc:134
 #: purchasing/includes/ui/po_ui.inc:445
 #: sales/includes/ui/sales_credit_ui.inc:296
-#: sales/includes/ui/sales_order_ui.inc:562
+#: sales/includes/ui/sales_order_ui.inc:563
 msgid "Cancel changes"
 msgstr ""
 
@@ -5115,7 +5105,7 @@ msgstr ""
 #: manufacturing/includes/work_order_issue_ui.inc:140
 #: purchasing/includes/ui/po_ui.inc:451
 #: sales/includes/ui/sales_credit_ui.inc:302
-#: sales/includes/ui/sales_order_ui.inc:568
+#: sales/includes/ui/sales_order_ui.inc:569
 msgid "Add Item"
 msgstr ""
 
@@ -5125,7 +5115,7 @@ msgstr ""
 #: manufacturing/includes/work_order_issue_ui.inc:141
 #: purchasing/includes/ui/po_ui.inc:452
 #: sales/includes/ui/sales_credit_ui.inc:303
-#: sales/includes/ui/sales_order_ui.inc:569
+#: sales/includes/ui/sales_order_ui.inc:570
 msgid "Add new item to document"
 msgstr ""
 
@@ -5771,7 +5761,7 @@ msgstr ""
 msgid "Package '%s' not found."
 msgstr ""
 
-#: includes/session.inc:185
+#: includes/session.inc:176
 #, php-format
 msgid ""
 "Brute force attack on account '%s' detected. Access for non-logged users "
@@ -5855,7 +5845,6 @@ msgid "Sales Order"
 msgstr ""
 
 #: includes/sysnames.inc:41 sales/sales_order_entry.php:629
-#: sales/sales_order_entry.php.orig:629
 msgid "Sales Quotation"
 msgstr ""
 
@@ -6420,7 +6409,7 @@ msgstr ""
 msgid "Test type"
 msgstr ""
 
-#: includes/system_tests.inc:420 includes/ui/view_package.php:37
+#: includes/system_tests.inc:420 includes/ui/view_package.php:47
 #: reporting/rep204.php:83 reporting/rep301.php:103
 msgid "Value"
 msgstr ""
@@ -7026,61 +7015,61 @@ msgstr ""
 msgid "W"
 msgstr ""
 
-#: includes/ui/view_package.php:7
+#: includes/ui/view_package.php:17
 msgid "Package Details"
 msgstr ""
 
-#: includes/ui/view_package.php:14
+#: includes/ui/view_package.php:24
 msgid ""
 "The script must be called with a valid package id to review the info for."
 msgstr ""
 
-#: includes/ui/view_package.php:19
+#: includes/ui/view_package.php:29
 msgid "Available version"
 msgstr ""
 
-#: includes/ui/view_package.php:20
+#: includes/ui/view_package.php:30
 msgid "Package type"
 msgstr ""
 
-#: includes/ui/view_package.php:21
+#: includes/ui/view_package.php:31
 msgid "Package content"
 msgstr ""
 
-#: includes/ui/view_package.php:23
+#: includes/ui/view_package.php:33
 msgid "Author"
 msgstr ""
 
-#: includes/ui/view_package.php:24
+#: includes/ui/view_package.php:34
 msgid "Home page"
 msgstr ""
 
-#: includes/ui/view_package.php:25
+#: includes/ui/view_package.php:35
 msgid "Package maintainer"
 msgstr ""
 
-#: includes/ui/view_package.php:26
+#: includes/ui/view_package.php:36
 msgid "Installation path"
 msgstr ""
 
-#: includes/ui/view_package.php:27
+#: includes/ui/view_package.php:37
 msgid "Minimal software versions"
 msgstr ""
 
-#: includes/ui/view_package.php:28
+#: includes/ui/view_package.php:38
 msgid "Right to left"
 msgstr ""
 
-#: includes/ui/view_package.php:29
+#: includes/ui/view_package.php:39
 msgid "Charset encoding"
 msgstr ""
 
-#: includes/ui/view_package.php:34
+#: includes/ui/view_package.php:44
 #, php-format
 msgid "Content information for package '%s'"
 msgstr ""
 
-#: includes/ui/view_package.php:37
+#: includes/ui/view_package.php:47
 msgid "Property"
 msgstr ""
 
@@ -7117,7 +7106,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.orig:359
+#: sales/sales_order_entry.php:359
 msgid "You must enter at least one non empty item line."
 msgstr ""
 
@@ -7375,16 +7364,13 @@ msgstr ""
 
 #: inventory/reorder_level.php:57 inventory/inquiry/stock_movements.php:82
 #: inventory/inquiry/stock_status.php:76 purchasing/supplier_credit.php:203
-#: sales/sales_order_entry.php:507 sales/sales_order_entry.php.orig:507
-#: sales/includes/ui/sales_order_ui.inc:179
+#: sales/sales_order_entry.php:507 sales/includes/ui/sales_order_ui.inc:180
 msgid "Quantity On Hand"
 msgstr ""
 
 #: inventory/reorder_level.php:57 inventory/inquiry/stock_status.php:76
 #: sales/includes/db/sales_order_db.inc:110
 #: sales/includes/db/sales_order_db.inc:263
-#: sales/includes/db/sales_order_db.inc.orig:110
-#: sales/includes/db/sales_order_db.inc.orig:263
 msgid "Re-Order Level"
 msgstr ""
 
@@ -7714,7 +7700,6 @@ msgid "Foreign Item Codes"
 msgstr ""
 
 #: inventory/manage/item_codes.php:23 sales/sales_order_entry.php:674
-#: sales/sales_order_entry.php.orig:674
 msgid "There are no inventory items defined in the system."
 msgstr ""
 
@@ -8877,9 +8862,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/cust_trans_db.inc.orig:111
 #: sales/includes/db/sales_order_db.inc:249
-#: sales/includes/db/sales_order_db.inc.orig:249
 msgid "Updated."
 msgstr ""
 
@@ -9141,17 +9124,14 @@ msgid "Supplier Currency:"
 msgstr ""
 
 #: purchasing/includes/ui/po_ui.inc:178 sales/sales_order_entry.php:698
-#: sales/sales_order_entry.php.orig:698
 msgid "Order Date:"
 msgstr ""
 
 #: purchasing/includes/ui/po_ui.inc:179 sales/sales_order_entry.php:685
-#: sales/sales_order_entry.php.orig:685
 msgid "Delivery Date:"
 msgstr ""
 
 #: purchasing/includes/ui/po_ui.inc:179 sales/sales_order_entry.php:679
-#: sales/sales_order_entry.php.orig:679
 msgid "Invoice Date:"
 msgstr ""
 
@@ -9186,7 +9166,7 @@ msgid "Received"
 msgstr ""
 
 #: purchasing/includes/ui/po_ui.inc:238
-#: sales/includes/ui/sales_order_ui.inc:615
+#: sales/includes/ui/sales_order_ui.inc:616
 msgid "Required Delivery Date"
 msgstr ""
 
@@ -9201,21 +9181,21 @@ msgstr ""
 #: sales/customer_credit_invoice.php:322 sales/customer_delivery.php:501
 #: sales/customer_invoice.php:565 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:233
+#: sales/includes/ui/sales_order_ui.inc:234
 msgid "Sub-total"
 msgstr ""
 
 #: purchasing/includes/ui/po_ui.inc:298 purchasing/po_receive_items.php:122
 #: purchasing/view/view_grn.php:79 purchasing/view/view_po.php:93
 #: sales/customer_delivery.php:508 sales/view/view_sales_order.php:244
-#: sales/includes/ui/sales_order_ui.inc:240
+#: sales/includes/ui/sales_order_ui.inc:241
 msgid "Amount Total"
 msgstr ""
 
 #: purchasing/includes/ui/po_ui.inc:299
 #: purchasing/allocations/supplier_allocate.php:63
 #: sales/allocations/customer_allocate.php:62
-#: sales/includes/ui/sales_order_ui.inc:241
+#: sales/includes/ui/sales_order_ui.inc:242
 msgid "Refresh"
 msgstr ""
 
@@ -9248,14 +9228,12 @@ msgid "&View this order"
 msgstr ""
 
 #: purchasing/po_entry_items.php:82 sales/sales_order_entry.php:113
-#: sales/sales_order_entry.php:133 sales/sales_order_entry.php.orig:113
-#: sales/sales_order_entry.php.orig:133
+#: sales/sales_order_entry.php:133
 msgid "&Print This Order"
 msgstr ""
 
 #: purchasing/po_entry_items.php:84 sales/sales_order_entry.php:114
-#: sales/sales_order_entry.php:134 sales/sales_order_entry.php.orig:114
-#: sales/sales_order_entry.php.orig:134
+#: sales/sales_order_entry.php:134
 msgid "&Email This Order"
 msgstr ""
 
@@ -9337,7 +9315,6 @@ msgid "Enter a new purchase order"
 msgstr ""
 
 #: purchasing/po_entry_items.php:216 sales/sales_order_entry.php:479
-#: sales/sales_order_entry.php.orig:479
 msgid "Item description cannot be empty."
 msgstr ""
 
@@ -9373,7 +9350,7 @@ msgid ""
 msgstr ""
 
 #: purchasing/po_entry_items.php:329 purchasing/supplier_invoice.php:343
-#: purchasing/supplier_payment.php:113
+#: purchasing/supplier_payment.php:114
 msgid "There is no supplier selected."
 msgstr ""
 
@@ -9382,7 +9359,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.orig:354
+#: sales/sales_order_entry.php:354
 msgid "The entered date is not in fiscal year"
 msgstr ""
 
@@ -9417,7 +9394,6 @@ msgid ""
 msgstr ""
 
 #: purchasing/po_entry_items.php:527 sales/sales_order_entry.php:702
-#: sales/sales_order_entry.php.orig:702
 msgid "Place Order"
 msgstr ""
 
@@ -9426,7 +9402,6 @@ msgid "Update Order"
 msgstr ""
 
 #: purchasing/po_entry_items.php:529 sales/sales_order_entry.php:701
-#: sales/sales_order_entry.php.orig:701
 msgid "Cancel Order"
 msgstr ""
 
@@ -9451,7 +9426,6 @@ msgid "Update Invoice"
 msgstr ""
 
 #: purchasing/po_entry_items.php:538 sales/sales_order_entry.php:682
-#: sales/sales_order_entry.php.orig:682
 msgid "Cancel Invoice"
 msgstr ""
 
@@ -9704,52 +9678,54 @@ msgstr ""
 msgid "View the GL &Journal Entries for this Payment"
 msgstr ""
 
-#: purchasing/supplier_payment.php:100
-msgid "Enter another supplier &payment"
+#: purchasing/supplier_payment.php:98
+msgid "Select Another &Supplier Transaction for Payment"
+msgstr ""
+
+#: purchasing/supplier_payment.php:101
+msgid "Enter Another Supplier &Payment"
 msgstr ""
 
-#: purchasing/supplier_payment.php:147 sales/customer_payments.php:192
-#: sales/customer_payments.php.orig:192
+#: purchasing/supplier_payment.php:148 sales/customer_payments.php:196
 msgid "The exchange rate must be numeric and greater than zero."
 msgstr ""
 
-#: purchasing/supplier_payment.php:159
+#: purchasing/supplier_payment.php:160
 msgid "The entered discount is invalid or less than zero."
 msgstr ""
 
-#: purchasing/supplier_payment.php:167
+#: purchasing/supplier_payment.php:168
 msgid ""
 "The total of the amount and the discount is zero or negative. Please enter "
 "positive values."
 msgstr ""
 
-#: purchasing/supplier_payment.php:270
+#: purchasing/supplier_payment.php:271
 msgid "Payment To:"
 msgstr ""
 
-#: purchasing/supplier_payment.php:283
+#: purchasing/supplier_payment.php:284
 msgid "From Bank Account:"
 msgstr ""
 
-#: purchasing/supplier_payment.php:291
+#: purchasing/supplier_payment.php:292
 #: purchasing/view/view_supp_payment.php:55
 msgid "Date Paid"
 msgstr ""
 
-#: purchasing/supplier_payment.php:314 sales/customer_payments.php:410
-#: sales/customer_payments.php.orig:409
+#: purchasing/supplier_payment.php:315 sales/customer_payments.php:414
 msgid "Amount of Discount:"
 msgstr ""
 
-#: purchasing/supplier_payment.php:315
+#: purchasing/supplier_payment.php:316
 msgid "Amount of Payment:"
 msgstr ""
 
-#: purchasing/supplier_payment.php:321
+#: purchasing/supplier_payment.php:322
 msgid "The amount and discount are in the bank account's currency."
 msgstr ""
 
-#: purchasing/supplier_payment.php:324
+#: purchasing/supplier_payment.php:325
 msgid "Enter Payment"
 msgstr ""
 
@@ -11279,7 +11255,7 @@ msgstr ""
 #: reporting/includes/doctext.inc:48 sales/view/view_sales_order.php:69
 #: sales/inquiry/sales_orders_view.php:282
 #: sales/inquiry/sales_orders_view.php.orig:280
-#: sales/includes/ui/sales_order_ui.inc:610
+#: sales/includes/ui/sales_order_ui.inc:611
 msgid "Valid until"
 msgstr ""
 
@@ -11627,7 +11603,6 @@ msgid "Modifying Customer Credit Note #%d"
 msgstr ""
 
 #: sales/credit_note_entry.php:51 sales/sales_order_entry.php:676
-#: sales/sales_order_entry.php.orig:676
 msgid ""
 "There are no customers, or there are no customers with branches. Please "
 "define customers and customer branches."
@@ -11788,38 +11763,35 @@ msgid "Deliver Items for a Sales Order"
 msgstr ""
 
 #: sales/customer_delivery.php:50 sales/sales_order_entry.php:183
-#: sales/sales_order_entry.php.orig:183
 #, php-format
 msgid "Delivery # %d has been entered."
 msgstr ""
 
 #: sales/customer_delivery.php:52 sales/sales_order_entry.php:185
-#: sales/sales_order_entry.php.orig:185
 msgid "&View This Delivery"
 msgstr ""
 
 #: sales/customer_delivery.php:54 sales/customer_delivery.php:75
-#: sales/sales_order_entry.php:187 sales/sales_order_entry.php.orig:187
+#: sales/sales_order_entry.php:187
 msgid "&Print Delivery Note"
 msgstr ""
 
 #: sales/customer_delivery.php:55 sales/customer_delivery.php:76
-#: sales/sales_order_entry.php:188 sales/sales_order_entry.php.orig:188
+#: sales/sales_order_entry.php:188
 msgid "&Email Delivery Note"
 msgstr ""
 
 #: sales/customer_delivery.php:56 sales/customer_delivery.php:77
-#: sales/sales_order_entry.php:189 sales/sales_order_entry.php.orig:189
+#: sales/sales_order_entry.php:189
 msgid "P&rint as Packing Slip"
 msgstr ""
 
 #: sales/customer_delivery.php:57 sales/customer_delivery.php:78
-#: sales/sales_order_entry.php:190 sales/sales_order_entry.php.orig:190
+#: sales/sales_order_entry.php:190
 msgid "E&mail as Packing Slip"
 msgstr ""
 
 #: sales/customer_delivery.php:59 sales/sales_order_entry.php:193
-#: sales/sales_order_entry.php.orig:193
 msgid "View the GL Journal Entries for this Dispatch"
 msgstr ""
 
@@ -11905,8 +11877,7 @@ msgid "There are no item quantities on this delivery note."
 msgstr ""
 
 #: sales/customer_delivery.php:285 sales/sales_order_entry.php:505
-#: sales/sales_order_entry.php.orig:505
-#: sales/includes/ui/sales_order_ui.inc:248
+#: sales/includes/ui/sales_order_ui.inc:249
 msgid ""
 "The delivery cannot be processed because there is an insufficient quantity "
 "for item:"
@@ -11926,7 +11897,7 @@ msgstr ""
 
 #: sales/customer_delivery.php:421 sales/customer_invoice.php:459
 #: sales/includes/ui/sales_order_ui.inc:84
-#: sales/includes/ui/sales_order_ui.inc:372
+#: sales/includes/ui/sales_order_ui.inc:373
 msgid ""
 "The selected customer account is currently on hold. Please contact the "
 "credit control personnel to discuss."
@@ -11949,7 +11920,7 @@ msgstr ""
 msgid "Shipping Cost"
 msgstr ""
 
-#: sales/customer_delivery.php:513 sales/includes/ui/sales_order_ui.inc:246
+#: sales/customer_delivery.php:513 sales/includes/ui/sales_order_ui.inc:247
 msgid ""
 "Marked items have insufficient quantities in stock as on day of delivery."
 msgstr ""
@@ -11967,7 +11938,7 @@ msgid "Process Dispatch"
 msgstr ""
 
 #: sales/customer_delivery.php:526 sales/customer_invoice.php:585
-#: sales/sales_order_entry.php:724 sales/sales_order_entry.php.orig:724
+#: sales/sales_order_entry.php:724
 msgid "Check entered data and save document"
 msgstr ""
 
@@ -11989,7 +11960,7 @@ msgid "Selected deliveries has been processed"
 msgstr ""
 
 #: sales/customer_invoice.php:57 sales/customer_invoice.php:77
-#: sales/sales_order_entry.php:212 sales/sales_order_entry.php.orig:212
+#: sales/sales_order_entry.php:212
 msgid "&View This Invoice"
 msgstr ""
 
@@ -12002,7 +11973,6 @@ msgid "&Email This Invoice"
 msgstr ""
 
 #: sales/customer_invoice.php:62 sales/sales_order_entry.php:225
-#: sales/sales_order_entry.php.orig:225
 msgid "View the GL &Journal Entries for this Invoice"
 msgstr ""
 
@@ -12079,8 +12049,8 @@ msgstr ""
 msgid "Payment terms:"
 msgstr ""
 
-#: sales/customer_invoice.php:388 sales/includes/ui/sales_order_ui.inc:409
-#: sales/includes/ui/sales_order_ui.inc:413
+#: sales/customer_invoice.php:388 sales/includes/ui/sales_order_ui.inc:410
+#: sales/includes/ui/sales_order_ui.inc:414
 msgid "Payment:"
 msgstr ""
 
@@ -12100,407 +12070,403 @@ msgstr ""
 msgid "Invoice Total"
 msgstr ""
 
-#: sales/customer_payments.php:33 sales/customer_payments.php.orig:33
+#: sales/customer_payments.php:33
 msgid "Customer Payment Entry"
 msgstr ""
 
-#: sales/customer_payments.php:37 sales/customer_payments.php.orig:37
+#: sales/customer_payments.php:37
 msgid "There are no customers defined in the system."
 msgstr ""
 
-#: sales/customer_payments.php:68 sales/customer_payments.php.orig:68
+#: sales/customer_payments.php:68
 msgid "Invalid sales invoice number."
 msgstr ""
 
-#: sales/customer_payments.php:92 sales/customer_payments.php.orig:92
+#: sales/customer_payments.php:92
 msgid "The customer payment has been successfully entered."
 msgstr ""
 
-#: sales/customer_payments.php:94 sales/customer_payments.php:109
-#: sales/customer_payments.php.orig:94 sales/customer_payments.php.orig:109
+#: sales/customer_payments.php:94 sales/customer_payments.php:111
 msgid "&Print This Receipt"
 msgstr ""
 
-#: sales/customer_payments.php:96 sales/customer_payments.php:111
-#: sales/customer_payments.php.orig:96 sales/customer_payments.php.orig:111
+#: sales/customer_payments.php:96 sales/customer_payments.php:113
 msgid "&View the GL Journal Entries for this Customer Payment"
 msgstr ""
 
-#: sales/customer_payments.php:100 sales/customer_payments.php:115
-#: sales/customer_payments.php.orig:100 sales/customer_payments.php.orig:115
+#: sales/customer_payments.php:100
+msgid "Select Another &Customer Transaction for Payment"
+msgstr ""
+
+#: sales/customer_payments.php:102 sales/customer_payments.php:119
 msgid "Enter Another &Customer Payment"
 msgstr ""
 
-#: sales/customer_payments.php:107 sales/customer_payments.php.orig:107
+#: sales/customer_payments.php:109
 msgid "The customer payment has been successfully updated."
 msgstr ""
 
-#: sales/customer_payments.php:128 sales/customer_payments.php.orig:128
-#: sales/sales_order_entry.php:336 sales/sales_order_entry.php.orig:336
+#: sales/customer_payments.php:117
+msgid "Select Another Customer Payment for &Edition"
+msgstr ""
+
+#: sales/customer_payments.php:132 sales/sales_order_entry.php:336
 msgid "There is no customer selected."
 msgstr ""
 
-#: sales/customer_payments.php:135 sales/customer_payments.php.orig:135
-#: sales/sales_order_entry.php:343 sales/sales_order_entry.php.orig:343
+#: sales/customer_payments.php:139 sales/sales_order_entry.php:343
 msgid "This customer has no branch defined."
 msgstr ""
 
-#: sales/customer_payments.php:141 sales/customer_payments.php.orig:141
+#: sales/customer_payments.php:145
 msgid "The entered date is invalid. Please enter a valid date for the payment."
 msgstr ""
 
-#: sales/customer_payments.php:171 sales/customer_payments.php:177
-#: sales/customer_payments.php.orig:171 sales/customer_payments.php.orig:177
+#: sales/customer_payments.php:175 sales/customer_payments.php:181
 msgid "The entered amount is invalid or negative and cannot be processed."
 msgstr ""
 
-#: sales/customer_payments.php:203 sales/customer_payments.php.orig:203
+#: sales/customer_payments.php:207
 msgid "The entered discount is not a valid number."
 msgstr ""
 
-#: sales/customer_payments.php:210 sales/customer_payments.php.orig:210
+#: sales/customer_payments.php:214
 msgid ""
 "The balance of the amount and discout is zero or negative. Please enter "
 "valid amounts."
 msgstr ""
 
-#: sales/customer_payments.php:338 sales/customer_payments.php:340
-#: sales/customer_payments.php.orig:343 sales/customer_payments.php.orig:345
+#: sales/customer_payments.php:342 sales/customer_payments.php:344
 msgid "From Customer:"
 msgstr ""
 
-#: sales/customer_payments.php:381 sales/customer_payments.php.orig:380
+#: sales/customer_payments.php:385
 msgid "Into Bank Account:"
 msgstr ""
 
-#: sales/customer_payments.php:387 sales/customer_payments.php.orig:386
+#: sales/customer_payments.php:391
 msgid "Date of Deposit:"
 msgstr ""
 
-#: sales/customer_payments.php:409 sales/customer_payments.php.orig:408
+#: sales/customer_payments.php:413
 msgid "Customer prompt payment discount :"
 msgstr ""
 
-#: sales/customer_payments.php:418 sales/customer_payments.php.orig:417
+#: sales/customer_payments.php:422
 msgid "Amount and discount are in customer's currency."
 msgstr ""
 
-#: sales/customer_payments.php:423 sales/customer_payments.php.orig:422
+#: sales/customer_payments.php:427
 msgid "Update Payment"
 msgstr ""
 
-#: sales/customer_payments.php:425 sales/customer_payments.php.orig:424
+#: sales/customer_payments.php:429
 msgid "Add Payment"
 msgstr ""
 
-#: sales/sales_order_entry.php:64 sales/sales_order_entry.php.orig:64
+#: sales/sales_order_entry.php:64
 msgid "Direct Sales Delivery"
 msgstr ""
 
-#: sales/sales_order_entry.php:69 sales/sales_order_entry.php.orig:69
+#: sales/sales_order_entry.php:69
 msgid "Direct Sales Invoice"
 msgstr ""
 
-#: sales/sales_order_entry.php:75 sales/sales_order_entry.php.orig:75
+#: sales/sales_order_entry.php:75
 #, php-format
 msgid "Modifying Sales Order # %d"
 msgstr ""
 
-#: sales/sales_order_entry.php:81 sales/sales_order_entry.php.orig:81
+#: sales/sales_order_entry.php:81
 #, php-format
 msgid "Modifying Sales Quotation # %d"
 msgstr ""
 
-#: sales/sales_order_entry.php:86 sales/sales_order_entry.php.orig:86
+#: sales/sales_order_entry.php:86
 msgid "New Sales Order Entry"
 msgstr ""
 
-#: sales/sales_order_entry.php:90 sales/sales_order_entry.php.orig:90
+#: sales/sales_order_entry.php:90
 msgid "New Sales Quotation Entry"
 msgstr ""
 
-#: sales/sales_order_entry.php:93 sales/sales_order_entry.php.orig:93
+#: sales/sales_order_entry.php:93
 msgid "Sales Order Entry"
 msgstr ""
 
-#: sales/sales_order_entry.php:109 sales/sales_order_entry.php.orig:109
+#: sales/sales_order_entry.php:109
 #, php-format
 msgid "Order # %d has been entered."
 msgstr ""
 
 #: sales/sales_order_entry.php:111 sales/sales_order_entry.php:131
-#: sales/sales_order_entry.php.orig:111 sales/sales_order_entry.php.orig:131
 msgid "&View This Order"
 msgstr ""
 
-#: sales/sales_order_entry.php:117 sales/sales_order_entry.php.orig:117
+#: sales/sales_order_entry.php:117
 msgid "Make &Delivery Against This Order"
 msgstr ""
 
-#: sales/sales_order_entry.php:122 sales/sales_order_entry.php.orig:122
+#: sales/sales_order_entry.php:122
 msgid "Enter a &New Order"
 msgstr ""
 
-#: sales/sales_order_entry.php:129 sales/sales_order_entry.php.orig:129
+#: sales/sales_order_entry.php:129
 #, php-format
 msgid "Order # %d has been updated."
 msgstr ""
 
-#: sales/sales_order_entry.php:137 sales/sales_order_entry.php.orig:137
+#: sales/sales_order_entry.php:137
 msgid "Confirm Order Quantities and Make &Delivery"
 msgstr ""
 
-#: sales/sales_order_entry.php:140 sales/sales_order_entry.php.orig:140
+#: sales/sales_order_entry.php:140
 msgid "Select A Different &Order"
 msgstr ""
 
-#: sales/sales_order_entry.php:147 sales/sales_order_entry.php.orig:147
+#: sales/sales_order_entry.php:147
 #, php-format
 msgid "Quotation # %d has been entered."
 msgstr ""
 
 #: sales/sales_order_entry.php:149 sales/sales_order_entry.php:167
-#: sales/sales_order_entry.php.orig:149 sales/sales_order_entry.php.orig:167
 msgid "&View This Quotation"
 msgstr ""
 
 #: sales/sales_order_entry.php:151 sales/sales_order_entry.php:169
-#: sales/sales_order_entry.php.orig:151 sales/sales_order_entry.php.orig:169
 msgid "&Print This Quotation"
 msgstr ""
 
 #: sales/sales_order_entry.php:152 sales/sales_order_entry.php:170
-#: sales/sales_order_entry.php.orig:152 sales/sales_order_entry.php.orig:170
 msgid "&Email This Quotation"
 msgstr ""
 
 #: sales/sales_order_entry.php:155 sales/sales_order_entry.php:173
-#: sales/sales_order_entry.php.orig:155 sales/sales_order_entry.php.orig:173
 msgid "Make &Sales Order Against This Quotation"
 msgstr ""
 
-#: sales/sales_order_entry.php:158 sales/sales_order_entry.php.orig:158
+#: sales/sales_order_entry.php:158
 msgid "Enter a New &Quotation"
 msgstr ""
 
-#: sales/sales_order_entry.php:165 sales/sales_order_entry.php.orig:165
+#: sales/sales_order_entry.php:165
 #, php-format
 msgid "Quotation # %d has been updated."
 msgstr ""
 
-#: sales/sales_order_entry.php:176 sales/sales_order_entry.php.orig:176
+#: sales/sales_order_entry.php:176
 msgid "Select A Different &Quotation"
 msgstr ""
 
-#: sales/sales_order_entry.php:195 sales/sales_order_entry.php.orig:195
+#: sales/sales_order_entry.php:195
 msgid "Make &Invoice Against This Delivery"
 msgstr ""
 
-#: sales/sales_order_entry.php:199 sales/sales_order_entry.php.orig:199
+#: sales/sales_order_entry.php:199
 msgid "Enter a New Template &Delivery"
 msgstr ""
 
-#: sales/sales_order_entry.php:202 sales/sales_order_entry.php.orig:202
+#: sales/sales_order_entry.php:202
 msgid "Enter a &New Delivery"
 msgstr ""
 
-#: sales/sales_order_entry.php:210 sales/sales_order_entry.php.orig:210
+#: sales/sales_order_entry.php:210
 #, php-format
 msgid "Invoice # %d has been entered."
 msgstr ""
 
-#: sales/sales_order_entry.php:214 sales/sales_order_entry.php.orig:214
+#: sales/sales_order_entry.php:214
 msgid "&Print Sales Invoice"
 msgstr ""
 
-#: sales/sales_order_entry.php:215 sales/sales_order_entry.php.orig:215
+#: sales/sales_order_entry.php:215
 msgid "&Email Sales Invoice"
 msgstr ""
 
-#: sales/sales_order_entry.php:223 sales/sales_order_entry.php.orig:223
+#: sales/sales_order_entry.php:223
 msgid "Print &Receipt"
 msgstr ""
 
-#: sales/sales_order_entry.php:228 sales/sales_order_entry.php.orig:228
+#: sales/sales_order_entry.php:228
 msgid "Enter a &New Template Invoice"
 msgstr ""
 
-#: sales/sales_order_entry.php:231 sales/sales_order_entry.php.orig:231
+#: sales/sales_order_entry.php:231
 msgid "Enter a &New Direct Invoice"
 msgstr ""
 
-#: sales/sales_order_entry.php:365 sales/sales_order_entry.php.orig:365
+#: sales/sales_order_entry.php:365
 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.orig:372
+#: sales/sales_order_entry.php:372
 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.orig:381
+#: sales/sales_order_entry.php:381
 msgid "The shipping cost entered is expected to be numeric."
 msgstr ""
 
-#: sales/sales_order_entry.php:387 sales/sales_order_entry.php.orig:387
+#: sales/sales_order_entry.php:387
 msgid "The Valid date is invalid."
 msgstr ""
 
-#: sales/sales_order_entry.php:389 sales/sales_order_entry.php.orig:389
+#: sales/sales_order_entry.php:389
 msgid "The delivery date is invalid."
 msgstr ""
 
-#: sales/sales_order_entry.php:396 sales/sales_order_entry.php.orig:396
+#: sales/sales_order_entry.php:396
 msgid "The requested valid date is before the date of the quotation."
 msgstr ""
 
-#: sales/sales_order_entry.php:398 sales/sales_order_entry.php.orig:398
+#: sales/sales_order_entry.php:398
 msgid "The requested delivery date is before the date of the order."
 msgstr ""
 
-#: sales/sales_order_entry.php:407 sales/sales_order_entry.php.orig:407
+#: sales/sales_order_entry.php:407
 msgid "You need to define a cash account for your Sales Point."
 msgstr ""
 
-#: sales/sales_order_entry.php:484 sales/sales_order_entry.php.orig:484
+#: sales/sales_order_entry.php:484
 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:488 sales/sales_order_entry.php.orig:488
+#: sales/sales_order_entry.php:488
 msgid "Price for inventory item must be entered and can not be less than 0"
 msgstr ""
 
-#: sales/sales_order_entry.php:495 sales/sales_order_entry.php.orig:495
+#: sales/sales_order_entry.php:495
 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:526 sales/sales_order_entry.php.orig:526
+#: sales/sales_order_entry.php:526
 #, php-format
 msgid "Price %s is below Standard Cost %s"
 msgstr ""
 
-#: sales/sales_order_entry.php:551 sales/sales_order_entry.php.orig:551
+#: sales/sales_order_entry.php:551
 msgid ""
 "This item cannot be deleted because some of it has already been delivered."
 msgstr ""
 
-#: sales/sales_order_entry.php:580 sales/sales_order_entry.php.orig:580
+#: sales/sales_order_entry.php:580
 msgid "Direct delivery entry has been cancelled as requested."
 msgstr ""
 
-#: sales/sales_order_entry.php:581 sales/sales_order_entry.php.orig:581
+#: sales/sales_order_entry.php:581
 msgid "Enter a New Sales Delivery"
 msgstr ""
 
-#: sales/sales_order_entry.php:584 sales/sales_order_entry.php.orig:584
+#: sales/sales_order_entry.php:584
 msgid "Direct invoice entry has been cancelled as requested."
 msgstr ""
 
-#: sales/sales_order_entry.php:585 sales/sales_order_entry.php.orig:585
+#: sales/sales_order_entry.php:585
 msgid "Enter a New Sales Invoice"
 msgstr ""
 
-#: sales/sales_order_entry.php:590 sales/sales_order_entry.php.orig:590
+#: sales/sales_order_entry.php:590
 msgid ""
 "This order cannot be cancelled because some of it has already been invoiced "
 "or dispatched. However, the line item quantities may be modified."
 msgstr ""
 
-#: sales/sales_order_entry.php:595 sales/sales_order_entry.php.orig:595
+#: sales/sales_order_entry.php:595
 msgid "This sales quotation has been cancelled as requested."
 msgstr ""
 
-#: sales/sales_order_entry.php:596 sales/sales_order_entry.php.orig:596
+#: sales/sales_order_entry.php:596
 msgid "Enter a New Sales Quotation"
 msgstr ""
 
-#: sales/sales_order_entry.php:600 sales/sales_order_entry.php.orig:600
+#: sales/sales_order_entry.php:600
 msgid "This sales order has been cancelled as requested."
 msgstr ""
 
-#: sales/sales_order_entry.php:601 sales/sales_order_entry.php.orig:601
+#: sales/sales_order_entry.php:601
 msgid "Enter a New Sales Order"
 msgstr ""
 
-#: sales/sales_order_entry.php:680 sales/sales_order_entry.php.orig:680
+#: sales/sales_order_entry.php:680
 msgid "Sales Invoice Items"
 msgstr ""
 
-#: sales/sales_order_entry.php:681 sales/sales_order_entry.php.orig:681
+#: sales/sales_order_entry.php:681
 msgid "Enter Delivery Details and Confirm Invoice"
 msgstr ""
 
-#: sales/sales_order_entry.php:683 sales/sales_order_entry.php.orig:683
+#: sales/sales_order_entry.php:683
 msgid "Place Invoice"
 msgstr ""
 
-#: sales/sales_order_entry.php:686 sales/sales_order_entry.php.orig:686
+#: sales/sales_order_entry.php:686
 msgid "Delivery Note Items"
 msgstr ""
 
-#: sales/sales_order_entry.php:687 sales/sales_order_entry.php.orig:687
+#: sales/sales_order_entry.php:687
 msgid "Enter Delivery Details and Confirm Dispatch"
 msgstr ""
 
-#: sales/sales_order_entry.php:688 sales/sales_order_entry.php.orig:688
+#: sales/sales_order_entry.php:688
 msgid "Cancel Delivery"
 msgstr ""
 
-#: sales/sales_order_entry.php:689 sales/sales_order_entry.php.orig:689
+#: sales/sales_order_entry.php:689
 msgid "Place Delivery"
 msgstr ""
 
-#: sales/sales_order_entry.php:691 sales/sales_order_entry.php.orig:691
+#: sales/sales_order_entry.php:691
 msgid "Quotation Date:"
 msgstr ""
 
-#: sales/sales_order_entry.php:692 sales/sales_order_entry.php.orig:692
+#: sales/sales_order_entry.php:692
 msgid "Sales Quotation Items"
 msgstr ""
 
-#: sales/sales_order_entry.php:693 sales/sales_order_entry.php.orig:693
+#: sales/sales_order_entry.php:693
 msgid "Enter Delivery Details and Confirm Quotation"
 msgstr ""
 
-#: sales/sales_order_entry.php:694 sales/sales_order_entry.php.orig:694
+#: sales/sales_order_entry.php:694
 msgid "Cancel Quotation"
 msgstr ""
 
-#: sales/sales_order_entry.php:695 sales/sales_order_entry.php.orig:695
+#: sales/sales_order_entry.php:695
 msgid "Place Quotation"
 msgstr ""
 
-#: sales/sales_order_entry.php:696 sales/sales_order_entry.php.orig:696
+#: sales/sales_order_entry.php:696
 msgid "Commit Quotations Changes"
 msgstr ""
 
-#: sales/sales_order_entry.php:699 sales/sales_order_entry.php.orig:699
+#: sales/sales_order_entry.php:699
 msgid "Sales Order Items"
 msgstr ""
 
-#: sales/sales_order_entry.php:700 sales/sales_order_entry.php.orig:700
+#: sales/sales_order_entry.php:700
 msgid "Enter Delivery Details and Confirm Order"
 msgstr ""
 
-#: sales/sales_order_entry.php:703 sales/sales_order_entry.php.orig:703
+#: sales/sales_order_entry.php:703
 msgid "Commit Order Changes"
 msgstr ""
 
-#: sales/sales_order_entry.php:725 sales/sales_order_entry.php.orig:725
+#: sales/sales_order_entry.php:725
 msgid "You are about to void this Document.\\nDo you want to continue?"
 msgstr ""
 
-#: sales/sales_order_entry.php:728 sales/sales_order_entry.php.orig:728
+#: sales/sales_order_entry.php:728
 msgid "Validate changes and update document"
 msgstr ""
 
-#: sales/sales_order_entry.php:732 sales/sales_order_entry.php.orig:732
+#: sales/sales_order_entry.php:732
 msgid ""
 "Cancels document entry or removes sales order when editing an old document"
 msgstr ""
@@ -12708,7 +12674,7 @@ msgid "Tax Group"
 msgstr ""
 
 #: sales/manage/customer_branches.php:319
-#: sales/includes/ui/sales_order_ui.inc:303
+#: sales/includes/ui/sales_order_ui.inc:304
 msgid ""
 "The selected customer does not have any branches. Please create at least one "
 "branch."
@@ -12901,7 +12867,7 @@ msgstr ""
 msgid "End:"
 msgstr ""
 
-#: sales/manage/sales_areas.php:30 sales/manage/sales_groups.php:30
+#: sales/manage/sales_areas.php:30
 msgid "The area description cannot be empty."
 msgstr ""
 
@@ -12935,6 +12901,10 @@ msgstr ""
 msgid "Sales Groups"
 msgstr ""
 
+#: sales/manage/sales_groups.php:30
+msgid "The sales group description cannot be empty."
+msgstr ""
+
 #: sales/manage/sales_groups.php:39
 msgid "Selected sales group has been updated"
 msgstr ""
@@ -13427,7 +13397,7 @@ msgstr ""
 msgid "Tmpl"
 msgstr ""
 
-#: sales/includes/cart_class.inc:352
+#: sales/includes/cart_class.inc:356
 msgid "You have to enter valid stock code or nonempty description"
 msgstr ""
 
@@ -13451,42 +13421,35 @@ msgstr ""
 
 #: sales/includes/db/sales_order_db.inc:107
 #: sales/includes/db/sales_order_db.inc:259
-#: sales/includes/db/sales_order_db.inc.orig:107
-#: sales/includes/db/sales_order_db.inc.orig:259
 msgid "Stocks below Re-Order Level at "
 msgstr ""
 
 #: sales/includes/db/sales_order_db.inc:110
 #: sales/includes/db/sales_order_db.inc:264
-#: sales/includes/db/sales_order_db.inc.orig:110
-#: sales/includes/db/sales_order_db.inc.orig:264
 msgid "Below"
 msgstr ""
 
 #: sales/includes/db/sales_order_db.inc:111
 #: sales/includes/db/sales_order_db.inc:265
-#: sales/includes/db/sales_order_db.inc.orig:111
-#: sales/includes/db/sales_order_db.inc.orig:265
 msgid "Please reorder"
 msgstr ""
 
 #: sales/includes/db/sales_order_db.inc:139
-#: sales/includes/db/sales_order_db.inc.orig:139
 msgid "Deleted."
 msgstr ""
 
 #: sales/includes/ui/sales_credit_ui.inc:94
-#: sales/includes/ui/sales_order_ui.inc:383
+#: 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:643
+#: 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:390
+#: sales/includes/ui/sales_order_ui.inc:391
 msgid "Customer Discount:"
 msgstr ""
 
@@ -13500,98 +13463,98 @@ msgid ""
 "have any branches."
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:228
+#: sales/includes/ui/sales_order_ui.inc:229
 msgid "Shipping Charge"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:301
+#: sales/includes/ui/sales_order_ui.inc:302
 msgid "No customer found for entered text."
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:327
+#: sales/includes/ui/sales_order_ui.inc:328
 #, php-format
 msgid "Customer's payment terms '%s' cannot be selected on this POS"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:377
+#: sales/includes/ui/sales_order_ui.inc:378
 msgid "Reference number unique for this document type"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:417
-#: sales/includes/ui/sales_order_ui.inc:419
+#: 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:436
+#: sales/includes/ui/sales_order_ui.inc:437
 msgid "Date of order receive"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:586
+#: sales/includes/ui/sales_order_ui.inc:587
 msgid "Cash payment"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:589
-#: sales/includes/ui/sales_order_ui.inc:621
+#: 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:592
+#: sales/includes/ui/sales_order_ui.inc:593
 msgid "Cash account:"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:599
+#: sales/includes/ui/sales_order_ui.inc:600
 msgid "Delivery Details"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:604
+#: sales/includes/ui/sales_order_ui.inc:605
 msgid "Invoice Delivery Details"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:605
+#: sales/includes/ui/sales_order_ui.inc:606
 msgid "Invoice before"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:609
+#: sales/includes/ui/sales_order_ui.inc:610
 msgid "Quotation Delivery Details"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:614
+#: sales/includes/ui/sales_order_ui.inc:615
 msgid "Order Delivery Details"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:627
+#: sales/includes/ui/sales_order_ui.inc:628
 msgid "Enter requested day of delivery"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:628
+#: sales/includes/ui/sales_order_ui.inc:629
 msgid "Enter Valid until Date"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:629
+#: sales/includes/ui/sales_order_ui.inc:630
 msgid "Deliver To:"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:630
+#: 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:633
+#: 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:637
+#: sales/includes/ui/sales_order_ui.inc:638
 msgid "Contact Phone Number:"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:638
+#: 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:639
+#: sales/includes/ui/sales_order_ui.inc:640
 msgid "Customer Reference:"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:640
+#: sales/includes/ui/sales_order_ui.inc:641
 msgid "Customer reference number for this order (if any)"
 msgstr ""
 
diff --git a/purchasing/supplier_payment.php b/purchasing/supplier_payment.php
index aff8282..9bd3559 100644
--- a/purchasing/supplier_payment.php
+++ b/purchasing/supplier_payment.php
@@ -95,9 +95,10 @@ if (isset($_GET['AddedID'])) {
 
     display_note(get_gl_view_str(ST_SUPPAYMENT, $payment_id, _("View the GL &Journal Entries for this Payment")));
 
+	hyperlink_no_params($path_to_root . "/purchasing/inquiry/supplier_allocation_inquiry.php?supplier_id=", _("Select Another &Supplier Transaction for Payment"));
 //    hyperlink_params($path_to_root . "/purchasing/allocations/supplier_allocate.php", _("&Allocate this Payment"), "trans_no=$payment_id&trans_type=22");
 
-	hyperlink_params($_SERVER['PHP_SELF'], _("Enter another supplier &payment"), "supplier_id=" . $_POST['supplier_id']);
+	hyperlink_params($_SERVER['PHP_SELF'], _("Enter Another Supplier &Payment"), "supplier_id=" . $_POST['supplier_id']);
 
 	display_footer_exit();
 }
diff --git a/sales/customer_payments.php b/sales/customer_payments.php
index b81b609..4f27a74 100644
--- a/sales/customer_payments.php
+++ b/sales/customer_payments.php
@@ -97,8 +97,10 @@ if (isset($_GET['AddedID'])) {
 
 //	hyperlink_params($path_to_root . "/sales/allocations/customer_allocate.php", _("&Allocate this Customer Payment"), "trans_no=$payment_no&trans_type=12");
 
+	hyperlink_no_params($path_to_root . "/sales/inquiry/customer_allocation_inquiry.php?customer_id=", _("Select Another &Customer Transaction for Payment"));
+
 	hyperlink_no_params($path_to_root . "/sales/customer_payments.php", _("Enter Another &Customer Payment"));
-	
+
 	display_footer_exit();
 }
 elseif (isset($_GET['UpdatedID'])) {
@@ -112,8 +114,10 @@ elseif (isset($_GET['UpdatedID'])) {
 
 //	hyperlink_params($path_to_root . "/sales/allocations/customer_allocate.php", _("&Allocate this Customer Payment"), "trans_no=$payment_no&trans_type=12");
 
+	hyperlink_no_params($path_to_root . "/sales/inquiry/customer_inquiry.php?", _("Select Another Customer Payment for &Edition"));
+
 	hyperlink_no_params($path_to_root . "/sales/customer_payments.php", _("Enter Another &Customer Payment"));
-	
+
 	display_footer_exit();
 }