From: Janusz Dobrowolski <janusz@frontaccouting.eu>
Date: Thu, 21 Jul 2011 14:55:13 +0000 (+0200)
Subject: Language template update.
X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=commitdiff_plain;h=db42abe367b53a2567f9cf9780bfd187f82e8dd4;p=textcart.git

Language template update.
---

diff --git a/lang/new_language_template/LC_MESSAGES/empty.po b/lang/new_language_template/LC_MESSAGES/empty.po
index 0c07a25..e970845 100644
--- a/lang/new_language_template/LC_MESSAGES/empty.po
+++ b/lang/new_language_template/LC_MESSAGES/empty.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-06-09 15:26+0200\n"
+"POT-Creation-Date: 2011-07-21 16:54+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"
@@ -97,7 +97,7 @@ msgid "Attachment has been deleted."
 msgstr ""
 
 #: admin/attachments.php:155 admin/view_print_transaction.php:72
-#: admin/void_transaction.php:151 gl/inquiry/journal_inquiry.php:47
+#: admin/void_transaction.php:155 gl/inquiry/journal_inquiry.php:47
 #: inventory/includes/item_adjustments_ui.inc:47
 #: manufacturing/work_order_add_finished.php:203
 #: manufacturing/work_order_costs.php:150
@@ -109,9 +109,9 @@ msgid "Type:"
 msgstr ""
 
 #: admin/attachments.php:167 admin/view_print_transaction.php:126
-#: admin/void_transaction.php:175 dimensions/inquiry/search_dimensions.php:127
+#: admin/void_transaction.php:179 dimensions/inquiry/search_dimensions.php:127
 #: dimensions/view/view_dimension.php:54 gl/bank_account_reconcile.php:234
-#: gl/inquiry/bank_inquiry.php:70 gl/inquiry/gl_account_inquiry.php:125
+#: gl/inquiry/bank_inquiry.php:70 gl/inquiry/gl_account_inquiry.php:126
 #: gl/inquiry/journal_inquiry.php:120 gl/inquiry/journal_inquiry.php:133
 #: includes/ui/allocation_cart.inc:263
 #: inventory/inquiry/stock_movements.php:76
@@ -130,9 +130,10 @@ msgstr ""
 #: purchasing/inquiry/supplier_inquiry.php.orig:163
 #: purchasing/allocations/supplier_allocation_main.php:95
 #: reporting/rep101.php:130 reporting/rep201.php:118 reporting/rep203.php:91
-#: reporting/rep601.php:76 reporting/rep704.php:78 reporting/rep704.php:81
-#: reporting/rep704.php:84 reporting/rep710.php:76
-#: reporting/includes/doctext.inc:110 reporting/includes/doctext.inc:118
+#: reporting/rep601.php:76 reporting/rep704.php:79 reporting/rep704.php:82
+#: reporting/rep704.php:85 reporting/rep710.php:76
+#: reporting/includes/doctext.inc:143 reporting/includes/doctext.inc:183
+#: reporting/includes/doctext.inc:221
 #: sales/allocations/customer_allocation_main.php:94
 #: sales/view/view_sales_order.php:96 sales/view/view_sales_order.php:129
 #: sales/view/view_sales_order.php:161
@@ -151,11 +152,11 @@ msgstr ""
 #: inventory/manage/sales_kits.php:40 inventory/view/view_adjustment.php:56
 #: inventory/view/view_transfer.php:56 manufacturing/manage/bom_edit.php:70
 #: manufacturing/includes/manufacturing_ui.inc:28
-#: purchasing/includes/ui/invoice_ui.inc:470
-#: purchasing/includes/ui/invoice_ui.inc:482
+#: purchasing/includes/ui/invoice_ui.inc:471
+#: purchasing/includes/ui/invoice_ui.inc:483
 #: purchasing/po_receive_items.php:62 reporting/rep104.php:109
 #: reporting/rep105.php:112 reporting/rep204.php:82 reporting/rep303.php:109
-#: reporting/rep303.php:115 reporting/rep304.php:114 reporting/rep305.php:95
+#: reporting/rep303.php:115 reporting/rep304.php:113 reporting/rep305.php:95
 #: reporting/rep401.php:69 sales/create_recurrent_invoices.php:115
 #: sales/manage/credit_status.php:97 sales/manage/recurrent_invoices.php:102
 #: sales/inquiry/sales_orders_view.php:286
@@ -164,7 +165,7 @@ msgstr ""
 msgid "Description"
 msgstr ""
 
-#: admin/attachments.php:167 admin/backups.php:60 admin/backups.php:142
+#: admin/attachments.php:167 admin/backups.php:63 admin/backups.php:149
 msgid "Filename"
 msgstr ""
 
@@ -185,7 +186,7 @@ msgstr ""
 #: admin/inst_lang.php:100 admin/payment_terms.php:142 admin/printers.php:96
 #: admin/shipping_companies.php:106 admin/tags.php:140 admin/users.php:144
 #: dimensions/inquiry/search_dimensions.php:120
-#: gl/inquiry/journal_inquiry.php:111 gl/manage/bank_accounts.php:126
+#: gl/inquiry/journal_inquiry.php:111 gl/manage/bank_accounts.php:131
 #: gl/manage/currencies.php:166 gl/manage/exchange_rates.php:94
 #: gl/manage/gl_account_classes.php:132 gl/manage/gl_account_types.php:155
 #: gl/manage/gl_quick_entries.php:196 gl/manage/gl_quick_entries.php:295
@@ -202,7 +203,7 @@ msgstr ""
 #: manufacturing/manage/bom_edit.php:86
 #: manufacturing/manage/work_centres.php:114
 #: manufacturing/includes/work_order_issue_ui.inc:58
-#: purchasing/includes/ui/invoice_ui.inc:519
+#: purchasing/includes/ui/invoice_ui.inc:520
 #: purchasing/includes/ui/po_ui.inc:266
 #: purchasing/inquiry/po_search_completed.php:101
 #: purchasing/inquiry/po_search.php:87 sales/manage/credit_status.php:119
@@ -232,7 +233,7 @@ msgstr ""
 #: admin/inst_chart.php:80 admin/inst_lang.php:109 admin/inst_module.php:144
 #: admin/inst_theme.php:102 admin/payment_terms.php:143 admin/printers.php:97
 #: admin/shipping_companies.php:107 admin/tags.php:141 admin/users.php:146
-#: gl/gl_budget.php:137 gl/manage/bank_accounts.php:127
+#: gl/gl_budget.php:137 gl/manage/bank_accounts.php:132
 #: gl/manage/currencies.php:168 gl/manage/exchange_rates.php:99
 #: gl/manage/gl_account_classes.php:133 gl/manage/gl_account_types.php:156
 #: gl/manage/gl_quick_entries.php:197 gl/manage/gl_quick_entries.php:296
@@ -268,43 +269,44 @@ msgstr ""
 msgid "Attached File"
 msgstr ""
 
-#: admin/backups.php:21 admin/backups.php:111
+#: admin/backups.php:21 admin/backups.php:40 admin/backups.php:114
+#: admin/backups.php:142 admin/backups.php:155 admin/backups.php:173
 msgid "Select backup file first."
 msgstr ""
 
-#: admin/backups.php:40
+#: admin/backups.php:43
 msgid "Backup and Restore Database"
 msgstr ""
 
-#: admin/backups.php:47
+#: admin/backups.php:50
 msgid "Backup paths have not been set correctly."
 msgstr ""
 
-#: admin/backups.php:48
+#: admin/backups.php:51
 msgid "Please contact System Administrator."
 msgstr ""
 
-#: admin/backups.php:49
+#: admin/backups.php:52
 msgid "cannot find backup directory"
 msgstr ""
 
-#: admin/backups.php:59
+#: admin/backups.php:62
 msgid "Backup successfully generated."
 msgstr ""
 
-#: admin/backups.php:62
+#: admin/backups.php:65
 msgid "Database backup failed."
 msgstr ""
 
-#: admin/backups.php:95 admin/create_coy.php:261 admin/fiscalyears.php:155
+#: admin/backups.php:98 admin/create_coy.php:261 admin/fiscalyears.php:155
 #: admin/inst_lang.php:85 admin/inst_lang.php:97
 #: dimensions/inquiry/search_dimensions.php:107
-#: gl/manage/bank_accounts.php:123 gl/manage/currencies.php:164
+#: gl/manage/bank_accounts.php:128 gl/manage/currencies.php:164
 #: 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:1638
 #: purchasing/manage/suppliers.php:123 reporting/rep101.php:126
-#: reporting/rep102.php:114 reporting/rep102.php:116 reporting/rep104.php:103
+#: reporting/rep102.php:112 reporting/rep102.php:114 reporting/rep104.php:103
 #: reporting/rep106.php:73 reporting/rep114.php:73 reporting/rep201.php:114
 #: reporting/rep202.php:116 reporting/rep202.php:118 reporting/rep203.php:87
 #: reporting/rep303.php:101 reporting/rep303.php:105 reporting/rep501.php:109
@@ -314,77 +316,77 @@ msgstr ""
 msgid "No"
 msgstr ""
 
-#: admin/backups.php:135
+#: admin/backups.php:139
 msgid "Restore backup completed."
 msgstr ""
 
-#: admin/backups.php:141
+#: admin/backups.php:148
 msgid "File successfully deleted."
 msgstr ""
 
-#: admin/backups.php:146
+#: admin/backups.php:153
 msgid "Can't delete backup file."
 msgstr ""
 
-#: admin/backups.php:155
+#: admin/backups.php:165
 msgid "You can only upload *.sql backup files"
 msgstr ""
 
-#: admin/backups.php:161
+#: admin/backups.php:171
 msgid "File was not uploaded into the system."
 msgstr ""
 
-#: admin/backups.php:167
+#: admin/backups.php:180
 msgid "Create backup"
 msgstr ""
 
-#: admin/backups.php:168 sales/includes/ui/sales_order_ui.inc:589
+#: admin/backups.php:181 sales/includes/ui/sales_order_ui.inc:589
 #: sales/includes/ui/sales_order_ui.inc:636
 msgid "Comments:"
 msgstr ""
 
-#: admin/backups.php:169
+#: admin/backups.php:182
 msgid "Compression:"
 msgstr ""
 
-#: admin/backups.php:171
+#: admin/backups.php:184
 msgid "Create Backup"
 msgstr ""
 
-#: admin/backups.php:173
+#: admin/backups.php:186
 msgid "Backup scripts maintenance"
 msgstr ""
 
-#: admin/backups.php:179
+#: admin/backups.php:192
 msgid "View Backup"
 msgstr ""
 
-#: admin/backups.php:180
+#: admin/backups.php:193
 msgid "Download Backup"
 msgstr ""
 
-#: admin/backups.php:181
+#: admin/backups.php:194
 msgid "Restore Backup"
 msgstr ""
 
-#: admin/backups.php:182
+#: admin/backups.php:195
 msgid ""
 "You are about to restore database from backup file.\n"
 "Do you want to continue?"
 msgstr ""
 
-#: admin/backups.php:184
+#: admin/backups.php:197
 msgid "Delete Backup"
 msgstr ""
 
-#: admin/backups.php:186
+#: admin/backups.php:199
 #, php-format
 msgid ""
 "You are about to remove selected backup file.\n"
 "Do you want to continue ?"
 msgstr ""
 
-#: admin/backups.php:192
+#: admin/backups.php:205
 msgid "Upload file"
 msgstr ""
 
@@ -471,7 +473,7 @@ msgstr ""
 
 #: admin/company_preferences.php:161 admin/shipping_companies.php:142
 #: includes/ui/contacts_view.inc:109 inventory/manage/locations.php:202
-#: sales/manage/customers.php:203 sales/includes/ui/sales_order_ui.inc:627
+#: sales/manage/customers.php:205 sales/includes/ui/sales_order_ui.inc:627
 msgid "Address:"
 msgstr ""
 
@@ -498,7 +500,7 @@ msgid "Official Company Number:"
 msgstr ""
 
 #: admin/company_preferences.php:169 purchasing/manage/suppliers.php:88
-#: sales/manage/customers.php:205
+#: sales/manage/customers.php:207
 msgid "GSTNo:"
 msgstr ""
 
@@ -600,7 +602,7 @@ msgstr ""
 #: 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:203
 #: includes/ui/ui_input.inc:894 inventory/adjustments.php:235
-#: inventory/cost_update.php:119 inventory/reorder_level.php:97
+#: inventory/cost_update.php:116 inventory/reorder_level.php:97
 #: inventory/transfers.php:236 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
@@ -728,12 +730,12 @@ msgstr ""
 
 #: admin/create_coy.php:259 admin/fiscalyears.php:159 admin/inst_lang.php:85
 #: admin/inst_lang.php:97 dimensions/inquiry/search_dimensions.php:107
-#: gl/manage/bank_accounts.php:121 gl/manage/currencies.php:164
+#: gl/manage/bank_accounts.php:126 gl/manage/currencies.php:164
 #: 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:1639
 #: purchasing/manage/suppliers.php:123 reporting/rep101.php:125
-#: reporting/rep102.php:113 reporting/rep102.php:115 reporting/rep104.php:105
+#: reporting/rep102.php:111 reporting/rep102.php:113 reporting/rep104.php:105
 #: reporting/rep106.php:75 reporting/rep114.php:75 reporting/rep201.php:113
 #: reporting/rep202.php:115 reporting/rep202.php:117 reporting/rep203.php:86
 #: reporting/rep303.php:96 reporting/rep303.php:104 reporting/rep501.php:107
@@ -1506,7 +1508,7 @@ msgstr ""
 msgid "Save database and perform upgrade"
 msgstr ""
 
-#: admin/payment_terms.php:16 reporting/includes/doctext.inc:58
+#: admin/payment_terms.php:16 reporting/includes/doctext.inc:239
 #: sales/view/view_invoice.php:74 sales/view/view_sales_order.php:78
 msgid "Payment Terms"
 msgstr ""
@@ -1547,9 +1549,9 @@ msgstr ""
 #: dimensions/inquiry/search_dimensions.php:75
 #: dimensions/inquiry/search_dimensions.php:130
 #: dimensions/view/view_dimension.php:54 gl/bank_account_reconcile.php:233
-#: gl/inquiry/bank_inquiry.php:70 gl/inquiry/gl_account_inquiry.php:125
+#: gl/inquiry/bank_inquiry.php:70 gl/inquiry/gl_account_inquiry.php:126
 #: gl/inquiry/journal_inquiry.php:122 gl/inquiry/tax_inquiry.php:82
-#: gl/manage/bank_accounts.php:102 gl/manage/gl_quick_entries.php:186
+#: gl/manage/bank_accounts.php:107 gl/manage/gl_quick_entries.php:186
 #: gl/view/accrual_trans.php:52 gl/includes/ui/gl_bank_ui.inc:80
 #: gl/includes/ui/gl_bank_ui.inc.orig:80 includes/ui/ui_view.inc:488
 #: inventory/inquiry/stock_movements.php:76
@@ -1561,13 +1563,13 @@ msgstr ""
 #: manufacturing/includes/manufacturing_ui.inc:331
 #: purchasing/inquiry/supplier_allocation_inquiry.php:125
 #: purchasing/inquiry/supplier_inquiry.php:162
-#: purchasing/inquiry/supplier_inquiry.php.orig:162 reporting/rep102.php:134
+#: purchasing/inquiry/supplier_inquiry.php.orig:162 reporting/rep102.php:132
 #: reporting/rep202.php:137 reporting/rep501.php:85 reporting/rep601.php:76
-#: reporting/rep702.php:58 reporting/rep704.php:78 reporting/rep704.php:81
-#: reporting/rep704.php:84 reporting/rep709.php:105 reporting/rep710.php:76
+#: reporting/rep702.php:58 reporting/rep704.php:79 reporting/rep704.php:82
+#: reporting/rep704.php:85 reporting/rep709.php:105 reporting/rep710.php:76
 #: reporting/rep710.php:84 reporting/reports_main.php:251
-#: reporting/reports_main.php:398 reporting/includes/doctext.inc:44
-#: reporting/includes/doctext.inc:54
+#: reporting/reports_main.php:398 reporting/includes/doctext.inc:138
+#: reporting/includes/doctext.inc:178 reporting/includes/doctext.inc:197
 #: sales/inquiry/customer_allocation_inquiry.php:141
 #: sales/inquiry/customer_inquiry.php:212
 msgid "Type"
@@ -1763,7 +1765,7 @@ msgstr ""
 
 #: admin/security_roles.php:180 gl/manage/gl_accounts.php:199
 #: inventory/manage/items.php:253 purchasing/manage/suppliers.php:281
-#: sales/manage/customers.php:282
+#: sales/manage/customers.php:284
 msgid "Show inactive:"
 msgstr ""
 
@@ -1803,7 +1805,7 @@ msgstr ""
 msgid "Delete This Role"
 msgstr ""
 
-#: admin/security_roles.php:249 admin/void_transaction.php:223
+#: admin/security_roles.php:249 admin/void_transaction.php:227
 #: gl/manage/gl_quick_entries.php:61 gl/includes/ui/gl_bank_ui.inc:259
 #: gl/includes/ui/gl_bank_ui.inc.orig:259 gl/includes/ui/gl_journal_ui.inc:223
 #: includes/ui/simple_crud_class.inc:58 includes/ui/simple_crud_class.inc:231
@@ -1822,10 +1824,10 @@ msgstr ""
 msgid "Cancel Edition"
 msgstr ""
 
-#: admin/shipping_companies.php:15 reporting/includes/doctext.inc:32
-#: sales/customer_credit_invoice.php:256 sales/customer_delivery.php:365
-#: sales/customer_invoice.php:409 sales/view/view_credit.php:74
-#: sales/view/view_dispatch.php:92 sales/view/view_invoice.php:91
+#: admin/shipping_companies.php:15 sales/customer_credit_invoice.php:256
+#: sales/customer_delivery.php:365 sales/customer_invoice.php:409
+#: sales/view/view_credit.php:74 sales/view/view_dispatch.php:92
+#: sales/view/view_invoice.php:91
 msgid "Shipping Company"
 msgstr ""
 
@@ -1870,7 +1872,6 @@ msgid "Secondary Phone"
 msgstr ""
 
 #: admin/shipping_companies.php:91 inventory/manage/locations.php:146
-#: reporting/includes/doctext.inc:77
 msgid "Address"
 msgstr ""
 
@@ -1978,7 +1979,7 @@ msgstr ""
 
 #: admin/users.php:114 includes/ui/contacts_view.inc:41
 #: inventory/manage/locations.php:146 reporting/rep106.php:86
-#: reporting/includes/header2.inc:86 sales/manage/sales_people.php:99
+#: reporting/includes/header2.inc:98 sales/manage/sales_people.php:99
 msgid "Phone"
 msgstr ""
 
@@ -2036,18 +2037,18 @@ msgstr ""
 msgid "Only documents can be printed."
 msgstr ""
 
-#: admin/view_print_transaction.php:79 admin/void_transaction.php:160
+#: admin/view_print_transaction.php:79 admin/void_transaction.php:164
 msgid "from #:"
 msgstr ""
 
-#: admin/view_print_transaction.php:81 admin/void_transaction.php:162
+#: admin/view_print_transaction.php:81 admin/void_transaction.php:166
 msgid "to #:"
 msgstr ""
 
-#: admin/view_print_transaction.php:83 admin/void_transaction.php:164
+#: admin/view_print_transaction.php:83 admin/void_transaction.php:168
 #: dimensions/inquiry/search_dimensions.php:88
 #: gl/inquiry/journal_inquiry.php:53 manufacturing/search_work_orders.php:78
-#: purchasing/includes/ui/invoice_ui.inc:452
+#: purchasing/includes/ui/invoice_ui.inc:453
 #: purchasing/inquiry/po_search_completed.php:74
 #: purchasing/inquiry/po_search.php:76
 #: purchasing/inquiry/supplier_allocation_inquiry.php:57
@@ -2072,7 +2073,7 @@ msgid ""
 "zero."
 msgstr ""
 
-#: admin/view_print_transaction.php:127 admin/void_transaction.php:176
+#: admin/view_print_transaction.php:127 admin/void_transaction.php:180
 #: dimensions/inquiry/search_dimensions.php:128
 #: dimensions/view/view_dimension.php:54 gl/bank_account_reconcile.php:235
 #: gl/inquiry/bank_inquiry.php:70 gl/inquiry/journal_inquiry.php:124
@@ -2100,7 +2101,7 @@ msgstr ""
 #: purchasing/inquiry/supplier_inquiry.php.orig:164
 #: purchasing/allocations/supplier_allocation_main.php:96
 #: reporting/rep501.php:85 reporting/rep601.php:76 reporting/rep702.php:51
-#: reporting/includes/doctext.inc:47 sales/customer_credit_invoice.php:247
+#: reporting/includes/doctext.inc:196 sales/customer_credit_invoice.php:247
 #: sales/customer_credit_invoice.php:249 sales/customer_delivery.php:345
 #: sales/customer_delivery.php:347 sales/customer_invoice.php:388
 #: sales/customer_invoice.php:390
@@ -2116,11 +2117,11 @@ msgstr ""
 msgid "Reference"
 msgstr ""
 
-#: admin/view_print_transaction.php:128 admin/void_transaction.php:177
+#: admin/view_print_transaction.php:128 admin/void_transaction.php:181
 #: dimensions/inquiry/search_dimensions.php:131
 #: dimensions/view/view_dimension.php:54 gl/accruals.php:90
 #: gl/accruals.php:195 gl/bank_account_reconcile.php:236
-#: gl/inquiry/bank_inquiry.php:70 gl/inquiry/gl_account_inquiry.php:125
+#: gl/inquiry/bank_inquiry.php:70 gl/inquiry/gl_account_inquiry.php:126
 #: gl/inquiry/journal_inquiry.php:121 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
@@ -2144,11 +2145,11 @@ msgstr ""
 #: purchasing/inquiry/supplier_inquiry.php.orig:167
 #: purchasing/allocations/supplier_allocation_main.php:97
 #: reporting/rep101.php:130 reporting/rep201.php:118 reporting/rep501.php:85
-#: reporting/rep601.php:76 reporting/rep704.php:78 reporting/rep704.php:81
-#: reporting/rep704.php:84 reporting/rep709.php:109 reporting/rep710.php:75
-#: reporting/includes/doctext.inc:15 reporting/includes/doctext.inc:110
-#: reporting/includes/doctext.inc:118 sales/customer_delivery.php:375
-#: sales/customer_invoice.php:419
+#: reporting/rep601.php:76 reporting/rep704.php:79 reporting/rep704.php:82
+#: reporting/rep704.php:85 reporting/rep709.php:109 reporting/rep710.php:75
+#: reporting/includes/doctext.inc:143 reporting/includes/doctext.inc:183
+#: reporting/includes/doctext.inc:221 reporting/includes/header2.inc:135
+#: sales/customer_delivery.php:375 sales/customer_invoice.php:419
 #: 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
@@ -2157,7 +2158,7 @@ msgstr ""
 msgid "Date"
 msgstr ""
 
-#: admin/view_print_transaction.php:130 admin/void_transaction.php:178
+#: admin/view_print_transaction.php:130 admin/void_transaction.php:182
 #: includes/ui/ui_view.inc:51
 msgid "GL"
 msgstr ""
@@ -2166,70 +2167,70 @@ msgstr ""
 msgid "Void a Transaction"
 msgstr ""
 
-#: admin/void_transaction.php:119 admin/void_transaction.php:179
+#: admin/void_transaction.php:124 admin/void_transaction.php:183
 #: includes/ui/ui_input.inc:136 includes/ui/ui_input.inc:277
 #: includes/ui/ui_lists.inc:20
 msgid "Select"
 msgstr ""
 
-#: admin/void_transaction.php:198
+#: admin/void_transaction.php:202
 msgid "Transaction #:"
 msgstr ""
 
-#: admin/void_transaction.php:200
+#: admin/void_transaction.php:204
 msgid "Voiding Date:"
 msgstr ""
 
-#: admin/void_transaction.php:202 dimensions/dimension_entry.php:283
+#: admin/void_transaction.php:206 dimensions/dimension_entry.php:283
 #: gl/bank_transfer.php:93 gl/inquiry/journal_inquiry.php:56
 #: gl/manage/revaluate_currencies.php:106 includes/ui/ui_view.inc:308
 #: manufacturing/work_order_add_finished.php:210
 #: manufacturing/work_order_entry.php:451
 #: manufacturing/work_order_release.php:100
-#: purchasing/includes/ui/invoice_ui.inc:161 purchasing/po_entry_items.php:511
-#: purchasing/supplier_payment.php:313
+#: purchasing/includes/ui/invoice_ui.inc:161 purchasing/po_entry_items.php:518
+#: purchasing/po_entry_items.php.orig:511 purchasing/supplier_payment.php:313
 #: purchasing/supplier_payment.php.orig:314 sales/customer_payments.php:292
 #: sales/customer_payments.php.orig:293
 msgid "Memo:"
 msgstr ""
 
-#: admin/void_transaction.php:207 admin/void_transaction.php:216
+#: admin/void_transaction.php:211 admin/void_transaction.php:220
 msgid "Void Transaction"
 msgstr ""
 
-#: admin/void_transaction.php:212 admin/void_transaction.php:291
+#: admin/void_transaction.php:216 admin/void_transaction.php:295
 msgid "The entered transaction does not exist or cannot be voided."
 msgstr ""
 
-#: admin/void_transaction.php:220
+#: admin/void_transaction.php:224
 msgid ""
 "Are you sure you want to void this transaction ? This action cannot be "
 "undone."
 msgstr ""
 
-#: admin/void_transaction.php:222 includes/ui/ui_controls.inc:586
+#: admin/void_transaction.php:226 includes/ui/ui_controls.inc:586
 msgid "Proceed"
 msgstr ""
 
-#: admin/void_transaction.php:236
+#: admin/void_transaction.php:240
 msgid "The selected transaction was closed for edition and cannot be voided."
 msgstr ""
 
-#: admin/void_transaction.php:242 gl/accruals.php:32 gl/bank_transfer.php:110
+#: admin/void_transaction.php:246 gl/accruals.php:32 gl/bank_transfer.php:110
 #: gl/gl_journal.php:156 gl/manage/exchange_rates.php:33
 #: gl/manage/revaluate_currencies.php:53
 #: manufacturing/work_order_add_finished.php:98
 #: manufacturing/work_order_costs.php:83 purchasing/po_receive_items.php:174
 #: purchasing/supplier_payment.php:178
 #: purchasing/supplier_payment.php.orig:175
-#: sales/customer_credit_invoice.php:91 sales/sales_order_entry.php:342
+#: sales/customer_credit_invoice.php:91 sales/sales_order_entry.php:340
 #: sales/manage/recurrent_invoices.php:41
 #: sales/manage/recurrent_invoices.php:46
 #: sales/manage/recurrent_invoices.php:51
 msgid "The entered date is invalid."
 msgstr ""
 
-#: admin/void_transaction.php:248 gl/accruals.php:38 gl/bank_transfer.php:116
+#: admin/void_transaction.php:252 gl/accruals.php:38 gl/bank_transfer.php:116
 #: gl/gl_bank.php:266 gl/gl_journal.php:162
 #: gl/manage/revaluate_currencies.php:59 inventory/adjustments.php:116
 #: inventory/transfers.php:111 manufacturing/work_order_add_finished.php:104
@@ -2244,36 +2245,36 @@ msgstr ""
 msgid "The entered date is not in fiscal year."
 msgstr ""
 
-#: admin/void_transaction.php:255
+#: admin/void_transaction.php:259
 msgid "The transaction number is expected to be numeric and greater than zero."
 msgstr ""
 
-#: admin/void_transaction.php:272
+#: admin/void_transaction.php:276
 msgid "The selected transaction has already been voided."
 msgstr ""
 
-#: admin/void_transaction.php:285
+#: admin/void_transaction.php:289
 msgid "Selected transaction has been voided."
 msgstr ""
 
-#: admin/db/fiscalyears_db.inc:124
+#: admin/db/fiscalyears_db.inc:136
 msgid ""
 "The Retained Earnings Account or the Profit and Loss Year Account has not "
 "been set in System and General GL Setup"
 msgstr ""
 
-#: admin/db/fiscalyears_db.inc:129
+#: admin/db/fiscalyears_db.inc:141
 msgid ""
 "The Retained Earnings Account should be a Balance Account or the Profit and "
 "Loss Year Account should be an Expense Account (preferred the last one in "
 "the Expense Class)"
 msgstr ""
 
-#: admin/db/fiscalyears_db.inc:154 admin/db/fiscalyears_db.inc:156
+#: admin/db/fiscalyears_db.inc:166 admin/db/fiscalyears_db.inc:168
 msgid "Closing Year"
 msgstr ""
 
-#: admin/db/fiscalyears_db.inc:202 reporting/rep101.php:175
+#: admin/db/fiscalyears_db.inc:214 reporting/rep101.php:175
 #: reporting/rep201.php:167 reporting/rep706.php:181
 msgid "Open Balance"
 msgstr ""
@@ -2314,15 +2315,15 @@ msgstr ""
 msgid "SQL script execution failed in line %d: %s"
 msgstr ""
 
-#: admin/db/users_db.inc:197
+#: admin/db/users_db.inc:211
 msgid "user online"
 msgstr ""
 
-#: admin/db/users_db.inc:197
+#: admin/db/users_db.inc:211
 msgid "users online"
 msgstr ""
 
-#: admin/db/voiding_db.inc:111
+#: admin/db/voiding_db.inc:114
 #: manufacturing/includes/db/work_orders_db.inc:446
 #: manufacturing/includes/db/work_orders_db.inc:462
 #: sales/includes/db/sales_invoice_db.inc:205
@@ -2896,12 +2897,13 @@ msgstr ""
 #: inventory/transfers.php:99 manufacturing/work_order_add_finished.php:84
 #: manufacturing/work_order_entry.php:139
 #: manufacturing/work_order_issue.php:98 purchasing/po_entry_items.php:363
-#: purchasing/po_receive_items.php:195 purchasing/supplier_credit.php:156
-#: purchasing/supplier_invoice.php:154 purchasing/supplier_payment.php:207
+#: purchasing/po_entry_items.php.orig:363 purchasing/po_receive_items.php:195
+#: purchasing/supplier_credit.php:156 purchasing/supplier_invoice.php:154
+#: purchasing/supplier_payment.php:207
 #: purchasing/supplier_payment.php.orig:204 sales/credit_note_entry.php:151
 #: sales/customer_credit_invoice.php:108 sales/customer_delivery.php:169
 #: sales/customer_invoice.php:282 sales/customer_payments.php:112
-#: sales/customer_payments.php.orig:112 sales/sales_order_entry.php:411
+#: sales/customer_payments.php.orig:112 sales/sales_order_entry.php:409
 msgid "The entered reference is already in use."
 msgstr ""
 
@@ -2911,6 +2913,7 @@ msgstr ""
 
 #: dimensions/dimension_entry.php:138 manufacturing/work_order_entry.php:154
 #: manufacturing/work_order_entry.php:234 purchasing/po_entry_items.php:235
+#: purchasing/po_entry_items.php.orig:235
 msgid "The date entered is in an invalid format."
 msgstr ""
 
@@ -2987,8 +2990,8 @@ msgstr ""
 
 #: dimensions/dimension_entry.php:302 includes/ui/simple_crud_class.inc:225
 #: purchasing/includes/ui/invoice_ui.inc:186
-#: purchasing/includes/ui/invoice_ui.inc:391
-#: purchasing/includes/ui/invoice_ui.inc:393
+#: purchasing/includes/ui/invoice_ui.inc:392
+#: purchasing/includes/ui/invoice_ui.inc:394
 msgid "Add"
 msgstr ""
 
@@ -3001,29 +3004,29 @@ msgid "Balance for this Dimension"
 msgstr ""
 
 #: dimensions/includes/dimensions_ui.inc:31 gl/accruals.php:90
-#: gl/inquiry/gl_account_inquiry.php:128 gl/inquiry/gl_trial_balance.php:170
+#: gl/inquiry/gl_account_inquiry.php:129 gl/inquiry/gl_trial_balance.php:171
 #: gl/manage/gl_quick_entries.php:241 gl/manage/gl_quick_entries.php:333
 #: includes/sysnames.inc:164 purchasing/includes/ui/invoice_ui.inc:245
 #: purchasing/includes/ui/invoice_ui.inc:247
 #: purchasing/includes/ui/invoice_ui.inc:249 reporting/rep701.php:109
 #: reporting/rep705.php:234 reporting/rep706.php:181 reporting/rep707.php:206
-#: reporting/rep708.php:178
+#: reporting/rep708.php:179
 msgid "Account"
 msgstr ""
 
 #: dimensions/includes/dimensions_ui.inc:31 gl/accruals.php:98
 #: gl/bank_account_reconcile.php:237 gl/inquiry/bank_inquiry.php:71
-#: gl/inquiry/gl_account_inquiry.php:140 gl/inquiry/gl_account_inquiry.php:142
-#: gl/inquiry/gl_trial_balance.php:176 gl/inquiry/gl_trial_balance.php:178
-#: gl/inquiry/gl_trial_balance.php:180 gl/view/accrual_trans.php:60
+#: gl/inquiry/gl_account_inquiry.php:141 gl/inquiry/gl_account_inquiry.php:143
+#: gl/inquiry/gl_trial_balance.php:177 gl/inquiry/gl_trial_balance.php:179
+#: gl/inquiry/gl_trial_balance.php:181 gl/view/accrual_trans.php:60
 #: gl/view/gl_trans_view.php:64 gl/view/gl_trans_view.php:67
 #: gl/view/gl_trans_view.php:70 gl/includes/ui/gl_journal_ui.inc:84
 #: gl/includes/ui/gl_journal_ui.inc:87 gl/includes/ui/gl_journal_ui.inc:90
 #: purchasing/inquiry/supplier_allocation_inquiry.php:133
 #: purchasing/inquiry/supplier_inquiry.php:170
 #: purchasing/inquiry/supplier_inquiry.php.orig:170 reporting/rep601.php:77
-#: reporting/rep702.php:52 reporting/rep704.php:79 reporting/rep704.php:82
-#: reporting/rep704.php:85 reporting/rep708.php:178 reporting/rep708.php:179
+#: reporting/rep702.php:52 reporting/rep704.php:80 reporting/rep704.php:83
+#: reporting/rep704.php:86 reporting/rep708.php:179 reporting/rep708.php:180
 #: sales/inquiry/customer_allocation_inquiry.php:149
 #: sales/inquiry/customer_inquiry.php:221
 msgid "Debit"
@@ -3031,9 +3034,9 @@ msgstr ""
 
 #: dimensions/includes/dimensions_ui.inc:31 gl/accruals.php:98
 #: gl/bank_account_reconcile.php:238 gl/inquiry/bank_inquiry.php:71
-#: gl/inquiry/gl_account_inquiry.php:140 gl/inquiry/gl_account_inquiry.php:142
-#: gl/inquiry/gl_trial_balance.php:177 gl/inquiry/gl_trial_balance.php:179
-#: gl/inquiry/gl_trial_balance.php:181 gl/view/accrual_trans.php:60
+#: gl/inquiry/gl_account_inquiry.php:141 gl/inquiry/gl_account_inquiry.php:143
+#: gl/inquiry/gl_trial_balance.php:178 gl/inquiry/gl_trial_balance.php:180
+#: gl/inquiry/gl_trial_balance.php:182 gl/view/accrual_trans.php:60
 #: gl/view/gl_trans_view.php:64 gl/view/gl_trans_view.php:67
 #: gl/view/gl_trans_view.php:70 gl/includes/ui/gl_journal_ui.inc:84
 #: gl/includes/ui/gl_journal_ui.inc:87 gl/includes/ui/gl_journal_ui.inc:90
@@ -3041,8 +3044,8 @@ msgstr ""
 #: purchasing/inquiry/supplier_allocation_inquiry.php:134
 #: purchasing/inquiry/supplier_inquiry.php:171
 #: purchasing/inquiry/supplier_inquiry.php.orig:171 reporting/rep601.php:77
-#: reporting/rep702.php:52 reporting/rep704.php:79 reporting/rep704.php:82
-#: reporting/rep704.php:85 reporting/rep708.php:178 reporting/rep708.php:179
+#: reporting/rep702.php:52 reporting/rep704.php:80 reporting/rep704.php:83
+#: reporting/rep704.php:86 reporting/rep708.php:179 reporting/rep708.php:180
 #: sales/inquiry/customer_allocation_inquiry.php:150
 #: sales/inquiry/customer_inquiry.php:222
 msgid "Credit"
@@ -3050,11 +3053,11 @@ msgstr ""
 
 #: dimensions/includes/dimensions_ui.inc:45
 #: dimensions/inquiry/search_dimensions.php:134 gl/inquiry/bank_inquiry.php:71
-#: gl/inquiry/gl_account_inquiry.php:140 gl/inquiry/gl_trial_balance.php:174
+#: gl/inquiry/gl_account_inquiry.php:141 gl/inquiry/gl_trial_balance.php:175
 #: purchasing/inquiry/supplier_allocation_inquiry.php:136
 #: reporting/rep203.php:92 reporting/rep204.php:82 reporting/rep601.php:77
-#: reporting/rep701.php:109 reporting/rep704.php:79 reporting/rep704.php:82
-#: reporting/rep704.php:85 reporting/rep708.php:171
+#: reporting/rep701.php:109 reporting/rep704.php:80 reporting/rep704.php:83
+#: reporting/rep704.php:86 reporting/rep708.php:172
 #: sales/inquiry/customer_allocation_inquiry.php:152
 msgid "Balance"
 msgstr ""
@@ -3088,13 +3091,13 @@ msgstr ""
 
 #: dimensions/inquiry/search_dimensions.php:75
 #: includes/ui/allocation_cart.inc:284 includes/ui/ui_lists.inc:1887
-#: reporting/rep101.php:112 reporting/rep102.php:96 reporting/rep104.php:95
+#: reporting/rep101.php:112 reporting/rep102.php:94 reporting/rep104.php:95
 #: reporting/rep104.php:99 reporting/rep105.php:93 reporting/rep105.php:97
 #: reporting/rep201.php:100 reporting/rep202.php:98 reporting/rep203.php:72
 #: reporting/rep204.php:75 reporting/rep301.php:87 reporting/rep301.php:94
 #: reporting/rep302.php:103 reporting/rep302.php:110 reporting/rep303.php:84
-#: reporting/rep303.php:91 reporting/rep304.php:96 reporting/rep304.php:103
-#: reporting/rep304.php:108 reporting/rep702.php:59 reporting/rep710.php:84
+#: reporting/rep303.php:91 reporting/rep304.php:97 reporting/rep304.php:102
+#: reporting/rep304.php:107 reporting/rep702.php:59 reporting/rep710.php:84
 #: reporting/rep710.php:85
 msgid "All"
 msgstr ""
@@ -3143,9 +3146,11 @@ msgstr ""
 #: purchasing/inquiry/supplier_inquiry.php:168
 #: purchasing/inquiry/supplier_inquiry.php.orig:168 reporting/rep101.php:130
 #: reporting/rep201.php:118 reporting/rep203.php:91 reporting/rep501.php:85
-#: reporting/includes/doctext.inc:40 reporting/includes/doctext.inc:110
-#: sales/customer_invoice.php:426 sales/view/view_dispatch.php:97
-#: sales/view/view_invoice.php:96
+#: reporting/includes/doctext.inc:98 reporting/includes/doctext.inc:120
+#: reporting/includes/doctext.inc:141 reporting/includes/doctext.inc:143
+#: reporting/includes/doctext.inc:163 reporting/includes/doctext.inc:181
+#: reporting/includes/doctext.inc:183 sales/customer_invoice.php:426
+#: sales/view/view_dispatch.php:97 sales/view/view_invoice.php:96
 #: sales/inquiry/customer_allocation_inquiry.php:146
 #: sales/inquiry/customer_inquiry.php:217
 #: sales/includes/ui/sales_order_ui.inc:595
@@ -3168,7 +3173,7 @@ msgstr ""
 msgid "This dimension is closed."
 msgstr ""
 
-#: dimensions/view/view_dimension.php:84 gl/inquiry/gl_account_inquiry.php:70
+#: dimensions/view/view_dimension.php:84 gl/inquiry/gl_account_inquiry.php:71
 #: gl/inquiry/tax_inquiry.php:61 purchasing/inquiry/po_search_completed.php:62
 #: purchasing/inquiry/po_search.php:64
 #: sales/inquiry/customer_allocation_inquiry.php:44
@@ -3177,7 +3182,7 @@ msgstr ""
 msgid "from:"
 msgstr ""
 
-#: dimensions/view/view_dimension.php:85 gl/inquiry/gl_account_inquiry.php:71
+#: dimensions/view/view_dimension.php:85 gl/inquiry/gl_account_inquiry.php:72
 #: gl/inquiry/tax_inquiry.php:62 purchasing/inquiry/po_search_completed.php:63
 #: purchasing/inquiry/po_search.php:65
 #: sales/inquiry/customer_allocation_inquiry.php:45
@@ -3187,7 +3192,7 @@ msgid "to:"
 msgstr ""
 
 #: dimensions/view/view_dimension.php:86 gl/inquiry/balance_sheet.php:131
-#: gl/inquiry/bank_inquiry.php:52 gl/inquiry/gl_account_inquiry.php:84
+#: gl/inquiry/bank_inquiry.php:52 gl/inquiry/gl_account_inquiry.php:85
 #: gl/inquiry/gl_trial_balance.php:58 gl/inquiry/profit_loss.php:178
 #: gl/inquiry/tax_inquiry.php:63
 msgid "Show"
@@ -3219,9 +3224,9 @@ msgstr ""
 #: gl/accruals.php:92 gl/accruals.php:94 gl/accruals.php:203
 #: gl/accruals.php:205 gl/gl_budget.php:71 gl/gl_budget.php:72
 #: gl/gl_budget.php:76 gl/inquiry/balance_sheet.php:128
-#: gl/inquiry/balance_sheet.php:130 gl/inquiry/gl_account_inquiry.php:78
-#: gl/inquiry/gl_account_inquiry.php:80 gl/inquiry/gl_account_inquiry.php:133
-#: gl/inquiry/gl_account_inquiry.php:135 gl/inquiry/gl_trial_balance.php:52
+#: gl/inquiry/balance_sheet.php:130 gl/inquiry/gl_account_inquiry.php:79
+#: gl/inquiry/gl_account_inquiry.php:81 gl/inquiry/gl_account_inquiry.php:134
+#: gl/inquiry/gl_account_inquiry.php:136 gl/inquiry/gl_trial_balance.php:52
 #: gl/inquiry/gl_trial_balance.php:54 gl/inquiry/profit_loss.php:174
 #: gl/inquiry/profit_loss.php:176 gl/manage/gl_quick_entries.php:261
 #: gl/manage/gl_quick_entries.php:263 gl/manage/gl_quick_entries.php:343
@@ -3242,12 +3247,12 @@ msgstr ""
 #: purchasing/includes/ui/invoice_ui.inc:247
 #: purchasing/manage/suppliers.php:135 purchasing/manage/suppliers.php:136
 #: purchasing/manage/suppliers.php:138 reporting/rep501.php:90
-#: reporting/rep704.php:78 reporting/rep704.php:81 reporting/rep704.php:92
-#: reporting/rep704.php:94 reporting/rep704.php:102 reporting/rep705.php:245
+#: reporting/rep704.php:79 reporting/rep704.php:82 reporting/rep704.php:93
+#: reporting/rep704.php:95 reporting/rep704.php:103 reporting/rep705.php:245
 #: reporting/rep705.php:247 reporting/rep705.php:258 reporting/rep706.php:190
 #: reporting/rep706.php:192 reporting/rep706.php:200 reporting/rep707.php:214
-#: reporting/rep707.php:216 reporting/rep707.php:224 reporting/rep708.php:187
-#: reporting/rep708.php:189 reporting/rep708.php:196
+#: reporting/rep707.php:216 reporting/rep707.php:224 reporting/rep708.php:188
+#: reporting/rep708.php:190 reporting/rep708.php:197
 #: reporting/reports_main.php:264 reporting/reports_main.php:265
 #: reporting/reports_main.php:270 reporting/reports_main.php:271
 #: reporting/reports_main.php:278 reporting/reports_main.php:279
@@ -3257,8 +3262,8 @@ msgstr ""
 #: reporting/reports_main.php:325 reporting/reports_main.php:335
 #: reporting/reports_main.php:346 sales/customer_delivery.php:392
 #: sales/customer_delivery.php:400 sales/customer_invoice.php:401
-#: sales/customer_invoice.php:428 sales/manage/customers.php:234
-#: sales/manage/customers.php:236 sales/includes/ui/sales_credit_ui.inc:132
+#: sales/customer_invoice.php:428 sales/manage/customers.php:236
+#: sales/manage/customers.php:238 sales/includes/ui/sales_credit_ui.inc:132
 #: sales/includes/ui/sales_credit_ui.inc:137
 #: sales/includes/ui/sales_order_ui.inc:451
 #: sales/includes/ui/sales_order_ui.inc:456
@@ -3266,7 +3271,7 @@ msgid "Dimension"
 msgstr ""
 
 #: gl/accruals.php:98 gl/accruals.php:213
-#: gl/inquiry/gl_account_inquiry.php:140 gl/inquiry/gl_account_inquiry.php:142
+#: gl/inquiry/gl_account_inquiry.php:141 gl/inquiry/gl_account_inquiry.php:143
 #: gl/inquiry/journal_inquiry.php:126 gl/view/accrual_trans.php:60
 #: gl/view/gl_deposit_view.php:100 gl/view/gl_deposit_view.php:103
 #: gl/view/gl_deposit_view.php:106 gl/view/gl_payment_view.php:99
@@ -3348,10 +3353,11 @@ msgstr ""
 #: purchasing/includes/ui/invoice_ui.inc:247
 #: purchasing/includes/ui/invoice_ui.inc:249
 #: purchasing/view/view_supp_payment.php:60
-#: purchasing/view/view_supp_payment.php:69 reporting/rep102.php:243
-#: reporting/rep202.php:249 reporting/rep706.php:303 reporting/rep707.php:321
-#: reporting/rep710.php:76 reporting/includes/doctext.inc:152
-#: sales/view/view_receipt.php:44
+#: purchasing/view/view_supp_payment.php:69 reporting/rep102.php:241
+#: reporting/rep107.php:180 reporting/rep109.php:188 reporting/rep110.php:193
+#: reporting/rep111.php:175 reporting/rep113.php:182 reporting/rep202.php:249
+#: reporting/rep209.php:197 reporting/rep706.php:303 reporting/rep707.php:321
+#: reporting/rep710.php:76 sales/view/view_receipt.php:44
 msgid "Amount"
 msgstr ""
 
@@ -3399,7 +3405,7 @@ msgid "Reconcile this transaction"
 msgstr ""
 
 #: gl/bank_account_reconcile.php:166 gl/inquiry/bank_inquiry.php:47
-#: gl/inquiry/gl_account_inquiry.php:69
+#: gl/inquiry/gl_account_inquiry.php:70
 msgid "Account:"
 msgstr ""
 
@@ -3440,10 +3446,10 @@ msgid "Date of bank statement to reconcile"
 msgstr ""
 
 #: gl/bank_account_reconcile.php:239 gl/inquiry/bank_inquiry.php:71
-#: gl/inquiry/gl_account_inquiry.php:140 gl/inquiry/gl_account_inquiry.php:142
+#: gl/inquiry/gl_account_inquiry.php:141 gl/inquiry/gl_account_inquiry.php:143
 #: gl/view/accrual_trans.php:60 gl/view/gl_trans_view.php:36
-#: reporting/rep601.php:76 reporting/rep704.php:79 reporting/rep704.php:81
-#: reporting/rep704.php:84
+#: reporting/rep601.php:76 reporting/rep704.php:80 reporting/rep704.php:82
+#: reporting/rep704.php:85
 msgid "Person/Item"
 msgstr ""
 
@@ -3534,7 +3540,7 @@ msgstr ""
 #: purchasing/supplier_payment.php.orig:197 sales/credit_note_entry.php:147
 #: sales/customer_credit_invoice.php:102 sales/customer_delivery.php:163
 #: sales/customer_invoice.php:276 sales/customer_payments.php:106
-#: sales/customer_payments.php.orig:106 sales/sales_order_entry.php:405
+#: sales/customer_payments.php.orig:106 sales/sales_order_entry.php:403
 msgid "You must enter a reference."
 msgstr ""
 
@@ -3577,7 +3583,8 @@ msgstr ""
 
 #: gl/gl_bank.php:80 gl/gl_journal.php:61 inventory/adjustments.php:50
 #: manufacturing/work_order_entry.php:68 purchasing/po_entry_items.php:109
-#: purchasing/po_entry_items.php:133 purchasing/supplier_credit.php:49
+#: purchasing/po_entry_items.php:133 purchasing/po_entry_items.php.orig:109
+#: purchasing/po_entry_items.php.orig:133 purchasing/supplier_credit.php:49
 #: purchasing/supplier_invoice.php:52 sales/credit_note_entry.php:77
 #: sales/customer_credit_invoice.php:62 sales/customer_invoice.php:66
 #: sales/sales_order_entry.php:226
@@ -3685,13 +3692,13 @@ msgstr ""
 #: gl/gl_budget.php:91 gl/gl_budget.php:93 gl/inquiry/profit_loss.php:231
 #: gl/manage/gl_quick_entries.php:240 reporting/rep101.php:136
 #: reporting/rep105.php:116 reporting/rep106.php:90 reporting/rep114.php:88
-#: reporting/rep201.php:124 reporting/rep304.php:121 reporting/rep305.php:100
-#: reporting/rep601.php:82 reporting/rep702.php:57 reporting/rep704.php:90
-#: reporting/rep704.php:100 reporting/rep704.php:108 reporting/rep706.php:181
+#: reporting/rep201.php:124 reporting/rep304.php:120 reporting/rep305.php:100
+#: reporting/rep601.php:82 reporting/rep702.php:57 reporting/rep704.php:91
+#: reporting/rep704.php:101 reporting/rep704.php:109 reporting/rep706.php:181
 #: reporting/rep706.php:189 reporting/rep706.php:199 reporting/rep706.php:207
 #: reporting/rep707.php:206 reporting/rep707.php:213 reporting/rep707.php:223
-#: reporting/rep707.php:231 reporting/rep708.php:186 reporting/rep708.php:195
-#: reporting/rep708.php:202 reporting/rep709.php:104 reporting/rep710.php:83
+#: reporting/rep707.php:231 reporting/rep708.php:187 reporting/rep708.php:196
+#: reporting/rep708.php:203 reporting/rep709.php:104 reporting/rep710.php:83
 msgid "Period"
 msgstr ""
 
@@ -3705,7 +3712,7 @@ msgstr ""
 
 #: gl/gl_budget.php:127 gl/inquiry/balance_sheet.php:98
 #: gl/inquiry/balance_sheet.php:205 gl/inquiry/balance_sheet.php:236
-#: gl/inquiry/gl_trial_balance.php:209 gl/inquiry/profit_loss.php:115
+#: gl/inquiry/gl_trial_balance.php:210 gl/inquiry/profit_loss.php:115
 #: gl/inquiry/profit_loss.php:283 gl/view/gl_deposit_view.php:132
 #: gl/view/gl_payment_view.php:131 gl/view/gl_trans_view.php:106
 #: gl/includes/ui/gl_bank_ui.inc:182 gl/includes/ui/gl_bank_ui.inc.orig:182
@@ -3714,20 +3721,20 @@ msgstr ""
 #: inventory/includes/item_adjustments_ui.inc:102
 #: manufacturing/includes/manufacturing_ui.inc:178
 #: purchasing/includes/ui/invoice_ui.inc:309
-#: purchasing/includes/ui/invoice_ui.inc:473
-#: purchasing/includes/ui/invoice_ui.inc:543
+#: purchasing/includes/ui/invoice_ui.inc:474
+#: purchasing/includes/ui/invoice_ui.inc:544
 #: purchasing/po_receive_items.php:63 purchasing/view/view_po.php:140
 #: purchasing/allocations/supplier_allocation_main.php:100
 #: reporting/rep101.php:237 reporting/rep106.php:82 reporting/rep106.php:120
 #: reporting/rep106.php:168 reporting/rep114.php:156 reporting/rep201.php:221
 #: reporting/rep203.php:92 reporting/rep203.php:167 reporting/rep204.php:109
 #: reporting/rep204.php:137 reporting/rep301.php:126 reporting/rep301.php:163
-#: reporting/rep304.php:144 reporting/rep304.php:186 reporting/rep305.php:95
+#: reporting/rep304.php:143 reporting/rep304.php:185 reporting/rep305.php:95
 #: reporting/rep305.php:119 reporting/rep305.php:176 reporting/rep702.php:138
 #: reporting/rep705.php:152 reporting/rep705.php:309 reporting/rep706.php:106
 #: reporting/rep706.php:249 reporting/rep706.php:284 reporting/rep707.php:115
-#: reporting/rep707.php:291 reporting/rep708.php:234
-#: reporting/includes/doctext.inc:105 reporting/includes/doctext.inc:113
+#: reporting/rep707.php:291 reporting/rep708.php:235
+#: reporting/includes/doctext.inc:30 reporting/includes/doctext.inc:167
 #: sales/customer_credit_invoice.php:283 sales/customer_delivery.php:430
 #: sales/customer_invoice.php:449
 #: sales/allocations/customer_allocation_main.php:99
@@ -3858,39 +3865,39 @@ msgstr ""
 msgid "Bank Statement"
 msgstr ""
 
-#: gl/inquiry/bank_inquiry.php:78 gl/inquiry/gl_account_inquiry.php:161
-#: reporting/rep601.php:99 reporting/rep704.php:137
+#: gl/inquiry/bank_inquiry.php:78 gl/inquiry/gl_account_inquiry.php:162
+#: reporting/rep601.php:99 reporting/rep704.php:138
 msgid "Opening Balance"
 msgstr ""
 
-#: gl/inquiry/bank_inquiry.php:123 gl/inquiry/gl_account_inquiry.php:210
-#: gl/inquiry/gl_trial_balance.php:219 reporting/rep601.php:150
-#: reporting/rep704.php:185 reporting/rep708.php:243
+#: gl/inquiry/bank_inquiry.php:123 gl/inquiry/gl_account_inquiry.php:211
+#: gl/inquiry/gl_trial_balance.php:220 reporting/rep601.php:150
+#: reporting/rep704.php:186 reporting/rep708.php:244
 msgid "Ending Balance"
 msgstr ""
 
-#: gl/inquiry/gl_account_inquiry.php:30
+#: gl/inquiry/gl_account_inquiry.php:31
 msgid "General Ledger Inquiry"
 msgstr ""
 
-#: gl/inquiry/gl_account_inquiry.php:69
+#: gl/inquiry/gl_account_inquiry.php:70
 msgid "All Accounts"
 msgstr ""
 
-#: gl/inquiry/gl_account_inquiry.php:82
+#: gl/inquiry/gl_account_inquiry.php:83
 msgid "Amount min:"
 msgstr ""
 
-#: gl/inquiry/gl_account_inquiry.php:83
+#: gl/inquiry/gl_account_inquiry.php:84
 msgid "Amount max:"
 msgstr ""
 
-#: gl/inquiry/gl_account_inquiry.php:219
+#: gl/inquiry/gl_account_inquiry.php:220
 msgid ""
 "No general ledger transactions have been created for the specified criteria."
 msgstr ""
 
-#: gl/inquiry/gl_trial_balance.php:28 reporting/rep708.php:205
+#: gl/inquiry/gl_trial_balance.php:28 reporting/rep708.php:206
 msgid "Trial Balance"
 msgstr ""
 
@@ -3903,38 +3910,38 @@ msgstr ""
 msgid "Only balances"
 msgstr ""
 
-#: gl/inquiry/gl_trial_balance.php:89 gl/inquiry/gl_trial_balance.php:141
-#: reporting/rep706.php:302 reporting/rep707.php:320 reporting/rep708.php:50
-#: reporting/rep708.php:116 sales/create_recurrent_invoices.php:115
+#: gl/inquiry/gl_trial_balance.php:90 gl/inquiry/gl_trial_balance.php:142
+#: reporting/rep706.php:302 reporting/rep707.php:320 reporting/rep708.php:51
+#: reporting/rep708.php:117 sales/create_recurrent_invoices.php:115
 #: sales/manage/recurrent_invoices.php:102
 msgid "Group"
 msgstr ""
 
-#: gl/inquiry/gl_trial_balance.php:158
+#: gl/inquiry/gl_trial_balance.php:159
 msgid "The from date cannot be bigger than the fiscal year end."
 msgstr ""
 
-#: gl/inquiry/gl_trial_balance.php:171 gl/manage/bank_accounts.php:102
+#: gl/inquiry/gl_trial_balance.php:172 gl/manage/bank_accounts.php:107
 #: gl/view/gl_trans_view.php:63 gl/view/gl_trans_view.php:66
 #: gl/view/gl_trans_view.php:69 reporting/rep701.php:109
 #: reporting/rep702.php:51 reporting/rep705.php:234 reporting/rep706.php:181
-#: reporting/rep707.php:206 reporting/rep708.php:178
+#: reporting/rep707.php:206 reporting/rep708.php:179
 msgid "Account Name"
 msgstr ""
 
-#: gl/inquiry/gl_trial_balance.php:172 reporting/rep708.php:171
+#: gl/inquiry/gl_trial_balance.php:173 reporting/rep708.php:172
 msgid "Brought Forward"
 msgstr ""
 
-#: gl/inquiry/gl_trial_balance.php:173 reporting/rep708.php:171
+#: gl/inquiry/gl_trial_balance.php:174 reporting/rep708.php:172
 msgid "This Period"
 msgstr ""
 
-#: gl/inquiry/gl_trial_balance.php:192
+#: gl/inquiry/gl_trial_balance.php:193
 msgid "Class"
 msgstr ""
 
-#: gl/inquiry/gl_trial_balance.php:227 reporting/rep708.php:264
+#: gl/inquiry/gl_trial_balance.php:228 reporting/rep708.php:265
 msgid ""
 "The Opening Balance is not in balance, probably due to a non closed Previous "
 "Fiscalyear."
@@ -3970,17 +3977,17 @@ msgid "Profit & Loss Drilldown"
 msgstr ""
 
 #: gl/inquiry/profit_loss.php:168 reporting/rep707.php:206
-#: reporting/includes/reports_classes.inc:235
+#: reporting/includes/reports_classes.inc:234
 msgid "Accumulated"
 msgstr ""
 
 #: gl/inquiry/profit_loss.php:168 reporting/rep707.php:251
-#: reporting/includes/reports_classes.inc:235
+#: reporting/includes/reports_classes.inc:234
 msgid "Period Y-1"
 msgstr ""
 
 #: gl/inquiry/profit_loss.php:168 reporting/rep707.php:242
-#: reporting/includes/reports_classes.inc:235
+#: reporting/includes/reports_classes.inc:234
 msgid "Budget"
 msgstr ""
 
@@ -4041,31 +4048,35 @@ msgstr ""
 msgid "The bank account name cannot be empty."
 msgstr ""
 
-#: gl/manage/bank_accounts.php:47
+#: gl/manage/bank_accounts.php:39
+msgid "The GL account selected is already in use. Select another GL account."
+msgstr ""
+
+#: gl/manage/bank_accounts.php:52
 msgid "Bank account has been updated"
 msgstr ""
 
-#: gl/manage/bank_accounts.php:56
+#: gl/manage/bank_accounts.php:61
 msgid "New bank account has been added"
 msgstr ""
 
-#: gl/manage/bank_accounts.php:72
+#: gl/manage/bank_accounts.php:77
 msgid ""
 "Cannot delete this bank account because transactions have been created using "
 "this account."
 msgstr ""
 
-#: gl/manage/bank_accounts.php:78
+#: gl/manage/bank_accounts.php:83
 msgid ""
 "Cannot delete this bank account because POS definitions have been created "
 "using this account."
 msgstr ""
 
-#: gl/manage/bank_accounts.php:83
+#: gl/manage/bank_accounts.php:88
 msgid "Selected bank account has been deleted"
 msgstr ""
 
-#: gl/manage/bank_accounts.php:102 gl/view/bank_transfer_view.php:69
+#: gl/manage/bank_accounts.php:107 gl/view/bank_transfer_view.php:69
 #: gl/view/bank_transfer_view.php:78 gl/view/gl_deposit_view.php:66
 #: gl/view/gl_payment_view.php:64 inventory/prices.php:133
 #: inventory/purchasing_data.php:129 purchasing/view/view_supp_credit.php:49
@@ -4082,7 +4093,7 @@ msgstr ""
 #: purchasing/inquiry/supplier_inquiry.php.orig:180
 #: purchasing/allocations/supplier_allocation_main.php:99
 #: purchasing/allocations/supplier_allocation_main.php:107
-#: reporting/rep101.php:138 reporting/rep102.php:133 reporting/rep102.php:139
+#: reporting/rep101.php:138 reporting/rep102.php:131 reporting/rep102.php:137
 #: reporting/rep104.php:114 reporting/rep201.php:126 reporting/rep202.php:136
 #: reporting/rep203.php:99 sales/customer_credit_invoice.php:239
 #: sales/customer_delivery.php:337 sales/customer_invoice.php:398
@@ -4101,55 +4112,55 @@ msgstr ""
 msgid "Currency"
 msgstr ""
 
-#: gl/manage/bank_accounts.php:102
+#: gl/manage/bank_accounts.php:107
 msgid "GL Account"
 msgstr ""
 
-#: gl/manage/bank_accounts.php:103 reporting/includes/doctext.inc:79
+#: gl/manage/bank_accounts.php:108 reporting/includes/doctext.inc:244
 msgid "Bank"
 msgstr ""
 
-#: gl/manage/bank_accounts.php:103 includes/ui/ui_view.inc:488
+#: gl/manage/bank_accounts.php:108 includes/ui/ui_view.inc:488
 msgid "Number"
 msgstr ""
 
-#: gl/manage/bank_accounts.php:103
+#: gl/manage/bank_accounts.php:108
 msgid "Bank Address"
 msgstr ""
 
-#: gl/manage/bank_accounts.php:103
+#: gl/manage/bank_accounts.php:108
 msgid "Dflt"
 msgstr ""
 
-#: gl/manage/bank_accounts.php:159
+#: gl/manage/bank_accounts.php:164
 msgid "Bank Account Name:"
 msgstr ""
 
-#: gl/manage/bank_accounts.php:163 gl/manage/bank_accounts.php:167
+#: gl/manage/bank_accounts.php:168 gl/manage/bank_accounts.php:172
 msgid "Account Type:"
 msgstr ""
 
-#: gl/manage/bank_accounts.php:171 gl/manage/bank_accounts.php:175
+#: gl/manage/bank_accounts.php:176 gl/manage/bank_accounts.php:180
 msgid "Bank Account Currency:"
 msgstr ""
 
-#: gl/manage/bank_accounts.php:178
+#: gl/manage/bank_accounts.php:183
 msgid "Default currency account:"
 msgstr ""
 
-#: gl/manage/bank_accounts.php:181 gl/manage/bank_accounts.php:183
+#: gl/manage/bank_accounts.php:186 gl/manage/bank_accounts.php:188
 msgid "Bank Account GL Code:"
 msgstr ""
 
-#: gl/manage/bank_accounts.php:185
+#: gl/manage/bank_accounts.php:190
 msgid "Bank Name:"
 msgstr ""
 
-#: gl/manage/bank_accounts.php:186
+#: gl/manage/bank_accounts.php:191
 msgid "Bank Account Number:"
 msgstr ""
 
-#: gl/manage/bank_accounts.php:187
+#: gl/manage/bank_accounts.php:192
 msgid "Bank Address:"
 msgstr ""
 
@@ -4884,7 +4895,7 @@ msgstr ""
 #: inventory/includes/item_adjustments_ui.inc:88
 #: inventory/includes/stock_transfers_ui.inc:80
 #: manufacturing/includes/work_order_issue_ui.inc:59
-#: purchasing/includes/ui/invoice_ui.inc:519
+#: purchasing/includes/ui/invoice_ui.inc:520
 #: purchasing/includes/ui/po_ui.inc:267
 #: sales/includes/ui/sales_credit_ui.inc:198
 #: sales/includes/ui/sales_order_ui.inc:203
@@ -5514,22 +5525,22 @@ msgid ""
 "rate manually on Exchange Rates page."
 msgstr ""
 
-#: includes/current_user.inc:79
+#: includes/current_user.inc:87 includes/ldap.current_user.inc:96
 msgid ""
 "Before software upgrade you have to include old $security_groups and "
 "$security_headings arrays from old config.php file to the new one."
 msgstr ""
 
-#: includes/current_user.inc:80 includes/ui/ui_controls.inc:190
-#: includes/ui/ui_view.inc:826
+#: includes/current_user.inc:88 includes/ldap.current_user.inc:97
+#: includes/ui/ui_controls.inc:190 includes/ui/ui_view.inc:826
 msgid "Back"
 msgstr ""
 
-#: includes/current_user.inc:90
+#: includes/current_user.inc:98 includes/ldap.current_user.inc:107
 msgid "System is available for site admin only until full database upgrade"
 msgstr ""
 
-#: includes/current_user.inc:428
+#: includes/current_user.inc:436 includes/ldap.current_user.inc:544
 msgid "Requesting data..."
 msgstr ""
 
@@ -5591,51 +5602,51 @@ msgstr ""
 msgid "Package '%s' not found."
 msgstr ""
 
-#: includes/session.inc:39
+#: includes/session.inc:39 includes/session.inc.ldap.inc:39
 msgid "Incorrect Password"
 msgstr ""
 
-#: includes/session.inc:40
+#: includes/session.inc:40 includes/session.inc.ldap.inc:40
 msgid "The user and password combination is not valid for the system."
 msgstr ""
 
-#: includes/session.inc:42
+#: includes/session.inc:42 includes/session.inc.ldap.inc:42
 msgid ""
 "If you are not an authorized user, please contact your system administrator "
 "to obtain an account to enable you to use the system."
 msgstr ""
 
-#: includes/session.inc:43
+#: includes/session.inc:43 includes/session.inc.ldap.inc:43
 msgid "Try again"
 msgstr ""
 
-#: includes/session.inc:62
+#: includes/session.inc:62 includes/session.inc.ldap.inc:62
 msgid "Security settings have not been defined for your user account."
 msgstr ""
 
-#: includes/session.inc:63
+#: includes/session.inc:63 includes/session.inc.ldap.inc:63
 msgid "Please contact your system administrator."
 msgstr ""
 
-#: includes/session.inc:64
+#: includes/session.inc:64 includes/session.inc.ldap.inc:64
 msgid ""
 "Please remove $security_groups and $security_headings arrays from config.php "
 "file!"
 msgstr ""
 
-#: includes/session.inc:66
+#: includes/session.inc:66 includes/session.inc.ldap.inc:66
 msgid ""
 "Access to application has been blocked until database upgrade is completed "
 "by system administrator."
 msgstr ""
 
-#: includes/session.inc:80
+#: includes/session.inc:80 includes/session.inc.ldap.inc:80
 msgid ""
 "The security settings on your account do not permit you to access this "
 "function"
 msgstr ""
 
-#: includes/session.inc:89
+#: includes/session.inc:89 includes/session.inc.ldap.inc:89
 msgid ""
 "System is blocked after source upgrade until database is updated on System/"
 "Software Upgrade page"
@@ -5715,7 +5726,7 @@ msgstr ""
 msgid "Sales Order"
 msgstr ""
 
-#: includes/sysnames.inc:41 sales/sales_order_entry.php:615
+#: includes/sysnames.inc:41 sales/sales_order_entry.php:614
 msgid "Sales Quotation"
 msgstr ""
 
@@ -5839,9 +5850,9 @@ msgstr ""
 msgid "Cash"
 msgstr ""
 
-#: includes/sysnames.inc:96 reporting/rep101.php:137 reporting/rep102.php:125
-#: reporting/rep102.php:132 reporting/rep105.php:107 reporting/rep106.php:81
-#: reporting/rep114.php:93 reporting/rep304.php:114 reporting/rep304.php:124
+#: includes/sysnames.inc:96 reporting/rep101.php:137 reporting/rep102.php:123
+#: reporting/rep102.php:130 reporting/rep105.php:107 reporting/rep106.php:81
+#: reporting/rep114.php:93 reporting/rep304.php:113 reporting/rep304.php:123
 #: reporting/reports_main.php:32 reporting/reports_main.php:36
 #: reporting/reports_main.php:43 reporting/reports_main.php:108
 #: reporting/reports_main.php:202 sales/create_recurrent_invoices.php:115
@@ -6259,7 +6270,7 @@ msgstr ""
 #: reporting/reports_main.php:386 reporting/reports_main.php:393
 #: reporting/reports_main.php:400 reporting/includes/excel_report.inc:295
 #: reporting/includes/excel_report.inc:428
-#: reporting/includes/pdf_report.inc:346 reporting/includes/pdf_report.inc:617
+#: reporting/includes/pdf_report.inc:346 reporting/includes/pdf_report.inc:618
 #: sales/view/view_sales_order.php:85
 msgid "Comments"
 msgstr ""
@@ -6296,8 +6307,8 @@ msgstr ""
 msgid "Transaction Type"
 msgstr ""
 
-#: includes/ui/allocation_cart.inc:263 reporting/rep704.php:78
-#: reporting/rep704.php:81 reporting/rep704.php:84 reporting/rep709.php:109
+#: includes/ui/allocation_cart.inc:263 reporting/rep704.php:79
+#: reporting/rep704.php:82 reporting/rep704.php:85 reporting/rep709.php:109
 #: 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:218
@@ -6311,19 +6322,21 @@ msgid "Other Allocations"
 msgstr ""
 
 #: includes/ui/allocation_cart.inc:264 includes/ui/ui_view.inc:489
-#: reporting/includes/doctext.inc:110
+#: reporting/includes/doctext.inc:143 reporting/includes/doctext.inc:183
 msgid "This Allocation"
 msgstr ""
 
 #: includes/ui/allocation_cart.inc:264 includes/ui/allocation_cart.inc:311
 #: includes/ui/ui_view.inc:489
 #: purchasing/allocations/supplier_allocation_main.php:101
-#: reporting/includes/doctext.inc:110 reporting/includes/doctext.inc:168
+#: reporting/rep112.php:145 reporting/rep210.php:159
+#: reporting/includes/doctext.inc:143 reporting/includes/doctext.inc:183
 #: sales/allocations/customer_allocation_main.php:100
 msgid "Left to Allocate"
 msgstr ""
 
-#: includes/ui/allocation_cart.inc:294 reporting/includes/doctext.inc:167
+#: includes/ui/allocation_cart.inc:294 reporting/rep112.php:142
+#: reporting/rep210.php:156
 msgid "Total Allocated"
 msgstr ""
 
@@ -6350,7 +6363,7 @@ msgid "Sec Phone"
 msgstr ""
 
 #: includes/ui/contacts_view.inc:41 reporting/rep103.php:223
-#: reporting/includes/header2.inc:92 sales/manage/sales_people.php:99
+#: reporting/includes/header2.inc:104 sales/manage/sales_people.php:99
 msgid "Fax"
 msgstr ""
 
@@ -6513,7 +6526,7 @@ msgstr ""
 
 #: includes/ui/ui_input.inc:904 includes/ui/ui_lists.inc:2120
 #: reporting/rep301.php:148 reporting/rep302.php:166 reporting/rep303.php:170
-#: reporting/rep304.php:168 reporting/rep304.php:172
+#: reporting/rep304.php:167 reporting/rep304.php:171
 #: sales/manage/customer_branches.php:302
 msgid "Inactive"
 msgstr ""
@@ -6675,6 +6688,10 @@ msgstr ""
 msgid "Standard American COA (4 digit) with demo data"
 msgstr ""
 
+#: includes/ui/ui_lists.inc:2338
+msgid "No payment Link"
+msgstr ""
+
 #: includes/ui/ui_msgs.inc:63
 msgid "in units of : "
 msgstr ""
@@ -6683,14 +6700,16 @@ msgstr ""
 msgid "Date Voided:"
 msgstr ""
 
-#: includes/ui/ui_view.inc:407 reporting/rep107.php:175
-#: reporting/rep109.php:181 reporting/rep110.php:186 reporting/rep111.php:168
-#: reporting/rep113.php:175 reporting/rep209.php:190
+#: includes/ui/ui_view.inc:407 reporting/rep107.php:171
+#: reporting/rep109.php:179 reporting/rep110.php:184 reporting/rep111.php:166
+#: reporting/rep113.php:173 reporting/rep209.php:188
 msgid "Total Tax Excluded"
 msgstr ""
 
 #: includes/ui/ui_view.inc:413 includes/ui/ui_view.inc:432
-#: includes/ui/ui_view.inc:451 reporting/includes/doctext.inc:151
+#: includes/ui/ui_view.inc:451 reporting/rep107.php:180
+#: reporting/rep109.php:188 reporting/rep110.php:193 reporting/rep111.php:175
+#: reporting/rep113.php:182 reporting/rep209.php:197
 msgid "Included"
 msgstr ""
 
@@ -6699,7 +6718,8 @@ msgstr ""
 msgid "Allocations"
 msgstr ""
 
-#: includes/ui/ui_view.inc:488 reporting/includes/doctext.inc:110
+#: includes/ui/ui_view.inc:488 reporting/includes/doctext.inc:143
+#: reporting/includes/doctext.inc:183
 msgid "Total Amount"
 msgstr ""
 
@@ -6719,7 +6739,7 @@ msgstr ""
 msgid "No Quick Entry lines are defined."
 msgstr ""
 
-#: includes/ui/ui_view.inc:762 purchasing/includes/ui/invoice_ui.inc:451
+#: includes/ui/ui_view.inc:762 purchasing/includes/ui/invoice_ui.inc:452
 msgid "and"
 msgstr ""
 
@@ -6894,7 +6914,7 @@ msgid "Enter &Another Adjustment"
 msgstr ""
 
 #: inventory/adjustments.php:90 inventory/transfers.php:87
-#: sales/sales_order_entry.php:352
+#: sales/sales_order_entry.php:350
 msgid "You must enter at least one non empty item line."
 msgstr ""
 
@@ -6961,15 +6981,15 @@ msgstr ""
 msgid "Item:"
 msgstr ""
 
-#: inventory/cost_update.php:105
+#: inventory/cost_update.php:102
 msgid "Standard Material Cost Per Unit"
 msgstr ""
 
-#: inventory/cost_update.php:108
+#: inventory/cost_update.php:105
 msgid "Standard Labour Cost Per Unit"
 msgstr ""
 
-#: inventory/cost_update.php:109
+#: inventory/cost_update.php:106
 msgid "Standard Overhead Cost Per Unit"
 msgstr ""
 
@@ -7014,10 +7034,10 @@ msgid "Sales Type"
 msgstr ""
 
 #: inventory/prices.php:133 inventory/purchasing_data.php:129
-#: purchasing/includes/ui/invoice_ui.inc:483
+#: purchasing/includes/ui/invoice_ui.inc:484
 #: purchasing/po_receive_items.php:63 purchasing/view/view_grn.php:41
 #: purchasing/view/view_po.php:45 reporting/rep104.php:109
-#: reporting/includes/doctext.inc:105 reporting/includes/doctext.inc:113
+#: reporting/includes/doctext.inc:30 reporting/includes/doctext.inc:167
 #: sales/customer_credit_invoice.php:283 sales/customer_delivery.php:430
 #: sales/customer_invoice.php:449 sales/view/view_credit.php:91
 #: sales/view/view_dispatch.php:113 sales/view/view_invoice.php:114
@@ -7055,12 +7075,14 @@ msgid "Supplier Purchasing Data"
 msgstr ""
 
 #: inventory/purchasing_data.php:23 purchasing/po_entry_items.php:64
+#: purchasing/po_entry_items.php.orig:64
 msgid "There are no purchasable inventory items defined in the system."
 msgstr ""
 
 #: inventory/purchasing_data.php:24 purchasing/po_entry_items.php:62
-#: purchasing/supplier_credit.php:32 purchasing/supplier_invoice.php:32
-#: purchasing/supplier_payment.php:40 purchasing/supplier_payment.php.orig:40
+#: purchasing/po_entry_items.php.orig:62 purchasing/supplier_credit.php:32
+#: purchasing/supplier_invoice.php:32 purchasing/supplier_payment.php:40
+#: purchasing/supplier_payment.php.orig:40
 msgid "There are no suppliers defined in the system."
 msgstr ""
 
@@ -7142,7 +7164,7 @@ msgstr ""
 #: purchasing/inquiry/po_search_completed.php:129
 #: purchasing/inquiry/po_search.php:133 purchasing/inquiry/po_search.php:144
 #: reporting/rep105.php:118 reporting/rep301.php:106 reporting/rep302.php:130
-#: reporting/rep303.php:122 reporting/rep304.php:123
+#: reporting/rep303.php:122 reporting/rep304.php:122
 #: reporting/reports_main.php:179 reporting/reports_main.php:185
 #: reporting/reports_main.php:190 reporting/reports_main.php:201
 #: sales/manage/sales_points.php:84
@@ -7151,7 +7173,7 @@ msgstr ""
 
 #: inventory/reorder_level.php:57 inventory/inquiry/stock_movements.php:77
 #: inventory/inquiry/stock_status.php:69 purchasing/supplier_credit.php:203
-#: sales/sales_order_entry.php:493 sales/includes/ui/sales_order_ui.inc:175
+#: sales/sales_order_entry.php:492 sales/includes/ui/sales_order_ui.inc:175
 msgid "Quantity On Hand"
 msgstr ""
 
@@ -7230,8 +7252,8 @@ msgstr ""
 #: manufacturing/includes/work_order_issue_ui.inc:33
 #: purchasing/includes/ui/po_ui.inc:236 purchasing/po_receive_items.php:62
 #: purchasing/view/view_grn.php:40 purchasing/view/view_po.php:45
-#: reporting/includes/doctext.inc:104 reporting/includes/doctext.inc:107
-#: reporting/includes/doctext.inc:112 sales/customer_credit_invoice.php:282
+#: reporting/includes/doctext.inc:29 reporting/includes/doctext.inc:166
+#: reporting/includes/doctext.inc:203 sales/customer_credit_invoice.php:282
 #: sales/customer_delivery.php:428 sales/customer_invoice.php:448
 #: 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
@@ -7244,8 +7266,8 @@ msgstr ""
 #: inventory/includes/stock_transfers_ui.inc:60
 #: manufacturing/includes/work_order_issue_ui.inc:33
 #: purchasing/includes/ui/po_ui.inc:236 purchasing/view/view_grn.php:40
-#: purchasing/view/view_po.php:45 reporting/includes/doctext.inc:104
-#: reporting/includes/doctext.inc:107 reporting/includes/doctext.inc:112
+#: purchasing/view/view_po.php:45 reporting/includes/doctext.inc:29
+#: reporting/includes/doctext.inc:166 reporting/includes/doctext.inc:203
 #: sales/customer_credit_invoice.php:282 sales/customer_delivery.php:428
 #: sales/customer_invoice.php:448 sales/view/view_credit.php:90
 #: sales/view/view_dispatch.php:112 sales/view/view_invoice.php:113
@@ -7265,12 +7287,12 @@ msgstr ""
 #: manufacturing/includes/manufacturing_ui.inc:157
 #: manufacturing/includes/manufacturing_ui.inc:332
 #: manufacturing/includes/work_order_issue_ui.inc:33
-#: purchasing/includes/ui/invoice_ui.inc:483
+#: purchasing/includes/ui/invoice_ui.inc:484
 #: purchasing/includes/ui/po_ui.inc:236 purchasing/view/view_grn.php:40
 #: purchasing/view/view_po.php:45 reporting/rep301.php:100
 #: reporting/rep303.php:109 reporting/rep303.php:115 reporting/rep401.php:69
-#: reporting/includes/doctext.inc:49 reporting/includes/doctext.inc:105
-#: reporting/includes/doctext.inc:112 sales/view/view_credit.php:90
+#: reporting/includes/doctext.inc:29 reporting/includes/doctext.inc:167
+#: reporting/includes/doctext.inc:200 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
@@ -7283,8 +7305,8 @@ msgstr ""
 #: inventory/manage/item_units.php:94
 #: manufacturing/includes/work_order_issue_ui.inc:34
 #: purchasing/includes/ui/po_ui.inc:237 purchasing/view/view_grn.php:41
-#: purchasing/view/view_po.php:45 reporting/includes/doctext.inc:105
-#: reporting/includes/doctext.inc:113 sales/view/view_credit.php:91
+#: purchasing/view/view_po.php:45 reporting/includes/doctext.inc:30
+#: reporting/includes/doctext.inc:167 sales/view/view_credit.php:91
 #: 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
@@ -7348,7 +7370,7 @@ msgid "Show Movements"
 msgstr ""
 
 #: inventory/inquiry/stock_movements.php:61
-#: purchasing/includes/ui/invoice_ui.inc:452
+#: purchasing/includes/ui/invoice_ui.inc:453
 #: purchasing/inquiry/supplier_allocation_inquiry.php:57
 #: purchasing/inquiry/supplier_inquiry.php:54
 #: purchasing/inquiry/supplier_inquiry.php.orig:54
@@ -7484,7 +7506,7 @@ msgstr ""
 msgid "Foreign Item Codes"
 msgstr ""
 
-#: inventory/manage/item_codes.php:23 sales/sales_order_entry.php:660
+#: inventory/manage/item_codes.php:23 sales/sales_order_entry.php:659
 msgid "There are no inventory items defined in the system."
 msgstr ""
 
@@ -7520,7 +7542,7 @@ msgstr ""
 #: inventory/manage/item_codes.php:125 reporting/rep104.php:115
 #: reporting/rep105.php:117 reporting/rep301.php:100 reporting/rep301.php:105
 #: reporting/rep302.php:122 reporting/rep302.php:129 reporting/rep303.php:121
-#: reporting/rep304.php:114 reporting/rep304.php:122
+#: reporting/rep304.php:113 reporting/rep304.php:121
 msgid "Category"
 msgstr ""
 
@@ -7605,8 +7627,8 @@ msgstr ""
 #: manufacturing/search_work_orders.php:163
 #: manufacturing/view/wo_issue_view.php:44
 #: manufacturing/view/wo_production_view.php:45
-#: purchasing/includes/ui/invoice_ui.inc:470
-#: purchasing/includes/ui/invoice_ui.inc:482 reporting/rep204.php:82
+#: purchasing/includes/ui/invoice_ui.inc:471
+#: purchasing/includes/ui/invoice_ui.inc:483 reporting/rep204.php:82
 msgid "Item"
 msgstr ""
 
@@ -7927,7 +7949,7 @@ msgstr ""
 #: inventory/view/view_transfer.php:40 manufacturing/view/wo_issue_view.php:44
 #: manufacturing/includes/manufacturing_ui.inc:29
 #: manufacturing/includes/manufacturing_ui.inc:83
-#: reporting/includes/doctext.inc:108
+#: reporting/includes/doctext.inc:204
 msgid "From Location"
 msgstr ""
 
@@ -7983,7 +8005,7 @@ msgstr ""
 #: manufacturing/search_work_orders.php:167
 #: manufacturing/includes/manufacturing_ui.inc:277
 #: manufacturing/includes/manufacturing_ui.inc:281
-#: reporting/includes/doctext.inc:46 sales/inquiry/sales_orders_view.php:259
+#: reporting/includes/doctext.inc:202 sales/inquiry/sales_orders_view.php:259
 msgid "Required By"
 msgstr ""
 
@@ -8424,7 +8446,7 @@ msgstr ""
 #: manufacturing/manage/bom_edit.php:71
 #: manufacturing/includes/manufacturing_ui.inc:28
 #: manufacturing/includes/manufacturing_ui.inc:83
-#: reporting/includes/doctext.inc:108
+#: reporting/includes/doctext.inc:204
 msgid "Work Centre"
 msgstr ""
 
@@ -8527,17 +8549,17 @@ msgid "There are no Requirements for this Order."
 msgstr ""
 
 #: manufacturing/includes/manufacturing_ui.inc:84
-#: reporting/includes/doctext.inc:108
+#: reporting/includes/doctext.inc:204
 msgid "Unit Quantity"
 msgstr ""
 
 #: manufacturing/includes/manufacturing_ui.inc:84
-#: reporting/includes/doctext.inc:108
+#: reporting/includes/doctext.inc:204
 msgid "Total Quantity"
 msgstr ""
 
 #: manufacturing/includes/manufacturing_ui.inc:84
-#: reporting/includes/doctext.inc:108
+#: reporting/includes/doctext.inc:204
 msgid "Units Issued"
 msgstr ""
 
@@ -8569,14 +8591,14 @@ msgstr ""
 #: manufacturing/includes/manufacturing_ui.inc:276
 #: manufacturing/includes/manufacturing_ui.inc:280
 #: manufacturing/includes/manufacturing_ui.inc:331
-#: reporting/includes/doctext.inc:45
+#: reporting/includes/doctext.inc:198
 msgid "Manufactured Item"
 msgstr ""
 
 #: manufacturing/includes/manufacturing_ui.inc:277
 #: manufacturing/includes/manufacturing_ui.inc:281
 #: manufacturing/includes/manufacturing_ui.inc:332
-#: reporting/includes/doctext.inc:48
+#: reporting/includes/doctext.inc:199
 msgid "Into Location"
 msgstr ""
 
@@ -8768,116 +8790,116 @@ msgstr ""
 msgid "Quick Entry:"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:391
+#: purchasing/includes/ui/invoice_ui.inc:392
 msgid "Add to Invoice"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:393
+#: purchasing/includes/ui/invoice_ui.inc:394
 msgid "Add to Credit Note"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:395 sales/customer_invoice.php:503
+#: purchasing/includes/ui/invoice_ui.inc:396 sales/customer_invoice.php:503
 msgid "Remove"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:395
-#: purchasing/includes/ui/invoice_ui.inc:430
+#: purchasing/includes/ui/invoice_ui.inc:396
+#: purchasing/includes/ui/invoice_ui.inc:431
 msgid ""
 "WARNING! Be careful with removal. The operation is executed immediately and "
 "cannot be undone !!!"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:397
+#: purchasing/includes/ui/invoice_ui.inc:398
 msgid ""
 "You are about to remove all yet non-invoiced items from selected delivery "
 "line. This operation also irreversibly changes related order line. Do you "
 "want to continue ?"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:428
+#: purchasing/includes/ui/invoice_ui.inc:429
 msgid "Items Received Yet to be Invoiced"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:433
+#: purchasing/includes/ui/invoice_ui.inc:434
 msgid "Delivery Item Selected For Adding To A Supplier Credit Note"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:438
+#: purchasing/includes/ui/invoice_ui.inc:439
 msgid "Received Items Charged on this Invoice"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:440
+#: purchasing/includes/ui/invoice_ui.inc:441
 msgid "Received Items Credited on this Note"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:450
+#: purchasing/includes/ui/invoice_ui.inc:451
 msgid "Received between"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:461
+#: purchasing/includes/ui/invoice_ui.inc:462
 msgid "Add All Items"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:470
-#: purchasing/includes/ui/invoice_ui.inc:482
+#: purchasing/includes/ui/invoice_ui.inc:471
+#: purchasing/includes/ui/invoice_ui.inc:483
 #: sales/inquiry/sales_orders_view.php:150
 msgid "Delivery"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:470
+#: purchasing/includes/ui/invoice_ui.inc:471
 msgid "P.O."
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:471
+#: purchasing/includes/ui/invoice_ui.inc:472
 msgid "Received On"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:471 purchasing/view/view_po.php:46
+#: purchasing/includes/ui/invoice_ui.inc:472 purchasing/view/view_po.php:46
 msgid "Quantity Received"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:471 purchasing/view/view_grn.php:41
+#: purchasing/includes/ui/invoice_ui.inc:472 purchasing/view/view_grn.php:41
 #: purchasing/view/view_po.php:46
 msgid "Quantity Invoiced"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:472
+#: purchasing/includes/ui/invoice_ui.inc:473
 msgid "Qty Yet To Invoice"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:472
+#: purchasing/includes/ui/invoice_ui.inc:473
 #: purchasing/includes/ui/po_ui.inc:238
 #: sales/includes/ui/sales_order_ui.inc:142
 msgid "Price after Tax"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:472
+#: purchasing/includes/ui/invoice_ui.inc:473
 #: purchasing/includes/ui/po_ui.inc:238
 #: sales/includes/ui/sales_order_ui.inc:142
 msgid "Price before Tax"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:478
+#: purchasing/includes/ui/invoice_ui.inc:479
 msgid "Qty Yet To Credit"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:483
+#: purchasing/includes/ui/invoice_ui.inc:484
 msgid "Line Value"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:550
+#: purchasing/includes/ui/invoice_ui.inc:551
 msgid ""
 "There are no outstanding items received from this supplier that have not "
 "been invoiced by them."
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:553
+#: purchasing/includes/ui/invoice_ui.inc:554
 msgid ""
 "There are no received items for the selected supplier that have been "
 "invoiced."
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:554
+#: purchasing/includes/ui/invoice_ui.inc:555
 msgid "Credits can only be applied to invoiced items."
 msgstr ""
 
@@ -8885,15 +8907,15 @@ msgstr ""
 msgid "Supplier Currency:"
 msgstr ""
 
-#: purchasing/includes/ui/po_ui.inc:178 sales/sales_order_entry.php:684
+#: purchasing/includes/ui/po_ui.inc:178 sales/sales_order_entry.php:683
 msgid "Order Date:"
 msgstr ""
 
-#: purchasing/includes/ui/po_ui.inc:179 sales/sales_order_entry.php:671
+#: purchasing/includes/ui/po_ui.inc:179 sales/sales_order_entry.php:670
 msgid "Delivery Date:"
 msgstr ""
 
-#: purchasing/includes/ui/po_ui.inc:179 sales/sales_order_entry.php:665
+#: purchasing/includes/ui/po_ui.inc:179 sales/sales_order_entry.php:664
 msgid "Invoice Date:"
 msgstr ""
 
@@ -8938,10 +8960,11 @@ msgid "Line Total"
 msgstr ""
 
 #: purchasing/includes/ui/po_ui.inc:289 purchasing/po_receive_items.php:114
-#: reporting/includes/doctext.inc:149 sales/customer_credit_invoice.php:324
-#: sales/customer_delivery.php:498 sales/customer_invoice.php:544
-#: sales/view/view_dispatch.php:146 sales/view/view_invoice.php:148
-#: sales/includes/ui/sales_credit_ui.inc:217
+#: reporting/rep107.php:146 reporting/rep109.php:148 reporting/rep110.php:159
+#: reporting/rep111.php:135 reporting/rep113.php:148 reporting/rep209.php:167
+#: sales/customer_credit_invoice.php:324 sales/customer_delivery.php:498
+#: sales/customer_invoice.php:544 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:229
 msgid "Sub-total"
 msgstr ""
@@ -8960,229 +8983,244 @@ msgstr ""
 msgid "Refresh"
 msgstr ""
 
-#: purchasing/po_entry_items.php:38
+#: purchasing/po_entry_items.php:38 purchasing/po_entry_items.php.orig:38
 msgid "Modify Purchase Order #"
 msgstr ""
 
-#: purchasing/po_entry_items.php:43
+#: purchasing/po_entry_items.php:43 purchasing/po_entry_items.php.orig:43
 msgid "Purchase Order Entry"
 msgstr ""
 
-#: purchasing/po_entry_items.php:48
+#: purchasing/po_entry_items.php:48 purchasing/po_entry_items.php.orig:48
 msgid "Direct GRN Entry"
 msgstr ""
 
-#: purchasing/po_entry_items.php:53
+#: purchasing/po_entry_items.php:53 purchasing/po_entry_items.php.orig:53
 msgid "Direct Purchase Invoice Entry"
 msgstr ""
 
-#: purchasing/po_entry_items.php:74
+#: purchasing/po_entry_items.php:74 purchasing/po_entry_items.php.orig:74
 msgid "Purchase Order has been entered"
 msgstr ""
 
-#: purchasing/po_entry_items.php:76
+#: purchasing/po_entry_items.php:76 purchasing/po_entry_items.php.orig:76
 msgid "Purchase Order has been updated"
 msgstr ""
 
-#: purchasing/po_entry_items.php:77
+#: purchasing/po_entry_items.php:77 purchasing/po_entry_items.php.orig:77
 msgid "&View this order"
 msgstr ""
 
-#: purchasing/po_entry_items.php:79 sales/sales_order_entry.php:105
-#: sales/sales_order_entry.php:125
+#: purchasing/po_entry_items.php:79 purchasing/po_entry_items.php.orig:79
+#: sales/sales_order_entry.php:105 sales/sales_order_entry.php:125
 msgid "&Print This Order"
 msgstr ""
 
-#: purchasing/po_entry_items.php:81 sales/sales_order_entry.php:106
-#: sales/sales_order_entry.php:126
+#: purchasing/po_entry_items.php:81 purchasing/po_entry_items.php.orig:81
+#: sales/sales_order_entry.php:106 sales/sales_order_entry.php:126
 msgid "&Email This Order"
 msgstr ""
 
-#: purchasing/po_entry_items.php:83
+#: purchasing/po_entry_items.php:83 purchasing/po_entry_items.php.orig:83
 msgid "&Receive Items on this Purchase Order"
 msgstr ""
 
-#: purchasing/po_entry_items.php:85
+#: purchasing/po_entry_items.php:85 purchasing/po_entry_items.php.orig:85
 msgid "Enter &Another Purchase Order"
 msgstr ""
 
-#: purchasing/po_entry_items.php:87
+#: purchasing/po_entry_items.php:87 purchasing/po_entry_items.php.orig:87
 msgid "Select An &Outstanding Purchase Order"
 msgstr ""
 
-#: purchasing/po_entry_items.php:96
+#: purchasing/po_entry_items.php:96 purchasing/po_entry_items.php.orig:96
 msgid "Direct GRN has been entered"
 msgstr ""
 
-#: purchasing/po_entry_items.php:98
+#: purchasing/po_entry_items.php:98 purchasing/po_entry_items.php.orig:98
 msgid "&View this GRN"
 msgstr ""
 
-#: purchasing/po_entry_items.php:102 purchasing/po_receive_items.php:40
+#: purchasing/po_entry_items.php:102 purchasing/po_entry_items.php.orig:102
+#: purchasing/po_receive_items.php:40
 msgid "View the GL Journal Entries for this Delivery"
 msgstr ""
 
-#: purchasing/po_entry_items.php:107 purchasing/po_receive_items.php:42
+#: purchasing/po_entry_items.php:107 purchasing/po_entry_items.php.orig:107
+#: purchasing/po_receive_items.php:42
 msgid "Entry purchase &invoice for this receival"
 msgstr ""
 
-#: purchasing/po_entry_items.php:112
+#: purchasing/po_entry_items.php:112 purchasing/po_entry_items.php.orig:112
 msgid "Enter &Another GRN"
 msgstr ""
 
-#: purchasing/po_entry_items.php:121
+#: purchasing/po_entry_items.php:121 purchasing/po_entry_items.php.orig:121
 msgid "Direct Purchase Invoice has been entered"
 msgstr ""
 
-#: purchasing/po_entry_items.php:123
+#: purchasing/po_entry_items.php:123 purchasing/po_entry_items.php.orig:123
 msgid "&View this Invoice"
 msgstr ""
 
-#: purchasing/po_entry_items.php:128 purchasing/supplier_invoice.php:46
+#: purchasing/po_entry_items.php:128 purchasing/po_entry_items.php.orig:128
+#: purchasing/supplier_invoice.php:46
 msgid "View the GL Journal Entries for this Invoice"
 msgstr ""
 
-#: purchasing/po_entry_items.php:130 purchasing/supplier_invoice.php:48
+#: purchasing/po_entry_items.php:130 purchasing/po_entry_items.php.orig:130
+#: purchasing/supplier_invoice.php:48
 msgid "Entry supplier &payment for this invoice"
 msgstr ""
 
-#: purchasing/po_entry_items.php:136
+#: purchasing/po_entry_items.php:136 purchasing/po_entry_items.php.orig:136
 msgid "Enter &Another Direct Invoice"
 msgstr ""
 
-#: purchasing/po_entry_items.php:168
+#: purchasing/po_entry_items.php:168 purchasing/po_entry_items.php.orig:168
 msgid ""
 "This item cannot be deleted because some of it has already been received."
 msgstr ""
 
-#: purchasing/po_entry_items.php:183
+#: purchasing/po_entry_items.php:183 purchasing/po_entry_items.php.orig:183
 msgid ""
 "This order cannot be cancelled because some of it has already been received."
 msgstr ""
 
-#: purchasing/po_entry_items.php:184
+#: purchasing/po_entry_items.php:184 purchasing/po_entry_items.php.orig:184
 msgid ""
 "The line item quantities may be modified to quantities more than already "
 "received. prices cannot be altered for lines that have already been received "
 "and quantities cannot be reduced below the quantity already received."
 msgstr ""
 
-#: purchasing/po_entry_items.php:199
+#: purchasing/po_entry_items.php:199 purchasing/po_entry_items.php.orig:199
 msgid "This purchase order has been cancelled."
 msgstr ""
 
-#: purchasing/po_entry_items.php:201
+#: purchasing/po_entry_items.php:201 purchasing/po_entry_items.php.orig:201
 msgid "Enter a new purchase order"
 msgstr ""
 
-#: purchasing/po_entry_items.php:213 sales/sales_order_entry.php:465
+#: purchasing/po_entry_items.php:213 purchasing/po_entry_items.php.orig:213
+#: sales/sales_order_entry.php:464
 msgid "Item description cannot be empty."
 msgstr ""
 
-#: purchasing/po_entry_items.php:223
+#: purchasing/po_entry_items.php:223 purchasing/po_entry_items.php.orig:223
 msgid "The quantity of the order item must be numeric and not less than "
 msgstr ""
 
-#: purchasing/po_entry_items.php:230
+#: purchasing/po_entry_items.php:230 purchasing/po_entry_items.php.orig:230
 msgid "The price entered must be numeric and not less than zero."
 msgstr ""
 
-#: purchasing/po_entry_items.php:254
+#: purchasing/po_entry_items.php:254 purchasing/po_entry_items.php.orig:254
 msgid ""
 "You are attempting to make the quantity ordered a quantity less than has "
 "already been invoiced or received.  This is prohibited."
 msgstr ""
 
-#: purchasing/po_entry_items.php:255
+#: purchasing/po_entry_items.php:255 purchasing/po_entry_items.php.orig:255
 msgid ""
 "The quantity received can only be modified by entering a negative receipt "
 "and the quantity invoiced can only be reduced by entering a credit note "
 "against this item."
 msgstr ""
 
-#: purchasing/po_entry_items.php:283
+#: purchasing/po_entry_items.php:283 purchasing/po_entry_items.php.orig:283
 msgid "The selected item is already on this order."
 msgstr ""
 
-#: purchasing/po_entry_items.php:310
+#: purchasing/po_entry_items.php:310 purchasing/po_entry_items.php.orig:310
 msgid ""
 "The selected item does not exist or it is a kit part and therefore cannot be "
 "purchased."
 msgstr ""
 
-#: purchasing/po_entry_items.php:326 purchasing/supplier_invoice.php:343
-#: purchasing/supplier_payment.php:117
+#: purchasing/po_entry_items.php:326 purchasing/po_entry_items.php.orig:326
+#: purchasing/supplier_invoice.php:343 purchasing/supplier_payment.php:117
 #: purchasing/supplier_payment.php.orig:114
 msgid "There is no supplier selected."
 msgstr ""
 
-#: purchasing/po_entry_items.php:333
+#: purchasing/po_entry_items.php:333 purchasing/po_entry_items.php.orig:333
 msgid "The entered order date is invalid."
 msgstr ""
 
-#: purchasing/po_entry_items.php:340 purchasing/po_receive_items.php:181
-#: sales/sales_order_entry.php:347
+#: purchasing/po_entry_items.php:340 purchasing/po_entry_items.php.orig:340
+#: purchasing/po_receive_items.php:181 sales/sales_order_entry.php:345
 msgid "The entered date is not in fiscal year"
 msgstr ""
 
-#: purchasing/po_entry_items.php:347
+#: purchasing/po_entry_items.php:347 purchasing/po_entry_items.php.orig:347
 msgid "The entered due date is invalid."
 msgstr ""
 
-#: purchasing/po_entry_items.php:356
+#: purchasing/po_entry_items.php:356 purchasing/po_entry_items.php.orig:356
 msgid "There is no reference entered for this purchase order."
 msgstr ""
 
-#: purchasing/po_entry_items.php:371 purchasing/supplier_invoice.php:161
+#: purchasing/po_entry_items.php:371 purchasing/po_entry_items.php.orig:371
+#: purchasing/supplier_invoice.php:161
 msgid "You must enter a supplier's invoice reference."
 msgstr ""
 
-#: purchasing/po_entry_items.php:377
+#: purchasing/po_entry_items.php:378 purchasing/supplier_invoice.php:187
+msgid ""
+"This invoice number has already been entered. It cannot be entered again."
+msgstr ""
+
+#: purchasing/po_entry_items.php:384 purchasing/po_entry_items.php.orig:377
 msgid "There is no delivery address specified."
 msgstr ""
 
-#: purchasing/po_entry_items.php:383
+#: purchasing/po_entry_items.php:390 purchasing/po_entry_items.php.orig:383
 msgid "There is no location specified to move any items into."
 msgstr ""
 
-#: purchasing/po_entry_items.php:390
+#: purchasing/po_entry_items.php:397 purchasing/po_entry_items.php.orig:390
 msgid ""
 "The order cannot be placed because there are no lines entered on this order."
 msgstr ""
 
-#: purchasing/po_entry_items.php:516 sales/sales_order_entry.php:688
+#: purchasing/po_entry_items.php:523 purchasing/po_entry_items.php.orig:516
+#: sales/sales_order_entry.php:687
 msgid "Place Order"
 msgstr ""
 
-#: purchasing/po_entry_items.php:517
+#: purchasing/po_entry_items.php:524 purchasing/po_entry_items.php.orig:517
 msgid "Update Order"
 msgstr ""
 
-#: purchasing/po_entry_items.php:518 sales/sales_order_entry.php:687
+#: purchasing/po_entry_items.php:525 purchasing/po_entry_items.php.orig:518
+#: sales/sales_order_entry.php:686
 msgid "Cancel Order"
 msgstr ""
 
-#: purchasing/po_entry_items.php:520
+#: purchasing/po_entry_items.php:527 purchasing/po_entry_items.php.orig:520
 msgid "Process GRN"
 msgstr ""
 
-#: purchasing/po_entry_items.php:521
+#: purchasing/po_entry_items.php:528 purchasing/po_entry_items.php.orig:521
 msgid "Update GRN"
 msgstr ""
 
-#: purchasing/po_entry_items.php:522
+#: purchasing/po_entry_items.php:529 purchasing/po_entry_items.php.orig:522
 msgid "Cancel GRN"
 msgstr ""
 
-#: purchasing/po_entry_items.php:525 sales/customer_invoice.php:563
+#: purchasing/po_entry_items.php:532 purchasing/po_entry_items.php.orig:525
+#: sales/customer_invoice.php:563
 msgid "Process Invoice"
 msgstr ""
 
-#: purchasing/po_entry_items.php:526
+#: purchasing/po_entry_items.php:533 purchasing/po_entry_items.php.orig:526
 msgid "Update Invoice"
 msgstr ""
 
-#: purchasing/po_entry_items.php:527 sales/sales_order_entry.php:668
+#: purchasing/po_entry_items.php:534 purchasing/po_entry_items.php.orig:527
+#: sales/sales_order_entry.php:667
 msgid "Cancel Invoice"
 msgstr ""
 
@@ -9215,7 +9253,7 @@ msgstr ""
 
 #: purchasing/po_receive_items.php:63 reporting/rep101.php:131
 #: reporting/rep105.php:113 reporting/rep105.php:167 reporting/rep201.php:119
-#: reporting/includes/doctext.inc:119
+#: reporting/includes/doctext.inc:222
 msgid "Outstanding"
 msgstr ""
 
@@ -9375,11 +9413,6 @@ msgid ""
 "incorrect format."
 msgstr ""
 
-#: purchasing/supplier_invoice.php:187
-msgid ""
-"This invoice number has already been entered. It cannot be entered again."
-msgstr ""
-
 #: purchasing/supplier_invoice.php:224
 msgid "The quantity to invoice must be numeric and greater than zero."
 msgstr ""
@@ -9514,8 +9547,8 @@ msgstr ""
 msgid "Line Details"
 msgstr ""
 
-#: purchasing/view/view_grn.php:40 reporting/includes/doctext.inc:36
-#: reporting/includes/doctext.inc:105
+#: purchasing/view/view_grn.php:40 reporting/includes/doctext.inc:63
+#: reporting/includes/doctext.inc:167 reporting/includes/doctext.inc:219
 #: sales/inquiry/sales_deliveries_view.php:186
 msgid "Delivery Date"
 msgstr ""
@@ -9597,7 +9630,7 @@ msgstr ""
 msgid "SUPPLIER INVOICE"
 msgstr ""
 
-#: purchasing/view/view_supp_invoice.php:72 reporting/includes/doctext.inc:153
+#: purchasing/view/view_supp_invoice.php:72 reporting/rep107.php:194
 #: sales/view/view_invoice.php:164
 msgid "TOTAL INVOICE"
 msgstr ""
@@ -9668,11 +9701,11 @@ msgstr ""
 msgid "Bank Name/Account:"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:113 sales/manage/customers.php:228
+#: purchasing/manage/suppliers.php:113 sales/manage/customers.php:230
 msgid "Credit Limit:"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:114 sales/manage/customers.php:230
+#: purchasing/manage/suppliers.php:114 sales/manage/customers.php:232
 msgid "Payment Terms:"
 msgstr ""
 
@@ -9680,8 +9713,8 @@ msgstr ""
 msgid "Prices contain tax included:"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:125 reporting/rep704.php:91
-#: reporting/rep704.php:101 reporting/rep704.php:109
+#: purchasing/manage/suppliers.php:125 reporting/rep704.php:92
+#: reporting/rep704.php:102 reporting/rep704.php:110
 msgid "Accounts"
 msgstr ""
 
@@ -9714,7 +9747,7 @@ msgid "General"
 msgstr ""
 
 #: purchasing/manage/suppliers.php:151 sales/manage/customer_branches.php:269
-#: sales/manage/customers.php:251
+#: sales/manage/customers.php:253
 msgid "General Notes:"
 msgstr ""
 
@@ -9784,12 +9817,12 @@ msgid "New supplier"
 msgstr ""
 
 #: purchasing/manage/suppliers.php:298 sales/manage/customer_branches.php:322
-#: sales/manage/customers.php:300
+#: sales/manage/customers.php:302
 msgid "&General settings"
 msgstr ""
 
 #: purchasing/manage/suppliers.php:299 sales/manage/customer_branches.php:323
-#: sales/manage/customers.php:301
+#: sales/manage/customers.php:303
 msgid "&Contacts"
 msgstr ""
 
@@ -9847,7 +9880,7 @@ msgstr ""
 
 #: purchasing/inquiry/supplier_allocation_inquiry.php:135
 #: reporting/rep101.php:131 reporting/rep201.php:119
-#: reporting/includes/doctext.inc:119
+#: reporting/includes/doctext.inc:222
 #: sales/inquiry/customer_allocation_inquiry.php:151
 msgid "Allocated"
 msgstr ""
@@ -9867,12 +9900,12 @@ msgstr ""
 #: purchasing/inquiry/supplier_inquiry.php:68
 #: purchasing/inquiry/supplier_inquiry.php.orig:66
 #: purchasing/inquiry/supplier_inquiry.php.orig:67
-#: purchasing/inquiry/supplier_inquiry.php.orig:68 reporting/rep102.php:120
-#: reporting/rep102.php:121 reporting/rep102.php:122 reporting/rep102.php:242
+#: purchasing/inquiry/supplier_inquiry.php.orig:68 reporting/rep102.php:118
+#: reporting/rep102.php:119 reporting/rep102.php:120 reporting/rep102.php:240
+#: reporting/rep108.php:150 reporting/rep108.php:151 reporting/rep108.php:152
 #: reporting/rep202.php:122 reporting/rep202.php:123 reporting/rep202.php:124
 #: reporting/rep202.php:154 reporting/rep202.php:155 reporting/rep202.php:156
-#: reporting/rep202.php:248 reporting/includes/doctext.inc:181
-#: sales/create_recurrent_invoices.php:115
+#: reporting/rep202.php:248 sales/create_recurrent_invoices.php:115
 #: sales/manage/recurrent_invoices.php:102
 #: sales/inquiry/customer_inquiry.php:71 sales/inquiry/customer_inquiry.php:72
 #: sales/inquiry/customer_inquiry.php:73
@@ -9880,9 +9913,9 @@ msgid "Days"
 msgstr ""
 
 #: purchasing/inquiry/supplier_inquiry.php:68
-#: purchasing/inquiry/supplier_inquiry.php.orig:68 reporting/rep102.php:122
-#: reporting/rep202.php:124 reporting/rep202.php:156
-#: reporting/includes/doctext.inc:182 sales/inquiry/customer_inquiry.php:73
+#: purchasing/inquiry/supplier_inquiry.php.orig:68 reporting/rep102.php:120
+#: reporting/rep108.php:152 reporting/rep202.php:124 reporting/rep202.php:156
+#: sales/inquiry/customer_inquiry.php:73
 msgid "Over"
 msgstr ""
 
@@ -9893,15 +9926,15 @@ msgid "Terms"
 msgstr ""
 
 #: purchasing/inquiry/supplier_inquiry.php:72
-#: purchasing/inquiry/supplier_inquiry.php.orig:72 reporting/rep102.php:125
-#: reporting/rep102.php:240 reporting/rep202.php:128 reporting/rep202.php:246
-#: reporting/includes/doctext.inc:177 sales/inquiry/customer_inquiry.php:76
+#: purchasing/inquiry/supplier_inquiry.php.orig:72 reporting/rep102.php:123
+#: reporting/rep102.php:238 reporting/rep108.php:154 reporting/rep202.php:128
+#: reporting/rep202.php:246 sales/inquiry/customer_inquiry.php:76
 msgid "Current"
 msgstr ""
 
 #: purchasing/inquiry/supplier_inquiry.php:73
-#: purchasing/inquiry/supplier_inquiry.php.orig:73 reporting/rep102.php:126
-#: reporting/rep202.php:129 reporting/includes/doctext.inc:178
+#: purchasing/inquiry/supplier_inquiry.php.orig:73 reporting/rep102.php:124
+#: reporting/rep108.php:154 reporting/rep202.php:129
 #: sales/inquiry/customer_inquiry.php:77
 msgid "Total Balance"
 msgstr ""
@@ -9982,28 +10015,28 @@ msgstr ""
 msgid "Marked items are settled."
 msgstr ""
 
-#: reporting/rep101.php:120 reporting/rep102.php:108 reporting/rep114.php:103
+#: reporting/rep101.php:120 reporting/rep102.php:106 reporting/rep114.php:103
 #: reporting/rep202.php:110 reporting/rep203.php:81
 msgid "Balances in Home Currency"
 msgstr ""
 
 #: reporting/rep101.php:130 reporting/rep201.php:118 reporting/rep203.php:91
-#: reporting/rep709.php:109 reporting/includes/doctext.inc:110
-#: reporting/includes/doctext.inc:118
+#: reporting/rep709.php:109 reporting/includes/doctext.inc:143
+#: reporting/includes/doctext.inc:183 reporting/includes/doctext.inc:221
 msgid "Trans Type"
 msgstr ""
 
 #: reporting/rep101.php:130 reporting/rep201.php:118
-#: reporting/includes/doctext.inc:118
+#: reporting/includes/doctext.inc:221
 msgid "Charges"
 msgstr ""
 
 #: reporting/rep101.php:130 reporting/rep201.php:119
-#: reporting/includes/doctext.inc:119
+#: reporting/includes/doctext.inc:222
 msgid "Credits"
 msgstr ""
 
-#: reporting/rep101.php:139 reporting/rep102.php:136 reporting/rep201.php:127
+#: reporting/rep101.php:139 reporting/rep102.php:134 reporting/rep201.php:127
 #: reporting/rep202.php:139 reporting/rep203.php:100 reporting/rep303.php:124
 #: reporting/reports_main.php:38 reporting/reports_main.php:47
 #: reporting/reports_main.php:138 reporting/reports_main.php:147
@@ -10015,25 +10048,25 @@ msgstr ""
 msgid "Customer Balances"
 msgstr ""
 
-#: reporting/rep101.php:244 reporting/rep102.php:226 reporting/rep106.php:177
+#: reporting/rep101.php:244 reporting/rep102.php:224 reporting/rep106.php:177
 #: reporting/rep201.php:231 reporting/rep202.php:231 reporting/rep203.php:177
-#: reporting/rep204.php:144 reporting/rep301.php:172 reporting/rep304.php:193
+#: reporting/rep204.php:144 reporting/rep301.php:172 reporting/rep304.php:192
 #: reporting/rep305.php:181
 msgid "Grand Total"
 msgstr ""
 
-#: reporting/rep102.php:102 reporting/rep106.php:91 reporting/rep202.php:104
+#: reporting/rep102.php:100 reporting/rep106.php:91 reporting/rep202.php:104
 #: reporting/rep709.php:93 reporting/reports_main.php:46
 #: reporting/reports_main.php:84 reporting/reports_main.php:146
 #: reporting/reports_main.php:180 reporting/reports_main.php:392
 msgid "Summary Only"
 msgstr ""
 
-#: reporting/rep102.php:104 reporting/rep202.php:106 reporting/rep709.php:95
+#: reporting/rep102.php:102 reporting/rep202.php:106 reporting/rep709.php:95
 msgid "Detailed Report"
 msgstr ""
 
-#: reporting/rep102.php:131 reporting/rep202.php:134 reporting/rep203.php:97
+#: reporting/rep102.php:129 reporting/rep202.php:134 reporting/rep203.php:97
 #: reporting/reports_main.php:35 reporting/reports_main.php:42
 #: reporting/reports_main.php:61 reporting/reports_main.php:75
 #: reporting/reports_main.php:83 reporting/reports_main.php:135
@@ -10050,13 +10083,13 @@ msgstr ""
 msgid "End Date"
 msgstr ""
 
-#: reporting/rep102.php:135 reporting/rep202.php:138
+#: reporting/rep102.php:133 reporting/rep202.php:138
 #: reporting/reports_main.php:45 reporting/reports_main.php:110
 #: reporting/reports_main.php:145
 msgid "Show Also Allocated"
 msgstr ""
 
-#: reporting/rep102.php:140
+#: reporting/rep102.php:138
 msgid "Aged Customer Analysis"
 msgstr ""
 
@@ -10117,7 +10150,7 @@ msgstr ""
 msgid "Customers in"
 msgstr ""
 
-#: reporting/rep103.php:196 sales/includes/ui/sales_order_ui.inc:413
+#: reporting/rep103.php:196
 msgid "Price List"
 msgstr ""
 
@@ -10168,8 +10201,8 @@ msgstr ""
 msgid "Order"
 msgstr ""
 
-#: reporting/rep105.php:107 reporting/rep106.php:81
-#: reporting/includes/doctext.inc:165 sales/create_recurrent_invoices.php:115
+#: reporting/rep105.php:107 reporting/rep106.php:81 reporting/rep112.php:168
+#: sales/create_recurrent_invoices.php:115
 #: sales/customer_credit_invoice.php:238 sales/customer_delivery.php:336
 #: sales/customer_invoice.php:375 sales/manage/recurrent_invoices.php:102
 #: sales/view/view_credit.php:58 sales/inquiry/customer_inquiry.php:219
@@ -10222,7 +10255,7 @@ msgstr ""
 msgid "Salesman"
 msgstr ""
 
-#: reporting/rep106.php:86 reporting/includes/header2.inc:98
+#: reporting/rep106.php:86 reporting/includes/header2.inc:110
 #: sales/manage/sales_people.php:99
 msgid "Email"
 msgstr ""
@@ -10235,55 +10268,115 @@ msgstr ""
 msgid "Salesman Listing"
 msgstr ""
 
-#: reporting/rep107.php:66 reporting/rep107.php:91 reporting/rep107.php:96
-#: reporting/includes/doctext.inc:94
+#: reporting/rep107.php:66 reporting/rep107.php:89 reporting/rep107.php:94
+#: reporting/includes/doctext.inc:103
 msgid "INVOICE"
 msgstr ""
 
+#: reporting/rep107.php:149 reporting/rep109.php:151 reporting/rep110.php:162
+#: reporting/rep111.php:138 reporting/rep113.php:151
+#: 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
+msgid "Shipping"
+msgstr ""
+
 #: reporting/rep108.php:84 reporting/rep108.php:115
-#: reporting/includes/doctext.inc:117
+#: reporting/includes/doctext.inc:213
 msgid "STATEMENT"
 msgstr ""
 
+#: reporting/rep108.php:126
+msgid "Outstanding Transactions"
+msgstr ""
+
+#: reporting/rep108.php:169
+msgid "Statement"
+msgstr ""
+
+#: reporting/rep108.php:169
+msgid "as of"
+msgstr ""
+
 #: reporting/rep109.php:65 reporting/rep109.php:93 reporting/rep109.php:99
-#: reporting/includes/doctext.inc:92
+#: reporting/includes/doctext.inc:52
 msgid "SALES ORDER"
 msgstr ""
 
 #: reporting/rep109.php:67 reporting/rep109.php:88 reporting/rep109.php:99
-#: reporting/includes/doctext.inc:92
+#: reporting/includes/doctext.inc:52
 msgid "QUOTE"
 msgstr ""
 
+#: reporting/rep109.php:157 reporting/rep111.php:144
+msgid "TOTAL ORDER EX VAT"
+msgstr ""
+
+#: reporting/rep109.php:203 reporting/rep111.php:190
+msgid "TOTAL ORDER VAT INCL."
+msgstr ""
+
 #: reporting/rep110.php:68
 msgid "DELIVERY"
 msgstr ""
 
 #: reporting/rep110.php:70 reporting/rep110.php:97
-#: reporting/includes/doctext.inc:90
+#: reporting/includes/doctext.inc:68
 msgid "PACKING SLIP"
 msgstr ""
 
 #: reporting/rep110.php:92 reporting/rep110.php:103
-#: reporting/includes/doctext.inc:90
+#: reporting/includes/doctext.inc:68
 msgid "DELIVERY NOTE"
 msgstr ""
 
+#: reporting/rep110.php:206
+msgid "TOTAL DELIVERY INCL. VAT"
+msgstr ""
+
 #: reporting/rep111.php:61 reporting/rep111.php:86
-#: reporting/includes/doctext.inc:86
+#: reporting/includes/doctext.inc:38
 msgid "SALES QUOTATION"
 msgstr ""
 
 #: reporting/rep112.php:92 reporting/rep112.php:112
-#: reporting/includes/doctext.inc:100
+#: reporting/includes/doctext.inc:173
 msgid "RECEIPT"
 msgstr ""
 
+#: reporting/rep112.php:121 reporting/rep210.php:135
+msgid "As advance / full / part / payment towards:"
+msgstr ""
+
+#: reporting/rep112.php:149
+msgid "TOTAL RECEIPT"
+msgstr ""
+
+#: reporting/rep112.php:159
+msgid "Received / Sign"
+msgstr ""
+
+#: reporting/rep112.php:161
+msgid "By Cash / Cheque* / Draft No."
+msgstr ""
+
+#: reporting/rep112.php:163
+msgid "Dated"
+msgstr ""
+
+#: reporting/rep112.php:166
+msgid "Drawn on Bank"
+msgstr ""
+
 #: reporting/rep113.php:66 reporting/rep113.php:91 reporting/rep113.php:96
-#: reporting/includes/doctext.inc:102
+#: reporting/includes/doctext.inc:89
 msgid "CREDIT NOTE"
 msgstr ""
 
+#: reporting/rep113.php:195 sales/view/view_credit.php:143
+msgid "TOTAL CREDIT"
+msgstr ""
+
 #: reporting/rep114.php:85
 msgid "Sales Summary Report"
 msgstr ""
@@ -10341,15 +10434,23 @@ msgid "Outstanding GRNs Report"
 msgstr ""
 
 #: reporting/rep209.php:88 reporting/rep209.php:107 reporting/rep209.php:112
-#: reporting/includes/doctext.inc:88
+#: reporting/includes/doctext.inc:147
 msgid "PURCHASE ORDER"
 msgstr ""
 
+#: reporting/rep209.php:211
+msgid "TOTAL PO"
+msgstr ""
+
 #: reporting/rep210.php:94 reporting/rep210.php:121 reporting/rep210.php:126
-#: reporting/includes/doctext.inc:98
+#: reporting/includes/doctext.inc:127
 msgid "REMITTANCE"
 msgstr ""
 
+#: reporting/rep210.php:164
+msgid "TOTAL REMITTANCE"
+msgstr ""
+
 #: reporting/rep301.php:108
 msgid "Inventory Valuation Report"
 msgstr ""
@@ -10394,24 +10495,24 @@ msgstr ""
 msgid "Stock Check Sheets"
 msgstr ""
 
-#: reporting/rep304.php:114 reporting/rep305.php:95
+#: reporting/rep304.php:113 reporting/rep305.php:95
 msgid "Qty"
 msgstr ""
 
-#: reporting/rep304.php:114 sales/manage/customer_branches.php:240
-#: sales/manage/customers.php:224
+#: reporting/rep304.php:113 sales/manage/customer_branches.php:240
+#: sales/manage/customers.php:226
 msgid "Sales"
 msgstr ""
 
-#: reporting/rep304.php:114
+#: reporting/rep304.php:113
 msgid "Cost"
 msgstr ""
 
-#: reporting/rep304.php:114
+#: reporting/rep304.php:113
 msgid "Contribution"
 msgstr ""
 
-#: reporting/rep304.php:126
+#: reporting/rep304.php:125
 msgid "Inventory Sales Report"
 msgstr ""
 
@@ -10444,7 +10545,7 @@ msgid "Bill of Material Listing"
 msgstr ""
 
 #: reporting/rep409.php:60 reporting/rep409.php:79 reporting/rep409.php:84
-#: reporting/includes/doctext.inc:96
+#: reporting/includes/doctext.inc:189
 msgid "WORK ORDER"
 msgstr ""
 
@@ -10452,10 +10553,6 @@ msgstr ""
 msgid "Insufficient stock"
 msgstr ""
 
-#: reporting/rep409.php:147 reporting/includes/doctext.inc:138
-msgid "Work Order No."
-msgstr ""
-
 #: reporting/rep501.php:85
 msgid "YTD"
 msgstr ""
@@ -10464,7 +10561,7 @@ msgstr ""
 msgid "Dimension Summary"
 msgstr ""
 
-#: reporting/rep601.php:83 reporting/includes/doctext.inc:72
+#: reporting/rep601.php:83 reporting/includes/doctext.inc:244
 msgid "Bank Account"
 msgstr ""
 
@@ -10492,7 +10589,7 @@ msgstr ""
 msgid "List of Journal Entries"
 msgstr ""
 
-#: reporting/rep704.php:66
+#: reporting/rep704.php:67
 msgid "GL Account Transactions"
 msgstr ""
 
@@ -10877,214 +10974,133 @@ msgstr ""
 msgid "Ta&x Report"
 msgstr ""
 
-#: reporting/includes/doctext.inc:14
-msgid "Cust no"
-msgstr ""
-
-#: reporting/includes/doctext.inc:18
-msgid "Order To"
-msgstr ""
-
-#: reporting/includes/doctext.inc:20
-msgid "Deliver To"
-msgstr ""
-
-#: reporting/includes/doctext.inc:22 reporting/includes/doctext.inc:29
+#: reporting/includes/doctext.inc:18 reporting/includes/doctext.inc:132
 #: sales/view/view_dispatch.php:51 sales/view/view_invoice.php:51
 msgid "Charge To"
 msgstr ""
 
-#: reporting/includes/doctext.inc:27
-msgid "With thanks from"
-msgstr ""
-
-#: reporting/includes/doctext.inc:30 sales/view/view_dispatch.php:74
+#: reporting/includes/doctext.inc:23 sales/view/view_dispatch.php:74
 msgid "Delivered To"
 msgstr ""
 
-#: reporting/includes/doctext.inc:34 sales/view/view_sales_order.php:69
-#: sales/inquiry/sales_orders_view.php:273
-#: sales/includes/ui/sales_order_ui.inc:605
-msgid "Valid until"
-msgstr ""
-
-#: reporting/includes/doctext.inc:38
-msgid "To Be Invoiced Before"
-msgstr ""
-
-#: reporting/includes/doctext.inc:41
-msgid "Your Ref"
-msgstr ""
-
-#: reporting/includes/doctext.inc:56 sales/manage/customer_branches.php:296
-msgid "Sales Person"
-msgstr ""
-
-#: reporting/includes/doctext.inc:57
-msgid "Your VAT no."
-msgstr ""
-
-#: reporting/includes/doctext.inc:59
-msgid "Customers Reference"
-msgstr ""
-
-#: reporting/includes/doctext.inc:60 sales/view/view_dispatch.php:87
-#: sales/view/view_invoice.php:86
-msgid "Our Order No"
-msgstr ""
-
-#: reporting/includes/doctext.inc:62
-msgid "Our VAT No."
-msgstr ""
-
-#: reporting/includes/doctext.inc:63
-msgid "Domicile"
-msgstr ""
-
-#: reporting/includes/doctext.inc:68
-msgid "* Subject to Realisation of the Cheque."
-msgstr ""
-
-#: reporting/includes/doctext.inc:70
-msgid "All amounts stated in"
-msgstr ""
-
-#: reporting/includes/doctext.inc:74
-msgid "Please quote Invoice no. when paying. All amounts stated in"
-msgstr ""
-
-#: reporting/includes/doctext.inc:75
-msgid "Please quote Credit no. when paying. All amounts stated in"
-msgstr ""
-
-#: reporting/includes/doctext.inc:78
-msgid "Phone/Fax/Email"
-msgstr ""
-
-#: reporting/includes/doctext.inc:80 reporting/includes/doctext.inc:127
-msgid "You can pay through"
-msgstr ""
-
-#: reporting/includes/doctext.inc:113 sales/customer_credit_invoice.php:283
+#: reporting/includes/doctext.inc:30 sales/customer_credit_invoice.php:283
 #: 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:142
 msgid "Discount %"
 msgstr ""
 
-#: reporting/includes/doctext.inc:118
-msgid "DueDate"
-msgstr ""
-
-#: reporting/includes/doctext.inc:124
-msgid "Dear"
+#: reporting/includes/doctext.inc:33
+msgid "All amounts stated in"
 msgstr ""
 
-#: reporting/includes/doctext.inc:125
-msgid "Attached you will find "
+#: reporting/includes/doctext.inc:39
+msgid "Quotation No."
 msgstr ""
 
-#: reporting/includes/doctext.inc:126
-msgid "Kindest regards"
+#: reporting/includes/doctext.inc:43 reporting/includes/doctext.inc:59
+#: reporting/includes/doctext.inc:80 reporting/includes/doctext.inc:94
+#: reporting/includes/doctext.inc:116 reporting/includes/doctext.inc:137
+#: reporting/includes/doctext.inc:159 reporting/includes/doctext.inc:177
+#: reporting/includes/doctext.inc:215
+msgid "Customers Reference"
 msgstr ""
 
-#: reporting/includes/doctext.inc:131 reporting/includes/doctext.inc:140
-msgid "Delivery Note No."
+#: reporting/includes/doctext.inc:44 reporting/includes/doctext.inc:60
+#: reporting/includes/doctext.inc:81 reporting/includes/doctext.inc:95
+#: reporting/includes/doctext.inc:117 reporting/includes/doctext.inc:160
+#: reporting/includes/doctext.inc:216 sales/manage/customer_branches.php:296
+msgid "Sales Person"
 msgstr ""
 
-#: reporting/includes/doctext.inc:132
-msgid "Receipt No."
+#: reporting/includes/doctext.inc:45 reporting/includes/doctext.inc:61
+#: reporting/includes/doctext.inc:82 reporting/includes/doctext.inc:96
+#: reporting/includes/doctext.inc:118 reporting/includes/doctext.inc:139
+#: reporting/includes/doctext.inc:161 reporting/includes/doctext.inc:179
+#: reporting/includes/doctext.inc:217
+msgid "Your VAT no."
 msgstr ""
 
-#: reporting/includes/doctext.inc:133
-msgid "Remittance No."
+#: reporting/includes/doctext.inc:46 reporting/includes/doctext.inc:62
+#: reporting/includes/doctext.inc:83 reporting/includes/doctext.inc:97
+#: reporting/includes/doctext.inc:140 reporting/includes/doctext.inc:162
+#: reporting/includes/doctext.inc:180 reporting/includes/doctext.inc:218
+#: sales/view/view_dispatch.php:87 sales/view/view_invoice.php:86
+msgid "Our Order No"
 msgstr ""
 
-#: reporting/includes/doctext.inc:134
-msgid "Purchase Order No."
+#: reporting/includes/doctext.inc:47 sales/view/view_sales_order.php:69
+#: sales/inquiry/sales_orders_view.php:273
+#: sales/includes/ui/sales_order_ui.inc:605
+msgid "Valid until"
 msgstr ""
 
-#: reporting/includes/doctext.inc:135 reporting/includes/doctext.inc:141
+#: reporting/includes/doctext.inc:53
 msgid "Order No."
 msgstr ""
 
-#: reporting/includes/doctext.inc:136
-msgid "Quotation No."
+#: reporting/includes/doctext.inc:69 reporting/includes/doctext.inc:119
+msgid "Delivery Note No."
 msgstr ""
 
-#: reporting/includes/doctext.inc:137
-msgid "Invoice No."
+#: reporting/includes/doctext.inc:84
+msgid "To Be Invoiced Before"
 msgstr ""
 
-#: reporting/includes/doctext.inc:138
+#: reporting/includes/doctext.inc:90
 msgid "Credit No."
 msgstr ""
 
-#: reporting/includes/doctext.inc:150 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
-msgid "Shipping"
-msgstr ""
-
-#: reporting/includes/doctext.inc:153 sales/view/view_credit.php:143
-msgid "TOTAL CREDIT"
-msgstr ""
-
-#: reporting/includes/doctext.inc:154
-msgid "TOTAL ORDER EX VAT"
-msgstr ""
-
-#: reporting/includes/doctext.inc:155
-msgid "TOTAL ORDER VAT INCL."
+#: reporting/includes/doctext.inc:91
+msgid "Please quote Credit no. when paying. All amounts stated in"
 msgstr ""
 
-#: reporting/includes/doctext.inc:156
-msgid "TOTAL PO"
+#: reporting/includes/doctext.inc:104
+msgid "Invoice No."
 msgstr ""
 
-#: reporting/includes/doctext.inc:157
-msgid "TOTAL DELIVERY INCL. VAT"
+#: reporting/includes/doctext.inc:106
+msgid "Please quote Invoice no. when paying. All amounts stated in"
 msgstr ""
 
-#: reporting/includes/doctext.inc:161
-msgid "As advance / full / part / payment towards:"
+#: reporting/includes/doctext.inc:128
+msgid "Remittance No."
 msgstr ""
 
-#: reporting/includes/doctext.inc:162
-msgid "By Cash / Cheque* / Draft No."
+#: reporting/includes/doctext.inc:129 reporting/includes/doctext.inc:149
+msgid "Order To"
 msgstr ""
 
-#: reporting/includes/doctext.inc:163
-msgid "Dated"
+#: reporting/includes/doctext.inc:148
+msgid "Purchase Order No."
 msgstr ""
 
-#: reporting/includes/doctext.inc:164
-msgid "Drawn on Bank"
+#: reporting/includes/doctext.inc:152
+msgid "Deliver To"
 msgstr ""
 
-#: reporting/includes/doctext.inc:166
-msgid "Received / Sign"
+#: reporting/includes/doctext.inc:174
+msgid "Receipt No."
 msgstr ""
 
-#: reporting/includes/doctext.inc:170
-msgid "TOTAL RECEIPT"
+#: reporting/includes/doctext.inc:175
+msgid "With thanks from"
 msgstr ""
 
-#: reporting/includes/doctext.inc:172
-msgid "TOTAL REMITTANCE"
+#: reporting/includes/doctext.inc:190
+msgid "Work Order No."
 msgstr ""
 
-#: reporting/includes/doctext.inc:176
-msgid "Outstanding Transactions"
+#: reporting/includes/doctext.inc:221
+msgid "DueDate"
 msgstr ""
 
-#: reporting/includes/doctext.inc:179
-msgid "Statement"
+#: reporting/includes/doctext.inc:256 reporting/includes/pdf_report.inc:1012
+msgid "You can pay through"
 msgstr ""
 
-#: reporting/includes/doctext.inc:180
-msgid "as of"
+#: reporting/includes/doctext.inc:260
+msgid "* Subject to Realisation of the Cheque."
 msgstr ""
 
 #: reporting/includes/excel_report.inc:67 reporting/includes/pdf_report.inc:80
@@ -11107,21 +11123,29 @@ msgid "Report Date"
 msgstr ""
 
 #: reporting/includes/excel_report.inc:413
-#: reporting/includes/pdf_report.inc:599
+#: reporting/includes/pdf_report.inc:600
 msgid "Generated At"
 msgstr ""
 
 #: reporting/includes/excel_report.inc:419
-#: reporting/includes/pdf_report.inc:608
+#: reporting/includes/pdf_report.inc:609
 msgid "Generated By"
 msgstr ""
 
-#: reporting/includes/header2.inc:150 reporting/includes/pdf_report.inc:352
-#: reporting/includes/pdf_report.inc:499 reporting/includes/pdf_report.inc:627
+#: reporting/includes/header2.inc:122
+msgid "Our VAT No."
+msgstr ""
+
+#: reporting/includes/header2.inc:128
+msgid "Domicile"
+msgstr ""
+
+#: reporting/includes/header2.inc:143 reporting/includes/pdf_report.inc:352
+#: reporting/includes/pdf_report.inc:500 reporting/includes/pdf_report.inc:628
 msgid "Page"
 msgstr ""
 
-#: reporting/includes/pdf_report.inc:582
+#: reporting/includes/pdf_report.inc:583
 msgid "Report Period"
 msgstr ""
 
@@ -11129,19 +11153,31 @@ msgstr ""
 msgid "You have no email contact defined for this type of document"
 msgstr ""
 
-#: reporting/includes/pdf_report.inc:1022
+#: reporting/includes/pdf_report.inc:998
+msgid "Dear"
+msgstr ""
+
+#: reporting/includes/pdf_report.inc:999
+msgid "Attached you will find "
+msgstr ""
+
+#: reporting/includes/pdf_report.inc:1015
+msgid "Kindest regards"
+msgstr ""
+
+#: reporting/includes/pdf_report.inc:1026
 msgid "There is no contact email set for this document type."
 msgstr ""
 
-#: reporting/includes/pdf_report.inc:1024
+#: reporting/includes/pdf_report.inc:1028
 msgid "Sending document by email failed"
 msgstr ""
 
-#: reporting/includes/pdf_report.inc:1027
+#: reporting/includes/pdf_report.inc:1031
 msgid "has been sent by email to destination."
 msgstr ""
 
-#: reporting/includes/pdf_report.inc:1057
+#: reporting/includes/pdf_report.inc:1061
 msgid "Report has been sent to network printer "
 msgstr ""
 
@@ -11193,78 +11229,74 @@ msgstr ""
 msgid "No Currency Filter"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:224
-msgid "No payment Link"
-msgstr ""
-
-#: reporting/includes/reports_classes.inc:228
+#: reporting/includes/reports_classes.inc:227
 msgid "PDF/Printer"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:239
+#: reporting/includes/reports_classes.inc:238
 msgid "No Graphics"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:239
+#: reporting/includes/reports_classes.inc:238
 msgid "Vertical bars"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:239
+#: reporting/includes/reports_classes.inc:238
 msgid "Horizontal bars"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:240
+#: reporting/includes/reports_classes.inc:239
 msgid "Dots"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:240
+#: reporting/includes/reports_classes.inc:239
 msgid "Lines"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:240
+#: reporting/includes/reports_classes.inc:239
 msgid "Pie"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:240
+#: reporting/includes/reports_classes.inc:239
 msgid "Donut"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:244
-#: reporting/includes/reports_classes.inc:247
+#: reporting/includes/reports_classes.inc:243
+#: reporting/includes/reports_classes.inc:246
 msgid "No Type Filter"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:257
+#: reporting/includes/reports_classes.inc:256
 msgid "No Account Group Filter"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:272
-#: reporting/includes/reports_classes.inc:278
-#: reporting/includes/reports_classes.inc:284
+#: reporting/includes/reports_classes.inc:271
+#: reporting/includes/reports_classes.inc:277
+#: reporting/includes/reports_classes.inc:283
 msgid "No Dimension Filter"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:290
+#: reporting/includes/reports_classes.inc:289
 msgid "No Customer Filter"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:298
+#: reporting/includes/reports_classes.inc:297
 msgid "No Supplier Filter"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:380
+#: reporting/includes/reports_classes.inc:379
 msgid "No Location Filter"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:383
+#: reporting/includes/reports_classes.inc:382
 msgid "No Category Filter"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:392
+#: reporting/includes/reports_classes.inc:391
 msgid "No Sales Folk Filter"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:399
+#: reporting/includes/reports_classes.inc:398
 msgid "No Users Filter"
 msgstr ""
 
@@ -11330,7 +11362,7 @@ msgstr ""
 msgid "Modifying Customer Credit Note #%d"
 msgstr ""
 
-#: sales/credit_note_entry.php:51 sales/sales_order_entry.php:662
+#: sales/credit_note_entry.php:51 sales/sales_order_entry.php:661
 msgid ""
 "There are no customers, or there are no customers with branches. Please "
 "define customers and customer branches."
@@ -11604,7 +11636,7 @@ msgstr ""
 msgid "There are no item quantities on this delivery note."
 msgstr ""
 
-#: sales/customer_delivery.php:288 sales/sales_order_entry.php:491
+#: sales/customer_delivery.php:288 sales/sales_order_entry.php:490
 #: sales/includes/ui/sales_order_ui.inc:244
 msgid ""
 "The delivery cannot be processed because there is an insufficient quantity "
@@ -11671,7 +11703,7 @@ msgid "Process Dispatch"
 msgstr ""
 
 #: sales/customer_delivery.php:523 sales/customer_invoice.php:564
-#: sales/sales_order_entry.php:710
+#: sales/sales_order_entry.php:709
 msgid "Check entered data and save document"
 msgstr ""
 
@@ -11828,12 +11860,12 @@ msgid "Enter Another &Customer Payment"
 msgstr ""
 
 #: sales/customer_payments.php:83 sales/customer_payments.php.orig:83
-#: sales/sales_order_entry.php:329
+#: sales/sales_order_entry.php:327
 msgid "There is no customer selected."
 msgstr ""
 
 #: sales/customer_payments.php:90 sales/customer_payments.php.orig:90
-#: sales/sales_order_entry.php:336
+#: sales/sales_order_entry.php:334
 msgid "This customer has no branch defined."
 msgstr ""
 
@@ -12015,178 +12047,178 @@ msgstr ""
 msgid "Enter a &New Direct Invoice"
 msgstr ""
 
-#: sales/sales_order_entry.php:358
+#: sales/sales_order_entry.php:356
 msgid ""
 "You must enter the person or company to whom delivery should be made to."
 msgstr ""
 
-#: sales/sales_order_entry.php:365
+#: sales/sales_order_entry.php:363
 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:374
+#: sales/sales_order_entry.php:372
 msgid "The shipping cost entered is expected to be numeric."
 msgstr ""
 
-#: sales/sales_order_entry.php:380
+#: sales/sales_order_entry.php:378
 msgid "The Valid date is invalid."
 msgstr ""
 
-#: sales/sales_order_entry.php:382
+#: sales/sales_order_entry.php:380
 msgid "The delivery date is invalid."
 msgstr ""
 
-#: sales/sales_order_entry.php:389
+#: sales/sales_order_entry.php:387
 msgid "The requested valid date is before the date of the quotation."
 msgstr ""
 
-#: sales/sales_order_entry.php:391
+#: sales/sales_order_entry.php:389
 msgid "The requested delivery date is before the date of the order."
 msgstr ""
 
-#: sales/sales_order_entry.php:400
+#: sales/sales_order_entry.php:398
 msgid "You need to define a cash account for your Sales Point."
 msgstr ""
 
-#: sales/sales_order_entry.php:470
+#: sales/sales_order_entry.php:469
 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:474
+#: sales/sales_order_entry.php:473
 msgid "Price for inventory item must be entered and can not be less than 0"
 msgstr ""
 
-#: sales/sales_order_entry.php:481
+#: sales/sales_order_entry.php:480
 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:512
+#: sales/sales_order_entry.php:511
 #, php-format
 msgid "Price %s is below Standard Cost %s"
 msgstr ""
 
-#: sales/sales_order_entry.php:537
+#: sales/sales_order_entry.php:536
 msgid ""
 "This item cannot be deleted because some of it has already been delivered."
 msgstr ""
 
-#: sales/sales_order_entry.php:566
+#: sales/sales_order_entry.php:565
 msgid "Direct delivery entry has been cancelled as requested."
 msgstr ""
 
-#: sales/sales_order_entry.php:567
+#: sales/sales_order_entry.php:566
 msgid "Enter a New Sales Delivery"
 msgstr ""
 
-#: sales/sales_order_entry.php:570
+#: sales/sales_order_entry.php:569
 msgid "Direct invoice entry has been cancelled as requested."
 msgstr ""
 
-#: sales/sales_order_entry.php:571
+#: sales/sales_order_entry.php:570
 msgid "Enter a New Sales Invoice"
 msgstr ""
 
-#: sales/sales_order_entry.php:576
+#: sales/sales_order_entry.php:575
 msgid ""
 "This order cannot be cancelled because some of it has already been invoiced "
 "or dispatched. However, the line item quantities may be modified."
 msgstr ""
 
-#: sales/sales_order_entry.php:581
+#: sales/sales_order_entry.php:580
 msgid "This sales quotation has been cancelled as requested."
 msgstr ""
 
-#: sales/sales_order_entry.php:582
+#: sales/sales_order_entry.php:581
 msgid "Enter a New Sales Quotation"
 msgstr ""
 
-#: sales/sales_order_entry.php:586
+#: sales/sales_order_entry.php:585
 msgid "This sales order has been cancelled as requested."
 msgstr ""
 
-#: sales/sales_order_entry.php:587
+#: sales/sales_order_entry.php:586
 msgid "Enter a New Sales Order"
 msgstr ""
 
-#: sales/sales_order_entry.php:666
+#: sales/sales_order_entry.php:665
 msgid "Sales Invoice Items"
 msgstr ""
 
-#: sales/sales_order_entry.php:667
+#: sales/sales_order_entry.php:666
 msgid "Enter Delivery Details and Confirm Invoice"
 msgstr ""
 
-#: sales/sales_order_entry.php:669
+#: sales/sales_order_entry.php:668
 msgid "Place Invoice"
 msgstr ""
 
-#: sales/sales_order_entry.php:672
+#: sales/sales_order_entry.php:671
 msgid "Delivery Note Items"
 msgstr ""
 
-#: sales/sales_order_entry.php:673
+#: sales/sales_order_entry.php:672
 msgid "Enter Delivery Details and Confirm Dispatch"
 msgstr ""
 
-#: sales/sales_order_entry.php:674
+#: sales/sales_order_entry.php:673
 msgid "Cancel Delivery"
 msgstr ""
 
-#: sales/sales_order_entry.php:675
+#: sales/sales_order_entry.php:674
 msgid "Place Delivery"
 msgstr ""
 
-#: sales/sales_order_entry.php:677
+#: sales/sales_order_entry.php:676
 msgid "Quotation Date:"
 msgstr ""
 
-#: sales/sales_order_entry.php:678
+#: sales/sales_order_entry.php:677
 msgid "Sales Quotation Items"
 msgstr ""
 
-#: sales/sales_order_entry.php:679
+#: sales/sales_order_entry.php:678
 msgid "Enter Delivery Details and Confirm Quotation"
 msgstr ""
 
-#: sales/sales_order_entry.php:680
+#: sales/sales_order_entry.php:679
 msgid "Cancel Quotation"
 msgstr ""
 
-#: sales/sales_order_entry.php:681
+#: sales/sales_order_entry.php:680
 msgid "Place Quotation"
 msgstr ""
 
-#: sales/sales_order_entry.php:682
+#: sales/sales_order_entry.php:681
 msgid "Commit Quotations Changes"
 msgstr ""
 
-#: sales/sales_order_entry.php:685
+#: sales/sales_order_entry.php:684
 msgid "Sales Order Items"
 msgstr ""
 
-#: sales/sales_order_entry.php:686
+#: sales/sales_order_entry.php:685
 msgid "Enter Delivery Details and Confirm Order"
 msgstr ""
 
-#: sales/sales_order_entry.php:689
+#: sales/sales_order_entry.php:688
 msgid "Commit Order Changes"
 msgstr ""
 
-#: sales/sales_order_entry.php:711
+#: sales/sales_order_entry.php:710
 msgid "You are about to void this Document.\\nDo you want to continue?"
 msgstr ""
 
-#: sales/sales_order_entry.php:714
+#: sales/sales_order_entry.php:713
 msgid "Validate changes and update document"
 msgstr ""
 
-#: sales/sales_order_entry.php:718
+#: sales/sales_order_entry.php:717
 msgid ""
 "Cancels document entry or removes sales order when editing an old document"
 msgstr ""
@@ -12205,7 +12237,7 @@ msgid "Customer Allocations"
 msgstr ""
 
 #: sales/allocations/customer_allocation_main.php:32
-#: sales/manage/customer_branches.php:280 sales/manage/customers.php:280
+#: sales/manage/customer_branches.php:280 sales/manage/customers.php:282
 #: sales/inquiry/customer_allocation_inquiry.php:42
 #: sales/inquiry/customer_inquiry.php:44
 #: sales/inquiry/sales_orders_view.php:234
@@ -12449,85 +12481,85 @@ msgstr ""
 msgid "Selected customer has been deleted."
 msgstr ""
 
-#: sales/manage/customers.php:199
+#: sales/manage/customers.php:201
 msgid "Name and Address"
 msgstr ""
 
-#: sales/manage/customers.php:201
+#: sales/manage/customers.php:203
 msgid "Customer Name:"
 msgstr ""
 
-#: sales/manage/customers.php:202
+#: sales/manage/customers.php:204
 msgid "Customer Short Name:"
 msgstr ""
 
-#: sales/manage/customers.php:210 sales/manage/customers.php:214
+#: sales/manage/customers.php:212 sales/manage/customers.php:216
 msgid "Customer's Currency:"
 msgstr ""
 
-#: sales/manage/customers.php:217
+#: sales/manage/customers.php:219
 msgid "Sales Type/Price List:"
 msgstr ""
 
-#: sales/manage/customers.php:220
+#: sales/manage/customers.php:222
 msgid "Customer status:"
 msgstr ""
 
-#: sales/manage/customers.php:226
+#: sales/manage/customers.php:228
 msgid "Discount Percent:"
 msgstr ""
 
-#: sales/manage/customers.php:227
+#: sales/manage/customers.php:229
 msgid "Prompt Payment Discount Percent:"
 msgstr ""
 
-#: sales/manage/customers.php:231
+#: sales/manage/customers.php:233
 msgid "Credit Status:"
 msgstr ""
 
-#: sales/manage/customers.php:244
+#: sales/manage/customers.php:246
 msgid "Customer branches"
 msgstr ""
 
-#: sales/manage/customers.php:246
+#: sales/manage/customers.php:248
 msgid "Select or &Add"
 msgstr ""
 
-#: sales/manage/customers.php:246
+#: sales/manage/customers.php:248
 msgid "&Add or Edit "
 msgstr ""
 
-#: sales/manage/customers.php:257
+#: sales/manage/customers.php:259
 msgid "Add New Customer"
 msgstr ""
 
-#: sales/manage/customers.php:261
+#: sales/manage/customers.php:263
 msgid "Update Customer"
 msgstr ""
 
-#: sales/manage/customers.php:262
+#: sales/manage/customers.php:264
 msgid "Update customer data"
 msgstr ""
 
-#: sales/manage/customers.php:263
+#: sales/manage/customers.php:265
 msgid "Select this customer and return to document entry."
 msgstr ""
 
-#: sales/manage/customers.php:264
+#: sales/manage/customers.php:266
 msgid "Delete Customer"
 msgstr ""
 
-#: sales/manage/customers.php:265
+#: sales/manage/customers.php:267
 msgid "Delete customer data if have been never used"
 msgstr ""
 
-#: sales/manage/customers.php:272
+#: sales/manage/customers.php:274
 msgid ""
 "There are no sales types defined. Please define at least one sales type "
 "before adding a customer."
 msgstr ""
 
-#: sales/manage/customers.php:281
+#: sales/manage/customers.php:283
 msgid "New customer"
 msgstr ""
 
@@ -13145,6 +13177,7 @@ msgstr ""
 msgid "Reference number unique for this document type"
 msgstr ""
 
+#: sales/includes/ui/sales_order_ui.inc:413
 #: sales/includes/ui/sales_order_ui.inc:415
 msgid "Price List:"
 msgstr ""