X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=lang%2Fnew_language_template%2FLC_MESSAGES%2Fempty.po;h=4caebea3974ef4e80d2089789213ab84349d201b;hb=0694fdb6ca4f9cb947db9275ea91b40028d4b57c;hp=1a7aef5a0be42e65d796c4f6d508418535f2d897;hpb=f11b39846d81bd043490ba9596224b859e47467c;p=fa-stable.git

diff --git a/lang/new_language_template/LC_MESSAGES/empty.po b/lang/new_language_template/LC_MESSAGES/empty.po
index 1a7aef5a..4caebea3 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: 2017-06-14 23:29+0200\n"
+"POT-Creation-Date: 2020-02-04 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: frontaccounting.php:75 frontaccounting.php:76
+#: frontaccounting.php:72 frontaccounting.php:73
 msgid "Main  Menu"
 msgstr ""
 
-#: frontaccounting.php:77 access/logout.php:21 themes/default/renderer.php:73
+#: frontaccounting.php:74 access/logout.php:21 themes/default/renderer.php:73
 #: themes/default/renderer.php:87
 msgid "Logout"
 msgstr ""
@@ -66,14 +66,13 @@ msgstr ""
 msgid "User name"
 msgstr ""
 
-#: access/login.php:97 admin/users.php:200
+#: access/login.php:97 admin/users.php:202
 msgid "Password:"
 msgstr ""
 
 #: access/login.php:106 access/login.php:112 access/password_reset.php:69
-#: access/password_reset.php:75 admin/create_coy.php:240
-#: admin/create_coy.php:316 admin/inst_upgrade.php:63
-#: includes/sysnames.inc:208
+#: access/password_reset.php:75 admin/create_coy.php:247
+#: admin/create_coy.php:327 admin/inst_upgrade.php:63 includes/sysnames.inc:210
 msgid "Company"
 msgstr ""
 
@@ -82,7 +81,7 @@ msgid "Login -->"
 msgstr ""
 
 #: access/login.php:155 access/password_reset.php:106
-#: admin/display_prefs.php:123 themes/default/renderer.php:136
+#: admin/display_prefs.php:125 themes/default/renderer.php:136
 msgid "Theme:"
 msgstr ""
 
@@ -99,7 +98,7 @@ msgid "Password reset"
 msgstr ""
 
 #: access/password_reset.php:63 reporting/rep103.php:274
-#: reporting/rep106.php:94 reporting/rep205.php:186
+#: reporting/rep106.php:95 reporting/rep205.php:186
 #: reporting/includes/header2.inc:112 sales/manage/sales_people.php:99
 msgid "Email"
 msgstr ""
@@ -112,7 +111,7 @@ msgstr ""
 msgid "Attach Documents"
 msgstr ""
 
-#: admin/attachments.php:83 admin/db/voiding_db.inc:28
+#: admin/attachments.php:84 admin/db/voiding_db.inc:28
 #: admin/db/voiding_db.inc:40 admin/db/voiding_db.inc:53
 #: admin/db/voiding_db.inc:65 admin/db/voiding_db.inc:71
 #: admin/db/voiding_db.inc:90 admin/db/voiding_db.inc:97
@@ -120,24 +119,24 @@ msgstr ""
 msgid "Selected transaction does not exists."
 msgstr ""
 
-#: admin/attachments.php:85 admin/attachments.php:90
+#: admin/attachments.php:86 admin/attachments.php:91
 msgid "Select attachment file."
 msgstr ""
 
-#: admin/attachments.php:88 admin/company_preferences.php:42
-#: inventory/manage/items.php:83
+#: admin/attachments.php:89 admin/company_preferences.php:66
+#: inventory/manage/items.php:93
 msgid "The file size is over the maximum allowed."
 msgstr ""
 
-#: admin/attachments.php:131
+#: admin/attachments.php:132
 msgid "Attachment has been inserted."
 msgstr ""
 
-#: admin/attachments.php:137
+#: admin/attachments.php:138
 msgid "Attachment has been updated."
 msgstr ""
 
-#: admin/attachments.php:152
+#: admin/attachments.php:153
 msgid "Attachment has been deleted."
 msgstr ""
 
@@ -152,88 +151,106 @@ msgstr ""
 msgid "Type:"
 msgstr ""
 
-#: admin/attachments.php:186 admin/create_coy.php:261
+#: admin/attachments.php:175 sales/allocations/customer_allocation_main.php:32
+#: sales/manage/customer_branches.php:270 sales/manage/customers.php:331
+#: sales/inquiry/customer_allocation_inquiry.php:42
+#: sales/inquiry/customer_inquiry.php:160
+#: sales/inquiry/sales_deliveries_view.php:115
+#: sales/inquiry/sales_orders_view.php:237
+msgid "Select a customer: "
+msgstr ""
+
+#: admin/attachments.php:177 purchasing/manage/suppliers.php:302
+#: purchasing/inquiry/po_search_completed.php:104
+#: purchasing/inquiry/po_search.php:76
+#: purchasing/inquiry/supplier_allocation_inquiry.php:48
+msgid "Select a supplier: "
+msgstr ""
+
+#: admin/attachments.php:192 admin/create_coy.php:269
 #: admin/crm_categories.php:106 admin/fiscalyears.php:164
 #: admin/inst_lang.php:100 admin/payment_terms.php:142 admin/printers.php:96
-#: admin/shipping_companies.php:106 admin/tags.php:140 admin/users.php:153
-#: dimensions/inquiry/search_dimensions.php:116
-#: gl/manage/bank_accounts.php:133 gl/manage/currencies.php:164
-#: gl/manage/exchange_rates.php:94 gl/manage/gl_account_classes.php:131
-#: gl/manage/gl_account_types.php:153 gl/manage/gl_quick_entries.php:201
-#: gl/manage/gl_quick_entries.php:303 gl/includes/ui/gl_bank_ui.inc:179
-#: gl/includes/ui/gl_journal_ui.inc:150 includes/ui/class.crud_view.inc:281
+#: admin/shipping_companies.php:106 admin/tags.php:140 admin/users.php:155
+#: dimensions/inquiry/search_dimensions.php:117 gl/manage/bank_accounts.php:133
+#: gl/manage/currencies.php:164 gl/manage/exchange_rates.php:94
+#: gl/manage/gl_account_classes.php:131 gl/manage/gl_account_types.php:159
+#: gl/manage/gl_quick_entries.php:201 gl/manage/gl_quick_entries.php:303
+#: gl/includes/ui/gl_bank_ui.inc:179 gl/includes/ui/gl_journal_ui.inc:160
+#: includes/ui/attachment.inc:94 includes/ui/class.crud_view.inc:290
 #: includes/ui/contacts_view.inc:61 includes/ui/simple_crud_class.inc:52
-#: includes/ui/ui_view.inc:1547 inventory/prices.php:163
+#: includes/ui/ui_view.inc:1581 inventory/prices.php:163
 #: inventory/purchasing_data.php:167
 #: inventory/includes/item_adjustments_ui.inc:100
-#: inventory/includes/stock_transfers_ui.inc:83
-#: inventory/manage/item_categories.php:147
-#: inventory/manage/item_codes.php:142 inventory/manage/item_units.php:110
-#: inventory/manage/locations.php:170 inventory/manage/sales_kits.php:51
-#: manufacturing/manage/bom_edit.php:59
+#: inventory/includes/sav.item_adjustments_ui.inc:102
+#: inventory/includes/stock_transfers_ui.inc:85
+#: inventory/manage/item_categories.php:147 inventory/manage/item_codes.php:142
+#: inventory/manage/item_units.php:110 inventory/manage/locations.php:170
+#: inventory/manage/sales_kits.php:51 manufacturing/manage/bom_edit.php:60
 #: manufacturing/manage/work_centres.php:114
 #: manufacturing/includes/work_order_issue_ui.inc:61
-#: purchasing/includes/ui/invoice_ui.inc:551
-#: purchasing/includes/ui/po_ui.inc:249 sales/manage/credit_status.php:119
+#: purchasing/includes/ui/invoice_ui.inc:318
+#: purchasing/includes/ui/invoice_ui.inc:550
+#: purchasing/includes/ui/po_ui.inc:253 sales/manage/credit_status.php:119
 #: sales/manage/customer_branches.php:158
 #: sales/manage/recurrent_invoices.php:156 sales/manage/sales_areas.php:103
 #: sales/manage/sales_groups.php:99 sales/manage/sales_people.php:119
 #: sales/manage/sales_points.php:99 sales/manage/sales_types.php:121
 #: sales/includes/ui/sales_credit_ui.inc:192
 #: sales/includes/ui/sales_order_ui.inc:196 taxes/item_tax_types.php:139
-#: taxes/tax_groups.php:137 taxes/tax_types.php:132
+#: taxes/tax_groups.php:140 taxes/tax_types.php:132
 msgid "Edit"
 msgstr ""
 
-#: admin/attachments.php:191 gl/inquiry/journal_inquiry.php:116
+#: admin/attachments.php:197 gl/inquiry/journal_inquiry.php:122
 msgid "View"
 msgstr ""
 
-#: admin/attachments.php:196
+#: admin/attachments.php:202 includes/ui/attachment.inc:96
 msgid "Download"
 msgstr ""
 
-#: admin/attachments.php:201 admin/create_coy.php:264
+#: admin/attachments.php:207 admin/create_coy.php:272
 #: admin/crm_categories.php:110 admin/fiscalyears.php:166
-#: admin/inst_chart.php:83 admin/inst_lang.php:109 admin/inst_module.php:142
+#: admin/inst_chart.php:90 admin/inst_lang.php:109 admin/inst_module.php:152
 #: admin/inst_theme.php:87 admin/payment_terms.php:143 admin/printers.php:97
-#: admin/shipping_companies.php:107 admin/tags.php:141 admin/users.php:155
+#: admin/shipping_companies.php:107 admin/tags.php:141 admin/users.php:157
 #: gl/gl_budget.php:136 gl/manage/bank_accounts.php:134
 #: gl/manage/currencies.php:166 gl/manage/exchange_rates.php:99
-#: gl/manage/gl_account_classes.php:132 gl/manage/gl_account_types.php:154
+#: gl/manage/gl_account_classes.php:132 gl/manage/gl_account_types.php:160
 #: gl/manage/gl_quick_entries.php:202 gl/manage/gl_quick_entries.php:304
-#: gl/includes/ui/gl_bank_ui.inc:181 gl/includes/ui/gl_journal_ui.inc:152
-#: includes/ui/class.crud_view.inc:285 includes/ui/contacts_view.inc:64
-#: includes/ui/simple_crud_class.inc:54 includes/ui/ui_input.inc:304
-#: inventory/prices.php:164 inventory/purchasing_data.php:168
-#: inventory/includes/item_adjustments_ui.inc:102
-#: inventory/includes/stock_transfers_ui.inc:84
-#: inventory/manage/item_categories.php:148
-#: inventory/manage/item_codes.php:143 inventory/manage/item_units.php:111
-#: inventory/manage/locations.php:171 inventory/manage/sales_kits.php:52
-#: manufacturing/manage/bom_edit.php:60
+#: gl/includes/ui/gl_bank_ui.inc:181 gl/includes/ui/gl_journal_ui.inc:162
+#: includes/ui/attachment.inc:98 includes/ui/class.crud_view.inc:294
+#: includes/ui/contacts_view.inc:64 includes/ui/simple_crud_class.inc:54
+#: includes/ui/ui_input.inc:305 inventory/prices.php:164
+#: inventory/purchasing_data.php:168
+#: inventory/includes/item_adjustments_ui.inc:105
+#: inventory/includes/sav.item_adjustments_ui.inc:104
+#: inventory/includes/stock_transfers_ui.inc:86
+#: inventory/manage/item_categories.php:148 inventory/manage/item_codes.php:143
+#: inventory/manage/item_units.php:111 inventory/manage/locations.php:171
+#: inventory/manage/sales_kits.php:52 manufacturing/manage/bom_edit.php:61
 #: manufacturing/manage/work_centres.php:115
 #: manufacturing/includes/work_order_issue_ui.inc:63
-#: purchasing/includes/ui/invoice_ui.inc:317
-#: purchasing/includes/ui/po_ui.inc:251 sales/manage/credit_status.php:120
+#: purchasing/includes/ui/invoice_ui.inc:316
+#: purchasing/includes/ui/po_ui.inc:255 sales/manage/credit_status.php:120
 #: sales/manage/customer_branches.php:162
 #: sales/manage/recurrent_invoices.php:157 sales/manage/sales_areas.php:104
 #: sales/manage/sales_groups.php:100 sales/manage/sales_people.php:120
 #: sales/manage/sales_points.php:100 sales/manage/sales_types.php:122
 #: sales/includes/ui/sales_credit_ui.inc:194
 #: sales/includes/ui/sales_order_ui.inc:198 taxes/item_tax_types.php:140
-#: taxes/tax_groups.php:138 taxes/tax_types.php:133
+#: taxes/tax_groups.php:141 taxes/tax_types.php:133
 msgid "Delete"
 msgstr ""
 
-#: admin/attachments.php:208 admin/view_print_transaction.php:126
-#: admin/void_transaction.php:180 dimensions/inquiry/search_dimensions.php:124
-#: dimensions/view/view_dimension.php:55 gl/bank_account_reconcile.php:231
-#: gl/inquiry/bank_inquiry.php:71 gl/inquiry/gl_account_inquiry.php:126
-#: gl/inquiry/journal_inquiry.php:106 gl/inquiry/journal_inquiry.php:121
+#: admin/attachments.php:214 admin/view_print_transaction.php:126
+#: admin/void_transaction.php:186 dimensions/inquiry/search_dimensions.php:131
+#: dimensions/view/view_dimension.php:55 gl/bank_account_reconcile.php:267
+#: gl/inquiry/bank_inquiry.php:71 gl/inquiry/gl_account_inquiry.php:128
+#: gl/inquiry/journal_inquiry.php:112 gl/inquiry/journal_inquiry.php:127
 #: includes/ui/allocation_cart.inc:290
 #: inventory/inquiry/stock_movements.php:104
-#: manufacturing/search_work_orders.php:157
+#: manufacturing/search_work_orders.php:164
 #: manufacturing/includes/manufacturing_ui.inc:174
 #: manufacturing/includes/manufacturing_ui.inc:217
 #: manufacturing/includes/manufacturing_ui.inc:253
@@ -241,25 +258,26 @@ msgstr ""
 #: manufacturing/includes/manufacturing_ui.inc:295
 #: manufacturing/includes/manufacturing_ui.inc:346
 #: purchasing/view/view_po.php:115 purchasing/view/view_po.php:140
-#: purchasing/inquiry/po_search_completed.php:110
+#: purchasing/inquiry/po_search_completed.php:119
 #: purchasing/inquiry/po_search.php:117
 #: purchasing/inquiry/supplier_allocation_inquiry.php:137
-#: purchasing/inquiry/supplier_inquiry.php:178
+#: purchasing/inquiry/supplier_inquiry.php:174
 #: purchasing/allocations/supplier_allocation_main.php:95
-#: reporting/rep101.php:132 reporting/rep201.php:107 reporting/rep203.php:88
-#: reporting/rep306.php:141 reporting/rep601.php:79 reporting/rep602.php:80
-#: reporting/rep704.php:82 reporting/rep704.php:85 reporting/rep704.php:88
-#: reporting/rep710.php:78 reporting/includes/doctext.inc:166
-#: reporting/includes/doctext.inc:207 reporting/includes/doctext.inc:245
-#: sales/allocations/customer_allocation_main.php:88
-#: sales/view/view_sales_order.php:109 sales/view/view_sales_order.php:142
-#: sales/view/view_sales_order.php:179
+#: reporting/rep101.php:136 reporting/rep201.php:115 reporting/rep203.php:88
+#: reporting/rep306.php:141 reporting/rep310.php:142 reporting/rep601.php:81
+#: reporting/rep602.php:80 reporting/rep704.php:82 reporting/rep704.php:85
+#: reporting/rep704.php:88 reporting/rep710.php:78
+#: reporting/includes/doctext.inc:166 reporting/includes/doctext.inc:209
+#: reporting/includes/doctext.inc:247
+#: sales/allocations/customer_allocation_main.php:93
+#: sales/view/view_sales_order.php:111 sales/view/view_sales_order.php:144
+#: sales/view/view_sales_order.php:181
 #: sales/inquiry/customer_allocation_inquiry.php:147
-#: sales/inquiry/customer_inquiry.php:203
+#: sales/inquiry/customer_inquiry.php:201
 msgid "#"
 msgstr ""
 
-#: admin/attachments.php:209 admin/attachments.php:253
+#: admin/attachments.php:215 admin/attachments.php:267
 #: admin/crm_categories.php:88 admin/payment_terms.php:127
 #: admin/printers.php:84 admin/print_profiles.php:147
 #: gl/inquiry/accounts_list.php:39 gl/inquiry/accounts_list.php:52
@@ -270,180 +288,181 @@ msgstr ""
 #: inventory/manage/sales_kits.php:36 inventory/view/view_adjustment.php:54
 #: inventory/view/view_transfer.php:50 manufacturing/manage/bom_edit.php:43
 #: manufacturing/includes/manufacturing_ui.inc:28
-#: purchasing/includes/ui/invoice_ui.inc:501
-#: purchasing/includes/ui/invoice_ui.inc:513
-#: purchasing/po_receive_items.php:62 reporting/rep104.php:109
-#: reporting/rep105.php:114 reporting/rep204.php:84 reporting/rep303.php:120
-#: reporting/rep303.php:126 reporting/rep304.php:127 reporting/rep305.php:106
-#: reporting/rep306.php:141 reporting/rep307.php:114 reporting/rep308.php:223
-#: reporting/rep309.php:99 reporting/rep401.php:71
-#: sales/create_recurrent_invoices.php:203 sales/manage/credit_status.php:97
-#: sales/manage/recurrent_invoices.php:128
-#: sales/inquiry/sales_orders_view.php:284
-#: sales/inquiry/sales_orders_view.php:288 taxes/tax_groups.php:123
+#: purchasing/includes/ui/invoice_ui.inc:500
+#: purchasing/includes/ui/invoice_ui.inc:512 purchasing/po_receive_items.php:62
+#: reporting/rep104.php:109 reporting/rep105.php:115 reporting/rep204.php:84
+#: reporting/rep303.php:223 reporting/rep303.php:229 reporting/rep304.php:127
+#: reporting/rep305.php:106 reporting/rep306.php:141 reporting/rep307.php:114
+#: reporting/rep308.php:224 reporting/rep309.php:99 reporting/rep310.php:142
+#: reporting/rep401.php:71 sales/create_recurrent_invoices.php:204
+#: sales/manage/credit_status.php:97 sales/manage/recurrent_invoices.php:128
+#: sales/inquiry/sales_orders_view.php:290
+#: sales/inquiry/sales_orders_view.php:294 taxes/tax_groups.php:126
 #: taxes/tax_types.php:115
 msgid "Description"
 msgstr ""
 
-#: admin/attachments.php:210 admin/backups.php:67 admin/backups.php:152
+#: admin/attachments.php:216 admin/backups.php:74 admin/backups.php:160
+#: includes/ui/attachment.inc:84
 msgid "Filename"
 msgstr ""
 
-#: admin/attachments.php:211
+#: admin/attachments.php:217 includes/ui/attachment.inc:84
 msgid "Size"
 msgstr ""
 
-#: admin/attachments.php:212
+#: admin/attachments.php:218 includes/ui/attachment.inc:84
 msgid "Filetype"
 msgstr ""
 
-#: admin/attachments.php:213
+#: admin/attachments.php:219
 msgid "Date Uploaded"
 msgstr ""
 
-#: admin/attachments.php:247 admin/attachments.php:252
+#: admin/attachments.php:259 admin/attachments.php:265
 msgid "Transaction #"
 msgstr ""
 
-#: admin/attachments.php:254
+#: admin/attachments.php:268
 msgid "Attached File"
 msgstr ""
 
-#: admin/backups.php:21 admin/backups.php:40 admin/backups.php:118
-#: admin/backups.php:145 admin/backups.php:158 admin/backups.php:178
+#: admin/backups.php:21 admin/backups.php:47 admin/backups.php:125
+#: admin/backups.php:153 admin/backups.php:166 admin/backups.php:186
 msgid "Select backup file first."
 msgstr ""
 
-#: admin/backups.php:43
+#: admin/backups.php:50
 msgid "Backup and Restore Database"
 msgstr ""
 
-#: admin/backups.php:52
+#: admin/backups.php:59
 msgid "Backup paths have not been set correctly."
 msgstr ""
 
-#: admin/backups.php:53
+#: admin/backups.php:60
 msgid "Please contact System Administrator."
 msgstr ""
 
-#: admin/backups.php:54
+#: admin/backups.php:61
 msgid "cannot find backup directory"
 msgstr ""
 
-#: admin/backups.php:66
+#: admin/backups.php:73
 msgid "Backup successfully generated."
 msgstr ""
 
-#: admin/backups.php:69
+#: admin/backups.php:76
 msgid "Database backup failed."
 msgstr ""
 
-#: admin/backups.php:102 admin/create_coy.php:260 admin/fiscalyears.php:155
+#: admin/backups.php:109 admin/create_coy.php:268 admin/fiscalyears.php:155
 #: admin/inst_lang.php:85 admin/inst_lang.php:97
-#: dimensions/inquiry/search_dimensions.php:106
-#: gl/manage/bank_accounts.php:130 gl/manage/currencies.php:162
-#: gl/manage/gl_account_classes.php:126 gl/manage/gl_quick_entries.php:237
-#: includes/system_tests.inc:38 includes/system_tests.inc:113
-#: includes/system_tests.inc:126 includes/ui/class.reflines_crud.inc:56
-#: includes/ui/ui_lists.inc:1852 purchasing/manage/suppliers.php:122
-#: reporting/rep101.php:128 reporting/rep102.php:110 reporting/rep102.php:112
-#: reporting/rep104.php:103 reporting/rep106.php:81 reporting/rep114.php:74
-#: reporting/rep201.php:103 reporting/rep202.php:116 reporting/rep202.php:118
-#: reporting/rep203.php:84 reporting/rep303.php:112 reporting/rep303.php:116
-#: reporting/rep304.php:123 reporting/rep402.php:99 reporting/rep402.php:134
+#: dimensions/inquiry/search_dimensions.php:107 gl/manage/bank_accounts.php:130
+#: gl/manage/currencies.php:162 gl/manage/gl_account_classes.php:126
+#: gl/manage/gl_quick_entries.php:237 includes/system_tests.inc:41
+#: includes/system_tests.inc:116 includes/system_tests.inc:129
+#: includes/ui/class.reflines_crud.inc:56 includes/ui/ui_lists.inc:1877
+#: purchasing/manage/suppliers.php:232 reporting/rep101.php:121
+#: reporting/rep101.php:132 reporting/rep102.php:110 reporting/rep102.php:112
+#: reporting/rep104.php:103 reporting/rep106.php:82 reporting/rep114.php:74
+#: reporting/rep115.php:156 reporting/rep201.php:111 reporting/rep202.php:116
+#: reporting/rep202.php:118 reporting/rep203.php:84 reporting/rep206.php:111
+#: reporting/rep303.php:214 reporting/rep303.php:219 reporting/rep304.php:123
+#: reporting/rep402.php:131 reporting/rep402.php:132 reporting/rep402.php:183
 #: reporting/rep501.php:113 sales/manage/sales_points.php:94
 #: sales/manage/sales_points.php:95 sales/manage/sales_types.php:119
 #: taxes/item_tax_types.php:129
 msgid "No"
 msgstr ""
 
-#: admin/backups.php:142
+#: admin/backups.php:150
 msgid "Restore backup completed."
 msgstr ""
 
-#: admin/backups.php:151
+#: admin/backups.php:159
 msgid "File successfully deleted."
 msgstr ""
 
-#: admin/backups.php:156
+#: admin/backups.php:164
 msgid "Can't delete backup file."
 msgstr ""
 
-#: admin/backups.php:168
+#: admin/backups.php:176
 msgid "You can only upload *.sql backup files"
 msgstr ""
 
-#: admin/backups.php:170
+#: admin/backups.php:178
 msgid "Filename contains forbidden chars. Please rename file and try again."
 msgstr ""
 
-#: admin/backups.php:173
+#: admin/backups.php:181
 msgid "File uploaded to backup directory"
 msgstr ""
 
-#: admin/backups.php:176
+#: admin/backups.php:184
 msgid "File was not uploaded into the system."
 msgstr ""
 
-#: admin/backups.php:185
+#: admin/backups.php:193
 msgid "Create backup"
 msgstr ""
 
-#: admin/backups.php:186 sales/includes/ui/sales_order_ui.inc:581
-#: sales/includes/ui/sales_order_ui.inc:637
+#: admin/backups.php:194 sales/includes/ui/sales_order_ui.inc:585
+#: sales/includes/ui/sales_order_ui.inc:641
 msgid "Comments:"
 msgstr ""
 
-#: admin/backups.php:187
+#: admin/backups.php:195
 msgid "Compression:"
 msgstr ""
 
-#: admin/backups.php:189
+#: admin/backups.php:197
 msgid "Create Backup"
 msgstr ""
 
-#: admin/backups.php:191
+#: admin/backups.php:199
 msgid "Backup scripts maintenance"
 msgstr ""
 
-#: admin/backups.php:197
+#: admin/backups.php:205
 msgid "View Backup"
 msgstr ""
 
-#: admin/backups.php:198
+#: admin/backups.php:206
 msgid "Download Backup"
 msgstr ""
 
-#: admin/backups.php:199
+#: admin/backups.php:207
 msgid "Restore Backup"
 msgstr ""
 
-#: admin/backups.php:200
+#: admin/backups.php:208
 msgid ""
 "You are about to restore database from backup file.\n"
 "Do you want to continue?"
 msgstr ""
 
-#: admin/backups.php:202
+#: admin/backups.php:210
 msgid "Delete Backup"
 msgstr ""
 
-#: admin/backups.php:204
+#: admin/backups.php:212
 #, php-format
 msgid ""
 "You are about to remove selected backup file.\n"
 "Do you want to continue ?"
 msgstr ""
 
-#: admin/backups.php:210
+#: admin/backups.php:218
 msgid "Update security settings"
 msgstr ""
 
-#: admin/backups.php:211
+#: admin/backups.php:219
 msgid "Protect security settings"
 msgstr ""
 
-#: admin/backups.php:215
+#: admin/backups.php:223
 msgid "Upload file"
 msgstr ""
 
@@ -476,7 +495,7 @@ msgstr ""
 msgid "Your password has been updated."
 msgstr ""
 
-#: admin/change_current_user_password.php:85 admin/users.php:189
+#: admin/change_current_user_password.php:85 admin/users.php:191
 msgid "User login:"
 msgstr ""
 
@@ -508,229 +527,267 @@ msgstr ""
 msgid "The company name must be entered."
 msgstr ""
 
-#: admin/company_preferences.php:46
+#: admin/company_preferences.php:41
+msgid "Tax Periods must be positive number."
+msgstr ""
+
+#: admin/company_preferences.php:47
+msgid "Tax Last Periods must be positive number."
+msgstr ""
+
+#: admin/company_preferences.php:53
+msgid "Round Calculated field must be a positive number."
+msgstr ""
+
+#: admin/company_preferences.php:59
+msgid "Add Price from Std Cost field must be number."
+msgstr ""
+
+#: admin/company_preferences.php:70
 msgid "Error uploading logo file."
 msgstr ""
 
-#: admin/company_preferences.php:60
+#: admin/company_preferences.php:84
 msgid ""
 "Only jpg and png files are supported - a file extension of .jpg or .png is "
 "expected"
 msgstr ""
 
-#: admin/company_preferences.php:65 inventory/manage/items.php:109
+#: admin/company_preferences.php:89 inventory/manage/items.php:119
 msgid ""
 "The file size is over the maximum allowed. The maximum size allowed in KB is"
 msgstr ""
 
-#: admin/company_preferences.php:70 inventory/manage/items.php:99
-#: inventory/manage/items.php:114
+#: admin/company_preferences.php:94 inventory/manage/items.php:109
+#: inventory/manage/items.php:124
 msgid "Only graphics files can be uploaded"
 msgstr ""
 
-#: admin/company_preferences.php:78 admin/company_preferences.php:99
-#: inventory/manage/items.php:122
+#: admin/company_preferences.php:102 admin/company_preferences.php:123
+#: inventory/manage/items.php:132
 msgid "The existing image could not be removed"
 msgstr ""
 
-#: admin/company_preferences.php:88
+#: admin/company_preferences.php:112
 msgid "Error uploading logo file"
 msgstr ""
 
-#: admin/company_preferences.php:123
+#: admin/company_preferences.php:147
 msgid "Company setup has been updated."
 msgstr ""
 
-#: admin/company_preferences.php:169
+#: admin/company_preferences.php:223
 msgid "General settings"
 msgstr ""
 
-#: admin/company_preferences.php:171
+#: admin/company_preferences.php:225
 msgid "Name (to appear on reports):"
 msgstr ""
 
-#: admin/company_preferences.php:172 admin/shipping_companies.php:142
+#: admin/company_preferences.php:226 admin/shipping_companies.php:142
 #: includes/ui/contacts_view.inc:106 inventory/manage/locations.php:212
-#: sales/manage/customers.php:234 sales/includes/ui/sales_order_ui.inc:628
+#: sales/manage/customers.php:235 sales/includes/ui/sales_order_ui.inc:632
 msgid "Address:"
 msgstr ""
 
-#: admin/company_preferences.php:173
+#: admin/company_preferences.php:227
 msgid "Domicile:"
 msgstr ""
 
-#: admin/company_preferences.php:175 admin/shipping_companies.php:138
-#: purchasing/manage/suppliers.php:135 sales/manage/customer_branches.php:253
+#: admin/company_preferences.php:229 admin/shipping_companies.php:138
+#: purchasing/manage/suppliers.php:245 sales/manage/customer_branches.php:253
 msgid "Phone Number:"
 msgstr ""
 
-#: admin/company_preferences.php:176 includes/ui/contacts_view.inc:101
-#: purchasing/manage/suppliers.php:138 sales/manage/customer_branches.php:255
-#: sales/manage/customers.php:258
+#: admin/company_preferences.php:230 includes/ui/contacts_view.inc:101
+#: purchasing/manage/suppliers.php:248 sales/manage/customer_branches.php:255
+#: sales/manage/customers.php:259
 msgid "Fax Number:"
 msgstr ""
 
-#: admin/company_preferences.php:177 admin/users.php:211
+#: admin/company_preferences.php:231 admin/users.php:213
 msgid "Email Address:"
 msgstr ""
 
-#: admin/company_preferences.php:179
+#: admin/company_preferences.php:233
 msgid "BCC Address for all outgoing mails:"
 msgstr ""
 
-#: admin/company_preferences.php:181
+#: admin/company_preferences.php:235
 msgid "Official Company Number:"
 msgstr ""
 
-#: admin/company_preferences.php:182 purchasing/manage/suppliers.php:95
-#: sales/manage/customers.php:236
+#: admin/company_preferences.php:236 purchasing/manage/suppliers.php:205
+#: sales/manage/customers.php:237
 msgid "GSTNo:"
 msgstr ""
 
-#: admin/company_preferences.php:183
+#: admin/company_preferences.php:237
 msgid "Home Currency:"
 msgstr ""
 
-#: admin/company_preferences.php:185
+#: admin/company_preferences.php:239
 msgid "Company Logo:"
 msgstr ""
 
-#: admin/company_preferences.php:186
+#: admin/company_preferences.php:240
 msgid "New Company Logo (.jpg)"
 msgstr ""
 
-#: admin/company_preferences.php:187
+#: admin/company_preferences.php:241
 msgid "Delete Company Logo:"
 msgstr ""
 
-#: admin/company_preferences.php:189
+#: admin/company_preferences.php:243
 msgid "Automatic Revaluation Currency Accounts"
 msgstr ""
 
-#: admin/company_preferences.php:190
+#: admin/company_preferences.php:244
 msgid "Time Zone on Reports"
 msgstr ""
 
-#: admin/company_preferences.php:191
+#: admin/company_preferences.php:245
+msgid "Company Logo on Reports"
+msgstr ""
+
+#: admin/company_preferences.php:246
+msgid "Use Barcodes on Stocks"
+msgstr ""
+
+#: admin/company_preferences.php:247
+msgid "Auto Increase of Document References"
+msgstr ""
+
+#: admin/company_preferences.php:248
 msgid "Database Scheme Version"
 msgstr ""
 
-#: admin/company_preferences.php:195
+#: admin/company_preferences.php:252
 msgid "General Ledger Settings"
 msgstr ""
 
-#: admin/company_preferences.php:196 gl/gl_budget.php:62
+#: admin/company_preferences.php:253 gl/gl_budget.php:62
 msgid "Fiscal Year:"
 msgstr ""
 
-#: admin/company_preferences.php:197
+#: admin/company_preferences.php:254
 msgid "Tax Periods:"
 msgstr ""
 
-#: admin/company_preferences.php:197
+#: admin/company_preferences.php:254
 msgid "Months."
 msgstr ""
 
-#: admin/company_preferences.php:198
+#: admin/company_preferences.php:255
 msgid "Tax Last Period:"
 msgstr ""
 
-#: admin/company_preferences.php:198
+#: admin/company_preferences.php:255
 msgid "Months back."
 msgstr ""
 
-#: admin/company_preferences.php:199
+#: admin/company_preferences.php:256
 msgid "Put alternative Tax Include on Docs"
 msgstr ""
 
-#: admin/company_preferences.php:200
+#: admin/company_preferences.php:257
 msgid "Suppress Tax Rates on Docs"
 msgstr ""
 
-#: admin/company_preferences.php:202
+#: admin/company_preferences.php:259
 msgid "Sales Pricing"
 msgstr ""
 
-#: admin/company_preferences.php:203
+#: admin/company_preferences.php:260
 msgid "Base for auto price calculations:"
 msgstr ""
 
-#: admin/company_preferences.php:204
+#: admin/company_preferences.php:261
 msgid "No base price list"
 msgstr ""
 
-#: admin/company_preferences.php:206
+#: admin/company_preferences.php:263
 msgid "Add Price from Std Cost:"
 msgstr ""
 
-#: admin/company_preferences.php:208
+#: admin/company_preferences.php:265
 msgid "Round calculated prices to nearest:"
 msgstr ""
 
-#: admin/company_preferences.php:212
+#: admin/company_preferences.php:269
 msgid "Optional Modules"
 msgstr ""
 
-#: admin/company_preferences.php:213 includes/dashboard.inc:118
-#: reporting/reports_main.php:285
+#: admin/company_preferences.php:270 includes/dashboard.inc:118
+#: reporting/reports_main.php:316
 msgid "Manufacturing"
 msgstr ""
 
-#: admin/company_preferences.php:214 includes/dashboard.inc:116
-#: inventory/manage/items.php:24 reporting/reports_main.php:308
+#: admin/company_preferences.php:271 includes/dashboard.inc:116
+#: inventory/manage/items.php:24 reporting/reports_main.php:340
 msgid "Fixed Assets"
 msgstr ""
 
-#: admin/company_preferences.php:215
+#: admin/company_preferences.php:272
 msgid "Use Dimensions:"
 msgstr ""
 
-#: admin/company_preferences.php:217
+#: admin/company_preferences.php:274
 msgid "User Interface Options"
 msgstr ""
 
-#: admin/company_preferences.php:219
+#: admin/company_preferences.php:276
+msgid "Short Name and Name in List"
+msgstr ""
+
+#: admin/company_preferences.php:277
+msgid "Open Print Dialog Direct on Reports"
+msgstr ""
+
+#: admin/company_preferences.php:278
 msgid "Search Item List"
 msgstr ""
 
-#: admin/company_preferences.php:220
+#: admin/company_preferences.php:279
 msgid "Search Customer List"
 msgstr ""
 
-#: admin/company_preferences.php:221
+#: admin/company_preferences.php:280
 msgid "Search Supplier List"
 msgstr ""
 
-#: admin/company_preferences.php:222
+#: admin/company_preferences.php:281
 msgid "Login Timeout:"
 msgstr ""
 
-#: admin/company_preferences.php:222
+#: admin/company_preferences.php:281
 msgid "seconds"
 msgstr ""
 
-#: admin/company_preferences.php:227 admin/display_prefs.php:160
-#: admin/gl_setup.php:274 admin/inst_chart.php:77 admin/inst_lang.php:103
-#: admin/inst_module.php:136 admin/inst_module.php:154
-#: admin/inst_module.php:197 admin/inst_theme.php:81
-#: dimensions/dimension_entry.php:283 gl/gl_bank.php:409 gl/gl_budget.php:134
-#: gl/manage/gl_quick_entries.php:60 gl/includes/ui/gl_bank_ui.inc:267
-#: gl/includes/ui/gl_journal_ui.inc:267 includes/ui/class.crud_view.inc:289
-#: includes/ui/db_pager_view.inc:180 includes/ui/simple_crud_class.inc:56
-#: includes/ui/simple_crud_class.inc:225 includes/ui/ui_input.inc:226
-#: includes/ui/ui_input.inc:961 inventory/adjustments.php:255
-#: inventory/cost_update.php:150 inventory/reorder_level.php:111
-#: inventory/transfers.php:237 inventory/includes/item_adjustments_ui.inc:190
+#: admin/company_preferences.php:286 admin/display_prefs.php:162
+#: admin/gl_setup.php:309 admin/inst_chart.php:84 admin/inst_lang.php:103
+#: admin/inst_module.php:146 admin/inst_module.php:164
+#: admin/inst_module.php:207 admin/inst_theme.php:81
+#: dimensions/dimension_entry.php:283 gl/gl_bank.php:415 gl/gl_budget.php:134
+#: gl/manage/gl_quick_entries.php:60 gl/includes/ui/gl_bank_ui.inc:265
+#: gl/includes/ui/gl_journal_ui.inc:278 includes/ui/attachment.inc:169
+#: includes/ui/class.crud_view.inc:298 includes/ui/db_pager_view.inc:180
+#: includes/ui/simple_crud_class.inc:56 includes/ui/simple_crud_class.inc:225
+#: includes/ui/ui_input.inc:227 includes/ui/ui_input.inc:966
+#: inventory/adjustments.php:258 inventory/cost_update.php:150
+#: inventory/reorder_level.php:111 inventory/transfers.php:237
+#: inventory/includes/item_adjustments_ui.inc:204
+#: inventory/includes/sav.item_adjustments_ui.inc:194
 #: inventory/includes/stock_transfers_ui.inc:150
 #: inventory/manage/sales_kits.php:208 manufacturing/work_order_entry.php:437
 #: manufacturing/includes/work_order_issue_ui.inc:132
-#: purchasing/includes/ui/po_ui.inc:283 purchasing/includes/ui/po_ui.inc:436
+#: purchasing/includes/ui/po_ui.inc:287 purchasing/includes/ui/po_ui.inc:442
 #: purchasing/po_receive_items.php:325 sales/credit_note_entry.php:284
 #: sales/customer_credit_invoice.php:376 sales/customer_delivery.php:527
-#: sales/customer_invoice.php:662 sales/inquiry/sales_orders_view.php:316
+#: sales/customer_invoice.php:662 sales/inquiry/sales_orders_view.php:323
 #: sales/includes/ui/sales_credit_ui.inc:288
 #: sales/includes/ui/sales_order_ui.inc:231
-#: sales/includes/ui/sales_order_ui.inc:547
+#: sales/includes/ui/sales_order_ui.inc:551
 msgid "Update"
 msgstr ""
 
@@ -742,177 +799,194 @@ msgstr ""
 msgid "Database settings are not specified."
 msgstr ""
 
-#: admin/create_coy.php:53
+#: admin/create_coy.php:48
+msgid "Database port has to be numeric or empty."
+msgstr ""
+
+#: admin/create_coy.php:59
 msgid "This database settings are already used by another company."
 msgstr ""
 
-#: admin/create_coy.php:58
+#: admin/create_coy.php:64
 msgid ""
 "You cannot have table set without prefix together with prefixed sets in the "
 "same database."
 msgstr ""
 
-#: admin/create_coy.php:117
+#: admin/create_coy.php:124
 msgid "Error creating Database: "
 msgstr ""
 
-#: admin/create_coy.php:117
+#: admin/create_coy.php:124
 msgid ", Please create it manually"
 msgstr ""
 
-#: admin/create_coy.php:123
+#: admin/create_coy.php:130
 msgid "Cannot create new company due to bugs in sql file."
 msgstr ""
 
-#: admin/create_coy.php:141 admin/create_coy.php:209
+#: admin/create_coy.php:148 admin/create_coy.php:216
 msgid "Cannot open the configuration file - "
 msgstr ""
 
-#: admin/create_coy.php:143 admin/create_coy.php:211
+#: admin/create_coy.php:150 admin/create_coy.php:218
 msgid "Cannot write to the configuration file - "
 msgstr ""
 
-#: admin/create_coy.php:145 admin/create_coy.php:181 admin/create_coy.php:213
+#: admin/create_coy.php:152 admin/create_coy.php:188 admin/create_coy.php:220
 msgid "The configuration file "
 msgstr ""
 
-#: admin/create_coy.php:145 admin/create_coy.php:181 admin/create_coy.php:213
-#: admin/db/maintenance_db.inc:251
+#: admin/create_coy.php:152 admin/create_coy.php:188 admin/create_coy.php:220
+#: admin/db/maintenance_db.inc:253
 msgid ""
 " is not writable. Change its permissions so it is, then re-run the operation."
 msgstr ""
 
-#: admin/create_coy.php:157
+#: admin/create_coy.php:164
 msgid "New company has been created."
 msgstr ""
 
-#: admin/create_coy.php:157
+#: admin/create_coy.php:164
 msgid "Company has been updated."
 msgstr ""
 
-#: admin/create_coy.php:174
+#: admin/create_coy.php:181
 msgid ""
 "Broken company subdirectories system. You have to remove this company "
 "manually."
 msgstr ""
 
-#: admin/create_coy.php:190
+#: admin/create_coy.php:197
 msgid "Cannot rename subdirectory to temporary name."
 msgstr ""
 
-#: admin/create_coy.php:196
+#: admin/create_coy.php:203
 msgid "Cannot rename company subdirectory"
 msgstr ""
 
-#: admin/create_coy.php:202
+#: admin/create_coy.php:209
 msgid "Error removing Database: "
 msgstr ""
 
-#: admin/create_coy.php:202
+#: admin/create_coy.php:209
 msgid ", please remove it manually"
 msgstr ""
 
-#: admin/create_coy.php:222
+#: admin/create_coy.php:229
 msgid "Cannot remove temporary renamed company data directory "
 msgstr ""
 
-#: admin/create_coy.php:225
+#: admin/create_coy.php:232
 msgid "Selected company has been deleted"
 msgstr ""
 
-#: admin/create_coy.php:240
+#: admin/create_coy.php:247
 msgid "Database Host"
 msgstr ""
 
-#: admin/create_coy.php:240 admin/create_coy.php:321 admin/create_coy.php:331
+#: admin/create_coy.php:247
+msgid "Database Port"
+msgstr ""
+
+#: admin/create_coy.php:247 admin/create_coy.php:333 admin/create_coy.php:344
 msgid "Database User"
 msgstr ""
 
-#: admin/create_coy.php:241 admin/create_coy.php:323 admin/create_coy.php:332
+#: admin/create_coy.php:248 admin/create_coy.php:335 admin/create_coy.php:345
 msgid "Database Name"
 msgstr ""
 
-#: admin/create_coy.php:241 admin/create_coy.php:325 admin/create_coy.php:333
+#: admin/create_coy.php:248 admin/create_coy.php:337 admin/create_coy.php:347
 msgid "Table Pref"
 msgstr ""
 
-#: admin/create_coy.php:241
+#: admin/create_coy.php:248
 msgid "Charset"
 msgstr ""
 
-#: admin/create_coy.php:241 admin/inst_lang.php:36
-#: admin/print_profiles.php:161 includes/ui/class.reflines_crud.inc:38
+#: admin/create_coy.php:248 admin/inst_lang.php:36 admin/print_profiles.php:161
+#: includes/ui/class.reflines_crud.inc:38
 #: purchasing/includes/ui/invoice_ui.inc:140
 #: purchasing/includes/ui/invoice_ui.inc:143
 #: purchasing/includes/ui/po_ui.inc:172 purchasing/includes/ui/po_ui.inc:174
 msgid "Default"
 msgstr ""
 
-#: admin/create_coy.php:260 admin/create_coy.php:337 admin/fiscalyears.php:159
+#: admin/create_coy.php:268 admin/create_coy.php:351 admin/fiscalyears.php:159
 #: admin/inst_lang.php:85 admin/inst_lang.php:97
-#: dimensions/inquiry/search_dimensions.php:106
-#: gl/manage/bank_accounts.php:128 gl/manage/currencies.php:162
-#: gl/manage/gl_account_classes.php:126 gl/manage/gl_quick_entries.php:237
-#: includes/system_tests.inc:38 includes/system_tests.inc:113
-#: includes/system_tests.inc:126 includes/ui/class.reflines_crud.inc:56
-#: includes/ui/class.reflines_crud.inc:101 includes/ui/ui_lists.inc:1853
-#: purchasing/manage/suppliers.php:122 reporting/rep101.php:127
-#: reporting/rep102.php:109 reporting/rep102.php:111 reporting/rep104.php:105
-#: reporting/rep106.php:83 reporting/rep114.php:76 reporting/rep201.php:102
-#: reporting/rep202.php:115 reporting/rep202.php:117 reporting/rep203.php:83
-#: reporting/rep303.php:107 reporting/rep303.php:115 reporting/rep304.php:122
-#: reporting/rep402.php:99 reporting/rep501.php:111
+#: dimensions/inquiry/search_dimensions.php:107 gl/manage/bank_accounts.php:128
+#: gl/manage/currencies.php:162 gl/manage/gl_account_classes.php:126
+#: gl/manage/gl_quick_entries.php:237 includes/system_tests.inc:41
+#: includes/system_tests.inc:116 includes/system_tests.inc:129
+#: includes/ui/class.reflines_crud.inc:56
+#: includes/ui/class.reflines_crud.inc:101 includes/ui/ui_lists.inc:1878
+#: purchasing/manage/suppliers.php:232 reporting/rep101.php:120
+#: reporting/rep101.php:131 reporting/rep102.php:109 reporting/rep102.php:111
+#: reporting/rep104.php:105 reporting/rep106.php:84 reporting/rep114.php:76
+#: reporting/rep115.php:155 reporting/rep201.php:110 reporting/rep202.php:115
+#: reporting/rep202.php:117 reporting/rep203.php:83 reporting/rep206.php:110
+#: reporting/rep303.php:209 reporting/rep303.php:218 reporting/rep304.php:122
+#: reporting/rep402.php:131 reporting/rep402.php:132 reporting/rep501.php:111
 #: sales/manage/sales_points.php:94 sales/manage/sales_points.php:95
 #: sales/manage/sales_types.php:119 taxes/item_tax_types.php:133
 msgid "Yes"
 msgstr ""
 
-#: admin/create_coy.php:266
+#: admin/create_coy.php:274
 #, php-format
 msgid ""
 "You are about to remove company \\'%s\\'.\n"
 "Do you want to continue ?"
 msgstr ""
 
-#: admin/create_coy.php:274
+#: admin/create_coy.php:282
 msgid "The marked company is the current company which cannot be deleted."
 msgstr ""
 
-#: admin/create_coy.php:275
+#: admin/create_coy.php:283
 msgid ""
 "If no Admin Password is entered, the new Admin Password will be "
 "'<b>password</b>' by default "
 msgstr ""
 
-#: admin/create_coy.php:320 admin/create_coy.php:330 admin/printers.php:84
+#: admin/create_coy.php:284
+msgid "Set Only Port value if you cannot use the default port 3306."
+msgstr ""
+
+#: admin/create_coy.php:331 admin/create_coy.php:342 admin/printers.php:84
 msgid "Host"
 msgstr ""
 
-#: admin/create_coy.php:322
+#: admin/create_coy.php:332 admin/create_coy.php:343 admin/printers.php:135
+msgid "Port"
+msgstr ""
+
+#: admin/create_coy.php:334
 msgid "Database Password"
 msgstr ""
 
-#: admin/create_coy.php:324
+#: admin/create_coy.php:336 admin/create_coy.php:346
 msgid "Database Collation:"
 msgstr ""
 
-#: admin/create_coy.php:325 admin/inst_chart.php:71 admin/inst_chart.php:73
-#: admin/inst_lang.php:87 admin/inst_lang.php:90 admin/inst_module.php:125
+#: admin/create_coy.php:337 admin/inst_chart.php:78 admin/inst_chart.php:80
+#: admin/inst_lang.php:87 admin/inst_lang.php:90 admin/inst_module.php:135
 #: admin/inst_theme.php:76 admin/inst_theme.php:78
-#: gl/manage/gl_account_types.php:189 includes/db/audit_trail_db.inc:127
-#: includes/ui/allocation_cart.inc:316 inventory/manage/items.php:446
+#: gl/manage/gl_account_types.php:195 includes/db/audit_trail_db.inc:128
+#: includes/ui/allocation_cart.inc:316 inventory/manage/items.php:438
 msgid "None"
 msgstr ""
 
-#: admin/create_coy.php:326 admin/create_coy.php:335 admin/create_coy.php:337
+#: admin/create_coy.php:338 admin/create_coy.php:349 admin/create_coy.php:351
 msgid "Default Company"
 msgstr ""
 
-#: admin/create_coy.php:327
+#: admin/create_coy.php:339
 msgid "Database Script"
 msgstr ""
 
-#: admin/create_coy.php:328
+#: admin/create_coy.php:340
 msgid "New script Admin Password"
 msgstr ""
 
@@ -982,164 +1056,164 @@ msgstr ""
 msgid "Query size must be integer and greater than zero."
 msgstr ""
 
-#: admin/display_prefs.php:61
+#: admin/display_prefs.php:63
 msgid ""
 "Display settings have been updated. Keep in mind that changed settings are "
 "restored on every login in demo mode."
 msgstr ""
 
-#: admin/display_prefs.php:63
+#: admin/display_prefs.php:65
 msgid "Display settings have been updated."
 msgstr ""
 
-#: admin/display_prefs.php:72
+#: admin/display_prefs.php:74
 msgid "Decimal Places"
 msgstr ""
 
-#: admin/display_prefs.php:74
+#: admin/display_prefs.php:76
 msgid "Prices/Amounts:"
 msgstr ""
 
-#: admin/display_prefs.php:75
+#: admin/display_prefs.php:77
 msgid "Quantities:"
 msgstr ""
 
-#: admin/display_prefs.php:76
+#: admin/display_prefs.php:78
 msgid "Exchange Rates:"
 msgstr ""
 
-#: admin/display_prefs.php:77
+#: admin/display_prefs.php:79
 msgid "Percentages:"
 msgstr ""
 
-#: admin/display_prefs.php:79
+#: admin/display_prefs.php:81
 msgid "Date Format and Separators"
 msgstr ""
 
-#: admin/display_prefs.php:81
+#: admin/display_prefs.php:83
 msgid "Date Format:"
 msgstr ""
 
-#: admin/display_prefs.php:83
+#: admin/display_prefs.php:85
 msgid "Date Separator:"
 msgstr ""
 
-#: admin/display_prefs.php:88
+#: admin/display_prefs.php:90
 msgid "Thousand Separator:"
 msgstr ""
 
-#: admin/display_prefs.php:93
+#: admin/display_prefs.php:95
 msgid "Decimal Separator:"
 msgstr ""
 
-#: admin/display_prefs.php:98
+#: admin/display_prefs.php:100
 msgid "Use Date Picker"
 msgstr ""
 
-#: admin/display_prefs.php:103
+#: admin/display_prefs.php:105
 msgid "Reports"
 msgstr ""
 
-#: admin/display_prefs.php:105
+#: admin/display_prefs.php:107
 msgid "Save Report Selection Days:"
 msgstr ""
 
-#: admin/display_prefs.php:107
+#: admin/display_prefs.php:109
 msgid "Default Report Destination:"
 msgstr ""
 
-#: admin/display_prefs.php:108
+#: admin/display_prefs.php:110
 msgid "Excel"
 msgstr ""
 
-#: admin/display_prefs.php:108 reporting/includes/reports_classes.inc:235
+#: admin/display_prefs.php:110 reporting/includes/reports_classes.inc:235
 msgid "PDF/Printer"
 msgstr ""
 
-#: admin/display_prefs.php:110
+#: admin/display_prefs.php:112
 msgid "Default Report Orientation:"
 msgstr ""
 
-#: admin/display_prefs.php:111 reporting/includes/reports_classes.inc:242
+#: admin/display_prefs.php:113 reporting/includes/reports_classes.inc:242
 msgid "Landscape"
 msgstr ""
 
-#: admin/display_prefs.php:111 reporting/includes/reports_classes.inc:242
+#: admin/display_prefs.php:113 reporting/includes/reports_classes.inc:242
 msgid "Portrait"
 msgstr ""
 
-#: admin/display_prefs.php:115 applications/setup.php:42
-#: includes/sysnames.inc:99
+#: admin/display_prefs.php:117 applications/setup.php:42
+#: includes/sysnames.inc:101
 msgid "Miscellaneous"
 msgstr ""
 
-#: admin/display_prefs.php:117
+#: admin/display_prefs.php:119
 msgid "Show hints for new users:"
 msgstr ""
 
-#: admin/display_prefs.php:119
+#: admin/display_prefs.php:121
 msgid "Show GL Information:"
 msgstr ""
 
-#: admin/display_prefs.php:121
+#: admin/display_prefs.php:123
 msgid "Show Item Codes:"
 msgstr ""
 
-#: admin/display_prefs.php:128
+#: admin/display_prefs.php:130
 msgid "Page Size:"
 msgstr ""
 
-#: admin/display_prefs.php:130
+#: admin/display_prefs.php:132
 msgid "Start-up Tab"
 msgstr ""
 
-#: admin/display_prefs.php:138 admin/users.php:219
+#: admin/display_prefs.php:140 admin/users.php:221
 msgid "Printing profile"
 msgstr ""
 
-#: admin/display_prefs.php:139 admin/users.php:220
+#: admin/display_prefs.php:141 admin/users.php:222
 msgid "Browser printing support"
 msgstr ""
 
-#: admin/display_prefs.php:141
+#: admin/display_prefs.php:143
 msgid "Use popup window to display reports:"
 msgstr ""
 
-#: admin/display_prefs.php:142 admin/users.php:223
+#: admin/display_prefs.php:144 admin/users.php:225
 msgid "Set this option to on if your browser directly supports pdf files"
 msgstr ""
 
-#: admin/display_prefs.php:144
+#: admin/display_prefs.php:146
 msgid "Use icons instead of text links:"
 msgstr ""
 
-#: admin/display_prefs.php:145
+#: admin/display_prefs.php:147
 msgid "Set this option to on for using icons instead of text links"
 msgstr ""
 
-#: admin/display_prefs.php:147
+#: admin/display_prefs.php:149
 msgid "Remember last document date:"
 msgstr ""
 
-#: admin/display_prefs.php:148
+#: admin/display_prefs.php:150
 msgid ""
 "If set document date is remembered on subsequent documents, otherwise "
 "default is current date"
 msgstr ""
 
-#: admin/display_prefs.php:150
+#: admin/display_prefs.php:152
 msgid "Query page size:"
 msgstr ""
 
-#: admin/display_prefs.php:152
+#: admin/display_prefs.php:154
 msgid "Transaction days:"
 msgstr ""
 
-#: admin/display_prefs.php:154 admin/inst_lang.php:35
+#: admin/display_prefs.php:156 admin/inst_lang.php:35
 msgid "Language"
 msgstr ""
 
-#: admin/display_prefs.php:156 admin/users.php:215
+#: admin/display_prefs.php:158 admin/users.php:217
 msgid "Language:"
 msgstr ""
 
@@ -1202,10 +1276,10 @@ msgstr ""
 msgid "Fiscal Year End"
 msgstr ""
 
-#: admin/fiscalyears.php:138 dimensions/inquiry/search_dimensions.php:130
-#: dimensions/inquiry/search_dimensions.php:136 includes/ui/ui_lists.inc:743
-#: includes/ui/ui_view.inc:1546 manufacturing/search_work_orders.php:114
-#: reporting/rep402.php:103 reporting/rep501.php:87 reporting/rep710.php:113
+#: admin/fiscalyears.php:138 dimensions/inquiry/search_dimensions.php:137
+#: dimensions/inquiry/search_dimensions.php:144 includes/ui/ui_lists.inc:761
+#: includes/ui/ui_view.inc:1580 manufacturing/search_work_orders.php:116
+#: reporting/rep402.php:136 reporting/rep501.php:87 reporting/rep710.php:113
 #: reporting/includes/excel_report.inc:231
 #: reporting/includes/pdf_report.inc:267
 msgid "Closed"
@@ -1243,105 +1317,122 @@ msgstr ""
 msgid "System and General GL Setup"
 msgstr ""
 
-#: admin/gl_setup.php:34
-msgid "The delivery over-receive allowance must be between 0 and 100."
+#: admin/gl_setup.php:34 admin/gl_setup.php:83
+msgid "The past due days interval allowance must be between 0 and 100."
 msgstr ""
 
 #: admin/gl_setup.php:41
-msgid "The invoice over-charge allowance must be between 0 and 100."
+msgid "Quote Valid Days is not valid number."
 msgstr ""
 
 #: admin/gl_setup.php:48
-msgid "The past due days interval allowance must be between 0 and 100."
+msgid "Delivery Required By is not valid number."
+msgstr ""
+
+#: admin/gl_setup.php:55
+msgid "Receival Required By is not valid number."
+msgstr ""
+
+#: admin/gl_setup.php:62
+msgid "Work Order Required By After is not valid number."
+msgstr ""
+
+#: admin/gl_setup.php:69
+msgid "The delivery over-receive allowance must be between 0 and 100."
+msgstr ""
+
+#: admin/gl_setup.php:76
+msgid "The invoice over-charge allowance must be between 0 and 100."
 msgstr ""
 
-#: admin/gl_setup.php:59
+#: admin/gl_setup.php:94
 msgid "Before GRN Clearing Account can be changed all GRNs have to be invoiced"
 msgstr ""
 
-#: admin/gl_setup.php:66 admin/db/fiscalyears_db.inc:142
+#: admin/gl_setup.php:101 admin/db/fiscalyears_db.inc:142
 msgid ""
 "The Retained Earnings Account should be a Balance Account or the Profit and "
 "Loss Year Account should be an Expense Account (preferred the last one in "
 "the Expense Class)"
 msgstr ""
 
-#: admin/gl_setup.php:89
+#: admin/gl_setup.php:124
 msgid "The general GL setup has been updated."
 msgstr ""
 
-#: admin/gl_setup.php:154
+#: admin/gl_setup.php:189
 msgid "General GL"
 msgstr ""
 
-#: admin/gl_setup.php:156
+#: admin/gl_setup.php:191
 msgid "Past Due Days Interval:"
 msgstr ""
 
-#: admin/gl_setup.php:156 admin/gl_setup.php:174 admin/gl_setup.php:208
-#: admin/gl_setup.php:210 admin/gl_setup.php:230 admin/gl_setup.php:268
+#: admin/gl_setup.php:191 admin/gl_setup.php:209 admin/gl_setup.php:243
+#: admin/gl_setup.php:245 admin/gl_setup.php:265 admin/gl_setup.php:303
 #: admin/payment_terms.php:140
 msgid "days"
 msgstr ""
 
-#: admin/gl_setup.php:158
+#: admin/gl_setup.php:193
 msgid "Accounts Type:"
 msgstr ""
 
-#: admin/gl_setup.php:160
+#: admin/gl_setup.php:195
 msgid "Retained Earnings:"
 msgstr ""
 
-#: admin/gl_setup.php:162
+#: admin/gl_setup.php:197
 msgid "Profit/Loss Year:"
 msgstr ""
 
-#: admin/gl_setup.php:164
+#: admin/gl_setup.php:199
 msgid "Exchange Variances Account:"
 msgstr ""
 
-#: admin/gl_setup.php:166 gl/manage/bank_accounts.php:194
+#: admin/gl_setup.php:201 gl/manage/bank_accounts.php:194
 msgid "Bank Charges Account:"
 msgstr ""
 
-#: admin/gl_setup.php:168
+#: admin/gl_setup.php:203
 msgid "Tax Algorithm:"
 msgstr ""
 
-#: admin/gl_setup.php:172
+#: admin/gl_setup.php:207
 msgid "Dimension Defaults"
 msgstr ""
 
-#: admin/gl_setup.php:174
+#: admin/gl_setup.php:209
 msgid "Dimension Required By After:"
 msgstr ""
 
-#: admin/gl_setup.php:178
+#: admin/gl_setup.php:213
 msgid "Customers and Sales"
 msgstr ""
 
-#: admin/gl_setup.php:180
+#: admin/gl_setup.php:215
 msgid "Default Credit Limit:"
 msgstr ""
 
-#: admin/gl_setup.php:182
+#: admin/gl_setup.php:217
 msgid "Invoice Identification:"
 msgstr ""
 
-#: admin/gl_setup.php:182 gl/manage/bank_accounts.php:110
-#: includes/ui/ui_view.inc:546
+#: admin/gl_setup.php:217 gl/manage/bank_accounts.php:110
+#: includes/ui/ui_view.inc:552
 msgid "Number"
 msgstr ""
 
-#: admin/gl_setup.php:182 admin/view_print_transaction.php:127
-#: admin/void_transaction.php:181 dimensions/inquiry/search_dimensions.php:125
-#: dimensions/view/view_dimension.php:55 gl/bank_account_reconcile.php:232
-#: gl/inquiry/bank_inquiry.php:71 gl/inquiry/journal_inquiry.php:112
-#: gl/view/bank_transfer_view.php:86 gl/view/gl_deposit_view.php:80
-#: gl/view/gl_payment_view.php:78 gl/view/gl_trans_view.php:38
-#: includes/ui/contacts_view.inc:40 inventory/inquiry/stock_movements.php:104
+#: admin/gl_setup.php:217 admin/view_print_transaction.php:127
+#: admin/void_transaction.php:187 dimensions/inquiry/search_dimensions.php:132
+#: dimensions/view/view_dimension.php:55 gl/bank_account_reconcile.php:268
+#: gl/inquiry/bank_inquiry.php:71 gl/inquiry/gl_account_inquiry.php:128
+#: gl/inquiry/journal_inquiry.php:118 gl/view/bank_transfer_view.php:86
+#: gl/view/gl_deposit_view.php:80 gl/view/gl_payment_view.php:78
+#: gl/view/gl_trans_view.php:38 includes/ui/contacts_view.inc:40
+#: inventory/inquiry/stock_movements.php:104
 #: inventory/view/view_adjustment.php:43 inventory/view/view_transfer.php:36
-#: manufacturing/search_work_orders.php:158
+#: manufacturing/search_work_orders.php:165
 #: manufacturing/view/wo_issue_view.php:42
 #: manufacturing/view/wo_production_view.php:43
 #: manufacturing/includes/manufacturing_ui.inc:174
@@ -1350,203 +1441,203 @@ msgstr ""
 #: manufacturing/includes/manufacturing_ui.inc:295
 #: manufacturing/includes/manufacturing_ui.inc:346
 #: purchasing/includes/ui/grn_ui.inc:32 purchasing/includes/ui/grn_ui.inc:64
-#: purchasing/includes/ui/po_ui.inc:298 purchasing/view/view_po.php:115
+#: purchasing/includes/ui/po_ui.inc:302 purchasing/view/view_po.php:115
 #: purchasing/view/view_supp_credit.php:43
 #: purchasing/view/view_supp_invoice.php:47
 #: purchasing/view/view_supp_payment.php:73
-#: purchasing/inquiry/po_search_completed.php:111
+#: purchasing/inquiry/po_search_completed.php:120
 #: purchasing/inquiry/po_search.php:118
 #: purchasing/inquiry/supplier_allocation_inquiry.php:138
-#: purchasing/inquiry/supplier_inquiry.php:179
+#: purchasing/inquiry/supplier_inquiry.php:175
 #: purchasing/allocations/supplier_allocation_main.php:96
-#: reporting/rep501.php:87 reporting/rep601.php:79 reporting/rep602.php:80
-#: reporting/rep702.php:53 reporting/includes/doctext.inc:220
+#: reporting/rep501.php:87 reporting/rep601.php:81 reporting/rep602.php:80
+#: reporting/rep702.php:53 reporting/includes/doctext.inc:222
 #: sales/customer_credit_invoice.php:241 sales/customer_credit_invoice.php:246
 #: sales/customer_delivery.php:333 sales/customer_delivery.php:338
 #: sales/customer_invoice.php:445 sales/customer_invoice.php:450
-#: sales/allocations/customer_allocation_main.php:89
+#: sales/allocations/customer_allocation_main.php:94
 #: sales/view/view_dispatch.php:85 sales/view/view_invoice.php:85
-#: sales/view/view_receipt.php:39 sales/view/view_sales_order.php:94
+#: sales/view/view_receipt.php:39 sales/view/view_sales_order.php:96
 #: sales/inquiry/customer_allocation_inquiry.php:148
-#: sales/inquiry/customer_inquiry.php:205
-#: sales/inquiry/sales_deliveries_view.php:173
+#: sales/inquiry/customer_inquiry.php:203
+#: sales/inquiry/sales_deliveries_view.php:174
 #: sales/includes/ui/sales_credit_ui.inc:81
 #: sales/includes/ui/sales_credit_ui.inc:83
 #: sales/includes/ui/sales_order_ui.inc:361
 msgid "Reference"
 msgstr ""
 
-#: admin/gl_setup.php:184
+#: admin/gl_setup.php:219
 msgid "Accumulate batch shipping:"
 msgstr ""
 
-#: admin/gl_setup.php:186
+#: admin/gl_setup.php:221
 msgid "Print Item Image on Quote:"
 msgstr ""
 
-#: admin/gl_setup.php:188
+#: admin/gl_setup.php:223
 msgid "Legal Text on Invoice:"
 msgstr ""
 
-#: admin/gl_setup.php:190
+#: admin/gl_setup.php:225
 msgid "Shipping Charged Account:"
 msgstr ""
 
-#: admin/gl_setup.php:192
+#: admin/gl_setup.php:227
 msgid "Deferred Income Account:"
 msgstr ""
 
-#: admin/gl_setup.php:193
+#: admin/gl_setup.php:228
 msgid "Not used"
 msgstr ""
 
-#: admin/gl_setup.php:197
+#: admin/gl_setup.php:232
 msgid "Customers and Sales Defaults"
 msgstr ""
 
-#: admin/gl_setup.php:199
+#: admin/gl_setup.php:234
 msgid "Receivable Account:"
 msgstr ""
 
-#: admin/gl_setup.php:201 admin/gl_setup.php:246
-#: inventory/manage/item_categories.php:228 inventory/manage/items.php:468
+#: admin/gl_setup.php:236 admin/gl_setup.php:281
+#: inventory/manage/item_categories.php:228 inventory/manage/items.php:460
 #: sales/manage/customer_branches.php:242
 msgid "Sales Account:"
 msgstr ""
 
-#: admin/gl_setup.php:204 sales/manage/customer_branches.php:243
+#: admin/gl_setup.php:239 sales/manage/customer_branches.php:243
 msgid "Sales Discount Account:"
 msgstr ""
 
-#: admin/gl_setup.php:206 sales/manage/customer_branches.php:245
+#: admin/gl_setup.php:241 sales/manage/customer_branches.php:245
 msgid "Prompt Payment Discount Account:"
 msgstr ""
 
-#: admin/gl_setup.php:208
+#: admin/gl_setup.php:243
 msgid "Quote Valid Days:"
 msgstr ""
 
-#: admin/gl_setup.php:210
+#: admin/gl_setup.php:245
 msgid "Delivery Required By:"
 msgstr ""
 
-#: admin/gl_setup.php:216
+#: admin/gl_setup.php:251
 msgid "Suppliers and Purchasing"
 msgstr ""
 
-#: admin/gl_setup.php:218
+#: admin/gl_setup.php:253
 msgid "Delivery Over-Receive Allowance:"
 msgstr ""
 
-#: admin/gl_setup.php:220
+#: admin/gl_setup.php:255
 msgid "Invoice Over-Charge Allowance:"
 msgstr ""
 
-#: admin/gl_setup.php:222
+#: admin/gl_setup.php:257
 msgid "Suppliers and Purchasing Defaults"
 msgstr ""
 
-#: admin/gl_setup.php:224
+#: admin/gl_setup.php:259
 msgid "Payable Account:"
 msgstr ""
 
-#: admin/gl_setup.php:226 purchasing/manage/suppliers.php:131
+#: admin/gl_setup.php:261 purchasing/manage/suppliers.php:241
 msgid "Purchase Discount Account:"
 msgstr ""
 
-#: admin/gl_setup.php:228
+#: admin/gl_setup.php:263
 msgid "GRN Clearing Account:"
 msgstr ""
 
-#: admin/gl_setup.php:228
+#: admin/gl_setup.php:263
 msgid "No postings on GRN"
 msgstr ""
 
-#: admin/gl_setup.php:230
+#: admin/gl_setup.php:265
 msgid "Receival Required By:"
 msgstr ""
 
-#: admin/gl_setup.php:232
+#: admin/gl_setup.php:267
 msgid "Show PO item codes:"
 msgstr ""
 
-#: admin/gl_setup.php:234 reporting/reports_main.php:208
+#: admin/gl_setup.php:269 reporting/reports_main.php:229
 msgid "Inventory"
 msgstr ""
 
-#: admin/gl_setup.php:236
+#: admin/gl_setup.php:271
 msgid "Allow Negative Inventory:"
 msgstr ""
 
-#: admin/gl_setup.php:237
+#: admin/gl_setup.php:272
 msgid "Warning:  This may cause a delay in GL postings"
 msgstr ""
 
-#: admin/gl_setup.php:239
+#: admin/gl_setup.php:274
 msgid "No zero-amounts (Service):"
 msgstr ""
 
-#: admin/gl_setup.php:241
+#: admin/gl_setup.php:276
 msgid "Location Notifications:"
 msgstr ""
 
-#: admin/gl_setup.php:243
+#: admin/gl_setup.php:278
 msgid "Allow Negative Prices:"
 msgstr ""
 
-#: admin/gl_setup.php:245
+#: admin/gl_setup.php:280
 msgid "Items Defaults"
 msgstr ""
 
-#: admin/gl_setup.php:248 inventory/manage/item_categories.php:244
-#: inventory/manage/items.php:477
+#: admin/gl_setup.php:283 inventory/manage/item_categories.php:244
+#: inventory/manage/items.php:469
 msgid "Inventory Account:"
 msgstr ""
 
-#: admin/gl_setup.php:250 inventory/manage/item_categories.php:232
-#: inventory/manage/item_categories.php:246 inventory/manage/items.php:478
-#: inventory/manage/items.php:483
+#: admin/gl_setup.php:285 inventory/manage/item_categories.php:232
+#: inventory/manage/item_categories.php:246 inventory/manage/items.php:470
+#: inventory/manage/items.php:475
 msgid "C.O.G.S. Account:"
 msgstr ""
 
-#: admin/gl_setup.php:252 inventory/manage/item_categories.php:247
-#: inventory/manage/items.php:479
+#: admin/gl_setup.php:287 inventory/manage/item_categories.php:247
+#: inventory/manage/items.php:471
 msgid "Inventory Adjustments Account:"
 msgstr ""
 
-#: admin/gl_setup.php:254 inventory/manage/items.php:490
+#: admin/gl_setup.php:289 inventory/manage/items.php:482
 msgid "WIP Account:"
 msgstr ""
 
-#: admin/gl_setup.php:258 sql/alter2.4rc1.php:34
+#: admin/gl_setup.php:293 sql/alter2.4rc1.php:34
 msgid "Fixed Assets Defaults"
 msgstr ""
 
-#: admin/gl_setup.php:260 sql/alter2.4rc1.php:35
+#: admin/gl_setup.php:295 sql/alter2.4rc1.php:35
 msgid "Loss On Asset Disposal Account:"
 msgstr ""
 
-#: admin/gl_setup.php:262
+#: admin/gl_setup.php:297
 msgid "Depreciation Period:"
 msgstr ""
 
-#: admin/gl_setup.php:262 gl/accruals.php:198
+#: admin/gl_setup.php:297 gl/accruals.php:198
 #: gl/manage/gl_quick_entries.php:247 gl/includes/ui/gl_journal_ui.inc:69
-#: sales/create_recurrent_invoices.php:203
+#: sales/create_recurrent_invoices.php:204
 #: sales/manage/recurrent_invoices.php:128
 msgid "Monthly"
 msgstr ""
 
-#: admin/gl_setup.php:262 gl/manage/gl_quick_entries.php:247
+#: admin/gl_setup.php:297 gl/manage/gl_quick_entries.php:247
 #: gl/includes/ui/gl_journal_ui.inc:69
 msgid "Yearly"
 msgstr ""
 
-#: admin/gl_setup.php:266
+#: admin/gl_setup.php:301
 msgid "Manufacturing Defaults"
 msgstr ""
 
-#: admin/gl_setup.php:268
+#: admin/gl_setup.php:303
 msgid "Work Order Required By After:"
 msgstr ""
 
@@ -1558,45 +1649,45 @@ msgstr ""
 msgid "Selected chart has been successfully deleted"
 msgstr ""
 
-#: admin/inst_chart.php:52
+#: admin/inst_chart.php:57
 msgid "No optional chart of accounts is currently available."
 msgstr ""
 
-#: admin/inst_chart.php:55
+#: admin/inst_chart.php:62
 msgid "Chart"
 msgstr ""
 
-#: admin/inst_chart.php:55 admin/inst_lang.php:36 admin/inst_module.php:105
+#: admin/inst_chart.php:62 admin/inst_lang.php:36 admin/inst_module.php:115
 #: admin/inst_theme.php:55
 msgid "Installed"
 msgstr ""
 
-#: admin/inst_chart.php:55 admin/inst_lang.php:36 admin/inst_module.php:105
+#: admin/inst_chart.php:62 admin/inst_lang.php:36 admin/inst_module.php:115
 #: admin/inst_theme.php:55 inventory/inquiry/stock_status.php:75
-#: reporting/rep303.php:113
+#: reporting/rep303.php:215
 msgid "Available"
 msgstr ""
 
-#: admin/inst_chart.php:55 admin/inst_lang.php:35 admin/inst_lang.php:220
+#: admin/inst_chart.php:62 admin/inst_lang.php:35 admin/inst_lang.php:220
 msgid "Encoding"
 msgstr ""
 
-#: admin/inst_chart.php:72 admin/inst_chart.php:74 admin/inst_lang.php:88
-#: admin/inst_module.php:126 admin/inst_module.php:127 admin/inst_theme.php:77
-#: includes/sysnames.inc:207
+#: admin/inst_chart.php:79 admin/inst_chart.php:81 admin/inst_lang.php:88
+#: admin/inst_module.php:136 admin/inst_module.php:137 admin/inst_theme.php:77
+#: includes/sysnames.inc:209
 msgid "Unknown"
 msgstr ""
 
-#: admin/inst_chart.php:77 admin/inst_lang.php:103 admin/inst_module.php:131
-#: admin/inst_module.php:136 admin/inst_theme.php:81
+#: admin/inst_chart.php:84 admin/inst_lang.php:103 admin/inst_module.php:141
+#: admin/inst_module.php:146 admin/inst_theme.php:81
 msgid "Install"
 msgstr ""
 
-#: admin/inst_chart.php:78 admin/inst_module.php:137 admin/inst_theme.php:82
+#: admin/inst_chart.php:85 admin/inst_module.php:147 admin/inst_theme.php:82
 msgid "Upload and install latest extension package"
 msgstr ""
 
-#: admin/inst_chart.php:85 admin/inst_module.php:144 admin/inst_theme.php:89
+#: admin/inst_chart.php:92 admin/inst_module.php:154 admin/inst_theme.php:89
 #, php-format
 msgid ""
 "You are about to remove package \\'%s\\'.\n"
@@ -1607,19 +1698,19 @@ msgstr ""
 msgid "Install/Update Languages"
 msgstr ""
 
-#: admin/inst_lang.php:35 admin/printers.php:84
-#: admin/shipping_companies.php:91 dimensions/dimension_entry.php:261
-#: dimensions/inquiry/search_dimensions.php:126
-#: dimensions/view/view_dimension.php:55 gl/gl_journal.php:546
+#: admin/inst_lang.php:35 admin/printers.php:84 admin/shipping_companies.php:91
+#: dimensions/dimension_entry.php:261
+#: dimensions/inquiry/search_dimensions.php:133
+#: dimensions/view/view_dimension.php:55 gl/gl_journal.php:556
 #: inventory/manage/item_categories.php:117
 #: inventory/manage/item_categories.php:121
 #: manufacturing/manage/work_centres.php:101
-#: purchasing/includes/ui/invoice_ui.inc:278
-#: purchasing/includes/ui/invoice_ui.inc:280
-#: purchasing/includes/ui/invoice_ui.inc:282 reporting/rep501.php:87
-#: reporting/rep709.php:116 reporting/rep709.php:117
-#: sales/manage/customer_branches.php:284 sales/manage/sales_people.php:99
-#: taxes/item_tax_types.php:117
+#: purchasing/includes/ui/invoice_ui.inc:277
+#: purchasing/includes/ui/invoice_ui.inc:279
+#: purchasing/includes/ui/invoice_ui.inc:281 reporting/rep115.php:161
+#: reporting/rep206.php:115 reporting/rep501.php:87 reporting/rep709.php:116
+#: reporting/rep709.php:117 sales/manage/customer_branches.php:284
+#: sales/manage/sales_people.php:99 taxes/item_tax_types.php:117
 msgid "Name"
 msgstr ""
 
@@ -1696,57 +1787,57 @@ msgstr ""
 msgid "Install/Activate extensions"
 msgstr ""
 
-#: admin/inst_module.php:78
+#: admin/inst_module.php:88
 msgid "Selected extension has been successfully deleted"
 msgstr ""
 
-#: admin/inst_module.php:104 admin/inst_module.php:167
+#: admin/inst_module.php:114 admin/inst_module.php:177
 msgid "Extension"
 msgstr ""
 
-#: admin/inst_module.php:104 admin/inst_module.php:167
+#: admin/inst_module.php:114 admin/inst_module.php:177
 msgid "Modules provided"
 msgstr ""
 
-#: admin/inst_module.php:104 admin/inst_module.php:167
+#: admin/inst_module.php:114 admin/inst_module.php:177
 msgid "Options provided"
 msgstr ""
 
-#: admin/inst_module.php:131
+#: admin/inst_module.php:141
 msgid "Install third-party extension."
 msgstr ""
 
-#: admin/inst_module.php:167 includes/ui/ui_lists.inc:743
-#: includes/ui/ui_lists.inc:2330 reporting/includes/excel_report.inc:229
+#: admin/inst_module.php:177 includes/ui/ui_lists.inc:761
+#: includes/ui/ui_lists.inc:2355 reporting/includes/excel_report.inc:229
 #: reporting/includes/pdf_report.inc:265
 msgid "Active"
 msgstr ""
 
-#: admin/inst_module.php:217
+#: admin/inst_module.php:227
 #, php-format
 msgid ""
 "Package '%s' is incompatible with current application version and cannot be "
 "activated.\n"
 msgstr ""
 
-#: admin/inst_module.php:218
+#: admin/inst_module.php:228
 #, php-format
 msgid "Check Install/Activate page for newer package version."
 msgstr ""
 
-#: admin/inst_module.php:234
+#: admin/inst_module.php:244
 msgid "Status change for some extensions failed."
 msgstr ""
 
-#: admin/inst_module.php:237
+#: admin/inst_module.php:247
 msgid "Current active extensions set has been saved."
 msgstr ""
 
-#: admin/inst_module.php:259
+#: admin/inst_module.php:269
 msgid "Extensions:"
 msgstr ""
 
-#: admin/inst_module.php:267
+#: admin/inst_module.php:277
 msgid "No optional extension module is currently available."
 msgstr ""
 
@@ -1827,8 +1918,8 @@ msgid "Save database and perform upgrade"
 msgstr ""
 
 #: admin/payment_terms.php:16 reporting/includes/doctext.inc:40
-#: sales/view/view_invoice.php:76 sales/view/view_sales_order.php:82
-#: sales/view/view_sales_order.php:90
+#: sales/view/view_invoice.php:76 sales/view/view_sales_order.php:84
+#: sales/view/view_sales_order.php:92
 msgid "Payment Terms"
 msgstr ""
 
@@ -1865,31 +1956,31 @@ msgid "Selected payment terms have been deleted"
 msgstr ""
 
 #: admin/payment_terms.php:127 dimensions/dimension_entry.php:265
-#: dimensions/inquiry/search_dimensions.php:74
-#: dimensions/inquiry/search_dimensions.php:127
-#: dimensions/view/view_dimension.php:55 gl/bank_account_reconcile.php:230
-#: gl/inquiry/bank_inquiry.php:71 gl/inquiry/gl_account_inquiry.php:126
-#: gl/inquiry/journal_inquiry.php:108 gl/inquiry/tax_inquiry.php:80
+#: dimensions/inquiry/search_dimensions.php:75
+#: dimensions/inquiry/search_dimensions.php:134
+#: dimensions/view/view_dimension.php:55 gl/bank_account_reconcile.php:266
+#: gl/inquiry/bank_inquiry.php:71 gl/inquiry/gl_account_inquiry.php:128
+#: gl/inquiry/journal_inquiry.php:114 gl/inquiry/tax_inquiry.php:80
 #: gl/manage/bank_accounts.php:109 gl/manage/gl_quick_entries.php:190
 #: gl/view/accrual_trans.php:52 gl/includes/ui/gl_bank_ui.inc:90
-#: includes/ui/ui_view.inc:546 inventory/inquiry/stock_movements.php:104
+#: includes/ui/ui_view.inc:552 inventory/inquiry/stock_movements.php:104
 #: inventory/manage/item_categories.php:121
-#: manufacturing/search_work_orders.php:159
+#: manufacturing/search_work_orders.php:166
 #: manufacturing/includes/manufacturing_ui.inc:253
 #: manufacturing/includes/manufacturing_ui.inc:291
 #: manufacturing/includes/manufacturing_ui.inc:295
 #: manufacturing/includes/manufacturing_ui.inc:346
 #: purchasing/inquiry/supplier_allocation_inquiry.php:136
-#: purchasing/inquiry/supplier_inquiry.php:177 reporting/rep102.php:130
-#: reporting/rep202.php:137 reporting/rep402.php:103 reporting/rep501.php:87
-#: reporting/rep601.php:79 reporting/rep602.php:80 reporting/rep702.php:60
+#: purchasing/inquiry/supplier_inquiry.php:173 reporting/rep102.php:130
+#: reporting/rep202.php:137 reporting/rep402.php:136 reporting/rep501.php:87
+#: reporting/rep601.php:81 reporting/rep602.php:80 reporting/rep702.php:60
 #: reporting/rep704.php:82 reporting/rep704.php:85 reporting/rep704.php:88
 #: reporting/rep709.php:112 reporting/rep710.php:78 reporting/rep710.php:86
-#: reporting/reports_main.php:354 reporting/reports_main.php:516
-#: reporting/includes/doctext.inc:161 reporting/includes/doctext.inc:202
-#: reporting/includes/doctext.inc:221
+#: reporting/reports_main.php:386 reporting/reports_main.php:548
+#: reporting/includes/doctext.inc:161 reporting/includes/doctext.inc:204
+#: reporting/includes/doctext.inc:223
 #: sales/inquiry/customer_allocation_inquiry.php:146
-#: sales/inquiry/customer_inquiry.php:202
+#: sales/inquiry/customer_inquiry.php:200
 msgid "Type"
 msgstr ""
 
@@ -1963,10 +2054,6 @@ msgstr ""
 msgid "Host name or IP"
 msgstr ""
 
-#: admin/printers.php:135
-msgid "Port"
-msgstr ""
-
 #: admin/printers.php:137
 msgid "Timeout"
 msgstr ""
@@ -2081,9 +2168,9 @@ msgstr ""
 msgid "Role:"
 msgstr ""
 
-#: admin/security_roles.php:177 gl/manage/gl_accounts.php:202
-#: inventory/inquiry/stock_movements.php:67 inventory/manage/items.php:562
-#: purchasing/manage/suppliers.php:292 sales/manage/customers.php:331
+#: admin/security_roles.php:177 gl/manage/gl_accounts.php:208
+#: inventory/inquiry/stock_movements.php:67 inventory/manage/items.php:555
+#: purchasing/manage/suppliers.php:304 sales/manage/customers.php:333
 msgid "Show inactive:"
 msgstr ""
 
@@ -2123,23 +2210,22 @@ msgstr ""
 msgid "Delete This Role"
 msgstr ""
 
-#: admin/security_roles.php:244 admin/void_transaction.php:228
-#: gl/manage/gl_quick_entries.php:61 gl/includes/ui/gl_bank_ui.inc:269
-#: gl/includes/ui/gl_journal_ui.inc:269 includes/ui/class.crud_view.inc:292
-#: includes/ui/simple_crud_class.inc:58 includes/ui/simple_crud_class.inc:229
-#: includes/ui/ui_controls.inc:645 includes/ui/ui_input.inc:229
-#: inventory/includes/item_adjustments_ui.inc:192
-#: inventory/includes/stock_transfers_ui.inc:152
-#: inventory/manage/items.php:545
+#: admin/security_roles.php:244 admin/void_transaction.php:253
+#: gl/manage/gl_quick_entries.php:61 gl/includes/ui/gl_bank_ui.inc:267
+#: gl/includes/ui/gl_journal_ui.inc:280 includes/ui/attachment.inc:171
+#: includes/ui/class.crud_view.inc:301 includes/ui/simple_crud_class.inc:58
+#: includes/ui/simple_crud_class.inc:229 includes/ui/ui_controls.inc:645
+#: includes/ui/ui_input.inc:230 inventory/includes/item_adjustments_ui.inc:206
+#: inventory/includes/sav.item_adjustments_ui.inc:196
+#: inventory/includes/stock_transfers_ui.inc:151 inventory/manage/items.php:538
 #: manufacturing/includes/work_order_issue_ui.inc:134
-#: purchasing/includes/ui/po_ui.inc:438
-#: sales/create_recurrent_invoices.php:190
+#: purchasing/includes/ui/po_ui.inc:444 sales/create_recurrent_invoices.php:191
 #: sales/includes/ui/sales_credit_ui.inc:290
-#: sales/includes/ui/sales_order_ui.inc:549
+#: sales/includes/ui/sales_order_ui.inc:553
 msgid "Cancel"
 msgstr ""
 
-#: admin/security_roles.php:244 inventory/manage/items.php:545
+#: admin/security_roles.php:244 inventory/manage/items.php:538
 msgid "Cancel Edition"
 msgstr ""
 
@@ -2191,25 +2277,24 @@ msgid "Secondary Phone"
 msgstr ""
 
 #: admin/shipping_companies.php:91 inventory/manage/locations.php:155
-#: purchasing/inquiry/suppliers_list.php:53
-#: sales/inquiry/customers_list.php:54
+#: purchasing/inquiry/suppliers_list.php:53 sales/inquiry/customers_list.php:54
 msgid "Address"
 msgstr ""
 
-#: admin/shipping_companies.php:134 gl/manage/gl_account_types.php:187
-#: gl/includes/ui/gl_bank_ui.inc:57 inventory/manage/items.php:366
+#: admin/shipping_companies.php:134 gl/manage/gl_account_types.php:193
+#: gl/includes/ui/gl_bank_ui.inc:57 inventory/manage/items.php:357
 #: manufacturing/manage/work_centres.php:137
 msgid "Name:"
 msgstr ""
 
-#: admin/shipping_companies.php:136 purchasing/manage/suppliers.php:134
+#: admin/shipping_companies.php:136 purchasing/manage/suppliers.php:244
 #: sales/manage/customer_branches.php:252
 msgid "Contact Person:"
 msgstr ""
 
 #: admin/shipping_companies.php:140 includes/ui/contacts_view.inc:100
-#: inventory/manage/locations.php:215 purchasing/manage/suppliers.php:136
-#: sales/manage/customer_branches.php:254 sales/manage/customers.php:257
+#: inventory/manage/locations.php:215 purchasing/manage/suppliers.php:246
+#: sales/manage/customer_branches.php:254 sales/manage/customers.php:258
 msgid "Secondary Phone Number:"
 msgstr ""
 
@@ -2221,11 +2306,11 @@ msgstr ""
 msgid "Unspecified tag type"
 msgstr ""
 
-#: admin/tags.php:40 reporting/reports_main.php:375
-#: reporting/reports_main.php:384 reporting/reports_main.php:396
-#: reporting/reports_main.php:427 reporting/reports_main.php:435
-#: reporting/reports_main.php:446 reporting/reports_main.php:474
-#: reporting/reports_main.php:481 reporting/reports_main.php:491
+#: admin/tags.php:40 reporting/reports_main.php:407
+#: reporting/reports_main.php:416 reporting/reports_main.php:428
+#: reporting/reports_main.php:459 reporting/reports_main.php:467
+#: reporting/reports_main.php:478 reporting/reports_main.php:506
+#: reporting/reports_main.php:513 reporting/reports_main.php:523
 msgid "Account Tags"
 msgstr ""
 
@@ -2298,19 +2383,19 @@ msgstr ""
 msgid "User login"
 msgstr ""
 
-#: admin/users.php:123 admin/users.php:207 includes/ui/contacts_view.inc:40
+#: admin/users.php:123 admin/users.php:209 includes/ui/contacts_view.inc:40
 msgid "Full Name"
 msgstr ""
 
 #: admin/users.php:123 includes/ui/contacts_view.inc:40
-#: inventory/manage/locations.php:155 reporting/rep106.php:94
+#: inventory/manage/locations.php:155 reporting/rep106.php:95
 #: reporting/includes/header2.inc:100 sales/manage/sales_people.php:99
 #: sales/inquiry/customer_branches_list.php:49
 msgid "Phone"
 msgstr ""
 
 #: admin/users.php:124 sales/manage/customer_branches.php:290
-#: sales/view/view_sales_order.php:96
+#: sales/view/view_sales_order.php:98
 msgid "E-mail"
 msgstr ""
 
@@ -2322,27 +2407,27 @@ msgstr ""
 msgid "Access Level"
 msgstr ""
 
-#: admin/users.php:193
+#: admin/users.php:195
 msgid "User Login:"
 msgstr ""
 
-#: admin/users.php:204
+#: admin/users.php:206
 msgid "Enter a new password to change, leave empty to keep current."
 msgstr ""
 
-#: admin/users.php:209
+#: admin/users.php:211
 msgid "Telephone No.:"
 msgstr ""
 
-#: admin/users.php:213
+#: admin/users.php:215
 msgid "Access Level:"
 msgstr ""
 
-#: admin/users.php:217
+#: admin/users.php:219
 msgid "User's POS"
 msgstr ""
 
-#: admin/users.php:222
+#: admin/users.php:224
 msgid "Use popup window for reports:"
 msgstr ""
 
@@ -2351,10 +2436,12 @@ msgid "View or Print Transactions"
 msgstr ""
 
 #: admin/view_print_transaction.php:43 admin/view_print_transaction.php:45
-#: admin/view_print_transaction.php:129 includes/ui/ui_controls.inc:213
-#: purchasing/inquiry/po_search_completed.php:43
-#: purchasing/inquiry/po_search.php:94 sales/inquiry/customer_inquiry.php:186
-#: sales/inquiry/sales_deliveries_view.php:148
+#: admin/view_print_transaction.php:129
+#: dimensions/inquiry/search_dimensions.php:123 includes/ui/ui_controls.inc:213
+#: manufacturing/search_work_orders.php:152
+#: purchasing/inquiry/po_search_completed.php:52
+#: purchasing/inquiry/po_search.php:94 sales/inquiry/customer_inquiry.php:103
+#: sales/inquiry/sales_deliveries_view.php:149
 #: sales/inquiry/sales_orders_view.php:102
 msgid "Print"
 msgstr ""
@@ -2363,29 +2450,29 @@ msgstr ""
 msgid "Only documents can be printed."
 msgstr ""
 
-#: admin/view_print_transaction.php:79 admin/void_transaction.php:165
+#: admin/view_print_transaction.php:79 admin/void_transaction.php:171
 msgid "from #:"
 msgstr ""
 
-#: admin/view_print_transaction.php:81 admin/void_transaction.php:167
+#: admin/view_print_transaction.php:81 admin/void_transaction.php:173
 msgid "to #:"
 msgstr ""
 
-#: admin/view_print_transaction.php:83 admin/void_transaction.php:169
-#: dimensions/inquiry/search_dimensions.php:87 gl/inquiry/accounts_list.php:40
+#: admin/view_print_transaction.php:83 admin/void_transaction.php:175
+#: dimensions/inquiry/search_dimensions.php:88 gl/inquiry/accounts_list.php:40
 #: gl/inquiry/journal_inquiry.php:58 inventory/inquiry/stock_list.php:42
-#: manufacturing/search_work_orders.php:84
-#: purchasing/includes/ui/invoice_ui.inc:483
-#: purchasing/inquiry/po_search_completed.php:99
+#: manufacturing/search_work_orders.php:86
+#: purchasing/includes/ui/invoice_ui.inc:482
+#: purchasing/inquiry/po_search_completed.php:108
 #: purchasing/inquiry/po_search.php:78
 #: purchasing/inquiry/supplier_allocation_inquiry.php:57
-#: purchasing/inquiry/supplier_inquiry.php:56
+#: purchasing/inquiry/supplier_inquiry.php:147
 #: purchasing/inquiry/suppliers_list.php:42
 #: sales/inquiry/customer_allocation_inquiry.php:51
 #: sales/inquiry/customer_branches_list.php:38
-#: sales/inquiry/customer_inquiry.php:54 sales/inquiry/customers_list.php:42
-#: sales/inquiry/sales_deliveries_view.php:116
-#: sales/inquiry/sales_orders_view.php:236
+#: sales/inquiry/customer_inquiry.php:171 sales/inquiry/customers_list.php:42
+#: sales/inquiry/sales_deliveries_view.php:117
+#: sales/inquiry/sales_orders_view.php:241
 msgid "Search"
 msgstr ""
 
@@ -2401,18 +2488,19 @@ msgid ""
 "zero."
 msgstr ""
 
-#: admin/view_print_transaction.php:128 admin/void_transaction.php:182
-#: dimensions/inquiry/search_dimensions.php:128
+#: admin/view_print_transaction.php:128 admin/void_transaction.php:188
+#: dimensions/inquiry/search_dimensions.php:135
 #: dimensions/view/view_dimension.php:55 gl/accruals.php:104
-#: gl/accruals.php:211 gl/bank_account_reconcile.php:233
-#: gl/inquiry/bank_inquiry.php:71 gl/inquiry/gl_account_inquiry.php:126
-#: gl/inquiry/journal_inquiry.php:107 gl/view/accrual_trans.php:52
+#: gl/accruals.php:211 gl/bank_account_reconcile.php:269
+#: gl/inquiry/bank_inquiry.php:71 gl/inquiry/gl_account_inquiry.php:128
+#: gl/inquiry/journal_inquiry.php:113 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 includes/dashboard.inc:486
 #: includes/dashboard.inc:571 includes/ui/allocation_cart.inc:290
-#: includes/ui/ui_view.inc:546 inventory/inquiry/stock_movements.php:109
+#: includes/ui/attachment.inc:136 includes/ui/ui_view.inc:552
+#: inventory/inquiry/stock_movements.php:109
 #: inventory/view/view_adjustment.php:44 inventory/view/view_transfer.php:37
-#: manufacturing/search_work_orders.php:164
+#: manufacturing/search_work_orders.php:171
 #: manufacturing/work_order_entry.php:399
 #: manufacturing/work_order_entry.php:405
 #: manufacturing/view/wo_costs_view.php:60
@@ -2424,27 +2512,27 @@ msgstr ""
 #: manufacturing/includes/manufacturing_ui.inc:296
 #: manufacturing/includes/manufacturing_ui.inc:347
 #: purchasing/includes/ui/invoice_ui.inc:114
-#: purchasing/includes/ui/po_ui.inc:312 purchasing/view/view_po.php:140
+#: purchasing/includes/ui/po_ui.inc:316 purchasing/view/view_po.php:140
 #: purchasing/inquiry/supplier_allocation_inquiry.php:141
-#: purchasing/inquiry/supplier_inquiry.php:182
+#: purchasing/inquiry/supplier_inquiry.php:178
 #: purchasing/allocations/supplier_allocation_main.php:97
-#: reporting/rep101.php:132 reporting/rep107.php:203 reporting/rep201.php:107
-#: reporting/rep306.php:141 reporting/rep402.php:103 reporting/rep501.php:87
-#: reporting/rep601.php:79 reporting/rep602.php:80 reporting/rep704.php:82
-#: reporting/rep704.php:85 reporting/rep704.php:88 reporting/rep709.php:116
-#: reporting/rep710.php:77 reporting/includes/doctext.inc:166
-#: reporting/includes/doctext.inc:207 reporting/includes/doctext.inc:245
-#: reporting/includes/header2.inc:137 sales/customer_delivery.php:366
-#: sales/customer_invoice.php:485
-#: sales/allocations/customer_allocation_main.php:90
-#: sales/view/view_credit.php:69 sales/view/view_sales_order.php:109
-#: sales/view/view_sales_order.php:142 sales/view/view_sales_order.php:179
+#: reporting/rep101.php:136 reporting/rep107.php:202 reporting/rep201.php:115
+#: reporting/rep306.php:141 reporting/rep310.php:142 reporting/rep402.php:136
+#: reporting/rep402.php:141 reporting/rep501.php:87 reporting/rep601.php:81
+#: reporting/rep602.php:80 reporting/rep704.php:82 reporting/rep704.php:85
+#: reporting/rep704.php:88 reporting/rep709.php:116 reporting/rep710.php:77
+#: reporting/includes/doctext.inc:166 reporting/includes/doctext.inc:209
+#: reporting/includes/doctext.inc:247 reporting/includes/header2.inc:137
+#: sales/customer_delivery.php:366 sales/customer_invoice.php:485
+#: sales/allocations/customer_allocation_main.php:95
+#: sales/view/view_credit.php:69 sales/view/view_sales_order.php:111
+#: sales/view/view_sales_order.php:144 sales/view/view_sales_order.php:181
 #: sales/inquiry/customer_allocation_inquiry.php:150
-#: sales/inquiry/customer_inquiry.php:206
+#: sales/inquiry/customer_inquiry.php:204
 msgid "Date"
 msgstr ""
 
-#: admin/view_print_transaction.php:130 admin/void_transaction.php:183
+#: admin/view_print_transaction.php:130 admin/void_transaction.php:189
 #: includes/ui/ui_view.inc:51
 msgid "GL"
 msgstr ""
@@ -2453,9 +2541,9 @@ msgstr ""
 msgid "Void a Transaction"
 msgstr ""
 
-#: admin/void_transaction.php:125 admin/void_transaction.php:184
-#: gl/inquiry/accounts_list.php:63 includes/ui/ui_input.inc:152
-#: includes/ui/ui_input.inc:300 includes/ui/ui_lists.inc:20
+#: admin/void_transaction.php:125 admin/void_transaction.php:190
+#: gl/inquiry/accounts_list.php:64 includes/ui/ui_input.inc:152
+#: includes/ui/ui_input.inc:301 includes/ui/ui_lists.inc:20
 #: inventory/inquiry/stock_list.php:66 inventory/inquiry/stock_list.php:69
 #: purchasing/inquiry/suppliers_list.php:65
 #: purchasing/inquiry/suppliers_list.php:68
@@ -2464,59 +2552,75 @@ msgstr ""
 msgid "Select"
 msgstr ""
 
-#: admin/void_transaction.php:156 includes/ui/class.reflines_crud.inc:90
+#: admin/void_transaction.php:162 includes/ui/class.reflines_crud.inc:90
 #: includes/ui/class.reflines_crud.inc:93
 msgid "Transaction Type:"
 msgstr ""
 
-#: admin/void_transaction.php:203
+#: admin/void_transaction.php:194
+msgid "Marked transactions will be voided."
+msgstr ""
+
+#: admin/void_transaction.php:211
 msgid "Transaction #:"
 msgstr ""
 
-#: admin/void_transaction.php:205
+#: admin/void_transaction.php:213
 msgid "Voiding Date:"
 msgstr ""
 
-#: admin/void_transaction.php:207 dimensions/dimension_entry.php:273
-#: gl/bank_transfer.php:137 gl/inquiry/journal_inquiry.php:53
-#: gl/manage/revaluate_currencies.php:96
-#: includes/ui/class.reflines_crud.inc:105 includes/ui/ui_view.inc:344
+#: admin/void_transaction.php:215 dimensions/dimension_entry.php:273
+#: gl/bank_transfer.php:137 gl/inquiry/gl_account_inquiry.php:84
+#: gl/inquiry/journal_inquiry.php:53 gl/manage/revaluate_currencies.php:96
+#: includes/ui/class.reflines_crud.inc:105 includes/ui/ui_view.inc:350
 #: manufacturing/work_order_add_finished.php:196
 #: manufacturing/work_order_costs.php:147
 #: manufacturing/work_order_entry.php:429
 #: manufacturing/work_order_release.php:102
-#: purchasing/includes/ui/invoice_ui.inc:193
-#: purchasing/includes/ui/po_ui.inc:465 purchasing/po_entry_items.php:486
+#: purchasing/includes/ui/invoice_ui.inc:191
+#: purchasing/includes/ui/po_ui.inc:471 purchasing/po_entry_items.php:486
 #: purchasing/supplier_payment.php:331 sales/customer_invoice.php:658
-#: sales/customer_payments.php:378
+#: sales/customer_payments.php:382
 msgid "Memo:"
 msgstr ""
 
-#: admin/void_transaction.php:212 admin/void_transaction.php:221
+#: admin/void_transaction.php:220 admin/void_transaction.php:229
 msgid "Void Transaction"
 msgstr ""
 
-#: admin/void_transaction.php:217
+#: admin/void_transaction.php:225
 msgid "The entered transaction does not exist or cannot be voided."
 msgstr ""
 
-#: admin/void_transaction.php:225
+#: admin/void_transaction.php:240
+msgid ""
+"The void cannot be processed because there is an insufficient quantity for "
+"item:"
+msgstr ""
+
+#: admin/void_transaction.php:242 inventory/reorder_level.php:71
+#: inventory/inquiry/stock_movements.php:109
+#: inventory/inquiry/stock_status.php:74 purchasing/supplier_credit.php:220
+msgid "Quantity On Hand"
+msgstr ""
+
+#: admin/void_transaction.php:250
 msgid ""
 "Are you sure you want to void this transaction ? This action cannot be "
 "undone."
 msgstr ""
 
-#: admin/void_transaction.php:227 includes/ui/ui_controls.inc:644
+#: admin/void_transaction.php:252 includes/ui/ui_controls.inc:644
 msgid "Proceed"
 msgstr ""
 
-#: admin/void_transaction.php:241
+#: admin/void_transaction.php:266
 msgid "The selected transaction was closed for edition and cannot be voided."
 msgstr ""
 
-#: admin/void_transaction.php:247 gl/accruals.php:42 gl/bank_transfer.php:159
-#: gl/gl_journal.php:217 gl/gl_journal.php:229 gl/gl_journal.php:235
-#: gl/gl_journal.php:256 gl/manage/close_period.php:34
+#: admin/void_transaction.php:272 gl/accruals.php:42 gl/bank_transfer.php:159
+#: gl/gl_journal.php:216 gl/gl_journal.php:228 gl/gl_journal.php:234
+#: gl/gl_journal.php:255 gl/manage/close_period.php:34
 #: gl/manage/exchange_rates.php:33 gl/manage/revaluate_currencies.php:51
 #: manufacturing/work_order_add_finished.php:89
 #: manufacturing/work_order_costs.php:80 purchasing/po_receive_items.php:174
@@ -2527,33 +2631,32 @@ msgstr ""
 msgid "The entered date is invalid."
 msgstr ""
 
-#: admin/void_transaction.php:253 gl/accruals.php:48 gl/bank_transfer.php:165
-#: gl/gl_bank.php:261 gl/gl_journal.php:223 gl/gl_journal.php:262
+#: admin/void_transaction.php:278 gl/accruals.php:48 gl/bank_transfer.php:165
+#: gl/gl_bank.php:267 gl/gl_journal.php:222 gl/gl_journal.php:261
 #: gl/manage/revaluate_currencies.php:57 inventory/adjustments.php:123
 #: inventory/transfers.php:115 manufacturing/work_order_add_finished.php:95
-#: manufacturing/work_order_costs.php:86
-#: manufacturing/work_order_entry.php:151
+#: manufacturing/work_order_costs.php:86 manufacturing/work_order_entry.php:151
 #: manufacturing/work_order_issue.php:82 purchasing/po_entry_items.php:351
 #: purchasing/po_receive_items.php:179 purchasing/supplier_credit.php:186
-#: purchasing/supplier_invoice.php:195 purchasing/supplier_payment.php:200
+#: purchasing/supplier_invoice.php:193 purchasing/supplier_payment.php:200
 #: sales/create_recurrent_invoices.php:87
-#: sales/create_recurrent_invoices.php:166 sales/credit_note_entry.php:157
+#: sales/create_recurrent_invoices.php:165 sales/credit_note_entry.php:157
 #: sales/customer_credit_invoice.php:94 sales/customer_delivery.php:164
-#: sales/customer_invoice.php:302 sales/customer_payments.php:157
+#: sales/customer_invoice.php:302 sales/customer_payments.php:162
 #: sales/sales_order_entry.php:378
 msgid ""
 "The entered date is out of fiscal year or is closed for further data entry."
 msgstr ""
 
-#: admin/void_transaction.php:260
+#: admin/void_transaction.php:285
 msgid "The transaction number is expected to be numeric and greater than zero."
 msgstr ""
 
-#: admin/void_transaction.php:277
+#: admin/void_transaction.php:302
 msgid "The selected transaction has already been voided."
 msgstr ""
 
-#: admin/void_transaction.php:290
+#: admin/void_transaction.php:315
 msgid "Selected transaction has been voided."
 msgstr ""
 
@@ -2572,49 +2675,50 @@ msgstr ""
 msgid "Closing Year"
 msgstr ""
 
-#: admin/db/fiscalyears_db.inc:220 reporting/rep101.php:187
-#: reporting/rep201.php:162 reporting/rep706.php:185
+#: admin/db/fiscalyears_db.inc:220 reporting/rep101.php:192
+#: reporting/rep115.php:161 reporting/rep201.php:170 reporting/rep206.php:115
+#: reporting/rep706.php:185
 msgid "Open Balance"
 msgstr ""
 
-#: admin/db/maintenance_db.inc:152
+#: admin/db/maintenance_db.inc:154
 #, php-format
 msgid "Cannot open the extension setup file '%s' for writing."
 msgstr ""
 
-#: admin/db/maintenance_db.inc:160
+#: admin/db/maintenance_db.inc:162
 #, php-format
 msgid "Cannot write to the extensions setup file '%s'."
 msgstr ""
 
-#: admin/db/maintenance_db.inc:179
+#: admin/db/maintenance_db.inc:181
 msgid "Cannot update system extensions list."
 msgstr ""
 
-#: admin/db/maintenance_db.inc:197
+#: admin/db/maintenance_db.inc:199
 #, php-format
 msgid "Cannot update extensions list for company '%s'."
 msgstr ""
 
-#: admin/db/maintenance_db.inc:233
+#: admin/db/maintenance_db.inc:235
 msgid "Cannot open the languages file - "
 msgstr ""
 
-#: admin/db/maintenance_db.inc:240
+#: admin/db/maintenance_db.inc:242
 msgid "Cannot write to the language file - "
 msgstr ""
 
-#: admin/db/maintenance_db.inc:251
+#: admin/db/maintenance_db.inc:253
 msgid "The language files folder "
 msgstr ""
 
-#: admin/db/maintenance_db.inc:400
+#: admin/db/maintenance_db.inc:405
 msgid ""
 "This is new format backup file which cannot be restored on database not "
 "migrated to utf8."
 msgstr ""
 
-#: admin/db/maintenance_db.inc:484
+#: admin/db/maintenance_db.inc:489
 #, php-format
 msgid "SQL script execution failed in line %d: %s"
 msgstr ""
@@ -2671,7 +2775,7 @@ msgid ""
 "closed."
 msgstr ""
 
-#: admin/db/voiding_db.inc:127 sales/includes/db/sales_invoice_db.inc:250
+#: admin/db/voiding_db.inc:127 sales/includes/db/sales_invoice_db.inc:251
 msgid "Voided."
 msgstr ""
 
@@ -2928,8 +3032,8 @@ msgstr ""
 msgid "Ta&x Inquiry"
 msgstr ""
 
-#: applications/generalledger.php:44 reporting/reports_main.php:402
-#: reporting/reports_main.php:452 reporting/reports_main.php:497
+#: applications/generalledger.php:44 reporting/reports_main.php:434
+#: reporting/reports_main.php:484 reporting/reports_main.php:529
 msgid "Trial &Balance"
 msgstr ""
 
@@ -3037,7 +3141,7 @@ msgstr ""
 msgid "&Units of Measure"
 msgstr ""
 
-#: applications/inventory.php:45 inventory/manage/items.php:591
+#: applications/inventory.php:45 inventory/manage/items.php:584
 msgid "&Reorder Levels"
 msgstr ""
 
@@ -3053,7 +3157,7 @@ msgstr ""
 msgid "Purchasing &Pricing"
 msgstr ""
 
-#: applications/inventory.php:53 inventory/manage/items.php:590
+#: applications/inventory.php:53 inventory/manage/items.php:583
 msgid "Standard &Costs"
 msgstr ""
 
@@ -3290,10 +3394,14 @@ msgstr ""
 msgid "Enter a &new dimension"
 msgstr ""
 
-#: dimensions/dimension_entry.php:99
+#: dimensions/dimension_entry.php:98
 msgid "&Select an existing dimension"
 msgstr ""
 
+#: dimensions/dimension_entry.php:99
+msgid "&Add Attachment"
+msgstr ""
+
 #: dimensions/dimension_entry.php:121
 msgid "The dimension name must be entered."
 msgstr ""
@@ -3320,20 +3428,21 @@ msgid "Dimension Reference:"
 msgstr ""
 
 #: dimensions/dimension_entry.php:267 reporting/reports_main.php:36
-#: reporting/reports_main.php:66 reporting/reports_main.php:82
-#: reporting/reports_main.php:91 reporting/reports_main.php:153
-#: reporting/reports_main.php:235 reporting/reports_main.php:245
-#: reporting/reports_main.php:251 reporting/reports_main.php:261
-#: reporting/reports_main.php:269 reporting/reports_main.php:277
-#: reporting/reports_main.php:332 reporting/reports_main.php:340
-#: reporting/reports_main.php:352 reporting/reports_main.php:362
-#: reporting/reports_main.php:380 reporting/reports_main.php:391
-#: reporting/reports_main.php:403 reporting/reports_main.php:416
-#: reporting/reports_main.php:432 reporting/reports_main.php:442
-#: reporting/reports_main.php:453 reporting/reports_main.php:465
-#: reporting/reports_main.php:479 reporting/reports_main.php:488
-#: reporting/reports_main.php:498 reporting/reports_main.php:507
-#: reporting/reports_main.php:514
+#: reporting/reports_main.php:57 reporting/reports_main.php:77
+#: reporting/reports_main.php:93 reporting/reports_main.php:102
+#: reporting/reports_main.php:165 reporting/reports_main.php:186
+#: reporting/reports_main.php:256 reporting/reports_main.php:266
+#: reporting/reports_main.php:272 reporting/reports_main.php:282
+#: reporting/reports_main.php:290 reporting/reports_main.php:298
+#: reporting/reports_main.php:305 reporting/reports_main.php:364
+#: reporting/reports_main.php:372 reporting/reports_main.php:384
+#: reporting/reports_main.php:394 reporting/reports_main.php:412
+#: reporting/reports_main.php:423 reporting/reports_main.php:435
+#: reporting/reports_main.php:448 reporting/reports_main.php:464
+#: reporting/reports_main.php:474 reporting/reports_main.php:485
+#: reporting/reports_main.php:497 reporting/reports_main.php:511
+#: reporting/reports_main.php:520 reporting/reports_main.php:530
+#: reporting/reports_main.php:539 reporting/reports_main.php:546
 msgid "Start Date"
 msgstr ""
 
@@ -3377,11 +3486,11 @@ msgstr ""
 msgid "Delete unused dimension"
 msgstr ""
 
-#: dimensions/dimension_entry.php:292 includes/ui/class.crud_view.inc:296
-#: includes/ui/simple_crud_class.inc:223
-#: purchasing/includes/ui/invoice_ui.inc:219
-#: purchasing/includes/ui/invoice_ui.inc:421
-#: purchasing/includes/ui/invoice_ui.inc:423
+#: dimensions/dimension_entry.php:292 includes/ui/attachment.inc:167
+#: includes/ui/class.crud_view.inc:305 includes/ui/simple_crud_class.inc:223
+#: purchasing/includes/ui/invoice_ui.inc:218
+#: purchasing/includes/ui/invoice_ui.inc:420
+#: purchasing/includes/ui/invoice_ui.inc:422
 msgid "Add"
 msgstr ""
 
@@ -3394,159 +3503,167 @@ msgid "Balance for this Dimension"
 msgstr ""
 
 #: dimensions/includes/dimensions_ui.inc:31 gl/accruals.php:104
-#: gl/inquiry/gl_account_inquiry.php:129 gl/inquiry/gl_trial_balance.php:184
+#: gl/inquiry/gl_account_inquiry.php:131 gl/inquiry/gl_trial_balance.php:215
 #: gl/manage/gl_quick_entries.php:248 gl/manage/gl_quick_entries.php:342
-#: includes/dashboard.inc:606 includes/sysnames.inc:179
-#: purchasing/includes/ui/invoice_ui.inc:278
-#: purchasing/includes/ui/invoice_ui.inc:280
-#: purchasing/includes/ui/invoice_ui.inc:282 reporting/rep701.php:110
+#: includes/dashboard.inc:606 includes/sysnames.inc:181
+#: purchasing/includes/ui/invoice_ui.inc:277
+#: purchasing/includes/ui/invoice_ui.inc:279
+#: purchasing/includes/ui/invoice_ui.inc:281 reporting/rep701.php:110
 #: reporting/rep705.php:235 reporting/rep706.php:185 reporting/rep707.php:210
 #: reporting/rep708.php:192
 msgid "Account"
 msgstr ""
 
 #: dimensions/includes/dimensions_ui.inc:31 gl/accruals.php:112
-#: gl/bank_account_reconcile.php:234 gl/inquiry/bank_inquiry.php:72
-#: gl/inquiry/gl_account_inquiry.php:141 gl/inquiry/gl_account_inquiry.php:143
-#: gl/inquiry/gl_trial_balance.php:190 gl/inquiry/gl_trial_balance.php:192
-#: gl/inquiry/gl_trial_balance.php:194 gl/view/accrual_trans.php:60
+#: gl/bank_account_reconcile.php:270 gl/inquiry/bank_inquiry.php:72
+#: gl/inquiry/gl_account_inquiry.php:143 gl/inquiry/gl_account_inquiry.php:145
+#: gl/inquiry/gl_trial_balance.php:221 gl/inquiry/gl_trial_balance.php:223
+#: gl/inquiry/gl_trial_balance.php:225 gl/view/accrual_trans.php:60
 #: gl/view/gl_trans_view.php:96 gl/view/gl_trans_view.php:99
-#: gl/view/gl_trans_view.php:102 gl/includes/ui/gl_journal_ui.inc:103
-#: gl/includes/ui/gl_journal_ui.inc:106 gl/includes/ui/gl_journal_ui.inc:109
+#: gl/view/gl_trans_view.php:102 gl/includes/ui/gl_journal_ui.inc:113
+#: gl/includes/ui/gl_journal_ui.inc:116 gl/includes/ui/gl_journal_ui.inc:119
 #: manufacturing/view/wo_costs_view.php:61
 #: purchasing/inquiry/supplier_allocation_inquiry.php:144
-#: purchasing/inquiry/supplier_inquiry.php:185 reporting/rep601.php:80
-#: reporting/rep602.php:81 reporting/rep702.php:54 reporting/rep704.php:83
-#: reporting/rep704.php:86 reporting/rep704.php:89 reporting/rep708.php:192
-#: reporting/rep708.php:193 sales/inquiry/customer_allocation_inquiry.php:154
-#: sales/inquiry/customer_inquiry.php:211
+#: reporting/rep115.php:161 reporting/rep206.php:115 reporting/rep402.php:141
+#: reporting/rep601.php:82 reporting/rep602.php:81 reporting/rep702.php:54
+#: reporting/rep704.php:83 reporting/rep704.php:86 reporting/rep704.php:89
+#: reporting/rep708.php:192 reporting/rep708.php:193
+#: sales/inquiry/customer_allocation_inquiry.php:154
 msgid "Debit"
 msgstr ""
 
 #: dimensions/includes/dimensions_ui.inc:31 gl/accruals.php:112
-#: gl/bank_account_reconcile.php:235 gl/inquiry/bank_inquiry.php:72
-#: gl/inquiry/gl_account_inquiry.php:141 gl/inquiry/gl_account_inquiry.php:143
-#: gl/inquiry/gl_trial_balance.php:191 gl/inquiry/gl_trial_balance.php:193
-#: gl/inquiry/gl_trial_balance.php:195 gl/view/accrual_trans.php:60
+#: gl/bank_account_reconcile.php:271 gl/inquiry/bank_inquiry.php:72
+#: gl/inquiry/gl_account_inquiry.php:143 gl/inquiry/gl_account_inquiry.php:145
+#: gl/inquiry/gl_trial_balance.php:222 gl/inquiry/gl_trial_balance.php:224
+#: gl/inquiry/gl_trial_balance.php:226 gl/view/accrual_trans.php:60
 #: gl/view/gl_trans_view.php:96 gl/view/gl_trans_view.php:99
-#: gl/view/gl_trans_view.php:102 gl/includes/ui/gl_journal_ui.inc:103
-#: gl/includes/ui/gl_journal_ui.inc:106 gl/includes/ui/gl_journal_ui.inc:109
-#: includes/sysnames.inc:90 manufacturing/view/wo_costs_view.php:61
+#: gl/view/gl_trans_view.php:102 gl/includes/ui/gl_journal_ui.inc:113
+#: gl/includes/ui/gl_journal_ui.inc:116 gl/includes/ui/gl_journal_ui.inc:119
+#: includes/sysnames.inc:92 manufacturing/view/wo_costs_view.php:61
 #: purchasing/inquiry/supplier_allocation_inquiry.php:145
-#: purchasing/inquiry/supplier_inquiry.php:186 reporting/rep601.php:80
-#: reporting/rep602.php:81 reporting/rep702.php:54 reporting/rep704.php:83
-#: reporting/rep704.php:86 reporting/rep704.php:89 reporting/rep708.php:192
-#: reporting/rep708.php:193 sales/inquiry/customer_allocation_inquiry.php:155
-#: sales/inquiry/customer_inquiry.php:212
+#: reporting/rep115.php:161 reporting/rep206.php:116 reporting/rep402.php:141
+#: reporting/rep601.php:82 reporting/rep602.php:81 reporting/rep702.php:54
+#: reporting/rep704.php:83 reporting/rep704.php:86 reporting/rep704.php:89
+#: reporting/rep708.php:192 reporting/rep708.php:193
+#: sales/inquiry/customer_allocation_inquiry.php:155
 msgid "Credit"
 msgstr ""
 
 #: dimensions/includes/dimensions_ui.inc:45
-#: dimensions/inquiry/search_dimensions.php:131 gl/inquiry/bank_inquiry.php:72
-#: gl/inquiry/gl_account_inquiry.php:141 gl/inquiry/gl_trial_balance.php:188
+#: dimensions/inquiry/search_dimensions.php:138 gl/inquiry/bank_inquiry.php:72
+#: gl/inquiry/gl_account_inquiry.php:143 gl/inquiry/gl_trial_balance.php:219
 #: includes/dashboard.inc:606
 #: purchasing/inquiry/supplier_allocation_inquiry.php:147
-#: reporting/rep101.php:136 reporting/rep201.php:111 reporting/rep203.php:89
-#: reporting/rep204.php:84 reporting/rep307.php:114 reporting/rep601.php:80
-#: reporting/rep602.php:81 reporting/rep701.php:110 reporting/rep704.php:83
-#: reporting/rep704.php:86 reporting/rep704.php:89 reporting/rep708.php:185
-#: sales/inquiry/customer_allocation_inquiry.php:157
+#: purchasing/inquiry/supplier_inquiry.php:182
+#: purchasing/inquiry/supplier_inquiry.php:195 reporting/rep101.php:140
+#: reporting/rep115.php:161 reporting/rep201.php:119 reporting/rep203.php:89
+#: reporting/rep204.php:84 reporting/rep206.php:116 reporting/rep307.php:114
+#: reporting/rep601.php:82 reporting/rep602.php:81 reporting/rep701.php:110
+#: reporting/rep704.php:83 reporting/rep704.php:86 reporting/rep704.php:89
+#: reporting/rep708.php:185 sales/inquiry/customer_allocation_inquiry.php:157
+#: sales/inquiry/customer_inquiry.php:210
+#: sales/inquiry/customer_inquiry.php:223
 msgid "Balance"
 msgstr ""
 
-#: dimensions/inquiry/search_dimensions.php:29
+#: dimensions/inquiry/search_dimensions.php:30
 msgid "Search Outstanding Dimensions"
 msgstr ""
 
-#: dimensions/inquiry/search_dimensions.php:34
+#: dimensions/inquiry/search_dimensions.php:35
 msgid "Search Dimensions"
 msgstr ""
 
-#: dimensions/inquiry/search_dimensions.php:72 gl/bank_transfer.php:117
+#: dimensions/inquiry/search_dimensions.php:73 gl/bank_transfer.php:117
 #: gl/inquiry/journal_inquiry.php:45 gl/manage/revaluate_currencies.php:95
 #: gl/includes/ui/gl_bank_ui.inc:26 gl/includes/ui/gl_journal_ui.inc:51
 #: includes/ui/contacts_view.inc:91
 #: inventory/includes/item_adjustments_ui.inc:39
-#: inventory/includes/stock_transfers_ui.inc:42
-#: manufacturing/search_work_orders.php:68
-#: manufacturing/work_order_add_finished.php:185
+#: inventory/includes/sav.item_adjustments_ui.inc:39
+#: inventory/includes/stock_transfers_ui.inc:45
+#: manufacturing/search_work_orders.php:70
+#: manufacturing/work_order_add_finished.php:186
 #: manufacturing/work_order_costs.php:134
 #: manufacturing/work_order_entry.php:357
 #: manufacturing/work_order_entry.php:365
 #: manufacturing/includes/work_order_issue_ui.inc:161
 #: purchasing/includes/ui/invoice_ui.inc:116
 #: purchasing/includes/ui/po_ui.inc:156 purchasing/includes/ui/po_ui.inc:161
-#: purchasing/supplier_payment.php:302 sales/customer_payments.php:347
+#: purchasing/supplier_payment.php:302 sales/customer_payments.php:351
 msgid "Reference:"
 msgstr ""
 
-#: dimensions/inquiry/search_dimensions.php:74
-#: includes/ui/allocation_cart.inc:314 includes/ui/ui_lists.inc:2100
-#: reporting/rep101.php:114 reporting/rep102.php:92 reporting/rep104.php:95
-#: reporting/rep104.php:99 reporting/rep105.php:95 reporting/rep105.php:99
-#: reporting/rep201.php:89 reporting/rep202.php:98 reporting/rep203.php:69
-#: reporting/rep204.php:77 reporting/rep301.php:151 reporting/rep301.php:158
-#: reporting/rep302.php:103 reporting/rep302.php:110 reporting/rep303.php:95
-#: reporting/rep303.php:102 reporting/rep304.php:109 reporting/rep304.php:114
-#: reporting/rep304.php:119 reporting/rep306.php:120 reporting/rep306.php:125
-#: reporting/rep306.php:130 reporting/rep306.php:135 reporting/rep307.php:103
-#: reporting/rep307.php:108 reporting/rep308.php:212 reporting/rep308.php:217
-#: reporting/rep309.php:93 reporting/rep402.php:87 reporting/rep402.php:95
-#: reporting/rep451.php:57 reporting/rep451.php:64 reporting/rep702.php:61
+#: dimensions/inquiry/search_dimensions.php:75
+#: includes/ui/allocation_cart.inc:314 includes/ui/ui_lists.inc:2125
+#: reporting/rep101.php:115 reporting/rep102.php:92 reporting/rep104.php:95
+#: reporting/rep104.php:99 reporting/rep105.php:96 reporting/rep105.php:100
+#: reporting/rep115.php:127 reporting/rep201.php:97 reporting/rep202.php:98
+#: reporting/rep203.php:69 reporting/rep204.php:77 reporting/rep206.php:97
+#: reporting/rep301.php:152 reporting/rep301.php:159 reporting/rep302.php:103
+#: reporting/rep302.php:110 reporting/rep303.php:197 reporting/rep303.php:204
+#: reporting/rep304.php:109 reporting/rep304.php:114 reporting/rep304.php:119
+#: reporting/rep306.php:120 reporting/rep306.php:125 reporting/rep306.php:130
+#: reporting/rep306.php:135 reporting/rep307.php:103 reporting/rep307.php:108
+#: reporting/rep308.php:213 reporting/rep308.php:218 reporting/rep309.php:93
+#: reporting/rep310.php:121 reporting/rep310.php:126 reporting/rep310.php:131
+#: reporting/rep310.php:136 reporting/rep402.php:119 reporting/rep402.php:127
+#: reporting/rep451.php:67 reporting/rep451.php:74 reporting/rep702.php:61
 #: reporting/rep710.php:86 reporting/rep710.php:87
+#: reporting/includes/reports_classes.inc:282
 msgid "All"
 msgstr ""
 
-#: dimensions/inquiry/search_dimensions.php:75 gl/inquiry/bank_inquiry.php:50
-#: gl/inquiry/gl_trial_balance.php:54 gl/inquiry/journal_inquiry.php:48
+#: dimensions/inquiry/search_dimensions.php:76 gl/inquiry/bank_inquiry.php:50
+#: gl/inquiry/gl_trial_balance.php:55 gl/inquiry/journal_inquiry.php:48
 #: gl/inquiry/profit_loss.php:175 gl/includes/ui/gl_bank_ui.inc:52
 #: gl/includes/ui/gl_bank_ui.inc:114 inventory/inquiry/stock_movements.php:85
 #: purchasing/inquiry/supplier_allocation_inquiry.php:50
-#: purchasing/inquiry/supplier_inquiry.php:51
-#: sales/inquiry/customer_inquiry.php:46
+#: purchasing/inquiry/supplier_inquiry.php:143
+#: sales/inquiry/customer_inquiry.php:166
 msgid "From:"
 msgstr ""
 
-#: dimensions/inquiry/search_dimensions.php:76 gl/inquiry/bank_inquiry.php:51
-#: gl/inquiry/gl_trial_balance.php:55 gl/inquiry/journal_inquiry.php:49
+#: dimensions/inquiry/search_dimensions.php:77 gl/inquiry/bank_inquiry.php:51
+#: gl/inquiry/gl_trial_balance.php:56 gl/inquiry/journal_inquiry.php:49
 #: gl/inquiry/profit_loss.php:176 inventory/inquiry/stock_movements.php:86
 #: purchasing/inquiry/supplier_allocation_inquiry.php:51
-#: purchasing/inquiry/supplier_inquiry.php:52
-#: sales/inquiry/customer_inquiry.php:47
+#: purchasing/inquiry/supplier_inquiry.php:144
+#: sales/inquiry/customer_inquiry.php:167
 msgid "To:"
 msgstr ""
 
-#: dimensions/inquiry/search_dimensions.php:78
-#: manufacturing/search_work_orders.php:77
+#: dimensions/inquiry/search_dimensions.php:79
+#: manufacturing/search_work_orders.php:79
 msgid "Only Overdue:"
 msgstr ""
 
-#: dimensions/inquiry/search_dimensions.php:82
-#: manufacturing/search_work_orders.php:80
+#: dimensions/inquiry/search_dimensions.php:83
+#: manufacturing/search_work_orders.php:82
 msgid "Only Open:"
 msgstr ""
 
-#: dimensions/inquiry/search_dimensions.php:129
+#: dimensions/inquiry/search_dimensions.php:136
 #: dimensions/view/view_dimension.php:55 includes/dashboard.inc:486
 #: includes/dashboard.inc:571 includes/ui/allocation_cart.inc:290
 #: purchasing/includes/ui/invoice_ui.inc:135
 #: purchasing/view/view_supp_credit.php:48
 #: purchasing/view/view_supp_invoice.php:52
 #: purchasing/inquiry/supplier_allocation_inquiry.php:142
-#: purchasing/inquiry/supplier_inquiry.php:183 reporting/rep101.php:132
-#: reporting/rep201.php:107 reporting/rep203.php:88 reporting/rep501.php:87
+#: purchasing/inquiry/supplier_inquiry.php:179 reporting/rep101.php:136
+#: reporting/rep201.php:115 reporting/rep203.php:88 reporting/rep501.php:87
 #: reporting/includes/doctext.inc:111 reporting/includes/doctext.inc:143
 #: reporting/includes/doctext.inc:164 reporting/includes/doctext.inc:166
-#: reporting/includes/doctext.inc:205 reporting/includes/doctext.inc:207
+#: reporting/includes/doctext.inc:207 reporting/includes/doctext.inc:209
 #: sales/customer_invoice.php:492 sales/view/view_dispatch.php:97
-#: sales/view/view_invoice.php:96
+#: sales/view/view_invoice.php:96 sales/view/view_sales_order.php:71
 #: sales/inquiry/customer_allocation_inquiry.php:151
-#: sales/inquiry/customer_inquiry.php:207
-#: sales/includes/ui/sales_order_ui.inc:588
+#: sales/inquiry/customer_inquiry.php:205
+#: sales/includes/ui/sales_order_ui.inc:592
 msgid "Due Date"
 msgstr ""
 
-#: dimensions/inquiry/search_dimensions.php:140
+#: dimensions/inquiry/search_dimensions.php:148
 msgid "Marked dimensions are overdue."
 msgstr ""
 
@@ -3562,26 +3679,26 @@ msgstr ""
 msgid "This dimension is closed."
 msgstr ""
 
-#: dimensions/view/view_dimension.php:85 gl/inquiry/gl_account_inquiry.php:71
-#: gl/inquiry/tax_inquiry.php:61 purchasing/inquiry/po_search_completed.php:82
+#: dimensions/view/view_dimension.php:85 gl/inquiry/gl_account_inquiry.php:72
+#: gl/inquiry/tax_inquiry.php:61 purchasing/inquiry/po_search_completed.php:91
 #: purchasing/inquiry/po_search.php:64
 #: sales/inquiry/customer_allocation_inquiry.php:44
-#: sales/inquiry/sales_deliveries_view.php:102
-#: sales/inquiry/sales_orders_view.php:217
+#: sales/inquiry/sales_deliveries_view.php:103
+#: sales/inquiry/sales_orders_view.php:222
 msgid "from:"
 msgstr ""
 
-#: dimensions/view/view_dimension.php:86 gl/inquiry/gl_account_inquiry.php:72
-#: gl/inquiry/tax_inquiry.php:62 purchasing/inquiry/po_search_completed.php:83
+#: dimensions/view/view_dimension.php:86 gl/inquiry/gl_account_inquiry.php:73
+#: gl/inquiry/tax_inquiry.php:62 purchasing/inquiry/po_search_completed.php:92
 #: purchasing/inquiry/po_search.php:65
 #: sales/inquiry/customer_allocation_inquiry.php:45
-#: sales/inquiry/sales_deliveries_view.php:103
-#: sales/inquiry/sales_orders_view.php:218
+#: sales/inquiry/sales_deliveries_view.php:104
+#: sales/inquiry/sales_orders_view.php:223
 msgid "to:"
 msgstr ""
 
 #: dimensions/view/view_dimension.php:87 gl/inquiry/balance_sheet.php:130
-#: gl/inquiry/bank_inquiry.php:53 gl/inquiry/gl_account_inquiry.php:85
+#: gl/inquiry/bank_inquiry.php:53 gl/inquiry/gl_account_inquiry.php:87
 #: gl/inquiry/gl_trial_balance.php:63 gl/inquiry/profit_loss.php:188
 #: gl/inquiry/tax_inquiry.php:63
 msgid "Show"
@@ -3613,10 +3730,10 @@ msgstr ""
 #: gl/accruals.php:106 gl/accruals.php:108 gl/accruals.php:219
 #: gl/accruals.php:221 gl/gl_budget.php:70 gl/gl_budget.php:71
 #: gl/gl_budget.php:75 gl/inquiry/balance_sheet.php:127
-#: gl/inquiry/balance_sheet.php:129 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:57
-#: gl/inquiry/gl_trial_balance.php:59 gl/inquiry/profit_loss.php:184
+#: gl/inquiry/balance_sheet.php:129 gl/inquiry/gl_account_inquiry.php:80
+#: gl/inquiry/gl_account_inquiry.php:82 gl/inquiry/gl_account_inquiry.php:136
+#: gl/inquiry/gl_account_inquiry.php:138 gl/inquiry/gl_trial_balance.php:58
+#: gl/inquiry/gl_trial_balance.php:60 gl/inquiry/profit_loss.php:184
 #: gl/inquiry/profit_loss.php:186 gl/manage/gl_quick_entries.php:268
 #: gl/manage/gl_quick_entries.php:270 gl/manage/gl_quick_entries.php:353
 #: gl/manage/gl_quick_entries.php:355 gl/view/accrual_trans.php:54
@@ -3625,16 +3742,16 @@ msgstr ""
 #: gl/view/gl_payment_view.php:106 gl/view/gl_trans_view.php:95
 #: gl/view/gl_trans_view.php:98 gl/includes/ui/gl_bank_ui.inc:146
 #: gl/includes/ui/gl_bank_ui.inc:147 gl/includes/ui/gl_bank_ui.inc:149
-#: gl/includes/ui/gl_journal_ui.inc:102 gl/includes/ui/gl_journal_ui.inc:103
-#: gl/includes/ui/gl_journal_ui.inc:105 includes/dashboard.inc:134
+#: gl/includes/ui/gl_journal_ui.inc:112 gl/includes/ui/gl_journal_ui.inc:113
+#: gl/includes/ui/gl_journal_ui.inc:115 includes/dashboard.inc:134
 #: includes/dashboard.inc:336 includes/sysnames.inc:43
-#: includes/sysnames.inc:180 inventory/manage/item_categories.php:258
-#: inventory/manage/item_categories.php:260 inventory/manage/items.php:457
-#: inventory/manage/items.php:459 purchasing/includes/ui/invoice_ui.inc:140
-#: purchasing/includes/ui/invoice_ui.inc:278
-#: purchasing/includes/ui/invoice_ui.inc:280
-#: purchasing/includes/ui/po_ui.inc:172 purchasing/manage/suppliers.php:147
-#: purchasing/manage/suppliers.php:148 purchasing/manage/suppliers.php:150
+#: includes/sysnames.inc:182 inventory/manage/item_categories.php:258
+#: inventory/manage/item_categories.php:260 inventory/manage/items.php:449
+#: inventory/manage/items.php:451 purchasing/includes/ui/invoice_ui.inc:140
+#: purchasing/includes/ui/invoice_ui.inc:277
+#: purchasing/includes/ui/invoice_ui.inc:279
+#: purchasing/includes/ui/po_ui.inc:172 purchasing/manage/suppliers.php:257
+#: purchasing/manage/suppliers.php:258 purchasing/manage/suppliers.php:260
 #: reporting/rep103.php:240 reporting/rep103.php:252 reporting/rep205.php:152
 #: reporting/rep205.php:164 reporting/rep501.php:92 reporting/rep704.php:82
 #: reporting/rep704.php:85 reporting/rep704.php:96 reporting/rep704.php:98
@@ -3642,17 +3759,17 @@ msgstr ""
 #: reporting/rep705.php:259 reporting/rep706.php:194 reporting/rep706.php:196
 #: reporting/rep706.php:204 reporting/rep707.php:218 reporting/rep707.php:220
 #: reporting/rep707.php:228 reporting/rep708.php:201 reporting/rep708.php:203
-#: reporting/rep708.php:210 reporting/reports_main.php:366
-#: reporting/reports_main.php:367 reporting/reports_main.php:373
-#: reporting/reports_main.php:374 reporting/reports_main.php:382
-#: reporting/reports_main.php:383 reporting/reports_main.php:394
-#: reporting/reports_main.php:395 reporting/reports_main.php:407
-#: reporting/reports_main.php:408 reporting/reports_main.php:420
-#: reporting/reports_main.php:426 reporting/reports_main.php:434
-#: reporting/reports_main.php:445 reporting/reports_main.php:457
+#: reporting/rep708.php:210 reporting/reports_main.php:398
+#: reporting/reports_main.php:399 reporting/reports_main.php:405
+#: reporting/reports_main.php:406 reporting/reports_main.php:414
+#: reporting/reports_main.php:415 reporting/reports_main.php:426
+#: reporting/reports_main.php:427 reporting/reports_main.php:439
+#: reporting/reports_main.php:440 reporting/reports_main.php:452
+#: reporting/reports_main.php:458 reporting/reports_main.php:466
+#: reporting/reports_main.php:477 reporting/reports_main.php:489
 #: sales/customer_delivery.php:383 sales/customer_delivery.php:391
 #: sales/customer_invoice.php:457 sales/customer_invoice.php:494
-#: sales/manage/customers.php:275 sales/manage/customers.php:277
+#: sales/manage/customers.php:276 sales/manage/customers.php:278
 #: sales/includes/ui/sales_credit_ui.inc:128
 #: sales/includes/ui/sales_credit_ui.inc:133
 #: sales/includes/ui/sales_order_ui.inc:441
@@ -3660,27 +3777,28 @@ msgstr ""
 msgid "Dimension"
 msgstr ""
 
-#: gl/accruals.php:112 gl/accruals.php:229 gl/inquiry/bank_inquiry.php:72
-#: gl/inquiry/gl_account_inquiry.php:141 gl/inquiry/gl_account_inquiry.php:143
-#: gl/inquiry/journal_inquiry.php:114 gl/manage/gl_quick_entries.php:268
-#: gl/manage/gl_quick_entries.php:270 gl/manage/gl_quick_entries.php:272
-#: gl/view/accrual_trans.php:60 gl/view/gl_deposit_view.php:105
-#: gl/view/gl_deposit_view.php:108 gl/view/gl_deposit_view.php:111
-#: gl/view/gl_payment_view.php:104 gl/view/gl_payment_view.php:107
-#: gl/view/gl_payment_view.php:110 gl/view/gl_trans_view.php:96
-#: gl/view/gl_trans_view.php:99 gl/view/gl_trans_view.php:102
-#: gl/includes/ui/gl_bank_ui.inc:147 gl/includes/ui/gl_bank_ui.inc:150
-#: gl/includes/ui/gl_bank_ui.inc:153 gl/includes/ui/gl_bank_ui.inc:302
-#: gl/includes/ui/gl_journal_ui.inc:103 gl/includes/ui/gl_journal_ui.inc:106
-#: gl/includes/ui/gl_journal_ui.inc:109 gl/includes/ui/gl_journal_ui.inc:286
-#: includes/ui/class.reflines_crud.inc:38 inventory/cost_update.php:146
-#: inventory/includes/item_adjustments_ui.inc:214
-#: inventory/includes/stock_transfers_ui.inc:174
+#: gl/accruals.php:112 gl/accruals.php:229 gl/bank_account_reconcile.php:273
+#: gl/inquiry/bank_inquiry.php:72 gl/inquiry/gl_account_inquiry.php:143
+#: gl/inquiry/gl_account_inquiry.php:145 gl/inquiry/journal_inquiry.php:120
+#: gl/manage/gl_quick_entries.php:268 gl/manage/gl_quick_entries.php:270
+#: gl/manage/gl_quick_entries.php:272 gl/view/accrual_trans.php:60
+#: gl/view/gl_deposit_view.php:105 gl/view/gl_deposit_view.php:108
+#: gl/view/gl_deposit_view.php:111 gl/view/gl_payment_view.php:104
+#: gl/view/gl_payment_view.php:107 gl/view/gl_payment_view.php:110
+#: gl/view/gl_trans_view.php:96 gl/view/gl_trans_view.php:99
+#: gl/view/gl_trans_view.php:102 gl/includes/ui/gl_bank_ui.inc:147
+#: gl/includes/ui/gl_bank_ui.inc:150 gl/includes/ui/gl_bank_ui.inc:153
+#: gl/includes/ui/gl_bank_ui.inc:300 gl/includes/ui/gl_journal_ui.inc:113
+#: gl/includes/ui/gl_journal_ui.inc:116 gl/includes/ui/gl_journal_ui.inc:119
+#: gl/includes/ui/gl_journal_ui.inc:297 includes/ui/class.reflines_crud.inc:38
+#: inventory/cost_update.php:146 inventory/includes/item_adjustments_ui.inc:228
+#: inventory/includes/sav.item_adjustments_ui.inc:218
+#: inventory/includes/stock_transfers_ui.inc:169
 #: manufacturing/view/wo_costs_view.php:61
 #: manufacturing/includes/work_order_issue_ui.inc:169
-#: purchasing/includes/ui/invoice_ui.inc:278
-#: purchasing/includes/ui/invoice_ui.inc:280
-#: purchasing/includes/ui/invoice_ui.inc:282
+#: purchasing/includes/ui/invoice_ui.inc:277
+#: purchasing/includes/ui/invoice_ui.inc:279
+#: purchasing/includes/ui/invoice_ui.inc:281 reporting/rep402.php:141
 #: sales/customer_credit_invoice.php:359 sales/customer_delivery.php:523
 #: sales/includes/ui/sales_credit_ui.inc:334
 msgid "Memo"
@@ -3719,7 +3837,7 @@ msgid "Revenue / Cost Account"
 msgstr ""
 
 #: gl/accruals.php:224 gl/gl_budget.php:90 gl/gl_budget.php:92
-#: gl/inquiry/journal_inquiry.php:113 gl/inquiry/tax_inquiry.php:80
+#: gl/inquiry/journal_inquiry.php:119 gl/inquiry/tax_inquiry.php:80
 #: gl/manage/gl_quick_entries.php:268 gl/manage/gl_quick_entries.php:270
 #: gl/manage/gl_quick_entries.php:272 gl/manage/gl_quick_entries.php:348
 #: gl/view/bank_transfer_view.php:70 gl/view/bank_transfer_view.php:80
@@ -3732,19 +3850,20 @@ msgstr ""
 #: includes/dashboard.inc:147 includes/dashboard.inc:170
 #: includes/dashboard.inc:189 includes/dashboard.inc:226
 #: includes/dashboard.inc:294 includes/dashboard.inc:336
-#: includes/dashboard.inc:448 includes/sysnames.inc:138
-#: includes/ui/allocation_cart.inc:290 includes/ui/ui_lists.inc:1349
+#: includes/dashboard.inc:448 includes/sysnames.inc:140
+#: includes/ui/allocation_cart.inc:290 includes/ui/ui_lists.inc:1373
 #: manufacturing/includes/manufacturing_ui.inc:253
-#: purchasing/includes/ui/invoice_ui.inc:278
-#: purchasing/includes/ui/invoice_ui.inc:280
-#: purchasing/includes/ui/invoice_ui.inc:282
+#: purchasing/includes/ui/invoice_ui.inc:277
+#: purchasing/includes/ui/invoice_ui.inc:279
+#: purchasing/includes/ui/invoice_ui.inc:281
 #: purchasing/view/view_supp_payment.php:60
-#: purchasing/view/view_supp_payment.php:72 reporting/rep102.php:242
-#: reporting/rep107.php:205 reporting/rep107.php:270 reporting/rep109.php:197
+#: purchasing/view/view_supp_payment.php:72
+#: purchasing/inquiry/supplier_inquiry.php:181 reporting/rep102.php:242
+#: reporting/rep107.php:204 reporting/rep107.php:269 reporting/rep109.php:197
 #: reporting/rep110.php:194 reporting/rep111.php:194 reporting/rep113.php:183
-#: reporting/rep202.php:250 reporting/rep209.php:199 reporting/rep706.php:308
-#: reporting/rep707.php:326 reporting/rep710.php:78
-#: sales/view/view_receipt.php:44
+#: reporting/rep202.php:250 reporting/rep209.php:196 reporting/rep706.php:308
+#: reporting/rep707.php:328 reporting/rep710.php:78
+#: sales/view/view_receipt.php:44 sales/inquiry/customer_inquiry.php:209
 msgid "Amount"
 msgstr ""
 
@@ -3760,7 +3879,7 @@ msgstr ""
 msgid "Periods"
 msgstr ""
 
-#: gl/accruals.php:232
+#: gl/accruals.php:232 reporting/rep402.php:155 reporting/reports_main.php:327
 msgid "Show GL Rows"
 msgstr ""
 
@@ -3790,59 +3909,62 @@ msgstr ""
 msgid "Reconcile this transaction"
 msgstr ""
 
-#: gl/bank_account_reconcile.php:163 gl/inquiry/bank_inquiry.php:48
-#: gl/inquiry/gl_account_inquiry.php:70
+#: gl/bank_account_reconcile.php:199 gl/inquiry/bank_inquiry.php:48
+#: gl/inquiry/gl_account_inquiry.php:71
 msgid "Account:"
 msgstr ""
 
-#: gl/bank_account_reconcile.php:165
+#: gl/bank_account_reconcile.php:201
 msgid "Bank Statement:"
 msgstr ""
 
-#: gl/bank_account_reconcile.php:166 includes/ui/class.crud_view.inc:300
+#: gl/bank_account_reconcile.php:202 includes/ui/class.crud_view.inc:309
 msgid "New"
 msgstr ""
 
-#: gl/bank_account_reconcile.php:195
+#: gl/bank_account_reconcile.php:231
 msgid "Reconcile Date"
 msgstr ""
 
-#: gl/bank_account_reconcile.php:195
+#: gl/bank_account_reconcile.php:231
 msgid "Beginning<br>Balance"
 msgstr ""
 
-#: gl/bank_account_reconcile.php:196
+#: gl/bank_account_reconcile.php:232
 msgid "Ending<br>Balance"
 msgstr ""
 
-#: gl/bank_account_reconcile.php:196
+#: gl/bank_account_reconcile.php:232
 msgid "Account<br>Total"
 msgstr ""
 
-#: gl/bank_account_reconcile.php:196
+#: gl/bank_account_reconcile.php:232
 msgid "Reconciled<br>Amount"
 msgstr ""
 
-#: gl/bank_account_reconcile.php:196 reporting/rep602.php:205
+#: gl/bank_account_reconcile.php:232 reporting/rep602.php:205
 msgid "Difference"
 msgstr ""
 
-#: gl/bank_account_reconcile.php:200
+#: gl/bank_account_reconcile.php:236
 msgid "Date of bank statement to reconcile"
 msgstr ""
 
-#: gl/bank_account_reconcile.php:236 gl/inquiry/bank_inquiry.php:72
-#: gl/inquiry/gl_account_inquiry.php:141 gl/inquiry/gl_account_inquiry.php:143
-#: gl/view/accrual_trans.php:60 reporting/rep601.php:79
-#: reporting/rep602.php:80 reporting/rep704.php:83 reporting/rep704.php:85
-#: reporting/rep704.php:88
+#: gl/bank_account_reconcile.php:272 gl/inquiry/bank_inquiry.php:72
+#: gl/inquiry/gl_account_inquiry.php:143 gl/inquiry/gl_account_inquiry.php:145
+#: gl/view/accrual_trans.php:60 reporting/rep601.php:81 reporting/rep602.php:80
+#: reporting/rep704.php:83 reporting/rep704.php:85 reporting/rep704.php:88
 msgid "Person/Item"
 msgstr ""
 
-#: gl/bank_account_reconcile.php:246
+#: gl/bank_account_reconcile.php:284
 msgid "Reconcile"
 msgstr ""
 
+#: gl/bank_account_reconcile.php:285
+msgid "Reconcile All"
+msgstr ""
+
 #: gl/bank_transfer.php:30
 msgid "Modify Bank Account Transfer"
 msgstr ""
@@ -3876,12 +3998,12 @@ msgid "Transfer Date:"
 msgstr ""
 
 #: gl/bank_transfer.php:126 gl/bank_transfer.php:133
-#: sales/customer_payments.php:376
+#: sales/customer_payments.php:380
 msgid "Amount:"
 msgstr ""
 
 #: gl/bank_transfer.php:127 gl/bank_transfer.php:134
-#: purchasing/supplier_payment.php:319 sales/customer_payments.php:362
+#: purchasing/supplier_payment.php:319 sales/customer_payments.php:366
 msgid "Bank Charge:"
 msgstr ""
 
@@ -3902,7 +4024,7 @@ msgstr ""
 msgid "The entered amount is invalid or less than zero."
 msgstr ""
 
-#: gl/bank_transfer.php:177 gl/gl_bank.php:226
+#: gl/bank_transfer.php:177 gl/gl_bank.php:230
 msgid "The total bank amount cannot be 0."
 msgstr ""
 
@@ -3935,7 +4057,7 @@ msgid ""
 msgstr ""
 
 #: gl/bank_transfer.php:231 purchasing/supplier_payment.php:158
-#: sales/customer_payments.php:181
+#: sales/customer_payments.php:186
 msgid ""
 "The Bank Charge Account has not been set in System and General GL Setup."
 msgstr ""
@@ -3964,124 +4086,124 @@ msgstr ""
 msgid "Modify Bank Deposit Entry"
 msgstr ""
 
-#: gl/gl_bank.php:77
+#: gl/gl_bank.php:81
 #, php-format
 msgid "Payment %d has been entered"
 msgstr ""
 
-#: gl/gl_bank.php:79 gl/gl_bank.php:97
+#: gl/gl_bank.php:83 gl/gl_bank.php:101
 msgid "&View the GL Postings for this Payment"
 msgstr ""
 
-#: gl/gl_bank.php:81 gl/gl_bank.php:99
+#: gl/gl_bank.php:85 gl/gl_bank.php:103
 msgid "Enter Another &Payment"
 msgstr ""
 
-#: gl/gl_bank.php:83 gl/gl_bank.php:101
+#: gl/gl_bank.php:87 gl/gl_bank.php:105
 msgid "Enter A &Deposit"
 msgstr ""
 
-#: gl/gl_bank.php:85 gl/gl_journal.php:64 inventory/adjustments.php:65
+#: gl/gl_bank.php:89 gl/gl_journal.php:64 inventory/adjustments.php:65
 #: manufacturing/work_order_entry.php:67 purchasing/po_entry_items.php:117
 #: purchasing/po_entry_items.php:138 purchasing/supplier_credit.php:82
-#: purchasing/supplier_invoice.php:76 sales/credit_note_entry.php:77
+#: purchasing/supplier_invoice.php:74 sales/credit_note_entry.php:77
 #: sales/customer_credit_invoice.php:61 sales/customer_invoice.php:72
 #: sales/sales_order_entry.php:250
 msgid "Add an Attachment"
 msgstr ""
 
-#: gl/gl_bank.php:95
+#: gl/gl_bank.php:99
 #, php-format
 msgid "Payment %d has been modified"
 msgstr ""
 
-#: gl/gl_bank.php:111
+#: gl/gl_bank.php:115
 #, php-format
 msgid "Deposit %d has been entered"
 msgstr ""
 
-#: gl/gl_bank.php:113
+#: gl/gl_bank.php:117
 msgid "View the GL Postings for this Deposit"
 msgstr ""
 
-#: gl/gl_bank.php:115
+#: gl/gl_bank.php:119
 msgid "Enter Another Deposit"
 msgstr ""
 
-#: gl/gl_bank.php:117
+#: gl/gl_bank.php:121
 msgid "Enter A Payment"
 msgstr ""
 
-#: gl/gl_bank.php:126
+#: gl/gl_bank.php:130
 #, php-format
 msgid "Deposit %d has been modified"
 msgstr ""
 
-#: gl/gl_bank.php:128
+#: gl/gl_bank.php:132
 msgid "&View the GL Postings for this Deposit"
 msgstr ""
 
-#: gl/gl_bank.php:130
+#: gl/gl_bank.php:134
 msgid "Enter Another &Deposit"
 msgstr ""
 
-#: gl/gl_bank.php:132
+#: gl/gl_bank.php:136
 msgid "Enter A &Payment"
 msgstr ""
 
-#: gl/gl_bank.php:220
+#: gl/gl_bank.php:224
 msgid "You must enter at least one payment line."
 msgstr ""
 
-#: gl/gl_bank.php:237 purchasing/supplier_payment.php:209
+#: gl/gl_bank.php:241 purchasing/supplier_payment.php:209
 #, php-format
 msgid "The total bank amount exceeds allowed limit (%s)."
 msgstr ""
 
-#: gl/gl_bank.php:243
+#: gl/gl_bank.php:248
 #, php-format
 msgid ""
 "The bank transaction would result in exceed of authorized overdraft limit "
 "for transaction: %s #%s on %s."
 msgstr ""
 
-#: gl/gl_bank.php:255
+#: gl/gl_bank.php:261
 msgid "The entered date for the payment is invalid."
 msgstr ""
 
-#: gl/gl_bank.php:267
+#: gl/gl_bank.php:273
 msgid "You have to select customer and customer branch."
 msgstr ""
 
-#: gl/gl_bank.php:271
+#: gl/gl_bank.php:277
 msgid "You have to select supplier."
 msgstr ""
 
-#: gl/gl_bank.php:279
+#: gl/gl_bank.php:285
 msgid "Settled amount have to be positive number."
 msgstr ""
 
-#: gl/gl_bank.php:325
+#: gl/gl_bank.php:331
 msgid "The amount entered is not a valid number or is less than zero."
 msgstr ""
 
-#: gl/gl_bank.php:331 gl/manage/exchange_rates.php:39
+#: gl/gl_bank.php:337 gl/manage/exchange_rates.php:39
 msgid "The exchange rate cannot be zero or a negative number."
 msgstr ""
 
-#: gl/gl_bank.php:403
+#: gl/gl_bank.php:409
 msgid "Payment Items"
 msgstr ""
 
-#: gl/gl_bank.php:403
+#: gl/gl_bank.php:409
 msgid "Deposit Items"
 msgstr ""
 
-#: gl/gl_bank.php:411
+#: gl/gl_bank.php:417
 msgid "Process Payment"
 msgstr ""
 
-#: gl/gl_bank.php:411
+#: gl/gl_bank.php:417
 msgid "Process Deposit"
 msgstr ""
 
@@ -4103,8 +4225,8 @@ msgstr ""
 msgid "The Budget has been deleted."
 msgstr ""
 
-#: gl/gl_budget.php:63 gl/manage/gl_accounts.php:234
-#: gl/manage/gl_accounts.php:244
+#: gl/gl_budget.php:63 gl/manage/gl_accounts.php:240
+#: gl/manage/gl_accounts.php:251
 msgid "Account Code:"
 msgstr ""
 
@@ -4113,11 +4235,12 @@ msgid "Get"
 msgstr ""
 
 #: gl/gl_budget.php:90 gl/gl_budget.php:92 gl/inquiry/profit_loss.php:237
-#: gl/manage/gl_quick_entries.php:247 reporting/rep101.php:140
-#: reporting/rep105.php:118 reporting/rep106.php:98 reporting/rep114.php:90
-#: reporting/rep201.php:115 reporting/rep304.php:134 reporting/rep305.php:111
-#: reporting/rep306.php:148 reporting/rep307.php:119 reporting/rep308.php:229
-#: reporting/rep309.php:104 reporting/rep601.php:85 reporting/rep602.php:86
+#: gl/manage/gl_quick_entries.php:247 reporting/rep101.php:144
+#: reporting/rep105.php:119 reporting/rep106.php:99 reporting/rep114.php:90
+#: reporting/rep115.php:166 reporting/rep201.php:123 reporting/rep206.php:121
+#: reporting/rep304.php:134 reporting/rep305.php:111 reporting/rep306.php:148
+#: reporting/rep307.php:119 reporting/rep308.php:230 reporting/rep309.php:104
+#: reporting/rep310.php:149 reporting/rep601.php:94 reporting/rep602.php:86
 #: reporting/rep702.php:59 reporting/rep704.php:94 reporting/rep704.php:104
 #: reporting/rep704.php:112 reporting/rep706.php:185 reporting/rep706.php:193
 #: reporting/rep706.php:203 reporting/rep706.php:211 reporting/rep707.php:210
@@ -4137,40 +4260,42 @@ msgstr ""
 
 #: gl/gl_budget.php:126 gl/inquiry/balance_sheet.php:98
 #: gl/inquiry/balance_sheet.php:202 gl/inquiry/balance_sheet.php:233
-#: gl/inquiry/gl_trial_balance.php:220 gl/inquiry/profit_loss.php:120
-#: gl/inquiry/profit_loss.php:287 gl/view/gl_deposit_view.php:137
-#: gl/view/gl_payment_view.php:136 gl/view/gl_trans_view.php:144
-#: gl/includes/ui/gl_bank_ui.inc:195 gl/includes/ui/gl_journal_ui.inc:169
-#: includes/dashboard.inc:487 includes/dashboard.inc:571
-#: inventory/includes/item_adjustments_ui.inc:60
-#: inventory/includes/item_adjustments_ui.inc:114
+#: gl/inquiry/gl_trial_balance.php:174 gl/inquiry/gl_trial_balance.php:251
+#: gl/inquiry/profit_loss.php:120 gl/inquiry/profit_loss.php:287
+#: gl/view/gl_deposit_view.php:137 gl/view/gl_payment_view.php:136
+#: gl/view/gl_trans_view.php:144 gl/includes/ui/gl_bank_ui.inc:195
+#: gl/includes/ui/gl_journal_ui.inc:179 includes/dashboard.inc:487
+#: includes/dashboard.inc:571 inventory/includes/item_adjustments_ui.inc:60
+#: inventory/includes/item_adjustments_ui.inc:120
+#: inventory/includes/sav.item_adjustments_ui.inc:60
+#: inventory/includes/sav.item_adjustments_ui.inc:116
 #: manufacturing/includes/manufacturing_ui.inc:195
 #: purchasing/includes/ui/invoice_ui.inc:341
-#: purchasing/includes/ui/invoice_ui.inc:504
-#: purchasing/includes/ui/invoice_ui.inc:575
-#: purchasing/po_receive_items.php:63 purchasing/view/view_po.php:140
+#: purchasing/includes/ui/invoice_ui.inc:503
+#: purchasing/includes/ui/invoice_ui.inc:574 purchasing/po_receive_items.php:63
+#: purchasing/view/view_po.php:140
 #: purchasing/allocations/supplier_allocation_main.php:100
-#: reporting/rep101.php:249 reporting/rep106.php:90 reporting/rep106.php:125
-#: reporting/rep106.php:172 reporting/rep114.php:161 reporting/rep201.php:222
+#: reporting/rep101.php:260 reporting/rep106.php:91 reporting/rep106.php:126
+#: reporting/rep106.php:173 reporting/rep114.php:161 reporting/rep201.php:230
 #: reporting/rep203.php:89 reporting/rep203.php:166 reporting/rep204.php:113
-#: reporting/rep204.php:141 reporting/rep301.php:192 reporting/rep301.php:240
+#: reporting/rep204.php:141 reporting/rep301.php:193 reporting/rep301.php:241
 #: reporting/rep304.php:160 reporting/rep304.php:205 reporting/rep305.php:106
 #: reporting/rep305.php:132 reporting/rep305.php:188 reporting/rep306.php:141
 #: reporting/rep306.php:176 reporting/rep306.php:196 reporting/rep306.php:212
-#: reporting/rep306.php:261 reporting/rep306.php:276 reporting/rep306.php:287
-#: reporting/rep308.php:304 reporting/rep309.php:125 reporting/rep309.php:152
-#: reporting/rep451.php:107 reporting/rep451.php:142 reporting/rep702.php:142
-#: reporting/rep705.php:152 reporting/rep705.php:312 reporting/rep706.php:106
-#: reporting/rep706.php:255 reporting/rep706.php:290 reporting/rep707.php:115
-#: reporting/rep707.php:297 reporting/rep708.php:253
-#: reporting/includes/doctext.inc:32 reporting/includes/doctext.inc:191
-#: sales/customer_credit_invoice.php:276 sales/customer_delivery.php:421
-#: sales/customer_invoice.php:519 sales/customer_invoice.php:522
-#: sales/allocations/customer_allocation_main.php:93
+#: reporting/rep306.php:260 reporting/rep306.php:275 reporting/rep306.php:286
+#: reporting/rep309.php:125 reporting/rep309.php:152 reporting/rep451.php:120
+#: reporting/rep451.php:155 reporting/rep702.php:136 reporting/rep705.php:152
+#: reporting/rep705.php:312 reporting/rep706.php:106 reporting/rep706.php:255
+#: reporting/rep706.php:290 reporting/rep707.php:115 reporting/rep707.php:299
+#: reporting/rep708.php:253 reporting/includes/doctext.inc:32
+#: reporting/includes/doctext.inc:191 sales/customer_credit_invoice.php:276
+#: sales/customer_delivery.php:421 sales/customer_invoice.php:519
+#: sales/customer_invoice.php:522
+#: sales/allocations/customer_allocation_main.php:98
 #: sales/view/view_credit.php:91 sales/view/view_dispatch.php:113
-#: sales/view/view_invoice.php:116 sales/view/view_sales_order.php:109
-#: sales/view/view_sales_order.php:142 sales/view/view_sales_order.php:179
-#: sales/view/view_sales_order.php:220
+#: sales/view/view_invoice.php:116 sales/view/view_sales_order.php:111
+#: sales/view/view_sales_order.php:144 sales/view/view_sales_order.php:181
+#: sales/view/view_sales_order.php:222
 #: sales/includes/ui/sales_credit_ui.inc:163
 #: sales/includes/ui/sales_order_ui.inc:148
 msgid "Total"
@@ -4185,7 +4310,7 @@ msgstr ""
 msgid "Modifying Journal Transaction # %d."
 msgstr ""
 
-#: gl/gl_journal.php:36 includes/sysnames.inc:22 includes/sysnames.inc:155
+#: gl/gl_journal.php:36 includes/sysnames.inc:22 includes/sysnames.inc:157
 msgid "Journal Entry"
 msgstr ""
 
@@ -4218,119 +4343,114 @@ msgstr ""
 msgid "Entry &New Journal Entry"
 msgstr ""
 
-#: gl/gl_journal.php:204
+#: gl/gl_journal.php:203
 msgid "You must enter at least one journal line."
 msgstr ""
 
-#: gl/gl_journal.php:210
+#: gl/gl_journal.php:209
 msgid ""
 "The journal must balance (debits equal to credits) before it can be "
 "processed."
 msgstr ""
 
-#: gl/gl_journal.php:247
+#: gl/gl_journal.php:246
 msgid "The exchange rate must be numeric and greater than zero."
 msgstr ""
 
-#: gl/gl_journal.php:273
+#: gl/gl_journal.php:272
 msgid ""
 "Check tax register records before processing transaction or switch off "
 "'Include in tax register' option."
 msgstr ""
 
-#: gl/gl_journal.php:287
+#: gl/gl_journal.php:286
 msgid ""
 "Cannot determine tax register to be used. You have to make at least one "
 "posting either to tax or customer/supplier account to use tax register."
 msgstr ""
 
-#: gl/gl_journal.php:347 gl/manage/gl_quick_entries.php:121
+#: gl/gl_journal.php:355 gl/manage/gl_quick_entries.php:121
 msgid "You must select GL account."
 msgstr ""
 
-#: gl/gl_journal.php:353
+#: gl/gl_journal.php:361
 msgid "You must select subledger account."
 msgstr ""
 
-#: gl/gl_journal.php:361 gl/gl_journal.php:368
+#: gl/gl_journal.php:369 gl/gl_journal.php:376
 msgid "Dimension is closed."
 msgstr ""
 
-#: gl/gl_journal.php:375
+#: gl/gl_journal.php:383
 msgid "You must enter either a debit amount or a credit amount."
 msgstr ""
 
-#: gl/gl_journal.php:382
+#: gl/gl_journal.php:390
 msgid "The debit amount entered is not a valid number or is less than zero."
 msgstr ""
 
-#: gl/gl_journal.php:387
+#: gl/gl_journal.php:395
 msgid "The credit amount entered is not a valid number or is less than zero."
 msgstr ""
 
-#: gl/gl_journal.php:393 includes/ui/ui_view.inc:649
-#: purchasing/supplier_credit.php:143 purchasing/supplier_invoice.php:154
+#: gl/gl_journal.php:401 includes/ui/ui_view.inc:655
+#: purchasing/supplier_credit.php:143 purchasing/supplier_invoice.php:152
 msgid "Cannot post to GL account used by more than one tax type."
 msgstr ""
 
-#: gl/gl_journal.php:400
+#: gl/gl_journal.php:408
 msgid ""
 "You cannot make a journal entry for a bank account. Please use one of the "
 "banking functions for bank transactions."
 msgstr ""
 
-#: gl/gl_journal.php:520
+#: gl/gl_journal.php:528
 msgid "&GL postings"
 msgstr ""
 
-#: gl/gl_journal.php:521
+#: gl/gl_journal.php:529
 msgid "&Tax register"
 msgstr ""
 
-#: gl/gl_journal.php:530
+#: gl/gl_journal.php:538
 msgid "Rows"
 msgstr ""
 
-#: gl/gl_journal.php:539
+#: gl/gl_journal.php:548
 msgid "Tax register record"
 msgstr ""
 
-#: gl/gl_journal.php:541
+#: gl/gl_journal.php:551
 msgid "VAT date:"
 msgstr ""
 
-#: gl/gl_journal.php:542
-msgid "Tax group:"
-msgstr ""
-
-#: gl/gl_journal.php:546 gl/inquiry/tax_inquiry.php:102
+#: gl/gl_journal.php:556 gl/inquiry/tax_inquiry.php:102
 #: reporting/rep709.php:189
 msgid "Input Tax"
 msgstr ""
 
-#: gl/gl_journal.php:546 gl/inquiry/tax_inquiry.php:96
-#: reporting/rep709.php:189
+#: gl/gl_journal.php:556 gl/inquiry/tax_inquiry.php:96 reporting/rep709.php:189
 msgid "Output Tax"
 msgstr ""
 
-#: gl/gl_journal.php:546
+#: gl/gl_journal.php:556
 msgid "Net amount"
 msgstr ""
 
-#: gl/gl_journal.php:561
+#: gl/gl_journal.php:571
 msgid "Process Journal Entry"
 msgstr ""
 
-#: gl/gl_journal.php:562
+#: gl/gl_journal.php:572
 msgid "Process journal entry only if debits equal to credits"
 msgstr ""
 
-#: gl/inquiry/accounts_list.php:25 inventory/manage/items.php:466
+#: gl/inquiry/accounts_list.php:25 inventory/manage/items.php:458
 #: sales/manage/customer_branches.php:240
 msgid "GL Accounts"
 msgstr ""
 
-#: gl/inquiry/accounts_list.php:40 includes/ui/ui_lists.inc:346
+#: gl/inquiry/accounts_list.php:40 includes/ui/ui_lists.inc:351
 msgid "Search GL accounts"
 msgstr ""
 
@@ -4340,19 +4460,21 @@ msgstr ""
 #: gl/view/gl_payment_view.php:109 gl/view/gl_trans_view.php:95
 #: gl/view/gl_trans_view.php:98 gl/view/gl_trans_view.php:101
 #: gl/includes/ui/gl_bank_ui.inc:146 gl/includes/ui/gl_bank_ui.inc:149
-#: gl/includes/ui/gl_bank_ui.inc:152 gl/includes/ui/gl_journal_ui.inc:102
-#: gl/includes/ui/gl_journal_ui.inc:105 gl/includes/ui/gl_journal_ui.inc:108
-#: manufacturing/view/wo_costs_view.php:60 reporting/rep701.php:110
+#: gl/includes/ui/gl_bank_ui.inc:152 gl/includes/ui/gl_journal_ui.inc:112
+#: gl/includes/ui/gl_journal_ui.inc:115 gl/includes/ui/gl_journal_ui.inc:118
+#: manufacturing/view/wo_costs_view.php:60 reporting/rep402.php:141
+#: reporting/rep701.php:110
 msgid "Account Code"
 msgstr ""
 
 #: gl/inquiry/accounts_list.php:52 inventory/inquiry/stock_list.php:53
 #: inventory/manage/item_codes.php:127 reporting/rep104.php:115
-#: reporting/rep105.php:119 reporting/rep301.php:164 reporting/rep301.php:170
-#: reporting/rep302.php:122 reporting/rep302.php:129 reporting/rep303.php:132
+#: reporting/rep105.php:120 reporting/rep301.php:165 reporting/rep301.php:171
+#: reporting/rep302.php:122 reporting/rep302.php:129 reporting/rep303.php:235
 #: reporting/rep304.php:127 reporting/rep304.php:135 reporting/rep306.php:141
 #: reporting/rep306.php:149 reporting/rep307.php:114 reporting/rep307.php:120
-#: reporting/rep308.php:223 reporting/rep308.php:230 reporting/rep309.php:105
+#: reporting/rep308.php:224 reporting/rep308.php:231 reporting/rep309.php:105
+#: reporting/rep310.php:150
 msgid "Category"
 msgstr ""
 
@@ -4365,13 +4487,12 @@ msgid "As at:"
 msgstr ""
 
 #: gl/inquiry/balance_sheet.php:225 gl/inquiry/profit_loss.php:298
-#: includes/dashboard.inc:394 reporting/rep705.php:322
-#: reporting/rep706.php:278 reporting/rep706.php:303 reporting/rep707.php:309
-#: reporting/rep707.php:315
+#: includes/dashboard.inc:394 reporting/rep705.php:322 reporting/rep706.php:278
+#: reporting/rep706.php:303 reporting/rep707.php:311 reporting/rep707.php:317
 msgid "Calculated Return"
 msgstr ""
 
-#: gl/inquiry/balance_sheet.php:233 includes/sysnames.inc:126
+#: gl/inquiry/balance_sheet.php:233 includes/sysnames.inc:128
 #: reporting/rep706.php:290
 msgid "Liabilities"
 msgstr ""
@@ -4384,38 +4505,42 @@ msgstr ""
 msgid "Equities"
 msgstr ""
 
-#: gl/inquiry/bank_inquiry.php:29 reporting/rep601.php:72
-msgid "Bank Statement"
+#: gl/inquiry/bank_inquiry.php:29
+msgid "Bank Account Inquiry"
 msgstr ""
 
-#: gl/inquiry/bank_inquiry.php:79 gl/inquiry/gl_account_inquiry.php:162
-#: reporting/rep601.php:104 reporting/rep602.php:103 reporting/rep704.php:143
+#: gl/inquiry/bank_inquiry.php:79 gl/inquiry/gl_account_inquiry.php:164
+#: reporting/rep601.php:112 reporting/rep602.php:103 reporting/rep704.php:143
 msgid "Opening Balance"
 msgstr ""
 
-#: gl/inquiry/bank_inquiry.php:130 gl/inquiry/gl_account_inquiry.php:213
-#: gl/inquiry/gl_trial_balance.php:230 reporting/rep601.php:157
+#: gl/inquiry/bank_inquiry.php:130 gl/inquiry/gl_account_inquiry.php:220
+#: gl/inquiry/gl_trial_balance.php:261 reporting/rep601.php:165
 #: reporting/rep602.php:157 reporting/rep704.php:191 reporting/rep708.php:262
 msgid "Ending Balance"
 msgstr ""
 
-#: gl/inquiry/gl_account_inquiry.php:31
+#: gl/inquiry/gl_account_inquiry.php:32
 msgid "General Ledger Inquiry"
 msgstr ""
 
-#: gl/inquiry/gl_account_inquiry.php:70
+#: gl/inquiry/gl_account_inquiry.php:71
 msgid "All Accounts"
 msgstr ""
 
-#: gl/inquiry/gl_account_inquiry.php:83
+#: gl/inquiry/gl_account_inquiry.php:84 gl/inquiry/journal_inquiry.php:53
+msgid "Enter memo fragment or leave empty"
+msgstr ""
+
+#: gl/inquiry/gl_account_inquiry.php:85
 msgid "Amount min:"
 msgstr ""
 
-#: gl/inquiry/gl_account_inquiry.php:84
+#: gl/inquiry/gl_account_inquiry.php:86
 msgid "Amount max:"
 msgstr ""
 
-#: gl/inquiry/gl_account_inquiry.php:222
+#: gl/inquiry/gl_account_inquiry.php:229
 msgid ""
 "No general ledger transactions have been created for the specified criteria."
 msgstr ""
@@ -4424,50 +4549,51 @@ msgstr ""
 msgid "Trial Balance"
 msgstr ""
 
-#: gl/inquiry/gl_trial_balance.php:60
+#: gl/inquiry/gl_trial_balance.php:61
 msgid "No zero values"
 msgstr ""
 
-#: gl/inquiry/gl_trial_balance.php:61 reporting/reports_main.php:406
-#: reporting/reports_main.php:456 reporting/reports_main.php:501
+#: gl/inquiry/gl_trial_balance.php:62 reporting/reports_main.php:438
+#: reporting/reports_main.php:488 reporting/reports_main.php:533
 msgid "Only balances"
 msgstr ""
 
-#: gl/inquiry/gl_trial_balance.php:93 gl/inquiry/gl_trial_balance.php:154
-#: includes/dashboard.inc:526 reporting/rep706.php:307
-#: reporting/rep707.php:325 reporting/rep708.php:51 reporting/rep708.php:126
-#: sales/create_recurrent_invoices.php:203
+#: gl/inquiry/gl_trial_balance.php:104 gl/inquiry/gl_trial_balance.php:165
+#: includes/dashboard.inc:526 reporting/rep706.php:307 reporting/rep707.php:327
+#: reporting/rep708.php:51 reporting/rep708.php:126
+#: sales/create_recurrent_invoices.php:204
 #: sales/manage/recurrent_invoices.php:128
 msgid "Group"
 msgstr ""
 
-#: gl/inquiry/gl_trial_balance.php:172
+#: gl/inquiry/gl_trial_balance.php:203
 msgid "The from date cannot be bigger than the fiscal year end."
 msgstr ""
 
-#: gl/inquiry/gl_trial_balance.php:185 gl/manage/bank_accounts.php:109
+#: gl/inquiry/gl_trial_balance.php:216 gl/manage/bank_accounts.php:109
 #: gl/view/gl_trans_view.php:95 gl/view/gl_trans_view.php:98
 #: gl/view/gl_trans_view.php:101 manufacturing/view/wo_costs_view.php:60
-#: reporting/rep701.php:110 reporting/rep702.php:53 reporting/rep705.php:235
-#: reporting/rep706.php:185 reporting/rep707.php:210 reporting/rep708.php:192
+#: reporting/rep402.php:141 reporting/rep701.php:110 reporting/rep702.php:53
+#: reporting/rep705.php:235 reporting/rep706.php:185 reporting/rep707.php:210
+#: reporting/rep708.php:192
 msgid "Account Name"
 msgstr ""
 
-#: gl/inquiry/gl_trial_balance.php:186 reporting/rep708.php:185
+#: gl/inquiry/gl_trial_balance.php:217 reporting/rep708.php:185
 msgid "Brought Forward"
 msgstr ""
 
-#: gl/inquiry/gl_trial_balance.php:187 reporting/rep708.php:185
+#: gl/inquiry/gl_trial_balance.php:218 reporting/rep708.php:185
 msgid "This Period"
 msgstr ""
 
-#: gl/inquiry/gl_trial_balance.php:206 gl/manage/gl_account_types.php:127
+#: gl/inquiry/gl_trial_balance.php:237 gl/manage/gl_account_types.php:133
 #: includes/dashboard.inc:147 includes/dashboard.inc:170
-#: reporting/rep451.php:70 reporting/rep451.php:76
+#: reporting/rep451.php:80 reporting/rep451.php:86
 msgid "Class"
 msgstr ""
 
-#: gl/inquiry/gl_trial_balance.php:238 reporting/rep708.php:283
+#: gl/inquiry/gl_trial_balance.php:269 reporting/rep708.php:283
 msgid ""
 "The Opening Balance is not in balance, probably due to a non closed Previous "
 "Fiscalyear."
@@ -4481,10 +4607,6 @@ msgstr ""
 msgid "Enter reference fragment or leave empty"
 msgstr ""
 
-#: gl/inquiry/journal_inquiry.php:53
-msgid "Enter memo fragment or leave empty"
-msgstr ""
-
 #: gl/inquiry/journal_inquiry.php:54
 msgid "User:"
 msgstr ""
@@ -4497,29 +4619,28 @@ msgstr ""
 msgid "Show closed:"
 msgstr ""
 
-#: gl/inquiry/journal_inquiry.php:109
+#: gl/inquiry/journal_inquiry.php:115
 msgid "Trans #"
 msgstr ""
 
-#: gl/inquiry/journal_inquiry.php:110 gl/view/gl_trans_view.php:44
-#: gl/includes/ui/gl_journal_ui.inc:113
+#: gl/inquiry/journal_inquiry.php:116 gl/view/gl_trans_view.php:44
+#: gl/includes/ui/gl_journal_ui.inc:123
 msgid "Counterparty"
 msgstr ""
 
-#: gl/inquiry/journal_inquiry.php:111 gl/inquiry/journal_inquiry.php:126
+#: gl/inquiry/journal_inquiry.php:117 gl/inquiry/journal_inquiry.php:132
 #: purchasing/includes/ui/grn_ui.inc:34 purchasing/includes/ui/grn_ui.inc:77
-#: purchasing/includes/ui/po_ui.inc:328
-#: purchasing/view/view_supp_credit.php:44
+#: purchasing/includes/ui/po_ui.inc:332 purchasing/view/view_supp_credit.php:44
 #: purchasing/view/view_supp_invoice.php:48
-#: purchasing/inquiry/po_search_completed.php:114
+#: purchasing/inquiry/po_search_completed.php:123
 #: purchasing/inquiry/po_search.php:121
-#: purchasing/inquiry/supplier_inquiry.php:181
+#: purchasing/inquiry/supplier_inquiry.php:177
 #: reporting/includes/doctext.inc:163 reporting/includes/doctext.inc:186
 msgid "Supplier's Reference"
 msgstr ""
 
-#: gl/inquiry/journal_inquiry.php:115 reporting/rep710.php:77
-#: reporting/rep710.php:87 reporting/reports_main.php:517
+#: gl/inquiry/journal_inquiry.php:121 reporting/rep710.php:77
+#: reporting/rep710.php:87 reporting/reports_main.php:549
 msgid "User"
 msgstr ""
 
@@ -4532,7 +4653,7 @@ msgstr ""
 msgid "Accumulated"
 msgstr ""
 
-#: gl/inquiry/profit_loss.php:31 reporting/rep707.php:255
+#: gl/inquiry/profit_loss.php:31 reporting/rep707.php:257
 #: reporting/includes/reports_classes.inc:249
 msgid "Period Y-1"
 msgstr ""
@@ -4542,8 +4663,8 @@ msgstr ""
 msgid "Budget"
 msgstr ""
 
-#: gl/inquiry/profit_loss.php:178 reporting/reports_main.php:393
-#: reporting/reports_main.php:444 reporting/reports_main.php:490
+#: gl/inquiry/profit_loss.php:178 reporting/reports_main.php:425
+#: reporting/reports_main.php:476 reporting/reports_main.php:522
 msgid "Compare to"
 msgstr ""
 
@@ -4583,8 +4704,8 @@ msgstr ""
 msgid "Total payable or refund"
 msgstr ""
 
-#: gl/manage/bank_accounts.php:16 reporting/reports_main.php:331
-#: reporting/reports_main.php:339
+#: gl/manage/bank_accounts.php:16 reporting/reports_main.php:363
+#: reporting/reports_main.php:371
 msgid "Bank Accounts"
 msgstr ""
 
@@ -4629,32 +4750,33 @@ msgstr ""
 #: inventory/prices.php:151 inventory/purchasing_data.php:150
 #: purchasing/view/view_supp_credit.php:49
 #: purchasing/view/view_supp_invoice.php:54
-#: purchasing/inquiry/po_search_completed.php:116
+#: purchasing/inquiry/po_search_completed.php:125
 #: purchasing/inquiry/po_search.php:123
 #: purchasing/inquiry/supplier_allocation_inquiry.php:143
 #: purchasing/inquiry/supplier_allocation_inquiry.php:153
-#: purchasing/inquiry/supplier_inquiry.php:74
-#: purchasing/inquiry/supplier_inquiry.php:184
-#: purchasing/inquiry/supplier_inquiry.php:196
+#: purchasing/inquiry/supplier_inquiry.php:50
+#: purchasing/inquiry/supplier_inquiry.php:180
+#: purchasing/inquiry/supplier_inquiry.php:192
 #: purchasing/allocations/supplier_allocation_main.php:99
 #: purchasing/allocations/supplier_allocation_main.php:107
-#: reporting/rep101.php:142 reporting/rep102.php:129 reporting/rep102.php:135
-#: reporting/rep103.php:229 reporting/rep104.php:114 reporting/rep201.php:117
-#: reporting/rep202.php:136 reporting/rep203.php:96 reporting/rep205.php:141
+#: reporting/rep101.php:147 reporting/rep102.php:129 reporting/rep102.php:135
+#: reporting/rep103.php:229 reporting/rep104.php:114 reporting/rep115.php:170
+#: reporting/rep201.php:125 reporting/rep202.php:136 reporting/rep203.php:96
+#: reporting/rep205.php:141 reporting/rep206.php:123
 #: sales/customer_credit_invoice.php:236 sales/customer_delivery.php:328
 #: sales/customer_invoice.php:455
-#: sales/allocations/customer_allocation_main.php:92
-#: sales/allocations/customer_allocation_main.php:100
+#: sales/allocations/customer_allocation_main.php:97
+#: sales/allocations/customer_allocation_main.php:105
 #: sales/view/view_credit.php:70 sales/view/view_dispatch.php:86
 #: sales/view/view_invoice.php:86
 #: sales/inquiry/customer_allocation_inquiry.php:153
 #: sales/inquiry/customer_allocation_inquiry.php:163
-#: sales/inquiry/customer_inquiry.php:76
-#: sales/inquiry/customer_inquiry.php:210
-#: sales/inquiry/customer_inquiry.php:223
-#: sales/inquiry/sales_deliveries_view.php:178
-#: sales/inquiry/sales_orders_view.php:262
-#: sales/inquiry/sales_orders_view.php:276
+#: sales/inquiry/customer_inquiry.php:127
+#: sales/inquiry/customer_inquiry.php:208
+#: sales/inquiry/customer_inquiry.php:220
+#: sales/inquiry/sales_deliveries_view.php:179
+#: sales/inquiry/sales_orders_view.php:267
+#: sales/inquiry/sales_orders_view.php:281
 msgid "Currency"
 msgstr ""
 
@@ -4662,7 +4784,7 @@ msgstr ""
 msgid "GL Account"
 msgstr ""
 
-#: gl/manage/bank_accounts.php:110 reporting/includes/doctext.inc:259
+#: gl/manage/bank_accounts.php:110 reporting/includes/doctext.inc:261
 msgid "Bank"
 msgstr ""
 
@@ -4699,7 +4821,7 @@ msgid "Bank Name:"
 msgstr ""
 
 #: gl/manage/bank_accounts.php:196 sales/manage/customer_branches.php:246
-#: sales/manage/customers.php:260
+#: sales/manage/customers.php:261
 msgid "Bank Account Number:"
 msgstr ""
 
@@ -4867,7 +4989,7 @@ msgstr ""
 msgid "Date to Use From:"
 msgstr ""
 
-#: gl/manage/exchange_rates.php:142 includes/ui/ui_view.inc:325
+#: gl/manage/exchange_rates.php:142 includes/ui/ui_view.inc:331
 msgid "Exchange Rate:"
 msgstr ""
 
@@ -4964,116 +5086,116 @@ msgstr ""
 msgid "Chart of Accounts"
 msgstr ""
 
-#: gl/manage/gl_accounts.php:57
+#: gl/manage/gl_accounts.php:60
 msgid "The account code must be entered."
 msgstr ""
 
-#: gl/manage/gl_accounts.php:63
+#: gl/manage/gl_accounts.php:66
 msgid "The account name cannot be empty."
 msgstr ""
 
-#: gl/manage/gl_accounts.php:69
+#: gl/manage/gl_accounts.php:72
 msgid "The account code must be numeric."
 msgstr ""
 
-#: gl/manage/gl_accounts.php:84
+#: gl/manage/gl_accounts.php:87
 msgid "The account belongs to a bank account and cannot be inactivated."
 msgstr ""
 
-#: gl/manage/gl_accounts.php:93
+#: gl/manage/gl_accounts.php:96
 msgid "Account data has been updated."
 msgstr ""
 
-#: gl/manage/gl_accounts.php:102
+#: gl/manage/gl_accounts.php:105
 msgid "New account has been added."
 msgstr ""
 
-#: gl/manage/gl_accounts.php:106
+#: gl/manage/gl_accounts.php:109
 msgid "Account not added, possible duplicate Account Code."
 msgstr ""
 
-#: gl/manage/gl_accounts.php:121
+#: gl/manage/gl_accounts.php:124
 msgid ""
 "Cannot delete this account because transactions have been created using this "
 "account."
 msgstr ""
 
-#: gl/manage/gl_accounts.php:127
+#: gl/manage/gl_accounts.php:130
 msgid ""
 "Cannot delete this account because it is used as one of the company default "
 "GL accounts."
 msgstr ""
 
-#: gl/manage/gl_accounts.php:133
+#: gl/manage/gl_accounts.php:136
 msgid "Cannot delete this account because it is used by a bank account."
 msgstr ""
 
-#: gl/manage/gl_accounts.php:139
+#: gl/manage/gl_accounts.php:142
 msgid ""
 "Cannot delete this account because it is used by one or more Item Categories."
 msgstr ""
 
-#: gl/manage/gl_accounts.php:145
+#: gl/manage/gl_accounts.php:148
 msgid "Cannot delete this account because it is used by one or more Items."
 msgstr ""
 
-#: gl/manage/gl_accounts.php:151
+#: gl/manage/gl_accounts.php:154
 msgid "Cannot delete this account because it is used by one or more Taxes."
 msgstr ""
 
-#: gl/manage/gl_accounts.php:157
+#: gl/manage/gl_accounts.php:160
 msgid ""
 "Cannot delete this account because it is used by one or more Customer "
 "Branches."
 msgstr ""
 
-#: gl/manage/gl_accounts.php:162
+#: gl/manage/gl_accounts.php:165
 msgid "Cannot delete this account because it is used by one or more suppliers."
 msgstr ""
 
-#: gl/manage/gl_accounts.php:168
+#: gl/manage/gl_accounts.php:171
 msgid ""
 "Cannot delete this account because it is used by one or more Quick Entry "
 "Lines."
 msgstr ""
 
-#: gl/manage/gl_accounts.php:186
+#: gl/manage/gl_accounts.php:189
 msgid "Selected account has been deleted"
 msgstr ""
 
-#: gl/manage/gl_accounts.php:201
+#: gl/manage/gl_accounts.php:205 gl/manage/gl_accounts.php:207
 msgid "New account"
 msgstr ""
 
-#: gl/manage/gl_accounts.php:247
+#: gl/manage/gl_accounts.php:254
 msgid "Account Code 2:"
 msgstr ""
 
-#: gl/manage/gl_accounts.php:249
+#: gl/manage/gl_accounts.php:256
 msgid "Account Name:"
 msgstr ""
 
-#: gl/manage/gl_accounts.php:251
+#: gl/manage/gl_accounts.php:258
 msgid "Account Group:"
 msgstr ""
 
-#: gl/manage/gl_accounts.php:253
+#: gl/manage/gl_accounts.php:260
 msgid "Account Tags:"
 msgstr ""
 
-#: gl/manage/gl_accounts.php:255
+#: gl/manage/gl_accounts.php:262
 msgid "Account status:"
 msgstr ""
 
-#: gl/manage/gl_accounts.php:260
+#: gl/manage/gl_accounts.php:267
 msgid "Add Account"
 msgstr ""
 
-#: gl/manage/gl_accounts.php:264
+#: gl/manage/gl_accounts.php:271
 msgid "Update Account"
 msgstr ""
 
-#: gl/manage/gl_accounts.php:265
+#: gl/manage/gl_accounts.php:272
 msgid "Delete account"
 msgstr ""
 
@@ -5081,67 +5203,67 @@ msgstr ""
 msgid "GL Account Groups"
 msgstr ""
 
-#: gl/manage/gl_account_types.php:29
+#: gl/manage/gl_account_types.php:32
 msgid "The account group id cannot be empty."
 msgstr ""
 
-#: gl/manage/gl_account_types.php:35
+#: gl/manage/gl_account_types.php:38
 msgid "The account group name cannot be empty."
 msgstr ""
 
-#: gl/manage/gl_account_types.php:42
+#: gl/manage/gl_account_types.php:45
 msgid "This account group id is already in use."
 msgstr ""
 
-#: gl/manage/gl_account_types.php:49
+#: gl/manage/gl_account_types.php:52
 msgid "You cannot set an account group to be a subgroup of itself."
 msgstr ""
 
-#: gl/manage/gl_account_types.php:67
+#: gl/manage/gl_account_types.php:70
 msgid "Selected account type has been updated"
 msgstr ""
 
-#: gl/manage/gl_account_types.php:72
+#: gl/manage/gl_account_types.php:75
 msgid "New account type has been added"
 msgstr ""
 
-#: gl/manage/gl_account_types.php:88
+#: gl/manage/gl_account_types.php:91
 msgid ""
 "Cannot delete this account group because GL accounts have been created "
 "referring to it."
 msgstr ""
 
-#: gl/manage/gl_account_types.php:94
+#: gl/manage/gl_account_types.php:97
 msgid ""
 "Cannot delete this account group because GL account groups have been created "
 "referring to it."
 msgstr ""
 
-#: gl/manage/gl_account_types.php:110
+#: gl/manage/gl_account_types.php:113
 msgid "Selected account group has been deleted"
 msgstr ""
 
-#: gl/manage/gl_account_types.php:127
+#: gl/manage/gl_account_types.php:133
 msgid "Group ID"
 msgstr ""
 
-#: gl/manage/gl_account_types.php:127 sales/manage/sales_groups.php:85
+#: gl/manage/gl_account_types.php:133 sales/manage/sales_groups.php:85
 msgid "Group Name"
 msgstr ""
 
-#: gl/manage/gl_account_types.php:127
+#: gl/manage/gl_account_types.php:133
 msgid "Subgroup Of"
 msgstr ""
 
-#: gl/manage/gl_account_types.php:186
+#: gl/manage/gl_account_types.php:192
 msgid "ID:"
 msgstr ""
 
-#: gl/manage/gl_account_types.php:189
+#: gl/manage/gl_account_types.php:195
 msgid "Subgroup Of:"
 msgstr ""
 
-#: gl/manage/gl_account_types.php:191
+#: gl/manage/gl_account_types.php:198 gl/manage/gl_account_types.php:200
 msgid "Class:"
 msgstr ""
 
@@ -5149,9 +5271,9 @@ msgstr ""
 msgid "Quick Entries"
 msgstr ""
 
-#: gl/manage/gl_quick_entries.php:58 includes/ui/class.crud_view.inc:296
-#: includes/ui/class.crud_view.inc:300 includes/ui/simple_crud_class.inc:219
-#: includes/ui/ui_input.inc:224
+#: gl/manage/gl_quick_entries.php:58 includes/ui/attachment.inc:163
+#: includes/ui/class.crud_view.inc:305 includes/ui/class.crud_view.inc:309
+#: includes/ui/simple_crud_class.inc:219 includes/ui/ui_input.inc:225
 msgid "Add new"
 msgstr ""
 
@@ -5311,11 +5433,11 @@ msgid "GL Deposit"
 msgstr ""
 
 #: gl/view/gl_deposit_view.php:71 gl/includes/db/gl_db_banking.inc:227
-#: reporting/reports_main.php:98 reporting/reports_main.php:108
-#: reporting/reports_main.php:116 reporting/reports_main.php:130
-#: reporting/reports_main.php:138 reporting/reports_main.php:145
-#: reporting/reports_main.php:194 reporting/reports_main.php:201
-#: reporting/reports_main.php:300
+#: reporting/reports_main.php:109 reporting/reports_main.php:119
+#: reporting/reports_main.php:127 reporting/reports_main.php:141
+#: reporting/reports_main.php:149 reporting/reports_main.php:156
+#: reporting/reports_main.php:215 reporting/reports_main.php:222
+#: reporting/reports_main.php:332
 msgid "From"
 msgstr ""
 
@@ -5351,8 +5473,8 @@ msgstr ""
 #: gl/view/gl_deposit_view.php:110 gl/view/gl_payment_view.php:103
 #: gl/view/gl_payment_view.php:106 gl/view/gl_payment_view.php:109
 #: gl/includes/ui/gl_bank_ui.inc:146 gl/includes/ui/gl_bank_ui.inc:149
-#: gl/includes/ui/gl_bank_ui.inc:152 gl/includes/ui/gl_journal_ui.inc:102
-#: gl/includes/ui/gl_journal_ui.inc:105 gl/includes/ui/gl_journal_ui.inc:108
+#: gl/includes/ui/gl_bank_ui.inc:152 gl/includes/ui/gl_journal_ui.inc:112
+#: gl/includes/ui/gl_journal_ui.inc:115 gl/includes/ui/gl_journal_ui.inc:118
 msgid "Account Description"
 msgstr ""
 
@@ -5394,7 +5516,7 @@ msgid "Transaction Date"
 msgstr ""
 
 #: gl/view/gl_trans_view.php:39
-msgid "Journal #"
+msgid "GL #"
 msgstr ""
 
 #: gl/view/gl_trans_view.php:42
@@ -5444,16 +5566,16 @@ msgstr ""
 msgid "Exchange Variance"
 msgstr ""
 
-#: gl/includes/db/gl_db_banking.inc:227 reporting/reports_main.php:99
-#: reporting/reports_main.php:109 reporting/reports_main.php:117
-#: reporting/reports_main.php:131 reporting/reports_main.php:139
-#: reporting/reports_main.php:146 reporting/reports_main.php:195
-#: reporting/reports_main.php:202 reporting/reports_main.php:301
+#: gl/includes/db/gl_db_banking.inc:227 reporting/reports_main.php:110
+#: reporting/reports_main.php:120 reporting/reports_main.php:128
+#: reporting/reports_main.php:142 reporting/reports_main.php:150
+#: reporting/reports_main.php:157 reporting/reports_main.php:216
+#: reporting/reports_main.php:223 reporting/reports_main.php:333
 msgid "To"
 msgstr ""
 
-#: gl/includes/db/gl_db_banking.inc:533 gl/includes/db/gl_journal.inc:114
-#: purchasing/includes/db/invoice_db.inc:139
+#: gl/includes/db/gl_db_banking.inc:360 gl/includes/db/gl_db_banking.inc:533
+#: gl/includes/db/gl_journal.inc:113 purchasing/includes/db/invoice_db.inc:141
 msgid "Document reentered."
 msgstr ""
 
@@ -5464,11 +5586,12 @@ msgstr ""
 
 #: gl/includes/ui/gl_bank_ui.inc:24
 #: inventory/includes/item_adjustments_ui.inc:35
-#: inventory/includes/stock_transfers_ui.inc:40
-#: manufacturing/work_order_add_finished.php:186
+#: inventory/includes/sav.item_adjustments_ui.inc:35
+#: inventory/includes/stock_transfers_ui.inc:43
+#: manufacturing/work_order_add_finished.php:185
 #: manufacturing/work_order_costs.php:133
 #: purchasing/allocations/supplier_allocate.php:56
-#: sales/allocations/customer_allocate.php:54
+#: sales/allocations/customer_allocate.php:59
 #: sales/includes/ui/sales_credit_ui.inc:117
 msgid "Date:"
 msgstr ""
@@ -5495,7 +5618,7 @@ msgstr ""
 msgid "Customer:"
 msgstr ""
 
-#: gl/includes/ui/gl_bank_ui.inc:68 sales/customer_payments.php:324
+#: gl/includes/ui/gl_bank_ui.inc:68 sales/customer_payments.php:322
 #: sales/manage/recurrent_invoices.php:198
 #: sales/includes/ui/sales_credit_ui.inc:37
 #: sales/includes/ui/sales_order_ui.inc:274
@@ -5503,13 +5626,13 @@ msgid "Branch:"
 msgstr ""
 
 #: gl/includes/ui/gl_bank_ui.inc:82 gl/includes/ui/gl_bank_ui.inc:85
-#: sales/customer_payments.php:340
+#: sales/customer_payments.php:344
 msgid "This customer account is on hold."
 msgstr ""
 
 #: gl/includes/ui/gl_bank_ui.inc:98 gl/includes/ui/gl_journal_ui.inc:70
 #: gl/includes/ui/gl_journal_ui.inc:76
-#: purchasing/includes/ui/invoice_ui.inc:264
+#: purchasing/includes/ui/invoice_ui.inc:263
 msgid "Go"
 msgstr ""
 
@@ -5517,77 +5640,83 @@ msgstr ""
 msgid "Into:"
 msgstr ""
 
-#: gl/includes/ui/gl_bank_ui.inc:180 includes/ui/class.crud_view.inc:281
+#: gl/includes/ui/gl_bank_ui.inc:180 includes/ui/class.crud_view.inc:290
 #: includes/ui/simple_crud_class.inc:52
 #: inventory/includes/item_adjustments_ui.inc:100
-#: inventory/includes/stock_transfers_ui.inc:83
+#: inventory/includes/sav.item_adjustments_ui.inc:102
+#: inventory/includes/stock_transfers_ui.inc:85
 #: manufacturing/includes/work_order_issue_ui.inc:62
-#: purchasing/includes/ui/invoice_ui.inc:551
-#: purchasing/includes/ui/po_ui.inc:250
+#: purchasing/includes/ui/invoice_ui.inc:550
+#: purchasing/includes/ui/po_ui.inc:254
 #: sales/includes/ui/sales_credit_ui.inc:193
 #: sales/includes/ui/sales_order_ui.inc:197
 msgid "Edit document line"
 msgstr ""
 
-#: gl/includes/ui/gl_bank_ui.inc:182 includes/ui/class.crud_view.inc:285
+#: gl/includes/ui/gl_bank_ui.inc:182 includes/ui/class.crud_view.inc:294
 #: includes/ui/simple_crud_class.inc:54
-#: inventory/includes/item_adjustments_ui.inc:102
-#: inventory/includes/stock_transfers_ui.inc:84
+#: inventory/includes/item_adjustments_ui.inc:105
+#: inventory/includes/sav.item_adjustments_ui.inc:104
+#: inventory/includes/stock_transfers_ui.inc:86
 #: manufacturing/includes/work_order_issue_ui.inc:64
-#: purchasing/includes/ui/invoice_ui.inc:318
-#: purchasing/includes/ui/po_ui.inc:252
+#: purchasing/includes/ui/invoice_ui.inc:317
+#: purchasing/includes/ui/po_ui.inc:256
 #: sales/includes/ui/sales_credit_ui.inc:195
 #: sales/includes/ui/sales_order_ui.inc:199
 msgid "Remove line from document"
 msgstr ""
 
-#: gl/includes/ui/gl_bank_ui.inc:268 gl/includes/ui/gl_journal_ui.inc:268
+#: gl/includes/ui/gl_bank_ui.inc:266 gl/includes/ui/gl_journal_ui.inc:279
 #: includes/ui/simple_crud_class.inc:56
-#: inventory/includes/item_adjustments_ui.inc:191
-#: inventory/includes/stock_transfers_ui.inc:151
+#: inventory/includes/item_adjustments_ui.inc:205
+#: inventory/includes/sav.item_adjustments_ui.inc:195
+#: inventory/includes/stock_transfers_ui.inc:150
 #: manufacturing/includes/work_order_issue_ui.inc:133
-#: purchasing/includes/ui/po_ui.inc:437
+#: purchasing/includes/ui/po_ui.inc:443
 #: sales/includes/ui/sales_credit_ui.inc:289
-#: sales/includes/ui/sales_order_ui.inc:548
+#: sales/includes/ui/sales_order_ui.inc:552
 msgid "Confirm changes"
 msgstr ""
 
-#: gl/includes/ui/gl_bank_ui.inc:270 gl/includes/ui/gl_journal_ui.inc:270
-#: includes/ui/class.crud_view.inc:292 includes/ui/simple_crud_class.inc:58
-#: inventory/includes/item_adjustments_ui.inc:193
-#: inventory/includes/stock_transfers_ui.inc:153
+#: gl/includes/ui/gl_bank_ui.inc:268 gl/includes/ui/gl_journal_ui.inc:281
+#: includes/ui/class.crud_view.inc:301 includes/ui/simple_crud_class.inc:58
+#: inventory/includes/item_adjustments_ui.inc:207
+#: inventory/includes/sav.item_adjustments_ui.inc:197
+#: inventory/includes/stock_transfers_ui.inc:151
 #: manufacturing/includes/work_order_issue_ui.inc:135
-#: purchasing/includes/ui/po_ui.inc:439
+#: purchasing/includes/ui/po_ui.inc:445
 #: sales/includes/ui/sales_credit_ui.inc:291
-#: sales/includes/ui/sales_order_ui.inc:550
+#: sales/includes/ui/sales_order_ui.inc:554
 msgid "Cancel changes"
 msgstr ""
 
-#: gl/includes/ui/gl_bank_ui.inc:275 gl/includes/ui/gl_journal_ui.inc:274
-#: inventory/includes/item_adjustments_ui.inc:199
-#: inventory/includes/stock_transfers_ui.inc:159
+#: gl/includes/ui/gl_bank_ui.inc:273 gl/includes/ui/gl_journal_ui.inc:285
+#: inventory/includes/item_adjustments_ui.inc:213
+#: inventory/includes/sav.item_adjustments_ui.inc:203
+#: inventory/includes/stock_transfers_ui.inc:156
 #: manufacturing/includes/work_order_issue_ui.inc:141
-#: purchasing/includes/ui/po_ui.inc:445
+#: purchasing/includes/ui/po_ui.inc:451
 #: sales/includes/ui/sales_credit_ui.inc:297
-#: sales/includes/ui/sales_order_ui.inc:556
+#: sales/includes/ui/sales_order_ui.inc:560
 msgid "Add Item"
 msgstr ""
 
-#: gl/includes/ui/gl_bank_ui.inc:276
-#: inventory/includes/item_adjustments_ui.inc:200
-#: inventory/includes/stock_transfers_ui.inc:160
+#: gl/includes/ui/gl_bank_ui.inc:274
+#: inventory/includes/item_adjustments_ui.inc:214
+#: inventory/includes/sav.item_adjustments_ui.inc:204
+#: inventory/includes/stock_transfers_ui.inc:156
 #: manufacturing/includes/work_order_issue_ui.inc:142
-#: purchasing/includes/ui/po_ui.inc:446
+#: purchasing/includes/ui/po_ui.inc:452
 #: sales/includes/ui/sales_credit_ui.inc:298
-#: sales/includes/ui/sales_order_ui.inc:557
+#: sales/includes/ui/sales_order_ui.inc:561
 msgid "Add new item to document"
 msgstr ""
 
-#: gl/includes/ui/gl_bank_ui.inc:299
+#: gl/includes/ui/gl_bank_ui.inc:297
 msgid "Settled AR Amount:"
 msgstr ""
 
-#: gl/includes/ui/gl_bank_ui.inc:299
+#: gl/includes/ui/gl_bank_ui.inc:297
 msgid "Settled AP Amount:"
 msgstr ""
 
@@ -5611,7 +5740,7 @@ msgstr ""
 msgid "Source ref:"
 msgstr ""
 
-#: gl/includes/ui/gl_journal_ui.inc:57 includes/sysnames.inc:103
+#: gl/includes/ui/gl_journal_ui.inc:57 includes/sysnames.inc:105
 msgid "Quick Entry"
 msgstr ""
 
@@ -5627,19 +5756,23 @@ msgstr ""
 msgid "Include in tax register:"
 msgstr ""
 
-#: gl/includes/ui/gl_journal_ui.inc:151
+#: gl/includes/ui/gl_journal_ui.inc:88
+msgid "Reconciled:"
+msgstr ""
+
+#: gl/includes/ui/gl_journal_ui.inc:161
 msgid "Edit journal line"
 msgstr ""
 
-#: gl/includes/ui/gl_journal_ui.inc:153
+#: gl/includes/ui/gl_journal_ui.inc:163
 msgid "Remove line from journal"
 msgstr ""
 
-#: gl/includes/ui/gl_journal_ui.inc:216 gl/includes/ui/gl_journal_ui.inc:234
+#: gl/includes/ui/gl_journal_ui.inc:226 gl/includes/ui/gl_journal_ui.inc:244
 msgid "[Select account]"
 msgstr ""
 
-#: gl/includes/ui/gl_journal_ui.inc:275
+#: gl/includes/ui/gl_journal_ui.inc:286
 msgid "Add new line to journal"
 msgstr ""
 
@@ -5719,8 +5852,8 @@ msgstr ""
 msgid "Dimensions configuration"
 msgstr ""
 
-#: includes/access_levels.inc:79 inventory/manage/items.php:455
-#: reporting/reports_main.php:318
+#: includes/access_levels.inc:79 inventory/manage/items.php:447
+#: reporting/reports_main.php:350
 msgid "Dimensions"
 msgstr ""
 
@@ -6056,7 +6189,7 @@ msgstr ""
 msgid "Fixed Asset disposals"
 msgstr ""
 
-#: includes/access_levels.inc:207 inventory/manage/items.php:411
+#: includes/access_levels.inc:207 inventory/manage/items.php:403
 msgid "Depreciation"
 msgstr ""
 
@@ -6250,7 +6383,7 @@ msgid ""
 msgstr ""
 
 #: includes/current_user.inc:102 includes/ui/ui_controls.inc:215
-#: includes/ui/ui_view.inc:985
+#: includes/ui/ui_view.inc:1011
 msgid "Back"
 msgstr ""
 
@@ -6258,37 +6391,38 @@ msgstr ""
 msgid "System is available for site admin only until full database upgrade"
 msgstr ""
 
-#: includes/current_user.inc:162
+#: includes/current_user.inc:168
 msgid "New password for"
 msgstr ""
 
-#: includes/current_user.inc:616
+#: includes/current_user.inc:624
 msgid "Requesting data..."
 msgstr ""
 
 #: includes/dashboard.inc:89 includes/dashboard.inc:159
 #: includes/dashboard.inc:189 includes/dashboard.inc:486
-#: includes/dashboard.inc:526 includes/sysnames.inc:101
-#: includes/sysnames.inc:209 reporting/rep101.php:141 reporting/rep102.php:121
-#: reporting/rep102.php:128 reporting/rep105.php:109 reporting/rep106.php:89
-#: reporting/rep114.php:95 reporting/rep304.php:127 reporting/rep304.php:137
+#: includes/dashboard.inc:526 includes/sysnames.inc:44
+#: includes/sysnames.inc:103 includes/sysnames.inc:211 reporting/rep101.php:145
+#: reporting/rep102.php:121 reporting/rep102.php:128 reporting/rep105.php:110
+#: reporting/rep106.php:90 reporting/rep114.php:95 reporting/rep115.php:167
+#: reporting/rep304.php:127 reporting/rep304.php:137
 #: reporting/reports_main.php:34 reporting/reports_main.php:38
-#: reporting/reports_main.php:47 reporting/reports_main.php:104
-#: reporting/reports_main.php:123 reporting/reports_main.php:239
-#: sales/create_recurrent_invoices.php:203
+#: reporting/reports_main.php:47 reporting/reports_main.php:59
+#: reporting/reports_main.php:115 reporting/reports_main.php:134
+#: reporting/reports_main.php:260 sales/create_recurrent_invoices.php:204
 #: sales/customer_credit_invoice.php:234 sales/customer_delivery.php:326
 #: sales/customer_invoice.php:431
-#: sales/allocations/customer_allocation_main.php:91
-#: sales/allocations/customer_allocation_main.php:99
+#: sales/allocations/customer_allocation_main.php:96
+#: sales/allocations/customer_allocation_main.php:104
 #: sales/manage/recurrent_invoices.php:128 sales/view/view_credit.php:47
 #: sales/inquiry/customer_allocation_inquiry.php:152
 #: sales/inquiry/customer_allocation_inquiry.php:162
-#: sales/inquiry/customer_inquiry.php:208
-#: sales/inquiry/customer_inquiry.php:222 sales/inquiry/customers_list.php:41
+#: sales/inquiry/customer_inquiry.php:206
+#: sales/inquiry/customer_inquiry.php:219 sales/inquiry/customers_list.php:41
 #: sales/inquiry/customers_list.php:54
-#: sales/inquiry/sales_deliveries_view.php:169
-#: sales/inquiry/sales_orders_view.php:254
-#: sales/inquiry/sales_orders_view.php:268
+#: sales/inquiry/sales_deliveries_view.php:170
+#: sales/inquiry/sales_orders_view.php:259
+#: sales/inquiry/sales_orders_view.php:273
 msgid "Customer"
 msgstr ""
 
@@ -6296,34 +6430,35 @@ msgstr ""
 #: includes/dashboard.inc:159 includes/dashboard.inc:165
 #: includes/dashboard.inc:292 includes/dashboard.inc:438
 #: reporting/rep304.php:127 reporting/rep309.php:99
-#: sales/manage/customer_branches.php:232 sales/manage/customers.php:265
+#: sales/manage/customer_branches.php:232 sales/manage/customers.php:266
 msgid "Sales"
 msgstr ""
 
 #: includes/dashboard.inc:103 includes/dashboard.inc:162
 #: includes/dashboard.inc:226 includes/dashboard.inc:571
-#: includes/sysnames.inc:102 includes/sysnames.inc:187
-#: includes/sysnames.inc:210 inventory/purchasing_data.php:150
+#: includes/sysnames.inc:45 includes/sysnames.inc:104 includes/sysnames.inc:189
+#: includes/sysnames.inc:212 inventory/purchasing_data.php:150
 #: purchasing/includes/ui/grn_ui.inc:20 purchasing/includes/ui/grn_ui.inc:52
-#: purchasing/includes/ui/po_ui.inc:300
-#: purchasing/view/view_supp_credit.php:42
+#: purchasing/includes/ui/po_ui.inc:304 purchasing/view/view_supp_credit.php:42
 #: purchasing/view/view_supp_invoice.php:46
-#: purchasing/inquiry/po_search_completed.php:112
+#: purchasing/inquiry/po_search_completed.php:121
 #: purchasing/inquiry/po_search.php:119
 #: purchasing/inquiry/supplier_allocation_inquiry.php:139
 #: purchasing/inquiry/supplier_allocation_inquiry.php:152
-#: purchasing/inquiry/supplier_inquiry.php:180
-#: purchasing/inquiry/supplier_inquiry.php:195
+#: purchasing/inquiry/supplier_inquiry.php:176
+#: purchasing/inquiry/supplier_inquiry.php:191
 #: purchasing/inquiry/suppliers_list.php:41
 #: purchasing/inquiry/suppliers_list.php:53
 #: purchasing/allocations/supplier_allocation_main.php:98
 #: purchasing/allocations/supplier_allocation_main.php:106
-#: reporting/rep201.php:116 reporting/rep202.php:128 reporting/rep202.php:135
-#: reporting/rep203.php:95 reporting/rep204.php:90 reporting/rep306.php:141
-#: reporting/rep306.php:151 reporting/reports_main.php:151
-#: reporting/reports_main.php:155 reporting/reports_main.php:164
-#: reporting/reports_main.php:175 reporting/reports_main.php:182
-#: reporting/reports_main.php:255
+#: reporting/rep201.php:124 reporting/rep202.php:128 reporting/rep202.php:135
+#: reporting/rep203.php:95 reporting/rep204.php:90 reporting/rep206.php:122
+#: reporting/rep306.php:141 reporting/rep306.php:151 reporting/rep310.php:142
+#: reporting/rep310.php:152 reporting/reports_main.php:163
+#: reporting/reports_main.php:167 reporting/reports_main.php:176
+#: reporting/reports_main.php:188 reporting/reports_main.php:196
+#: reporting/reports_main.php:203 reporting/reports_main.php:276
+#: reporting/reports_main.php:309
 msgid "Supplier"
 msgstr ""
 
@@ -6334,14 +6469,15 @@ msgstr ""
 #: includes/dashboard.inc:120 includes/dashboard.inc:165
 #: includes/ui/ui_controls.inc:512 includes/ui/ui_controls.inc:514
 #: inventory/transfers.php:231 inventory/inquiry/stock_list.php:29
-#: inventory/manage/items.php:29 reporting/rep402.php:108
-#: reporting/reports_main.php:256 reporting/reports_main.php:293
+#: inventory/manage/items.php:29 reporting/rep402.php:152
+#: reporting/reports_main.php:277 reporting/reports_main.php:310
+#: reporting/reports_main.php:324
 msgid "Items"
 msgstr ""
 
 #: includes/dashboard.inc:122 includes/dashboard.inc:165
 #: includes/dashboard.inc:292 includes/dashboard.inc:438
-#: manufacturing/search_work_orders.php:139
+#: manufacturing/search_work_orders.php:141
 msgid "Costs"
 msgstr ""
 
@@ -6379,35 +6515,37 @@ msgid "Top %s Sold Items in fiscal year"
 msgstr ""
 
 #: includes/dashboard.inc:292 includes/dashboard.inc:294
-#: manufacturing/search_work_orders.php:161
+#: manufacturing/search_work_orders.php:168
 #: manufacturing/view/wo_issue_view.php:43
 #: manufacturing/view/wo_production_view.php:44
-#: purchasing/includes/ui/invoice_ui.inc:501
-#: purchasing/includes/ui/invoice_ui.inc:513 reporting/rep204.php:84
-#: reporting/rep306.php:152 reporting/rep402.php:103
+#: purchasing/includes/ui/invoice_ui.inc:500
+#: purchasing/includes/ui/invoice_ui.inc:512 reporting/rep204.php:84
+#: reporting/rep306.php:152 reporting/rep310.php:142 reporting/rep310.php:153
+#: reporting/rep402.php:136
 msgid "Item"
 msgstr ""
 
 #: includes/dashboard.inc:292 includes/dashboard.inc:294
 #: inventory/includes/item_adjustments_ui.inc:56
 #: inventory/includes/item_adjustments_ui.inc:59
-#: inventory/includes/stock_transfers_ui.inc:57
+#: inventory/includes/sav.item_adjustments_ui.inc:56
+#: inventory/includes/sav.item_adjustments_ui.inc:59
+#: inventory/includes/stock_transfers_ui.inc:59
 #: inventory/manage/item_codes.php:126 inventory/manage/sales_kits.php:36
 #: inventory/view/view_adjustment.php:54 inventory/view/view_transfer.php:50
-#: manufacturing/view/wo_issue_view.php:76
-#: manufacturing/manage/bom_edit.php:44
+#: manufacturing/view/wo_issue_view.php:76 manufacturing/manage/bom_edit.php:44
 #: manufacturing/includes/manufacturing_ui.inc:29
 #: manufacturing/includes/manufacturing_ui.inc:174
 #: manufacturing/includes/manufacturing_ui.inc:347
 #: manufacturing/includes/work_order_issue_ui.inc:33
-#: purchasing/includes/ui/invoice_ui.inc:514
-#: purchasing/includes/ui/po_ui.inc:214 purchasing/view/view_grn.php:40
-#: purchasing/view/view_po.php:45 reporting/rep301.php:164
-#: reporting/rep303.php:120 reporting/rep303.php:126 reporting/rep401.php:71
+#: purchasing/includes/ui/invoice_ui.inc:513
+#: purchasing/includes/ui/po_ui.inc:216 purchasing/view/view_grn.php:40
+#: purchasing/view/view_po.php:45 reporting/rep301.php:165
+#: reporting/rep303.php:223 reporting/rep303.php:229 reporting/rep401.php:71
 #: reporting/includes/doctext.inc:31 reporting/includes/doctext.inc:191
-#: reporting/includes/doctext.inc:224 sales/customer_invoice.php:518
+#: reporting/includes/doctext.inc:226 sales/customer_invoice.php:518
 #: sales/view/view_credit.php:90 sales/view/view_dispatch.php:112
-#: sales/view/view_invoice.php:115 sales/view/view_sales_order.php:219
+#: sales/view/view_invoice.php:115 sales/view/view_sales_order.php:221
 #: sales/includes/ui/sales_credit_ui.inc:162
 #: sales/includes/ui/sales_order_ui.inc:146
 msgid "Quantity"
@@ -6435,37 +6573,38 @@ msgid "Ref."
 msgstr ""
 
 #: includes/dashboard.inc:486 includes/dashboard.inc:526
-#: reporting/rep105.php:109 reporting/rep106.php:89 reporting/rep112.php:180
-#: sales/create_recurrent_invoices.php:203
+#: reporting/rep105.php:110 reporting/rep106.php:90 reporting/rep112.php:189
+#: sales/create_recurrent_invoices.php:204
 #: sales/customer_credit_invoice.php:235 sales/customer_delivery.php:327
-#: sales/customer_invoice.php:432 sales/manage/customers.php:255
-#: sales/manage/customers.php:295 sales/manage/recurrent_invoices.php:128
+#: sales/customer_invoice.php:432 sales/manage/customers.php:256
+#: sales/manage/customers.php:296 sales/manage/recurrent_invoices.php:128
 #: sales/view/view_credit.php:58 sales/inquiry/customer_branches_list.php:37
 #: sales/inquiry/customer_branches_list.php:49
-#: sales/inquiry/customer_inquiry.php:209
-#: sales/inquiry/sales_deliveries_view.php:171
-#: sales/inquiry/sales_orders_view.php:255
-#: sales/inquiry/sales_orders_view.php:269
+#: sales/inquiry/customer_inquiry.php:207
+#: sales/inquiry/sales_deliveries_view.php:172
+#: sales/inquiry/sales_orders_view.php:260
+#: sales/inquiry/sales_orders_view.php:274
 msgid "Branch"
 msgstr ""
 
 #: includes/dashboard.inc:487 includes/dashboard.inc:572
-#: includes/sysnames.inc:137
+#: includes/sysnames.inc:139
 msgid "Remainder"
 msgstr ""
 
 #: includes/dashboard.inc:487 includes/dashboard.inc:572
-#: purchasing/inquiry/supplier_inquiry.php:68
-#: purchasing/inquiry/supplier_inquiry.php:69
-#: purchasing/inquiry/supplier_inquiry.php:70 reporting/rep102.php:116
+#: purchasing/inquiry/supplier_inquiry.php:44
+#: purchasing/inquiry/supplier_inquiry.php:45
+#: purchasing/inquiry/supplier_inquiry.php:46 reporting/rep102.php:116
 #: reporting/rep102.php:117 reporting/rep102.php:118 reporting/rep102.php:241
-#: reporting/rep108.php:150 reporting/rep108.php:151 reporting/rep108.php:152
+#: reporting/rep108.php:158 reporting/rep108.php:159 reporting/rep108.php:160
 #: reporting/rep202.php:122 reporting/rep202.php:123 reporting/rep202.php:124
 #: reporting/rep202.php:156 reporting/rep202.php:157 reporting/rep202.php:158
-#: reporting/rep202.php:249 sales/create_recurrent_invoices.php:203
+#: reporting/rep202.php:249 sales/create_recurrent_invoices.php:204
 #: sales/manage/recurrent_invoices.php:128
-#: sales/inquiry/customer_inquiry.php:71 sales/inquiry/customer_inquiry.php:72
-#: sales/inquiry/customer_inquiry.php:73
+#: sales/inquiry/customer_inquiry.php:122
+#: sales/inquiry/customer_inquiry.php:123
+#: sales/inquiry/customer_inquiry.php:124
 msgid "Days"
 msgstr ""
 
@@ -6473,12 +6612,12 @@ msgstr ""
 msgid "Overdue Recurrent Invoices"
 msgstr ""
 
-#: includes/dashboard.inc:526 sales/create_recurrent_invoices.php:203
+#: includes/dashboard.inc:526 sales/create_recurrent_invoices.php:204
 #: sales/manage/recurrent_invoices.php:128
 msgid "Template No"
 msgstr ""
 
-#: includes/dashboard.inc:526 sales/create_recurrent_invoices.php:203
+#: includes/dashboard.inc:526 sales/create_recurrent_invoices.php:204
 msgid "Next invoice"
 msgstr ""
 
@@ -6490,42 +6629,47 @@ msgstr ""
 msgid "Bank Account Balances"
 msgstr ""
 
-#: includes/data_checks.inc:612
+#: includes/data_checks.inc:613
 #, php-format
 msgid "%s #%s is closed for further edition."
 msgstr ""
 
-#: includes/data_checks.inc:654
+#: includes/data_checks.inc:655
 msgid "You have no edit access to transactions created by other users."
 msgstr ""
 
-#: includes/data_checks.inc:669
+#: includes/data_checks.inc:670
 msgid "The entered reference is invalid."
 msgstr ""
 
-#: includes/data_checks.inc:673 sales/credit_note_entry.php:181
+#: includes/data_checks.inc:674 sales/credit_note_entry.php:181
 #: sales/customer_credit_invoice.php:204 sales/customer_delivery.php:298
-#: sales/customer_invoice.php:364 sales/sales_order_entry.php:474
+#: sales/customer_invoice.php:364 sales/sales_order_entry.php:478
 msgid "The entered reference is already in use."
 msgstr ""
 
-#: includes/errors.inc:124
+#: includes/errors.inc:94
+#, php-format
+msgid "Unhandled exception [%s]: %s."
+msgstr ""
+
+#: includes/errors.inc:132
 msgid "in file"
 msgstr ""
 
-#: includes/errors.inc:124
+#: includes/errors.inc:132
 msgid "at line "
 msgstr ""
 
-#: includes/errors.inc:176
+#: includes/errors.inc:184
 msgid "Debug mode database warning:"
 msgstr ""
 
-#: includes/errors.inc:178
+#: includes/errors.inc:186
 msgid "DATABASE ERROR :"
 msgstr ""
 
-#: includes/errors.inc:210
+#: includes/errors.inc:218
 msgid ""
 "The entered information is a duplicate. Please go back and enter different "
 "values."
@@ -6535,154 +6679,160 @@ msgstr ""
 msgid "This page is usable only with javascript enabled browsers."
 msgstr ""
 
-#: includes/packages.inc:189
+#: includes/packages.inc:190
 #, php-format
 msgid "No key field '%s' in file '%s'"
 msgstr ""
 
-#: includes/packages.inc:294
+#: includes/packages.inc:295
 msgid "Cannot download repo index file."
 msgstr ""
 
-#: includes/packages.inc:306 includes/packages.inc:343
+#: includes/packages.inc:304 includes/system_tests.inc:401
+msgid ""
+"OpenSSL have to be available on your server to use extension repository "
+"system."
+msgstr ""
+
+#: includes/packages.inc:311 includes/packages.inc:348
 #, php-format
 msgid "Cannot delete outdated '%s' file."
 msgstr ""
 
-#: includes/packages.inc:310
+#: includes/packages.inc:315
 msgid "Release file in repository is invalid, or public key is outdated."
 msgstr ""
 
-#: includes/packages.inc:327
+#: includes/packages.inc:332
 msgid "Repository version does not match application version."
 msgstr ""
 
-#: includes/packages.inc:335 includes/packages.inc:377
+#: includes/packages.inc:340 includes/packages.inc:382
 #, php-format
 msgid "Cannot download '%s' file."
 msgstr ""
 
-#: includes/packages.inc:347
+#: includes/packages.inc:352
 #, php-format
 msgid ""
 "Security alert: broken index file in repository '%s'. Please inform "
 "repository administrator about this issue."
 msgstr ""
 
-#: includes/packages.inc:383
+#: includes/packages.inc:388
 #, php-format
 msgid ""
 "Security alert: broken package '%s' in repository. Please inform repository "
 "administrator about this issue."
 msgstr ""
 
-#: includes/packages.inc:641 includes/packages.inc:696
+#: includes/packages.inc:646 includes/packages.inc:701
 #, php-format
 msgid "Package '%s' not found."
 msgstr ""
 
-#: includes/references.inc:103
+#: includes/references.inc:107
 msgid "Invalid refline template."
 msgstr ""
 
-#: includes/references.inc:113
+#: includes/references.inc:117
 #, php-format
 msgid "Missing refline context data: '%s'"
 msgstr ""
 
-#: includes/references.inc:156
+#: includes/references.inc:165
 msgid "Missing numeric placeholder in refline definition."
 msgstr ""
 
-#: includes/session.inc:136
+#: includes/session.inc:138
 msgid "Incorrect Password"
 msgstr ""
 
-#: includes/session.inc:137
+#: includes/session.inc:139
 msgid "The user and password combination is not valid for the system."
 msgstr ""
 
-#: includes/session.inc:139
+#: includes/session.inc:141
 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:140 includes/session.inc:155
+#: includes/session.inc:142 includes/session.inc:157
 msgid "Try again"
 msgstr ""
 
-#: includes/session.inc:151
+#: includes/session.inc:153
 msgid "Incorrect Email"
 msgstr ""
 
-#: includes/session.inc:152
+#: includes/session.inc:154
 msgid ""
 "The email address does not exist in the system, or is used by more than one "
 "user."
 msgstr ""
 
-#: includes/session.inc:154
+#: includes/session.inc:156
 msgid ""
 "Plase try again or contact your system administrator to obtain new password."
 msgstr ""
 
-#: includes/session.inc:166
+#: includes/session.inc:168
 msgid "New password sent"
 msgstr ""
 
-#: includes/session.inc:167
+#: includes/session.inc:169
 msgid "A new password has been sent to your mailbox."
 msgstr ""
 
-#: includes/session.inc:169
+#: includes/session.inc:171
 msgid "Login here"
 msgstr ""
 
-#: includes/session.inc:219
+#: includes/session.inc:221
 #, php-format
 msgid ""
 "Brute force attack on account '%s' detected. Access for non-logged users "
 "temporarily blocked."
 msgstr ""
 
-#: includes/session.inc:251
+#: includes/session.inc:253
 msgid "Security settings have not been defined for your user account."
 msgstr ""
 
-#: includes/session.inc:252
+#: includes/session.inc:254
 msgid "Please contact your system administrator."
 msgstr ""
 
-#: includes/session.inc:253
+#: includes/session.inc:255
 msgid ""
 "Please remove $security_groups and $security_headings arrays from config.php "
 "file!"
 msgstr ""
 
-#: includes/session.inc:256
+#: includes/session.inc:258
 msgid ""
 "Access to application has been blocked until database upgrade is completed "
 "by system administrator."
 msgstr ""
 
-#: includes/session.inc:270
+#: includes/session.inc:272
 msgid ""
 "The security settings on your account do not permit you to access this "
 "function"
 msgstr ""
 
-#: includes/session.inc:279
+#: includes/session.inc:281
 msgid ""
 "System is blocked after source upgrade until database is updated on System/"
 "Software Upgrade page"
 msgstr ""
 
-#: includes/sysnames.inc:23 includes/sysnames.inc:154
+#: includes/sysnames.inc:23 includes/sysnames.inc:156
 msgid "Bank Payment"
 msgstr ""
 
-#: includes/sysnames.inc:24 includes/sysnames.inc:153
+#: includes/sysnames.inc:24 includes/sysnames.inc:155
 msgid "Bank Deposit"
 msgstr ""
 
@@ -6714,7 +6864,7 @@ msgstr ""
 msgid "Inventory Adjustment"
 msgstr ""
 
-#: includes/sysnames.inc:32 purchasing/includes/ui/po_ui.inc:307
+#: includes/sysnames.inc:32 purchasing/includes/ui/po_ui.inc:311
 #: purchasing/view/view_po.php:30
 msgid "Purchase Order"
 msgstr ""
@@ -6723,8 +6873,8 @@ msgstr ""
 msgid "Supplier Invoice"
 msgstr ""
 
-#: includes/sysnames.inc:34 purchasing/supplier_credit.php:57
-#: purchasing/supplier_credit.php:61
+#: includes/sysnames.inc:34 purchasing/supplier_credit.php:55
+#: purchasing/supplier_credit.php:59
 msgid "Supplier Credit Note"
 msgstr ""
 
@@ -6736,7 +6886,7 @@ msgstr ""
 msgid "Purchase Order Delivery"
 msgstr ""
 
-#: includes/sysnames.inc:37 includes/sysnames.inc:100 includes/types.inc:133
+#: includes/sysnames.inc:37 includes/sysnames.inc:102 includes/types.inc:135
 msgid "Work Order"
 msgstr ""
 
@@ -6748,12 +6898,12 @@ msgstr ""
 msgid "Work Order Production"
 msgstr ""
 
-#: includes/sysnames.inc:40 sales/inquiry/sales_orders_view.php:126
-#: sales/inquiry/sales_orders_view.php:148
+#: includes/sysnames.inc:40 sales/inquiry/sales_orders_view.php:131
+#: sales/inquiry/sales_orders_view.php:153
 msgid "Sales Order"
 msgstr ""
 
-#: includes/sysnames.inc:41 sales/sales_order_entry.php:656
+#: includes/sysnames.inc:41 sales/sales_order_entry.php:659
 msgid "Sales Quotation"
 msgstr ""
 
@@ -6761,404 +6911,404 @@ msgstr ""
 msgid "Cost Update"
 msgstr ""
 
-#: includes/sysnames.inc:47 inventory/adjustments.php:32
+#: includes/sysnames.inc:49 inventory/adjustments.php:32
 msgid "Fixed Assets Disposal"
 msgstr ""
 
-#: includes/sysnames.inc:48
+#: includes/sysnames.inc:50
 msgid "Fixed Assets Revaluation"
 msgstr ""
 
-#: includes/sysnames.inc:52
+#: includes/sysnames.inc:54
 msgid "GJ"
 msgstr ""
 
-#: includes/sysnames.inc:53
+#: includes/sysnames.inc:55
 msgid "BP"
 msgstr ""
 
-#: includes/sysnames.inc:54
+#: includes/sysnames.inc:56
 msgid "BD"
 msgstr ""
 
-#: includes/sysnames.inc:55
+#: includes/sysnames.inc:57
 msgid "BT"
 msgstr ""
 
-#: includes/sysnames.inc:56
+#: includes/sysnames.inc:58
 msgid "SI"
 msgstr ""
 
-#: includes/sysnames.inc:57
+#: includes/sysnames.inc:59
 msgid "CN"
 msgstr ""
 
-#: includes/sysnames.inc:58
+#: includes/sysnames.inc:60
 msgid "CP"
 msgstr ""
 
-#: includes/sysnames.inc:59 sales/customer_invoice.php:525
+#: includes/sysnames.inc:61 sales/customer_invoice.php:525
 msgid "DN"
 msgstr ""
 
-#: includes/sysnames.inc:60
+#: includes/sysnames.inc:62
 msgid "IT"
 msgstr ""
 
-#: includes/sysnames.inc:61
+#: includes/sysnames.inc:63
 msgid "IA"
 msgstr ""
 
-#: includes/sysnames.inc:62
+#: includes/sysnames.inc:64
 msgid "PO"
 msgstr ""
 
-#: includes/sysnames.inc:63
+#: includes/sysnames.inc:65
 msgid "PI"
 msgstr ""
 
-#: includes/sysnames.inc:64
+#: includes/sysnames.inc:66
 msgid "PC"
 msgstr ""
 
-#: includes/sysnames.inc:65
+#: includes/sysnames.inc:67
 msgid "SP"
 msgstr ""
 
-#: includes/sysnames.inc:66 reporting/rep204.php:84 reporting/rep305.php:106
+#: includes/sysnames.inc:68 reporting/rep204.php:84 reporting/rep305.php:106
 msgid "GRN"
 msgstr ""
 
-#: includes/sysnames.inc:67
+#: includes/sysnames.inc:69
 msgid "WO"
 msgstr ""
 
-#: includes/sysnames.inc:68
+#: includes/sysnames.inc:70
 msgid "WI"
 msgstr ""
 
-#: includes/sysnames.inc:69
+#: includes/sysnames.inc:71
 msgid "WP"
 msgstr ""
 
-#: includes/sysnames.inc:70
+#: includes/sysnames.inc:72
 msgid "SO"
 msgstr ""
 
-#: includes/sysnames.inc:71
+#: includes/sysnames.inc:73
 msgid "SQ"
 msgstr ""
 
-#: includes/sysnames.inc:72
+#: includes/sysnames.inc:74
 msgid "CU"
 msgstr ""
 
-#: includes/sysnames.inc:73
+#: includes/sysnames.inc:75
 msgid "Dim"
 msgstr ""
 
-#: includes/sysnames.inc:81
+#: includes/sysnames.inc:83
 msgid "Savings Account"
 msgstr ""
 
-#: includes/sysnames.inc:82
+#: includes/sysnames.inc:84
 msgid "Chequing Account"
 msgstr ""
 
-#: includes/sysnames.inc:83 manufacturing/work_order_costs.php:146
+#: includes/sysnames.inc:85 manufacturing/work_order_costs.php:146
 msgid "Credit Account"
 msgstr ""
 
-#: includes/sysnames.inc:84
+#: includes/sysnames.inc:86
 msgid "Cash Account"
 msgstr ""
 
-#: includes/sysnames.inc:88
+#: includes/sysnames.inc:90
 msgid "Transfer"
 msgstr ""
 
-#: includes/sysnames.inc:89
+#: includes/sysnames.inc:91
 msgid "Cheque"
 msgstr ""
 
-#: includes/sysnames.inc:91 includes/sysnames.inc:195
+#: includes/sysnames.inc:93 includes/sysnames.inc:197
 msgid "Cash"
 msgstr ""
 
-#: includes/sysnames.inc:110
+#: includes/sysnames.inc:112
 msgid "Assemble"
 msgstr ""
 
-#: includes/sysnames.inc:111
+#: includes/sysnames.inc:113
 msgid "Unassemble"
 msgstr ""
 
-#: includes/sysnames.inc:112
+#: includes/sysnames.inc:114
 msgid "Advanced Manufacture"
 msgstr ""
 
-#: includes/sysnames.inc:116
+#: includes/sysnames.inc:118
 msgid "Labour Cost"
 msgstr ""
 
-#: includes/sysnames.inc:117
+#: includes/sysnames.inc:119
 msgid "Overhead Cost"
 msgstr ""
 
-#: includes/sysnames.inc:118
+#: includes/sysnames.inc:120
 msgid "Materials"
 msgstr ""
 
-#: includes/sysnames.inc:125
+#: includes/sysnames.inc:127
 msgid "Assets"
 msgstr ""
 
-#: includes/sysnames.inc:127
+#: includes/sysnames.inc:129
 msgid "Equity"
 msgstr ""
 
-#: includes/sysnames.inc:128
+#: includes/sysnames.inc:130
 msgid "Income"
 msgstr ""
 
-#: includes/sysnames.inc:129
+#: includes/sysnames.inc:131
 msgid "Cost of Goods Sold"
 msgstr ""
 
-#: includes/sysnames.inc:130
+#: includes/sysnames.inc:132
 msgid "Expense"
 msgstr ""
 
-#: includes/sysnames.inc:139
+#: includes/sysnames.inc:141
 msgid "Amount, increase base"
 msgstr ""
 
-#: includes/sysnames.inc:140
+#: includes/sysnames.inc:142
 msgid "Amount, reduce base"
 msgstr ""
 
-#: includes/sysnames.inc:141
+#: includes/sysnames.inc:143
 msgid "% amount of base"
 msgstr ""
 
-#: includes/sysnames.inc:142
+#: includes/sysnames.inc:144
 msgid "% amount of base, increase base"
 msgstr ""
 
-#: includes/sysnames.inc:143
+#: includes/sysnames.inc:145
 msgid "% amount of base, reduce base"
 msgstr ""
 
-#: includes/sysnames.inc:144
+#: includes/sysnames.inc:146
 msgid "Taxes added"
 msgstr ""
 
-#: includes/sysnames.inc:145
+#: includes/sysnames.inc:147
 msgid "Taxes added, increase base"
 msgstr ""
 
-#: includes/sysnames.inc:146
+#: includes/sysnames.inc:148
 msgid "Taxes added, reduce base"
 msgstr ""
 
-#: includes/sysnames.inc:147
+#: includes/sysnames.inc:149
 msgid "Taxes included"
 msgstr ""
 
-#: includes/sysnames.inc:148
+#: includes/sysnames.inc:150
 msgid "Taxes included, increase base"
 msgstr ""
 
-#: includes/sysnames.inc:149
+#: includes/sysnames.inc:151
 msgid "Taxes included, reduce base"
 msgstr ""
 
-#: includes/sysnames.inc:156
+#: includes/sysnames.inc:158
 msgid "Supplier Invoice/Credit"
 msgstr ""
 
-#: includes/sysnames.inc:162
+#: includes/sysnames.inc:164
 msgid "Declining balance"
 msgstr ""
 
-#: includes/sysnames.inc:163
+#: includes/sysnames.inc:165
 msgid "Straight line"
 msgstr ""
 
-#: includes/sysnames.inc:164
+#: includes/sysnames.inc:166
 msgid "Sum of the Year Digits"
 msgstr ""
 
-#: includes/sysnames.inc:165
+#: includes/sysnames.inc:167
 msgid "One-time"
 msgstr ""
 
-#: includes/sysnames.inc:171 manufacturing/search_work_orders.php:163
-#: manufacturing/includes/manufacturing_ui.inc:293 reporting/rep402.php:103
+#: includes/sysnames.inc:173 manufacturing/search_work_orders.php:170
+#: manufacturing/includes/manufacturing_ui.inc:293 reporting/rep402.php:136
 msgid "Manufactured"
 msgstr ""
 
-#: includes/sysnames.inc:172
+#: includes/sysnames.inc:174
 msgid "Purchased"
 msgstr ""
 
-#: includes/sysnames.inc:173
+#: includes/sysnames.inc:175
 msgid "Service"
 msgstr ""
 
-#: includes/sysnames.inc:186
+#: includes/sysnames.inc:188
 msgid "Customer branch"
 msgstr ""
 
-#: includes/sysnames.inc:188
+#: includes/sysnames.inc:190
 msgid "Shipper"
 msgstr ""
 
-#: includes/sysnames.inc:189
+#: includes/sysnames.inc:191
 msgid "Company internal"
 msgstr ""
 
-#: includes/sysnames.inc:194
+#: includes/sysnames.inc:196
 msgid "Prepayment"
 msgstr ""
 
-#: includes/sysnames.inc:196
+#: includes/sysnames.inc:198
 msgid "After No. of Days"
 msgstr ""
 
-#: includes/sysnames.inc:197
+#: includes/sysnames.inc:199
 msgid "Day In Following Month"
 msgstr ""
 
-#: includes/sysnames.inc:201
+#: includes/sysnames.inc:203
 msgid "Sum per line taxes"
 msgstr ""
 
-#: includes/sysnames.inc:202
+#: includes/sysnames.inc:204
 msgid "Taxes from totals"
 msgstr ""
 
-#: includes/sysnames.inc:214
+#: includes/sysnames.inc:216
 msgid "Jan"
 msgstr ""
 
-#: includes/sysnames.inc:214
+#: includes/sysnames.inc:216
 msgid "Feb"
 msgstr ""
 
-#: includes/sysnames.inc:214
+#: includes/sysnames.inc:216
 msgid "Mar"
 msgstr ""
 
-#: includes/sysnames.inc:214
+#: includes/sysnames.inc:216
 msgid "Apr"
 msgstr ""
 
-#: includes/sysnames.inc:214 includes/ui/ui_view.inc:982
+#: includes/sysnames.inc:216 includes/ui/ui_view.inc:1008
 msgid "May"
 msgstr ""
 
-#: includes/sysnames.inc:214
+#: includes/sysnames.inc:216
 msgid "Jun"
 msgstr ""
 
-#: includes/sysnames.inc:214
+#: includes/sysnames.inc:216
 msgid "Jul"
 msgstr ""
 
-#: includes/sysnames.inc:214
+#: includes/sysnames.inc:216
 msgid "Aug"
 msgstr ""
 
-#: includes/sysnames.inc:214
+#: includes/sysnames.inc:216
 msgid "Sep"
 msgstr ""
 
-#: includes/sysnames.inc:214
+#: includes/sysnames.inc:216
 msgid "Oct"
 msgstr ""
 
-#: includes/sysnames.inc:214
+#: includes/sysnames.inc:216
 msgid "Nov"
 msgstr ""
 
-#: includes/sysnames.inc:214
+#: includes/sysnames.inc:216
 msgid "Dec"
 msgstr ""
 
-#: includes/sysnames.inc:220
+#: includes/sysnames.inc:222
 msgid "Unicode (multilanguage)"
 msgstr ""
 
-#: includes/sysnames.inc:221
+#: includes/sysnames.inc:223
 msgid "Icelandic"
 msgstr ""
 
-#: includes/sysnames.inc:222
+#: includes/sysnames.inc:224
 msgid "Latvian"
 msgstr ""
 
-#: includes/sysnames.inc:223
+#: includes/sysnames.inc:225
 msgid "Romanian"
 msgstr ""
 
-#: includes/sysnames.inc:224
+#: includes/sysnames.inc:226
 msgid "Slovenian"
 msgstr ""
 
-#: includes/sysnames.inc:225
+#: includes/sysnames.inc:227
 msgid "Polish"
 msgstr ""
 
-#: includes/sysnames.inc:226
+#: includes/sysnames.inc:228
 msgid "Estonian"
 msgstr ""
 
-#: includes/sysnames.inc:227
+#: includes/sysnames.inc:229
 msgid "Spanish"
 msgstr ""
 
-#: includes/sysnames.inc:228
+#: includes/sysnames.inc:230
 msgid "Swedish"
 msgstr ""
 
-#: includes/sysnames.inc:229
+#: includes/sysnames.inc:231
 msgid "Turkish"
 msgstr ""
 
-#: includes/sysnames.inc:230
+#: includes/sysnames.inc:232
 msgid "Czech"
 msgstr ""
 
-#: includes/sysnames.inc:231
+#: includes/sysnames.inc:233
 msgid "Danish"
 msgstr ""
 
-#: includes/sysnames.inc:232
+#: includes/sysnames.inc:234
 msgid "Lithuanian"
 msgstr ""
 
-#: includes/sysnames.inc:233
+#: includes/sysnames.inc:235
 msgid "Slovak"
 msgstr ""
 
-#: includes/sysnames.inc:234
+#: includes/sysnames.inc:236
 msgid "Spanish (alternative)"
 msgstr ""
 
-#: includes/sysnames.inc:235
+#: includes/sysnames.inc:237
 msgid "Persian"
 msgstr ""
 
-#: includes/sysnames.inc:236
+#: includes/sysnames.inc:238
 msgid "Hungarian"
 msgstr ""
 
-#: includes/sysnames.inc:237
+#: includes/sysnames.inc:239
 msgid "French"
 msgstr ""
 
-#: includes/sysnames.inc:238
+#: includes/sysnames.inc:240
 msgid "Italian"
 msgstr ""
 
@@ -7183,246 +7333,242 @@ msgstr ""
 msgid "MySQL version"
 msgstr ""
 
-#: includes/system_tests.inc:28
+#: includes/system_tests.inc:31
 msgid "Upgrade MySQL server to version at least 4.1"
 msgstr ""
 
-#: includes/system_tests.inc:35
+#: includes/system_tests.inc:38
 msgid "PHP MySQL extension"
 msgstr ""
 
-#: includes/system_tests.inc:40
+#: includes/system_tests.inc:43
 msgid "Your PHP has to have MySQL extension enabled."
 msgstr ""
 
-#: includes/system_tests.inc:46
+#: includes/system_tests.inc:49
 msgid "PHP version"
 msgstr ""
 
-#: includes/system_tests.inc:50
+#: includes/system_tests.inc:53
 msgid "Upgrade PHP to version at least 5.0.0"
 msgstr ""
 
-#: includes/system_tests.inc:57
+#: includes/system_tests.inc:60
 msgid "Server system"
 msgstr ""
 
-#: includes/system_tests.inc:67
+#: includes/system_tests.inc:70
 msgid "Session save path"
 msgstr ""
 
-#: includes/system_tests.inc:79
+#: includes/system_tests.inc:82
 msgid "Removed install wizard folder"
 msgstr ""
 
-#: includes/system_tests.inc:82
+#: includes/system_tests.inc:85
 msgid "Not removed"
 msgstr ""
 
-#: includes/system_tests.inc:83
+#: includes/system_tests.inc:86
 msgid "Remove or rename install wizard folder for security reasons."
 msgstr ""
 
-#: includes/system_tests.inc:90
+#: includes/system_tests.inc:93
 msgid "Browser type"
 msgstr ""
 
-#: includes/system_tests.inc:94
+#: includes/system_tests.inc:97
 msgid "Any browser is supported"
 msgstr ""
 
-#: includes/system_tests.inc:101
+#: includes/system_tests.inc:104
 msgid "Http server type"
 msgstr ""
 
-#: includes/system_tests.inc:105
+#: includes/system_tests.inc:108
 msgid "Any server is supported"
 msgstr ""
 
-#: includes/system_tests.inc:112
+#: includes/system_tests.inc:115
 msgid "Native gettext"
 msgstr ""
 
-#: includes/system_tests.inc:116
+#: includes/system_tests.inc:119
 msgid "In case of no gettext support, php emulation is used"
 msgstr ""
 
-#: includes/system_tests.inc:124
+#: includes/system_tests.inc:127
 msgid "Debugging mode"
 msgstr ""
 
-#: includes/system_tests.inc:128
+#: includes/system_tests.inc:131
 msgid "To switch debugging on set $go_debug>0 in config.php file"
 msgstr ""
 
-#: includes/system_tests.inc:138
+#: includes/system_tests.inc:141
 msgid "Error logging"
 msgstr ""
 
-#: includes/system_tests.inc:146
+#: includes/system_tests.inc:149
 msgid "Disabled"
 msgstr ""
 
-#: includes/system_tests.inc:149
+#: includes/system_tests.inc:152
 msgid "To switch error logging set $error_logging in config.php file"
 msgstr ""
 
-#: includes/system_tests.inc:152
+#: includes/system_tests.inc:155
 msgid "Log file is not writeable"
 msgstr ""
 
-#: includes/system_tests.inc:162
+#: includes/system_tests.inc:165
 msgid "Current database version"
 msgstr ""
 
-#: includes/system_tests.inc:166
+#: includes/system_tests.inc:169
 msgid "Database structure seems to be not upgraded to current version"
 msgstr ""
 
-#: includes/system_tests.inc:181
+#: includes/system_tests.inc:184
 msgid "Company subdirectories consistency"
 msgstr ""
 
-#: includes/system_tests.inc:194 includes/system_tests.inc:201
-#: includes/system_tests.inc:209 includes/system_tests.inc:226
-#: includes/system_tests.inc:341 includes/system_tests.inc:350
-#: includes/system_tests.inc:359 includes/system_tests.inc:367
+#: includes/system_tests.inc:197 includes/system_tests.inc:204
+#: includes/system_tests.inc:212 includes/system_tests.inc:229
+#: includes/system_tests.inc:344 includes/system_tests.inc:353
+#: includes/system_tests.inc:362 includes/system_tests.inc:370
 #, php-format
 msgid "'%s' is not writeable"
 msgstr ""
 
-#: includes/system_tests.inc:222
+#: includes/system_tests.inc:225
 msgid "Temporary directory"
 msgstr ""
 
-#: includes/system_tests.inc:234
+#: includes/system_tests.inc:237
 msgid "Language configuration consistency"
 msgstr ""
 
-#: includes/system_tests.inc:243
+#: includes/system_tests.inc:246
 msgid "Languages folder should be writeable."
 msgstr ""
 
-#: includes/system_tests.inc:252
+#: includes/system_tests.inc:255
 msgid "Languages configuration file should be writeable."
 msgstr ""
 
-#: includes/system_tests.inc:271
+#: includes/system_tests.inc:274
 #, php-format
 msgid "Missing %s translation file."
 msgstr ""
 
-#: includes/system_tests.inc:276
+#: includes/system_tests.inc:279
 #, php-format
 msgid "Missing system locale: %s"
 msgstr ""
 
-#: includes/system_tests.inc:289
+#: includes/system_tests.inc:292
 msgid "Main config file"
 msgstr ""
 
-#: includes/system_tests.inc:296 includes/system_tests.inc:318
+#: includes/system_tests.inc:299 includes/system_tests.inc:321
 #, php-format
 msgid "Can't write '%s' file. Check FA directory write permissions."
 msgstr ""
 
-#: includes/system_tests.inc:297 includes/system_tests.inc:319
+#: includes/system_tests.inc:300 includes/system_tests.inc:322
 #, php-format
 msgid "'%s' file exists."
 msgstr ""
 
-#: includes/system_tests.inc:301
+#: includes/system_tests.inc:304
 #, php-format
 msgid "'%s' file should be read-only"
 msgstr ""
 
-#: includes/system_tests.inc:310
+#: includes/system_tests.inc:313
 msgid "Database auth file"
 msgstr ""
 
-#: includes/system_tests.inc:323
+#: includes/system_tests.inc:326
 #, php-format
 msgid ""
 "'%s' file should be read-only if you do not plan to add or change companies"
 msgstr ""
 
-#: includes/system_tests.inc:334
+#: includes/system_tests.inc:337
 msgid "Extensions system"
 msgstr ""
 
-#: includes/system_tests.inc:372
+#: includes/system_tests.inc:375
 msgid "Extensions configuration files and directories should be writeable"
 msgstr ""
 
-#: includes/system_tests.inc:385
+#: includes/system_tests.inc:388
 #, php-format
 msgid "Non-standard theme directory '%s' is not writable"
 msgstr ""
 
-#: includes/system_tests.inc:395
-msgid ""
-"OpenSSL PHP extension have to be enabled to use extension repository system."
-msgstr ""
-
 #: includes/system_tests.inc:398
 msgid ""
-"OpenSSL have to be available on your server to use extension repository "
-"system."
+"OpenSSL PHP extension have to be enabled to use extension repository system."
 msgstr ""
 
-#: includes/system_tests.inc:421
+#: includes/system_tests.inc:424
 msgid "Test"
 msgstr ""
 
-#: includes/system_tests.inc:421
+#: includes/system_tests.inc:424
 msgid "Test type"
 msgstr ""
 
-#: includes/system_tests.inc:421 reporting/rep204.php:85
-#: reporting/rep301.php:164 reporting/rep308.php:224
+#: includes/system_tests.inc:424 reporting/rep204.php:85
+#: reporting/rep301.php:165 reporting/rep308.php:225
 msgid "Value"
 msgstr ""
 
-#: includes/system_tests.inc:421 reporting/reports_main.php:42
-#: reporting/reports_main.php:53 reporting/reports_main.php:62
-#: reporting/reports_main.php:69 reporting/reports_main.php:78
-#: reporting/reports_main.php:87 reporting/reports_main.php:94
-#: reporting/reports_main.php:103 reporting/reports_main.php:113
-#: reporting/reports_main.php:120 reporting/reports_main.php:127
-#: reporting/reports_main.php:135 reporting/reports_main.php:142
-#: reporting/reports_main.php:148 reporting/reports_main.php:159
-#: reporting/reports_main.php:170 reporting/reports_main.php:178
-#: reporting/reports_main.php:183 reporting/reports_main.php:190
-#: reporting/reports_main.php:198 reporting/reports_main.php:205
-#: reporting/reports_main.php:214 reporting/reports_main.php:220
-#: reporting/reports_main.php:231 reporting/reports_main.php:241
-#: reporting/reports_main.php:247 reporting/reports_main.php:257
-#: reporting/reports_main.php:265 reporting/reports_main.php:273
-#: reporting/reports_main.php:280 reporting/reports_main.php:289
-#: reporting/reports_main.php:296 reporting/reports_main.php:303
-#: reporting/reports_main.php:314 reporting/reports_main.php:325
-#: reporting/reports_main.php:335 reporting/reports_main.php:342
-#: reporting/reports_main.php:348 reporting/reports_main.php:355
-#: reporting/reports_main.php:368 reporting/reports_main.php:376
-#: reporting/reports_main.php:387 reporting/reports_main.php:399
-#: reporting/reports_main.php:409 reporting/reports_main.php:421
-#: reporting/reports_main.php:428 reporting/reports_main.php:438
-#: reporting/reports_main.php:449 reporting/reports_main.php:458
-#: reporting/reports_main.php:469 reporting/reports_main.php:475
-#: reporting/reports_main.php:484 reporting/reports_main.php:494
-#: reporting/reports_main.php:502 reporting/reports_main.php:510
-#: reporting/reports_main.php:518 reporting/includes/excel_report.inc:292
+#: includes/system_tests.inc:424 reporting/reports_main.php:42
+#: reporting/reports_main.php:53 reporting/reports_main.php:64
+#: reporting/reports_main.php:73 reporting/reports_main.php:80
+#: reporting/reports_main.php:89 reporting/reports_main.php:98
+#: reporting/reports_main.php:105 reporting/reports_main.php:114
+#: reporting/reports_main.php:124 reporting/reports_main.php:131
+#: reporting/reports_main.php:138 reporting/reports_main.php:146
+#: reporting/reports_main.php:153 reporting/reports_main.php:160
+#: reporting/reports_main.php:171 reporting/reports_main.php:182
+#: reporting/reports_main.php:191 reporting/reports_main.php:199
+#: reporting/reports_main.php:204 reporting/reports_main.php:211
+#: reporting/reports_main.php:219 reporting/reports_main.php:226
+#: reporting/reports_main.php:235 reporting/reports_main.php:241
+#: reporting/reports_main.php:252 reporting/reports_main.php:262
+#: reporting/reports_main.php:268 reporting/reports_main.php:278
+#: reporting/reports_main.php:286 reporting/reports_main.php:294
+#: reporting/reports_main.php:301 reporting/reports_main.php:311
+#: reporting/reports_main.php:320 reporting/reports_main.php:328
+#: reporting/reports_main.php:335 reporting/reports_main.php:346
+#: reporting/reports_main.php:357 reporting/reports_main.php:367
+#: reporting/reports_main.php:374 reporting/reports_main.php:380
+#: reporting/reports_main.php:387 reporting/reports_main.php:400
+#: reporting/reports_main.php:408 reporting/reports_main.php:419
+#: reporting/reports_main.php:431 reporting/reports_main.php:441
+#: reporting/reports_main.php:453 reporting/reports_main.php:460
+#: reporting/reports_main.php:470 reporting/reports_main.php:481
+#: reporting/reports_main.php:490 reporting/reports_main.php:501
+#: reporting/reports_main.php:507 reporting/reports_main.php:516
+#: reporting/reports_main.php:526 reporting/reports_main.php:534
+#: reporting/reports_main.php:542 reporting/reports_main.php:550
+#: reporting/includes/excel_report.inc:292
 #: reporting/includes/excel_report.inc:425
-#: reporting/includes/pdf_report.inc:347 reporting/includes/pdf_report.inc:608
-#: sales/view/view_sales_order.php:98
+#: reporting/includes/pdf_report.inc:360 reporting/includes/pdf_report.inc:621
+#: sales/view/view_sales_order.php:100
 msgid "Comments"
 msgstr ""
 
-#: includes/system_tests.inc:445
+#: includes/system_tests.inc:448
 msgid "Ok"
 msgstr ""
 
-#: includes/db/audit_trail_db.inc:102
+#: includes/db/audit_trail_db.inc:103
 msgid ""
 "Some transactions journal GL postings were not indexed due to lack of audit "
 "trail record."
@@ -7557,7 +7703,7 @@ msgstr ""
 
 #: includes/ui/allocation_cart.inc:290
 #: purchasing/allocations/supplier_allocation_main.php:94
-#: sales/allocations/customer_allocation_main.php:87
+#: sales/allocations/customer_allocation_main.php:92
 msgid "Transaction Type"
 msgstr ""
 
@@ -7567,12 +7713,12 @@ msgstr ""
 
 #: includes/ui/allocation_cart.inc:290 reporting/rep704.php:82
 #: reporting/rep704.php:85 reporting/rep704.php:88 reporting/rep709.php:116
-#: sales/view/view_credit.php:68 sales/view/view_sales_order.php:109
-#: sales/view/view_sales_order.php:142 sales/view/view_sales_order.php:179
+#: sales/view/view_credit.php:68 sales/view/view_sales_order.php:111
+#: sales/view/view_sales_order.php:144 sales/view/view_sales_order.php:181
 #: sales/inquiry/customer_branches_list.php:49
-#: sales/inquiry/sales_orders_view.php:214
-#: sales/inquiry/sales_orders_view.php:253
-#: sales/inquiry/sales_orders_view.php:267
+#: sales/inquiry/sales_orders_view.php:219
+#: sales/inquiry/sales_orders_view.php:258
+#: sales/inquiry/sales_orders_view.php:272
 msgid "Ref"
 msgstr ""
 
@@ -7581,20 +7727,20 @@ msgid "Other Allocations"
 msgstr ""
 
 #: includes/ui/allocation_cart.inc:291 includes/ui/allocation_cart.inc:337
-#: includes/ui/ui_view.inc:547
+#: includes/ui/ui_view.inc:553
 #: purchasing/allocations/supplier_allocation_main.php:101
-#: reporting/rep112.php:150 reporting/rep210.php:157
-#: reporting/includes/doctext.inc:166 reporting/includes/doctext.inc:207
-#: sales/allocations/customer_allocation_main.php:94
+#: reporting/rep112.php:159 reporting/rep210.php:157
+#: reporting/includes/doctext.inc:166 reporting/includes/doctext.inc:209
+#: sales/allocations/customer_allocation_main.php:99
 msgid "Left to Allocate"
 msgstr ""
 
-#: includes/ui/allocation_cart.inc:291 includes/ui/ui_view.inc:547
-#: reporting/includes/doctext.inc:166 reporting/includes/doctext.inc:207
+#: includes/ui/allocation_cart.inc:291 includes/ui/ui_view.inc:553
+#: reporting/includes/doctext.inc:166 reporting/includes/doctext.inc:209
 msgid "This Allocation"
 msgstr ""
 
-#: includes/ui/allocation_cart.inc:324 reporting/rep112.php:147
+#: includes/ui/allocation_cart.inc:324 reporting/rep112.php:156
 #: reporting/rep210.php:154
 msgid "Total Allocated"
 msgstr ""
@@ -7613,13 +7759,76 @@ msgid ""
 "than the total amount left to allocate."
 msgstr ""
 
-#: includes/ui/class.crud_view.inc:289 includes/ui/simple_crud_class.inc:225
-#: includes/ui/ui_input.inc:226
+#: includes/ui/attachment.inc:84 sales/manage/sales_groups.php:85
+#: sales/manage/sales_groups.php:120
+msgid "ID"
+msgstr ""
+
+#: includes/ui/attachment.inc:84 includes/ui/attachment.inc:137
+msgid "Docs Title"
+msgstr ""
+
+#: includes/ui/attachment.inc:84
+msgid "Date Updated"
+msgstr ""
+
+#: includes/ui/attachment.inc:112
+msgid "Attachment Detail"
+msgstr ""
+
+#: includes/ui/attachment.inc:131
+msgid "Customer ID"
+msgstr ""
+
+#: includes/ui/attachment.inc:133
+msgid "Supplier ID"
+msgstr ""
+
+#: includes/ui/attachment.inc:139
+msgid "File:"
+msgstr ""
+
+#: includes/ui/attachment.inc:139
+#, php-format
+msgid "%s [%s bytes]"
+msgstr ""
+
+#: includes/ui/attachment.inc:140
+msgid "File change"
+msgstr ""
+
+#: includes/ui/attachment.inc:140
+msgid "Select file"
+msgstr ""
+
+#: includes/ui/attachment.inc:169 includes/ui/class.crud_view.inc:298
+#: includes/ui/simple_crud_class.inc:225 includes/ui/ui_input.inc:227
 msgid "Submit changes"
 msgstr ""
 
-#: includes/ui/class.crud_view.inc:304 includes/ui/simple_crud_class.inc:227
-#: includes/ui/ui_input.inc:227
+#: includes/ui/attachment.inc:171 includes/ui/simple_crud_class.inc:229
+#: includes/ui/ui_input.inc:230
+msgid "Cancel edition"
+msgstr ""
+
+#: includes/ui/attachment.inc:207 includes/ui/attachment.inc:259
+msgid "The existing Docs could not be removed"
+msgstr ""
+
+#: includes/ui/attachment.inc:224
+msgid "A New Attachment Added Successfully"
+msgstr ""
+
+#: includes/ui/attachment.inc:285
+msgid "Description cannot be empty."
+msgstr ""
+
+#: includes/ui/attachment.inc:315
+msgid "The Selected Attachment is Deleted Successfully"
+msgstr ""
+
+#: includes/ui/class.crud_view.inc:313 includes/ui/simple_crud_class.inc:227
+#: includes/ui/ui_input.inc:228
 msgid "Clone"
 msgstr ""
 
@@ -7681,17 +7890,17 @@ msgstr ""
 msgid "Contact active for:"
 msgstr ""
 
-#: includes/ui/contacts_view.inc:99 sales/manage/customers.php:256
+#: includes/ui/contacts_view.inc:99 sales/manage/customers.php:257
 msgid "Phone:"
 msgstr ""
 
 #: includes/ui/contacts_view.inc:102 inventory/manage/locations.php:217
-#: purchasing/manage/suppliers.php:139 sales/manage/customer_branches.php:256
-#: sales/manage/customers.php:259 sales/manage/sales_people.php:158
+#: purchasing/manage/suppliers.php:249 sales/manage/customer_branches.php:256
+#: sales/manage/customers.php:260 sales/manage/sales_people.php:158
 msgid "E-mail:"
 msgstr ""
 
-#: includes/ui/contacts_view.inc:107 purchasing/manage/suppliers.php:140
+#: includes/ui/contacts_view.inc:107 purchasing/manage/suppliers.php:250
 #: sales/manage/customer_branches.php:257
 msgid "Document Language:"
 msgstr ""
@@ -7716,7 +7925,7 @@ msgstr ""
 msgid "You have to select at least one category."
 msgstr ""
 
-#: includes/ui/db_pager_view.inc:172 includes/ui/ui_input.inc:959
+#: includes/ui/db_pager_view.inc:172 includes/ui/ui_input.inc:964
 msgid "Show also Inactive"
 msgstr ""
 
@@ -7749,14 +7958,10 @@ msgstr ""
 msgid "Exchange rate roundings"
 msgstr ""
 
-#: includes/ui/simple_crud_class.inc:227 includes/ui/ui_input.inc:228
+#: includes/ui/simple_crud_class.inc:227 includes/ui/ui_input.inc:229
 msgid "Edit new record with current data"
 msgstr ""
 
-#: includes/ui/simple_crud_class.inc:229 includes/ui/ui_input.inc:229
-msgid "Cancel edition"
-msgstr ""
-
 #: includes/ui/ui_controls.inc:93
 msgid "Request from outside of this page is forbidden."
 msgstr ""
@@ -7794,7 +7999,7 @@ msgstr ""
 msgid "Branches"
 msgstr ""
 
-#: includes/ui/ui_controls.inc:510 purchasing/manage/suppliers.php:22
+#: includes/ui/ui_controls.inc:510 purchasing/manage/suppliers.php:23
 #: purchasing/inquiry/suppliers_list.php:29
 msgid "Suppliers"
 msgstr ""
@@ -7805,23 +8010,23 @@ msgid ""
 "Do you want to abandon changes?"
 msgstr ""
 
-#: includes/ui/ui_input.inc:656 reporting/includes/reports_classes.inc:223
+#: includes/ui/ui_input.inc:661 reporting/includes/reports_classes.inc:223
 msgid "Click Here to Pick up the date"
 msgstr ""
 
-#: includes/ui/ui_input.inc:971 includes/ui/ui_lists.inc:2330
-#: reporting/rep301.php:224 reporting/rep302.php:168 reporting/rep303.php:178
-#: reporting/rep304.php:184 reporting/rep304.php:188 reporting/rep306.php:235
-#: reporting/rep306.php:242 reporting/rep451.php:130
-#: sales/manage/customer_branches.php:292
+#: includes/ui/ui_input.inc:976 includes/ui/ui_lists.inc:2355
+#: reporting/rep301.php:225 reporting/rep302.php:168 reporting/rep303.php:300
+#: reporting/rep304.php:184 reporting/rep304.php:188 reporting/rep306.php:234
+#: reporting/rep306.php:241 reporting/rep310.php:189 reporting/rep310.php:197
+#: reporting/rep451.php:143 sales/manage/customer_branches.php:292
 msgid "Inactive"
 msgstr ""
 
-#: includes/ui/ui_input.inc:981 includes/ui/ui_input.inc:993
+#: includes/ui/ui_input.inc:986 includes/ui/ui_input.inc:998
 msgid "Current Credit:"
 msgstr ""
 
-#: includes/ui/ui_input.inc:1007
+#: includes/ui/ui_input.inc:1012
 msgid "Bank Balance:"
 msgstr ""
 
@@ -7841,176 +8046,179 @@ msgstr ""
 msgid "Enter description fragment to search or * for all"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:305 includes/ui/ui_lists.inc:309
-#: includes/ui/ui_lists.inc:313 includes/ui/ui_lists.inc:317
-#: includes/ui/ui_lists.inc:321 includes/ui/ui_lists.inc:326
-#: includes/ui/ui_lists.inc:330 inventory/inquiry/stock_list.php:42
+#: includes/ui/ui_lists.inc:308 includes/ui/ui_lists.inc:312
+#: includes/ui/ui_lists.inc:316 includes/ui/ui_lists.inc:320
+#: includes/ui/ui_lists.inc:324 includes/ui/ui_lists.inc:329
+#: includes/ui/ui_lists.inc:333 inventory/inquiry/stock_list.php:42
 msgid "Search items"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:334 sales/inquiry/customers_list.php:42
+#: includes/ui/ui_lists.inc:337 sales/inquiry/customers_list.php:42
 msgid "Search customers"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:338 sales/inquiry/customer_branches_list.php:38
+#: includes/ui/ui_lists.inc:341 sales/inquiry/customer_branches_list.php:38
 msgid "Search branches"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:342 purchasing/inquiry/suppliers_list.php:42
+#: includes/ui/ui_lists.inc:345 purchasing/inquiry/suppliers_list.php:42
 msgid "Search suppliers"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:526 includes/ui/ui_lists.inc:1528
+#: includes/ui/ui_lists.inc:540 includes/ui/ui_lists.inc:1552
 msgid "All Suppliers"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:530
+#: includes/ui/ui_lists.inc:544
 msgid "Press Space tab to filter by name fragment"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:531
+#: includes/ui/ui_lists.inc:545
 msgid "Select supplier"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:577
+#: includes/ui/ui_lists.inc:595
 msgid "All Customers"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:581
+#: includes/ui/ui_lists.inc:599
 msgid "Press Space tab to filter by name fragment; F2 - entry new customer"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:582
+#: includes/ui/ui_lists.inc:600
 msgid "Select customer"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:627
+#: includes/ui/ui_lists.inc:645
 msgid "All branches"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:630
+#: includes/ui/ui_lists.inc:648
 msgid "Select customer branch"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:666
+#: includes/ui/ui_lists.inc:684
 msgid "All Locations"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:823 includes/ui/ui_lists.inc:907
+#: includes/ui/ui_lists.inc:841 includes/ui/ui_lists.inc:925
 msgid "All Items"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:1460
+#: includes/ui/ui_lists.inc:1484
 msgid "All Sales Types"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:1807
+#: includes/ui/ui_lists.inc:1832
 msgid "Use Item Sales Accounts"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2116 includes/ui/ui_lists.inc:2132
-#: includes/ui/ui_lists.inc:2148
+#: includes/ui/ui_lists.inc:2141 includes/ui/ui_lists.inc:2157
+#: includes/ui/ui_lists.inc:2173
 msgid "All Types"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2117 sales/view/view_sales_order.php:140
+#: includes/ui/ui_lists.inc:2142 sales/view/view_sales_order.php:142
 msgid "Sales Invoices"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2118 includes/ui/ui_lists.inc:2134
-#: includes/ui/ui_lists.inc:2151
-msgid "Overdue Invoices"
+#: includes/ui/ui_lists.inc:2143 includes/ui/ui_lists.inc:2176
+msgid "Unsettled transactions"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2119 includes/ui/ui_lists.inc:2135
-#: includes/ui/ui_lists.inc:2152 includes/ui/ui_view.inc:609
-#: includes/ui/ui_view.inc:613
+#: includes/ui/ui_lists.inc:2144 includes/ui/ui_lists.inc:2160
+#: includes/ui/ui_lists.inc:2177 includes/ui/ui_view.inc:615
+#: includes/ui/ui_view.inc:619
 msgid "Payments"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2120 includes/ui/ui_lists.inc:2136
-#: includes/ui/ui_lists.inc:2153 sales/view/view_sales_order.php:176
+#: includes/ui/ui_lists.inc:2145 includes/ui/ui_lists.inc:2161
+#: includes/ui/ui_lists.inc:2178 sales/view/view_sales_order.php:178
 msgid "Credit Notes"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2121 sales/view/view_sales_order.php:106
+#: includes/ui/ui_lists.inc:2146 sales/view/view_sales_order.php:108
 msgid "Delivery Notes"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2133 includes/ui/ui_lists.inc:2150
+#: includes/ui/ui_lists.inc:2158 includes/ui/ui_lists.inc:2175
 msgid "Invoices"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2137 includes/ui/ui_lists.inc:2154
+#: includes/ui/ui_lists.inc:2159
+msgid "Overdue Invoices"
+msgstr ""
+
+#: includes/ui/ui_lists.inc:2162 includes/ui/ui_lists.inc:2179
 msgid "Overdue Credit Notes"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2149
+#: includes/ui/ui_lists.inc:2174
 msgid "GRNs"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2167
+#: includes/ui/ui_lists.inc:2192
 msgid "Automatically put balance on back order"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2168
+#: includes/ui/ui_lists.inc:2193
 msgid "Cancel any quantites not delivered"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2185
+#: includes/ui/ui_lists.inc:2210
 msgid "Items Returned to Inventory Location"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2186
+#: includes/ui/ui_lists.inc:2211
 msgid "Items Written Off"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2355
+#: includes/ui/ui_lists.inc:2380
 msgid "New role"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2407
+#: includes/ui/ui_lists.inc:2432
 msgid "No tags defined."
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2407
+#: includes/ui/ui_lists.inc:2432
 msgid "No active tags defined."
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2445
+#: includes/ui/ui_lists.inc:2470
 #, php-format
 msgid "Activated for '%s'"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2448
+#: includes/ui/ui_lists.inc:2473
 msgid "Available and/or installed"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2518
+#: includes/ui/ui_lists.inc:2543
 msgid "Standard new company American COA (4 digit)"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2520
+#: includes/ui/ui_lists.inc:2545
 msgid "Standard American COA (4 digit) with demo data"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2541
+#: includes/ui/ui_lists.inc:2566
 msgid "No payment Link"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2661
+#: includes/ui/ui_lists.inc:2686
 msgid "Numeric"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2661
+#: includes/ui/ui_lists.inc:2686
 msgid "Alpha Numeric"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2661
+#: includes/ui/ui_lists.inc:2686
 msgid "ALPHA NUMERIC"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2677
+#: includes/ui/ui_lists.inc:2702
 msgid "All users"
 msgstr ""
 
@@ -8018,137 +8226,137 @@ msgstr ""
 msgid "in units of : "
 msgstr ""
 
-#: includes/ui/ui_view.inc:301
+#: includes/ui/ui_view.inc:307
 #, php-format
 msgid ""
 "Cannot retrieve exchange rate for currency %s. Please adjust approximate "
 "rate if needed."
 msgstr ""
 
-#: includes/ui/ui_view.inc:342
+#: includes/ui/ui_view.inc:348
 msgid "Date Voided:"
 msgstr ""
 
-#: includes/ui/ui_view.inc:442 reporting/rep107.php:261
+#: includes/ui/ui_view.inc:448 reporting/rep107.php:260
 #: reporting/rep109.php:188 reporting/rep110.php:185 reporting/rep111.php:185
-#: reporting/rep113.php:174 reporting/rep209.php:190
+#: reporting/rep113.php:174 reporting/rep209.php:187
 msgid "Total Tax Excluded"
 msgstr ""
 
-#: includes/ui/ui_view.inc:448 includes/ui/ui_view.inc:467
-#: includes/ui/ui_view.inc:491 includes/ui/ui_view.inc:508
-#: reporting/rep107.php:270 reporting/rep109.php:197 reporting/rep110.php:194
-#: reporting/rep111.php:194 reporting/rep113.php:183 reporting/rep209.php:199
+#: includes/ui/ui_view.inc:454 includes/ui/ui_view.inc:473
+#: includes/ui/ui_view.inc:497 includes/ui/ui_view.inc:514
+#: reporting/rep107.php:269 reporting/rep109.php:197 reporting/rep110.php:194
+#: reporting/rep111.php:194 reporting/rep113.php:183 reporting/rep209.php:196
 msgid "Included"
 msgstr ""
 
-#: includes/ui/ui_view.inc:546 reporting/includes/doctext.inc:166
-#: reporting/includes/doctext.inc:207
+#: includes/ui/ui_view.inc:552 reporting/rep105.php:116
+#: reporting/includes/doctext.inc:166 reporting/includes/doctext.inc:209
 msgid "Total Amount"
 msgstr ""
 
-#: includes/ui/ui_view.inc:570
+#: includes/ui/ui_view.inc:576
 msgid "Total Allocated:"
 msgstr ""
 
-#: includes/ui/ui_view.inc:576
+#: includes/ui/ui_view.inc:582
 msgid "Left to Allocate:"
 msgstr ""
 
-#: includes/ui/ui_view.inc:592 includes/ui/ui_view.inc:596
+#: includes/ui/ui_view.inc:598 includes/ui/ui_view.inc:602
 #: purchasing/inquiry/supplier_allocation_inquiry.php:99
 msgid "Allocations"
 msgstr ""
 
-#: includes/ui/ui_view.inc:609 includes/ui/ui_view.inc:613
+#: includes/ui/ui_view.inc:615 includes/ui/ui_view.inc:619
 msgid "Pre-Payments"
 msgstr ""
 
-#: includes/ui/ui_view.inc:629
+#: includes/ui/ui_view.inc:635
 msgid "No Quick Entries are defined."
 msgstr ""
 
-#: includes/ui/ui_view.inc:644
+#: includes/ui/ui_view.inc:650
 msgid "No Quick Entry lines are defined."
 msgstr ""
 
-#: includes/ui/ui_view.inc:875 purchasing/includes/ui/invoice_ui.inc:482
+#: includes/ui/ui_view.inc:881 purchasing/includes/ui/invoice_ui.inc:481
 msgid "and"
 msgstr ""
 
-#: includes/ui/ui_view.inc:982
+#: includes/ui/ui_view.inc:1008
 msgid "January"
 msgstr ""
 
-#: includes/ui/ui_view.inc:982
+#: includes/ui/ui_view.inc:1008
 msgid "February"
 msgstr ""
 
-#: includes/ui/ui_view.inc:982
+#: includes/ui/ui_view.inc:1008
 msgid "March"
 msgstr ""
 
-#: includes/ui/ui_view.inc:982
+#: includes/ui/ui_view.inc:1008
 msgid "April"
 msgstr ""
 
-#: includes/ui/ui_view.inc:982
+#: includes/ui/ui_view.inc:1008
 msgid "June"
 msgstr ""
 
-#: includes/ui/ui_view.inc:982
+#: includes/ui/ui_view.inc:1008
 msgid "July"
 msgstr ""
 
-#: includes/ui/ui_view.inc:982
+#: includes/ui/ui_view.inc:1008
 msgid "August"
 msgstr ""
 
-#: includes/ui/ui_view.inc:982
+#: includes/ui/ui_view.inc:1008
 msgid "September"
 msgstr ""
 
-#: includes/ui/ui_view.inc:982
+#: includes/ui/ui_view.inc:1008
 msgid "October"
 msgstr ""
 
-#: includes/ui/ui_view.inc:982
+#: includes/ui/ui_view.inc:1008
 msgid "November"
 msgstr ""
 
-#: includes/ui/ui_view.inc:982
+#: includes/ui/ui_view.inc:1008
 msgid "December"
 msgstr ""
 
-#: includes/ui/ui_view.inc:983
+#: includes/ui/ui_view.inc:1009
 msgid "Su"
 msgstr ""
 
-#: includes/ui/ui_view.inc:983
+#: includes/ui/ui_view.inc:1009
 msgid "Mo"
 msgstr ""
 
-#: includes/ui/ui_view.inc:983
+#: includes/ui/ui_view.inc:1009
 msgid "Tu"
 msgstr ""
 
-#: includes/ui/ui_view.inc:983
+#: includes/ui/ui_view.inc:1009
 msgid "We"
 msgstr ""
 
-#: includes/ui/ui_view.inc:983
+#: includes/ui/ui_view.inc:1009
 msgid "Th"
 msgstr ""
 
-#: includes/ui/ui_view.inc:983
+#: includes/ui/ui_view.inc:1009
 msgid "Fr"
 msgstr ""
 
-#: includes/ui/ui_view.inc:983
+#: includes/ui/ui_view.inc:1009
 msgid "Sa"
 msgstr ""
 
-#: includes/ui/ui_view.inc:984
+#: includes/ui/ui_view.inc:1010
 msgid "W"
 msgstr ""
 
@@ -8211,30 +8419,30 @@ msgstr ""
 msgid "The entered standard cost is negative or invalid."
 msgstr ""
 
-#: inventory/adjustments.php:228 inventory/cost_update.php:42
-#: inventory/transfers.php:216 sales/sales_order_entry.php:702
+#: inventory/adjustments.php:231 inventory/cost_update.php:42
+#: inventory/transfers.php:216 sales/sales_order_entry.php:705
 msgid "There are no fixed assets defined in the system."
 msgstr ""
 
-#: inventory/adjustments.php:230
+#: inventory/adjustments.php:233
 msgid ""
 "There are no inventory items defined in the system which can be adjusted "
 "(Purchased or Manufactured)."
 msgstr ""
 
-#: inventory/adjustments.php:239
+#: inventory/adjustments.php:242
 msgid "Disposal Items"
 msgstr ""
 
-#: inventory/adjustments.php:240
+#: inventory/adjustments.php:243
 msgid "Process Disposal"
 msgstr ""
 
-#: inventory/adjustments.php:242
+#: inventory/adjustments.php:245
 msgid "Adjustment Items"
 msgstr ""
 
-#: inventory/adjustments.php:243
+#: inventory/adjustments.php:246
 msgid "Process Adjustment"
 msgstr ""
 
@@ -8275,8 +8483,8 @@ msgstr ""
 #: inventory/inquiry/stock_status.php:45 inventory/manage/item_codes.php:108
 #: manufacturing/work_order_entry.php:376
 #: manufacturing/work_order_entry.php:381 purchasing/inquiry/po_search.php:74
-#: sales/inquiry/sales_deliveries_view.php:112
-#: sales/inquiry/sales_orders_view.php:229
+#: sales/inquiry/sales_deliveries_view.php:113
+#: sales/inquiry/sales_orders_view.php:234
 msgid "Item:"
 msgstr ""
 
@@ -8343,14 +8551,14 @@ msgid "Sales Type"
 msgstr ""
 
 #: inventory/prices.php:151 inventory/purchasing_data.php:150
-#: purchasing/includes/ui/invoice_ui.inc:514
-#: 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:32 reporting/includes/doctext.inc:191
-#: sales/customer_credit_invoice.php:276 sales/customer_delivery.php:421
-#: sales/customer_invoice.php:519 sales/customer_invoice.php:522
-#: sales/view/view_credit.php:91 sales/view/view_dispatch.php:113
-#: sales/view/view_invoice.php:116 sales/view/view_sales_order.php:220
+#: purchasing/includes/ui/invoice_ui.inc:513 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:32
+#: reporting/includes/doctext.inc:191 sales/customer_credit_invoice.php:276
+#: sales/customer_delivery.php:421 sales/customer_invoice.php:519
+#: sales/customer_invoice.php:522 sales/view/view_credit.php:91
+#: sales/view/view_dispatch.php:113 sales/view/view_invoice.php:116
+#: sales/view/view_sales_order.php:222
 #: sales/includes/ui/sales_credit_ui.inc:163
 msgid "Price"
 msgstr ""
@@ -8384,7 +8592,7 @@ msgid "There are no purchasable inventory items defined in the system."
 msgstr ""
 
 #: inventory/purchasing_data.php:30 purchasing/po_entry_items.php:73
-#: purchasing/supplier_credit.php:31 purchasing/supplier_invoice.php:30
+#: purchasing/supplier_credit.php:65 purchasing/supplier_invoice.php:53
 #: purchasing/supplier_payment.php:40
 msgid "There are no suppliers defined in the system."
 msgstr ""
@@ -8465,30 +8673,26 @@ msgstr ""
 
 #: inventory/reorder_level.php:71 inventory/inquiry/stock_movements.php:107
 #: inventory/inquiry/stock_status.php:70 inventory/inquiry/stock_status.php:74
-#: manufacturing/search_work_orders.php:160
+#: manufacturing/search_work_orders.php:167
 #: manufacturing/inquiry/where_used_inquiry.php:45
 #: manufacturing/manage/bom_edit.php:43
-#: purchasing/inquiry/po_search_completed.php:113
-#: purchasing/inquiry/po_search_completed.php:123
+#: purchasing/inquiry/po_search_completed.php:122
+#: purchasing/inquiry/po_search_completed.php:133
 #: purchasing/inquiry/po_search.php:120 purchasing/inquiry/po_search.php:131
-#: reporting/rep105.php:120 reporting/rep301.php:171 reporting/rep302.php:130
-#: reporting/rep303.php:133 reporting/rep304.php:136 reporting/rep306.php:150
-#: reporting/rep307.php:121 reporting/rep308.php:231 reporting/rep402.php:103
-#: reporting/rep402.php:109 reporting/rep451.php:77
-#: reporting/reports_main.php:212 reporting/reports_main.php:219
-#: reporting/reports_main.php:225 reporting/reports_main.php:238
-#: reporting/reports_main.php:254 reporting/reports_main.php:264
-#: reporting/reports_main.php:272 reporting/reports_main.php:294
+#: reporting/rep105.php:121 reporting/rep301.php:172 reporting/rep302.php:130
+#: reporting/rep303.php:236 reporting/rep304.php:136 reporting/rep306.php:150
+#: reporting/rep307.php:121 reporting/rep308.php:232 reporting/rep310.php:142
+#: reporting/rep310.php:151 reporting/rep402.php:136 reporting/rep402.php:153
+#: reporting/rep451.php:87 reporting/reports_main.php:233
+#: reporting/reports_main.php:240 reporting/reports_main.php:246
+#: reporting/reports_main.php:259 reporting/reports_main.php:275
+#: reporting/reports_main.php:285 reporting/reports_main.php:293
+#: reporting/reports_main.php:308 reporting/reports_main.php:325
 #: sales/manage/sales_points.php:84
 msgid "Location"
 msgstr ""
 
-#: inventory/reorder_level.php:71 inventory/inquiry/stock_movements.php:109
-#: inventory/inquiry/stock_status.php:74 purchasing/supplier_credit.php:220
-msgid "Quantity On Hand"
-msgstr ""
-
-#: inventory/reorder_level.php:71 inventory/includes/inventory_db.inc:99
+#: inventory/reorder_level.php:71 inventory/includes/inventory_db.inc:101
 #: inventory/inquiry/stock_status.php:74
 msgid "Re-Order Level"
 msgstr ""
@@ -8543,46 +8747,50 @@ msgstr ""
 msgid "Process Transfer"
 msgstr ""
 
-#: inventory/includes/inventory_db.inc:96
+#: inventory/includes/inventory_db.inc:98
 msgid "Stocks below Re-Order Level at "
 msgstr ""
 
-#: inventory/includes/inventory_db.inc:99
+#: inventory/includes/inventory_db.inc:101
 msgid "Below"
 msgstr ""
 
-#: inventory/includes/inventory_db.inc:100
+#: inventory/includes/inventory_db.inc:102
 msgid "Please reorder"
 msgstr ""
 
 #: inventory/includes/item_adjustments_ui.inc:20
-#: inventory/includes/stock_transfers_ui.inc:20
+#: inventory/includes/sav.item_adjustments_ui.inc:20
+#: inventory/includes/stock_transfers_ui.inc:22
 #: manufacturing/includes/work_order_issue_ui.inc:20
 #: sales/includes/ui/sales_order_ui.inc:59
 msgid "For Part :"
 msgstr ""
 
 #: inventory/includes/item_adjustments_ui.inc:34
+#: inventory/includes/sav.item_adjustments_ui.inc:34
 #: manufacturing/work_order_entry.php:200 purchasing/inquiry/po_search.php:67
-#: sales/inquiry/sales_deliveries_view.php:105
-#: sales/inquiry/sales_orders_view.php:220
+#: sales/inquiry/sales_deliveries_view.php:106
+#: sales/inquiry/sales_orders_view.php:225
 msgid "Location:"
 msgstr ""
 
 #: inventory/includes/item_adjustments_ui.inc:56
 #: inventory/includes/item_adjustments_ui.inc:59
-#: inventory/includes/stock_transfers_ui.inc:57
+#: inventory/includes/sav.item_adjustments_ui.inc:56
+#: inventory/includes/sav.item_adjustments_ui.inc:59
+#: inventory/includes/stock_transfers_ui.inc:59
 #: inventory/inquiry/stock_list.php:53 inventory/view/view_adjustment.php:54
 #: inventory/view/view_transfer.php:50
 #: manufacturing/includes/work_order_issue_ui.inc:33
-#: purchasing/includes/ui/po_ui.inc:214 purchasing/po_receive_items.php:62
+#: purchasing/includes/ui/po_ui.inc:216 purchasing/po_receive_items.php:62
 #: purchasing/view/view_grn.php:40 purchasing/view/view_po.php:45
 #: reporting/includes/doctext.inc:31 reporting/includes/doctext.inc:190
-#: reporting/includes/doctext.inc:227 sales/customer_credit_invoice.php:275
+#: reporting/includes/doctext.inc:229 sales/customer_credit_invoice.php:275
 #: sales/customer_delivery.php:419 sales/customer_invoice.php:518
 #: sales/customer_invoice.php:521 sales/view/view_credit.php:90
 #: sales/view/view_dispatch.php:112 sales/view/view_invoice.php:115
-#: sales/view/view_sales_order.php:219
+#: sales/view/view_sales_order.php:221
 #: sales/includes/ui/sales_credit_ui.inc:162
 #: sales/includes/ui/sales_order_ui.inc:146
 msgid "Item Code"
@@ -8590,15 +8798,17 @@ msgstr ""
 
 #: inventory/includes/item_adjustments_ui.inc:56
 #: inventory/includes/item_adjustments_ui.inc:59
-#: inventory/includes/stock_transfers_ui.inc:57
+#: inventory/includes/sav.item_adjustments_ui.inc:56
+#: inventory/includes/sav.item_adjustments_ui.inc:59
+#: inventory/includes/stock_transfers_ui.inc:59
 #: manufacturing/includes/work_order_issue_ui.inc:33
-#: purchasing/includes/ui/po_ui.inc:214 purchasing/view/view_grn.php:40
+#: purchasing/includes/ui/po_ui.inc:216 purchasing/view/view_grn.php:40
 #: purchasing/view/view_po.php:45 reporting/includes/doctext.inc:31
-#: reporting/includes/doctext.inc:190 reporting/includes/doctext.inc:227
+#: reporting/includes/doctext.inc:190 reporting/includes/doctext.inc:229
 #: sales/customer_credit_invoice.php:275 sales/customer_delivery.php:419
 #: sales/customer_invoice.php:518 sales/customer_invoice.php:521
 #: sales/view/view_credit.php:90 sales/view/view_dispatch.php:112
-#: sales/view/view_invoice.php:115 sales/view/view_sales_order.php:219
+#: sales/view/view_invoice.php:115 sales/view/view_sales_order.php:221
 #: sales/includes/ui/sales_credit_ui.inc:162
 #: sales/includes/ui/sales_order_ui.inc:146
 msgid "Item Description"
@@ -8606,14 +8816,16 @@ msgstr ""
 
 #: inventory/includes/item_adjustments_ui.inc:57
 #: inventory/includes/item_adjustments_ui.inc:60
-#: inventory/includes/stock_transfers_ui.inc:57
+#: inventory/includes/sav.item_adjustments_ui.inc:57
+#: inventory/includes/sav.item_adjustments_ui.inc:60
+#: inventory/includes/stock_transfers_ui.inc:59
 #: inventory/manage/item_units.php:94
 #: manufacturing/includes/work_order_issue_ui.inc:34
-#: purchasing/includes/ui/po_ui.inc:215 purchasing/view/view_grn.php:41
+#: purchasing/includes/ui/po_ui.inc:217 purchasing/view/view_grn.php:41
 #: purchasing/view/view_po.php:45 reporting/includes/doctext.inc:32
 #: reporting/includes/doctext.inc:191 sales/view/view_credit.php:91
 #: sales/view/view_dispatch.php:113 sales/view/view_invoice.php:116
-#: sales/view/view_sales_order.php:219
+#: sales/view/view_sales_order.php:221
 #: sales/includes/ui/sales_credit_ui.inc:162
 #: sales/includes/ui/sales_order_ui.inc:148
 msgid "Unit"
@@ -8621,30 +8833,34 @@ msgstr ""
 
 #: inventory/includes/item_adjustments_ui.inc:57
 #: inventory/includes/item_adjustments_ui.inc:60
+#: inventory/includes/sav.item_adjustments_ui.inc:57
+#: inventory/includes/sav.item_adjustments_ui.inc:60
 #: inventory/view/view_adjustment.php:55
 #: manufacturing/view/wo_issue_view.php:76
 #: manufacturing/includes/manufacturing_ui.inc:29
-#: manufacturing/includes/work_order_issue_ui.inc:34 reporting/rep301.php:164
+#: manufacturing/includes/work_order_issue_ui.inc:34 reporting/rep301.php:165
 msgid "Unit Cost"
 msgstr ""
 
 #: inventory/includes/item_adjustments_ui.inc:57
-#: inventory/manage/items.php:525
+#: inventory/includes/sav.item_adjustments_ui.inc:57
+#: inventory/manage/items.php:517
 msgid "Initial Value"
 msgstr ""
 
-#: inventory/includes/item_adjustments_ui.inc:118
+#: inventory/includes/item_adjustments_ui.inc:127
+#: inventory/includes/sav.item_adjustments_ui.inc:120
 msgid ""
 "Marked items have insufficient quantities in stock as on day of adjustment."
 msgstr ""
 
-#: inventory/includes/stock_transfers_ui.inc:35
+#: inventory/includes/stock_transfers_ui.inc:38
 #: inventory/inquiry/stock_movements.php:83
 #: manufacturing/includes/work_order_issue_ui.inc:158
 msgid "From Location:"
 msgstr ""
 
-#: inventory/includes/stock_transfers_ui.inc:36
+#: inventory/includes/stock_transfers_ui.inc:39
 msgid "To Location:"
 msgstr ""
 
@@ -8653,26 +8869,30 @@ msgid ""
 "Marked items have insufficient quantities in stock as on day of transfer."
 msgstr ""
 
-#: inventory/includes/db/items_db.inc:139
+#: inventory/includes/db/items_db.inc:140
 msgid ""
 "Cannot delete this item because there are stock movements that refer to this "
 "item."
 msgstr ""
 
-#: inventory/includes/db/items_db.inc:142
+#: inventory/includes/db/items_db.inc:143
 msgid ""
 "Cannot delete this item record because there are bills of material that "
 "require this part as a component."
 msgstr ""
 
-#: inventory/includes/db/items_db.inc:145
-#: inventory/includes/db/items_db.inc:148
+#: inventory/includes/db/items_db.inc:146
+msgid ""
+"Cannot delete this item because there are existing sales order items for it."
+msgstr ""
+
+#: inventory/includes/db/items_db.inc:149
 msgid ""
 "Cannot delete this item because there are existing purchase order items for "
 "it."
 msgstr ""
 
-#: inventory/includes/db/items_db.inc:166
+#: inventory/includes/db/items_db.inc:167
 msgid ""
 "This item cannot be deleted because some code aliases \n"
 "\t\t\t\tor foreign codes was entered for it, or there are kits defined \n"
@@ -8701,11 +8921,11 @@ msgid "Show Movements"
 msgstr ""
 
 #: inventory/inquiry/stock_movements.php:88
-#: purchasing/includes/ui/invoice_ui.inc:483
+#: purchasing/includes/ui/invoice_ui.inc:482
 #: purchasing/inquiry/supplier_allocation_inquiry.php:57
-#: purchasing/inquiry/supplier_inquiry.php:56
+#: purchasing/inquiry/supplier_inquiry.php:147
 #: sales/inquiry/customer_allocation_inquiry.php:51
-#: sales/inquiry/customer_inquiry.php:54
+#: sales/inquiry/customer_inquiry.php:171
 msgid "Refresh Inquiry"
 msgstr ""
 
@@ -8740,12 +8960,12 @@ msgid ""
 msgstr ""
 
 #: inventory/inquiry/stock_status.php:70 inventory/inquiry/stock_status.php:75
-#: reporting/rep303.php:120 reporting/rep303.php:126
+#: reporting/rep303.php:223 reporting/rep303.php:229
 msgid "Demand"
 msgstr ""
 
-#: inventory/inquiry/stock_status.php:75 reporting/rep303.php:120
-#: reporting/rep303.php:126
+#: inventory/inquiry/stock_status.php:75 reporting/rep303.php:223
+#: reporting/rep303.php:229
 msgid "On Order"
 msgstr ""
 
@@ -8777,10 +8997,9 @@ msgid "Tax type"
 msgstr ""
 
 #: inventory/manage/item_categories.php:117
-#: inventory/manage/item_categories.php:121
-#: inventory/manage/item_codes.php:126 inventory/manage/sales_kits.php:36
-#: inventory/view/view_adjustment.php:55 inventory/view/view_transfer.php:50
-#: manufacturing/view/wo_issue_view.php:76
+#: inventory/manage/item_categories.php:121 inventory/manage/item_codes.php:126
+#: inventory/manage/sales_kits.php:36 inventory/view/view_adjustment.php:55
+#: inventory/view/view_transfer.php:50 manufacturing/view/wo_issue_view.php:76
 #: manufacturing/manage/bom_edit.php:44 purchasing/po_receive_items.php:62
 #: sales/customer_credit_invoice.php:275 sales/customer_delivery.php:420
 #: sales/customer_invoice.php:518 sales/customer_invoice.php:521
@@ -8828,35 +9047,35 @@ msgstr ""
 msgid "Default values for new items"
 msgstr ""
 
-#: inventory/manage/item_categories.php:212 inventory/manage/items.php:394
+#: inventory/manage/item_categories.php:212 inventory/manage/items.php:386
 msgid "Item Tax Type:"
 msgstr ""
 
-#: inventory/manage/item_categories.php:217 inventory/manage/items.php:397
+#: inventory/manage/item_categories.php:217 inventory/manage/items.php:389
 msgid "Item Type:"
 msgstr ""
 
-#: inventory/manage/item_categories.php:219 inventory/manage/items.php:399
+#: inventory/manage/item_categories.php:219 inventory/manage/items.php:391
 msgid "Units of Measure:"
 msgstr ""
 
-#: inventory/manage/item_categories.php:224 inventory/manage/items.php:406
+#: inventory/manage/item_categories.php:224 inventory/manage/items.php:398
 msgid "Exclude from sales:"
 msgstr ""
 
-#: inventory/manage/item_categories.php:226 inventory/manage/items.php:408
+#: inventory/manage/item_categories.php:226 inventory/manage/items.php:400
 msgid "Exclude from purchases:"
 msgstr ""
 
-#: inventory/manage/item_categories.php:238 inventory/manage/items.php:471
+#: inventory/manage/item_categories.php:238 inventory/manage/items.php:463
 msgid "Asset account:"
 msgstr ""
 
-#: inventory/manage/item_categories.php:239 inventory/manage/items.php:472
+#: inventory/manage/item_categories.php:239 inventory/manage/items.php:464
 msgid "Depreciation cost account:"
 msgstr ""
 
-#: inventory/manage/item_categories.php:240 inventory/manage/items.php:473
+#: inventory/manage/item_categories.php:240 inventory/manage/items.php:465
 msgid "Depreciation/Disposal account:"
 msgstr ""
 
@@ -8868,7 +9087,7 @@ msgstr ""
 msgid "Foreign Item Codes"
 msgstr ""
 
-#: inventory/manage/item_codes.php:26 sales/sales_order_entry.php:704
+#: inventory/manage/item_codes.php:26 sales/sales_order_entry.php:707
 msgid "There are no inventory items defined in the system."
 msgstr ""
 
@@ -8880,7 +9099,7 @@ msgstr ""
 msgid "Item code description cannot be empty."
 msgstr ""
 
-#: inventory/manage/item_codes.php:58 inventory/manage/items.php:194
+#: inventory/manage/item_codes.php:58 inventory/manage/items.php:204
 #: inventory/manage/sales_kits.php:89
 msgid "This item code is already assigned to stock item or sale kit."
 msgstr ""
@@ -8907,217 +9126,220 @@ msgstr ""
 
 #: inventory/manage/item_codes.php:181 inventory/manage/sales_kits.php:243
 #: manufacturing/work_order_add_finished.php:194
-#: manufacturing/work_order_entry.php:404
-#: manufacturing/manage/bom_edit.php:204
+#: manufacturing/work_order_entry.php:404 manufacturing/manage/bom_edit.php:233
 msgid "Quantity:"
 msgstr ""
 
-#: inventory/manage/item_codes.php:182 inventory/manage/items.php:368
+#: inventory/manage/item_codes.php:182 inventory/manage/items.php:359
 #: inventory/manage/sales_kits.php:206 inventory/manage/sales_kits.php:230
 #: manufacturing/manage/work_centres.php:138
-#: sales/create_recurrent_invoices.php:179 sales/manage/credit_status.php:145
+#: sales/create_recurrent_invoices.php:178 sales/manage/credit_status.php:145
 #: sales/manage/recurrent_invoices.php:191 taxes/item_tax_types.php:173
-#: taxes/tax_groups.php:162 taxes/tax_types.php:158
+#: taxes/tax_groups.php:165 taxes/tax_types.php:158
 msgid "Description:"
 msgstr ""
 
-#: inventory/manage/item_codes.php:183 inventory/manage/items.php:370
+#: inventory/manage/item_codes.php:183 inventory/manage/items.php:361
 #: inventory/manage/sales_kits.php:207 inventory/manage/sales_kits.php:231
 msgid "Category:"
 msgstr ""
 
-#: inventory/manage/items.php:87
+#: inventory/manage/items.php:97
 msgid "Error uploading file."
 msgstr ""
 
-#: inventory/manage/items.php:104
+#: inventory/manage/items.php:114
 msgid ""
 "Only graphics files are supported - a file extension of .jpg, .png or .gif "
 "is expected"
 msgstr ""
 
-#: inventory/manage/items.php:136
+#: inventory/manage/items.php:146
 msgid ""
 "There are no fixed asset categories defined in the system. At least one "
 "fixed asset category is required to add a fixed asset."
 msgstr ""
 
-#: inventory/manage/items.php:137
+#: inventory/manage/items.php:147
 msgid ""
 "There are no fixed asset classes defined in the system. At least one fixed "
 "asset class is required to add a fixed asset."
 msgstr ""
 
-#: inventory/manage/items.php:139
+#: inventory/manage/items.php:149
 msgid ""
 "There are no item categories defined in the system. At least one item "
 "category is required to add a item."
 msgstr ""
 
-#: inventory/manage/items.php:141
+#: inventory/manage/items.php:151
 msgid ""
 "There are no item tax types defined in the system. At least one item tax "
 "type is required to add a item."
 msgstr ""
 
-#: inventory/manage/items.php:173
+#: inventory/manage/items.php:183
 msgid "The item name must be entered."
 msgstr ""
 
-#: inventory/manage/items.php:179
+#: inventory/manage/items.php:189
 msgid "The item code cannot be empty"
 msgstr ""
 
-#: inventory/manage/items.php:187
+#: inventory/manage/items.php:197
 msgid ""
 "The item code cannot contain any of the following characters -  & + OR a "
 "space OR quotes"
 msgstr ""
 
-#: inventory/manage/items.php:207
+#: inventory/manage/items.php:217
 msgid "The depracation cannot start before the fixed asset purchase date"
 msgstr ""
 
-#: inventory/manage/items.php:239
+#: inventory/manage/items.php:249
 msgid "Item has been updated."
 msgstr ""
 
-#: inventory/manage/items.php:254
+#: inventory/manage/items.php:264
 msgid "A new item has been added."
 msgstr ""
 
-#: inventory/manage/items.php:297
+#: inventory/manage/items.php:308
 msgid "Selected item has been deleted."
 msgstr ""
 
-#: inventory/manage/items.php:314
+#: inventory/manage/items.php:325
 msgid "General Settings"
 msgstr ""
 
-#: inventory/manage/items.php:319 inventory/manage/items.php:360
+#: inventory/manage/items.php:334
+msgid "Generate EAN-8 Barcode"
+msgstr ""
+
+#: inventory/manage/items.php:341 inventory/manage/items.php:351
 msgid "Item Code:"
 msgstr ""
 
-#: inventory/manage/items.php:401
+#: inventory/manage/items.php:393
 msgid "Editable description:"
 msgstr ""
 
-#: inventory/manage/items.php:413
+#: inventory/manage/items.php:405
 msgid "Fixed Asset Class"
 msgstr ""
 
-#: inventory/manage/items.php:415
+#: inventory/manage/items.php:407
 msgid "Depreciation Method"
 msgstr ""
 
-#: inventory/manage/items.php:426 inventory/manage/items.php:435
+#: inventory/manage/items.php:418 inventory/manage/items.php:427
 msgid "Depreciation Rate"
 msgstr ""
 
-#: inventory/manage/items.php:430
+#: inventory/manage/items.php:422
 msgid "Depreciation Years"
 msgstr ""
 
-#: inventory/manage/items.php:430
+#: inventory/manage/items.php:422
 msgid "years"
 msgstr ""
 
-#: inventory/manage/items.php:433
+#: inventory/manage/items.php:425
 msgid "Base Rate"
 msgstr ""
 
-#: inventory/manage/items.php:438
+#: inventory/manage/items.php:430
 msgid "Rate multiplier"
 msgstr ""
 
-#: inventory/manage/items.php:442 inventory/manage/items.php:445
+#: inventory/manage/items.php:434 inventory/manage/items.php:437
 msgid "Depreciation Start"
 msgstr ""
 
-#: inventory/manage/items.php:446
+#: inventory/manage/items.php:438
 msgid "Last Depreciation"
 msgstr ""
 
-#: inventory/manage/items.php:494
+#: inventory/manage/items.php:486
 msgid "Other"
 msgstr ""
 
-#: inventory/manage/items.php:497
+#: inventory/manage/items.php:489
 msgid "Image File (.jpg)"
 msgstr ""
 
-#: inventory/manage/items.php:512
+#: inventory/manage/items.php:504
 msgid "No image"
 msgstr ""
 
-#: inventory/manage/items.php:517
+#: inventory/manage/items.php:509
 msgid "Delete Image:"
 msgstr ""
 
-#: inventory/manage/items.php:519
+#: inventory/manage/items.php:511
 msgid "Item status:"
 msgstr ""
 
-#: inventory/manage/items.php:521
+#: inventory/manage/items.php:513
 msgid "Values"
 msgstr ""
 
-#: inventory/manage/items.php:526 reporting/rep451.php:70
+#: inventory/manage/items.php:518 reporting/rep451.php:80
 msgid "Depreciations"
 msgstr ""
 
-#: inventory/manage/items.php:527
+#: inventory/manage/items.php:519
 msgid "Current Value"
 msgstr ""
 
-#: inventory/manage/items.php:535
+#: inventory/manage/items.php:528
 msgid "Insert New Item"
 msgstr ""
 
-#: inventory/manage/items.php:539
+#: inventory/manage/items.php:532
 msgid "Update Item"
 msgstr ""
 
-#: inventory/manage/items.php:542
+#: inventory/manage/items.php:535
 msgid "Select this items and return to document entry."
 msgstr ""
 
-#: inventory/manage/items.php:543
+#: inventory/manage/items.php:536
 msgid "Clone This Item"
 msgstr ""
 
-#: inventory/manage/items.php:544
+#: inventory/manage/items.php:537
 msgid "Delete This Item"
 msgstr ""
 
-#: inventory/manage/items.php:559
+#: inventory/manage/items.php:552
 msgid "Select an item:"
 msgstr ""
 
-#: inventory/manage/items.php:560
+#: inventory/manage/items.php:553
 msgid "New item"
 msgstr ""
 
-#: inventory/manage/items.php:584 inventory/manage/items.php:587
-#: purchasing/manage/suppliers.php:309 sales/manage/customer_branches.php:310
-#: sales/manage/customers.php:350
+#: inventory/manage/items.php:577 inventory/manage/items.php:580
+#: purchasing/manage/suppliers.php:321 sales/manage/customer_branches.php:310
+#: sales/manage/customers.php:352
 msgid "&General settings"
 msgstr ""
 
-#: inventory/manage/items.php:585 inventory/manage/items.php:593
-#: purchasing/manage/suppliers.php:311 sales/manage/customers.php:352
+#: inventory/manage/items.php:578 inventory/manage/items.php:586
+#: purchasing/manage/suppliers.php:323 sales/manage/customers.php:354
 msgid "&Transactions"
 msgstr ""
 
-#: inventory/manage/items.php:588
+#: inventory/manage/items.php:581
 msgid "S&ales Pricing"
 msgstr ""
 
-#: inventory/manage/items.php:589
+#: inventory/manage/items.php:582
 msgid "&Purchasing Pricing"
 msgstr ""
 
-#: inventory/manage/items.php:594
+#: inventory/manage/items.php:588
 msgid "&Status"
 msgstr ""
 
@@ -9262,7 +9484,7 @@ msgstr ""
 msgid "kit"
 msgstr ""
 
-#: inventory/manage/sales_kits.php:68 manufacturing/manage/bom_edit.php:74
+#: inventory/manage/sales_kits.php:68 manufacturing/manage/bom_edit.php:95
 msgid "The quantity entered must be numeric and greater than zero."
 msgstr ""
 
@@ -9304,7 +9526,7 @@ msgid ""
 "following kits"
 msgstr ""
 
-#: inventory/manage/sales_kits.php:168 manufacturing/manage/bom_edit.php:126
+#: inventory/manage/sales_kits.php:168 manufacturing/manage/bom_edit.php:147
 msgid "The component item has been deleted from this bom"
 msgstr ""
 
@@ -9324,8 +9546,8 @@ msgstr ""
 msgid "Update kit/alias name"
 msgstr ""
 
-#: inventory/manage/sales_kits.php:223 manufacturing/manage/bom_edit.php:180
-#: manufacturing/manage/bom_edit.php:187
+#: inventory/manage/sales_kits.php:223 manufacturing/manage/bom_edit.php:209
+#: manufacturing/manage/bom_edit.php:216
 msgid "Component:"
 msgstr ""
 
@@ -9352,7 +9574,7 @@ msgstr ""
 #: inventory/view/view_transfer.php:40 manufacturing/view/wo_issue_view.php:43
 #: manufacturing/includes/manufacturing_ui.inc:29
 #: manufacturing/includes/manufacturing_ui.inc:100
-#: reporting/includes/doctext.inc:228
+#: reporting/includes/doctext.inc:230
 msgid "From Location"
 msgstr ""
 
@@ -9360,63 +9582,63 @@ msgstr ""
 msgid "To Location"
 msgstr ""
 
-#: manufacturing/search_work_orders.php:26
+#: manufacturing/search_work_orders.php:28
 msgid "Search Outstanding Work Orders"
 msgstr ""
 
-#: manufacturing/search_work_orders.php:31
+#: manufacturing/search_work_orders.php:33
 msgid "Search Work Orders"
 msgstr ""
 
-#: manufacturing/search_work_orders.php:67
-#: purchasing/inquiry/po_search_completed.php:80
+#: manufacturing/search_work_orders.php:69
+#: purchasing/inquiry/po_search_completed.php:89
 #: purchasing/inquiry/po_search.php:62
-#: sales/inquiry/sales_deliveries_view.php:101
-#: sales/inquiry/sales_orders_view.php:213
+#: sales/inquiry/sales_deliveries_view.php:102
+#: sales/inquiry/sales_orders_view.php:218
 msgid "#:"
 msgstr ""
 
-#: manufacturing/search_work_orders.php:70
+#: manufacturing/search_work_orders.php:72
 msgid "at Location:"
 msgstr ""
 
-#: manufacturing/search_work_orders.php:82
-#: purchasing/inquiry/po_search_completed.php:92
+#: manufacturing/search_work_orders.php:84
+#: purchasing/inquiry/po_search_completed.php:101
 msgid "for item:"
 msgstr ""
 
-#: manufacturing/search_work_orders.php:84
-#: purchasing/inquiry/po_search_completed.php:99
+#: manufacturing/search_work_orders.php:86
+#: purchasing/inquiry/po_search_completed.php:108
 #: purchasing/inquiry/po_search.php:78
-#: sales/inquiry/sales_deliveries_view.php:116
-#: sales/inquiry/sales_orders_view.php:236
+#: sales/inquiry/sales_deliveries_view.php:117
+#: sales/inquiry/sales_orders_view.php:241
 msgid "Select documents"
 msgstr ""
 
-#: manufacturing/search_work_orders.php:122
+#: manufacturing/search_work_orders.php:124
 msgid "Release"
 msgstr ""
 
-#: manufacturing/search_work_orders.php:125
+#: manufacturing/search_work_orders.php:127
 msgid "Issue"
 msgstr ""
 
-#: manufacturing/search_work_orders.php:132
+#: manufacturing/search_work_orders.php:134
 msgid "Produce"
 msgstr ""
 
-#: manufacturing/search_work_orders.php:162 reporting/rep402.php:103
+#: manufacturing/search_work_orders.php:169 reporting/rep402.php:136
 msgid "Required"
 msgstr ""
 
-#: manufacturing/search_work_orders.php:165
+#: manufacturing/search_work_orders.php:172
 #: manufacturing/includes/manufacturing_ui.inc:292
-#: manufacturing/includes/manufacturing_ui.inc:296 reporting/rep402.php:103
-#: reporting/includes/doctext.inc:226 sales/inquiry/sales_orders_view.php:258
+#: manufacturing/includes/manufacturing_ui.inc:296 reporting/rep402.php:136
+#: reporting/includes/doctext.inc:228 sales/inquiry/sales_orders_view.php:263
 msgid "Required By"
 msgstr ""
 
-#: manufacturing/search_work_orders.php:174
+#: manufacturing/search_work_orders.php:182
 msgid "Marked orders are overdue."
 msgstr ""
 
@@ -9452,8 +9674,7 @@ msgid "Select another &Work Order to Process"
 msgstr ""
 
 #: manufacturing/work_order_add_finished.php:64
-#: manufacturing/work_order_costs.php:63
-#: manufacturing/work_order_entry.php:323
+#: manufacturing/work_order_costs.php:63 manufacturing/work_order_entry.php:323
 msgid "The order number sent is not valid."
 msgstr ""
 
@@ -9492,7 +9713,7 @@ msgstr ""
 
 #: manufacturing/work_order_add_finished.php:200
 #: purchasing/allocations/supplier_allocate.php:75
-#: sales/allocations/customer_allocate.php:73
+#: sales/allocations/customer_allocate.php:78
 msgid "Process"
 msgstr ""
 
@@ -9740,25 +9961,25 @@ msgstr ""
 msgid "View Work Order Costs"
 msgstr ""
 
-#: manufacturing/view/wo_costs_view.php:60
+#: manufacturing/view/wo_costs_view.php:60 reporting/rep402.php:141
 msgid "Transaction"
 msgstr ""
 
-#: manufacturing/view/wo_costs_view.php:66
+#: manufacturing/view/wo_costs_view.php:66 reporting/rep402.php:188
 msgid "Finished Product Requirements"
 msgstr ""
 
-#: manufacturing/view/wo_costs_view.php:69
+#: manufacturing/view/wo_costs_view.php:69 reporting/rep402.php:191
 msgid "Additional Material Issues"
 msgstr ""
 
 #: manufacturing/view/wo_costs_view.php:72
 #: manufacturing/view/work_order_view.php:66
-#: manufacturing/view/work_order_view.php:73
+#: manufacturing/view/work_order_view.php:73 reporting/rep402.php:194
 msgid "Additional Costs"
 msgstr ""
 
-#: manufacturing/view/wo_costs_view.php:75
+#: manufacturing/view/wo_costs_view.php:75 reporting/rep402.php:197
 msgid "Finished Product Receival"
 msgstr ""
 
@@ -9853,7 +10074,7 @@ msgid "There are no manufactured or kit items defined in the system."
 msgstr ""
 
 #: manufacturing/inquiry/bom_cost_inquiry.php:34
-#: manufacturing/manage/bom_edit.php:143
+#: manufacturing/manage/bom_edit.php:172
 msgid "Select a manufacturable item:"
 msgstr ""
 
@@ -9877,7 +10098,7 @@ msgstr ""
 #: manufacturing/manage/bom_edit.php:44
 #: manufacturing/includes/manufacturing_ui.inc:28
 #: manufacturing/includes/manufacturing_ui.inc:100
-#: reporting/includes/doctext.inc:228
+#: reporting/includes/doctext.inc:230
 msgid "Work Centre"
 msgstr ""
 
@@ -9897,36 +10118,44 @@ msgid ""
 "work centre be defined."
 msgstr ""
 
-#: manufacturing/manage/bom_edit.php:43 reporting/rep105.php:114
+#: manufacturing/manage/bom_edit.php:43 reporting/rep105.php:115
 msgid "Code"
 msgstr ""
 
-#: manufacturing/manage/bom_edit.php:83
+#: manufacturing/manage/bom_edit.php:69
+msgid "Copy BOM to another manufacturable item"
+msgstr ""
+
+#: manufacturing/manage/bom_edit.php:104
 msgid "Selected component has been updated"
 msgstr ""
 
-#: manufacturing/manage/bom_edit.php:103
+#: manufacturing/manage/bom_edit.php:124
 msgid ""
 "A new component part has been added to the bill of material for this item."
 msgstr ""
 
-#: manufacturing/manage/bom_edit.php:109
+#: manufacturing/manage/bom_edit.php:130
 msgid ""
 "The selected component is already on this bom. You can modify it's quantity "
 "but it cannot appear more than once on the same bom."
 msgstr ""
 
-#: manufacturing/manage/bom_edit.php:115
+#: manufacturing/manage/bom_edit.php:136
 msgid ""
 "The selected component is a parent of the current item. Recursive BOMs are "
 "not allowed."
 msgstr ""
 
-#: manufacturing/manage/bom_edit.php:200
+#: manufacturing/manage/bom_edit.php:164
+msgid "BOM copied to "
+msgstr ""
+
+#: manufacturing/manage/bom_edit.php:229
 msgid "Location to Draw From:"
 msgstr ""
 
-#: manufacturing/manage/bom_edit.php:201
+#: manufacturing/manage/bom_edit.php:230
 msgid "Work Centre Added:"
 msgstr ""
 
@@ -9991,17 +10220,17 @@ msgid "There are no Requirements for this Order."
 msgstr ""
 
 #: manufacturing/includes/manufacturing_ui.inc:101
-#: reporting/includes/doctext.inc:228
+#: reporting/includes/doctext.inc:230
 msgid "Unit Quantity"
 msgstr ""
 
 #: manufacturing/includes/manufacturing_ui.inc:101
-#: reporting/includes/doctext.inc:228
+#: reporting/includes/doctext.inc:230
 msgid "Total Quantity"
 msgstr ""
 
 #: manufacturing/includes/manufacturing_ui.inc:101
-#: reporting/includes/doctext.inc:228
+#: reporting/includes/doctext.inc:230
 msgid "Units Issued"
 msgstr ""
 
@@ -10033,14 +10262,14 @@ msgstr ""
 #: manufacturing/includes/manufacturing_ui.inc:291
 #: manufacturing/includes/manufacturing_ui.inc:295
 #: manufacturing/includes/manufacturing_ui.inc:346
-#: reporting/includes/doctext.inc:222
+#: reporting/includes/doctext.inc:224
 msgid "Manufactured Item"
 msgstr ""
 
 #: manufacturing/includes/manufacturing_ui.inc:292
 #: manufacturing/includes/manufacturing_ui.inc:296
 #: manufacturing/includes/manufacturing_ui.inc:347
-#: reporting/includes/doctext.inc:223
+#: reporting/includes/doctext.inc:225
 msgid "Into Location"
 msgstr ""
 
@@ -10074,7 +10303,7 @@ msgstr ""
 msgid "COGS changed from %s to %s for %d %s of '%s'"
 msgstr ""
 
-#: manufacturing/includes/db/work_order_costing_db.inc:235
+#: manufacturing/includes/db/work_order_costing_db.inc:236
 #, php-format
 msgid "Voided WO #%s"
 msgstr ""
@@ -10087,13 +10316,12 @@ msgstr ""
 msgid "Issue to"
 msgstr ""
 
-#: manufacturing/includes/db/work_order_produce_items_db.inc:94
+#: manufacturing/includes/db/work_order_produce_items_db.inc:95
 msgid "Production."
 msgstr ""
 
 #: manufacturing/includes/db/work_orders_db.inc:95
-#: purchasing/includes/db/po_db.inc:153
-#: sales/includes/db/cust_trans_db.inc:115
+#: purchasing/includes/db/po_db.inc:154 sales/includes/db/cust_trans_db.inc:115
 #: sales/includes/db/sales_order_db.inc:211
 msgid "Updated."
 msgstr ""
@@ -10102,7 +10330,7 @@ msgstr ""
 msgid "Canceled."
 msgstr ""
 
-#: manufacturing/includes/db/work_orders_db.inc:195
+#: manufacturing/includes/db/work_orders_db.inc:197
 msgid "Released."
 msgstr ""
 
@@ -10110,23 +10338,24 @@ msgstr ""
 msgid "Payment for:"
 msgstr ""
 
-#: purchasing/includes/db/invoice_db.inc:339
+#: purchasing/includes/db/invoice_db.inc:341
 msgid "Supplier invoice adjustment for zero inventory of "
 msgstr ""
 
-#: purchasing/includes/db/invoice_db.inc:339 reporting/rep106.php:89
-#: sales/inquiry/sales_deliveries_view.php:154
-#: sales/inquiry/sales_orders_view.php:134
+#: purchasing/includes/db/invoice_db.inc:341 reporting/rep106.php:90
+#: sales/inquiry/customer_inquiry.php:76
+#: sales/inquiry/sales_deliveries_view.php:155
+#: sales/inquiry/sales_orders_view.php:139
 msgid "Invoice"
 msgstr ""
 
-#: purchasing/includes/db/invoice_db.inc:693
-#: purchasing/includes/db/invoice_db.inc:695
+#: purchasing/includes/db/invoice_db.inc:698
+#: purchasing/includes/db/invoice_db.inc:700
 msgid "GRN Removal"
 msgstr ""
 
 #: purchasing/includes/ui/grn_ui.inc:23 purchasing/includes/ui/grn_ui.inc:55
-#: purchasing/includes/ui/po_ui.inc:303 sales/view/view_sales_order.php:74
+#: purchasing/includes/ui/po_ui.inc:307 sales/view/view_sales_order.php:76
 msgid "Order Currency"
 msgstr ""
 
@@ -10134,26 +10363,31 @@ msgstr ""
 msgid "For Purchase Order"
 msgstr ""
 
-#: purchasing/includes/ui/grn_ui.inc:28 purchasing/includes/ui/grn_ui.inc:59
-#: sales/view/view_sales_order.php:67
-msgid "Ordered On"
+#: purchasing/includes/ui/grn_ui.inc:28 reporting/includes/doctext.inc:76
+#: reporting/includes/doctext.inc:191 reporting/includes/doctext.inc:245
+#: sales/inquiry/sales_deliveries_view.php:176
+msgid "Delivery Date"
 msgstr ""
 
 #: purchasing/includes/ui/grn_ui.inc:33 purchasing/includes/ui/grn_ui.inc:69
-#: purchasing/includes/ui/po_ui.inc:318 purchasing/includes/ui/po_ui.inc:323
+#: purchasing/includes/ui/po_ui.inc:322 purchasing/includes/ui/po_ui.inc:327
 msgid "Deliver Into Location"
 msgstr ""
 
 #: purchasing/includes/ui/grn_ui.inc:38 purchasing/includes/ui/grn_ui.inc:79
-#: purchasing/includes/ui/po_ui.inc:332 sales/view/view_sales_order.php:92
+#: purchasing/includes/ui/po_ui.inc:336 sales/view/view_sales_order.php:94
 msgid "Delivery Address"
 msgstr ""
 
 #: purchasing/includes/ui/grn_ui.inc:41 purchasing/includes/ui/grn_ui.inc:82
-#: purchasing/includes/ui/po_ui.inc:344
+#: purchasing/includes/ui/po_ui.inc:348
 msgid "Order Comments"
 msgstr ""
 
+#: purchasing/includes/ui/grn_ui.inc:59 sales/view/view_sales_order.php:67
+msgid "Ordered On"
+msgstr ""
+
 #: purchasing/includes/ui/grn_ui.inc:74
 msgid "Date Items Received"
 msgstr ""
@@ -10175,76 +10409,80 @@ msgstr ""
 msgid "Dimension 2"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:155
-#: purchasing/manage/suppliers.php:100 purchasing/manage/suppliers.php:105
+#: purchasing/includes/ui/invoice_ui.inc:153
+#: purchasing/manage/suppliers.php:210 purchasing/manage/suppliers.php:215
 msgid "Supplier's Currency:"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:159
-#: purchasing/manage/suppliers.php:107 sales/manage/customer_branches.php:238
-#: sales/manage/customers.php:299
+#: purchasing/includes/ui/invoice_ui.inc:157
+#: purchasing/manage/suppliers.php:217 sales/manage/customer_branches.php:238
+#: sales/manage/customers.php:300
 msgid "Tax Group:"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:177
+#: purchasing/includes/ui/invoice_ui.inc:175
 msgid "Sub-total:"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:185
+#: purchasing/includes/ui/invoice_ui.inc:183
 msgid "Invoice Total:"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:188
+#: purchasing/includes/ui/invoice_ui.inc:186
 #: sales/customer_credit_invoice.php:325
 #: sales/includes/ui/sales_credit_ui.inc:228
 msgid "Credit Note Total"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:220
+#: purchasing/includes/ui/invoice_ui.inc:219
 msgid "Add GL Line"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:221
+#: purchasing/includes/ui/invoice_ui.inc:220
 msgid "Reset"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:222
+#: purchasing/includes/ui/invoice_ui.inc:221
 #: purchasing/po_receive_items.php:326
 msgid "Clear all GL entry fields"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:240
+#: purchasing/includes/ui/invoice_ui.inc:239
 msgid "GL Items for this Invoice"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:242
+#: purchasing/includes/ui/invoice_ui.inc:241
 msgid "GL Items for this Credit Note"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:252
+#: purchasing/includes/ui/invoice_ui.inc:251
 msgid "Quick Entry:"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:421
+#: purchasing/includes/ui/invoice_ui.inc:319
+msgid "Edit line from document"
+msgstr ""
+
+#: purchasing/includes/ui/invoice_ui.inc:420
 msgid "Add to Invoice"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:423
+#: purchasing/includes/ui/invoice_ui.inc:422
 msgid "Add to Credit Note"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:425 sales/customer_invoice.php:581
+#: purchasing/includes/ui/invoice_ui.inc:424 sales/customer_invoice.php:581
 msgid "Remove"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:425
-#: purchasing/includes/ui/invoice_ui.inc:460
+#: purchasing/includes/ui/invoice_ui.inc:424
+#: purchasing/includes/ui/invoice_ui.inc:459
 msgid ""
 "WARNING! Be careful with removal. The operation is executed immediately and "
 "cannot be undone !!!"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:427
+#: purchasing/includes/ui/invoice_ui.inc:426
 #, php-format
 msgid ""
 "You are about to remove all yet non-invoiced items from delivery line #%d. "
@@ -10252,102 +10490,102 @@ msgid ""
 "continue ?"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:458
+#: purchasing/includes/ui/invoice_ui.inc:457
 msgid "Items Received Yet to be Invoiced"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:463
+#: purchasing/includes/ui/invoice_ui.inc:462
 msgid "Delivery Item Selected For Adding To A Supplier Credit Note"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:468
+#: purchasing/includes/ui/invoice_ui.inc:467
 msgid "Received Items Charged on this Invoice"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:470
+#: purchasing/includes/ui/invoice_ui.inc:469
 msgid "Received Items Credited on this Note"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:480
+#: purchasing/includes/ui/invoice_ui.inc:479
 msgid "Received between"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:492
+#: purchasing/includes/ui/invoice_ui.inc:491
 msgid "Add All Items"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:501
-#: purchasing/includes/ui/invoice_ui.inc:513 reporting/rep308.php:223
-#: sales/inquiry/sales_orders_view.php:142
+#: purchasing/includes/ui/invoice_ui.inc:500
+#: purchasing/includes/ui/invoice_ui.inc:512 reporting/rep308.php:224
+#: sales/inquiry/sales_orders_view.php:147
 msgid "Delivery"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:501
+#: purchasing/includes/ui/invoice_ui.inc:500
 msgid "P.O."
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:502
+#: purchasing/includes/ui/invoice_ui.inc:501
 msgid "Received On"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:502 purchasing/view/view_po.php:46
+#: purchasing/includes/ui/invoice_ui.inc:501 purchasing/view/view_po.php:46
 msgid "Quantity Received"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:502 purchasing/view/view_grn.php:41
+#: purchasing/includes/ui/invoice_ui.inc:501 purchasing/view/view_grn.php:41
 #: purchasing/view/view_po.php:46
 msgid "Quantity Invoiced"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:503
+#: purchasing/includes/ui/invoice_ui.inc:502
 msgid "Qty Yet To Invoice"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:503
-#: purchasing/includes/ui/po_ui.inc:216
+#: purchasing/includes/ui/invoice_ui.inc:502
+#: purchasing/includes/ui/po_ui.inc:217
 #: sales/includes/ui/sales_order_ui.inc:148
 msgid "Price after Tax"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:503
-#: purchasing/includes/ui/po_ui.inc:216
+#: purchasing/includes/ui/invoice_ui.inc:502
+#: purchasing/includes/ui/po_ui.inc:217
 #: sales/includes/ui/sales_order_ui.inc:148
 msgid "Price before Tax"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:509
+#: purchasing/includes/ui/invoice_ui.inc:508
 msgid "Qty Yet To Credit"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:514
+#: purchasing/includes/ui/invoice_ui.inc:513
 msgid "Line Value"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:582
+#: purchasing/includes/ui/invoice_ui.inc:581
 msgid ""
 "There are no outstanding items received from this supplier that have not "
 "been invoiced by them."
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:585
+#: purchasing/includes/ui/invoice_ui.inc:584
 msgid ""
 "There are no received items for the selected supplier that have been "
 "invoiced."
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:586
+#: purchasing/includes/ui/invoice_ui.inc:585
 msgid "Credits can only be applied to invoiced items."
 msgstr ""
 
-#: purchasing/includes/ui/po_ui.inc:135 sales/sales_order_entry.php:728
+#: purchasing/includes/ui/po_ui.inc:135 sales/sales_order_entry.php:731
 msgid "Order Date:"
 msgstr ""
 
-#: purchasing/includes/ui/po_ui.inc:136 sales/sales_order_entry.php:715
+#: purchasing/includes/ui/po_ui.inc:136 sales/sales_order_entry.php:718
 msgid "Delivery Date:"
 msgstr ""
 
-#: purchasing/includes/ui/po_ui.inc:136 sales/sales_order_entry.php:709
+#: purchasing/includes/ui/po_ui.inc:136 sales/sales_order_entry.php:712
 msgid "Invoice Date:"
 msgstr ""
 
@@ -10381,22 +10619,22 @@ msgstr ""
 msgid "Order Items"
 msgstr ""
 
-#: purchasing/includes/ui/po_ui.inc:215 purchasing/po_receive_items.php:62
+#: purchasing/includes/ui/po_ui.inc:216 purchasing/po_receive_items.php:62
 msgid "Received"
 msgstr ""
 
-#: purchasing/includes/ui/po_ui.inc:216
-#: sales/includes/ui/sales_order_ui.inc:603
+#: purchasing/includes/ui/po_ui.inc:217
+#: sales/includes/ui/sales_order_ui.inc:607
 msgid "Required Delivery Date"
 msgstr ""
 
-#: purchasing/includes/ui/po_ui.inc:216 purchasing/view/view_grn.php:41
+#: purchasing/includes/ui/po_ui.inc:217 purchasing/view/view_grn.php:41
 #: purchasing/view/view_po.php:46
 msgid "Line Total"
 msgstr ""
 
-#: purchasing/includes/ui/po_ui.inc:272 purchasing/po_receive_items.php:114
-#: reporting/rep107.php:232 reporting/rep109.php:154 reporting/rep110.php:156
+#: purchasing/includes/ui/po_ui.inc:276 purchasing/po_receive_items.php:114
+#: reporting/rep107.php:231 reporting/rep109.php:154 reporting/rep110.php:156
 #: reporting/rep111.php:151 reporting/rep113.php:145 reporting/rep209.php:166
 #: sales/customer_credit_invoice.php:317 sales/customer_delivery.php:505
 #: sales/customer_invoice.php:625 sales/view/view_dispatch.php:146
@@ -10405,41 +10643,41 @@ msgstr ""
 msgid "Sub-total"
 msgstr ""
 
-#: purchasing/includes/ui/po_ui.inc:281 purchasing/po_receive_items.php:122
-#: purchasing/view/view_grn.php:79 purchasing/view/view_po.php:93
-#: sales/customer_delivery.php:512 sales/view/view_sales_order.php:263
+#: purchasing/includes/ui/po_ui.inc:285 purchasing/po_receive_items.php:122
+#: purchasing/view/view_grn.php:89 purchasing/view/view_po.php:93
+#: sales/customer_delivery.php:512 sales/view/view_sales_order.php:265
 #: sales/includes/ui/sales_order_ui.inc:230
 msgid "Amount Total"
 msgstr ""
 
-#: purchasing/includes/ui/po_ui.inc:283
+#: purchasing/includes/ui/po_ui.inc:287
 #: purchasing/allocations/supplier_allocate.php:74
-#: sales/allocations/customer_allocate.php:72
+#: sales/allocations/customer_allocate.php:77
 #: sales/includes/ui/sales_order_ui.inc:231
 msgid "Refresh"
 msgstr ""
 
-#: purchasing/includes/ui/po_ui.inc:338 sales/view/view_sales_order.php:83
+#: purchasing/includes/ui/po_ui.inc:342 sales/view/view_sales_order.php:85
 msgid "Required Pre-Payment"
 msgstr ""
 
-#: purchasing/includes/ui/po_ui.inc:339
+#: purchasing/includes/ui/po_ui.inc:343
 msgid "Pre-Payments Allocated"
 msgstr ""
 
-#: purchasing/includes/ui/po_ui.inc:461 purchasing/po_entry_items.php:483
+#: purchasing/includes/ui/po_ui.inc:467 purchasing/po_entry_items.php:483
 #: sales/customer_invoice.php:439 sales/includes/ui/sales_order_ui.inc:396
 #: sales/includes/ui/sales_order_ui.inc:398
 msgid "Payment:"
 msgstr ""
 
-#: purchasing/includes/ui/po_ui.inc:461 purchasing/po_entry_items.php:483
+#: purchasing/includes/ui/po_ui.inc:467 purchasing/po_entry_items.php:483
 msgid "Delayed"
 msgstr ""
 
-#: purchasing/includes/ui/po_ui.inc:463
-#: sales/includes/ui/sales_order_ui.inc:614
-#: sales/includes/ui/sales_order_ui.inc:616
+#: purchasing/includes/ui/po_ui.inc:469
+#: sales/includes/ui/sales_order_ui.inc:618
+#: sales/includes/ui/sales_order_ui.inc:620
 msgid "Pre-Payment Required:"
 msgstr ""
 
@@ -10525,11 +10763,11 @@ msgstr ""
 msgid "&View this Invoice"
 msgstr ""
 
-#: purchasing/po_entry_items.php:133 purchasing/supplier_invoice.php:69
+#: purchasing/po_entry_items.php:133 purchasing/supplier_invoice.php:67
 msgid "View the GL Journal Entries for this Invoice"
 msgstr ""
 
-#: purchasing/po_entry_items.php:135 purchasing/supplier_invoice.php:71
+#: purchasing/po_entry_items.php:135 purchasing/supplier_invoice.php:69
 msgid "Entry supplier &payment for this invoice"
 msgstr ""
 
@@ -10566,7 +10804,7 @@ msgstr ""
 msgid "Enter a new purchase order"
 msgstr ""
 
-#: purchasing/po_entry_items.php:228 sales/sales_order_entry.php:519
+#: purchasing/po_entry_items.php:228 sales/sales_order_entry.php:522
 msgid "Item description cannot be empty."
 msgstr ""
 
@@ -10601,7 +10839,7 @@ msgid ""
 "purchased."
 msgstr ""
 
-#: purchasing/po_entry_items.php:338 purchasing/supplier_invoice.php:382
+#: purchasing/po_entry_items.php:338 purchasing/supplier_invoice.php:384
 #: purchasing/supplier_payment.php:132
 msgid "There is no supplier selected."
 msgstr ""
@@ -10615,12 +10853,12 @@ msgid "The entered due date is invalid."
 msgstr ""
 
 #: purchasing/po_entry_items.php:374 purchasing/supplier_credit.php:199
-#: purchasing/supplier_invoice.php:208
+#: purchasing/supplier_invoice.php:206
 msgid "You must enter a supplier's invoice reference."
 msgstr ""
 
 #: purchasing/po_entry_items.php:381 purchasing/supplier_credit.php:206
-#: purchasing/supplier_invoice.php:215
+#: purchasing/supplier_invoice.php:213
 msgid ""
 "This invoice number has already been entered. It cannot be entered again."
 msgstr ""
@@ -10642,7 +10880,7 @@ msgstr ""
 msgid "Required prepayment is greater than total invoice value."
 msgstr ""
 
-#: purchasing/po_entry_items.php:491 sales/sales_order_entry.php:732
+#: purchasing/po_entry_items.php:491 sales/sales_order_entry.php:735
 msgid "Place Order"
 msgstr ""
 
@@ -10650,7 +10888,7 @@ msgstr ""
 msgid "Update Order"
 msgstr ""
 
-#: purchasing/po_entry_items.php:493 sales/sales_order_entry.php:731
+#: purchasing/po_entry_items.php:493 sales/sales_order_entry.php:734
 msgid "Cancel Order"
 msgstr ""
 
@@ -10674,7 +10912,7 @@ msgstr ""
 msgid "Update Invoice"
 msgstr ""
 
-#: purchasing/po_entry_items.php:502 sales/sales_order_entry.php:712
+#: purchasing/po_entry_items.php:502 sales/sales_order_entry.php:715
 msgid "Cancel Invoice"
 msgstr ""
 
@@ -10700,14 +10938,14 @@ msgid ""
 "select a purchase order first."
 msgstr ""
 
-#: purchasing/po_receive_items.php:62 reporting/rep105.php:114
+#: purchasing/po_receive_items.php:62 reporting/rep105.php:115
 #: sales/customer_delivery.php:420
 msgid "Ordered"
 msgstr ""
 
-#: purchasing/po_receive_items.php:63 reporting/rep101.php:133
-#: reporting/rep105.php:115 reporting/rep105.php:166 reporting/rep201.php:108
-#: reporting/includes/doctext.inc:246
+#: purchasing/po_receive_items.php:63 reporting/rep101.php:137
+#: reporting/rep105.php:116 reporting/rep105.php:170 reporting/rep201.php:116
+#: reporting/includes/doctext.inc:248
 msgid "Outstanding"
 msgstr ""
 
@@ -10772,13 +11010,13 @@ msgstr ""
 msgid "Enter Another Credit Note"
 msgstr ""
 
-#: purchasing/supplier_credit.php:126 purchasing/supplier_invoice.php:137
+#: purchasing/supplier_credit.php:126 purchasing/supplier_invoice.php:135
 msgid ""
 "The account code entered is not a valid code, this line cannot be added to "
 "the transaction."
 msgstr ""
 
-#: purchasing/supplier_credit.php:136 purchasing/supplier_invoice.php:147
+#: purchasing/supplier_credit.php:136 purchasing/supplier_invoice.php:145
 msgid ""
 "The amount entered is not numeric. This line cannot be added to the "
 "transaction."
@@ -10796,7 +11034,7 @@ msgid ""
 "not valid."
 msgstr ""
 
-#: purchasing/supplier_credit.php:192 purchasing/supplier_invoice.php:201
+#: purchasing/supplier_credit.php:192 purchasing/supplier_invoice.php:199
 msgid ""
 "The invoice as entered cannot be processed because the due date is in an "
 "incorrect format."
@@ -10816,63 +11054,63 @@ msgstr ""
 msgid "The price is either not numeric or negative."
 msgstr ""
 
-#: purchasing/supplier_credit.php:372
+#: purchasing/supplier_credit.php:371
 msgid "Enter Credit Note"
 msgstr ""
 
-#: purchasing/supplier_invoice.php:43
+#: purchasing/supplier_invoice.php:39
 msgid "Enter Supplier Invoice"
 msgstr ""
 
-#: purchasing/supplier_invoice.php:48
+#: purchasing/supplier_invoice.php:44
 #, php-format
 msgid "Modifying Purchase Invoice # %d"
 msgstr ""
 
-#: purchasing/supplier_invoice.php:66
+#: purchasing/supplier_invoice.php:64
 msgid "Supplier invoice has been processed."
 msgstr ""
 
-#: purchasing/supplier_invoice.php:67
+#: purchasing/supplier_invoice.php:65
 msgid "View this Invoice"
 msgstr ""
 
-#: purchasing/supplier_invoice.php:74
+#: purchasing/supplier_invoice.php:72
 msgid "Enter Another Invoice"
 msgstr ""
 
-#: purchasing/supplier_invoice.php:177
+#: purchasing/supplier_invoice.php:175
 msgid ""
 "The invoice cannot be processed because the there are no items or values on "
 "the invoice.  Invoices are expected to have a charge."
 msgstr ""
 
-#: purchasing/supplier_invoice.php:189
+#: purchasing/supplier_invoice.php:187
 msgid ""
 "The invoice as entered cannot be processed because the invoice date is in an "
 "incorrect format."
 msgstr ""
 
-#: purchasing/supplier_invoice.php:253
+#: purchasing/supplier_invoice.php:251
 msgid "The quantity to invoice must be numeric and greater than zero."
 msgstr ""
 
-#: purchasing/supplier_invoice.php:260
+#: purchasing/supplier_invoice.php:258
 msgid "The price is not numeric."
 msgstr ""
 
-#: purchasing/supplier_invoice.php:273
+#: purchasing/supplier_invoice.php:271
 msgid ""
 "The price being invoiced is more than the purchase order price by more than "
 "the allowed over-charge percentage. The system is set up to prohibit this. "
 "See the system administrator to modify the set up parameters if necessary."
 msgstr ""
 
-#: purchasing/supplier_invoice.php:274 purchasing/supplier_invoice.php:287
+#: purchasing/supplier_invoice.php:272 purchasing/supplier_invoice.php:285
 msgid "The over-charge percentage allowance is :"
 msgstr ""
 
-#: purchasing/supplier_invoice.php:286
+#: purchasing/supplier_invoice.php:284
 msgid ""
 "The quantity being invoiced is more than the outstanding quantity by more "
 "than the allowed over-charge percentage. The system is set up to prohibit "
@@ -10880,12 +11118,12 @@ msgid ""
 "necessary."
 msgstr ""
 
-#: purchasing/supplier_invoice.php:364
+#: purchasing/supplier_invoice.php:366
 #, php-format
 msgid "All yet non-invoiced items on delivery line # %d has been removed."
 msgstr ""
 
-#: purchasing/supplier_invoice.php:406
+#: purchasing/supplier_invoice.php:408
 msgid "Enter Invoice"
 msgstr ""
 
@@ -10921,7 +11159,7 @@ msgstr ""
 msgid "Enter another supplier &payment"
 msgstr ""
 
-#: purchasing/supplier_payment.php:105 sales/customer_payments.php:107
+#: purchasing/supplier_payment.php:105 sales/customer_payments.php:112
 msgid "Enter Other &Payment"
 msgstr ""
 
@@ -10929,11 +11167,11 @@ msgstr ""
 msgid "Enter &Customer Payment"
 msgstr ""
 
-#: purchasing/supplier_payment.php:107 sales/customer_payments.php:105
+#: purchasing/supplier_payment.php:107 sales/customer_payments.php:110
 msgid "Enter Other &Deposit"
 msgstr ""
 
-#: purchasing/supplier_payment.php:108 sales/customer_payments.php:108
+#: purchasing/supplier_payment.php:108 sales/customer_payments.php:113
 msgid "Bank Account &Transfer"
 msgstr ""
 
@@ -10959,8 +11197,7 @@ msgstr ""
 msgid "From Bank Account:"
 msgstr ""
 
-#: purchasing/supplier_payment.php:300
-#: purchasing/view/view_supp_payment.php:55
+#: purchasing/supplier_payment.php:300 purchasing/view/view_supp_payment.php:55
 msgid "Date Paid"
 msgstr ""
 
@@ -10968,7 +11205,7 @@ msgstr ""
 msgid "Bank Amount:"
 msgstr ""
 
-#: purchasing/supplier_payment.php:329 sales/customer_payments.php:374
+#: purchasing/supplier_payment.php:329 sales/customer_payments.php:378
 msgid "Amount of Discount:"
 msgstr ""
 
@@ -10990,24 +11227,26 @@ msgid ""
 msgstr ""
 
 #: purchasing/view/view_grn.php:37 purchasing/view/view_po.php:41
-#: sales/view/view_sales_order.php:216
+#: sales/view/view_sales_order.php:218
 msgid "Line Details"
 msgstr ""
 
-#: purchasing/view/view_grn.php:40 reporting/includes/doctext.inc:76
-#: reporting/includes/doctext.inc:191 reporting/includes/doctext.inc:243
-#: sales/inquiry/sales_deliveries_view.php:175
-msgid "Delivery Date"
+#: purchasing/view/view_grn.php:40
+msgid "Required by"
 msgstr ""
 
-#: purchasing/view/view_grn.php:70 purchasing/view/view_po.php:84
+#: purchasing/view/view_grn.php:80 purchasing/view/view_po.php:84
 #: purchasing/view/view_supp_credit.php:60
 #: purchasing/view/view_supp_invoice.php:66 sales/view/view_credit.php:135
-#: sales/view/view_sales_order.php:253
+#: sales/view/view_sales_order.php:255
 msgid "Sub Total"
 msgstr ""
 
-#: purchasing/view/view_grn.php:86
+#: purchasing/view/view_grn.php:97
+msgid "Marked items were delivered overdue."
+msgstr ""
+
+#: purchasing/view/view_grn.php:99
 msgid "This delivery has been voided."
 msgstr ""
 
@@ -11025,11 +11264,11 @@ msgstr ""
 
 #: purchasing/view/view_po.php:100
 #: purchasing/inquiry/supplier_allocation_inquiry.php:158
-#: purchasing/inquiry/supplier_inquiry.php:201
+#: purchasing/inquiry/supplier_inquiry.php:199
 #: sales/inquiry/customer_allocation_inquiry.php:167
-#: sales/inquiry/customer_inquiry.php:229
-#: sales/inquiry/sales_deliveries_view.php:195
-#: sales/inquiry/sales_orders_view.php:311
+#: sales/inquiry/customer_inquiry.php:226
+#: sales/inquiry/sales_deliveries_view.php:196
+#: sales/inquiry/sales_orders_view.php:318
 msgid "Marked items are overdue."
 msgstr ""
 
@@ -11076,12 +11315,12 @@ msgstr ""
 msgid "SUPPLIER INVOICE"
 msgstr ""
 
-#: purchasing/view/view_supp_invoice.php:73 reporting/rep107.php:285
-#: reporting/rep107.php:291 sales/view/view_invoice.php:168
+#: purchasing/view/view_supp_invoice.php:73 reporting/rep107.php:284
+#: reporting/rep107.php:290 sales/view/view_invoice.php:168
 msgid "TOTAL INVOICE"
 msgstr ""
 
-#: purchasing/view/view_supp_invoice.php:77 sales/view/view_invoice.php:172
+#: purchasing/view/view_supp_invoice.php:77 sales/view/view_invoice.php:175
 msgid "This invoice has been voided."
 msgstr ""
 
@@ -11093,216 +11332,222 @@ msgstr ""
 msgid "Payment to Supplier"
 msgstr ""
 
-#: purchasing/view/view_supp_payment.php:53
-msgid "To Supplier"
+#: purchasing/view/view_supp_payment.php:53
+msgid "To Supplier"
+msgstr ""
+
+#: purchasing/view/view_supp_payment.php:59
+msgid "Payment Currency"
+msgstr ""
+
+#: purchasing/view/view_supp_payment.php:62 reporting/rep112.php:164
+#: reporting/rep210.php:164 sales/customer_delivery.php:421
+#: sales/customer_invoice.php:519 sales/customer_invoice.php:522
+#: sales/view/view_receipt.php:45 sales/view/view_sales_order.php:222
+msgid "Discount"
+msgstr ""
+
+#: purchasing/view/view_supp_payment.php:69
+msgid "Supplier's Currency"
+msgstr ""
+
+#: purchasing/manage/suppliers.php:29 sales/manage/customer_branches.php:37
+#: sales/manage/recurrent_invoices.php:42
+msgid ""
+"There are no tax groups defined in the system. At least one tax group is "
+"required before proceeding."
+msgstr ""
+
+#: purchasing/manage/suppliers.php:47
+msgid "The supplier name must be entered."
+msgstr ""
+
+#: purchasing/manage/suppliers.php:54
+msgid "The supplier short name must be entered."
 msgstr ""
 
-#: purchasing/view/view_supp_payment.php:59
-msgid "Payment Currency"
+#: purchasing/manage/suppliers.php:80
+msgid "Supplier has been updated."
 msgstr ""
 
-#: purchasing/view/view_supp_payment.php:62 reporting/rep112.php:155
-#: reporting/rep210.php:164 sales/customer_delivery.php:421
-#: sales/customer_invoice.php:519 sales/customer_invoice.php:522
-#: sales/view/view_receipt.php:45 sales/view/view_sales_order.php:220
-msgid "Discount"
+#: purchasing/manage/suppliers.php:98
+msgid "A new supplier has been added."
 msgstr ""
 
-#: purchasing/view/view_supp_payment.php:69
-msgid "Supplier's Currency"
+#: purchasing/manage/suppliers.php:120
+msgid ""
+"Cannot delete this supplier because there are transactions that refer to "
+"this supplier."
 msgstr ""
 
-#: purchasing/manage/suppliers.php:27 sales/manage/customer_branches.php:37
-#: sales/manage/recurrent_invoices.php:42
+#: purchasing/manage/suppliers.php:128
 msgid ""
-"There are no tax groups defined in the system. At least one tax group is "
-"required before proceeding."
+"Cannot delete the supplier record because purchase orders have been created "
+"against this supplier."
+msgstr ""
+
+#: purchasing/manage/suppliers.php:139
+msgid "Supplier has been deleted."
 msgstr ""
 
-#: purchasing/manage/suppliers.php:90
+#: purchasing/manage/suppliers.php:200
 msgid "Basic Data"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:92
+#: purchasing/manage/suppliers.php:202
 msgid "Supplier Name:"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:93
+#: purchasing/manage/suppliers.php:203
 msgid "Supplier Short Name:"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:96
+#: purchasing/manage/suppliers.php:206
 msgid "Website:"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:108
+#: purchasing/manage/suppliers.php:218
 msgid "Our Customer No:"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:110
+#: purchasing/manage/suppliers.php:220
 msgid "Purchasing"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:111
+#: purchasing/manage/suppliers.php:221
 msgid "Bank Name/Account:"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:112 sales/manage/customers.php:269
+#: purchasing/manage/suppliers.php:222 sales/manage/customers.php:270
 msgid "Credit Limit:"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:113 sales/manage/customers.php:271
+#: purchasing/manage/suppliers.php:223 sales/manage/customers.php:272
 msgid "Payment Terms:"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:119 purchasing/manage/suppliers.php:122
+#: purchasing/manage/suppliers.php:229 purchasing/manage/suppliers.php:232
 msgid "Prices contain tax included:"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:127 reporting/rep704.php:95
+#: purchasing/manage/suppliers.php:237 reporting/rep704.php:95
 #: reporting/rep704.php:105 reporting/rep704.php:113
 msgid "Accounts"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:128
+#: purchasing/manage/suppliers.php:238
 msgid "Accounts Payable Account:"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:129
+#: purchasing/manage/suppliers.php:239
 msgid "Purchase Account:"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:130
+#: purchasing/manage/suppliers.php:240
 msgid "Use Item Inventory/COGS Account"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:133 purchasing/manage/suppliers.php:137
+#: purchasing/manage/suppliers.php:243 purchasing/manage/suppliers.php:247
 msgid "Contact Data"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:140
+#: purchasing/manage/suppliers.php:250
 msgid "System default"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:159 sales/manage/customer_branches.php:259
+#: purchasing/manage/suppliers.php:269 sales/manage/customer_branches.php:259
 msgid "Addresses"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:160 reporting/rep205.php:93
+#: purchasing/manage/suppliers.php:270 reporting/rep205.php:93
 #: sales/manage/customer_branches.php:260
 msgid "Mailing Address:"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:161
+#: purchasing/manage/suppliers.php:271
 msgid "Physical Address:"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:163
+#: purchasing/manage/suppliers.php:273
 msgid "General"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:164 reporting/rep205.php:170
-#: sales/manage/customer_branches.php:262 sales/manage/customers.php:292
+#: purchasing/manage/suppliers.php:274 reporting/rep103.php:258
+#: reporting/rep205.php:170 sales/manage/customer_branches.php:262
+#: sales/manage/customers.php:293
 msgid "General Notes:"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:166
+#: purchasing/manage/suppliers.php:276
 msgid "Supplier status:"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:172
+#: purchasing/manage/suppliers.php:283
 msgid "Update Supplier"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:173
+#: purchasing/manage/suppliers.php:284
 msgid "Update supplier data"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:174
+#: purchasing/manage/suppliers.php:285
 msgid "Select this supplier and return to document entry."
 msgstr ""
 
-#: purchasing/manage/suppliers.php:175
+#: purchasing/manage/suppliers.php:286
 msgid "Delete Supplier"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:176
+#: purchasing/manage/suppliers.php:287
 msgid "Delete supplier data if have been never used"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:180
+#: purchasing/manage/suppliers.php:291
 msgid "Add New Supplier Details"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:199
-msgid "The supplier name must be entered."
-msgstr ""
-
-#: purchasing/manage/suppliers.php:206
-msgid "The supplier short name must be entered."
-msgstr ""
-
-#: purchasing/manage/suppliers.php:226
-msgid "Supplier has been updated."
-msgstr ""
-
-#: purchasing/manage/suppliers.php:244
-msgid "A new supplier has been added."
-msgstr ""
-
-#: purchasing/manage/suppliers.php:262
-msgid ""
-"Cannot delete this supplier because there are transactions that refer to "
-"this supplier."
-msgstr ""
-
-#: purchasing/manage/suppliers.php:270
-msgid ""
-"Cannot delete the supplier record because purchase orders have been created "
-"against this supplier."
-msgstr ""
-
-#: purchasing/manage/suppliers.php:290
-#: purchasing/inquiry/po_search_completed.php:95
-#: purchasing/inquiry/po_search.php:76
-#: purchasing/inquiry/supplier_allocation_inquiry.php:48
-msgid "Select a supplier: "
-msgstr ""
-
-#: purchasing/manage/suppliers.php:291
+#: purchasing/manage/suppliers.php:303
 msgid "New supplier"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:310 sales/manage/customer_branches.php:311
-#: sales/manage/customers.php:351
+#: purchasing/manage/suppliers.php:322 sales/manage/customer_branches.php:311
+#: sales/manage/customers.php:353
 msgid "&Contacts"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:312
+#: purchasing/manage/suppliers.php:324
 msgid "Purchase &Orders"
 msgstr ""
 
+#: purchasing/manage/suppliers.php:325 sales/manage/customers.php:356
+msgid "Attachments"
+msgstr ""
+
 #: purchasing/inquiry/po_search_completed.php:25
 msgid "Search Purchase Orders"
 msgstr ""
 
-#: purchasing/inquiry/po_search_completed.php:85
+#: purchasing/inquiry/po_search_completed.php:46
+#: purchasing/inquiry/po_search.php:99
+msgid "Receive"
+msgstr ""
+
+#: purchasing/inquiry/po_search_completed.php:94
 msgid "into location:"
 msgstr ""
 
-#: purchasing/inquiry/po_search_completed.php:97
+#: purchasing/inquiry/po_search_completed.php:106
 msgid "Also closed:"
 msgstr ""
 
-#: purchasing/inquiry/po_search_completed.php:115
+#: purchasing/inquiry/po_search_completed.php:124
 #: purchasing/inquiry/po_search.php:122 reporting/includes/doctext.inc:187
-#: sales/inquiry/sales_orders_view.php:257
+#: sales/inquiry/sales_orders_view.php:262
 msgid "Order Date"
 msgstr ""
 
-#: purchasing/inquiry/po_search_completed.php:117
-#: purchasing/inquiry/po_search.php:124
-#: sales/inquiry/sales_orders_view.php:260
+#: purchasing/inquiry/po_search_completed.php:126
+#: purchasing/inquiry/po_search.php:124 sales/inquiry/sales_orders_view.php:265
 msgid "Order Total"
 msgstr ""
 
@@ -11310,10 +11555,6 @@ msgstr ""
 msgid "Search Outstanding Purchase Orders"
 msgstr ""
 
-#: purchasing/inquiry/po_search.php:99
-msgid "Receive"
-msgstr ""
-
 #: purchasing/inquiry/po_search.php:135
 msgid "Marked orders have overdue items."
 msgstr ""
@@ -11337,8 +11578,8 @@ msgid "Supp Reference"
 msgstr ""
 
 #: purchasing/inquiry/supplier_allocation_inquiry.php:146
-#: reporting/rep101.php:133 reporting/rep201.php:108
-#: reporting/includes/doctext.inc:246
+#: reporting/rep101.php:137 reporting/rep201.php:116
+#: reporting/includes/doctext.inc:248
 #: sales/inquiry/customer_allocation_inquiry.php:156
 msgid "Allocated"
 msgstr ""
@@ -11347,45 +11588,44 @@ msgstr ""
 msgid "Supplier Inquiry"
 msgstr ""
 
-#: purchasing/inquiry/supplier_inquiry.php:49
-msgid "Select a supplier:"
-msgstr ""
-
-#: purchasing/inquiry/supplier_inquiry.php:70 reporting/rep102.php:118
-#: reporting/rep108.php:152 reporting/rep202.php:124 reporting/rep202.php:158
-#: sales/inquiry/customer_inquiry.php:73
+#: purchasing/inquiry/supplier_inquiry.php:46 reporting/rep102.php:118
+#: reporting/rep108.php:160 reporting/rep202.php:124 reporting/rep202.php:158
+#: sales/inquiry/customer_inquiry.php:124
 msgid "Over"
 msgstr ""
 
-#: purchasing/inquiry/supplier_inquiry.php:74
-#: sales/inquiry/customer_inquiry.php:76
+#: purchasing/inquiry/supplier_inquiry.php:50
+#: sales/inquiry/customer_inquiry.php:127
 msgid "Terms"
 msgstr ""
 
-#: purchasing/inquiry/supplier_inquiry.php:74 reporting/rep102.php:121
-#: reporting/rep102.php:239 reporting/rep108.php:154 reporting/rep202.php:128
-#: reporting/rep202.php:247 reporting/rep451.php:70
-#: sales/inquiry/customer_inquiry.php:76
+#: purchasing/inquiry/supplier_inquiry.php:50 reporting/rep102.php:121
+#: reporting/rep102.php:239 reporting/rep108.php:162 reporting/rep202.php:128
+#: reporting/rep202.php:247 reporting/rep451.php:80
+#: sales/inquiry/customer_inquiry.php:127
 msgid "Current"
 msgstr ""
 
-#: purchasing/inquiry/supplier_inquiry.php:75 reporting/rep102.php:122
-#: reporting/rep108.php:154 reporting/rep202.php:129
-#: sales/inquiry/customer_inquiry.php:77
+#: purchasing/inquiry/supplier_inquiry.php:51 reporting/rep102.php:122
+#: reporting/rep108.php:162 reporting/rep202.php:129
+#: sales/inquiry/customer_inquiry.php:128
 msgid "Total Balance"
 msgstr ""
 
-#: purchasing/inquiry/supplier_inquiry.php:133
-#: sales/inquiry/customer_inquiry.php:163
+#: purchasing/inquiry/supplier_inquiry.php:94
+#: sales/inquiry/customer_inquiry.php:79
 msgid "Credit This"
 msgstr ""
 
-#: purchasing/inquiry/supplier_inquiry.php:155
+#: purchasing/inquiry/supplier_inquiry.php:109
 msgid "Print Remittance"
 msgstr ""
 
-#: purchasing/inquiry/suppliers_list.php:53
-#: sales/inquiry/customers_list.php:54
+#: purchasing/inquiry/supplier_inquiry.php:137
+msgid "Select a supplier:"
+msgstr ""
+
+#: purchasing/inquiry/suppliers_list.php:53 sales/inquiry/customers_list.php:54
 msgid "Tax ID"
 msgstr ""
 
@@ -11398,41 +11638,41 @@ msgid "Allocation of"
 msgstr ""
 
 #: purchasing/allocations/supplier_allocate.php:58
-#: sales/allocations/customer_allocate.php:55
+#: sales/allocations/customer_allocate.php:60
 msgid "Total:"
 msgstr ""
 
 #: purchasing/allocations/supplier_allocate.php:62
-#: sales/allocations/customer_allocate.php:59
+#: sales/allocations/customer_allocate.php:64
 msgid "Amount ot be settled:"
 msgstr ""
 
 #: purchasing/allocations/supplier_allocate.php:74
-#: sales/allocations/customer_allocate.php:72
+#: sales/allocations/customer_allocate.php:77
 msgid "Start again allocation of selected amount"
 msgstr ""
 
 #: purchasing/allocations/supplier_allocate.php:75
-#: sales/allocations/customer_allocate.php:73
+#: sales/allocations/customer_allocate.php:78
 msgid "Process allocations"
 msgstr ""
 
 #: purchasing/allocations/supplier_allocate.php:76
 #: purchasing/allocations/supplier_allocate.php:82
-#: sales/allocations/customer_allocate.php:74
-#: sales/allocations/customer_allocate.php:80
+#: sales/allocations/customer_allocate.php:79
+#: sales/allocations/customer_allocate.php:85
 msgid "Back to Allocations"
 msgstr ""
 
 #: purchasing/allocations/supplier_allocate.php:77
 #: purchasing/allocations/supplier_allocate.php:83
-#: sales/allocations/customer_allocate.php:74
-#: sales/allocations/customer_allocate.php:81
+#: sales/allocations/customer_allocate.php:79
+#: sales/allocations/customer_allocate.php:86
 msgid "Abandon allocations and return to selection of allocatable amounts"
 msgstr ""
 
 #: purchasing/allocations/supplier_allocate.php:81
-#: sales/allocations/customer_allocate.php:78
+#: sales/allocations/customer_allocate.php:83
 msgid "There are no unsettled transactions to allocate."
 msgstr ""
 
@@ -11455,56 +11695,64 @@ msgid "Allocate"
 msgstr ""
 
 #: purchasing/allocations/supplier_allocation_main.php:111
-#: sales/allocations/customer_allocation_main.php:104
+#: sales/allocations/customer_allocation_main.php:109
 msgid "Marked items are settled."
 msgstr ""
 
-#: reporting/rep101.php:122 reporting/rep102.php:104 reporting/rep114.php:108
-#: reporting/rep202.php:110 reporting/rep203.php:78
+#: reporting/rep101.php:126 reporting/rep102.php:104 reporting/rep114.php:108
+#: reporting/rep115.php:150 reporting/rep202.php:110 reporting/rep203.php:78
 msgid "Balances in Home Currency"
 msgstr ""
 
-#: reporting/rep101.php:132 reporting/rep201.php:107 reporting/rep203.php:88
+#: reporting/rep101.php:136 reporting/rep201.php:115 reporting/rep203.php:88
 #: reporting/rep709.php:116 reporting/includes/doctext.inc:166
-#: reporting/includes/doctext.inc:207 reporting/includes/doctext.inc:245
+#: reporting/includes/doctext.inc:209 reporting/includes/doctext.inc:247
 msgid "Trans Type"
 msgstr ""
 
-#: reporting/rep101.php:132 reporting/rep201.php:107
-#: reporting/includes/doctext.inc:245
+#: reporting/rep101.php:136 reporting/rep201.php:115
+#: reporting/includes/doctext.inc:247
 msgid "Charges"
 msgstr ""
 
-#: reporting/rep101.php:132 reporting/rep201.php:108
-#: reporting/includes/doctext.inc:246
+#: reporting/rep101.php:136 reporting/rep201.php:116
+#: reporting/includes/doctext.inc:248
 msgid "Credits"
 msgstr ""
 
-#: reporting/rep101.php:143 reporting/rep102.php:132 reporting/rep201.php:118
-#: reporting/rep202.php:139 reporting/rep203.php:97 reporting/rep303.php:135
+#: reporting/rep101.php:146 reporting/reports_main.php:39
+#: reporting/reports_main.php:168 reporting/reports_main.php:356
+msgid "Show Balance"
+msgstr ""
+
+#: reporting/rep101.php:148 reporting/rep102.php:132 reporting/rep115.php:171
+#: reporting/rep201.php:126 reporting/rep202.php:139 reporting/rep203.php:97
+#: reporting/rep206.php:124 reporting/rep303.php:238
 #: reporting/reports_main.php:41 reporting/reports_main.php:51
-#: reporting/reports_main.php:158 reporting/reports_main.php:168
-#: reporting/reports_main.php:177 reporting/reports_main.php:229
+#: reporting/reports_main.php:63 reporting/reports_main.php:170
+#: reporting/reports_main.php:180 reporting/reports_main.php:190
+#: reporting/reports_main.php:198 reporting/reports_main.php:250
 msgid "Suppress Zeros"
 msgstr ""
 
-#: reporting/rep101.php:145
+#: reporting/rep101.php:150
 msgid "Customer Balances"
 msgstr ""
 
-#: reporting/rep101.php:256 reporting/rep102.php:226 reporting/rep106.php:181
-#: reporting/rep201.php:232 reporting/rep202.php:233 reporting/rep203.php:176
-#: reporting/rep204.php:148 reporting/rep301.php:249 reporting/rep304.php:212
-#: reporting/rep305.php:193 reporting/rep306.php:293 reporting/rep309.php:157
-#: reporting/rep451.php:151
+#: reporting/rep101.php:267 reporting/rep102.php:226 reporting/rep105.php:177
+#: reporting/rep106.php:182 reporting/rep115.php:292 reporting/rep201.php:240
+#: reporting/rep202.php:233 reporting/rep203.php:176 reporting/rep204.php:148
+#: reporting/rep206.php:227 reporting/rep301.php:250 reporting/rep304.php:212
+#: reporting/rep305.php:193 reporting/rep306.php:292 reporting/rep309.php:157
+#: reporting/rep451.php:164
 msgid "Grand Total"
 msgstr ""
 
-#: reporting/rep102.php:98 reporting/rep106.php:99 reporting/rep202.php:104
+#: reporting/rep102.php:98 reporting/rep106.php:100 reporting/rep202.php:104
 #: reporting/rep709.php:100 reporting/reports_main.php:50
-#: reporting/reports_main.php:93 reporting/reports_main.php:167
-#: reporting/reports_main.php:213 reporting/reports_main.php:313
-#: reporting/reports_main.php:509
+#: reporting/reports_main.php:104 reporting/reports_main.php:179
+#: reporting/reports_main.php:234 reporting/reports_main.php:345
+#: reporting/reports_main.php:541
 msgid "Summary Only"
 msgstr ""
 
@@ -11513,30 +11761,31 @@ msgid "Detailed Report"
 msgstr ""
 
 #: reporting/rep102.php:127 reporting/rep202.php:134 reporting/rep203.php:94
-#: reporting/rep301.php:169 reporting/rep451.php:75
+#: reporting/rep301.php:170 reporting/rep451.php:85
 #: reporting/reports_main.php:37 reporting/reports_main.php:46
-#: reporting/reports_main.php:67 reporting/reports_main.php:83
-#: reporting/reports_main.php:92 reporting/reports_main.php:154
-#: reporting/reports_main.php:163 reporting/reports_main.php:174
-#: reporting/reports_main.php:210 reporting/reports_main.php:236
-#: reporting/reports_main.php:246 reporting/reports_main.php:252
-#: reporting/reports_main.php:262 reporting/reports_main.php:270
-#: reporting/reports_main.php:278 reporting/reports_main.php:310
-#: reporting/reports_main.php:333 reporting/reports_main.php:341
-#: reporting/reports_main.php:353 reporting/reports_main.php:363
-#: reporting/reports_main.php:381 reporting/reports_main.php:392
-#: reporting/reports_main.php:404 reporting/reports_main.php:417
-#: reporting/reports_main.php:433 reporting/reports_main.php:443
-#: reporting/reports_main.php:454 reporting/reports_main.php:466
-#: reporting/reports_main.php:480 reporting/reports_main.php:489
-#: reporting/reports_main.php:499 reporting/reports_main.php:508
-#: reporting/reports_main.php:515
+#: reporting/reports_main.php:58 reporting/reports_main.php:78
+#: reporting/reports_main.php:94 reporting/reports_main.php:103
+#: reporting/reports_main.php:166 reporting/reports_main.php:175
+#: reporting/reports_main.php:187 reporting/reports_main.php:195
+#: reporting/reports_main.php:231 reporting/reports_main.php:257
+#: reporting/reports_main.php:267 reporting/reports_main.php:273
+#: reporting/reports_main.php:283 reporting/reports_main.php:291
+#: reporting/reports_main.php:299 reporting/reports_main.php:306
+#: reporting/reports_main.php:342 reporting/reports_main.php:365
+#: reporting/reports_main.php:373 reporting/reports_main.php:385
+#: reporting/reports_main.php:395 reporting/reports_main.php:413
+#: reporting/reports_main.php:424 reporting/reports_main.php:436
+#: reporting/reports_main.php:449 reporting/reports_main.php:465
+#: reporting/reports_main.php:475 reporting/reports_main.php:486
+#: reporting/reports_main.php:498 reporting/reports_main.php:512
+#: reporting/reports_main.php:521 reporting/reports_main.php:531
+#: reporting/reports_main.php:540 reporting/reports_main.php:547
 msgid "End Date"
 msgstr ""
 
 #: reporting/rep102.php:131 reporting/rep202.php:138
-#: reporting/reports_main.php:49 reporting/reports_main.php:125
-#: reporting/reports_main.php:166
+#: reporting/reports_main.php:49 reporting/reports_main.php:136
+#: reporting/reports_main.php:178
 msgid "Show Also Allocated"
 msgstr ""
 
@@ -11544,7 +11793,7 @@ msgstr ""
 msgid "Aged Customer Analysis"
 msgstr ""
 
-#: reporting/rep103.php:131
+#: reporting/rep103.php:131 reporting/rep115.php:136
 msgid "All Areas"
 msgstr ""
 
@@ -11577,16 +11826,18 @@ msgid "Branch Delivery Address"
 msgstr ""
 
 #: reporting/rep103.php:158 reporting/rep205.php:99
-#: reporting/reports_main.php:57 reporting/reports_main.php:187
+#: reporting/reports_main.php:68 reporting/reports_main.php:208
 msgid "Activity Since"
 msgstr ""
 
-#: reporting/rep103.php:159 reporting/reports_main.php:58
+#: reporting/rep103.php:159 reporting/rep115.php:168
+#: reporting/reports_main.php:60 reporting/reports_main.php:69
 #: sales/manage/sales_areas.php:16
 msgid "Sales Areas"
 msgstr ""
 
-#: reporting/rep103.php:160 reporting/reports_main.php:59
+#: reporting/rep103.php:160 reporting/rep115.php:169
+#: reporting/reports_main.php:61 reporting/reports_main.php:70
 msgid "Sales Folk"
 msgstr ""
 
@@ -11610,10 +11861,6 @@ msgstr ""
 msgid "Ph"
 msgstr ""
 
-#: reporting/rep103.php:258
-msgid "Gereral Notes:"
-msgstr ""
-
 #: reporting/rep103.php:267 reporting/rep205.php:93 reporting/rep205.php:179
 msgid "Turnover"
 msgstr ""
@@ -11622,9 +11869,9 @@ msgstr ""
 msgid "Category/Items"
 msgstr ""
 
-#: reporting/rep104.php:109 reporting/rep301.php:164 reporting/rep303.php:120
-#: reporting/rep303.php:126 reporting/rep307.php:114 reporting/rep308.php:223
-#: reporting/rep451.php:70
+#: reporting/rep104.php:109 reporting/rep301.php:165 reporting/rep303.php:223
+#: reporting/rep303.php:229 reporting/rep307.php:114 reporting/rep308.php:224
+#: reporting/rep451.php:80
 msgid "UOM"
 msgstr ""
 
@@ -11632,7 +11879,7 @@ msgstr ""
 msgid "GP %"
 msgstr ""
 
-#: reporting/rep104.php:117 reporting/reports_main.php:77
+#: reporting/rep104.php:117 reporting/reports_main.php:88
 msgid "Show GP %"
 msgstr ""
 
@@ -11644,118 +11891,118 @@ msgstr ""
 msgid "Sales Kits"
 msgstr ""
 
-#: reporting/rep105.php:103
+#: reporting/rep105.php:104
 msgid "All Orders"
 msgstr ""
 
-#: reporting/rep105.php:105 reporting/reports_main.php:86
+#: reporting/rep105.php:106 reporting/reports_main.php:97
 msgid "Back Orders Only"
 msgstr ""
 
-#: reporting/rep105.php:109 reporting/rep204.php:84
+#: reporting/rep105.php:110 reporting/rep204.php:84
 #: sales/inquiry/customer_allocation_inquiry.php:149
-#: sales/inquiry/customer_inquiry.php:204
+#: sales/inquiry/customer_inquiry.php:202
 msgid "Order"
 msgstr ""
 
-#: reporting/rep105.php:109 reporting/rep106.php:89
+#: reporting/rep105.php:110 reporting/rep106.php:90
 msgid "Customer Ref"
 msgstr ""
 
-#: reporting/rep105.php:110
+#: reporting/rep105.php:111
 msgid "Ord Date"
 msgstr ""
 
-#: reporting/rep105.php:110
+#: reporting/rep105.php:111
 msgid "Del Date"
 msgstr ""
 
-#: reporting/rep105.php:110 reporting/rep401.php:71
+#: reporting/rep105.php:111 reporting/rep401.php:71
 msgid "Loc"
 msgstr ""
 
-#: reporting/rep105.php:114 sales/customer_delivery.php:420
+#: reporting/rep105.php:115 sales/customer_delivery.php:420
 #: sales/customer_invoice.php:521 sales/includes/ui/sales_order_ui.inc:147
 msgid "Delivered"
 msgstr ""
 
-#: reporting/rep105.php:121
+#: reporting/rep105.php:122
 msgid "Selection"
 msgstr ""
 
-#: reporting/rep105.php:125
+#: reporting/rep105.php:126
 msgid "Order Status Listing"
 msgstr ""
 
-#: reporting/rep106.php:90
+#: reporting/rep106.php:91
 msgid "Inv Date"
 msgstr ""
 
-#: reporting/rep106.php:90 reporting/rep106.php:94 reporting/rep106.php:95
+#: reporting/rep106.php:91 reporting/rep106.php:95 reporting/rep106.php:96
 #: sales/manage/sales_people.php:99 sales/manage/sales_people.php:159
 #: sales/manage/sales_people.php:161
 msgid "Provision"
 msgstr ""
 
-#: reporting/rep106.php:94
+#: reporting/rep106.php:95
 msgid "Salesman"
 msgstr ""
 
-#: reporting/rep106.php:95 sales/manage/sales_people.php:99
+#: reporting/rep106.php:96 sales/manage/sales_people.php:99
 msgid "Break Pt."
 msgstr ""
 
-#: reporting/rep106.php:103
+#: reporting/rep106.php:104
 msgid "Salesman Listing"
 msgstr ""
 
-#: reporting/rep107.php:88 reporting/rep107.php:114
+#: reporting/rep107.php:87 reporting/rep107.php:113
 #: reporting/includes/doctext.inc:117
 msgid "INVOICE"
 msgstr ""
 
-#: reporting/rep107.php:197
+#: reporting/rep107.php:196
 msgid "Prepayments invoiced to this order up to day:"
 msgstr ""
 
-#: reporting/rep107.php:204
+#: reporting/rep107.php:203
 msgid "Invoice reference"
 msgstr ""
 
-#: reporting/rep107.php:221
+#: reporting/rep107.php:220
 msgid "Total payments:"
 msgstr ""
 
-#: reporting/rep107.php:238 reporting/rep109.php:160 reporting/rep110.php:162
+#: reporting/rep107.php:237 reporting/rep109.php:160 reporting/rep110.php:162
 #: reporting/rep111.php:157 reporting/rep113.php:151
 #: sales/view/view_credit.php:140 sales/view/view_dispatch.php:155
-#: sales/view/view_invoice.php:160 sales/view/view_sales_order.php:246
+#: sales/view/view_invoice.php:160 sales/view/view_sales_order.php:248
 #: sales/includes/ui/sales_credit_ui.inc:217
 msgid "Shipping"
 msgstr ""
 
-#: reporting/rep107.php:285 reporting/rep109.php:212 reporting/rep111.php:209
+#: reporting/rep107.php:284 reporting/rep109.php:212 reporting/rep111.php:209
 msgid "TOTAL ORDER VAT INCL."
 msgstr ""
 
-#: reporting/rep107.php:291
+#: reporting/rep107.php:290
 msgid "THIS INVOICE"
 msgstr ""
 
-#: reporting/rep108.php:81 reporting/rep108.php:109
-#: reporting/includes/doctext.inc:237
+#: reporting/rep108.php:112 reporting/rep108.php:116
+#: reporting/includes/doctext.inc:239
 msgid "STATEMENT"
 msgstr ""
 
-#: reporting/rep108.php:126
+#: reporting/rep108.php:133
 msgid "Outstanding Transactions"
 msgstr ""
 
-#: reporting/rep108.php:169
+#: reporting/rep108.php:177
 msgid "Statement"
 msgstr ""
 
-#: reporting/rep108.php:169
+#: reporting/rep108.php:177
 msgid "as of"
 msgstr ""
 
@@ -11794,31 +12041,32 @@ msgstr ""
 msgid "SALES QUOTATION"
 msgstr ""
 
-#: reporting/rep112.php:85 reporting/includes/doctext.inc:197
+#: reporting/rep112.php:87 reporting/rep112.php:112
+#: reporting/includes/doctext.inc:197
 msgid "RECEIPT"
 msgstr ""
 
-#: reporting/rep112.php:119 reporting/rep210.php:127
+#: reporting/rep112.php:128 reporting/rep210.php:127
 msgid "As advance / full / part / payment towards:"
 msgstr ""
 
-#: reporting/rep112.php:160
+#: reporting/rep112.php:169
 msgid "TOTAL RECEIPT"
 msgstr ""
 
-#: reporting/rep112.php:171
+#: reporting/rep112.php:180
 msgid "Received / Sign"
 msgstr ""
 
-#: reporting/rep112.php:173
+#: reporting/rep112.php:182
 msgid "By Cash / Cheque* / Draft No."
 msgstr ""
 
-#: reporting/rep112.php:175
+#: reporting/rep112.php:184
 msgid "Dated"
 msgstr ""
 
-#: reporting/rep112.php:178
+#: reporting/rep112.php:187
 msgid "Drawn on Bank"
 msgstr ""
 
@@ -11835,7 +12083,7 @@ msgstr ""
 msgid "Sales Summary Report"
 msgstr ""
 
-#: reporting/rep114.php:91 reporting/reports_main.php:68
+#: reporting/rep114.php:91 reporting/reports_main.php:79
 msgid "Tax Id Only"
 msgstr ""
 
@@ -11847,15 +12095,23 @@ msgstr ""
 msgid "Total ex. Tax"
 msgstr ""
 
-#: reporting/rep114.php:95 reporting/rep709.php:117 taxes/tax_groups.php:171
+#: reporting/rep114.php:95 reporting/rep709.php:117 taxes/tax_groups.php:174
 msgid "Tax"
 msgstr ""
 
-#: reporting/rep201.php:97
+#: reporting/rep115.php:143
+msgid "All Sales Man"
+msgstr ""
+
+#: reporting/rep115.php:173 reporting/reports_main.php:56
+msgid "Customer Trial Balance"
+msgstr ""
+
+#: reporting/rep201.php:105 reporting/rep206.php:105
 msgid "Balances in Home currency"
 msgstr ""
 
-#: reporting/rep201.php:120
+#: reporting/rep201.php:128
 msgid "Supplier Balances"
 msgstr ""
 
@@ -11903,12 +12159,16 @@ msgstr ""
 msgid "Tax_Id"
 msgstr ""
 
+#: reporting/rep206.php:126
+msgid "Supplier Trial Balance"
+msgstr ""
+
 #: reporting/rep209.php:88 reporting/rep209.php:104
 #: reporting/includes/doctext.inc:170
 msgid "PURCHASE ORDER"
 msgstr ""
 
-#: reporting/rep209.php:213
+#: reporting/rep209.php:210
 msgid "TOTAL PO"
 msgstr ""
 
@@ -11921,7 +12181,7 @@ msgstr ""
 msgid "TOTAL REMITTANCE"
 msgstr ""
 
-#: reporting/rep301.php:173
+#: reporting/rep301.php:174
 msgid "Inventory Valuation Report"
 msgstr ""
 
@@ -11945,28 +12205,28 @@ msgstr ""
 msgid "Inventory Planning Report"
 msgstr ""
 
-#: reporting/rep303.php:108
+#: reporting/rep303.php:210
 msgid "Shortage"
 msgstr ""
 
-#: reporting/rep303.php:120 reporting/rep303.php:126 reporting/rep305.php:106
+#: reporting/rep303.php:223 reporting/rep303.php:229 reporting/rep305.php:106
 msgid "Stock ID"
 msgstr ""
 
-#: reporting/rep303.php:120
+#: reporting/rep303.php:223
 msgid "Check"
 msgstr ""
 
-#: reporting/rep303.php:134
+#: reporting/rep303.php:237
 msgid "Only Shortage"
 msgstr ""
 
-#: reporting/rep303.php:137
+#: reporting/rep303.php:261
 msgid "Stock Check Sheets"
 msgstr ""
 
 #: reporting/rep304.php:127 reporting/rep305.php:106 reporting/rep306.php:141
-#: reporting/rep309.php:99
+#: reporting/rep309.php:99 reporting/rep310.php:142
 msgid "Qty"
 msgstr ""
 
@@ -11974,7 +12234,7 @@ msgstr ""
 msgid "Contribution"
 msgstr ""
 
-#: reporting/rep304.php:138 reporting/reports_main.php:240
+#: reporting/rep304.php:138 reporting/reports_main.php:261
 msgid "Show Service Items"
 msgstr ""
 
@@ -12002,7 +12262,7 @@ msgstr ""
 msgid "GRN Valuation Report"
 msgstr ""
 
-#: reporting/rep306.php:141 reporting/rep309.php:99
+#: reporting/rep306.php:141 reporting/rep309.php:99 reporting/rep310.php:142
 msgid "Unit Price"
 msgstr ""
 
@@ -12018,31 +12278,39 @@ msgstr ""
 msgid "Inventory Movements"
 msgstr ""
 
-#: reporting/rep308.php:223
+#: reporting/rep308.php:224
 msgid "OpeningStock"
 msgstr ""
 
-#: reporting/rep308.php:223
+#: reporting/rep308.php:224
 msgid "StockIn"
 msgstr ""
 
-#: reporting/rep308.php:223
+#: reporting/rep308.php:224
 msgid "ClosingStock"
 msgstr ""
 
-#: reporting/rep308.php:224
+#: reporting/rep308.php:225
 msgid "QTY"
 msgstr ""
 
-#: reporting/rep308.php:224 reporting/rep709.php:117
+#: reporting/rep308.php:225 reporting/rep709.php:117
 #: taxes/item_tax_types.php:185
 msgid "Rate"
 msgstr ""
 
-#: reporting/rep308.php:233
+#: reporting/rep308.php:234
 msgid "Costed Inventory Movements"
 msgstr ""
 
+#: reporting/rep308.php:305
+msgid "Total Movement"
+msgstr ""
+
+#: reporting/rep308.php:311
+msgid "Total Out"
+msgstr ""
+
 #: reporting/rep309.php:99
 msgid "Item/Category"
 msgstr ""
@@ -12059,6 +12327,18 @@ msgstr ""
 msgid "Gift"
 msgstr ""
 
+#: reporting/rep310.php:154
+msgid "Note"
+msgstr ""
+
+#: reporting/rep310.php:154
+msgid "The lines separate the transactions."
+msgstr ""
+
+#: reporting/rep310.php:157
+msgid "Inventory Purchasing - Transaction Based"
+msgstr ""
+
 #: reporting/rep401.php:71
 msgid "Wrk Ctr"
 msgstr ""
@@ -12067,24 +12347,24 @@ msgstr ""
 msgid "Bill of Material Listing"
 msgstr ""
 
-#: reporting/rep402.php:110
+#: reporting/rep402.php:154
 msgid "Open Only"
 msgstr ""
 
-#: reporting/rep402.php:112
+#: reporting/rep402.php:158
 msgid "Work Order Listing"
 msgstr ""
 
 #: reporting/rep409.php:59 reporting/rep409.php:71
-#: reporting/includes/doctext.inc:213
+#: reporting/includes/doctext.inc:215
 msgid "WORK ORDER"
 msgstr ""
 
-#: reporting/rep451.php:70
+#: reporting/rep451.php:80
 msgid "Initial"
 msgstr ""
 
-#: reporting/rep451.php:79
+#: reporting/rep451.php:89
 msgid "Fixed Assets Valuation Report"
 msgstr ""
 
@@ -12096,16 +12376,20 @@ msgstr ""
 msgid "Dimension Summary"
 msgstr ""
 
-#: reporting/rep601.php:86 reporting/rep602.php:87
-#: reporting/includes/doctext.inc:259
+#: reporting/rep601.php:74
+msgid "Bank Statement"
+msgstr ""
+
+#: reporting/rep601.php:95 reporting/rep602.php:87
+#: reporting/includes/doctext.inc:261
 msgid "Bank Account"
 msgstr ""
 
-#: reporting/rep601.php:151 reporting/rep602.php:151
+#: reporting/rep601.php:159 reporting/rep602.php:151
 msgid "Total Debit / Credit"
 msgstr ""
 
-#: reporting/rep601.php:168 reporting/rep602.php:167
+#: reporting/rep601.php:176 reporting/rep602.php:167
 msgid "Net Change"
 msgstr ""
 
@@ -12146,8 +12430,8 @@ msgid "GL Account Transactions"
 msgstr ""
 
 #: reporting/rep705.php:244 reporting/rep705.php:257 reporting/rep705.php:268
-#: reporting/reports_main.php:372 reporting/reports_main.php:425
-#: reporting/reports_main.php:473
+#: reporting/reports_main.php:404 reporting/reports_main.php:457
+#: reporting/reports_main.php:505
 msgid "Year"
 msgstr ""
 
@@ -12169,7 +12453,7 @@ msgstr ""
 msgid "Close Balance"
 msgstr ""
 
-#: reporting/rep707.php:258
+#: reporting/rep707.php:260
 msgid "Profit and Loss Statement"
 msgstr ""
 
@@ -12209,7 +12493,7 @@ msgstr ""
 msgid "Action"
 msgstr ""
 
-#: reporting/rep710.php:89 reporting/reports_main.php:513
+#: reporting/rep710.php:89 reporting/reports_main.php:545
 msgid "Audit Trail"
 msgstr ""
 
@@ -12225,75 +12509,74 @@ msgstr ""
 msgid "Customer &Balances"
 msgstr ""
 
-#: reporting/reports_main.php:39 reporting/reports_main.php:156
-#: reporting/reports_main.php:324
-msgid "Show Balance"
-msgstr ""
-
 #: reporting/reports_main.php:40 reporting/reports_main.php:48
-#: reporting/reports_main.php:73 reporting/reports_main.php:100
-#: reporting/reports_main.php:110 reporting/reports_main.php:124
-#: reporting/reports_main.php:132 reporting/reports_main.php:140
-#: reporting/reports_main.php:147 reporting/reports_main.php:157
-#: reporting/reports_main.php:165 reporting/reports_main.php:176
-#: reporting/reports_main.php:196 reporting/reports_main.php:203
+#: reporting/reports_main.php:62 reporting/reports_main.php:84
+#: reporting/reports_main.php:111 reporting/reports_main.php:121
+#: reporting/reports_main.php:135 reporting/reports_main.php:143
+#: reporting/reports_main.php:151 reporting/reports_main.php:158
+#: reporting/reports_main.php:169 reporting/reports_main.php:177
+#: reporting/reports_main.php:189 reporting/reports_main.php:197
+#: reporting/reports_main.php:217 reporting/reports_main.php:224
 msgid "Currency Filter"
 msgstr ""
 
 #: reporting/reports_main.php:43 reporting/reports_main.php:54
-#: reporting/reports_main.php:63 reporting/reports_main.php:70
-#: reporting/reports_main.php:79 reporting/reports_main.php:88
-#: reporting/reports_main.php:95 reporting/reports_main.php:105
-#: reporting/reports_main.php:114 reporting/reports_main.php:121
-#: reporting/reports_main.php:128 reporting/reports_main.php:136
-#: reporting/reports_main.php:143 reporting/reports_main.php:149
-#: reporting/reports_main.php:160 reporting/reports_main.php:171
-#: reporting/reports_main.php:179 reporting/reports_main.php:184
-#: reporting/reports_main.php:191 reporting/reports_main.php:199
-#: reporting/reports_main.php:206 reporting/reports_main.php:215
-#: reporting/reports_main.php:221 reporting/reports_main.php:232
-#: reporting/reports_main.php:242 reporting/reports_main.php:248
-#: reporting/reports_main.php:258 reporting/reports_main.php:266
-#: reporting/reports_main.php:274 reporting/reports_main.php:281
-#: reporting/reports_main.php:290 reporting/reports_main.php:297
-#: reporting/reports_main.php:304 reporting/reports_main.php:315
-#: reporting/reports_main.php:326 reporting/reports_main.php:336
-#: reporting/reports_main.php:349 reporting/reports_main.php:356
-#: reporting/reports_main.php:369 reporting/reports_main.php:377
-#: reporting/reports_main.php:388 reporting/reports_main.php:400
-#: reporting/reports_main.php:410 reporting/reports_main.php:422
-#: reporting/reports_main.php:429 reporting/reports_main.php:439
-#: reporting/reports_main.php:450 reporting/reports_main.php:459
-#: reporting/reports_main.php:470 reporting/reports_main.php:476
-#: reporting/reports_main.php:485 reporting/reports_main.php:495
-#: reporting/reports_main.php:503 reporting/reports_main.php:511
-#: reporting/reports_main.php:519
+#: reporting/reports_main.php:65 reporting/reports_main.php:74
+#: reporting/reports_main.php:81 reporting/reports_main.php:90
+#: reporting/reports_main.php:99 reporting/reports_main.php:106
+#: reporting/reports_main.php:116 reporting/reports_main.php:125
+#: reporting/reports_main.php:132 reporting/reports_main.php:139
+#: reporting/reports_main.php:147 reporting/reports_main.php:154
+#: reporting/reports_main.php:161 reporting/reports_main.php:172
+#: reporting/reports_main.php:183 reporting/reports_main.php:192
+#: reporting/reports_main.php:200 reporting/reports_main.php:205
+#: reporting/reports_main.php:212 reporting/reports_main.php:220
+#: reporting/reports_main.php:227 reporting/reports_main.php:236
+#: reporting/reports_main.php:242 reporting/reports_main.php:253
+#: reporting/reports_main.php:263 reporting/reports_main.php:269
+#: reporting/reports_main.php:279 reporting/reports_main.php:287
+#: reporting/reports_main.php:295 reporting/reports_main.php:302
+#: reporting/reports_main.php:312 reporting/reports_main.php:321
+#: reporting/reports_main.php:329 reporting/reports_main.php:336
+#: reporting/reports_main.php:347 reporting/reports_main.php:358
+#: reporting/reports_main.php:368 reporting/reports_main.php:381
+#: reporting/reports_main.php:388 reporting/reports_main.php:401
+#: reporting/reports_main.php:409 reporting/reports_main.php:420
+#: reporting/reports_main.php:432 reporting/reports_main.php:442
+#: reporting/reports_main.php:454 reporting/reports_main.php:461
+#: reporting/reports_main.php:471 reporting/reports_main.php:482
+#: reporting/reports_main.php:491 reporting/reports_main.php:502
+#: reporting/reports_main.php:508 reporting/reports_main.php:517
+#: reporting/reports_main.php:527 reporting/reports_main.php:535
+#: reporting/reports_main.php:543 reporting/reports_main.php:551
 msgid "Orientation"
 msgstr ""
 
 #: reporting/reports_main.php:44 reporting/reports_main.php:55
-#: reporting/reports_main.php:64 reporting/reports_main.php:71
-#: reporting/reports_main.php:80 reporting/reports_main.php:89
-#: reporting/reports_main.php:96 reporting/reports_main.php:161
-#: reporting/reports_main.php:172 reporting/reports_main.php:180
-#: reporting/reports_main.php:185 reporting/reports_main.php:192
-#: reporting/reports_main.php:216 reporting/reports_main.php:222
-#: reporting/reports_main.php:233 reporting/reports_main.php:243
-#: reporting/reports_main.php:249 reporting/reports_main.php:259
-#: reporting/reports_main.php:267 reporting/reports_main.php:275
-#: reporting/reports_main.php:282 reporting/reports_main.php:291
-#: reporting/reports_main.php:298 reporting/reports_main.php:316
-#: reporting/reports_main.php:327 reporting/reports_main.php:337
-#: reporting/reports_main.php:343 reporting/reports_main.php:350
-#: reporting/reports_main.php:357 reporting/reports_main.php:370
-#: reporting/reports_main.php:378 reporting/reports_main.php:389
-#: reporting/reports_main.php:401 reporting/reports_main.php:411
-#: reporting/reports_main.php:423 reporting/reports_main.php:430
-#: reporting/reports_main.php:440 reporting/reports_main.php:451
-#: reporting/reports_main.php:460 reporting/reports_main.php:471
-#: reporting/reports_main.php:477 reporting/reports_main.php:486
-#: reporting/reports_main.php:496 reporting/reports_main.php:504
-#: reporting/reports_main.php:512 reporting/reports_main.php:520
+#: reporting/reports_main.php:66 reporting/reports_main.php:75
+#: reporting/reports_main.php:82 reporting/reports_main.php:91
+#: reporting/reports_main.php:100 reporting/reports_main.php:107
+#: reporting/reports_main.php:173 reporting/reports_main.php:184
+#: reporting/reports_main.php:193 reporting/reports_main.php:201
+#: reporting/reports_main.php:206 reporting/reports_main.php:213
+#: reporting/reports_main.php:237 reporting/reports_main.php:243
+#: reporting/reports_main.php:254 reporting/reports_main.php:264
+#: reporting/reports_main.php:270 reporting/reports_main.php:280
+#: reporting/reports_main.php:288 reporting/reports_main.php:296
+#: reporting/reports_main.php:303 reporting/reports_main.php:313
+#: reporting/reports_main.php:322 reporting/reports_main.php:330
+#: reporting/reports_main.php:348 reporting/reports_main.php:359
+#: reporting/reports_main.php:369 reporting/reports_main.php:375
+#: reporting/reports_main.php:382 reporting/reports_main.php:389
+#: reporting/reports_main.php:402 reporting/reports_main.php:410
+#: reporting/reports_main.php:421 reporting/reports_main.php:433
+#: reporting/reports_main.php:443 reporting/reports_main.php:455
+#: reporting/reports_main.php:462 reporting/reports_main.php:472
+#: reporting/reports_main.php:483 reporting/reports_main.php:492
+#: reporting/reports_main.php:503 reporting/reports_main.php:509
+#: reporting/reports_main.php:518 reporting/reports_main.php:528
+#: reporting/reports_main.php:536 reporting/reports_main.php:544
+#: reporting/reports_main.php:552
 msgid "Destination"
 msgstr ""
 
@@ -12301,313 +12584,323 @@ msgstr ""
 msgid "&Aged Customer Analysis"
 msgstr ""
 
-#: reporting/reports_main.php:52 reporting/reports_main.php:169
-#: reporting/reports_main.php:386 reporting/reports_main.php:398
-#: reporting/reports_main.php:437 reporting/reports_main.php:448
-#: reporting/reports_main.php:483 reporting/reports_main.php:493
+#: reporting/reports_main.php:52 reporting/reports_main.php:181
+#: reporting/reports_main.php:418 reporting/reports_main.php:430
+#: reporting/reports_main.php:469 reporting/reports_main.php:480
+#: reporting/reports_main.php:515 reporting/reports_main.php:525
 msgid "Graphics"
 msgstr ""
 
-#: reporting/reports_main.php:56
+#: reporting/reports_main.php:67
 msgid "Customer &Detail Listing"
 msgstr ""
 
-#: reporting/reports_main.php:60 reporting/reports_main.php:188
+#: reporting/reports_main.php:71 reporting/reports_main.php:209
 msgid "Activity Greater Than"
 msgstr ""
 
-#: reporting/reports_main.php:61 reporting/reports_main.php:189
+#: reporting/reports_main.php:72 reporting/reports_main.php:210
 msgid "Activity Less Than"
 msgstr ""
 
-#: reporting/reports_main.php:65
+#: reporting/reports_main.php:76
 msgid "Sales &Summary Report"
 msgstr ""
 
-#: reporting/reports_main.php:72
+#: reporting/reports_main.php:83
 msgid "&Price Listing"
 msgstr ""
 
-#: reporting/reports_main.php:74 reporting/reports_main.php:84
-#: reporting/reports_main.php:211 reporting/reports_main.php:218
-#: reporting/reports_main.php:224 reporting/reports_main.php:237
-#: reporting/reports_main.php:253 reporting/reports_main.php:263
-#: reporting/reports_main.php:271 reporting/reports_main.php:279
+#: reporting/reports_main.php:85 reporting/reports_main.php:95
+#: reporting/reports_main.php:232 reporting/reports_main.php:239
+#: reporting/reports_main.php:245 reporting/reports_main.php:258
+#: reporting/reports_main.php:274 reporting/reports_main.php:284
+#: reporting/reports_main.php:292 reporting/reports_main.php:300
+#: reporting/reports_main.php:307
 msgid "Inventory Category"
 msgstr ""
 
-#: reporting/reports_main.php:75 sales/manage/sales_types.php:16
+#: reporting/reports_main.php:86 sales/manage/sales_types.php:16
 msgid "Sales Types"
 msgstr ""
 
-#: reporting/reports_main.php:76 reporting/reports_main.php:226
+#: reporting/reports_main.php:87 reporting/reports_main.php:247
 msgid "Show Pictures"
 msgstr ""
 
-#: reporting/reports_main.php:81
+#: reporting/reports_main.php:92
 msgid "&Order Status Listing"
 msgstr ""
 
-#: reporting/reports_main.php:85
+#: reporting/reports_main.php:96
 msgid "Stock Location"
 msgstr ""
 
-#: reporting/reports_main.php:90
+#: reporting/reports_main.php:101
 msgid "&Salesman Listing"
 msgstr ""
 
-#: reporting/reports_main.php:97
+#: reporting/reports_main.php:108
 msgid "Print &Invoices"
 msgstr ""
 
-#: reporting/reports_main.php:101 reporting/reports_main.php:111
-#: reporting/reports_main.php:118
+#: reporting/reports_main.php:112 reporting/reports_main.php:122
+#: reporting/reports_main.php:129
 msgid "email Customers"
 msgstr ""
 
-#: reporting/reports_main.php:102 reporting/reports_main.php:112
+#: reporting/reports_main.php:113 reporting/reports_main.php:123
 msgid "Payment Link"
 msgstr ""
 
-#: reporting/reports_main.php:107
+#: reporting/reports_main.php:118
 msgid "Print &Credit Notes"
 msgstr ""
 
-#: reporting/reports_main.php:115
+#: reporting/reports_main.php:126
 msgid "Print &Deliveries"
 msgstr ""
 
-#: reporting/reports_main.php:119
+#: reporting/reports_main.php:130
 msgid "Print as Packing Slip"
 msgstr ""
 
-#: reporting/reports_main.php:122
+#: reporting/reports_main.php:133
 msgid "Print &Statements"
 msgstr ""
 
-#: reporting/reports_main.php:126 reporting/reports_main.php:133
-#: reporting/reports_main.php:141
+#: reporting/reports_main.php:137 reporting/reports_main.php:144
+#: reporting/reports_main.php:152 reporting/reports_main.php:159
 msgid "Email Customers"
 msgstr ""
 
-#: reporting/reports_main.php:129
+#: reporting/reports_main.php:140
 msgid "&Print Sales Orders"
 msgstr ""
 
-#: reporting/reports_main.php:134
+#: reporting/reports_main.php:145
 msgid "Print as Quote"
 msgstr ""
 
-#: reporting/reports_main.php:137
+#: reporting/reports_main.php:148
 msgid "&Print Sales Quotations"
 msgstr ""
 
-#: reporting/reports_main.php:144
+#: reporting/reports_main.php:155
 msgid "Print Receipts"
 msgstr ""
 
-#: reporting/reports_main.php:152
+#: reporting/reports_main.php:164
 msgid "Supplier &Balances"
 msgstr ""
 
-#: reporting/reports_main.php:162
+#: reporting/reports_main.php:174
 msgid "&Aged Supplier Analyses"
 msgstr ""
 
-#: reporting/reports_main.php:173
+#: reporting/reports_main.php:185
+msgid "Supplier &Trial Balances"
+msgstr ""
+
+#: reporting/reports_main.php:194
 msgid "&Payment Report"
 msgstr ""
 
-#: reporting/reports_main.php:181
+#: reporting/reports_main.php:202
 msgid "Outstanding &GRNs Report"
 msgstr ""
 
-#: reporting/reports_main.php:186
+#: reporting/reports_main.php:207
 msgid "Supplier &Detail Listing"
 msgstr ""
 
-#: reporting/reports_main.php:193
+#: reporting/reports_main.php:214
 msgid "Print Purchase &Orders"
 msgstr ""
 
-#: reporting/reports_main.php:197 reporting/reports_main.php:204
+#: reporting/reports_main.php:218 reporting/reports_main.php:225
 msgid "Email Suppliers"
 msgstr ""
 
-#: reporting/reports_main.php:200
+#: reporting/reports_main.php:221
 msgid "Print Remi&ttances"
 msgstr ""
 
-#: reporting/reports_main.php:209
+#: reporting/reports_main.php:230
 msgid "Inventory &Valuation Report"
 msgstr ""
 
-#: reporting/reports_main.php:217
+#: reporting/reports_main.php:238
 msgid "Inventory &Planning Report"
 msgstr ""
 
-#: reporting/reports_main.php:223
+#: reporting/reports_main.php:244
 msgid "Stock &Check Sheets"
 msgstr ""
 
-#: reporting/reports_main.php:227
+#: reporting/reports_main.php:248
 msgid "Inventory Column"
 msgstr ""
 
-#: reporting/reports_main.php:228
+#: reporting/reports_main.php:249
 msgid "Show Shortage"
 msgstr ""
 
-#: reporting/reports_main.php:230
+#: reporting/reports_main.php:251
 msgid "Item Like"
 msgstr ""
 
-#: reporting/reports_main.php:234
+#: reporting/reports_main.php:255
 msgid "Inventory &Sales Report"
 msgstr ""
 
-#: reporting/reports_main.php:244
+#: reporting/reports_main.php:265
 msgid "&GRN Valuation Report"
 msgstr ""
 
-#: reporting/reports_main.php:250
+#: reporting/reports_main.php:271
 msgid "Inventory P&urchasing Report"
 msgstr ""
 
-#: reporting/reports_main.php:260
+#: reporting/reports_main.php:281
 msgid "Inventory &Movement Report"
 msgstr ""
 
-#: reporting/reports_main.php:268
+#: reporting/reports_main.php:289
 msgid "C&osted Inventory Movement Report"
 msgstr ""
 
-#: reporting/reports_main.php:276
+#: reporting/reports_main.php:297
 msgid "Item &Sales Summary Report"
 msgstr ""
 
-#: reporting/reports_main.php:286
+#: reporting/reports_main.php:304
+msgid "Inventory Purchasing - &Transaction Based"
+msgstr ""
+
+#: reporting/reports_main.php:317
 msgid "&Bill of Material Listing"
 msgstr ""
 
-#: reporting/reports_main.php:287
+#: reporting/reports_main.php:318
 msgid "From product"
 msgstr ""
 
-#: reporting/reports_main.php:288
+#: reporting/reports_main.php:319
 msgid "To product"
 msgstr ""
 
-#: reporting/reports_main.php:292
+#: reporting/reports_main.php:323
 msgid "Work Order &Listing"
 msgstr ""
 
-#: reporting/reports_main.php:295
+#: reporting/reports_main.php:326
 msgid "Outstanding Only"
 msgstr ""
 
-#: reporting/reports_main.php:299
+#: reporting/reports_main.php:331
 msgid "Print &Work Orders"
 msgstr ""
 
-#: reporting/reports_main.php:302
+#: reporting/reports_main.php:334
 msgid "Email Locations"
 msgstr ""
 
-#: reporting/reports_main.php:309
+#: reporting/reports_main.php:341
 msgid "&Fixed Assets Valuation"
 msgstr ""
 
-#: reporting/reports_main.php:311
+#: reporting/reports_main.php:343
 msgid "Fixed Assets Class"
 msgstr ""
 
-#: reporting/reports_main.php:312
+#: reporting/reports_main.php:344
 msgid "Fixed Assets Location"
 msgstr ""
 
-#: reporting/reports_main.php:321
+#: reporting/reports_main.php:353
 msgid "Dimension &Summary"
 msgstr ""
 
-#: reporting/reports_main.php:322
+#: reporting/reports_main.php:354
 msgid "From Dimension"
 msgstr ""
 
-#: reporting/reports_main.php:323
+#: reporting/reports_main.php:355
 msgid "To Dimension"
 msgstr ""
 
-#: reporting/reports_main.php:329
+#: reporting/reports_main.php:361
 msgid "Banking"
 msgstr ""
 
-#: reporting/reports_main.php:330
+#: reporting/reports_main.php:362
 msgid "Bank &Statement"
 msgstr ""
 
-#: reporting/reports_main.php:334 reporting/reports_main.php:405
-#: reporting/reports_main.php:455 reporting/reports_main.php:500
+#: reporting/reports_main.php:366 reporting/reports_main.php:437
+#: reporting/reports_main.php:487 reporting/reports_main.php:532
+#: sales/inquiry/customer_inquiry.php:169
 msgid "Zero values"
 msgstr ""
 
-#: reporting/reports_main.php:338
+#: reporting/reports_main.php:370
 msgid "Bank Statement w/ &Reconcile"
 msgstr ""
 
-#: reporting/reports_main.php:345
+#: reporting/reports_main.php:377
 msgid "General Ledger"
 msgstr ""
 
-#: reporting/reports_main.php:346
+#: reporting/reports_main.php:378
 msgid "Chart of &Accounts"
 msgstr ""
 
-#: reporting/reports_main.php:347
+#: reporting/reports_main.php:379
 msgid "Show Balances"
 msgstr ""
 
-#: reporting/reports_main.php:351
+#: reporting/reports_main.php:383
 msgid "List of &Journal Entries"
 msgstr ""
 
-#: reporting/reports_main.php:361 reporting/reports_main.php:415
-#: reporting/reports_main.php:464
+#: reporting/reports_main.php:393 reporting/reports_main.php:447
+#: reporting/reports_main.php:496
 msgid "GL Account &Transactions"
 msgstr ""
 
-#: reporting/reports_main.php:364 reporting/reports_main.php:418
-#: reporting/reports_main.php:467
+#: reporting/reports_main.php:396 reporting/reports_main.php:450
+#: reporting/reports_main.php:499
 msgid "From Account"
 msgstr ""
 
-#: reporting/reports_main.php:365 reporting/reports_main.php:419
-#: reporting/reports_main.php:468
+#: reporting/reports_main.php:397 reporting/reports_main.php:451
+#: reporting/reports_main.php:500
 msgid "To Account"
 msgstr ""
 
-#: reporting/reports_main.php:371 reporting/reports_main.php:424
-#: reporting/reports_main.php:472
+#: reporting/reports_main.php:403 reporting/reports_main.php:456
+#: reporting/reports_main.php:504
 msgid "Annual &Expense Breakdown"
 msgstr ""
 
-#: reporting/reports_main.php:379 reporting/reports_main.php:431
-#: reporting/reports_main.php:478
+#: reporting/reports_main.php:411 reporting/reports_main.php:463
+#: reporting/reports_main.php:510
 msgid "&Balance Sheet"
 msgstr ""
 
-#: reporting/reports_main.php:385 reporting/reports_main.php:397
-#: reporting/reports_main.php:436 reporting/reports_main.php:447
-#: reporting/reports_main.php:482 reporting/reports_main.php:492
+#: reporting/reports_main.php:417 reporting/reports_main.php:429
+#: reporting/reports_main.php:468 reporting/reports_main.php:479
+#: reporting/reports_main.php:514 reporting/reports_main.php:524
 msgid "Decimal values"
 msgstr ""
 
-#: reporting/reports_main.php:390 reporting/reports_main.php:441
-#: reporting/reports_main.php:487
+#: reporting/reports_main.php:422 reporting/reports_main.php:473
+#: reporting/reports_main.php:519
 msgid "&Profit and Loss Statement"
 msgstr ""
 
-#: reporting/reports_main.php:506
+#: reporting/reports_main.php:538
 msgid "Ta&x Report"
 msgstr ""
 
@@ -12638,23 +12931,23 @@ msgstr ""
 #: reporting/includes/doctext.inc:55 reporting/includes/doctext.inc:72
 #: reporting/includes/doctext.inc:93 reporting/includes/doctext.inc:107
 #: reporting/includes/doctext.inc:130 reporting/includes/doctext.inc:160
-#: reporting/includes/doctext.inc:183 reporting/includes/doctext.inc:201
-#: reporting/includes/doctext.inc:239
+#: reporting/includes/doctext.inc:183 reporting/includes/doctext.inc:203
+#: reporting/includes/doctext.inc:241
 msgid "Customer's Reference"
 msgstr ""
 
 #: reporting/includes/doctext.inc:56 reporting/includes/doctext.inc:73
 #: reporting/includes/doctext.inc:94 reporting/includes/doctext.inc:108
 #: reporting/includes/doctext.inc:131 reporting/includes/doctext.inc:184
-#: reporting/includes/doctext.inc:240 sales/manage/customer_branches.php:286
+#: reporting/includes/doctext.inc:242 sales/manage/customer_branches.php:286
 msgid "Sales Person"
 msgstr ""
 
 #: reporting/includes/doctext.inc:57 reporting/includes/doctext.inc:74
 #: reporting/includes/doctext.inc:95 reporting/includes/doctext.inc:109
 #: reporting/includes/doctext.inc:132 reporting/includes/doctext.inc:162
-#: reporting/includes/doctext.inc:185 reporting/includes/doctext.inc:203
-#: reporting/includes/doctext.inc:241
+#: reporting/includes/doctext.inc:185 reporting/includes/doctext.inc:205
+#: reporting/includes/doctext.inc:243
 msgid "Your VAT no."
 msgstr ""
 
@@ -12663,8 +12956,8 @@ msgid "Our Quotation No"
 msgstr ""
 
 #: reporting/includes/doctext.inc:59 sales/view/view_sales_order.php:69
-#: sales/inquiry/sales_orders_view.php:272
-#: sales/includes/ui/sales_order_ui.inc:598
+#: sales/inquiry/sales_orders_view.php:277
+#: sales/includes/ui/sales_order_ui.inc:602
 msgid "Valid until"
 msgstr ""
 
@@ -12678,7 +12971,7 @@ msgstr ""
 
 #: reporting/includes/doctext.inc:75 reporting/includes/doctext.inc:96
 #: reporting/includes/doctext.inc:110 reporting/includes/doctext.inc:137
-#: reporting/includes/doctext.inc:204 reporting/includes/doctext.inc:242
+#: reporting/includes/doctext.inc:206 reporting/includes/doctext.inc:244
 #: sales/view/view_dispatch.php:87 sales/view/view_invoice.php:87
 msgid "Our Order No"
 msgstr ""
@@ -12747,19 +13040,19 @@ msgstr ""
 msgid "With thanks from"
 msgstr ""
 
-#: reporting/includes/doctext.inc:214
+#: reporting/includes/doctext.inc:216
 msgid "Work Order No."
 msgstr ""
 
-#: reporting/includes/doctext.inc:245
+#: reporting/includes/doctext.inc:247
 msgid "DueDate"
 msgstr ""
 
-#: reporting/includes/doctext.inc:271 reporting/includes/pdf_report.inc:1006
+#: reporting/includes/doctext.inc:273 reporting/includes/pdf_report.inc:1022
 msgid "You can pay through"
 msgstr ""
 
-#: reporting/includes/doctext.inc:275
+#: reporting/includes/doctext.inc:277
 msgid "* Subject to Realisation of the Cheque."
 msgstr ""
 
@@ -12769,12 +13062,12 @@ msgid ""
 msgstr ""
 
 #: reporting/includes/excel_report.inc:259
-#: reporting/includes/pdf_report.inc:317
+#: reporting/includes/pdf_report.inc:330
 msgid "Print Out Date"
 msgstr ""
 
 #: reporting/includes/excel_report.inc:265
-#: reporting/includes/pdf_report.inc:326
+#: reporting/includes/pdf_report.inc:339
 msgid "Fiscal Year"
 msgstr ""
 
@@ -12783,12 +13076,12 @@ msgid "Report Date"
 msgstr ""
 
 #: reporting/includes/excel_report.inc:410
-#: reporting/includes/pdf_report.inc:590
+#: reporting/includes/pdf_report.inc:603
 msgid "Generated At"
 msgstr ""
 
 #: reporting/includes/excel_report.inc:416
-#: reporting/includes/pdf_report.inc:599
+#: reporting/includes/pdf_report.inc:612
 msgid "Generated By"
 msgstr ""
 
@@ -12800,47 +13093,46 @@ msgstr ""
 msgid "Domicile"
 msgstr ""
 
-#: reporting/includes/header2.inc:146 reporting/includes/pdf_report.inc:353
-#: reporting/includes/pdf_report.inc:491 reporting/includes/pdf_report.inc:618
+#: reporting/includes/header2.inc:146 reporting/includes/pdf_report.inc:366
+#: reporting/includes/pdf_report.inc:504 reporting/includes/pdf_report.inc:631
 msgid "Page"
 msgstr ""
 
-#: reporting/includes/pdf_report.inc:573
+#: reporting/includes/pdf_report.inc:586
 msgid "Report Period"
 msgstr ""
 
-#: reporting/includes/pdf_report.inc:973
-#: reporting/includes/pdf_report.inc:1021
+#: reporting/includes/pdf_report.inc:989 reporting/includes/pdf_report.inc:1037
 #, php-format
 msgid "You have no email contact defined for this type of document for '%s'."
 msgstr ""
 
-#: reporting/includes/pdf_report.inc:992
+#: reporting/includes/pdf_report.inc:1008
 msgid "Dear"
 msgstr ""
 
-#: reporting/includes/pdf_report.inc:993
+#: reporting/includes/pdf_report.inc:1009
 msgid "Attached you will find "
 msgstr ""
 
-#: reporting/includes/pdf_report.inc:1009
+#: reporting/includes/pdf_report.inc:1025
 msgid "Kindest regards"
 msgstr ""
 
-#: reporting/includes/pdf_report.inc:1024
+#: reporting/includes/pdf_report.inc:1040
 msgid "Sending document by email failed"
 msgstr ""
 
-#: reporting/includes/pdf_report.inc:1024
-#: reporting/includes/pdf_report.inc:1027
+#: reporting/includes/pdf_report.inc:1040
+#: reporting/includes/pdf_report.inc:1043
 msgid "Email:"
 msgstr ""
 
-#: reporting/includes/pdf_report.inc:1027
+#: reporting/includes/pdf_report.inc:1043
 msgid "has been sent by email to destination."
 msgstr ""
 
-#: reporting/includes/pdf_report.inc:1056
+#: reporting/includes/pdf_report.inc:1072
 msgid "Report has been sent to network printer "
 msgstr ""
 
@@ -12929,39 +13221,43 @@ msgstr ""
 msgid "No Account Group Filter"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:286
-#: reporting/includes/reports_classes.inc:292
-#: reporting/includes/reports_classes.inc:298
+#: reporting/includes/reports_classes.inc:290
+#: reporting/includes/reports_classes.inc:296
+#: reporting/includes/reports_classes.inc:302
 msgid "No Dimension Filter"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:304
+#: reporting/includes/reports_classes.inc:307
 msgid "No Customer Filter"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:312
+#: reporting/includes/reports_classes.inc:314
 msgid "No Supplier Filter"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:419
-#: reporting/includes/reports_classes.inc:421
+#: reporting/includes/reports_classes.inc:429
+#: reporting/includes/reports_classes.inc:431
 msgid "No Location Filter"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:424
-#: reporting/includes/reports_classes.inc:426
+#: reporting/includes/reports_classes.inc:434
+#: reporting/includes/reports_classes.inc:436
 msgid "No Category Filter"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:428
+#: reporting/includes/reports_classes.inc:438
 msgid "No Class Filter"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:436
+#: reporting/includes/reports_classes.inc:443
+msgid "No Areas Filter"
+msgstr ""
+
+#: reporting/includes/reports_classes.inc:446
 msgid "No Sales Folk Filter"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:443
+#: reporting/includes/reports_classes.inc:453
 msgid "No Users Filter"
 msgstr ""
 
@@ -12979,89 +13275,89 @@ msgstr ""
 msgid "&Print Recurrent Invoices # %s - # %s"
 msgstr ""
 
-#: sales/create_recurrent_invoices.php:150
+#: sales/create_recurrent_invoices.php:149
 #, php-format
 msgid "&Email Recurrent Invoices # %s - # %s"
 msgstr ""
 
-#: sales/create_recurrent_invoices.php:168
+#: sales/create_recurrent_invoices.php:167
 msgid ""
 "Recurrent invoice cannot be generated before last day of covered period."
 msgstr ""
 
-#: sales/create_recurrent_invoices.php:170
+#: sales/create_recurrent_invoices.php:169
 msgid ""
 "Recurrent invoices cannot be generated because some items have no price "
 "defined in customer currency."
 msgstr ""
 
-#: sales/create_recurrent_invoices.php:172
+#: sales/create_recurrent_invoices.php:171
 msgid ""
 "Recurrent invoices cannot be generated because selected sales order template "
 "uses prepayment sales terms. Change payment terms and try again."
 msgstr ""
 
-#: sales/create_recurrent_invoices.php:180
+#: sales/create_recurrent_invoices.php:179
 #: sales/manage/recurrent_invoices.php:193
 msgid "Template:"
 msgstr ""
 
-#: sales/create_recurrent_invoices.php:181
+#: sales/create_recurrent_invoices.php:180
 msgid "Number of invoices:"
 msgstr ""
 
-#: sales/create_recurrent_invoices.php:182
+#: sales/create_recurrent_invoices.php:181
 msgid "Invoice date:"
 msgstr ""
 
-#: sales/create_recurrent_invoices.php:183
+#: sales/create_recurrent_invoices.php:184
 msgid "Invoice notice:"
 msgstr ""
 
-#: sales/create_recurrent_invoices.php:183
+#: sales/create_recurrent_invoices.php:184
 #, php-format
 msgid "Recurrent Invoice covers period %s - %s."
 msgstr ""
 
-#: sales/create_recurrent_invoices.php:189
+#: sales/create_recurrent_invoices.php:190
 msgid "Create"
 msgstr ""
 
-#: sales/create_recurrent_invoices.php:189
+#: sales/create_recurrent_invoices.php:190
 msgid "Create recurrent invoices"
 msgstr ""
 
-#: sales/create_recurrent_invoices.php:190
+#: sales/create_recurrent_invoices.php:191
 msgid "Return to recurrent invoices"
 msgstr ""
 
-#: sales/create_recurrent_invoices.php:191
+#: sales/create_recurrent_invoices.php:192
 #, php-format
 msgid ""
 "You are about to issue %s invoices.\n"
 " Do you want to continue?"
 msgstr ""
 
-#: sales/create_recurrent_invoices.php:203
+#: sales/create_recurrent_invoices.php:204
 #: sales/manage/recurrent_invoices.php:128
 msgid "Begin"
 msgstr ""
 
-#: sales/create_recurrent_invoices.php:203
+#: sales/create_recurrent_invoices.php:204
 #: sales/manage/recurrent_invoices.php:128
 msgid "End"
 msgstr ""
 
-#: sales/create_recurrent_invoices.php:240
+#: sales/create_recurrent_invoices.php:241
 #, php-format
 msgid "Create %s Invoice(s)"
 msgstr ""
 
-#: sales/create_recurrent_invoices.php:252
+#: sales/create_recurrent_invoices.php:253
 msgid "Marked items are due."
 msgstr ""
 
-#: sales/create_recurrent_invoices.php:254
+#: sales/create_recurrent_invoices.php:255
 msgid "No recurrent invoices are due."
 msgstr ""
 
@@ -13070,7 +13366,7 @@ msgstr ""
 msgid "Modifying Customer Credit Note #%d"
 msgstr ""
 
-#: sales/credit_note_entry.php:51 sales/sales_order_entry.php:706
+#: sales/credit_note_entry.php:51 sales/sales_order_entry.php:709
 msgid ""
 "There are no customers, or there are no customers with branches. Please "
 "define customers and customer branches."
@@ -13427,7 +13723,7 @@ msgid "Process Dispatch"
 msgstr ""
 
 #: sales/customer_delivery.php:536 sales/customer_invoice.php:665
-#: sales/sales_order_entry.php:753
+#: sales/sales_order_entry.php:756
 msgid "Check entered data and save document"
 msgstr ""
 
@@ -13545,7 +13841,7 @@ msgstr ""
 msgid "Payment terms:"
 msgstr ""
 
-#: sales/customer_invoice.php:512 sales/sales_order_entry.php:729
+#: sales/customer_invoice.php:512 sales/sales_order_entry.php:732
 msgid "Sales Order Items"
 msgstr ""
 
@@ -13589,97 +13885,101 @@ msgstr ""
 msgid "There are no customers defined in the system."
 msgstr ""
 
-#: sales/customer_payments.php:71
+#: sales/customer_payments.php:72
 msgid "Invalid sales invoice number."
 msgstr ""
 
-#: sales/customer_payments.php:98
+#: sales/customer_payments.php:102
 msgid "The customer payment has been successfully entered."
 msgstr ""
 
-#: sales/customer_payments.php:100 sales/customer_payments.php:119
+#: sales/customer_payments.php:104 sales/customer_payments.php:124
 msgid "&Print This Receipt"
 msgstr ""
 
-#: sales/customer_payments.php:102
+#: sales/customer_payments.php:105
+msgid "&Email This Receipt"
+msgstr ""
+
+#: sales/customer_payments.php:107
 msgid "&View this Customer Payment"
 msgstr ""
 
-#: sales/customer_payments.php:104 sales/customer_payments.php:127
+#: sales/customer_payments.php:109 sales/customer_payments.php:132
 msgid "Enter Another &Customer Payment"
 msgstr ""
 
-#: sales/customer_payments.php:106
+#: sales/customer_payments.php:111
 msgid "Enter Payment to &Supplier"
 msgstr ""
 
-#: sales/customer_payments.php:110 sales/customer_payments.php:121
+#: sales/customer_payments.php:115 sales/customer_payments.php:126
 msgid "&View the GL Journal Entries for this Customer Payment"
 msgstr ""
 
-#: sales/customer_payments.php:117
+#: sales/customer_payments.php:122
 msgid "The customer payment has been successfully updated."
 msgstr ""
 
-#: sales/customer_payments.php:125
+#: sales/customer_payments.php:130
 msgid "Select Another Customer Payment for &Edition"
 msgstr ""
 
-#: sales/customer_payments.php:140 sales/sales_order_entry.php:360
+#: sales/customer_payments.php:145 sales/sales_order_entry.php:360
 msgid "There is no customer selected."
 msgstr ""
 
-#: sales/customer_payments.php:147 sales/sales_order_entry.php:367
+#: sales/customer_payments.php:152 sales/sales_order_entry.php:367
 msgid "This customer has no branch defined."
 msgstr ""
 
-#: sales/customer_payments.php:153
+#: sales/customer_payments.php:158
 msgid "The entered date is invalid. Please enter a valid date for the payment."
 msgstr ""
 
-#: sales/customer_payments.php:168 sales/customer_payments.php:174
+#: sales/customer_payments.php:173 sales/customer_payments.php:179
 msgid "The entered amount is invalid or negative and cannot be processed."
 msgstr ""
 
-#: sales/customer_payments.php:193
+#: sales/customer_payments.php:198
 msgid "The entered discount is not a valid number."
 msgstr ""
 
-#: sales/customer_payments.php:199
+#: sales/customer_payments.php:204
 msgid ""
 "The balance of the amount and discount is zero or negative. Please enter "
 "valid amounts."
 msgstr ""
 
-#: sales/customer_payments.php:206
+#: sales/customer_payments.php:211
 msgid "The entered payment amount is zero or negative."
 msgstr ""
 
-#: sales/customer_payments.php:308
-msgid "Into Bank Account:"
+#: sales/customer_payments.php:315 sales/customer_payments.php:317
+msgid "From Customer:"
 msgstr ""
 
-#: sales/customer_payments.php:311 sales/customer_payments.php:313
-msgid "From Customer:"
+#: sales/customer_payments.php:338
+msgid "Into Bank Account:"
 msgstr ""
 
-#: sales/customer_payments.php:345
+#: sales/customer_payments.php:349
 msgid "Date of Deposit:"
 msgstr ""
 
-#: sales/customer_payments.php:359
+#: sales/customer_payments.php:363
 msgid "Payment Amount:"
 msgstr ""
 
-#: sales/customer_payments.php:372
+#: sales/customer_payments.php:376
 msgid "Customer prompt payment discount :"
 msgstr ""
 
-#: sales/customer_payments.php:382
+#: sales/customer_payments.php:386
 msgid "Add Payment"
 msgstr ""
 
-#: sales/customer_payments.php:384
+#: sales/customer_payments.php:388
 msgid "Update Payment"
 msgstr ""
 
@@ -13863,152 +14163,152 @@ msgstr ""
 msgid "You need to define a cash account for your Sales Point."
 msgstr ""
 
-#: sales/sales_order_entry.php:478
+#: sales/sales_order_entry.php:483
 msgid ""
 "The reference number field has been increased. Please save the document "
 "again."
 msgstr ""
 
-#: sales/sales_order_entry.php:524
+#: sales/sales_order_entry.php:527
 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:528
+#: sales/sales_order_entry.php:531
 msgid "Price for inventory item must be entered and can not be less than 0"
 msgstr ""
 
-#: sales/sales_order_entry.php:535
+#: sales/sales_order_entry.php:538
 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:553
+#: sales/sales_order_entry.php:556
 #, php-format
 msgid "Price %s is below Standard Cost %s"
 msgstr ""
 
-#: sales/sales_order_entry.php:578
+#: sales/sales_order_entry.php:581
 msgid ""
 "This item cannot be deleted because some of it has already been delivered."
 msgstr ""
 
-#: sales/sales_order_entry.php:607
+#: sales/sales_order_entry.php:610
 msgid "Direct delivery entry has been cancelled as requested."
 msgstr ""
 
-#: sales/sales_order_entry.php:608
+#: sales/sales_order_entry.php:611
 msgid "Enter a New Sales Delivery"
 msgstr ""
 
-#: sales/sales_order_entry.php:610
+#: sales/sales_order_entry.php:613
 msgid "Direct invoice entry has been cancelled as requested."
 msgstr ""
 
-#: sales/sales_order_entry.php:611
+#: sales/sales_order_entry.php:614
 msgid "Enter a New Sales Invoice"
 msgstr ""
 
-#: sales/sales_order_entry.php:616
+#: sales/sales_order_entry.php:619
 msgid "This sales quotation has been cancelled as requested."
 msgstr ""
 
-#: sales/sales_order_entry.php:617
+#: sales/sales_order_entry.php:620
 msgid "Enter a New Sales Quotation"
 msgstr ""
 
-#: sales/sales_order_entry.php:624
+#: sales/sales_order_entry.php:627
 msgid "Undelivered part of order has been cancelled as requested."
 msgstr ""
 
-#: sales/sales_order_entry.php:625
+#: sales/sales_order_entry.php:628
 msgid "Select Another Sales Order for Edition"
 msgstr ""
 
-#: sales/sales_order_entry.php:629
+#: sales/sales_order_entry.php:632
 msgid "This sales order has been cancelled as requested."
 msgstr ""
 
-#: sales/sales_order_entry.php:630
+#: sales/sales_order_entry.php:633
 msgid "Enter a New Sales Order"
 msgstr ""
 
-#: sales/sales_order_entry.php:710
+#: sales/sales_order_entry.php:713
 msgid "Sales Invoice Items"
 msgstr ""
 
-#: sales/sales_order_entry.php:711
+#: sales/sales_order_entry.php:714
 msgid "Enter Delivery Details and Confirm Invoice"
 msgstr ""
 
-#: sales/sales_order_entry.php:713
+#: sales/sales_order_entry.php:716
 msgid "Place Invoice"
 msgstr ""
 
-#: sales/sales_order_entry.php:716
+#: sales/sales_order_entry.php:719
 msgid "Delivery Note Items"
 msgstr ""
 
-#: sales/sales_order_entry.php:717
+#: sales/sales_order_entry.php:720
 msgid "Enter Delivery Details and Confirm Dispatch"
 msgstr ""
 
-#: sales/sales_order_entry.php:718
+#: sales/sales_order_entry.php:721
 msgid "Cancel Delivery"
 msgstr ""
 
-#: sales/sales_order_entry.php:719
+#: sales/sales_order_entry.php:722
 msgid "Place Delivery"
 msgstr ""
 
-#: sales/sales_order_entry.php:721
+#: sales/sales_order_entry.php:724
 msgid "Quotation Date:"
 msgstr ""
 
-#: sales/sales_order_entry.php:722
+#: sales/sales_order_entry.php:725
 msgid "Sales Quotation Items"
 msgstr ""
 
-#: sales/sales_order_entry.php:723
+#: sales/sales_order_entry.php:726
 msgid "Enter Delivery Details and Confirm Quotation"
 msgstr ""
 
-#: sales/sales_order_entry.php:724
+#: sales/sales_order_entry.php:727
 msgid "Cancel Quotation"
 msgstr ""
 
-#: sales/sales_order_entry.php:725
+#: sales/sales_order_entry.php:728
 msgid "Place Quotation"
 msgstr ""
 
-#: sales/sales_order_entry.php:726
+#: sales/sales_order_entry.php:729
 msgid "Commit Quotations Changes"
 msgstr ""
 
-#: sales/sales_order_entry.php:730
+#: sales/sales_order_entry.php:733
 msgid "Enter Delivery Details and Confirm Order"
 msgstr ""
 
-#: sales/sales_order_entry.php:733
+#: sales/sales_order_entry.php:736
 msgid "Commit Order Changes"
 msgstr ""
 
-#: sales/sales_order_entry.php:755 sales/sales_order_entry.php:761
+#: sales/sales_order_entry.php:758 sales/sales_order_entry.php:764
 msgid ""
 "Cancels document entry or removes sales order when editing an old document"
 msgstr ""
 
-#: sales/sales_order_entry.php:756 sales/sales_order_entry.php:765
+#: sales/sales_order_entry.php:759 sales/sales_order_entry.php:768
 msgid "You are about to void this Document.\\nDo you want to continue?"
 msgstr ""
 
-#: sales/sales_order_entry.php:759
+#: sales/sales_order_entry.php:762
 msgid "Validate changes and update document"
 msgstr ""
 
-#: sales/sales_order_entry.php:763
+#: sales/sales_order_entry.php:766
 msgid ""
 "You are about to cancel undelivered part of this order.\\nDo you want to "
 "continue?"
@@ -14018,7 +14318,7 @@ msgstr ""
 msgid "Allocate Customer Payment or Credit Note"
 msgstr ""
 
-#: sales/allocations/customer_allocate.php:50
+#: sales/allocations/customer_allocate.php:55
 #, php-format
 msgid "Allocation of %s # %d"
 msgstr ""
@@ -14027,15 +14327,6 @@ msgstr ""
 msgid "Customer Allocations"
 msgstr ""
 
-#: sales/allocations/customer_allocation_main.php:32
-#: sales/manage/customer_branches.php:270 sales/manage/customers.php:329
-#: sales/inquiry/customer_allocation_inquiry.php:42
-#: sales/inquiry/customer_inquiry.php:44
-#: sales/inquiry/sales_deliveries_view.php:114
-#: sales/inquiry/sales_orders_view.php:232
-msgid "Select a customer: "
-msgstr ""
-
 #: sales/manage/credit_status.php:16
 msgid "Credit Status"
 msgstr ""
@@ -14155,11 +14446,11 @@ msgstr ""
 msgid "Branch Short Name:"
 msgstr ""
 
-#: sales/manage/customer_branches.php:233 sales/manage/customers.php:261
+#: sales/manage/customer_branches.php:233 sales/manage/customers.php:262
 msgid "Sales Person:"
 msgstr ""
 
-#: sales/manage/customer_branches.php:234 sales/manage/customers.php:298
+#: sales/manage/customer_branches.php:234 sales/manage/customers.php:299
 msgid "Sales Area:"
 msgstr ""
 
@@ -14168,11 +14459,11 @@ msgstr ""
 msgid "Sales Group:"
 msgstr ""
 
-#: sales/manage/customer_branches.php:236 sales/manage/customers.php:296
+#: sales/manage/customer_branches.php:236 sales/manage/customers.php:297
 msgid "Default Inventory Location:"
 msgstr ""
 
-#: sales/manage/customer_branches.php:237 sales/manage/customers.php:297
+#: sales/manage/customer_branches.php:237 sales/manage/customers.php:298
 msgid "Default Shipping Company:"
 msgstr ""
 
@@ -14190,7 +14481,7 @@ msgstr ""
 
 #: sales/manage/customer_branches.php:285
 #: sales/inquiry/customer_branches_list.php:49
-#: sales/inquiry/sales_deliveries_view.php:172
+#: sales/inquiry/sales_deliveries_view.php:173
 msgid "Contact"
 msgstr ""
 
@@ -14217,149 +14508,149 @@ msgid ""
 "branch."
 msgstr ""
 
-#: sales/manage/customers.php:42
+#: sales/manage/customers.php:43
 msgid "The customer name cannot be empty."
 msgstr ""
 
-#: sales/manage/customers.php:49
+#: sales/manage/customers.php:50
 msgid "The customer short name cannot be empty."
 msgstr ""
 
-#: sales/manage/customers.php:56
+#: sales/manage/customers.php:57
 msgid "The credit limit must be numeric and not less than zero."
 msgstr ""
 
-#: sales/manage/customers.php:63
+#: sales/manage/customers.php:64
 msgid ""
 "The payment discount must be numeric and is expected to be less than 100% "
 "and greater than or equal to 0."
 msgstr ""
 
-#: sales/manage/customers.php:70
+#: sales/manage/customers.php:71
 msgid ""
 "The discount percentage must be numeric and is expected to be less than 100% "
 "and greater than or equal to 0."
 msgstr ""
 
-#: sales/manage/customers.php:98
+#: sales/manage/customers.php:99
 msgid "Customer has been updated."
 msgstr ""
 
-#: sales/manage/customers.php:130
+#: sales/manage/customers.php:131
 msgid "A new customer has been added."
 msgstr ""
 
-#: sales/manage/customers.php:133
+#: sales/manage/customers.php:134
 msgid ""
 "A default Branch has been automatically created, please check default Branch "
 "values by using link below."
 msgstr ""
 
-#: sales/manage/customers.php:156
+#: sales/manage/customers.php:157
 msgid ""
 "This customer cannot be deleted because there are transactions that refer to "
 "it."
 msgstr ""
 
-#: sales/manage/customers.php:163
+#: sales/manage/customers.php:164
 msgid ""
 "Cannot delete the customer record because orders have been created against "
 "it."
 msgstr ""
 
-#: sales/manage/customers.php:170
+#: sales/manage/customers.php:171
 msgid ""
 "Cannot delete this customer because there are branch records set up against "
 "it."
 msgstr ""
 
-#: sales/manage/customers.php:181
+#: sales/manage/customers.php:182
 msgid "Selected customer has been deleted."
 msgstr ""
 
-#: sales/manage/customers.php:230
+#: sales/manage/customers.php:231
 msgid "Name and Address"
 msgstr ""
 
-#: sales/manage/customers.php:232
+#: sales/manage/customers.php:233
 msgid "Customer Name:"
 msgstr ""
 
-#: sales/manage/customers.php:233
+#: sales/manage/customers.php:234
 msgid "Customer Short Name:"
 msgstr ""
 
-#: sales/manage/customers.php:242 sales/manage/customers.php:246
+#: sales/manage/customers.php:243 sales/manage/customers.php:247
 msgid "Customer's Currency:"
 msgstr ""
 
-#: sales/manage/customers.php:249
+#: sales/manage/customers.php:250
 msgid "Sales Type/Price List:"
 msgstr ""
 
-#: sales/manage/customers.php:252
+#: sales/manage/customers.php:253
 msgid "Customer status:"
 msgstr ""
 
-#: sales/manage/customers.php:267
+#: sales/manage/customers.php:268
 msgid "Discount Percent:"
 msgstr ""
 
-#: sales/manage/customers.php:268
+#: sales/manage/customers.php:269
 msgid "Prompt Payment Discount Percent:"
 msgstr ""
 
-#: sales/manage/customers.php:272
+#: sales/manage/customers.php:273
 msgid "Credit Status:"
 msgstr ""
 
-#: sales/manage/customers.php:285
+#: sales/manage/customers.php:286
 msgid "Customer branches"
 msgstr ""
 
-#: sales/manage/customers.php:287
+#: sales/manage/customers.php:288
 msgid "Select or &Add"
 msgstr ""
 
-#: sales/manage/customers.php:287
+#: sales/manage/customers.php:288
 msgid "&Add or Edit "
 msgstr ""
 
-#: sales/manage/customers.php:306
+#: sales/manage/customers.php:308
 msgid "Add New Customer"
 msgstr ""
 
-#: sales/manage/customers.php:310
+#: sales/manage/customers.php:312
 msgid "Update Customer"
 msgstr ""
 
-#: sales/manage/customers.php:311
+#: sales/manage/customers.php:313
 msgid "Update customer data"
 msgstr ""
 
-#: sales/manage/customers.php:312
+#: sales/manage/customers.php:314
 msgid "Select this customer and return to document entry."
 msgstr ""
 
-#: sales/manage/customers.php:313
+#: sales/manage/customers.php:315
 msgid "Delete Customer"
 msgstr ""
 
-#: sales/manage/customers.php:314
+#: sales/manage/customers.php:316
 msgid "Delete customer data if have been never used"
 msgstr ""
 
-#: sales/manage/customers.php:321
+#: sales/manage/customers.php:323
 msgid ""
 "There are no sales types defined. Please define at least one sales type "
 "before adding a customer."
 msgstr ""
 
-#: sales/manage/customers.php:330
+#: sales/manage/customers.php:332
 msgid "New customer"
 msgstr ""
 
-#: sales/manage/customers.php:353
+#: sales/manage/customers.php:355
 msgid "Sales &Orders"
 msgstr ""
 
@@ -14481,10 +14772,6 @@ msgstr ""
 msgid "Selected sales group has been deleted"
 msgstr ""
 
-#: sales/manage/sales_groups.php:85 sales/manage/sales_groups.php:120
-msgid "ID"
-msgstr ""
-
 #: sales/manage/sales_groups.php:123
 msgid "Group Name:"
 msgstr ""
@@ -14738,6 +15025,10 @@ msgstr ""
 msgid "There are no line items on this invoice."
 msgstr ""
 
+#: sales/view/view_invoice.php:171
+msgid "PREPAYMENT AMOUNT INVOICED"
+msgstr ""
+
 #: sales/view/view_receipt.php:24
 msgid "View Customer Payment"
 msgstr ""
@@ -14801,31 +15092,31 @@ msgstr ""
 msgid "Deliver To Branch"
 msgstr ""
 
-#: sales/view/view_sales_order.php:71
+#: sales/view/view_sales_order.php:73
 msgid "Requested Delivery"
 msgstr ""
 
-#: sales/view/view_sales_order.php:75
+#: sales/view/view_sales_order.php:77
 msgid "Deliver From Location"
 msgstr ""
 
-#: sales/view/view_sales_order.php:86
+#: sales/view/view_sales_order.php:88
 msgid "Non-Invoiced Prepayments"
 msgstr ""
 
-#: sales/view/view_sales_order.php:87
+#: sales/view/view_sales_order.php:89
 msgid "All Payments Allocated"
 msgstr ""
 
-#: sales/view/view_sales_order.php:95
+#: sales/view/view_sales_order.php:97
 msgid "Telephone"
 msgstr ""
 
-#: sales/view/view_sales_order.php:215
+#: sales/view/view_sales_order.php:217
 msgid "This Sales Order is used as a Template."
 msgstr ""
 
-#: sales/view/view_sales_order.php:220
+#: sales/view/view_sales_order.php:222
 msgid "Quantity Delivered"
 msgstr ""
 
@@ -14841,17 +15132,12 @@ msgstr ""
 msgid "Customer Transactions"
 msgstr ""
 
-#: sales/inquiry/customer_inquiry.php:68
-msgid "CUSTOMER ACCOUNT IS ON HOLD"
-msgstr ""
-
-#: sales/inquiry/customer_inquiry.php:182
+#: sales/inquiry/customer_inquiry.php:99
 msgid "Print Receipt"
 msgstr ""
 
-#: sales/inquiry/customer_inquiry.php:213
-#: sales/inquiry/customer_inquiry.php:226
-msgid "RB"
+#: sales/inquiry/customer_inquiry.php:119
+msgid "CUSTOMER ACCOUNT IS ON HOLD"
 msgstr ""
 
 #: sales/inquiry/sales_deliveries_view.php:29
@@ -14862,34 +15148,34 @@ msgstr ""
 msgid "Search All Deliveries"
 msgstr ""
 
-#: sales/inquiry/sales_deliveries_view.php:68
+#: sales/inquiry/sales_deliveries_view.php:69
 msgid ""
 "For batch invoicing you should\n"
 "\t\t    select at least one delivery. All items must be dispatched to\n"
 "\t\t    the same customer branch."
 msgstr ""
 
-#: sales/inquiry/sales_deliveries_view.php:168
+#: sales/inquiry/sales_deliveries_view.php:169
 msgid "Delivery #"
 msgstr ""
 
-#: sales/inquiry/sales_deliveries_view.php:174
+#: sales/inquiry/sales_deliveries_view.php:175
 msgid "Cust Ref"
 msgstr ""
 
-#: sales/inquiry/sales_deliveries_view.php:176
+#: sales/inquiry/sales_deliveries_view.php:177
 msgid "Due By"
 msgstr ""
 
-#: sales/inquiry/sales_deliveries_view.php:177
+#: sales/inquiry/sales_deliveries_view.php:178
 msgid "Delivery Total"
 msgstr ""
 
-#: sales/inquiry/sales_deliveries_view.php:179
+#: sales/inquiry/sales_deliveries_view.php:180
 msgid "Batch"
 msgstr ""
 
-#: sales/inquiry/sales_deliveries_view.php:179
+#: sales/inquiry/sales_deliveries_view.php:180
 msgid "Batch Invoicing"
 msgstr ""
 
@@ -14917,57 +15203,57 @@ msgstr ""
 msgid "Search All Sales Quotations"
 msgstr ""
 
-#: sales/inquiry/sales_orders_view.php:123
+#: sales/inquiry/sales_orders_view.php:125
 msgid "Dispatch"
 msgstr ""
 
-#: sales/inquiry/sales_orders_view.php:167
+#: sales/inquiry/sales_orders_view.php:172
 msgid "Set this order as a template for direct deliveries/invoices"
 msgstr ""
 
-#: sales/inquiry/sales_orders_view.php:176
+#: sales/inquiry/sales_orders_view.php:181
 msgid "Prepayment Invoice"
 msgstr ""
 
-#: sales/inquiry/sales_orders_view.php:176
+#: sales/inquiry/sales_orders_view.php:181
 msgid "Final Invoice"
 msgstr ""
 
-#: sales/inquiry/sales_orders_view.php:234
+#: sales/inquiry/sales_orders_view.php:239
 msgid "Show All:"
 msgstr ""
 
-#: sales/inquiry/sales_orders_view.php:252
+#: sales/inquiry/sales_orders_view.php:257
 msgid "Order #"
 msgstr ""
 
-#: sales/inquiry/sales_orders_view.php:256
-#: sales/inquiry/sales_orders_view.php:270
+#: sales/inquiry/sales_orders_view.php:261
+#: sales/inquiry/sales_orders_view.php:275
 msgid "Cust Order Ref"
 msgstr ""
 
-#: sales/inquiry/sales_orders_view.php:259
-#: sales/inquiry/sales_orders_view.php:273
+#: sales/inquiry/sales_orders_view.php:264
+#: sales/inquiry/sales_orders_view.php:278
 msgid "Delivery To"
 msgstr ""
 
-#: sales/inquiry/sales_orders_view.php:266
+#: sales/inquiry/sales_orders_view.php:271
 msgid "Quote #"
 msgstr ""
 
-#: sales/inquiry/sales_orders_view.php:271
+#: sales/inquiry/sales_orders_view.php:276
 msgid "Quote Date"
 msgstr ""
 
-#: sales/inquiry/sales_orders_view.php:274
+#: sales/inquiry/sales_orders_view.php:279
 msgid "Quote Total"
 msgstr ""
 
-#: sales/inquiry/sales_orders_view.php:304
+#: sales/inquiry/sales_orders_view.php:310
 msgid "Tmpl"
 msgstr ""
 
-#: sales/includes/cart_class.inc:400
+#: sales/includes/cart_class.inc:407
 msgid "You have to enter valid stock code or nonempty description"
 msgstr ""
 
@@ -14977,7 +15263,7 @@ msgid ""
 "browser tab. You cannot edit more than one sales document at once."
 msgstr ""
 
-#: sales/includes/db/custalloc_db.inc:381
+#: sales/includes/db/custalloc_db.inc:382
 msgid ""
 "Unsuspected overallocation happened due to sparse credit notes exists for "
 "this invoice.\n"
@@ -14990,18 +15276,14 @@ msgstr ""
 msgid "Unknown %s price for '%s' in pricelist '%s'"
 msgstr ""
 
-#: sales/includes/db/sales_credit_db.inc:185
+#: sales/includes/db/sales_credit_db.inc:187
 msgid "Return"
 msgstr ""
 
-#: sales/includes/db/sales_credit_db.inc:187
+#: sales/includes/db/sales_credit_db.inc:189
 msgid "Ex Inv:"
 msgstr ""
 
-#: sales/includes/db/sales_invoice_db.inc:206
-msgid "Cash invoice"
-msgstr ""
-
 #: sales/includes/db/sales_order_db.inc:101
 msgid "Deleted."
 msgstr ""
@@ -15012,7 +15294,7 @@ msgid "Customer Currency:"
 msgstr ""
 
 #: sales/includes/ui/sales_credit_ui.inc:108
-#: sales/includes/ui/sales_order_ui.inc:639
+#: sales/includes/ui/sales_order_ui.inc:643
 msgid "Shipping Company:"
 msgstr ""
 
@@ -15061,72 +15343,72 @@ msgstr ""
 msgid "[Select item]"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:574
+#: sales/includes/ui/sales_order_ui.inc:578
 msgid "Cash payment"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:577
-#: sales/includes/ui/sales_order_ui.inc:609
+#: sales/includes/ui/sales_order_ui.inc:581
+#: sales/includes/ui/sales_order_ui.inc:613
 msgid "Deliver from Location:"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:580
+#: sales/includes/ui/sales_order_ui.inc:584
 msgid "Cash account:"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:587
+#: sales/includes/ui/sales_order_ui.inc:591
 msgid "Delivery Details"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:592
+#: sales/includes/ui/sales_order_ui.inc:596
 msgid "Invoice Delivery Details"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:593
+#: sales/includes/ui/sales_order_ui.inc:597
 msgid "Invoice before"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:597
+#: sales/includes/ui/sales_order_ui.inc:601
 msgid "Quotation Delivery Details"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:602
+#: sales/includes/ui/sales_order_ui.inc:606
 msgid "Order Delivery Details"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:623
+#: sales/includes/ui/sales_order_ui.inc:627
 msgid "Enter requested day of delivery"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:624
+#: sales/includes/ui/sales_order_ui.inc:628
 msgid "Enter Valid until Date"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:625
+#: sales/includes/ui/sales_order_ui.inc:629
 msgid "Deliver To:"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:626
+#: sales/includes/ui/sales_order_ui.inc:630
 msgid "Additional identifier for delivery e.g. name of receiving person"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:629
+#: sales/includes/ui/sales_order_ui.inc:633
 msgid "Delivery address. Default is address of customer branch"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:633
+#: sales/includes/ui/sales_order_ui.inc:637
 msgid "Contact Phone Number:"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:634
+#: sales/includes/ui/sales_order_ui.inc:638
 msgid "Phone number of ordering person. Defaults to branch phone number"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:635
+#: sales/includes/ui/sales_order_ui.inc:639
 msgid "Customer Reference:"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:636
+#: sales/includes/ui/sales_order_ui.inc:640
 msgid "Customer reference number for this order (if any)"
 msgstr ""
 
@@ -15195,34 +15477,34 @@ msgstr ""
 msgid "The tax group name cannot be empty."
 msgstr ""
 
-#: taxes/tax_groups.php:60
+#: taxes/tax_groups.php:63
 msgid "Selected tax group has been updated"
 msgstr ""
 
-#: taxes/tax_groups.php:65
+#: taxes/tax_groups.php:68
 msgid "New tax group has been added"
 msgstr ""
 
-#: taxes/tax_groups.php:80
+#: taxes/tax_groups.php:83
 msgid ""
 "Cannot delete this tax group because customer branches been created "
 "referring to it."
 msgstr ""
 
-#: taxes/tax_groups.php:86
+#: taxes/tax_groups.php:89
 msgid ""
 "Cannot delete this tax group because suppliers been created referring to it."
 msgstr ""
 
-#: taxes/tax_groups.php:103
+#: taxes/tax_groups.php:106
 msgid "Selected tax group has been deleted"
 msgstr ""
 
-#: taxes/tax_groups.php:166
+#: taxes/tax_groups.php:169
 msgid "Select the taxes that are included in this group."
 msgstr ""
 
-#: taxes/tax_groups.php:171
+#: taxes/tax_groups.php:174
 msgid "Shipping Tax"
 msgstr ""
 
@@ -15356,7 +15638,7 @@ msgid "Upgrade from version 2.2 to 2.3"
 msgstr ""
 
 #: sql/alter2.4.php:23
-msgid "Upgrade from version 2.3 to 2.4RC1"
+msgid "Upgrade from version 2.3 to 2.4"
 msgstr ""
 
 #: sql/alter2.4.php:31 sql/alter2.4rc1.php:31
@@ -15367,22 +15649,22 @@ msgstr ""
 msgid "Text collation optimization:"
 msgstr ""
 
-#: sql/alter2.4.php:83
+#: sql/alter2.4.php:98
 msgid "Cannot update config_db.php file."
 msgstr ""
 
-#: sql/alter2.4.php:122
+#: sql/alter2.4.php:138
 #, php-format
 msgid ""
 "Cannot update work orders costs:\n"
 "%s"
 msgstr ""
 
-#: sql/alter2.4.php:215
+#: sql/alter2.4.php:231
 msgid "Convertion to utf8 done."
 msgstr ""
 
-#: sql/alter2.4.php:254
+#: sql/alter2.4.php:270
 #, php-format
 msgid "Cannot drop column in %s table: %s"
 msgstr ""