Fixed gettextized message.
[fa-stable.git] / lang / new_language_template / LC_MESSAGES / empty.po
index 5c383df1b8651087fb72b790193c66a98234a45e..a3b3a34f26865438c6cd2f66f5a8d2fb87f90afd 100644 (file)
@@ -8,13 +8,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-09 11:41+0100\n"
+"POT-Creation-Date: 2011-02-13 23:51+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"
 "Language: \n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-2\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #: ../frontaccounting.php:73
@@ -24,41 +24,54 @@ msgstr ""
 
 #: ../frontaccounting.php:75
 #: ../access/logout.php:17
-#: ../themes/default/renderer.php:42
-#: ../themes/default/renderer.php:68
+#: ../themes/default/renderer.php:52
+#: ../themes/default/renderer.php:78
 #: ../themes/exclusive/renderer.php:42
 #: ../themes/exclusive/renderer.php:51
 msgid "Logout"
 msgstr ""
 
+#: ../link_test.php:38
+msgid "Trans Link Test"
+msgstr ""
+
 #: ../access/login.php:13
+#: ../access/sav.login.php:13
 msgid "Restricted access"
 msgstr ""
 
 #: ../access/login.php:33
+#: ../access/sav.login.php:33
 msgid "Login as user: demouser and password: password"
 msgstr ""
 
 #: ../access/login.php:37
+#: ../access/sav.login.php:37
 msgid "Please login here"
 msgstr ""
 
 #: ../access/login.php:45
 #: ../access/login.php:75
+#: ../access/sav.login.php:45
+#: ../access/sav.login.php:75
 msgid "Authorization timeout"
 msgstr ""
 
 #: ../access/login.php:45
 #: ../access/login.php:82
+#: ../access/sav.login.php:45
+#: ../access/sav.login.php:82
 msgid "Login"
 msgstr ""
 
 #: ../access/login.php:82
+#: ../access/sav.login.php:82
 #: ../admin/inst_upgrade.php:137
 msgid "Version"
 msgstr ""
 
 #: ../access/login.php:85
+#: ../access/sav.login.php:85
 msgid "User name"
 msgstr ""
 
@@ -69,18 +82,21 @@ msgid "Password:"
 msgstr ""
 
 #: ../access/login.php:98
-#: ../admin/create_coy.php:237
-#: ../admin/create_coy.php:313
+#: ../access/sav.login.php:98
+#: ../admin/create_coy.php:240
+#: ../admin/create_coy.php:324
 msgid "Company"
 msgstr ""
 
 #: ../access/login.php:107
+#: ../access/sav.login.php:107
 msgid "Login -->"
 msgstr ""
 
 #: ../access/login.php:136
+#: ../access/sav.login.php:137
 #: ../admin/display_prefs.php:111
-#: ../themes/default/renderer.php:113
+#: ../themes/default/renderer.php:123
 #: ../themes/exclusive/renderer.php:154
 msgid "Theme:"
 msgstr ""
@@ -93,6 +109,10 @@ msgstr ""
 msgid "Click here to Login Again."
 msgstr ""
 
+#: ../access/sav.login.php:89
+msgid "Password"
+msgstr ""
+
 #: ../admin/attachments.php:72
 msgid "Attach Documents"
 msgstr ""
@@ -124,7 +144,7 @@ msgstr ""
 
 #: ../admin/attachments.php:167
 #: ../admin/view_print_transaction.php:126
-#: ../admin/void_transaction.php:160
+#: ../admin/void_transaction.php:164
 #: ../dimensions/inquiry/search_dimensions.php:127
 #: ../dimensions/view/view_dimension.php:54
 #: ../gl/bank_account_reconcile.php:234
@@ -186,9 +206,9 @@ msgstr ""
 #: ../inventory/view/view_transfer.php:56
 #: ../manufacturing/manage/bom_edit.php:70
 #: ../manufacturing/includes/manufacturing_ui.inc:28
-#: ../purchasing/includes/ui/invoice_ui.inc:465
-#: ../purchasing/includes/ui/invoice_ui.inc:477
-#: ../purchasing/po_receive_items.php:58
+#: ../purchasing/includes/ui/invoice_ui.inc:470
+#: ../purchasing/includes/ui/invoice_ui.inc:482
+#: ../purchasing/po_receive_items.php:62
 #: ../reporting/rep104.php:109
 #: ../reporting/rep105.php:112
 #: ../reporting/rep204.php:82
@@ -200,8 +220,8 @@ msgstr ""
 #: ../sales/create_recurrent_invoices.php:98
 #: ../sales/manage/credit_status.php:97
 #: ../sales/manage/recurrent_invoices.php:85
-#: ../sales/inquiry/sales_orders_view.php:289
-#: ../sales/inquiry/sales_orders_view.php:293
+#: ../sales/inquiry/sales_orders_view.php:284
+#: ../sales/inquiry/sales_orders_view.php:288
 #: ../taxes/tax_groups.php:146
 #: ../taxes/tax_types.php:115
 msgid "Description"
@@ -226,7 +246,7 @@ msgid "Date Uploaded"
 msgstr ""
 
 #: ../admin/attachments.php:182
-#: ../admin/create_coy.php:261
+#: ../admin/create_coy.php:264
 #: ../admin/crm_categories.php:106
 #: ../admin/fiscalyears.php:164
 #: ../admin/inst_lang.php:100
@@ -243,7 +263,7 @@ msgstr ""
 #: ../gl/manage/gl_account_classes.php:132
 #: ../gl/manage/gl_account_types.php:148
 #: ../gl/manage/gl_quick_entries.php:196
-#: ../gl/manage/gl_quick_entries.php:296
+#: ../gl/manage/gl_quick_entries.php:295
 #: ../gl/includes/ui/gl_bank_ui.inc:155
 #: ../gl/includes/ui/gl_journal_ui.inc:122
 #: ../includes/ui/contacts_view.inc:64
@@ -262,7 +282,7 @@ msgstr ""
 #: ../manufacturing/manage/bom_edit.php:86
 #: ../manufacturing/manage/work_centres.php:114
 #: ../manufacturing/includes/work_order_issue_ui.inc:58
-#: ../purchasing/includes/ui/invoice_ui.inc:514
+#: ../purchasing/includes/ui/invoice_ui.inc:519
 #: ../purchasing/includes/ui/po_ui.inc:266
 #: ../purchasing/inquiry/po_search_completed.php:101
 #: ../purchasing/inquiry/po_search.php:87
@@ -278,7 +298,7 @@ msgstr ""
 #: ../sales/inquiry/sales_deliveries_view.php:154
 #: ../sales/inquiry/sales_orders_view.php:123
 #: ../sales/includes/ui/sales_credit_ui.inc:197
-#: ../sales/includes/ui/sales_order_ui.inc:203
+#: ../sales/includes/ui/sales_order_ui.inc:202
 #: ../taxes/item_tax_types.php:134
 #: ../taxes/tax_groups.php:168
 #: ../taxes/tax_types.php:132
@@ -295,7 +315,7 @@ msgid "Download"
 msgstr ""
 
 #: ../admin/attachments.php:185
-#: ../admin/create_coy.php:262
+#: ../admin/create_coy.php:265
 #: ../admin/crm_categories.php:110
 #: ../admin/fiscalyears.php:166
 #: ../admin/inst_chart.php:80
@@ -314,7 +334,7 @@ msgstr ""
 #: ../gl/manage/gl_account_classes.php:133
 #: ../gl/manage/gl_account_types.php:149
 #: ../gl/manage/gl_quick_entries.php:197
-#: ../gl/manage/gl_quick_entries.php:297
+#: ../gl/manage/gl_quick_entries.php:296
 #: ../gl/includes/ui/gl_bank_ui.inc:157
 #: ../gl/includes/ui/gl_journal_ui.inc:124
 #: ../includes/ui/contacts_view.inc:67
@@ -344,7 +364,7 @@ msgstr ""
 #: ../sales/manage/sales_points.php:100
 #: ../sales/manage/sales_types.php:122
 #: ../sales/includes/ui/sales_credit_ui.inc:199
-#: ../sales/includes/ui/sales_order_ui.inc:205
+#: ../sales/includes/ui/sales_order_ui.inc:204
 #: ../taxes/item_tax_types.php:135
 #: ../taxes/tax_groups.php:169
 #: ../taxes/tax_types.php:133
@@ -390,7 +410,7 @@ msgid "Database backup failed."
 msgstr ""
 
 #: ../admin/backups.php:95
-#: ../admin/create_coy.php:249
+#: ../admin/create_coy.php:252
 #: ../admin/fiscalyears.php:155
 #: ../admin/inst_lang.php:85
 #: ../admin/inst_lang.php:97
@@ -447,8 +467,8 @@ msgid "Create backup"
 msgstr ""
 
 #: ../admin/backups.php:168
-#: ../sales/includes/ui/sales_order_ui.inc:590
-#: ../sales/includes/ui/sales_order_ui.inc:637
+#: ../sales/includes/ui/sales_order_ui.inc:587
+#: ../sales/includes/ui/sales_order_ui.inc:634
 msgid "Comments:"
 msgstr ""
 
@@ -499,7 +519,7 @@ msgstr ""
 
 #: ../admin/change_current_user_password.php:16
 #: ../admin/change_current_user_password.php:85
-#: ../themes/default/renderer.php:62
+#: ../themes/default/renderer.php:72
 #: ../themes/exclusive/renderer.php:47
 msgid "Change password"
 msgstr ""
@@ -592,7 +612,7 @@ msgstr ""
 #: ../includes/ui/contacts_view.inc:109
 #: ../inventory/manage/locations.php:202
 #: ../sales/manage/customers.php:203
-#: ../sales/includes/ui/sales_order_ui.inc:628
+#: ../sales/includes/ui/sales_order_ui.inc:625
 msgid "Address:"
 msgstr ""
 
@@ -721,15 +741,15 @@ msgstr ""
 #: ../admin/company_preferences.php:202
 #: ../admin/display_prefs.php:142
 #: ../admin/forms_setup.php:61
-#: ../admin/gl_setup.php:203
+#: ../admin/gl_setup.php:221
 #: ../admin/inst_chart.php:74
 #: ../admin/inst_lang.php:103
 #: ../admin/inst_module.php:138
 #: ../admin/inst_module.php:156
-#: ../admin/inst_module.php:200
+#: ../admin/inst_module.php:199
 #: ../admin/inst_theme.php:96
 #: ../dimensions/dimension_entry.php:293
-#: ../gl/gl_bank.php:381
+#: ../gl/gl_bank.php:390
 #: ../gl/gl_budget.php:135
 #: ../gl/manage/gl_quick_entries.php:60
 #: ../gl/includes/ui/gl_bank_ui.inc:246
@@ -750,15 +770,15 @@ msgstr ""
 #: ../manufacturing/includes/work_order_issue_ui.inc:127
 #: ../purchasing/includes/ui/po_ui.inc:299
 #: ../purchasing/includes/ui/po_ui.inc:434
-#: ../purchasing/po_receive_items.php:322
+#: ../purchasing/po_receive_items.php:326
 #: ../sales/credit_note_entry.php:280
-#: ../sales/customer_credit_invoice.php:391
-#: ../sales/customer_delivery.php:521
-#: ../sales/customer_invoice.php:555
-#: ../sales/inquiry/sales_orders_view.php:317
+#: ../sales/customer_credit_invoice.php:380
+#: ../sales/customer_delivery.php:509
+#: ../sales/customer_invoice.php:559
+#: ../sales/inquiry/sales_orders_view.php:312
 #: ../sales/includes/ui/sales_credit_ui.inc:293
-#: ../sales/includes/ui/sales_order_ui.inc:238
-#: ../sales/includes/ui/sales_order_ui.inc:558
+#: ../sales/includes/ui/sales_order_ui.inc:237
+#: ../sales/includes/ui/sales_order_ui.inc:555
 msgid "Update"
 msgstr ""
 
@@ -766,122 +786,126 @@ msgstr ""
 msgid "Create/Update Company"
 msgstr ""
 
-#: ../admin/create_coy.php:53
+#: ../admin/create_coy.php:45
+msgid "Database settings are not specified."
+msgstr ""
+
+#: ../admin/create_coy.php:56
 msgid "This database settings are already used by another company."
 msgstr ""
 
-#: ../admin/create_coy.php:58
+#: ../admin/create_coy.php:61
 msgid ""
 "You cannot have table set without prefix together with prefixed sets in the "
 "same database."
 msgstr ""
 
-#: ../admin/create_coy.php:116
+#: ../admin/create_coy.php:119
 msgid "Error creating Database: "
 msgstr ""
 
-#: ../admin/create_coy.php:116
+#: ../admin/create_coy.php:119
 msgid ", Please create it manually"
 msgstr ""
 
-#: ../admin/create_coy.php:120
+#: ../admin/create_coy.php:123
 msgid "Cannot create new company due to bugs in sql file."
 msgstr ""
 
-#: ../admin/create_coy.php:133
-#: ../admin/create_coy.php:200
+#: ../admin/create_coy.php:136
+#: ../admin/create_coy.php:203
 msgid "Cannot open the configuration file - "
 msgstr ""
 
-#: ../admin/create_coy.php:135
-#: ../admin/create_coy.php:202
+#: ../admin/create_coy.php:138
+#: ../admin/create_coy.php:205
 msgid "Cannot write to the configuration file - "
 msgstr ""
 
-#: ../admin/create_coy.php:137
-#: ../admin/create_coy.php:173
-#: ../admin/create_coy.php:204
+#: ../admin/create_coy.php:140
+#: ../admin/create_coy.php:176
+#: ../admin/create_coy.php:207
 msgid "The configuration file "
 msgstr ""
 
-#: ../admin/create_coy.php:137
-#: ../admin/create_coy.php:173
-#: ../admin/create_coy.php:204
+#: ../admin/create_coy.php:140
+#: ../admin/create_coy.php:176
+#: ../admin/create_coy.php:207
 #: ../admin/db/maintenance_db.inc:248
 msgid ""
 " is not writable. Change its permissions so it is, then re-run the operation."
 msgstr ""
 
-#: ../admin/create_coy.php:149
+#: ../admin/create_coy.php:152
 msgid "New company has been created."
 msgstr ""
 
-#: ../admin/create_coy.php:149
+#: ../admin/create_coy.php:152
 msgid "Company has been updated."
 msgstr ""
 
-#: ../admin/create_coy.php:166
+#: ../admin/create_coy.php:169
 msgid ""
 "Broken company subdirectories system. You have to remove this company "
 "manually."
 msgstr ""
 
-#: ../admin/create_coy.php:182
+#: ../admin/create_coy.php:185
 msgid "Cannot rename subdirectory to temporary name."
 msgstr ""
 
-#: ../admin/create_coy.php:188
+#: ../admin/create_coy.php:191
 msgid "Cannot rename company subdirectory"
 msgstr ""
 
-#: ../admin/create_coy.php:194
+#: ../admin/create_coy.php:197
 msgid "Error removing Database: "
 msgstr ""
 
-#: ../admin/create_coy.php:194
+#: ../admin/create_coy.php:197
 msgid ", please remove it manually"
 msgstr ""
 
-#: ../admin/create_coy.php:213
+#: ../admin/create_coy.php:216
 msgid "Cannot remove temporary renamed company data directory "
 msgstr ""
 
-#: ../admin/create_coy.php:216
+#: ../admin/create_coy.php:219
 msgid "Selected company has been deleted"
 msgstr ""
 
-#: ../admin/create_coy.php:230
+#: ../admin/create_coy.php:233
 msgid "Are you sure you want to delete company no. "
 msgstr ""
 
-#: ../admin/create_coy.php:237
+#: ../admin/create_coy.php:240
 msgid "Database Host"
 msgstr ""
 
-#: ../admin/create_coy.php:237
-#: ../admin/create_coy.php:315
+#: ../admin/create_coy.php:240
+#: ../admin/create_coy.php:326
 msgid "Database User"
 msgstr ""
 
-#: ../admin/create_coy.php:238
-#: ../admin/create_coy.php:318
+#: ../admin/create_coy.php:241
+#: ../admin/create_coy.php:329
 msgid "Database Name"
 msgstr ""
 
-#: ../admin/create_coy.php:238
-#: ../admin/create_coy.php:320
-#: ../admin/create_coy.php:322
+#: ../admin/create_coy.php:241
+#: ../admin/create_coy.php:331
+#: ../admin/create_coy.php:333
 msgid "Table Pref"
 msgstr ""
 
-#: ../admin/create_coy.php:238
-#: ../admin/create_coy.php:323
+#: ../admin/create_coy.php:241
+#: ../admin/create_coy.php:334
 #: ../admin/inst_lang.php:36
 #: ../admin/print_profiles.php:162
 msgid "Default"
 msgstr ""
 
-#: ../admin/create_coy.php:247
+#: ../admin/create_coy.php:250
 #: ../admin/fiscalyears.php:159
 #: ../admin/inst_lang.php:85
 #: ../admin/inst_lang.php:97
@@ -913,20 +937,20 @@ msgstr ""
 msgid "Yes"
 msgstr ""
 
-#: ../admin/create_coy.php:275
+#: ../admin/create_coy.php:278
 msgid "The marked company is the current company which cannot be deleted."
 msgstr ""
 
-#: ../admin/create_coy.php:314
+#: ../admin/create_coy.php:325
 #: ../admin/printers.php:84
 msgid "Host"
 msgstr ""
 
-#: ../admin/create_coy.php:317
+#: ../admin/create_coy.php:328
 msgid "Database Password"
 msgstr ""
 
-#: ../admin/create_coy.php:320
+#: ../admin/create_coy.php:331
 #: ../admin/inst_chart.php:68
 #: ../admin/inst_chart.php:70
 #: ../admin/inst_lang.php:87
@@ -937,24 +961,24 @@ msgstr ""
 #: ../admin/inst_upgrade.php:149
 #: ../gl/manage/gl_account_types.php:184
 #: ../includes/ui/allocation_cart.inc:286
-#: ../taxes/tax_groups.php:220
+#: ../taxes/tax_groups.php:221
 msgid "None"
 msgstr ""
 
-#: ../admin/create_coy.php:325
+#: ../admin/create_coy.php:336
 msgid "Database Script"
 msgstr ""
 
-#: ../admin/create_coy.php:327
+#: ../admin/create_coy.php:338
 msgid "New script Admin Password"
 msgstr ""
 
-#: ../admin/create_coy.php:330
+#: ../admin/create_coy.php:341
 #: ../gl/gl_budget.php:136
 msgid "Save"
 msgstr ""
 
-#: ../admin/create_coy.php:354
+#: ../admin/create_coy.php:365
 msgid "Create a new company"
 msgstr ""
 
@@ -1277,149 +1301,161 @@ msgstr ""
 msgid "The past due days interval allowance must be between 0 and 100."
 msgstr ""
 
-#: ../admin/gl_setup.php:66
+#: ../admin/gl_setup.php:52
+msgid "Before GRN Clearing Account can be changed all GRNs have to be invoiced"
+msgstr ""
+
+#: ../admin/gl_setup.php:75
 msgid "The general GL setup has been updated."
 msgstr ""
 
-#: ../admin/gl_setup.php:116
+#: ../admin/gl_setup.php:132
 msgid "General GL"
 msgstr ""
 
-#: ../admin/gl_setup.php:118
+#: ../admin/gl_setup.php:134
 msgid "Past Due Days Interval:"
 msgstr ""
 
-#: ../admin/gl_setup.php:118
-#: ../admin/gl_setup.php:153
-#: ../admin/gl_setup.php:161
-#: ../admin/gl_setup.php:196
+#: ../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
 msgid "days"
 msgstr ""
 
-#: ../admin/gl_setup.php:120
+#: ../admin/gl_setup.php:136
 msgid "Retained Earnings:"
 msgstr ""
 
-#: ../admin/gl_setup.php:122
+#: ../admin/gl_setup.php:138
 msgid "Profit/Loss Year:"
 msgstr ""
 
-#: ../admin/gl_setup.php:124
+#: ../admin/gl_setup.php:140
 msgid "Exchange Variances Account:"
 msgstr ""
 
-#: ../admin/gl_setup.php:126
+#: ../admin/gl_setup.php:142
 msgid "Bank Charges Account:"
 msgstr ""
 
-#: ../admin/gl_setup.php:130
+#: ../admin/gl_setup.php:146
 msgid "Customers and Sales"
 msgstr ""
 
-#: ../admin/gl_setup.php:132
+#: ../admin/gl_setup.php:148
 msgid "Default Credit Limit:"
 msgstr ""
 
-#: ../admin/gl_setup.php:134
+#: ../admin/gl_setup.php:150
 msgid "Accumulate batch shipping:"
 msgstr ""
 
-#: ../admin/gl_setup.php:136
+#: ../admin/gl_setup.php:152
 msgid "Legal Text on Invoice:"
 msgstr ""
 
-#: ../admin/gl_setup.php:138
+#: ../admin/gl_setup.php:154
 msgid "Shipping Charged Account:"
 msgstr ""
 
-#: ../admin/gl_setup.php:142
+#: ../admin/gl_setup.php:158
 msgid "Customers and Sales Defaults"
 msgstr ""
 
-#: ../admin/gl_setup.php:144
+#: ../admin/gl_setup.php:160
 msgid "Receivable Account:"
 msgstr ""
 
-#: ../admin/gl_setup.php:146
-#: ../admin/gl_setup.php:182
+#: ../admin/gl_setup.php:162
+#: ../admin/gl_setup.php:200
 #: ../inventory/manage/item_categories.php:192
 #: ../inventory/manage/items.php:364
 #: ../sales/manage/customer_branches.php:250
 msgid "Sales Account:"
 msgstr ""
 
-#: ../admin/gl_setup.php:149
+#: ../admin/gl_setup.php:165
 #: ../sales/manage/customer_branches.php:251
 msgid "Sales Discount Account:"
 msgstr ""
 
-#: ../admin/gl_setup.php:151
+#: ../admin/gl_setup.php:167
 #: ../sales/manage/customer_branches.php:253
 msgid "Prompt Payment Discount Account:"
 msgstr ""
 
-#: ../admin/gl_setup.php:153
+#: ../admin/gl_setup.php:169
 msgid "Delivery Required By:"
 msgstr ""
 
-#: ../admin/gl_setup.php:159
+#: ../admin/gl_setup.php:175
 msgid "Dimension Defaults"
 msgstr ""
 
-#: ../admin/gl_setup.php:161
+#: ../admin/gl_setup.php:177
 msgid "Dimension Required By After:"
 msgstr ""
 
-#: ../admin/gl_setup.php:164
+#: ../admin/gl_setup.php:180
 msgid "Suppliers and Purchasing"
 msgstr ""
 
-#: ../admin/gl_setup.php:166
+#: ../admin/gl_setup.php:182
 msgid "Delivery Over-Receive Allowance:"
 msgstr ""
 
-#: ../admin/gl_setup.php:168
+#: ../admin/gl_setup.php:184
 msgid "Invoice Over-Charge Allowance:"
 msgstr ""
 
-#: ../admin/gl_setup.php:170
+#: ../admin/gl_setup.php:186
 msgid "Suppliers and Purchasing Defaults"
 msgstr ""
 
-#: ../admin/gl_setup.php:172
+#: ../admin/gl_setup.php:188
 msgid "Payable Account:"
 msgstr ""
 
-#: ../admin/gl_setup.php:174
+#: ../admin/gl_setup.php:190
 #: ../purchasing/manage/suppliers.php:129
 msgid "Purchase Discount Account:"
 msgstr ""
 
-#: ../admin/gl_setup.php:176
+#: ../admin/gl_setup.php:192
+msgid "GRN Clearing Account:"
+msgstr ""
+
+#: ../admin/gl_setup.php:192
+msgid "No postings on GRN"
+msgstr ""
+
+#: ../admin/gl_setup.php:194
 #: ../reporting/reports_main.php:166
 msgid "Inventory"
 msgstr ""
 
-#: ../admin/gl_setup.php:178
+#: ../admin/gl_setup.php:196
 msgid "Allow Negative Inventory:"
 msgstr ""
 
-#: ../admin/gl_setup.php:179
+#: ../admin/gl_setup.php:197
 msgid "Warning:  This may cause a delay in GL postings"
 msgstr ""
 
-#: ../admin/gl_setup.php:181
+#: ../admin/gl_setup.php:199
 msgid "Items Defaults"
 msgstr ""
 
-#: ../admin/gl_setup.php:184
+#: ../admin/gl_setup.php:202
 #: ../inventory/manage/item_categories.php:202
 #: ../inventory/manage/items.php:368
 msgid "Inventory Account:"
 msgstr ""
 
-#: ../admin/gl_setup.php:186
+#: ../admin/gl_setup.php:204
 #: ../inventory/manage/item_categories.php:196
 #: ../inventory/manage/item_categories.php:204
 #: ../inventory/manage/items.php:369
@@ -1427,23 +1463,23 @@ msgstr ""
 msgid "C.O.G.S. Account:"
 msgstr ""
 
-#: ../admin/gl_setup.php:188
+#: ../admin/gl_setup.php:206
 #: ../inventory/manage/item_categories.php:205
 #: ../inventory/manage/items.php:370
 msgid "Inventory Adjustments Account:"
 msgstr ""
 
-#: ../admin/gl_setup.php:190
+#: ../admin/gl_setup.php:208
 #: ../inventory/manage/item_categories.php:209
 #: ../inventory/manage/items.php:381
 msgid "Item Assembly Costs Account:"
 msgstr ""
 
-#: ../admin/gl_setup.php:194
+#: ../admin/gl_setup.php:212
 msgid "Manufacturing Defaults"
 msgstr ""
 
-#: ../admin/gl_setup.php:196
+#: ../admin/gl_setup.php:214
 msgid "Work Order Required By After:"
 msgstr ""
 
@@ -1618,17 +1654,17 @@ msgid "Selected extension has been successfully deleted"
 msgstr ""
 
 #: ../admin/inst_module.php:104
-#: ../admin/inst_module.php:170
+#: ../admin/inst_module.php:169
 msgid "Extension"
 msgstr ""
 
 #: ../admin/inst_module.php:104
-#: ../admin/inst_module.php:170
+#: ../admin/inst_module.php:169
 msgid "Modules provided"
 msgstr ""
 
 #: ../admin/inst_module.php:104
-#: ../admin/inst_module.php:170
+#: ../admin/inst_module.php:169
 msgid "Options provided"
 msgstr ""
 
@@ -1636,27 +1672,23 @@ msgstr ""
 msgid "Install third-party extension."
 msgstr ""
 
-#: ../admin/inst_module.php:157
-msgid "Add third-party extension"
-msgstr ""
-
-#: ../admin/inst_module.php:170
+#: ../admin/inst_module.php:169
 #: ../includes/ui/ui_lists.inc:648
-#: ../includes/ui/ui_lists.inc:2118
+#: ../includes/ui/ui_lists.inc:2120
 #: ../reporting/includes/excel_report.inc:232
 #: ../reporting/includes/pdf_report.inc:264
 msgid "Active"
 msgstr ""
 
-#: ../admin/inst_module.php:233
+#: ../admin/inst_module.php:232
 msgid "Status change for some extensions failed."
 msgstr ""
 
-#: ../admin/inst_module.php:236
+#: ../admin/inst_module.php:235
 msgid "Current active extensions set has been saved."
 msgstr ""
 
-#: ../admin/inst_module.php:258
+#: ../admin/inst_module.php:257
 msgid "Extensions:"
 msgstr ""
 
@@ -2056,7 +2088,7 @@ msgid "Delete This Role"
 msgstr ""
 
 #: ../admin/security_roles.php:249
-#: ../admin/void_transaction.php:208
+#: ../admin/void_transaction.php:212
 #: ../gl/manage/gl_quick_entries.php:61
 #: ../gl/includes/ui/gl_bank_ui.inc:248
 #: ../gl/includes/ui/gl_journal_ui.inc:223
@@ -2070,7 +2102,7 @@ msgstr ""
 #: ../manufacturing/includes/work_order_issue_ui.inc:129
 #: ../purchasing/includes/ui/po_ui.inc:436
 #: ../sales/includes/ui/sales_credit_ui.inc:295
-#: ../sales/includes/ui/sales_order_ui.inc:560
+#: ../sales/includes/ui/sales_order_ui.inc:557
 msgid "Cancel"
 msgstr ""
 
@@ -2081,9 +2113,9 @@ msgstr ""
 
 #: ../admin/shipping_companies.php:15
 #: ../reporting/includes/doctext.inc:32
-#: ../sales/customer_credit_invoice.php:265
-#: ../sales/customer_delivery.php:366
-#: ../sales/customer_invoice.php:403
+#: ../sales/customer_credit_invoice.php:254
+#: ../sales/customer_delivery.php:354
+#: ../sales/customer_invoice.php:407
 #: ../sales/view/view_credit.php:74
 #: ../sales/view/view_dispatch.php:92
 #: ../sales/view/view_invoice.php:91
@@ -2330,7 +2362,7 @@ msgstr ""
 #: ../dimensions/inquiry/search_dimensions.php:88
 #: ../gl/inquiry/journal_inquiry.php:53
 #: ../manufacturing/search_work_orders.php:78
-#: ../purchasing/includes/ui/invoice_ui.inc:447
+#: ../purchasing/includes/ui/invoice_ui.inc:452
 #: ../purchasing/inquiry/po_search_completed.php:74
 #: ../purchasing/inquiry/po_search.php:76
 #: ../purchasing/inquiry/supplier_allocation_inquiry.php:57
@@ -2338,7 +2370,7 @@ msgstr ""
 #: ../sales/inquiry/customer_allocation_inquiry.php:51
 #: ../sales/inquiry/customer_inquiry.php:54
 #: ../sales/inquiry/sales_deliveries_view.php:116
-#: ../sales/inquiry/sales_orders_view.php:244
+#: ../sales/inquiry/sales_orders_view.php:238
 msgid "Search"
 msgstr ""
 
@@ -2355,7 +2387,7 @@ msgid ""
 msgstr ""
 
 #: ../admin/view_print_transaction.php:127
-#: ../admin/void_transaction.php:161
+#: ../admin/void_transaction.php:165
 #: ../dimensions/inquiry/search_dimensions.php:128
 #: ../dimensions/view/view_dimension.php:54
 #: ../gl/bank_account_reconcile.php:235
@@ -2393,12 +2425,12 @@ msgstr ""
 #: ../reporting/rep601.php:76
 #: ../reporting/rep702.php:51
 #: ../reporting/includes/doctext.inc:45
-#: ../sales/customer_credit_invoice.php:256
-#: ../sales/customer_credit_invoice.php:258
-#: ../sales/customer_delivery.php:346
-#: ../sales/customer_delivery.php:348
-#: ../sales/customer_invoice.php:382
-#: ../sales/customer_invoice.php:384
+#: ../sales/customer_credit_invoice.php:245
+#: ../sales/customer_credit_invoice.php:247
+#: ../sales/customer_delivery.php:334
+#: ../sales/customer_delivery.php:336
+#: ../sales/customer_invoice.php:386
+#: ../sales/customer_invoice.php:388
 #: ../sales/allocations/customer_allocation_main.php:95
 #: ../sales/view/view_dispatch.php:85
 #: ../sales/view/view_invoice.php:84
@@ -2409,16 +2441,16 @@ 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:374
+#: ../sales/includes/ui/sales_order_ui.inc:373
 msgid "Reference"
 msgstr ""
 
 #: ../admin/view_print_transaction.php:128
-#: ../admin/void_transaction.php:162
+#: ../admin/void_transaction.php:166
 #: ../dimensions/inquiry/search_dimensions.php:131
 #: ../dimensions/view/view_dimension.php:54
-#: ../gl/accruals.php:87
-#: ../gl/accruals.php:191
+#: ../gl/accruals.php:90
+#: ../gl/accruals.php:195
 #: ../gl/bank_account_reconcile.php:236
 #: ../gl/inquiry/bank_inquiry.php:67
 #: ../gl/inquiry/gl_account_inquiry.php:125
@@ -2461,8 +2493,8 @@ msgstr ""
 #: ../reporting/includes/doctext.inc:15
 #: ../reporting/includes/doctext.inc:108
 #: ../reporting/includes/doctext.inc:116
-#: ../sales/customer_delivery.php:376
-#: ../sales/customer_invoice.php:413
+#: ../sales/customer_delivery.php:364
+#: ../sales/customer_invoice.php:417
 #: ../sales/allocations/customer_allocation_main.php:96
 #: ../sales/view/view_credit.php:69
 #: ../sales/view/view_sales_order.php:95
@@ -2476,7 +2508,7 @@ msgid "Date"
 msgstr ""
 
 #: ../admin/view_print_transaction.php:130
-#: ../admin/void_transaction.php:163
+#: ../admin/void_transaction.php:167
 #: ../includes/ui/ui_view.inc:51
 msgid "GL"
 msgstr ""
@@ -2486,26 +2518,26 @@ msgid "Void a Transaction"
 msgstr ""
 
 #: ../admin/void_transaction.php:119
-#: ../admin/void_transaction.php:164
+#: ../admin/void_transaction.php:168
 #: ../includes/ui/ui_input.inc:136
 #: ../includes/ui/ui_input.inc:277
 #: ../includes/ui/ui_lists.inc:20
 msgid "Select"
 msgstr ""
 
-#: ../admin/void_transaction.php:147
+#: ../admin/void_transaction.php:151
 msgid "Transaction Type:"
 msgstr ""
 
-#: ../admin/void_transaction.php:183
+#: ../admin/void_transaction.php:187
 msgid "Transaction #:"
 msgstr ""
 
-#: ../admin/void_transaction.php:185
+#: ../admin/void_transaction.php:189
 msgid "Voiding Date:"
 msgstr ""
 
-#: ../admin/void_transaction.php:187
+#: ../admin/void_transaction.php:191
 #: ../dimensions/dimension_entry.php:283
 #: ../gl/bank_transfer.php:91
 #: ../gl/inquiry/journal_inquiry.php:56
@@ -2515,38 +2547,38 @@ msgstr ""
 #: ../manufacturing/work_order_entry.php:449
 #: ../manufacturing/work_order_release.php:100
 #: ../purchasing/includes/ui/invoice_ui.inc:161
-#: ../purchasing/po_entry_items.php:501
-#: ../purchasing/supplier_payment.php:298
+#: ../purchasing/po_entry_items.php:504
+#: ../purchasing/supplier_payment.php:308
 #: ../sales/customer_payments.php:291
 msgid "Memo:"
 msgstr ""
 
-#: ../admin/void_transaction.php:192
-#: ../admin/void_transaction.php:201
+#: ../admin/void_transaction.php:196
+#: ../admin/void_transaction.php:205
 msgid "Void Transaction"
 msgstr ""
 
-#: ../admin/void_transaction.php:197
-#: ../admin/void_transaction.php:276
+#: ../admin/void_transaction.php:201
+#: ../admin/void_transaction.php:280
 msgid "The entered transaction does not exist or cannot be voided."
 msgstr ""
 
-#: ../admin/void_transaction.php:205
+#: ../admin/void_transaction.php:209
 msgid ""
 "Are you sure you want to void this transaction ? This action cannot be "
 "undone."
 msgstr ""
 
-#: ../admin/void_transaction.php:207
+#: ../admin/void_transaction.php:211
 #: ../includes/ui/ui_controls.inc:560
 msgid "Proceed"
 msgstr ""
 
-#: ../admin/void_transaction.php:221
+#: ../admin/void_transaction.php:225
 msgid "The selected transaction was closed for edition and cannot be voided."
 msgstr ""
 
-#: ../admin/void_transaction.php:227
+#: ../admin/void_transaction.php:231
 #: ../gl/accruals.php:32
 #: ../gl/bank_transfer.php:108
 #: ../gl/gl_journal.php:154
@@ -2554,17 +2586,17 @@ msgstr ""
 #: ../gl/manage/revaluate_currencies.php:50
 #: ../manufacturing/work_order_add_finished.php:98
 #: ../manufacturing/work_order_costs.php:83
-#: ../purchasing/po_receive_items.php:170
+#: ../purchasing/po_receive_items.php:174
 #: ../purchasing/supplier_payment.php:179
 #: ../sales/customer_credit_invoice.php:89
 #: ../sales/sales_order_entry.php:335
 msgid "The entered date is invalid."
 msgstr ""
 
-#: ../admin/void_transaction.php:233
+#: ../admin/void_transaction.php:237
 #: ../gl/accruals.php:38
 #: ../gl/bank_transfer.php:114
-#: ../gl/gl_bank.php:247
+#: ../gl/gl_bank.php:256
 #: ../gl/gl_journal.php:160
 #: ../gl/manage/revaluate_currencies.php:56
 #: ../inventory/adjustments.php:114
@@ -2583,15 +2615,15 @@ msgstr ""
 msgid "The entered date is not in fiscal year."
 msgstr ""
 
-#: ../admin/void_transaction.php:240
+#: ../admin/void_transaction.php:244
 msgid "The transaction number is expected to be numeric and greater than zero."
 msgstr ""
 
-#: ../admin/void_transaction.php:257
+#: ../admin/void_transaction.php:261
 msgid "The selected transaction has already been voided."
 msgstr ""
 
-#: ../admin/void_transaction.php:270
+#: ../admin/void_transaction.php:274
 msgid "Selected transaction has been voided."
 msgstr ""
 
@@ -3244,8 +3276,8 @@ msgid "The dimension reference must be entered."
 msgstr ""
 
 #: ../dimensions/dimension_entry.php:123
-#: ../gl/bank_transfer.php:146
-#: ../gl/gl_bank.php:235
+#: ../gl/bank_transfer.php:155
+#: ../gl/gl_bank.php:244
 #: ../gl/gl_journal.php:174
 #: ../gl/manage/revaluate_currencies.php:69
 #: ../inventory/adjustments.php:101
@@ -3253,15 +3285,15 @@ msgstr ""
 #: ../manufacturing/work_order_add_finished.php:84
 #: ../manufacturing/work_order_entry.php:138
 #: ../manufacturing/work_order_issue.php:98
-#: ../purchasing/po_entry_items.php:353
-#: ../purchasing/po_receive_items.php:184
+#: ../purchasing/po_entry_items.php:356
+#: ../purchasing/po_receive_items.php:188
 #: ../purchasing/supplier_credit.php:156
 #: ../purchasing/supplier_invoice.php:154
-#: ../purchasing/supplier_payment.php:198
+#: ../purchasing/supplier_payment.php:208
 #: ../sales/credit_note_entry.php:149
 #: ../sales/customer_credit_invoice.php:106
-#: ../sales/customer_delivery.php:181
-#: ../sales/customer_invoice.php:285
+#: ../sales/customer_delivery.php:169
+#: ../sales/customer_invoice.php:280
 #: ../sales/customer_payments.php:112
 #: ../sales/sales_order_entry.php:404
 msgid "The entered reference is already in use."
@@ -3274,7 +3306,7 @@ msgstr ""
 #: ../dimensions/dimension_entry.php:138
 #: ../manufacturing/work_order_entry.php:153
 #: ../manufacturing/work_order_entry.php:233
-#: ../purchasing/po_entry_items.php:232
+#: ../purchasing/po_entry_items.php:235
 msgid "The date entered is in an invalid format."
 msgstr ""
 
@@ -3365,8 +3397,8 @@ 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:386
-#: ../purchasing/includes/ui/invoice_ui.inc:388
+#: ../purchasing/includes/ui/invoice_ui.inc:391
+#: ../purchasing/includes/ui/invoice_ui.inc:393
 msgid "Add"
 msgstr ""
 
@@ -3379,11 +3411,11 @@ msgid "Balance for this Dimension"
 msgstr ""
 
 #: ../dimensions/includes/dimensions_ui.inc:31
-#: ../gl/accruals.php:87
+#: ../gl/accruals.php:90
 #: ../gl/inquiry/gl_account_inquiry.php:128
 #: ../gl/inquiry/gl_trial_balance.php:83
 #: ../gl/manage/gl_quick_entries.php:241
-#: ../gl/manage/gl_quick_entries.php:334
+#: ../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
@@ -3397,7 +3429,7 @@ msgid "Account"
 msgstr ""
 
 #: ../dimensions/includes/dimensions_ui.inc:31
-#: ../gl/accruals.php:95
+#: ../gl/accruals.php:98
 #: ../gl/bank_account_reconcile.php:237
 #: ../gl/inquiry/bank_inquiry.php:68
 #: ../gl/inquiry/gl_account_inquiry.php:140
@@ -3427,7 +3459,7 @@ msgid "Debit"
 msgstr ""
 
 #: ../dimensions/includes/dimensions_ui.inc:31
-#: ../gl/accruals.php:95
+#: ../gl/accruals.php:98
 #: ../gl/bank_account_reconcile.php:238
 #: ../gl/inquiry/bank_inquiry.php:68
 #: ../gl/inquiry/gl_account_inquiry.php:140
@@ -3500,14 +3532,14 @@ msgstr ""
 #: ../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:271
+#: ../purchasing/supplier_payment.php:281
 #: ../sales/customer_payments.php:258
 msgid "Reference:"
 msgstr ""
 
 #: ../dimensions/inquiry/search_dimensions.php:75
 #: ../includes/ui/allocation_cart.inc:284
-#: ../includes/ui/ui_lists.inc:1885
+#: ../includes/ui/ui_lists.inc:1887
 #: ../reporting/rep101.php:112
 #: ../reporting/rep102.php:88
 #: ../reporting/rep104.php:95
@@ -3584,12 +3616,12 @@ msgstr ""
 #: ../reporting/rep501.php:85
 #: ../reporting/includes/doctext.inc:38
 #: ../reporting/includes/doctext.inc:108
-#: ../sales/customer_invoice.php:420
+#: ../sales/customer_invoice.php:424
 #: ../sales/view/view_dispatch.php:97
 #: ../sales/view/view_invoice.php:96
 #: ../sales/inquiry/customer_allocation_inquiry.php:146
 #: ../sales/inquiry/customer_inquiry.php:217
-#: ../sales/includes/ui/sales_order_ui.inc:596
+#: ../sales/includes/ui/sales_order_ui.inc:593
 #: ../themes/exclusive/renderer.php:289
 #: ../themes/exclusive/renderer.php:383
 msgid "Due Date"
@@ -3618,7 +3650,7 @@ msgstr ""
 #: ../purchasing/inquiry/po_search.php:64
 #: ../sales/inquiry/customer_allocation_inquiry.php:44
 #: ../sales/inquiry/sales_deliveries_view.php:104
-#: ../sales/inquiry/sales_orders_view.php:229
+#: ../sales/inquiry/sales_orders_view.php:221
 msgid "from:"
 msgstr ""
 
@@ -3629,7 +3661,7 @@ msgstr ""
 #: ../purchasing/inquiry/po_search.php:65
 #: ../sales/inquiry/customer_allocation_inquiry.php:45
 #: ../sales/inquiry/sales_deliveries_view.php:105
-#: ../sales/inquiry/sales_orders_view.php:230
+#: ../sales/inquiry/sales_orders_view.php:222
 msgid "to:"
 msgstr ""
 
@@ -3656,16 +3688,21 @@ msgstr ""
 msgid "The periods must be greater than 0."
 msgstr ""
 
-#: ../gl/accruals.php:64
+#: ../gl/accruals.php:67
 msgid ""
 "Some of the period dates are outside the fiscal year. Create a new fiscal "
 "year first!"
 msgstr ""
 
-#: ../gl/accruals.php:89
-#: ../gl/accruals.php:91
-#: ../gl/accruals.php:199
-#: ../gl/accruals.php:201
+#: ../gl/accruals.php:82
+#, php-format
+msgid "Accruals for %s"
+msgstr ""
+
+#: ../gl/accruals.php:92
+#: ../gl/accruals.php:94
+#: ../gl/accruals.php:203
+#: ../gl/accruals.php:205
 #: ../gl/gl_budget.php:71
 #: ../gl/gl_budget.php:72
 #: ../gl/gl_budget.php:76
@@ -3679,10 +3716,10 @@ msgstr ""
 #: ../gl/inquiry/gl_trial_balance.php:51
 #: ../gl/inquiry/profit_loss.php:174
 #: ../gl/inquiry/profit_loss.php:176
-#: ../gl/manage/gl_quick_entries.php:262
-#: ../gl/manage/gl_quick_entries.php:264
-#: ../gl/manage/gl_quick_entries.php:344
-#: ../gl/manage/gl_quick_entries.php:346
+#: ../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
@@ -3741,23 +3778,23 @@ msgstr ""
 #: ../reporting/reports_main.php:316
 #: ../reporting/reports_main.php:326
 #: ../reporting/reports_main.php:337
-#: ../sales/customer_delivery.php:393
-#: ../sales/customer_delivery.php:401
-#: ../sales/customer_invoice.php:395
-#: ../sales/customer_invoice.php:422
+#: ../sales/customer_delivery.php:381
+#: ../sales/customer_delivery.php:389
+#: ../sales/customer_invoice.php:399
+#: ../sales/customer_invoice.php:426
 #: ../sales/manage/customers.php:234
 #: ../sales/manage/customers.php:236
 #: ../sales/includes/ui/sales_credit_ui.inc:132
 #: ../sales/includes/ui/sales_credit_ui.inc:137
-#: ../sales/includes/ui/sales_order_ui.inc:454
-#: ../sales/includes/ui/sales_order_ui.inc:459
+#: ../sales/includes/ui/sales_order_ui.inc:451
+#: ../sales/includes/ui/sales_order_ui.inc:456
 #: ../themes/exclusive/renderer.php:488
 #: ../themes/exclusive/renderer.php:506
 msgid "Dimension"
 msgstr ""
 
-#: ../gl/accruals.php:95
-#: ../gl/accruals.php:209
+#: ../gl/accruals.php:98
+#: ../gl/accruals.php:213
 #: ../gl/inquiry/gl_account_inquiry.php:140
 #: ../gl/inquiry/gl_account_inquiry.php:142
 #: ../gl/inquiry/journal_inquiry.php:126
@@ -3785,30 +3822,30 @@ msgstr ""
 #: ../purchasing/includes/ui/invoice_ui.inc:245
 #: ../purchasing/includes/ui/invoice_ui.inc:247
 #: ../purchasing/includes/ui/invoice_ui.inc:249
-#: ../sales/customer_credit_invoice.php:375
-#: ../sales/customer_delivery.php:517
-#: ../sales/customer_invoice.php:551
+#: ../sales/customer_credit_invoice.php:364
+#: ../sales/customer_delivery.php:505
+#: ../sales/customer_invoice.php:555
 #: ../sales/includes/ui/sales_credit_ui.inc:339
 msgid "Memo"
 msgstr ""
 
-#: ../gl/accruals.php:158
+#: ../gl/accruals.php:162
 msgid "Revenue / Cost Accruals have been processed."
 msgstr ""
 
-#: ../gl/accruals.php:164
+#: ../gl/accruals.php:168
 msgid "Showing GL Transactions."
 msgstr ""
 
-#: ../gl/accruals.php:176
+#: ../gl/accruals.php:180
 msgid "Weekly"
 msgstr ""
 
-#: ../gl/accruals.php:177
+#: ../gl/accruals.php:181
 msgid "Bi-weekly"
 msgstr ""
 
-#: ../gl/accruals.php:178
+#: ../gl/accruals.php:182
 #: ../gl/manage/gl_quick_entries.php:240
 #: ../gl/includes/ui/gl_journal_ui.inc:57
 #: ../sales/create_recurrent_invoices.php:98
@@ -3816,31 +3853,31 @@ msgstr ""
 msgid "Monthly"
 msgstr ""
 
-#: ../gl/accruals.php:179
+#: ../gl/accruals.php:183
 msgid "Quarterly"
 msgstr ""
 
-#: ../gl/accruals.php:191
+#: ../gl/accruals.php:195
 msgid "First date of Accruals"
 msgstr ""
 
-#: ../gl/accruals.php:193
+#: ../gl/accruals.php:197
 msgid "Accrued Balance Account"
 msgstr ""
 
-#: ../gl/accruals.php:196
+#: ../gl/accruals.php:200
 msgid "Revenue / Cost Account"
 msgstr ""
 
-#: ../gl/accruals.php:204
+#: ../gl/accruals.php:208
 #: ../gl/gl_budget.php:91
 #: ../gl/gl_budget.php:93
 #: ../gl/inquiry/journal_inquiry.php:125
 #: ../gl/inquiry/tax_inquiry.php:82
-#: ../gl/manage/gl_quick_entries.php:262
-#: ../gl/manage/gl_quick_entries.php:264
-#: ../gl/manage/gl_quick_entries.php:266
-#: ../gl/manage/gl_quick_entries.php:340
+#: ../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
@@ -3882,27 +3919,27 @@ msgstr ""
 msgid "Amount"
 msgstr ""
 
-#: ../gl/accruals.php:204
+#: ../gl/accruals.php:208
 msgid "Search Amount"
 msgstr ""
 
-#: ../gl/accruals.php:206
+#: ../gl/accruals.php:210
 msgid "Frequency"
 msgstr ""
 
-#: ../gl/accruals.php:208
+#: ../gl/accruals.php:212
 msgid "Periods"
 msgstr ""
 
-#: ../gl/accruals.php:212
+#: ../gl/accruals.php:216
 msgid "Show GL Rows"
 msgstr ""
 
-#: ../gl/accruals.php:213
+#: ../gl/accruals.php:217
 msgid "Process Accruals"
 msgstr ""
 
-#: ../gl/accruals.php:214
+#: ../gl/accruals.php:218
 msgid "Are you sure you want to post accruals?"
 msgstr ""
 
@@ -4024,7 +4061,7 @@ msgstr ""
 
 #: ../gl/bank_transfer.php:77
 #: ../gl/bank_transfer.php:84
-#: ../purchasing/supplier_payment.php:284
+#: ../purchasing/supplier_payment.php:294
 #: ../sales/customer_payments.php:274
 msgid "Bank Charge:"
 msgstr ""
@@ -4034,21 +4071,26 @@ msgid "Enter Transfer"
 msgstr ""
 
 #: ../gl/bank_transfer.php:121
-#: ../gl/bank_transfer.php:128
+#: ../gl/bank_transfer.php:137
 #: ../purchasing/supplier_payment.php:130
 #: ../purchasing/supplier_payment.php:136
 msgid "The entered amount is invalid or less than zero."
 msgstr ""
 
-#: ../gl/bank_transfer.php:133
+#: ../gl/bank_transfer.php:130
+#, php-format
+msgid "The total bank amount exceeds allowed limit (%s) for source account."
+msgstr ""
+
+#: ../gl/bank_transfer.php:142
 #: ../purchasing/supplier_payment.php:144
 #: ../sales/customer_payments.php:131
 msgid ""
 "The Bank Charge Account has not been set in System and General GL Setup."
 msgstr ""
 
-#: ../gl/bank_transfer.php:139
-#: ../gl/gl_bank.php:229
+#: ../gl/bank_transfer.php:148
+#: ../gl/gl_bank.php:238
 #: ../gl/gl_journal.php:166
 #: ../gl/manage/revaluate_currencies.php:62
 #: ../inventory/adjustments.php:94
@@ -4056,18 +4098,18 @@ msgstr ""
 #: ../manufacturing/work_order_add_finished.php:77
 #: ../manufacturing/work_order_entry.php:131
 #: ../manufacturing/work_order_issue.php:91
-#: ../purchasing/po_receive_items.php:177
-#: ../purchasing/supplier_payment.php:191
+#: ../purchasing/po_receive_items.php:181
+#: ../purchasing/supplier_payment.php:201
 #: ../sales/credit_note_entry.php:145
 #: ../sales/customer_credit_invoice.php:100
-#: ../sales/customer_delivery.php:175
-#: ../sales/customer_invoice.php:279
+#: ../sales/customer_delivery.php:163
+#: ../sales/customer_invoice.php:274
 #: ../sales/customer_payments.php:106
 #: ../sales/sales_order_entry.php:398
 msgid "You must enter a reference."
 msgstr ""
 
-#: ../gl/bank_transfer.php:153
+#: ../gl/bank_transfer.php:162
 msgid "The source and destination bank accouts cannot be the same."
 msgstr ""
 
@@ -4087,6 +4129,11 @@ msgstr ""
 msgid "Modify Bank Deposit Entry"
 msgstr ""
 
+#: ../gl/gl_bank.php:72
+#, php-format
+msgid "Payment %d has been entered"
+msgstr ""
+
 #: ../gl/gl_bank.php:74
 #: ../gl/gl_bank.php:90
 msgid "&View the GL Postings for this Payment"
@@ -4102,6 +4149,11 @@ msgstr ""
 msgid "Enter A &Deposit"
 msgstr ""
 
+#: ../gl/gl_bank.php:104
+#, php-format
+msgid "Deposit %d has been entered"
+msgstr ""
+
 #: ../gl/gl_bank.php:106
 msgid "View the GL Postings for this Deposit"
 msgstr ""
@@ -4134,35 +4186,41 @@ msgstr ""
 msgid "The total bank amount cannot be 0."
 msgstr ""
 
-#: ../gl/gl_bank.php:241
+#: ../gl/gl_bank.php:231
+#: ../purchasing/supplier_payment.php:194
+#, php-format
+msgid "The total bank amount exceeds allowed limit (%s)."
+msgstr ""
+
+#: ../gl/gl_bank.php:250
 msgid "The entered date for the payment is invalid."
 msgstr ""
 
-#: ../gl/gl_bank.php:253
+#: ../gl/gl_bank.php:262
 msgid "You have to select customer and customer branch."
 msgstr ""
 
-#: ../gl/gl_bank.php:257
+#: ../gl/gl_bank.php:266
 msgid "You have to select supplier."
 msgstr ""
 
-#: ../gl/gl_bank.php:303
+#: ../gl/gl_bank.php:312
 msgid "The amount entered is not a valid number or is less than zero."
 msgstr ""
 
-#: ../gl/gl_bank.php:375
+#: ../gl/gl_bank.php:384
 msgid "Payment Items"
 msgstr ""
 
-#: ../gl/gl_bank.php:375
+#: ../gl/gl_bank.php:384
 msgid "Deposit Items"
 msgstr ""
 
-#: ../gl/gl_bank.php:383
+#: ../gl/gl_bank.php:392
 msgid "Process Payment"
 msgstr ""
 
-#: ../gl/gl_bank.php:383
+#: ../gl/gl_bank.php:392
 msgid "Process Deposit"
 msgstr ""
 
@@ -4252,9 +4310,9 @@ msgstr ""
 #: ../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:468
-#: ../purchasing/includes/ui/invoice_ui.inc:538
-#: ../purchasing/po_receive_items.php:59
+#: ../purchasing/includes/ui/invoice_ui.inc:473
+#: ../purchasing/includes/ui/invoice_ui.inc:543
+#: ../purchasing/po_receive_items.php:63
 #: ../purchasing/view/view_po.php:140
 #: ../purchasing/allocations/supplier_allocation_main.php:100
 #: ../reporting/rep101.php:237
@@ -4284,9 +4342,9 @@ msgstr ""
 #: ../reporting/rep708.php:182
 #: ../reporting/includes/doctext.inc:103
 #: ../reporting/includes/doctext.inc:111
-#: ../sales/customer_credit_invoice.php:292
-#: ../sales/customer_delivery.php:431
-#: ../sales/customer_invoice.php:443
+#: ../sales/customer_credit_invoice.php:281
+#: ../sales/customer_delivery.php:419
+#: ../sales/customer_invoice.php:447
 #: ../sales/allocations/customer_allocation_main.php:99
 #: ../sales/view/view_credit.php:91
 #: ../sales/view/view_dispatch.php:113
@@ -4296,7 +4354,7 @@ msgstr ""
 #: ../sales/view/view_sales_order.php:160
 #: ../sales/view/view_sales_order.php:201
 #: ../sales/includes/ui/sales_credit_ui.inc:168
-#: ../sales/includes/ui/sales_order_ui.inc:143
+#: ../sales/includes/ui/sales_order_ui.inc:142
 #: ../themes/exclusive/renderer.php:290
 #: ../themes/exclusive/renderer.php:383
 msgid "Total"
@@ -4371,7 +4429,7 @@ msgid "The credit amount entered is not a valid number or is less than zero."
 msgstr ""
 
 #: ../gl/gl_journal.php:241
-#: ../includes/ui/ui_view.inc:646
+#: ../includes/ui/ui_view.inc:647
 #: ../purchasing/supplier_credit.php:119
 #: ../purchasing/supplier_invoice.php:119
 msgid "Cannot post to GL account used by more than one tax type."
@@ -4687,9 +4745,9 @@ msgstr ""
 #: ../reporting/rep201.php:126
 #: ../reporting/rep202.php:126
 #: ../reporting/rep203.php:99
-#: ../sales/customer_credit_invoice.php:248
-#: ../sales/customer_delivery.php:338
-#: ../sales/customer_invoice.php:392
+#: ../sales/customer_credit_invoice.php:237
+#: ../sales/customer_delivery.php:326
+#: ../sales/customer_invoice.php:396
 #: ../sales/allocations/customer_allocation_main.php:98
 #: ../sales/allocations/customer_allocation_main.php:106
 #: ../sales/view/view_credit.php:70
@@ -4701,8 +4759,8 @@ msgstr ""
 #: ../sales/inquiry/customer_inquiry.php:220
 #: ../sales/inquiry/customer_inquiry.php:233
 #: ../sales/inquiry/sales_deliveries_view.php:189
-#: ../sales/inquiry/sales_orders_view.php:268
-#: ../sales/inquiry/sales_orders_view.php:282
+#: ../sales/inquiry/sales_orders_view.php:263
+#: ../sales/inquiry/sales_orders_view.php:277
 #: ../themes/exclusive/renderer.php:289
 #: ../themes/exclusive/renderer.php:383
 msgid "Currency"
@@ -5213,8 +5271,6 @@ msgid "Selected quick entry line has been deleted"
 msgstr ""
 
 #: ../gl/manage/gl_quick_entries.php:171
-#: ../gl/manage/gl_quick_entries.php:245
-#: ../gl/manage/gl_quick_entries.php:246
 msgid "Base Amount"
 msgstr ""
 
@@ -5231,41 +5287,41 @@ msgstr ""
 msgid "Yearly"
 msgstr ""
 
-#: ../gl/manage/gl_quick_entries.php:246
+#: ../gl/manage/gl_quick_entries.php:245
 msgid "Base Amount Description"
 msgstr ""
 
-#: ../gl/manage/gl_quick_entries.php:247
+#: ../gl/manage/gl_quick_entries.php:246
 msgid "Default Base Amount"
 msgstr ""
 
-#: ../gl/manage/gl_quick_entries.php:256
+#: ../gl/manage/gl_quick_entries.php:255
 msgid "Quick Entry Lines"
 msgstr ""
 
-#: ../gl/manage/gl_quick_entries.php:262
-#: ../gl/manage/gl_quick_entries.php:264
-#: ../gl/manage/gl_quick_entries.php:266
+#: ../gl/manage/gl_quick_entries.php:261
+#: ../gl/manage/gl_quick_entries.php:263
+#: ../gl/manage/gl_quick_entries.php:265
 msgid "Post"
 msgstr ""
 
-#: ../gl/manage/gl_quick_entries.php:262
-#: ../gl/manage/gl_quick_entries.php:264
-#: ../gl/manage/gl_quick_entries.php:266
+#: ../gl/manage/gl_quick_entries.php:261
+#: ../gl/manage/gl_quick_entries.php:263
+#: ../gl/manage/gl_quick_entries.php:265
 msgid "Account/Tax Type"
 msgstr ""
 
-#: ../gl/manage/gl_quick_entries.php:321
+#: ../gl/manage/gl_quick_entries.php:320
 msgid "Posted"
 msgstr ""
 
-#: ../gl/manage/gl_quick_entries.php:330
-#: ../sales/customer_delivery.php:431
-#: ../sales/customer_invoice.php:443
+#: ../gl/manage/gl_quick_entries.php:329
+#: ../sales/customer_delivery.php:419
+#: ../sales/customer_invoice.php:447
 msgid "Tax Type"
 msgstr ""
 
-#: ../gl/manage/gl_quick_entries.php:338
+#: ../gl/manage/gl_quick_entries.php:337
 msgid "Part"
 msgstr ""
 
@@ -5463,6 +5519,12 @@ msgstr ""
 msgid "To"
 msgstr ""
 
+#: ../gl/includes/db/gl_db_rates.inc:128
+#, php-format
+msgid ""
+"Cannot retrieve currency rate from %s page. Please set the rate manually."
+msgstr ""
+
 #: ../gl/includes/ui/gl_bank_ui.inc:25
 #: ../gl/includes/ui/gl_journal_ui.inc:27
 #: ../inventory/includes/item_adjustments_ui.inc:39
@@ -5496,7 +5558,7 @@ msgstr ""
 #: ../gl/includes/ui/gl_bank_ui.inc:65
 #: ../sales/manage/recurrent_invoices.php:151
 #: ../sales/includes/ui/sales_credit_ui.inc:29
-#: ../sales/includes/ui/sales_order_ui.inc:279
+#: ../sales/includes/ui/sales_order_ui.inc:278
 msgid "Customer:"
 msgstr ""
 
@@ -5504,7 +5566,7 @@ msgstr ""
 #: ../sales/customer_payments.php:239
 #: ../sales/manage/recurrent_invoices.php:154
 #: ../sales/includes/ui/sales_credit_ui.inc:37
-#: ../sales/includes/ui/sales_order_ui.inc:286
+#: ../sales/includes/ui/sales_order_ui.inc:285
 msgid "Branch:"
 msgstr ""
 
@@ -5520,10 +5582,10 @@ msgstr ""
 #: ../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:514
+#: ../purchasing/includes/ui/invoice_ui.inc:519
 #: ../purchasing/includes/ui/po_ui.inc:267
 #: ../sales/includes/ui/sales_credit_ui.inc:198
-#: ../sales/includes/ui/sales_order_ui.inc:204
+#: ../sales/includes/ui/sales_order_ui.inc:203
 msgid "Edit document line"
 msgstr ""
 
@@ -5535,7 +5597,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:206
+#: ../sales/includes/ui/sales_order_ui.inc:205
 msgid "Remove line from document"
 msgstr ""
 
@@ -5547,7 +5609,7 @@ msgstr ""
 #: ../manufacturing/includes/work_order_issue_ui.inc:128
 #: ../purchasing/includes/ui/po_ui.inc:435
 #: ../sales/includes/ui/sales_credit_ui.inc:294
-#: ../sales/includes/ui/sales_order_ui.inc:559
+#: ../sales/includes/ui/sales_order_ui.inc:556
 msgid "Confirm changes"
 msgstr ""
 
@@ -5559,7 +5621,7 @@ msgstr ""
 #: ../manufacturing/includes/work_order_issue_ui.inc:130
 #: ../purchasing/includes/ui/po_ui.inc:437
 #: ../sales/includes/ui/sales_credit_ui.inc:296
-#: ../sales/includes/ui/sales_order_ui.inc:561
+#: ../sales/includes/ui/sales_order_ui.inc:558
 msgid "Cancel changes"
 msgstr ""
 
@@ -5570,7 +5632,7 @@ msgstr ""
 #: ../manufacturing/includes/work_order_issue_ui.inc:136
 #: ../purchasing/includes/ui/po_ui.inc:443
 #: ../sales/includes/ui/sales_credit_ui.inc:302
-#: ../sales/includes/ui/sales_order_ui.inc:567
+#: ../sales/includes/ui/sales_order_ui.inc:564
 msgid "Add Item"
 msgstr ""
 
@@ -5580,7 +5642,7 @@ msgstr ""
 #: ../manufacturing/includes/work_order_issue_ui.inc:137
 #: ../purchasing/includes/ui/po_ui.inc:444
 #: ../sales/includes/ui/sales_credit_ui.inc:303
-#: ../sales/includes/ui/sales_order_ui.inc:568
+#: ../sales/includes/ui/sales_order_ui.inc:565
 msgid "Add new item to document"
 msgstr ""
 
@@ -5662,7 +5724,7 @@ msgid "Manufacturing configuration"
 msgstr ""
 
 #: ../includes/access_levels.inc:69
-msgid "Manufacturing transations"
+msgid "Manufacturing transactions"
 msgstr ""
 
 #: ../includes/access_levels.inc:70
@@ -6162,7 +6224,7 @@ msgstr ""
 
 #: ../includes/current_user.inc:80
 #: ../includes/ui/ui_controls.inc:174
-#: ../includes/ui/ui_view.inc:842
+#: ../includes/ui/ui_view.inc:843
 msgid "Back"
 msgstr ""
 
@@ -6174,23 +6236,23 @@ msgstr ""
 msgid "Requesting data..."
 msgstr ""
 
-#: ../includes/errors.inc:73
+#: ../includes/errors.inc:76
 msgid "in file"
 msgstr ""
 
-#: ../includes/errors.inc:73
+#: ../includes/errors.inc:76
 msgid "at line "
 msgstr ""
 
-#: ../includes/errors.inc:120
+#: ../includes/errors.inc:123
 msgid "Debug mode database warning:"
 msgstr ""
 
-#: ../includes/errors.inc:122
+#: ../includes/errors.inc:125
 msgid "DATABASE ERROR :"
 msgstr ""
 
-#: ../includes/errors.inc:153
+#: ../includes/errors.inc:156
 msgid ""
 "The entered information is a duplicate. Please go back and enter different "
 "values."
@@ -6200,78 +6262,91 @@ msgstr ""
 msgid "This page is usable only with javascript enabled browsers."
 msgstr ""
 
-#: ../includes/packages.inc:294
+#: ../includes/packages.inc:190
+#, php-format
+msgid "No key field '%s' in file '%s'"
+msgstr ""
+
+#: ../includes/packages.inc:295
 msgid "Release file in repository is invalid, or public key is outdated."
 msgstr ""
 
-#: ../includes/packages.inc:310
+#: ../includes/packages.inc:311
 msgid "Repository version does not match application version."
 msgstr ""
 
-#: ../includes/packages.inc:324
+#: ../includes/packages.inc:325
 #, php-format
 msgid ""
 "Security alert: broken index file in repository '%s'. Please inform "
 "repository administrator about this issue."
 msgstr ""
 
-#: ../includes/packages.inc:357
+#: ../includes/packages.inc:358
 #, php-format
 msgid ""
 "Security alert: broken package '%s' in repository. Please inform repository "
 "administrator about this issue."
 msgstr ""
 
-#: ../includes/packages.inc:612
-#: ../includes/packages.inc:663
+#: ../includes/packages.inc:613
+#: ../includes/packages.inc:664
 #, php-format
 msgid "Package '%s' not found."
 msgstr ""
 
+#: ../includes/sav.session.inc:39
 #: ../includes/session.inc:39
 msgid "Incorrect Password"
 msgstr ""
 
+#: ../includes/sav.session.inc:40
 #: ../includes/session.inc:40
 msgid "The user and password combination is not valid for the system."
 msgstr ""
 
+#: ../includes/sav.session.inc:42
 #: ../includes/session.inc:42
 msgid ""
 "If you are not an authorized user, please contact your system administrator "
 "to obtain an account to enable you to use the system."
 msgstr ""
 
+#: ../includes/sav.session.inc:43
 #: ../includes/session.inc:43
 msgid "Try again"
 msgstr ""
 
+#: ../includes/sav.session.inc:58
 #: ../includes/session.inc:62
 msgid "Security settings have not been defined for your user account."
 msgstr ""
 
+#: ../includes/sav.session.inc:59
 #: ../includes/session.inc:63
 msgid "Please contact your system administrator."
 msgstr ""
 
+#: ../includes/sav.session.inc:60
 #: ../includes/session.inc:64
 msgid ""
 "Please remove $security_groups and $security_headings arrays from config.php "
 "file!"
 msgstr ""
 
-#: ../includes/session.inc:66
-msgid ""
-"Access to application has been blocked until database upgrade is completed "
-"by system administrator."
-msgstr ""
-
+#: ../includes/sav.session.inc:72
 #: ../includes/session.inc:80
 msgid ""
 "The security settings on your account do not permit you to access this "
 "function"
 msgstr ""
 
+#: ../includes/session.inc:66
+msgid ""
+"Access to application has been blocked until database upgrade is completed "
+"by system administrator."
+msgstr ""
+
 #: ../includes/session.inc:89
 msgid ""
 "System is blocked after source upgrade until database is updated on System/"
@@ -6361,7 +6436,7 @@ msgid "Sales Order"
 msgstr ""
 
 #: ../includes/sysnames.inc:41
-#: ../sales/sales_order_entry.php:592
+#: ../sales/sales_order_entry.php:591
 msgid "Sales Quotation"
 msgstr ""
 
@@ -6398,7 +6473,7 @@ msgid "CP"
 msgstr ""
 
 #: ../includes/sysnames.inc:54
-#: ../sales/customer_invoice.php:446
+#: ../sales/customer_invoice.php:450
 msgid "DN"
 msgstr ""
 
@@ -6503,9 +6578,9 @@ msgstr ""
 #: ../reporting/reports_main.php:94
 #: ../reporting/reports_main.php:193
 #: ../sales/create_recurrent_invoices.php:98
-#: ../sales/customer_credit_invoice.php:246
-#: ../sales/customer_delivery.php:336
-#: ../sales/customer_invoice.php:367
+#: ../sales/customer_credit_invoice.php:235
+#: ../sales/customer_delivery.php:324
+#: ../sales/customer_invoice.php:372
 #: ../sales/allocations/customer_allocation_main.php:97
 #: ../sales/allocations/customer_allocation_main.php:105
 #: ../sales/manage/recurrent_invoices.php:85
@@ -6515,8 +6590,8 @@ msgstr ""
 #: ../sales/inquiry/customer_inquiry.php:218
 #: ../sales/inquiry/customer_inquiry.php:232
 #: ../sales/inquiry/sales_deliveries_view.php:180
-#: ../sales/inquiry/sales_orders_view.php:260
-#: ../sales/inquiry/sales_orders_view.php:274
+#: ../sales/inquiry/sales_orders_view.php:255
+#: ../sales/inquiry/sales_orders_view.php:269
 #: ../themes/exclusive/renderer.php:236
 #: ../themes/exclusive/renderer.php:254
 #: ../themes/exclusive/renderer.php:289
@@ -6983,23 +7058,26 @@ msgid ""
 "trail record."
 msgstr ""
 
-#: ../includes/db/inventory_db.inc:227
-#, php-format
-msgid "Cost was %s changed to %s for item '%s'"
-msgstr ""
-
-#: ../includes/db/inventory_db.inc:285
+#: ../includes/db/inventory_db.inc:280
+#: ../includes/db/inventory_db.inc.old:285
 msgid "Cost was "
 msgstr ""
 
-#: ../includes/db/inventory_db.inc:285
+#: ../includes/db/inventory_db.inc:280
+#: ../includes/db/inventory_db.inc.old:285
 msgid " changed to "
 msgstr ""
 
-#: ../includes/db/inventory_db.inc:285
+#: ../includes/db/inventory_db.inc:280
+#: ../includes/db/inventory_db.inc.old:285
 msgid " for item "
 msgstr ""
 
+#: ../includes/db/inventory_db.inc.old:227
+#, php-format
+msgid "Cost was %s changed to %s for item '%s'"
+msgstr ""
+
 #: ../includes/ui/allocation_cart.inc:263
 #: ../purchasing/allocations/supplier_allocation_main.php:94
 #: ../sales/allocations/customer_allocation_main.php:93
@@ -7015,9 +7093,9 @@ msgstr ""
 #: ../sales/view/view_sales_order.php:95
 #: ../sales/view/view_sales_order.php:128
 #: ../sales/view/view_sales_order.php:160
-#: ../sales/inquiry/sales_orders_view.php:228
-#: ../sales/inquiry/sales_orders_view.php:259
-#: ../sales/inquiry/sales_orders_view.php:273
+#: ../sales/inquiry/sales_orders_view.php:218
+#: ../sales/inquiry/sales_orders_view.php:254
+#: ../sales/inquiry/sales_orders_view.php:268
 msgid "Ref"
 msgstr ""
 
@@ -7238,7 +7316,7 @@ msgid "Click Here to Pick up the date"
 msgstr ""
 
 #: ../includes/ui/ui_input.inc:904
-#: ../includes/ui/ui_lists.inc:2118
+#: ../includes/ui/ui_lists.inc:2120
 #: ../reporting/rep301.php:147
 #: ../reporting/rep302.php:166
 #: ../reporting/rep303.php:170
@@ -7320,97 +7398,97 @@ msgstr ""
 msgid "Use Item Sales Accounts"
 msgstr ""
 
-#: ../includes/ui/ui_lists.inc:1902
-#: ../includes/ui/ui_lists.inc:1919
-#: ../includes/ui/ui_lists.inc:1936
+#: ../includes/ui/ui_lists.inc:1904
+#: ../includes/ui/ui_lists.inc:1921
+#: ../includes/ui/ui_lists.inc:1938
 msgid "All Types"
 msgstr ""
 
-#: ../includes/ui/ui_lists.inc:1903
+#: ../includes/ui/ui_lists.inc:1905
 #: ../sales/view/view_sales_order.php:126
 msgid "Sales Invoices"
 msgstr ""
 
-#: ../includes/ui/ui_lists.inc:1904
-#: ../includes/ui/ui_lists.inc:1921
-#: ../includes/ui/ui_lists.inc:1939
+#: ../includes/ui/ui_lists.inc:1906
+#: ../includes/ui/ui_lists.inc:1923
+#: ../includes/ui/ui_lists.inc:1941
 msgid "Overdue Invoices"
 msgstr ""
 
-#: ../includes/ui/ui_lists.inc:1905
-#: ../includes/ui/ui_lists.inc:1922
-#: ../includes/ui/ui_lists.inc:1940
+#: ../includes/ui/ui_lists.inc:1907
+#: ../includes/ui/ui_lists.inc:1924
+#: ../includes/ui/ui_lists.inc:1942
 msgid "Payments"
 msgstr ""
 
-#: ../includes/ui/ui_lists.inc:1906
-#: ../includes/ui/ui_lists.inc:1923
-#: ../includes/ui/ui_lists.inc:1941
+#: ../includes/ui/ui_lists.inc:1908
+#: ../includes/ui/ui_lists.inc:1925
+#: ../includes/ui/ui_lists.inc:1943
 #: ../sales/view/view_sales_order.php:157
 msgid "Credit Notes"
 msgstr ""
 
-#: ../includes/ui/ui_lists.inc:1907
+#: ../includes/ui/ui_lists.inc:1909
 #: ../sales/view/view_sales_order.php:92
 msgid "Delivery Notes"
 msgstr ""
 
-#: ../includes/ui/ui_lists.inc:1920
-#: ../includes/ui/ui_lists.inc:1938
+#: ../includes/ui/ui_lists.inc:1922
+#: ../includes/ui/ui_lists.inc:1940
 msgid "Invoices"
 msgstr ""
 
-#: ../includes/ui/ui_lists.inc:1924
-#: ../includes/ui/ui_lists.inc:1942
+#: ../includes/ui/ui_lists.inc:1926
+#: ../includes/ui/ui_lists.inc:1944
 msgid "Overdue Credit Notes"
 msgstr ""
 
-#: ../includes/ui/ui_lists.inc:1937
+#: ../includes/ui/ui_lists.inc:1939
 msgid "GRNs"
 msgstr ""
 
-#: ../includes/ui/ui_lists.inc:1955
+#: ../includes/ui/ui_lists.inc:1957
 msgid "Automatically put balance on back order"
 msgstr ""
 
-#: ../includes/ui/ui_lists.inc:1956
+#: ../includes/ui/ui_lists.inc:1958
 msgid "Cancel any quantites not delivered"
 msgstr ""
 
-#: ../includes/ui/ui_lists.inc:1973
+#: ../includes/ui/ui_lists.inc:1975
 msgid "Items Returned to Inventory Location"
 msgstr ""
 
-#: ../includes/ui/ui_lists.inc:1974
+#: ../includes/ui/ui_lists.inc:1976
 msgid "Items Written Off"
 msgstr ""
 
-#: ../includes/ui/ui_lists.inc:2144
+#: ../includes/ui/ui_lists.inc:2146
 msgid "New role"
 msgstr ""
 
-#: ../includes/ui/ui_lists.inc:2202
+#: ../includes/ui/ui_lists.inc:2204
 msgid "No tags defined."
 msgstr ""
 
-#: ../includes/ui/ui_lists.inc:2202
+#: ../includes/ui/ui_lists.inc:2204
 msgid "No active tags defined."
 msgstr ""
 
-#: ../includes/ui/ui_lists.inc:2240
+#: ../includes/ui/ui_lists.inc:2242
 #, php-format
 msgid "Activated for '%s'"
 msgstr ""
 
-#: ../includes/ui/ui_lists.inc:2243
+#: ../includes/ui/ui_lists.inc:2245
 msgid "Available and/or installed"
 msgstr ""
 
-#: ../includes/ui/ui_lists.inc:2313
+#: ../includes/ui/ui_lists.inc:2315
 msgid "Standard new company American COA (4 digit)"
 msgstr ""
 
-#: ../includes/ui/ui_lists.inc:2315
+#: ../includes/ui/ui_lists.inc:2317
 msgid "Standard American COA (4 digit) with demo data"
 msgstr ""
 
@@ -7463,88 +7541,88 @@ msgstr ""
 msgid "No Quick Entry lines are defined."
 msgstr ""
 
-#: ../includes/ui/ui_view.inc:753
-#: ../purchasing/includes/ui/invoice_ui.inc:446
+#: ../includes/ui/ui_view.inc:754
+#: ../purchasing/includes/ui/invoice_ui.inc:451
 msgid "and"
 msgstr ""
 
-#: ../includes/ui/ui_view.inc:839
+#: ../includes/ui/ui_view.inc:840
 msgid "January"
 msgstr ""
 
-#: ../includes/ui/ui_view.inc:839
+#: ../includes/ui/ui_view.inc:840
 msgid "February"
 msgstr ""
 
-#: ../includes/ui/ui_view.inc:839
+#: ../includes/ui/ui_view.inc:840
 msgid "March"
 msgstr ""
 
-#: ../includes/ui/ui_view.inc:839
+#: ../includes/ui/ui_view.inc:840
 msgid "April"
 msgstr ""
 
-#: ../includes/ui/ui_view.inc:839
+#: ../includes/ui/ui_view.inc:840
 msgid "May"
 msgstr ""
 
-#: ../includes/ui/ui_view.inc:839
+#: ../includes/ui/ui_view.inc:840
 msgid "June"
 msgstr ""
 
-#: ../includes/ui/ui_view.inc:839
+#: ../includes/ui/ui_view.inc:840
 msgid "July"
 msgstr ""
 
-#: ../includes/ui/ui_view.inc:839
+#: ../includes/ui/ui_view.inc:840
 msgid "August"
 msgstr ""
 
-#: ../includes/ui/ui_view.inc:839
+#: ../includes/ui/ui_view.inc:840
 msgid "September"
 msgstr ""
 
-#: ../includes/ui/ui_view.inc:839
+#: ../includes/ui/ui_view.inc:840
 msgid "October"
 msgstr ""
 
-#: ../includes/ui/ui_view.inc:839
+#: ../includes/ui/ui_view.inc:840
 msgid "November"
 msgstr ""
 
-#: ../includes/ui/ui_view.inc:839
+#: ../includes/ui/ui_view.inc:840
 msgid "December"
 msgstr ""
 
-#: ../includes/ui/ui_view.inc:840
+#: ../includes/ui/ui_view.inc:841
 msgid "Su"
 msgstr ""
 
-#: ../includes/ui/ui_view.inc:840
+#: ../includes/ui/ui_view.inc:841
 msgid "Mo"
 msgstr ""
 
-#: ../includes/ui/ui_view.inc:840
+#: ../includes/ui/ui_view.inc:841
 msgid "Tu"
 msgstr ""
 
-#: ../includes/ui/ui_view.inc:840
+#: ../includes/ui/ui_view.inc:841
 msgid "We"
 msgstr ""
 
-#: ../includes/ui/ui_view.inc:840
+#: ../includes/ui/ui_view.inc:841
 msgid "Th"
 msgstr ""
 
-#: ../includes/ui/ui_view.inc:840
+#: ../includes/ui/ui_view.inc:841
 msgid "Fr"
 msgstr ""
 
-#: ../includes/ui/ui_view.inc:840
+#: ../includes/ui/ui_view.inc:841
 msgid "Sa"
 msgstr ""
 
-#: ../includes/ui/ui_view.inc:841
+#: ../includes/ui/ui_view.inc:842
 msgid "W"
 msgstr ""
 
@@ -7711,7 +7789,7 @@ msgstr ""
 #: ../manufacturing/work_order_entry.php:399
 #: ../purchasing/inquiry/po_search.php:74
 #: ../sales/inquiry/sales_deliveries_view.php:114
-#: ../sales/inquiry/sales_orders_view.php:239
+#: ../sales/inquiry/sales_orders_view.php:233
 msgid "Item:"
 msgstr ""
 
@@ -7764,8 +7842,8 @@ msgstr ""
 
 #: ../inventory/prices.php:133
 #: ../reporting/rep104.php:116
-#: ../sales/customer_delivery.php:353
-#: ../sales/customer_invoice.php:390
+#: ../sales/customer_delivery.php:341
+#: ../sales/customer_invoice.php:394
 #: ../sales/view/view_credit.php:73
 #: ../sales/view/view_dispatch.php:93
 #: ../sales/view/view_invoice.php:92
@@ -7775,16 +7853,16 @@ msgstr ""
 
 #: ../inventory/prices.php:133
 #: ../inventory/purchasing_data.php:127
-#: ../purchasing/includes/ui/invoice_ui.inc:478
-#: ../purchasing/po_receive_items.php:59
+#: ../purchasing/includes/ui/invoice_ui.inc:483
+#: ../purchasing/po_receive_items.php:63
 #: ../purchasing/view/view_grn.php:41
 #: ../purchasing/view/view_po.php:45
 #: ../reporting/rep104.php:109
 #: ../reporting/includes/doctext.inc:103
 #: ../reporting/includes/doctext.inc:111
-#: ../sales/customer_credit_invoice.php:292
-#: ../sales/customer_delivery.php:431
-#: ../sales/customer_invoice.php:443
+#: ../sales/customer_credit_invoice.php:281
+#: ../sales/customer_delivery.php:419
+#: ../sales/customer_invoice.php:447
 #: ../sales/view/view_credit.php:91
 #: ../sales/view/view_dispatch.php:113
 #: ../sales/view/view_invoice.php:114
@@ -7932,15 +8010,16 @@ msgstr ""
 #: ../inventory/reorder_level.php:57
 #: ../inventory/inquiry/stock_movements.php:77
 #: ../inventory/inquiry/stock_status.php:69
-#: ../sales/sales_order_entry.php:482
-#: ../sales/includes/ui/sales_order_ui.inc:176
+#: ../purchasing/supplier_credit.php:203
+#: ../sales/sales_order_entry.php:485
+#: ../sales/includes/ui/sales_order_ui.inc:175
 msgid "Quantity On Hand"
 msgstr ""
 
 #: ../inventory/reorder_level.php:57
 #: ../inventory/inquiry/stock_status.php:69
-#: ../sales/includes/db/sales_order_db.inc:108
-#: ../sales/includes/db/sales_order_db.inc:261
+#: ../sales/includes/db/sales_order_db.inc:110
+#: ../sales/includes/db/sales_order_db.inc:263
 msgid "Re-Order Level"
 msgstr ""
 
@@ -7993,7 +8072,7 @@ msgstr ""
 #: ../manufacturing/work_order_entry.php:209
 #: ../purchasing/inquiry/po_search.php:67
 #: ../sales/inquiry/sales_deliveries_view.php:107
-#: ../sales/inquiry/sales_orders_view.php:232
+#: ../sales/inquiry/sales_orders_view.php:224
 msgid "Location:"
 msgstr ""
 
@@ -8013,21 +8092,21 @@ msgstr ""
 #: ../inventory/includes/stock_transfers_ui.inc:60
 #: ../manufacturing/includes/work_order_issue_ui.inc:33
 #: ../purchasing/includes/ui/po_ui.inc:236
-#: ../purchasing/po_receive_items.php:58
+#: ../purchasing/po_receive_items.php:62
 #: ../purchasing/view/view_grn.php:40
 #: ../purchasing/view/view_po.php:45
 #: ../reporting/includes/doctext.inc:102
 #: ../reporting/includes/doctext.inc:105
 #: ../reporting/includes/doctext.inc:110
-#: ../sales/customer_credit_invoice.php:291
-#: ../sales/customer_delivery.php:429
-#: ../sales/customer_invoice.php:442
+#: ../sales/customer_credit_invoice.php:280
+#: ../sales/customer_delivery.php:417
+#: ../sales/customer_invoice.php:446
 #: ../sales/view/view_credit.php:90
 #: ../sales/view/view_dispatch.php:112
 #: ../sales/view/view_invoice.php:113
 #: ../sales/view/view_sales_order.php:200
 #: ../sales/includes/ui/sales_credit_ui.inc:167
-#: ../sales/includes/ui/sales_order_ui.inc:141
+#: ../sales/includes/ui/sales_order_ui.inc:140
 msgid "Item Code"
 msgstr ""
 
@@ -8040,15 +8119,15 @@ msgstr ""
 #: ../reporting/includes/doctext.inc:102
 #: ../reporting/includes/doctext.inc:105
 #: ../reporting/includes/doctext.inc:110
-#: ../sales/customer_credit_invoice.php:291
-#: ../sales/customer_delivery.php:429
-#: ../sales/customer_invoice.php:442
+#: ../sales/customer_credit_invoice.php:280
+#: ../sales/customer_delivery.php:417
+#: ../sales/customer_invoice.php:446
 #: ../sales/view/view_credit.php:90
 #: ../sales/view/view_dispatch.php:112
 #: ../sales/view/view_invoice.php:113
 #: ../sales/view/view_sales_order.php:200
 #: ../sales/includes/ui/sales_credit_ui.inc:167
-#: ../sales/includes/ui/sales_order_ui.inc:141
+#: ../sales/includes/ui/sales_order_ui.inc:140
 msgid "Item Description"
 msgstr ""
 
@@ -8064,7 +8143,7 @@ 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:478
+#: ../purchasing/includes/ui/invoice_ui.inc:483
 #: ../purchasing/includes/ui/po_ui.inc:236
 #: ../purchasing/view/view_grn.php:40
 #: ../purchasing/view/view_po.php:45
@@ -8080,7 +8159,7 @@ msgstr ""
 #: ../sales/view/view_invoice.php:113
 #: ../sales/view/view_sales_order.php:200
 #: ../sales/includes/ui/sales_credit_ui.inc:167
-#: ../sales/includes/ui/sales_order_ui.inc:141
+#: ../sales/includes/ui/sales_order_ui.inc:140
 #: ../themes/exclusive/renderer.php:433
 msgid "Quantity"
 msgstr ""
@@ -8099,7 +8178,7 @@ msgstr ""
 #: ../sales/view/view_invoice.php:114
 #: ../sales/view/view_sales_order.php:200
 #: ../sales/includes/ui/sales_credit_ui.inc:167
-#: ../sales/includes/ui/sales_order_ui.inc:143
+#: ../sales/includes/ui/sales_order_ui.inc:142
 msgid "Unit"
 msgstr ""
 
@@ -8160,7 +8239,7 @@ msgid "Show Movements"
 msgstr ""
 
 #: ../inventory/inquiry/stock_movements.php:61
-#: ../purchasing/includes/ui/invoice_ui.inc:447
+#: ../purchasing/includes/ui/invoice_ui.inc:452
 #: ../purchasing/inquiry/supplier_allocation_inquiry.php:57
 #: ../purchasing/inquiry/supplier_inquiry.php:54
 #: ../sales/inquiry/customer_allocation_inquiry.php:51
@@ -8249,10 +8328,10 @@ 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:58
-#: ../sales/customer_credit_invoice.php:291
-#: ../sales/customer_delivery.php:430
-#: ../sales/customer_invoice.php:442
+#: ../purchasing/po_receive_items.php:62
+#: ../sales/customer_credit_invoice.php:280
+#: ../sales/customer_delivery.php:418
+#: ../sales/customer_invoice.php:446
 msgid "Units"
 msgstr ""
 
@@ -8309,7 +8388,7 @@ msgid "Foreign Item Codes"
 msgstr ""
 
 #: ../inventory/manage/item_codes.php:23
-#: ../sales/sales_order_entry.php:637
+#: ../sales/sales_order_entry.php:636
 msgid "There are no inventory items defined in the system."
 msgstr ""
 
@@ -8378,7 +8457,7 @@ msgstr ""
 #: ../sales/manage/credit_status.php:145
 #: ../sales/manage/recurrent_invoices.php:147
 #: ../taxes/item_tax_types.php:168
-#: ../taxes/tax_groups.php:203
+#: ../taxes/tax_groups.php:204
 #: ../taxes/tax_types.php:158
 msgid "Description:"
 msgstr ""
@@ -8447,8 +8526,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:465
-#: ../purchasing/includes/ui/invoice_ui.inc:477
+#: ../purchasing/includes/ui/invoice_ui.inc:470
+#: ../purchasing/includes/ui/invoice_ui.inc:482
 #: ../reporting/rep204.php:82
 #: ../themes/exclusive/renderer.php:433
 #: ../themes/exclusive/renderer.php:452
@@ -8813,7 +8892,7 @@ msgstr ""
 #: ../purchasing/inquiry/po_search_completed.php:74
 #: ../purchasing/inquiry/po_search.php:76
 #: ../sales/inquiry/sales_deliveries_view.php:116
-#: ../sales/inquiry/sales_orders_view.php:244
+#: ../sales/inquiry/sales_orders_view.php:238
 msgid "Select documents"
 msgstr ""
 
@@ -8841,7 +8920,7 @@ msgstr ""
 #: ../manufacturing/includes/manufacturing_ui.inc:277
 #: ../manufacturing/includes/manufacturing_ui.inc:281
 #: ../reporting/includes/doctext.inc:44
-#: ../sales/inquiry/sales_orders_view.php:264
+#: ../sales/inquiry/sales_orders_view.php:259
 msgid "Required By"
 msgstr ""
 
@@ -9480,7 +9559,7 @@ msgstr ""
 #: ../manufacturing/includes/db/work_orders_db.inc:179
 #: ../purchasing/includes/db/po_db.inc:115
 #: ../sales/includes/db/cust_trans_db.inc:109
-#: ../sales/includes/db/sales_order_db.inc:247
+#: ../sales/includes/db/sales_order_db.inc:249
 msgid "Updated."
 msgstr ""
 
@@ -9500,6 +9579,11 @@ msgstr ""
 msgid "Produced"
 msgstr ""
 
+#: ../purchasing/includes/db/invoice_db.inc:595
+#: ../purchasing/includes/db/invoice_db.inc:597
+msgid "GRN Removal"
+msgstr ""
+
 #: ../purchasing/includes/ui/grn_ui.inc:23
 #: ../purchasing/includes/ui/po_ui.inc:319
 #: ../sales/view/view_sales_order.php:73
@@ -9578,7 +9662,7 @@ msgid "Invoice Total:"
 msgstr ""
 
 #: ../purchasing/includes/ui/invoice_ui.inc:156
-#: ../sales/customer_credit_invoice.php:341
+#: ../sales/customer_credit_invoice.php:330
 #: ../sales/includes/ui/sales_credit_ui.inc:233
 msgid "Credit Note Total"
 msgstr ""
@@ -9592,7 +9676,7 @@ msgid "Reset"
 msgstr ""
 
 #: ../purchasing/includes/ui/invoice_ui.inc:189
-#: ../purchasing/po_receive_items.php:323
+#: ../purchasing/po_receive_items.php:327
 msgid "Clear all GL entry fields"
 msgstr ""
 
@@ -9608,27 +9692,27 @@ msgstr ""
 msgid "Quick Entry:"
 msgstr ""
 
-#: ../purchasing/includes/ui/invoice_ui.inc:386
+#: ../purchasing/includes/ui/invoice_ui.inc:391
 msgid "Add to Invoice"
 msgstr ""
 
-#: ../purchasing/includes/ui/invoice_ui.inc:388
+#: ../purchasing/includes/ui/invoice_ui.inc:393
 msgid "Add to Credit Note"
 msgstr ""
 
-#: ../purchasing/includes/ui/invoice_ui.inc:390
-#: ../sales/customer_invoice.php:497
+#: ../purchasing/includes/ui/invoice_ui.inc:395
+#: ../sales/customer_invoice.php:501
 msgid "Remove"
 msgstr ""
 
-#: ../purchasing/includes/ui/invoice_ui.inc:390
-#: ../purchasing/includes/ui/invoice_ui.inc:425
+#: ../purchasing/includes/ui/invoice_ui.inc:395
+#: ../purchasing/includes/ui/invoice_ui.inc:430
 msgid ""
 "WARNING! Be careful with removal. The operation is executed immediately and "
 "cannot be undone !!!"
 msgstr ""
 
-#: ../purchasing/includes/ui/invoice_ui.inc:392
+#: ../purchasing/includes/ui/invoice_ui.inc:397
 #, php-format
 msgid ""
 "You are about to remove all yet non-invoiced items from delivery line #%d. "
@@ -9636,96 +9720,96 @@ msgid ""
 "continue ?"
 msgstr ""
 
-#: ../purchasing/includes/ui/invoice_ui.inc:423
+#: ../purchasing/includes/ui/invoice_ui.inc:428
 msgid "Items Received Yet to be Invoiced"
 msgstr ""
 
-#: ../purchasing/includes/ui/invoice_ui.inc:428
+#: ../purchasing/includes/ui/invoice_ui.inc:433
 msgid "Delivery Item Selected For Adding To A Supplier Credit Note"
 msgstr ""
 
-#: ../purchasing/includes/ui/invoice_ui.inc:433
+#: ../purchasing/includes/ui/invoice_ui.inc:438
 msgid "Received Items Charged on this Invoice"
 msgstr ""
 
-#: ../purchasing/includes/ui/invoice_ui.inc:435
+#: ../purchasing/includes/ui/invoice_ui.inc:440
 msgid "Received Items Credited on this Note"
 msgstr ""
 
-#: ../purchasing/includes/ui/invoice_ui.inc:445
+#: ../purchasing/includes/ui/invoice_ui.inc:450
 msgid "Received between"
 msgstr ""
 
-#: ../purchasing/includes/ui/invoice_ui.inc:456
+#: ../purchasing/includes/ui/invoice_ui.inc:461
 msgid "Add All Items"
 msgstr ""
 
-#: ../purchasing/includes/ui/invoice_ui.inc:465
-#: ../purchasing/includes/ui/invoice_ui.inc:477
+#: ../purchasing/includes/ui/invoice_ui.inc:470
+#: ../purchasing/includes/ui/invoice_ui.inc:482
 #: ../sales/inquiry/sales_orders_view.php:150
 msgid "Delivery"
 msgstr ""
 
-#: ../purchasing/includes/ui/invoice_ui.inc:465
+#: ../purchasing/includes/ui/invoice_ui.inc:470
 msgid "Sequence #"
 msgstr ""
 
-#: ../purchasing/includes/ui/invoice_ui.inc:465
+#: ../purchasing/includes/ui/invoice_ui.inc:470
 msgid "P.O."
 msgstr ""
 
-#: ../purchasing/includes/ui/invoice_ui.inc:466
+#: ../purchasing/includes/ui/invoice_ui.inc:471
 msgid "Received On"
 msgstr ""
 
-#: ../purchasing/includes/ui/invoice_ui.inc:466
+#: ../purchasing/includes/ui/invoice_ui.inc:471
 #: ../purchasing/view/view_po.php:46
 msgid "Quantity Received"
 msgstr ""
 
-#: ../purchasing/includes/ui/invoice_ui.inc:466
+#: ../purchasing/includes/ui/invoice_ui.inc:471
 #: ../purchasing/view/view_grn.php:41
 #: ../purchasing/view/view_po.php:46
 msgid "Quantity Invoiced"
 msgstr ""
 
-#: ../purchasing/includes/ui/invoice_ui.inc:467
+#: ../purchasing/includes/ui/invoice_ui.inc:472
 msgid "Qty Yet To Invoice"
 msgstr ""
 
-#: ../purchasing/includes/ui/invoice_ui.inc:467
+#: ../purchasing/includes/ui/invoice_ui.inc:472
 #: ../purchasing/includes/ui/po_ui.inc:238
-#: ../sales/includes/ui/sales_order_ui.inc:143
+#: ../sales/includes/ui/sales_order_ui.inc:142
 msgid "Price after Tax"
 msgstr ""
 
-#: ../purchasing/includes/ui/invoice_ui.inc:467
+#: ../purchasing/includes/ui/invoice_ui.inc:472
 #: ../purchasing/includes/ui/po_ui.inc:238
-#: ../sales/includes/ui/sales_order_ui.inc:143
+#: ../sales/includes/ui/sales_order_ui.inc:142
 msgid "Price before Tax"
 msgstr ""
 
-#: ../purchasing/includes/ui/invoice_ui.inc:473
+#: ../purchasing/includes/ui/invoice_ui.inc:478
 msgid "Qty Yet To Credit"
 msgstr ""
 
-#: ../purchasing/includes/ui/invoice_ui.inc:478
+#: ../purchasing/includes/ui/invoice_ui.inc:483
 msgid "Line Value"
 msgstr ""
 
-#: ../purchasing/includes/ui/invoice_ui.inc:545
+#: ../purchasing/includes/ui/invoice_ui.inc:550
 msgid ""
 "There are no outstanding items received from this supplier that have not "
 "been invoiced by them."
 msgstr ""
 
-#: ../purchasing/includes/ui/invoice_ui.inc:548
+#: ../purchasing/includes/ui/invoice_ui.inc:553
 msgid ""
 "There are no received items for the selected supplier that have been "
 "invoiced."
 msgstr ""
 
-#: ../purchasing/includes/ui/invoice_ui.inc:549
+#: ../purchasing/includes/ui/invoice_ui.inc:554
 msgid "Credits can only be applied to invoiced items."
 msgstr ""
 
@@ -9734,17 +9818,17 @@ msgid "Supplier Currency:"
 msgstr ""
 
 #: ../purchasing/includes/ui/po_ui.inc:178
-#: ../sales/sales_order_entry.php:661
+#: ../sales/sales_order_entry.php:660
 msgid "Order Date:"
 msgstr ""
 
 #: ../purchasing/includes/ui/po_ui.inc:179
-#: ../sales/sales_order_entry.php:648
+#: ../sales/sales_order_entry.php:647
 msgid "Delivery Date:"
 msgstr ""
 
 #: ../purchasing/includes/ui/po_ui.inc:179
-#: ../sales/sales_order_entry.php:642
+#: ../sales/sales_order_entry.php:641
 msgid "Invoice Date:"
 msgstr ""
 
@@ -9775,12 +9859,12 @@ msgid "Order Items"
 msgstr ""
 
 #: ../purchasing/includes/ui/po_ui.inc:237
-#: ../purchasing/po_receive_items.php:58
+#: ../purchasing/po_receive_items.php:62
 msgid "Received"
 msgstr ""
 
 #: ../purchasing/includes/ui/po_ui.inc:238
-#: ../sales/includes/ui/sales_order_ui.inc:611
+#: ../sales/includes/ui/sales_order_ui.inc:608
 msgid "Required Delivery Date"
 msgstr ""
 
@@ -9791,32 +9875,32 @@ msgid "Line Total"
 msgstr ""
 
 #: ../purchasing/includes/ui/po_ui.inc:289
-#: ../purchasing/po_receive_items.php:110
+#: ../purchasing/po_receive_items.php:114
 #: ../reporting/includes/doctext.inc:147
-#: ../sales/customer_credit_invoice.php:333
-#: ../sales/customer_delivery.php:499
-#: ../sales/customer_invoice.php:538
+#: ../sales/customer_credit_invoice.php:322
+#: ../sales/customer_delivery.php:487
+#: ../sales/customer_invoice.php:542
 #: ../sales/view/view_dispatch.php:146
 #: ../sales/view/view_invoice.php:148
 #: ../sales/includes/ui/sales_credit_ui.inc:217
-#: ../sales/includes/ui/sales_order_ui.inc:230
+#: ../sales/includes/ui/sales_order_ui.inc:229
 msgid "Sub-total"
 msgstr ""
 
 #: ../purchasing/includes/ui/po_ui.inc:298
-#: ../purchasing/po_receive_items.php:118
+#: ../purchasing/po_receive_items.php:122
 #: ../purchasing/view/view_grn.php:79
 #: ../purchasing/view/view_po.php:93
-#: ../sales/customer_delivery.php:506
+#: ../sales/customer_delivery.php:494
 #: ../sales/view/view_sales_order.php:243
-#: ../sales/includes/ui/sales_order_ui.inc:237
+#: ../sales/includes/ui/sales_order_ui.inc:236
 msgid "Amount Total"
 msgstr ""
 
 #: ../purchasing/includes/ui/po_ui.inc:299
 #: ../purchasing/allocations/supplier_allocate.php:64
 #: ../sales/allocations/customer_allocate.php:63
-#: ../sales/includes/ui/sales_order_ui.inc:238
+#: ../sales/includes/ui/sales_order_ui.inc:237
 msgid "Refresh"
 msgstr ""
 
@@ -9880,178 +9964,183 @@ msgstr ""
 msgid "&View this GRN"
 msgstr ""
 
-#: ../purchasing/po_entry_items.php:104
-#: ../purchasing/po_receive_items.php:38
+#: ../purchasing/po_entry_items.php:102
+#: ../purchasing/po_receive_items.php:40
+msgid "View the GL Journal Entries for this Delivery"
+msgstr ""
+
+#: ../purchasing/po_entry_items.php:107
+#: ../purchasing/po_receive_items.php:42
 msgid "Entry purchase &invoice for this receival"
 msgstr ""
 
-#: ../purchasing/po_entry_items.php:106
-#: ../purchasing/po_entry_items.php:130
+#: ../purchasing/po_entry_items.php:109
+#: ../purchasing/po_entry_items.php:133
 #: ../purchasing/supplier_credit.php:49
 #: ../purchasing/supplier_invoice.php:52
 msgid "Add an Attachment"
 msgstr ""
 
-#: ../purchasing/po_entry_items.php:109
+#: ../purchasing/po_entry_items.php:112
 msgid "Enter &Another GRN"
 msgstr ""
 
-#: ../purchasing/po_entry_items.php:118
+#: ../purchasing/po_entry_items.php:121
 msgid "Direct Purchase Invoice has been entered"
 msgstr ""
 
-#: ../purchasing/po_entry_items.php:120
+#: ../purchasing/po_entry_items.php:123
 msgid "&View this Invoice"
 msgstr ""
 
-#: ../purchasing/po_entry_items.php:125
+#: ../purchasing/po_entry_items.php:128
 #: ../purchasing/supplier_invoice.php:46
 msgid "View the GL Journal Entries for this Invoice"
 msgstr ""
 
-#: ../purchasing/po_entry_items.php:127
+#: ../purchasing/po_entry_items.php:130
 #: ../purchasing/supplier_invoice.php:48
 msgid "Entry supplier &payment for this invoice"
 msgstr ""
 
-#: ../purchasing/po_entry_items.php:133
+#: ../purchasing/po_entry_items.php:136
 msgid "Enter &Another Direct Invoice"
 msgstr ""
 
-#: ../purchasing/po_entry_items.php:165
+#: ../purchasing/po_entry_items.php:168
 msgid ""
 "This item cannot be deleted because some of it has already been received."
 msgstr ""
 
-#: ../purchasing/po_entry_items.php:180
+#: ../purchasing/po_entry_items.php:183
 msgid ""
 "This order cannot be cancelled because some of it has already been received."
 msgstr ""
 
-#: ../purchasing/po_entry_items.php:181
+#: ../purchasing/po_entry_items.php:184
 msgid ""
 "The line item quantities may be modified to quantities more than already "
 "received. prices cannot be altered for lines that have already been received "
 "and quantities cannot be reduced below the quantity already received."
 msgstr ""
 
-#: ../purchasing/po_entry_items.php:196
+#: ../purchasing/po_entry_items.php:199
 msgid "This purchase order has been cancelled."
 msgstr ""
 
-#: ../purchasing/po_entry_items.php:198
+#: ../purchasing/po_entry_items.php:201
 msgid "Enter a new purchase order"
 msgstr ""
 
-#: ../purchasing/po_entry_items.php:210
-#: ../sales/sales_order_entry.php:454
+#: ../purchasing/po_entry_items.php:213
+#: ../sales/sales_order_entry.php:457
 msgid "Item description cannot be empty."
 msgstr ""
 
-#: ../purchasing/po_entry_items.php:220
+#: ../purchasing/po_entry_items.php:223
 msgid "The quantity of the order item must be numeric and not less than "
 msgstr ""
 
-#: ../purchasing/po_entry_items.php:227
+#: ../purchasing/po_entry_items.php:230
 msgid "The price entered must be numeric and not less than zero."
 msgstr ""
 
-#: ../purchasing/po_entry_items.php:251
+#: ../purchasing/po_entry_items.php:254
 msgid ""
 "You are attempting to make the quantity ordered a quantity less than has "
 "already been invoiced or received.  This is prohibited."
 msgstr ""
 
-#: ../purchasing/po_entry_items.php:252
+#: ../purchasing/po_entry_items.php:255
 msgid ""
 "The quantity received can only be modified by entering a negative receipt "
 "and the quantity invoiced can only be reduced by entering a credit note "
 "against this item."
 msgstr ""
 
-#: ../purchasing/po_entry_items.php:280
+#: ../purchasing/po_entry_items.php:283
 msgid "The selected item is already on this order."
 msgstr ""
 
-#: ../purchasing/po_entry_items.php:307
+#: ../purchasing/po_entry_items.php:310
 msgid ""
 "The selected item does not exist or it is a kit part and therefore cannot be "
 "purchased."
 msgstr ""
 
-#: ../purchasing/po_entry_items.php:323
+#: ../purchasing/po_entry_items.php:326
 #: ../purchasing/supplier_invoice.php:352
 #: ../purchasing/supplier_payment.php:118
 msgid "There is no supplier selected."
 msgstr ""
 
-#: ../purchasing/po_entry_items.php:330
+#: ../purchasing/po_entry_items.php:333
 msgid "The entered order date is invalid."
 msgstr ""
 
-#: ../purchasing/po_entry_items.php:337
+#: ../purchasing/po_entry_items.php:340
 msgid "The entered due date is invalid."
 msgstr ""
 
-#: ../purchasing/po_entry_items.php:346
+#: ../purchasing/po_entry_items.php:349
 msgid "There is no reference entered for this purchase order."
 msgstr ""
 
-#: ../purchasing/po_entry_items.php:361
+#: ../purchasing/po_entry_items.php:364
 #: ../purchasing/supplier_invoice.php:161
 msgid "You must enter a supplier's invoice reference."
 msgstr ""
 
-#: ../purchasing/po_entry_items.php:367
+#: ../purchasing/po_entry_items.php:370
 msgid "There is no delivery address specified."
 msgstr ""
 
-#: ../purchasing/po_entry_items.php:373
+#: ../purchasing/po_entry_items.php:376
 msgid "There is no location specified to move any items into."
 msgstr ""
 
-#: ../purchasing/po_entry_items.php:380
+#: ../purchasing/po_entry_items.php:383
 msgid ""
 "The order cannot be placed because there are no lines entered on this order."
 msgstr ""
 
-#: ../purchasing/po_entry_items.php:506
-#: ../sales/sales_order_entry.php:665
+#: ../purchasing/po_entry_items.php:509
+#: ../sales/sales_order_entry.php:664
 msgid "Place Order"
 msgstr ""
 
-#: ../purchasing/po_entry_items.php:507
+#: ../purchasing/po_entry_items.php:510
 msgid "Update Order"
 msgstr ""
 
-#: ../purchasing/po_entry_items.php:508
-#: ../sales/sales_order_entry.php:664
+#: ../purchasing/po_entry_items.php:511
+#: ../sales/sales_order_entry.php:663
 msgid "Cancel Order"
 msgstr ""
 
-#: ../purchasing/po_entry_items.php:510
+#: ../purchasing/po_entry_items.php:513
 msgid "Process GRN"
 msgstr ""
 
-#: ../purchasing/po_entry_items.php:511
+#: ../purchasing/po_entry_items.php:514
 msgid "Update GRN"
 msgstr ""
 
-#: ../purchasing/po_entry_items.php:512
+#: ../purchasing/po_entry_items.php:515
 msgid "Cancel GRN"
 msgstr ""
 
-#: ../purchasing/po_entry_items.php:515
-#: ../sales/customer_invoice.php:557
+#: ../purchasing/po_entry_items.php:518
+#: ../sales/customer_invoice.php:561
 msgid "Process Invoice"
 msgstr ""
 
-#: ../purchasing/po_entry_items.php:516
+#: ../purchasing/po_entry_items.php:519
 msgid "Update Invoice"
 msgstr ""
 
-#: ../purchasing/po_entry_items.php:517
-#: ../sales/sales_order_entry.php:645
+#: ../purchasing/po_entry_items.php:520
+#: ../sales/sales_order_entry.php:644
 msgid "Cancel Invoice"
 msgstr ""
 
@@ -10067,23 +10156,23 @@ msgstr ""
 msgid "&View this Delivery"
 msgstr ""
 
-#: ../purchasing/po_receive_items.php:40
+#: ../purchasing/po_receive_items.php:44
 msgid "Select a different &purchase order for receiving items against"
 msgstr ""
 
-#: ../purchasing/po_receive_items.php:49
+#: ../purchasing/po_receive_items.php:53
 msgid ""
 "This page can only be opened if a purchase order has been selected. Please "
 "select a purchase order first."
 msgstr ""
 
-#: ../purchasing/po_receive_items.php:58
+#: ../purchasing/po_receive_items.php:62
 #: ../reporting/rep105.php:112
-#: ../sales/customer_delivery.php:430
+#: ../sales/customer_delivery.php:418
 msgid "Ordered"
 msgstr ""
 
-#: ../purchasing/po_receive_items.php:59
+#: ../purchasing/po_receive_items.php:63
 #: ../reporting/rep101.php:131
 #: ../reporting/rep105.php:113
 #: ../reporting/rep105.php:167
@@ -10092,30 +10181,30 @@ msgstr ""
 msgid "Outstanding"
 msgstr ""
 
-#: ../purchasing/po_receive_items.php:59
-#: ../sales/customer_delivery.php:431
+#: ../purchasing/po_receive_items.php:63
+#: ../sales/customer_delivery.php:419
 msgid "This Delivery"
 msgstr ""
 
-#: ../purchasing/po_receive_items.php:164
-#: ../purchasing/po_receive_items.php:213
+#: ../purchasing/po_receive_items.php:168
+#: ../purchasing/po_receive_items.php:217
 msgid ""
 "There is nothing to process. Please enter valid quantities greater than zero."
 msgstr ""
 
-#: ../purchasing/po_receive_items.php:218
+#: ../purchasing/po_receive_items.php:222
 msgid ""
 "Entered quantities cannot be greater than the quantity entered on the "
 "purchase order including the allowed over-receive percentage"
 msgstr ""
 
-#: ../purchasing/po_receive_items.php:220
+#: ../purchasing/po_receive_items.php:224
 msgid ""
 "Modify the ordered items on the purchase order if you wish to increase the "
 "quantities."
 msgstr ""
 
-#: ../purchasing/po_receive_items.php:238
+#: ../purchasing/po_receive_items.php:242
 msgid ""
 "This order has been changed or invoiced since this delivery was started to "
 "be actioned. Processing halted. To enter a delivery against this purchase "
@@ -10123,19 +10212,19 @@ msgid ""
 "by the other user."
 msgstr ""
 
-#: ../purchasing/po_receive_items.php:241
+#: ../purchasing/po_receive_items.php:245
 msgid "Select a different purchase order for receiving goods against"
 msgstr ""
 
-#: ../purchasing/po_receive_items.php:244
+#: ../purchasing/po_receive_items.php:248
 msgid "Re-Read the updated purchase order for receiving goods against"
 msgstr ""
 
-#: ../purchasing/po_receive_items.php:318
+#: ../purchasing/po_receive_items.php:322
 msgid "Items to Receive"
 msgstr ""
 
-#: ../purchasing/po_receive_items.php:323
+#: ../purchasing/po_receive_items.php:327
 msgid "Process Receive Items"
 msgstr ""
 
@@ -10203,15 +10292,21 @@ msgid ""
 "mistake somewhere, the credit note as entered will not be processed."
 msgstr ""
 
-#: ../purchasing/supplier_credit.php:227
+#: ../purchasing/supplier_credit.php:201
+msgid ""
+"The return cannot be processed because there is an insufficient quantity for "
+"item:"
+msgstr ""
+
+#: ../purchasing/supplier_credit.php:245
 msgid "The quantity to credit must be numeric and greater than zero."
 msgstr ""
 
-#: ../purchasing/supplier_credit.php:234
+#: ../purchasing/supplier_credit.php:252
 msgid "The price is either not numeric or negative."
 msgstr ""
 
-#: ../purchasing/supplier_credit.php:336
+#: ../purchasing/supplier_credit.php:354
 msgid "Enter Credit Note"
 msgstr ""
 
@@ -10332,33 +10427,33 @@ msgid ""
 "positive values."
 msgstr ""
 
-#: ../purchasing/supplier_payment.php:263
+#: ../purchasing/supplier_payment.php:273
 msgid "Payment To:"
 msgstr ""
 
-#: ../purchasing/supplier_payment.php:267
+#: ../purchasing/supplier_payment.php:277
 msgid "From Bank Account:"
 msgstr ""
 
-#: ../purchasing/supplier_payment.php:273
+#: ../purchasing/supplier_payment.php:283
 #: ../purchasing/view/view_supp_payment.php:55
 msgid "Date Paid"
 msgstr ""
 
-#: ../purchasing/supplier_payment.php:296
+#: ../purchasing/supplier_payment.php:306
 #: ../sales/customer_payments.php:287
 msgid "Amount of Discount:"
 msgstr ""
 
-#: ../purchasing/supplier_payment.php:297
+#: ../purchasing/supplier_payment.php:307
 msgid "Amount of Payment:"
 msgstr ""
 
-#: ../purchasing/supplier_payment.php:303
+#: ../purchasing/supplier_payment.php:313
 msgid "The amount and discount are in the bank account's currency."
 msgstr ""
 
-#: ../purchasing/supplier_payment.php:306
+#: ../purchasing/supplier_payment.php:316
 msgid "Enter Payment"
 msgstr ""
 
@@ -10415,7 +10510,7 @@ msgstr ""
 #: ../sales/inquiry/customer_allocation_inquiry.php:162
 #: ../sales/inquiry/customer_inquiry.php:239
 #: ../sales/inquiry/sales_deliveries_view.php:206
-#: ../sales/inquiry/sales_orders_view.php:312
+#: ../sales/inquiry/sales_orders_view.php:307
 msgid "Marked items are overdue."
 msgstr ""
 
@@ -10444,7 +10539,7 @@ msgstr ""
 
 #: ../purchasing/view/view_supp_credit.php:47
 #: ../purchasing/view/view_supp_invoice.php:50
-#: ../sales/customer_credit_invoice.php:279
+#: ../sales/customer_credit_invoice.php:268
 #: ../sales/view/view_invoice.php:95
 msgid "Invoice Date"
 msgstr ""
@@ -10683,7 +10778,7 @@ msgstr ""
 #: ../purchasing/inquiry/po_search_completed.php:60
 #: ../purchasing/inquiry/po_search.php:62
 #: ../sales/inquiry/sales_deliveries_view.php:103
-#: ../sales/inquiry/sales_orders_view.php:225
+#: ../sales/inquiry/sales_orders_view.php:217
 msgid "#:"
 msgstr ""
 
@@ -10693,13 +10788,13 @@ msgstr ""
 
 #: ../purchasing/inquiry/po_search_completed.php:121
 #: ../purchasing/inquiry/po_search.php:135
-#: ../sales/inquiry/sales_orders_view.php:263
+#: ../sales/inquiry/sales_orders_view.php:258
 msgid "Order Date"
 msgstr ""
 
 #: ../purchasing/inquiry/po_search_completed.php:123
 #: ../purchasing/inquiry/po_search.php:137
-#: ../sales/inquiry/sales_orders_view.php:266
+#: ../sales/inquiry/sales_orders_view.php:261
 msgid "Order Total"
 msgstr ""
 
@@ -11049,7 +11144,7 @@ msgid "Customers in"
 msgstr ""
 
 #: ../reporting/rep103.php:196
-#: ../sales/includes/ui/sales_order_ui.inc:416
+#: ../sales/includes/ui/sales_order_ui.inc:413
 msgid "Price List"
 msgstr ""
 
@@ -11109,15 +11204,15 @@ msgstr ""
 #: ../reporting/rep106.php:81
 #: ../reporting/includes/doctext.inc:163
 #: ../sales/create_recurrent_invoices.php:98
-#: ../sales/customer_credit_invoice.php:247
-#: ../sales/customer_delivery.php:337
-#: ../sales/customer_invoice.php:368
+#: ../sales/customer_credit_invoice.php:236
+#: ../sales/customer_delivery.php:325
+#: ../sales/customer_invoice.php:373
 #: ../sales/manage/recurrent_invoices.php:85
 #: ../sales/view/view_credit.php:58
 #: ../sales/inquiry/customer_inquiry.php:219
 #: ../sales/inquiry/sales_deliveries_view.php:182
-#: ../sales/inquiry/sales_orders_view.php:261
-#: ../sales/inquiry/sales_orders_view.php:275
+#: ../sales/inquiry/sales_orders_view.php:256
+#: ../sales/inquiry/sales_orders_view.php:270
 #: ../themes/exclusive/renderer.php:289
 msgid "Branch"
 msgstr ""
@@ -11141,8 +11236,8 @@ msgid "Loc"
 msgstr ""
 
 #: ../reporting/rep105.php:112
-#: ../sales/customer_delivery.php:430
-#: ../sales/customer_invoice.php:442
+#: ../sales/customer_delivery.php:418
+#: ../sales/customer_invoice.php:446
 msgid "Invoiced"
 msgstr ""
 
@@ -11520,7 +11615,7 @@ msgid "Rate"
 msgstr ""
 
 #: ../reporting/rep709.php:108
-#: ../taxes/tax_groups.php:213
+#: ../taxes/tax_groups.php:214
 msgid "Tax"
 msgstr ""
 
@@ -11936,8 +12031,8 @@ msgstr ""
 
 #: ../reporting/includes/doctext.inc:34
 #: ../sales/view/view_sales_order.php:68
-#: ../sales/inquiry/sales_orders_view.php:278
-#: ../sales/includes/ui/sales_order_ui.inc:606
+#: ../sales/inquiry/sales_orders_view.php:273
+#: ../sales/includes/ui/sales_order_ui.inc:603
 msgid "Valid until"
 msgstr ""
 
@@ -11998,12 +12093,12 @@ msgid "You can pay through"
 msgstr ""
 
 #: ../reporting/includes/doctext.inc:111
-#: ../sales/customer_credit_invoice.php:292
+#: ../sales/customer_credit_invoice.php:281
 #: ../sales/view/view_credit.php:91
 #: ../sales/view/view_dispatch.php:113
 #: ../sales/view/view_invoice.php:114
 #: ../sales/includes/ui/sales_credit_ui.inc:168
-#: ../sales/includes/ui/sales_order_ui.inc:143
+#: ../sales/includes/ui/sales_order_ui.inc:142
 msgid "Discount %"
 msgstr ""
 
@@ -12168,19 +12263,23 @@ msgstr ""
 msgid "Report Period"
 msgstr ""
 
-#: ../reporting/includes/pdf_report.inc:977
+#: ../reporting/includes/pdf_report.inc:980
 msgid "You have no email contact defined for this type of document"
 msgstr ""
 
-#: ../reporting/includes/pdf_report.inc:1019
+#: ../reporting/includes/pdf_report.inc:1022
+msgid "There is no contact email set for this document type."
+msgstr ""
+
+#: ../reporting/includes/pdf_report.inc:1024
 msgid "Sending document by email failed"
 msgstr ""
 
-#: ../reporting/includes/pdf_report.inc:1022
+#: ../reporting/includes/pdf_report.inc:1027
 msgid "has been sent by email to destination."
 msgstr ""
 
-#: ../reporting/includes/pdf_report.inc:1052
+#: ../reporting/includes/pdf_report.inc:1057
 msgid "Report has been sent to network printer "
 msgstr ""
 
@@ -12349,7 +12448,7 @@ msgid "Modifying Customer Credit Note #%d"
 msgstr ""
 
 #: ../sales/credit_note_entry.php:51
-#: ../sales/sales_order_entry.php:639
+#: ../sales/sales_order_entry.php:638
 msgid ""
 "There are no customers, or there are no customers with branches. Please "
 "define customers and customer branches."
@@ -12415,7 +12514,7 @@ msgid "Credit Note Items"
 msgstr ""
 
 #: ../sales/credit_note_entry.php:281
-#: ../sales/customer_credit_invoice.php:393
+#: ../sales/customer_credit_invoice.php:382
 msgid "Process Credit Note"
 msgstr ""
 
@@ -12456,53 +12555,53 @@ msgid "The entered shipping cost is invalid or less than zero."
 msgstr ""
 
 #: ../sales/customer_credit_invoice.php:117
-#: ../sales/customer_credit_invoice.php:152
+#: ../sales/customer_credit_invoice.php:139
 msgid ""
 "Selected quantity cannot be less than zero nor more than quantity not "
 "credited yet."
 msgstr ""
 
-#: ../sales/customer_credit_invoice.php:150
+#: ../sales/customer_credit_invoice.php:137
 msgid ""
 "This page can only be opened if an invoice has been selected for crediting."
 msgstr ""
 
-#: ../sales/customer_credit_invoice.php:260
+#: ../sales/customer_credit_invoice.php:249
 msgid "Crediting Invoice"
 msgstr ""
 
-#: ../sales/customer_credit_invoice.php:281
+#: ../sales/customer_credit_invoice.php:270
 msgid "Credit Note Date"
 msgstr ""
 
-#: ../sales/customer_credit_invoice.php:291
+#: ../sales/customer_credit_invoice.php:280
 msgid "Invoiced Quantity"
 msgstr ""
 
-#: ../sales/customer_credit_invoice.php:292
+#: ../sales/customer_credit_invoice.php:281
 msgid "Credit Quantity"
 msgstr ""
 
-#: ../sales/customer_credit_invoice.php:326
+#: ../sales/customer_credit_invoice.php:315
 msgid "Credit Shipping Cost"
 msgstr ""
 
-#: ../sales/customer_credit_invoice.php:359
+#: ../sales/customer_credit_invoice.php:348
 #: ../sales/includes/ui/sales_credit_ui.inc:323
 msgid "Credit Note Type"
 msgstr ""
 
-#: ../sales/customer_credit_invoice.php:367
+#: ../sales/customer_credit_invoice.php:356
 #: ../sales/includes/ui/sales_credit_ui.inc:331
 msgid "Items Returned to Location"
 msgstr ""
 
-#: ../sales/customer_credit_invoice.php:372
+#: ../sales/customer_credit_invoice.php:361
 #: ../sales/includes/ui/sales_credit_ui.inc:336
 msgid "Write off the cost of the items to"
 msgstr ""
 
-#: ../sales/customer_credit_invoice.php:391
+#: ../sales/customer_credit_invoice.php:380
 msgid "Update credit value for quantities entered"
 msgstr ""
 
@@ -12580,140 +12679,140 @@ msgstr ""
 msgid "Select A Different Delivery"
 msgstr ""
 
-#: ../sales/customer_delivery.php:96
+#: ../sales/customer_delivery.php:94
 msgid "Select a different sales order to delivery"
 msgstr ""
 
-#: ../sales/customer_delivery.php:97
+#: ../sales/customer_delivery.php:95
 msgid "This order has no items. There is nothing to delivery."
 msgstr ""
 
-#: ../sales/customer_delivery.php:119
+#: ../sales/customer_delivery.php:107
 msgid "Select a different delivery"
 msgstr ""
 
-#: ../sales/customer_delivery.php:120
+#: ../sales/customer_delivery.php:108
 msgid "This delivery has all items invoiced. There is nothing to modify."
 msgstr ""
 
-#: ../sales/customer_delivery.php:130
+#: ../sales/customer_delivery.php:118
 msgid ""
 "This page can only be opened if an order or delivery note has been selected. "
 "Please select it first."
 msgstr ""
 
-#: ../sales/customer_delivery.php:132
+#: ../sales/customer_delivery.php:120
 msgid "Select a Sales Order to Delivery"
 msgstr ""
 
-#: ../sales/customer_delivery.php:141
+#: ../sales/customer_delivery.php:129
 msgid ""
 "Selected quantity cannot be less than quantity invoiced nor more than "
 "quantity\tnot dispatched on sales order."
 msgstr ""
 
-#: ../sales/customer_delivery.php:144
+#: ../sales/customer_delivery.php:132
 msgid "Freight cost cannot be less than zero"
 msgstr ""
 
-#: ../sales/customer_delivery.php:156
+#: ../sales/customer_delivery.php:144
 msgid "The entered date of delivery is invalid."
 msgstr ""
 
-#: ../sales/customer_delivery.php:162
+#: ../sales/customer_delivery.php:150
 msgid "The entered date of delivery is not in fiscal year."
 msgstr ""
 
-#: ../sales/customer_delivery.php:168
+#: ../sales/customer_delivery.php:156
 msgid "The entered dead-line for invoice is invalid."
 msgstr ""
 
-#: ../sales/customer_delivery.php:191
-#: ../sales/customer_invoice.php:296
+#: ../sales/customer_delivery.php:179
+#: ../sales/customer_invoice.php:291
 msgid "The entered shipping value is not numeric."
 msgstr ""
 
-#: ../sales/customer_delivery.php:197
+#: ../sales/customer_delivery.php:185
 msgid "There are no item quantities on this delivery note."
 msgstr ""
 
-#: ../sales/customer_delivery.php:290
-#: ../sales/sales_order_entry.php:480
-#: ../sales/includes/ui/sales_order_ui.inc:245
+#: ../sales/customer_delivery.php:278
+#: ../sales/sales_order_entry.php:483
+#: ../sales/includes/ui/sales_order_ui.inc:244
 msgid ""
 "The delivery cannot be processed because there is an insufficient quantity "
 "for item:"
 msgstr ""
 
-#: ../sales/customer_delivery.php:351
+#: ../sales/customer_delivery.php:339
 msgid "For Sales Order"
 msgstr ""
 
-#: ../sales/customer_delivery.php:360
+#: ../sales/customer_delivery.php:348
 msgid "Delivery From"
 msgstr ""
 
-#: ../sales/customer_delivery.php:409
+#: ../sales/customer_delivery.php:397
 msgid "Invoice Dead-line"
 msgstr ""
 
-#: ../sales/customer_delivery.php:419
-#: ../sales/customer_invoice.php:432
+#: ../sales/customer_delivery.php:407
+#: ../sales/customer_invoice.php:436
 #: ../sales/includes/ui/sales_order_ui.inc:82
-#: ../sales/includes/ui/sales_order_ui.inc:369
+#: ../sales/includes/ui/sales_order_ui.inc:368
 msgid ""
 "The selected customer account is currently on hold. Please contact the "
 "credit control personnel to discuss."
 msgstr ""
 
-#: ../sales/customer_delivery.php:424
+#: ../sales/customer_delivery.php:412
 msgid "Delivery Items"
 msgstr ""
 
-#: ../sales/customer_delivery.php:430
+#: ../sales/customer_delivery.php:418
 msgid "Max. delivery"
 msgstr ""
 
-#: ../sales/customer_delivery.php:430
-#: ../sales/customer_invoice.php:442
-#: ../sales/includes/ui/sales_order_ui.inc:142
+#: ../sales/customer_delivery.php:418
+#: ../sales/customer_invoice.php:446
+#: ../sales/includes/ui/sales_order_ui.inc:141
 msgid "Delivered"
 msgstr ""
 
-#: ../sales/customer_delivery.php:431
-#: ../sales/customer_invoice.php:443
+#: ../sales/customer_delivery.php:419
+#: ../sales/customer_invoice.php:447
 #: ../sales/view/view_receipt.php:45
 #: ../sales/view/view_sales_order.php:201
 msgid "Discount"
 msgstr ""
 
-#: ../sales/customer_delivery.php:491
-#: ../sales/customer_invoice.php:527
+#: ../sales/customer_delivery.php:479
+#: ../sales/customer_invoice.php:531
 msgid "Shipping Cost"
 msgstr ""
 
-#: ../sales/customer_delivery.php:511
-#: ../sales/includes/ui/sales_order_ui.inc:243
+#: ../sales/customer_delivery.php:499
+#: ../sales/includes/ui/sales_order_ui.inc:242
 msgid ""
 "Marked items have insufficient quantities in stock as on day of delivery."
 msgstr ""
 
-#: ../sales/customer_delivery.php:515
+#: ../sales/customer_delivery.php:503
 msgid "Action For Balance"
 msgstr ""
 
-#: ../sales/customer_delivery.php:522
-#: ../sales/customer_invoice.php:556
+#: ../sales/customer_delivery.php:510
+#: ../sales/customer_invoice.php:560
 msgid "Refresh document page"
 msgstr ""
 
-#: ../sales/customer_delivery.php:523
+#: ../sales/customer_delivery.php:511
 msgid "Process Dispatch"
 msgstr ""
 
-#: ../sales/customer_delivery.php:524
-#: ../sales/customer_invoice.php:558
-#: ../sales/sales_order_entry.php:687
+#: ../sales/customer_delivery.php:512
+#: ../sales/customer_invoice.php:562
+#: ../sales/sales_order_entry.php:686
 msgid "Check entered data and save document"
 msgstr ""
 
@@ -12768,17 +12867,17 @@ msgstr ""
 msgid "Select Another &Invoice to Modify"
 msgstr ""
 
-#: ../sales/customer_invoice.php:118
+#: ../sales/customer_invoice.php:119
 msgid "Select a different delivery to invoice"
 msgstr ""
 
-#: ../sales/customer_invoice.php:119
+#: ../sales/customer_invoice.php:120
 msgid ""
 "There are no delivered items with a quantity left to invoice. There is "
 "nothing left to invoice."
 msgstr ""
 
-#: ../sales/customer_invoice.php:134
+#: ../sales/customer_invoice.php:129
 msgid ""
 "There are no delivery notes for this invoice.<br>\n"
 "\t\tMost likely this invoice was created in Front Accounting version prior "
@@ -12786,68 +12885,68 @@ msgid ""
 "\t\tand therefore can not be modified."
 msgstr ""
 
-#: ../sales/customer_invoice.php:143
+#: ../sales/customer_invoice.php:138
 msgid ""
 "All quantities on this invoice has been credited. There is nothing to modify "
 "on this invoice"
 msgstr ""
 
-#: ../sales/customer_invoice.php:149
+#: ../sales/customer_invoice.php:144
 msgid ""
 "This page can only be opened after delivery selection. Please select "
 "delivery to invoicing first."
 msgstr ""
 
-#: ../sales/customer_invoice.php:151
+#: ../sales/customer_invoice.php:146
 msgid "Select Delivery to Invoice"
 msgstr ""
 
-#: ../sales/customer_invoice.php:156
-#: ../sales/customer_invoice.php:307
+#: ../sales/customer_invoice.php:151
+#: ../sales/customer_invoice.php:302
 msgid ""
 "Selected quantity cannot be less than quantity credited nor more than "
 "quantity not invoiced yet."
 msgstr ""
 
-#: ../sales/customer_invoice.php:260
+#: ../sales/customer_invoice.php:255
 msgid "The entered invoice date is invalid."
 msgstr ""
 
-#: ../sales/customer_invoice.php:266
+#: ../sales/customer_invoice.php:261
 msgid "The entered invoice date is not in fiscal year."
 msgstr ""
 
-#: ../sales/customer_invoice.php:272
+#: ../sales/customer_invoice.php:267
 msgid "The entered invoice due date is invalid."
 msgstr ""
 
-#: ../sales/customer_invoice.php:302
+#: ../sales/customer_invoice.php:297
 msgid "There are no item quantities on this invoice."
 msgstr ""
 
-#: ../sales/customer_invoice.php:373
+#: ../sales/customer_invoice.php:377
 msgid "Payment terms:"
 msgstr ""
 
-#: ../sales/customer_invoice.php:376
-#: ../sales/includes/ui/sales_order_ui.inc:408
-#: ../sales/includes/ui/sales_order_ui.inc:412
+#: ../sales/customer_invoice.php:380
+#: ../sales/includes/ui/sales_order_ui.inc:405
+#: ../sales/includes/ui/sales_order_ui.inc:409
 msgid "Payment:"
 msgstr ""
 
-#: ../sales/customer_invoice.php:438
+#: ../sales/customer_invoice.php:442
 msgid "Invoice Items"
 msgstr ""
 
-#: ../sales/customer_invoice.php:443
+#: ../sales/customer_invoice.php:447
 msgid "This Invoice"
 msgstr ""
 
-#: ../sales/customer_invoice.php:451
+#: ../sales/customer_invoice.php:455
 msgid "Credited"
 msgstr ""
 
-#: ../sales/customer_invoice.php:545
+#: ../sales/customer_invoice.php:549
 msgid "Invoice Total"
 msgstr ""
 
@@ -13107,138 +13206,138 @@ msgstr ""
 msgid "You need to define a cash account for your Sales Point."
 msgstr ""
 
-#: ../sales/sales_order_entry.php:459
+#: ../sales/sales_order_entry.php:462
 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:463
-msgid "Price for item must be entered and can not be less than 0"
+#: ../sales/sales_order_entry.php:466
+msgid "Price for inventory item must be entered and can not be less than 0"
 msgstr ""
 
-#: ../sales/sales_order_entry.php:470
+#: ../sales/sales_order_entry.php:473
 msgid ""
 "You attempting to make the quantity ordered a quantity less than has already "
 "been delivered. The quantity delivered cannot be modified retrospectively."
 msgstr ""
 
-#: ../sales/sales_order_entry.php:510
+#: ../sales/sales_order_entry.php:513
 msgid ""
 "This item cannot be deleted because some of it has already been delivered."
 msgstr ""
 
-#: ../sales/sales_order_entry.php:539
+#: ../sales/sales_order_entry.php:542
 msgid "Direct delivery entry has been cancelled as requested."
 msgstr ""
 
-#: ../sales/sales_order_entry.php:540
+#: ../sales/sales_order_entry.php:543
 msgid "Enter a New Sales Delivery"
 msgstr ""
 
-#: ../sales/sales_order_entry.php:543
+#: ../sales/sales_order_entry.php:546
 msgid "Direct invoice entry has been cancelled as requested."
 msgstr ""
 
-#: ../sales/sales_order_entry.php:544
+#: ../sales/sales_order_entry.php:547
 msgid "Enter a New Sales Invoice"
 msgstr ""
 
-#: ../sales/sales_order_entry.php:549
+#: ../sales/sales_order_entry.php:552
 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:554
+#: ../sales/sales_order_entry.php:557
 msgid "This sales quotation has been cancelled as requested."
 msgstr ""
 
-#: ../sales/sales_order_entry.php:555
+#: ../sales/sales_order_entry.php:558
 msgid "Enter a New Sales Quotation"
 msgstr ""
 
-#: ../sales/sales_order_entry.php:559
+#: ../sales/sales_order_entry.php:562
 msgid "This sales order has been cancelled as requested."
 msgstr ""
 
-#: ../sales/sales_order_entry.php:560
+#: ../sales/sales_order_entry.php:563
 msgid "Enter a New Sales Order"
 msgstr ""
 
-#: ../sales/sales_order_entry.php:643
+#: ../sales/sales_order_entry.php:642
 msgid "Sales Invoice Items"
 msgstr ""
 
-#: ../sales/sales_order_entry.php:644
+#: ../sales/sales_order_entry.php:643
 msgid "Enter Delivery Details and Confirm Invoice"
 msgstr ""
 
-#: ../sales/sales_order_entry.php:646
+#: ../sales/sales_order_entry.php:645
 msgid "Place Invoice"
 msgstr ""
 
-#: ../sales/sales_order_entry.php:649
+#: ../sales/sales_order_entry.php:648
 msgid "Delivery Note Items"
 msgstr ""
 
-#: ../sales/sales_order_entry.php:650
+#: ../sales/sales_order_entry.php:649
 msgid "Enter Delivery Details and Confirm Dispatch"
 msgstr ""
 
-#: ../sales/sales_order_entry.php:651
+#: ../sales/sales_order_entry.php:650
 msgid "Cancel Delivery"
 msgstr ""
 
-#: ../sales/sales_order_entry.php:652
+#: ../sales/sales_order_entry.php:651
 msgid "Place Delivery"
 msgstr ""
 
-#: ../sales/sales_order_entry.php:654
+#: ../sales/sales_order_entry.php:653
 msgid "Quotation Date:"
 msgstr ""
 
-#: ../sales/sales_order_entry.php:655
+#: ../sales/sales_order_entry.php:654
 msgid "Sales Quotation Items"
 msgstr ""
 
-#: ../sales/sales_order_entry.php:656
+#: ../sales/sales_order_entry.php:655
 msgid "Enter Delivery Details and Confirm Quotation"
 msgstr ""
 
-#: ../sales/sales_order_entry.php:657
+#: ../sales/sales_order_entry.php:656
 msgid "Cancel Quotation"
 msgstr ""
 
-#: ../sales/sales_order_entry.php:658
+#: ../sales/sales_order_entry.php:657
 msgid "Place Quotation"
 msgstr ""
 
-#: ../sales/sales_order_entry.php:659
+#: ../sales/sales_order_entry.php:658
 msgid "Commit Quotations Changes"
 msgstr ""
 
-#: ../sales/sales_order_entry.php:662
+#: ../sales/sales_order_entry.php:661
 msgid "Sales Order Items"
 msgstr ""
 
-#: ../sales/sales_order_entry.php:663
+#: ../sales/sales_order_entry.php:662
 msgid "Enter Delivery Details and Confirm Order"
 msgstr ""
 
-#: ../sales/sales_order_entry.php:666
+#: ../sales/sales_order_entry.php:665
 msgid "Commit Order Changes"
 msgstr ""
 
-#: ../sales/sales_order_entry.php:688
+#: ../sales/sales_order_entry.php:687
 msgid "You are about to void this Document.\\nDo you want to continue?"
 msgstr ""
 
-#: ../sales/sales_order_entry.php:691
+#: ../sales/sales_order_entry.php:690
 msgid "Validate changes and update document"
 msgstr ""
 
-#: ../sales/sales_order_entry.php:695
+#: ../sales/sales_order_entry.php:694
 msgid ""
 "Cancels document entry or removes sales order when editing an old document"
 msgstr ""
@@ -13441,7 +13540,7 @@ msgid "Tax Group"
 msgstr ""
 
 #: ../sales/manage/customer_branches.php:319
-#: ../sales/includes/ui/sales_order_ui.inc:300
+#: ../sales/includes/ui/sales_order_ui.inc:299
 msgid ""
 "The selected customer does not have any branches. Please create at least one "
 "branch."
@@ -14085,41 +14184,41 @@ msgstr ""
 msgid "Set this order as a template for direct deliveries/invoices"
 msgstr ""
 
-#: ../sales/inquiry/sales_orders_view.php:242
+#: ../sales/inquiry/sales_orders_view.php:236
 msgid "Show All:"
 msgstr ""
 
-#: ../sales/inquiry/sales_orders_view.php:258
+#: ../sales/inquiry/sales_orders_view.php:253
 msgid "Order #"
 msgstr ""
 
-#: ../sales/inquiry/sales_orders_view.php:262
-#: ../sales/inquiry/sales_orders_view.php:276
+#: ../sales/inquiry/sales_orders_view.php:257
+#: ../sales/inquiry/sales_orders_view.php:271
 msgid "Cust Order Ref"
 msgstr ""
 
-#: ../sales/inquiry/sales_orders_view.php:265
-#: ../sales/inquiry/sales_orders_view.php:279
+#: ../sales/inquiry/sales_orders_view.php:260
+#: ../sales/inquiry/sales_orders_view.php:274
 msgid "Delivery To"
 msgstr ""
 
-#: ../sales/inquiry/sales_orders_view.php:272
+#: ../sales/inquiry/sales_orders_view.php:267
 msgid "Quote #"
 msgstr ""
 
-#: ../sales/inquiry/sales_orders_view.php:277
+#: ../sales/inquiry/sales_orders_view.php:272
 msgid "Quote Date"
 msgstr ""
 
-#: ../sales/inquiry/sales_orders_view.php:280
+#: ../sales/inquiry/sales_orders_view.php:275
 msgid "Quote Total"
 msgstr ""
 
-#: ../sales/inquiry/sales_orders_view.php:305
+#: ../sales/inquiry/sales_orders_view.php:300
 msgid "Tmpl"
 msgstr ""
 
-#: ../sales/includes/cart_class.inc:357
+#: ../sales/includes/cart_class.inc:346
 msgid "You have to enter valid stock code or nonempty description"
 msgstr ""
 
@@ -14141,37 +14240,37 @@ msgstr ""
 msgid "Cash invoice"
 msgstr ""
 
-#: ../sales/includes/db/sales_order_db.inc:105
-#: ../sales/includes/db/sales_order_db.inc:257
+#: ../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:108
-#: ../sales/includes/db/sales_order_db.inc:262
+#: ../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:109
-#: ../sales/includes/db/sales_order_db.inc:263
+#: ../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:137
+#: ../sales/includes/db/sales_order_db.inc:139
 msgid "Deleted."
 msgstr ""
 
 #: ../sales/includes/ui/sales_credit_ui.inc:94
-#: ../sales/includes/ui/sales_order_ui.inc:380
+#: ../sales/includes/ui/sales_order_ui.inc:379
 msgid "Customer Currency:"
 msgstr ""
 
 #: ../sales/includes/ui/sales_credit_ui.inc:112
-#: ../sales/includes/ui/sales_order_ui.inc:639
+#: ../sales/includes/ui/sales_order_ui.inc:636
 msgid "Shipping Company:"
 msgstr ""
 
 #: ../sales/includes/ui/sales_credit_ui.inc:114
-#: ../sales/includes/ui/sales_order_ui.inc:387
+#: ../sales/includes/ui/sales_order_ui.inc:386
 msgid "Customer Discount:"
 msgstr ""
 
@@ -14185,97 +14284,97 @@ msgid ""
 "have any branches."
 msgstr ""
 
-#: ../sales/includes/ui/sales_order_ui.inc:225
+#: ../sales/includes/ui/sales_order_ui.inc:224
 msgid "Shipping Charge"
 msgstr ""
 
-#: ../sales/includes/ui/sales_order_ui.inc:298
+#: ../sales/includes/ui/sales_order_ui.inc:297
 msgid "No customer found for entered text."
 msgstr ""
 
-#: ../sales/includes/ui/sales_order_ui.inc:324
+#: ../sales/includes/ui/sales_order_ui.inc:323
 #, php-format
 msgid "Customer's payment terms '%s' cannot be selected on this POS"
 msgstr ""
 
-#: ../sales/includes/ui/sales_order_ui.inc:374
+#: ../sales/includes/ui/sales_order_ui.inc:373
 msgid "Reference number unique for this document type"
 msgstr ""
 
-#: ../sales/includes/ui/sales_order_ui.inc:418
+#: ../sales/includes/ui/sales_order_ui.inc:415
 msgid "Price List:"
 msgstr ""
 
-#: ../sales/includes/ui/sales_order_ui.inc:435
+#: ../sales/includes/ui/sales_order_ui.inc:432
 msgid "Date of order receive"
 msgstr ""
 
-#: ../sales/includes/ui/sales_order_ui.inc:585
+#: ../sales/includes/ui/sales_order_ui.inc:582
 msgid "Cash payment"
 msgstr ""
 
-#: ../sales/includes/ui/sales_order_ui.inc:588
-#: ../sales/includes/ui/sales_order_ui.inc:617
+#: ../sales/includes/ui/sales_order_ui.inc:585
+#: ../sales/includes/ui/sales_order_ui.inc:614
 msgid "Deliver from Location:"
 msgstr ""
 
-#: ../sales/includes/ui/sales_order_ui.inc:589
+#: ../sales/includes/ui/sales_order_ui.inc:586
 msgid "Cash account:"
 msgstr ""
 
-#: ../sales/includes/ui/sales_order_ui.inc:595
+#: ../sales/includes/ui/sales_order_ui.inc:592
 msgid "Delivery Details"
 msgstr ""
 
-#: ../sales/includes/ui/sales_order_ui.inc:600
+#: ../sales/includes/ui/sales_order_ui.inc:597
 msgid "Invoice Delivery Details"
 msgstr ""
 
-#: ../sales/includes/ui/sales_order_ui.inc:601
+#: ../sales/includes/ui/sales_order_ui.inc:598
 msgid "Invoice before"
 msgstr ""
 
-#: ../sales/includes/ui/sales_order_ui.inc:605
+#: ../sales/includes/ui/sales_order_ui.inc:602
 msgid "Quotation Delivery Details"
 msgstr ""
 
-#: ../sales/includes/ui/sales_order_ui.inc:610
+#: ../sales/includes/ui/sales_order_ui.inc:607
 msgid "Order Delivery Details"
 msgstr ""
 
-#: ../sales/includes/ui/sales_order_ui.inc:623
+#: ../sales/includes/ui/sales_order_ui.inc:620
 msgid "Enter requested day of delivery"
 msgstr ""
 
-#: ../sales/includes/ui/sales_order_ui.inc:624
+#: ../sales/includes/ui/sales_order_ui.inc:621
 msgid "Enter Valid until Date"
 msgstr ""
 
-#: ../sales/includes/ui/sales_order_ui.inc:625
+#: ../sales/includes/ui/sales_order_ui.inc:622
 msgid "Deliver To:"
 msgstr ""
 
-#: ../sales/includes/ui/sales_order_ui.inc:626
+#: ../sales/includes/ui/sales_order_ui.inc:623
 msgid "Additional identifier for delivery e.g. name of receiving person"
 msgstr ""
 
-#: ../sales/includes/ui/sales_order_ui.inc:629
+#: ../sales/includes/ui/sales_order_ui.inc:626
 msgid "Delivery address. Default is address of customer branch"
 msgstr ""
 
-#: ../sales/includes/ui/sales_order_ui.inc:633
+#: ../sales/includes/ui/sales_order_ui.inc:630
 msgid "Contact Phone Number:"
 msgstr ""
 
-#: ../sales/includes/ui/sales_order_ui.inc:634
+#: ../sales/includes/ui/sales_order_ui.inc:631
 msgid "Phone number of ordering person. Defaults to branch phone number"
 msgstr ""
 
-#: ../sales/includes/ui/sales_order_ui.inc:635
+#: ../sales/includes/ui/sales_order_ui.inc:632
 msgid "Customer Reference:"
 msgstr ""
 
-#: ../sales/includes/ui/sales_order_ui.inc:636
+#: ../sales/includes/ui/sales_order_ui.inc:633
 msgid "Customer reference number for this order (if any)"
 msgstr ""
 
@@ -14365,15 +14464,15 @@ msgstr ""
 msgid "Shipping Tax"
 msgstr ""
 
-#: ../taxes/tax_groups.php:204
+#: ../taxes/tax_groups.php:205
 msgid "Tax applied to Shipping:"
 msgstr ""
 
-#: ../taxes/tax_groups.php:208
+#: ../taxes/tax_groups.php:209
 msgid "Select the taxes that are included in this group."
 msgstr ""
 
-#: ../taxes/tax_groups.php:213
+#: ../taxes/tax_groups.php:214
 msgid "Rate (%)"
 msgstr ""
 
@@ -14440,19 +14539,19 @@ msgstr ""
 msgid "Purchasing GL Account:"
 msgstr ""
 
-#: ../themes/default/renderer.php:17
+#: ../themes/default/renderer.php:27
 #: ../themes/exclusive/renderer.php:19
 msgid "Main Menu"
 msgstr ""
 
-#: ../themes/default/renderer.php:43
-#: ../themes/default/renderer.php:66
+#: ../themes/default/renderer.php:53
+#: ../themes/default/renderer.php:76
 #: ../themes/exclusive/renderer.php:43
 #: ../themes/exclusive/renderer.php:50
 msgid "Help"
 msgstr ""
 
-#: ../themes/default/renderer.php:61
+#: ../themes/default/renderer.php:71
 #: ../themes/exclusive/renderer.php:46
 msgid "Preferences"
 msgstr ""