Updated gettext template.
authorJanusz Dobrowolski <janusz@frontaccounting.eu>
Mon, 29 Sep 2014 13:35:40 +0000 (15:35 +0200)
committerJanusz Dobrowolski <janusz@frontaccounting.eu>
Mon, 29 Sep 2014 13:35:40 +0000 (15:35 +0200)
lang/new_language_template/LC_MESSAGES/empty.po

index 2d37b0bf6d4c1c09c3843baaf63c26132a1cc464..1666f7cf5793b9fe7871d88cf9ac5f50d4a9c2d9 100644 (file)
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-06-07 23:23+0200\n"
+"POT-Creation-Date: 2014-09-29 15:35+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -66,7 +66,7 @@ msgstr ""
 msgid "User name"
 msgstr ""
 
-#: access/login.php:97 admin/users.php:191
+#: access/login.php:97 admin/users.php:200
 msgid "Password:"
 msgstr ""
 
@@ -80,7 +80,7 @@ msgstr ""
 msgid "Login -->"
 msgstr ""
 
-#: access/login.php:152 access/password_reset.php:108
+#: access/login.php:156 access/password_reset.php:108
 #: admin/display_prefs.php:112 themes/default/renderer.php:129
 msgid "Theme:"
 msgstr ""
@@ -99,7 +99,7 @@ msgstr ""
 
 #: access/password_reset.php:63 reporting/rep103.php:277
 #: reporting/rep106.php:88 reporting/rep205.php:195
-#: reporting/includes/header2.inc:110 sales/manage/sales_people.php:99
+#: reporting/includes/header2.inc:113 sales/manage/sales_people.php:99
 msgid "Email"
 msgstr ""
 
@@ -134,11 +134,11 @@ msgstr ""
 #: admin/attachments.php:167 admin/view_print_transaction.php:72
 #: admin/void_transaction.php:157 gl/inquiry/journal_inquiry.php:47
 #: inventory/includes/item_adjustments_ui.inc:47
-#: manufacturing/work_order_add_finished.php:203
+#: manufacturing/work_order_add_finished.php:200
 #: manufacturing/work_order_costs.php:150
-#: manufacturing/work_order_entry.php:379
-#: manufacturing/work_order_entry.php:387
-#: manufacturing/includes/work_order_issue_ui.inc:161
+#: manufacturing/work_order_entry.php:377
+#: manufacturing/work_order_entry.php:385
+#: manufacturing/includes/work_order_issue_ui.inc:168
 #: sales/inquiry/customer_allocation_inquiry.php:47
 msgid "Type:"
 msgstr ""
@@ -146,7 +146,7 @@ msgstr ""
 #: admin/attachments.php:183 admin/create_coy.php:277
 #: admin/crm_categories.php:115 admin/fiscalyears.php:164
 #: admin/inst_lang.php:100 admin/payment_terms.php:142 admin/printers.php:96
-#: admin/shipping_companies.php:106 admin/tags.php:140 admin/users.php:144
+#: admin/shipping_companies.php:106 admin/tags.php:140 admin/users.php:153
 #: dimensions/inquiry/search_dimensions.php:120
 #: gl/inquiry/journal_inquiry.php:118 gl/manage/bank_accounts.php:130
 #: gl/manage/currencies.php:164 gl/manage/exchange_rates.php:94
@@ -155,28 +155,28 @@ msgstr ""
 #: gl/includes/ui/gl_bank_ui.inc:186 gl/includes/ui/gl_journal_ui.inc:122
 #: includes/ui/contacts_view.inc:64 includes/ui/simple_crud_class.inc:52
 #: inventory/prices.php:158 inventory/purchasing_data.php:164
-#: inventory/includes/item_adjustments_ui.inc:87
-#: inventory/includes/stock_transfers_ui.inc:79
+#: inventory/includes/item_adjustments_ui.inc:91
+#: inventory/includes/stock_transfers_ui.inc:83
 #: inventory/manage/item_categories.php:121
 #: inventory/manage/item_codes.php:140 inventory/manage/item_units.php:110
 #: inventory/manage/locations.php:161 inventory/manage/movement_types.php:106
 #: inventory/manage/sales_kits.php:55 manufacturing/search_work_orders.php:109
 #: manufacturing/manage/bom_edit.php:86
 #: manufacturing/manage/work_centres.php:114
-#: manufacturing/includes/work_order_issue_ui.inc:58
+#: manufacturing/includes/work_order_issue_ui.inc:63
 #: purchasing/includes/ui/invoice_ui.inc:533
 #: purchasing/includes/ui/po_ui.inc:263
-#: purchasing/inquiry/po_search_completed.php:106
-#: purchasing/inquiry/po_search.php:87 sales/manage/credit_status.php:119
+#: purchasing/inquiry/po_search_completed.php:109
+#: purchasing/inquiry/po_search.php:89 sales/manage/credit_status.php:119
 #: sales/manage/customer_branches.php:159
 #: sales/manage/recurrent_invoices.php:130 sales/manage/sales_areas.php:103
 #: sales/manage/sales_groups.php:99 sales/manage/sales_people.php:119
 #: sales/manage/sales_points.php:99 sales/manage/sales_types.php:121
 #: sales/inquiry/customer_inquiry.php:192
-#: sales/inquiry/sales_deliveries_view.php:154
+#: sales/inquiry/sales_deliveries_view.php:156
 #: sales/inquiry/sales_orders_view.php:128
 #: sales/includes/ui/sales_credit_ui.inc:197
-#: sales/includes/ui/sales_order_ui.inc:208 taxes/item_tax_types.php:139
+#: sales/includes/ui/sales_order_ui.inc:194 taxes/item_tax_types.php:139
 #: taxes/tax_groups.php:142 taxes/tax_types.php:132
 msgid "Edit"
 msgstr ""
@@ -193,7 +193,7 @@ msgstr ""
 #: admin/crm_categories.php:119 admin/fiscalyears.php:166
 #: admin/inst_chart.php:80 admin/inst_lang.php:109 admin/inst_module.php:143
 #: admin/inst_theme.php:102 admin/payment_terms.php:143 admin/printers.php:97
-#: admin/shipping_companies.php:107 admin/tags.php:141 admin/users.php:146
+#: admin/shipping_companies.php:107 admin/tags.php:141 admin/users.php:155
 #: gl/gl_budget.php:137 gl/manage/bank_accounts.php:131
 #: gl/manage/currencies.php:166 gl/manage/exchange_rates.php:99
 #: gl/manage/gl_account_classes.php:133 gl/manage/gl_account_types.php:155
@@ -202,14 +202,14 @@ msgstr ""
 #: includes/ui/contacts_view.inc:67 includes/ui/simple_crud_class.inc:54
 #: includes/ui/ui_input.inc:285 inventory/prices.php:159
 #: inventory/purchasing_data.php:165
-#: inventory/includes/item_adjustments_ui.inc:89
-#: inventory/includes/stock_transfers_ui.inc:81
+#: inventory/includes/item_adjustments_ui.inc:93
+#: inventory/includes/stock_transfers_ui.inc:85
 #: inventory/manage/item_categories.php:122
 #: inventory/manage/item_codes.php:141 inventory/manage/item_units.php:111
 #: inventory/manage/locations.php:162 inventory/manage/movement_types.php:107
 #: inventory/manage/sales_kits.php:56 manufacturing/manage/bom_edit.php:87
 #: manufacturing/manage/work_centres.php:115
-#: manufacturing/includes/work_order_issue_ui.inc:60
+#: manufacturing/includes/work_order_issue_ui.inc:65
 #: purchasing/includes/ui/invoice_ui.inc:297
 #: purchasing/includes/ui/po_ui.inc:265 sales/manage/credit_status.php:120
 #: sales/manage/customer_branches.php:163
@@ -217,7 +217,7 @@ msgstr ""
 #: sales/manage/sales_groups.php:100 sales/manage/sales_people.php:120
 #: sales/manage/sales_points.php:100 sales/manage/sales_types.php:122
 #: sales/includes/ui/sales_credit_ui.inc:199
-#: sales/includes/ui/sales_order_ui.inc:210 taxes/item_tax_types.php:140
+#: sales/includes/ui/sales_order_ui.inc:196 taxes/item_tax_types.php:140
 #: taxes/tax_groups.php:143 taxes/tax_types.php:133
 msgid "Delete"
 msgstr ""
@@ -227,7 +227,7 @@ msgstr ""
 #: dimensions/view/view_dimension.php:55 gl/bank_account_reconcile.php:234
 #: gl/inquiry/bank_inquiry.php:70 gl/inquiry/gl_account_inquiry.php:126
 #: gl/inquiry/journal_inquiry.php:127 gl/inquiry/journal_inquiry.php:140
-#: includes/ui/allocation_cart.inc:288 includes/ui/mk.allocation_cart.inc:288
+#: includes/ui/allocation_cart.inc:288
 #: inventory/inquiry/stock_movements.php:82
 #: manufacturing/search_work_orders.php:159
 #: manufacturing/includes/manufacturing_ui.inc:157
@@ -237,8 +237,8 @@ msgstr ""
 #: manufacturing/includes/manufacturing_ui.inc:280
 #: manufacturing/includes/manufacturing_ui.inc:331
 #: purchasing/view/view_po.php:115 purchasing/view/view_po.php:140
-#: purchasing/inquiry/po_search_completed.php:121
-#: purchasing/inquiry/po_search.php:130
+#: purchasing/inquiry/po_search_completed.php:124
+#: purchasing/inquiry/po_search.php:132
 #: purchasing/inquiry/supplier_allocation_inquiry.php:127
 #: purchasing/inquiry/supplier_inquiry.php:169
 #: purchasing/allocations/supplier_allocation_main.php:95
@@ -270,7 +270,7 @@ msgstr ""
 #: purchasing/po_receive_items.php:62 reporting/rep104.php:111
 #: reporting/rep105.php:114 reporting/rep204.php:84 reporting/rep303.php:121
 #: reporting/rep303.php:127 reporting/rep304.php:114 reporting/rep305.php:101
-#: reporting/rep306.php:141 reporting/rep307.php:117 reporting/rep308.php:149
+#: reporting/rep306.php:141 reporting/rep307.php:117 reporting/rep308.php:230
 #: reporting/rep309.php:98 reporting/rep401.php:71
 #: sales/create_recurrent_invoices.php:134 sales/manage/credit_status.php:97
 #: sales/manage/recurrent_invoices.php:102
@@ -339,12 +339,13 @@ msgstr ""
 #: gl/manage/bank_accounts.php:127 gl/manage/currencies.php:162
 #: gl/manage/gl_account_classes.php:127 gl/manage/gl_quick_entries.php:230
 #: includes/system_tests.inc:38 includes/system_tests.inc:113
-#: includes/system_tests.inc:126 includes/ui/ui_lists.inc:1675
+#: includes/system_tests.inc:126 includes/ui/ui_lists.inc:1677
 #: purchasing/manage/suppliers.php:121 reporting/rep101.php:114
 #: reporting/rep102.php:114 reporting/rep102.php:116 reporting/rep104.php:105
 #: reporting/rep106.php:75 reporting/rep114.php:74 reporting/rep201.php:106
 #: reporting/rep202.php:118 reporting/rep202.php:120 reporting/rep203.php:89
-#: reporting/rep303.php:113 reporting/rep303.php:117 reporting/rep501.php:113
+#: reporting/rep303.php:113 reporting/rep303.php:117 reporting/rep402.php:99
+#: reporting/rep402.php:134 reporting/rep501.php:113
 #: sales/manage/sales_points.php:94 sales/manage/sales_points.php:95
 #: sales/manage/sales_types.php:119 taxes/item_tax_types.php:129
 #: taxes/tax_groups.php:139
@@ -379,8 +380,8 @@ msgstr ""
 msgid "Create backup"
 msgstr ""
 
-#: admin/backups.php:181 sales/includes/ui/sales_order_ui.inc:594
-#: sales/includes/ui/sales_order_ui.inc:642
+#: admin/backups.php:181 sales/includes/ui/sales_order_ui.inc:577
+#: sales/includes/ui/sales_order_ui.inc:625
 msgid "Comments:"
 msgstr ""
 
@@ -458,7 +459,7 @@ msgstr ""
 msgid "Your password has been updated."
 msgstr ""
 
-#: admin/change_current_user_password.php:85 admin/users.php:180
+#: admin/change_current_user_password.php:85 admin/users.php:189
 msgid "User login:"
 msgstr ""
 
@@ -524,7 +525,7 @@ msgstr ""
 
 #: admin/company_preferences.php:165 admin/shipping_companies.php:142
 #: includes/ui/contacts_view.inc:109 inventory/manage/locations.php:202
-#: sales/manage/customers.php:234 sales/includes/ui/sales_order_ui.inc:633
+#: sales/manage/customers.php:234 sales/includes/ui/sales_order_ui.inc:616
 msgid "Address:"
 msgstr ""
 
@@ -543,7 +544,7 @@ msgstr ""
 msgid "Fax Number:"
 msgstr ""
 
-#: admin/company_preferences.php:170 admin/users.php:202
+#: admin/company_preferences.php:170 admin/users.php:211
 msgid "Email Address:"
 msgstr ""
 
@@ -657,19 +658,19 @@ msgstr ""
 #: gl/includes/ui/gl_journal_ui.inc:221 includes/ui/db_pager_view.inc:174
 #: includes/ui/simple_crud_class.inc:56 includes/ui/simple_crud_class.inc:227
 #: includes/ui/ui_input.inc:207 includes/ui/ui_input.inc:905
-#: inventory/adjustments.php:233 inventory/cost_update.php:136
-#: inventory/reorder_level.php:111 inventory/transfers.php:234
-#: inventory/includes/item_adjustments_ui.inc:157
-#: inventory/includes/stock_transfers_ui.inc:137
-#: inventory/manage/sales_kits.php:208 manufacturing/work_order_entry.php:459
-#: manufacturing/includes/work_order_issue_ui.inc:131
+#: inventory/adjustments.php:234 inventory/cost_update.php:136
+#: inventory/reorder_level.php:111 inventory/transfers.php:230
+#: inventory/includes/item_adjustments_ui.inc:163
+#: inventory/includes/stock_transfers_ui.inc:143
+#: inventory/manage/sales_kits.php:208 manufacturing/work_order_entry.php:457
+#: manufacturing/includes/work_order_issue_ui.inc:138
 #: purchasing/includes/ui/po_ui.inc:296 purchasing/includes/ui/po_ui.inc:439
 #: purchasing/po_receive_items.php:334 sales/credit_note_entry.php:284
-#: sales/customer_credit_invoice.php:380 sales/customer_delivery.php:533
+#: sales/customer_credit_invoice.php:380 sales/customer_delivery.php:517
 #: sales/customer_invoice.php:591 sales/inquiry/sales_orders_view.php:323
 #: sales/includes/ui/sales_credit_ui.inc:293
-#: sales/includes/ui/sales_order_ui.inc:243
-#: sales/includes/ui/sales_order_ui.inc:560
+#: sales/includes/ui/sales_order_ui.inc:229
+#: sales/includes/ui/sales_order_ui.inc:543
 msgid "Update"
 msgstr ""
 
@@ -789,15 +790,15 @@ msgstr ""
 #: gl/manage/bank_accounts.php:125 gl/manage/currencies.php:162
 #: gl/manage/gl_account_classes.php:127 gl/manage/gl_quick_entries.php:230
 #: includes/system_tests.inc:38 includes/system_tests.inc:113
-#: includes/system_tests.inc:126 includes/ui/ui_lists.inc:1676
+#: includes/system_tests.inc:126 includes/ui/ui_lists.inc:1678
 #: purchasing/manage/suppliers.php:121 reporting/rep101.php:113
 #: reporting/rep102.php:113 reporting/rep102.php:115 reporting/rep104.php:107
 #: reporting/rep106.php:77 reporting/rep114.php:76 reporting/rep201.php:105
 #: reporting/rep202.php:117 reporting/rep202.php:119 reporting/rep203.php:88
-#: reporting/rep303.php:108 reporting/rep303.php:116 reporting/rep501.php:111
-#: sales/manage/sales_points.php:94 sales/manage/sales_points.php:95
-#: sales/manage/sales_types.php:119 taxes/item_tax_types.php:133
-#: taxes/tax_groups.php:137
+#: reporting/rep303.php:108 reporting/rep303.php:116 reporting/rep402.php:99
+#: reporting/rep501.php:111 sales/manage/sales_points.php:94
+#: sales/manage/sales_points.php:95 sales/manage/sales_types.php:119
+#: taxes/item_tax_types.php:133 taxes/tax_groups.php:137
 msgid "Yes"
 msgstr ""
 
@@ -823,7 +824,6 @@ msgstr ""
 #: admin/inst_lang.php:87 admin/inst_lang.php:90 admin/inst_module.php:126
 #: admin/inst_theme.php:91 admin/inst_theme.php:93 admin/inst_upgrade.php:149
 #: gl/manage/gl_account_types.php:190 includes/ui/allocation_cart.inc:314
-#: includes/ui/mk.allocation_cart.inc:314
 msgid "None"
 msgstr ""
 
@@ -957,7 +957,7 @@ msgstr ""
 msgid "Language"
 msgstr ""
 
-#: admin/display_prefs.php:101 admin/users.php:206
+#: admin/display_prefs.php:101 admin/users.php:215
 msgid "Language:"
 msgstr ""
 
@@ -986,11 +986,11 @@ msgstr ""
 msgid "Start-up Tab"
 msgstr ""
 
-#: admin/display_prefs.php:127 admin/users.php:210
+#: admin/display_prefs.php:127 admin/users.php:219
 msgid "Printing profile"
 msgstr ""
 
-#: admin/display_prefs.php:128 admin/users.php:211
+#: admin/display_prefs.php:128 admin/users.php:220
 msgid "Browser printing support"
 msgstr ""
 
@@ -998,7 +998,7 @@ msgstr ""
 msgid "Use popup window to display reports:"
 msgstr ""
 
-#: admin/display_prefs.php:131 admin/users.php:214
+#: admin/display_prefs.php:131 admin/users.php:223
 msgid "Set this option to on if your browser directly supports pdf files"
 msgstr ""
 
@@ -1084,9 +1084,10 @@ msgid "Fiscal Year End"
 msgstr ""
 
 #: admin/fiscalyears.php:138 dimensions/inquiry/search_dimensions.php:133
-#: dimensions/inquiry/search_dimensions.php:139 includes/ui/ui_lists.inc:676
-#: manufacturing/search_work_orders.php:108 reporting/rep501.php:87
-#: reporting/rep710.php:113 reporting/includes/excel_report.inc:234
+#: dimensions/inquiry/search_dimensions.php:139 includes/ui/ui_lists.inc:678
+#: manufacturing/search_work_orders.php:108 reporting/rep402.php:103
+#: reporting/rep501.php:87 reporting/rep710.php:113
+#: reporting/includes/excel_report.inc:234
 #: reporting/includes/pdf_report.inc:266
 msgid "Closed"
 msgstr ""
@@ -1384,7 +1385,7 @@ msgstr ""
 #: purchasing/includes/ui/invoice_ui.inc:258
 #: purchasing/includes/ui/invoice_ui.inc:260
 #: purchasing/includes/ui/invoice_ui.inc:262 reporting/rep501.php:87
-#: reporting/rep709.php:111 reporting/rep709.php:112
+#: reporting/rep709.php:116 reporting/rep709.php:117
 #: sales/manage/customer_branches.php:294 sales/manage/sales_people.php:99
 #: taxes/item_tax_types.php:117
 msgid "Name"
@@ -1483,8 +1484,8 @@ msgstr ""
 msgid "Install third-party extension."
 msgstr ""
 
-#: admin/inst_module.php:168 includes/ui/ui_lists.inc:676
-#: includes/ui/ui_lists.inc:2156 reporting/includes/excel_report.inc:232
+#: admin/inst_module.php:168 includes/ui/ui_lists.inc:678
+#: includes/ui/ui_lists.inc:2158 reporting/includes/excel_report.inc:232
 #: reporting/includes/pdf_report.inc:264
 msgid "Active"
 msgstr ""
@@ -1632,12 +1633,13 @@ msgstr ""
 #: manufacturing/includes/manufacturing_ui.inc:331
 #: purchasing/inquiry/supplier_allocation_inquiry.php:126
 #: purchasing/inquiry/supplier_inquiry.php:168 reporting/rep102.php:134
-#: reporting/rep202.php:139 reporting/rep501.php:87 reporting/rep601.php:79
-#: reporting/rep702.php:60 reporting/rep704.php:83 reporting/rep704.php:86
-#: reporting/rep704.php:89 reporting/rep709.php:107 reporting/rep710.php:78
-#: reporting/rep710.php:86 reporting/reports_main.php:327
-#: reporting/reports_main.php:491 reporting/includes/doctext.inc:140
-#: reporting/includes/doctext.inc:181 reporting/includes/doctext.inc:200
+#: reporting/rep202.php:139 reporting/rep402.php:103 reporting/rep501.php:87
+#: reporting/rep601.php:79 reporting/rep702.php:60 reporting/rep704.php:83
+#: reporting/rep704.php:86 reporting/rep704.php:89 reporting/rep709.php:112
+#: reporting/rep710.php:78 reporting/rep710.php:86
+#: reporting/reports_main.php:334 reporting/reports_main.php:498
+#: reporting/includes/doctext.inc:140 reporting/includes/doctext.inc:181
+#: reporting/includes/doctext.inc:200
 #: sales/inquiry/customer_allocation_inquiry.php:144
 #: sales/inquiry/customer_inquiry.php:217
 msgid "Type"
@@ -1877,13 +1879,13 @@ msgstr ""
 #: gl/manage/gl_quick_entries.php:61 gl/includes/ui/gl_bank_ui.inc:279
 #: gl/includes/ui/gl_journal_ui.inc:223 includes/ui/simple_crud_class.inc:58
 #: includes/ui/simple_crud_class.inc:231 includes/ui/ui_controls.inc:589
-#: includes/ui/ui_input.inc:210 inventory/includes/item_adjustments_ui.inc:159
-#: inventory/includes/stock_transfers_ui.inc:139
+#: includes/ui/ui_input.inc:210 inventory/includes/item_adjustments_ui.inc:165
+#: inventory/includes/stock_transfers_ui.inc:145
 #: inventory/manage/items.php:416
-#: manufacturing/includes/work_order_issue_ui.inc:133
+#: manufacturing/includes/work_order_issue_ui.inc:140
 #: purchasing/includes/ui/po_ui.inc:441
 #: sales/includes/ui/sales_credit_ui.inc:295
-#: sales/includes/ui/sales_order_ui.inc:562
+#: sales/includes/ui/sales_order_ui.inc:545
 msgid "Cancel"
 msgstr ""
 
@@ -1892,7 +1894,7 @@ msgid "Cancel Edition"
 msgstr ""
 
 #: admin/shipping_companies.php:15 sales/customer_credit_invoice.php:254
-#: sales/customer_delivery.php:368 sales/customer_invoice.php:431
+#: sales/customer_delivery.php:346 sales/customer_invoice.php:431
 #: sales/view/view_credit.php:74 sales/view/view_dispatch.php:92
 #: sales/view/view_invoice.php:91
 msgid "Shipping Company"
@@ -1967,11 +1969,11 @@ msgstr ""
 msgid "Unspecified tag type"
 msgstr ""
 
-#: admin/tags.php:40 reporting/reports_main.php:350
-#: reporting/reports_main.php:359 reporting/reports_main.php:371
-#: reporting/reports_main.php:402 reporting/reports_main.php:410
-#: reporting/reports_main.php:421 reporting/reports_main.php:449
-#: reporting/reports_main.php:456 reporting/reports_main.php:466
+#: admin/tags.php:40 reporting/reports_main.php:357
+#: reporting/reports_main.php:366 reporting/reports_main.php:378
+#: reporting/reports_main.php:409 reporting/reports_main.php:417
+#: reporting/reports_main.php:428 reporting/reports_main.php:456
+#: reporting/reports_main.php:463 reporting/reports_main.php:473
 msgid "Account Tags"
 msgstr ""
 
@@ -2032,58 +2034,62 @@ msgstr ""
 msgid "A new user has been added."
 msgstr ""
 
-#: admin/users.php:97
+#: admin/users.php:100
+msgid "Cannot delete this user because entries are associated with this user."
+msgstr ""
+
+#: admin/users.php:105
 msgid "User has been deleted."
 msgstr ""
 
-#: admin/users.php:114
+#: admin/users.php:123
 msgid "User login"
 msgstr ""
 
-#: admin/users.php:114 admin/users.php:198 includes/ui/contacts_view.inc:41
+#: admin/users.php:123 admin/users.php:207 includes/ui/contacts_view.inc:41
 msgid "Full Name"
 msgstr ""
 
-#: admin/users.php:114 includes/ui/contacts_view.inc:41
+#: admin/users.php:123 includes/ui/contacts_view.inc:41
 #: inventory/manage/locations.php:146 reporting/rep106.php:88
-#: reporting/includes/header2.inc:98 sales/manage/sales_people.php:99
+#: reporting/includes/header2.inc:101 sales/manage/sales_people.php:99
 msgid "Phone"
 msgstr ""
 
-#: admin/users.php:115 sales/manage/customer_branches.php:300
+#: admin/users.php:124 sales/manage/customer_branches.php:300
 #: sales/view/view_sales_order.php:83
 msgid "E-mail"
 msgstr ""
 
-#: admin/users.php:115
+#: admin/users.php:124
 msgid "Last Visit"
 msgstr ""
 
-#: admin/users.php:115
+#: admin/users.php:124
 msgid "Access Level"
 msgstr ""
 
-#: admin/users.php:184
+#: admin/users.php:193
 msgid "User Login:"
 msgstr ""
 
-#: admin/users.php:195
+#: admin/users.php:204
 msgid "Enter a new password to change, leave empty to keep current."
 msgstr ""
 
-#: admin/users.php:200
+#: admin/users.php:209
 msgid "Telephone No.:"
 msgstr ""
 
-#: admin/users.php:204
+#: admin/users.php:213
 msgid "Access Level:"
 msgstr ""
 
-#: admin/users.php:208
+#: admin/users.php:217
 msgid "User's POS"
 msgstr ""
 
-#: admin/users.php:213
+#: admin/users.php:222
 msgid "Use popup window for reports:"
 msgstr ""
 
@@ -2093,9 +2099,9 @@ msgstr ""
 
 #: admin/view_print_transaction.php:43 admin/view_print_transaction.php:45
 #: admin/view_print_transaction.php:129 includes/ui/ui_controls.inc:188
-#: purchasing/inquiry/po_search_completed.php:113
-#: purchasing/inquiry/po_search.php:93 sales/inquiry/customer_inquiry.php:202
-#: sales/inquiry/sales_deliveries_view.php:160
+#: purchasing/inquiry/po_search_completed.php:116
+#: purchasing/inquiry/po_search.php:95 sales/inquiry/customer_inquiry.php:202
+#: sales/inquiry/sales_deliveries_view.php:162
 #: sales/inquiry/sales_orders_view.php:119
 msgid "Print"
 msgstr ""
@@ -2116,13 +2122,13 @@ 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:466
-#: purchasing/inquiry/po_search_completed.php:77
-#: purchasing/inquiry/po_search.php:76
+#: purchasing/inquiry/po_search_completed.php:80
+#: purchasing/inquiry/po_search.php:78
 #: purchasing/inquiry/supplier_allocation_inquiry.php:57
 #: purchasing/inquiry/supplier_inquiry.php:58
 #: sales/inquiry/customer_allocation_inquiry.php:51
 #: sales/inquiry/customer_inquiry.php:58
-#: sales/inquiry/sales_deliveries_view.php:116
+#: sales/inquiry/sales_deliveries_view.php:118
 #: sales/inquiry/sales_orders_view.php:247
 msgid "Search"
 msgstr ""
@@ -2160,25 +2166,25 @@ msgstr ""
 #: purchasing/view/view_supp_credit.php:43
 #: purchasing/view/view_supp_invoice.php:46
 #: purchasing/view/view_supp_payment.php:73
-#: purchasing/inquiry/po_search_completed.php:122
-#: purchasing/inquiry/po_search.php:131
+#: purchasing/inquiry/po_search_completed.php:125
+#: purchasing/inquiry/po_search.php:133
 #: purchasing/inquiry/supplier_allocation_inquiry.php:128
 #: purchasing/inquiry/supplier_inquiry.php:170
 #: purchasing/allocations/supplier_allocation_main.php:96
 #: reporting/rep501.php:87 reporting/rep601.php:79 reporting/rep702.php:53
 #: reporting/includes/doctext.inc:199 sales/customer_credit_invoice.php:245
-#: sales/customer_credit_invoice.php:247 sales/customer_delivery.php:348
-#: sales/customer_delivery.php:350 sales/customer_invoice.php:403
+#: sales/customer_credit_invoice.php:247 sales/customer_delivery.php:326
+#: sales/customer_delivery.php:328 sales/customer_invoice.php:403
 #: sales/customer_invoice.php:405
 #: sales/allocations/customer_allocation_main.php:95
 #: sales/view/view_dispatch.php:85 sales/view/view_invoice.php:84
 #: sales/view/view_receipt.php:39 sales/view/view_sales_order.php:81
 #: sales/inquiry/customer_allocation_inquiry.php:146
 #: sales/inquiry/customer_inquiry.php:220
-#: sales/inquiry/sales_deliveries_view.php:184
+#: sales/inquiry/sales_deliveries_view.php:186
 #: sales/includes/ui/sales_credit_ui.inc:85
 #: sales/includes/ui/sales_credit_ui.inc:87
-#: sales/includes/ui/sales_order_ui.inc:378
+#: sales/includes/ui/sales_order_ui.inc:361
 msgid "Reference"
 msgstr ""
 
@@ -2190,12 +2196,12 @@ msgstr ""
 #: gl/inquiry/journal_inquiry.php:128 gl/view/accrual_trans.php:52
 #: gl/view/bank_transfer_view.php:83 gl/view/gl_deposit_view.php:68
 #: gl/view/gl_payment_view.php:66 gl/view/gl_trans_view.php:36
-#: includes/ui/allocation_cart.inc:288 includes/ui/mk.allocation_cart.inc:288
-#: includes/ui/ui_view.inc:547 inventory/inquiry/stock_movements.php:84
+#: includes/ui/allocation_cart.inc:288 includes/ui/ui_view.inc:547
+#: inventory/inquiry/stock_movements.php:84
 #: inventory/view/view_adjustment.php:45 inventory/view/view_transfer.php:47
 #: manufacturing/search_work_orders.php:166
-#: manufacturing/work_order_entry.php:419
-#: manufacturing/work_order_entry.php:425
+#: manufacturing/work_order_entry.php:417
+#: manufacturing/work_order_entry.php:423
 #: manufacturing/view/wo_production_view.php:45
 #: manufacturing/includes/manufacturing_ui.inc:157
 #: manufacturing/includes/manufacturing_ui.inc:200
@@ -2209,12 +2215,12 @@ msgstr ""
 #: purchasing/inquiry/supplier_inquiry.php:173
 #: purchasing/allocations/supplier_allocation_main.php:97
 #: reporting/rep101.php:118 reporting/rep201.php:110 reporting/rep306.php:141
-#: reporting/rep501.php:87 reporting/rep601.php:79 reporting/rep704.php:83
-#: reporting/rep704.php:86 reporting/rep704.php:89 reporting/rep709.php:111
-#: reporting/rep710.php:77 reporting/includes/doctext.inc:145
-#: reporting/includes/doctext.inc:186 reporting/includes/doctext.inc:224
-#: reporting/includes/header2.inc:135 sales/customer_delivery.php:378
-#: sales/customer_invoice.php:441
+#: reporting/rep402.php:103 reporting/rep501.php:87 reporting/rep601.php:79
+#: reporting/rep704.php:83 reporting/rep704.php:86 reporting/rep704.php:89
+#: reporting/rep709.php:116 reporting/rep710.php:77
+#: reporting/includes/doctext.inc:145 reporting/includes/doctext.inc:186
+#: reporting/includes/doctext.inc:224 reporting/includes/header2.inc:138
+#: sales/customer_delivery.php:356 sales/customer_invoice.php:441
 #: sales/allocations/customer_allocation_main.php:96
 #: sales/view/view_credit.php:69 sales/view/view_sales_order.php:96
 #: sales/view/view_sales_order.php:129 sales/view/view_sales_order.php:161
@@ -2249,8 +2255,8 @@ msgstr ""
 #: admin/void_transaction.php:208 dimensions/dimension_entry.php:283
 #: gl/bank_transfer.php:98 gl/inquiry/journal_inquiry.php:56
 #: gl/manage/revaluate_currencies.php:106 includes/ui/ui_view.inc:344
-#: manufacturing/work_order_add_finished.php:210
-#: manufacturing/work_order_entry.php:451
+#: manufacturing/work_order_add_finished.php:207
+#: manufacturing/work_order_entry.php:449
 #: manufacturing/work_order_release.php:103
 #: purchasing/includes/ui/invoice_ui.inc:174 purchasing/po_entry_items.php:529
 #: purchasing/supplier_payment.php:325 sales/customer_payments.php:399
@@ -2285,7 +2291,7 @@ msgstr ""
 #: manufacturing/work_order_add_finished.php:98
 #: manufacturing/work_order_costs.php:83 purchasing/po_receive_items.php:174
 #: purchasing/supplier_payment.php:185 sales/customer_credit_invoice.php:91
-#: sales/sales_order_entry.php:353 sales/manage/recurrent_invoices.php:41
+#: sales/sales_order_entry.php:356 sales/manage/recurrent_invoices.php:41
 #: sales/manage/recurrent_invoices.php:46
 #: sales/manage/recurrent_invoices.php:51
 msgid "The entered date is invalid."
@@ -2294,7 +2300,7 @@ msgstr ""
 #: admin/void_transaction.php:254 gl/accruals.php:38 gl/bank_transfer.php:121
 #: gl/gl_bank.php:266 gl/gl_journal.php:162
 #: gl/manage/revaluate_currencies.php:59 inventory/adjustments.php:114
-#: inventory/transfers.php:109 manufacturing/work_order_add_finished.php:104
+#: inventory/transfers.php:108 manufacturing/work_order_add_finished.php:104
 #: manufacturing/work_order_costs.php:89
 #: manufacturing/work_order_entry.php:160
 #: manufacturing/work_order_issue.php:83 purchasing/supplier_credit.php:186
@@ -2581,8 +2587,8 @@ msgstr ""
 msgid "Ta&x Inquiry"
 msgstr ""
 
-#: applications/generalledger.php:44 reporting/reports_main.php:377
-#: reporting/reports_main.php:427 reporting/reports_main.php:472
+#: applications/generalledger.php:44 reporting/reports_main.php:384
+#: reporting/reports_main.php:434 reporting/reports_main.php:479
 msgid "Trial &Balance"
 msgstr ""
 
@@ -2950,15 +2956,15 @@ msgstr ""
 #: dimensions/dimension_entry.php:123 gl/bank_transfer.php:176
 #: gl/gl_bank.php:254 gl/gl_journal.php:176
 #: gl/manage/revaluate_currencies.php:72 inventory/adjustments.php:101
-#: inventory/transfers.php:97 manufacturing/work_order_add_finished.php:84
+#: inventory/transfers.php:96 manufacturing/work_order_add_finished.php:84
 #: manufacturing/work_order_entry.php:139
 #: manufacturing/work_order_issue.php:96 purchasing/po_entry_items.php:366
 #: purchasing/po_receive_items.php:195 purchasing/supplier_credit.php:166
 #: purchasing/supplier_invoice.php:165 purchasing/supplier_payment.php:214
 #: sales/create_recurrent_invoices.php:57 sales/credit_note_entry.php:181
-#: sales/customer_credit_invoice.php:205 sales/customer_delivery.php:312
+#: sales/customer_credit_invoice.php:205 sales/customer_delivery.php:290
 #: sales/customer_invoice.php:328 sales/customer_payments.php:169
-#: sales/customer_payments.php:176 sales/sales_order_entry.php:445
+#: sales/customer_payments.php:176 sales/sales_order_entry.php:453
 msgid "The entered reference is already in use."
 msgstr ""
 
@@ -2967,7 +2973,7 @@ msgid "The dimension name must be entered."
 msgstr ""
 
 #: dimensions/dimension_entry.php:138 manufacturing/work_order_entry.php:154
-#: manufacturing/work_order_entry.php:234 purchasing/po_entry_items.php:238
+#: manufacturing/work_order_entry.php:232 purchasing/po_entry_items.php:238
 msgid "The date entered is in an invalid format."
 msgstr ""
 
@@ -2993,18 +2999,18 @@ msgstr ""
 #: reporting/reports_main.php:233 reporting/reports_main.php:242
 #: reporting/reports_main.php:248 reporting/reports_main.php:258
 #: reporting/reports_main.php:266 reporting/reports_main.php:274
-#: reporting/reports_main.php:311 reporting/reports_main.php:325
-#: reporting/reports_main.php:337 reporting/reports_main.php:355
-#: reporting/reports_main.php:366 reporting/reports_main.php:378
-#: reporting/reports_main.php:391 reporting/reports_main.php:407
-#: reporting/reports_main.php:417 reporting/reports_main.php:428
-#: reporting/reports_main.php:440 reporting/reports_main.php:454
-#: reporting/reports_main.php:463 reporting/reports_main.php:473
-#: reporting/reports_main.php:482 reporting/reports_main.php:489
+#: reporting/reports_main.php:318 reporting/reports_main.php:332
+#: reporting/reports_main.php:344 reporting/reports_main.php:362
+#: reporting/reports_main.php:373 reporting/reports_main.php:385
+#: reporting/reports_main.php:398 reporting/reports_main.php:414
+#: reporting/reports_main.php:424 reporting/reports_main.php:435
+#: reporting/reports_main.php:447 reporting/reports_main.php:461
+#: reporting/reports_main.php:470 reporting/reports_main.php:480
+#: reporting/reports_main.php:489 reporting/reports_main.php:496
 msgid "Start Date"
 msgstr ""
 
-#: dimensions/dimension_entry.php:279 manufacturing/work_order_entry.php:420
+#: dimensions/dimension_entry.php:279 manufacturing/work_order_entry.php:418
 msgid "Date Required By"
 msgstr ""
 
@@ -3132,10 +3138,10 @@ msgstr ""
 #: inventory/includes/item_adjustments_ui.inc:35
 #: inventory/includes/stock_transfers_ui.inc:40
 #: manufacturing/search_work_orders.php:67
-#: manufacturing/work_order_add_finished.php:198
-#: manufacturing/work_order_entry.php:378
-#: manufacturing/work_order_entry.php:385
-#: manufacturing/includes/work_order_issue_ui.inc:156
+#: manufacturing/work_order_add_finished.php:195
+#: manufacturing/work_order_entry.php:376
+#: manufacturing/work_order_entry.php:383
+#: manufacturing/includes/work_order_issue_ui.inc:163
 #: purchasing/includes/ui/invoice_ui.inc:105
 #: purchasing/includes/ui/po_ui.inc:176 purchasing/includes/ui/po_ui.inc:181
 #: purchasing/supplier_payment.php:298 sales/customer_payments.php:368
@@ -3143,17 +3149,17 @@ msgid "Reference:"
 msgstr ""
 
 #: dimensions/inquiry/search_dimensions.php:75
-#: includes/ui/allocation_cart.inc:312 includes/ui/mk.allocation_cart.inc:312
-#: includes/ui/ui_lists.inc:1923 reporting/rep101.php:100
-#: reporting/rep102.php:96 reporting/rep104.php:97 reporting/rep104.php:101
-#: reporting/rep105.php:95 reporting/rep105.php:99 reporting/rep201.php:92
-#: reporting/rep202.php:100 reporting/rep203.php:74 reporting/rep204.php:77
-#: reporting/rep301.php:92 reporting/rep301.php:99 reporting/rep302.php:105
-#: reporting/rep302.php:112 reporting/rep303.php:96 reporting/rep303.php:103
-#: reporting/rep304.php:98 reporting/rep304.php:103 reporting/rep304.php:108
-#: reporting/rep306.php:120 reporting/rep306.php:125 reporting/rep306.php:130
-#: reporting/rep306.php:135 reporting/rep307.php:103 reporting/rep307.php:110
-#: reporting/rep308.php:138 reporting/rep308.php:143 reporting/rep309.php:92
+#: includes/ui/allocation_cart.inc:312 includes/ui/ui_lists.inc:1925
+#: reporting/rep101.php:100 reporting/rep102.php:96 reporting/rep104.php:97
+#: reporting/rep104.php:101 reporting/rep105.php:95 reporting/rep105.php:99
+#: reporting/rep201.php:92 reporting/rep202.php:100 reporting/rep203.php:74
+#: reporting/rep204.php:77 reporting/rep301.php:156 reporting/rep301.php:163
+#: reporting/rep302.php:105 reporting/rep302.php:112 reporting/rep303.php:96
+#: reporting/rep303.php:103 reporting/rep304.php:98 reporting/rep304.php:103
+#: reporting/rep304.php:108 reporting/rep306.php:120 reporting/rep306.php:125
+#: reporting/rep306.php:130 reporting/rep306.php:135 reporting/rep307.php:103
+#: reporting/rep307.php:110 reporting/rep308.php:219 reporting/rep308.php:224
+#: reporting/rep309.php:92 reporting/rep402.php:87 reporting/rep402.php:95
 #: reporting/rep702.php:61 reporting/rep710.php:86 reporting/rep710.php:87
 msgid "All"
 msgstr ""
@@ -3189,7 +3195,6 @@ msgstr ""
 
 #: dimensions/inquiry/search_dimensions.php:132
 #: dimensions/view/view_dimension.php:55 includes/ui/allocation_cart.inc:288
-#: includes/ui/mk.allocation_cart.inc:288
 #: purchasing/includes/ui/invoice_ui.inc:125
 #: purchasing/view/view_supp_credit.php:48
 #: purchasing/view/view_supp_invoice.php:51
@@ -3203,7 +3208,7 @@ msgstr ""
 #: sales/view/view_invoice.php:96
 #: sales/inquiry/customer_allocation_inquiry.php:149
 #: sales/inquiry/customer_inquiry.php:222
-#: sales/includes/ui/sales_order_ui.inc:601
+#: sales/includes/ui/sales_order_ui.inc:584
 msgid "Due Date"
 msgstr ""
 
@@ -3301,20 +3306,20 @@ msgstr ""
 #: reporting/rep706.php:194 reporting/rep706.php:196 reporting/rep706.php:204
 #: reporting/rep707.php:218 reporting/rep707.php:220 reporting/rep707.php:228
 #: reporting/rep708.php:201 reporting/rep708.php:203 reporting/rep708.php:210
-#: reporting/reports_main.php:341 reporting/reports_main.php:342
 #: reporting/reports_main.php:348 reporting/reports_main.php:349
-#: reporting/reports_main.php:357 reporting/reports_main.php:358
-#: reporting/reports_main.php:369 reporting/reports_main.php:370
-#: reporting/reports_main.php:382 reporting/reports_main.php:383
-#: reporting/reports_main.php:395 reporting/reports_main.php:401
-#: reporting/reports_main.php:409 reporting/reports_main.php:420
-#: reporting/reports_main.php:432 sales/customer_delivery.php:395
-#: sales/customer_delivery.php:403 sales/customer_invoice.php:418
+#: reporting/reports_main.php:355 reporting/reports_main.php:356
+#: reporting/reports_main.php:364 reporting/reports_main.php:365
+#: reporting/reports_main.php:376 reporting/reports_main.php:377
+#: reporting/reports_main.php:389 reporting/reports_main.php:390
+#: reporting/reports_main.php:402 reporting/reports_main.php:408
+#: reporting/reports_main.php:416 reporting/reports_main.php:427
+#: reporting/reports_main.php:439 sales/customer_delivery.php:373
+#: sales/customer_delivery.php:381 sales/customer_invoice.php:418
 #: sales/customer_invoice.php:456 sales/manage/customers.php:274
 #: sales/manage/customers.php:276 sales/includes/ui/sales_credit_ui.inc:132
 #: sales/includes/ui/sales_credit_ui.inc:137
-#: sales/includes/ui/sales_order_ui.inc:456
-#: sales/includes/ui/sales_order_ui.inc:461
+#: sales/includes/ui/sales_order_ui.inc:439
+#: sales/includes/ui/sales_order_ui.inc:444
 msgid "Dimension"
 msgstr ""
 
@@ -3330,13 +3335,13 @@ msgstr ""
 #: gl/includes/ui/gl_bank_ui.inc:312 gl/includes/ui/gl_journal_ui.inc:84
 #: gl/includes/ui/gl_journal_ui.inc:87 gl/includes/ui/gl_journal_ui.inc:90
 #: gl/includes/ui/gl_journal_ui.inc:240
-#: inventory/includes/item_adjustments_ui.inc:181
-#: inventory/includes/stock_transfers_ui.inc:161
-#: manufacturing/includes/work_order_issue_ui.inc:169
+#: inventory/includes/item_adjustments_ui.inc:187
+#: inventory/includes/stock_transfers_ui.inc:167
+#: manufacturing/includes/work_order_issue_ui.inc:176
 #: purchasing/includes/ui/invoice_ui.inc:258
 #: purchasing/includes/ui/invoice_ui.inc:260
 #: purchasing/includes/ui/invoice_ui.inc:262
-#: sales/customer_credit_invoice.php:364 sales/customer_delivery.php:529
+#: sales/customer_credit_invoice.php:364 sales/customer_delivery.php:513
 #: sales/customer_invoice.php:587 sales/includes/ui/sales_credit_ui.inc:339
 msgid "Memo"
 msgstr ""
@@ -3390,8 +3395,7 @@ msgstr ""
 #: gl/view/gl_payment_view.php:107 gl/view/gl_payment_view.php:110
 #: gl/includes/ui/gl_bank_ui.inc:153 gl/includes/ui/gl_bank_ui.inc:156
 #: gl/includes/ui/gl_bank_ui.inc:159 includes/sysnames.inc:132
-#: includes/ui/allocation_cart.inc:288 includes/ui/mk.allocation_cart.inc:288
-#: includes/ui/ui_lists.inc:1187
+#: includes/ui/allocation_cart.inc:288 includes/ui/ui_lists.inc:1189
 #: manufacturing/includes/manufacturing_ui.inc:236
 #: purchasing/includes/ui/invoice_ui.inc:258
 #: purchasing/includes/ui/invoice_ui.inc:260
@@ -3399,7 +3403,7 @@ msgstr ""
 #: purchasing/view/view_supp_payment.php:60
 #: purchasing/view/view_supp_payment.php:72 reporting/rep102.php:245
 #: reporting/rep107.php:184 reporting/rep109.php:189 reporting/rep110.php:193
-#: reporting/rep111.php:174 reporting/rep113.php:178 reporting/rep202.php:253
+#: reporting/rep111.php:192 reporting/rep113.php:178 reporting/rep202.php:253
 #: reporting/rep209.php:192 reporting/rep706.php:309 reporting/rep707.php:327
 #: reporting/rep710.php:78 sales/view/view_receipt.php:44
 msgid "Amount"
@@ -3575,13 +3579,13 @@ msgstr ""
 
 #: gl/bank_transfer.php:169 gl/gl_bank.php:248 gl/gl_journal.php:168
 #: gl/manage/revaluate_currencies.php:65 inventory/adjustments.php:94
-#: inventory/transfers.php:91 manufacturing/work_order_add_finished.php:77
+#: inventory/transfers.php:90 manufacturing/work_order_add_finished.php:77
 #: manufacturing/work_order_entry.php:132
 #: manufacturing/work_order_issue.php:89 purchasing/po_receive_items.php:188
 #: purchasing/supplier_payment.php:207 sales/credit_note_entry.php:147
 #: sales/customer_credit_invoice.php:102 sales/customer_delivery.php:166
 #: sales/customer_invoice.php:289 sales/customer_payments.php:162
-#: sales/sales_order_entry.php:416
+#: sales/sales_order_entry.php:424
 msgid "You must enter a reference."
 msgstr ""
 
@@ -3754,13 +3758,13 @@ msgstr ""
 #: gl/manage/gl_quick_entries.php:240 reporting/rep101.php:126
 #: reporting/rep105.php:118 reporting/rep106.php:92 reporting/rep114.php:90
 #: reporting/rep201.php:118 reporting/rep304.php:121 reporting/rep305.php:106
-#: reporting/rep306.php:148 reporting/rep307.php:122 reporting/rep308.php:155
+#: reporting/rep306.php:148 reporting/rep307.php:122 reporting/rep308.php:236
 #: reporting/rep309.php:103 reporting/rep601.php:85 reporting/rep702.php:59
 #: reporting/rep704.php:95 reporting/rep704.php:105 reporting/rep704.php:113
 #: reporting/rep706.php:185 reporting/rep706.php:193 reporting/rep706.php:203
 #: reporting/rep706.php:211 reporting/rep707.php:210 reporting/rep707.php:217
 #: reporting/rep707.php:227 reporting/rep707.php:235 reporting/rep708.php:200
-#: reporting/rep708.php:209 reporting/rep708.php:216 reporting/rep709.php:106
+#: reporting/rep708.php:209 reporting/rep708.php:216 reporting/rep709.php:111
 #: reporting/rep710.php:85
 msgid "Period"
 msgstr ""
@@ -3780,7 +3784,7 @@ msgstr ""
 #: gl/view/gl_payment_view.php:136 gl/view/gl_trans_view.php:106
 #: gl/includes/ui/gl_bank_ui.inc:202 gl/includes/ui/gl_journal_ui.inc:141
 #: inventory/includes/item_adjustments_ui.inc:63
-#: inventory/includes/item_adjustments_ui.inc:102
+#: inventory/includes/item_adjustments_ui.inc:106
 #: manufacturing/includes/manufacturing_ui.inc:178
 #: purchasing/includes/ui/invoice_ui.inc:322
 #: purchasing/includes/ui/invoice_ui.inc:487
@@ -3790,17 +3794,17 @@ msgstr ""
 #: reporting/rep101.php:234 reporting/rep106.php:84 reporting/rep106.php:119
 #: reporting/rep106.php:162 reporting/rep114.php:161 reporting/rep201.php:223
 #: reporting/rep203.php:94 reporting/rep203.php:171 reporting/rep204.php:113
-#: reporting/rep204.php:141 reporting/rep301.php:133 reporting/rep301.php:170
+#: reporting/rep204.php:141 reporting/rep301.php:197 reporting/rep301.php:245
 #: reporting/rep304.php:146 reporting/rep304.php:188 reporting/rep305.php:101
 #: reporting/rep305.php:127 reporting/rep305.php:183 reporting/rep306.php:141
 #: reporting/rep306.php:176 reporting/rep306.php:196 reporting/rep306.php:212
 #: reporting/rep306.php:261 reporting/rep306.php:276 reporting/rep306.php:287
-#: reporting/rep309.php:126 reporting/rep309.php:153 reporting/rep702.php:142
-#: reporting/rep705.php:152 reporting/rep705.php:315 reporting/rep706.php:106
-#: reporting/rep706.php:255 reporting/rep706.php:290 reporting/rep707.php:115
-#: reporting/rep707.php:297 reporting/rep708.php:253
+#: reporting/rep308.php:311 reporting/rep309.php:126 reporting/rep309.php:153
+#: reporting/rep702.php:142 reporting/rep705.php:152 reporting/rep705.php:315
+#: reporting/rep706.php:106 reporting/rep706.php:255 reporting/rep706.php:290
+#: reporting/rep707.php:115 reporting/rep707.php:297 reporting/rep708.php:253
 #: reporting/includes/doctext.inc:30 reporting/includes/doctext.inc:170
-#: sales/customer_credit_invoice.php:281 sales/customer_delivery.php:433
+#: sales/customer_credit_invoice.php:281 sales/customer_delivery.php:411
 #: sales/customer_invoice.php:479
 #: sales/allocations/customer_allocation_main.php:99
 #: sales/view/view_credit.php:91 sales/view/view_dispatch.php:113
@@ -3808,7 +3812,7 @@ msgstr ""
 #: sales/view/view_sales_order.php:129 sales/view/view_sales_order.php:161
 #: sales/view/view_sales_order.php:202
 #: sales/includes/ui/sales_credit_ui.inc:168
-#: sales/includes/ui/sales_order_ui.inc:146
+#: sales/includes/ui/sales_order_ui.inc:145
 msgid "Total"
 msgstr ""
 
@@ -3970,8 +3974,8 @@ msgstr ""
 msgid "No zero values"
 msgstr ""
 
-#: gl/inquiry/gl_trial_balance.php:61 reporting/reports_main.php:381
-#: reporting/reports_main.php:431 reporting/reports_main.php:476
+#: gl/inquiry/gl_trial_balance.php:61 reporting/reports_main.php:388
+#: reporting/reports_main.php:438 reporting/reports_main.php:483
 msgid "Only balances"
 msgstr ""
 
@@ -4033,7 +4037,7 @@ msgid "Trans #"
 msgstr ""
 
 #: gl/inquiry/journal_inquiry.php:134 reporting/rep710.php:77
-#: reporting/rep710.php:87 reporting/reports_main.php:492
+#: reporting/rep710.php:87 reporting/reports_main.php:499
 msgid "User"
 msgstr ""
 
@@ -4042,22 +4046,22 @@ msgid "Profit & Loss Drilldown"
 msgstr ""
 
 #: gl/inquiry/profit_loss.php:173 reporting/rep707.php:210
-#: reporting/includes/reports_classes.inc:245
+#: reporting/includes/reports_classes.inc:248
 msgid "Accumulated"
 msgstr ""
 
 #: gl/inquiry/profit_loss.php:173 reporting/rep707.php:255
-#: reporting/includes/reports_classes.inc:245
+#: reporting/includes/reports_classes.inc:248
 msgid "Period Y-1"
 msgstr ""
 
 #: gl/inquiry/profit_loss.php:173 reporting/rep707.php:246
-#: reporting/includes/reports_classes.inc:245
+#: reporting/includes/reports_classes.inc:248
 msgid "Budget"
 msgstr ""
 
-#: gl/inquiry/profit_loss.php:174 reporting/reports_main.php:368
-#: reporting/reports_main.php:419 reporting/reports_main.php:465
+#: gl/inquiry/profit_loss.php:174 reporting/reports_main.php:375
+#: reporting/reports_main.php:426 reporting/reports_main.php:472
 msgid "Compare to"
 msgstr ""
 
@@ -4073,11 +4077,11 @@ msgstr ""
 msgid "Tax Inquiry"
 msgstr ""
 
-#: gl/inquiry/tax_inquiry.php:82 reporting/rep709.php:183
+#: gl/inquiry/tax_inquiry.php:82 reporting/rep709.php:188
 msgid "Outputs"
 msgstr ""
 
-#: gl/inquiry/tax_inquiry.php:82 reporting/rep709.php:183
+#: gl/inquiry/tax_inquiry.php:82 reporting/rep709.php:188
 msgid "Inputs"
 msgstr ""
 
@@ -4085,7 +4089,7 @@ msgstr ""
 msgid "Charged on sales"
 msgstr ""
 
-#: gl/inquiry/tax_inquiry.php:100 reporting/rep709.php:183
+#: gl/inquiry/tax_inquiry.php:100 reporting/rep709.php:188
 msgid "Output Tax"
 msgstr ""
 
@@ -4093,7 +4097,7 @@ msgstr ""
 msgid "Paid on purchases"
 msgstr ""
 
-#: gl/inquiry/tax_inquiry.php:106 reporting/rep709.php:183
+#: gl/inquiry/tax_inquiry.php:106 reporting/rep709.php:188
 msgid "Input Tax"
 msgstr ""
 
@@ -4101,11 +4105,11 @@ msgstr ""
 msgid "Net payable or collectible"
 msgstr ""
 
-#: gl/inquiry/tax_inquiry.php:119 reporting/rep709.php:214
+#: gl/inquiry/tax_inquiry.php:119 reporting/rep709.php:219
 msgid "Total payable or refund"
 msgstr ""
 
-#: gl/manage/bank_accounts.php:16 reporting/reports_main.php:310
+#: gl/manage/bank_accounts.php:16 reporting/reports_main.php:317
 msgid "Bank Accounts"
 msgstr ""
 
@@ -4146,8 +4150,8 @@ msgstr ""
 #: gl/view/gl_payment_view.php:64 inventory/prices.php:146
 #: inventory/purchasing_data.php:147 purchasing/view/view_supp_credit.php:49
 #: purchasing/view/view_supp_invoice.php:53
-#: purchasing/inquiry/po_search_completed.php:127
-#: purchasing/inquiry/po_search.php:136
+#: purchasing/inquiry/po_search_completed.php:130
+#: purchasing/inquiry/po_search.php:138
 #: purchasing/inquiry/supplier_allocation_inquiry.php:133
 #: purchasing/inquiry/supplier_allocation_inquiry.php:143
 #: purchasing/inquiry/supplier_inquiry.php:76
@@ -4158,7 +4162,7 @@ msgstr ""
 #: reporting/rep101.php:128 reporting/rep102.php:133 reporting/rep102.php:139
 #: reporting/rep103.php:232 reporting/rep104.php:116 reporting/rep201.php:120
 #: reporting/rep202.php:138 reporting/rep203.php:101 reporting/rep205.php:150
-#: sales/customer_credit_invoice.php:237 sales/customer_delivery.php:340
+#: sales/customer_credit_invoice.php:237 sales/customer_delivery.php:318
 #: sales/customer_invoice.php:413
 #: sales/allocations/customer_allocation_main.php:98
 #: sales/allocations/customer_allocation_main.php:106
@@ -4169,7 +4173,7 @@ msgstr ""
 #: sales/inquiry/customer_inquiry.php:80
 #: sales/inquiry/customer_inquiry.php:225
 #: sales/inquiry/customer_inquiry.php:238
-#: sales/inquiry/sales_deliveries_view.php:189
+#: sales/inquiry/sales_deliveries_view.php:191
 #: sales/inquiry/sales_orders_view.php:272
 #: sales/inquiry/sales_orders_view.php:286
 msgid "Currency"
@@ -4716,7 +4720,7 @@ msgstr ""
 msgid "Posted"
 msgstr ""
 
-#: gl/manage/gl_quick_entries.php:329 sales/customer_delivery.php:433
+#: gl/manage/gl_quick_entries.php:329 sales/customer_delivery.php:411
 #: sales/customer_invoice.php:479
 msgid "Tax Type"
 msgstr ""
@@ -4790,7 +4794,7 @@ msgstr ""
 #: reporting/reports_main.php:114 reporting/reports_main.php:128
 #: reporting/reports_main.php:136 reporting/reports_main.php:143
 #: reporting/reports_main.php:192 reporting/reports_main.php:199
-#: reporting/reports_main.php:289
+#: reporting/reports_main.php:296
 msgid "From"
 msgstr ""
 
@@ -4897,7 +4901,7 @@ msgstr ""
 #: reporting/reports_main.php:107 reporting/reports_main.php:115
 #: reporting/reports_main.php:129 reporting/reports_main.php:137
 #: reporting/reports_main.php:144 reporting/reports_main.php:193
-#: reporting/reports_main.php:200 reporting/reports_main.php:290
+#: reporting/reports_main.php:200 reporting/reports_main.php:297
 msgid "To"
 msgstr ""
 
@@ -4913,7 +4917,7 @@ msgstr ""
 #: gl/includes/ui/gl_bank_ui.inc:24 gl/includes/ui/gl_journal_ui.inc:27
 #: inventory/includes/item_adjustments_ui.inc:39
 #: inventory/includes/stock_transfers_ui.inc:42
-#: manufacturing/work_order_add_finished.php:208
+#: manufacturing/work_order_add_finished.php:205
 #: manufacturing/work_order_costs.php:152
 #: purchasing/allocations/supplier_allocate.php:56
 #: sales/allocations/customer_allocate.php:54
@@ -4938,14 +4942,14 @@ msgstr ""
 
 #: gl/includes/ui/gl_bank_ui.inc:67 sales/manage/recurrent_invoices.php:169
 #: sales/includes/ui/sales_credit_ui.inc:29
-#: sales/includes/ui/sales_order_ui.inc:284
+#: sales/includes/ui/sales_order_ui.inc:267
 msgid "Customer:"
 msgstr ""
 
 #: gl/includes/ui/gl_bank_ui.inc:71 sales/customer_payments.php:345
 #: sales/manage/recurrent_invoices.php:172
 #: sales/includes/ui/sales_credit_ui.inc:37
-#: sales/includes/ui/sales_order_ui.inc:291
+#: sales/includes/ui/sales_order_ui.inc:274
 msgid "Branch:"
 msgstr ""
 
@@ -4965,66 +4969,66 @@ msgid "Into:"
 msgstr ""
 
 #: gl/includes/ui/gl_bank_ui.inc:187 includes/ui/simple_crud_class.inc:52
-#: inventory/includes/item_adjustments_ui.inc:88
-#: inventory/includes/stock_transfers_ui.inc:80
-#: manufacturing/includes/work_order_issue_ui.inc:59
+#: inventory/includes/item_adjustments_ui.inc:92
+#: inventory/includes/stock_transfers_ui.inc:84
+#: manufacturing/includes/work_order_issue_ui.inc:64
 #: purchasing/includes/ui/invoice_ui.inc:533
 #: purchasing/includes/ui/po_ui.inc:264
 #: sales/includes/ui/sales_credit_ui.inc:198
-#: sales/includes/ui/sales_order_ui.inc:209
+#: sales/includes/ui/sales_order_ui.inc:195
 msgid "Edit document line"
 msgstr ""
 
 #: gl/includes/ui/gl_bank_ui.inc:189 includes/ui/simple_crud_class.inc:54
-#: inventory/includes/item_adjustments_ui.inc:90
-#: inventory/includes/stock_transfers_ui.inc:82
-#: manufacturing/includes/work_order_issue_ui.inc:61
+#: inventory/includes/item_adjustments_ui.inc:94
+#: inventory/includes/stock_transfers_ui.inc:86
+#: manufacturing/includes/work_order_issue_ui.inc:66
 #: purchasing/includes/ui/invoice_ui.inc:298
 #: purchasing/includes/ui/po_ui.inc:266
 #: sales/includes/ui/sales_credit_ui.inc:200
-#: sales/includes/ui/sales_order_ui.inc:211
+#: sales/includes/ui/sales_order_ui.inc:197
 msgid "Remove line from document"
 msgstr ""
 
 #: gl/includes/ui/gl_bank_ui.inc:278 gl/includes/ui/gl_journal_ui.inc:222
 #: includes/ui/simple_crud_class.inc:56
-#: inventory/includes/item_adjustments_ui.inc:158
-#: inventory/includes/stock_transfers_ui.inc:138
-#: manufacturing/includes/work_order_issue_ui.inc:132
+#: inventory/includes/item_adjustments_ui.inc:164
+#: inventory/includes/stock_transfers_ui.inc:144
+#: manufacturing/includes/work_order_issue_ui.inc:139
 #: purchasing/includes/ui/po_ui.inc:440
 #: sales/includes/ui/sales_credit_ui.inc:294
-#: sales/includes/ui/sales_order_ui.inc:561
+#: sales/includes/ui/sales_order_ui.inc:544
 msgid "Confirm changes"
 msgstr ""
 
 #: gl/includes/ui/gl_bank_ui.inc:280 gl/includes/ui/gl_journal_ui.inc:224
 #: includes/ui/simple_crud_class.inc:58
-#: inventory/includes/item_adjustments_ui.inc:160
-#: inventory/includes/stock_transfers_ui.inc:140
-#: manufacturing/includes/work_order_issue_ui.inc:134
+#: inventory/includes/item_adjustments_ui.inc:166
+#: inventory/includes/stock_transfers_ui.inc:146
+#: manufacturing/includes/work_order_issue_ui.inc:141
 #: purchasing/includes/ui/po_ui.inc:442
 #: sales/includes/ui/sales_credit_ui.inc:296
-#: sales/includes/ui/sales_order_ui.inc:563
+#: sales/includes/ui/sales_order_ui.inc:546
 msgid "Cancel changes"
 msgstr ""
 
 #: gl/includes/ui/gl_bank_ui.inc:285 gl/includes/ui/gl_journal_ui.inc:228
-#: inventory/includes/item_adjustments_ui.inc:166
-#: inventory/includes/stock_transfers_ui.inc:146
-#: manufacturing/includes/work_order_issue_ui.inc:140
+#: inventory/includes/item_adjustments_ui.inc:172
+#: inventory/includes/stock_transfers_ui.inc:152
+#: manufacturing/includes/work_order_issue_ui.inc:147
 #: purchasing/includes/ui/po_ui.inc:448
 #: sales/includes/ui/sales_credit_ui.inc:302
-#: sales/includes/ui/sales_order_ui.inc:569
+#: sales/includes/ui/sales_order_ui.inc:552
 msgid "Add Item"
 msgstr ""
 
 #: gl/includes/ui/gl_bank_ui.inc:286
-#: inventory/includes/item_adjustments_ui.inc:167
-#: inventory/includes/stock_transfers_ui.inc:147
-#: manufacturing/includes/work_order_issue_ui.inc:141
+#: inventory/includes/item_adjustments_ui.inc:173
+#: inventory/includes/stock_transfers_ui.inc:153
+#: manufacturing/includes/work_order_issue_ui.inc:148
 #: purchasing/includes/ui/po_ui.inc:449
 #: sales/includes/ui/sales_credit_ui.inc:303
-#: sales/includes/ui/sales_order_ui.inc:570
+#: sales/includes/ui/sales_order_ui.inc:553
 msgid "Add new item to document"
 msgstr ""
 
@@ -5125,7 +5129,7 @@ msgid "Dimensions configuration"
 msgstr ""
 
 #: includes/access_levels.inc:72 inventory/manage/items.php:341
-#: reporting/reports_main.php:294
+#: reporting/reports_main.php:301
 msgid "Dimensions"
 msgstr ""
 
@@ -5627,23 +5631,23 @@ msgstr ""
 msgid "Requesting data..."
 msgstr ""
 
-#: includes/errors.inc:125
+#: includes/errors.inc:126
 msgid "in file"
 msgstr ""
 
-#: includes/errors.inc:125
+#: includes/errors.inc:126
 msgid "at line "
 msgstr ""
 
-#: includes/errors.inc:179
+#: includes/errors.inc:180
 msgid "Debug mode database warning:"
 msgstr ""
 
-#: includes/errors.inc:181
+#: includes/errors.inc:182
 msgid "DATABASE ERROR :"
 msgstr ""
 
-#: includes/errors.inc:216
+#: includes/errors.inc:217
 msgid ""
 "The entered information is a duplicate. Please go back and enter different "
 "values."
@@ -5850,7 +5854,7 @@ msgstr ""
 msgid "Sales Order"
 msgstr ""
 
-#: includes/sysnames.inc:41 sales/sales_order_entry.php:641
+#: includes/sysnames.inc:41 sales/sales_order_entry.php:636
 msgid "Sales Quotation"
 msgstr ""
 
@@ -5981,7 +5985,7 @@ msgstr ""
 #: reporting/reports_main.php:45 reporting/reports_main.php:102
 #: reporting/reports_main.php:121 reporting/reports_main.php:237
 #: sales/create_recurrent_invoices.php:134
-#: sales/customer_credit_invoice.php:235 sales/customer_delivery.php:338
+#: sales/customer_credit_invoice.php:235 sales/customer_delivery.php:316
 #: sales/customer_invoice.php:389
 #: sales/allocations/customer_allocation_main.php:97
 #: sales/allocations/customer_allocation_main.php:105
@@ -5990,7 +5994,7 @@ msgstr ""
 #: sales/inquiry/customer_allocation_inquiry.php:160
 #: sales/inquiry/customer_inquiry.php:223
 #: sales/inquiry/customer_inquiry.php:237
-#: sales/inquiry/sales_deliveries_view.php:180
+#: sales/inquiry/sales_deliveries_view.php:182
 #: sales/inquiry/sales_orders_view.php:264
 #: sales/inquiry/sales_orders_view.php:278
 msgid "Customer"
@@ -6001,8 +6005,8 @@ msgstr ""
 #: purchasing/includes/ui/grn_ui.inc:52 purchasing/includes/ui/po_ui.inc:313
 #: purchasing/view/view_supp_credit.php:42
 #: purchasing/view/view_supp_invoice.php:45
-#: purchasing/inquiry/po_search_completed.php:123
-#: purchasing/inquiry/po_search.php:132
+#: purchasing/inquiry/po_search_completed.php:126
+#: purchasing/inquiry/po_search.php:134
 #: purchasing/inquiry/supplier_allocation_inquiry.php:129
 #: purchasing/inquiry/supplier_allocation_inquiry.php:142
 #: purchasing/inquiry/supplier_inquiry.php:171
@@ -6111,7 +6115,7 @@ msgid "Supplier Invoice/Credit"
 msgstr ""
 
 #: includes/sysnames.inc:156 manufacturing/search_work_orders.php:165
-#: manufacturing/includes/manufacturing_ui.inc:278
+#: manufacturing/includes/manufacturing_ui.inc:278 reporting/rep402.php:103
 msgid "Manufactured"
 msgstr ""
 
@@ -6412,7 +6416,7 @@ msgid "Test type"
 msgstr ""
 
 #: includes/system_tests.inc:420 includes/ui/view_package.php:47
-#: reporting/rep204.php:85 reporting/rep301.php:105 reporting/rep308.php:150
+#: reporting/rep204.php:85 reporting/rep301.php:169 reporting/rep308.php:231
 msgid "Value"
 msgstr ""
 
@@ -6432,18 +6436,18 @@ msgstr ""
 #: reporting/reports_main.php:244 reporting/reports_main.php:254
 #: reporting/reports_main.php:262 reporting/reports_main.php:270
 #: reporting/reports_main.php:277 reporting/reports_main.php:285
-#: reporting/reports_main.php:292 reporting/reports_main.php:301
-#: reporting/reports_main.php:314 reporting/reports_main.php:321
-#: reporting/reports_main.php:328 reporting/reports_main.php:343
-#: reporting/reports_main.php:351 reporting/reports_main.php:362
-#: reporting/reports_main.php:374 reporting/reports_main.php:384
-#: reporting/reports_main.php:396 reporting/reports_main.php:403
-#: reporting/reports_main.php:413 reporting/reports_main.php:424
-#: reporting/reports_main.php:433 reporting/reports_main.php:444
-#: reporting/reports_main.php:450 reporting/reports_main.php:459
-#: reporting/reports_main.php:469 reporting/reports_main.php:477
-#: reporting/reports_main.php:485 reporting/reports_main.php:493
-#: reporting/includes/excel_report.inc:295
+#: reporting/reports_main.php:292 reporting/reports_main.php:299
+#: reporting/reports_main.php:308 reporting/reports_main.php:321
+#: reporting/reports_main.php:328 reporting/reports_main.php:335
+#: reporting/reports_main.php:350 reporting/reports_main.php:358
+#: reporting/reports_main.php:369 reporting/reports_main.php:381
+#: reporting/reports_main.php:391 reporting/reports_main.php:403
+#: reporting/reports_main.php:410 reporting/reports_main.php:420
+#: reporting/reports_main.php:431 reporting/reports_main.php:440
+#: reporting/reports_main.php:451 reporting/reports_main.php:457
+#: reporting/reports_main.php:466 reporting/reports_main.php:476
+#: reporting/reports_main.php:484 reporting/reports_main.php:492
+#: reporting/reports_main.php:500 reporting/includes/excel_report.inc:295
 #: reporting/includes/excel_report.inc:428
 #: reporting/includes/pdf_report.inc:346 reporting/includes/pdf_report.inc:618
 #: sales/view/view_sales_order.php:85
@@ -6460,48 +6464,47 @@ msgid ""
 "trail record."
 msgstr ""
 
-#: includes/db/inventory_db.inc:253
+#: includes/db/inventory_db.inc:284
 #: inventory/includes/db/items_trans_db.inc:60
 #, php-format
 msgid "Cost was %s changed to %s x quantity on hand for item '%s'"
 msgstr ""
 
-#: includes/db/inventory_db.inc:294
+#: includes/db/inventory_db.inc:325
 msgid "Zero/negative inventory handling"
 msgstr ""
 
-#: includes/ui/allocation_cart.inc:286 includes/ui/mk.allocation_cart.inc:286
+#: includes/ui/allocation_cart.inc:286
 #, php-format
 msgid "Allocated amounts in %s:"
 msgstr ""
 
-#: includes/ui/allocation_cart.inc:288 includes/ui/mk.allocation_cart.inc:288
+#: includes/ui/allocation_cart.inc:288
 #: purchasing/allocations/supplier_allocation_main.php:94
 #: sales/allocations/customer_allocation_main.php:93
 msgid "Transaction Type"
 msgstr ""
 
-#: includes/ui/allocation_cart.inc:288 includes/ui/mk.allocation_cart.inc:288
+#: includes/ui/allocation_cart.inc:288
 msgid "Supplier Ref"
 msgstr ""
 
-#: includes/ui/allocation_cart.inc:288 includes/ui/mk.allocation_cart.inc:288
-#: reporting/rep704.php:83 reporting/rep704.php:86 reporting/rep704.php:89
-#: reporting/rep709.php:111 sales/view/view_credit.php:68
-#: sales/view/view_sales_order.php:96 sales/view/view_sales_order.php:129
-#: sales/view/view_sales_order.php:161 sales/inquiry/sales_orders_view.php:226
+#: includes/ui/allocation_cart.inc:288 reporting/rep704.php:83
+#: reporting/rep704.php:86 reporting/rep704.php:89 reporting/rep709.php:116
+#: sales/view/view_credit.php:68 sales/view/view_sales_order.php:96
+#: sales/view/view_sales_order.php:129 sales/view/view_sales_order.php:161
+#: sales/inquiry/sales_orders_view.php:226
 #: sales/inquiry/sales_orders_view.php:263
 #: sales/inquiry/sales_orders_view.php:277
 msgid "Ref"
 msgstr ""
 
-#: includes/ui/allocation_cart.inc:289 includes/ui/mk.allocation_cart.inc:289
+#: includes/ui/allocation_cart.inc:289
 msgid "Other Allocations"
 msgstr ""
 
 #: includes/ui/allocation_cart.inc:289 includes/ui/allocation_cart.inc:342
-#: includes/ui/mk.allocation_cart.inc:289
-#: includes/ui/mk.allocation_cart.inc:343 includes/ui/ui_view.inc:548
+#: includes/ui/ui_view.inc:548
 #: purchasing/allocations/supplier_allocation_main.php:101
 #: reporting/rep112.php:157 reporting/rep210.php:164
 #: reporting/includes/doctext.inc:145 reporting/includes/doctext.inc:186
@@ -6509,26 +6512,25 @@ msgstr ""
 msgid "Left to Allocate"
 msgstr ""
 
-#: includes/ui/allocation_cart.inc:289 includes/ui/mk.allocation_cart.inc:289
-#: includes/ui/ui_view.inc:548 reporting/includes/doctext.inc:145
-#: reporting/includes/doctext.inc:186
+#: includes/ui/allocation_cart.inc:289 includes/ui/ui_view.inc:548
+#: reporting/includes/doctext.inc:145 reporting/includes/doctext.inc:186
 msgid "This Allocation"
 msgstr ""
 
-#: includes/ui/allocation_cart.inc:322 includes/ui/mk.allocation_cart.inc:322
-#: reporting/rep112.php:154 reporting/rep210.php:161
+#: includes/ui/allocation_cart.inc:322 reporting/rep112.php:154
+#: reporting/rep210.php:161
 msgid "Total Allocated"
 msgstr ""
 
-#: includes/ui/allocation_cart.inc:363 includes/ui/mk.allocation_cart.inc:364
+#: includes/ui/allocation_cart.inc:363
 msgid "The entry for one or more amounts is invalid or negative."
 msgstr ""
 
-#: includes/ui/allocation_cart.inc:374 includes/ui/mk.allocation_cart.inc:375
+#: includes/ui/allocation_cart.inc:374
 msgid "At least one transaction is overallocated."
 msgstr ""
 
-#: includes/ui/allocation_cart.inc:393 includes/ui/mk.allocation_cart.inc:395
+#: includes/ui/allocation_cart.inc:393
 msgid ""
 "These allocations cannot be processed because the amount allocated is more "
 "than the total amount left to allocate."
@@ -6543,7 +6545,7 @@ msgid "Sec Phone"
 msgstr ""
 
 #: includes/ui/contacts_view.inc:41 reporting/rep103.php:266
-#: reporting/rep205.php:184 reporting/includes/header2.inc:104
+#: reporting/rep205.php:184 reporting/includes/header2.inc:107
 #: sales/manage/sales_people.php:99
 msgid "Fax"
 msgstr ""
@@ -6688,8 +6690,9 @@ msgstr ""
 msgid "Suppliers"
 msgstr ""
 
-#: includes/ui/ui_controls.inc:458 inventory/transfers.php:228
-#: inventory/manage/items.php:21 reporting/reports_main.php:253
+#: includes/ui/ui_controls.inc:458 inventory/transfers.php:224
+#: inventory/manage/items.php:21 reporting/rep402.php:108
+#: reporting/reports_main.php:253 reporting/reports_main.php:289
 msgid "Items"
 msgstr ""
 
@@ -6697,12 +6700,12 @@ msgstr ""
 msgid "Entered data has not been saved yet.\\nDo you want to abandon changes?"
 msgstr ""
 
-#: includes/ui/ui_input.inc:631 reporting/includes/reports_classes.inc:219
+#: includes/ui/ui_input.inc:631 reporting/includes/reports_classes.inc:222
 msgid "Click Here to Pick up the date"
 msgstr ""
 
-#: includes/ui/ui_input.inc:915 includes/ui/ui_lists.inc:2156
-#: reporting/rep301.php:155 reporting/rep302.php:170 reporting/rep303.php:184
+#: includes/ui/ui_input.inc:915 includes/ui/ui_lists.inc:2158
+#: reporting/rep301.php:229 reporting/rep302.php:170 reporting/rep303.php:184
 #: reporting/rep304.php:170 reporting/rep304.php:174 reporting/rep306.php:235
 #: reporting/rep306.php:242 sales/manage/customer_branches.php:302
 msgid "Inactive"
@@ -6732,140 +6735,140 @@ msgstr ""
 msgid "Enter description fragment to search or * for all"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:453 includes/ui/ui_lists.inc:1391
+#: includes/ui/ui_lists.inc:454 includes/ui/ui_lists.inc:1393
 msgid "All Suppliers"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:457
+#: includes/ui/ui_lists.inc:458
 msgid "Press Space tab to filter by name fragment"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:458
+#: includes/ui/ui_lists.inc:459
 msgid "Select supplier"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:505
+#: includes/ui/ui_lists.inc:507
 msgid "All Customers"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:509
+#: includes/ui/ui_lists.inc:511
 msgid "Press Space tab to filter by name fragment; F2 - entry new customer"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:510
+#: includes/ui/ui_lists.inc:512
 msgid "Select customer"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:558
+#: includes/ui/ui_lists.inc:560
 msgid "All branches"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:561
+#: includes/ui/ui_lists.inc:563
 msgid "Select customer branch"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:601
+#: includes/ui/ui_lists.inc:603
 msgid "All Locations"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:753 includes/ui/ui_lists.inc:822
+#: includes/ui/ui_lists.inc:755 includes/ui/ui_lists.inc:824
 msgid "All Items"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:1298
+#: includes/ui/ui_lists.inc:1300
 msgid "All Sales Types"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:1629
+#: includes/ui/ui_lists.inc:1631
 msgid "Use Item Sales Accounts"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:1940 includes/ui/ui_lists.inc:1957
-#: includes/ui/ui_lists.inc:1974
+#: includes/ui/ui_lists.inc:1942 includes/ui/ui_lists.inc:1959
+#: includes/ui/ui_lists.inc:1976
 msgid "All Types"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:1941 sales/view/view_sales_order.php:127
+#: includes/ui/ui_lists.inc:1943 sales/view/view_sales_order.php:127
 msgid "Sales Invoices"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:1942 includes/ui/ui_lists.inc:1959
-#: includes/ui/ui_lists.inc:1977
+#: includes/ui/ui_lists.inc:1944 includes/ui/ui_lists.inc:1961
+#: includes/ui/ui_lists.inc:1979
 msgid "Overdue Invoices"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:1943 includes/ui/ui_lists.inc:1960
-#: includes/ui/ui_lists.inc:1978 includes/ui/ui_view.inc:543
+#: includes/ui/ui_lists.inc:1945 includes/ui/ui_lists.inc:1962
+#: includes/ui/ui_lists.inc:1980 includes/ui/ui_view.inc:543
 msgid "Payments"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:1944 includes/ui/ui_lists.inc:1961
-#: includes/ui/ui_lists.inc:1979 sales/view/view_sales_order.php:158
+#: includes/ui/ui_lists.inc:1946 includes/ui/ui_lists.inc:1963
+#: includes/ui/ui_lists.inc:1981 sales/view/view_sales_order.php:158
 msgid "Credit Notes"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:1945 sales/view/view_sales_order.php:93
+#: includes/ui/ui_lists.inc:1947 sales/view/view_sales_order.php:93
 msgid "Delivery Notes"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:1958 includes/ui/ui_lists.inc:1976
+#: includes/ui/ui_lists.inc:1960 includes/ui/ui_lists.inc:1978
 msgid "Invoices"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:1962 includes/ui/ui_lists.inc:1980
+#: includes/ui/ui_lists.inc:1964 includes/ui/ui_lists.inc:1982
 msgid "Overdue Credit Notes"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:1975
+#: includes/ui/ui_lists.inc:1977
 msgid "GRNs"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:1993
+#: includes/ui/ui_lists.inc:1995
 msgid "Automatically put balance on back order"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:1994
+#: includes/ui/ui_lists.inc:1996
 msgid "Cancel any quantites not delivered"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2011
+#: includes/ui/ui_lists.inc:2013
 msgid "Items Returned to Inventory Location"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2012
+#: includes/ui/ui_lists.inc:2014
 msgid "Items Written Off"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2182
+#: includes/ui/ui_lists.inc:2184
 msgid "New role"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2234
+#: includes/ui/ui_lists.inc:2236
 msgid "No tags defined."
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2234
+#: includes/ui/ui_lists.inc:2236
 msgid "No active tags defined."
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2272
+#: includes/ui/ui_lists.inc:2274
 #, php-format
 msgid "Activated for '%s'"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2275
+#: includes/ui/ui_lists.inc:2277
 msgid "Available and/or installed"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2345
+#: includes/ui/ui_lists.inc:2347
 msgid "Standard new company American COA (4 digit)"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2347
+#: includes/ui/ui_lists.inc:2349
 msgid "Standard American COA (4 digit) with demo data"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2368
+#: includes/ui/ui_lists.inc:2370
 msgid "No payment Link"
 msgstr ""
 
@@ -6885,7 +6888,7 @@ msgid "Date Voided:"
 msgstr ""
 
 #: includes/ui/ui_view.inc:443 reporting/rep107.php:175
-#: reporting/rep109.php:180 reporting/rep110.php:184 reporting/rep111.php:165
+#: reporting/rep109.php:180 reporting/rep110.php:184 reporting/rep111.php:183
 #: reporting/rep113.php:169 reporting/rep209.php:183
 msgid "Total Tax Excluded"
 msgstr ""
@@ -6893,7 +6896,7 @@ msgstr ""
 #: includes/ui/ui_view.inc:449 includes/ui/ui_view.inc:468
 #: includes/ui/ui_view.inc:492 includes/ui/ui_view.inc:509
 #: reporting/rep107.php:184 reporting/rep109.php:189 reporting/rep110.php:193
-#: reporting/rep111.php:174 reporting/rep113.php:178 reporting/rep209.php:192
+#: reporting/rep111.php:192 reporting/rep113.php:178 reporting/rep209.php:192
 msgid "Included"
 msgstr ""
 
@@ -7093,8 +7096,8 @@ msgstr ""
 msgid "Enter &Another Adjustment"
 msgstr ""
 
-#: inventory/adjustments.php:88 inventory/transfers.php:85
-#: sales/sales_order_entry.php:363
+#: inventory/adjustments.php:88 inventory/transfers.php:84
+#: sales/sales_order_entry.php:366
 msgid "You must enter at least one non empty item line."
 msgstr ""
 
@@ -7102,25 +7105,25 @@ msgstr ""
 msgid "The entered date for the adjustment is invalid."
 msgstr ""
 
-#: inventory/adjustments.php:122
+#: inventory/adjustments.php:124
 msgid ""
-"The adjustment cannot be processed because an adjustment item would cause a "
-"negative inventory balance :"
+"The adjustment cannot be processed because it would cause negative inventory "
+"balance for marked items as of document date or later."
 msgstr ""
 
-#: inventory/adjustments.php:152 manufacturing/work_order_issue.php:139
+#: inventory/adjustments.php:153 manufacturing/work_order_issue.php:138
 msgid "The quantity entered is negative or invalid."
 msgstr ""
 
-#: inventory/adjustments.php:159 manufacturing/work_order_issue.php:146
+#: inventory/adjustments.php:160 manufacturing/work_order_issue.php:145
 msgid "The entered standard cost is negative or invalid."
 msgstr ""
 
-#: inventory/adjustments.php:228
+#: inventory/adjustments.php:229
 msgid "Adjustment Items"
 msgstr ""
 
-#: inventory/adjustments.php:234
+#: inventory/adjustments.php:235
 msgid "Process Adjustment"
 msgstr ""
 
@@ -7154,8 +7157,8 @@ msgstr ""
 #: inventory/purchasing_data.php:117 inventory/reorder_level.php:48
 #: inventory/inquiry/stock_movements.php:53
 #: inventory/inquiry/stock_status.php:47 inventory/manage/item_codes.php:105
-#: manufacturing/work_order_entry.php:396
-#: manufacturing/work_order_entry.php:401 purchasing/inquiry/po_search.php:74
+#: manufacturing/work_order_entry.php:394
+#: 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:241
 msgid "Item:"
@@ -7213,7 +7216,7 @@ msgid "The selected price has been deleted."
 msgstr ""
 
 #: inventory/prices.php:146 reporting/rep104.php:118
-#: sales/customer_delivery.php:355 sales/customer_invoice.php:411
+#: sales/customer_delivery.php:333 sales/customer_invoice.php:411
 #: sales/view/view_credit.php:73 sales/view/view_dispatch.php:93
 #: sales/view/view_invoice.php:92 sales/includes/ui/sales_credit_ui.inc:102
 msgid "Sales Type"
@@ -7224,7 +7227,7 @@ msgstr ""
 #: purchasing/po_receive_items.php:63 purchasing/view/view_grn.php:41
 #: purchasing/view/view_po.php:45 reporting/rep104.php:111
 #: reporting/includes/doctext.inc:30 reporting/includes/doctext.inc:170
-#: sales/customer_credit_invoice.php:281 sales/customer_delivery.php:433
+#: sales/customer_credit_invoice.php:281 sales/customer_delivery.php:411
 #: sales/customer_invoice.php:479 sales/view/view_credit.php:91
 #: sales/view/view_dispatch.php:113 sales/view/view_invoice.php:114
 #: sales/view/view_sales_order.php:202
@@ -7348,22 +7351,22 @@ msgstr ""
 #: manufacturing/search_work_orders.php:162
 #: manufacturing/inquiry/where_used_inquiry.php:45
 #: manufacturing/manage/bom_edit.php:70
-#: purchasing/inquiry/po_search_completed.php:124
-#: purchasing/inquiry/po_search_completed.php:134
-#: purchasing/inquiry/po_search.php:133 purchasing/inquiry/po_search.php:144
-#: reporting/rep105.php:120 reporting/rep301.php:112 reporting/rep302.php:132
+#: purchasing/inquiry/po_search_completed.php:127
+#: purchasing/inquiry/po_search_completed.php:137
+#: purchasing/inquiry/po_search.php:135 purchasing/inquiry/po_search.php:146
+#: reporting/rep105.php:120 reporting/rep301.php:176 reporting/rep302.php:132
 #: reporting/rep303.php:134 reporting/rep304.php:123 reporting/rep306.php:150
-#: reporting/rep307.php:124 reporting/rep308.php:157
-#: reporting/reports_main.php:210 reporting/reports_main.php:217
-#: reporting/reports_main.php:223 reporting/reports_main.php:236
-#: reporting/reports_main.php:251 reporting/reports_main.php:261
-#: reporting/reports_main.php:269 sales/manage/sales_points.php:84
+#: reporting/rep307.php:124 reporting/rep308.php:238 reporting/rep402.php:103
+#: reporting/rep402.php:109 reporting/reports_main.php:210
+#: reporting/reports_main.php:217 reporting/reports_main.php:223
+#: reporting/reports_main.php:236 reporting/reports_main.php:251
+#: reporting/reports_main.php:261 reporting/reports_main.php:269
+#: reporting/reports_main.php:290 sales/manage/sales_points.php:84
 msgid "Location"
 msgstr ""
 
 #: inventory/reorder_level.php:65 inventory/inquiry/stock_movements.php:84
-#: inventory/inquiry/stock_status.php:76 purchasing/supplier_credit.php:213
-#: sales/sales_order_entry.php:518 sales/includes/ui/sales_order_ui.inc:181
+#: inventory/inquiry/stock_status.php:76 purchasing/supplier_credit.php:212
 msgid "Quantity On Hand"
 msgstr ""
 
@@ -7392,25 +7395,25 @@ msgstr ""
 msgid "Enter &Another Inventory Transfer"
 msgstr ""
 
-#: inventory/transfers.php:103
+#: inventory/transfers.php:102
 msgid "The entered transfer date is invalid."
 msgstr ""
 
-#: inventory/transfers.php:115
+#: inventory/transfers.php:114
 msgid "The locations to transfer from and to must be different."
 msgstr ""
 
-#: inventory/transfers.php:125
+#: inventory/transfers.php:124
 msgid ""
-"The quantity entered is greater than the available quantity for this item at "
-"the source location :"
+"The transfer cannot be processed because it would cause negative inventory "
+"balance in source location for marked items as of document date or later."
 msgstr ""
 
-#: inventory/transfers.php:158
+#: inventory/transfers.php:154
 msgid "The quantity entered must be a positive number."
 msgstr ""
 
-#: inventory/transfers.php:235
+#: inventory/transfers.php:231
 msgid "Process Transfer"
 msgstr ""
 
@@ -7434,7 +7437,7 @@ msgid "For Part :"
 msgstr ""
 
 #: inventory/includes/item_adjustments_ui.inc:34
-#: manufacturing/work_order_entry.php:210 purchasing/inquiry/po_search.php:67
+#: 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
 msgid "Location:"
@@ -7459,11 +7462,11 @@ msgstr ""
 #: purchasing/view/view_grn.php:40 purchasing/view/view_po.php:45
 #: reporting/includes/doctext.inc:29 reporting/includes/doctext.inc:169
 #: reporting/includes/doctext.inc:206 sales/customer_credit_invoice.php:280
-#: sales/customer_delivery.php:431 sales/customer_invoice.php:478
+#: sales/customer_delivery.php:409 sales/customer_invoice.php:478
 #: sales/view/view_credit.php:90 sales/view/view_dispatch.php:112
 #: sales/view/view_invoice.php:113 sales/view/view_sales_order.php:201
 #: sales/includes/ui/sales_credit_ui.inc:167
-#: sales/includes/ui/sales_order_ui.inc:144
+#: sales/includes/ui/sales_order_ui.inc:143
 msgid "Item Code"
 msgstr ""
 
@@ -7473,12 +7476,12 @@ msgstr ""
 #: purchasing/includes/ui/po_ui.inc:233 purchasing/view/view_grn.php:40
 #: purchasing/view/view_po.php:45 reporting/includes/doctext.inc:29
 #: reporting/includes/doctext.inc:169 reporting/includes/doctext.inc:206
-#: sales/customer_credit_invoice.php:280 sales/customer_delivery.php:431
+#: sales/customer_credit_invoice.php:280 sales/customer_delivery.php:409
 #: sales/customer_invoice.php:478 sales/view/view_credit.php:90
 #: sales/view/view_dispatch.php:112 sales/view/view_invoice.php:113
 #: sales/view/view_sales_order.php:201
 #: sales/includes/ui/sales_credit_ui.inc:167
-#: sales/includes/ui/sales_order_ui.inc:144
+#: sales/includes/ui/sales_order_ui.inc:143
 msgid "Item Description"
 msgstr ""
 
@@ -7494,14 +7497,14 @@ msgstr ""
 #: manufacturing/includes/work_order_issue_ui.inc:33
 #: purchasing/includes/ui/invoice_ui.inc:497
 #: purchasing/includes/ui/po_ui.inc:233 purchasing/view/view_grn.php:40
-#: purchasing/view/view_po.php:45 reporting/rep301.php:105
+#: purchasing/view/view_po.php:45 reporting/rep301.php:169
 #: reporting/rep303.php:121 reporting/rep303.php:127 reporting/rep401.php:71
 #: reporting/includes/doctext.inc:29 reporting/includes/doctext.inc:170
 #: reporting/includes/doctext.inc:203 sales/view/view_credit.php:90
 #: sales/view/view_dispatch.php:112 sales/view/view_invoice.php:113
 #: sales/view/view_sales_order.php:201
 #: sales/includes/ui/sales_credit_ui.inc:167
-#: sales/includes/ui/sales_order_ui.inc:144
+#: sales/includes/ui/sales_order_ui.inc:143
 msgid "Quantity"
 msgstr ""
 
@@ -7515,20 +7518,25 @@ msgstr ""
 #: sales/view/view_dispatch.php:113 sales/view/view_invoice.php:114
 #: sales/view/view_sales_order.php:201
 #: sales/includes/ui/sales_credit_ui.inc:167
-#: sales/includes/ui/sales_order_ui.inc:146
+#: sales/includes/ui/sales_order_ui.inc:145
 msgid "Unit"
 msgstr ""
 
 #: inventory/includes/item_adjustments_ui.inc:63
 #: inventory/view/view_adjustment.php:57
 #: manufacturing/includes/manufacturing_ui.inc:29
-#: manufacturing/includes/work_order_issue_ui.inc:34 reporting/rep301.php:105
+#: manufacturing/includes/work_order_issue_ui.inc:34 reporting/rep301.php:169
 msgid "Unit Cost"
 msgstr ""
 
+#: inventory/includes/item_adjustments_ui.inc:110
+msgid ""
+"Marked items have insufficient quantities in stock as on day of adjustment."
+msgstr ""
+
 #: inventory/includes/stock_transfers_ui.inc:35
 #: inventory/inquiry/stock_movements.php:60
-#: manufacturing/includes/work_order_issue_ui.inc:164
+#: manufacturing/includes/work_order_issue_ui.inc:171
 msgid "From Location:"
 msgstr ""
 
@@ -7540,6 +7548,11 @@ msgstr ""
 msgid "Transfer Type:"
 msgstr ""
 
+#: inventory/includes/stock_transfers_ui.inc:100
+msgid ""
+"Marked items have insufficient quantities in stock as on day of transfer."
+msgstr ""
+
 #: inventory/includes/db/items_db.inc:119
 msgid ""
 "Cannot delete this item because there are stock movements that refer to this "
@@ -7657,7 +7670,7 @@ msgstr ""
 #: inventory/manage/sales_kits.php:40 inventory/view/view_adjustment.php:57
 #: inventory/view/view_transfer.php:56 manufacturing/view/wo_issue_view.php:77
 #: manufacturing/manage/bom_edit.php:71 purchasing/po_receive_items.php:62
-#: sales/customer_credit_invoice.php:280 sales/customer_delivery.php:432
+#: sales/customer_credit_invoice.php:280 sales/customer_delivery.php:410
 #: sales/customer_invoice.php:478
 msgid "Units"
 msgstr ""
@@ -7710,7 +7723,7 @@ msgstr ""
 msgid "Foreign Item Codes"
 msgstr ""
 
-#: inventory/manage/item_codes.php:23 sales/sales_order_entry.php:686
+#: inventory/manage/item_codes.php:23 sales/sales_order_entry.php:681
 msgid "There are no inventory items defined in the system."
 msgstr ""
 
@@ -7744,11 +7757,11 @@ msgid "EAN/UPC Code"
 msgstr ""
 
 #: inventory/manage/item_codes.php:125 reporting/rep104.php:117
-#: reporting/rep105.php:119 reporting/rep301.php:105 reporting/rep301.php:111
+#: reporting/rep105.php:119 reporting/rep301.php:169 reporting/rep301.php:175
 #: reporting/rep302.php:124 reporting/rep302.php:131 reporting/rep303.php:133
 #: reporting/rep304.php:114 reporting/rep304.php:122 reporting/rep306.php:141
 #: reporting/rep306.php:149 reporting/rep307.php:117 reporting/rep307.php:123
-#: reporting/rep308.php:149 reporting/rep308.php:156 reporting/rep309.php:104
+#: reporting/rep308.php:230 reporting/rep308.php:237 reporting/rep309.php:104
 msgid "Category"
 msgstr ""
 
@@ -7757,8 +7770,8 @@ msgid "UPC/EAN code:"
 msgstr ""
 
 #: inventory/manage/item_codes.php:179 inventory/manage/sales_kits.php:245
-#: manufacturing/work_order_add_finished.php:206
-#: manufacturing/work_order_entry.php:424
+#: manufacturing/work_order_add_finished.php:203
+#: manufacturing/work_order_entry.php:422
 #: manufacturing/manage/bom_edit.php:228
 msgid "Quantity:"
 msgstr ""
@@ -7829,7 +7842,7 @@ msgstr ""
 #: manufacturing/view/wo_production_view.php:45
 #: purchasing/includes/ui/invoice_ui.inc:484
 #: purchasing/includes/ui/invoice_ui.inc:496 reporting/rep204.php:84
-#: reporting/rep306.php:152
+#: reporting/rep306.php:152 reporting/rep402.php:103
 msgid "Item"
 msgstr ""
 
@@ -8206,9 +8219,9 @@ msgid "for item:"
 msgstr ""
 
 #: manufacturing/search_work_orders.php:78
-#: purchasing/inquiry/po_search_completed.php:77
-#: purchasing/inquiry/po_search.php:76
-#: sales/inquiry/sales_deliveries_view.php:116
+#: purchasing/inquiry/po_search_completed.php:80
+#: purchasing/inquiry/po_search.php:78
+#: sales/inquiry/sales_deliveries_view.php:118
 #: sales/inquiry/sales_orders_view.php:247
 msgid "Select documents"
 msgstr ""
@@ -8229,13 +8242,13 @@ msgstr ""
 msgid "Costs"
 msgstr ""
 
-#: manufacturing/search_work_orders.php:164
+#: manufacturing/search_work_orders.php:164 reporting/rep402.php:103
 msgid "Required"
 msgstr ""
 
 #: manufacturing/search_work_orders.php:167
 #: manufacturing/includes/manufacturing_ui.inc:277
-#: manufacturing/includes/manufacturing_ui.inc:281
+#: manufacturing/includes/manufacturing_ui.inc:281 reporting/rep402.php:103
 #: reporting/includes/doctext.inc:205 sales/inquiry/sales_orders_view.php:268
 msgid "Required By"
 msgstr ""
@@ -8277,7 +8290,7 @@ msgstr ""
 
 #: manufacturing/work_order_add_finished.php:65
 #: manufacturing/work_order_costs.php:64
-#: manufacturing/work_order_entry.php:341
+#: manufacturing/work_order_entry.php:339
 #: manufacturing/includes/db/work_order_issues_db.inc:30
 #: manufacturing/includes/db/work_order_produce_items_db.inc:27
 msgid "The order number sent is not valid."
@@ -8297,32 +8310,32 @@ msgid ""
 "The production exceeds the quantity needed. Please change the Work Order."
 msgstr ""
 
-#: manufacturing/work_order_add_finished.php:129
+#: manufacturing/work_order_add_finished.php:126
 msgid ""
 "The unassembling cannot be processed because there is insufficient stock."
 msgstr ""
 
-#: manufacturing/work_order_add_finished.php:147
+#: manufacturing/work_order_add_finished.php:144
 msgid ""
 "The production cannot be processed because a required item would cause a "
 "negative inventory balance :"
 msgstr ""
 
-#: manufacturing/work_order_add_finished.php:204
+#: manufacturing/work_order_add_finished.php:201
 msgid "Produce Finished Items"
 msgstr ""
 
-#: manufacturing/work_order_add_finished.php:204
+#: manufacturing/work_order_add_finished.php:201
 msgid "Return Items to Work Order"
 msgstr ""
 
-#: manufacturing/work_order_add_finished.php:214
+#: manufacturing/work_order_add_finished.php:211
 #: purchasing/allocations/supplier_allocate.php:74
 #: sales/allocations/customer_allocate.php:72
 msgid "Process"
 msgstr ""
 
-#: manufacturing/work_order_add_finished.php:215
+#: manufacturing/work_order_add_finished.php:212
 msgid "Process And Close Order"
 msgstr ""
 
@@ -8416,70 +8429,70 @@ msgstr ""
 msgid "The cost entered is invalid or less than zero."
 msgstr ""
 
-#: manufacturing/work_order_entry.php:209
+#: manufacturing/work_order_entry.php:208
 msgid ""
 "The work order cannot be processed because there is an insufficient quantity "
 "for component:"
 msgstr ""
 
-#: manufacturing/work_order_entry.php:223
+#: manufacturing/work_order_entry.php:221
 msgid ""
 "The selected item cannot be unassembled because there is insufficient stock."
 msgstr ""
 
-#: manufacturing/work_order_entry.php:249
+#: manufacturing/work_order_entry.php:247
 msgid ""
 "The quantity cannot be changed to be less than the quantity already "
 "manufactured for this order."
 msgstr ""
 
-#: manufacturing/work_order_entry.php:298
+#: manufacturing/work_order_entry.php:296
 msgid ""
 "This work order cannot be deleted because it has already been processed."
 msgstr ""
 
-#: manufacturing/work_order_entry.php:349
+#: manufacturing/work_order_entry.php:347
 msgid "This work order is closed and cannot be edited."
 msgstr ""
 
-#: manufacturing/work_order_entry.php:397
-#: manufacturing/work_order_entry.php:405
+#: manufacturing/work_order_entry.php:395
+#: manufacturing/work_order_entry.php:403
 msgid "Destination Location:"
 msgstr ""
 
-#: manufacturing/work_order_entry.php:416
+#: manufacturing/work_order_entry.php:414
 msgid "Quantity Required:"
 msgstr ""
 
-#: manufacturing/work_order_entry.php:418
+#: manufacturing/work_order_entry.php:416
 msgid "Quantity Manufactured:"
 msgstr ""
 
-#: manufacturing/work_order_entry.php:437
+#: manufacturing/work_order_entry.php:435
 msgid "Credit Labour Account"
 msgstr ""
 
-#: manufacturing/work_order_entry.php:444
+#: manufacturing/work_order_entry.php:442
 msgid "Credit Overhead Account"
 msgstr ""
 
-#: manufacturing/work_order_entry.php:449
+#: manufacturing/work_order_entry.php:447
 msgid "Released On:"
 msgstr ""
 
-#: manufacturing/work_order_entry.php:459
+#: manufacturing/work_order_entry.php:457
 msgid "Save changes to work order"
 msgstr ""
 
-#: manufacturing/work_order_entry.php:462
+#: manufacturing/work_order_entry.php:460
 msgid "Close This Work Order"
 msgstr ""
 
-#: manufacturing/work_order_entry.php:464
+#: manufacturing/work_order_entry.php:462
 msgid "Delete This Work Order"
 msgstr ""
 
-#: manufacturing/work_order_entry.php:470
+#: manufacturing/work_order_entry.php:468
 msgid "Add Workorder"
 msgstr ""
 
@@ -8497,29 +8510,29 @@ msgstr ""
 
 #: manufacturing/work_order_issue.php:104
 msgid ""
-"The issue cannot be processed because an entered item would cause a negative "
-"inventory balance :"
+"The issue cannot be processed because it would cause negative inventory "
+"balance for marked items as of document date or later."
 msgstr ""
 
-#: manufacturing/work_order_issue.php:122
+#: manufacturing/work_order_issue.php:121
 msgid ""
 "The process cannot be completed because there is an insufficient total "
 "quantity for a component."
 msgstr ""
 
-#: manufacturing/work_order_issue.php:123
+#: manufacturing/work_order_issue.php:122
 msgid "Component is :"
 msgstr ""
 
-#: manufacturing/work_order_issue.php:124
+#: manufacturing/work_order_issue.php:123
 msgid "From location :"
 msgstr ""
 
-#: manufacturing/work_order_issue.php:217
+#: manufacturing/work_order_issue.php:216
 msgid "Items to Issue"
 msgstr ""
 
-#: manufacturing/work_order_issue.php:223
+#: manufacturing/work_order_issue.php:222
 msgid "Process Issue"
 msgstr ""
 
@@ -8838,19 +8851,23 @@ msgstr ""
 msgid "This work order is closed."
 msgstr ""
 
-#: manufacturing/includes/work_order_issue_ui.inc:162
+#: manufacturing/includes/work_order_issue_ui.inc:82
+msgid "Marked items have insufficient quantities in stock as on day of issue."
+msgstr ""
+
+#: manufacturing/includes/work_order_issue_ui.inc:169
 msgid "Return Items to Location"
 msgstr ""
 
-#: manufacturing/includes/work_order_issue_ui.inc:162
+#: manufacturing/includes/work_order_issue_ui.inc:169
 msgid "Issue Items to Work order"
 msgstr ""
 
-#: manufacturing/includes/work_order_issue_ui.inc:165
+#: manufacturing/includes/work_order_issue_ui.inc:172
 msgid "To Work Centre:"
 msgstr ""
 
-#: manufacturing/includes/work_order_issue_ui.inc:167
+#: manufacturing/includes/work_order_issue_ui.inc:174
 msgid "Issue Date:"
 msgstr ""
 
@@ -8911,7 +8928,7 @@ msgid "Supplier invoice adjustment for zero inventory of "
 msgstr ""
 
 #: purchasing/includes/db/invoice_db.inc:311 reporting/rep106.php:83
-#: sales/inquiry/sales_deliveries_view.php:166
+#: sales/inquiry/sales_deliveries_view.php:168
 #: sales/inquiry/sales_orders_view.php:147
 msgid "Invoice"
 msgstr ""
@@ -8944,8 +8961,8 @@ msgstr ""
 #: purchasing/includes/ui/po_ui.inc:341
 #: purchasing/view/view_supp_credit.php:44
 #: purchasing/view/view_supp_invoice.php:47
-#: purchasing/inquiry/po_search_completed.php:125
-#: purchasing/inquiry/po_search.php:134
+#: purchasing/inquiry/po_search_completed.php:128
+#: purchasing/inquiry/po_search.php:136
 #: purchasing/inquiry/supplier_inquiry.php:172
 #: reporting/includes/doctext.inc:142 reporting/includes/doctext.inc:165
 msgid "Supplier's Reference"
@@ -9075,7 +9092,7 @@ msgid "Add All Items"
 msgstr ""
 
 #: purchasing/includes/ui/invoice_ui.inc:484
-#: purchasing/includes/ui/invoice_ui.inc:496 reporting/rep308.php:149
+#: purchasing/includes/ui/invoice_ui.inc:496 reporting/rep308.php:230
 #: sales/inquiry/sales_orders_view.php:155
 msgid "Delivery"
 msgstr ""
@@ -9103,13 +9120,13 @@ msgstr ""
 
 #: purchasing/includes/ui/invoice_ui.inc:486
 #: purchasing/includes/ui/po_ui.inc:235
-#: sales/includes/ui/sales_order_ui.inc:146
+#: sales/includes/ui/sales_order_ui.inc:145
 msgid "Price after Tax"
 msgstr ""
 
 #: purchasing/includes/ui/invoice_ui.inc:486
 #: purchasing/includes/ui/po_ui.inc:235
-#: sales/includes/ui/sales_order_ui.inc:146
+#: sales/includes/ui/sales_order_ui.inc:145
 msgid "Price before Tax"
 msgstr ""
 
@@ -9137,15 +9154,15 @@ msgstr ""
 msgid "Credits can only be applied to invoiced items."
 msgstr ""
 
-#: purchasing/includes/ui/po_ui.inc:154 sales/sales_order_entry.php:710
+#: purchasing/includes/ui/po_ui.inc:154 sales/sales_order_entry.php:705
 msgid "Order Date:"
 msgstr ""
 
-#: purchasing/includes/ui/po_ui.inc:155 sales/sales_order_entry.php:697
+#: purchasing/includes/ui/po_ui.inc:155 sales/sales_order_entry.php:692
 msgid "Delivery Date:"
 msgstr ""
 
-#: purchasing/includes/ui/po_ui.inc:155 sales/sales_order_entry.php:691
+#: purchasing/includes/ui/po_ui.inc:155 sales/sales_order_entry.php:686
 msgid "Invoice Date:"
 msgstr ""
 
@@ -9184,7 +9201,7 @@ msgid "Received"
 msgstr ""
 
 #: purchasing/includes/ui/po_ui.inc:235
-#: sales/includes/ui/sales_order_ui.inc:616
+#: sales/includes/ui/sales_order_ui.inc:599
 msgid "Required Delivery Date"
 msgstr ""
 
@@ -9195,25 +9212,25 @@ msgstr ""
 
 #: purchasing/includes/ui/po_ui.inc:286 purchasing/po_receive_items.php:114
 #: reporting/rep107.php:150 reporting/rep109.php:149 reporting/rep110.php:159
-#: reporting/rep111.php:134 reporting/rep113.php:144 reporting/rep209.php:162
-#: sales/customer_credit_invoice.php:322 sales/customer_delivery.php:511
+#: reporting/rep111.php:152 reporting/rep113.php:144 reporting/rep209.php:162
+#: sales/customer_credit_invoice.php:322 sales/customer_delivery.php:495
 #: sales/customer_invoice.php:574 sales/view/view_dispatch.php:146
 #: sales/view/view_invoice.php:148 sales/includes/ui/sales_credit_ui.inc:217
-#: sales/includes/ui/sales_order_ui.inc:235
+#: sales/includes/ui/sales_order_ui.inc:221
 msgid "Sub-total"
 msgstr ""
 
 #: purchasing/includes/ui/po_ui.inc:295 purchasing/po_receive_items.php:122
 #: purchasing/view/view_grn.php:79 purchasing/view/view_po.php:93
-#: sales/customer_delivery.php:518 sales/view/view_sales_order.php:244
-#: sales/includes/ui/sales_order_ui.inc:242
+#: sales/customer_delivery.php:502 sales/view/view_sales_order.php:244
+#: sales/includes/ui/sales_order_ui.inc:228
 msgid "Amount Total"
 msgstr ""
 
 #: purchasing/includes/ui/po_ui.inc:296
 #: purchasing/allocations/supplier_allocate.php:73
 #: sales/allocations/customer_allocate.php:71
-#: sales/includes/ui/sales_order_ui.inc:243
+#: sales/includes/ui/sales_order_ui.inc:229
 msgid "Refresh"
 msgstr ""
 
@@ -9332,7 +9349,7 @@ msgstr ""
 msgid "Enter a new purchase order"
 msgstr ""
 
-#: purchasing/po_entry_items.php:216 sales/sales_order_entry.php:490
+#: purchasing/po_entry_items.php:216 sales/sales_order_entry.php:498
 msgid "Item description cannot be empty."
 msgstr ""
 
@@ -9377,7 +9394,7 @@ msgid "The entered order date is invalid."
 msgstr ""
 
 #: purchasing/po_entry_items.php:343 purchasing/po_receive_items.php:181
-#: sales/sales_order_entry.php:358
+#: sales/sales_order_entry.php:361
 msgid "The entered date is not in fiscal year"
 msgstr ""
 
@@ -9411,7 +9428,7 @@ msgid ""
 "The order cannot be placed because there are no lines entered on this order."
 msgstr ""
 
-#: purchasing/po_entry_items.php:534 sales/sales_order_entry.php:714
+#: purchasing/po_entry_items.php:534 sales/sales_order_entry.php:709
 msgid "Place Order"
 msgstr ""
 
@@ -9419,7 +9436,7 @@ msgstr ""
 msgid "Update Order"
 msgstr ""
 
-#: purchasing/po_entry_items.php:536 sales/sales_order_entry.php:713
+#: purchasing/po_entry_items.php:536 sales/sales_order_entry.php:708
 msgid "Cancel Order"
 msgstr ""
 
@@ -9443,7 +9460,7 @@ msgstr ""
 msgid "Update Invoice"
 msgstr ""
 
-#: purchasing/po_entry_items.php:545 sales/sales_order_entry.php:694
+#: purchasing/po_entry_items.php:545 sales/sales_order_entry.php:689
 msgid "Cancel Invoice"
 msgstr ""
 
@@ -9470,7 +9487,7 @@ msgid ""
 msgstr ""
 
 #: purchasing/po_receive_items.php:62 reporting/rep105.php:114
-#: sales/customer_delivery.php:432
+#: sales/customer_delivery.php:410
 msgid "Ordered"
 msgstr ""
 
@@ -9480,7 +9497,7 @@ msgstr ""
 msgid "Outstanding"
 msgstr ""
 
-#: purchasing/po_receive_items.php:63 sales/customer_delivery.php:433
+#: purchasing/po_receive_items.php:63 sales/customer_delivery.php:411
 msgid "This Delivery"
 msgstr ""
 
@@ -9586,21 +9603,21 @@ msgid ""
 "mistake somewhere, the credit note as entered will not be processed."
 msgstr ""
 
-#: purchasing/supplier_credit.php:211
+#: purchasing/supplier_credit.php:210
 msgid ""
 "The return cannot be processed because there is an insufficient quantity for "
 "item:"
 msgstr ""
 
-#: purchasing/supplier_credit.php:254
+#: purchasing/supplier_credit.php:253
 msgid "The quantity to credit must be numeric and greater than zero."
 msgstr ""
 
-#: purchasing/supplier_credit.php:261
+#: purchasing/supplier_credit.php:260
 msgid "The price is either not numeric or negative."
 msgstr ""
 
-#: purchasing/supplier_credit.php:363
+#: purchasing/supplier_credit.php:362
 msgid "Enter Credit Note"
 msgstr ""
 
@@ -9784,7 +9801,7 @@ msgstr ""
 
 #: purchasing/view/view_grn.php:40 reporting/includes/doctext.inc:65
 #: reporting/includes/doctext.inc:170 reporting/includes/doctext.inc:222
-#: sales/inquiry/sales_deliveries_view.php:186
+#: sales/inquiry/sales_deliveries_view.php:188
 msgid "Delivery Date"
 msgstr ""
 
@@ -9816,7 +9833,7 @@ msgstr ""
 #: purchasing/inquiry/supplier_inquiry.php:193
 #: sales/inquiry/customer_allocation_inquiry.php:165
 #: sales/inquiry/customer_inquiry.php:244
-#: sales/inquiry/sales_deliveries_view.php:206
+#: sales/inquiry/sales_deliveries_view.php:208
 #: sales/inquiry/sales_orders_view.php:318
 msgid "Marked items are overdue."
 msgstr ""
@@ -9890,7 +9907,7 @@ msgid "Payment Currency"
 msgstr ""
 
 #: purchasing/view/view_supp_payment.php:62 reporting/rep112.php:162
-#: reporting/rep210.php:171 sales/customer_delivery.php:433
+#: reporting/rep210.php:171 sales/customer_delivery.php:411
 #: sales/customer_invoice.php:479 sales/view/view_receipt.php:45
 #: sales/view/view_sales_order.php:202
 msgid "Discount"
@@ -10050,6 +10067,8 @@ msgid ""
 msgstr ""
 
 #: purchasing/manage/suppliers.php:288
+#: purchasing/inquiry/po_search_completed.php:78
+#: purchasing/inquiry/po_search.php:76
 #: purchasing/inquiry/supplier_allocation_inquiry.php:48
 msgid "Select a supplier: "
 msgstr ""
@@ -10082,14 +10101,14 @@ msgstr ""
 msgid "into location:"
 msgstr ""
 
-#: purchasing/inquiry/po_search_completed.php:126
-#: purchasing/inquiry/po_search.php:135 reporting/includes/doctext.inc:166
+#: purchasing/inquiry/po_search_completed.php:129
+#: purchasing/inquiry/po_search.php:137 reporting/includes/doctext.inc:166
 #: sales/inquiry/sales_orders_view.php:267
 msgid "Order Date"
 msgstr ""
 
-#: purchasing/inquiry/po_search_completed.php:128
-#: purchasing/inquiry/po_search.php:137
+#: purchasing/inquiry/po_search_completed.php:131
+#: purchasing/inquiry/po_search.php:139
 #: sales/inquiry/sales_orders_view.php:270
 msgid "Order Total"
 msgstr ""
@@ -10098,11 +10117,11 @@ msgstr ""
 msgid "Search Outstanding Purchase Orders"
 msgstr ""
 
-#: purchasing/inquiry/po_search.php:98
+#: purchasing/inquiry/po_search.php:100
 msgid "Receive"
 msgstr ""
 
-#: purchasing/inquiry/po_search.php:148
+#: purchasing/inquiry/po_search.php:150
 msgid "Marked orders have overdue items."
 msgstr ""
 
@@ -10260,7 +10279,7 @@ msgid "Balances in Home Currency"
 msgstr ""
 
 #: reporting/rep101.php:118 reporting/rep201.php:110 reporting/rep203.php:93
-#: reporting/rep709.php:111 reporting/includes/doctext.inc:145
+#: reporting/rep709.php:116 reporting/includes/doctext.inc:145
 #: reporting/includes/doctext.inc:186 reporting/includes/doctext.inc:224
 msgid "Trans Type"
 msgstr ""
@@ -10289,24 +10308,24 @@ msgstr ""
 
 #: reporting/rep101.php:241 reporting/rep102.php:228 reporting/rep106.php:171
 #: reporting/rep201.php:233 reporting/rep202.php:235 reporting/rep203.php:181
-#: reporting/rep204.php:148 reporting/rep301.php:179 reporting/rep304.php:195
+#: reporting/rep204.php:148 reporting/rep301.php:254 reporting/rep304.php:195
 #: reporting/rep305.php:188 reporting/rep306.php:293 reporting/rep309.php:158
 msgid "Grand Total"
 msgstr ""
 
 #: reporting/rep102.php:102 reporting/rep106.php:93 reporting/rep202.php:106
-#: reporting/rep709.php:95 reporting/reports_main.php:48
+#: reporting/rep709.php:100 reporting/reports_main.php:48
 #: reporting/reports_main.php:91 reporting/reports_main.php:165
-#: reporting/reports_main.php:211 reporting/reports_main.php:484
+#: reporting/reports_main.php:211 reporting/reports_main.php:491
 msgid "Summary Only"
 msgstr ""
 
-#: reporting/rep102.php:104 reporting/rep202.php:108 reporting/rep709.php:97
+#: reporting/rep102.php:104 reporting/rep202.php:108 reporting/rep709.php:102
 msgid "Detailed Report"
 msgstr ""
 
 #: reporting/rep102.php:131 reporting/rep202.php:136 reporting/rep203.php:99
-#: reporting/rep301.php:110 reporting/reports_main.php:35
+#: reporting/rep301.php:174 reporting/reports_main.php:35
 #: reporting/reports_main.php:44 reporting/reports_main.php:65
 #: reporting/reports_main.php:81 reporting/reports_main.php:90
 #: reporting/reports_main.php:152 reporting/reports_main.php:161
@@ -10314,14 +10333,14 @@ msgstr ""
 #: reporting/reports_main.php:234 reporting/reports_main.php:243
 #: reporting/reports_main.php:249 reporting/reports_main.php:259
 #: reporting/reports_main.php:267 reporting/reports_main.php:275
-#: reporting/reports_main.php:312 reporting/reports_main.php:326
-#: reporting/reports_main.php:338 reporting/reports_main.php:356
-#: reporting/reports_main.php:367 reporting/reports_main.php:379
-#: reporting/reports_main.php:392 reporting/reports_main.php:408
-#: reporting/reports_main.php:418 reporting/reports_main.php:429
-#: reporting/reports_main.php:441 reporting/reports_main.php:455
-#: reporting/reports_main.php:464 reporting/reports_main.php:474
-#: reporting/reports_main.php:483 reporting/reports_main.php:490
+#: reporting/reports_main.php:319 reporting/reports_main.php:333
+#: reporting/reports_main.php:345 reporting/reports_main.php:363
+#: reporting/reports_main.php:374 reporting/reports_main.php:386
+#: reporting/reports_main.php:399 reporting/reports_main.php:415
+#: reporting/reports_main.php:425 reporting/reports_main.php:436
+#: reporting/reports_main.php:448 reporting/reports_main.php:462
+#: reporting/reports_main.php:471 reporting/reports_main.php:481
+#: reporting/reports_main.php:490 reporting/reports_main.php:497
 msgid "End Date"
 msgstr ""
 
@@ -10413,8 +10432,8 @@ msgstr ""
 msgid "Category/Items"
 msgstr ""
 
-#: reporting/rep104.php:111 reporting/rep301.php:105 reporting/rep303.php:121
-#: reporting/rep303.php:127 reporting/rep307.php:117 reporting/rep308.php:149
+#: reporting/rep104.php:111 reporting/rep301.php:169 reporting/rep303.php:121
+#: reporting/rep303.php:127 reporting/rep307.php:117 reporting/rep308.php:230
 msgid "UOM"
 msgstr ""
 
@@ -10450,11 +10469,11 @@ msgstr ""
 
 #: reporting/rep105.php:109 reporting/rep106.php:83 reporting/rep112.php:187
 #: sales/create_recurrent_invoices.php:134
-#: sales/customer_credit_invoice.php:236 sales/customer_delivery.php:339
+#: sales/customer_credit_invoice.php:236 sales/customer_delivery.php:317
 #: sales/customer_invoice.php:390 sales/manage/customers.php:255
 #: sales/manage/customers.php:294 sales/manage/recurrent_invoices.php:102
 #: sales/view/view_credit.php:58 sales/inquiry/customer_inquiry.php:224
-#: sales/inquiry/sales_deliveries_view.php:182
+#: sales/inquiry/sales_deliveries_view.php:184
 #: sales/inquiry/sales_orders_view.php:265
 #: sales/inquiry/sales_orders_view.php:279
 msgid "Branch"
@@ -10476,8 +10495,8 @@ msgstr ""
 msgid "Loc"
 msgstr ""
 
-#: reporting/rep105.php:114 sales/customer_delivery.php:432
-#: sales/customer_invoice.php:478 sales/includes/ui/sales_order_ui.inc:145
+#: reporting/rep105.php:114 sales/customer_delivery.php:410
+#: sales/customer_invoice.php:478 sales/includes/ui/sales_order_ui.inc:144
 msgid "Delivered"
 msgstr ""
 
@@ -10517,7 +10536,7 @@ msgid "INVOICE"
 msgstr ""
 
 #: reporting/rep107.php:153 reporting/rep109.php:152 reporting/rep110.php:162
-#: reporting/rep111.php:137 reporting/rep113.php:147
+#: reporting/rep111.php:155 reporting/rep113.php:147
 #: sales/view/view_credit.php:138 sales/view/view_dispatch.php:155
 #: sales/view/view_invoice.php:157 sales/view/view_sales_order.php:227
 #: sales/includes/ui/sales_credit_ui.inc:222
@@ -10551,11 +10570,11 @@ msgstr ""
 msgid "QUOTE"
 msgstr ""
 
-#: reporting/rep109.php:158 reporting/rep111.php:143
+#: reporting/rep109.php:158 reporting/rep111.php:161
 msgid "TOTAL ORDER EX VAT"
 msgstr ""
 
-#: reporting/rep109.php:204 reporting/rep111.php:189
+#: reporting/rep109.php:204 reporting/rep111.php:207
 msgid "TOTAL ORDER VAT INCL."
 msgstr ""
 
@@ -10576,7 +10595,7 @@ msgstr ""
 msgid "TOTAL DELIVERY INCL. VAT"
 msgstr ""
 
-#: reporting/rep111.php:60 reporting/includes/doctext.inc:38
+#: reporting/rep111.php:64 reporting/includes/doctext.inc:38
 msgid "SALES QUOTATION"
 msgstr ""
 
@@ -10633,7 +10652,7 @@ msgstr ""
 msgid "Total ex. Tax"
 msgstr ""
 
-#: reporting/rep114.php:95 reporting/rep709.php:112 taxes/tax_groups.php:177
+#: reporting/rep114.php:95 reporting/rep709.php:117 taxes/tax_groups.php:177
 msgid "Tax"
 msgstr ""
 
@@ -10707,7 +10726,7 @@ msgstr ""
 msgid "TOTAL REMITTANCE"
 msgstr ""
 
-#: reporting/rep301.php:114
+#: reporting/rep301.php:178
 msgid "Inventory Valuation Report"
 msgstr ""
 
@@ -10809,28 +10828,28 @@ msgstr ""
 msgid "Inventory Movements"
 msgstr ""
 
-#: reporting/rep308.php:149
+#: reporting/rep308.php:230
 msgid "OpeningStock"
 msgstr ""
 
-#: reporting/rep308.php:149
+#: reporting/rep308.php:230
 msgid "StockIn"
 msgstr ""
 
-#: reporting/rep308.php:149
+#: reporting/rep308.php:230
 msgid "ClosingStock"
 msgstr ""
 
-#: reporting/rep308.php:150
+#: reporting/rep308.php:231
 msgid "QTY"
 msgstr ""
 
-#: reporting/rep308.php:150 reporting/rep709.php:112
+#: reporting/rep308.php:231 reporting/rep709.php:117
 #: taxes/item_tax_types.php:185
 msgid "Rate"
 msgstr ""
 
-#: reporting/rep308.php:159
+#: reporting/rep308.php:240
 msgid "Costed Inventory Movements"
 msgstr ""
 
@@ -10858,6 +10877,14 @@ msgstr ""
 msgid "Bill of Material Listing"
 msgstr ""
 
+#: reporting/rep402.php:110
+msgid "Open Only"
+msgstr ""
+
+#: reporting/rep402.php:112
+msgid "Work Order Listing"
+msgstr ""
+
 #: reporting/rep409.php:60 reporting/rep409.php:73
 #: reporting/includes/doctext.inc:192
 msgid "WORK ORDER"
@@ -10908,8 +10935,8 @@ msgid "GL Account Transactions"
 msgstr ""
 
 #: reporting/rep705.php:247 reporting/rep705.php:260 reporting/rep705.php:271
-#: reporting/reports_main.php:347 reporting/reports_main.php:400
-#: reporting/reports_main.php:448
+#: reporting/reports_main.php:354 reporting/reports_main.php:407
+#: reporting/reports_main.php:455
 msgid "Year"
 msgstr ""
 
@@ -10935,23 +10962,23 @@ msgstr ""
 msgid "Profit and Loss Statement"
 msgstr ""
 
-#: reporting/rep709.php:93
+#: reporting/rep709.php:98
 msgid "Tax Report"
 msgstr ""
 
-#: reporting/rep709.php:111
+#: reporting/rep709.php:116
 msgid "Branch Name"
 msgstr ""
 
-#: reporting/rep709.php:112
+#: reporting/rep709.php:117
 msgid "Net"
 msgstr ""
 
-#: reporting/rep709.php:183
+#: reporting/rep709.php:188
 msgid "Tax Rate"
 msgstr ""
 
-#: reporting/rep709.php:183
+#: reporting/rep709.php:188
 msgid "Net Tax"
 msgstr ""
 
@@ -10967,7 +10994,7 @@ msgstr ""
 msgid "Action"
 msgstr ""
 
-#: reporting/rep710.php:89 reporting/reports_main.php:488
+#: reporting/rep710.php:89 reporting/reports_main.php:495
 msgid "Audit Trail"
 msgstr ""
 
@@ -10984,7 +11011,7 @@ msgid "Customer &Balances"
 msgstr ""
 
 #: reporting/reports_main.php:37 reporting/reports_main.php:154
-#: reporting/reports_main.php:300
+#: reporting/reports_main.php:307
 msgid "Show Balance"
 msgstr ""
 
@@ -11014,17 +11041,17 @@ msgstr ""
 #: reporting/reports_main.php:255 reporting/reports_main.php:263
 #: reporting/reports_main.php:271 reporting/reports_main.php:278
 #: reporting/reports_main.php:286 reporting/reports_main.php:293
-#: reporting/reports_main.php:302 reporting/reports_main.php:315
+#: reporting/reports_main.php:300 reporting/reports_main.php:309
 #: reporting/reports_main.php:322 reporting/reports_main.php:329
-#: reporting/reports_main.php:344 reporting/reports_main.php:352
-#: reporting/reports_main.php:363 reporting/reports_main.php:375
-#: reporting/reports_main.php:385 reporting/reports_main.php:397
-#: reporting/reports_main.php:404 reporting/reports_main.php:414
-#: reporting/reports_main.php:425 reporting/reports_main.php:434
-#: reporting/reports_main.php:445 reporting/reports_main.php:451
-#: reporting/reports_main.php:460 reporting/reports_main.php:470
-#: reporting/reports_main.php:478 reporting/reports_main.php:486
-#: reporting/reports_main.php:494
+#: reporting/reports_main.php:336 reporting/reports_main.php:351
+#: reporting/reports_main.php:359 reporting/reports_main.php:370
+#: reporting/reports_main.php:382 reporting/reports_main.php:392
+#: reporting/reports_main.php:404 reporting/reports_main.php:411
+#: reporting/reports_main.php:421 reporting/reports_main.php:432
+#: reporting/reports_main.php:441 reporting/reports_main.php:452
+#: reporting/reports_main.php:458 reporting/reports_main.php:467
+#: reporting/reports_main.php:477 reporting/reports_main.php:485
+#: reporting/reports_main.php:493 reporting/reports_main.php:501
 msgid "Orientation"
 msgstr ""
 
@@ -11039,17 +11066,17 @@ msgstr ""
 #: reporting/reports_main.php:246 reporting/reports_main.php:256
 #: reporting/reports_main.php:264 reporting/reports_main.php:272
 #: reporting/reports_main.php:279 reporting/reports_main.php:287
-#: reporting/reports_main.php:303 reporting/reports_main.php:316
+#: reporting/reports_main.php:294 reporting/reports_main.php:310
 #: reporting/reports_main.php:323 reporting/reports_main.php:330
-#: reporting/reports_main.php:345 reporting/reports_main.php:353
-#: reporting/reports_main.php:364 reporting/reports_main.php:376
-#: reporting/reports_main.php:386 reporting/reports_main.php:398
-#: reporting/reports_main.php:405 reporting/reports_main.php:415
-#: reporting/reports_main.php:426 reporting/reports_main.php:435
-#: reporting/reports_main.php:446 reporting/reports_main.php:452
-#: reporting/reports_main.php:461 reporting/reports_main.php:471
-#: reporting/reports_main.php:479 reporting/reports_main.php:487
-#: reporting/reports_main.php:495
+#: reporting/reports_main.php:337 reporting/reports_main.php:352
+#: reporting/reports_main.php:360 reporting/reports_main.php:371
+#: reporting/reports_main.php:383 reporting/reports_main.php:393
+#: reporting/reports_main.php:405 reporting/reports_main.php:412
+#: reporting/reports_main.php:422 reporting/reports_main.php:433
+#: reporting/reports_main.php:442 reporting/reports_main.php:453
+#: reporting/reports_main.php:459 reporting/reports_main.php:468
+#: reporting/reports_main.php:478 reporting/reports_main.php:486
+#: reporting/reports_main.php:494 reporting/reports_main.php:502
 msgid "Destination"
 msgstr ""
 
@@ -11058,9 +11085,9 @@ msgid "&Aged Customer Analysis"
 msgstr ""
 
 #: reporting/reports_main.php:50 reporting/reports_main.php:167
-#: reporting/reports_main.php:361 reporting/reports_main.php:373
-#: reporting/reports_main.php:412 reporting/reports_main.php:423
-#: reporting/reports_main.php:458 reporting/reports_main.php:468
+#: reporting/reports_main.php:368 reporting/reports_main.php:380
+#: reporting/reports_main.php:419 reporting/reports_main.php:430
+#: reporting/reports_main.php:465 reporting/reports_main.php:475
 msgid "Graphics"
 msgstr ""
 
@@ -11259,91 +11286,99 @@ msgid "To product"
 msgstr ""
 
 #: reporting/reports_main.php:288
-msgid "Print &Work Orders"
+msgid "Work Order &Listing"
 msgstr ""
 
 #: reporting/reports_main.php:291
+msgid "Outstanding Only"
+msgstr ""
+
+#: reporting/reports_main.php:295
+msgid "Print &Work Orders"
+msgstr ""
+
+#: reporting/reports_main.php:298
 msgid "Email Locations"
 msgstr ""
 
-#: reporting/reports_main.php:297
+#: reporting/reports_main.php:304
 msgid "Dimension &Summary"
 msgstr ""
 
-#: reporting/reports_main.php:298
+#: reporting/reports_main.php:305
 msgid "From Dimension"
 msgstr ""
 
-#: reporting/reports_main.php:299
+#: reporting/reports_main.php:306
 msgid "To Dimension"
 msgstr ""
 
-#: reporting/reports_main.php:308
+#: reporting/reports_main.php:315
 msgid "Banking"
 msgstr ""
 
-#: reporting/reports_main.php:309
+#: reporting/reports_main.php:316
 msgid "Bank &Statement"
 msgstr ""
 
-#: reporting/reports_main.php:313 reporting/reports_main.php:380
-#: reporting/reports_main.php:430 reporting/reports_main.php:475
+#: reporting/reports_main.php:320 reporting/reports_main.php:387
+#: reporting/reports_main.php:437 reporting/reports_main.php:482
 msgid "Zero values"
 msgstr ""
 
-#: reporting/reports_main.php:318
+#: reporting/reports_main.php:325
 msgid "General Ledger"
 msgstr ""
 
-#: reporting/reports_main.php:319
+#: reporting/reports_main.php:326
 msgid "Chart of &Accounts"
 msgstr ""
 
-#: reporting/reports_main.php:320
+#: reporting/reports_main.php:327
 msgid "Show Balances"
 msgstr ""
 
-#: reporting/reports_main.php:324
+#: reporting/reports_main.php:331
 msgid "List of &Journal Entries"
 msgstr ""
 
-#: reporting/reports_main.php:336 reporting/reports_main.php:390
-#: reporting/reports_main.php:439
+#: reporting/reports_main.php:343 reporting/reports_main.php:397
+#: reporting/reports_main.php:446
 msgid "GL Account &Transactions"
 msgstr ""
 
-#: reporting/reports_main.php:339 reporting/reports_main.php:393
-#: reporting/reports_main.php:442
+#: reporting/reports_main.php:346 reporting/reports_main.php:400
+#: reporting/reports_main.php:449
 msgid "From Account"
 msgstr ""
 
-#: reporting/reports_main.php:340 reporting/reports_main.php:394
-#: reporting/reports_main.php:443
+#: reporting/reports_main.php:347 reporting/reports_main.php:401
+#: reporting/reports_main.php:450
 msgid "To Account"
 msgstr ""
 
-#: reporting/reports_main.php:346 reporting/reports_main.php:399
-#: reporting/reports_main.php:447
+#: reporting/reports_main.php:353 reporting/reports_main.php:406
+#: reporting/reports_main.php:454
 msgid "Annual &Expense Breakdown"
 msgstr ""
 
-#: reporting/reports_main.php:354 reporting/reports_main.php:406
-#: reporting/reports_main.php:453
+#: reporting/reports_main.php:361 reporting/reports_main.php:413
+#: reporting/reports_main.php:460
 msgid "&Balance Sheet"
 msgstr ""
 
-#: reporting/reports_main.php:360 reporting/reports_main.php:372
-#: reporting/reports_main.php:411 reporting/reports_main.php:422
-#: reporting/reports_main.php:457 reporting/reports_main.php:467
+#: reporting/reports_main.php:367 reporting/reports_main.php:379
+#: reporting/reports_main.php:418 reporting/reports_main.php:429
+#: reporting/reports_main.php:464 reporting/reports_main.php:474
 msgid "Decimal values"
 msgstr ""
 
-#: reporting/reports_main.php:365 reporting/reports_main.php:416
-#: reporting/reports_main.php:462
+#: reporting/reports_main.php:372 reporting/reports_main.php:423
+#: reporting/reports_main.php:469
 msgid "&Profit and Loss Statement"
 msgstr ""
 
-#: reporting/reports_main.php:481
+#: reporting/reports_main.php:488
 msgid "Ta&x Report"
 msgstr ""
 
@@ -11359,7 +11394,7 @@ msgstr ""
 #: reporting/includes/doctext.inc:30 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:146
+#: sales/includes/ui/sales_order_ui.inc:145
 msgid "Discount %"
 msgstr ""
 
@@ -11400,7 +11435,7 @@ msgstr ""
 
 #: reporting/includes/doctext.inc:48 sales/view/view_sales_order.php:69
 #: sales/inquiry/sales_orders_view.php:282
-#: sales/includes/ui/sales_order_ui.inc:611
+#: sales/includes/ui/sales_order_ui.inc:594
 msgid "Valid until"
 msgstr ""
 
@@ -11508,15 +11543,15 @@ msgstr ""
 msgid "Generated By"
 msgstr ""
 
-#: reporting/includes/header2.inc:122
+#: reporting/includes/header2.inc:125
 msgid "Our VAT No."
 msgstr ""
 
-#: reporting/includes/header2.inc:128
+#: reporting/includes/header2.inc:131
 msgid "Domicile"
 msgstr ""
 
-#: reporting/includes/header2.inc:143 reporting/includes/pdf_report.inc:352
+#: reporting/includes/header2.inc:146 reporting/includes/pdf_report.inc:352
 #: reporting/includes/pdf_report.inc:501 reporting/includes/pdf_report.inc:628
 msgid "Page"
 msgstr ""
@@ -11600,90 +11635,90 @@ msgstr ""
 msgid "Display: "
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:149
+#: reporting/includes/reports_classes.inc:152
 msgid "Unknown report parameter type:"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:175
+#: reporting/includes/reports_classes.inc:178
 msgid "No Currency Filter"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:231
+#: reporting/includes/reports_classes.inc:234
 msgid "PDF/Printer"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:238
+#: reporting/includes/reports_classes.inc:241
 msgid "Portrait"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:238
+#: reporting/includes/reports_classes.inc:241
 msgid "Landscape"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:249
+#: reporting/includes/reports_classes.inc:252
 msgid "No Graphics"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:249
+#: reporting/includes/reports_classes.inc:252
 msgid "Vertical bars"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:249
+#: reporting/includes/reports_classes.inc:252
 msgid "Horizontal bars"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:250
+#: reporting/includes/reports_classes.inc:253
 msgid "Dots"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:250
+#: reporting/includes/reports_classes.inc:253
 msgid "Lines"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:250
+#: reporting/includes/reports_classes.inc:253
 msgid "Pie"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:250
+#: reporting/includes/reports_classes.inc:253
 msgid "Donut"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:254
 #: reporting/includes/reports_classes.inc:257
+#: reporting/includes/reports_classes.inc:260
 msgid "No Type Filter"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:267
+#: reporting/includes/reports_classes.inc:270
 msgid "No Account Group Filter"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:282
-#: reporting/includes/reports_classes.inc:288
-#: reporting/includes/reports_classes.inc:294
+#: reporting/includes/reports_classes.inc:285
+#: reporting/includes/reports_classes.inc:291
+#: reporting/includes/reports_classes.inc:297
 msgid "No Dimension Filter"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:300
+#: reporting/includes/reports_classes.inc:303
 msgid "No Customer Filter"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:308
+#: reporting/includes/reports_classes.inc:311
 msgid "No Supplier Filter"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:393
+#: reporting/includes/reports_classes.inc:399
 msgid "No Location Filter"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:396
+#: reporting/includes/reports_classes.inc:402
 msgid "No Category Filter"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:405
+#: reporting/includes/reports_classes.inc:411
 msgid "No Sales Folk Filter"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:412
+#: reporting/includes/reports_classes.inc:418
 msgid "No Users Filter"
 msgstr ""
 
@@ -11753,7 +11788,7 @@ msgstr ""
 msgid "Modifying Customer Credit Note #%d"
 msgstr ""
 
-#: sales/credit_note_entry.php:51 sales/sales_order_entry.php:688
+#: sales/credit_note_entry.php:51 sales/sales_order_entry.php:683
 msgid ""
 "There are no customers, or there are no customers with branches. Please "
 "define customers and customer branches."
@@ -12027,77 +12062,76 @@ msgstr ""
 msgid "There are no item quantities on this delivery note."
 msgstr ""
 
-#: sales/customer_delivery.php:285 sales/sales_order_entry.php:516
-#: sales/includes/ui/sales_order_ui.inc:250
+#: sales/customer_delivery.php:194
 msgid ""
-"The delivery cannot be processed because there is an insufficient quantity "
-"for item:"
+"This document cannot be processed because there is insufficient quantity "
+"for"
 msgstr ""
 
-#: sales/customer_delivery.php:353
+#: sales/customer_delivery.php:331
 msgid "For Sales Order"
 msgstr ""
 
-#: sales/customer_delivery.php:362
+#: sales/customer_delivery.php:340
 msgid "Delivery From"
 msgstr ""
 
-#: sales/customer_delivery.php:411
+#: sales/customer_delivery.php:389
 msgid "Invoice Dead-line"
 msgstr ""
 
-#: sales/customer_delivery.php:421 sales/customer_invoice.php:468
+#: sales/customer_delivery.php:399 sales/customer_invoice.php:468
 #: sales/includes/ui/sales_order_ui.inc:84
-#: sales/includes/ui/sales_order_ui.inc:374
+#: sales/includes/ui/sales_order_ui.inc:357
 msgid ""
 "The selected customer account is currently on hold. Please contact the "
 "credit control personnel to discuss."
 msgstr ""
 
-#: sales/customer_delivery.php:426
+#: sales/customer_delivery.php:404
 msgid "Delivery Items"
 msgstr ""
 
-#: sales/customer_delivery.php:432
+#: sales/customer_delivery.php:410
 msgid "Max. delivery"
 msgstr ""
 
-#: sales/customer_delivery.php:432 sales/customer_invoice.php:478
+#: sales/customer_delivery.php:410 sales/customer_invoice.php:478
 msgid "Invoiced"
 msgstr ""
 
-#: sales/customer_delivery.php:503 sales/customer_invoice.php:563
+#: sales/customer_delivery.php:487 sales/customer_invoice.php:563
 msgid "Shipping Cost"
 msgstr ""
 
-#: sales/customer_delivery.php:523 sales/includes/ui/sales_order_ui.inc:248
+#: sales/customer_delivery.php:507 sales/includes/ui/sales_order_ui.inc:234
 msgid ""
 "Marked items have insufficient quantities in stock as on day of delivery."
 msgstr ""
 
-#: sales/customer_delivery.php:527
+#: sales/customer_delivery.php:511
 msgid "Action For Balance"
 msgstr ""
 
-#: sales/customer_delivery.php:534 sales/customer_delivery.php:536
-#: sales/customer_delivery.php:539 sales/customer_invoice.php:592
+#: sales/customer_delivery.php:518 sales/customer_delivery.php:520
+#: sales/customer_delivery.php:523 sales/customer_invoice.php:592
 msgid "Refresh document page"
 msgstr ""
 
-#: sales/customer_delivery.php:536
+#: sales/customer_delivery.php:520
 msgid "Reset quantity"
 msgstr ""
 
-#: sales/customer_delivery.php:539
+#: sales/customer_delivery.php:523
 msgid "Clear quantity"
 msgstr ""
 
-#: sales/customer_delivery.php:541
+#: sales/customer_delivery.php:525
 msgid "Process Dispatch"
 msgstr ""
 
-#: sales/customer_delivery.php:542 sales/customer_invoice.php:594
-#: sales/sales_order_entry.php:736
+#: sales/customer_delivery.php:526 sales/customer_invoice.php:594
+#: sales/sales_order_entry.php:731
 msgid "Check entered data and save document"
 msgstr ""
 
@@ -12212,8 +12246,8 @@ msgstr ""
 msgid "Payment terms:"
 msgstr ""
 
-#: sales/customer_invoice.php:397 sales/includes/ui/sales_order_ui.inc:410
-#: sales/includes/ui/sales_order_ui.inc:414
+#: sales/customer_invoice.php:397 sales/includes/ui/sales_order_ui.inc:393
+#: sales/includes/ui/sales_order_ui.inc:397
 msgid "Payment:"
 msgstr ""
 
@@ -12277,11 +12311,11 @@ msgstr ""
 msgid "Select Another Customer Payment for &Edition"
 msgstr ""
 
-#: sales/customer_payments.php:139 sales/sales_order_entry.php:340
+#: sales/customer_payments.php:139 sales/sales_order_entry.php:343
 msgid "There is no customer selected."
 msgstr ""
 
-#: sales/customer_payments.php:146 sales/sales_order_entry.php:347
+#: sales/customer_payments.php:146 sales/sales_order_entry.php:350
 msgid "This customer has no branch defined."
 msgstr ""
 
@@ -12466,191 +12500,197 @@ msgstr ""
 msgid "Enter a &New Direct Invoice"
 msgstr ""
 
-#: sales/sales_order_entry.php:369
+#: sales/sales_order_entry.php:373
+msgid ""
+"This document cannot be processed because there is insufficient quantity for "
+"items marked."
+msgstr ""
+
+#: sales/sales_order_entry.php:380
 msgid ""
 "You must enter the person or company to whom delivery should be made to."
 msgstr ""
 
-#: sales/sales_order_entry.php:376
+#: sales/sales_order_entry.php:385
 msgid ""
 "You should enter the street address in the box provided. Orders cannot be "
 "accepted without a valid street address."
 msgstr ""
 
-#: sales/sales_order_entry.php:385
+#: sales/sales_order_entry.php:394
 msgid "The shipping cost entered is expected to be numeric."
 msgstr ""
 
-#: sales/sales_order_entry.php:391
+#: sales/sales_order_entry.php:400
 msgid "The Valid date is invalid."
 msgstr ""
 
-#: sales/sales_order_entry.php:393
+#: sales/sales_order_entry.php:402
 msgid "The delivery date is invalid."
 msgstr ""
 
-#: sales/sales_order_entry.php:400
+#: sales/sales_order_entry.php:408
 msgid "The requested valid date is before the date of the quotation."
 msgstr ""
 
-#: sales/sales_order_entry.php:402
+#: sales/sales_order_entry.php:410
 msgid "The requested delivery date is before the date of the order."
 msgstr ""
 
-#: sales/sales_order_entry.php:411
+#: sales/sales_order_entry.php:419
 msgid "You need to define a cash account for your Sales Point."
 msgstr ""
 
-#: sales/sales_order_entry.php:449
+#: sales/sales_order_entry.php:457
 msgid ""
 "The reference number field has been increased. Please save the document "
 "again."
 msgstr ""
 
-#: sales/sales_order_entry.php:495
+#: sales/sales_order_entry.php:503
 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:499
+#: sales/sales_order_entry.php:507
 msgid "Price for inventory item must be entered and can not be less than 0"
 msgstr ""
 
-#: sales/sales_order_entry.php:506
+#: sales/sales_order_entry.php:514
 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:537
+#: sales/sales_order_entry.php:532
 #, php-format
 msgid "Price %s is below Standard Cost %s"
 msgstr ""
 
-#: sales/sales_order_entry.php:562
+#: sales/sales_order_entry.php:557
 msgid ""
 "This item cannot be deleted because some of it has already been delivered."
 msgstr ""
 
-#: sales/sales_order_entry.php:591
+#: sales/sales_order_entry.php:586
 msgid "Direct delivery entry has been cancelled as requested."
 msgstr ""
 
-#: sales/sales_order_entry.php:592
+#: sales/sales_order_entry.php:587
 msgid "Enter a New Sales Delivery"
 msgstr ""
 
-#: sales/sales_order_entry.php:594
+#: sales/sales_order_entry.php:589
 msgid "Direct invoice entry has been cancelled as requested."
 msgstr ""
 
-#: sales/sales_order_entry.php:595
+#: sales/sales_order_entry.php:590
 msgid "Enter a New Sales Invoice"
 msgstr ""
 
-#: sales/sales_order_entry.php:600
+#: sales/sales_order_entry.php:595
 msgid "This sales quotation has been cancelled as requested."
 msgstr ""
 
-#: sales/sales_order_entry.php:601
+#: sales/sales_order_entry.php:596
 msgid "Enter a New Sales Quotation"
 msgstr ""
 
-#: sales/sales_order_entry.php:608
+#: sales/sales_order_entry.php:603
 msgid "Undelivered part of order has been cancelled as requested."
 msgstr ""
 
-#: sales/sales_order_entry.php:609
+#: sales/sales_order_entry.php:604
 msgid "Select Another Sales Order for Edition"
 msgstr ""
 
-#: sales/sales_order_entry.php:613
+#: sales/sales_order_entry.php:608
 msgid "This sales order has been cancelled as requested."
 msgstr ""
 
-#: sales/sales_order_entry.php:614
+#: sales/sales_order_entry.php:609
 msgid "Enter a New Sales Order"
 msgstr ""
 
-#: sales/sales_order_entry.php:692
+#: sales/sales_order_entry.php:687
 msgid "Sales Invoice Items"
 msgstr ""
 
-#: sales/sales_order_entry.php:693
+#: sales/sales_order_entry.php:688
 msgid "Enter Delivery Details and Confirm Invoice"
 msgstr ""
 
-#: sales/sales_order_entry.php:695
+#: sales/sales_order_entry.php:690
 msgid "Place Invoice"
 msgstr ""
 
-#: sales/sales_order_entry.php:698
+#: sales/sales_order_entry.php:693
 msgid "Delivery Note Items"
 msgstr ""
 
-#: sales/sales_order_entry.php:699
+#: sales/sales_order_entry.php:694
 msgid "Enter Delivery Details and Confirm Dispatch"
 msgstr ""
 
-#: sales/sales_order_entry.php:700
+#: sales/sales_order_entry.php:695
 msgid "Cancel Delivery"
 msgstr ""
 
-#: sales/sales_order_entry.php:701
+#: sales/sales_order_entry.php:696
 msgid "Place Delivery"
 msgstr ""
 
-#: sales/sales_order_entry.php:703
+#: sales/sales_order_entry.php:698
 msgid "Quotation Date:"
 msgstr ""
 
-#: sales/sales_order_entry.php:704
+#: sales/sales_order_entry.php:699
 msgid "Sales Quotation Items"
 msgstr ""
 
-#: sales/sales_order_entry.php:705
+#: sales/sales_order_entry.php:700
 msgid "Enter Delivery Details and Confirm Quotation"
 msgstr ""
 
-#: sales/sales_order_entry.php:706
+#: sales/sales_order_entry.php:701
 msgid "Cancel Quotation"
 msgstr ""
 
-#: sales/sales_order_entry.php:707
+#: sales/sales_order_entry.php:702
 msgid "Place Quotation"
 msgstr ""
 
-#: sales/sales_order_entry.php:708
+#: sales/sales_order_entry.php:703
 msgid "Commit Quotations Changes"
 msgstr ""
 
-#: sales/sales_order_entry.php:711
+#: sales/sales_order_entry.php:706
 msgid "Sales Order Items"
 msgstr ""
 
-#: sales/sales_order_entry.php:712
+#: sales/sales_order_entry.php:707
 msgid "Enter Delivery Details and Confirm Order"
 msgstr ""
 
-#: sales/sales_order_entry.php:715
+#: sales/sales_order_entry.php:710
 msgid "Commit Order Changes"
 msgstr ""
 
-#: sales/sales_order_entry.php:738 sales/sales_order_entry.php:744
+#: sales/sales_order_entry.php:733 sales/sales_order_entry.php:739
 msgid ""
 "Cancels document entry or removes sales order when editing an old document"
 msgstr ""
 
-#: sales/sales_order_entry.php:739 sales/sales_order_entry.php:748
+#: sales/sales_order_entry.php:734 sales/sales_order_entry.php:743
 msgid "You are about to void this Document.\\nDo you want to continue?"
 msgstr ""
 
-#: sales/sales_order_entry.php:742
+#: sales/sales_order_entry.php:737
 msgid "Validate changes and update document"
 msgstr ""
 
-#: sales/sales_order_entry.php:746
+#: sales/sales_order_entry.php:741
 msgid ""
 "You are about to cancel undelivered part of this order.\\nDo you want to "
 "continue?"
@@ -12673,6 +12713,7 @@ msgstr ""
 #: sales/manage/customer_branches.php:280 sales/manage/customers.php:328
 #: sales/inquiry/customer_allocation_inquiry.php:42
 #: sales/inquiry/customer_inquiry.php:48
+#: sales/inquiry/sales_deliveries_view.php:116
 #: sales/inquiry/sales_orders_view.php:243
 msgid "Select a customer: "
 msgstr ""
@@ -12833,7 +12874,7 @@ msgid "Disable this Branch:"
 msgstr ""
 
 #: sales/manage/customer_branches.php:295
-#: sales/inquiry/sales_deliveries_view.php:183
+#: sales/inquiry/sales_deliveries_view.php:185
 msgid "Contact"
 msgstr ""
 
@@ -12854,7 +12895,7 @@ msgid "Tax Group"
 msgstr ""
 
 #: sales/manage/customer_branches.php:319
-#: sales/includes/ui/sales_order_ui.inc:305
+#: sales/includes/ui/sales_order_ui.inc:288
 msgid ""
 "The selected customer does not have any branches. Please create at least one "
 "branch."
@@ -13476,27 +13517,27 @@ msgid ""
 "\t\t    the same customer branch."
 msgstr ""
 
-#: sales/inquiry/sales_deliveries_view.php:179
+#: sales/inquiry/sales_deliveries_view.php:181
 msgid "Delivery #"
 msgstr ""
 
-#: sales/inquiry/sales_deliveries_view.php:185
+#: sales/inquiry/sales_deliveries_view.php:187
 msgid "Cust Ref"
 msgstr ""
 
-#: sales/inquiry/sales_deliveries_view.php:187
+#: sales/inquiry/sales_deliveries_view.php:189
 msgid "Due By"
 msgstr ""
 
-#: sales/inquiry/sales_deliveries_view.php:188
+#: sales/inquiry/sales_deliveries_view.php:190
 msgid "Delivery Total"
 msgstr ""
 
-#: sales/inquiry/sales_deliveries_view.php:190
+#: sales/inquiry/sales_deliveries_view.php:192
 msgid "Batch"
 msgstr ""
 
-#: sales/inquiry/sales_deliveries_view.php:190
+#: sales/inquiry/sales_deliveries_view.php:192
 msgid "Batch Invoicing"
 msgstr ""
 
@@ -13589,17 +13630,17 @@ msgid "Deleted."
 msgstr ""
 
 #: sales/includes/ui/sales_credit_ui.inc:94
-#: sales/includes/ui/sales_order_ui.inc:384
+#: sales/includes/ui/sales_order_ui.inc:367
 msgid "Customer Currency:"
 msgstr ""
 
 #: sales/includes/ui/sales_credit_ui.inc:112
-#: sales/includes/ui/sales_order_ui.inc:644
+#: sales/includes/ui/sales_order_ui.inc:627
 msgid "Shipping Company:"
 msgstr ""
 
 #: sales/includes/ui/sales_credit_ui.inc:114
-#: sales/includes/ui/sales_order_ui.inc:391
+#: sales/includes/ui/sales_order_ui.inc:374
 msgid "Customer Discount:"
 msgstr ""
 
@@ -13613,98 +13654,98 @@ msgid ""
 "have any branches."
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:230
+#: sales/includes/ui/sales_order_ui.inc:216
 msgid "Shipping Charge"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:303
+#: sales/includes/ui/sales_order_ui.inc:286
 msgid "No customer found for entered text."
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:329
+#: sales/includes/ui/sales_order_ui.inc:312
 #, php-format
 msgid "Customer's payment terms '%s' cannot be selected on this POS"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:378
+#: sales/includes/ui/sales_order_ui.inc:361
 msgid "Reference number unique for this document type"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:418
-#: sales/includes/ui/sales_order_ui.inc:420
+#: sales/includes/ui/sales_order_ui.inc:401
+#: sales/includes/ui/sales_order_ui.inc:403
 msgid "Price List:"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:437
+#: sales/includes/ui/sales_order_ui.inc:420
 msgid "Date of order receive"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:587
+#: sales/includes/ui/sales_order_ui.inc:570
 msgid "Cash payment"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:590
-#: sales/includes/ui/sales_order_ui.inc:622
+#: sales/includes/ui/sales_order_ui.inc:573
+#: sales/includes/ui/sales_order_ui.inc:605
 msgid "Deliver from Location:"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:593
+#: sales/includes/ui/sales_order_ui.inc:576
 msgid "Cash account:"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:600
+#: sales/includes/ui/sales_order_ui.inc:583
 msgid "Delivery Details"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:605
+#: sales/includes/ui/sales_order_ui.inc:588
 msgid "Invoice Delivery Details"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:606
+#: sales/includes/ui/sales_order_ui.inc:589
 msgid "Invoice before"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:610
+#: sales/includes/ui/sales_order_ui.inc:593
 msgid "Quotation Delivery Details"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:615
+#: sales/includes/ui/sales_order_ui.inc:598
 msgid "Order Delivery Details"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:628
+#: sales/includes/ui/sales_order_ui.inc:611
 msgid "Enter requested day of delivery"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:629
+#: sales/includes/ui/sales_order_ui.inc:612
 msgid "Enter Valid until Date"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:630
+#: sales/includes/ui/sales_order_ui.inc:613
 msgid "Deliver To:"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:631
+#: sales/includes/ui/sales_order_ui.inc:614
 msgid "Additional identifier for delivery e.g. name of receiving person"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:634
+#: sales/includes/ui/sales_order_ui.inc:617
 msgid "Delivery address. Default is address of customer branch"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:638
+#: sales/includes/ui/sales_order_ui.inc:621
 msgid "Contact Phone Number:"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:639
+#: sales/includes/ui/sales_order_ui.inc:622
 msgid "Phone number of ordering person. Defaults to branch phone number"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:640
+#: sales/includes/ui/sales_order_ui.inc:623
 msgid "Customer Reference:"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:641
+#: sales/includes/ui/sales_order_ui.inc:624
 msgid "Customer reference number for this order (if any)"
 msgstr ""