Fixed typos in installer translation files, fixed translations in dashboard procedures.

[fa-stable.git] / lang / new_language_template / LC_MESSAGES / empty.po

diff --git a/lang/new_language_template/LC_MESSAGES/empty.po b/lang/new_language_template/LC_MESSAGES/empty.po
index 1a6abf321670499aa733613e2f53ddd6e8048d6f..ed1b1642804cdaebcb1ff76045083ace316b2c1c 100644 (file)
--- 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: FrontAccounting 2.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-05-14 14:34+0200\n"
+"POT-Creation-Date: 2016-05-17 19:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,15 +17,15 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: /frontaccounting.php:73
-#: /frontaccounting.php:74
+#: /frontaccounting.php:75
+#: /frontaccounting.php:76
 msgid "Main  Menu"
 msgstr ""
 
-#: /frontaccounting.php:75
+#: /frontaccounting.php:77
 #: /access/logout.php:21
-#: /themes/default/renderer.php:70
-#: /themes/default/renderer.php:82
+#: /themes/default/renderer.php:73
+#: /themes/default/renderer.php:87
 msgid "Logout"
 msgstr ""
 
@@ -79,24 +79,24 @@ msgid "Password:"
 msgstr ""
 
 #: /access/login.php:106
-#: /access/login.php:113
+#: /access/login.php:112
 #: /access/password_reset.php:69
-#: /access/password_reset.php:76
+#: /access/password_reset.php:75
 #: /admin/create_coy.php:240
 #: /admin/create_coy.php:316
 #: /admin/inst_upgrade.php:63
-#: /includes/sysnames.inc:194
+#: /includes/sysnames.inc:208
 msgid "Company"
 msgstr ""
 
-#: /access/login.php:121
+#: /access/login.php:120
 msgid "Login -->"
 msgstr ""
 
-#: /access/login.php:156
-#: /access/password_reset.php:107
+#: /access/login.php:155
+#: /access/password_reset.php:106
 #: /admin/display_prefs.php:123
-#: /themes/default/renderer.php:131
+#: /themes/default/renderer.php:136
 msgid "Theme:"
 msgstr ""
 
@@ -114,71 +114,71 @@ msgid "Password reset"
 msgstr ""
 
 #: /access/password_reset.php:63
-#: /reporting/rep103.php:276
+#: /reporting/rep103.php:274
 #: /reporting/rep106.php:94
-#: /reporting/rep205.php:195
+#: /reporting/rep205.php:186
 #: /reporting/includes/header2.inc:113
 #: /sales/manage/sales_people.php:99
 msgid "Email"
 msgstr ""
 
-#: /access/password_reset.php:82
+#: /access/password_reset.php:81
 msgid "Send password -->"
 msgstr ""
 
-#: /admin/attachments.php:74
+#: /admin/attachments.php:71
 msgid "Attach Documents"
 msgstr ""
 
-#: /admin/attachments.php:86
+#: /admin/attachments.php:83
 #: /admin/db/voiding_db.inc:28
-#: /admin/db/voiding_db.inc:38
-#: /admin/db/voiding_db.inc:51
-#: /admin/db/voiding_db.inc:63
-#: /admin/db/voiding_db.inc:69
-#: /admin/db/voiding_db.inc:84
-#: /admin/db/voiding_db.inc:91
+#: /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
 #: /admin/db/voiding_db.inc:103
+#: /admin/db/voiding_db.inc:111
 msgid "Selected transaction does not exists."
 msgstr ""
 
-#: /admin/attachments.php:88
-#: /admin/attachments.php:93
+#: /admin/attachments.php:85
+#: /admin/attachments.php:90
 msgid "Select attachment file."
 msgstr ""
 
-#: /admin/attachments.php:91
+#: /admin/attachments.php:88
 #: /admin/company_preferences.php:42
-#: /inventory/manage/items.php:69
+#: /inventory/manage/items.php:83
 msgid "The file size is over the maximum allowed."
 msgstr ""
 
-#: /admin/attachments.php:134
+#: /admin/attachments.php:131
 msgid "Attachment has been inserted."
 msgstr ""
 
-#: /admin/attachments.php:140
+#: /admin/attachments.php:137
 msgid "Attachment has been updated."
 msgstr ""
 
-#: /admin/attachments.php:155
+#: /admin/attachments.php:152
 msgid "Attachment has been deleted."
 msgstr ""
 
-#: /admin/attachments.php:173
+#: /admin/attachments.php:170
 #: /admin/view_print_transaction.php:72
 #: /gl/inquiry/journal_inquiry.php:47
-#: /manufacturing/work_order_add_finished.php:192
-#: /manufacturing/work_order_costs.php:135
-#: /manufacturing/work_order_entry.php:369
-#: /manufacturing/work_order_entry.php:377
-#: /manufacturing/includes/work_order_issue_ui.inc:172
+#: /manufacturing/work_order_add_finished.php:191
+#: /manufacturing/work_order_costs.php:136
+#: /manufacturing/work_order_entry.php:358
+#: /manufacturing/work_order_entry.php:367
+#: /manufacturing/includes/work_order_issue_ui.inc:166
 #: /sales/inquiry/customer_allocation_inquiry.php:47
 msgid "Type:"
 msgstr ""
 
-#: /admin/attachments.php:189
+#: /admin/attachments.php:186
 #: /admin/create_coy.php:261
 #: /admin/crm_categories.php:106
 #: /admin/fiscalyears.php:164
@@ -188,156 +188,156 @@ msgstr ""
 #: /admin/shipping_companies.php:106
 #: /admin/tags.php:140
 #: /admin/users.php:153
-#: /dimensions/inquiry/search_dimensions.php:120
+#: /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:132
-#: /gl/manage/gl_account_types.php:154
+#: /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:186
+#: /gl/includes/ui/gl_bank_ui.inc:179
 #: /gl/includes/ui/gl_journal_ui.inc:150
 #: /includes/ui/class.crud_view.inc:281
-#: /includes/ui/contacts_view.inc:64
+#: /includes/ui/contacts_view.inc:61
 #: /includes/ui/simple_crud_class.inc:52
-#: /includes/ui/ui_view.inc:1504
-#: /inventory/prices.php:159
-#: /inventory/purchasing_data.php:164
-#: /inventory/includes/item_adjustments_ui.inc:83
-#: /inventory/includes/stock_transfers_ui.inc:80
-#: /inventory/manage/item_categories.php:121
-#: /inventory/manage/item_codes.php:139
+#: /includes/ui/ui_view.inc:1547
+#: /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:161
-#: /inventory/manage/sales_kits.php:53
-#: /manufacturing/manage/bom_edit.php:84
+#: /inventory/manage/locations.php:170
+#: /inventory/manage/sales_kits.php:51
+#: /manufacturing/manage/bom_edit.php:59
 #: /manufacturing/manage/work_centres.php:114
-#: /manufacturing/includes/work_order_issue_ui.inc:63
-#: /purchasing/includes/ui/invoice_ui.inc:560
-#: /purchasing/includes/ui/po_ui.inc:244
+#: /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
-#: /sales/manage/customer_branches.php:154
+#: /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:198
-#: /sales/includes/ui/sales_order_ui.inc:197
+#: /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
 msgid "Edit"
 msgstr ""
 
-#: /admin/attachments.php:194
+#: /admin/attachments.php:191
 #: /gl/inquiry/journal_inquiry.php:116
 msgid "View"
 msgstr ""
 
-#: /admin/attachments.php:199
+#: /admin/attachments.php:196
 msgid "Download"
 msgstr ""
 
-#: /admin/attachments.php:204
+#: /admin/attachments.php:201
 #: /admin/create_coy.php:264
 #: /admin/crm_categories.php:110
 #: /admin/fiscalyears.php:166
-#: /admin/inst_chart.php:84
+#: /admin/inst_chart.php:83
 #: /admin/inst_lang.php:109
 #: /admin/inst_module.php:142
-#: /admin/inst_theme.php:90
+#: /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
-#: /gl/gl_budget.php:137
+#: /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:133
-#: /gl/manage/gl_account_types.php:155
+#: /gl/manage/gl_account_classes.php:132
+#: /gl/manage/gl_account_types.php:154
 #: /gl/manage/gl_quick_entries.php:202
 #: /gl/manage/gl_quick_entries.php:304
-#: /gl/includes/ui/gl_bank_ui.inc:188
+#: /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:67
+#: /includes/ui/contacts_view.inc:64
 #: /includes/ui/simple_crud_class.inc:54
 #: /includes/ui/ui_input.inc:304
-#: /inventory/prices.php:160
-#: /inventory/purchasing_data.php:165
-#: /inventory/includes/item_adjustments_ui.inc:85
-#: /inventory/includes/stock_transfers_ui.inc:82
-#: /inventory/manage/item_categories.php:122
-#: /inventory/manage/item_codes.php:140
+#: /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:162
-#: /inventory/manage/sales_kits.php:54
-#: /manufacturing/manage/bom_edit.php:85
+#: /inventory/manage/locations.php:171
+#: /inventory/manage/sales_kits.php:52
+#: /manufacturing/manage/bom_edit.php:60
 #: /manufacturing/manage/work_centres.php:115
-#: /manufacturing/includes/work_order_issue_ui.inc:65
-#: /purchasing/includes/ui/invoice_ui.inc:323
-#: /purchasing/includes/ui/po_ui.inc:246
+#: /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
-#: /sales/manage/customer_branches.php:158
+#: /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:200
-#: /sales/includes/ui/sales_order_ui.inc:199
+#: /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
 msgid "Delete"
 msgstr ""
 
-#: /admin/attachments.php:211
+#: /admin/attachments.php:208
 #: /admin/view_print_transaction.php:126
-#: /admin/void_transaction.php:181
-#: /dimensions/inquiry/search_dimensions.php:128
+#: /admin/void_transaction.php:180
+#: /dimensions/inquiry/search_dimensions.php:124
 #: /dimensions/view/view_dimension.php:55
-#: /gl/bank_account_reconcile.php:232
+#: /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
-#: /includes/ui/allocation_cart.inc:291
-#: /inventory/inquiry/stock_movements.php:79
-#: /manufacturing/search_work_orders.php:165
-#: /manufacturing/includes/manufacturing_ui.inc:157
-#: /manufacturing/includes/manufacturing_ui.inc:200
-#: /manufacturing/includes/manufacturing_ui.inc:236
-#: /manufacturing/includes/manufacturing_ui.inc:276
-#: /manufacturing/includes/manufacturing_ui.inc:280
-#: /manufacturing/includes/manufacturing_ui.inc:331
+#: /includes/ui/allocation_cart.inc:290
+#: /inventory/inquiry/stock_movements.php:104
+#: /manufacturing/search_work_orders.php:157
+#: /manufacturing/includes/manufacturing_ui.inc:174
+#: /manufacturing/includes/manufacturing_ui.inc:217
+#: /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/view/view_po.php:115
 #: /purchasing/view/view_po.php:140
 #: /purchasing/inquiry/po_search_completed.php:110
 #: /purchasing/inquiry/po_search.php:117
 #: /purchasing/inquiry/supplier_allocation_inquiry.php:137
-#: /purchasing/inquiry/supplier_inquiry.php:174
+#: /purchasing/inquiry/supplier_inquiry.php:178
 #: /purchasing/allocations/supplier_allocation_main.php:95
-#: /reporting/rep101.php:133
-#: /reporting/rep201.php:110
-#: /reporting/rep203.php:93
+#: /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:83
-#: /reporting/rep704.php:86
-#: /reporting/rep704.php:89
+#: /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:94
+#: /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
@@ -346,71 +346,76 @@ msgstr ""
 msgid "#"
 msgstr ""
 
-#: /admin/attachments.php:212
-#: /admin/attachments.php:256
+#: /admin/attachments.php:209
+#: /admin/attachments.php:253
 #: /admin/crm_categories.php:88
 #: /admin/payment_terms.php:127
 #: /admin/printers.php:84
-#: /admin/print_profiles.php:148
-#: /gl/inquiry/tax_inquiry.php:82
+#: /admin/print_profiles.php:147
+#: /gl/inquiry/accounts_list.php:39
+#: /gl/inquiry/accounts_list.php:52
+#: /gl/inquiry/tax_inquiry.php:80
 #: /gl/manage/gl_quick_entries.php:190
 #: /gl/manage/gl_quick_entries.php:230
-#: /inventory/manage/item_codes.php:124
+#: /includes/dashboard.inc:525
+#: /inventory/inquiry/stock_list.php:41
+#: /inventory/inquiry/stock_list.php:53
+#: /inventory/manage/item_codes.php:127
 #: /inventory/manage/item_units.php:94
-#: /inventory/manage/sales_kits.php:38
+#: /inventory/manage/sales_kits.php:36
 #: /inventory/view/view_adjustment.php:54
 #: /inventory/view/view_transfer.php:50
-#: /manufacturing/manage/bom_edit.php:68
+#: /manufacturing/manage/bom_edit.php:43
 #: /manufacturing/includes/manufacturing_ui.inc:28
-#: /purchasing/includes/ui/invoice_ui.inc:510
-#: /purchasing/includes/ui/invoice_ui.inc:522
+#: /purchasing/includes/ui/invoice_ui.inc:501
+#: /purchasing/includes/ui/invoice_ui.inc:513
 #: /purchasing/po_receive_items.php:62
-#: /reporting/rep104.php:111
+#: /reporting/rep104.php:109
 #: /reporting/rep105.php:114
 #: /reporting/rep204.php:84
-#: /reporting/rep303.php:121
-#: /reporting/rep303.php:127
-#: /reporting/rep304.php:126
-#: /reporting/rep305.php:101
+#: /reporting/rep303.php:120
+#: /reporting/rep303.php:126
+#: /reporting/rep304.php:127
+#: /reporting/rep305.php:106
 #: /reporting/rep306.php:141
-#: /reporting/rep307.php:117
+#: /reporting/rep307.php:114
 #: /reporting/rep308.php:242
-#: /reporting/rep309.php:98
+#: /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:282
-#: /sales/inquiry/sales_orders_view.php:286
+#: /sales/inquiry/sales_orders_view.php:281
+#: /sales/inquiry/sales_orders_view.php:285
 #: /taxes/tax_groups.php:123
 #: /taxes/tax_types.php:115
 msgid "Description"
 msgstr ""
 
-#: /admin/attachments.php:213
+#: /admin/attachments.php:210
 #: /admin/backups.php:67
 #: /admin/backups.php:152
 msgid "Filename"
 msgstr ""
 
-#: /admin/attachments.php:214
+#: /admin/attachments.php:211
 msgid "Size"
 msgstr ""
 
-#: /admin/attachments.php:215
+#: /admin/attachments.php:212
 msgid "Filetype"
 msgstr ""
 
-#: /admin/attachments.php:216
+#: /admin/attachments.php:213
 msgid "Date Uploaded"
 msgstr ""
 
-#: /admin/attachments.php:250
-#: /admin/attachments.php:255
+#: /admin/attachments.php:247
+#: /admin/attachments.php:252
 msgid "Transaction #"
 msgstr ""
 
-#: /admin/attachments.php:257
+#: /admin/attachments.php:254
 msgid "Attached File"
 msgstr ""
 
@@ -452,30 +457,30 @@ msgstr ""
 #: /admin/fiscalyears.php:155
 #: /admin/inst_lang.php:85
 #: /admin/inst_lang.php:97
-#: /dimensions/inquiry/search_dimensions.php:107
+#: /dimensions/inquiry/search_dimensions.php:106
 #: /gl/manage/bank_accounts.php:130
 #: /gl/manage/currencies.php:162
-#: /gl/manage/gl_account_classes.php:127
+#: /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:1647
-#: /purchasing/manage/suppliers.php:121
-#: /reporting/rep101.php:129
-#: /reporting/rep102.php:119
-#: /reporting/rep102.php:121
-#: /reporting/rep104.php:105
+#: /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:106
+#: /reporting/rep201.php:103
+#: /reporting/rep202.php:116
 #: /reporting/rep202.php:118
-#: /reporting/rep202.php:120
-#: /reporting/rep203.php:89
-#: /reporting/rep303.php:113
-#: /reporting/rep303.php:117
-#: /reporting/rep304.php:122
+#: /reporting/rep203.php:84
+#: /reporting/rep303.php:112
+#: /reporting/rep303.php:116
+#: /reporting/rep304.php:123
 #: /reporting/rep402.php:99
 #: /reporting/rep402.php:134
 #: /reporting/rep501.php:113
@@ -519,8 +524,8 @@ msgid "Create backup"
 msgstr ""
 
 #: /admin/backups.php:186
-#: /sales/includes/ui/sales_order_ui.inc:582
-#: /sales/includes/ui/sales_order_ui.inc:638
+#: /sales/includes/ui/sales_order_ui.inc:581
+#: /sales/includes/ui/sales_order_ui.inc:637
 msgid "Comments:"
 msgstr ""
 
@@ -579,7 +584,7 @@ msgstr ""
 
 #: /admin/change_current_user_password.php:16
 #: /admin/change_current_user_password.php:99
-#: /themes/default/renderer.php:76
+#: /themes/default/renderer.php:81
 msgid "Change password"
 msgstr ""
 
@@ -654,20 +659,20 @@ msgid ""
 msgstr ""
 
 #: /admin/company_preferences.php:65
-#: /inventory/manage/items.php:95
+#: /inventory/manage/items.php:109
 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:85
-#: /inventory/manage/items.php:100
+#: /inventory/manage/items.php:99
+#: /inventory/manage/items.php:114
 msgid "Only graphics files can be uploaded"
 msgstr ""
 
 #: /admin/company_preferences.php:78
 #: /admin/company_preferences.php:99
-#: /inventory/manage/items.php:108
+#: /inventory/manage/items.php:122
 msgid "The existing image could not be removed"
 msgstr ""
 
@@ -675,199 +680,232 @@ msgstr ""
 msgid "Error uploading logo file"
 msgstr ""
 
-#: /admin/company_preferences.php:122
+#: /admin/company_preferences.php:123
 msgid "Company setup has been updated."
 msgstr ""
 
-#: /admin/company_preferences.php:167
+#: /admin/company_preferences.php:169
+msgid "General settings"
+msgstr ""
+
+#: /admin/company_preferences.php:171
 msgid "Name (to appear on reports):"
 msgstr ""
 
-#: /admin/company_preferences.php:168
+#: /admin/company_preferences.php:172
 #: /admin/shipping_companies.php:142
-#: /includes/ui/contacts_view.inc:109
-#: /inventory/manage/locations.php:202
+#: /includes/ui/contacts_view.inc:106
+#: /inventory/manage/locations.php:212
 #: /sales/manage/customers.php:234
-#: /sales/includes/ui/sales_order_ui.inc:629
+#: /sales/includes/ui/sales_order_ui.inc:628
 msgid "Address:"
 msgstr ""
 
-#: /admin/company_preferences.php:169
+#: /admin/company_preferences.php:173
 msgid "Domicile:"
 msgstr ""
 
-#: /admin/company_preferences.php:171
+#: /admin/company_preferences.php:175
 #: /admin/shipping_companies.php:138
-#: /purchasing/manage/suppliers.php:134
-#: /sales/manage/customer_branches.php:249
+#: /purchasing/manage/suppliers.php:135
+#: /sales/manage/customer_branches.php:253
 msgid "Phone Number:"
 msgstr ""
 
-#: /admin/company_preferences.php:172
-#: /includes/ui/contacts_view.inc:104
-#: /purchasing/manage/suppliers.php:137
-#: /sales/manage/customer_branches.php:251
+#: /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
 msgid "Fax Number:"
 msgstr ""
 
-#: /admin/company_preferences.php:173
+#: /admin/company_preferences.php:177
 #: /admin/users.php:211
 msgid "Email Address:"
 msgstr ""
 
-#: /admin/company_preferences.php:175
+#: /admin/company_preferences.php:179
 msgid "BCC Address for all outgoing mails:"
 msgstr ""
 
-#: /admin/company_preferences.php:177
+#: /admin/company_preferences.php:181
 msgid "Official Company Number:"
 msgstr ""
 
-#: /admin/company_preferences.php:178
-#: /purchasing/manage/suppliers.php:94
+#: /admin/company_preferences.php:182
+#: /purchasing/manage/suppliers.php:95
 #: /sales/manage/customers.php:236
 msgid "GSTNo:"
 msgstr ""
 
-#: /admin/company_preferences.php:180
-#: /gl/gl_budget.php:63
+#: /admin/company_preferences.php:183
+msgid "Home Currency:"
+msgstr ""
+
+#: /admin/company_preferences.php:185
+msgid "Company Logo:"
+msgstr ""
+
+#: /admin/company_preferences.php:186
+msgid "New Company Logo (.jpg)"
+msgstr ""
+
+#: /admin/company_preferences.php:187
+msgid "Delete Company Logo:"
+msgstr ""
+
+#: /admin/company_preferences.php:189
+msgid "Automatic Revaluation Currency Accounts"
+msgstr ""
+
+#: /admin/company_preferences.php:190
+msgid "Time Zone on Reports"
+msgstr ""
+
+#: /admin/company_preferences.php:191
+msgid "Database Scheme Version"
+msgstr ""
+
+#: /admin/company_preferences.php:195
+msgid "General Ledger Settings"
+msgstr ""
+
+#: /admin/company_preferences.php:196
+#: /gl/gl_budget.php:62
 msgid "Fiscal Year:"
 msgstr ""
 
-#: /admin/company_preferences.php:181
+#: /admin/company_preferences.php:197
 msgid "Tax Periods:"
 msgstr ""
 
-#: /admin/company_preferences.php:181
+#: /admin/company_preferences.php:197
 msgid "Months."
 msgstr ""
 
-#: /admin/company_preferences.php:182
+#: /admin/company_preferences.php:198
 msgid "Tax Last Period:"
 msgstr ""
 
-#: /admin/company_preferences.php:182
+#: /admin/company_preferences.php:198
 msgid "Months back."
 msgstr ""
 
-#: /admin/company_preferences.php:183
+#: /admin/company_preferences.php:199
 msgid "Put alternative Tax Include on Docs"
 msgstr ""
 
-#: /admin/company_preferences.php:184
+#: /admin/company_preferences.php:200
 msgid "Suppress Tax Rates on Docs"
 msgstr ""
 
-#: /admin/company_preferences.php:188
-msgid "Company Logo:"
-msgstr ""
-
-#: /admin/company_preferences.php:189
-msgid "New Company Logo (.jpg)"
+#: /admin/company_preferences.php:202
+msgid "Sales Pricing"
 msgstr ""
 
-#: /admin/company_preferences.php:190
-msgid "Delete Company Logo:"
+#: /admin/company_preferences.php:203
+msgid "Base for auto price calculations:"
 msgstr ""
 
-#: /admin/company_preferences.php:192
-msgid "Use Dimensions:"
+#: /admin/company_preferences.php:204
+msgid "No base price list"
 msgstr ""
 
-#: /admin/company_preferences.php:193
-msgid "Base for auto price calculations:"
+#: /admin/company_preferences.php:206
+msgid "Add Price from Std Cost:"
 msgstr ""
 
-#: /admin/company_preferences.php:194
-msgid "No base price list"
+#: /admin/company_preferences.php:208
+msgid "Round calculated prices to nearest:"
 msgstr ""
 
-#: /admin/company_preferences.php:195
-msgid "Add Price from Std Cost:"
+#: /admin/company_preferences.php:212
+msgid "Optional Modules"
 msgstr ""
 
-#: /admin/company_preferences.php:197
-msgid "Round to nearest:"
+#: /admin/company_preferences.php:213
+#: /includes/dashboard.inc:118
+#: /reporting/reports_main.php:285
+msgid "Manufacturing"
 msgstr ""
 
-#: /admin/company_preferences.php:200
-msgid "Search Item List"
+#: /admin/company_preferences.php:214
+#: /includes/dashboard.inc:116
+#: /inventory/manage/items.php:24
+#: /reporting/reports_main.php:308
+msgid "Fixed Assets"
 msgstr ""
 
-#: /admin/company_preferences.php:201
-msgid "Search Customer List"
+#: /admin/company_preferences.php:215
+msgid "Use Dimensions:"
 msgstr ""
 
-#: /admin/company_preferences.php:202
-msgid "Search Supplier List"
+#: /admin/company_preferences.php:217
+msgid "User Interface Options"
 msgstr ""
 
-#: /admin/company_preferences.php:204
-msgid "Home Currency:"
+#: /admin/company_preferences.php:219
+msgid "Search Item List"
 msgstr ""
 
-#: /admin/company_preferences.php:205
-msgid "Automatic Revaluation Currency Accounts"
+#: /admin/company_preferences.php:220
+msgid "Search Customer List"
 msgstr ""
 
-#: /admin/company_preferences.php:206
-msgid "Time Zone on Reports"
+#: /admin/company_preferences.php:221
+msgid "Search Supplier List"
 msgstr ""
 
-#: /admin/company_preferences.php:207
+#: /admin/company_preferences.php:222
 msgid "Login Timeout:"
 msgstr ""
 
-#: /admin/company_preferences.php:207
+#: /admin/company_preferences.php:222
 msgid "seconds"
 msgstr ""
 
-#: /admin/company_preferences.php:208
-msgid "Version Id"
-msgstr ""
-
-#: /admin/company_preferences.php:213
+#: /admin/company_preferences.php:227
 #: /admin/display_prefs.php:160
-#: /admin/gl_setup.php:260
-#: /admin/inst_chart.php:78
+#: /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:84
+#: /admin/inst_theme.php:81
 #: /dimensions/dimension_entry.php:283
-#: /gl/gl_bank.php:410
-#: /gl/gl_budget.php:135
+#: /gl/gl_bank.php:409
+#: /gl/gl_budget.php:134
 #: /gl/manage/gl_quick_entries.php:60
-#: /gl/includes/ui/gl_bank_ui.inc:277
+#: /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:174
+#: /includes/ui/db_pager_view.inc:173
 #: /includes/ui/simple_crud_class.inc:56
-#: /includes/ui/simple_crud_class.inc:227
+#: /includes/ui/simple_crud_class.inc:225
 #: /includes/ui/ui_input.inc:226
-#: /includes/ui/ui_input.inc:981
-#: /inventory/adjustments.php:218
-#: /inventory/cost_update.php:133
-#: /inventory/reorder_level.php:112
-#: /inventory/transfers.php:216
-#: /inventory/includes/item_adjustments_ui.inc:155
-#: /inventory/includes/stock_transfers_ui.inc:140
-#: /inventory/manage/sales_kits.php:210
-#: /manufacturing/work_order_entry.php:448
-#: /manufacturing/includes/work_order_issue_ui.inc:138
-#: /purchasing/includes/ui/po_ui.inc:278
-#: /purchasing/includes/ui/po_ui.inc:429
+#: /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
+#: /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/po_receive_items.php:325
 #: /sales/credit_note_entry.php:284
-#: /sales/customer_credit_invoice.php:383
-#: /sales/customer_delivery.php:530
-#: /sales/customer_invoice.php:692
-#: /sales/inquiry/sales_orders_view.php:314
-#: /sales/includes/ui/sales_credit_ui.inc:294
-#: /sales/includes/ui/sales_order_ui.inc:232
-#: /sales/includes/ui/sales_order_ui.inc:548
+#: /sales/customer_credit_invoice.php:376
+#: /sales/customer_delivery.php:527
+#: /sales/customer_invoice.php:662
+#: /sales/inquiry/sales_orders_view.php:313
+#: /sales/includes/ui/sales_credit_ui.inc:288
+#: /sales/includes/ui/sales_order_ui.inc:231
+#: /sales/includes/ui/sales_order_ui.inc:547
 msgid "Update"
 msgstr ""
 
@@ -921,7 +959,7 @@ msgstr ""
 #: /admin/create_coy.php:145
 #: /admin/create_coy.php:181
 #: /admin/create_coy.php:213
-#: /admin/db/maintenance_db.inc:250
+#: /admin/db/maintenance_db.inc:251
 msgid ""
 " is not writable. Change its permissions so it is, then re-run the operation."
 msgstr ""
@@ -992,10 +1030,10 @@ msgstr ""
 
 #: /admin/create_coy.php:241
 #: /admin/inst_lang.php:36
-#: /admin/print_profiles.php:162
+#: /admin/print_profiles.php:161
 #: /includes/ui/class.reflines_crud.inc:38
-#: /purchasing/includes/ui/invoice_ui.inc:132
-#: /purchasing/includes/ui/invoice_ui.inc:135
+#: /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"
@@ -1006,31 +1044,31 @@ msgstr ""
 #: /admin/fiscalyears.php:159
 #: /admin/inst_lang.php:85
 #: /admin/inst_lang.php:97
-#: /dimensions/inquiry/search_dimensions.php:107
+#: /dimensions/inquiry/search_dimensions.php:106
 #: /gl/manage/bank_accounts.php:128
 #: /gl/manage/currencies.php:162
-#: /gl/manage/gl_account_classes.php:127
+#: /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:100
-#: /includes/ui/ui_lists.inc:1648
-#: /purchasing/manage/suppliers.php:121
-#: /reporting/rep101.php:128
-#: /reporting/rep102.php:118
-#: /reporting/rep102.php:120
-#: /reporting/rep104.php:107
+#: /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:105
+#: /reporting/rep201.php:102
+#: /reporting/rep202.php:115
 #: /reporting/rep202.php:117
-#: /reporting/rep202.php:119
-#: /reporting/rep203.php:88
-#: /reporting/rep303.php:108
-#: /reporting/rep303.php:116
-#: /reporting/rep304.php:121
+#: /reporting/rep203.php:83
+#: /reporting/rep303.php:107
+#: /reporting/rep303.php:115
+#: /reporting/rep304.php:122
 #: /reporting/rep402.php:99
 #: /reporting/rep501.php:111
 #: /sales/manage/sales_points.php:94
@@ -1072,16 +1110,17 @@ msgid "Database Collation:"
 msgstr ""
 
 #: /admin/create_coy.php:325
-#: /admin/inst_chart.php:72
-#: /admin/inst_chart.php:74
+#: /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/inst_theme.php:79
-#: /admin/inst_theme.php:81
-#: /gl/manage/gl_account_types.php:190
+#: /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:317
+#: /includes/ui/allocation_cart.inc:316
+#: /inventory/manage/items.php:446
 msgid "None"
 msgstr ""
 
@@ -1132,7 +1171,9 @@ msgid "Category Subtype"
 msgstr ""
 
 #: /admin/crm_categories.php:88
-#: /sales/manage/customer_branches.php:279
+#: /purchasing/inquiry/suppliers_list.php:53
+#: /sales/manage/customer_branches.php:283
+#: /sales/inquiry/customers_list.php:54
 msgid "Short Name"
 msgstr ""
 
@@ -1154,6 +1195,12 @@ msgstr ""
 msgid "Category Description:"
 msgstr ""
 
+#: /admin/dashboard.php:27
+#: /themes/default/renderer.php:70
+#: /themes/default/renderer.php:78
+msgid "Dashboard"
+msgstr ""
+
 #: /admin/display_prefs.php:16
 msgid "Display Setup"
 msgstr ""
@@ -1233,7 +1280,7 @@ msgid "Excel"
 msgstr ""
 
 #: /admin/display_prefs.php:108
-#: /reporting/includes/reports_classes.inc:234
+#: /reporting/includes/reports_classes.inc:235
 msgid "PDF/Printer"
 msgstr ""
 
@@ -1242,18 +1289,18 @@ msgid "Default Report Orientation:"
 msgstr ""
 
 #: /admin/display_prefs.php:111
-#: /reporting/includes/reports_classes.inc:241
+#: /reporting/includes/reports_classes.inc:242
 msgid "Landscape"
 msgstr ""
 
 #: /admin/display_prefs.php:111
-#: /reporting/includes/reports_classes.inc:241
+#: /reporting/includes/reports_classes.inc:242
 msgid "Portrait"
 msgstr ""
 
 #: /admin/display_prefs.php:115
 #: /applications/setup.php:42
-#: /includes/sysnames.inc:94
+#: /includes/sysnames.inc:99
 msgid "Miscellaneous"
 msgstr ""
 
@@ -1392,15 +1439,15 @@ msgid "Fiscal Year End"
 msgstr ""
 
 #: /admin/fiscalyears.php:138
-#: /dimensions/inquiry/search_dimensions.php:134
-#: /dimensions/inquiry/search_dimensions.php:140
-#: /includes/ui/ui_lists.inc:671
-#: /includes/ui/ui_view.inc:1503
+#: /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
-#: /reporting/includes/excel_report.inc:234
+#: /reporting/includes/excel_report.inc:230
 #: /reporting/includes/pdf_report.inc:267
 msgid "Closed"
 msgstr ""
@@ -1435,126 +1482,134 @@ msgstr ""
 msgid "Transaction References"
 msgstr ""
 
-#: /admin/gl_setup.php:16
+#: /admin/gl_setup.php:20
 msgid "System and General GL Setup"
 msgstr ""
 
-#: /admin/gl_setup.php:30
+#: /admin/gl_setup.php:34
 msgid "The delivery over-receive allowance must be between 0 and 100."
 msgstr ""
 
-#: /admin/gl_setup.php:37
+#: /admin/gl_setup.php:41
 msgid "The invoice over-charge allowance must be between 0 and 100."
 msgstr ""
 
-#: /admin/gl_setup.php:44
+#: /admin/gl_setup.php:48
 msgid "The past due days interval allowance must be between 0 and 100."
 msgstr ""
 
-#: /admin/gl_setup.php:55
+#: /admin/gl_setup.php:59
 msgid "Before GRN Clearing Account can be changed all GRNs have to be invoiced"
 msgstr ""
 
-#: /admin/gl_setup.php:62
-#: /admin/db/fiscalyears_db.inc:141
+#: /admin/gl_setup.php:66
+#: /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:85
+#: /admin/gl_setup.php:89
 msgid "The general GL setup has been updated."
 msgstr ""
 
-#: /admin/gl_setup.php:148
+#: /admin/gl_setup.php:154
 msgid "General GL"
 msgstr ""
 
-#: /admin/gl_setup.php:150
+#: /admin/gl_setup.php:156
 msgid "Past Due Days Interval:"
 msgstr ""
 
-#: /admin/gl_setup.php:150
-#: /admin/gl_setup.php:196
-#: /admin/gl_setup.php:198
-#: /admin/gl_setup.php:206
-#: /admin/gl_setup.php:224
-#: /admin/gl_setup.php:254
+#: /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/payment_terms.php:140
 msgid "days"
 msgstr ""
 
-#: /admin/gl_setup.php:152
+#: /admin/gl_setup.php:158
 msgid "Accounts Type:"
 msgstr ""
 
-#: /admin/gl_setup.php:154
+#: /admin/gl_setup.php:160
 msgid "Retained Earnings:"
 msgstr ""
 
-#: /admin/gl_setup.php:156
+#: /admin/gl_setup.php:162
 msgid "Profit/Loss Year:"
 msgstr ""
 
-#: /admin/gl_setup.php:158
+#: /admin/gl_setup.php:164
 msgid "Exchange Variances Account:"
 msgstr ""
 
-#: /admin/gl_setup.php:160
+#: /admin/gl_setup.php:166
 #: /gl/manage/bank_accounts.php:193
 msgid "Bank Charges Account:"
 msgstr ""
 
-#: /admin/gl_setup.php:162
+#: /admin/gl_setup.php:168
 msgid "Tax Algorithm:"
 msgstr ""
 
-#: /admin/gl_setup.php:166
+#: /admin/gl_setup.php:172
+msgid "Dimension Defaults"
+msgstr ""
+
+#: /admin/gl_setup.php:174
+msgid "Dimension Required By After:"
+msgstr ""
+
+#: /admin/gl_setup.php:178
 msgid "Customers and Sales"
 msgstr ""
 
-#: /admin/gl_setup.php:168
+#: /admin/gl_setup.php:180
 msgid "Default Credit Limit:"
 msgstr ""
 
-#: /admin/gl_setup.php:170
+#: /admin/gl_setup.php:182
 msgid "Invoice Identification:"
 msgstr ""
 
-#: /admin/gl_setup.php:170
+#: /admin/gl_setup.php:182
 #: /gl/manage/bank_accounts.php:110
-#: /includes/ui/ui_view.inc:548
+#: /includes/ui/ui_view.inc:546
 msgid "Number"
 msgstr ""
 
-#: /admin/gl_setup.php:170
+#: /admin/gl_setup.php:182
 #: /admin/view_print_transaction.php:127
-#: /admin/void_transaction.php:182
-#: /dimensions/inquiry/search_dimensions.php:129
+#: /admin/void_transaction.php:181
+#: /dimensions/inquiry/search_dimensions.php:125
 #: /dimensions/view/view_dimension.php:55
-#: /gl/bank_account_reconcile.php:233
+#: /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:41
-#: /inventory/inquiry/stock_movements.php:79
+#: /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:166
+#: /manufacturing/search_work_orders.php:158
 #: /manufacturing/view/wo_issue_view.php:42
 #: /manufacturing/view/wo_production_view.php:43
-#: /manufacturing/includes/manufacturing_ui.inc:157
-#: /manufacturing/includes/manufacturing_ui.inc:200
-#: /manufacturing/includes/manufacturing_ui.inc:276
-#: /manufacturing/includes/manufacturing_ui.inc:280
-#: /manufacturing/includes/manufacturing_ui.inc:331
+#: /manufacturing/includes/manufacturing_ui.inc:174
+#: /manufacturing/includes/manufacturing_ui.inc:217
+#: /manufacturing/includes/manufacturing_ui.inc:291
+#: /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:293
+#: /purchasing/includes/ui/po_ui.inc:298
 #: /purchasing/view/view_po.php:115
 #: /purchasing/view/view_supp_credit.php:43
 #: /purchasing/view/view_supp_invoice.php:47
@@ -1562,20 +1617,20 @@ msgstr ""
 #: /purchasing/inquiry/po_search_completed.php:111
 #: /purchasing/inquiry/po_search.php:118
 #: /purchasing/inquiry/supplier_allocation_inquiry.php:138
-#: /purchasing/inquiry/supplier_inquiry.php:175
+#: /purchasing/inquiry/supplier_inquiry.php:179
 #: /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
-#: /sales/customer_credit_invoice.php:244
-#: /sales/customer_credit_invoice.php:249
-#: /sales/customer_delivery.php:336
-#: /sales/customer_delivery.php:341
-#: /sales/customer_invoice.php:463
-#: /sales/customer_invoice.php:468
-#: /sales/allocations/customer_allocation_main.php:95
+#: /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/view/view_dispatch.php:85
 #: /sales/view/view_invoice.php:85
 #: /sales/view/view_receipt.php:39
@@ -1583,179 +1638,199 @@ msgstr ""
 #: /sales/inquiry/customer_allocation_inquiry.php:148
 #: /sales/inquiry/customer_inquiry.php:205
 #: /sales/inquiry/sales_deliveries_view.php:173
-#: /sales/includes/ui/sales_credit_ui.inc:86
-#: /sales/includes/ui/sales_credit_ui.inc:88
-#: /sales/includes/ui/sales_order_ui.inc:364
+#: /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:172
+#: /admin/gl_setup.php:184
 msgid "Accumulate batch shipping:"
 msgstr ""
 
-#: /admin/gl_setup.php:174
+#: /admin/gl_setup.php:186
 msgid "Print Item Image on Quote:"
 msgstr ""
 
-#: /admin/gl_setup.php:176
+#: /admin/gl_setup.php:188
 msgid "Legal Text on Invoice:"
 msgstr ""
 
-#: /admin/gl_setup.php:178
+#: /admin/gl_setup.php:190
 msgid "Shipping Charged Account:"
 msgstr ""
 
-#: /admin/gl_setup.php:180
+#: /admin/gl_setup.php:192
 msgid "Deferred Income Account:"
 msgstr ""
 
-#: /admin/gl_setup.php:181
+#: /admin/gl_setup.php:193
 msgid "Not used"
 msgstr ""
 
-#: /admin/gl_setup.php:185
+#: /admin/gl_setup.php:197
 msgid "Customers and Sales Defaults"
 msgstr ""
 
-#: /admin/gl_setup.php:187
+#: /admin/gl_setup.php:199
 msgid "Receivable Account:"
 msgstr ""
 
-#: /admin/gl_setup.php:189
-#: /admin/gl_setup.php:240
-#: /inventory/manage/item_categories.php:196
-#: /inventory/manage/items.php:374
-#: /sales/manage/customer_branches.php:238
+#: /admin/gl_setup.php:201
+#: /admin/gl_setup.php:246
+#: /inventory/manage/item_categories.php:228
+#: /inventory/manage/items.php:468
+#: /sales/manage/customer_branches.php:242
 msgid "Sales Account:"
 msgstr ""
 
-#: /admin/gl_setup.php:192
-#: /sales/manage/customer_branches.php:239
+#: /admin/gl_setup.php:204
+#: /sales/manage/customer_branches.php:243
 msgid "Sales Discount Account:"
 msgstr ""
 
-#: /admin/gl_setup.php:194
-#: /sales/manage/customer_branches.php:241
+#: /admin/gl_setup.php:206
+#: /sales/manage/customer_branches.php:245
 msgid "Prompt Payment Discount Account:"
 msgstr ""
 
-#: /admin/gl_setup.php:196
+#: /admin/gl_setup.php:208
 msgid "Quote Valid Days:"
 msgstr ""
 
-#: /admin/gl_setup.php:198
+#: /admin/gl_setup.php:210
 msgid "Delivery Required By:"
 msgstr ""
 
-#: /admin/gl_setup.php:204
-msgid "Dimension Defaults"
-msgstr ""
-
-#: /admin/gl_setup.php:206
-msgid "Dimension Required By After:"
-msgstr ""
-
-#: /admin/gl_setup.php:210
+#: /admin/gl_setup.php:216
 msgid "Suppliers and Purchasing"
 msgstr ""
 
-#: /admin/gl_setup.php:212
+#: /admin/gl_setup.php:218
 msgid "Delivery Over-Receive Allowance:"
 msgstr ""
 
-#: /admin/gl_setup.php:214
+#: /admin/gl_setup.php:220
 msgid "Invoice Over-Charge Allowance:"
 msgstr ""
 
-#: /admin/gl_setup.php:216
+#: /admin/gl_setup.php:222
 msgid "Suppliers and Purchasing Defaults"
 msgstr ""
 
-#: /admin/gl_setup.php:218
+#: /admin/gl_setup.php:224
 msgid "Payable Account:"
 msgstr ""
 
-#: /admin/gl_setup.php:220
-#: /purchasing/manage/suppliers.php:130
+#: /admin/gl_setup.php:226
+#: /purchasing/manage/suppliers.php:131
 msgid "Purchase Discount Account:"
 msgstr ""
 
-#: /admin/gl_setup.php:222
+#: /admin/gl_setup.php:228
 msgid "GRN Clearing Account:"
 msgstr ""
 
-#: /admin/gl_setup.php:222
+#: /admin/gl_setup.php:228
 msgid "No postings on GRN"
 msgstr ""
 
-#: /admin/gl_setup.php:224
+#: /admin/gl_setup.php:230
 msgid "Receival Required By:"
 msgstr ""
 
-#: /admin/gl_setup.php:226
+#: /admin/gl_setup.php:232
 msgid "Show PO item codes:"
 msgstr ""
 
-#: /admin/gl_setup.php:228
-#: /reporting/reports_main.php:206
+#: /admin/gl_setup.php:234
+#: /reporting/reports_main.php:208
 msgid "Inventory"
 msgstr ""
 
-#: /admin/gl_setup.php:230
+#: /admin/gl_setup.php:236
 msgid "Allow Negative Inventory:"
 msgstr ""
 
-#: /admin/gl_setup.php:231
+#: /admin/gl_setup.php:237
 msgid "Warning:  This may cause a delay in GL postings"
 msgstr ""
 
-#: /admin/gl_setup.php:233
+#: /admin/gl_setup.php:239
 msgid "No zero-amounts (Service):"
 msgstr ""
 
-#: /admin/gl_setup.php:235
+#: /admin/gl_setup.php:241
 msgid "Location Notifications:"
 msgstr ""
 
-#: /admin/gl_setup.php:237
+#: /admin/gl_setup.php:243
 msgid "Allow Negative Prices:"
 msgstr ""
 
-#: /admin/gl_setup.php:239
+#: /admin/gl_setup.php:245
 msgid "Items Defaults"
 msgstr ""
 
-#: /admin/gl_setup.php:242
-#: /inventory/manage/item_categories.php:206
-#: /inventory/manage/items.php:378
+#: /admin/gl_setup.php:248
+#: /inventory/manage/item_categories.php:244
+#: /inventory/manage/items.php:477
 msgid "Inventory Account:"
 msgstr ""
 
-#: /admin/gl_setup.php:244
-#: /inventory/manage/item_categories.php:200
-#: /inventory/manage/item_categories.php:208
-#: /inventory/manage/items.php:379
-#: /inventory/manage/items.php:384
+#: /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
 msgid "C.O.G.S. Account:"
 msgstr ""
 
-#: /admin/gl_setup.php:246
-#: /inventory/manage/item_categories.php:209
-#: /inventory/manage/items.php:380
+#: /admin/gl_setup.php:252
+#: /inventory/manage/item_categories.php:247
+#: /inventory/manage/items.php:479
 msgid "Inventory Adjustments Account:"
 msgstr ""
 
-#: /admin/gl_setup.php:248
-#: /inventory/manage/item_categories.php:213
-#: /inventory/manage/items.php:391
-msgid "Item Assembly Costs Account:"
+#: /admin/gl_setup.php:254
+#: /inventory/manage/items.php:490
+msgid "WIP Account:"
 msgstr ""
 
-#: /admin/gl_setup.php:252
+#: /admin/gl_setup.php:258
+#: /sql/alter2.4rc1.php:34
+msgid "Fixed Assets Defaults"
+msgstr ""
+
+#: /admin/gl_setup.php:260
+#: /sql/alter2.4rc1.php:35
+msgid "Loss On Asset Disposal Account:"
+msgstr ""
+
+#: /admin/gl_setup.php:262
+msgid "Depreciation Period:"
+msgstr ""
+
+#: /admin/gl_setup.php:262
+#: /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/manage/recurrent_invoices.php:128
+msgid "Monthly"
+msgstr ""
+
+#: /admin/gl_setup.php:262
+#: /gl/manage/gl_quick_entries.php:247
+#: /gl/includes/ui/gl_journal_ui.inc:69
+msgid "Yearly"
+msgstr ""
+
+#: /admin/gl_setup.php:266
 msgid "Manufacturing Defaults"
 msgstr ""
 
-#: /admin/gl_setup.php:254
+#: /admin/gl_setup.php:268
 msgid "Work Order Required By After:"
 msgstr ""
 
@@ -1778,16 +1853,16 @@ msgstr ""
 #: /admin/inst_chart.php:55
 #: /admin/inst_lang.php:36
 #: /admin/inst_module.php:105
-#: /admin/inst_theme.php:57
+#: /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_theme.php:57
-#: /inventory/inquiry/stock_status.php:71
-#: /reporting/rep303.php:114
+#: /admin/inst_theme.php:55
+#: /inventory/inquiry/stock_status.php:75
+#: /reporting/rep303.php:113
 msgid "Available"
 msgstr ""
 
@@ -1797,33 +1872,33 @@ msgstr ""
 msgid "Encoding"
 msgstr ""
 
-#: /admin/inst_chart.php:73
-#: /admin/inst_chart.php:75
+#: /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:80
-#: /includes/sysnames.inc:193
+#: /admin/inst_theme.php:77
+#: /includes/sysnames.inc:207
 msgid "Unknown"
 msgstr ""
 
-#: /admin/inst_chart.php:78
+#: /admin/inst_chart.php:77
 #: /admin/inst_lang.php:103
 #: /admin/inst_module.php:131
 #: /admin/inst_module.php:136
-#: /admin/inst_theme.php:84
+#: /admin/inst_theme.php:81
 msgid "Install"
 msgstr ""
 
-#: /admin/inst_chart.php:79
+#: /admin/inst_chart.php:78
 #: /admin/inst_module.php:137
-#: /admin/inst_theme.php:85
+#: /admin/inst_theme.php:82
 msgid "Upload and install latest extension package"
 msgstr ""
 
-#: /admin/inst_chart.php:86
+#: /admin/inst_chart.php:85
 #: /admin/inst_module.php:144
-#: /admin/inst_theme.php:92
+#: /admin/inst_theme.php:89
 #, php-format
 msgid ""
 "You are about to remove package \\'%s\\'.\n"
@@ -1838,18 +1913,19 @@ msgstr ""
 #: /admin/printers.php:84
 #: /admin/shipping_companies.php:91
 #: /dimensions/dimension_entry.php:261
-#: /dimensions/inquiry/search_dimensions.php:130
+#: /dimensions/inquiry/search_dimensions.php:126
 #: /dimensions/view/view_dimension.php:55
 #: /gl/gl_journal.php:546
-#: /inventory/manage/item_categories.php:98
+#: /inventory/manage/item_categories.php:117
+#: /inventory/manage/item_categories.php:121
 #: /manufacturing/manage/work_centres.php:101
-#: /purchasing/includes/ui/invoice_ui.inc:284
-#: /purchasing/includes/ui/invoice_ui.inc:286
-#: /purchasing/includes/ui/invoice_ui.inc:288
+#: /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:280
+#: /sales/manage/customer_branches.php:284
 #: /sales/manage/sales_people.php:99
 #: /taxes/item_tax_types.php:117
 msgid "Name"
@@ -1954,54 +2030,54 @@ msgid "Install third-party extension."
 msgstr ""
 
 #: /admin/inst_module.php:167
-#: /includes/ui/ui_lists.inc:671
-#: /includes/ui/ui_lists.inc:2125
-#: /reporting/includes/excel_report.inc:232
+#: /includes/ui/ui_lists.inc:743
+#: /includes/ui/ui_lists.inc:2330
+#: /reporting/includes/excel_report.inc:228
 #: /reporting/includes/pdf_report.inc:265
 msgid "Active"
 msgstr ""
 
-#: /admin/inst_module.php:216
+#: /admin/inst_module.php:217
 #, php-format
 msgid ""
 "Package '%s' is incompatible with current application version and cannot be "
 "activated.\n"
 msgstr ""
 
-#: /admin/inst_module.php:217
+#: /admin/inst_module.php:218
 #, php-format
 msgid "Check Install/Activate page for newer package version."
 msgstr ""
 
-#: /admin/inst_module.php:236
+#: /admin/inst_module.php:234
 msgid "Status change for some extensions failed."
 msgstr ""
 
-#: /admin/inst_module.php:239
+#: /admin/inst_module.php:237
 msgid "Current active extensions set has been saved."
 msgstr ""
 
-#: /admin/inst_module.php:261
+#: /admin/inst_module.php:259
 msgid "Extensions:"
 msgstr ""
 
-#: /admin/inst_module.php:269
+#: /admin/inst_module.php:267
 msgid "No optional extension module is currently available."
 msgstr ""
 
-#: /admin/inst_theme.php:20
+#: /admin/inst_theme.php:23
 msgid "Install Themes"
 msgstr ""
 
-#: /admin/inst_theme.php:42
+#: /admin/inst_theme.php:40
 msgid "Selected theme has been successfully deleted"
 msgstr ""
 
-#: /admin/inst_theme.php:57
+#: /admin/inst_theme.php:55
 msgid "Theme"
 msgstr ""
 
-#: /admin/inst_theme.php:63
+#: /admin/inst_theme.php:61
 msgid "No optional theme is currently available."
 msgstr ""
 
@@ -2030,39 +2106,39 @@ msgid "Last log"
 msgstr ""
 
 #: /admin/inst_upgrade.php:63
-#: /admin/inst_upgrade.php:115
+#: /admin/inst_upgrade.php:116
 msgid "Upgrade"
 msgstr ""
 
-#: /admin/inst_upgrade.php:82
+#: /admin/inst_upgrade.php:83
 msgid "View log"
 msgstr ""
 
-#: /admin/inst_upgrade.php:83
+#: /admin/inst_upgrade.php:84
 msgid "Clear"
 msgstr ""
 
-#: /admin/inst_upgrade.php:83
+#: /admin/inst_upgrade.php:84
 msgid "Clear log"
 msgstr ""
 
-#: /admin/inst_upgrade.php:84
+#: /admin/inst_upgrade.php:85
 msgid "Do you really want to clear this upgrade log?"
 msgstr ""
 
-#: /admin/inst_upgrade.php:94
+#: /admin/inst_upgrade.php:95
 msgid "Up to date"
 msgstr ""
 
-#: /admin/inst_upgrade.php:111
+#: /admin/inst_upgrade.php:112
 msgid "All company database schemes are up to date."
 msgstr ""
 
-#: /admin/inst_upgrade.php:114
+#: /admin/inst_upgrade.php:115
 msgid "Select company for incremental upgrade."
 msgstr ""
 
-#: /admin/inst_upgrade.php:115
+#: /admin/inst_upgrade.php:116
 msgid "Save database and perform upgrade"
 msgstr ""
 
@@ -2108,44 +2184,43 @@ msgstr ""
 
 #: /admin/payment_terms.php:127
 #: /dimensions/dimension_entry.php:265
-#: /dimensions/inquiry/search_dimensions.php:75
-#: /dimensions/inquiry/search_dimensions.php:131
+#: /dimensions/inquiry/search_dimensions.php:74
+#: /dimensions/inquiry/search_dimensions.php:127
 #: /dimensions/view/view_dimension.php:55
-#: /gl/bank_account_reconcile.php:231
+#: /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:82
+#: /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:93
-#: /includes/ui/ui_view.inc:548
-#: /inventory/inquiry/stock_movements.php:79
-#: /inventory/manage/item_categories.php:98
-#: /manufacturing/search_work_orders.php:167
-#: /manufacturing/view/wo_costs_view.php:45
-#: /manufacturing/includes/manufacturing_ui.inc:236
-#: /manufacturing/includes/manufacturing_ui.inc:276
-#: /manufacturing/includes/manufacturing_ui.inc:280
-#: /manufacturing/includes/manufacturing_ui.inc:331
+#: /gl/includes/ui/gl_bank_ui.inc:90
+#: /includes/ui/ui_view.inc:546
+#: /inventory/inquiry/stock_movements.php:104
+#: /inventory/manage/item_categories.php:121
+#: /manufacturing/search_work_orders.php:159
+#: /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:173
-#: /reporting/rep102.php:139
-#: /reporting/rep202.php:139
+#: /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
-#: /reporting/rep704.php:83
-#: /reporting/rep704.php:86
-#: /reporting/rep704.php:89
+#: /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:341
-#: /reporting/reports_main.php:505
+#: /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
@@ -2159,7 +2234,7 @@ msgid "Due After/Days"
 msgstr ""
 
 #: /admin/payment_terms.php:140
-#: /admin/void_transaction.php:125
+#: /admin/void_transaction.php:124
 msgid "N/A"
 msgstr ""
 
@@ -2242,68 +2317,68 @@ msgstr ""
 msgid "Default printing destination"
 msgstr ""
 
-#: /admin/print_profiles.php:91
+#: /admin/print_profiles.php:90
 msgid "Printing profile name cannot be empty."
 msgstr ""
 
-#: /admin/print_profiles.php:107
+#: /admin/print_profiles.php:106
 msgid "New printing profile has been created"
 msgstr ""
 
-#: /admin/print_profiles.php:110
+#: /admin/print_profiles.php:109
 msgid "Printing profile has been updated"
 msgstr ""
 
-#: /admin/print_profiles.php:119
+#: /admin/print_profiles.php:118
 msgid "Selected printing profile has been deleted"
 msgstr ""
 
-#: /admin/print_profiles.php:130
+#: /admin/print_profiles.php:129
 msgid "Select printing profile"
 msgstr ""
 
-#: /admin/print_profiles.php:131
+#: /admin/print_profiles.php:130
 msgid "New printing profile"
 msgstr ""
 
-#: /admin/print_profiles.php:136
-#: /admin/print_profiles.php:138
+#: /admin/print_profiles.php:135
+#: /admin/print_profiles.php:137
 msgid "Printing Profile Name"
 msgstr ""
 
-#: /admin/print_profiles.php:148
+#: /admin/print_profiles.php:147
 msgid "Report Id"
 msgstr ""
 
-#: /admin/print_profiles.php:148
+#: /admin/print_profiles.php:147
 msgid "Printer"
 msgstr ""
 
-#: /admin/print_profiles.php:162
+#: /admin/print_profiles.php:161
 msgid "Browser support"
 msgstr ""
 
-#: /admin/print_profiles.php:169
+#: /admin/print_profiles.php:168
 msgid "no title was found in this report definition file."
 msgstr ""
 
-#: /admin/print_profiles.php:175
+#: /admin/print_profiles.php:174
 msgid "Add New Profile"
 msgstr ""
 
-#: /admin/print_profiles.php:177
+#: /admin/print_profiles.php:176
 msgid "Update Profile"
 msgstr ""
 
-#: /admin/print_profiles.php:178
+#: /admin/print_profiles.php:177
 msgid "Update printer profile"
 msgstr ""
 
-#: /admin/print_profiles.php:179
+#: /admin/print_profiles.php:178
 msgid "Delete Profile"
 msgstr ""
 
-#: /admin/print_profiles.php:180
+#: /admin/print_profiles.php:179
 msgid "Delete printer profile (only if not used by any user)"
 msgstr ""
 
@@ -2341,85 +2416,86 @@ msgstr ""
 msgid "Security role has been sucessfully deleted."
 msgstr ""
 
-#: /admin/security_roles.php:178
+#: /admin/security_roles.php:175
 msgid "Role:"
 msgstr ""
 
-#: /admin/security_roles.php:180
-#: /gl/manage/gl_accounts.php:198
-#: /inventory/manage/items.php:453
+#: /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
 msgid "Show inactive:"
 msgstr ""
 
-#: /admin/security_roles.php:195
+#: /admin/security_roles.php:192
 msgid "Role name:"
 msgstr ""
 
-#: /admin/security_roles.php:196
+#: /admin/security_roles.php:193
 msgid "Role description:"
 msgstr ""
 
-#: /admin/security_roles.php:197
+#: /admin/security_roles.php:194
 msgid "Current status:"
 msgstr ""
 
-#: /admin/security_roles.php:221
+#: /admin/security_roles.php:216
 msgid "On/off set of features"
 msgstr ""
 
-#: /admin/security_roles.php:240
-#: /admin/security_roles.php:246
+#: /admin/security_roles.php:235
+#: /admin/security_roles.php:241
 msgid "Update view"
 msgstr ""
 
-#: /admin/security_roles.php:241
+#: /admin/security_roles.php:236
 msgid "Insert New Role"
 msgstr ""
 
-#: /admin/security_roles.php:245
+#: /admin/security_roles.php:240
 msgid "Save Role"
 msgstr ""
 
-#: /admin/security_roles.php:247
+#: /admin/security_roles.php:242
 msgid "Clone This Role"
 msgstr ""
 
-#: /admin/security_roles.php:248
+#: /admin/security_roles.php:243
 msgid "Delete This Role"
 msgstr ""
 
-#: /admin/security_roles.php:249
-#: /admin/void_transaction.php:229
+#: /admin/security_roles.php:244
+#: /admin/void_transaction.php:228
 #: /gl/manage/gl_quick_entries.php:61
-#: /gl/includes/ui/gl_bank_ui.inc:279
+#: /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:231
-#: /includes/ui/ui_controls.inc:637
+#: /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:157
-#: /inventory/includes/stock_transfers_ui.inc:142
-#: /inventory/manage/items.php:436
-#: /manufacturing/includes/work_order_issue_ui.inc:140
-#: /purchasing/includes/ui/po_ui.inc:431
+#: /inventory/includes/item_adjustments_ui.inc:192
+#: /inventory/includes/stock_transfers_ui.inc:152
+#: /inventory/manage/items.php:545
+#: /manufacturing/includes/work_order_issue_ui.inc:134
+#: /purchasing/includes/ui/po_ui.inc:438
 #: /sales/create_recurrent_invoices.php:190
-#: /sales/includes/ui/sales_credit_ui.inc:296
-#: /sales/includes/ui/sales_order_ui.inc:550
+#: /sales/includes/ui/sales_credit_ui.inc:290
+#: /sales/includes/ui/sales_order_ui.inc:549
 msgid "Cancel"
 msgstr ""
 
-#: /admin/security_roles.php:249
-#: /inventory/manage/items.php:436
+#: /admin/security_roles.php:244
+#: /inventory/manage/items.php:545
 msgid "Cancel Edition"
 msgstr ""
 
 #: /admin/shipping_companies.php:15
-#: /sales/customer_credit_invoice.php:256
-#: /sales/customer_delivery.php:359
-#: /sales/customer_invoice.php:494
+#: /sales/customer_credit_invoice.php:253
+#: /sales/customer_delivery.php:356
+#: /sales/customer_invoice.php:470
 #: /sales/view/view_credit.php:74
 #: /sales/view/view_dispatch.php:92
 #: /sales/view/view_invoice.php:92
@@ -2463,34 +2539,36 @@ msgid "Phone Number"
 msgstr ""
 
 #: /admin/shipping_companies.php:91
-#: /inventory/manage/locations.php:146
+#: /inventory/manage/locations.php:155
 msgid "Secondary Phone"
 msgstr ""
 
 #: /admin/shipping_companies.php:91
-#: /inventory/manage/locations.php:146
+#: /inventory/manage/locations.php:155
+#: /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:188
+#: /gl/manage/gl_account_types.php:187
 #: /gl/includes/ui/gl_bank_ui.inc:57
-#: /inventory/manage/items.php:316
+#: /inventory/manage/items.php:366
 #: /manufacturing/manage/work_centres.php:137
 msgid "Name:"
 msgstr ""
 
 #: /admin/shipping_companies.php:136
-#: /purchasing/manage/suppliers.php:133
-#: /sales/manage/customer_branches.php:248
+#: /purchasing/manage/suppliers.php:134
+#: /sales/manage/customer_branches.php:252
 msgid "Contact Person:"
 msgstr ""
 
 #: /admin/shipping_companies.php:140
-#: /includes/ui/contacts_view.inc:103
-#: /inventory/manage/locations.php:205
-#: /purchasing/manage/suppliers.php:135
-#: /sales/manage/customer_branches.php:250
+#: /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
 msgid "Secondary Phone Number:"
 msgstr ""
@@ -2504,15 +2582,15 @@ msgid "Unspecified tag type"
 msgstr ""
 
 #: /admin/tags.php:40
-#: /reporting/reports_main.php:364
-#: /reporting/reports_main.php:373
-#: /reporting/reports_main.php:385
-#: /reporting/reports_main.php:416
-#: /reporting/reports_main.php:424
+#: /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:463
-#: /reporting/reports_main.php:470
-#: /reporting/reports_main.php:480
+#: /reporting/reports_main.php:446
+#: /reporting/reports_main.php:474
+#: /reporting/reports_main.php:481
+#: /reporting/reports_main.php:491
 msgid "Account Tags"
 msgstr ""
 
@@ -2587,21 +2665,22 @@ msgstr ""
 
 #: /admin/users.php:123
 #: /admin/users.php:207
-#: /includes/ui/contacts_view.inc:41
+#: /includes/ui/contacts_view.inc:40
 msgid "Full Name"
 msgstr ""
 
 #: /admin/users.php:123
-#: /includes/ui/contacts_view.inc:41
-#: /inventory/manage/locations.php:146
+#: /includes/ui/contacts_view.inc:40
+#: /inventory/manage/locations.php:155
 #: /reporting/rep106.php:94
 #: /reporting/includes/header2.inc:101
 #: /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:286
+#: /sales/manage/customer_branches.php:290
 #: /sales/view/view_sales_order.php:96
 msgid "E-mail"
 msgstr ""
@@ -2645,7 +2724,7 @@ msgstr ""
 #: /admin/view_print_transaction.php:43
 #: /admin/view_print_transaction.php:45
 #: /admin/view_print_transaction.php:129
-#: /includes/ui/ui_controls.inc:214
+#: /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
@@ -2659,27 +2738,32 @@ msgid "Only documents can be printed."
 msgstr ""
 
 #: /admin/view_print_transaction.php:79
-#: /admin/void_transaction.php:166
+#: /admin/void_transaction.php:165
 msgid "from #:"
 msgstr ""
 
 #: /admin/view_print_transaction.php:81
-#: /admin/void_transaction.php:168
+#: /admin/void_transaction.php:167
 msgid "to #:"
 msgstr ""
 
 #: /admin/view_print_transaction.php:83
-#: /admin/void_transaction.php:170
-#: /dimensions/inquiry/search_dimensions.php:88
+#: /admin/void_transaction.php:169
+#: /dimensions/inquiry/search_dimensions.php:87
+#: /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:492
+#: /purchasing/includes/ui/invoice_ui.inc:483
 #: /purchasing/inquiry/po_search_completed.php:99
 #: /purchasing/inquiry/po_search.php:78
 #: /purchasing/inquiry/supplier_allocation_inquiry.php:57
-#: /purchasing/inquiry/supplier_inquiry.php:55
+#: /purchasing/inquiry/supplier_inquiry.php:56
+#: /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:233
 msgid "Search"
@@ -2698,12 +2782,12 @@ msgid ""
 msgstr ""
 
 #: /admin/view_print_transaction.php:128
-#: /admin/void_transaction.php:183
-#: /dimensions/inquiry/search_dimensions.php:132
+#: /admin/void_transaction.php:182
+#: /dimensions/inquiry/search_dimensions.php:128
 #: /dimensions/view/view_dimension.php:55
 #: /gl/accruals.php:104
 #: /gl/accruals.php:211
-#: /gl/bank_account_reconcile.php:234
+#: /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
@@ -2711,48 +2795,50 @@ msgstr ""
 #: /gl/view/bank_transfer_view.php:83
 #: /gl/view/gl_deposit_view.php:68
 #: /gl/view/gl_payment_view.php:66
-#: /includes/ui/allocation_cart.inc:291
-#: /includes/ui/ui_view.inc:548
-#: /inventory/inquiry/stock_movements.php:84
+#: /includes/dashboard.inc:485
+#: /includes/dashboard.inc:570
+#: /includes/ui/allocation_cart.inc:290
+#: /includes/ui/ui_view.inc:546
+#: /inventory/inquiry/stock_movements.php:109
 #: /inventory/view/view_adjustment.php:44
 #: /inventory/view/view_transfer.php:37
-#: /manufacturing/search_work_orders.php:172
-#: /manufacturing/work_order_entry.php:409
-#: /manufacturing/work_order_entry.php:415
-#: /manufacturing/view/wo_costs_view.php:45
+#: /manufacturing/search_work_orders.php:164
+#: /manufacturing/work_order_entry.php:399
+#: /manufacturing/work_order_entry.php:405
+#: /manufacturing/view/wo_costs_view.php:60
 #: /manufacturing/view/wo_production_view.php:44
-#: /manufacturing/includes/manufacturing_ui.inc:157
-#: /manufacturing/includes/manufacturing_ui.inc:200
-#: /manufacturing/includes/manufacturing_ui.inc:236
-#: /manufacturing/includes/manufacturing_ui.inc:277
-#: /manufacturing/includes/manufacturing_ui.inc:281
-#: /manufacturing/includes/manufacturing_ui.inc:332
-#: /purchasing/includes/ui/invoice_ui.inc:120
-#: /purchasing/includes/ui/po_ui.inc:307
+#: /manufacturing/includes/manufacturing_ui.inc:174
+#: /manufacturing/includes/manufacturing_ui.inc:217
+#: /manufacturing/includes/manufacturing_ui.inc:253
+#: /manufacturing/includes/manufacturing_ui.inc:292
+#: /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/inquiry/supplier_allocation_inquiry.php:141
-#: /purchasing/inquiry/supplier_inquiry.php:178
+#: /purchasing/inquiry/supplier_inquiry.php:182
 #: /purchasing/allocations/supplier_allocation_main.php:97
-#: /reporting/rep101.php:133
-#: /reporting/rep107.php:205
-#: /reporting/rep201.php:110
+#: /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:83
-#: /reporting/rep704.php:86
-#: /reporting/rep704.php:89
+#: /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:138
-#: /sales/customer_delivery.php:369
-#: /sales/customer_invoice.php:509
-#: /sales/allocations/customer_allocation_main.php:96
+#: /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
@@ -2763,7 +2849,7 @@ msgid "Date"
 msgstr ""
 
 #: /admin/view_print_transaction.php:130
-#: /admin/void_transaction.php:184
+#: /admin/void_transaction.php:183
 #: /includes/ui/ui_view.inc:51
 msgid "GL"
 msgstr ""
@@ -2772,107 +2858,115 @@ msgstr ""
 msgid "Void a Transaction"
 msgstr ""
 
-#: /admin/void_transaction.php:126
-#: /admin/void_transaction.php:185
+#: /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
+#: /inventory/inquiry/stock_list.php:66
+#: /inventory/inquiry/stock_list.php:69
+#: /purchasing/inquiry/suppliers_list.php:65
+#: /purchasing/inquiry/suppliers_list.php:68
+#: /sales/inquiry/customer_branches_list.php:60
+#: /sales/inquiry/customers_list.php:66
+#: /sales/inquiry/customers_list.php:69
 msgid "Select"
 msgstr ""
 
-#: /admin/void_transaction.php:157
-#: /includes/ui/class.reflines_crud.inc:89
-#: /includes/ui/class.reflines_crud.inc:92
+#: /admin/void_transaction.php:156
+#: /includes/ui/class.reflines_crud.inc:90
+#: /includes/ui/class.reflines_crud.inc:93
 msgid "Transaction Type:"
 msgstr ""
 
-#: /admin/void_transaction.php:204
+#: /admin/void_transaction.php:203
 msgid "Transaction #:"
 msgstr ""
 
-#: /admin/void_transaction.php:206
+#: /admin/void_transaction.php:205
 msgid "Voiding Date:"
 msgstr ""
 
-#: /admin/void_transaction.php:208
+#: /admin/void_transaction.php:207
 #: /dimensions/dimension_entry.php:273
-#: /gl/bank_transfer.php:138
+#: /gl/bank_transfer.php:137
 #: /gl/inquiry/journal_inquiry.php:53
-#: /gl/manage/revaluate_currencies.php:98
-#: /includes/ui/class.reflines_crud.inc:104
+#: /gl/manage/revaluate_currencies.php:96
+#: /includes/ui/class.reflines_crud.inc:105
 #: /includes/ui/ui_view.inc:344
-#: /manufacturing/work_order_add_finished.php:197
-#: /manufacturing/work_order_costs.php:145
-#: /manufacturing/work_order_entry.php:440
+#: /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:199
-#: /purchasing/includes/ui/po_ui.inc:458
-#: /purchasing/po_entry_items.php:477
+#: /purchasing/includes/ui/invoice_ui.inc:193
+#: /purchasing/includes/ui/po_ui.inc:465
+#: /purchasing/po_entry_items.php:486
 #: /purchasing/supplier_payment.php:319
-#: /sales/customer_invoice.php:688
-#: /sales/customer_payments.php:386
+#: /sales/customer_invoice.php:658
+#: /sales/customer_payments.php:378
 msgid "Memo:"
 msgstr ""
 
-#: /admin/void_transaction.php:213
-#: /admin/void_transaction.php:222
+#: /admin/void_transaction.php:212
+#: /admin/void_transaction.php:221
 msgid "Void Transaction"
 msgstr ""
 
-#: /admin/void_transaction.php:218
+#: /admin/void_transaction.php:217
 msgid "The entered transaction does not exist or cannot be voided."
 msgstr ""
 
-#: /admin/void_transaction.php:226
+#: /admin/void_transaction.php:225
 msgid ""
 "Are you sure you want to void this transaction ? This action cannot be "
 "undone."
 msgstr ""
 
-#: /admin/void_transaction.php:228
-#: /includes/ui/ui_controls.inc:636
+#: /admin/void_transaction.php:227
+#: /includes/ui/ui_controls.inc:644
 msgid "Proceed"
 msgstr ""
 
-#: /admin/void_transaction.php:242
+#: /admin/void_transaction.php:241
 msgid "The selected transaction was closed for edition and cannot be voided."
 msgstr ""
 
-#: /admin/void_transaction.php:248
+#: /admin/void_transaction.php:247
 #: /gl/accruals.php:42
-#: /gl/bank_transfer.php:160
+#: /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
 #: /gl/manage/exchange_rates.php:33
-#: /gl/manage/revaluate_currencies.php:53
+#: /gl/manage/revaluate_currencies.php:51
 #: /manufacturing/work_order_add_finished.php:89
-#: /manufacturing/work_order_costs.php:79
+#: /manufacturing/work_order_costs.php:80
 #: /purchasing/po_receive_items.php:174
 #: /purchasing/supplier_payment.php:185
 #: /sales/customer_credit_invoice.php:90
-#: /sales/sales_order_entry.php:363
+#: /sales/sales_order_entry.php:368
 #: /sales/manage/recurrent_invoices.php:60
 #: /sales/manage/recurrent_invoices.php:66
 #: /sales/manage/recurrent_invoices.php:71
 msgid "The entered date is invalid."
 msgstr ""
 
-#: /admin/void_transaction.php:254
+#: /admin/void_transaction.php:253
 msgid "The entered date is not in fiscal year."
 msgstr ""
 
-#: /admin/void_transaction.php:261
+#: /admin/void_transaction.php:260
 msgid "The transaction number is expected to be numeric and greater than zero."
 msgstr ""
 
-#: /admin/void_transaction.php:278
+#: /admin/void_transaction.php:277
 msgid "The selected transaction has already been voided."
 msgstr ""
 
-#: /admin/void_transaction.php:291
+#: /admin/void_transaction.php:290
 msgid "Selected transaction has been voided."
 msgstr ""
 
@@ -2880,21 +2974,21 @@ msgstr ""
 msgid "Attached File:"
 msgstr ""
 
-#: /admin/db/fiscalyears_db.inc:136
+#: /admin/db/fiscalyears_db.inc:137
 msgid ""
 "The Retained Earnings Account or the Profit and Loss Year Account has not "
 "been set in System and General GL Setup"
 msgstr ""
 
-#: /admin/db/fiscalyears_db.inc:166
 #: /admin/db/fiscalyears_db.inc:167
 #: /admin/db/fiscalyears_db.inc:168
+#: /admin/db/fiscalyears_db.inc:169
 msgid "Closing Year"
 msgstr ""
 
-#: /admin/db/fiscalyears_db.inc:219
-#: /reporting/rep101.php:188
-#: /reporting/rep201.php:165
+#: /admin/db/fiscalyears_db.inc:220
+#: /reporting/rep101.php:187
+#: /reporting/rep201.php:162
 #: /reporting/rep706.php:185
 msgid "Open Balance"
 msgstr ""
@@ -2909,11 +3003,11 @@ msgstr ""
 msgid "Cannot write to the extensions setup file '%s'."
 msgstr ""
 
-#: /admin/db/maintenance_db.inc:178
+#: /admin/db/maintenance_db.inc:179
 msgid "Cannot update system extensions list."
 msgstr ""
 
-#: /admin/db/maintenance_db.inc:196
+#: /admin/db/maintenance_db.inc:197
 #, php-format
 msgid "Cannot update extensions list for company '%s'."
 msgstr ""
@@ -2926,26 +3020,26 @@ msgstr ""
 msgid "Cannot write to the language file - "
 msgstr ""
 
-#: /admin/db/maintenance_db.inc:250
+#: /admin/db/maintenance_db.inc:251
 msgid "The language files folder "
 msgstr ""
 
-#: /admin/db/maintenance_db.inc:399
+#: /admin/db/maintenance_db.inc:400
 msgid ""
 "This is new format backup file which cannot be restored on database not "
 "migrated to utf8."
 msgstr ""
 
-#: /admin/db/maintenance_db.inc:483
+#: /admin/db/maintenance_db.inc:484
 #, php-format
 msgid "SQL script execution failed in line %d: %s"
 msgstr ""
 
-#: /admin/db/users_db.inc:224
+#: /admin/db/users_db.inc:207
 msgid "user online"
 msgstr ""
 
-#: /admin/db/users_db.inc:224
+#: /admin/db/users_db.inc:207
 msgid "users online"
 msgstr ""
 
@@ -2953,37 +3047,52 @@ msgstr ""
 msgid "This transaction was already voided before."
 msgstr ""
 
-#: /admin/db/voiding_db.inc:35
-#: /admin/db/voiding_db.inc:44
+#: /admin/db/voiding_db.inc:30
+#, php-format
+msgid ""
+"This transaction cannot be voided because it is part of Work Order %s costs."
+msgstr ""
+
+#: /admin/db/voiding_db.inc:37
+#: /admin/db/voiding_db.inc:46
 msgid ""
 "This transaction cannot be voided because the operation would decrease "
 "account balance below allowed limit in some point of account history."
 msgstr ""
 
-#: /admin/db/voiding_db.inc:47
+#: /admin/db/voiding_db.inc:49
 msgid "This invoice cannot be voided because it was already credited."
 msgstr ""
 
-#: /admin/db/voiding_db.inc:56
+#: /admin/db/voiding_db.inc:58
 msgid "This delivery cannot be voided because it was already invoiced."
 msgstr ""
 
-#: /admin/db/voiding_db.inc:74
-#: /admin/db/voiding_db.inc:109
-#: /admin/db/voiding_db.inc:112
+#: /admin/db/voiding_db.inc:76
+#: /admin/db/voiding_db.inc:119
+#: /admin/db/voiding_db.inc:122
 msgid "This transaction type cannot be voided."
 msgstr ""
 
-#: /admin/db/voiding_db.inc:79
+#: /admin/db/voiding_db.inc:81
 msgid "This GRN cannot be voided because it was already invoiced."
 msgstr ""
 
-#: /admin/db/voiding_db.inc:86
+#: /admin/db/voiding_db.inc:83
+#: /admin/db/voiding_db.inc:92
 msgid "Error encountered when voiding transaction."
 msgstr ""
 
-#: /admin/db/voiding_db.inc:117
-#: /sales/includes/db/sales_invoice_db.inc:254
+#: /admin/db/voiding_db.inc:105
+#: /admin/db/voiding_db.inc:113
+#, php-format
+msgid ""
+"Selected document cannot be voided because related Work Order %s is already "
+"closed."
+msgstr ""
+
+#: /admin/db/voiding_db.inc:127
+#: /sales/includes/db/sales_invoice_db.inc:244
 msgid "Voided."
 msgstr ""
 
@@ -2993,6 +3102,7 @@ msgstr ""
 
 #: /applications/customers.php:18
 #: /applications/dimensions.php:21
+#: /applications/fixed_assets.php:18
 #: /applications/generalledger.php:18
 #: /applications/inventory.php:18
 #: /applications/manufacturing.php:18
@@ -3054,6 +3164,7 @@ msgstr ""
 
 #: /applications/customers.php:49
 #: /applications/dimensions.php:27
+#: /applications/fixed_assets.php:33
 #: /applications/generalledger.php:34
 #: /applications/inventory.php:24
 #: /applications/manufacturing.php:24
@@ -3083,6 +3194,7 @@ msgstr ""
 
 #: /applications/customers.php:62
 #: /applications/dimensions.php:34
+#: /applications/fixed_assets.php:43
 #: /applications/generalledger.php:55
 #: /applications/inventory.php:32
 #: /applications/manufacturing.php:34
@@ -3147,6 +3259,58 @@ msgstr ""
 msgid "Dimension &Tags"
 msgstr ""
 
+#: /applications/fixed_assets.php:16
+msgid "&Fixed Assets"
+msgstr ""
+
+#: /applications/fixed_assets.php:19
+msgid "Fixed Assets &Purchase"
+msgstr ""
+
+#: /applications/fixed_assets.php:21
+msgid "Fixed Assets Location &Transfers"
+msgstr ""
+
+#: /applications/fixed_assets.php:23
+msgid "Fixed Assets &Disposal"
+msgstr ""
+
+#: /applications/fixed_assets.php:25
+msgid "Fixed Assets &Sale"
+msgstr ""
+
+#: /applications/fixed_assets.php:27
+msgid "Process &Depreciation"
+msgstr ""
+
+#: /applications/fixed_assets.php:34
+msgid "Fixed Assets &Movements"
+msgstr ""
+
+#: /applications/fixed_assets.php:36
+msgid "Fixed Assets In&quiry"
+msgstr ""
+
+#: /applications/fixed_assets.php:40
+msgid "Fixed Assets &Reports"
+msgstr ""
+
+#: /applications/fixed_assets.php:45
+msgid "Fixed &Assets"
+msgstr ""
+
+#: /applications/fixed_assets.php:47
+msgid "Fixed Assets &Locations"
+msgstr ""
+
+#: /applications/fixed_assets.php:49
+msgid "Fixed Assets &Categories"
+msgstr ""
+
+#: /applications/fixed_assets.php:51
+msgid "Fixed Assets Cl&asses"
+msgstr ""
+
 #: /applications/generalledger.php:16
 msgid "&Banking and General Ledger"
 msgstr ""
@@ -3196,9 +3360,9 @@ msgid "Ta&x Inquiry"
 msgstr ""
 
 #: /applications/generalledger.php:44
-#: /reporting/reports_main.php:391
-#: /reporting/reports_main.php:441
-#: /reporting/reports_main.php:486
+#: /reporting/reports_main.php:402
+#: /reporting/reports_main.php:452
+#: /reporting/reports_main.php:497
 msgid "Trial &Balance"
 msgstr ""
 
@@ -3307,7 +3471,7 @@ msgid "&Units of Measure"
 msgstr ""
 
 #: /applications/inventory.php:45
-#: /inventory/manage/items.php:478
+#: /inventory/manage/items.php:591
 msgid "&Reorder Levels"
 msgstr ""
 
@@ -3324,7 +3488,7 @@ msgid "Purchasing &Pricing"
 msgstr ""
 
 #: /applications/inventory.php:53
-#: /inventory/manage/items.php:477
+#: /inventory/manage/items.php:590
 msgid "Standard &Costs"
 msgstr ""
 
@@ -3333,7 +3497,7 @@ msgid "&Manufacturing"
 msgstr ""
 
 #: /applications/manufacturing.php:19
-#: /sales/sales_order_entry.php:126
+#: /sales/sales_order_entry.php:131
 msgid "Work &Order Entry"
 msgstr ""
 
@@ -3573,7 +3737,7 @@ msgstr ""
 #: /dimensions/dimension_entry.php:128
 #: /manufacturing/work_order_entry.php:145
 #: /manufacturing/work_order_entry.php:223
-#: /purchasing/po_entry_items.php:238
+#: /purchasing/po_entry_items.php:250
 msgid "The date entered is in an invalid format."
 msgstr ""
 
@@ -3595,39 +3759,39 @@ msgid "Dimension Reference:"
 msgstr ""
 
 #: /dimensions/dimension_entry.php:267
-#: /reporting/reports_main.php:34
-#: /reporting/reports_main.php:64
-#: /reporting/reports_main.php:80
-#: /reporting/reports_main.php:89
-#: /reporting/reports_main.php:151
-#: /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:319
-#: /reporting/reports_main.php:327
-#: /reporting/reports_main.php:339
-#: /reporting/reports_main.php:351
-#: /reporting/reports_main.php:369
+#: /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:392
-#: /reporting/reports_main.php:405
-#: /reporting/reports_main.php:421
-#: /reporting/reports_main.php:431
+#: /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:454
-#: /reporting/reports_main.php:468
-#: /reporting/reports_main.php:477
-#: /reporting/reports_main.php:487
-#: /reporting/reports_main.php:496
-#: /reporting/reports_main.php:503
+#: /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
 msgid "Start Date"
 msgstr ""
 
 #: /dimensions/dimension_entry.php:269
-#: /manufacturing/work_order_entry.php:410
+#: /manufacturing/work_order_entry.php:400
 msgid "Date Required By"
 msgstr ""
 
@@ -3669,10 +3833,10 @@ msgstr ""
 
 #: /dimensions/dimension_entry.php:292
 #: /includes/ui/class.crud_view.inc:296
-#: /includes/ui/simple_crud_class.inc:225
-#: /purchasing/includes/ui/invoice_ui.inc:225
-#: /purchasing/includes/ui/invoice_ui.inc:430
-#: /purchasing/includes/ui/invoice_ui.inc:432
+#: /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
 msgid "Add"
 msgstr ""
 
@@ -3690,12 +3854,13 @@ msgstr ""
 #: /gl/inquiry/gl_trial_balance.php:184
 #: /gl/manage/gl_quick_entries.php:248
 #: /gl/manage/gl_quick_entries.php:342
-#: /includes/sysnames.inc:165
-#: /purchasing/includes/ui/invoice_ui.inc:284
-#: /purchasing/includes/ui/invoice_ui.inc:286
-#: /purchasing/includes/ui/invoice_ui.inc:288
-#: /reporting/rep701.php:111
-#: /reporting/rep705.php:238
+#: /includes/dashboard.inc:605
+#: /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
+#: /reporting/rep705.php:235
 #: /reporting/rep706.php:185
 #: /reporting/rep707.php:210
 #: /reporting/rep708.php:192
@@ -3704,7 +3869,7 @@ msgstr ""
 
 #: /dimensions/includes/dimensions_ui.inc:31
 #: /gl/accruals.php:112
-#: /gl/bank_account_reconcile.php:235
+#: /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
@@ -3718,14 +3883,15 @@ msgstr ""
 #: /gl/includes/ui/gl_journal_ui.inc:103
 #: /gl/includes/ui/gl_journal_ui.inc:106
 #: /gl/includes/ui/gl_journal_ui.inc:109
+#: /manufacturing/view/wo_costs_view.php:61
 #: /purchasing/inquiry/supplier_allocation_inquiry.php:144
-#: /purchasing/inquiry/supplier_inquiry.php:181
+#: /purchasing/inquiry/supplier_inquiry.php:185
 #: /reporting/rep601.php:80
 #: /reporting/rep602.php:81
 #: /reporting/rep702.php:54
-#: /reporting/rep704.php:84
-#: /reporting/rep704.php:87
-#: /reporting/rep704.php:90
+#: /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
@@ -3735,7 +3901,7 @@ msgstr ""
 
 #: /dimensions/includes/dimensions_ui.inc:31
 #: /gl/accruals.php:112
-#: /gl/bank_account_reconcile.php:236
+#: /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
@@ -3749,15 +3915,16 @@ msgstr ""
 #: /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:85
+#: /includes/sysnames.inc:90
+#: /manufacturing/view/wo_costs_view.php:61
 #: /purchasing/inquiry/supplier_allocation_inquiry.php:145
-#: /purchasing/inquiry/supplier_inquiry.php:182
+#: /purchasing/inquiry/supplier_inquiry.php:186
 #: /reporting/rep601.php:80
 #: /reporting/rep602.php:81
 #: /reporting/rep702.php:54
-#: /reporting/rep704.php:84
-#: /reporting/rep704.php:87
-#: /reporting/rep704.php:90
+#: /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
@@ -3766,22 +3933,23 @@ msgid "Credit"
 msgstr ""
 
 #: /dimensions/includes/dimensions_ui.inc:45
-#: /dimensions/inquiry/search_dimensions.php:135
+#: /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
+#: /includes/dashboard.inc:605
 #: /purchasing/inquiry/supplier_allocation_inquiry.php:147
-#: /reporting/rep101.php:137
-#: /reporting/rep201.php:114
-#: /reporting/rep203.php:94
+#: /reporting/rep101.php:136
+#: /reporting/rep201.php:111
+#: /reporting/rep203.php:89
 #: /reporting/rep204.php:84
-#: /reporting/rep307.php:117
+#: /reporting/rep307.php:114
 #: /reporting/rep601.php:80
 #: /reporting/rep602.php:81
-#: /reporting/rep701.php:111
-#: /reporting/rep704.php:84
-#: /reporting/rep704.php:87
-#: /reporting/rep704.php:90
+#: /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
 msgid "Balance"
@@ -3795,115 +3963,119 @@ msgstr ""
 msgid "Search Dimensions"
 msgstr ""
 
-#: /dimensions/inquiry/search_dimensions.php:73
-#: /gl/bank_transfer.php:118
+#: /dimensions/inquiry/search_dimensions.php:72
+#: /gl/bank_transfer.php:117
 #: /gl/inquiry/journal_inquiry.php:45
-#: /gl/manage/revaluate_currencies.php:97
+#: /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:94
+#: /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:186
-#: /manufacturing/work_order_costs.php:133
-#: /manufacturing/work_order_entry.php:368
-#: /manufacturing/work_order_entry.php:375
-#: /manufacturing/includes/work_order_issue_ui.inc:167
-#: /purchasing/includes/ui/invoice_ui.inc:122
+#: /manufacturing/work_order_add_finished.php:185
+#: /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:290
-#: /sales/customer_payments.php:355
+#: /sales/customer_payments.php:347
 msgid "Reference:"
 msgstr ""
 
-#: /dimensions/inquiry/search_dimensions.php:75
-#: /includes/ui/allocation_cart.inc:315
-#: /includes/ui/ui_lists.inc:1895
-#: /reporting/rep101.php:115
-#: /reporting/rep102.php:101
-#: /reporting/rep104.php:97
-#: /reporting/rep104.php:101
+#: /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:92
-#: /reporting/rep202.php:100
-#: /reporting/rep203.php:74
+#: /reporting/rep201.php:89
+#: /reporting/rep202.php:98
+#: /reporting/rep203.php:69
 #: /reporting/rep204.php:77
-#: /reporting/rep301.php:156
-#: /reporting/rep301.php:163
-#: /reporting/rep302.php:104
-#: /reporting/rep302.php:111
-#: /reporting/rep303.php:96
-#: /reporting/rep303.php:103
-#: /reporting/rep304.php:108
-#: /reporting/rep304.php:113
-#: /reporting/rep304.php:118
+#: /reporting/rep301.php:159
+#: /reporting/rep301.php:166
+#: /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:110
+#: /reporting/rep307.php:108
 #: /reporting/rep308.php:231
 #: /reporting/rep308.php:236
-#: /reporting/rep309.php:92
+#: /reporting/rep309.php:93
 #: /reporting/rep402.php:87
 #: /reporting/rep402.php:95
+#: /reporting/rep451.php:57
+#: /reporting/rep451.php:64
 #: /reporting/rep702.php:61
 #: /reporting/rep710.php:86
 #: /reporting/rep710.php:87
 msgid "All"
 msgstr ""
 
-#: /dimensions/inquiry/search_dimensions.php:76
+#: /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
-#: /gl/inquiry/profit_loss.php:168
+#: /gl/inquiry/profit_loss.php:175
 #: /gl/includes/ui/gl_bank_ui.inc:52
-#: /gl/includes/ui/gl_bank_ui.inc:120
-#: /inventory/inquiry/stock_movements.php:59
+#: /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:50
+#: /purchasing/inquiry/supplier_inquiry.php:51
 #: /sales/inquiry/customer_inquiry.php:46
 msgid "From:"
 msgstr ""
 
-#: /dimensions/inquiry/search_dimensions.php:77
+#: /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
-#: /gl/inquiry/profit_loss.php:169
-#: /inventory/inquiry/stock_movements.php:60
+#: /gl/inquiry/profit_loss.php:176
+#: /inventory/inquiry/stock_movements.php:86
 #: /purchasing/inquiry/supplier_allocation_inquiry.php:51
-#: /purchasing/inquiry/supplier_inquiry.php:51
+#: /purchasing/inquiry/supplier_inquiry.php:52
 #: /sales/inquiry/customer_inquiry.php:47
 msgid "To:"
 msgstr ""
 
-#: /dimensions/inquiry/search_dimensions.php:79
+#: /dimensions/inquiry/search_dimensions.php:78
 #: /manufacturing/search_work_orders.php:77
 msgid "Only Overdue:"
 msgstr ""
 
-#: /dimensions/inquiry/search_dimensions.php:83
+#: /dimensions/inquiry/search_dimensions.php:82
 #: /manufacturing/search_work_orders.php:80
 msgid "Only Open:"
 msgstr ""
 
-#: /dimensions/inquiry/search_dimensions.php:133
+#: /dimensions/inquiry/search_dimensions.php:129
 #: /dimensions/view/view_dimension.php:55
-#: /includes/ui/allocation_cart.inc:291
-#: /purchasing/includes/ui/invoice_ui.inc:147
+#: /includes/dashboard.inc:485
+#: /includes/dashboard.inc:570
+#: /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:179
-#: /reporting/rep101.php:133
-#: /reporting/rep201.php:110
-#: /reporting/rep203.php:93
+#: /purchasing/inquiry/supplier_inquiry.php:183
+#: /reporting/rep101.php:132
+#: /reporting/rep201.php:107
+#: /reporting/rep203.php:88
 #: /reporting/rep501.php:87
 #: /reporting/includes/doctext.inc:111
 #: /reporting/includes/doctext.inc:143
@@ -3911,16 +4083,16 @@ msgstr ""
 #: /reporting/includes/doctext.inc:166
 #: /reporting/includes/doctext.inc:205
 #: /reporting/includes/doctext.inc:207
-#: /sales/customer_invoice.php:516
+#: /sales/customer_invoice.php:492
 #: /sales/view/view_dispatch.php:97
 #: /sales/view/view_invoice.php:96
 #: /sales/inquiry/customer_allocation_inquiry.php:151
 #: /sales/inquiry/customer_inquiry.php:207
-#: /sales/includes/ui/sales_order_ui.inc:589
+#: /sales/includes/ui/sales_order_ui.inc:588
 msgid "Due Date"
 msgstr ""
 
-#: /dimensions/inquiry/search_dimensions.php:144
+#: /dimensions/inquiry/search_dimensions.php:140
 msgid "Marked dimensions are overdue."
 msgstr ""
 
@@ -3959,35 +4131,35 @@ msgid "to:"
 msgstr ""
 
 #: /dimensions/view/view_dimension.php:87
-#: /gl/inquiry/balance_sheet.php:131
+#: /gl/inquiry/balance_sheet.php:130
 #: /gl/inquiry/bank_inquiry.php:53
 #: /gl/inquiry/gl_account_inquiry.php:85
 #: /gl/inquiry/gl_trial_balance.php:63
-#: /gl/inquiry/profit_loss.php:181
+#: /gl/inquiry/profit_loss.php:188
 #: /gl/inquiry/tax_inquiry.php:63
 msgid "Show"
 msgstr ""
 
 #: /gl/accruals.php:30
-#: /includes/access_levels.inc:245
+#: /includes/access_levels.inc:266
 msgid "Revenue / Cost Accruals"
 msgstr ""
 
 #: /gl/accruals.php:48
-#: /gl/bank_transfer.php:166
-#: /gl/gl_bank.php:262
+#: /gl/bank_transfer.php:165
+#: /gl/gl_bank.php:261
 #: /gl/gl_journal.php:223
 #: /gl/gl_journal.php:262
-#: /gl/manage/revaluate_currencies.php:59
-#: /inventory/adjustments.php:105
-#: /inventory/transfers.php:99
+#: /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:85
+#: /manufacturing/work_order_costs.php:86
 #: /manufacturing/work_order_entry.php:151
-#: /manufacturing/work_order_issue.php:84
-#: /purchasing/po_entry_items.php:342
+#: /manufacturing/work_order_issue.php:82
+#: /purchasing/po_entry_items.php:351
 #: /purchasing/po_receive_items.php:179
-#: /purchasing/supplier_credit.php:187
+#: /purchasing/supplier_credit.php:186
 #: /purchasing/supplier_invoice.php:195
 #: /purchasing/supplier_payment.php:191
 #: /sales/create_recurrent_invoices.php:87
@@ -3995,9 +4167,9 @@ msgstr ""
 #: /sales/credit_note_entry.php:157
 #: /sales/customer_credit_invoice.php:94
 #: /sales/customer_delivery.php:164
-#: /sales/customer_invoice.php:321
+#: /sales/customer_invoice.php:303
 #: /sales/customer_payments.php:157
-#: /sales/sales_order_entry.php:368
+#: /sales/sales_order_entry.php:373
 msgid ""
 "The entered date is out of fiscal year or is closed for further data entry."
 msgstr ""
@@ -4025,19 +4197,19 @@ msgstr ""
 #: /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:72
-#: /gl/gl_budget.php:76
-#: /gl/inquiry/balance_sheet.php:128
-#: /gl/inquiry/balance_sheet.php:130
+#: /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:177
-#: /gl/inquiry/profit_loss.php:179
+#: /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
@@ -4050,38 +4222,40 @@ 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:152
-#: /gl/includes/ui/gl_bank_ui.inc:153
-#: /gl/includes/ui/gl_bank_ui.inc:155
+#: /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
+#: /includes/dashboard.inc:333
 #: /includes/sysnames.inc:43
-#: /includes/sysnames.inc:166
-#: /inventory/manage/item_categories.php:220
-#: /inventory/manage/item_categories.php:222
-#: /inventory/manage/items.php:363
-#: /inventory/manage/items.php:365
-#: /purchasing/includes/ui/invoice_ui.inc:132
-#: /purchasing/includes/ui/invoice_ui.inc:284
-#: /purchasing/includes/ui/invoice_ui.inc:286
+#: /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:146
 #: /purchasing/manage/suppliers.php:147
-#: /purchasing/manage/suppliers.php:149
-#: /reporting/rep103.php:242
-#: /reporting/rep103.php:254
-#: /reporting/rep205.php:161
-#: /reporting/rep205.php:173
+#: /purchasing/manage/suppliers.php:148
+#: /purchasing/manage/suppliers.php:150
+#: /reporting/rep103.php:240
+#: /reporting/rep103.php:252
+#: /reporting/rep205.php:152
+#: /reporting/rep205.php:164
 #: /reporting/rep501.php:92
-#: /reporting/rep704.php:83
-#: /reporting/rep704.php:86
-#: /reporting/rep704.php:97
-#: /reporting/rep704.php:99
-#: /reporting/rep704.php:107
-#: /reporting/rep705.php:249
-#: /reporting/rep705.php:251
-#: /reporting/rep705.php:262
+#: /reporting/rep704.php:82
+#: /reporting/rep704.php:85
+#: /reporting/rep704.php:96
+#: /reporting/rep704.php:98
+#: /reporting/rep704.php:106
+#: /reporting/rep705.php:246
+#: /reporting/rep705.php:248
+#: /reporting/rep705.php:259
 #: /reporting/rep706.php:194
 #: /reporting/rep706.php:196
 #: /reporting/rep706.php:204
@@ -4091,31 +4265,31 @@ msgstr ""
 #: /reporting/rep708.php:201
 #: /reporting/rep708.php:203
 #: /reporting/rep708.php:210
-#: /reporting/reports_main.php:355
-#: /reporting/reports_main.php:356
-#: /reporting/reports_main.php:362
-#: /reporting/reports_main.php:363
-#: /reporting/reports_main.php:371
-#: /reporting/reports_main.php:372
+#: /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:384
-#: /reporting/reports_main.php:396
-#: /reporting/reports_main.php:397
-#: /reporting/reports_main.php:409
-#: /reporting/reports_main.php:415
-#: /reporting/reports_main.php:423
+#: /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:446
-#: /sales/customer_delivery.php:386
-#: /sales/customer_delivery.php:394
-#: /sales/customer_invoice.php:481
-#: /sales/customer_invoice.php:524
+#: /reporting/reports_main.php:445
+#: /reporting/reports_main.php:457
+#: /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/includes/ui/sales_credit_ui.inc:128
 #: /sales/includes/ui/sales_credit_ui.inc:133
-#: /sales/includes/ui/sales_credit_ui.inc:138
-#: /sales/includes/ui/sales_order_ui.inc:444
-#: /sales/includes/ui/sales_order_ui.inc:449
+#: /sales/includes/ui/sales_order_ui.inc:441
+#: /sales/includes/ui/sales_order_ui.inc:446
 msgid "Dimension"
 msgstr ""
 
@@ -4138,25 +4312,26 @@ msgstr ""
 #: /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:156
-#: /gl/includes/ui/gl_bank_ui.inc:159
-#: /gl/includes/ui/gl_bank_ui.inc:312
+#: /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/includes/item_adjustments_ui.inc:179
-#: /inventory/includes/stock_transfers_ui.inc:164
-#: /manufacturing/view/wo_costs_view.php:45
-#: /manufacturing/includes/work_order_issue_ui.inc:177
-#: /purchasing/includes/ui/invoice_ui.inc:284
-#: /purchasing/includes/ui/invoice_ui.inc:286
-#: /purchasing/includes/ui/invoice_ui.inc:288
-#: /sales/customer_credit_invoice.php:366
-#: /sales/customer_delivery.php:526
-#: /sales/includes/ui/sales_credit_ui.inc:340
+#: /inventory/cost_update.php:146
+#: /inventory/includes/item_adjustments_ui.inc:214
+#: /inventory/includes/stock_transfers_ui.inc:174
+#: /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
+#: /sales/customer_credit_invoice.php:359
+#: /sales/customer_delivery.php:523
+#: /sales/includes/ui/sales_credit_ui.inc:334
 msgid "Memo"
 msgstr ""
 
@@ -4176,14 +4351,6 @@ msgstr ""
 msgid "Bi-weekly"
 msgstr ""
 
-#: /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/manage/recurrent_invoices.php:128
-msgid "Monthly"
-msgstr ""
-
 #: /gl/accruals.php:199
 msgid "Quarterly"
 msgstr ""
@@ -4201,10 +4368,10 @@ msgid "Revenue / Cost Account"
 msgstr ""
 
 #: /gl/accruals.php:224
-#: /gl/gl_budget.php:91
-#: /gl/gl_budget.php:93
+#: /gl/gl_budget.php:90
+#: /gl/gl_budget.php:92
 #: /gl/inquiry/journal_inquiry.php:113
-#: /gl/inquiry/tax_inquiry.php:82
+#: /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
@@ -4219,28 +4386,35 @@ msgstr ""
 #: /gl/view/gl_payment_view.php:104
 #: /gl/view/gl_payment_view.php:107
 #: /gl/view/gl_payment_view.php:110
+#: /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:156
-#: /gl/includes/ui/gl_bank_ui.inc:159
-#: /includes/sysnames.inc:133
-#: /includes/ui/allocation_cart.inc:291
-#: /includes/ui/ui_lists.inc:1179
-#: /manufacturing/view/wo_costs_view.php:45
-#: /manufacturing/includes/manufacturing_ui.inc:236
-#: /purchasing/includes/ui/invoice_ui.inc:284
-#: /purchasing/includes/ui/invoice_ui.inc:286
-#: /purchasing/includes/ui/invoice_ui.inc:288
+#: /includes/dashboard.inc:121
+#: /includes/dashboard.inc:147
+#: /includes/dashboard.inc:167
+#: /includes/dashboard.inc:186
+#: /includes/dashboard.inc:223
+#: /includes/dashboard.inc:291
+#: /includes/dashboard.inc:333
+#: /includes/dashboard.inc:447
+#: /includes/sysnames.inc:138
+#: /includes/ui/allocation_cart.inc:290
+#: /includes/ui/ui_lists.inc:1349
+#: /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/view/view_supp_payment.php:60
 #: /purchasing/view/view_supp_payment.php:72
-#: /reporting/rep102.php:251
-#: /reporting/rep107.php:207
-#: /reporting/rep107.php:268
-#: /reporting/rep109.php:196
-#: /reporting/rep110.php:192
+#: /reporting/rep102.php:242
+#: /reporting/rep107.php:205
+#: /reporting/rep107.php:270
+#: /reporting/rep109.php:197
+#: /reporting/rep110.php:194
 #: /reporting/rep111.php:194
-#: /reporting/rep113.php:181
-#: /reporting/rep202.php:252
-#: /reporting/rep209.php:198
+#: /reporting/rep113.php:183
+#: /reporting/rep202.php:250
+#: /reporting/rep209.php:199
 #: /reporting/rep706.php:308
 #: /reporting/rep707.php:326
 #: /reporting/rep710.php:78
@@ -4272,11 +4446,11 @@ msgstr ""
 msgid "Are you sure you want to post accruals?"
 msgstr ""
 
-#: /gl/bank_account_reconcile.php:33
+#: /gl/bank_account_reconcile.php:32
 msgid "Reconcile Bank Account"
 msgstr ""
 
-#: /gl/bank_account_reconcile.php:35
+#: /gl/bank_account_reconcile.php:34
 #: /gl/bank_transfer.php:37
 #: /gl/gl_bank.php:49
 #: /gl/inquiry/bank_inquiry.php:31
@@ -4285,72 +4459,72 @@ msgstr ""
 msgid "There are no bank accounts defined in the system."
 msgstr ""
 
-#: /gl/bank_account_reconcile.php:39
+#: /gl/bank_account_reconcile.php:38
 msgid "Invalid reconcile date format"
 msgstr ""
 
-#: /gl/bank_account_reconcile.php:56
+#: /gl/bank_account_reconcile.php:55
 msgid "Reconcile this transaction"
 msgstr ""
 
-#: /gl/bank_account_reconcile.php:164
+#: /gl/bank_account_reconcile.php:163
 #: /gl/inquiry/bank_inquiry.php:48
 #: /gl/inquiry/gl_account_inquiry.php:70
 msgid "Account:"
 msgstr ""
 
-#: /gl/bank_account_reconcile.php:166
+#: /gl/bank_account_reconcile.php:165
 msgid "Bank Statement:"
 msgstr ""
 
-#: /gl/bank_account_reconcile.php:167
+#: /gl/bank_account_reconcile.php:166
 #: /includes/ui/class.crud_view.inc:300
 msgid "New"
 msgstr ""
 
-#: /gl/bank_account_reconcile.php:196
+#: /gl/bank_account_reconcile.php:195
 msgid "Reconcile Date"
 msgstr ""
 
-#: /gl/bank_account_reconcile.php:196
+#: /gl/bank_account_reconcile.php:195
 msgid "Beginning<br>Balance"
 msgstr ""
 
-#: /gl/bank_account_reconcile.php:197
+#: /gl/bank_account_reconcile.php:196
 msgid "Ending<br>Balance"
 msgstr ""
 
-#: /gl/bank_account_reconcile.php:197
+#: /gl/bank_account_reconcile.php:196
 msgid "Account<br>Total"
 msgstr ""
 
-#: /gl/bank_account_reconcile.php:197
+#: /gl/bank_account_reconcile.php:196
 msgid "Reconciled<br>Amount"
 msgstr ""
 
-#: /gl/bank_account_reconcile.php:197
+#: /gl/bank_account_reconcile.php:196
 #: /reporting/rep602.php:205
 msgid "Difference"
 msgstr ""
 
-#: /gl/bank_account_reconcile.php:201
+#: /gl/bank_account_reconcile.php:200
 msgid "Date of bank statement to reconcile"
 msgstr ""
 
-#: /gl/bank_account_reconcile.php:237
+#: /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:84
-#: /reporting/rep704.php:86
-#: /reporting/rep704.php:89
+#: /reporting/rep704.php:83
+#: /reporting/rep704.php:85
+#: /reporting/rep704.php:88
 msgid "Person/Item"
 msgstr ""
 
-#: /gl/bank_account_reconcile.php:247
+#: /gl/bank_account_reconcile.php:246
 msgid "Reconcile"
 msgstr ""
 
@@ -4376,96 +4550,96 @@ msgstr ""
 msgid "Enter &Another Transfer"
 msgstr ""
 
-#: /gl/bank_transfer.php:105
+#: /gl/bank_transfer.php:104
 msgid "From Account:"
 msgstr ""
 
-#: /gl/bank_transfer.php:109
+#: /gl/bank_transfer.php:108
 msgid "To Account:"
 msgstr ""
 
-#: /gl/bank_transfer.php:116
+#: /gl/bank_transfer.php:115
 msgid "Transfer Date:"
 msgstr ""
 
-#: /gl/bank_transfer.php:127
-#: /gl/bank_transfer.php:134
-#: /sales/customer_payments.php:384
+#: /gl/bank_transfer.php:126
+#: /gl/bank_transfer.php:133
+#: /sales/customer_payments.php:376
 msgid "Amount:"
 msgstr ""
 
-#: /gl/bank_transfer.php:128
-#: /gl/bank_transfer.php:135
+#: /gl/bank_transfer.php:127
+#: /gl/bank_transfer.php:134
 #: /purchasing/supplier_payment.php:307
-#: /sales/customer_payments.php:370
+#: /sales/customer_payments.php:362
 msgid "Bank Charge:"
 msgstr ""
 
-#: /gl/bank_transfer.php:130
+#: /gl/bank_transfer.php:129
 msgid "Incoming Amount:"
 msgstr ""
 
-#: /gl/bank_transfer.php:144
+#: /gl/bank_transfer.php:143
 msgid "Modify Transfer"
 msgstr ""
 
-#: /gl/bank_transfer.php:146
+#: /gl/bank_transfer.php:145
 msgid "Enter Transfer"
 msgstr ""
 
-#: /gl/bank_transfer.php:173
-#: /gl/bank_transfer.php:227
-#: /gl/bank_transfer.php:251
+#: /gl/bank_transfer.php:172
+#: /gl/bank_transfer.php:226
+#: /gl/bank_transfer.php:250
 #: /purchasing/supplier_payment.php:135
 #: /purchasing/supplier_payment.php:141
 msgid "The entered amount is invalid or less than zero."
 msgstr ""
 
-#: /gl/bank_transfer.php:178
-#: /gl/gl_bank.php:227
+#: /gl/bank_transfer.php:177
+#: /gl/gl_bank.php:226
 msgid "The total bank amount cannot be 0."
 msgstr ""
 
-#: /gl/bank_transfer.php:194
+#: /gl/bank_transfer.php:193
 #, php-format
 msgid ""
 "This bank transfer change would result in exceeding authorized overdraft "
 "limit (%s) of the account '%s'"
 msgstr ""
 
-#: /gl/bank_transfer.php:199
+#: /gl/bank_transfer.php:198
 #, php-format
 msgid ""
 "This bank transfer change would result in exceeding authorized overdraft "
 "limit on '%s' for transaction: %s #%s on %s."
 msgstr ""
 
-#: /gl/bank_transfer.php:211
+#: /gl/bank_transfer.php:210
 #, php-format
 msgid ""
 "This bank transfer would result in exceeding authorized overdraft limit of "
 "the account (%s)"
 msgstr ""
 
-#: /gl/bank_transfer.php:216
+#: /gl/bank_transfer.php:215
 #, php-format
 msgid ""
 "This bank transfer would result in exceeding authorized overdraft limit for "
 "transaction: %s #%s on %s."
 msgstr ""
 
-#: /gl/bank_transfer.php:232
+#: /gl/bank_transfer.php:231
 #: /purchasing/supplier_payment.php:149
 #: /sales/customer_payments.php:181
 msgid ""
 "The Bank Charge Account has not been set in System and General GL Setup."
 msgstr ""
 
-#: /gl/bank_transfer.php:244
+#: /gl/bank_transfer.php:243
 msgid "The source and destination bank accouts cannot be the same."
 msgstr ""
 
-#: /gl/bank_transfer.php:256
+#: /gl/bank_transfer.php:255
 msgid "The incomming bank amount cannot be 0."
 msgstr ""
 
@@ -4507,16 +4681,16 @@ msgstr ""
 
 #: /gl/gl_bank.php:85
 #: /gl/gl_journal.php:64
-#: /inventory/adjustments.php:48
+#: /inventory/adjustments.php:65
 #: /manufacturing/work_order_entry.php:67
-#: /purchasing/po_entry_items.php:115
-#: /purchasing/po_entry_items.php:136
-#: /purchasing/supplier_credit.php:83
+#: /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
 #: /sales/customer_credit_invoice.php:61
 #: /sales/customer_invoice.php:72
-#: /sales/sales_order_entry.php:240
+#: /sales/sales_order_entry.php:245
 msgid "Add an Attachment"
 msgstr ""
 
@@ -4559,61 +4733,61 @@ msgstr ""
 msgid "Enter A &Payment"
 msgstr ""
 
-#: /gl/gl_bank.php:221
+#: /gl/gl_bank.php:220
 msgid "You must enter at least one payment line."
 msgstr ""
 
-#: /gl/gl_bank.php:238
+#: /gl/gl_bank.php:237
 #: /purchasing/supplier_payment.php:200
 #, php-format
 msgid "The total bank amount exceeds allowed limit (%s)."
 msgstr ""
 
-#: /gl/gl_bank.php:244
+#: /gl/gl_bank.php:243
 #, 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:256
+#: /gl/gl_bank.php:255
 msgid "The entered date for the payment is invalid."
 msgstr ""
 
-#: /gl/gl_bank.php:268
+#: /gl/gl_bank.php:267
 msgid "You have to select customer and customer branch."
 msgstr ""
 
-#: /gl/gl_bank.php:272
+#: /gl/gl_bank.php:271
 msgid "You have to select supplier."
 msgstr ""
 
-#: /gl/gl_bank.php:280
+#: /gl/gl_bank.php:279
 msgid "Settled amount have to be positive number."
 msgstr ""
 
-#: /gl/gl_bank.php:326
+#: /gl/gl_bank.php:325
 msgid "The amount entered is not a valid number or is less than zero."
 msgstr ""
 
-#: /gl/gl_bank.php:332
+#: /gl/gl_bank.php:331
 #: /gl/manage/exchange_rates.php:39
 msgid "The exchange rate cannot be zero or a negative number."
 msgstr ""
 
-#: /gl/gl_bank.php:404
+#: /gl/gl_bank.php:403
 msgid "Payment Items"
 msgstr ""
 
-#: /gl/gl_bank.php:404
+#: /gl/gl_bank.php:403
 msgid "Deposit Items"
 msgstr ""
 
-#: /gl/gl_bank.php:412
+#: /gl/gl_bank.php:411
 msgid "Process Payment"
 msgstr ""
 
-#: /gl/gl_bank.php:412
+#: /gl/gl_bank.php:411
 msgid "Process Deposit"
 msgstr ""
 
@@ -4622,7 +4796,7 @@ msgid "Budget Entry"
 msgstr ""
 
 #: /gl/gl_budget.php:26
-#: /gl/manage/gl_accounts.php:23
+#: /gl/manage/gl_accounts.php:27
 msgid ""
 "There are no account groups defined. Please define at least one account "
 "group before entering accounts."
@@ -4636,38 +4810,38 @@ msgstr ""
 msgid "The Budget has been deleted."
 msgstr ""
 
-#: /gl/gl_budget.php:64
-#: /gl/manage/gl_accounts.php:230
-#: /gl/manage/gl_accounts.php:240
+#: /gl/gl_budget.php:63
+#: /gl/manage/gl_accounts.php:234
+#: /gl/manage/gl_accounts.php:244
 msgid "Account Code:"
 msgstr ""
 
-#: /gl/gl_budget.php:84
+#: /gl/gl_budget.php:83
 #: /gl/manage/exchange_rates.php:143
 msgid "Get"
 msgstr ""
 
-#: /gl/gl_budget.php:91
-#: /gl/gl_budget.php:93
-#: /gl/inquiry/profit_loss.php:235
+#: /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:141
+#: /reporting/rep101.php:140
 #: /reporting/rep105.php:118
 #: /reporting/rep106.php:98
 #: /reporting/rep114.php:90
-#: /reporting/rep201.php:118
-#: /reporting/rep304.php:133
-#: /reporting/rep305.php:106
+#: /reporting/rep201.php:115
+#: /reporting/rep304.php:134
+#: /reporting/rep305.php:111
 #: /reporting/rep306.php:148
-#: /reporting/rep307.php:122
+#: /reporting/rep307.php:119
 #: /reporting/rep308.php:248
-#: /reporting/rep309.php:103
+#: /reporting/rep309.php:104
 #: /reporting/rep601.php:85
 #: /reporting/rep602.php:86
 #: /reporting/rep702.php:59
-#: /reporting/rep704.php:95
-#: /reporting/rep704.php:105
-#: /reporting/rep704.php:113
+#: /reporting/rep704.php:94
+#: /reporting/rep704.php:104
+#: /reporting/rep704.php:112
 #: /reporting/rep706.php:185
 #: /reporting/rep706.php:193
 #: /reporting/rep706.php:203
@@ -4684,53 +4858,55 @@ msgstr ""
 msgid "Period"
 msgstr ""
 
-#: /gl/gl_budget.php:91
+#: /gl/gl_budget.php:90
 msgid "Dim. incl."
 msgstr ""
 
-#: /gl/gl_budget.php:91
-#: /gl/gl_budget.php:93
+#: /gl/gl_budget.php:90
+#: /gl/gl_budget.php:92
 msgid "Last Year"
 msgstr ""
 
-#: /gl/gl_budget.php:127
+#: /gl/gl_budget.php:126
 #: /gl/inquiry/balance_sheet.php:98
-#: /gl/inquiry/balance_sheet.php:205
-#: /gl/inquiry/balance_sheet.php:236
-#: /gl/inquiry/gl_trial_balance.php:223
-#: /gl/inquiry/profit_loss.php:115
+#: /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:202
+#: /gl/includes/ui/gl_bank_ui.inc:195
 #: /gl/includes/ui/gl_journal_ui.inc:169
-#: /inventory/includes/item_adjustments_ui.inc:55
-#: /inventory/includes/item_adjustments_ui.inc:98
-#: /manufacturing/includes/manufacturing_ui.inc:178
-#: /purchasing/includes/ui/invoice_ui.inc:348
-#: /purchasing/includes/ui/invoice_ui.inc:513
-#: /purchasing/includes/ui/invoice_ui.inc:584
+#: /includes/dashboard.inc:486
+#: /includes/dashboard.inc:570
+#: /inventory/includes/item_adjustments_ui.inc:60
+#: /inventory/includes/item_adjustments_ui.inc:114
+#: /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/allocations/supplier_allocation_main.php:100
-#: /reporting/rep101.php:249
+#: /reporting/rep101.php:248
 #: /reporting/rep106.php:90
 #: /reporting/rep106.php:125
 #: /reporting/rep106.php:172
 #: /reporting/rep114.php:161
-#: /reporting/rep201.php:224
-#: /reporting/rep203.php:94
-#: /reporting/rep203.php:171
+#: /reporting/rep201.php:221
+#: /reporting/rep203.php:89
+#: /reporting/rep203.php:166
 #: /reporting/rep204.php:113
 #: /reporting/rep204.php:141
-#: /reporting/rep301.php:197
-#: /reporting/rep301.php:245
-#: /reporting/rep304.php:159
-#: /reporting/rep304.php:204
-#: /reporting/rep305.php:101
-#: /reporting/rep305.php:127
-#: /reporting/rep305.php:183
+#: /reporting/rep301.php:200
+#: /reporting/rep301.php:248
+#: /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
@@ -4739,11 +4915,13 @@ msgstr ""
 #: /reporting/rep306.php:276
 #: /reporting/rep306.php:287
 #: /reporting/rep308.php:323
-#: /reporting/rep309.php:126
-#: /reporting/rep309.php:153
+#: /reporting/rep309.php:125
+#: /reporting/rep309.php:152
+#: /reporting/rep451.php:106
+#: /reporting/rep451.php:141
 #: /reporting/rep702.php:142
 #: /reporting/rep705.php:152
-#: /reporting/rep705.php:315
+#: /reporting/rep705.php:312
 #: /reporting/rep706.php:106
 #: /reporting/rep706.php:255
 #: /reporting/rep706.php:290
@@ -4752,11 +4930,11 @@ msgstr ""
 #: /reporting/rep708.php:253
 #: /reporting/includes/doctext.inc:32
 #: /reporting/includes/doctext.inc:191
-#: /sales/customer_credit_invoice.php:283
-#: /sales/customer_delivery.php:424
-#: /sales/customer_invoice.php:549
-#: /sales/customer_invoice.php:552
-#: /sales/allocations/customer_allocation_main.php:99
+#: /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
 #: /sales/view/view_credit.php:91
 #: /sales/view/view_dispatch.php:113
 #: /sales/view/view_invoice.php:116
@@ -4764,12 +4942,12 @@ msgstr ""
 #: /sales/view/view_sales_order.php:142
 #: /sales/view/view_sales_order.php:179
 #: /sales/view/view_sales_order.php:220
-#: /sales/includes/ui/sales_credit_ui.inc:169
+#: /sales/includes/ui/sales_credit_ui.inc:163
 #: /sales/includes/ui/sales_order_ui.inc:148
 msgid "Total"
 msgstr ""
 
-#: /gl/gl_budget.php:136
+#: /gl/gl_budget.php:135
 msgid "Save"
 msgstr ""
 
@@ -4780,7 +4958,7 @@ msgstr ""
 
 #: /gl/gl_journal.php:36
 #: /includes/sysnames.inc:22
-#: /includes/sysnames.inc:150
+#: /includes/sysnames.inc:155
 msgid "Journal Entry"
 msgstr ""
 
@@ -4867,8 +5045,8 @@ 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:651
-#: /purchasing/supplier_credit.php:144
+#: /includes/ui/ui_view.inc:649
+#: /purchasing/supplier_credit.php:143
 #: /purchasing/supplier_invoice.php:154
 msgid "Cannot post to GL account used by more than one tax type."
 msgstr ""
@@ -4904,14 +5082,14 @@ msgid "Tax group:"
 msgstr ""
 
 #: /gl/gl_journal.php:546
-#: /gl/inquiry/tax_inquiry.php:106
-#: /reporting/rep709.php:188
+#: /gl/inquiry/tax_inquiry.php:102
+#: /reporting/rep709.php:189
 msgid "Input Tax"
 msgstr ""
 
 #: /gl/gl_journal.php:546
-#: /gl/inquiry/tax_inquiry.php:100
-#: /reporting/rep709.php:188
+#: /gl/inquiry/tax_inquiry.php:96
+#: /reporting/rep709.php:189
 msgid "Output Tax"
 msgstr ""
 
@@ -4927,17 +5105,72 @@ msgstr ""
 msgid "Process journal entry only if debits equal to credits"
 msgstr ""
 
+#: /gl/inquiry/accounts_list.php:25
+#: /inventory/manage/items.php:466
+#: /sales/manage/customer_branches.php:240
+msgid "GL Accounts"
+msgstr ""
+
+#: /gl/inquiry/accounts_list.php:40
+#: /includes/ui/ui_lists.inc:346
+msgid "Search GL accounts"
+msgstr ""
+
+#: /gl/inquiry/accounts_list.php:52
+#: /gl/view/gl_deposit_view.php:104
+#: /gl/view/gl_deposit_view.php:107
+#: /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/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
+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:172
+#: /reporting/rep301.php:178
+#: /reporting/rep302.php:122
+#: /reporting/rep302.php:129
+#: /reporting/rep303.php:132
+#: /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:242
+#: /reporting/rep308.php:249
+#: /reporting/rep309.php:105
+msgid "Category"
+msgstr ""
+
 #: /gl/inquiry/balance_sheet.php:27
 msgid "Balance Sheet Drilldown"
 msgstr ""
 
-#: /gl/inquiry/balance_sheet.php:126
+#: /gl/inquiry/balance_sheet.php:125
 msgid "As at:"
 msgstr ""
 
-#: /gl/inquiry/balance_sheet.php:228
+#: /gl/inquiry/balance_sheet.php:225
 #: /gl/inquiry/profit_loss.php:298
-#: /reporting/rep705.php:325
+#: /includes/dashboard.inc:391
+#: /reporting/rep705.php:322
 #: /reporting/rep706.php:278
 #: /reporting/rep706.php:303
 #: /reporting/rep707.php:309
@@ -4945,18 +5178,18 @@ msgstr ""
 msgid "Calculated Return"
 msgstr ""
 
-#: /gl/inquiry/balance_sheet.php:236
-#: /includes/sysnames.inc:121
+#: /gl/inquiry/balance_sheet.php:233
+#: /includes/sysnames.inc:126
 #: /reporting/rep706.php:290
 msgid "Liabilities"
 msgstr ""
 
-#: /gl/inquiry/balance_sheet.php:236
+#: /gl/inquiry/balance_sheet.php:233
 #: /reporting/rep706.php:290
 msgid " and "
 msgstr ""
 
-#: /gl/inquiry/balance_sheet.php:236
+#: /gl/inquiry/balance_sheet.php:233
 #: /reporting/rep706.php:290
 msgid "Equities"
 msgstr ""
@@ -4970,16 +5203,16 @@ msgstr ""
 #: /gl/inquiry/gl_account_inquiry.php:162
 #: /reporting/rep601.php:104
 #: /reporting/rep602.php:103
-#: /reporting/rep704.php:144
+#: /reporting/rep704.php:143
 msgid "Opening Balance"
 msgstr ""
 
-#: /gl/inquiry/bank_inquiry.php:128
+#: /gl/inquiry/bank_inquiry.php:130
 #: /gl/inquiry/gl_account_inquiry.php:213
-#: /gl/inquiry/gl_trial_balance.php:233
+#: /gl/inquiry/gl_trial_balance.php:230
 #: /reporting/rep601.php:157
 #: /reporting/rep602.php:157
-#: /reporting/rep704.php:192
+#: /reporting/rep704.php:191
 #: /reporting/rep708.php:262
 msgid "Ending Balance"
 msgstr ""
@@ -5015,14 +5248,15 @@ msgid "No zero values"
 msgstr ""
 
 #: /gl/inquiry/gl_trial_balance.php:61
-#: /reporting/reports_main.php:395
-#: /reporting/reports_main.php:445
-#: /reporting/reports_main.php:490
+#: /reporting/reports_main.php:406
+#: /reporting/reports_main.php:456
+#: /reporting/reports_main.php:501
 msgid "Only balances"
 msgstr ""
 
 #: /gl/inquiry/gl_trial_balance.php:93
 #: /gl/inquiry/gl_trial_balance.php:154
+#: /includes/dashboard.inc:525
 #: /reporting/rep706.php:307
 #: /reporting/rep707.php:325
 #: /reporting/rep708.php:51
@@ -5041,9 +5275,10 @@ msgstr ""
 #: /gl/view/gl_trans_view.php:95
 #: /gl/view/gl_trans_view.php:98
 #: /gl/view/gl_trans_view.php:101
-#: /reporting/rep701.php:111
+#: /manufacturing/view/wo_costs_view.php:60
+#: /reporting/rep701.php:110
 #: /reporting/rep702.php:53
-#: /reporting/rep705.php:238
+#: /reporting/rep705.php:235
 #: /reporting/rep706.php:185
 #: /reporting/rep707.php:210
 #: /reporting/rep708.php:192
@@ -5061,11 +5296,15 @@ msgid "This Period"
 msgstr ""
 
 #: /gl/inquiry/gl_trial_balance.php:206
-#: /gl/manage/gl_account_types.php:128
+#: /gl/manage/gl_account_types.php:127
+#: /includes/dashboard.inc:147
+#: /includes/dashboard.inc:167
+#: /reporting/rep451.php:70
+#: /reporting/rep451.php:76
 msgid "Class"
 msgstr ""
 
-#: /gl/inquiry/gl_trial_balance.php:241
+#: /gl/inquiry/gl_trial_balance.php:238
 #: /reporting/rep708.php:283
 msgid ""
 "The Opening Balance is not in balance, probably due to a non closed Previous "
@@ -5109,13 +5348,13 @@ msgstr ""
 #: /gl/inquiry/journal_inquiry.php:111
 #: /gl/inquiry/journal_inquiry.php:126
 #: /purchasing/includes/ui/grn_ui.inc:34
-#: /purchasing/includes/ui/grn_ui.inc:79
-#: /purchasing/includes/ui/po_ui.inc:323
+#: /purchasing/includes/ui/grn_ui.inc:77
+#: /purchasing/includes/ui/po_ui.inc:328
 #: /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.php:121
-#: /purchasing/inquiry/supplier_inquiry.php:177
+#: /purchasing/inquiry/supplier_inquiry.php:181
 #: /reporting/includes/doctext.inc:163
 #: /reporting/includes/doctext.inc:186
 msgid "Supplier's Reference"
@@ -5124,7 +5363,7 @@ msgstr ""
 #: /gl/inquiry/journal_inquiry.php:115
 #: /reporting/rep710.php:77
 #: /reporting/rep710.php:87
-#: /reporting/reports_main.php:506
+#: /reporting/reports_main.php:517
 msgid "User"
 msgstr ""
 
@@ -5132,36 +5371,36 @@ msgstr ""
 msgid "Profit & Loss Drilldown"
 msgstr ""
 
-#: /gl/inquiry/profit_loss.php:171
+#: /gl/inquiry/profit_loss.php:30
 #: /reporting/rep707.php:210
-#: /reporting/includes/reports_classes.inc:248
+#: /reporting/includes/reports_classes.inc:249
 msgid "Accumulated"
 msgstr ""
 
-#: /gl/inquiry/profit_loss.php:171
+#: /gl/inquiry/profit_loss.php:31
 #: /reporting/rep707.php:255
-#: /reporting/includes/reports_classes.inc:248
+#: /reporting/includes/reports_classes.inc:249
 msgid "Period Y-1"
 msgstr ""
 
-#: /gl/inquiry/profit_loss.php:171
+#: /gl/inquiry/profit_loss.php:32
 #: /reporting/rep707.php:246
-#: /reporting/includes/reports_classes.inc:248
+#: /reporting/includes/reports_classes.inc:249
 msgid "Budget"
 msgstr ""
 
-#: /gl/inquiry/profit_loss.php:172
-#: /reporting/reports_main.php:382
-#: /reporting/reports_main.php:433
-#: /reporting/reports_main.php:479
+#: /gl/inquiry/profit_loss.php:178
+#: /reporting/reports_main.php:393
+#: /reporting/reports_main.php:444
+#: /reporting/reports_main.php:490
 msgid "Compare to"
 msgstr ""
 
-#: /gl/inquiry/profit_loss.php:234
+#: /gl/inquiry/profit_loss.php:236
 msgid "Group/Account Name"
 msgstr ""
 
-#: /gl/inquiry/profit_loss.php:237
+#: /gl/inquiry/profit_loss.php:239
 #: /reporting/rep707.php:210
 msgid "Achieved %"
 msgstr ""
@@ -5170,36 +5409,36 @@ msgstr ""
 msgid "Tax Inquiry"
 msgstr ""
 
-#: /gl/inquiry/tax_inquiry.php:82
-#: /reporting/rep709.php:188
+#: /gl/inquiry/tax_inquiry.php:80
+#: /reporting/rep709.php:189
 msgid "Outputs"
 msgstr ""
 
-#: /gl/inquiry/tax_inquiry.php:82
-#: /reporting/rep709.php:188
+#: /gl/inquiry/tax_inquiry.php:80
+#: /reporting/rep709.php:189
 msgid "Inputs"
 msgstr ""
 
-#: /gl/inquiry/tax_inquiry.php:100
+#: /gl/inquiry/tax_inquiry.php:96
 msgid "Charged on sales"
 msgstr ""
 
-#: /gl/inquiry/tax_inquiry.php:106
+#: /gl/inquiry/tax_inquiry.php:102
 msgid "Paid on purchases"
 msgstr ""
 
-#: /gl/inquiry/tax_inquiry.php:112
+#: /gl/inquiry/tax_inquiry.php:108
 msgid "Net payable or collectible"
 msgstr ""
 
-#: /gl/inquiry/tax_inquiry.php:119
-#: /reporting/rep709.php:219
+#: /gl/inquiry/tax_inquiry.php:115
+#: /reporting/rep709.php:221
 msgid "Total payable or refund"
 msgstr ""
 
 #: /gl/manage/bank_accounts.php:16
-#: /reporting/reports_main.php:318
-#: /reporting/reports_main.php:326
+#: /reporting/reports_main.php:331
+#: /reporting/reports_main.php:339
 msgid "Bank Accounts"
 msgstr ""
 
@@ -5242,33 +5481,36 @@ msgstr ""
 #: /gl/view/bank_transfer_view.php:78
 #: /gl/view/gl_deposit_view.php:66
 #: /gl/view/gl_payment_view.php:64
-#: /inventory/prices.php:147
-#: /inventory/purchasing_data.php:147
+#: /includes/dashboard.inc:485
+#: /includes/dashboard.inc:570
+#: /includes/dashboard.inc:605
+#: /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.php:123
 #: /purchasing/inquiry/supplier_allocation_inquiry.php:143
 #: /purchasing/inquiry/supplier_allocation_inquiry.php:153
-#: /purchasing/inquiry/supplier_inquiry.php:73
-#: /purchasing/inquiry/supplier_inquiry.php:180
-#: /purchasing/inquiry/supplier_inquiry.php:192
+#: /purchasing/inquiry/supplier_inquiry.php:74
+#: /purchasing/inquiry/supplier_inquiry.php:184
+#: /purchasing/inquiry/supplier_inquiry.php:196
 #: /purchasing/allocations/supplier_allocation_main.php:99
 #: /purchasing/allocations/supplier_allocation_main.php:107
-#: /reporting/rep101.php:143
-#: /reporting/rep102.php:138
-#: /reporting/rep102.php:144
-#: /reporting/rep103.php:231
-#: /reporting/rep104.php:116
-#: /reporting/rep201.php:120
-#: /reporting/rep202.php:138
-#: /reporting/rep203.php:101
-#: /reporting/rep205.php:150
+#: /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
 #: /sales/customer_credit_invoice.php:236
 #: /sales/customer_delivery.php:328
-#: /sales/customer_invoice.php:476
-#: /sales/allocations/customer_allocation_main.php:98
-#: /sales/allocations/customer_allocation_main.php:106
+#: /sales/customer_invoice.php:455
+#: /sales/allocations/customer_allocation_main.php:92
+#: /sales/allocations/customer_allocation_main.php:100
 #: /sales/view/view_credit.php:70
 #: /sales/view/view_dispatch.php:86
 #: /sales/view/view_invoice.php:86
@@ -5328,7 +5570,7 @@ msgid "Bank Name:"
 msgstr ""
 
 #: /gl/manage/bank_accounts.php:195
-#: /sales/manage/customer_branches.php:242
+#: /sales/manage/customer_branches.php:246
 #: /sales/manage/customers.php:260
 msgid "Bank Account Number:"
 msgstr ""
@@ -5378,7 +5620,7 @@ msgid "Close Transactions"
 msgstr ""
 
 #: /gl/manage/currencies.php:16
-#: /includes/access_levels.inc:223
+#: /includes/access_levels.inc:244
 msgid "Currencies"
 msgstr ""
 
@@ -5578,139 +5820,139 @@ msgid "Class Type"
 msgstr ""
 
 #: /gl/manage/gl_account_classes.php:112
-#: /gl/manage/gl_account_classes.php:169
+#: /gl/manage/gl_account_classes.php:168
 #: /reporting/rep706.php:215
 msgid "Balance Sheet"
 msgstr ""
 
-#: /gl/manage/gl_account_classes.php:157
-#: /gl/manage/gl_account_classes.php:163
+#: /gl/manage/gl_account_classes.php:156
+#: /gl/manage/gl_account_classes.php:162
 msgid "Class ID:"
 msgstr ""
 
-#: /gl/manage/gl_account_classes.php:166
+#: /gl/manage/gl_account_classes.php:165
 msgid "Class Name:"
 msgstr ""
 
-#: /gl/manage/gl_account_classes.php:171
+#: /gl/manage/gl_account_classes.php:170
 msgid "Class Type:"
 msgstr ""
 
-#: /gl/manage/gl_accounts.php:16
-#: /reporting/rep701.php:117
+#: /gl/manage/gl_accounts.php:20
+#: /reporting/rep701.php:116
 msgid "Chart of Accounts"
 msgstr ""
 
-#: /gl/manage/gl_accounts.php:53
+#: /gl/manage/gl_accounts.php:57
 msgid "The account code must be entered."
 msgstr ""
 
-#: /gl/manage/gl_accounts.php:59
+#: /gl/manage/gl_accounts.php:63
 msgid "The account name cannot be empty."
 msgstr ""
 
-#: /gl/manage/gl_accounts.php:65
+#: /gl/manage/gl_accounts.php:69
 msgid "The account code must be numeric."
 msgstr ""
 
-#: /gl/manage/gl_accounts.php:80
+#: /gl/manage/gl_accounts.php:84
 msgid "The account belongs to a bank account and cannot be inactivated."
 msgstr ""
 
-#: /gl/manage/gl_accounts.php:89
+#: /gl/manage/gl_accounts.php:93
 msgid "Account data has been updated."
 msgstr ""
 
-#: /gl/manage/gl_accounts.php:98
+#: /gl/manage/gl_accounts.php:102
 msgid "New account has been added."
 msgstr ""
 
-#: /gl/manage/gl_accounts.php:102
+#: /gl/manage/gl_accounts.php:106
 msgid "Account not added, possible duplicate Account Code."
 msgstr ""
 
-#: /gl/manage/gl_accounts.php:117
+#: /gl/manage/gl_accounts.php:121
 msgid ""
 "Cannot delete this account because transactions have been created using this "
 "account."
 msgstr ""
 
-#: /gl/manage/gl_accounts.php:123
+#: /gl/manage/gl_accounts.php:127
 msgid ""
 "Cannot delete this account because it is used as one of the company default "
 "GL accounts."
 msgstr ""
 
-#: /gl/manage/gl_accounts.php:129
+#: /gl/manage/gl_accounts.php:133
 msgid "Cannot delete this account because it is used by a bank account."
 msgstr ""
 
-#: /gl/manage/gl_accounts.php:135
+#: /gl/manage/gl_accounts.php:139
 msgid ""
 "Cannot delete this account because it is used by one or more Item Categories."
 msgstr ""
 
-#: /gl/manage/gl_accounts.php:141
+#: /gl/manage/gl_accounts.php:145
 msgid "Cannot delete this account because it is used by one or more Items."
 msgstr ""
 
-#: /gl/manage/gl_accounts.php:147
+#: /gl/manage/gl_accounts.php:151
 msgid "Cannot delete this account because it is used by one or more Taxes."
 msgstr ""
 
-#: /gl/manage/gl_accounts.php:153
+#: /gl/manage/gl_accounts.php:157
 msgid ""
 "Cannot delete this account because it is used by one or more Customer "
 "Branches."
 msgstr ""
 
-#: /gl/manage/gl_accounts.php:158
+#: /gl/manage/gl_accounts.php:162
 msgid "Cannot delete this account because it is used by one or more suppliers."
 msgstr ""
 
-#: /gl/manage/gl_accounts.php:164
+#: /gl/manage/gl_accounts.php:168
 msgid ""
 "Cannot delete this account because it is used by one or more Quick Entry "
 "Lines."
 msgstr ""
 
-#: /gl/manage/gl_accounts.php:182
+#: /gl/manage/gl_accounts.php:186
 msgid "Selected account has been deleted"
 msgstr ""
 
-#: /gl/manage/gl_accounts.php:197
+#: /gl/manage/gl_accounts.php:201
 msgid "New account"
 msgstr ""
 
-#: /gl/manage/gl_accounts.php:243
+#: /gl/manage/gl_accounts.php:247
 msgid "Account Code 2:"
 msgstr ""
 
-#: /gl/manage/gl_accounts.php:245
+#: /gl/manage/gl_accounts.php:249
 msgid "Account Name:"
 msgstr ""
 
-#: /gl/manage/gl_accounts.php:247
+#: /gl/manage/gl_accounts.php:251
 msgid "Account Group:"
 msgstr ""
 
-#: /gl/manage/gl_accounts.php:249
+#: /gl/manage/gl_accounts.php:253
 msgid "Account Tags:"
 msgstr ""
 
-#: /gl/manage/gl_accounts.php:251
+#: /gl/manage/gl_accounts.php:255
 msgid "Account status:"
 msgstr ""
 
-#: /gl/manage/gl_accounts.php:256
+#: /gl/manage/gl_accounts.php:260
 msgid "Add Account"
 msgstr ""
 
-#: /gl/manage/gl_accounts.php:260
+#: /gl/manage/gl_accounts.php:264
 msgid "Update Account"
 msgstr ""
 
-#: /gl/manage/gl_accounts.php:261
+#: /gl/manage/gl_accounts.php:265
 msgid "Delete account"
 msgstr ""
 
@@ -5730,56 +5972,56 @@ msgstr ""
 msgid "This account group id is already in use."
 msgstr ""
 
-#: /gl/manage/gl_account_types.php:50
+#: /gl/manage/gl_account_types.php:49
 msgid "You cannot set an account group to be a subgroup of itself."
 msgstr ""
 
-#: /gl/manage/gl_account_types.php:68
+#: /gl/manage/gl_account_types.php:67
 msgid "Selected account type has been updated"
 msgstr ""
 
-#: /gl/manage/gl_account_types.php:73
+#: /gl/manage/gl_account_types.php:72
 msgid "New account type has been added"
 msgstr ""
 
-#: /gl/manage/gl_account_types.php:89
+#: /gl/manage/gl_account_types.php:88
 msgid ""
 "Cannot delete this account group because GL accounts have been created "
 "referring to it."
 msgstr ""
 
-#: /gl/manage/gl_account_types.php:95
+#: /gl/manage/gl_account_types.php:94
 msgid ""
 "Cannot delete this account group because GL account groups have been created "
 "referring to it."
 msgstr ""
 
-#: /gl/manage/gl_account_types.php:111
+#: /gl/manage/gl_account_types.php:110
 msgid "Selected account group has been deleted"
 msgstr ""
 
-#: /gl/manage/gl_account_types.php:128
+#: /gl/manage/gl_account_types.php:127
 msgid "Group ID"
 msgstr ""
 
-#: /gl/manage/gl_account_types.php:128
+#: /gl/manage/gl_account_types.php:127
 #: /sales/manage/sales_groups.php:85
 msgid "Group Name"
 msgstr ""
 
-#: /gl/manage/gl_account_types.php:128
+#: /gl/manage/gl_account_types.php:127
 msgid "Subgroup Of"
 msgstr ""
 
-#: /gl/manage/gl_account_types.php:187
+#: /gl/manage/gl_account_types.php:186
 msgid "ID:"
 msgstr ""
 
-#: /gl/manage/gl_account_types.php:190
+#: /gl/manage/gl_account_types.php:189
 msgid "Subgroup Of:"
 msgstr ""
 
-#: /gl/manage/gl_account_types.php:192
+#: /gl/manage/gl_account_types.php:191
 msgid "Class:"
 msgstr ""
 
@@ -5790,7 +6032,7 @@ 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:221
+#: /includes/ui/simple_crud_class.inc:219
 #: /includes/ui/ui_input.inc:224
 msgid "Add new"
 msgstr ""
@@ -5852,11 +6094,6 @@ msgstr ""
 msgid "Balance Based"
 msgstr ""
 
-#: /gl/manage/gl_quick_entries.php:247
-#: /gl/includes/ui/gl_journal_ui.inc:69
-msgid "Yearly"
-msgstr ""
-
 #: /gl/manage/gl_quick_entries.php:252
 msgid "Base Amount Description"
 msgstr ""
@@ -5886,9 +6123,9 @@ msgid "Posted"
 msgstr ""
 
 #: /gl/manage/gl_quick_entries.php:338
-#: /sales/customer_delivery.php:424
-#: /sales/customer_invoice.php:549
-#: /sales/customer_invoice.php:552
+#: /sales/customer_delivery.php:421
+#: /sales/customer_invoice.php:519
+#: /sales/customer_invoice.php:522
 msgid "Tax Type"
 msgstr ""
 
@@ -5913,11 +6150,11 @@ msgstr ""
 msgid "%d Journal Entries for AR/AP accounts have been added"
 msgstr ""
 
-#: /gl/manage/revaluate_currencies.php:96
+#: /gl/manage/revaluate_currencies.php:94
 msgid "Date for Revaluation:"
 msgstr ""
 
-#: /gl/manage/revaluate_currencies.php:101
+#: /gl/manage/revaluate_currencies.php:99
 msgid "Revaluate Currencies"
 msgstr ""
 
@@ -5965,16 +6202,16 @@ msgid "GL Deposit"
 msgstr ""
 
 #: /gl/view/gl_deposit_view.php:71
-#: /gl/includes/db/gl_db_banking.inc:233
-#: /reporting/reports_main.php:96
-#: /reporting/reports_main.php:106
-#: /reporting/reports_main.php:114
-#: /reporting/reports_main.php:128
-#: /reporting/reports_main.php:136
-#: /reporting/reports_main.php:143
-#: /reporting/reports_main.php:192
-#: /reporting/reports_main.php:199
-#: /reporting/reports_main.php:297
+#: /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
 msgid "From"
 msgstr ""
 
@@ -6015,28 +6252,9 @@ msgstr ""
 #: /gl/view/gl_payment_view.php:103
 #: /gl/view/gl_payment_view.php:106
 #: /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:152
-#: /gl/includes/ui/gl_bank_ui.inc:155
-#: /gl/includes/ui/gl_bank_ui.inc:158
-#: /gl/includes/ui/gl_journal_ui.inc:102
-#: /gl/includes/ui/gl_journal_ui.inc:105
-#: /gl/includes/ui/gl_journal_ui.inc:108
-#: /reporting/rep701.php:111
-msgid "Account Code"
-msgstr ""
-
-#: /gl/view/gl_deposit_view.php:104
-#: /gl/view/gl_deposit_view.php:107
-#: /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_bank_ui.inc:155
-#: /gl/includes/ui/gl_bank_ui.inc:158
 #: /gl/includes/ui/gl_journal_ui.inc:102
 #: /gl/includes/ui/gl_journal_ui.inc:105
 #: /gl/includes/ui/gl_journal_ui.inc:108
@@ -6130,35 +6348,35 @@ msgstr ""
 msgid "This transaction has been voided."
 msgstr ""
 
-#: /gl/includes/db/gl_db_banking.inc:54
-#: /gl/includes/db/gl_db_banking.inc:61
-#: /gl/includes/db/gl_db_banking.inc:83
-#: /gl/includes/db/gl_db_banking.inc:86
-#: /gl/includes/db/gl_db_banking.inc:276
+#: /gl/includes/db/gl_db_banking.inc:52
+#: /gl/includes/db/gl_db_banking.inc:56
+#: /gl/includes/db/gl_db_banking.inc:77
+#: /gl/includes/db/gl_db_banking.inc:80
+#: /gl/includes/db/gl_db_banking.inc:270
 msgid "Exchange Variance"
 msgstr ""
 
-#: /gl/includes/db/gl_db_banking.inc:233
-#: /reporting/reports_main.php:97
-#: /reporting/reports_main.php:107
-#: /reporting/reports_main.php:115
-#: /reporting/reports_main.php:129
-#: /reporting/reports_main.php:137
-#: /reporting/reports_main.php:144
-#: /reporting/reports_main.php:193
-#: /reporting/reports_main.php:200
-#: /reporting/reports_main.php:298
+#: /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
 msgid "To"
 msgstr ""
 
-#: /gl/includes/db/gl_db_banking.inc:543
+#: /gl/includes/db/gl_db_banking.inc:533
 #: /gl/includes/db/gl_journal.inc:114
-#: /purchasing/includes/db/invoice_db.inc:137
+#: /purchasing/includes/db/invoice_db.inc:139
 msgid "Document reentered."
 msgstr ""
 
-#: /gl/includes/db/gl_db_trans.inc:96
-#: /includes/ui/items_cart.inc:357
+#: /gl/includes/db/gl_db_trans.inc:97
+#: /includes/ui/items_cart.inc:359
 #, php-format
 msgid "Rounding error %s encountered for trans_type:%s,trans_no:%s"
 msgstr ""
@@ -6166,11 +6384,11 @@ 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:187
-#: /manufacturing/work_order_costs.php:132
+#: /manufacturing/work_order_add_finished.php:186
+#: /manufacturing/work_order_costs.php:133
 #: /purchasing/allocations/supplier_allocate.php:56
 #: /sales/allocations/customer_allocate.php:54
-#: /sales/includes/ui/sales_credit_ui.inc:122
+#: /sales/includes/ui/sales_credit_ui.inc:117
 msgid "Date:"
 msgstr ""
 
@@ -6182,126 +6400,126 @@ msgstr ""
 msgid "To the Order of:"
 msgstr ""
 
-#: /gl/includes/ui/gl_bank_ui.inc:64
-#: /inventory/purchasing_data.php:207
-#: /inventory/purchasing_data.php:211
-#: /purchasing/includes/ui/invoice_ui.inc:96
-#: /purchasing/includes/ui/invoice_ui.inc:104
-#: /purchasing/includes/ui/invoice_ui.inc:106
+#: /gl/includes/ui/gl_bank_ui.inc:61
+#: /inventory/purchasing_data.php:206
+#: /inventory/purchasing_data.php:210
+#: /purchasing/includes/ui/invoice_ui.inc:90
+#: /purchasing/includes/ui/invoice_ui.inc:98
+#: /purchasing/includes/ui/invoice_ui.inc:100
 #: /purchasing/includes/ui/po_ui.inc:108
 #: /purchasing/includes/ui/po_ui.inc:113
 msgid "Supplier:"
 msgstr ""
 
-#: /gl/includes/ui/gl_bank_ui.inc:67
+#: /gl/includes/ui/gl_bank_ui.inc:64
 #: /sales/manage/recurrent_invoices.php:195
 #: /sales/includes/ui/sales_credit_ui.inc:29
-#: /sales/includes/ui/sales_order_ui.inc:270
+#: /sales/includes/ui/sales_order_ui.inc:267
 msgid "Customer:"
 msgstr ""
 
-#: /gl/includes/ui/gl_bank_ui.inc:71
-#: /sales/customer_payments.php:332
+#: /gl/includes/ui/gl_bank_ui.inc:68
+#: /sales/customer_payments.php:324
 #: /sales/manage/recurrent_invoices.php:198
 #: /sales/includes/ui/sales_credit_ui.inc:37
-#: /sales/includes/ui/sales_order_ui.inc:277
+#: /sales/includes/ui/sales_order_ui.inc:274
 msgid "Branch:"
 msgstr ""
 
+#: /gl/includes/ui/gl_bank_ui.inc:82
 #: /gl/includes/ui/gl_bank_ui.inc:85
-#: /gl/includes/ui/gl_bank_ui.inc:88
-#: /sales/customer_payments.php:348
+#: /sales/customer_payments.php:340
 msgid "This customer account is on hold."
 msgstr ""
 
-#: /gl/includes/ui/gl_bank_ui.inc:101
+#: /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:270
+#: /purchasing/includes/ui/invoice_ui.inc:264
 msgid "Go"
 msgstr ""
 
-#: /gl/includes/ui/gl_bank_ui.inc:120
+#: /gl/includes/ui/gl_bank_ui.inc:114
 msgid "Into:"
 msgstr ""
 
-#: /gl/includes/ui/gl_bank_ui.inc:187
+#: /gl/includes/ui/gl_bank_ui.inc:180
 #: /includes/ui/class.crud_view.inc:281
 #: /includes/ui/simple_crud_class.inc:52
-#: /inventory/includes/item_adjustments_ui.inc:84
-#: /inventory/includes/stock_transfers_ui.inc:81
-#: /manufacturing/includes/work_order_issue_ui.inc:64
-#: /purchasing/includes/ui/invoice_ui.inc:560
-#: /purchasing/includes/ui/po_ui.inc:245
-#: /sales/includes/ui/sales_credit_ui.inc:199
-#: /sales/includes/ui/sales_order_ui.inc:198
+#: /inventory/includes/item_adjustments_ui.inc:100
+#: /inventory/includes/stock_transfers_ui.inc:83
+#: /manufacturing/includes/work_order_issue_ui.inc:62
+#: /purchasing/includes/ui/invoice_ui.inc:551
+#: /purchasing/includes/ui/po_ui.inc:250
+#: /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:189
+#: /gl/includes/ui/gl_bank_ui.inc:182
 #: /includes/ui/class.crud_view.inc:285
 #: /includes/ui/simple_crud_class.inc:54
-#: /inventory/includes/item_adjustments_ui.inc:86
-#: /inventory/includes/stock_transfers_ui.inc:83
-#: /manufacturing/includes/work_order_issue_ui.inc:66
-#: /purchasing/includes/ui/invoice_ui.inc:324
-#: /purchasing/includes/ui/po_ui.inc:247
-#: /sales/includes/ui/sales_credit_ui.inc:201
-#: /sales/includes/ui/sales_order_ui.inc:200
+#: /inventory/includes/item_adjustments_ui.inc:102
+#: /inventory/includes/stock_transfers_ui.inc:84
+#: /manufacturing/includes/work_order_issue_ui.inc:64
+#: /purchasing/includes/ui/invoice_ui.inc:318
+#: /purchasing/includes/ui/po_ui.inc:252
+#: /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:278
+#: /gl/includes/ui/gl_bank_ui.inc:268
 #: /gl/includes/ui/gl_journal_ui.inc:268
 #: /includes/ui/simple_crud_class.inc:56
-#: /inventory/includes/item_adjustments_ui.inc:156
-#: /inventory/includes/stock_transfers_ui.inc:141
-#: /manufacturing/includes/work_order_issue_ui.inc:139
-#: /purchasing/includes/ui/po_ui.inc:430
-#: /sales/includes/ui/sales_credit_ui.inc:295
-#: /sales/includes/ui/sales_order_ui.inc:549
+#: /inventory/includes/item_adjustments_ui.inc:191
+#: /inventory/includes/stock_transfers_ui.inc:151
+#: /manufacturing/includes/work_order_issue_ui.inc:133
+#: /purchasing/includes/ui/po_ui.inc:437
+#: /sales/includes/ui/sales_credit_ui.inc:289
+#: /sales/includes/ui/sales_order_ui.inc:548
 msgid "Confirm changes"
 msgstr ""
 
-#: /gl/includes/ui/gl_bank_ui.inc:280
+#: /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:158
-#: /inventory/includes/stock_transfers_ui.inc:143
-#: /manufacturing/includes/work_order_issue_ui.inc:141
-#: /purchasing/includes/ui/po_ui.inc:432
-#: /sales/includes/ui/sales_credit_ui.inc:297
-#: /sales/includes/ui/sales_order_ui.inc:551
+#: /inventory/includes/item_adjustments_ui.inc:193
+#: /inventory/includes/stock_transfers_ui.inc:153
+#: /manufacturing/includes/work_order_issue_ui.inc:135
+#: /purchasing/includes/ui/po_ui.inc:439
+#: /sales/includes/ui/sales_credit_ui.inc:291
+#: /sales/includes/ui/sales_order_ui.inc:550
 msgid "Cancel changes"
 msgstr ""
 
-#: /gl/includes/ui/gl_bank_ui.inc:285
+#: /gl/includes/ui/gl_bank_ui.inc:275
 #: /gl/includes/ui/gl_journal_ui.inc:274
-#: /inventory/includes/item_adjustments_ui.inc:164
-#: /inventory/includes/stock_transfers_ui.inc:149
-#: /manufacturing/includes/work_order_issue_ui.inc:147
-#: /purchasing/includes/ui/po_ui.inc:438
-#: /sales/includes/ui/sales_credit_ui.inc:303
-#: /sales/includes/ui/sales_order_ui.inc:557
+#: /inventory/includes/item_adjustments_ui.inc:199
+#: /inventory/includes/stock_transfers_ui.inc:159
+#: /manufacturing/includes/work_order_issue_ui.inc:141
+#: /purchasing/includes/ui/po_ui.inc:445
+#: /sales/includes/ui/sales_credit_ui.inc:297
+#: /sales/includes/ui/sales_order_ui.inc:556
 msgid "Add Item"
 msgstr ""
 
-#: /gl/includes/ui/gl_bank_ui.inc:286
-#: /inventory/includes/item_adjustments_ui.inc:165
-#: /inventory/includes/stock_transfers_ui.inc:150
-#: /manufacturing/includes/work_order_issue_ui.inc:148
-#: /purchasing/includes/ui/po_ui.inc:439
-#: /sales/includes/ui/sales_credit_ui.inc:304
-#: /sales/includes/ui/sales_order_ui.inc:558
+#: /gl/includes/ui/gl_bank_ui.inc:276
+#: /inventory/includes/item_adjustments_ui.inc:200
+#: /inventory/includes/stock_transfers_ui.inc:160
+#: /manufacturing/includes/work_order_issue_ui.inc:142
+#: /purchasing/includes/ui/po_ui.inc:446
+#: /sales/includes/ui/sales_credit_ui.inc:298
+#: /sales/includes/ui/sales_order_ui.inc:557
 msgid "Add new item to document"
 msgstr ""
 
-#: /gl/includes/ui/gl_bank_ui.inc:309
+#: /gl/includes/ui/gl_bank_ui.inc:299
 msgid "Settled AR Amount:"
 msgstr ""
 
-#: /gl/includes/ui/gl_bank_ui.inc:309
+#: /gl/includes/ui/gl_bank_ui.inc:299
 msgid "Settled AP Amount:"
 msgstr ""
 
@@ -6310,7 +6528,7 @@ msgid "Journal Date:"
 msgstr ""
 
 #: /gl/includes/ui/gl_journal_ui.inc:33
-#: /inventory/prices.php:192
+#: /inventory/prices.php:193
 msgid "Currency:"
 msgstr ""
 
@@ -6327,7 +6545,7 @@ msgid "Source ref:"
 msgstr ""
 
 #: /gl/includes/ui/gl_journal_ui.inc:57
-#: /includes/sysnames.inc:98
+#: /includes/sysnames.inc:103
 msgid "Quick Entry"
 msgstr ""
 
@@ -6360,553 +6578,598 @@ msgstr ""
 msgid "Add new line to journal"
 msgstr ""
 
-#: /includes/access_levels.inc:56
+#: /includes/access_levels.inc:60
 msgid "System administration"
 msgstr ""
 
-#: /includes/access_levels.inc:57
+#: /includes/access_levels.inc:61
 msgid "Company setup"
 msgstr ""
 
-#: /includes/access_levels.inc:58
+#: /includes/access_levels.inc:62
 msgid "Special maintenance"
 msgstr ""
 
-#: /includes/access_levels.inc:59
+#: /includes/access_levels.inc:63
 msgid "Sales configuration"
 msgstr ""
 
-#: /includes/access_levels.inc:60
+#: /includes/access_levels.inc:64
 msgid "Sales transactions"
 msgstr ""
 
-#: /includes/access_levels.inc:61
+#: /includes/access_levels.inc:65
 msgid "Sales related reports"
 msgstr ""
 
-#: /includes/access_levels.inc:62
+#: /includes/access_levels.inc:66
 msgid "Purchase configuration"
 msgstr ""
 
-#: /includes/access_levels.inc:63
+#: /includes/access_levels.inc:67
 msgid "Purchase transactions"
 msgstr ""
 
-#: /includes/access_levels.inc:64
+#: /includes/access_levels.inc:68
 msgid "Purchase analytics"
 msgstr ""
 
-#: /includes/access_levels.inc:65
+#: /includes/access_levels.inc:69
 msgid "Inventory configuration"
 msgstr ""
 
-#: /includes/access_levels.inc:66
+#: /includes/access_levels.inc:70
 msgid "Inventory operations"
 msgstr ""
 
-#: /includes/access_levels.inc:67
+#: /includes/access_levels.inc:71
 msgid "Inventory analytics"
 msgstr ""
 
-#: /includes/access_levels.inc:68
+#: /includes/access_levels.inc:72
+msgid "Fixed Assets configuration"
+msgstr ""
+
+#: /includes/access_levels.inc:73
+msgid "Fixed Assets operations"
+msgstr ""
+
+#: /includes/access_levels.inc:74
+msgid "Fixed Assets analytics"
+msgstr ""
+
+#: /includes/access_levels.inc:75
 msgid "Manufacturing configuration"
 msgstr ""
 
-#: /includes/access_levels.inc:69
+#: /includes/access_levels.inc:76
 msgid "Manufacturing transactions"
 msgstr ""
 
-#: /includes/access_levels.inc:70
+#: /includes/access_levels.inc:77
 msgid "Manufacturing analytics"
 msgstr ""
 
-#: /includes/access_levels.inc:71
+#: /includes/access_levels.inc:78
 msgid "Dimensions configuration"
 msgstr ""
 
-#: /includes/access_levels.inc:72
-#: /inventory/manage/items.php:361
-#: /reporting/reports_main.php:302
+#: /includes/access_levels.inc:79
+#: /inventory/manage/items.php:455
+#: /reporting/reports_main.php:318
 msgid "Dimensions"
 msgstr ""
 
-#: /includes/access_levels.inc:73
+#: /includes/access_levels.inc:80
 msgid "Banking & GL configuration"
 msgstr ""
 
-#: /includes/access_levels.inc:74
+#: /includes/access_levels.inc:81
 msgid "Banking & GL transactions"
 msgstr ""
 
-#: /includes/access_levels.inc:75
+#: /includes/access_levels.inc:82
 msgid "Banking & GL analytics"
 msgstr ""
 
-#: /includes/access_levels.inc:93
+#: /includes/access_levels.inc:100
 msgid "Install/update companies"
 msgstr ""
 
-#: /includes/access_levels.inc:94
+#: /includes/access_levels.inc:101
 msgid "Install/update languages"
 msgstr ""
 
-#: /includes/access_levels.inc:95
+#: /includes/access_levels.inc:102
 msgid "Install/upgrade modules"
 msgstr ""
 
-#: /includes/access_levels.inc:96
+#: /includes/access_levels.inc:103
 msgid "Software upgrades"
 msgstr ""
 
-#: /includes/access_levels.inc:100
+#: /includes/access_levels.inc:107
 msgid "Company parameters"
 msgstr ""
 
-#: /includes/access_levels.inc:101
+#: /includes/access_levels.inc:108
 msgid "Access levels edition"
 msgstr ""
 
-#: /includes/access_levels.inc:102
+#: /includes/access_levels.inc:109
 msgid "Users setup"
 msgstr ""
 
-#: /includes/access_levels.inc:103
+#: /includes/access_levels.inc:110
 msgid "Point of sales definitions"
 msgstr ""
 
-#: /includes/access_levels.inc:104
+#: /includes/access_levels.inc:111
 msgid "Printers configuration"
 msgstr ""
 
-#: /includes/access_levels.inc:105
+#: /includes/access_levels.inc:112
 msgid "Print profiles"
 msgstr ""
 
-#: /includes/access_levels.inc:106
+#: /includes/access_levels.inc:113
 msgid "Payment terms"
 msgstr ""
 
-#: /includes/access_levels.inc:107
+#: /includes/access_levels.inc:114
 msgid "Shipping ways"
 msgstr ""
 
-#: /includes/access_levels.inc:108
+#: /includes/access_levels.inc:115
 msgid "Credit status definitions changes"
 msgstr ""
 
-#: /includes/access_levels.inc:109
+#: /includes/access_levels.inc:116
 msgid "Inventory locations changes"
 msgstr ""
 
-#: /includes/access_levels.inc:110
+#: /includes/access_levels.inc:117
 msgid "Inventory movement types"
 msgstr ""
 
-#: /includes/access_levels.inc:111
+#: /includes/access_levels.inc:118
 msgid "Manufacture work centres"
 msgstr ""
 
-#: /includes/access_levels.inc:112
+#: /includes/access_levels.inc:119
 msgid "Forms setup"
 msgstr ""
 
-#: /includes/access_levels.inc:113
+#: /includes/access_levels.inc:120
 msgid "Contact categories"
 msgstr ""
 
-#: /includes/access_levels.inc:117
+#: /includes/access_levels.inc:124
 msgid "Voiding transactions"
 msgstr ""
 
-#: /includes/access_levels.inc:118
+#: /includes/access_levels.inc:125
 msgid "Database backup/restore"
 msgstr ""
 
-#: /includes/access_levels.inc:119
+#: /includes/access_levels.inc:126
 msgid "Common view/print transactions interface"
 msgstr ""
 
-#: /includes/access_levels.inc:120
+#: /includes/access_levels.inc:127
 msgid "Attaching documents"
 msgstr ""
 
-#: /includes/access_levels.inc:121
+#: /includes/access_levels.inc:128
 msgid "Display preferences"
 msgstr ""
 
-#: /includes/access_levels.inc:122
+#: /includes/access_levels.inc:129
 msgid "Password changes"
 msgstr ""
 
-#: /includes/access_levels.inc:123
+#: /includes/access_levels.inc:130
 msgid "Edit other users transactions"
 msgstr ""
 
-#: /includes/access_levels.inc:127
+#: /includes/access_levels.inc:134
 msgid "Sales types"
 msgstr ""
 
-#: /includes/access_levels.inc:128
+#: /includes/access_levels.inc:135
 msgid "Sales prices edition"
 msgstr ""
 
-#: /includes/access_levels.inc:129
+#: /includes/access_levels.inc:136
 msgid "Sales staff maintenance"
 msgstr ""
 
-#: /includes/access_levels.inc:130
+#: /includes/access_levels.inc:137
 msgid "Sales areas maintenance"
 msgstr ""
 
-#: /includes/access_levels.inc:131
+#: /includes/access_levels.inc:138
 msgid "Sales groups changes"
 msgstr ""
 
-#: /includes/access_levels.inc:132
+#: /includes/access_levels.inc:139
 msgid "Sales templates"
 msgstr ""
 
-#: /includes/access_levels.inc:133
+#: /includes/access_levels.inc:140
 msgid "Recurrent invoices definitions"
 msgstr ""
 
-#: /includes/access_levels.inc:135
+#: /includes/access_levels.inc:142
 msgid "Sales transactions view"
 msgstr ""
 
-#: /includes/access_levels.inc:136
+#: /includes/access_levels.inc:143
 msgid "Sales customer and branches changes"
 msgstr ""
 
-#: /includes/access_levels.inc:137
+#: /includes/access_levels.inc:144
 msgid "Sales quotations"
 msgstr ""
 
-#: /includes/access_levels.inc:138
+#: /includes/access_levels.inc:145
 msgid "Sales orders edition"
 msgstr ""
 
-#: /includes/access_levels.inc:139
+#: /includes/access_levels.inc:146
 msgid "Sales deliveries edition"
 msgstr ""
 
-#: /includes/access_levels.inc:140
+#: /includes/access_levels.inc:147
 msgid "Sales invoices edition"
 msgstr ""
 
-#: /includes/access_levels.inc:141
+#: /includes/access_levels.inc:148
 msgid "Sales credit notes against invoice"
 msgstr ""
 
-#: /includes/access_levels.inc:142
+#: /includes/access_levels.inc:149
 msgid "Sales freehand credit notes"
 msgstr ""
 
-#: /includes/access_levels.inc:143
+#: /includes/access_levels.inc:150
 msgid "Customer payments entry"
 msgstr ""
 
-#: /includes/access_levels.inc:144
+#: /includes/access_levels.inc:151
 msgid "Customer payments allocation"
 msgstr ""
 
-#: /includes/access_levels.inc:146
+#: /includes/access_levels.inc:153
 msgid "Sales analytical reports"
 msgstr ""
 
-#: /includes/access_levels.inc:147
+#: /includes/access_levels.inc:154
 msgid "Sales document bulk reports"
 msgstr ""
 
-#: /includes/access_levels.inc:148
+#: /includes/access_levels.inc:155
 msgid "Sales prices listing"
 msgstr ""
 
-#: /includes/access_levels.inc:149
+#: /includes/access_levels.inc:156
 msgid "Sales staff listing"
 msgstr ""
 
-#: /includes/access_levels.inc:150
+#: /includes/access_levels.inc:157
 msgid "Customer bulk listing"
 msgstr ""
 
-#: /includes/access_levels.inc:151
+#: /includes/access_levels.inc:158
 msgid "Customer status report"
 msgstr ""
 
-#: /includes/access_levels.inc:152
+#: /includes/access_levels.inc:159
 msgid "Customer payments report"
 msgstr ""
 
-#: /includes/access_levels.inc:157
+#: /includes/access_levels.inc:164
 msgid "Purchase price changes"
 msgstr ""
 
-#: /includes/access_levels.inc:159
+#: /includes/access_levels.inc:166
 msgid "Supplier transactions view"
 msgstr ""
 
-#: /includes/access_levels.inc:160
+#: /includes/access_levels.inc:167
 msgid "Suppliers changes"
 msgstr ""
 
-#: /includes/access_levels.inc:161
+#: /includes/access_levels.inc:168
 msgid "Purchase order entry"
 msgstr ""
 
-#: /includes/access_levels.inc:162
+#: /includes/access_levels.inc:169
 msgid "Purchase receive"
 msgstr ""
 
-#: /includes/access_levels.inc:163
+#: /includes/access_levels.inc:170
 msgid "Supplier invoices"
 msgstr ""
 
-#: /includes/access_levels.inc:164
+#: /includes/access_levels.inc:171
 msgid "Deleting GRN items during invoice entry"
 msgstr ""
 
-#: /includes/access_levels.inc:165
+#: /includes/access_levels.inc:172
 msgid "Supplier credit notes"
 msgstr ""
 
-#: /includes/access_levels.inc:166
+#: /includes/access_levels.inc:173
 msgid "Supplier payments"
 msgstr ""
 
-#: /includes/access_levels.inc:167
+#: /includes/access_levels.inc:174
 msgid "Supplier payments allocations"
 msgstr ""
 
-#: /includes/access_levels.inc:169
+#: /includes/access_levels.inc:176
 msgid "Supplier analytical reports"
 msgstr ""
 
-#: /includes/access_levels.inc:170
+#: /includes/access_levels.inc:177
 msgid "Supplier document bulk reports"
 msgstr ""
 
-#: /includes/access_levels.inc:171
+#: /includes/access_levels.inc:178
 msgid "Supplier payments report"
 msgstr ""
 
-#: /includes/access_levels.inc:175
+#: /includes/access_levels.inc:182
 msgid "Stock items add/edit"
 msgstr ""
 
-#: /includes/access_levels.inc:176
+#: /includes/access_levels.inc:183
 msgid "Sales kits"
 msgstr ""
 
-#: /includes/access_levels.inc:177
+#: /includes/access_levels.inc:184
 msgid "Item categories"
 msgstr ""
 
-#: /includes/access_levels.inc:178
+#: /includes/access_levels.inc:185
 msgid "Units of measure"
 msgstr ""
 
-#: /includes/access_levels.inc:180
+#: /includes/access_levels.inc:187
 msgid "Stock status view"
 msgstr ""
 
-#: /includes/access_levels.inc:181
+#: /includes/access_levels.inc:188
 msgid "Stock transactions view"
 msgstr ""
 
-#: /includes/access_levels.inc:182
+#: /includes/access_levels.inc:189
 msgid "Foreign item codes entry"
 msgstr ""
 
-#: /includes/access_levels.inc:183
+#: /includes/access_levels.inc:190
 msgid "Inventory location transfers"
 msgstr ""
 
-#: /includes/access_levels.inc:184
+#: /includes/access_levels.inc:191
 msgid "Inventory adjustments"
 msgstr ""
 
-#: /includes/access_levels.inc:186
+#: /includes/access_levels.inc:193
 msgid "Reorder levels"
 msgstr ""
 
-#: /includes/access_levels.inc:187
+#: /includes/access_levels.inc:194
 msgid "Items analytical reports and inquiries"
 msgstr ""
 
-#: /includes/access_levels.inc:188
+#: /includes/access_levels.inc:195
 msgid "Inventory valuation report"
 msgstr ""
 
-#: /includes/access_levels.inc:193
+#: /includes/access_levels.inc:200
+msgid "Fixed Asset items add/edit"
+msgstr ""
+
+#: /includes/access_levels.inc:201
+msgid "Fixed Asset categories"
+msgstr ""
+
+#: /includes/access_levels.inc:202
+msgid "Fixed Asset classes"
+msgstr ""
+
+#: /includes/access_levels.inc:204
+msgid "Fixed Asset transactions view"
+msgstr ""
+
+#: /includes/access_levels.inc:205
+msgid "Fixed Asset location transfers"
+msgstr ""
+
+#: /includes/access_levels.inc:206
+msgid "Fixed Asset disposals"
+msgstr ""
+
+#: /includes/access_levels.inc:207
+#: /inventory/manage/items.php:411
+msgid "Depreciation"
+msgstr ""
+
+#: /includes/access_levels.inc:209
+msgid "Fixed Asset analytical reports and inquiries"
+msgstr ""
+
+#: /includes/access_levels.inc:214
 msgid "Bill of Materials"
 msgstr ""
 
-#: /includes/access_levels.inc:195
+#: /includes/access_levels.inc:216
 msgid "Manufacturing operations view"
 msgstr ""
 
-#: /includes/access_levels.inc:196
+#: /includes/access_levels.inc:217
 msgid "Work order entry"
 msgstr ""
 
-#: /includes/access_levels.inc:197
+#: /includes/access_levels.inc:218
 msgid "Material issues entry"
 msgstr ""
 
-#: /includes/access_levels.inc:198
+#: /includes/access_levels.inc:219
 msgid "Final product receive"
 msgstr ""
 
-#: /includes/access_levels.inc:199
+#: /includes/access_levels.inc:220
 msgid "Work order releases"
 msgstr ""
 
-#: /includes/access_levels.inc:201
+#: /includes/access_levels.inc:222
 msgid "Work order analytical reports and inquiries"
 msgstr ""
 
-#: /includes/access_levels.inc:202
+#: /includes/access_levels.inc:223
 msgid "Manufacturing cost inquiry"
 msgstr ""
 
-#: /includes/access_levels.inc:203
+#: /includes/access_levels.inc:224
 msgid "Work order bulk reports"
 msgstr ""
 
-#: /includes/access_levels.inc:204
+#: /includes/access_levels.inc:225
 msgid "Bill of materials reports"
 msgstr ""
 
-#: /includes/access_levels.inc:208
+#: /includes/access_levels.inc:229
 msgid "Dimension tags"
 msgstr ""
 
-#: /includes/access_levels.inc:210
+#: /includes/access_levels.inc:231
 msgid "Dimension view"
 msgstr ""
 
-#: /includes/access_levels.inc:212
+#: /includes/access_levels.inc:233
 msgid "Dimension entry"
 msgstr ""
 
-#: /includes/access_levels.inc:214
+#: /includes/access_levels.inc:235
 msgid "Dimension reports"
 msgstr ""
 
-#: /includes/access_levels.inc:218
+#: /includes/access_levels.inc:239
 msgid "Item tax type definitions"
 msgstr ""
 
-#: /includes/access_levels.inc:219
+#: /includes/access_levels.inc:240
 msgid "GL accounts edition"
 msgstr ""
 
-#: /includes/access_levels.inc:220
+#: /includes/access_levels.inc:241
 msgid "GL account groups"
 msgstr ""
 
-#: /includes/access_levels.inc:221
+#: /includes/access_levels.inc:242
 msgid "GL account classes"
 msgstr ""
 
-#: /includes/access_levels.inc:222
+#: /includes/access_levels.inc:243
 msgid "Quick GL entry definitions"
 msgstr ""
 
-#: /includes/access_levels.inc:224
+#: /includes/access_levels.inc:245
 msgid "Bank accounts"
 msgstr ""
 
-#: /includes/access_levels.inc:225
+#: /includes/access_levels.inc:246
 msgid "Tax rates"
 msgstr ""
 
-#: /includes/access_levels.inc:226
+#: /includes/access_levels.inc:247
 msgid "Tax groups"
 msgstr ""
 
-#: /includes/access_levels.inc:227
+#: /includes/access_levels.inc:248
 msgid "Fiscal years maintenance"
 msgstr ""
 
-#: /includes/access_levels.inc:228
+#: /includes/access_levels.inc:249
 msgid "Company GL setup"
 msgstr ""
 
-#: /includes/access_levels.inc:229
+#: /includes/access_levels.inc:250
 msgid "GL Account tags"
 msgstr ""
 
-#: /includes/access_levels.inc:230
+#: /includes/access_levels.inc:251
 msgid "Closing GL transactions"
 msgstr ""
 
-#: /includes/access_levels.inc:231
+#: /includes/access_levels.inc:252
 msgid "Reopening GL transactions"
 msgstr ""
 
-#: /includes/access_levels.inc:232
+#: /includes/access_levels.inc:253
 msgid "Allow entry on non closed Fiscal years"
 msgstr ""
 
-#: /includes/access_levels.inc:234
+#: /includes/access_levels.inc:255
 msgid "Bank transactions view"
 msgstr ""
 
-#: /includes/access_levels.inc:235
+#: /includes/access_levels.inc:256
 msgid "GL postings view"
 msgstr ""
 
-#: /includes/access_levels.inc:236
+#: /includes/access_levels.inc:257
 msgid "Exchange rate table changes"
 msgstr ""
 
-#: /includes/access_levels.inc:237
+#: /includes/access_levels.inc:258
 msgid "Bank payments"
 msgstr ""
 
-#: /includes/access_levels.inc:238
+#: /includes/access_levels.inc:259
 msgid "Bank deposits"
 msgstr ""
 
-#: /includes/access_levels.inc:239
+#: /includes/access_levels.inc:260
 msgid "Bank account transfers"
 msgstr ""
 
-#: /includes/access_levels.inc:240
+#: /includes/access_levels.inc:261
 msgid "Bank reconciliation"
 msgstr ""
 
-#: /includes/access_levels.inc:241
+#: /includes/access_levels.inc:262
 msgid "Manual journal entries"
 msgstr ""
 
-#: /includes/access_levels.inc:242
+#: /includes/access_levels.inc:263
 msgid "Journal entries to bank related accounts"
 msgstr ""
 
-#: /includes/access_levels.inc:243
+#: /includes/access_levels.inc:264
 msgid "Budget edition"
 msgstr ""
 
-#: /includes/access_levels.inc:244
+#: /includes/access_levels.inc:265
 msgid "Item standard costs"
 msgstr ""
 
-#: /includes/access_levels.inc:247
+#: /includes/access_levels.inc:268
 msgid "GL analytical reports and inquiries"
 msgstr ""
 
-#: /includes/access_levels.inc:248
+#: /includes/access_levels.inc:269
 msgid "Tax reports and inquiries"
 msgstr ""
 
-#: /includes/access_levels.inc:249
+#: /includes/access_levels.inc:270
 msgid "Bank reports and inquiries"
 msgstr ""
 
-#: /includes/access_levels.inc:250
+#: /includes/access_levels.inc:271
 msgid "GL reports and inquiries"
 msgstr ""
 
@@ -6925,8 +7188,8 @@ msgid ""
 msgstr ""
 
 #: /includes/current_user.inc:102
-#: /includes/ui/ui_controls.inc:216
-#: /includes/ui/ui_view.inc:942
+#: /includes/ui/ui_controls.inc:215
+#: /includes/ui/ui_view.inc:985
 msgid "Back"
 msgstr ""
 
@@ -6942,25 +7205,325 @@ msgstr ""
 msgid "Requesting data..."
 msgstr ""
 
-#: /includes/data_checks.inc:492
-#, php-format
-msgid "%s #%s is closed for further edition."
-msgstr ""
-
-#: /includes/data_checks.inc:534
-msgid "You have no edit access to transactions created by other users."
-msgstr ""
-
-#: /includes/data_checks.inc:549
-msgid "The entered reference is invalid."
-msgstr ""
-
-#: /includes/data_checks.inc:553
-#: /sales/credit_note_entry.php:181
-#: /sales/customer_credit_invoice.php:204
+#: /includes/dashboard.inc:89
+#: /includes/dashboard.inc:159
+#: /includes/dashboard.inc:186
+#: /includes/dashboard.inc:485
+#: /includes/dashboard.inc:525
+#: /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
+#: /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
+#: /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/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/customers_list.php:54
+#: /sales/inquiry/sales_deliveries_view.php:169
+#: /sales/inquiry/sales_orders_view.php:251
+#: /sales/inquiry/sales_orders_view.php:265
+msgid "Customer"
+msgstr ""
+
+#: /includes/dashboard.inc:89
+#: /includes/dashboard.inc:121
+#: /includes/dashboard.inc:159
+#: /includes/dashboard.inc:163
+#: /includes/dashboard.inc:289
+#: /includes/dashboard.inc:437
+#: /reporting/rep304.php:127
+#: /reporting/rep309.php:99
+#: /sales/manage/customer_branches.php:232
+#: /sales/manage/customers.php:265
+msgid "Sales"
+msgstr ""
+
+#: /includes/dashboard.inc:103
+#: /includes/dashboard.inc:161
+#: /includes/dashboard.inc:223
+#: /includes/dashboard.inc:570
+#: /includes/sysnames.inc:102
+#: /includes/sysnames.inc:187
+#: /includes/sysnames.inc:210
+#: /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/view/view_supp_invoice.php:46
+#: /purchasing/inquiry/po_search_completed.php:112
+#: /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/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
+msgid "Supplier"
+msgstr ""
+
+#: /includes/dashboard.inc:103
+msgid "Purchase"
+msgstr ""
+
+#: /includes/dashboard.inc:120
+#: /includes/dashboard.inc:163
+#: /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
+msgid "Items"
+msgstr ""
+
+#: /includes/dashboard.inc:122
+#: /includes/dashboard.inc:163
+#: /includes/dashboard.inc:289
+#: /includes/dashboard.inc:437
+#: /manufacturing/search_work_orders.php:139
+msgid "Costs"
+msgstr ""
+
+#: /includes/dashboard.inc:134
+msgid "Performance"
+msgstr ""
+
+#: /includes/dashboard.inc:161
+msgid "Purchases"
+msgstr ""
+
+#: /includes/dashboard.inc:184
+#, php-format
+msgid "Top %s customers in fiscal year"
+msgstr ""
+
+#: /includes/dashboard.inc:221
+#, php-format
+msgid "Top %s suppliers in fiscal year"
+msgstr ""
+
+#: /includes/dashboard.inc:282
+#, php-format
+msgid "Top %s Manufactured Items in fiscal year"
+msgstr ""
+
+#: /includes/dashboard.inc:284
+#, php-format
+msgid "Top %s Fixed Assets"
+msgstr ""
+
+#: /includes/dashboard.inc:286
+#, php-format
+msgid "Top %s Sold Items in fiscal year"
+msgstr ""
+
+#: /includes/dashboard.inc:289
+#: /includes/dashboard.inc:291
+#: /manufacturing/search_work_orders.php:161
+#: /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
+msgid "Item"
+msgstr ""
+
+#: /includes/dashboard.inc:289
+#: /includes/dashboard.inc:291
+#: /inventory/includes/item_adjustments_ui.inc:56
+#: /inventory/includes/item_adjustments_ui.inc:59
+#: /inventory/includes/stock_transfers_ui.inc:57
+#: /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/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:172
+#: /reporting/rep303.php:120
+#: /reporting/rep303.php:126
+#: /reporting/rep401.php:71
+#: /reporting/includes/doctext.inc:31
+#: /reporting/includes/doctext.inc:191
+#: /reporting/includes/doctext.inc:224
+#: /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/includes/ui/sales_credit_ui.inc:162
+#: /sales/includes/ui/sales_order_ui.inc:146
+msgid "Quantity"
+msgstr ""
+
+#: /includes/dashboard.inc:331
+#, php-format
+msgid "Top %s Dimensions in fiscal year"
+msgstr ""
+
+#: /includes/dashboard.inc:369
+msgid "Class Balances"
+msgstr ""
+
+#: /includes/dashboard.inc:437
+msgid "Week"
+msgstr ""
+
+#: /includes/dashboard.inc:483
+msgid " overdue Sales Invoices"
+msgstr ""
+
+#: /includes/dashboard.inc:485
+#: /includes/dashboard.inc:570
+msgid "Ref."
+msgstr ""
+
+#: /includes/dashboard.inc:485
+#: /includes/dashboard.inc:525
+#: /reporting/rep105.php:109
+#: /reporting/rep106.php:89
+#: /reporting/rep112.php:180
+#: /sales/create_recurrent_invoices.php:203
+#: /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/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:252
+#: /sales/inquiry/sales_orders_view.php:266
+msgid "Branch"
+msgstr ""
+
+#: /includes/dashboard.inc:486
+#: /includes/dashboard.inc:571
+#: /includes/sysnames.inc:137
+msgid "Remainder"
+msgstr ""
+
+#: /includes/dashboard.inc:486
+#: /includes/dashboard.inc:571
+#: /purchasing/inquiry/supplier_inquiry.php:68
+#: /purchasing/inquiry/supplier_inquiry.php:69
+#: /purchasing/inquiry/supplier_inquiry.php:70
+#: /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/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
+#: /sales/manage/recurrent_invoices.php:128
+#: /sales/inquiry/customer_inquiry.php:71
+#: /sales/inquiry/customer_inquiry.php:72
+#: /sales/inquiry/customer_inquiry.php:73
+msgid "Days"
+msgstr ""
+
+#: /includes/dashboard.inc:523
+msgid "Overdue Recurrent Invoices"
+msgstr ""
+
+#: /includes/dashboard.inc:525
+#: /sales/create_recurrent_invoices.php:203
+#: /sales/manage/recurrent_invoices.php:128
+msgid "Template No"
+msgstr ""
+
+#: /includes/dashboard.inc:525
+#: /sales/create_recurrent_invoices.php:203
+msgid "Next invoice"
+msgstr ""
+
+#: /includes/dashboard.inc:568
+msgid " overdue Purchase Invoices"
+msgstr ""
+
+#: /includes/dashboard.inc:603
+msgid "Bank Account Balances"
+msgstr ""
+
+#: /includes/data_checks.inc:612
+#, php-format
+msgid "%s #%s is closed for further edition."
+msgstr ""
+
+#: /includes/data_checks.inc:654
+msgid "You have no edit access to transactions created by other users."
+msgstr ""
+
+#: /includes/data_checks.inc:669
+msgid "The entered reference is invalid."
+msgstr ""
+
+#: /includes/data_checks.inc:673
+#: /sales/credit_note_entry.php:181
+#: /sales/customer_credit_invoice.php:204
 #: /sales/customer_delivery.php:298
-#: /sales/customer_invoice.php:382
-#: /sales/sales_order_entry.php:464
+#: /sales/customer_invoice.php:364
+#: /sales/sales_order_entry.php:469
 msgid "The entered reference is already in use."
 msgstr ""
 
@@ -6972,15 +7535,15 @@ msgstr ""
 msgid "at line "
 msgstr ""
 
-#: /includes/errors.inc:178
+#: /includes/errors.inc:176
 msgid "Debug mode database warning:"
 msgstr ""
 
-#: /includes/errors.inc:180
+#: /includes/errors.inc:178
 msgid "DATABASE ERROR :"
 msgstr ""
 
-#: /includes/errors.inc:213
+#: /includes/errors.inc:210
 msgid ""
 "The entered information is a duplicate. Please go back and enter different "
 "values."
@@ -7034,7 +7597,7 @@ msgid ""
 msgstr ""
 
 #: /includes/packages.inc:641
-#: /includes/packages.inc:702
+#: /includes/packages.inc:696
 #, php-format
 msgid "Package '%s' not found."
 msgstr ""
@@ -7048,7 +7611,7 @@ msgstr ""
 msgid "Missing refline context data: '%s'"
 msgstr ""
 
-#: /includes/references.inc:155
+#: /includes/references.inc:156
 msgid "Missing numeric placeholder in refline definition."
 msgstr ""
 
@@ -7098,52 +7661,52 @@ msgstr ""
 msgid "Login here"
 msgstr ""
 
-#: /includes/session.inc:209
+#: /includes/session.inc:219
 #, php-format
 msgid ""
 "Brute force attack on account '%s' detected. Access for non-logged users "
 "temporarily blocked."
 msgstr ""
 
-#: /includes/session.inc:240
+#: /includes/session.inc:251
 msgid "Security settings have not been defined for your user account."
 msgstr ""
 
-#: /includes/session.inc:241
+#: /includes/session.inc:252
 msgid "Please contact your system administrator."
 msgstr ""
 
-#: /includes/session.inc:242
+#: /includes/session.inc:253
 msgid ""
 "Please remove $security_groups and $security_headings arrays from config.php "
 "file!"
 msgstr ""
 
-#: /includes/session.inc:245
+#: /includes/session.inc:256
 msgid ""
 "Access to application has been blocked until database upgrade is completed "
 "by system administrator."
 msgstr ""
 
-#: /includes/session.inc:259
+#: /includes/session.inc:270
 msgid ""
 "The security settings on your account do not permit you to access this "
 "function"
 msgstr ""
 
-#: /includes/session.inc:268
+#: /includes/session.inc:279
 msgid ""
 "System is blocked after source upgrade until database is updated on System/"
 "Software Upgrade page"
 msgstr ""
 
 #: /includes/sysnames.inc:23
-#: /includes/sysnames.inc:149
+#: /includes/sysnames.inc:154
 msgid "Bank Payment"
 msgstr ""
 
 #: /includes/sysnames.inc:24
-#: /includes/sysnames.inc:148
+#: /includes/sysnames.inc:153
 msgid "Bank Deposit"
 msgstr ""
 
@@ -7177,7 +7740,7 @@ msgid "Inventory Adjustment"
 msgstr ""
 
 #: /includes/sysnames.inc:32
-#: /purchasing/includes/ui/po_ui.inc:302
+#: /purchasing/includes/ui/po_ui.inc:307
 #: /purchasing/view/view_po.php:30
 msgid "Purchase Order"
 msgstr ""
@@ -7187,8 +7750,8 @@ msgid "Supplier Invoice"
 msgstr ""
 
 #: /includes/sysnames.inc:34
-#: /purchasing/supplier_credit.php:58
-#: /purchasing/supplier_credit.php:62
+#: /purchasing/supplier_credit.php:57
+#: /purchasing/supplier_credit.php:61
 msgid "Supplier Credit Note"
 msgstr ""
 
@@ -7202,7 +7765,8 @@ msgid "Purchase Order Delivery"
 msgstr ""
 
 #: /includes/sysnames.inc:37
-#: /includes/sysnames.inc:95
+#: /includes/sysnames.inc:100
+#: /includes/types.inc:133
 msgid "Work Order"
 msgstr ""
 
@@ -7221,7 +7785,7 @@ msgid "Sales Order"
 msgstr ""
 
 #: /includes/sysnames.inc:41
-#: /sales/sales_order_entry.php:647
+#: /sales/sales_order_entry.php:651
 msgid "Sales Quotation"
 msgstr ""
 
@@ -7230,466 +7794,420 @@ msgid "Cost Update"
 msgstr ""
 
 #: /includes/sysnames.inc:47
-msgid "GJ"
+#: /inventory/adjustments.php:32
+msgid "Fixed Assets Disposal"
 msgstr ""
 
 #: /includes/sysnames.inc:48
+msgid "Fixed Assets Revaluation"
+msgstr ""
+
+#: /includes/sysnames.inc:52
+msgid "GJ"
+msgstr ""
+
+#: /includes/sysnames.inc:53
 msgid "BP"
 msgstr ""
 
-#: /includes/sysnames.inc:49
+#: /includes/sysnames.inc:54
 msgid "BD"
 msgstr ""
 
-#: /includes/sysnames.inc:50
+#: /includes/sysnames.inc:55
 msgid "BT"
 msgstr ""
 
-#: /includes/sysnames.inc:51
+#: /includes/sysnames.inc:56
 msgid "SI"
 msgstr ""
 
-#: /includes/sysnames.inc:52
+#: /includes/sysnames.inc:57
 msgid "CN"
 msgstr ""
 
-#: /includes/sysnames.inc:53
+#: /includes/sysnames.inc:58
 msgid "CP"
 msgstr ""
 
-#: /includes/sysnames.inc:54
-#: /sales/customer_invoice.php:555
+#: /includes/sysnames.inc:59
+#: /sales/customer_invoice.php:525
 msgid "DN"
 msgstr ""
 
-#: /includes/sysnames.inc:55
+#: /includes/sysnames.inc:60
 msgid "IT"
 msgstr ""
 
-#: /includes/sysnames.inc:56
+#: /includes/sysnames.inc:61
 msgid "IA"
 msgstr ""
 
-#: /includes/sysnames.inc:57
+#: /includes/sysnames.inc:62
 msgid "PO"
 msgstr ""
 
-#: /includes/sysnames.inc:58
+#: /includes/sysnames.inc:63
 msgid "PI"
 msgstr ""
 
-#: /includes/sysnames.inc:59
+#: /includes/sysnames.inc:64
 msgid "PC"
 msgstr ""
 
-#: /includes/sysnames.inc:60
+#: /includes/sysnames.inc:65
 msgid "SP"
 msgstr ""
 
-#: /includes/sysnames.inc:61
+#: /includes/sysnames.inc:66
 #: /reporting/rep204.php:84
-#: /reporting/rep305.php:101
+#: /reporting/rep305.php:106
 msgid "GRN"
 msgstr ""
 
-#: /includes/sysnames.inc:62
+#: /includes/sysnames.inc:67
 msgid "WO"
 msgstr ""
 
-#: /includes/sysnames.inc:63
+#: /includes/sysnames.inc:68
 msgid "WI"
 msgstr ""
 
-#: /includes/sysnames.inc:64
+#: /includes/sysnames.inc:69
 msgid "WP"
 msgstr ""
 
-#: /includes/sysnames.inc:65
+#: /includes/sysnames.inc:70
 msgid "SO"
 msgstr ""
 
-#: /includes/sysnames.inc:66
+#: /includes/sysnames.inc:71
 msgid "SQ"
 msgstr ""
 
-#: /includes/sysnames.inc:67
+#: /includes/sysnames.inc:72
 msgid "CU"
 msgstr ""
 
-#: /includes/sysnames.inc:68
+#: /includes/sysnames.inc:73
 msgid "Dim"
 msgstr ""
 
-#: /includes/sysnames.inc:76
+#: /includes/sysnames.inc:81
 msgid "Savings Account"
 msgstr ""
 
-#: /includes/sysnames.inc:77
+#: /includes/sysnames.inc:82
 msgid "Chequing Account"
 msgstr ""
 
-#: /includes/sysnames.inc:78
-#: /manufacturing/work_order_costs.php:144
+#: /includes/sysnames.inc:83
+#: /manufacturing/work_order_costs.php:146
 msgid "Credit Account"
 msgstr ""
 
-#: /includes/sysnames.inc:79
+#: /includes/sysnames.inc:84
 msgid "Cash Account"
 msgstr ""
 
-#: /includes/sysnames.inc:83
+#: /includes/sysnames.inc:88
 msgid "Transfer"
 msgstr ""
 
-#: /includes/sysnames.inc:84
+#: /includes/sysnames.inc:89
 msgid "Cheque"
 msgstr ""
 
-#: /includes/sysnames.inc:86
-#: /includes/sysnames.inc:181
+#: /includes/sysnames.inc:91
+#: /includes/sysnames.inc:195
 msgid "Cash"
 msgstr ""
 
-#: /includes/sysnames.inc:96
-#: /includes/sysnames.inc:195
-#: /reporting/rep101.php:142
-#: /reporting/rep102.php:130
-#: /reporting/rep102.php:137
-#: /reporting/rep105.php:109
-#: /reporting/rep106.php:89
-#: /reporting/rep114.php:95
-#: /reporting/rep304.php:126
-#: /reporting/rep304.php:136
-#: /reporting/reports_main.php:32
-#: /reporting/reports_main.php:36
-#: /reporting/reports_main.php:45
-#: /reporting/reports_main.php:102
-#: /reporting/reports_main.php:121
-#: /reporting/reports_main.php:237
-#: /sales/create_recurrent_invoices.php:203
-#: /sales/customer_credit_invoice.php:234
-#: /sales/customer_delivery.php:326
-#: /sales/customer_invoice.php:449
-#: /sales/allocations/customer_allocation_main.php:97
-#: /sales/allocations/customer_allocation_main.php:105
-#: /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/sales_deliveries_view.php:169
-#: /sales/inquiry/sales_orders_view.php:251
-#: /sales/inquiry/sales_orders_view.php:265
-msgid "Customer"
-msgstr ""
-
-#: /includes/sysnames.inc:97
-#: /includes/sysnames.inc:173
-#: /includes/sysnames.inc:196
-#: /inventory/purchasing_data.php:147
-#: /purchasing/includes/ui/grn_ui.inc:20
-#: /purchasing/includes/ui/grn_ui.inc:52
-#: /purchasing/includes/ui/po_ui.inc:295
-#: /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.php:119
-#: /purchasing/inquiry/supplier_allocation_inquiry.php:139
-#: /purchasing/inquiry/supplier_allocation_inquiry.php:152
-#: /purchasing/inquiry/supplier_inquiry.php:176
-#: /purchasing/inquiry/supplier_inquiry.php:191
-#: /purchasing/allocations/supplier_allocation_main.php:98
-#: /purchasing/allocations/supplier_allocation_main.php:106
-#: /reporting/rep201.php:119
-#: /reporting/rep202.php:130
-#: /reporting/rep202.php:137
-#: /reporting/rep203.php:100
-#: /reporting/rep204.php:90
-#: /reporting/rep306.php:141
-#: /reporting/rep306.php:151
-#: /reporting/reports_main.php:149
-#: /reporting/reports_main.php:153
-#: /reporting/reports_main.php:162
-#: /reporting/reports_main.php:173
-#: /reporting/reports_main.php:180
-#: /reporting/reports_main.php:253
-msgid "Supplier"
-msgstr ""
-
-#: /includes/sysnames.inc:105
+#: /includes/sysnames.inc:110
 msgid "Assemble"
 msgstr ""
 
-#: /includes/sysnames.inc:106
+#: /includes/sysnames.inc:111
 msgid "Unassemble"
 msgstr ""
 
-#: /includes/sysnames.inc:107
+#: /includes/sysnames.inc:112
 msgid "Advanced Manufacture"
 msgstr ""
 
-#: /includes/sysnames.inc:111
+#: /includes/sysnames.inc:116
 msgid "Labour Cost"
 msgstr ""
 
-#: /includes/sysnames.inc:112
+#: /includes/sysnames.inc:117
 msgid "Overhead Cost"
 msgstr ""
 
-#: /includes/sysnames.inc:113
+#: /includes/sysnames.inc:118
 msgid "Materials"
 msgstr ""
 
-#: /includes/sysnames.inc:120
+#: /includes/sysnames.inc:125
 msgid "Assets"
 msgstr ""
 
-#: /includes/sysnames.inc:122
+#: /includes/sysnames.inc:127
 msgid "Equity"
 msgstr ""
 
-#: /includes/sysnames.inc:123
+#: /includes/sysnames.inc:128
 msgid "Income"
 msgstr ""
 
-#: /includes/sysnames.inc:124
+#: /includes/sysnames.inc:129
 msgid "Cost of Goods Sold"
 msgstr ""
 
-#: /includes/sysnames.inc:125
+#: /includes/sysnames.inc:130
 msgid "Expense"
 msgstr ""
 
-#: /includes/sysnames.inc:132
-msgid "Remainder"
-msgstr ""
-
-#: /includes/sysnames.inc:134
+#: /includes/sysnames.inc:139
 msgid "Amount, increase base"
 msgstr ""
 
-#: /includes/sysnames.inc:135
+#: /includes/sysnames.inc:140
 msgid "Amount, reduce base"
 msgstr ""
 
-#: /includes/sysnames.inc:136
+#: /includes/sysnames.inc:141
 msgid "% amount of base"
 msgstr ""
 
-#: /includes/sysnames.inc:137
+#: /includes/sysnames.inc:142
 msgid "% amount of base, increase base"
 msgstr ""
 
-#: /includes/sysnames.inc:138
+#: /includes/sysnames.inc:143
 msgid "% amount of base, reduce base"
 msgstr ""
 
-#: /includes/sysnames.inc:139
+#: /includes/sysnames.inc:144
 msgid "Taxes added"
 msgstr ""
 
-#: /includes/sysnames.inc:140
+#: /includes/sysnames.inc:145
 msgid "Taxes added, increase base"
 msgstr ""
 
-#: /includes/sysnames.inc:141
+#: /includes/sysnames.inc:146
 msgid "Taxes added, reduce base"
 msgstr ""
 
-#: /includes/sysnames.inc:142
+#: /includes/sysnames.inc:147
 msgid "Taxes included"
 msgstr ""
 
-#: /includes/sysnames.inc:143
+#: /includes/sysnames.inc:148
 msgid "Taxes included, increase base"
 msgstr ""
 
-#: /includes/sysnames.inc:144
+#: /includes/sysnames.inc:149
 msgid "Taxes included, reduce base"
 msgstr ""
 
-#: /includes/sysnames.inc:151
+#: /includes/sysnames.inc:156
 msgid "Supplier Invoice/Credit"
 msgstr ""
 
-#: /includes/sysnames.inc:157
-#: /manufacturing/search_work_orders.php:171
-#: /manufacturing/includes/manufacturing_ui.inc:278
+#: /includes/sysnames.inc:162
+msgid "Declining balance"
+msgstr ""
+
+#: /includes/sysnames.inc:163
+msgid "Straight line"
+msgstr ""
+
+#: /includes/sysnames.inc:164
+msgid "Sum of the Year Digits"
+msgstr ""
+
+#: /includes/sysnames.inc:165
+msgid "One-time"
+msgstr ""
+
+#: /includes/sysnames.inc:171
+#: /manufacturing/search_work_orders.php:163
+#: /manufacturing/includes/manufacturing_ui.inc:293
 #: /reporting/rep402.php:103
 msgid "Manufactured"
 msgstr ""
 
-#: /includes/sysnames.inc:158
+#: /includes/sysnames.inc:172
 msgid "Purchased"
 msgstr ""
 
-#: /includes/sysnames.inc:159
+#: /includes/sysnames.inc:173
 msgid "Service"
 msgstr ""
 
-#: /includes/sysnames.inc:172
+#: /includes/sysnames.inc:186
 msgid "Customer branch"
 msgstr ""
 
-#: /includes/sysnames.inc:174
+#: /includes/sysnames.inc:188
 msgid "Shipper"
 msgstr ""
 
-#: /includes/sysnames.inc:175
+#: /includes/sysnames.inc:189
 msgid "Company internal"
 msgstr ""
 
-#: /includes/sysnames.inc:180
+#: /includes/sysnames.inc:194
 msgid "Prepayment"
 msgstr ""
 
-#: /includes/sysnames.inc:182
+#: /includes/sysnames.inc:196
 msgid "After No. of Days"
 msgstr ""
 
-#: /includes/sysnames.inc:183
+#: /includes/sysnames.inc:197
 msgid "Day In Following Month"
 msgstr ""
 
-#: /includes/sysnames.inc:187
+#: /includes/sysnames.inc:201
 msgid "Sum per line taxes"
 msgstr ""
 
-#: /includes/sysnames.inc:188
+#: /includes/sysnames.inc:202
 msgid "Taxes from totals"
 msgstr ""
 
-#: /includes/sysnames.inc:200
+#: /includes/sysnames.inc:214
 msgid "Jan"
 msgstr ""
 
-#: /includes/sysnames.inc:200
+#: /includes/sysnames.inc:214
 msgid "Feb"
 msgstr ""
 
-#: /includes/sysnames.inc:200
+#: /includes/sysnames.inc:214
 msgid "Mar"
 msgstr ""
 
-#: /includes/sysnames.inc:200
+#: /includes/sysnames.inc:214
 msgid "Apr"
 msgstr ""
 
-#: /includes/sysnames.inc:200
-#: /includes/ui/ui_view.inc:939
+#: /includes/sysnames.inc:214
+#: /includes/ui/ui_view.inc:982
 msgid "May"
 msgstr ""
 
-#: /includes/sysnames.inc:200
+#: /includes/sysnames.inc:214
 msgid "Jun"
 msgstr ""
 
-#: /includes/sysnames.inc:200
+#: /includes/sysnames.inc:214
 msgid "Jul"
 msgstr ""
 
-#: /includes/sysnames.inc:200
+#: /includes/sysnames.inc:214
 msgid "Aug"
 msgstr ""
 
-#: /includes/sysnames.inc:200
+#: /includes/sysnames.inc:214
 msgid "Sep"
 msgstr ""
 
-#: /includes/sysnames.inc:200
+#: /includes/sysnames.inc:214
 msgid "Oct"
 msgstr ""
 
-#: /includes/sysnames.inc:200
+#: /includes/sysnames.inc:214
 msgid "Nov"
 msgstr ""
 
-#: /includes/sysnames.inc:200
+#: /includes/sysnames.inc:214
 msgid "Dec"
 msgstr ""
 
-#: /includes/sysnames.inc:206
+#: /includes/sysnames.inc:220
 msgid "Unicode (multilanguage)"
 msgstr ""
 
-#: /includes/sysnames.inc:207
+#: /includes/sysnames.inc:221
 msgid "Icelandic"
 msgstr ""
 
-#: /includes/sysnames.inc:208
+#: /includes/sysnames.inc:222
 msgid "Latvian"
 msgstr ""
 
-#: /includes/sysnames.inc:209
+#: /includes/sysnames.inc:223
 msgid "Romanian"
 msgstr ""
 
-#: /includes/sysnames.inc:210
+#: /includes/sysnames.inc:224
 msgid "Slovenian"
 msgstr ""
 
-#: /includes/sysnames.inc:211
+#: /includes/sysnames.inc:225
 msgid "Polish"
 msgstr ""
 
-#: /includes/sysnames.inc:212
+#: /includes/sysnames.inc:226
 msgid "Estonian"
 msgstr ""
 
-#: /includes/sysnames.inc:213
+#: /includes/sysnames.inc:227
 msgid "Spanish"
 msgstr ""
 
-#: /includes/sysnames.inc:214
+#: /includes/sysnames.inc:228
 msgid "Swedish"
 msgstr ""
 
-#: /includes/sysnames.inc:215
+#: /includes/sysnames.inc:229
 msgid "Turkish"
 msgstr ""
 
-#: /includes/sysnames.inc:216
+#: /includes/sysnames.inc:230
 msgid "Czech"
 msgstr ""
 
-#: /includes/sysnames.inc:217
+#: /includes/sysnames.inc:231
 msgid "Danish"
 msgstr ""
 
-#: /includes/sysnames.inc:218
+#: /includes/sysnames.inc:232
 msgid "Lithuanian"
 msgstr ""
 
-#: /includes/sysnames.inc:219
+#: /includes/sysnames.inc:233
 msgid "Slovak"
 msgstr ""
 
-#: /includes/sysnames.inc:220
+#: /includes/sysnames.inc:234
 msgid "Spanish (alternative)"
 msgstr ""
 
-#: /includes/sysnames.inc:221
+#: /includes/sysnames.inc:235
 msgid "Persian"
 msgstr ""
 
-#: /includes/sysnames.inc:222
+#: /includes/sysnames.inc:236
 msgid "Hungarian"
 msgstr ""
 
-#: /includes/sysnames.inc:223
+#: /includes/sysnames.inc:237
 msgid "French"
 msgstr ""
 
-#: /includes/sysnames.inc:224
+#: /includes/sysnames.inc:238
 msgid "Italian"
 msgstr ""
 
 #: /includes/system_tests.inc:15
 #: /includes/ui/ui_view.inc:210
-#: /reporting/rep705.php:254
-#: /reporting/rep705.php:265
-#: /reporting/rep705.php:274
+#: /reporting/rep705.php:251
+#: /reporting/rep705.php:262
+#: /reporting/rep705.php:271
 msgid "Info"
 msgstr ""
 
@@ -7912,71 +8430,72 @@ msgstr ""
 
 #: /includes/system_tests.inc:421
 #: /reporting/rep204.php:85
-#: /reporting/rep301.php:169
+#: /reporting/rep301.php:172
 #: /reporting/rep308.php:243
 msgid "Value"
 msgstr ""
 
 #: /includes/system_tests.inc:421
-#: /reporting/reports_main.php:40
-#: /reporting/reports_main.php:51
-#: /reporting/reports_main.php:60
-#: /reporting/reports_main.php:67
-#: /reporting/reports_main.php:76
-#: /reporting/reports_main.php:85
-#: /reporting/reports_main.php:92
-#: /reporting/reports_main.php:101
-#: /reporting/reports_main.php:111
-#: /reporting/reports_main.php:118
-#: /reporting/reports_main.php:125
-#: /reporting/reports_main.php:133
-#: /reporting/reports_main.php:140
-#: /reporting/reports_main.php:146
-#: /reporting/reports_main.php:157
-#: /reporting/reports_main.php:168
-#: /reporting/reports_main.php:176
-#: /reporting/reports_main.php:181
-#: /reporting/reports_main.php:188
-#: /reporting/reports_main.php:196
-#: /reporting/reports_main.php:203
-#: /reporting/reports_main.php:212
-#: /reporting/reports_main.php:218
-#: /reporting/reports_main.php:229
-#: /reporting/reports_main.php:239
-#: /reporting/reports_main.php:245
-#: /reporting/reports_main.php:255
-#: /reporting/reports_main.php:263
-#: /reporting/reports_main.php:271
-#: /reporting/reports_main.php:278
-#: /reporting/reports_main.php:286
-#: /reporting/reports_main.php:293
-#: /reporting/reports_main.php:300
-#: /reporting/reports_main.php:309
-#: /reporting/reports_main.php:322
-#: /reporting/reports_main.php:329
+#: /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:357
-#: /reporting/reports_main.php:365
+#: /reporting/reports_main.php:348
+#: /reporting/reports_main.php:355
+#: /reporting/reports_main.php:368
 #: /reporting/reports_main.php:376
-#: /reporting/reports_main.php:388
-#: /reporting/reports_main.php:398
-#: /reporting/reports_main.php:410
-#: /reporting/reports_main.php:417
-#: /reporting/reports_main.php:427
+#: /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:447
+#: /reporting/reports_main.php:449
 #: /reporting/reports_main.php:458
-#: /reporting/reports_main.php:464
-#: /reporting/reports_main.php:473
-#: /reporting/reports_main.php:483
-#: /reporting/reports_main.php:491
-#: /reporting/reports_main.php:499
-#: /reporting/reports_main.php:507
-#: /reporting/includes/excel_report.inc:295
-#: /reporting/includes/excel_report.inc:428
+#: /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:291
+#: /reporting/includes/excel_report.inc:424
 #: /reporting/includes/pdf_report.inc:347
-#: /reporting/includes/pdf_report.inc:620
+#: /reporting/includes/pdf_report.inc:608
 #: /sales/view/view_sales_order.php:98
 msgid "Comments"
 msgstr ""
@@ -8098,103 +8617,104 @@ msgstr ""
 msgid "Reference line cannot be deleted because it is already in use."
 msgstr ""
 
-#: /includes/db/inventory_db.inc:290
+#: /includes/db/inventory_db.inc:307
 msgid "Cost was "
 msgstr ""
 
-#: /includes/db/inventory_db.inc:290
+#: /includes/db/inventory_db.inc:307
 msgid " changed to "
 msgstr ""
 
-#: /includes/db/inventory_db.inc:290
+#: /includes/db/inventory_db.inc:307
 msgid " for item "
 msgstr ""
 
-#: /includes/db/inventory_db.inc:333
+#: /includes/db/inventory_db.inc:367
 msgid "Zero/negative inventory handling"
 msgstr ""
 
-#: /includes/ui/allocation_cart.inc:289
+#: /includes/ui/allocation_cart.inc:288
 #, php-format
 msgid "Allocated amounts in %s:"
 msgstr ""
 
-#: /includes/ui/allocation_cart.inc:291
+#: /includes/ui/allocation_cart.inc:290
 #: /purchasing/allocations/supplier_allocation_main.php:94
-#: /sales/allocations/customer_allocation_main.php:93
+#: /sales/allocations/customer_allocation_main.php:87
 msgid "Transaction Type"
 msgstr ""
 
-#: /includes/ui/allocation_cart.inc:291
+#: /includes/ui/allocation_cart.inc:290
 msgid "Supplier Ref"
 msgstr ""
 
-#: /includes/ui/allocation_cart.inc:291
-#: /reporting/rep704.php:83
-#: /reporting/rep704.php:86
-#: /reporting/rep704.php:89
+#: /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/inquiry/customer_branches_list.php:49
 #: /sales/inquiry/sales_orders_view.php:211
 #: /sales/inquiry/sales_orders_view.php:250
 #: /sales/inquiry/sales_orders_view.php:264
 msgid "Ref"
 msgstr ""
 
-#: /includes/ui/allocation_cart.inc:292
+#: /includes/ui/allocation_cart.inc:291
 msgid "Other Allocations"
 msgstr ""
 
-#: /includes/ui/allocation_cart.inc:292
-#: /includes/ui/allocation_cart.inc:346
-#: /includes/ui/ui_view.inc:549
+#: /includes/ui/allocation_cart.inc:291
+#: /includes/ui/allocation_cart.inc:337
+#: /includes/ui/ui_view.inc:547
 #: /purchasing/allocations/supplier_allocation_main.php:101
-#: /reporting/rep112.php:148
-#: /reporting/rep210.php:155
+#: /reporting/rep112.php:150
+#: /reporting/rep210.php:157
 #: /reporting/includes/doctext.inc:166
 #: /reporting/includes/doctext.inc:207
-#: /sales/allocations/customer_allocation_main.php:100
+#: /sales/allocations/customer_allocation_main.php:94
 msgid "Left to Allocate"
 msgstr ""
 
-#: /includes/ui/allocation_cart.inc:292
-#: /includes/ui/ui_view.inc:549
+#: /includes/ui/allocation_cart.inc:291
+#: /includes/ui/ui_view.inc:547
 #: /reporting/includes/doctext.inc:166
 #: /reporting/includes/doctext.inc:207
 msgid "This Allocation"
 msgstr ""
 
-#: /includes/ui/allocation_cart.inc:325
-#: /reporting/rep112.php:145
-#: /reporting/rep210.php:152
+#: /includes/ui/allocation_cart.inc:324
+#: /reporting/rep112.php:147
+#: /reporting/rep210.php:154
 msgid "Total Allocated"
 msgstr ""
 
-#: /includes/ui/allocation_cart.inc:367
+#: /includes/ui/allocation_cart.inc:358
 msgid "The entry for one or more amounts is invalid or negative."
 msgstr ""
 
-#: /includes/ui/allocation_cart.inc:378
+#: /includes/ui/allocation_cart.inc:369
 msgid "At least one transaction is overallocated."
 msgstr ""
 
-#: /includes/ui/allocation_cart.inc:398
+#: /includes/ui/allocation_cart.inc:383
 msgid ""
 "These allocations cannot be processed because the amount allocated is more "
 "than the total amount left to allocate."
 msgstr ""
 
 #: /includes/ui/class.crud_view.inc:289
-#: /includes/ui/simple_crud_class.inc:227
+#: /includes/ui/simple_crud_class.inc:225
 #: /includes/ui/ui_input.inc:226
 msgid "Submit changes"
 msgstr ""
 
 #: /includes/ui/class.crud_view.inc:304
-#: /includes/ui/simple_crud_class.inc:229
+#: /includes/ui/simple_crud_class.inc:227
 #: /includes/ui/ui_input.inc:227
 msgid "Clone"
 msgstr ""
@@ -8211,135 +8731,135 @@ msgstr ""
 msgid "Pattern"
 msgstr ""
 
-#: /includes/ui/class.reflines_crud.inc:97
+#: /includes/ui/class.reflines_crud.inc:98
 msgid "Reference Pattern:"
 msgstr ""
 
-#: /includes/ui/class.reflines_crud.inc:100
+#: /includes/ui/class.reflines_crud.inc:101
 msgid "Default for This Type:"
 msgstr ""
 
-#: /includes/ui/class.reflines_crud.inc:102
+#: /includes/ui/class.reflines_crud.inc:103
 msgid "Set as Default for This Type:"
 msgstr ""
 
-#: /includes/ui/contacts_view.inc:41
+#: /includes/ui/contacts_view.inc:40
 msgid "Assignment"
 msgstr ""
 
-#: /includes/ui/contacts_view.inc:41
+#: /includes/ui/contacts_view.inc:40
 msgid "Sec Phone"
 msgstr ""
 
-#: /includes/ui/contacts_view.inc:41
-#: /reporting/rep103.php:265
-#: /reporting/rep205.php:184
+#: /includes/ui/contacts_view.inc:40
+#: /reporting/rep103.php:263
+#: /reporting/rep205.php:175
 #: /reporting/includes/header2.inc:107
 #: /sales/manage/sales_people.php:99
 msgid "Fax"
 msgstr ""
 
-#: /includes/ui/contacts_view.inc:42
+#: /includes/ui/contacts_view.inc:41
 msgid "email"
 msgstr ""
 
-#: /includes/ui/contacts_view.inc:90
+#: /includes/ui/contacts_view.inc:87
 msgid "Contact data"
 msgstr ""
 
-#: /includes/ui/contacts_view.inc:92
+#: /includes/ui/contacts_view.inc:89
 msgid "First Name:"
 msgstr ""
 
-#: /includes/ui/contacts_view.inc:93
+#: /includes/ui/contacts_view.inc:90
 msgid "Last Name:"
 msgstr ""
 
-#: /includes/ui/contacts_view.inc:96
+#: /includes/ui/contacts_view.inc:93
 msgid "Contact active for:"
 msgstr ""
 
-#: /includes/ui/contacts_view.inc:102
+#: /includes/ui/contacts_view.inc:99
 #: /sales/manage/customers.php:256
 msgid "Phone:"
 msgstr ""
 
-#: /includes/ui/contacts_view.inc:105
-#: /inventory/manage/locations.php:207
-#: /purchasing/manage/suppliers.php:138
-#: /sales/manage/customer_branches.php:252
+#: /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
 msgid "E-mail:"
 msgstr ""
 
-#: /includes/ui/contacts_view.inc:110
-#: /purchasing/manage/suppliers.php:139
-#: /sales/manage/customer_branches.php:253
+#: /includes/ui/contacts_view.inc:107
+#: /purchasing/manage/suppliers.php:140
+#: /sales/manage/customer_branches.php:257
 msgid "Document Language:"
 msgstr ""
 
-#: /includes/ui/contacts_view.inc:110
-#: /sales/manage/customer_branches.php:253
+#: /includes/ui/contacts_view.inc:107
+#: /sales/manage/customer_branches.php:257
 msgid "Customer default"
 msgstr ""
 
-#: /includes/ui/contacts_view.inc:112
+#: /includes/ui/contacts_view.inc:109
 msgid "Notes:"
 msgstr ""
 
-#: /includes/ui/contacts_view.inc:131
+#: /includes/ui/contacts_view.inc:128
 msgid "The contact name cannot be empty."
 msgstr ""
 
-#: /includes/ui/contacts_view.inc:136
+#: /includes/ui/contacts_view.inc:133
 msgid "Contact reference cannot be empty."
 msgstr ""
 
-#: /includes/ui/contacts_view.inc:141
+#: /includes/ui/contacts_view.inc:138
 msgid "You have to select at least one category."
 msgstr ""
 
-#: /includes/ui/db_pager_view.inc:166
-#: /includes/ui/ui_input.inc:979
+#: /includes/ui/db_pager_view.inc:165
+#: /includes/ui/ui_input.inc:959
 msgid "Show also Inactive"
 msgstr ""
 
-#: /includes/ui/db_pager_view.inc:175
+#: /includes/ui/db_pager_view.inc:174
 msgid "First"
 msgstr ""
 
-#: /includes/ui/db_pager_view.inc:176
+#: /includes/ui/db_pager_view.inc:175
 msgid "Prev"
 msgstr ""
 
-#: /includes/ui/db_pager_view.inc:177
+#: /includes/ui/db_pager_view.inc:176
 msgid "Next"
 msgstr ""
 
-#: /includes/ui/db_pager_view.inc:178
+#: /includes/ui/db_pager_view.inc:177
 msgid "Last"
 msgstr ""
 
-#: /includes/ui/db_pager_view.inc:187
+#: /includes/ui/db_pager_view.inc:186
 #, php-format
 msgid "Records %d-%d of %d"
 msgstr ""
 
-#: /includes/ui/db_pager_view.inc:191
+#: /includes/ui/db_pager_view.inc:190
 msgid "No records"
 msgstr ""
 
-#: /includes/ui/items_cart.inc:391
+#: /includes/ui/items_cart.inc:395
 msgid "Exchange rate roundings"
 msgstr ""
 
-#: /includes/ui/simple_crud_class.inc:229
+#: /includes/ui/simple_crud_class.inc:227
 #: /includes/ui/ui_input.inc:228
 msgid "Edit new record with current data"
 msgstr ""
 
-#: /includes/ui/simple_crud_class.inc:231
+#: /includes/ui/simple_crud_class.inc:229
 #: /includes/ui/ui_input.inc:229
 msgid "Cancel edition"
 msgstr ""
@@ -8352,77 +8872,73 @@ msgstr ""
 msgid "CSRF attack detected from: "
 msgstr ""
 
-#: /includes/ui/ui_controls.inc:165
+#: /includes/ui/ui_controls.inc:164
 msgid "You should automatically be forwarded."
 msgstr ""
 
-#: /includes/ui/ui_controls.inc:166
+#: /includes/ui/ui_controls.inc:165
 msgid "If this does not happen"
 msgstr ""
 
-#: /includes/ui/ui_controls.inc:166
+#: /includes/ui/ui_controls.inc:165
 msgid "click here"
 msgstr ""
 
-#: /includes/ui/ui_controls.inc:166
+#: /includes/ui/ui_controls.inc:165
 msgid "to continue"
 msgstr ""
 
-#: /includes/ui/ui_controls.inc:216
+#: /includes/ui/ui_controls.inc:215
 msgid "Close"
 msgstr ""
 
-#: /includes/ui/ui_controls.inc:500
+#: /includes/ui/ui_controls.inc:506
 #: /sales/manage/customers.php:23
+#: /sales/inquiry/customers_list.php:29
 msgid "Customers"
 msgstr ""
 
-#: /includes/ui/ui_controls.inc:502
+#: /includes/ui/ui_controls.inc:508
 msgid "Branches"
 msgstr ""
 
-#: /includes/ui/ui_controls.inc:504
+#: /includes/ui/ui_controls.inc:510
 #: /purchasing/manage/suppliers.php:22
+#: /purchasing/inquiry/suppliers_list.php:29
 msgid "Suppliers"
 msgstr ""
 
-#: /includes/ui/ui_controls.inc:506
-#: /inventory/transfers.php:210
-#: /inventory/manage/items.php:22
-#: /reporting/rep402.php:108
-#: /reporting/reports_main.php:254
-#: /reporting/reports_main.php:290
-msgid "Items"
-msgstr ""
-
-#: /includes/ui/ui_controls.inc:666
-msgid "Entered data has not been saved yet.\\nDo you want to abandon changes?"
+#: /includes/ui/ui_controls.inc:674
+msgid ""
+"Entered data has not been saved yet.\n"
+"Do you want to abandon changes?"
 msgstr ""
 
 #: /includes/ui/ui_input.inc:656
-#: /reporting/includes/reports_classes.inc:222
+#: /reporting/includes/reports_classes.inc:223
 msgid "Click Here to Pick up the date"
 msgstr ""
 
-#: /includes/ui/ui_input.inc:991
-#: /includes/ui/ui_lists.inc:2125
-#: /reporting/rep301.php:229
-#: /reporting/rep302.php:169
-#: /reporting/rep303.php:184
-#: /reporting/rep304.php:183
-#: /reporting/rep304.php:187
+#: /includes/ui/ui_input.inc:971
+#: /includes/ui/ui_lists.inc:2330
+#: /reporting/rep301.php:232
+#: /reporting/rep302.php:168
+#: /reporting/rep303.php:178
+#: /reporting/rep304.php:184
+#: /reporting/rep304.php:188
 #: /reporting/rep306.php:235
 #: /reporting/rep306.php:242
-#: /sales/manage/customer_branches.php:288
+#: /reporting/rep451.php:129
+#: /sales/manage/customer_branches.php:292
 msgid "Inactive"
 msgstr ""
 
-#: /includes/ui/ui_input.inc:1001
-#: /includes/ui/ui_input.inc:1013
+#: /includes/ui/ui_input.inc:981
+#: /includes/ui/ui_input.inc:993
 msgid "Current Credit:"
 msgstr ""
 
-#: /includes/ui/ui_input.inc:1027
+#: /includes/ui/ui_input.inc:1007
 msgid "Bank Balance:"
 msgstr ""
 
@@ -8430,181 +8946,207 @@ msgstr ""
 msgid "Set filter"
 msgstr ""
 
-#: /includes/ui/ui_lists.inc:98
+#: /includes/ui/ui_lists.inc:99
 msgid "Press Space tab for search pattern entry"
 msgstr ""
 
-#: /includes/ui/ui_lists.inc:102
+#: /includes/ui/ui_lists.inc:103
 msgid "Enter code fragment to search or * for all"
 msgstr ""
 
-#: /includes/ui/ui_lists.inc:103
+#: /includes/ui/ui_lists.inc:104
 msgid "Enter description fragment to search or * for all"
 msgstr ""
 
-#: /includes/ui/ui_lists.inc:451
-#: /includes/ui/ui_lists.inc:1359
+#: /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
+msgid "Search items"
+msgstr ""
+
+#: /includes/ui/ui_lists.inc:334
+#: /sales/inquiry/customers_list.php:42
+msgid "Search customers"
+msgstr ""
+
+#: /includes/ui/ui_lists.inc:338
+#: /sales/inquiry/customer_branches_list.php:38
+msgid "Search branches"
+msgstr ""
+
+#: /includes/ui/ui_lists.inc:342
+#: /purchasing/inquiry/suppliers_list.php:42
+msgid "Search suppliers"
+msgstr ""
+
+#: /includes/ui/ui_lists.inc:526
+#: /includes/ui/ui_lists.inc:1528
 msgid "All Suppliers"
 msgstr ""
 
-#: /includes/ui/ui_lists.inc:455
+#: /includes/ui/ui_lists.inc:530
 msgid "Press Space tab to filter by name fragment"
 msgstr ""
 
-#: /includes/ui/ui_lists.inc:456
+#: /includes/ui/ui_lists.inc:531
 msgid "Select supplier"
 msgstr ""
 
-#: /includes/ui/ui_lists.inc:503
+#: /includes/ui/ui_lists.inc:577
 msgid "All Customers"
 msgstr ""
 
-#: /includes/ui/ui_lists.inc:507
+#: /includes/ui/ui_lists.inc:581
 msgid "Press Space tab to filter by name fragment; F2 - entry new customer"
 msgstr ""
 
-#: /includes/ui/ui_lists.inc:508
+#: /includes/ui/ui_lists.inc:582
 msgid "Select customer"
 msgstr ""
 
-#: /includes/ui/ui_lists.inc:554
+#: /includes/ui/ui_lists.inc:627
 msgid "All branches"
 msgstr ""
 
-#: /includes/ui/ui_lists.inc:557
+#: /includes/ui/ui_lists.inc:630
 msgid "Select customer branch"
 msgstr ""
 
-#: /includes/ui/ui_lists.inc:596
+#: /includes/ui/ui_lists.inc:666
 msgid "All Locations"
 msgstr ""
 
-#: /includes/ui/ui_lists.inc:747
-#: /includes/ui/ui_lists.inc:814
+#: /includes/ui/ui_lists.inc:823
+#: /includes/ui/ui_lists.inc:907
 msgid "All Items"
 msgstr ""
 
-#: /includes/ui/ui_lists.inc:1290
+#: /includes/ui/ui_lists.inc:1460
 msgid "All Sales Types"
 msgstr ""
 
-#: /includes/ui/ui_lists.inc:1601
+#: /includes/ui/ui_lists.inc:1807
 msgid "Use Item Sales Accounts"
 msgstr ""
 
-#: /includes/ui/ui_lists.inc:1911
-#: /includes/ui/ui_lists.inc:1927
-#: /includes/ui/ui_lists.inc:1943
+#: /includes/ui/ui_lists.inc:2116
+#: /includes/ui/ui_lists.inc:2132
+#: /includes/ui/ui_lists.inc:2148
 msgid "All Types"
 msgstr ""
 
-#: /includes/ui/ui_lists.inc:1912
+#: /includes/ui/ui_lists.inc:2117
 #: /sales/view/view_sales_order.php:140
 msgid "Sales Invoices"
 msgstr ""
 
-#: /includes/ui/ui_lists.inc:1913
-#: /includes/ui/ui_lists.inc:1929
-#: /includes/ui/ui_lists.inc:1946
+#: /includes/ui/ui_lists.inc:2118
+#: /includes/ui/ui_lists.inc:2134
+#: /includes/ui/ui_lists.inc:2151
 msgid "Overdue Invoices"
 msgstr ""
 
-#: /includes/ui/ui_lists.inc:1914
-#: /includes/ui/ui_lists.inc:1930
-#: /includes/ui/ui_lists.inc:1947
-#: /includes/ui/ui_view.inc:611
-#: /includes/ui/ui_view.inc:615
+#: /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
 msgid "Payments"
 msgstr ""
 
-#: /includes/ui/ui_lists.inc:1915
-#: /includes/ui/ui_lists.inc:1931
-#: /includes/ui/ui_lists.inc:1948
+#: /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
 msgid "Credit Notes"
 msgstr ""
 
-#: /includes/ui/ui_lists.inc:1916
+#: /includes/ui/ui_lists.inc:2121
 #: /sales/view/view_sales_order.php:106
 msgid "Delivery Notes"
 msgstr ""
 
-#: /includes/ui/ui_lists.inc:1928
-#: /includes/ui/ui_lists.inc:1945
+#: /includes/ui/ui_lists.inc:2133
+#: /includes/ui/ui_lists.inc:2150
 msgid "Invoices"
 msgstr ""
 
-#: /includes/ui/ui_lists.inc:1932
-#: /includes/ui/ui_lists.inc:1949
+#: /includes/ui/ui_lists.inc:2137
+#: /includes/ui/ui_lists.inc:2154
 msgid "Overdue Credit Notes"
 msgstr ""
 
-#: /includes/ui/ui_lists.inc:1944
+#: /includes/ui/ui_lists.inc:2149
 msgid "GRNs"
 msgstr ""
 
-#: /includes/ui/ui_lists.inc:1962
+#: /includes/ui/ui_lists.inc:2167
 msgid "Automatically put balance on back order"
 msgstr ""
 
-#: /includes/ui/ui_lists.inc:1963
+#: /includes/ui/ui_lists.inc:2168
 msgid "Cancel any quantites not delivered"
 msgstr ""
 
-#: /includes/ui/ui_lists.inc:1980
+#: /includes/ui/ui_lists.inc:2185
 msgid "Items Returned to Inventory Location"
 msgstr ""
 
-#: /includes/ui/ui_lists.inc:1981
+#: /includes/ui/ui_lists.inc:2186
 msgid "Items Written Off"
 msgstr ""
 
-#: /includes/ui/ui_lists.inc:2150
+#: /includes/ui/ui_lists.inc:2355
 msgid "New role"
 msgstr ""
 
-#: /includes/ui/ui_lists.inc:2202
+#: /includes/ui/ui_lists.inc:2407
 msgid "No tags defined."
 msgstr ""
 
-#: /includes/ui/ui_lists.inc:2202
+#: /includes/ui/ui_lists.inc:2407
 msgid "No active tags defined."
 msgstr ""
 
-#: /includes/ui/ui_lists.inc:2240
+#: /includes/ui/ui_lists.inc:2445
 #, php-format
 msgid "Activated for '%s'"
 msgstr ""
 
-#: /includes/ui/ui_lists.inc:2243
+#: /includes/ui/ui_lists.inc:2448
 msgid "Available and/or installed"
 msgstr ""
 
-#: /includes/ui/ui_lists.inc:2313
+#: /includes/ui/ui_lists.inc:2518
 msgid "Standard new company American COA (4 digit)"
 msgstr ""
 
-#: /includes/ui/ui_lists.inc:2315
+#: /includes/ui/ui_lists.inc:2520
 msgid "Standard American COA (4 digit) with demo data"
 msgstr ""
 
-#: /includes/ui/ui_lists.inc:2336
+#: /includes/ui/ui_lists.inc:2541
 msgid "No payment Link"
 msgstr ""
 
-#: /includes/ui/ui_lists.inc:2456
+#: /includes/ui/ui_lists.inc:2661
 msgid "Numeric"
 msgstr ""
 
-#: /includes/ui/ui_lists.inc:2456
+#: /includes/ui/ui_lists.inc:2661
 msgid "Alpha Numeric"
 msgstr ""
 
-#: /includes/ui/ui_lists.inc:2456
+#: /includes/ui/ui_lists.inc:2661
 msgid "ALPHA NUMERIC"
 msgstr ""
 
-#: /includes/ui/ui_lists.inc:2472
+#: /includes/ui/ui_lists.inc:2677
 msgid "All users"
 msgstr ""
 
@@ -8623,526 +9165,576 @@ msgstr ""
 msgid "Date Voided:"
 msgstr ""
 
-#: /includes/ui/ui_view.inc:444
-#: /reporting/rep107.php:259
-#: /reporting/rep109.php:187
-#: /reporting/rep110.php:183
+#: /includes/ui/ui_view.inc:442
+#: /reporting/rep107.php:261
+#: /reporting/rep109.php:188
+#: /reporting/rep110.php:185
 #: /reporting/rep111.php:185
-#: /reporting/rep113.php:172
-#: /reporting/rep209.php:189
+#: /reporting/rep113.php:174
+#: /reporting/rep209.php:190
 msgid "Total Tax Excluded"
 msgstr ""
 
-#: /includes/ui/ui_view.inc:450
-#: /includes/ui/ui_view.inc:469
-#: /includes/ui/ui_view.inc:493
-#: /includes/ui/ui_view.inc:510
-#: /reporting/rep107.php:268
-#: /reporting/rep109.php:196
-#: /reporting/rep110.php:192
+#: /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:181
-#: /reporting/rep209.php:198
+#: /reporting/rep113.php:183
+#: /reporting/rep209.php:199
 msgid "Included"
 msgstr ""
 
-#: /includes/ui/ui_view.inc:548
+#: /includes/ui/ui_view.inc:546
 #: /reporting/includes/doctext.inc:166
 #: /reporting/includes/doctext.inc:207
 msgid "Total Amount"
 msgstr ""
 
-#: /includes/ui/ui_view.inc:572
+#: /includes/ui/ui_view.inc:570
 msgid "Total Allocated:"
 msgstr ""
 
-#: /includes/ui/ui_view.inc:578
+#: /includes/ui/ui_view.inc:576
 msgid "Left to Allocate:"
 msgstr ""
 
-#: /includes/ui/ui_view.inc:594
-#: /includes/ui/ui_view.inc:598
+#: /includes/ui/ui_view.inc:592
+#: /includes/ui/ui_view.inc:596
 #: /purchasing/inquiry/supplier_allocation_inquiry.php:99
 msgid "Allocations"
 msgstr ""
 
-#: /includes/ui/ui_view.inc:611
-#: /includes/ui/ui_view.inc:615
+#: /includes/ui/ui_view.inc:609
+#: /includes/ui/ui_view.inc:613
 msgid "Pre-Payments"
 msgstr ""
 
-#: /includes/ui/ui_view.inc:631
+#: /includes/ui/ui_view.inc:629
 msgid "No Quick Entries are defined."
 msgstr ""
 
-#: /includes/ui/ui_view.inc:646
+#: /includes/ui/ui_view.inc:644
 msgid "No Quick Entry lines are defined."
 msgstr ""
 
-#: /includes/ui/ui_view.inc:877
-#: /purchasing/includes/ui/invoice_ui.inc:491
+#: /includes/ui/ui_view.inc:875
+#: /purchasing/includes/ui/invoice_ui.inc:482
 msgid "and"
 msgstr ""
 
-#: /includes/ui/ui_view.inc:939
+#: /includes/ui/ui_view.inc:982
 msgid "January"
 msgstr ""
 
-#: /includes/ui/ui_view.inc:939
+#: /includes/ui/ui_view.inc:982
 msgid "February"
 msgstr ""
 
-#: /includes/ui/ui_view.inc:939
+#: /includes/ui/ui_view.inc:982
 msgid "March"
 msgstr ""
 
-#: /includes/ui/ui_view.inc:939
+#: /includes/ui/ui_view.inc:982
 msgid "April"
 msgstr ""
 
-#: /includes/ui/ui_view.inc:939
+#: /includes/ui/ui_view.inc:982
 msgid "June"
 msgstr ""
 
-#: /includes/ui/ui_view.inc:939
+#: /includes/ui/ui_view.inc:982
 msgid "July"
 msgstr ""
 
-#: /includes/ui/ui_view.inc:939
+#: /includes/ui/ui_view.inc:982
 msgid "August"
 msgstr ""
 
-#: /includes/ui/ui_view.inc:939
+#: /includes/ui/ui_view.inc:982
 msgid "September"
 msgstr ""
 
-#: /includes/ui/ui_view.inc:939
+#: /includes/ui/ui_view.inc:982
 msgid "October"
 msgstr ""
 
-#: /includes/ui/ui_view.inc:939
+#: /includes/ui/ui_view.inc:982
 msgid "November"
 msgstr ""
 
-#: /includes/ui/ui_view.inc:939
+#: /includes/ui/ui_view.inc:982
 msgid "December"
 msgstr ""
 
-#: /includes/ui/ui_view.inc:940
+#: /includes/ui/ui_view.inc:983
 msgid "Su"
 msgstr ""
 
-#: /includes/ui/ui_view.inc:940
+#: /includes/ui/ui_view.inc:983
 msgid "Mo"
 msgstr ""
 
-#: /includes/ui/ui_view.inc:940
+#: /includes/ui/ui_view.inc:983
 msgid "Tu"
 msgstr ""
 
-#: /includes/ui/ui_view.inc:940
+#: /includes/ui/ui_view.inc:983
 msgid "We"
 msgstr ""
 
-#: /includes/ui/ui_view.inc:940
+#: /includes/ui/ui_view.inc:983
 msgid "Th"
 msgstr ""
 
-#: /includes/ui/ui_view.inc:940
+#: /includes/ui/ui_view.inc:983
 msgid "Fr"
 msgstr ""
 
-#: /includes/ui/ui_view.inc:940
+#: /includes/ui/ui_view.inc:983
 msgid "Sa"
 msgstr ""
 
-#: /includes/ui/ui_view.inc:941
+#: /includes/ui/ui_view.inc:984
 msgid "W"
 msgstr ""
 
-#: /inventory/adjustments.php:28
+#: /inventory/adjustments.php:34
 msgid "Item Adjustments Note"
 msgstr ""
 
-#: /inventory/adjustments.php:32
-msgid ""
-"There are no inventory items defined in the system which can be adjusted "
-"(Purchased or Manufactured)."
+#: /inventory/adjustments.php:50
+msgid "Fixed Assets disposal has been processed"
+msgstr ""
+
+#: /inventory/adjustments.php:51
+msgid "&View this disposal"
+msgstr ""
+
+#: /inventory/adjustments.php:53
+msgid "View the GL &Postings for this Disposal"
+msgstr ""
+
+#: /inventory/adjustments.php:54
+msgid "Enter &Another Disposal"
 msgstr ""
 
-#: /inventory/adjustments.php:41
+#: /inventory/adjustments.php:57
 msgid "Items adjustment has been processed"
 msgstr ""
 
-#: /inventory/adjustments.php:42
+#: /inventory/adjustments.php:58
 msgid "&View this adjustment"
 msgstr ""
 
-#: /inventory/adjustments.php:44
+#: /inventory/adjustments.php:60
 msgid "View the GL &Postings for this Adjustment"
 msgstr ""
 
-#: /inventory/adjustments.php:46
+#: /inventory/adjustments.php:62
 msgid "Enter &Another Adjustment"
 msgstr ""
 
-#: /inventory/adjustments.php:86
-#: /inventory/transfers.php:82
-#: /sales/sales_order_entry.php:373
+#: /inventory/adjustments.php:104
+#: /inventory/transfers.php:98
+#: /sales/sales_order_entry.php:378
 msgid "You must enter at least one non empty item line."
 msgstr ""
 
-#: /inventory/adjustments.php:99
+#: /inventory/adjustments.php:117
 msgid "The entered date for the adjustment is invalid."
 msgstr ""
 
-#: /inventory/adjustments.php:115
+#: /inventory/adjustments.php:133
 msgid ""
 "The adjustment cannot be processed because it would cause negative inventory "
 "balance for marked items as of document date or later."
 msgstr ""
 
-#: /inventory/adjustments.php:143
+#: /inventory/adjustments.php:166
 msgid "The quantity entered is invalid."
 msgstr ""
 
-#: /inventory/adjustments.php:150
-#: /manufacturing/work_order_issue.php:138
+#: /inventory/adjustments.php:173
+#: /manufacturing/work_order_issue.php:136
 msgid "The entered standard cost is negative or invalid."
 msgstr ""
 
-#: /inventory/adjustments.php:213
+#: /inventory/adjustments.php:228
+#: /inventory/cost_update.php:42
+#: /inventory/transfers.php:216
+#: /sales/sales_order_entry.php:697
+msgid "There are no fixed assets defined in the system."
+msgstr ""
+
+#: /inventory/adjustments.php:230
+msgid ""
+"There are no inventory items defined in the system which can be adjusted "
+"(Purchased or Manufactured)."
+msgstr ""
+
+#: /inventory/adjustments.php:239
+msgid "Disposal Items"
+msgstr ""
+
+#: /inventory/adjustments.php:240
+msgid "Process Disposal"
+msgstr ""
+
+#: /inventory/adjustments.php:242
 msgid "Adjustment Items"
 msgstr ""
 
-#: /inventory/adjustments.php:219
+#: /inventory/adjustments.php:243
 msgid "Process Adjustment"
 msgstr ""
 
-#: /inventory/cost_update.php:28
+#: /inventory/cost_update.php:32
+msgid "FA Revaluation"
+msgstr ""
+
+#: /inventory/cost_update.php:35
 msgid "Inventory Item Cost Update"
 msgstr ""
 
-#: /inventory/cost_update.php:32
+#: /inventory/cost_update.php:44
 msgid ""
 "There are no costable inventory items defined in the system (Purchased or "
 "manufactured items)."
 msgstr ""
 
-#: /inventory/cost_update.php:53
+#: /inventory/cost_update.php:65
 msgid "The entered cost is not numeric."
 msgstr ""
 
-#: /inventory/cost_update.php:59
+#: /inventory/cost_update.php:71
 msgid "The new cost is the same as the old cost. Cost was not updated."
 msgstr ""
 
-#: /inventory/cost_update.php:69
+#: /inventory/cost_update.php:82
 msgid "Cost has been updated."
 msgstr ""
 
-#: /inventory/cost_update.php:73
+#: /inventory/cost_update.php:86
 msgid "View the GL Journal Entries for this Cost Update"
 msgstr ""
 
-#: /inventory/cost_update.php:93
-#: /inventory/prices.php:62
-#: /inventory/purchasing_data.php:117
-#: /inventory/reorder_level.php:50
-#: /inventory/inquiry/stock_movements.php:50
-#: /inventory/inquiry/stock_status.php:41
-#: /inventory/manage/item_codes.php:104
-#: /manufacturing/work_order_entry.php:386
-#: /manufacturing/work_order_entry.php:391
+#: /inventory/cost_update.php:110
+#: /inventory/prices.php:66
+#: /inventory/purchasing_data.php:121
+#: /inventory/reorder_level.php:54
+#: /inventory/inquiry/stock_movements.php:65
+#: /inventory/inquiry/stock_movements.php:74
+#: /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:226
 msgid "Item:"
 msgstr ""
 
-#: /inventory/cost_update.php:114
-msgid "Standard Material Cost Per Unit"
+#: /inventory/cost_update.php:133
+msgid "Unit cost"
 msgstr ""
 
-#: /inventory/cost_update.php:122
+#: /inventory/cost_update.php:137
 msgid "Standard Labour Cost Per Unit"
 msgstr ""
 
-#: /inventory/cost_update.php:123
+#: /inventory/cost_update.php:138
 msgid "Standard Overhead Cost Per Unit"
 msgstr ""
 
-#: /inventory/prices.php:25
-msgid "Inventory Item Sales prices"
+#: /inventory/cost_update.php:145
+msgid "Reference line:"
 msgstr ""
 
 #: /inventory/prices.php:29
-#: /inventory/inquiry/stock_movements.php:29
-#: /inventory/inquiry/stock_status.php:32
-#: /inventory/manage/sales_kits.php:22
+msgid "Inventory Item Sales prices"
+msgstr ""
+
+#: /inventory/prices.php:33
+#: /inventory/inquiry/stock_movements.php:41
+#: /inventory/inquiry/stock_status.php:36
+#: /inventory/manage/sales_kits.php:26
 #: /manufacturing/inquiry/where_used_inquiry.php:21
 #: /sales/credit_note_entry.php:49
 msgid "There are no items defined in the system."
 msgstr ""
 
-#: /inventory/prices.php:31
+#: /inventory/prices.php:35
 msgid ""
 "There are no sales types in the system. Please set up sales types befor "
 "entering pricing."
 msgstr ""
 
-#: /inventory/prices.php:78
+#: /inventory/prices.php:82
 msgid "The price entered must be numeric."
 msgstr ""
 
-#: /inventory/prices.php:84
+#: /inventory/prices.php:88
 msgid ""
 "The sales pricing for this item, sales type and currency has already been "
 "added."
 msgstr ""
 
-#: /inventory/prices.php:97
+#: /inventory/prices.php:101
 msgid "This price has been updated."
 msgstr ""
 
-#: /inventory/prices.php:105
+#: /inventory/prices.php:109
 msgid "The new price has been added."
 msgstr ""
 
-#: /inventory/prices.php:119
+#: /inventory/prices.php:123
 msgid "The selected price has been deleted."
 msgstr ""
 
-#: /inventory/prices.php:147
-#: /reporting/rep104.php:118
-#: /sales/customer_delivery.php:346
-#: /sales/customer_invoice.php:474
+#: /inventory/prices.php:151
+#: /reporting/rep104.php:116
+#: /sales/customer_delivery.php:343
+#: /sales/customer_invoice.php:453
 #: /sales/view/view_credit.php:73
 #: /sales/view/view_dispatch.php:93
 #: /sales/view/view_invoice.php:93
-#: /sales/includes/ui/sales_credit_ui.inc:103
+#: /sales/includes/ui/sales_credit_ui.inc:98
 msgid "Sales Type"
 msgstr ""
 
-#: /inventory/prices.php:147
-#: /inventory/purchasing_data.php:147
-#: /purchasing/includes/ui/invoice_ui.inc:523
+#: /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:111
+#: /reporting/rep104.php:109
 #: /reporting/includes/doctext.inc:32
 #: /reporting/includes/doctext.inc:191
-#: /sales/customer_credit_invoice.php:283
-#: /sales/customer_delivery.php:424
-#: /sales/customer_invoice.php:549
-#: /sales/customer_invoice.php:552
+#: /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
-#: /sales/includes/ui/sales_credit_ui.inc:169
+#: /sales/includes/ui/sales_credit_ui.inc:163
 msgid "Price"
 msgstr ""
 
-#: /inventory/prices.php:169
+#: /inventory/prices.php:173
 msgid "There are no prices set up for this part."
 msgstr ""
 
-#: /inventory/prices.php:194
+#: /inventory/prices.php:195
 msgid "Sales Type:"
 msgstr ""
 
-#: /inventory/prices.php:202
-#: /inventory/purchasing_data.php:214
+#: /inventory/prices.php:203
+#: /inventory/purchasing_data.php:213
 msgid "Price:"
 msgstr ""
 
-#: /inventory/prices.php:202
+#: /inventory/prices.php:203
 msgid "per"
 msgstr ""
 
-#: /inventory/prices.php:206
+#: /inventory/prices.php:207
 msgid "The price is calculated."
 msgstr ""
 
-#: /inventory/purchasing_data.php:23
+#: /inventory/purchasing_data.php:27
 msgid "Supplier Purchasing Data"
 msgstr ""
 
-#: /inventory/purchasing_data.php:25
-#: /purchasing/po_entry_items.php:70
+#: /inventory/purchasing_data.php:29
+#: /purchasing/po_entry_items.php:149
 msgid "There are no purchasable inventory items defined in the system."
 msgstr ""
 
-#: /inventory/purchasing_data.php:26
-#: /purchasing/po_entry_items.php:68
+#: /inventory/purchasing_data.php:30
+#: /purchasing/po_entry_items.php:73
 #: /purchasing/supplier_credit.php:31
 #: /purchasing/supplier_invoice.php:30
 #: /purchasing/supplier_payment.php:40
 msgid "There are no suppliers defined in the system."
 msgstr ""
 
-#: /inventory/purchasing_data.php:44
-#: /inventory/manage/item_codes.php:34
+#: /inventory/purchasing_data.php:48
+#: /inventory/manage/item_codes.php:38
 msgid "There is no item selected."
 msgstr ""
 
-#: /inventory/purchasing_data.php:50
+#: /inventory/purchasing_data.php:54
 msgid "The price entered was not numeric."
 msgstr ""
 
-#: /inventory/purchasing_data.php:56
+#: /inventory/purchasing_data.php:60
 msgid ""
 "The conversion factor entered was not numeric. The conversion factor is the "
 "number by which the price must be divided by to get the unit price in our "
 "unit of measure."
 msgstr ""
 
-#: /inventory/purchasing_data.php:62
+#: /inventory/purchasing_data.php:66
 msgid "The purchasing data for this supplier has already been added."
 msgstr ""
 
-#: /inventory/purchasing_data.php:71
+#: /inventory/purchasing_data.php:75
 msgid "This supplier purchasing data has been added."
 msgstr ""
 
-#: /inventory/purchasing_data.php:77
+#: /inventory/purchasing_data.php:81
 msgid "Supplier purchasing data has been updated."
 msgstr ""
 
-#: /inventory/purchasing_data.php:88
+#: /inventory/purchasing_data.php:92
 msgid "The purchasing data item has been sucessfully deleted."
 msgstr ""
 
-#: /inventory/purchasing_data.php:132
+#: /inventory/purchasing_data.php:135
 msgid "Entered item is not defined. Please re-enter."
 msgstr ""
 
-#: /inventory/purchasing_data.php:141
+#: /inventory/purchasing_data.php:144
 msgid "There is no purchasing data set up for the part selected"
 msgstr ""
 
-#: /inventory/purchasing_data.php:148
+#: /inventory/purchasing_data.php:151
 msgid "Supplier's Unit"
 msgstr ""
 
-#: /inventory/purchasing_data.php:148
+#: /inventory/purchasing_data.php:151
 msgid "Conversion Factor"
 msgstr ""
 
-#: /inventory/purchasing_data.php:148
+#: /inventory/purchasing_data.php:151
 msgid "Supplier's Description"
 msgstr ""
 
-#: /inventory/purchasing_data.php:215
+#: /inventory/purchasing_data.php:214
 msgid "Suppliers Unit of Measure:"
 msgstr ""
 
-#: /inventory/purchasing_data.php:221
+#: /inventory/purchasing_data.php:220
 msgid "Conversion Factor (to our UOM):"
 msgstr ""
 
-#: /inventory/purchasing_data.php:223
+#: /inventory/purchasing_data.php:221
 msgid "Supplier's Code or Description:"
 msgstr ""
 
-#: /inventory/reorder_level.php:24
+#: /inventory/reorder_level.php:28
 msgid "Reorder Levels"
 msgstr ""
 
-#: /inventory/reorder_level.php:26
-#: /inventory/transfers.php:32
+#: /inventory/reorder_level.php:30
+#: /inventory/transfers.php:42
+#: /inventory/transfers.php:218
 msgid ""
 "There are no inventory items defined in the system (Purchased or "
 "manufactured items)."
 msgstr ""
 
-#: /inventory/reorder_level.php:67
-#: /inventory/inquiry/stock_movements.php:82
-#: /inventory/inquiry/stock_status.php:66
+#: /inventory/reorder_level.php:71
+#: /inventory/inquiry/stock_movements.php:107
 #: /inventory/inquiry/stock_status.php:70
-#: /manufacturing/search_work_orders.php:168
+#: /inventory/inquiry/stock_status.php:74
+#: /manufacturing/search_work_orders.php:160
 #: /manufacturing/inquiry/where_used_inquiry.php:45
-#: /manufacturing/manage/bom_edit.php:68
+#: /manufacturing/manage/bom_edit.php:43
 #: /purchasing/inquiry/po_search_completed.php:113
 #: /purchasing/inquiry/po_search_completed.php:123
 #: /purchasing/inquiry/po_search.php:120
 #: /purchasing/inquiry/po_search.php:131
 #: /reporting/rep105.php:120
-#: /reporting/rep301.php:176
-#: /reporting/rep302.php:131
-#: /reporting/rep303.php:134
-#: /reporting/rep304.php:135
+#: /reporting/rep301.php:179
+#: /reporting/rep302.php:130
+#: /reporting/rep303.php:133
+#: /reporting/rep304.php:136
 #: /reporting/rep306.php:150
-#: /reporting/rep307.php:124
+#: /reporting/rep307.php:121
 #: /reporting/rep308.php:250
 #: /reporting/rep402.php:103
 #: /reporting/rep402.php:109
-#: /reporting/reports_main.php:210
-#: /reporting/reports_main.php:217
-#: /reporting/reports_main.php:223
-#: /reporting/reports_main.php:236
-#: /reporting/reports_main.php:252
-#: /reporting/reports_main.php:262
-#: /reporting/reports_main.php:270
-#: /reporting/reports_main.php:291
+#: /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
 #: /sales/manage/sales_points.php:84
 msgid "Location"
 msgstr ""
 
-#: /inventory/reorder_level.php:67
-#: /inventory/inquiry/stock_movements.php:84
-#: /inventory/inquiry/stock_status.php:70
-#: /purchasing/supplier_credit.php:207
+#: /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:67
+#: /inventory/reorder_level.php:71
 #: /inventory/includes/inventory_db.inc:99
-#: /inventory/inquiry/stock_status.php:70
+#: /inventory/inquiry/stock_status.php:74
 msgid "Re-Order Level"
 msgstr ""
 
-#: /inventory/reorder_level.php:90
+#: /inventory/reorder_level.php:89
 msgid "Reorder levels has been updated."
 msgstr ""
 
-#: /inventory/transfers.php:28
+#: /inventory/transfers.php:32
+msgid "Fixed Assets Location Transfers"
+msgstr ""
+
+#: /inventory/transfers.php:35
 msgid "Inventory Location Transfers"
 msgstr ""
 
-#: /inventory/transfers.php:41
+#: /inventory/transfers.php:51
 msgid "Inventory transfer has been processed"
 msgstr ""
 
-#: /inventory/transfers.php:42
+#: /inventory/transfers.php:52
 msgid "&View this transfer"
 msgstr ""
 
-#: /inventory/transfers.php:44
+#: /inventory/transfers.php:57
+msgid "Enter &Another Fixed Assets Transfer"
+msgstr ""
+
+#: /inventory/transfers.php:59
 msgid "Enter &Another Inventory Transfer"
 msgstr ""
 
-#: /inventory/transfers.php:93
+#: /inventory/transfers.php:109
 msgid "The entered transfer date is invalid."
 msgstr ""
 
-#: /inventory/transfers.php:105
+#: /inventory/transfers.php:121
 msgid "The locations to transfer from and to must be different."
 msgstr ""
 
-#: /inventory/transfers.php:115
+#: /inventory/transfers.php:131
 msgid ""
 "The transfer cannot be processed because it would cause negative inventory "
 "balance in source location for marked items as of document date or later."
 msgstr ""
 
-#: /inventory/transfers.php:145
+#: /inventory/transfers.php:161
 msgid "The quantity entered must be a positive number."
 msgstr ""
 
-#: /inventory/transfers.php:217
+#: /inventory/transfers.php:238
 msgid "Process Transfer"
 msgstr ""
 
@@ -9173,8 +9765,10 @@ msgstr ""
 msgid "Location:"
 msgstr ""
 
-#: /inventory/includes/item_adjustments_ui.inc:54
+#: /inventory/includes/item_adjustments_ui.inc:56
+#: /inventory/includes/item_adjustments_ui.inc:59
 #: /inventory/includes/stock_transfers_ui.inc:57
+#: /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
@@ -9185,20 +9779,21 @@ msgstr ""
 #: /reporting/includes/doctext.inc:31
 #: /reporting/includes/doctext.inc:190
 #: /reporting/includes/doctext.inc:227
-#: /sales/customer_credit_invoice.php:282
-#: /sales/customer_delivery.php:422
-#: /sales/customer_invoice.php:548
-#: /sales/customer_invoice.php:551
+#: /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/includes/ui/sales_credit_ui.inc:168
+#: /sales/includes/ui/sales_credit_ui.inc:162
 #: /sales/includes/ui/sales_order_ui.inc:146
 msgid "Item Code"
 msgstr ""
 
-#: /inventory/includes/item_adjustments_ui.inc:54
+#: /inventory/includes/item_adjustments_ui.inc:56
+#: /inventory/includes/item_adjustments_ui.inc:59
 #: /inventory/includes/stock_transfers_ui.inc:57
 #: /manufacturing/includes/work_order_issue_ui.inc:33
 #: /purchasing/includes/ui/po_ui.inc:214
@@ -9207,53 +9802,21 @@ msgstr ""
 #: /reporting/includes/doctext.inc:31
 #: /reporting/includes/doctext.inc:190
 #: /reporting/includes/doctext.inc:227
-#: /sales/customer_credit_invoice.php:282
-#: /sales/customer_delivery.php:422
-#: /sales/customer_invoice.php:548
-#: /sales/customer_invoice.php:551
+#: /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/includes/ui/sales_credit_ui.inc:168
+#: /sales/includes/ui/sales_credit_ui.inc:162
 #: /sales/includes/ui/sales_order_ui.inc:146
 msgid "Item Description"
 msgstr ""
 
-#: /inventory/includes/item_adjustments_ui.inc:54
-#: /inventory/includes/stock_transfers_ui.inc:57
-#: /inventory/manage/item_codes.php:123
-#: /inventory/manage/sales_kits.php:38
-#: /inventory/view/view_adjustment.php:54
-#: /inventory/view/view_transfer.php:50
-#: /manufacturing/view/wo_issue_view.php:76
-#: /manufacturing/manage/bom_edit.php:69
-#: /manufacturing/includes/manufacturing_ui.inc:29
-#: /manufacturing/includes/manufacturing_ui.inc:157
-#: /manufacturing/includes/manufacturing_ui.inc:332
-#: /manufacturing/includes/work_order_issue_ui.inc:33
-#: /purchasing/includes/ui/invoice_ui.inc:523
-#: /purchasing/includes/ui/po_ui.inc:214
-#: /purchasing/view/view_grn.php:40
-#: /purchasing/view/view_po.php:45
-#: /reporting/rep301.php:169
-#: /reporting/rep303.php:121
-#: /reporting/rep303.php:127
-#: /reporting/rep401.php:71
-#: /reporting/includes/doctext.inc:31
-#: /reporting/includes/doctext.inc:191
-#: /reporting/includes/doctext.inc:224
-#: /sales/customer_invoice.php:548
-#: /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/includes/ui/sales_credit_ui.inc:168
-#: /sales/includes/ui/sales_order_ui.inc:146
-msgid "Quantity"
-msgstr ""
-
-#: /inventory/includes/item_adjustments_ui.inc:55
+#: /inventory/includes/item_adjustments_ui.inc:57
+#: /inventory/includes/item_adjustments_ui.inc:60
 #: /inventory/includes/stock_transfers_ui.inc:57
 #: /inventory/manage/item_units.php:94
 #: /manufacturing/includes/work_order_issue_ui.inc:34
@@ -9266,27 +9829,34 @@ msgstr ""
 #: /sales/view/view_dispatch.php:113
 #: /sales/view/view_invoice.php:116
 #: /sales/view/view_sales_order.php:219
-#: /sales/includes/ui/sales_credit_ui.inc:168
+#: /sales/includes/ui/sales_credit_ui.inc:162
 #: /sales/includes/ui/sales_order_ui.inc:148
 msgid "Unit"
 msgstr ""
 
-#: /inventory/includes/item_adjustments_ui.inc:55
+#: /inventory/includes/item_adjustments_ui.inc:57
+#: /inventory/includes/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:169
+#: /reporting/rep301.php:172
 msgid "Unit Cost"
 msgstr ""
 
-#: /inventory/includes/item_adjustments_ui.inc:102
+#: /inventory/includes/item_adjustments_ui.inc:57
+#: /inventory/manage/items.php:525
+msgid "Initial Value"
+msgstr ""
+
+#: /inventory/includes/item_adjustments_ui.inc:118
 msgid ""
 "Marked items have insufficient quantities in stock as on day of adjustment."
 msgstr ""
 
 #: /inventory/includes/stock_transfers_ui.inc:35
-#: /inventory/inquiry/stock_movements.php:57
-#: /manufacturing/includes/work_order_issue_ui.inc:164
+#: /inventory/inquiry/stock_movements.php:83
+#: /manufacturing/includes/work_order_issue_ui.inc:158
 msgid "From Location:"
 msgstr ""
 
@@ -9294,278 +9864,296 @@ msgstr ""
 msgid "To Location:"
 msgstr ""
 
-#: /inventory/includes/stock_transfers_ui.inc:97
+#: /inventory/includes/stock_transfers_ui.inc:98
 msgid ""
 "Marked items have insufficient quantities in stock as on day of transfer."
 msgstr ""
 
-#: /inventory/includes/db/items_db.inc:121
+#: /inventory/includes/db/items_db.inc:139
 msgid ""
 "Cannot delete this item because there are stock movements that refer to this "
 "item."
 msgstr ""
 
-#: /inventory/includes/db/items_db.inc:124
+#: /inventory/includes/db/items_db.inc:142
 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:127
-#: /inventory/includes/db/items_db.inc:130
+#: /inventory/includes/db/items_db.inc:145
+#: /inventory/includes/db/items_db.inc:148
 msgid ""
 "Cannot delete this item because there are existing purchase order items for "
 "it."
 msgstr ""
 
-#: /inventory/includes/db/items_db.inc:148
+#: /inventory/includes/db/items_db.inc:166
 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"
 "\t\t\t\tusing this item as component"
 msgstr ""
 
-#: /inventory/includes/db/items_trans_db.inc:66
+#: /inventory/includes/db/items_trans_db.inc:63
 #, php-format
 msgid "Cost was %s changed to %s x quantity on hand of %s"
 msgstr ""
 
-#: /inventory/inquiry/stock_movements.php:26
+#: /inventory/inquiry/stock_movements.php:30
+msgid "Fixed Assets Movement"
+msgstr ""
+
+#: /inventory/inquiry/stock_movements.php:32
 msgid "Inventory Item Movement"
 msgstr ""
 
-#: /inventory/inquiry/stock_movements.php:62
+#: /inventory/inquiry/stock_movements.php:39
+msgid "There are no fixed asset defined in the system."
+msgstr ""
+
+#: /inventory/inquiry/stock_movements.php:88
 msgid "Show Movements"
 msgstr ""
 
-#: /inventory/inquiry/stock_movements.php:62
-#: /purchasing/includes/ui/invoice_ui.inc:492
+#: /inventory/inquiry/stock_movements.php:88
+#: /purchasing/includes/ui/invoice_ui.inc:483
 #: /purchasing/inquiry/supplier_allocation_inquiry.php:57
-#: /purchasing/inquiry/supplier_inquiry.php:55
+#: /purchasing/inquiry/supplier_inquiry.php:56
 #: /sales/inquiry/customer_allocation_inquiry.php:51
 #: /sales/inquiry/customer_inquiry.php:54
 msgid "Refresh Inquiry"
 msgstr ""
 
-#: /inventory/inquiry/stock_movements.php:84
+#: /inventory/inquiry/stock_movements.php:109
 msgid "Detail"
 msgstr ""
 
-#: /inventory/inquiry/stock_movements.php:84
-#: /reporting/rep307.php:117
+#: /inventory/inquiry/stock_movements.php:109
+#: /reporting/rep307.php:114
 msgid "Quantity In"
 msgstr ""
 
-#: /inventory/inquiry/stock_movements.php:84
-#: /reporting/rep307.php:117
+#: /inventory/inquiry/stock_movements.php:109
+#: /reporting/rep307.php:114
 msgid "Quantity Out"
 msgstr ""
 
-#: /inventory/inquiry/stock_movements.php:100
+#: /inventory/inquiry/stock_movements.php:119
 msgid "Quantity on hand before"
 msgstr ""
 
-#: /inventory/inquiry/stock_movements.php:162
+#: /inventory/inquiry/stock_movements.php:184
 msgid "Quantity on hand after"
 msgstr ""
 
-#: /inventory/inquiry/stock_status.php:16
+#: /inventory/inquiry/stock_status.php:23
 msgid "Inventory Item Status"
 msgstr ""
 
-#: /inventory/inquiry/stock_status.php:56
+#: /inventory/inquiry/stock_status.php:60
 msgid ""
 "This is a service and cannot have a stock holding, only the total quantity "
 "on outstanding sales orders is shown."
 msgstr ""
 
-#: /inventory/inquiry/stock_status.php:66
-#: /inventory/inquiry/stock_status.php:71
-#: /reporting/rep303.php:121
-#: /reporting/rep303.php:127
+#: /inventory/inquiry/stock_status.php:70
+#: /inventory/inquiry/stock_status.php:75
+#: /reporting/rep303.php:120
+#: /reporting/rep303.php:126
 msgid "Demand"
 msgstr ""
 
-#: /inventory/inquiry/stock_status.php:71
-#: /reporting/rep303.php:121
-#: /reporting/rep303.php:127
+#: /inventory/inquiry/stock_status.php:75
+#: /reporting/rep303.php:120
+#: /reporting/rep303.php:126
 msgid "On Order"
 msgstr ""
 
-#: /inventory/manage/item_categories.php:16
-msgid "Item Categories"
-msgstr ""
-
-#: /inventory/manage/item_categories.php:34
+#: /inventory/manage/item_categories.php:47
 msgid "The item category description cannot be empty."
 msgstr ""
 
-#: /inventory/manage/item_categories.php:48
+#: /inventory/manage/item_categories.php:61
 msgid "Selected item category has been updated"
 msgstr ""
 
-#: /inventory/manage/item_categories.php:58
+#: /inventory/manage/item_categories.php:71
 msgid "New item category has been added"
 msgstr ""
 
-#: /inventory/manage/item_categories.php:72
+#: /inventory/manage/item_categories.php:85
 msgid ""
 "Cannot delete this item category because items have been created using this "
 "item category."
 msgstr ""
 
-#: /inventory/manage/item_categories.php:77
+#: /inventory/manage/item_categories.php:90
 msgid "Selected item category has been deleted"
 msgstr ""
 
-#: /inventory/manage/item_categories.php:98
+#: /inventory/manage/item_categories.php:117
+#: /inventory/manage/item_categories.php:121
 msgid "Tax type"
 msgstr ""
 
-#: /inventory/manage/item_categories.php:98
-#: /inventory/manage/item_codes.php:123
-#: /inventory/manage/sales_kits.php:38
+#: /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
-#: /manufacturing/manage/bom_edit.php:69
+#: /manufacturing/manage/bom_edit.php:44
 #: /purchasing/po_receive_items.php:62
-#: /sales/customer_credit_invoice.php:282
-#: /sales/customer_delivery.php:423
-#: /sales/customer_invoice.php:548
-#: /sales/customer_invoice.php:551
+#: /sales/customer_credit_invoice.php:275
+#: /sales/customer_delivery.php:420
+#: /sales/customer_invoice.php:518
+#: /sales/customer_invoice.php:521
 msgid "Units"
 msgstr ""
 
-#: /inventory/manage/item_categories.php:98
+#: /inventory/manage/item_categories.php:117
+#: /inventory/manage/item_categories.php:121
 msgid "Sales Act"
 msgstr ""
 
-#: /inventory/manage/item_categories.php:99
+#: /inventory/manage/item_categories.php:118
+msgid "Asset Account"
+msgstr ""
+
+#: /inventory/manage/item_categories.php:118
+msgid "Deprecation Cost Account"
+msgstr ""
+
+#: /inventory/manage/item_categories.php:119
+msgid "Depreciation/Disposal Account"
+msgstr ""
+
+#: /inventory/manage/item_categories.php:122
 msgid "Inventory Account"
 msgstr ""
 
-#: /inventory/manage/item_categories.php:99
+#: /inventory/manage/item_categories.php:122
 msgid "COGS Account"
 msgstr ""
 
-#: /inventory/manage/item_categories.php:99
+#: /inventory/manage/item_categories.php:122
 msgid "Adjustment Account"
 msgstr ""
 
-#: /inventory/manage/item_categories.php:100
+#: /inventory/manage/item_categories.php:123
 msgid "Assembly Account"
 msgstr ""
 
-#: /inventory/manage/item_categories.php:182
+#: /inventory/manage/item_categories.php:208
 msgid "Category Name:"
 msgstr ""
 
-#: /inventory/manage/item_categories.php:184
+#: /inventory/manage/item_categories.php:210
 msgid "Default values for new items"
 msgstr ""
 
-#: /inventory/manage/item_categories.php:186
-#: /inventory/manage/items.php:344
+#: /inventory/manage/item_categories.php:212
+#: /inventory/manage/items.php:394
 msgid "Item Tax Type:"
 msgstr ""
 
-#: /inventory/manage/item_categories.php:188
-#: /inventory/manage/items.php:346
+#: /inventory/manage/item_categories.php:217
+#: /inventory/manage/items.php:397
 msgid "Item Type:"
 msgstr ""
 
-#: /inventory/manage/item_categories.php:190
-#: /inventory/manage/items.php:348
+#: /inventory/manage/item_categories.php:219
+#: /inventory/manage/items.php:399
 msgid "Units of Measure:"
 msgstr ""
 
-#: /inventory/manage/item_categories.php:192
-#: /inventory/manage/items.php:352
+#: /inventory/manage/item_categories.php:224
+#: /inventory/manage/items.php:406
 msgid "Exclude from sales:"
 msgstr ""
 
-#: /inventory/manage/item_categories.php:194
-#: /inventory/manage/items.php:354
+#: /inventory/manage/item_categories.php:226
+#: /inventory/manage/items.php:408
 msgid "Exclude from purchases:"
 msgstr ""
 
-#: /inventory/manage/item_codes.php:16
+#: /inventory/manage/item_categories.php:238
+#: /inventory/manage/items.php:471
+msgid "Asset account:"
+msgstr ""
+
+#: /inventory/manage/item_categories.php:239
+#: /inventory/manage/items.php:472
+msgid "Depreciation cost account:"
+msgstr ""
+
+#: /inventory/manage/item_categories.php:240
+#: /inventory/manage/items.php:473
+msgid "Depreciation/Disposal account:"
+msgstr ""
+
+#: /inventory/manage/item_categories.php:251
+msgid "Item Assembly Costs Account:"
+msgstr ""
+
+#: /inventory/manage/item_codes.php:20
 msgid "Foreign Item Codes"
 msgstr ""
 
-#: /inventory/manage/item_codes.php:22
-#: /sales/sales_order_entry.php:692
+#: /inventory/manage/item_codes.php:26
+#: /sales/sales_order_entry.php:699
 msgid "There are no inventory items defined in the system."
 msgstr ""
 
-#: /inventory/manage/item_codes.php:40
+#: /inventory/manage/item_codes.php:44
 msgid "The quantity entered was not positive number."
 msgstr ""
 
-#: /inventory/manage/item_codes.php:46
-#: /inventory/manage/sales_kits.php:76
+#: /inventory/manage/item_codes.php:50
+#: /inventory/manage/sales_kits.php:74
 msgid "Item code description cannot be empty."
 msgstr ""
 
-#: /inventory/manage/item_codes.php:54
-#: /inventory/manage/items.php:172
-#: /inventory/manage/sales_kits.php:91
+#: /inventory/manage/item_codes.php:58
+#: /inventory/manage/items.php:194
+#: /inventory/manage/sales_kits.php:89
 msgid "This item code is already assigned to stock item or sale kit."
 msgstr ""
 
-#: /inventory/manage/item_codes.php:66
+#: /inventory/manage/item_codes.php:70
 msgid "New item code has been added."
 msgstr ""
 
-#: /inventory/manage/item_codes.php:72
+#: /inventory/manage/item_codes.php:76
 msgid "Item code has been updated."
 msgstr ""
 
-#: /inventory/manage/item_codes.php:84
+#: /inventory/manage/item_codes.php:88
 msgid "Item code has been sucessfully deleted."
 msgstr ""
 
-#: /inventory/manage/item_codes.php:123
+#: /inventory/manage/item_codes.php:126
 msgid "EAN/UPC Code"
 msgstr ""
 
-#: /inventory/manage/item_codes.php:124
-#: /reporting/rep104.php:117
-#: /reporting/rep105.php:119
-#: /reporting/rep301.php:169
-#: /reporting/rep301.php:175
-#: /reporting/rep302.php:123
-#: /reporting/rep302.php:130
-#: /reporting/rep303.php:133
-#: /reporting/rep304.php:126
-#: /reporting/rep304.php:134
-#: /reporting/rep306.php:141
-#: /reporting/rep306.php:149
-#: /reporting/rep307.php:117
-#: /reporting/rep307.php:123
-#: /reporting/rep308.php:242
-#: /reporting/rep308.php:249
-#: /reporting/rep309.php:104
-msgid "Category"
-msgstr ""
-
-#: /inventory/manage/item_codes.php:177
+#: /inventory/manage/item_codes.php:180
 msgid "UPC/EAN code:"
 msgstr ""
 
-#: /inventory/manage/item_codes.php:178
-#: /inventory/manage/sales_kits.php:247
-#: /manufacturing/work_order_add_finished.php:195
-#: /manufacturing/work_order_entry.php:414
-#: /manufacturing/manage/bom_edit.php:226
+#: /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
 msgid "Quantity:"
 msgstr ""
 
-#: /inventory/manage/item_codes.php:179
-#: /inventory/manage/items.php:318
-#: /inventory/manage/sales_kits.php:208
-#: /inventory/manage/sales_kits.php:234
+#: /inventory/manage/item_codes.php:182
+#: /inventory/manage/items.php:368
+#: /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
@@ -9576,149 +10164,213 @@ msgstr ""
 msgid "Description:"
 msgstr ""
 
-#: /inventory/manage/item_codes.php:180
-#: /inventory/manage/items.php:320
-#: /inventory/manage/sales_kits.php:209
-#: /inventory/manage/sales_kits.php:235
+#: /inventory/manage/item_codes.php:183
+#: /inventory/manage/items.php:370
+#: /inventory/manage/sales_kits.php:207
+#: /inventory/manage/sales_kits.php:231
 msgid "Category:"
 msgstr ""
 
-#: /inventory/manage/items.php:73
+#: /inventory/manage/items.php:87
 msgid "Error uploading file."
 msgstr ""
 
-#: /inventory/manage/items.php:90
+#: /inventory/manage/items.php:104
 msgid ""
 "Only graphics files are supported - a file extension of .jpg, .png or .gif "
 "is expected"
 msgstr ""
 
-#: /inventory/manage/items.php:121
+#: /inventory/manage/items.php:136
+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
+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
 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:123
+#: /inventory/manage/items.php:141
 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:151
+#: /inventory/manage/items.php:173
 msgid "The item name must be entered."
 msgstr ""
 
-#: /inventory/manage/items.php:157
+#: /inventory/manage/items.php:179
 msgid "The item code cannot be empty"
 msgstr ""
 
-#: /inventory/manage/items.php:165
+#: /inventory/manage/items.php:187
 msgid ""
 "The item code cannot contain any of the following characters -  & + OR a "
 "space OR quotes"
 msgstr ""
 
-#: /inventory/manage/items.php:201
+#: /inventory/manage/items.php:207
+msgid "The depracation cannot start before the fixed asset purchase date"
+msgstr ""
+
+#: /inventory/manage/items.php:239
 msgid "Item has been updated."
 msgstr ""
 
-#: /inventory/manage/items.php:214
+#: /inventory/manage/items.php:254
 msgid "A new item has been added."
 msgstr ""
 
-#: /inventory/manage/items.php:257
+#: /inventory/manage/items.php:297
 msgid "Selected item has been deleted."
 msgstr ""
 
-#: /inventory/manage/items.php:274
+#: /inventory/manage/items.php:314
 msgid "General Settings"
 msgstr ""
 
-#: /inventory/manage/items.php:279
-#: /inventory/manage/items.php:311
+#: /inventory/manage/items.php:319
+#: /inventory/manage/items.php:360
 msgid "Item Code:"
 msgstr ""
 
-#: /inventory/manage/items.php:350
+#: /inventory/manage/items.php:401
 msgid "Editable description:"
 msgstr ""
 
-#: /inventory/manage/items.php:372
-#: /sales/manage/customer_branches.php:236
-msgid "GL Accounts"
+#: /inventory/manage/items.php:413
+msgid "Fixed Asset Class"
+msgstr ""
+
+#: /inventory/manage/items.php:415
+msgid "Depreciation Method"
+msgstr ""
+
+#: /inventory/manage/items.php:426
+#: /inventory/manage/items.php:435
+msgid "Depreciation Rate"
+msgstr ""
+
+#: /inventory/manage/items.php:430
+msgid "Depreciation Years"
+msgstr ""
+
+#: /inventory/manage/items.php:430
+msgid "years"
+msgstr ""
+
+#: /inventory/manage/items.php:433
+msgid "Base Rate"
+msgstr ""
+
+#: /inventory/manage/items.php:438
+msgid "Rate multiplier"
+msgstr ""
+
+#: /inventory/manage/items.php:442
+#: /inventory/manage/items.php:445
+msgid "Depreciation Start"
 msgstr ""
 
-#: /inventory/manage/items.php:395
+#: /inventory/manage/items.php:446
+msgid "Last Depreciation"
+msgstr ""
+
+#: /inventory/manage/items.php:494
 msgid "Other"
 msgstr ""
 
-#: /inventory/manage/items.php:398
+#: /inventory/manage/items.php:497
 msgid "Image File (.jpg)"
 msgstr ""
 
-#: /inventory/manage/items.php:413
+#: /inventory/manage/items.php:512
 msgid "No image"
 msgstr ""
 
-#: /inventory/manage/items.php:418
+#: /inventory/manage/items.php:517
 msgid "Delete Image:"
 msgstr ""
 
-#: /inventory/manage/items.php:420
+#: /inventory/manage/items.php:519
 msgid "Item status:"
 msgstr ""
 
-#: /inventory/manage/items.php:426
+#: /inventory/manage/items.php:521
+msgid "Values"
+msgstr ""
+
+#: /inventory/manage/items.php:526
+#: /reporting/rep451.php:70
+msgid "Depreciations"
+msgstr ""
+
+#: /inventory/manage/items.php:527
+msgid "Current Value"
+msgstr ""
+
+#: /inventory/manage/items.php:535
 msgid "Insert New Item"
 msgstr ""
 
-#: /inventory/manage/items.php:430
+#: /inventory/manage/items.php:539
 msgid "Update Item"
 msgstr ""
 
-#: /inventory/manage/items.php:433
+#: /inventory/manage/items.php:542
 msgid "Select this items and return to document entry."
 msgstr ""
 
-#: /inventory/manage/items.php:434
+#: /inventory/manage/items.php:543
 msgid "Clone This Item"
 msgstr ""
 
-#: /inventory/manage/items.php:435
+#: /inventory/manage/items.php:544
 msgid "Delete This Item"
 msgstr ""
 
-#: /inventory/manage/items.php:450
+#: /inventory/manage/items.php:559
 msgid "Select an item:"
 msgstr ""
 
-#: /inventory/manage/items.php:451
+#: /inventory/manage/items.php:560
 msgid "New item"
 msgstr ""
 
-#: /inventory/manage/items.php:474
+#: /inventory/manage/items.php:584
+#: /inventory/manage/items.php:587
 #: /purchasing/manage/suppliers.php:309
-#: /sales/manage/customer_branches.php:306
+#: /sales/manage/customer_branches.php:310
 #: /sales/manage/customers.php:350
 msgid "&General settings"
 msgstr ""
 
-#: /inventory/manage/items.php:475
-msgid "S&ales Pricing"
+#: /inventory/manage/items.php:585
+#: /inventory/manage/items.php:592
+#: /purchasing/manage/suppliers.php:311
+#: /sales/manage/customers.php:352
+msgid "&Transactions"
 msgstr ""
 
-#: /inventory/manage/items.php:476
-msgid "&Purchasing Pricing"
+#: /inventory/manage/items.php:588
+msgid "S&ales Pricing"
 msgstr ""
 
-#: /inventory/manage/items.php:479
-#: /purchasing/manage/suppliers.php:311
-#: /sales/manage/customers.php:352
-msgid "&Transactions"
+#: /inventory/manage/items.php:589
+msgid "&Purchasing Pricing"
 msgstr ""
 
-#: /inventory/manage/items.php:480
+#: /inventory/manage/items.php:593
 msgid "&Status"
 msgstr ""
 
@@ -9778,171 +10430,167 @@ msgstr ""
 msgid "Decimal Places:"
 msgstr ""
 
-#: /inventory/manage/locations.php:16
-msgid "Inventory Locations"
-msgstr ""
-
-#: /inventory/manage/locations.php:39
+#: /inventory/manage/locations.php:46
 msgid ""
 "The location code must be five characters or less long (including converted "
 "special chars)."
 msgstr ""
 
-#: /inventory/manage/locations.php:45
+#: /inventory/manage/locations.php:52
 msgid "The location name must be entered."
 msgstr ""
 
-#: /inventory/manage/locations.php:56
+#: /inventory/manage/locations.php:63
 msgid "Selected location has been updated"
 msgstr ""
 
-#: /inventory/manage/locations.php:65
+#: /inventory/manage/locations.php:72
 msgid "New location has been added"
 msgstr ""
 
-#: /inventory/manage/locations.php:76
+#: /inventory/manage/locations.php:83
 msgid ""
 "Cannot delete this location because item movements have been created using "
 "this location."
 msgstr ""
 
-#: /inventory/manage/locations.php:82
+#: /inventory/manage/locations.php:89
 msgid ""
 "Cannot delete this location because it is used by some work orders records."
 msgstr ""
 
-#: /inventory/manage/locations.php:88
+#: /inventory/manage/locations.php:95
 msgid ""
 "Cannot delete this location because it is used by some branch records as the "
 "default location to deliver from."
 msgstr ""
 
-#: /inventory/manage/locations.php:94
-#: /inventory/manage/locations.php:100
-#: /inventory/manage/locations.php:105
-#: /inventory/manage/locations.php:110
-#: /inventory/manage/locations.php:115
+#: /inventory/manage/locations.php:101
+#: /inventory/manage/locations.php:107
+#: /inventory/manage/locations.php:112
+#: /inventory/manage/locations.php:117
+#: /inventory/manage/locations.php:122
 msgid ""
 "Cannot delete this location because it is used by some related records in "
 "other tables."
 msgstr ""
 
-#: /inventory/manage/locations.php:129
+#: /inventory/manage/locations.php:136
 msgid "Selected location has been deleted"
 msgstr ""
 
-#: /inventory/manage/locations.php:146
+#: /inventory/manage/locations.php:155
 msgid "Location Code"
 msgstr ""
 
-#: /inventory/manage/locations.php:146
+#: /inventory/manage/locations.php:155
 msgid "Location Name"
 msgstr ""
 
-#: /inventory/manage/locations.php:192
-#: /inventory/manage/locations.php:196
+#: /inventory/manage/locations.php:202
+#: /inventory/manage/locations.php:206
 msgid "Location Code:"
 msgstr ""
 
-#: /inventory/manage/locations.php:199
+#: /inventory/manage/locations.php:209
 msgid "Location Name:"
 msgstr ""
 
-#: /inventory/manage/locations.php:200
+#: /inventory/manage/locations.php:210
 msgid "Contact for deliveries:"
 msgstr ""
 
-#: /inventory/manage/locations.php:204
+#: /inventory/manage/locations.php:214
 msgid "Telephone No:"
 msgstr ""
 
-#: /inventory/manage/locations.php:206
+#: /inventory/manage/locations.php:216
 msgid "Facsimile No:"
 msgstr ""
 
-#: /inventory/manage/sales_kits.php:16
+#: /inventory/manage/sales_kits.php:20
 msgid "Sales Kits & Alias Codes"
 msgstr ""
 
-#: /inventory/manage/sales_kits.php:38
+#: /inventory/manage/sales_kits.php:36
 msgid "Stock Item"
 msgstr ""
 
-#: /inventory/manage/sales_kits.php:52
+#: /inventory/manage/sales_kits.php:50
 msgid "kit"
 msgstr ""
 
-#: /inventory/manage/sales_kits.php:70
-#: /manufacturing/manage/bom_edit.php:99
+#: /inventory/manage/sales_kits.php:68
+#: /manufacturing/manage/bom_edit.php:74
 msgid "The quantity entered must be numeric and greater than zero."
 msgstr ""
 
-#: /inventory/manage/sales_kits.php:84
+#: /inventory/manage/sales_kits.php:82
 msgid "Kit/alias code cannot be empty."
 msgstr ""
 
-#: /inventory/manage/sales_kits.php:99
+#: /inventory/manage/sales_kits.php:97
 msgid ""
 "The selected component contains directly or on any lower level the kit under "
 "edition. Recursive kits are not allowed."
 msgstr ""
 
-#: /inventory/manage/sales_kits.php:106
+#: /inventory/manage/sales_kits.php:104
 msgid ""
 "The selected component is already in this kit. You can modify it's quantity "
 "but it cannot appear more than once in the same kit."
 msgstr ""
 
-#: /inventory/manage/sales_kits.php:113
+#: /inventory/manage/sales_kits.php:111
 msgid "New alias code has been created."
 msgstr ""
 
-#: /inventory/manage/sales_kits.php:116
+#: /inventory/manage/sales_kits.php:114
 msgid "New component has been added to selected kit."
 msgstr ""
 
-#: /inventory/manage/sales_kits.php:126
+#: /inventory/manage/sales_kits.php:124
 msgid "Component of selected kit has been updated."
 msgstr ""
 
-#: /inventory/manage/sales_kits.php:138
+#: /inventory/manage/sales_kits.php:136
 msgid "Kit common properties has been updated"
 msgstr ""
 
-#: /inventory/manage/sales_kits.php:159
+#: /inventory/manage/sales_kits.php:157
 msgid ""
 "This item cannot be deleted because it is the last item in the kit used by "
 "following kits"
 msgstr ""
 
-#: /inventory/manage/sales_kits.php:170
-#: /manufacturing/manage/bom_edit.php:151
+#: /inventory/manage/sales_kits.php:168
+#: /manufacturing/manage/bom_edit.php:126
 msgid "The component item has been deleted from this bom"
 msgstr ""
 
-#: /inventory/manage/sales_kits.php:185
+#: /inventory/manage/sales_kits.php:183
 msgid "Select a sale kit:"
 msgstr ""
 
-#: /inventory/manage/sales_kits.php:186
+#: /inventory/manage/sales_kits.php:184
 msgid "New kit"
 msgstr ""
 
-#: /inventory/manage/sales_kits.php:201
+#: /inventory/manage/sales_kits.php:199
 msgid "Alias/kit code:"
 msgstr ""
 
-#: /inventory/manage/sales_kits.php:210
+#: /inventory/manage/sales_kits.php:208
 msgid "Update kit/alias name"
 msgstr ""
 
-#: /inventory/manage/sales_kits.php:225
-#: /manufacturing/manage/bom_edit.php:202
-#: /manufacturing/manage/bom_edit.php:209
+#: /inventory/manage/sales_kits.php:223
+#: /manufacturing/manage/bom_edit.php:180
+#: /manufacturing/manage/bom_edit.php:187
 msgid "Component:"
 msgstr ""
 
-#: /inventory/manage/sales_kits.php:239
+#: /inventory/manage/sales_kits.php:235
 msgid "kits"
 msgstr ""
 
@@ -9965,7 +10613,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:83
+#: /manufacturing/includes/manufacturing_ui.inc:100
 #: /reporting/includes/doctext.inc:228
 msgid "From Location"
 msgstr ""
@@ -10019,36 +10667,21 @@ msgstr ""
 msgid "Produce"
 msgstr ""
 
-#: /manufacturing/search_work_orders.php:145
-msgid "Costs"
-msgstr ""
-
-#: /manufacturing/search_work_orders.php:169
-#: /manufacturing/view/wo_issue_view.php:43
-#: /manufacturing/view/wo_production_view.php:44
-#: /purchasing/includes/ui/invoice_ui.inc:510
-#: /purchasing/includes/ui/invoice_ui.inc:522
-#: /reporting/rep204.php:84
-#: /reporting/rep306.php:152
-#: /reporting/rep402.php:103
-msgid "Item"
-msgstr ""
-
-#: /manufacturing/search_work_orders.php:170
+#: /manufacturing/search_work_orders.php:162
 #: /reporting/rep402.php:103
 msgid "Required"
 msgstr ""
 
-#: /manufacturing/search_work_orders.php:173
-#: /manufacturing/includes/manufacturing_ui.inc:277
-#: /manufacturing/includes/manufacturing_ui.inc:281
+#: /manufacturing/search_work_orders.php:165
+#: /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:255
 msgid "Required By"
 msgstr ""
 
-#: /manufacturing/search_work_orders.php:182
+#: /manufacturing/search_work_orders.php:174
 msgid "Marked orders are overdue."
 msgstr ""
 
@@ -10069,6 +10702,7 @@ msgid "View this Work Order"
 msgstr ""
 
 #: /manufacturing/work_order_add_finished.php:47
+#: /manufacturing/work_order_costs.php:46
 #: /manufacturing/work_order_entry.php:63
 #: /manufacturing/work_order_issue.php:42
 msgid "View the GL Journal Entries for this Work Order"
@@ -10080,16 +10714,14 @@ msgid "Print the GL Journal Entries for this Work Order"
 msgstr ""
 
 #: /manufacturing/work_order_add_finished.php:51
-#: /manufacturing/work_order_costs.php:48
+#: /manufacturing/work_order_costs.php:50
 #: /manufacturing/work_order_issue.php:44
 msgid "Select another &Work Order to Process"
 msgstr ""
 
 #: /manufacturing/work_order_add_finished.php:64
-#: /manufacturing/work_order_costs.php:61
-#: /manufacturing/work_order_entry.php:331
-#: /manufacturing/includes/db/work_order_issues_db.inc:30
-#: /manufacturing/includes/db/work_order_produce_items_db.inc:27
+#: /manufacturing/work_order_costs.php:63
+#: /manufacturing/work_order_entry.php:323
 msgid "The order number sent is not valid."
 msgstr ""
 
@@ -10118,21 +10750,21 @@ msgid ""
 "negative inventory balance :"
 msgstr ""
 
-#: /manufacturing/work_order_add_finished.php:193
+#: /manufacturing/work_order_add_finished.php:192
 msgid "Produce Finished Items"
 msgstr ""
 
-#: /manufacturing/work_order_add_finished.php:193
+#: /manufacturing/work_order_add_finished.php:192
 msgid "Return Items to Work Order"
 msgstr ""
 
-#: /manufacturing/work_order_add_finished.php:201
+#: /manufacturing/work_order_add_finished.php:200
 #: /purchasing/allocations/supplier_allocate.php:75
 #: /sales/allocations/customer_allocate.php:73
 msgid "Process"
 msgstr ""
 
-#: /manufacturing/work_order_add_finished.php:202
+#: /manufacturing/work_order_add_finished.php:201
 msgid "Process And Close Order"
 msgstr ""
 
@@ -10144,28 +10776,24 @@ msgstr ""
 msgid "The additional cost has been entered."
 msgstr ""
 
-#: /manufacturing/work_order_costs.php:46
+#: /manufacturing/work_order_costs.php:48
 msgid "Enter another additional cost."
 msgstr ""
 
-#: /manufacturing/work_order_costs.php:72
+#: /manufacturing/work_order_costs.php:73
 msgid "The amount entered is not a valid number or less then zero."
 msgstr ""
 
-#: /manufacturing/work_order_costs.php:91
+#: /manufacturing/work_order_costs.php:92
 msgid ""
 "The additional cost date cannot be before the release date of the work order."
 msgstr ""
 
-#: /manufacturing/work_order_costs.php:142
+#: /manufacturing/work_order_costs.php:145
 msgid "Additional Costs:"
 msgstr ""
 
-#: /manufacturing/work_order_costs.php:143
-msgid "Debit Account"
-msgstr ""
-
-#: /manufacturing/work_order_costs.php:150
+#: /manufacturing/work_order_costs.php:152
 msgid "Process Additional Cost"
 msgstr ""
 
@@ -10237,59 +10865,59 @@ msgid ""
 "The selected item cannot be unassembled because there is insufficient stock."
 msgstr ""
 
-#: /manufacturing/work_order_entry.php:238
+#: /manufacturing/work_order_entry.php:231
 msgid ""
 "The quantity cannot be changed to be less than the quantity already "
 "manufactured for this order."
 msgstr ""
 
-#: /manufacturing/work_order_entry.php:288
+#: /manufacturing/work_order_entry.php:280
 msgid ""
 "This work order cannot be deleted because it has already been processed."
 msgstr ""
 
-#: /manufacturing/work_order_entry.php:339
+#: /manufacturing/work_order_entry.php:331
 msgid "This work order is closed and cannot be edited."
 msgstr ""
 
-#: /manufacturing/work_order_entry.php:387
-#: /manufacturing/work_order_entry.php:395
+#: /manufacturing/work_order_entry.php:377
+#: /manufacturing/work_order_entry.php:385
 msgid "Destination Location:"
 msgstr ""
 
-#: /manufacturing/work_order_entry.php:406
+#: /manufacturing/work_order_entry.php:396
 msgid "Quantity Required:"
 msgstr ""
 
-#: /manufacturing/work_order_entry.php:408
+#: /manufacturing/work_order_entry.php:398
 msgid "Quantity Manufactured:"
 msgstr ""
 
-#: /manufacturing/work_order_entry.php:426
+#: /manufacturing/work_order_entry.php:420
 msgid "Credit Labour Account"
 msgstr ""
 
-#: /manufacturing/work_order_entry.php:433
+#: /manufacturing/work_order_entry.php:422
 msgid "Credit Overhead Account"
 msgstr ""
 
-#: /manufacturing/work_order_entry.php:438
+#: /manufacturing/work_order_entry.php:427
 msgid "Released On:"
 msgstr ""
 
-#: /manufacturing/work_order_entry.php:448
+#: /manufacturing/work_order_entry.php:437
 msgid "Save changes to work order"
 msgstr ""
 
-#: /manufacturing/work_order_entry.php:451
+#: /manufacturing/work_order_entry.php:440
 msgid "Close This Work Order"
 msgstr ""
 
-#: /manufacturing/work_order_entry.php:453
+#: /manufacturing/work_order_entry.php:442
 msgid "Delete This Work Order"
 msgstr ""
 
-#: /manufacturing/work_order_entry.php:459
+#: /manufacturing/work_order_entry.php:448
 msgid "Add Workorder"
 msgstr ""
 
@@ -10301,39 +10929,39 @@ msgstr ""
 msgid "The work order issue has been entered."
 msgstr ""
 
-#: /manufacturing/work_order_issue.php:78
+#: /manufacturing/work_order_issue.php:76
 msgid "The entered date for the issue is invalid."
 msgstr ""
 
-#: /manufacturing/work_order_issue.php:97
+#: /manufacturing/work_order_issue.php:95
 msgid ""
 "The issue cannot be processed because it would cause negative inventory "
 "balance for marked items as of document date or later."
 msgstr ""
 
-#: /manufacturing/work_order_issue.php:114
+#: /manufacturing/work_order_issue.php:112
 msgid ""
 "The process cannot be completed because there is an insufficient total "
 "quantity for a component."
 msgstr ""
 
-#: /manufacturing/work_order_issue.php:115
+#: /manufacturing/work_order_issue.php:113
 msgid "Component is :"
 msgstr ""
 
-#: /manufacturing/work_order_issue.php:116
+#: /manufacturing/work_order_issue.php:114
 msgid "From location :"
 msgstr ""
 
-#: /manufacturing/work_order_issue.php:131
+#: /manufacturing/work_order_issue.php:129
 msgid "The quantity entered is negative or invalid."
 msgstr ""
 
-#: /manufacturing/work_order_issue.php:209
+#: /manufacturing/work_order_issue.php:207
 msgid "Items to Issue"
 msgstr ""
 
-#: /manufacturing/work_order_issue.php:215
+#: /manufacturing/work_order_issue.php:213
 msgid "Process Issue"
 msgstr ""
 
@@ -10368,7 +10996,7 @@ msgid "Work Order Reference:"
 msgstr ""
 
 #: /manufacturing/work_order_release.php:100
-#: /manufacturing/includes/manufacturing_ui.inc:278
+#: /manufacturing/includes/manufacturing_ui.inc:293
 msgid "Released Date"
 msgstr ""
 
@@ -10380,7 +11008,29 @@ msgstr ""
 msgid "View Work Order Costs"
 msgstr ""
 
-#: /manufacturing/view/wo_costs_view.php:61
+#: /manufacturing/view/wo_costs_view.php:60
+msgid "Transaction"
+msgstr ""
+
+#: /manufacturing/view/wo_costs_view.php:66
+msgid "Finished Product Requirements"
+msgstr ""
+
+#: /manufacturing/view/wo_costs_view.php:69
+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
+msgid "Additional Costs"
+msgstr ""
+
+#: /manufacturing/view/wo_costs_view.php:75
+msgid "Finished Product Receival"
+msgstr ""
+
+#: /manufacturing/view/wo_costs_view.php:80
 #, php-format
 msgid "Production Costs for Work Order # %d"
 msgstr ""
@@ -10416,13 +11066,13 @@ msgstr ""
 
 #: /manufacturing/view/wo_issue_view.php:76
 #: /manufacturing/includes/manufacturing_ui.inc:28
-#: /manufacturing/includes/manufacturing_ui.inc:83
+#: /manufacturing/includes/manufacturing_ui.inc:100
 #: /reporting/rep401.php:71
 #: /reporting/rep401.php:76
 msgid "Component"
 msgstr ""
 
-#: /manufacturing/view/wo_issue_view.php:113
+#: /manufacturing/view/wo_issue_view.php:114
 msgid "Items for this Issue"
 msgstr ""
 
@@ -10451,7 +11101,7 @@ msgid "BOM for item:"
 msgstr ""
 
 #: /manufacturing/view/work_order_view.php:55
-#: /reporting/rep409.php:87
+#: /reporting/rep409.php:86
 msgid "Work Order Requirements"
 msgstr ""
 
@@ -10463,11 +11113,6 @@ msgstr ""
 msgid "Productions"
 msgstr ""
 
-#: /manufacturing/view/work_order_view.php:66
-#: /manufacturing/view/work_order_view.php:73
-msgid "Additional Costs"
-msgstr ""
-
 #: /manufacturing/view/work_order_view.php:81
 msgid "This work order has been voided."
 msgstr ""
@@ -10478,7 +11123,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:168
+#: /manufacturing/manage/bom_edit.php:143
 msgid "Select a manufacturable item:"
 msgstr ""
 
@@ -10499,16 +11144,16 @@ msgid "Parent Item"
 msgstr ""
 
 #: /manufacturing/inquiry/where_used_inquiry.php:44
-#: /manufacturing/manage/bom_edit.php:69
+#: /manufacturing/manage/bom_edit.php:44
 #: /manufacturing/includes/manufacturing_ui.inc:28
-#: /manufacturing/includes/manufacturing_ui.inc:83
+#: /manufacturing/includes/manufacturing_ui.inc:100
 #: /reporting/includes/doctext.inc:228
 msgid "Work Centre"
 msgstr ""
 
 #: /manufacturing/inquiry/where_used_inquiry.php:46
-#: /manufacturing/includes/manufacturing_ui.inc:277
-#: /manufacturing/includes/manufacturing_ui.inc:281
+#: /manufacturing/includes/manufacturing_ui.inc:292
+#: /manufacturing/includes/manufacturing_ui.inc:296
 msgid "Quantity Required"
 msgstr ""
 
@@ -10522,37 +11167,37 @@ msgid ""
 "work centre be defined."
 msgstr ""
 
-#: /manufacturing/manage/bom_edit.php:68
+#: /manufacturing/manage/bom_edit.php:43
 #: /reporting/rep105.php:114
 msgid "Code"
 msgstr ""
 
-#: /manufacturing/manage/bom_edit.php:108
+#: /manufacturing/manage/bom_edit.php:83
 msgid "Selected component has been updated"
 msgstr ""
 
-#: /manufacturing/manage/bom_edit.php:128
+#: /manufacturing/manage/bom_edit.php:103
 msgid ""
 "A new component part has been added to the bill of material for this item."
 msgstr ""
 
-#: /manufacturing/manage/bom_edit.php:134
+#: /manufacturing/manage/bom_edit.php:109
 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:140
+#: /manufacturing/manage/bom_edit.php:115
 msgid ""
 "The selected component is a parent of the current item. Recursive BOMs are "
 "not allowed."
 msgstr ""
 
-#: /manufacturing/manage/bom_edit.php:222
+#: /manufacturing/manage/bom_edit.php:200
 msgid "Location to Draw From:"
 msgstr ""
 
-#: /manufacturing/manage/bom_edit.php:223
+#: /manufacturing/manage/bom_edit.php:201
 msgid "Work Centre Added:"
 msgstr ""
 
@@ -10597,163 +11242,165 @@ msgid "The bill of material for this item is empty."
 msgstr ""
 
 #: /manufacturing/includes/manufacturing_ui.inc:29
-#: /manufacturing/includes/manufacturing_ui.inc:61
+#: /reporting/rep304.php:127
+msgid "Cost"
+msgstr ""
+
+#: /manufacturing/includes/manufacturing_ui.inc:66
+msgid "Standard Labour Cost"
+msgstr ""
+
+#: /manufacturing/includes/manufacturing_ui.inc:74
+msgid "Standard Overhead Cost"
+msgstr ""
+
+#: /manufacturing/includes/manufacturing_ui.inc:78
 msgid "Total Cost"
 msgstr ""
 
-#: /manufacturing/includes/manufacturing_ui.inc:77
+#: /manufacturing/includes/manufacturing_ui.inc:94
 msgid "There are no Requirements for this Order."
 msgstr ""
 
-#: /manufacturing/includes/manufacturing_ui.inc:84
+#: /manufacturing/includes/manufacturing_ui.inc:101
 #: /reporting/includes/doctext.inc:228
 msgid "Unit Quantity"
 msgstr ""
 
-#: /manufacturing/includes/manufacturing_ui.inc:84
+#: /manufacturing/includes/manufacturing_ui.inc:101
 #: /reporting/includes/doctext.inc:228
 msgid "Total Quantity"
 msgstr ""
 
-#: /manufacturing/includes/manufacturing_ui.inc:84
+#: /manufacturing/includes/manufacturing_ui.inc:101
 #: /reporting/includes/doctext.inc:228
 msgid "Units Issued"
 msgstr ""
 
-#: /manufacturing/includes/manufacturing_ui.inc:84
+#: /manufacturing/includes/manufacturing_ui.inc:101
 msgid "On Hand"
 msgstr ""
 
-#: /manufacturing/includes/manufacturing_ui.inc:138
+#: /manufacturing/includes/manufacturing_ui.inc:155
 msgid "Marked items have insufficient quantities in stock."
 msgstr ""
 
-#: /manufacturing/includes/manufacturing_ui.inc:152
+#: /manufacturing/includes/manufacturing_ui.inc:169
 msgid "There are no Productions for this Order."
 msgstr ""
 
-#: /manufacturing/includes/manufacturing_ui.inc:195
+#: /manufacturing/includes/manufacturing_ui.inc:212
 msgid "There are no Issues for this Order."
 msgstr ""
 
-#: /manufacturing/includes/manufacturing_ui.inc:231
+#: /manufacturing/includes/manufacturing_ui.inc:248
 msgid "There are no additional costs for this Order."
 msgstr ""
 
-#: /manufacturing/includes/manufacturing_ui.inc:269
-#: /manufacturing/includes/manufacturing_ui.inc:325
+#: /manufacturing/includes/manufacturing_ui.inc:284
+#: /manufacturing/includes/manufacturing_ui.inc:340
 msgid "The work order number sent is not valid."
 msgstr ""
 
-#: /manufacturing/includes/manufacturing_ui.inc:276
-#: /manufacturing/includes/manufacturing_ui.inc:280
-#: /manufacturing/includes/manufacturing_ui.inc:331
+#: /manufacturing/includes/manufacturing_ui.inc:291
+#: /manufacturing/includes/manufacturing_ui.inc:295
+#: /manufacturing/includes/manufacturing_ui.inc:346
 #: /reporting/includes/doctext.inc:222
 msgid "Manufactured Item"
 msgstr ""
 
-#: /manufacturing/includes/manufacturing_ui.inc:277
-#: /manufacturing/includes/manufacturing_ui.inc:281
-#: /manufacturing/includes/manufacturing_ui.inc:332
+#: /manufacturing/includes/manufacturing_ui.inc:292
+#: /manufacturing/includes/manufacturing_ui.inc:296
+#: /manufacturing/includes/manufacturing_ui.inc:347
 #: /reporting/includes/doctext.inc:223
 msgid "Into Location"
 msgstr ""
 
-#: /manufacturing/includes/manufacturing_ui.inc:311
-#: /manufacturing/includes/manufacturing_ui.inc:356
+#: /manufacturing/includes/manufacturing_ui.inc:326
+#: /manufacturing/includes/manufacturing_ui.inc:371
 msgid "This work order is closed."
 msgstr ""
 
-#: /manufacturing/includes/work_order_issue_ui.inc:82
+#: /manufacturing/includes/work_order_issue_ui.inc:78
 msgid "Marked items have insufficient quantities in stock as on day of issue."
 msgstr ""
 
-#: /manufacturing/includes/work_order_issue_ui.inc:163
+#: /manufacturing/includes/work_order_issue_ui.inc:157
 msgid "Issue Date:"
 msgstr ""
 
-#: /manufacturing/includes/work_order_issue_ui.inc:165
+#: /manufacturing/includes/work_order_issue_ui.inc:159
 msgid "To Work Centre:"
 msgstr ""
 
-#: /manufacturing/includes/work_order_issue_ui.inc:173
+#: /manufacturing/includes/work_order_issue_ui.inc:167
 msgid "Return Items to Location"
 msgstr ""
 
-#: /manufacturing/includes/work_order_issue_ui.inc:173
+#: /manufacturing/includes/work_order_issue_ui.inc:167
 msgid "Issue Items to Work order"
 msgstr ""
 
-#: /manufacturing/includes/db/work_order_issues_db.inc:81
-msgid "Issue of"
+#: /manufacturing/includes/db/work_order_costing_db.inc:98
+#, php-format
+msgid "COGS changed from %s to %s for %d %s of '%s'"
 msgstr ""
 
-#: /manufacturing/includes/db/work_order_issues_db.inc:90
-msgid "Issue to"
+#: /manufacturing/includes/db/work_order_costing_db.inc:217
+#, php-format
+msgid "Voided WO #%s"
 msgstr ""
 
-#: /manufacturing/includes/db/work_order_issues_db.inc:208
-msgid "Reversed the issue of"
+#: /manufacturing/includes/db/work_order_issues_db.inc:66
+msgid "Issue of"
 msgstr ""
 
-#: /manufacturing/includes/db/work_order_issues_db.inc:220
-msgid "Reversed the issue to"
+#: /manufacturing/includes/db/work_order_issues_db.inc:74
+msgid "Issue to"
 msgstr ""
 
-#: /manufacturing/includes/db/work_order_produce_items_db.inc:73
+#: /manufacturing/includes/db/work_order_produce_items_db.inc:94
 msgid "Production."
 msgstr ""
 
-#: /manufacturing/includes/db/work_order_produce_items_db.inc:157
-msgid "Reversed the production "
-msgstr ""
-
-#: /manufacturing/includes/db/work_orders_db.inc:79
-#: /purchasing/includes/db/po_db.inc:161
+#: /manufacturing/includes/db/work_orders_db.inc:95
+#: /purchasing/includes/db/po_db.inc:153
 #: /sales/includes/db/cust_trans_db.inc:115
 #: /sales/includes/db/sales_order_db.inc:211
 msgid "Updated."
 msgstr ""
 
-#: /manufacturing/includes/db/work_orders_db.inc:100
+#: /manufacturing/includes/db/work_orders_db.inc:114
 msgid "Canceled."
 msgstr ""
 
-#: /manufacturing/includes/db/work_orders_db.inc:176
+#: /manufacturing/includes/db/work_orders_db.inc:195
 msgid "Released."
 msgstr ""
 
-#: /manufacturing/includes/db/work_orders_quick_db.inc:104
-msgid "Quick production."
-msgstr ""
-
-#: /manufacturing/includes/db/work_orders_quick_db.inc:184
-msgid "Produced"
-msgstr ""
-
-#: /purchasing/includes/purchasing_db.inc:215
+#: /purchasing/includes/purchasing_db.inc:216
 msgid "Payment for:"
 msgstr ""
 
-#: /purchasing/includes/db/invoice_db.inc:337
+#: /purchasing/includes/db/invoice_db.inc:339
 msgid "Supplier invoice adjustment for zero inventory of "
 msgstr ""
 
-#: /purchasing/includes/db/invoice_db.inc:337
+#: /purchasing/includes/db/invoice_db.inc:339
 #: /reporting/rep106.php:89
 #: /sales/inquiry/sales_deliveries_view.php:154
 #: /sales/inquiry/sales_orders_view.php:131
 msgid "Invoice"
 msgstr ""
 
-#: /purchasing/includes/db/invoice_db.inc:689
-#: /purchasing/includes/db/invoice_db.inc:691
+#: /purchasing/includes/db/invoice_db.inc:696
+#: /purchasing/includes/db/invoice_db.inc:698
 msgid "GRN Removal"
 msgstr ""
 
 #: /purchasing/includes/ui/grn_ui.inc:23
 #: /purchasing/includes/ui/grn_ui.inc:55
-#: /purchasing/includes/ui/po_ui.inc:298
+#: /purchasing/includes/ui/po_ui.inc:303
 #: /sales/view/view_sales_order.php:74
 msgid "Order Currency"
 msgstr ""
@@ -10771,21 +11418,21 @@ msgstr ""
 
 #: /purchasing/includes/ui/grn_ui.inc:33
 #: /purchasing/includes/ui/grn_ui.inc:69
-#: /purchasing/includes/ui/po_ui.inc:313
 #: /purchasing/includes/ui/po_ui.inc:318
+#: /purchasing/includes/ui/po_ui.inc:323
 msgid "Deliver Into Location"
 msgstr ""
 
 #: /purchasing/includes/ui/grn_ui.inc:38
-#: /purchasing/includes/ui/grn_ui.inc:81
-#: /purchasing/includes/ui/po_ui.inc:327
+#: /purchasing/includes/ui/grn_ui.inc:79
+#: /purchasing/includes/ui/po_ui.inc:332
 #: /sales/view/view_sales_order.php:92
 msgid "Delivery Address"
 msgstr ""
 
 #: /purchasing/includes/ui/grn_ui.inc:41
-#: /purchasing/includes/ui/grn_ui.inc:84
-#: /purchasing/includes/ui/po_ui.inc:339
+#: /purchasing/includes/ui/grn_ui.inc:82
+#: /purchasing/includes/ui/po_ui.inc:344
 msgid "Order Comments"
 msgstr ""
 
@@ -10793,96 +11440,96 @@ msgstr ""
 msgid "Date Items Received"
 msgstr ""
 
-#: /purchasing/includes/ui/invoice_ui.inc:127
+#: /purchasing/includes/ui/invoice_ui.inc:121
 msgid "Source Invoices:"
 msgstr ""
 
-#: /purchasing/includes/ui/invoice_ui.inc:129
+#: /purchasing/includes/ui/invoice_ui.inc:123
 msgid "Supplier's Ref.:"
 msgstr ""
 
-#: /purchasing/includes/ui/invoice_ui.inc:135
-#: /purchasing/includes/ui/po_ui.inc:174
-msgid "Dimension 2"
+#: /purchasing/includes/ui/invoice_ui.inc:137
+msgid "Terms:"
 msgstr ""
 
-#: /purchasing/includes/ui/invoice_ui.inc:149
-msgid "Terms:"
+#: /purchasing/includes/ui/invoice_ui.inc:143
+#: /purchasing/includes/ui/po_ui.inc:174
+msgid "Dimension 2"
 msgstr ""
 
-#: /purchasing/includes/ui/invoice_ui.inc:161
-#: /purchasing/manage/suppliers.php:99
-#: /purchasing/manage/suppliers.php:104
+#: /purchasing/includes/ui/invoice_ui.inc:155
+#: /purchasing/manage/suppliers.php:100
+#: /purchasing/manage/suppliers.php:105
 msgid "Supplier's Currency:"
 msgstr ""
 
-#: /purchasing/includes/ui/invoice_ui.inc:165
-#: /purchasing/manage/suppliers.php:106
-#: /sales/manage/customer_branches.php:234
+#: /purchasing/includes/ui/invoice_ui.inc:159
+#: /purchasing/manage/suppliers.php:107
+#: /sales/manage/customer_branches.php:238
 #: /sales/manage/customers.php:299
 msgid "Tax Group:"
 msgstr ""
 
-#: /purchasing/includes/ui/invoice_ui.inc:183
+#: /purchasing/includes/ui/invoice_ui.inc:177
 msgid "Sub-total:"
 msgstr ""
 
-#: /purchasing/includes/ui/invoice_ui.inc:191
+#: /purchasing/includes/ui/invoice_ui.inc:185
 msgid "Invoice Total:"
 msgstr ""
 
-#: /purchasing/includes/ui/invoice_ui.inc:194
-#: /sales/customer_credit_invoice.php:332
-#: /sales/includes/ui/sales_credit_ui.inc:234
+#: /purchasing/includes/ui/invoice_ui.inc:188
+#: /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:226
+#: /purchasing/includes/ui/invoice_ui.inc:220
 msgid "Add GL Line"
 msgstr ""
 
-#: /purchasing/includes/ui/invoice_ui.inc:227
+#: /purchasing/includes/ui/invoice_ui.inc:221
 msgid "Reset"
 msgstr ""
 
-#: /purchasing/includes/ui/invoice_ui.inc:228
+#: /purchasing/includes/ui/invoice_ui.inc:222
 #: /purchasing/po_receive_items.php:326
 msgid "Clear all GL entry fields"
 msgstr ""
 
-#: /purchasing/includes/ui/invoice_ui.inc:246
+#: /purchasing/includes/ui/invoice_ui.inc:240
 msgid "GL Items for this Invoice"
 msgstr ""
 
-#: /purchasing/includes/ui/invoice_ui.inc:248
+#: /purchasing/includes/ui/invoice_ui.inc:242
 msgid "GL Items for this Credit Note"
 msgstr ""
 
-#: /purchasing/includes/ui/invoice_ui.inc:258
+#: /purchasing/includes/ui/invoice_ui.inc:252
 msgid "Quick Entry:"
 msgstr ""
 
-#: /purchasing/includes/ui/invoice_ui.inc:430
+#: /purchasing/includes/ui/invoice_ui.inc:421
 msgid "Add to Invoice"
 msgstr ""
 
-#: /purchasing/includes/ui/invoice_ui.inc:432
+#: /purchasing/includes/ui/invoice_ui.inc:423
 msgid "Add to Credit Note"
 msgstr ""
 
-#: /purchasing/includes/ui/invoice_ui.inc:434
-#: /sales/customer_invoice.php:611
+#: /purchasing/includes/ui/invoice_ui.inc:425
+#: /sales/customer_invoice.php:581
 msgid "Remove"
 msgstr ""
 
-#: /purchasing/includes/ui/invoice_ui.inc:434
-#: /purchasing/includes/ui/invoice_ui.inc:469
+#: /purchasing/includes/ui/invoice_ui.inc:425
+#: /purchasing/includes/ui/invoice_ui.inc:460
 msgid ""
 "WARNING! Be careful with removal. The operation is executed immediately and "
 "cannot be undone !!!"
 msgstr ""
 
-#: /purchasing/includes/ui/invoice_ui.inc:436
+#: /purchasing/includes/ui/invoice_ui.inc:427
 #, php-format
 msgid ""
 "You are about to remove all yet non-invoiced items from delivery line #%d. "
@@ -10890,108 +11537,108 @@ msgid ""
 "continue ?"
 msgstr ""
 
-#: /purchasing/includes/ui/invoice_ui.inc:467
+#: /purchasing/includes/ui/invoice_ui.inc:458
 msgid "Items Received Yet to be Invoiced"
 msgstr ""
 
-#: /purchasing/includes/ui/invoice_ui.inc:472
+#: /purchasing/includes/ui/invoice_ui.inc:463
 msgid "Delivery Item Selected For Adding To A Supplier Credit Note"
 msgstr ""
 
-#: /purchasing/includes/ui/invoice_ui.inc:477
+#: /purchasing/includes/ui/invoice_ui.inc:468
 msgid "Received Items Charged on this Invoice"
 msgstr ""
 
-#: /purchasing/includes/ui/invoice_ui.inc:479
+#: /purchasing/includes/ui/invoice_ui.inc:470
 msgid "Received Items Credited on this Note"
 msgstr ""
 
-#: /purchasing/includes/ui/invoice_ui.inc:489
+#: /purchasing/includes/ui/invoice_ui.inc:480
 msgid "Received between"
 msgstr ""
 
-#: /purchasing/includes/ui/invoice_ui.inc:501
+#: /purchasing/includes/ui/invoice_ui.inc:492
 msgid "Add All Items"
 msgstr ""
 
-#: /purchasing/includes/ui/invoice_ui.inc:510
-#: /purchasing/includes/ui/invoice_ui.inc:522
+#: /purchasing/includes/ui/invoice_ui.inc:501
+#: /purchasing/includes/ui/invoice_ui.inc:513
 #: /reporting/rep308.php:242
 #: /sales/inquiry/sales_orders_view.php:139
 msgid "Delivery"
 msgstr ""
 
-#: /purchasing/includes/ui/invoice_ui.inc:510
+#: /purchasing/includes/ui/invoice_ui.inc:501
 msgid "P.O."
 msgstr ""
 
-#: /purchasing/includes/ui/invoice_ui.inc:511
+#: /purchasing/includes/ui/invoice_ui.inc:502
 msgid "Received On"
 msgstr ""
 
-#: /purchasing/includes/ui/invoice_ui.inc:511
+#: /purchasing/includes/ui/invoice_ui.inc:502
 #: /purchasing/view/view_po.php:46
 msgid "Quantity Received"
 msgstr ""
 
-#: /purchasing/includes/ui/invoice_ui.inc:511
+#: /purchasing/includes/ui/invoice_ui.inc:502
 #: /purchasing/view/view_grn.php:41
 #: /purchasing/view/view_po.php:46
 msgid "Quantity Invoiced"
 msgstr ""
 
-#: /purchasing/includes/ui/invoice_ui.inc:512
+#: /purchasing/includes/ui/invoice_ui.inc:503
 msgid "Qty Yet To Invoice"
 msgstr ""
 
-#: /purchasing/includes/ui/invoice_ui.inc:512
+#: /purchasing/includes/ui/invoice_ui.inc:503
 #: /purchasing/includes/ui/po_ui.inc:216
 #: /sales/includes/ui/sales_order_ui.inc:148
 msgid "Price after Tax"
 msgstr ""
 
-#: /purchasing/includes/ui/invoice_ui.inc:512
+#: /purchasing/includes/ui/invoice_ui.inc:503
 #: /purchasing/includes/ui/po_ui.inc:216
 #: /sales/includes/ui/sales_order_ui.inc:148
 msgid "Price before Tax"
 msgstr ""
 
-#: /purchasing/includes/ui/invoice_ui.inc:518
+#: /purchasing/includes/ui/invoice_ui.inc:509
 msgid "Qty Yet To Credit"
 msgstr ""
 
-#: /purchasing/includes/ui/invoice_ui.inc:523
+#: /purchasing/includes/ui/invoice_ui.inc:514
 msgid "Line Value"
 msgstr ""
 
-#: /purchasing/includes/ui/invoice_ui.inc:591
+#: /purchasing/includes/ui/invoice_ui.inc:582
 msgid ""
 "There are no outstanding items received from this supplier that have not "
 "been invoiced by them."
 msgstr ""
 
-#: /purchasing/includes/ui/invoice_ui.inc:594
+#: /purchasing/includes/ui/invoice_ui.inc:585
 msgid ""
 "There are no received items for the selected supplier that have been "
 "invoiced."
 msgstr ""
 
-#: /purchasing/includes/ui/invoice_ui.inc:595
+#: /purchasing/includes/ui/invoice_ui.inc:586
 msgid "Credits can only be applied to invoiced items."
 msgstr ""
 
 #: /purchasing/includes/ui/po_ui.inc:135
-#: /sales/sales_order_entry.php:716
+#: /sales/sales_order_entry.php:723
 msgid "Order Date:"
 msgstr ""
 
 #: /purchasing/includes/ui/po_ui.inc:136
-#: /sales/sales_order_entry.php:703
+#: /sales/sales_order_entry.php:710
 msgid "Delivery Date:"
 msgstr ""
 
 #: /purchasing/includes/ui/po_ui.inc:136
-#: /sales/sales_order_entry.php:697
+#: /sales/sales_order_entry.php:704
 msgid "Invoice Date:"
 msgstr ""
 
@@ -11031,7 +11678,7 @@ msgid "Received"
 msgstr ""
 
 #: /purchasing/includes/ui/po_ui.inc:216
-#: /sales/includes/ui/sales_order_ui.inc:604
+#: /sales/includes/ui/sales_order_ui.inc:603
 msgid "Required Delivery Date"
 msgstr ""
 
@@ -11041,66 +11688,66 @@ msgstr ""
 msgid "Line Total"
 msgstr ""
 
-#: /purchasing/includes/ui/po_ui.inc:267
+#: /purchasing/includes/ui/po_ui.inc:272
 #: /purchasing/po_receive_items.php:114
-#: /reporting/rep107.php:234
-#: /reporting/rep109.php:156
-#: /reporting/rep110.php:158
-#: /reporting/rep111.php:154
-#: /reporting/rep113.php:147
-#: /reporting/rep209.php:165
-#: /sales/customer_credit_invoice.php:324
-#: /sales/customer_delivery.php:508
-#: /sales/customer_invoice.php:655
+#: /reporting/rep107.php:232
+#: /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
 #: /sales/view/view_invoice.php:150
-#: /sales/includes/ui/sales_credit_ui.inc:218
-#: /sales/includes/ui/sales_order_ui.inc:224
+#: /sales/includes/ui/sales_credit_ui.inc:212
+#: /sales/includes/ui/sales_order_ui.inc:223
 msgid "Sub-total"
 msgstr ""
 
-#: /purchasing/includes/ui/po_ui.inc:276
+#: /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:515
-#: /sales/view/view_sales_order.php:262
-#: /sales/includes/ui/sales_order_ui.inc:231
+#: /sales/customer_delivery.php:512
+#: /sales/view/view_sales_order.php:263
+#: /sales/includes/ui/sales_order_ui.inc:230
 msgid "Amount Total"
 msgstr ""
 
-#: /purchasing/includes/ui/po_ui.inc:278
+#: /purchasing/includes/ui/po_ui.inc:283
 #: /purchasing/allocations/supplier_allocate.php:74
 #: /sales/allocations/customer_allocate.php:72
-#: /sales/includes/ui/sales_order_ui.inc:232
+#: /sales/includes/ui/sales_order_ui.inc:231
 msgid "Refresh"
 msgstr ""
 
-#: /purchasing/includes/ui/po_ui.inc:333
+#: /purchasing/includes/ui/po_ui.inc:338
 #: /sales/view/view_sales_order.php:83
 msgid "Required Pre-Payment"
 msgstr ""
 
-#: /purchasing/includes/ui/po_ui.inc:334
+#: /purchasing/includes/ui/po_ui.inc:339
 msgid "Pre-Payments Allocated"
 msgstr ""
 
-#: /purchasing/includes/ui/po_ui.inc:454
-#: /purchasing/po_entry_items.php:474
-#: /sales/customer_invoice.php:457
-#: /sales/includes/ui/sales_order_ui.inc:399
-#: /sales/includes/ui/sales_order_ui.inc:401
+#: /purchasing/includes/ui/po_ui.inc:461
+#: /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:454
-#: /purchasing/po_entry_items.php:474
+#: /purchasing/includes/ui/po_ui.inc:461
+#: /purchasing/po_entry_items.php:483
 msgid "Delayed"
 msgstr ""
 
-#: /purchasing/includes/ui/po_ui.inc:456
-#: /sales/includes/ui/sales_order_ui.inc:615
-#: /sales/includes/ui/sales_order_ui.inc:617
+#: /purchasing/includes/ui/po_ui.inc:463
+#: /sales/includes/ui/sales_order_ui.inc:614
+#: /sales/includes/ui/sales_order_ui.inc:616
 msgid "Pre-Payment Required:"
 msgstr ""
 
@@ -11116,224 +11763,240 @@ msgstr ""
 msgid "Direct GRN Entry"
 msgstr ""
 
-#: /purchasing/po_entry_items.php:56
+#: /purchasing/po_entry_items.php:60
+msgid "Fixed Asset Purchase Invoice Entry"
+msgstr ""
+
+#: /purchasing/po_entry_items.php:63
 msgid "Direct Purchase Invoice Entry"
 msgstr ""
 
-#: /purchasing/po_entry_items.php:80
+#: /purchasing/po_entry_items.php:83
 msgid "Purchase Order has been entered"
 msgstr ""
 
-#: /purchasing/po_entry_items.php:82
+#: /purchasing/po_entry_items.php:85
 msgid "Purchase Order has been updated"
 msgstr ""
 
-#: /purchasing/po_entry_items.php:83
+#: /purchasing/po_entry_items.php:86
 msgid "&View this order"
 msgstr ""
 
-#: /purchasing/po_entry_items.php:85
-#: /sales/sales_order_entry.php:119
-#: /sales/sales_order_entry.php:139
+#: /purchasing/po_entry_items.php:88
+#: /sales/sales_order_entry.php:124
+#: /sales/sales_order_entry.php:144
 msgid "&Print This Order"
 msgstr ""
 
-#: /purchasing/po_entry_items.php:87
-#: /sales/sales_order_entry.php:120
-#: /sales/sales_order_entry.php:140
+#: /purchasing/po_entry_items.php:90
+#: /sales/sales_order_entry.php:125
+#: /sales/sales_order_entry.php:145
 msgid "&Email This Order"
 msgstr ""
 
-#: /purchasing/po_entry_items.php:89
+#: /purchasing/po_entry_items.php:92
 msgid "&Receive Items on this Purchase Order"
 msgstr ""
 
-#: /purchasing/po_entry_items.php:91
+#: /purchasing/po_entry_items.php:95
 msgid "Enter &Another Purchase Order"
 msgstr ""
 
-#: /purchasing/po_entry_items.php:93
+#: /purchasing/po_entry_items.php:97
 msgid "Select An &Outstanding Purchase Order"
 msgstr ""
 
-#: /purchasing/po_entry_items.php:102
+#: /purchasing/po_entry_items.php:106
 msgid "Direct GRN has been entered"
 msgstr ""
 
-#: /purchasing/po_entry_items.php:104
+#: /purchasing/po_entry_items.php:108
 msgid "&View this GRN"
 msgstr ""
 
-#: /purchasing/po_entry_items.php:108
+#: /purchasing/po_entry_items.php:112
 #: /purchasing/po_receive_items.php:40
 msgid "View the GL Journal Entries for this Delivery"
 msgstr ""
 
-#: /purchasing/po_entry_items.php:113
+#: /purchasing/po_entry_items.php:115
 #: /purchasing/po_receive_items.php:42
 msgid "Entry purchase &invoice for this receival"
 msgstr ""
 
-#: /purchasing/po_entry_items.php:118
+#: /purchasing/po_entry_items.php:120
 msgid "Enter &Another GRN"
 msgstr ""
 
-#: /purchasing/po_entry_items.php:127
+#: /purchasing/po_entry_items.php:129
 msgid "Direct Purchase Invoice has been entered"
 msgstr ""
 
-#: /purchasing/po_entry_items.php:129
+#: /purchasing/po_entry_items.php:131
 msgid "&View this Invoice"
 msgstr ""
 
-#: /purchasing/po_entry_items.php:134
+#: /purchasing/po_entry_items.php:133
 #: /purchasing/supplier_invoice.php:69
 msgid "View the GL Journal Entries for this Invoice"
 msgstr ""
 
-#: /purchasing/po_entry_items.php:139
+#: /purchasing/po_entry_items.php:135
+#: /purchasing/supplier_invoice.php:71
+msgid "Entry supplier &payment for this invoice"
+msgstr ""
+
+#: /purchasing/po_entry_items.php:141
 msgid "Enter &Another Direct Invoice"
 msgstr ""
 
-#: /purchasing/po_entry_items.php:171
+#: /purchasing/po_entry_items.php:147
+msgid "There are no purchasable fixed assets defined in the system."
+msgstr ""
+
+#: /purchasing/po_entry_items.php:178
 msgid ""
 "This item cannot be deleted because some of it has already been received."
 msgstr ""
 
-#: /purchasing/po_entry_items.php:186
+#: /purchasing/po_entry_items.php:193
 msgid ""
 "This order cannot be cancelled because some of it has already been received."
 msgstr ""
 
-#: /purchasing/po_entry_items.php:187
+#: /purchasing/po_entry_items.php:194
 msgid ""
 "The line item quantities may be modified to quantities more than already "
 "received. prices cannot be altered for lines that have already been received "
 "and quantities cannot be reduced below the quantity already received."
 msgstr ""
 
-#: /purchasing/po_entry_items.php:202
+#: /purchasing/po_entry_items.php:214
 msgid "This purchase order has been cancelled."
 msgstr ""
 
-#: /purchasing/po_entry_items.php:204
+#: /purchasing/po_entry_items.php:216
 msgid "Enter a new purchase order"
 msgstr ""
 
-#: /purchasing/po_entry_items.php:216
-#: /sales/sales_order_entry.php:509
+#: /purchasing/po_entry_items.php:228
+#: /sales/sales_order_entry.php:514
 msgid "Item description cannot be empty."
 msgstr ""
 
-#: /purchasing/po_entry_items.php:226
+#: /purchasing/po_entry_items.php:238
 msgid "The quantity of the order item must be numeric and not less than "
 msgstr ""
 
-#: /purchasing/po_entry_items.php:233
+#: /purchasing/po_entry_items.php:245
 msgid "The price entered must be numeric and not less than zero."
 msgstr ""
 
-#: /purchasing/po_entry_items.php:257
+#: /purchasing/po_entry_items.php:269
 msgid ""
 "You are attempting to make the quantity ordered a quantity less than has "
 "already been invoiced or received.  This is prohibited."
 msgstr ""
 
-#: /purchasing/po_entry_items.php:258
+#: /purchasing/po_entry_items.php:270
 msgid ""
 "The quantity received can only be modified by entering a negative receipt "
 "and the quantity invoiced can only be reduced by entering a credit note "
 "against this item."
 msgstr ""
 
-#: /purchasing/po_entry_items.php:286
+#: /purchasing/po_entry_items.php:298
 msgid "The selected item is already on this order."
 msgstr ""
 
-#: /purchasing/po_entry_items.php:313
+#: /purchasing/po_entry_items.php:324
 msgid ""
 "The selected item does not exist or it is a kit part and therefore cannot be "
 "purchased."
 msgstr ""
 
-#: /purchasing/po_entry_items.php:329
-#: /purchasing/supplier_invoice.php:374
+#: /purchasing/po_entry_items.php:338
+#: /purchasing/supplier_invoice.php:382
 #: /purchasing/supplier_payment.php:123
 msgid "There is no supplier selected."
 msgstr ""
 
-#: /purchasing/po_entry_items.php:336
+#: /purchasing/po_entry_items.php:345
 msgid "The entered order date is invalid."
 msgstr ""
 
-#: /purchasing/po_entry_items.php:349
+#: /purchasing/po_entry_items.php:358
 msgid "The entered due date is invalid."
 msgstr ""
 
-#: /purchasing/po_entry_items.php:365
+#: /purchasing/po_entry_items.php:374
+#: /purchasing/supplier_credit.php:199
+#: /purchasing/supplier_invoice.php:208
 msgid "You must enter a supplier's invoice reference."
 msgstr ""
 
-#: /purchasing/po_entry_items.php:372
-#: /purchasing/supplier_invoice.php:208
+#: /purchasing/po_entry_items.php:381
+#: /purchasing/supplier_credit.php:206
+#: /purchasing/supplier_invoice.php:215
 msgid ""
 "This invoice number has already been entered. It cannot be entered again."
 msgstr ""
 
-#: /purchasing/po_entry_items.php:378
+#: /purchasing/po_entry_items.php:387
 msgid "There is no delivery address specified."
 msgstr ""
 
-#: /purchasing/po_entry_items.php:384
+#: /purchasing/po_entry_items.php:393
 msgid "There is no location specified to move any items into."
 msgstr ""
 
-#: /purchasing/po_entry_items.php:392
+#: /purchasing/po_entry_items.php:401
 msgid ""
 "The order cannot be placed because there are no lines entered on this order."
 msgstr ""
 
-#: /purchasing/po_entry_items.php:397
+#: /purchasing/po_entry_items.php:406
 msgid "Required prepayment is greater than total invoice value."
 msgstr ""
 
-#: /purchasing/po_entry_items.php:482
-#: /sales/sales_order_entry.php:720
+#: /purchasing/po_entry_items.php:491
+#: /sales/sales_order_entry.php:727
 msgid "Place Order"
 msgstr ""
 
-#: /purchasing/po_entry_items.php:483
+#: /purchasing/po_entry_items.php:492
 msgid "Update Order"
 msgstr ""
 
-#: /purchasing/po_entry_items.php:484
-#: /sales/sales_order_entry.php:719
+#: /purchasing/po_entry_items.php:493
+#: /sales/sales_order_entry.php:726
 msgid "Cancel Order"
 msgstr ""
 
-#: /purchasing/po_entry_items.php:486
+#: /purchasing/po_entry_items.php:495
 msgid "Process GRN"
 msgstr ""
 
-#: /purchasing/po_entry_items.php:487
+#: /purchasing/po_entry_items.php:496
 msgid "Update GRN"
 msgstr ""
 
-#: /purchasing/po_entry_items.php:488
+#: /purchasing/po_entry_items.php:497
 msgid "Cancel GRN"
 msgstr ""
 
-#: /purchasing/po_entry_items.php:491
-#: /sales/customer_invoice.php:694
+#: /purchasing/po_entry_items.php:500
+#: /sales/customer_invoice.php:664
 msgid "Process Invoice"
 msgstr ""
 
-#: /purchasing/po_entry_items.php:492
+#: /purchasing/po_entry_items.php:501
 msgid "Update Invoice"
 msgstr ""
 
-#: /purchasing/po_entry_items.php:493
-#: /sales/sales_order_entry.php:700
+#: /purchasing/po_entry_items.php:502
+#: /sales/sales_order_entry.php:707
 msgid "Cancel Invoice"
 msgstr ""
 
@@ -11361,21 +12024,21 @@ msgstr ""
 
 #: /purchasing/po_receive_items.php:62
 #: /reporting/rep105.php:114
-#: /sales/customer_delivery.php:423
+#: /sales/customer_delivery.php:420
 msgid "Ordered"
 msgstr ""
 
 #: /purchasing/po_receive_items.php:63
-#: /reporting/rep101.php:134
+#: /reporting/rep101.php:133
 #: /reporting/rep105.php:115
 #: /reporting/rep105.php:166
-#: /reporting/rep201.php:111
+#: /reporting/rep201.php:108
 #: /reporting/includes/doctext.inc:246
 msgid "Outstanding"
 msgstr ""
 
 #: /purchasing/po_receive_items.php:63
-#: /sales/customer_delivery.php:424
+#: /sales/customer_delivery.php:421
 msgid "This Delivery"
 msgstr ""
 
@@ -11421,70 +12084,70 @@ msgstr ""
 msgid "Process Receive Items"
 msgstr ""
 
-#: /purchasing/supplier_credit.php:77
+#: /purchasing/supplier_credit.php:76
 msgid "Supplier credit note has been processed."
 msgstr ""
 
-#: /purchasing/supplier_credit.php:78
+#: /purchasing/supplier_credit.php:77
 msgid "View this Credit Note"
 msgstr ""
 
-#: /purchasing/supplier_credit.php:80
+#: /purchasing/supplier_credit.php:79
 msgid "View the GL Journal Entries for this Credit Note"
 msgstr ""
 
-#: /purchasing/supplier_credit.php:82
+#: /purchasing/supplier_credit.php:81
 msgid "Enter Another Credit Note"
 msgstr ""
 
-#: /purchasing/supplier_credit.php:127
+#: /purchasing/supplier_credit.php:126
 #: /purchasing/supplier_invoice.php:137
 msgid ""
 "The account code entered is not a valid code, this line cannot be added to "
 "the transaction."
 msgstr ""
 
-#: /purchasing/supplier_credit.php:137
+#: /purchasing/supplier_credit.php:136
 #: /purchasing/supplier_invoice.php:147
 msgid ""
 "The amount entered is not numeric. This line cannot be added to the "
 "transaction."
 msgstr ""
 
-#: /purchasing/supplier_credit.php:168
+#: /purchasing/supplier_credit.php:167
 msgid ""
 "The credit note cannot be processed because the there are no items or values "
 "on the invoice.  Credit notes are expected to have a charge."
 msgstr ""
 
-#: /purchasing/supplier_credit.php:181
+#: /purchasing/supplier_credit.php:180
 msgid ""
 "The credit note as entered cannot be processed because the date entered is "
 "not valid."
 msgstr ""
 
-#: /purchasing/supplier_credit.php:193
+#: /purchasing/supplier_credit.php:192
 #: /purchasing/supplier_invoice.php:201
 msgid ""
 "The invoice as entered cannot be processed because the due date is in an "
 "incorrect format."
 msgstr ""
 
-#: /purchasing/supplier_credit.php:205
+#: /purchasing/supplier_credit.php:218
 msgid ""
 "The return cannot be processed because there is an insufficient quantity for "
 "item:"
 msgstr ""
 
-#: /purchasing/supplier_credit.php:249
+#: /purchasing/supplier_credit.php:262
 msgid "The quantity to credit must be numeric and greater than zero."
 msgstr ""
 
-#: /purchasing/supplier_credit.php:256
+#: /purchasing/supplier_credit.php:269
 msgid "The price is either not numeric or negative."
 msgstr ""
 
-#: /purchasing/supplier_credit.php:359
+#: /purchasing/supplier_credit.php:372
 msgid "Enter Credit Note"
 msgstr ""
 
@@ -11505,10 +12168,6 @@ msgstr ""
 msgid "View this Invoice"
 msgstr ""
 
-#: /purchasing/supplier_invoice.php:71
-msgid "Entry supplier &payment for this invoice"
-msgstr ""
-
 #: /purchasing/supplier_invoice.php:74
 msgid "Enter Another Invoice"
 msgstr ""
@@ -11525,27 +12184,27 @@ msgid ""
 "incorrect format."
 msgstr ""
 
-#: /purchasing/supplier_invoice.php:245
+#: /purchasing/supplier_invoice.php:253
 msgid "The quantity to invoice must be numeric and greater than zero."
 msgstr ""
 
-#: /purchasing/supplier_invoice.php:252
+#: /purchasing/supplier_invoice.php:260
 msgid "The price is not numeric."
 msgstr ""
 
-#: /purchasing/supplier_invoice.php:265
+#: /purchasing/supplier_invoice.php:273
 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:266
-#: /purchasing/supplier_invoice.php:279
+#: /purchasing/supplier_invoice.php:274
+#: /purchasing/supplier_invoice.php:287
 msgid "The over-charge percentage allowance is :"
 msgstr ""
 
-#: /purchasing/supplier_invoice.php:278
+#: /purchasing/supplier_invoice.php:286
 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 "
@@ -11553,12 +12212,12 @@ msgid ""
 "necessary."
 msgstr ""
 
-#: /purchasing/supplier_invoice.php:356
+#: /purchasing/supplier_invoice.php:364
 #, php-format
 msgid "All yet non-invoiced items on delivery line # %d has been removed."
 msgstr ""
 
-#: /purchasing/supplier_invoice.php:398
+#: /purchasing/supplier_invoice.php:406
 msgid "Enter Invoice"
 msgstr ""
 
@@ -11645,7 +12304,7 @@ msgid "Bank Amount:"
 msgstr ""
 
 #: /purchasing/supplier_payment.php:317
-#: /sales/customer_payments.php:382
+#: /sales/customer_payments.php:374
 msgid "Amount of Discount:"
 msgstr ""
 
@@ -11684,8 +12343,8 @@ msgstr ""
 #: /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:136
-#: /sales/view/view_sales_order.php:252
+#: /sales/view/view_credit.php:135
+#: /sales/view/view_sales_order.php:253
 msgid "Sub Total"
 msgstr ""
 
@@ -11707,11 +12366,11 @@ msgstr ""
 
 #: /purchasing/view/view_po.php:100
 #: /purchasing/inquiry/supplier_allocation_inquiry.php:158
-#: /purchasing/inquiry/supplier_inquiry.php:197
+#: /purchasing/inquiry/supplier_inquiry.php:201
 #: /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:309
+#: /sales/inquiry/sales_orders_view.php:308
 msgid "Marked items are overdue."
 msgstr ""
 
@@ -11741,7 +12400,7 @@ msgstr ""
 #: /purchasing/view/view_supp_credit.php:47
 #: /purchasing/view/view_supp_invoice.php:51
 #: /reporting/includes/doctext.inc:140
-#: /sales/customer_credit_invoice.php:270
+#: /sales/customer_credit_invoice.php:263
 #: /sales/view/view_invoice.php:100
 msgid "Invoice Date"
 msgstr ""
@@ -11751,7 +12410,7 @@ msgid "TOTAL CREDIT NOTE"
 msgstr ""
 
 #: /purchasing/view/view_supp_credit.php:71
-#: /sales/view/view_credit.php:147
+#: /sales/view/view_credit.php:150
 msgid "This credit note has been voided."
 msgstr ""
 
@@ -11764,14 +12423,14 @@ msgid "SUPPLIER INVOICE"
 msgstr ""
 
 #: /purchasing/view/view_supp_invoice.php:73
-#: /reporting/rep107.php:283
-#: /reporting/rep107.php:289
-#: /sales/view/view_invoice.php:166
+#: /reporting/rep107.php:285
+#: /reporting/rep107.php:291
+#: /sales/view/view_invoice.php:168
 msgid "TOTAL INVOICE"
 msgstr ""
 
 #: /purchasing/view/view_supp_invoice.php:77
-#: /sales/view/view_invoice.php:170
+#: /sales/view/view_invoice.php:172
 msgid "This invoice has been voided."
 msgstr ""
 
@@ -11792,11 +12451,11 @@ msgid "Payment Currency"
 msgstr ""
 
 #: /purchasing/view/view_supp_payment.php:62
-#: /reporting/rep112.php:153
-#: /reporting/rep210.php:162
-#: /sales/customer_delivery.php:424
-#: /sales/customer_invoice.php:549
-#: /sales/customer_invoice.php:552
+#: /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"
@@ -11807,161 +12466,161 @@ msgid "Supplier's Currency"
 msgstr ""
 
 #: /purchasing/manage/suppliers.php:27
-#: /sales/manage/customer_branches.php:33
+#: /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:89
+#: /purchasing/manage/suppliers.php:90
 msgid "Basic Data"
 msgstr ""
 
-#: /purchasing/manage/suppliers.php:91
+#: /purchasing/manage/suppliers.php:92
 msgid "Supplier Name:"
 msgstr ""
 
-#: /purchasing/manage/suppliers.php:92
+#: /purchasing/manage/suppliers.php:93
 msgid "Supplier Short Name:"
 msgstr ""
 
-#: /purchasing/manage/suppliers.php:95
+#: /purchasing/manage/suppliers.php:96
 msgid "Website:"
 msgstr ""
 
-#: /purchasing/manage/suppliers.php:107
+#: /purchasing/manage/suppliers.php:108
 msgid "Our Customer No:"
 msgstr ""
 
-#: /purchasing/manage/suppliers.php:109
+#: /purchasing/manage/suppliers.php:110
 msgid "Purchasing"
 msgstr ""
 
-#: /purchasing/manage/suppliers.php:110
+#: /purchasing/manage/suppliers.php:111
 msgid "Bank Name/Account:"
 msgstr ""
 
-#: /purchasing/manage/suppliers.php:111
+#: /purchasing/manage/suppliers.php:112
 #: /sales/manage/customers.php:269
 msgid "Credit Limit:"
 msgstr ""
 
-#: /purchasing/manage/suppliers.php:112
+#: /purchasing/manage/suppliers.php:113
 #: /sales/manage/customers.php:271
 msgid "Payment Terms:"
 msgstr ""
 
-#: /purchasing/manage/suppliers.php:118
-#: /purchasing/manage/suppliers.php:121
+#: /purchasing/manage/suppliers.php:119
+#: /purchasing/manage/suppliers.php:122
 msgid "Prices contain tax included:"
 msgstr ""
 
-#: /purchasing/manage/suppliers.php:126
-#: /reporting/rep704.php:96
-#: /reporting/rep704.php:106
-#: /reporting/rep704.php:114
+#: /purchasing/manage/suppliers.php:127
+#: /reporting/rep704.php:95
+#: /reporting/rep704.php:105
+#: /reporting/rep704.php:113
 msgid "Accounts"
 msgstr ""
 
-#: /purchasing/manage/suppliers.php:127
+#: /purchasing/manage/suppliers.php:128
 msgid "Accounts Payable Account:"
 msgstr ""
 
-#: /purchasing/manage/suppliers.php:128
+#: /purchasing/manage/suppliers.php:129
 msgid "Purchase Account:"
 msgstr ""
 
-#: /purchasing/manage/suppliers.php:129
+#: /purchasing/manage/suppliers.php:130
 msgid "Use Item Inventory/COGS Account"
 msgstr ""
 
-#: /purchasing/manage/suppliers.php:132
-#: /purchasing/manage/suppliers.php:136
+#: /purchasing/manage/suppliers.php:133
+#: /purchasing/manage/suppliers.php:137
 msgid "Contact Data"
 msgstr ""
 
-#: /purchasing/manage/suppliers.php:139
+#: /purchasing/manage/suppliers.php:140
 msgid "System default"
 msgstr ""
 
-#: /purchasing/manage/suppliers.php:158
-#: /sales/manage/customer_branches.php:255
+#: /purchasing/manage/suppliers.php:159
+#: /sales/manage/customer_branches.php:259
 msgid "Addresses"
 msgstr ""
 
-#: /purchasing/manage/suppliers.php:159
-#: /reporting/rep205.php:102
-#: /sales/manage/customer_branches.php:256
+#: /purchasing/manage/suppliers.php:160
+#: /reporting/rep205.php:93
+#: /sales/manage/customer_branches.php:260
 msgid "Mailing Address:"
 msgstr ""
 
-#: /purchasing/manage/suppliers.php:160
+#: /purchasing/manage/suppliers.php:161
 msgid "Physical Address:"
 msgstr ""
 
-#: /purchasing/manage/suppliers.php:162
+#: /purchasing/manage/suppliers.php:163
 msgid "General"
 msgstr ""
 
-#: /purchasing/manage/suppliers.php:163
-#: /reporting/rep205.php:179
-#: /sales/manage/customer_branches.php:258
+#: /purchasing/manage/suppliers.php:164
+#: /reporting/rep205.php:170
+#: /sales/manage/customer_branches.php:262
 #: /sales/manage/customers.php:292
 msgid "General Notes:"
 msgstr ""
 
-#: /purchasing/manage/suppliers.php:165
+#: /purchasing/manage/suppliers.php:166
 msgid "Supplier status:"
 msgstr ""
 
-#: /purchasing/manage/suppliers.php:171
+#: /purchasing/manage/suppliers.php:172
 msgid "Update Supplier"
 msgstr ""
 
-#: /purchasing/manage/suppliers.php:172
+#: /purchasing/manage/suppliers.php:173
 msgid "Update supplier data"
 msgstr ""
 
-#: /purchasing/manage/suppliers.php:173
+#: /purchasing/manage/suppliers.php:174
 msgid "Select this supplier and return to document entry."
 msgstr ""
 
-#: /purchasing/manage/suppliers.php:174
+#: /purchasing/manage/suppliers.php:175
 msgid "Delete Supplier"
 msgstr ""
 
-#: /purchasing/manage/suppliers.php:175
+#: /purchasing/manage/suppliers.php:176
 msgid "Delete supplier data if have been never used"
 msgstr ""
 
-#: /purchasing/manage/suppliers.php:179
+#: /purchasing/manage/suppliers.php:180
 msgid "Add New Supplier Details"
 msgstr ""
 
-#: /purchasing/manage/suppliers.php:198
+#: /purchasing/manage/suppliers.php:199
 msgid "The supplier name must be entered."
 msgstr ""
 
-#: /purchasing/manage/suppliers.php:205
+#: /purchasing/manage/suppliers.php:206
 msgid "The supplier short name must be entered."
 msgstr ""
 
-#: /purchasing/manage/suppliers.php:225
+#: /purchasing/manage/suppliers.php:226
 msgid "Supplier has been updated."
 msgstr ""
 
-#: /purchasing/manage/suppliers.php:243
+#: /purchasing/manage/suppliers.php:244
 msgid "A new supplier has been added."
 msgstr ""
 
-#: /purchasing/manage/suppliers.php:261
+#: /purchasing/manage/suppliers.php:262
 msgid ""
 "Cannot delete this supplier because there are transactions that refer to "
 "this supplier."
 msgstr ""
 
-#: /purchasing/manage/suppliers.php:269
+#: /purchasing/manage/suppliers.php:270
 msgid ""
 "Cannot delete the supplier record because purchase orders have been created "
 "against this supplier."
@@ -11979,7 +12638,7 @@ msgid "New supplier"
 msgstr ""
 
 #: /purchasing/manage/suppliers.php:310
-#: /sales/manage/customer_branches.php:307
+#: /sales/manage/customer_branches.php:311
 #: /sales/manage/customers.php:351
 msgid "&Contacts"
 msgstr ""
@@ -12044,8 +12703,8 @@ msgid "Supp Reference"
 msgstr ""
 
 #: /purchasing/inquiry/supplier_allocation_inquiry.php:146
-#: /reporting/rep101.php:134
-#: /reporting/rep201.php:111
+#: /reporting/rep101.php:133
+#: /reporting/rep201.php:108
 #: /reporting/includes/doctext.inc:246
 #: /sales/inquiry/customer_allocation_inquiry.php:156
 msgid "Allocated"
@@ -12055,63 +12714,39 @@ msgstr ""
 msgid "Supplier Inquiry"
 msgstr ""
 
-#: /purchasing/inquiry/supplier_inquiry.php:48
+#: /purchasing/inquiry/supplier_inquiry.php:49
 msgid "Select a supplier:"
 msgstr ""
 
-#: /purchasing/inquiry/supplier_inquiry.php:67
-#: /purchasing/inquiry/supplier_inquiry.php:68
-#: /purchasing/inquiry/supplier_inquiry.php:69
-#: /reporting/rep102.php:125
-#: /reporting/rep102.php:126
-#: /reporting/rep102.php:127
-#: /reporting/rep102.php:250
-#: /reporting/rep108.php:154
-#: /reporting/rep108.php:155
-#: /reporting/rep108.php:156
+#: /purchasing/inquiry/supplier_inquiry.php:70
+#: /reporting/rep102.php:118
+#: /reporting/rep108.php:152
 #: /reporting/rep202.php:124
-#: /reporting/rep202.php:125
-#: /reporting/rep202.php:126
 #: /reporting/rep202.php:158
-#: /reporting/rep202.php:159
-#: /reporting/rep202.php:160
-#: /reporting/rep202.php:251
-#: /sales/create_recurrent_invoices.php:203
-#: /sales/manage/recurrent_invoices.php:128
-#: /sales/inquiry/customer_inquiry.php:71
-#: /sales/inquiry/customer_inquiry.php:72
-#: /sales/inquiry/customer_inquiry.php:73
-msgid "Days"
-msgstr ""
-
-#: /purchasing/inquiry/supplier_inquiry.php:69
-#: /reporting/rep102.php:127
-#: /reporting/rep108.php:156
-#: /reporting/rep202.php:126
-#: /reporting/rep202.php:160
 #: /sales/inquiry/customer_inquiry.php:73
 msgid "Over"
 msgstr ""
 
-#: /purchasing/inquiry/supplier_inquiry.php:73
+#: /purchasing/inquiry/supplier_inquiry.php:74
 #: /sales/inquiry/customer_inquiry.php:76
 msgid "Terms"
 msgstr ""
 
-#: /purchasing/inquiry/supplier_inquiry.php:73
-#: /reporting/rep102.php:130
-#: /reporting/rep102.php:248
-#: /reporting/rep108.php:158
-#: /reporting/rep202.php:130
-#: /reporting/rep202.php:249
+#: /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
 msgid "Current"
 msgstr ""
 
-#: /purchasing/inquiry/supplier_inquiry.php:74
-#: /reporting/rep102.php:131
-#: /reporting/rep108.php:158
-#: /reporting/rep202.php:131
+#: /purchasing/inquiry/supplier_inquiry.php:75
+#: /reporting/rep102.php:122
+#: /reporting/rep108.php:154
+#: /reporting/rep202.php:129
 #: /sales/inquiry/customer_inquiry.php:77
 msgid "Total Balance"
 msgstr ""
@@ -12125,6 +12760,11 @@ msgstr ""
 msgid "Print Remittance"
 msgstr ""
 
+#: /purchasing/inquiry/suppliers_list.php:53
+#: /sales/inquiry/customers_list.php:54
+msgid "Tax ID"
+msgstr ""
+
 #: /purchasing/allocations/supplier_allocate.php:29
 msgid "Allocate Supplier Payment or Credit Note"
 msgstr ""
@@ -12186,26 +12826,26 @@ msgid "Show Settled Items:"
 msgstr ""
 
 #: /purchasing/allocations/supplier_allocation_main.php:70
-#: /sales/allocations/customer_allocation_main.php:74
+#: /sales/allocations/customer_allocation_main.php:68
 msgid "Allocate"
 msgstr ""
 
 #: /purchasing/allocations/supplier_allocation_main.php:111
-#: /sales/allocations/customer_allocation_main.php:110
+#: /sales/allocations/customer_allocation_main.php:104
 msgid "Marked items are settled."
 msgstr ""
 
-#: /reporting/rep101.php:123
-#: /reporting/rep102.php:113
+#: /reporting/rep101.php:122
+#: /reporting/rep102.php:104
 #: /reporting/rep114.php:108
-#: /reporting/rep202.php:112
-#: /reporting/rep203.php:83
+#: /reporting/rep202.php:110
+#: /reporting/rep203.php:78
 msgid "Balances in Home Currency"
 msgstr ""
 
-#: /reporting/rep101.php:133
-#: /reporting/rep201.php:110
-#: /reporting/rep203.php:93
+#: /reporting/rep101.php:132
+#: /reporting/rep201.php:107
+#: /reporting/rep203.php:88
 #: /reporting/rep709.php:116
 #: /reporting/includes/doctext.inc:166
 #: /reporting/includes/doctext.inc:207
@@ -12213,232 +12853,237 @@ msgstr ""
 msgid "Trans Type"
 msgstr ""
 
-#: /reporting/rep101.php:133
-#: /reporting/rep201.php:110
+#: /reporting/rep101.php:132
+#: /reporting/rep201.php:107
 #: /reporting/includes/doctext.inc:245
 msgid "Charges"
 msgstr ""
 
-#: /reporting/rep101.php:133
-#: /reporting/rep201.php:111
+#: /reporting/rep101.php:132
+#: /reporting/rep201.php:108
 #: /reporting/includes/doctext.inc:246
 msgid "Credits"
 msgstr ""
 
-#: /reporting/rep101.php:144
-#: /reporting/rep102.php:141
-#: /reporting/rep201.php:121
-#: /reporting/rep202.php:141
-#: /reporting/rep203.php:102
-#: /reporting/rep303.php:136
-#: /reporting/reports_main.php:39
-#: /reporting/reports_main.php:49
-#: /reporting/reports_main.php:156
-#: /reporting/reports_main.php:166
-#: /reporting/reports_main.php:175
-#: /reporting/reports_main.php:227
+#: /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/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
 msgid "Suppress Zeros"
 msgstr ""
 
-#: /reporting/rep101.php:146
+#: /reporting/rep101.php:145
 msgid "Customer Balances"
 msgstr ""
 
-#: /reporting/rep101.php:256
-#: /reporting/rep102.php:235
+#: /reporting/rep101.php:255
+#: /reporting/rep102.php:226
 #: /reporting/rep106.php:181
-#: /reporting/rep201.php:234
-#: /reporting/rep202.php:235
-#: /reporting/rep203.php:181
+#: /reporting/rep201.php:231
+#: /reporting/rep202.php:233
+#: /reporting/rep203.php:176
 #: /reporting/rep204.php:148
-#: /reporting/rep301.php:254
-#: /reporting/rep304.php:211
-#: /reporting/rep305.php:188
+#: /reporting/rep301.php:257
+#: /reporting/rep304.php:212
+#: /reporting/rep305.php:193
 #: /reporting/rep306.php:293
-#: /reporting/rep309.php:158
+#: /reporting/rep309.php:157
+#: /reporting/rep451.php:150
 msgid "Grand Total"
 msgstr ""
 
-#: /reporting/rep102.php:107
+#: /reporting/rep102.php:98
 #: /reporting/rep106.php:99
-#: /reporting/rep202.php:106
+#: /reporting/rep202.php:104
 #: /reporting/rep709.php:100
-#: /reporting/reports_main.php:48
-#: /reporting/reports_main.php:91
-#: /reporting/reports_main.php:165
-#: /reporting/reports_main.php:211
-#: /reporting/reports_main.php:498
+#: /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
 msgid "Summary Only"
 msgstr ""
 
-#: /reporting/rep102.php:109
-#: /reporting/rep202.php:108
+#: /reporting/rep102.php:100
+#: /reporting/rep202.php:106
 #: /reporting/rep709.php:102
 msgid "Detailed Report"
 msgstr ""
 
-#: /reporting/rep102.php:136
-#: /reporting/rep202.php:136
-#: /reporting/rep203.php:99
-#: /reporting/rep301.php:174
-#: /reporting/reports_main.php:35
-#: /reporting/reports_main.php:44
-#: /reporting/reports_main.php:65
-#: /reporting/reports_main.php:81
-#: /reporting/reports_main.php:90
-#: /reporting/reports_main.php:152
-#: /reporting/reports_main.php:161
-#: /reporting/reports_main.php:172
-#: /reporting/reports_main.php:208
-#: /reporting/reports_main.php:234
-#: /reporting/reports_main.php:244
-#: /reporting/reports_main.php:250
-#: /reporting/reports_main.php:260
-#: /reporting/reports_main.php:268
-#: /reporting/reports_main.php:276
-#: /reporting/reports_main.php:320
-#: /reporting/reports_main.php:328
-#: /reporting/reports_main.php:340
-#: /reporting/reports_main.php:352
-#: /reporting/reports_main.php:370
+#: /reporting/rep102.php:127
+#: /reporting/rep202.php:134
+#: /reporting/rep203.php:94
+#: /reporting/rep301.php:177
+#: /reporting/rep451.php:75
+#: /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:393
-#: /reporting/reports_main.php:406
-#: /reporting/reports_main.php:422
-#: /reporting/reports_main.php:432
+#: /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:455
-#: /reporting/reports_main.php:469
-#: /reporting/reports_main.php:478
-#: /reporting/reports_main.php:488
-#: /reporting/reports_main.php:497
-#: /reporting/reports_main.php:504
+#: /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
 msgid "End Date"
 msgstr ""
 
-#: /reporting/rep102.php:140
-#: /reporting/rep202.php:140
-#: /reporting/reports_main.php:47
-#: /reporting/reports_main.php:123
-#: /reporting/reports_main.php:164
+#: /reporting/rep102.php:131
+#: /reporting/rep202.php:138
+#: /reporting/reports_main.php:49
+#: /reporting/reports_main.php:125
+#: /reporting/reports_main.php:166
 msgid "Show Also Allocated"
 msgstr ""
 
-#: /reporting/rep102.php:145
+#: /reporting/rep102.php:136
 msgid "Aged Customer Analysis"
 msgstr ""
 
-#: /reporting/rep103.php:133
+#: /reporting/rep103.php:131
 msgid "All Areas"
 msgstr ""
 
-#: /reporting/rep103.php:137
+#: /reporting/rep103.php:135
 msgid "All Sales Folk"
 msgstr ""
 
-#: /reporting/rep103.php:141
-#: /reporting/rep205.php:89
+#: /reporting/rep103.php:139
+#: /reporting/rep205.php:80
 msgid "Greater than "
 msgstr ""
 
-#: /reporting/rep103.php:145
-#: /reporting/rep205.php:93
+#: /reporting/rep103.php:143
+#: /reporting/rep205.php:84
 msgid "Less than "
 msgstr ""
 
-#: /reporting/rep103.php:154
+#: /reporting/rep103.php:152
 msgid "Customer Postal Address"
 msgstr ""
 
-#: /reporting/rep103.php:154
+#: /reporting/rep103.php:152
 msgid "Price/Turnover"
 msgstr ""
 
-#: /reporting/rep103.php:154
+#: /reporting/rep103.php:152
 msgid "Branch Contact Information"
 msgstr ""
 
-#: /reporting/rep103.php:155
+#: /reporting/rep103.php:153
 msgid "Branch Delivery Address"
 msgstr ""
 
-#: /reporting/rep103.php:160
-#: /reporting/rep205.php:108
-#: /reporting/reports_main.php:55
-#: /reporting/reports_main.php:185
+#: /reporting/rep103.php:158
+#: /reporting/rep205.php:99
+#: /reporting/reports_main.php:57
+#: /reporting/reports_main.php:187
 msgid "Activity Since"
 msgstr ""
 
-#: /reporting/rep103.php:161
-#: /reporting/reports_main.php:56
+#: /reporting/rep103.php:159
+#: /reporting/reports_main.php:58
 #: /sales/manage/sales_areas.php:16
 msgid "Sales Areas"
 msgstr ""
 
-#: /reporting/rep103.php:162
-#: /reporting/reports_main.php:57
+#: /reporting/rep103.php:160
+#: /reporting/reports_main.php:59
 msgid "Sales Folk"
 msgstr ""
 
-#: /reporting/rep103.php:163
-#: /reporting/rep205.php:109
+#: /reporting/rep103.php:161
+#: /reporting/rep205.php:100
 msgid "Activity"
 msgstr ""
 
-#: /reporting/rep103.php:165
+#: /reporting/rep103.php:163
 msgid "Customer Details Listing"
 msgstr ""
 
-#: /reporting/rep103.php:196
+#: /reporting/rep103.php:194
 msgid "Customers in"
 msgstr ""
 
-#: /reporting/rep103.php:217
+#: /reporting/rep103.php:215
 msgid "Price List"
 msgstr ""
 
-#: /reporting/rep103.php:245
-#: /reporting/rep205.php:164
+#: /reporting/rep103.php:243
+#: /reporting/rep205.php:155
 msgid "Ph"
 msgstr ""
 
-#: /reporting/rep103.php:260
+#: /reporting/rep103.php:258
 msgid "Gereral Notes:"
 msgstr ""
 
-#: /reporting/rep103.php:269
-#: /reporting/rep205.php:102
-#: /reporting/rep205.php:188
+#: /reporting/rep103.php:267
+#: /reporting/rep205.php:93
+#: /reporting/rep205.php:179
 msgid "Turnover"
 msgstr ""
 
-#: /reporting/rep104.php:111
+#: /reporting/rep104.php:109
 msgid "Category/Items"
 msgstr ""
 
-#: /reporting/rep104.php:111
-#: /reporting/rep301.php:169
-#: /reporting/rep303.php:121
-#: /reporting/rep303.php:127
-#: /reporting/rep307.php:117
+#: /reporting/rep104.php:109
+#: /reporting/rep301.php:172
+#: /reporting/rep303.php:120
+#: /reporting/rep303.php:126
+#: /reporting/rep307.php:114
 #: /reporting/rep308.php:242
+#: /reporting/rep451.php:70
 msgid "UOM"
 msgstr ""
 
-#: /reporting/rep104.php:111
+#: /reporting/rep104.php:109
 msgid "GP %"
 msgstr ""
 
-#: /reporting/rep104.php:119
-#: /reporting/reports_main.php:75
+#: /reporting/rep104.php:117
+#: /reporting/reports_main.php:77
 msgid "Show GP %"
 msgstr ""
 
-#: /reporting/rep104.php:126
+#: /reporting/rep104.php:124
 msgid "Price Listing"
 msgstr ""
 
-#: /reporting/rep104.php:195
+#: /reporting/rep104.php:193
 msgid "Sales Kits"
 msgstr ""
 
@@ -12447,7 +13092,7 @@ msgid "All Orders"
 msgstr ""
 
 #: /reporting/rep105.php:105
-#: /reporting/reports_main.php:84
+#: /reporting/reports_main.php:86
 msgid "Back Orders Only"
 msgstr ""
 
@@ -12458,24 +13103,6 @@ msgstr ""
 msgid "Order"
 msgstr ""
 
-#: /reporting/rep105.php:109
-#: /reporting/rep106.php:89
-#: /reporting/rep112.php:178
-#: /sales/create_recurrent_invoices.php:203
-#: /sales/customer_credit_invoice.php:235
-#: /sales/customer_delivery.php:327
-#: /sales/customer_invoice.php:450
-#: /sales/manage/customers.php:255
-#: /sales/manage/customers.php:295
-#: /sales/manage/recurrent_invoices.php:128
-#: /sales/view/view_credit.php:58
-#: /sales/inquiry/customer_inquiry.php:209
-#: /sales/inquiry/sales_deliveries_view.php:171
-#: /sales/inquiry/sales_orders_view.php:252
-#: /sales/inquiry/sales_orders_view.php:266
-msgid "Branch"
-msgstr ""
-
 #: /reporting/rep105.php:109
 #: /reporting/rep106.php:89
 msgid "Customer Ref"
@@ -12495,8 +13122,8 @@ msgid "Loc"
 msgstr ""
 
 #: /reporting/rep105.php:114
-#: /sales/customer_delivery.php:423
-#: /sales/customer_invoice.php:551
+#: /sales/customer_delivery.php:420
+#: /sales/customer_invoice.php:521
 #: /sales/includes/ui/sales_order_ui.inc:147
 msgid "Delivered"
 msgstr ""
@@ -12541,56 +13168,56 @@ msgstr ""
 msgid "INVOICE"
 msgstr ""
 
-#: /reporting/rep107.php:199
+#: /reporting/rep107.php:197
 msgid "Prepayments invoiced to this order up to day:"
 msgstr ""
 
-#: /reporting/rep107.php:206
+#: /reporting/rep107.php:204
 msgid "Invoice reference"
 msgstr ""
 
-#: /reporting/rep107.php:223
+#: /reporting/rep107.php:221
 msgid "Total payments:"
 msgstr ""
 
-#: /reporting/rep107.php:237
-#: /reporting/rep109.php:159
-#: /reporting/rep110.php:161
+#: /reporting/rep107.php:238
+#: /reporting/rep109.php:160
+#: /reporting/rep110.php:162
 #: /reporting/rep111.php:157
-#: /reporting/rep113.php:150
-#: /sales/view/view_credit.php:138
+#: /reporting/rep113.php:151
+#: /sales/view/view_credit.php:140
 #: /sales/view/view_dispatch.php:155
-#: /sales/view/view_invoice.php:159
-#: /sales/view/view_sales_order.php:245
-#: /sales/includes/ui/sales_credit_ui.inc:223
+#: /sales/view/view_invoice.php:160
+#: /sales/view/view_sales_order.php:246
+#: /sales/includes/ui/sales_credit_ui.inc:217
 msgid "Shipping"
 msgstr ""
 
-#: /reporting/rep107.php:283
-#: /reporting/rep109.php:211
+#: /reporting/rep107.php:285
+#: /reporting/rep109.php:212
 #: /reporting/rep111.php:209
 msgid "TOTAL ORDER VAT INCL."
 msgstr ""
 
-#: /reporting/rep107.php:289
+#: /reporting/rep107.php:291
 msgid "THIS INVOICE"
 msgstr ""
 
-#: /reporting/rep108.php:85
-#: /reporting/rep108.php:113
+#: /reporting/rep108.php:81
+#: /reporting/rep108.php:109
 #: /reporting/includes/doctext.inc:237
 msgid "STATEMENT"
 msgstr ""
 
-#: /reporting/rep108.php:130
+#: /reporting/rep108.php:126
 msgid "Outstanding Transactions"
 msgstr ""
 
-#: /reporting/rep108.php:173
+#: /reporting/rep108.php:169
 msgid "Statement"
 msgstr ""
 
-#: /reporting/rep108.php:173
+#: /reporting/rep108.php:169
 msgid "as of"
 msgstr ""
 
@@ -12608,27 +13235,27 @@ msgstr ""
 msgid "QUOTE"
 msgstr ""
 
-#: /reporting/rep109.php:165
+#: /reporting/rep109.php:166
 #: /reporting/rep111.php:163
 msgid "TOTAL ORDER EX VAT"
 msgstr ""
 
-#: /reporting/rep110.php:69
+#: /reporting/rep110.php:68
 msgid "DELIVERY"
 msgstr ""
 
-#: /reporting/rep110.php:71
-#: /reporting/rep110.php:92
+#: /reporting/rep110.php:70
+#: /reporting/rep110.php:91
 #: /reporting/includes/doctext.inc:81
 msgid "PACKING SLIP"
 msgstr ""
 
-#: /reporting/rep110.php:87
+#: /reporting/rep110.php:86
 #: /reporting/includes/doctext.inc:81
 msgid "DELIVERY NOTE"
 msgstr ""
 
-#: /reporting/rep110.php:205
+#: /reporting/rep110.php:207
 msgid "TOTAL DELIVERY INCL. VAT"
 msgstr ""
 
@@ -12637,33 +13264,33 @@ msgstr ""
 msgid "SALES QUOTATION"
 msgstr ""
 
-#: /reporting/rep112.php:83
+#: /reporting/rep112.php:85
 #: /reporting/includes/doctext.inc:197
 msgid "RECEIPT"
 msgstr ""
 
-#: /reporting/rep112.php:117
-#: /reporting/rep210.php:125
+#: /reporting/rep112.php:119
+#: /reporting/rep210.php:127
 msgid "As advance / full / part / payment towards:"
 msgstr ""
 
-#: /reporting/rep112.php:158
+#: /reporting/rep112.php:160
 msgid "TOTAL RECEIPT"
 msgstr ""
 
-#: /reporting/rep112.php:169
+#: /reporting/rep112.php:171
 msgid "Received / Sign"
 msgstr ""
 
-#: /reporting/rep112.php:171
+#: /reporting/rep112.php:173
 msgid "By Cash / Cheque* / Draft No."
 msgstr ""
 
-#: /reporting/rep112.php:173
+#: /reporting/rep112.php:175
 msgid "Dated"
 msgstr ""
 
-#: /reporting/rep112.php:176
+#: /reporting/rep112.php:178
 msgid "Drawn on Bank"
 msgstr ""
 
@@ -12673,8 +13300,8 @@ msgstr ""
 msgid "CREDIT NOTE"
 msgstr ""
 
-#: /reporting/rep113.php:194
-#: /sales/view/view_credit.php:143
+#: /reporting/rep113.php:196
+#: /sales/view/view_credit.php:146
 msgid "TOTAL CREDIT"
 msgstr ""
 
@@ -12683,7 +13310,7 @@ msgid "Sales Summary Report"
 msgstr ""
 
 #: /reporting/rep114.php:91
-#: /reporting/reports_main.php:66
+#: /reporting/reports_main.php:68
 msgid "Tax Id Only"
 msgstr ""
 
@@ -12701,23 +13328,23 @@ msgstr ""
 msgid "Tax"
 msgstr ""
 
-#: /reporting/rep201.php:100
+#: /reporting/rep201.php:97
 msgid "Balances in Home currency"
 msgstr ""
 
-#: /reporting/rep201.php:123
+#: /reporting/rep201.php:120
 msgid "Supplier Balances"
 msgstr ""
 
-#: /reporting/rep202.php:144
+#: /reporting/rep202.php:142
 msgid "currency"
 msgstr ""
 
-#: /reporting/rep202.php:145
+#: /reporting/rep202.php:143
 msgid "Aged Supplier Analysis"
 msgstr ""
 
-#: /reporting/rep203.php:104
+#: /reporting/rep203.php:99
 msgid "Payment Report"
 msgstr ""
 
@@ -12737,141 +13364,130 @@ msgstr ""
 msgid "Outstanding GRNs Report"
 msgstr ""
 
-#: /reporting/rep205.php:102
+#: /reporting/rep205.php:93
 msgid "Contact Information"
 msgstr ""
 
-#: /reporting/rep205.php:103
+#: /reporting/rep205.php:94
 msgid "Physical Address"
 msgstr ""
 
-#: /reporting/rep205.php:111
+#: /reporting/rep205.php:102
 msgid "Supplier Details Listing"
 msgstr ""
 
-#: /reporting/rep205.php:139
+#: /reporting/rep205.php:130
 msgid "Tax_Id"
 msgstr ""
 
-#: /reporting/rep209.php:87
-#: /reporting/rep209.php:103
+#: /reporting/rep209.php:88
+#: /reporting/rep209.php:104
 #: /reporting/includes/doctext.inc:170
 msgid "PURCHASE ORDER"
 msgstr ""
 
-#: /reporting/rep209.php:212
+#: /reporting/rep209.php:213
 msgid "TOTAL PO"
 msgstr ""
 
-#: /reporting/rep210.php:84
-#: /reporting/rep210.php:109
+#: /reporting/rep210.php:86
+#: /reporting/rep210.php:111
 #: /reporting/includes/doctext.inc:150
 msgid "REMITTANCE"
 msgstr ""
 
-#: /reporting/rep210.php:168
+#: /reporting/rep210.php:170
 msgid "TOTAL REMITTANCE"
 msgstr ""
 
-#: /reporting/rep301.php:178
+#: /reporting/rep301.php:181
 msgid "Inventory Valuation Report"
 msgstr ""
 
-#: /reporting/rep302.php:124
+#: /reporting/rep302.php:123
 msgid "QOH"
 msgstr ""
 
-#: /reporting/rep302.php:124
+#: /reporting/rep302.php:123
 msgid "Cust Ord"
 msgstr ""
 
-#: /reporting/rep302.php:124
+#: /reporting/rep302.php:123
 msgid "Supp Ord"
 msgstr ""
 
-#: /reporting/rep302.php:124
+#: /reporting/rep302.php:123
 msgid "Sugg Ord"
 msgstr ""
 
-#: /reporting/rep302.php:133
+#: /reporting/rep302.php:132
 msgid "Inventory Planning Report"
 msgstr ""
 
-#: /reporting/rep303.php:109
+#: /reporting/rep303.php:108
 msgid "Shortage"
 msgstr ""
 
-#: /reporting/rep303.php:121
-#: /reporting/rep303.php:127
-#: /reporting/rep305.php:101
+#: /reporting/rep303.php:120
+#: /reporting/rep303.php:126
+#: /reporting/rep305.php:106
 msgid "Stock ID"
 msgstr ""
 
-#: /reporting/rep303.php:121
+#: /reporting/rep303.php:120
 msgid "Check"
 msgstr ""
 
-#: /reporting/rep303.php:135
+#: /reporting/rep303.php:134
 msgid "Only Shortage"
 msgstr ""
 
-#: /reporting/rep303.php:143
+#: /reporting/rep303.php:137
 msgid "Stock Check Sheets"
 msgstr ""
 
-#: /reporting/rep304.php:126
-#: /reporting/rep305.php:101
+#: /reporting/rep304.php:127
+#: /reporting/rep305.php:106
 #: /reporting/rep306.php:141
-#: /reporting/rep309.php:98
+#: /reporting/rep309.php:99
 msgid "Qty"
 msgstr ""
 
-#: /reporting/rep304.php:126
-#: /reporting/rep309.php:98
-#: /sales/manage/customer_branches.php:228
-#: /sales/manage/customers.php:265
-msgid "Sales"
-msgstr ""
-
-#: /reporting/rep304.php:126
-msgid "Cost"
-msgstr ""
-
-#: /reporting/rep304.php:126
+#: /reporting/rep304.php:127
 msgid "Contribution"
 msgstr ""
 
-#: /reporting/rep304.php:137
-#: /reporting/reports_main.php:238
+#: /reporting/rep304.php:138
+#: /reporting/reports_main.php:240
 msgid "Show Service Items"
 msgstr ""
 
-#: /reporting/rep304.php:139
+#: /reporting/rep304.php:140
 msgid "Inventory Sales Report"
 msgstr ""
 
-#: /reporting/rep305.php:101
+#: /reporting/rep305.php:106
 msgid "PO No"
 msgstr ""
 
-#: /reporting/rep305.php:101
+#: /reporting/rep305.php:106
 msgid "Inv"
 msgstr ""
 
-#: /reporting/rep305.php:101
+#: /reporting/rep305.php:106
 msgid "Inv Price"
 msgstr ""
 
-#: /reporting/rep305.php:101
+#: /reporting/rep305.php:106
 msgid "PO Price"
 msgstr ""
 
-#: /reporting/rep305.php:108
+#: /reporting/rep305.php:113
 msgid "GRN Valuation Report"
 msgstr ""
 
 #: /reporting/rep306.php:141
-#: /reporting/rep309.php:98
+#: /reporting/rep309.php:99
 msgid "Unit Price"
 msgstr ""
 
@@ -12879,11 +13495,11 @@ msgstr ""
 msgid "Inventory Purchasing Report"
 msgstr ""
 
-#: /reporting/rep307.php:117
+#: /reporting/rep307.php:114
 msgid "Opening"
 msgstr ""
 
-#: /reporting/rep307.php:126
+#: /reporting/rep307.php:123
 msgid "Inventory Movements"
 msgstr ""
 
@@ -12913,19 +13529,19 @@ msgstr ""
 msgid "Costed Inventory Movements"
 msgstr ""
 
-#: /reporting/rep309.php:98
+#: /reporting/rep309.php:99
 msgid "Item/Category"
 msgstr ""
 
-#: /reporting/rep309.php:98
+#: /reporting/rep309.php:99
 msgid "Remark"
 msgstr ""
 
-#: /reporting/rep309.php:106
+#: /reporting/rep309.php:107
 msgid "Item Sales Summary Report"
 msgstr ""
 
-#: /reporting/rep309.php:147
+#: /reporting/rep309.php:146
 msgid "Gift"
 msgstr ""
 
@@ -12946,11 +13562,19 @@ msgid "Work Order Listing"
 msgstr ""
 
 #: /reporting/rep409.php:59
-#: /reporting/rep409.php:72
+#: /reporting/rep409.php:71
 #: /reporting/includes/doctext.inc:213
 msgid "WORK ORDER"
 msgstr ""
 
+#: /reporting/rep451.php:70
+msgid "Initial"
+msgstr ""
+
+#: /reporting/rep451.php:79
+msgid "Fixed Assets Valuation Report"
+msgstr ""
+
 #: /reporting/rep501.php:87
 msgid "YTD"
 msgstr ""
@@ -13011,18 +13635,18 @@ msgstr ""
 msgid "GL Account Transactions"
 msgstr ""
 
-#: /reporting/rep705.php:247
-#: /reporting/rep705.php:260
-#: /reporting/rep705.php:271
-#: /reporting/reports_main.php:361
-#: /reporting/reports_main.php:414
-#: /reporting/reports_main.php:462
+#: /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
 msgid "Year"
 msgstr ""
 
-#: /reporting/rep705.php:253
-#: /reporting/rep705.php:264
-#: /reporting/rep705.php:273
+#: /reporting/rep705.php:250
+#: /reporting/rep705.php:261
+#: /reporting/rep705.php:270
 #: /reporting/rep706.php:198
 #: /reporting/rep706.php:206
 #: /reporting/rep706.php:212
@@ -13032,13 +13656,13 @@ msgstr ""
 msgid "Tags"
 msgstr ""
 
-#: /reporting/rep705.php:254
-#: /reporting/rep705.php:265
-#: /reporting/rep705.php:274
+#: /reporting/rep705.php:251
+#: /reporting/rep705.php:262
+#: /reporting/rep705.php:271
 msgid "Amounts in thousands"
 msgstr ""
 
-#: /reporting/rep705.php:278
+#: /reporting/rep705.php:275
 msgid "Annual Expense Breakdown"
 msgstr ""
 
@@ -13062,14 +13686,18 @@ msgstr ""
 msgid "Net"
 msgstr ""
 
-#: /reporting/rep709.php:188
+#: /reporting/rep709.php:189
 msgid "Tax Rate"
 msgstr ""
 
-#: /reporting/rep709.php:188
+#: /reporting/rep709.php:189
 msgid "Net Tax"
 msgstr ""
 
+#: /reporting/rep709.php:207
+msgid "Exempt"
+msgstr ""
+
 #: /reporting/rep710.php:77
 msgid "Time"
 msgstr ""
@@ -13083,7 +13711,7 @@ msgid "Action"
 msgstr ""
 
 #: /reporting/rep710.php:89
-#: /reporting/reports_main.php:502
+#: /reporting/reports_main.php:513
 msgid "Audit Trail"
 msgstr ""
 
@@ -13091,473 +13719,483 @@ msgstr ""
 msgid "Changed"
 msgstr ""
 
-#: /reporting/reports_main.php:26
+#: /reporting/reports_main.php:28
 msgid "Reports and Analysis"
 msgstr ""
 
-#: /reporting/reports_main.php:33
+#: /reporting/reports_main.php:35
 msgid "Customer &Balances"
 msgstr ""
 
-#: /reporting/reports_main.php:37
-#: /reporting/reports_main.php:154
-#: /reporting/reports_main.php:308
+#: /reporting/reports_main.php:39
+#: /reporting/reports_main.php:156
+#: /reporting/reports_main.php:324
 msgid "Show Balance"
 msgstr ""
 
-#: /reporting/reports_main.php:38
-#: /reporting/reports_main.php:46
-#: /reporting/reports_main.php:71
-#: /reporting/reports_main.php:98
-#: /reporting/reports_main.php:108
-#: /reporting/reports_main.php:122
-#: /reporting/reports_main.php:130
-#: /reporting/reports_main.php:138
-#: /reporting/reports_main.php:145
-#: /reporting/reports_main.php:155
-#: /reporting/reports_main.php:163
-#: /reporting/reports_main.php:174
-#: /reporting/reports_main.php:194
-#: /reporting/reports_main.php:201
+#: /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
 msgid "Currency Filter"
 msgstr ""
 
-#: /reporting/reports_main.php:41
-#: /reporting/reports_main.php:52
-#: /reporting/reports_main.php:61
-#: /reporting/reports_main.php:68
-#: /reporting/reports_main.php:77
-#: /reporting/reports_main.php:86
-#: /reporting/reports_main.php:93
-#: /reporting/reports_main.php:103
-#: /reporting/reports_main.php:112
-#: /reporting/reports_main.php:119
-#: /reporting/reports_main.php:126
-#: /reporting/reports_main.php:134
-#: /reporting/reports_main.php:141
-#: /reporting/reports_main.php:147
-#: /reporting/reports_main.php:158
-#: /reporting/reports_main.php:169
-#: /reporting/reports_main.php:177
-#: /reporting/reports_main.php:182
-#: /reporting/reports_main.php:189
-#: /reporting/reports_main.php:197
-#: /reporting/reports_main.php:204
-#: /reporting/reports_main.php:213
-#: /reporting/reports_main.php:219
-#: /reporting/reports_main.php:230
-#: /reporting/reports_main.php:240
-#: /reporting/reports_main.php:246
-#: /reporting/reports_main.php:256
-#: /reporting/reports_main.php:264
-#: /reporting/reports_main.php:272
-#: /reporting/reports_main.php:279
-#: /reporting/reports_main.php:287
-#: /reporting/reports_main.php:294
-#: /reporting/reports_main.php:301
-#: /reporting/reports_main.php:310
-#: /reporting/reports_main.php:323
+#: /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:343
-#: /reporting/reports_main.php:358
-#: /reporting/reports_main.php:366
+#: /reporting/reports_main.php:349
+#: /reporting/reports_main.php:356
+#: /reporting/reports_main.php:369
 #: /reporting/reports_main.php:377
-#: /reporting/reports_main.php:389
-#: /reporting/reports_main.php:399
-#: /reporting/reports_main.php:411
-#: /reporting/reports_main.php:418
-#: /reporting/reports_main.php:428
+#: /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:448
+#: /reporting/reports_main.php:450
 #: /reporting/reports_main.php:459
-#: /reporting/reports_main.php:465
-#: /reporting/reports_main.php:474
-#: /reporting/reports_main.php:484
-#: /reporting/reports_main.php:492
-#: /reporting/reports_main.php:500
-#: /reporting/reports_main.php:508
+#: /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
 msgid "Orientation"
 msgstr ""
 
-#: /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: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: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:288
-#: /reporting/reports_main.php:295
-#: /reporting/reports_main.php:311
-#: /reporting/reports_main.php:324
-#: /reporting/reports_main.php:330
+#: /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:344
-#: /reporting/reports_main.php:359
-#: /reporting/reports_main.php:367
+#: /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:390
-#: /reporting/reports_main.php:400
-#: /reporting/reports_main.php:412
-#: /reporting/reports_main.php:419
-#: /reporting/reports_main.php:429
+#: /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:449
+#: /reporting/reports_main.php:451
 #: /reporting/reports_main.php:460
-#: /reporting/reports_main.php:466
-#: /reporting/reports_main.php:475
-#: /reporting/reports_main.php:485
-#: /reporting/reports_main.php:493
-#: /reporting/reports_main.php:501
-#: /reporting/reports_main.php:509
+#: /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
 msgid "Destination"
 msgstr ""
 
-#: /reporting/reports_main.php:43
+#: /reporting/reports_main.php:45
 msgid "&Aged Customer Analysis"
 msgstr ""
 
-#: /reporting/reports_main.php:50
-#: /reporting/reports_main.php:167
-#: /reporting/reports_main.php:375
-#: /reporting/reports_main.php:387
-#: /reporting/reports_main.php:426
+#: /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:472
-#: /reporting/reports_main.php:482
+#: /reporting/reports_main.php:448
+#: /reporting/reports_main.php:483
+#: /reporting/reports_main.php:493
 msgid "Graphics"
 msgstr ""
 
-#: /reporting/reports_main.php:54
+#: /reporting/reports_main.php:56
 msgid "Customer &Detail Listing"
 msgstr ""
 
-#: /reporting/reports_main.php:58
-#: /reporting/reports_main.php:186
+#: /reporting/reports_main.php:60
+#: /reporting/reports_main.php:188
 msgid "Activity Greater Than"
 msgstr ""
 
-#: /reporting/reports_main.php:59
-#: /reporting/reports_main.php:187
+#: /reporting/reports_main.php:61
+#: /reporting/reports_main.php:189
 msgid "Activity Less Than"
 msgstr ""
 
-#: /reporting/reports_main.php:63
+#: /reporting/reports_main.php:65
 msgid "Sales &Summary Report"
 msgstr ""
 
-#: /reporting/reports_main.php:70
+#: /reporting/reports_main.php:72
 msgid "&Price Listing"
 msgstr ""
 
-#: /reporting/reports_main.php:72
-#: /reporting/reports_main.php:82
-#: /reporting/reports_main.php:209
-#: /reporting/reports_main.php:216
-#: /reporting/reports_main.php:222
-#: /reporting/reports_main.php:235
-#: /reporting/reports_main.php:251
-#: /reporting/reports_main.php:261
-#: /reporting/reports_main.php:269
-#: /reporting/reports_main.php:277
+#: /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
 msgid "Inventory Category"
 msgstr ""
 
-#: /reporting/reports_main.php:73
+#: /reporting/reports_main.php:75
 #: /sales/manage/sales_types.php:16
 msgid "Sales Types"
 msgstr ""
 
-#: /reporting/reports_main.php:74
-#: /reporting/reports_main.php:224
+#: /reporting/reports_main.php:76
+#: /reporting/reports_main.php:226
 msgid "Show Pictures"
 msgstr ""
 
-#: /reporting/reports_main.php:79
+#: /reporting/reports_main.php:81
 msgid "&Order Status Listing"
 msgstr ""
 
-#: /reporting/reports_main.php:83
+#: /reporting/reports_main.php:85
 msgid "Stock Location"
 msgstr ""
 
-#: /reporting/reports_main.php:88
+#: /reporting/reports_main.php:90
 msgid "&Salesman Listing"
 msgstr ""
 
-#: /reporting/reports_main.php:95
+#: /reporting/reports_main.php:97
 msgid "Print &Invoices"
 msgstr ""
 
-#: /reporting/reports_main.php:99
-#: /reporting/reports_main.php:109
-#: /reporting/reports_main.php:116
+#: /reporting/reports_main.php:101
+#: /reporting/reports_main.php:111
+#: /reporting/reports_main.php:118
 msgid "email Customers"
 msgstr ""
 
-#: /reporting/reports_main.php:100
-#: /reporting/reports_main.php:110
+#: /reporting/reports_main.php:102
+#: /reporting/reports_main.php:112
 msgid "Payment Link"
 msgstr ""
 
-#: /reporting/reports_main.php:105
+#: /reporting/reports_main.php:107
 msgid "Print &Credit Notes"
 msgstr ""
 
-#: /reporting/reports_main.php:113
+#: /reporting/reports_main.php:115
 msgid "Print &Deliveries"
 msgstr ""
 
-#: /reporting/reports_main.php:117
+#: /reporting/reports_main.php:119
 msgid "Print as Packing Slip"
 msgstr ""
 
-#: /reporting/reports_main.php:120
+#: /reporting/reports_main.php:122
 msgid "Print &Statements"
 msgstr ""
 
-#: /reporting/reports_main.php:124
-#: /reporting/reports_main.php:131
-#: /reporting/reports_main.php:139
+#: /reporting/reports_main.php:126
+#: /reporting/reports_main.php:133
+#: /reporting/reports_main.php:141
 msgid "Email Customers"
 msgstr ""
 
-#: /reporting/reports_main.php:127
+#: /reporting/reports_main.php:129
 msgid "&Print Sales Orders"
 msgstr ""
 
-#: /reporting/reports_main.php:132
+#: /reporting/reports_main.php:134
 msgid "Print as Quote"
 msgstr ""
 
-#: /reporting/reports_main.php:135
+#: /reporting/reports_main.php:137
 msgid "&Print Sales Quotations"
 msgstr ""
 
-#: /reporting/reports_main.php:142
+#: /reporting/reports_main.php:144
 msgid "Print Receipts"
 msgstr ""
 
-#: /reporting/reports_main.php:150
+#: /reporting/reports_main.php:152
 msgid "Supplier &Balances"
 msgstr ""
 
-#: /reporting/reports_main.php:160
+#: /reporting/reports_main.php:162
 msgid "&Aged Supplier Analyses"
 msgstr ""
 
-#: /reporting/reports_main.php:171
+#: /reporting/reports_main.php:173
 msgid "&Payment Report"
 msgstr ""
 
-#: /reporting/reports_main.php:179
+#: /reporting/reports_main.php:181
 msgid "Outstanding &GRNs Report"
 msgstr ""
 
-#: /reporting/reports_main.php:184
+#: /reporting/reports_main.php:186
 msgid "Supplier &Detail Listing"
 msgstr ""
 
-#: /reporting/reports_main.php:191
+#: /reporting/reports_main.php:193
 msgid "Print Purchase &Orders"
 msgstr ""
 
-#: /reporting/reports_main.php:195
-#: /reporting/reports_main.php:202
+#: /reporting/reports_main.php:197
+#: /reporting/reports_main.php:204
 msgid "Email Suppliers"
 msgstr ""
 
-#: /reporting/reports_main.php:198
+#: /reporting/reports_main.php:200
 msgid "Print Remi&ttances"
 msgstr ""
 
-#: /reporting/reports_main.php:207
+#: /reporting/reports_main.php:209
 msgid "Inventory &Valuation Report"
 msgstr ""
 
-#: /reporting/reports_main.php:215
+#: /reporting/reports_main.php:217
 msgid "Inventory &Planning Report"
 msgstr ""
 
-#: /reporting/reports_main.php:221
+#: /reporting/reports_main.php:223
 msgid "Stock &Check Sheets"
 msgstr ""
 
-#: /reporting/reports_main.php:225
+#: /reporting/reports_main.php:227
 msgid "Inventory Column"
 msgstr ""
 
-#: /reporting/reports_main.php:226
+#: /reporting/reports_main.php:228
 msgid "Show Shortage"
 msgstr ""
 
-#: /reporting/reports_main.php:228
+#: /reporting/reports_main.php:230
 msgid "Item Like"
 msgstr ""
 
-#: /reporting/reports_main.php:232
+#: /reporting/reports_main.php:234
 msgid "Inventory &Sales Report"
 msgstr ""
 
-#: /reporting/reports_main.php:242
+#: /reporting/reports_main.php:244
 msgid "&GRN Valuation Report"
 msgstr ""
 
-#: /reporting/reports_main.php:248
+#: /reporting/reports_main.php:250
 msgid "Inventory P&urchasing Report"
 msgstr ""
 
-#: /reporting/reports_main.php:258
+#: /reporting/reports_main.php:260
 msgid "Inventory &Movement Report"
 msgstr ""
 
-#: /reporting/reports_main.php:266
+#: /reporting/reports_main.php:268
 msgid "C&osted Inventory Movement Report"
 msgstr ""
 
-#: /reporting/reports_main.php:274
+#: /reporting/reports_main.php:276
 msgid "Item &Sales Summary Report"
 msgstr ""
 
-#: /reporting/reports_main.php:282
-msgid "Manufacturing"
-msgstr ""
-
-#: /reporting/reports_main.php:283
+#: /reporting/reports_main.php:286
 msgid "&Bill of Material Listing"
 msgstr ""
 
-#: /reporting/reports_main.php:284
+#: /reporting/reports_main.php:287
 msgid "From product"
 msgstr ""
 
-#: /reporting/reports_main.php:285
+#: /reporting/reports_main.php:288
 msgid "To product"
 msgstr ""
 
-#: /reporting/reports_main.php:289
+#: /reporting/reports_main.php:292
 msgid "Work Order &Listing"
 msgstr ""
 
-#: /reporting/reports_main.php:292
+#: /reporting/reports_main.php:295
 msgid "Outstanding Only"
 msgstr ""
 
-#: /reporting/reports_main.php:296
+#: /reporting/reports_main.php:299
 msgid "Print &Work Orders"
 msgstr ""
 
-#: /reporting/reports_main.php:299
+#: /reporting/reports_main.php:302
 msgid "Email Locations"
 msgstr ""
 
-#: /reporting/reports_main.php:305
+#: /reporting/reports_main.php:309
+msgid "&Fixed Assets Valuation"
+msgstr ""
+
+#: /reporting/reports_main.php:311
+msgid "Fixed Assets Class"
+msgstr ""
+
+#: /reporting/reports_main.php:312
+msgid "Fixed Assets Location"
+msgstr ""
+
+#: /reporting/reports_main.php:321
 msgid "Dimension &Summary"
 msgstr ""
 
-#: /reporting/reports_main.php:306
+#: /reporting/reports_main.php:322
 msgid "From Dimension"
 msgstr ""
 
-#: /reporting/reports_main.php:307
+#: /reporting/reports_main.php:323
 msgid "To Dimension"
 msgstr ""
 
-#: /reporting/reports_main.php:316
+#: /reporting/reports_main.php:329
 msgid "Banking"
 msgstr ""
 
-#: /reporting/reports_main.php:317
+#: /reporting/reports_main.php:330
 msgid "Bank &Statement"
 msgstr ""
 
-#: /reporting/reports_main.php:321
-#: /reporting/reports_main.php:394
-#: /reporting/reports_main.php:444
-#: /reporting/reports_main.php:489
+#: /reporting/reports_main.php:334
+#: /reporting/reports_main.php:405
+#: /reporting/reports_main.php:455
+#: /reporting/reports_main.php:500
 msgid "Zero values"
 msgstr ""
 
-#: /reporting/reports_main.php:325
+#: /reporting/reports_main.php:338
 msgid "Bank Statement w/ &Reconcile"
 msgstr ""
 
-#: /reporting/reports_main.php:332
+#: /reporting/reports_main.php:345
 msgid "General Ledger"
 msgstr ""
 
-#: /reporting/reports_main.php:333
+#: /reporting/reports_main.php:346
 msgid "Chart of &Accounts"
 msgstr ""
 
-#: /reporting/reports_main.php:334
+#: /reporting/reports_main.php:347
 msgid "Show Balances"
 msgstr ""
 
-#: /reporting/reports_main.php:338
+#: /reporting/reports_main.php:351
 msgid "List of &Journal Entries"
 msgstr ""
 
-#: /reporting/reports_main.php:350
-#: /reporting/reports_main.php:404
-#: /reporting/reports_main.php:453
+#: /reporting/reports_main.php:361
+#: /reporting/reports_main.php:415
+#: /reporting/reports_main.php:464
 msgid "GL Account &Transactions"
 msgstr ""
 
-#: /reporting/reports_main.php:353
-#: /reporting/reports_main.php:407
-#: /reporting/reports_main.php:456
+#: /reporting/reports_main.php:364
+#: /reporting/reports_main.php:418
+#: /reporting/reports_main.php:467
 msgid "From Account"
 msgstr ""
 
-#: /reporting/reports_main.php:354
-#: /reporting/reports_main.php:408
-#: /reporting/reports_main.php:457
+#: /reporting/reports_main.php:365
+#: /reporting/reports_main.php:419
+#: /reporting/reports_main.php:468
 msgid "To Account"
 msgstr ""
 
-#: /reporting/reports_main.php:360
-#: /reporting/reports_main.php:413
-#: /reporting/reports_main.php:461
+#: /reporting/reports_main.php:371
+#: /reporting/reports_main.php:424
+#: /reporting/reports_main.php:472
 msgid "Annual &Expense Breakdown"
 msgstr ""
 
-#: /reporting/reports_main.php:368
-#: /reporting/reports_main.php:420
-#: /reporting/reports_main.php:467
+#: /reporting/reports_main.php:379
+#: /reporting/reports_main.php:431
+#: /reporting/reports_main.php:478
 msgid "&Balance Sheet"
 msgstr ""
 
-#: /reporting/reports_main.php:374
-#: /reporting/reports_main.php:386
-#: /reporting/reports_main.php:425
+#: /reporting/reports_main.php:385
+#: /reporting/reports_main.php:397
 #: /reporting/reports_main.php:436
-#: /reporting/reports_main.php:471
-#: /reporting/reports_main.php:481
+#: /reporting/reports_main.php:447
+#: /reporting/reports_main.php:482
+#: /reporting/reports_main.php:492
 msgid "Decimal values"
 msgstr ""
 
-#: /reporting/reports_main.php:379
-#: /reporting/reports_main.php:430
-#: /reporting/reports_main.php:476
+#: /reporting/reports_main.php:390
+#: /reporting/reports_main.php:441
+#: /reporting/reports_main.php:487
 msgid "&Profit and Loss Statement"
 msgstr ""
 
-#: /reporting/reports_main.php:495
+#: /reporting/reports_main.php:506
 msgid "Ta&x Report"
 msgstr ""
 
@@ -13574,11 +14212,11 @@ msgid "Delivered To"
 msgstr ""
 
 #: /reporting/includes/doctext.inc:32
-#: /sales/customer_credit_invoice.php:283
+#: /sales/customer_credit_invoice.php:276
 #: /sales/view/view_credit.php:91
 #: /sales/view/view_dispatch.php:113
 #: /sales/view/view_invoice.php:116
-#: /sales/includes/ui/sales_credit_ui.inc:169
+#: /sales/includes/ui/sales_credit_ui.inc:163
 #: /sales/includes/ui/sales_order_ui.inc:148
 msgid "Discount %"
 msgstr ""
@@ -13610,7 +14248,7 @@ msgstr ""
 #: /reporting/includes/doctext.inc:131
 #: /reporting/includes/doctext.inc:184
 #: /reporting/includes/doctext.inc:240
-#: /sales/manage/customer_branches.php:282
+#: /sales/manage/customer_branches.php:286
 msgid "Sales Person"
 msgstr ""
 
@@ -13633,7 +14271,7 @@ msgstr ""
 #: /reporting/includes/doctext.inc:59
 #: /sales/view/view_sales_order.php:69
 #: /sales/inquiry/sales_orders_view.php:269
-#: /sales/includes/ui/sales_order_ui.inc:599
+#: /sales/includes/ui/sales_order_ui.inc:598
 msgid "Valid until"
 msgstr ""
 
@@ -13730,7 +14368,7 @@ msgid "DueDate"
 msgstr ""
 
 #: /reporting/includes/doctext.inc:271
-#: /reporting/includes/pdf_report.inc:1021
+#: /reporting/includes/pdf_report.inc:1006
 msgid "You can pay through"
 msgstr ""
 
@@ -13744,27 +14382,27 @@ msgid ""
 "The security settings on your account do not permit you to print this report"
 msgstr ""
 
-#: /reporting/includes/excel_report.inc:262
+#: /reporting/includes/excel_report.inc:258
 #: /reporting/includes/pdf_report.inc:317
 msgid "Print Out Date"
 msgstr ""
 
-#: /reporting/includes/excel_report.inc:268
+#: /reporting/includes/excel_report.inc:264
 #: /reporting/includes/pdf_report.inc:326
 msgid "Fiscal Year"
 msgstr ""
 
-#: /reporting/includes/excel_report.inc:396
+#: /reporting/includes/excel_report.inc:392
 msgid "Report Date"
 msgstr ""
 
-#: /reporting/includes/excel_report.inc:413
-#: /reporting/includes/pdf_report.inc:602
+#: /reporting/includes/excel_report.inc:409
+#: /reporting/includes/pdf_report.inc:590
 msgid "Generated At"
 msgstr ""
 
-#: /reporting/includes/excel_report.inc:419
-#: /reporting/includes/pdf_report.inc:611
+#: /reporting/includes/excel_report.inc:415
+#: /reporting/includes/pdf_report.inc:599
 msgid "Generated By"
 msgstr ""
 
@@ -13778,47 +14416,47 @@ msgstr ""
 
 #: /reporting/includes/header2.inc:147
 #: /reporting/includes/pdf_report.inc:353
-#: /reporting/includes/pdf_report.inc:503
-#: /reporting/includes/pdf_report.inc:630
+#: /reporting/includes/pdf_report.inc:491
+#: /reporting/includes/pdf_report.inc:618
 msgid "Page"
 msgstr ""
 
-#: /reporting/includes/pdf_report.inc:585
+#: /reporting/includes/pdf_report.inc:573
 msgid "Report Period"
 msgstr ""
 
-#: /reporting/includes/pdf_report.inc:988
-#: /reporting/includes/pdf_report.inc:1036
+#: /reporting/includes/pdf_report.inc:973
+#: /reporting/includes/pdf_report.inc:1021
 #, php-format
 msgid "You have no email contact defined for this type of document for '%s'."
 msgstr ""
 
-#: /reporting/includes/pdf_report.inc:1007
+#: /reporting/includes/pdf_report.inc:992
 msgid "Dear"
 msgstr ""
 
-#: /reporting/includes/pdf_report.inc:1008
+#: /reporting/includes/pdf_report.inc:993
 msgid "Attached you will find "
 msgstr ""
 
-#: /reporting/includes/pdf_report.inc:1024
+#: /reporting/includes/pdf_report.inc:1009
 msgid "Kindest regards"
 msgstr ""
 
-#: /reporting/includes/pdf_report.inc:1039
+#: /reporting/includes/pdf_report.inc:1024
 msgid "Sending document by email failed"
 msgstr ""
 
-#: /reporting/includes/pdf_report.inc:1039
-#: /reporting/includes/pdf_report.inc:1042
+#: /reporting/includes/pdf_report.inc:1024
+#: /reporting/includes/pdf_report.inc:1027
 msgid "Email:"
 msgstr ""
 
-#: /reporting/includes/pdf_report.inc:1042
+#: /reporting/includes/pdf_report.inc:1027
 msgid "has been sent by email to destination."
 msgstr ""
 
-#: /reporting/includes/pdf_report.inc:1072
+#: /reporting/includes/pdf_report.inc:1056
 msgid "Report has been sent to network printer "
 msgstr ""
 
@@ -13850,90 +14488,96 @@ msgstr ""
 msgid "Cannot flush printing queue"
 msgstr ""
 
-#: /reporting/includes/reports_classes.inc:61
+#: /reporting/includes/reports_classes.inc:62
 msgid "Report Classes:"
 msgstr ""
 
-#: /reporting/includes/reports_classes.inc:81
+#: /reporting/includes/reports_classes.inc:82
 msgid "Reports For Class: "
 msgstr ""
 
-#: /reporting/includes/reports_classes.inc:101
+#: /reporting/includes/reports_classes.inc:102
 msgid "Display: "
 msgstr ""
 
-#: /reporting/includes/reports_classes.inc:152
+#: /reporting/includes/reports_classes.inc:153
 msgid "Unknown report parameter type:"
 msgstr ""
 
-#: /reporting/includes/reports_classes.inc:178
+#: /reporting/includes/reports_classes.inc:179
 msgid "No Currency Filter"
 msgstr ""
 
-#: /reporting/includes/reports_classes.inc:252
+#: /reporting/includes/reports_classes.inc:253
 msgid "No Graphics"
 msgstr ""
 
-#: /reporting/includes/reports_classes.inc:252
+#: /reporting/includes/reports_classes.inc:253
 msgid "Vertical bars"
 msgstr ""
 
-#: /reporting/includes/reports_classes.inc:252
+#: /reporting/includes/reports_classes.inc:253
 msgid "Horizontal bars"
 msgstr ""
 
-#: /reporting/includes/reports_classes.inc:253
+#: /reporting/includes/reports_classes.inc:254
 msgid "Dots"
 msgstr ""
 
-#: /reporting/includes/reports_classes.inc:253
+#: /reporting/includes/reports_classes.inc:254
 msgid "Lines"
 msgstr ""
 
-#: /reporting/includes/reports_classes.inc:253
+#: /reporting/includes/reports_classes.inc:254
 msgid "Pie"
 msgstr ""
 
-#: /reporting/includes/reports_classes.inc:253
+#: /reporting/includes/reports_classes.inc:254
 msgid "Donut"
 msgstr ""
 
-#: /reporting/includes/reports_classes.inc:257
-#: /reporting/includes/reports_classes.inc:260
+#: /reporting/includes/reports_classes.inc:258
+#: /reporting/includes/reports_classes.inc:261
 msgid "No Type Filter"
 msgstr ""
 
-#: /reporting/includes/reports_classes.inc:270
+#: /reporting/includes/reports_classes.inc:271
 msgid "No Account Group Filter"
 msgstr ""
 
-#: /reporting/includes/reports_classes.inc:285
-#: /reporting/includes/reports_classes.inc:291
-#: /reporting/includes/reports_classes.inc:297
+#: /reporting/includes/reports_classes.inc:286
+#: /reporting/includes/reports_classes.inc:292
+#: /reporting/includes/reports_classes.inc:298
 msgid "No Dimension Filter"
 msgstr ""
 
-#: /reporting/includes/reports_classes.inc:303
+#: /reporting/includes/reports_classes.inc:304
 msgid "No Customer Filter"
 msgstr ""
 
-#: /reporting/includes/reports_classes.inc:311
+#: /reporting/includes/reports_classes.inc:312
 msgid "No Supplier Filter"
 msgstr ""
 
-#: /reporting/includes/reports_classes.inc:399
+#: /reporting/includes/reports_classes.inc:419
+#: /reporting/includes/reports_classes.inc:421
 msgid "No Location Filter"
 msgstr ""
 
-#: /reporting/includes/reports_classes.inc:402
+#: /reporting/includes/reports_classes.inc:424
+#: /reporting/includes/reports_classes.inc:426
 msgid "No Category Filter"
 msgstr ""
 
-#: /reporting/includes/reports_classes.inc:411
+#: /reporting/includes/reports_classes.inc:428
+msgid "No Class Filter"
+msgstr ""
+
+#: /reporting/includes/reports_classes.inc:436
 msgid "No Sales Folk Filter"
 msgstr ""
 
-#: /reporting/includes/reports_classes.inc:418
+#: /reporting/includes/reports_classes.inc:443
 msgid "No Users Filter"
 msgstr ""
 
@@ -14014,11 +14658,6 @@ msgid ""
 " Do you want to continue?"
 msgstr ""
 
-#: /sales/create_recurrent_invoices.php:203
-#: /sales/manage/recurrent_invoices.php:128
-msgid "Template No"
-msgstr ""
-
 #: /sales/create_recurrent_invoices.php:203
 #: /sales/manage/recurrent_invoices.php:128
 msgid "Begin"
@@ -14029,10 +14668,6 @@ msgstr ""
 msgid "End"
 msgstr ""
 
-#: /sales/create_recurrent_invoices.php:203
-msgid "Next invoice"
-msgstr ""
-
 #: /sales/create_recurrent_invoices.php:240
 #, php-format
 msgid "Create %s Invoice(s)"
@@ -14052,7 +14687,7 @@ msgid "Modifying Customer Credit Note #%d"
 msgstr ""
 
 #: /sales/credit_note_entry.php:51
-#: /sales/sales_order_entry.php:694
+#: /sales/sales_order_entry.php:701
 msgid ""
 "There are no customers, or there are no customers with branches. Please "
 "define customers and customer branches."
@@ -14088,8 +14723,8 @@ msgstr ""
 #: /sales/credit_note_entry.php:147
 #: /sales/customer_credit_invoice.php:101
 #: /sales/customer_delivery.php:177
-#: /sales/customer_invoice.php:335
-#: /sales/sales_order_entry.php:435
+#: /sales/customer_invoice.php:317
+#: /sales/sales_order_entry.php:440
 msgid "You must enter a reference."
 msgstr ""
 
@@ -14126,7 +14761,7 @@ msgid "Credit Note Items"
 msgstr ""
 
 #: /sales/credit_note_entry.php:285
-#: /sales/customer_credit_invoice.php:385
+#: /sales/customer_credit_invoice.php:378
 msgid "Process Credit Note"
 msgstr ""
 
@@ -14178,42 +14813,42 @@ msgid ""
 "This page can only be opened if an invoice has been selected for crediting."
 msgstr ""
 
-#: /sales/customer_credit_invoice.php:251
+#: /sales/customer_credit_invoice.php:248
 msgid "Crediting Invoice"
 msgstr ""
 
-#: /sales/customer_credit_invoice.php:272
+#: /sales/customer_credit_invoice.php:265
 msgid "Credit Note Date"
 msgstr ""
 
-#: /sales/customer_credit_invoice.php:282
+#: /sales/customer_credit_invoice.php:275
 msgid "Invoiced Quantity"
 msgstr ""
 
-#: /sales/customer_credit_invoice.php:283
+#: /sales/customer_credit_invoice.php:276
 msgid "Credit Quantity"
 msgstr ""
 
-#: /sales/customer_credit_invoice.php:317
+#: /sales/customer_credit_invoice.php:310
 msgid "Credit Shipping Cost"
 msgstr ""
 
-#: /sales/customer_credit_invoice.php:350
-#: /sales/includes/ui/sales_credit_ui.inc:324
+#: /sales/customer_credit_invoice.php:343
+#: /sales/includes/ui/sales_credit_ui.inc:318
 msgid "Credit Note Type"
 msgstr ""
 
-#: /sales/customer_credit_invoice.php:358
-#: /sales/includes/ui/sales_credit_ui.inc:332
+#: /sales/customer_credit_invoice.php:351
+#: /sales/includes/ui/sales_credit_ui.inc:326
 msgid "Items Returned to Location"
 msgstr ""
 
-#: /sales/customer_credit_invoice.php:363
-#: /sales/includes/ui/sales_credit_ui.inc:337
+#: /sales/customer_credit_invoice.php:356
+#: /sales/includes/ui/sales_credit_ui.inc:331
 msgid "Write off the cost of the items to"
 msgstr ""
 
-#: /sales/customer_credit_invoice.php:383
+#: /sales/customer_credit_invoice.php:376
 msgid "Update credit value for quantities entered"
 msgstr ""
 
@@ -14227,42 +14862,42 @@ msgid "Deliver Items for a Sales Order"
 msgstr ""
 
 #: /sales/customer_delivery.php:49
-#: /sales/sales_order_entry.php:189
+#: /sales/sales_order_entry.php:194
 #, php-format
 msgid "Delivery # %d has been entered."
 msgstr ""
 
 #: /sales/customer_delivery.php:51
-#: /sales/sales_order_entry.php:191
+#: /sales/sales_order_entry.php:196
 msgid "&View This Delivery"
 msgstr ""
 
 #: /sales/customer_delivery.php:53
 #: /sales/customer_delivery.php:75
-#: /sales/sales_order_entry.php:193
+#: /sales/sales_order_entry.php:198
 msgid "&Print Delivery Note"
 msgstr ""
 
 #: /sales/customer_delivery.php:54
 #: /sales/customer_delivery.php:76
-#: /sales/sales_order_entry.php:194
+#: /sales/sales_order_entry.php:199
 msgid "&Email Delivery Note"
 msgstr ""
 
 #: /sales/customer_delivery.php:55
 #: /sales/customer_delivery.php:77
-#: /sales/sales_order_entry.php:195
+#: /sales/sales_order_entry.php:200
 msgid "P&rint as Packing Slip"
 msgstr ""
 
 #: /sales/customer_delivery.php:56
 #: /sales/customer_delivery.php:78
-#: /sales/sales_order_entry.php:196
+#: /sales/sales_order_entry.php:201
 msgid "E&mail as Packing Slip"
 msgstr ""
 
 #: /sales/customer_delivery.php:58
-#: /sales/sales_order_entry.php:199
+#: /sales/sales_order_entry.php:204
 msgid "View the GL Journal Entries for this Dispatch"
 msgstr ""
 
@@ -14292,7 +14927,7 @@ msgid "Select A Different Delivery"
 msgstr ""
 
 #: /sales/customer_delivery.php:93
-#: /sales/customer_invoice.php:155
+#: /sales/customer_invoice.php:148
 msgid ""
 "You have to set Deferred Income Account in GL Setup to entry prepayment "
 "invoices."
@@ -14350,7 +14985,7 @@ msgid "The entered dead-line for invoice is invalid."
 msgstr ""
 
 #: /sales/customer_delivery.php:187
-#: /sales/customer_invoice.php:348
+#: /sales/customer_invoice.php:330
 msgid "The entered shipping value is not numeric."
 msgstr ""
 
@@ -14359,83 +14994,83 @@ msgid "There are no item quantities on this delivery note."
 msgstr ""
 
 #: /sales/customer_delivery.php:205
-#: /sales/sales_order_entry.php:379
+#: /sales/sales_order_entry.php:384
 msgid ""
 "This document cannot be processed because there is insufficient quantity for "
 "items marked."
 msgstr ""
 
-#: /sales/customer_delivery.php:344
+#: /sales/customer_delivery.php:341
 msgid "For Sales Order"
 msgstr ""
 
-#: /sales/customer_delivery.php:353
+#: /sales/customer_delivery.php:350
 msgid "Delivery From"
 msgstr ""
 
-#: /sales/customer_delivery.php:402
+#: /sales/customer_delivery.php:399
 msgid "Invoice Dead-line"
 msgstr ""
 
-#: /sales/customer_delivery.php:412
-#: /sales/customer_invoice.php:536
+#: /sales/customer_delivery.php:409
+#: /sales/customer_invoice.php:506
 #: /sales/includes/ui/sales_order_ui.inc:83
-#: /sales/includes/ui/sales_order_ui.inc:360
+#: /sales/includes/ui/sales_order_ui.inc:357
 msgid ""
 "The selected customer account is currently on hold. Please contact the "
 "credit control personnel to discuss."
 msgstr ""
 
-#: /sales/customer_delivery.php:417
+#: /sales/customer_delivery.php:414
 msgid "Delivery Items"
 msgstr ""
 
-#: /sales/customer_delivery.php:423
+#: /sales/customer_delivery.php:420
 msgid "Max. delivery"
 msgstr ""
 
-#: /sales/customer_delivery.php:423
-#: /sales/customer_invoice.php:551
+#: /sales/customer_delivery.php:420
+#: /sales/customer_invoice.php:521
 msgid "Invoiced"
 msgstr ""
 
-#: /sales/customer_delivery.php:500
-#: /sales/customer_invoice.php:641
+#: /sales/customer_delivery.php:497
+#: /sales/customer_invoice.php:611
 msgid "Shipping Cost"
 msgstr ""
 
-#: /sales/customer_delivery.php:520
-#: /sales/includes/ui/sales_order_ui.inc:237
+#: /sales/customer_delivery.php:517
+#: /sales/includes/ui/sales_order_ui.inc:236
 msgid ""
 "Marked items have insufficient quantities in stock as on day of delivery."
 msgstr ""
 
-#: /sales/customer_delivery.php:524
+#: /sales/customer_delivery.php:521
 msgid "Action For Balance"
 msgstr ""
 
-#: /sales/customer_delivery.php:531
+#: /sales/customer_delivery.php:528
+#: /sales/customer_delivery.php:530
 #: /sales/customer_delivery.php:533
-#: /sales/customer_delivery.php:536
-#: /sales/customer_invoice.php:693
+#: /sales/customer_invoice.php:663
 msgid "Refresh document page"
 msgstr ""
 
-#: /sales/customer_delivery.php:533
+#: /sales/customer_delivery.php:530
 msgid "Reset quantity"
 msgstr ""
 
-#: /sales/customer_delivery.php:536
+#: /sales/customer_delivery.php:533
 msgid "Clear quantity"
 msgstr ""
 
-#: /sales/customer_delivery.php:538
+#: /sales/customer_delivery.php:535
 msgid "Process Dispatch"
 msgstr ""
 
-#: /sales/customer_delivery.php:539
-#: /sales/customer_invoice.php:695
-#: /sales/sales_order_entry.php:741
+#: /sales/customer_delivery.php:536
+#: /sales/customer_invoice.php:665
+#: /sales/sales_order_entry.php:748
 msgid "Check entered data and save document"
 msgstr ""
 
@@ -14462,7 +15097,7 @@ msgstr ""
 
 #: /sales/customer_invoice.php:59
 #: /sales/customer_invoice.php:83
-#: /sales/sales_order_entry.php:218
+#: /sales/sales_order_entry.php:223
 msgid "&View This Invoice"
 msgstr ""
 
@@ -14477,7 +15112,7 @@ msgid "&Email This Invoice"
 msgstr ""
 
 #: /sales/customer_invoice.php:64
-#: /sales/sales_order_entry.php:228
+#: /sales/sales_order_entry.php:233
 msgid "View the GL &Journal Entries for this Invoice"
 msgstr ""
 
@@ -14486,7 +15121,7 @@ msgid "Select Another &Delivery For Invoicing"
 msgstr ""
 
 #: /sales/customer_invoice.php:69
-#: /sales/sales_order_entry.php:238
+#: /sales/sales_order_entry.php:243
 msgid "Entry &customer payment for this invoice"
 msgstr ""
 
@@ -14509,90 +15144,90 @@ msgid ""
 "nothing left to invoice."
 msgstr ""
 
-#: /sales/customer_invoice.php:149
+#: /sales/customer_invoice.php:142
 msgid ""
 "All quantities on this invoice has been credited. There is nothing to modify "
 "on this invoice"
 msgstr ""
 
-#: /sales/customer_invoice.php:163
+#: /sales/customer_invoice.php:156
 msgid ""
 "Please select correct Sales Order Prepayment to be invoiced and try again."
 msgstr ""
 
-#: /sales/customer_invoice.php:194
+#: /sales/customer_invoice.php:179
 msgid ""
 "This page can only be opened after delivery selection. Please select "
 "delivery to invoicing first."
 msgstr ""
 
-#: /sales/customer_invoice.php:196
+#: /sales/customer_invoice.php:181
 msgid "Select Delivery to Invoice"
 msgstr ""
 
-#: /sales/customer_invoice.php:201
-#: /sales/customer_invoice.php:359
+#: /sales/customer_invoice.php:186
+#: /sales/customer_invoice.php:341
 msgid ""
 "Selected quantity cannot be less than quantity credited nor more than "
 "quantity not invoiced yet."
 msgstr ""
 
-#: /sales/customer_invoice.php:315
+#: /sales/customer_invoice.php:297
 msgid "The entered invoice date is invalid."
 msgstr ""
 
-#: /sales/customer_invoice.php:328
+#: /sales/customer_invoice.php:310
 msgid "The entered invoice due date is invalid."
 msgstr ""
 
-#: /sales/customer_invoice.php:354
+#: /sales/customer_invoice.php:336
 msgid "There are no item quantities on this invoice."
 msgstr ""
 
-#: /sales/customer_invoice.php:364
+#: /sales/customer_invoice.php:346
 msgid ""
 "There is no non-invoiced payments for this order. If you want to issue final "
 "invoice, select delayed or cash payment terms."
 msgstr ""
 
-#: /sales/customer_invoice.php:454
+#: /sales/customer_invoice.php:436
 msgid "Payment terms:"
 msgstr ""
 
-#: /sales/customer_invoice.php:542
-#: /sales/sales_order_entry.php:717
+#: /sales/customer_invoice.php:512
+#: /sales/sales_order_entry.php:724
 msgid "Sales Order Items"
 msgstr ""
 
-#: /sales/customer_invoice.php:542
+#: /sales/customer_invoice.php:512
 msgid "Invoice Items"
 msgstr ""
 
-#: /sales/customer_invoice.php:552
+#: /sales/customer_invoice.php:522
 msgid "This Invoice"
 msgstr ""
 
-#: /sales/customer_invoice.php:560
+#: /sales/customer_invoice.php:530
 msgid "Credited"
 msgstr ""
 
-#: /sales/customer_invoice.php:662
+#: /sales/customer_invoice.php:632
 msgid "Invoice Total"
 msgstr ""
 
-#: /sales/customer_invoice.php:671
+#: /sales/customer_invoice.php:641
 msgid "Sales order:"
 msgstr ""
 
-#: /sales/customer_invoice.php:683
+#: /sales/customer_invoice.php:653
 msgid "Payments received:"
 msgstr ""
 
-#: /sales/customer_invoice.php:684
+#: /sales/customer_invoice.php:654
 msgid "Invoiced here:"
 msgstr ""
 
-#: /sales/customer_invoice.php:685
+#: /sales/customer_invoice.php:655
 msgid "Left to be invoiced:"
 msgstr ""
 
@@ -14644,12 +15279,12 @@ msgid "Select Another Customer Payment for &Edition"
 msgstr ""
 
 #: /sales/customer_payments.php:140
-#: /sales/sales_order_entry.php:350
+#: /sales/sales_order_entry.php:355
 msgid "There is no customer selected."
 msgstr ""
 
 #: /sales/customer_payments.php:147
-#: /sales/sales_order_entry.php:357
+#: /sales/sales_order_entry.php:362
 msgid "This customer has no branch defined."
 msgstr ""
 
@@ -14662,46 +15297,46 @@ msgstr ""
 msgid "The entered amount is invalid or negative and cannot be processed."
 msgstr ""
 
-#: /sales/customer_payments.php:200
+#: /sales/customer_payments.php:193
 msgid "The entered discount is not a valid number."
 msgstr ""
 
-#: /sales/customer_payments.php:207
+#: /sales/customer_payments.php:199
 msgid ""
 "The balance of the amount and discount is zero or negative. Please enter "
 "valid amounts."
 msgstr ""
 
-#: /sales/customer_payments.php:214
+#: /sales/customer_payments.php:206
 msgid "The entered payment amount is zero or negative."
 msgstr ""
 
-#: /sales/customer_payments.php:316
+#: /sales/customer_payments.php:308
 msgid "Into Bank Account:"
 msgstr ""
 
-#: /sales/customer_payments.php:319
-#: /sales/customer_payments.php:321
+#: /sales/customer_payments.php:311
+#: /sales/customer_payments.php:313
 msgid "From Customer:"
 msgstr ""
 
-#: /sales/customer_payments.php:353
+#: /sales/customer_payments.php:345
 msgid "Date of Deposit:"
 msgstr ""
 
-#: /sales/customer_payments.php:367
+#: /sales/customer_payments.php:359
 msgid "Payment Amount:"
 msgstr ""
 
-#: /sales/customer_payments.php:380
+#: /sales/customer_payments.php:372
 msgid "Customer prompt payment discount :"
 msgstr ""
 
-#: /sales/customer_payments.php:390
+#: /sales/customer_payments.php:382
 msgid "Add Payment"
 msgstr ""
 
-#: /sales/customer_payments.php:392
+#: /sales/customer_payments.php:384
 msgid "Update Payment"
 msgstr ""
 
@@ -14709,325 +15344,329 @@ msgstr ""
 msgid "Direct Sales Delivery"
 msgstr ""
 
-#: /sales/sales_order_entry.php:69
-msgid "Direct Sales Invoice"
+#: /sales/sales_order_entry.php:72
+msgid "Fixed Assets Sale"
 msgstr ""
 
 #: /sales/sales_order_entry.php:75
+msgid "Direct Sales Invoice"
+msgstr ""
+
+#: /sales/sales_order_entry.php:80
 #, php-format
 msgid "Modifying Sales Order # %d"
 msgstr ""
 
-#: /sales/sales_order_entry.php:81
+#: /sales/sales_order_entry.php:86
 #, php-format
 msgid "Modifying Sales Quotation # %d"
 msgstr ""
 
-#: /sales/sales_order_entry.php:86
+#: /sales/sales_order_entry.php:91
 msgid "New Sales Order Entry"
 msgstr ""
 
-#: /sales/sales_order_entry.php:90
+#: /sales/sales_order_entry.php:95
 msgid "New Sales Quotation Entry"
 msgstr ""
 
-#: /sales/sales_order_entry.php:93
+#: /sales/sales_order_entry.php:98
 msgid "Sales Order Entry"
 msgstr ""
 
-#: /sales/sales_order_entry.php:115
+#: /sales/sales_order_entry.php:120
 #, php-format
 msgid "Order # %d has been entered."
 msgstr ""
 
-#: /sales/sales_order_entry.php:117
-#: /sales/sales_order_entry.php:137
+#: /sales/sales_order_entry.php:122
+#: /sales/sales_order_entry.php:142
 msgid "&View This Order"
 msgstr ""
 
-#: /sales/sales_order_entry.php:123
+#: /sales/sales_order_entry.php:128
 msgid "Make &Delivery Against This Order"
 msgstr ""
 
-#: /sales/sales_order_entry.php:128
+#: /sales/sales_order_entry.php:133
 msgid "Enter a &New Order"
 msgstr ""
 
-#: /sales/sales_order_entry.php:135
+#: /sales/sales_order_entry.php:140
 #, php-format
 msgid "Order # %d has been updated."
 msgstr ""
 
-#: /sales/sales_order_entry.php:143
+#: /sales/sales_order_entry.php:148
 msgid "Confirm Order Quantities and Make &Delivery"
 msgstr ""
 
-#: /sales/sales_order_entry.php:146
+#: /sales/sales_order_entry.php:151
 msgid "Select A Different &Order"
 msgstr ""
 
-#: /sales/sales_order_entry.php:153
+#: /sales/sales_order_entry.php:158
 #, php-format
 msgid "Quotation # %d has been entered."
 msgstr ""
 
-#: /sales/sales_order_entry.php:155
-#: /sales/sales_order_entry.php:173
+#: /sales/sales_order_entry.php:160
+#: /sales/sales_order_entry.php:178
 msgid "&View This Quotation"
 msgstr ""
 
-#: /sales/sales_order_entry.php:157
-#: /sales/sales_order_entry.php:175
+#: /sales/sales_order_entry.php:162
+#: /sales/sales_order_entry.php:180
 msgid "&Print This Quotation"
 msgstr ""
 
-#: /sales/sales_order_entry.php:158
-#: /sales/sales_order_entry.php:176
+#: /sales/sales_order_entry.php:163
+#: /sales/sales_order_entry.php:181
 msgid "&Email This Quotation"
 msgstr ""
 
-#: /sales/sales_order_entry.php:161
-#: /sales/sales_order_entry.php:179
+#: /sales/sales_order_entry.php:166
+#: /sales/sales_order_entry.php:184
 msgid "Make &Sales Order Against This Quotation"
 msgstr ""
 
-#: /sales/sales_order_entry.php:164
+#: /sales/sales_order_entry.php:169
 msgid "Enter a New &Quotation"
 msgstr ""
 
-#: /sales/sales_order_entry.php:171
+#: /sales/sales_order_entry.php:176
 #, php-format
 msgid "Quotation # %d has been updated."
 msgstr ""
 
-#: /sales/sales_order_entry.php:182
+#: /sales/sales_order_entry.php:187
 msgid "Select A Different &Quotation"
 msgstr ""
 
-#: /sales/sales_order_entry.php:201
+#: /sales/sales_order_entry.php:206
 msgid "Make &Invoice Against This Delivery"
 msgstr ""
 
-#: /sales/sales_order_entry.php:205
+#: /sales/sales_order_entry.php:210
 msgid "Enter a New Template &Delivery"
 msgstr ""
 
-#: /sales/sales_order_entry.php:208
+#: /sales/sales_order_entry.php:213
 msgid "Enter a &New Delivery"
 msgstr ""
 
-#: /sales/sales_order_entry.php:216
+#: /sales/sales_order_entry.php:221
 #, php-format
 msgid "Invoice # %d has been entered."
 msgstr ""
 
-#: /sales/sales_order_entry.php:220
+#: /sales/sales_order_entry.php:225
 msgid "&Print Sales Invoice"
 msgstr ""
 
-#: /sales/sales_order_entry.php:221
+#: /sales/sales_order_entry.php:226
 msgid "&Email Sales Invoice"
 msgstr ""
 
-#: /sales/sales_order_entry.php:226
+#: /sales/sales_order_entry.php:231
 msgid "Print &Receipt"
 msgstr ""
 
-#: /sales/sales_order_entry.php:231
+#: /sales/sales_order_entry.php:236
 msgid "Enter a &New Template Invoice"
 msgstr ""
 
-#: /sales/sales_order_entry.php:234
+#: /sales/sales_order_entry.php:239
 msgid "Enter a &New Direct Invoice"
 msgstr ""
 
-#: /sales/sales_order_entry.php:385
+#: /sales/sales_order_entry.php:390
 msgid "Pre-payment required have to be positive and less than total amount."
 msgstr ""
 
-#: /sales/sales_order_entry.php:390
+#: /sales/sales_order_entry.php:395
 msgid ""
 "You must enter the person or company to whom delivery should be made to."
 msgstr ""
 
-#: /sales/sales_order_entry.php:396
+#: /sales/sales_order_entry.php:401
 msgid ""
 "You should enter the street address in the box provided. Orders cannot be "
 "accepted without a valid street address."
 msgstr ""
 
-#: /sales/sales_order_entry.php:405
+#: /sales/sales_order_entry.php:410
 msgid "The shipping cost entered is expected to be numeric."
 msgstr ""
 
-#: /sales/sales_order_entry.php:411
+#: /sales/sales_order_entry.php:416
 msgid "The Valid date is invalid."
 msgstr ""
 
-#: /sales/sales_order_entry.php:413
+#: /sales/sales_order_entry.php:418
 msgid "The delivery date is invalid."
 msgstr ""
 
-#: /sales/sales_order_entry.php:419
+#: /sales/sales_order_entry.php:424
 msgid "The requested valid date is before the date of the quotation."
 msgstr ""
 
-#: /sales/sales_order_entry.php:421
+#: /sales/sales_order_entry.php:426
 msgid "The requested delivery date is before the date of the order."
 msgstr ""
 
-#: /sales/sales_order_entry.php:430
+#: /sales/sales_order_entry.php:435
 msgid "You need to define a cash account for your Sales Point."
 msgstr ""
 
-#: /sales/sales_order_entry.php:468
+#: /sales/sales_order_entry.php:473
 msgid ""
 "The reference number field has been increased. Please save the document "
 "again."
 msgstr ""
 
-#: /sales/sales_order_entry.php:514
+#: /sales/sales_order_entry.php:519
 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:518
+#: /sales/sales_order_entry.php:523
 msgid "Price for inventory item must be entered and can not be less than 0"
 msgstr ""
 
-#: /sales/sales_order_entry.php:525
+#: /sales/sales_order_entry.php:530
 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:543
+#: /sales/sales_order_entry.php:548
 #, php-format
 msgid "Price %s is below Standard Cost %s"
 msgstr ""
 
-#: /sales/sales_order_entry.php:568
+#: /sales/sales_order_entry.php:573
 msgid ""
 "This item cannot be deleted because some of it has already been delivered."
 msgstr ""
 
-#: /sales/sales_order_entry.php:597
+#: /sales/sales_order_entry.php:602
 msgid "Direct delivery entry has been cancelled as requested."
 msgstr ""
 
-#: /sales/sales_order_entry.php:598
+#: /sales/sales_order_entry.php:603
 msgid "Enter a New Sales Delivery"
 msgstr ""
 
-#: /sales/sales_order_entry.php:600
+#: /sales/sales_order_entry.php:605
 msgid "Direct invoice entry has been cancelled as requested."
 msgstr ""
 
-#: /sales/sales_order_entry.php:601
+#: /sales/sales_order_entry.php:606
 msgid "Enter a New Sales Invoice"
 msgstr ""
 
-#: /sales/sales_order_entry.php:606
+#: /sales/sales_order_entry.php:611
 msgid "This sales quotation has been cancelled as requested."
 msgstr ""
 
-#: /sales/sales_order_entry.php:607
+#: /sales/sales_order_entry.php:612
 msgid "Enter a New Sales Quotation"
 msgstr ""
 
-#: /sales/sales_order_entry.php:614
+#: /sales/sales_order_entry.php:619
 msgid "Undelivered part of order has been cancelled as requested."
 msgstr ""
 
-#: /sales/sales_order_entry.php:615
+#: /sales/sales_order_entry.php:620
 msgid "Select Another Sales Order for Edition"
 msgstr ""
 
-#: /sales/sales_order_entry.php:619
+#: /sales/sales_order_entry.php:624
 msgid "This sales order has been cancelled as requested."
 msgstr ""
 
-#: /sales/sales_order_entry.php:620
+#: /sales/sales_order_entry.php:625
 msgid "Enter a New Sales Order"
 msgstr ""
 
-#: /sales/sales_order_entry.php:698
+#: /sales/sales_order_entry.php:705
 msgid "Sales Invoice Items"
 msgstr ""
 
-#: /sales/sales_order_entry.php:699
+#: /sales/sales_order_entry.php:706
 msgid "Enter Delivery Details and Confirm Invoice"
 msgstr ""
 
-#: /sales/sales_order_entry.php:701
+#: /sales/sales_order_entry.php:708
 msgid "Place Invoice"
 msgstr ""
 
-#: /sales/sales_order_entry.php:704
+#: /sales/sales_order_entry.php:711
 msgid "Delivery Note Items"
 msgstr ""
 
-#: /sales/sales_order_entry.php:705
+#: /sales/sales_order_entry.php:712
 msgid "Enter Delivery Details and Confirm Dispatch"
 msgstr ""
 
-#: /sales/sales_order_entry.php:706
+#: /sales/sales_order_entry.php:713
 msgid "Cancel Delivery"
 msgstr ""
 
-#: /sales/sales_order_entry.php:707
+#: /sales/sales_order_entry.php:714
 msgid "Place Delivery"
 msgstr ""
 
-#: /sales/sales_order_entry.php:709
+#: /sales/sales_order_entry.php:716
 msgid "Quotation Date:"
 msgstr ""
 
-#: /sales/sales_order_entry.php:710
+#: /sales/sales_order_entry.php:717
 msgid "Sales Quotation Items"
 msgstr ""
 
-#: /sales/sales_order_entry.php:711
+#: /sales/sales_order_entry.php:718
 msgid "Enter Delivery Details and Confirm Quotation"
 msgstr ""
 
-#: /sales/sales_order_entry.php:712
+#: /sales/sales_order_entry.php:719
 msgid "Cancel Quotation"
 msgstr ""
 
-#: /sales/sales_order_entry.php:713
+#: /sales/sales_order_entry.php:720
 msgid "Place Quotation"
 msgstr ""
 
-#: /sales/sales_order_entry.php:714
+#: /sales/sales_order_entry.php:721
 msgid "Commit Quotations Changes"
 msgstr ""
 
-#: /sales/sales_order_entry.php:718
+#: /sales/sales_order_entry.php:725
 msgid "Enter Delivery Details and Confirm Order"
 msgstr ""
 
-#: /sales/sales_order_entry.php:721
+#: /sales/sales_order_entry.php:728
 msgid "Commit Order Changes"
 msgstr ""
 
-#: /sales/sales_order_entry.php:743
-#: /sales/sales_order_entry.php:749
+#: /sales/sales_order_entry.php:750
+#: /sales/sales_order_entry.php:756
 msgid ""
 "Cancels document entry or removes sales order when editing an old document"
 msgstr ""
 
-#: /sales/sales_order_entry.php:744
-#: /sales/sales_order_entry.php:753
+#: /sales/sales_order_entry.php:751
+#: /sales/sales_order_entry.php:760
 msgid "You are about to void this Document.\\nDo you want to continue?"
 msgstr ""
 
-#: /sales/sales_order_entry.php:747
+#: /sales/sales_order_entry.php:754
 msgid "Validate changes and update document"
 msgstr ""
 
-#: /sales/sales_order_entry.php:751
+#: /sales/sales_order_entry.php:758
 msgid ""
 "You are about to cancel undelivered part of this order.\\nDo you want to "
 "continue?"
@@ -15047,7 +15686,7 @@ msgid "Customer Allocations"
 msgstr ""
 
 #: /sales/allocations/customer_allocation_main.php:32
-#: /sales/manage/customer_branches.php:266
+#: /sales/manage/customer_branches.php:270
 #: /sales/manage/customers.php:329
 #: /sales/inquiry/customer_allocation_inquiry.php:42
 #: /sales/inquiry/customer_inquiry.php:44
@@ -15098,142 +15737,144 @@ msgstr ""
 msgid "Dissallow invoicing ?"
 msgstr ""
 
-#: /sales/manage/customer_branches.php:18
+#: /sales/manage/customer_branches.php:22
+#: /sales/inquiry/customer_branches_list.php:25
 msgid "Customer Branches"
 msgstr ""
 
-#: /sales/manage/customer_branches.php:25
+#: /sales/manage/customer_branches.php:29
 msgid ""
 "There are no customers defined in the system. Please define a customer to "
 "add customer branches."
 msgstr ""
 
-#: /sales/manage/customer_branches.php:27
+#: /sales/manage/customer_branches.php:31
 msgid ""
 "There are no sales people defined in the system. At least one sales person "
 "is required before proceeding."
 msgstr ""
 
-#: /sales/manage/customer_branches.php:29
+#: /sales/manage/customer_branches.php:33
 msgid ""
 "There are no sales areas defined in the system. At least one sales area is "
 "required before proceeding."
 msgstr ""
 
-#: /sales/manage/customer_branches.php:31
+#: /sales/manage/customer_branches.php:35
 msgid ""
 "There are no shipping companies defined in the system. At least one shipping "
 "company is required before proceeding."
 msgstr ""
 
-#: /sales/manage/customer_branches.php:63
+#: /sales/manage/customer_branches.php:67
 msgid "The Branch name cannot be empty."
 msgstr ""
 
-#: /sales/manage/customer_branches.php:70
+#: /sales/manage/customer_branches.php:74
 msgid "The Branch short name cannot be empty."
 msgstr ""
 
-#: /sales/manage/customer_branches.php:86
+#: /sales/manage/customer_branches.php:90
 msgid "Selected customer branch has been updated"
 msgstr ""
 
-#: /sales/manage/customer_branches.php:104
+#: /sales/manage/customer_branches.php:108
 msgid "New customer branch has been added"
 msgstr ""
 
-#: /sales/manage/customer_branches.php:120
+#: /sales/manage/customer_branches.php:124
 msgid ""
 "Cannot delete this branch because customer transactions have been created to "
 "this branch."
 msgstr ""
 
-#: /sales/manage/customer_branches.php:127
+#: /sales/manage/customer_branches.php:131
 msgid ""
 "Cannot delete this branch because sales orders exist for it. Purge old sales "
 "orders first."
 msgstr ""
 
-#: /sales/manage/customer_branches.php:132
+#: /sales/manage/customer_branches.php:136
 msgid "Selected customer branch has been deleted"
 msgstr ""
 
-#: /sales/manage/customer_branches.php:205
+#: /sales/manage/customer_branches.php:209
 msgid "Main Branch"
 msgstr ""
 
-#: /sales/manage/customer_branches.php:224
+#: /sales/manage/customer_branches.php:228
 msgid "Name and Contact"
 msgstr ""
 
-#: /sales/manage/customer_branches.php:225
+#: /sales/manage/customer_branches.php:229
 msgid "Branch Name:"
 msgstr ""
 
-#: /sales/manage/customer_branches.php:226
+#: /sales/manage/customer_branches.php:230
 msgid "Branch Short Name:"
 msgstr ""
 
-#: /sales/manage/customer_branches.php:229
+#: /sales/manage/customer_branches.php:233
 #: /sales/manage/customers.php:261
 msgid "Sales Person:"
 msgstr ""
 
-#: /sales/manage/customer_branches.php:230
+#: /sales/manage/customer_branches.php:234
 #: /sales/manage/customers.php:298
 msgid "Sales Area:"
 msgstr ""
 
-#: /sales/manage/customer_branches.php:231
+#: /sales/manage/customer_branches.php:235
 #: /sales/manage/recurrent_invoices.php:200
 msgid "Sales Group:"
 msgstr ""
 
-#: /sales/manage/customer_branches.php:232
+#: /sales/manage/customer_branches.php:236
 #: /sales/manage/customers.php:296
 msgid "Default Inventory Location:"
 msgstr ""
 
-#: /sales/manage/customer_branches.php:233
+#: /sales/manage/customer_branches.php:237
 #: /sales/manage/customers.php:297
 msgid "Default Shipping Company:"
 msgstr ""
 
-#: /sales/manage/customer_branches.php:240
+#: /sales/manage/customer_branches.php:244
 msgid "Accounts Receivable Account:"
 msgstr ""
 
-#: /sales/manage/customer_branches.php:247
+#: /sales/manage/customer_branches.php:251
 msgid "General contact data"
 msgstr ""
 
-#: /sales/manage/customer_branches.php:257
+#: /sales/manage/customer_branches.php:261
 msgid "Billing Address:"
 msgstr ""
 
-#: /sales/manage/customer_branches.php:281
+#: /sales/manage/customer_branches.php:285
+#: /sales/inquiry/customer_branches_list.php:49
 #: /sales/inquiry/sales_deliveries_view.php:172
 msgid "Contact"
 msgstr ""
 
-#: /sales/manage/customer_branches.php:283
+#: /sales/manage/customer_branches.php:287
 msgid "Area"
 msgstr ""
 
-#: /sales/manage/customer_branches.php:284
+#: /sales/manage/customer_branches.php:288
 msgid "Phone No"
 msgstr ""
 
-#: /sales/manage/customer_branches.php:285
+#: /sales/manage/customer_branches.php:289
 msgid "Fax No"
 msgstr ""
 
-#: /sales/manage/customer_branches.php:287
+#: /sales/manage/customer_branches.php:291
 msgid "Tax Group"
 msgstr ""
 
-#: /sales/manage/customer_branches.php:303
-#: /sales/includes/ui/sales_order_ui.inc:291
+#: /sales/manage/customer_branches.php:307
+#: /sales/includes/ui/sales_order_ui.inc:288
 msgid ""
 "The selected customer does not have any branches. Please create at least one "
 "branch."
@@ -15733,11 +16374,11 @@ msgstr ""
 msgid "There are no line items on this dispatch."
 msgstr ""
 
-#: /sales/view/view_dispatch.php:162
+#: /sales/view/view_dispatch.php:163
 msgid "TOTAL VALUE"
 msgstr ""
 
-#: /sales/view/view_dispatch.php:166
+#: /sales/view/view_dispatch.php:167
 msgid "This dispatch has been voided."
 msgstr ""
 
@@ -15989,11 +16630,11 @@ msgstr ""
 msgid "Quote Total"
 msgstr ""
 
-#: /sales/inquiry/sales_orders_view.php:302
+#: /sales/inquiry/sales_orders_view.php:301
 msgid "Tmpl"
 msgstr ""
 
-#: /sales/includes/cart_class.inc:398
+#: /sales/includes/cart_class.inc:399
 msgid "You have to enter valid stock code or nonempty description"
 msgstr ""
 
@@ -16011,20 +16652,20 @@ msgid ""
 "charges."
 msgstr ""
 
-#: /sales/includes/db/recurrent_invoices_db.inc:154
+#: /sales/includes/db/recurrent_invoices_db.inc:158
 #, php-format
 msgid "Unknown %s price for '%s' in pricelist '%s'"
 msgstr ""
 
-#: /sales/includes/db/sales_credit_db.inc:189
+#: /sales/includes/db/sales_credit_db.inc:186
 msgid "Return"
 msgstr ""
 
-#: /sales/includes/db/sales_credit_db.inc:191
+#: /sales/includes/db/sales_credit_db.inc:188
 msgid "Ex Inv:"
 msgstr ""
 
-#: /sales/includes/db/sales_invoice_db.inc:201
+#: /sales/includes/db/sales_invoice_db.inc:200
 msgid "Cash invoice"
 msgstr ""
 
@@ -16032,18 +16673,18 @@ msgstr ""
 msgid "Deleted."
 msgstr ""
 
-#: /sales/includes/ui/sales_credit_ui.inc:95
-#: /sales/includes/ui/sales_order_ui.inc:370
+#: /sales/includes/ui/sales_credit_ui.inc:90
+#: /sales/includes/ui/sales_order_ui.inc:367
 msgid "Customer Currency:"
 msgstr ""
 
-#: /sales/includes/ui/sales_credit_ui.inc:113
-#: /sales/includes/ui/sales_order_ui.inc:640
+#: /sales/includes/ui/sales_credit_ui.inc:108
+#: /sales/includes/ui/sales_order_ui.inc:639
 msgid "Shipping Company:"
 msgstr ""
 
-#: /sales/includes/ui/sales_credit_ui.inc:115
-#: /sales/includes/ui/sales_order_ui.inc:377
+#: /sales/includes/ui/sales_credit_ui.inc:110
+#: /sales/includes/ui/sales_order_ui.inc:374
 msgid "Customer Discount:"
 msgstr ""
 
@@ -16057,98 +16698,102 @@ msgid ""
 "have any branches."
 msgstr ""
 
-#: /sales/includes/ui/sales_order_ui.inc:219
+#: /sales/includes/ui/sales_order_ui.inc:218
 msgid "Shipping Charge"
 msgstr ""
 
-#: /sales/includes/ui/sales_order_ui.inc:289
+#: /sales/includes/ui/sales_order_ui.inc:286
 msgid "No customer found for entered text."
 msgstr ""
 
-#: /sales/includes/ui/sales_order_ui.inc:315
+#: /sales/includes/ui/sales_order_ui.inc:312
 #, php-format
 msgid "Customer's payment terms '%s' cannot be selected on this POS"
 msgstr ""
 
-#: /sales/includes/ui/sales_order_ui.inc:364
+#: /sales/includes/ui/sales_order_ui.inc:361
 msgid "Reference number unique for this document type"
 msgstr ""
 
-#: /sales/includes/ui/sales_order_ui.inc:406
-#: /sales/includes/ui/sales_order_ui.inc:408
+#: /sales/includes/ui/sales_order_ui.inc:403
+#: /sales/includes/ui/sales_order_ui.inc:405
 msgid "Price List:"
 msgstr ""
 
-#: /sales/includes/ui/sales_order_ui.inc:425
+#: /sales/includes/ui/sales_order_ui.inc:422
 msgid "Date of order receive"
 msgstr ""
 
-#: /sales/includes/ui/sales_order_ui.inc:575
+#: /sales/includes/ui/sales_order_ui.inc:503
+msgid "[Select item]"
+msgstr ""
+
+#: /sales/includes/ui/sales_order_ui.inc:574
 msgid "Cash payment"
 msgstr ""
 
-#: /sales/includes/ui/sales_order_ui.inc:578
-#: /sales/includes/ui/sales_order_ui.inc:610
+#: /sales/includes/ui/sales_order_ui.inc:577
+#: /sales/includes/ui/sales_order_ui.inc:609
 msgid "Deliver from Location:"
 msgstr ""
 
-#: /sales/includes/ui/sales_order_ui.inc:581
+#: /sales/includes/ui/sales_order_ui.inc:580
 msgid "Cash account:"
 msgstr ""
 
-#: /sales/includes/ui/sales_order_ui.inc:588
+#: /sales/includes/ui/sales_order_ui.inc:587
 msgid "Delivery Details"
 msgstr ""
 
-#: /sales/includes/ui/sales_order_ui.inc:593
+#: /sales/includes/ui/sales_order_ui.inc:592
 msgid "Invoice Delivery Details"
 msgstr ""
 
-#: /sales/includes/ui/sales_order_ui.inc:594
+#: /sales/includes/ui/sales_order_ui.inc:593
 msgid "Invoice before"
 msgstr ""
 
-#: /sales/includes/ui/sales_order_ui.inc:598
+#: /sales/includes/ui/sales_order_ui.inc:597
 msgid "Quotation Delivery Details"
 msgstr ""
 
-#: /sales/includes/ui/sales_order_ui.inc:603
+#: /sales/includes/ui/sales_order_ui.inc:602
 msgid "Order Delivery Details"
 msgstr ""
 
-#: /sales/includes/ui/sales_order_ui.inc:624
+#: /sales/includes/ui/sales_order_ui.inc:623
 msgid "Enter requested day of delivery"
 msgstr ""
 
-#: /sales/includes/ui/sales_order_ui.inc:625
+#: /sales/includes/ui/sales_order_ui.inc:624
 msgid "Enter Valid until Date"
 msgstr ""
 
-#: /sales/includes/ui/sales_order_ui.inc:626
+#: /sales/includes/ui/sales_order_ui.inc:625
 msgid "Deliver To:"
 msgstr ""
 
-#: /sales/includes/ui/sales_order_ui.inc:627
+#: /sales/includes/ui/sales_order_ui.inc:626
 msgid "Additional identifier for delivery e.g. name of receiving person"
 msgstr ""
 
-#: /sales/includes/ui/sales_order_ui.inc:630
+#: /sales/includes/ui/sales_order_ui.inc:629
 msgid "Delivery address. Default is address of customer branch"
 msgstr ""
 
-#: /sales/includes/ui/sales_order_ui.inc:634
+#: /sales/includes/ui/sales_order_ui.inc:633
 msgid "Contact Phone Number:"
 msgstr ""
 
-#: /sales/includes/ui/sales_order_ui.inc:635
+#: /sales/includes/ui/sales_order_ui.inc:634
 msgid "Phone number of ordering person. Defaults to branch phone number"
 msgstr ""
 
-#: /sales/includes/ui/sales_order_ui.inc:636
+#: /sales/includes/ui/sales_order_ui.inc:635
 msgid "Customer Reference:"
 msgstr ""
 
-#: /sales/includes/ui/sales_order_ui.inc:637
+#: /sales/includes/ui/sales_order_ui.inc:636
 msgid "Customer reference number for this order (if any)"
 msgstr ""
 
@@ -16317,11 +16962,16 @@ msgstr ""
 
 #: /themes/default/renderer.php:71
 #: /themes/default/renderer.php:80
-msgid "Help"
+msgid "Preferences"
 msgstr ""
 
-#: /themes/default/renderer.php:75
-msgid "Preferences"
+#: /themes/default/renderer.php:72
+msgid "Change Password"
+msgstr ""
+
+#: /themes/default/renderer.php:74
+#: /themes/default/renderer.php:85
+msgid "Help"
 msgstr ""
 
 #: /sql/alter2.1.php:19
@@ -16374,30 +17024,50 @@ msgstr ""
 msgid "Upgrade from version 2.2 to 2.3"
 msgstr ""
 
-#: /sql/alter2.4.php:22
-msgid "Upgrade from version 2.3 to 2.4"
+#: /sql/alter2.4.php:23
+msgid "Upgrade from version 2.3 to 2.4RC1"
 msgstr ""
 
-#: /sql/alter2.4.php:30
+#: /sql/alter2.4.php:31
+#: /sql/alter2.4rc1.php:31
 msgid "Set optimal parameters and start upgrade:"
 msgstr ""
 
-#: /sql/alter2.4.php:33
+#: /sql/alter2.4.php:34
 msgid "Text collation optimization:"
 msgstr ""
 
-#: /sql/alter2.4.php:99
+#: /sql/alter2.4.php:83
+msgid "Cannot update config_db.php file."
+msgstr ""
+
+#: /sql/alter2.4.php:122
 #, php-format
 msgid ""
 "Cannot update work orders costs:\n"
 "%s"
 msgstr ""
 
-#: /sql/alter2.4.php:189
+#: /sql/alter2.4.php:215
 msgid "Convertion to utf8 done."
 msgstr ""
 
-#: /sql/alter2.4.php:228
+#: /sql/alter2.4.php:254
 #, php-format
 msgid "Cannot drop column in %s table: %s"
 msgstr ""
+
+#: /sql/alter2.4rc1.php:23
+msgid "Upgrade from version 2.4beta to 2.4RC1"
+msgstr ""
+
+#: /sql/alter2.4rc1.php:36
+msgid "None (will be set later)"
+msgstr ""
+
+#: /sql/alter2.4rc1.php:71
+#, php-format
+msgid ""
+"Cannot update sys prefs setting:\n"
+"%s"
+msgstr ""