Updating the empty.po language file. Files adjustment.
[fa-stable.git] / lang / new_language_template / LC_MESSAGES / empty.po
index 68c6f37fbbabc508245a438f4a2e182e185c05b0..a89005eef896fe6f1b740d9397df5d6a4741f03c 100644 (file)
@@ -1,16 +1,16 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# Front Accounting internationalization file.
+# Copyright (C) 2007-2022 Front Accounting Team
+# This file is distributed under the same license as the Front Accounting package.
+# Joe Hunt <joe@frontaccounting.com>, 2007.
 #
 #, fuzzy
 msgid ""
 msgstr ""
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: 2.4\n"
 "Report-Msgid-Bugs-To: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-03-16 17:28+0100\n"
+"POT-Creation-Date: 2022-09-26 10:57+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Last-Translator: Joe Hunt <joe@frontaccounting.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
@@ -21,8 +21,10 @@ msgstr ""
 msgid "Main  Menu"
 msgstr ""
 
 msgid "Main  Menu"
 msgstr ""
 
-#: frontaccounting.php:74 access/logout.php:21 themes/default/renderer.php:73
-#: themes/default/renderer.php:87
+#: frontaccounting.php:74 access/logout.php:21 themes/canvas/renderer.php:42
+#: themes/canvas/renderer.php:53 themes/default/renderer.php:73
+#: themes/default/renderer.php:87 themes/dropdown/renderer.php:84
+#: themes/dropdown/renderer.php:93
 msgid "Logout"
 msgstr ""
 
 msgid "Logout"
 msgstr ""
 
@@ -30,59 +32,63 @@ msgstr ""
 msgid "Restricted access"
 msgstr ""
 
 msgid "Restricted access"
 msgstr ""
 
-#: access/login.php:27
+#: access/login.php:28
 msgid "Login as user: demouser and password: password"
 msgstr ""
 
 msgid "Login as user: demouser and password: password"
 msgstr ""
 
-#: access/login.php:31
+#: access/login.php:32
 msgid "Please login here"
 msgstr ""
 
 msgid "Please login here"
 msgstr ""
 
-#: access/login.php:33
+#: access/login.php:34
 msgid "or"
 msgstr ""
 
 msgid "or"
 msgstr ""
 
-#: access/login.php:33
+#: access/login.php:34
 msgid "request new password"
 msgstr ""
 
 msgid "request new password"
 msgstr ""
 
-#: access/login.php:39
+#: access/login.php:45
 msgid "Too many failed login attempts.<br>Please wait a while or try later."
 msgstr ""
 
 msgid "Too many failed login attempts.<br>Please wait a while or try later."
 msgstr ""
 
-#: access/login.php:53 access/login.php:84
+#: access/login.php:47
+msgid "Invalid password or username. Please, try again."
+msgstr ""
+
+#: access/login.php:57 access/login.php:89
 msgid "Authorization timeout"
 msgstr ""
 
 msgid "Authorization timeout"
 msgstr ""
 
-#: access/login.php:53 access/login.php:90
+#: access/login.php:57 access/login.php:94
 msgid "Login"
 msgstr ""
 
 msgid "Login"
 msgstr ""
 
-#: access/login.php:90 access/password_reset.php:61
+#: access/login.php:94 access/password_reset.php:61
 msgid "Version"
 msgstr ""
 
 msgid "Version"
 msgstr ""
 
-#: access/login.php:93
+#: access/login.php:98
 msgid "User name"
 msgstr ""
 
 msgid "User name"
 msgstr ""
 
-#: access/login.php:97 admin/users.php:200
+#: access/login.php:102 admin/users.php:202
 msgid "Password:"
 msgstr ""
 
 msgid "Password:"
 msgstr ""
 
-#: access/login.php:106 access/login.php:112 access/password_reset.php:69
+#: access/login.php:111 access/login.php:117 access/password_reset.php:69
 #: access/password_reset.php:75 admin/create_coy.php:247
 #: access/password_reset.php:75 admin/create_coy.php:247
-#: admin/create_coy.php:327 admin/inst_upgrade.php:63
-#: includes/sysnames.inc:208
+#: admin/create_coy.php:327 admin/inst_upgrade.php:63 includes/sysnames.inc:210
 msgid "Company"
 msgstr ""
 
 msgid "Company"
 msgstr ""
 
-#: access/login.php:120
+#: access/login.php:125
 msgid "Login -->"
 msgstr ""
 
 msgid "Login -->"
 msgstr ""
 
-#: access/login.php:155 access/password_reset.php:106
-#: admin/display_prefs.php:123 themes/default/renderer.php:136
+#: access/login.php:160 access/password_reset.php:106
+#: admin/display_prefs.php:125 themes/canvas/renderer.php:184
+#: themes/default/renderer.php:136 themes/dropdown/renderer.php:210
 msgid "Theme:"
 msgstr ""
 
 msgid "Theme:"
 msgstr ""
 
@@ -99,8 +105,8 @@ msgid "Password reset"
 msgstr ""
 
 #: access/password_reset.php:63 reporting/rep103.php:274
 msgstr ""
 
 #: access/password_reset.php:63 reporting/rep103.php:274
-#: reporting/rep106.php:94 reporting/rep205.php:186
-#: reporting/includes/header2.inc:112 sales/manage/sales_people.php:99
+#: reporting/rep106.php:95 reporting/rep205.php:186
+#: reporting/includes/header2.inc:110 sales/manage/sales_people.php:99
 msgid "Email"
 msgstr ""
 
 msgid "Email"
 msgstr ""
 
@@ -112,36 +118,45 @@ msgstr ""
 msgid "Attach Documents"
 msgstr ""
 
 msgid "Attach Documents"
 msgstr ""
 
-#: admin/attachments.php:83 admin/db/voiding_db.inc:28
+#: admin/attachments.php:85 admin/db/voiding_db.inc:28
 #: admin/db/voiding_db.inc:40 admin/db/voiding_db.inc:53
 #: 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
+#: admin/db/voiding_db.inc:68 admin/db/voiding_db.inc:74
+#: admin/db/voiding_db.inc:93 admin/db/voiding_db.inc:100
+#: admin/db/voiding_db.inc:106 admin/db/voiding_db.inc:114
 msgid "Selected transaction does not exists."
 msgstr ""
 
 msgid "Selected transaction does not exists."
 msgstr ""
 
-#: admin/attachments.php:85 admin/attachments.php:90
+#: admin/attachments.php:88
+msgid "Only graphics,pdf,doc and odt files are supported."
+msgstr ""
+
+#: admin/attachments.php:90 admin/attachments.php:95
 msgid "Select attachment file."
 msgstr ""
 
 msgid "Select attachment file."
 msgstr ""
 
-#: admin/attachments.php:88 admin/company_preferences.php:42
-#: inventory/manage/items.php:83
+#: admin/attachments.php:93 admin/company_preferences.php:73
+#: inventory/manage/items.php:129
 msgid "The file size is over the maximum allowed."
 msgstr ""
 
 msgid "The file size is over the maximum allowed."
 msgstr ""
 
-#: admin/attachments.php:131
+#: admin/attachments.php:97
+msgid ""
+"File name exceeds maximum of 60 chars. Please change filename and try again."
+msgstr ""
+
+#: admin/attachments.php:136
 msgid "Attachment has been inserted."
 msgstr ""
 
 msgid "Attachment has been inserted."
 msgstr ""
 
-#: admin/attachments.php:137
+#: admin/attachments.php:142
 msgid "Attachment has been updated."
 msgstr ""
 
 msgid "Attachment has been updated."
 msgstr ""
 
-#: admin/attachments.php:152
+#: admin/attachments.php:157
 msgid "Attachment has been deleted."
 msgstr ""
 
 msgid "Attachment has been deleted."
 msgstr ""
 
-#: admin/attachments.php:170 admin/view_print_transaction.php:72
+#: admin/attachments.php:179 admin/view_print_transaction.php:72
 #: gl/inquiry/journal_inquiry.php:47
 #: manufacturing/work_order_add_finished.php:191
 #: manufacturing/work_order_costs.php:136
 #: gl/inquiry/journal_inquiry.php:47
 #: manufacturing/work_order_add_finished.php:191
 #: manufacturing/work_order_costs.php:136
@@ -152,161 +167,184 @@ msgstr ""
 msgid "Type:"
 msgstr ""
 
 msgid "Type:"
 msgstr ""
 
-#: admin/attachments.php:186 admin/create_coy.php:269
+#: admin/attachments.php:184 sales/allocations/customer_allocation_main.php:32
+#: sales/inquiry/customer_allocation_inquiry.php:42
+#: sales/inquiry/customer_inquiry.php:159
+#: sales/inquiry/sales_deliveries_view.php:115
+#: sales/inquiry/sales_orders_view.php:252 sales/manage/customers.php:331
+#: sales/manage/customer_branches.php:270
+msgid "Select a customer: "
+msgstr ""
+
+#: admin/attachments.php:186 purchasing/inquiry/po_search.php:76
+#: purchasing/inquiry/po_search_completed.php:104
+#: purchasing/inquiry/supplier_allocation_inquiry.php:48
+#: purchasing/manage/suppliers.php:302
+msgid "Select a supplier: "
+msgstr ""
+
+#: admin/attachments.php:201 admin/create_coy.php:269
 #: admin/crm_categories.php:106 admin/fiscalyears.php:164
 #: admin/inst_lang.php:100 admin/payment_terms.php:142 admin/printers.php:96
 #: admin/crm_categories.php:106 admin/fiscalyears.php:164
 #: admin/inst_lang.php:100 admin/payment_terms.php:142 admin/printers.php:96
-#: admin/shipping_companies.php:106 admin/tags.php:140 admin/users.php:153
-#: dimensions/inquiry/search_dimensions.php:116
-#: gl/manage/bank_accounts.php:133 gl/manage/currencies.php:164
-#: gl/manage/exchange_rates.php:94 gl/manage/gl_account_classes.php:131
-#: gl/manage/gl_account_types.php:159 gl/manage/gl_quick_entries.php:201
-#: gl/manage/gl_quick_entries.php:303 gl/includes/ui/gl_bank_ui.inc:179
-#: gl/includes/ui/gl_journal_ui.inc:160 includes/ui/class.crud_view.inc:281
+#: admin/shipping_companies.php:106 admin/tags.php:140 admin/users.php:155
+#: dimensions/inquiry/search_dimensions.php:117
+#: fixed_assets/fixed_asset_classes.php:101 gl/includes/ui/gl_bank_ui.inc:179
+#: gl/includes/ui/gl_journal_ui.inc:160 gl/manage/bank_accounts.php:133
+#: gl/manage/currencies.php:164 gl/manage/exchange_rates.php:94
+#: gl/manage/gl_account_classes.php:131 gl/manage/gl_account_types.php:159
+#: gl/manage/gl_quick_entries.php:201 gl/manage/gl_quick_entries.php:303
+#: includes/ui/attachment.inc:94 includes/ui/class.crud_view.inc:290
 #: includes/ui/contacts_view.inc:61 includes/ui/simple_crud_class.inc:52
 #: includes/ui/contacts_view.inc:61 includes/ui/simple_crud_class.inc:52
-#: 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:170 inventory/manage/sales_kits.php:51
-#: manufacturing/manage/bom_edit.php:59
-#: manufacturing/manage/work_centres.php:114
+#: includes/ui/ui_view.inc:1583 inventory/prices.php:163
+#: inventory/purchasing_data.php:168
+#: inventory/includes/item_adjustments_ui.inc:106
+#: inventory/includes/stock_transfers_ui.inc:85
+#: inventory/manage/item_categories.php:147 inventory/manage/item_codes.php:146
+#: inventory/manage/item_units.php:110 inventory/manage/locations.php:170
+#: inventory/manage/sales_kits.php:51
 #: manufacturing/includes/work_order_issue_ui.inc:61
 #: manufacturing/includes/work_order_issue_ui.inc:61
+#: manufacturing/manage/bom_edit.php:60
+#: manufacturing/manage/work_centres.php:114
+#: purchasing/includes/ui/invoice_ui.inc:319
 #: purchasing/includes/ui/invoice_ui.inc:551
 #: purchasing/includes/ui/invoice_ui.inc:551
-#: purchasing/includes/ui/po_ui.inc:249 sales/manage/credit_status.php:119
+#: purchasing/includes/ui/po_ui.inc:253
+#: sales/includes/ui/sales_credit_ui.inc:192
+#: sales/includes/ui/sales_order_ui.inc:196 sales/manage/credit_status.php:119
 #: sales/manage/customer_branches.php:158
 #: sales/manage/recurrent_invoices.php:156 sales/manage/sales_areas.php:103
 #: sales/manage/sales_groups.php:99 sales/manage/sales_people.php:119
 #: sales/manage/sales_points.php:99 sales/manage/sales_types.php:121
 #: sales/manage/customer_branches.php:158
 #: sales/manage/recurrent_invoices.php:156 sales/manage/sales_areas.php:103
 #: sales/manage/sales_groups.php:99 sales/manage/sales_people.php:119
 #: sales/manage/sales_points.php:99 sales/manage/sales_types.php:121
-#: sales/includes/ui/sales_credit_ui.inc:192
-#: sales/includes/ui/sales_order_ui.inc:196 taxes/item_tax_types.php:139
-#: taxes/tax_groups.php:140 taxes/tax_types.php:132
+#: taxes/item_tax_types.php:139 taxes/tax_groups.php:140
+#: taxes/tax_types.php:132
 msgid "Edit"
 msgstr ""
 
 msgid "Edit"
 msgstr ""
 
-#: admin/attachments.php:191 gl/inquiry/journal_inquiry.php:116
+#: admin/attachments.php:206 gl/inquiry/journal_inquiry.php:122
 msgid "View"
 msgstr ""
 
 msgid "View"
 msgstr ""
 
-#: admin/attachments.php:196
+#: admin/attachments.php:211 includes/ui/attachment.inc:96
 msgid "Download"
 msgstr ""
 
 msgid "Download"
 msgstr ""
 
-#: admin/attachments.php:201 admin/create_coy.php:272
+#: admin/attachments.php:216 admin/create_coy.php:272
 #: admin/crm_categories.php:110 admin/fiscalyears.php:166
 #: admin/inst_chart.php:90 admin/inst_lang.php:109 admin/inst_module.php:152
 #: admin/inst_theme.php:87 admin/payment_terms.php:143 admin/printers.php:97
 #: admin/crm_categories.php:110 admin/fiscalyears.php:166
 #: admin/inst_chart.php:90 admin/inst_lang.php:109 admin/inst_module.php:152
 #: admin/inst_theme.php:87 admin/payment_terms.php:143 admin/printers.php:97
-#: admin/shipping_companies.php:107 admin/tags.php:141 admin/users.php:155
-#: gl/gl_budget.php:136 gl/manage/bank_accounts.php:134
-#: gl/manage/currencies.php:166 gl/manage/exchange_rates.php:99
-#: gl/manage/gl_account_classes.php:132 gl/manage/gl_account_types.php:160
-#: gl/manage/gl_quick_entries.php:202 gl/manage/gl_quick_entries.php:304
+#: admin/shipping_companies.php:107 admin/tags.php:141 admin/users.php:157
+#: fixed_assets/fixed_asset_classes.php:102 gl/gl_budget.php:136
 #: gl/includes/ui/gl_bank_ui.inc:181 gl/includes/ui/gl_journal_ui.inc:162
 #: gl/includes/ui/gl_bank_ui.inc:181 gl/includes/ui/gl_journal_ui.inc:162
-#: includes/ui/class.crud_view.inc:285 includes/ui/contacts_view.inc:64
+#: gl/manage/bank_accounts.php:134 gl/manage/currencies.php:166
+#: gl/manage/exchange_rates.php:99 gl/manage/gl_account_classes.php:132
+#: gl/manage/gl_account_types.php:160 gl/manage/gl_quick_entries.php:202
+#: gl/manage/gl_quick_entries.php:304 includes/ui/attachment.inc:98
+#: includes/ui/class.crud_view.inc:294 includes/ui/contacts_view.inc:64
 #: includes/ui/simple_crud_class.inc:54 includes/ui/ui_input.inc:305
 #: includes/ui/simple_crud_class.inc:54 includes/ui/ui_input.inc:305
-#: inventory/prices.php:164 inventory/purchasing_data.php:168
-#: inventory/includes/item_adjustments_ui.inc:102
-#: inventory/includes/stock_transfers_ui.inc:84
-#: inventory/manage/item_categories.php:148
-#: inventory/manage/item_codes.php:143 inventory/manage/item_units.php:111
-#: inventory/manage/locations.php:171 inventory/manage/sales_kits.php:52
-#: manufacturing/manage/bom_edit.php:60
-#: manufacturing/manage/work_centres.php:115
+#: inventory/prices.php:164 inventory/purchasing_data.php:169
+#: inventory/includes/item_adjustments_ui.inc:111
+#: inventory/includes/stock_transfers_ui.inc:86
+#: inventory/manage/item_categories.php:148 inventory/manage/item_codes.php:147
+#: inventory/manage/item_units.php:111 inventory/manage/locations.php:171
+#: inventory/manage/sales_kits.php:52
 #: manufacturing/includes/work_order_issue_ui.inc:63
 #: manufacturing/includes/work_order_issue_ui.inc:63
+#: manufacturing/manage/bom_edit.php:61
+#: manufacturing/manage/work_centres.php:115
 #: purchasing/includes/ui/invoice_ui.inc:317
 #: purchasing/includes/ui/invoice_ui.inc:317
-#: purchasing/includes/ui/po_ui.inc:251 sales/manage/credit_status.php:120
+#: purchasing/includes/ui/po_ui.inc:255
+#: sales/includes/ui/sales_credit_ui.inc:194
+#: sales/includes/ui/sales_order_ui.inc:198 sales/manage/credit_status.php:120
 #: sales/manage/customer_branches.php:162
 #: sales/manage/recurrent_invoices.php:157 sales/manage/sales_areas.php:104
 #: sales/manage/sales_groups.php:100 sales/manage/sales_people.php:120
 #: sales/manage/sales_points.php:100 sales/manage/sales_types.php:122
 #: sales/manage/customer_branches.php:162
 #: sales/manage/recurrent_invoices.php:157 sales/manage/sales_areas.php:104
 #: sales/manage/sales_groups.php:100 sales/manage/sales_people.php:120
 #: sales/manage/sales_points.php:100 sales/manage/sales_types.php:122
-#: sales/includes/ui/sales_credit_ui.inc:194
-#: sales/includes/ui/sales_order_ui.inc:198 taxes/item_tax_types.php:140
-#: taxes/tax_groups.php:141 taxes/tax_types.php:133
+#: taxes/item_tax_types.php:140 taxes/tax_groups.php:141
+#: taxes/tax_types.php:133
 msgid "Delete"
 msgstr ""
 
 msgid "Delete"
 msgstr ""
 
-#: admin/attachments.php:208 admin/view_print_transaction.php:126
-#: admin/void_transaction.php:180 dimensions/inquiry/search_dimensions.php:124
-#: dimensions/view/view_dimension.php:55 gl/bank_account_reconcile.php:267
+#: admin/attachments.php:223 admin/view_print_transaction.php:126
+#: admin/void_transaction.php:186 dimensions/inquiry/search_dimensions.php:131
+#: dimensions/view/view_dimension.php:55
+#: fixed_assets/inquiry/stock_inquiry.php:165 gl/bank_account_reconcile.php:267
 #: gl/inquiry/bank_inquiry.php:71 gl/inquiry/gl_account_inquiry.php:128
 #: gl/inquiry/bank_inquiry.php:71 gl/inquiry/gl_account_inquiry.php:128
-#: gl/inquiry/journal_inquiry.php:106 gl/inquiry/journal_inquiry.php:121
-#: includes/ui/allocation_cart.inc:290
+#: gl/inquiry/journal_inquiry.php:112 gl/inquiry/journal_inquiry.php:127
+#: includes/ui/allocation_cart.inc:311
 #: inventory/inquiry/stock_movements.php:104
 #: inventory/inquiry/stock_movements.php:104
-#: manufacturing/search_work_orders.php:157
+#: manufacturing/search_work_orders.php:164
 #: manufacturing/includes/manufacturing_ui.inc:174
 #: manufacturing/includes/manufacturing_ui.inc:217
 #: manufacturing/includes/manufacturing_ui.inc:253
 #: manufacturing/includes/manufacturing_ui.inc:291
 #: manufacturing/includes/manufacturing_ui.inc:295
 #: manufacturing/includes/manufacturing_ui.inc:346
 #: 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/allocations/supplier_allocation_main.php:95
 #: purchasing/inquiry/po_search.php:117
 #: purchasing/inquiry/po_search.php:117
+#: purchasing/inquiry/po_search_completed.php:119
 #: purchasing/inquiry/supplier_allocation_inquiry.php:137
 #: purchasing/inquiry/supplier_allocation_inquiry.php:137
-#: purchasing/inquiry/supplier_inquiry.php:174
-#: purchasing/allocations/supplier_allocation_main.php:95
-#: reporting/rep101.php:133 reporting/rep201.php:107 reporting/rep203.php:88
-#: reporting/rep306.php:141 reporting/rep310.php:142 reporting/rep601.php:79
-#: reporting/rep602.php:80 reporting/rep704.php:82 reporting/rep704.php:85
-#: reporting/rep704.php:88 reporting/rep710.php:78
-#: reporting/includes/doctext.inc:166 reporting/includes/doctext.inc:207
-#: reporting/includes/doctext.inc:245
+#: purchasing/inquiry/supplier_inquiry.php:175 purchasing/view/view_po.php:115
+#: purchasing/view/view_po.php:140 reporting/rep101.php:137
+#: reporting/rep201.php:115 reporting/rep203.php:88 reporting/rep306.php:138
+#: reporting/rep310.php:139 reporting/rep601.php:81 reporting/rep602.php:80
+#: reporting/rep704.php:79 reporting/rep704.php:87 reporting/rep704.php:95
+#: reporting/rep710.php:78 reporting/includes/doctext.inc:166
+#: reporting/includes/doctext.inc:209 reporting/includes/doctext.inc:247
 #: sales/allocations/customer_allocation_main.php:93
 #: sales/allocations/customer_allocation_main.php:93
-#: sales/view/view_sales_order.php:109 sales/view/view_sales_order.php:142
-#: sales/view/view_sales_order.php:179
-#: sales/inquiry/customer_allocation_inquiry.php:147
-#: sales/inquiry/customer_inquiry.php:194
+#: sales/inquiry/customer_allocation_inquiry.php:148
+#: sales/inquiry/customer_inquiry.php:200 sales/view/view_sales_order.php:111
+#: sales/view/view_sales_order.php:144 sales/view/view_sales_order.php:181
 msgid "#"
 msgstr ""
 
 msgid "#"
 msgstr ""
 
-#: admin/attachments.php:209 admin/attachments.php:253
+#: admin/attachments.php:224 admin/attachments.php:276
 #: admin/crm_categories.php:88 admin/payment_terms.php:127
 #: admin/printers.php:84 admin/print_profiles.php:147
 #: admin/crm_categories.php:88 admin/payment_terms.php:127
 #: admin/printers.php:84 admin/print_profiles.php:147
-#: gl/inquiry/accounts_list.php:39 gl/inquiry/accounts_list.php:52
-#: gl/inquiry/tax_inquiry.php:80 gl/manage/gl_quick_entries.php:190
-#: gl/manage/gl_quick_entries.php:230 includes/dashboard.inc:526
+#: admin/view/view_package.php:32 fixed_assets/fixed_asset_classes.php:89
+#: fixed_assets/inquiry/stock_inquiry.php:168 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
+#: includes/dashboard.inc:1051 includes/dashboard.inc:1145
 #: inventory/inquiry/stock_list.php:41 inventory/inquiry/stock_list.php:53
 #: 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/item_codes.php:131 inventory/manage/item_units.php:94
 #: inventory/manage/sales_kits.php:36 inventory/view/view_adjustment.php:54
 #: inventory/manage/sales_kits.php:36 inventory/view/view_adjustment.php:54
-#: inventory/view/view_transfer.php:50 manufacturing/manage/bom_edit.php:43
+#: inventory/view/view_transfer.php:50
 #: manufacturing/includes/manufacturing_ui.inc:28
 #: manufacturing/includes/manufacturing_ui.inc:28
+#: manufacturing/manage/bom_edit.php:43 purchasing/po_receive_items.php:62
 #: purchasing/includes/ui/invoice_ui.inc:501
 #: purchasing/includes/ui/invoice_ui.inc:501
-#: purchasing/includes/ui/invoice_ui.inc:513
-#: purchasing/po_receive_items.php:62 reporting/rep104.php:109
-#: reporting/rep105.php:115 reporting/rep204.php:84 reporting/rep303.php:121
-#: reporting/rep303.php:127 reporting/rep304.php:127 reporting/rep305.php:106
-#: reporting/rep306.php:141 reporting/rep307.php:114 reporting/rep308.php:223
-#: reporting/rep309.php:99 reporting/rep310.php:142 reporting/rep401.php:71
-#: sales/create_recurrent_invoices.php:203 sales/manage/credit_status.php:97
-#: sales/manage/recurrent_invoices.php:128
-#: sales/inquiry/sales_orders_view.php:284
-#: sales/inquiry/sales_orders_view.php:288 taxes/tax_groups.php:126
+#: purchasing/includes/ui/invoice_ui.inc:513 reporting/rep104.php:109
+#: reporting/rep105.php:115 reporting/rep204.php:84 reporting/rep303.php:223
+#: reporting/rep303.php:229 reporting/rep304.php:127 reporting/rep305.php:106
+#: reporting/rep306.php:138 reporting/rep307.php:114 reporting/rep308.php:224
+#: reporting/rep309.php:99 reporting/rep310.php:139 reporting/rep401.php:71
+#: sales/create_recurrent_invoices.php:209
+#: sales/inquiry/sales_orders_view.php:305
+#: sales/inquiry/sales_orders_view.php:309 sales/manage/credit_status.php:97
+#: sales/manage/recurrent_invoices.php:128 taxes/tax_groups.php:126
 #: taxes/tax_types.php:115
 msgid "Description"
 msgstr ""
 
 #: taxes/tax_types.php:115
 msgid "Description"
 msgstr ""
 
-#: admin/attachments.php:210 admin/backups.php:74 admin/backups.php:160
+#: admin/attachments.php:225 admin/backups.php:74 admin/backups.php:160
+#: includes/ui/attachment.inc:84
 msgid "Filename"
 msgstr ""
 
 msgid "Filename"
 msgstr ""
 
-#: admin/attachments.php:211
+#: admin/attachments.php:226 includes/ui/attachment.inc:84
 msgid "Size"
 msgstr ""
 
 msgid "Size"
 msgstr ""
 
-#: admin/attachments.php:212
+#: admin/attachments.php:227 includes/ui/attachment.inc:84
 msgid "Filetype"
 msgstr ""
 
 msgid "Filetype"
 msgstr ""
 
-#: admin/attachments.php:213
+#: admin/attachments.php:228
 msgid "Date Uploaded"
 msgstr ""
 
 msgid "Date Uploaded"
 msgstr ""
 
-#: admin/attachments.php:247 admin/attachments.php:252
+#: admin/attachments.php:268 admin/attachments.php:274
 msgid "Transaction #"
 msgstr ""
 
 msgid "Transaction #"
 msgstr ""
 
-#: admin/attachments.php:254
+#: admin/attachments.php:277
 msgid "Attached File"
 msgstr ""
 
 msgid "Attached File"
 msgstr ""
 
@@ -341,17 +379,18 @@ msgstr ""
 
 #: admin/backups.php:109 admin/create_coy.php:268 admin/fiscalyears.php:155
 #: admin/inst_lang.php:85 admin/inst_lang.php:97
 
 #: admin/backups.php:109 admin/create_coy.php:268 admin/fiscalyears.php:155
 #: admin/inst_lang.php:85 admin/inst_lang.php:97
-#: dimensions/inquiry/search_dimensions.php:106
-#: gl/manage/bank_accounts.php:130 gl/manage/currencies.php:162
-#: gl/manage/gl_account_classes.php:126 gl/manage/gl_quick_entries.php:237
-#: includes/system_tests.inc:41 includes/system_tests.inc:116
-#: includes/system_tests.inc:129 includes/ui/class.reflines_crud.inc:56
-#: includes/ui/ui_lists.inc:1873 purchasing/manage/suppliers.php:122
-#: reporting/rep101.php:129 reporting/rep102.php:110 reporting/rep102.php:112
-#: reporting/rep104.php:103 reporting/rep106.php:81 reporting/rep114.php:74
-#: reporting/rep201.php:103 reporting/rep202.php:116 reporting/rep202.php:118
-#: reporting/rep203.php:84 reporting/rep303.php:112 reporting/rep303.php:117
-#: reporting/rep304.php:123 reporting/rep402.php:99 reporting/rep402.php:134
+#: dimensions/inquiry/search_dimensions.php:107 gl/manage/bank_accounts.php:130
+#: gl/manage/currencies.php:162 gl/manage/gl_account_classes.php:126
+#: gl/manage/gl_quick_entries.php:237 includes/system_tests.inc:41
+#: includes/system_tests.inc:116 includes/system_tests.inc:129
+#: includes/ui/class.reflines_crud.inc:56 includes/ui/ui_lists.inc:1879
+#: purchasing/manage/suppliers.php:232 reporting/rep101.php:122
+#: reporting/rep101.php:133 reporting/rep102.php:107 reporting/rep102.php:109
+#: reporting/rep104.php:103 reporting/rep106.php:82 reporting/rep114.php:74
+#: reporting/rep115.php:160 reporting/rep201.php:111 reporting/rep202.php:117
+#: reporting/rep202.php:119 reporting/rep203.php:84 reporting/rep206.php:111
+#: reporting/rep303.php:214 reporting/rep303.php:219 reporting/rep304.php:123
+#: reporting/rep402.php:131 reporting/rep402.php:132 reporting/rep402.php:183
 #: reporting/rep501.php:113 sales/manage/sales_points.php:94
 #: sales/manage/sales_points.php:95 sales/manage/sales_types.php:119
 #: taxes/item_tax_types.php:129
 #: reporting/rep501.php:113 sales/manage/sales_points.php:94
 #: sales/manage/sales_points.php:95 sales/manage/sales_types.php:119
 #: taxes/item_tax_types.php:129
@@ -390,8 +429,8 @@ msgstr ""
 msgid "Create backup"
 msgstr ""
 
 msgid "Create backup"
 msgstr ""
 
-#: admin/backups.php:194 sales/includes/ui/sales_order_ui.inc:582
-#: sales/includes/ui/sales_order_ui.inc:638
+#: admin/backups.php:194 sales/includes/ui/sales_order_ui.inc:588
+#: sales/includes/ui/sales_order_ui.inc:644
 msgid "Comments:"
 msgstr ""
 
 msgid "Comments:"
 msgstr ""
 
@@ -449,7 +488,8 @@ msgid "Upload file"
 msgstr ""
 
 #: admin/change_current_user_password.php:16
 msgstr ""
 
 #: admin/change_current_user_password.php:16
-#: admin/change_current_user_password.php:99 themes/default/renderer.php:81
+#: admin/change_current_user_password.php:99 themes/canvas/renderer.php:49
+#: themes/default/renderer.php:81 themes/dropdown/renderer.php:89
 msgid "Change password"
 msgstr ""
 
 msgid "Change password"
 msgstr ""
 
@@ -477,7 +517,7 @@ msgstr ""
 msgid "Your password has been updated."
 msgstr ""
 
 msgid "Your password has been updated."
 msgstr ""
 
-#: admin/change_current_user_password.php:85 admin/users.php:189
+#: admin/change_current_user_password.php:85 admin/users.php:191
 msgid "User login:"
 msgstr ""
 
 msgid "User login:"
 msgstr ""
 
@@ -498,252 +538,301 @@ msgid "Enter your new password in the fields."
 msgstr ""
 
 #: admin/company_preferences.php:16 applications/setup.php:18
 msgstr ""
 
 #: admin/company_preferences.php:16 applications/setup.php:18
+#: themes/canvas/renderer.php:140
 msgid "Company Setup"
 msgstr ""
 
 msgid "Company Setup"
 msgstr ""
 
-#: admin/company_preferences.php:29
+#: admin/company_preferences.php:30
 msgid "Login timeout must be positive number not less than 10."
 msgstr ""
 
 msgid "Login timeout must be positive number not less than 10."
 msgstr ""
 
-#: admin/company_preferences.php:36
+#: admin/company_preferences.php:37
 msgid "The company name must be entered."
 msgstr ""
 
 msgid "The company name must be entered."
 msgstr ""
 
-#: admin/company_preferences.php:46
-msgid "Error uploading logo file."
+#: admin/company_preferences.php:42
+msgid "Tax Periods must be positive number."
+msgstr ""
+
+#: admin/company_preferences.php:48
+msgid "Tax Last Periods must be positive number."
+msgstr ""
+
+#: admin/company_preferences.php:54
+msgid "Round Calculated field must be a positive number."
 msgstr ""
 
 #: admin/company_preferences.php:60
 msgstr ""
 
 #: admin/company_preferences.php:60
+msgid "Max day range in Documents must be a positive number."
+msgstr ""
+
+#: admin/company_preferences.php:66
+msgid "Add Price from Std Cost field must be number."
+msgstr ""
+
+#: admin/company_preferences.php:77
+msgid "Error uploading logo file."
+msgstr ""
+
+#: admin/company_preferences.php:91
 msgid ""
 "Only jpg and png files are supported - a file extension of .jpg or .png is "
 "expected"
 msgstr ""
 
 msgid ""
 "Only jpg and png files are supported - a file extension of .jpg or .png is "
 "expected"
 msgstr ""
 
-#: admin/company_preferences.php:65 inventory/manage/items.php:109
+#: admin/company_preferences.php:96 inventory/manage/items.php:155
 msgid ""
 "The file size is over the maximum allowed. The maximum size allowed in KB is"
 msgstr ""
 
 msgid ""
 "The file size is over the maximum allowed. The maximum size allowed in KB is"
 msgstr ""
 
-#: admin/company_preferences.php:70 inventory/manage/items.php:99
-#: inventory/manage/items.php:114
+#: admin/company_preferences.php:101 inventory/manage/items.php:145
+#: inventory/manage/items.php:160
 msgid "Only graphics files can be uploaded"
 msgstr ""
 
 msgid "Only graphics files can be uploaded"
 msgstr ""
 
-#: admin/company_preferences.php:78 admin/company_preferences.php:99
-#: inventory/manage/items.php:122
+#: admin/company_preferences.php:109 admin/company_preferences.php:138
+#: inventory/manage/items.php:165
 msgid "The existing image could not be removed"
 msgstr ""
 
 msgid "The existing image could not be removed"
 msgstr ""
 
-#: admin/company_preferences.php:88
+#: admin/company_preferences.php:118
 msgid "Error uploading logo file"
 msgstr ""
 
 msgid "Error uploading logo file"
 msgstr ""
 
-#: admin/company_preferences.php:123
+#: admin/company_preferences.php:162
 msgid "Company setup has been updated."
 msgstr ""
 
 msgid "Company setup has been updated."
 msgstr ""
 
-#: admin/company_preferences.php:187
+#: admin/company_preferences.php:256
 msgid "General settings"
 msgstr ""
 
 msgid "General settings"
 msgstr ""
 
-#: admin/company_preferences.php:189
+#: admin/company_preferences.php:258
 msgid "Name (to appear on reports):"
 msgstr ""
 
 msgid "Name (to appear on reports):"
 msgstr ""
 
-#: admin/company_preferences.php:190 admin/shipping_companies.php:142
+#: admin/company_preferences.php:259 admin/shipping_companies.php:142
 #: includes/ui/contacts_view.inc:106 inventory/manage/locations.php:212
 #: 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:635 sales/manage/customers.php:235
 msgid "Address:"
 msgstr ""
 
 msgid "Address:"
 msgstr ""
 
-#: admin/company_preferences.php:191
+#: admin/company_preferences.php:260
 msgid "Domicile:"
 msgstr ""
 
 msgid "Domicile:"
 msgstr ""
 
-#: admin/company_preferences.php:193 admin/shipping_companies.php:138
-#: purchasing/manage/suppliers.php:135 sales/manage/customer_branches.php:253
+#: admin/company_preferences.php:262 admin/shipping_companies.php:138
+#: purchasing/manage/suppliers.php:245 sales/manage/customer_branches.php:253
 msgid "Phone Number:"
 msgstr ""
 
 msgid "Phone Number:"
 msgstr ""
 
-#: admin/company_preferences.php:194 includes/ui/contacts_view.inc:101
-#: purchasing/manage/suppliers.php:138 sales/manage/customer_branches.php:255
-#: sales/manage/customers.php:258
+#: admin/company_preferences.php:263 includes/ui/contacts_view.inc:101
+#: purchasing/manage/suppliers.php:248 sales/manage/customers.php:259
+#: sales/manage/customer_branches.php:255
 msgid "Fax Number:"
 msgstr ""
 
 msgid "Fax Number:"
 msgstr ""
 
-#: admin/company_preferences.php:195 admin/users.php:211
+#: admin/company_preferences.php:264 admin/users.php:213
 msgid "Email Address:"
 msgstr ""
 
 msgid "Email Address:"
 msgstr ""
 
-#: admin/company_preferences.php:197
+#: admin/company_preferences.php:266
 msgid "BCC Address for all outgoing mails:"
 msgstr ""
 
 msgid "BCC Address for all outgoing mails:"
 msgstr ""
 
-#: admin/company_preferences.php:199
+#: admin/company_preferences.php:268
 msgid "Official Company Number:"
 msgstr ""
 
 msgid "Official Company Number:"
 msgstr ""
 
-#: admin/company_preferences.php:200 purchasing/manage/suppliers.php:95
-#: sales/manage/customers.php:236
+#: admin/company_preferences.php:269 purchasing/manage/suppliers.php:205
+#: sales/manage/customers.php:237
 msgid "GSTNo:"
 msgstr ""
 
 msgid "GSTNo:"
 msgstr ""
 
-#: admin/company_preferences.php:201
+#: admin/company_preferences.php:270
 msgid "Home Currency:"
 msgstr ""
 
 msgid "Home Currency:"
 msgstr ""
 
-#: admin/company_preferences.php:203
+#: admin/company_preferences.php:272
 msgid "Company Logo:"
 msgstr ""
 
 msgid "Company Logo:"
 msgstr ""
 
-#: admin/company_preferences.php:204
+#: admin/company_preferences.php:273
 msgid "New Company Logo (.jpg)"
 msgstr ""
 
 msgid "New Company Logo (.jpg)"
 msgstr ""
 
-#: admin/company_preferences.php:205
+#: admin/company_preferences.php:274
 msgid "Delete Company Logo:"
 msgstr ""
 
 msgid "Delete Company Logo:"
 msgstr ""
 
-#: admin/company_preferences.php:207
-msgid "Automatic Revaluation Currency Accounts"
-msgstr ""
-
-#: admin/company_preferences.php:208
+#: admin/company_preferences.php:276
 msgid "Time Zone on Reports"
 msgstr ""
 
 msgid "Time Zone on Reports"
 msgstr ""
 
-#: admin/company_preferences.php:209
+#: admin/company_preferences.php:277
 msgid "Company Logo on Reports"
 msgstr ""
 
 msgid "Company Logo on Reports"
 msgstr ""
 
-#: admin/company_preferences.php:210
+#: admin/company_preferences.php:278
 msgid "Use Barcodes on Stocks"
 msgstr ""
 
 msgid "Use Barcodes on Stocks"
 msgstr ""
 
-#: admin/company_preferences.php:211
+#: admin/company_preferences.php:279
+msgid "Auto Increase of Document References"
+msgstr ""
+
+#: admin/company_preferences.php:280
+msgid "Use Dimensions on Recurrent Invoices"
+msgstr ""
+
+#: admin/company_preferences.php:281
+msgid "Use Long Descriptions on Invoices"
+msgstr ""
+
+#: admin/company_preferences.php:282
 msgid "Database Scheme Version"
 msgstr ""
 
 msgid "Database Scheme Version"
 msgstr ""
 
-#: admin/company_preferences.php:215
+#: admin/company_preferences.php:286
 msgid "General Ledger Settings"
 msgstr ""
 
 msgid "General Ledger Settings"
 msgstr ""
 
-#: admin/company_preferences.php:216 gl/gl_budget.php:62
+#: admin/company_preferences.php:287 gl/gl_budget.php:62
 msgid "Fiscal Year:"
 msgstr ""
 
 msgid "Fiscal Year:"
 msgstr ""
 
-#: admin/company_preferences.php:217
+#: admin/company_preferences.php:288
 msgid "Tax Periods:"
 msgstr ""
 
 msgid "Tax Periods:"
 msgstr ""
 
-#: admin/company_preferences.php:217
+#: admin/company_preferences.php:288
 msgid "Months."
 msgstr ""
 
 msgid "Months."
 msgstr ""
 
-#: admin/company_preferences.php:218
+#: admin/company_preferences.php:289
 msgid "Tax Last Period:"
 msgstr ""
 
 msgid "Tax Last Period:"
 msgstr ""
 
-#: admin/company_preferences.php:218
+#: admin/company_preferences.php:289
 msgid "Months back."
 msgstr ""
 
 msgid "Months back."
 msgstr ""
 
-#: admin/company_preferences.php:219
+#: admin/company_preferences.php:290
 msgid "Put alternative Tax Include on Docs"
 msgstr ""
 
 msgid "Put alternative Tax Include on Docs"
 msgstr ""
 
-#: admin/company_preferences.php:220
+#: admin/company_preferences.php:291
 msgid "Suppress Tax Rates on Docs"
 msgstr ""
 
 msgid "Suppress Tax Rates on Docs"
 msgstr ""
 
-#: admin/company_preferences.php:222
+#: admin/company_preferences.php:292
+msgid "Automatic Revaluation Currency Accounts"
+msgstr ""
+
+#: admin/company_preferences.php:294 themes/canvas/renderer.php:106
 msgid "Sales Pricing"
 msgstr ""
 
 msgid "Sales Pricing"
 msgstr ""
 
-#: admin/company_preferences.php:223
+#: admin/company_preferences.php:295
 msgid "Base for auto price calculations:"
 msgstr ""
 
 msgid "Base for auto price calculations:"
 msgstr ""
 
-#: admin/company_preferences.php:224
+#: admin/company_preferences.php:296
 msgid "No base price list"
 msgstr ""
 
 msgid "No base price list"
 msgstr ""
 
-#: admin/company_preferences.php:226
+#: admin/company_preferences.php:298
 msgid "Add Price from Std Cost:"
 msgstr ""
 
 msgid "Add Price from Std Cost:"
 msgstr ""
 
-#: admin/company_preferences.php:228
+#: admin/company_preferences.php:300
 msgid "Round calculated prices to nearest:"
 msgstr ""
 
 msgid "Round calculated prices to nearest:"
 msgstr ""
 
-#: admin/company_preferences.php:232
+#: admin/company_preferences.php:304
 msgid "Optional Modules"
 msgstr ""
 
 msgid "Optional Modules"
 msgstr ""
 
-#: admin/company_preferences.php:233 includes/dashboard.inc:118
-#: reporting/reports_main.php:295
+#: admin/company_preferences.php:305 includes/dashboard.inc:317
+#: reporting/reports_main.php:316
 msgid "Manufacturing"
 msgstr ""
 
 msgid "Manufacturing"
 msgstr ""
 
-#: admin/company_preferences.php:234 includes/dashboard.inc:116
-#: inventory/manage/items.php:24 reporting/reports_main.php:318
+#: admin/company_preferences.php:306 includes/dashboard.inc:287
+#: includes/dashboard.inc:315 inventory/manage/items.php:25
+#: reporting/reports_main.php:340 themes/canvas/renderer.php:119
 msgid "Fixed Assets"
 msgstr ""
 
 msgid "Fixed Assets"
 msgstr ""
 
-#: admin/company_preferences.php:235
+#: admin/company_preferences.php:307
 msgid "Use Dimensions:"
 msgstr ""
 
 msgid "Use Dimensions:"
 msgstr ""
 
-#: admin/company_preferences.php:237
+#: admin/company_preferences.php:309
 msgid "User Interface Options"
 msgstr ""
 
 msgid "User Interface Options"
 msgstr ""
 
-#: admin/company_preferences.php:239
+#: admin/company_preferences.php:311
 msgid "Short Name and Name in List"
 msgstr ""
 
 msgid "Short Name and Name in List"
 msgstr ""
 
-#: admin/company_preferences.php:240
+#: admin/company_preferences.php:312
+msgid "Open Print Dialog Direct on Reports"
+msgstr ""
+
+#: admin/company_preferences.php:313
 msgid "Search Item List"
 msgstr ""
 
 msgid "Search Item List"
 msgstr ""
 
-#: admin/company_preferences.php:241
+#: admin/company_preferences.php:314
 msgid "Search Customer List"
 msgstr ""
 
 msgid "Search Customer List"
 msgstr ""
 
-#: admin/company_preferences.php:242
+#: admin/company_preferences.php:315
 msgid "Search Supplier List"
 msgstr ""
 
 msgid "Search Supplier List"
 msgstr ""
 
-#: admin/company_preferences.php:243
+#: admin/company_preferences.php:316
 msgid "Login Timeout:"
 msgstr ""
 
 msgid "Login Timeout:"
 msgstr ""
 
-#: admin/company_preferences.php:243
+#: admin/company_preferences.php:316
 msgid "seconds"
 msgstr ""
 
 msgid "seconds"
 msgstr ""
 
-#: admin/company_preferences.php:248 admin/display_prefs.php:160
-#: admin/gl_setup.php:274 admin/inst_chart.php:84 admin/inst_lang.php:103
+#: admin/company_preferences.php:317
+msgid "Max day range in documents"
+msgstr ""
+
+#: admin/company_preferences.php:317
+msgid "days."
+msgstr ""
+
+#: admin/company_preferences.php:322 admin/display_prefs.php:162
+#: admin/gl_setup.php:309 admin/inst_chart.php:84 admin/inst_lang.php:103
 #: admin/inst_module.php:146 admin/inst_module.php:164
 #: admin/inst_module.php:207 admin/inst_theme.php:81
 #: admin/inst_module.php:146 admin/inst_module.php:164
 #: admin/inst_module.php:207 admin/inst_theme.php:81
-#: dimensions/dimension_entry.php:283 gl/gl_bank.php:409 gl/gl_budget.php:134
-#: gl/manage/gl_quick_entries.php:60 gl/includes/ui/gl_bank_ui.inc:268
-#: gl/includes/ui/gl_journal_ui.inc:277 includes/ui/class.crud_view.inc:289
-#: includes/ui/db_pager_view.inc:180 includes/ui/simple_crud_class.inc:56
-#: includes/ui/simple_crud_class.inc:225 includes/ui/ui_input.inc:227
-#: includes/ui/ui_input.inc:960 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
+#: dimensions/dimension_entry.php:283 gl/gl_bank.php:415 gl/gl_budget.php:134
+#: gl/includes/ui/gl_bank_ui.inc:265 gl/includes/ui/gl_journal_ui.inc:276
+#: gl/manage/gl_quick_entries.php:60 includes/ui/attachment.inc:169
+#: includes/ui/class.crud_view.inc:298 includes/ui/db_pager_view.inc:180
+#: includes/ui/simple_crud_class.inc:56 includes/ui/simple_crud_class.inc:225
+#: includes/ui/ui_input.inc:227 includes/ui/ui_input.inc:967
+#: inventory/adjustments.php:258 inventory/cost_update.php:152
+#: inventory/reorder_level.php:111 inventory/transfers.php:238
+#: inventory/includes/item_adjustments_ui.inc:212
 #: 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
 #: 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:376 sales/customer_delivery.php:527
-#: sales/customer_invoice.php:662 sales/inquiry/sales_orders_view.php:316
+#: purchasing/po_receive_items.php:325
+#: purchasing/includes/ui/invoice_ui.inc:188
+#: purchasing/includes/ui/po_ui.inc:287 purchasing/includes/ui/po_ui.inc:445
+#: sales/credit_note_entry.php:302 sales/customer_credit_invoice.php:376
+#: sales/customer_delivery.php:528 sales/customer_invoice.php:663
 #: sales/includes/ui/sales_credit_ui.inc:288
 #: sales/includes/ui/sales_order_ui.inc:231
 #: sales/includes/ui/sales_credit_ui.inc:288
 #: sales/includes/ui/sales_order_ui.inc:231
-#: sales/includes/ui/sales_order_ui.inc:548
+#: sales/includes/ui/sales_order_ui.inc:554
+#: sales/inquiry/sales_orders_view.php:339
 msgid "Update"
 msgstr ""
 
 msgid "Update"
 msgstr ""
 
@@ -861,28 +950,29 @@ msgstr ""
 msgid "Charset"
 msgstr ""
 
 msgid "Charset"
 msgstr ""
 
-#: admin/create_coy.php:248 admin/inst_lang.php:36
-#: admin/print_profiles.php:161 includes/ui/class.reflines_crud.inc:38
-#: purchasing/includes/ui/invoice_ui.inc:140
-#: purchasing/includes/ui/invoice_ui.inc:143
+#: admin/create_coy.php:248 admin/inst_lang.php:36 admin/print_profiles.php:161
+#: includes/ui/class.reflines_crud.inc:38
+#: purchasing/includes/ui/invoice_ui.inc:141
+#: purchasing/includes/ui/invoice_ui.inc:144
 #: purchasing/includes/ui/po_ui.inc:172 purchasing/includes/ui/po_ui.inc:174
 msgid "Default"
 msgstr ""
 
 #: admin/create_coy.php:268 admin/create_coy.php:351 admin/fiscalyears.php:159
 #: admin/inst_lang.php:85 admin/inst_lang.php:97
 #: purchasing/includes/ui/po_ui.inc:172 purchasing/includes/ui/po_ui.inc:174
 msgid "Default"
 msgstr ""
 
 #: admin/create_coy.php:268 admin/create_coy.php:351 admin/fiscalyears.php:159
 #: admin/inst_lang.php:85 admin/inst_lang.php:97
-#: dimensions/inquiry/search_dimensions.php:106
-#: gl/manage/bank_accounts.php:128 gl/manage/currencies.php:162
-#: gl/manage/gl_account_classes.php:126 gl/manage/gl_quick_entries.php:237
-#: includes/system_tests.inc:41 includes/system_tests.inc:116
-#: includes/system_tests.inc:129 includes/ui/class.reflines_crud.inc:56
-#: includes/ui/class.reflines_crud.inc:101 includes/ui/ui_lists.inc:1874
-#: purchasing/manage/suppliers.php:122 reporting/rep101.php:128
-#: reporting/rep102.php:109 reporting/rep102.php:111 reporting/rep104.php:105
-#: reporting/rep106.php:83 reporting/rep114.php:76 reporting/rep201.php:102
-#: reporting/rep202.php:115 reporting/rep202.php:117 reporting/rep203.php:83
-#: reporting/rep303.php:107 reporting/rep303.php:116 reporting/rep304.php:122
-#: reporting/rep402.php:99 reporting/rep501.php:111
+#: dimensions/inquiry/search_dimensions.php:107 gl/manage/bank_accounts.php:128
+#: gl/manage/currencies.php:162 gl/manage/gl_account_classes.php:126
+#: gl/manage/gl_quick_entries.php:237 includes/system_tests.inc:41
+#: includes/system_tests.inc:116 includes/system_tests.inc:129
+#: includes/ui/class.reflines_crud.inc:56
+#: includes/ui/class.reflines_crud.inc:101 includes/ui/ui_lists.inc:1880
+#: purchasing/manage/suppliers.php:232 reporting/rep101.php:121
+#: reporting/rep101.php:132 reporting/rep102.php:106 reporting/rep102.php:108
+#: reporting/rep104.php:105 reporting/rep106.php:84 reporting/rep114.php:76
+#: reporting/rep115.php:159 reporting/rep201.php:110 reporting/rep202.php:116
+#: reporting/rep202.php:118 reporting/rep203.php:83 reporting/rep206.php:110
+#: reporting/rep303.php:209 reporting/rep303.php:218 reporting/rep304.php:122
+#: reporting/rep402.php:131 reporting/rep402.php:132 reporting/rep501.php:111
 #: sales/manage/sales_points.php:94 sales/manage/sales_points.php:95
 #: sales/manage/sales_types.php:119 taxes/item_tax_types.php:133
 msgid "Yes"
 #: sales/manage/sales_points.php:94 sales/manage/sales_points.php:95
 #: sales/manage/sales_types.php:119 taxes/item_tax_types.php:133
 msgid "Yes"
@@ -928,8 +1018,8 @@ msgstr ""
 #: admin/create_coy.php:337 admin/inst_chart.php:78 admin/inst_chart.php:80
 #: admin/inst_lang.php:87 admin/inst_lang.php:90 admin/inst_module.php:135
 #: admin/inst_theme.php:76 admin/inst_theme.php:78
 #: admin/create_coy.php:337 admin/inst_chart.php:78 admin/inst_chart.php:80
 #: admin/inst_lang.php:87 admin/inst_lang.php:90 admin/inst_module.php:135
 #: admin/inst_theme.php:76 admin/inst_theme.php:78
-#: gl/manage/gl_account_types.php:195 includes/db/audit_trail_db.inc:127
-#: includes/ui/allocation_cart.inc:316 inventory/manage/items.php:457
+#: gl/manage/gl_account_types.php:195 includes/ui/allocation_cart.inc:337
+#: inventory/manage/items.php:467
 msgid "None"
 msgstr ""
 
 msgid "None"
 msgstr ""
 
@@ -978,7 +1068,7 @@ msgid "Category Subtype"
 msgstr ""
 
 #: admin/crm_categories.php:88 purchasing/inquiry/suppliers_list.php:53
 msgstr ""
 
 #: admin/crm_categories.php:88 purchasing/inquiry/suppliers_list.php:53
-#: sales/manage/customer_branches.php:283 sales/inquiry/customers_list.php:54
+#: sales/inquiry/customers_list.php:54 sales/manage/customer_branches.php:283
 msgid "Short Name"
 msgstr ""
 
 msgid "Short Name"
 msgstr ""
 
@@ -998,8 +1088,9 @@ msgstr ""
 msgid "Category Description:"
 msgstr ""
 
 msgid "Category Description:"
 msgstr ""
 
-#: admin/dashboard.php:27 themes/default/renderer.php:70
-#: themes/default/renderer.php:78
+#: admin/dashboard.php:34 themes/canvas/renderer.php:148
+#: themes/default/renderer.php:70 themes/default/renderer.php:78
+#: themes/dropdown/renderer.php:128
 msgid "Dashboard"
 msgstr ""
 
 msgid "Dashboard"
 msgstr ""
 
@@ -1011,164 +1102,164 @@ msgstr ""
 msgid "Query size must be integer and greater than zero."
 msgstr ""
 
 msgid "Query size must be integer and greater than zero."
 msgstr ""
 
-#: admin/display_prefs.php:61
+#: admin/display_prefs.php:63
 msgid ""
 "Display settings have been updated. Keep in mind that changed settings are "
 "restored on every login in demo mode."
 msgstr ""
 
 msgid ""
 "Display settings have been updated. Keep in mind that changed settings are "
 "restored on every login in demo mode."
 msgstr ""
 
-#: admin/display_prefs.php:63
+#: admin/display_prefs.php:65
 msgid "Display settings have been updated."
 msgstr ""
 
 msgid "Display settings have been updated."
 msgstr ""
 
-#: admin/display_prefs.php:72
+#: admin/display_prefs.php:74
 msgid "Decimal Places"
 msgstr ""
 
 msgid "Decimal Places"
 msgstr ""
 
-#: admin/display_prefs.php:74
+#: admin/display_prefs.php:76
 msgid "Prices/Amounts:"
 msgstr ""
 
 msgid "Prices/Amounts:"
 msgstr ""
 
-#: admin/display_prefs.php:75
+#: admin/display_prefs.php:77
 msgid "Quantities:"
 msgstr ""
 
 msgid "Quantities:"
 msgstr ""
 
-#: admin/display_prefs.php:76
+#: admin/display_prefs.php:78
 msgid "Exchange Rates:"
 msgstr ""
 
 msgid "Exchange Rates:"
 msgstr ""
 
-#: admin/display_prefs.php:77
+#: admin/display_prefs.php:79
 msgid "Percentages:"
 msgstr ""
 
 msgid "Percentages:"
 msgstr ""
 
-#: admin/display_prefs.php:79
+#: admin/display_prefs.php:81
 msgid "Date Format and Separators"
 msgstr ""
 
 msgid "Date Format and Separators"
 msgstr ""
 
-#: admin/display_prefs.php:81
+#: admin/display_prefs.php:83
 msgid "Date Format:"
 msgstr ""
 
 msgid "Date Format:"
 msgstr ""
 
-#: admin/display_prefs.php:83
+#: admin/display_prefs.php:85
 msgid "Date Separator:"
 msgstr ""
 
 msgid "Date Separator:"
 msgstr ""
 
-#: admin/display_prefs.php:88
+#: admin/display_prefs.php:90
 msgid "Thousand Separator:"
 msgstr ""
 
 msgid "Thousand Separator:"
 msgstr ""
 
-#: admin/display_prefs.php:93
+#: admin/display_prefs.php:95
 msgid "Decimal Separator:"
 msgstr ""
 
 msgid "Decimal Separator:"
 msgstr ""
 
-#: admin/display_prefs.php:98
+#: admin/display_prefs.php:100
 msgid "Use Date Picker"
 msgstr ""
 
 msgid "Use Date Picker"
 msgstr ""
 
-#: admin/display_prefs.php:103
+#: admin/display_prefs.php:105
 msgid "Reports"
 msgstr ""
 
 msgid "Reports"
 msgstr ""
 
-#: admin/display_prefs.php:105
+#: admin/display_prefs.php:107
 msgid "Save Report Selection Days:"
 msgstr ""
 
 msgid "Save Report Selection Days:"
 msgstr ""
 
-#: admin/display_prefs.php:107
+#: admin/display_prefs.php:109
 msgid "Default Report Destination:"
 msgstr ""
 
 msgid "Default Report Destination:"
 msgstr ""
 
-#: admin/display_prefs.php:108
+#: admin/display_prefs.php:110
 msgid "Excel"
 msgstr ""
 
 msgid "Excel"
 msgstr ""
 
-#: admin/display_prefs.php:108 reporting/includes/reports_classes.inc:235
+#: admin/display_prefs.php:110 reporting/includes/reports_classes.inc:237
 msgid "PDF/Printer"
 msgstr ""
 
 msgid "PDF/Printer"
 msgstr ""
 
-#: admin/display_prefs.php:110
+#: admin/display_prefs.php:112
 msgid "Default Report Orientation:"
 msgstr ""
 
 msgid "Default Report Orientation:"
 msgstr ""
 
-#: admin/display_prefs.php:111 reporting/includes/reports_classes.inc:242
+#: admin/display_prefs.php:113 reporting/includes/reports_classes.inc:244
 msgid "Landscape"
 msgstr ""
 
 msgid "Landscape"
 msgstr ""
 
-#: admin/display_prefs.php:111 reporting/includes/reports_classes.inc:242
+#: admin/display_prefs.php:113 reporting/includes/reports_classes.inc:244
 msgid "Portrait"
 msgstr ""
 
 msgid "Portrait"
 msgstr ""
 
-#: admin/display_prefs.php:115 applications/setup.php:42
-#: includes/sysnames.inc:99
+#: admin/display_prefs.php:117 applications/setup.php:42
+#: includes/sysnames.inc:101
 msgid "Miscellaneous"
 msgstr ""
 
 msgid "Miscellaneous"
 msgstr ""
 
-#: admin/display_prefs.php:117
+#: admin/display_prefs.php:119
 msgid "Show hints for new users:"
 msgstr ""
 
 msgid "Show hints for new users:"
 msgstr ""
 
-#: admin/display_prefs.php:119
+#: admin/display_prefs.php:121
 msgid "Show GL Information:"
 msgstr ""
 
 msgid "Show GL Information:"
 msgstr ""
 
-#: admin/display_prefs.php:121
+#: admin/display_prefs.php:123
 msgid "Show Item Codes:"
 msgstr ""
 
 msgid "Show Item Codes:"
 msgstr ""
 
-#: admin/display_prefs.php:128
+#: admin/display_prefs.php:130
 msgid "Page Size:"
 msgstr ""
 
 msgid "Page Size:"
 msgstr ""
 
-#: admin/display_prefs.php:130
+#: admin/display_prefs.php:132
 msgid "Start-up Tab"
 msgstr ""
 
 msgid "Start-up Tab"
 msgstr ""
 
-#: admin/display_prefs.php:138 admin/users.php:219
+#: admin/display_prefs.php:140 admin/users.php:221
 msgid "Printing profile"
 msgstr ""
 
 msgid "Printing profile"
 msgstr ""
 
-#: admin/display_prefs.php:139 admin/users.php:220
+#: admin/display_prefs.php:141 admin/users.php:222
 msgid "Browser printing support"
 msgstr ""
 
 msgid "Browser printing support"
 msgstr ""
 
-#: admin/display_prefs.php:141
+#: admin/display_prefs.php:143
 msgid "Use popup window to display reports:"
 msgstr ""
 
 msgid "Use popup window to display reports:"
 msgstr ""
 
-#: admin/display_prefs.php:142 admin/users.php:223
+#: admin/display_prefs.php:144 admin/users.php:225
 msgid "Set this option to on if your browser directly supports pdf files"
 msgstr ""
 
 msgid "Set this option to on if your browser directly supports pdf files"
 msgstr ""
 
-#: admin/display_prefs.php:144
+#: admin/display_prefs.php:146
 msgid "Use icons instead of text links:"
 msgstr ""
 
 msgid "Use icons instead of text links:"
 msgstr ""
 
-#: admin/display_prefs.php:145
+#: admin/display_prefs.php:147
 msgid "Set this option to on for using icons instead of text links"
 msgstr ""
 
 msgid "Set this option to on for using icons instead of text links"
 msgstr ""
 
-#: admin/display_prefs.php:147
+#: admin/display_prefs.php:149
 msgid "Remember last document date:"
 msgstr ""
 
 msgid "Remember last document date:"
 msgstr ""
 
-#: admin/display_prefs.php:148
+#: admin/display_prefs.php:150
 msgid ""
 "If set document date is remembered on subsequent documents, otherwise "
 "default is current date"
 msgstr ""
 
 msgid ""
 "If set document date is remembered on subsequent documents, otherwise "
 "default is current date"
 msgstr ""
 
-#: admin/display_prefs.php:150
+#: admin/display_prefs.php:152
 msgid "Query page size:"
 msgstr ""
 
 msgid "Query page size:"
 msgstr ""
 
-#: admin/display_prefs.php:152
+#: admin/display_prefs.php:154
 msgid "Transaction days:"
 msgstr ""
 
 msgid "Transaction days:"
 msgstr ""
 
-#: admin/display_prefs.php:154 admin/inst_lang.php:35
+#: admin/display_prefs.php:156 admin/inst_lang.php:35
 msgid "Language"
 msgstr ""
 
 msgid "Language"
 msgstr ""
 
-#: admin/display_prefs.php:156 admin/users.php:215
+#: admin/display_prefs.php:158 admin/users.php:217
 msgid "Language:"
 msgstr ""
 
 msgid "Language:"
 msgstr ""
 
@@ -1231,12 +1322,12 @@ msgstr ""
 msgid "Fiscal Year End"
 msgstr ""
 
 msgid "Fiscal Year End"
 msgstr ""
 
-#: admin/fiscalyears.php:138 dimensions/inquiry/search_dimensions.php:130
-#: dimensions/inquiry/search_dimensions.php:136 includes/ui/ui_lists.inc:758
-#: includes/ui/ui_view.inc:1546 manufacturing/search_work_orders.php:114
-#: reporting/rep402.php:103 reporting/rep501.php:87 reporting/rep710.php:113
+#: admin/fiscalyears.php:138 dimensions/inquiry/search_dimensions.php:137
+#: dimensions/inquiry/search_dimensions.php:144 includes/ui/ui_lists.inc:763
+#: includes/ui/ui_view.inc:1582 manufacturing/search_work_orders.php:116
+#: reporting/rep402.php:136 reporting/rep501.php:87 reporting/rep710.php:114
 #: reporting/includes/excel_report.inc:231
 #: reporting/includes/excel_report.inc:231
-#: reporting/includes/pdf_report.inc:267
+#: reporting/includes/pdf_report.inc:268
 msgid "Closed"
 msgstr ""
 
 msgid "Closed"
 msgstr ""
 
@@ -1272,311 +1363,326 @@ msgstr ""
 msgid "System and General GL Setup"
 msgstr ""
 
 msgid "System and General GL Setup"
 msgstr ""
 
-#: admin/gl_setup.php:34
-msgid "The delivery over-receive allowance must be between 0 and 100."
+#: admin/gl_setup.php:34 admin/gl_setup.php:83
+msgid "The past due days interval allowance must be between 0 and 100."
 msgstr ""
 
 #: admin/gl_setup.php:41
 msgstr ""
 
 #: admin/gl_setup.php:41
-msgid "The invoice over-charge allowance must be between 0 and 100."
+msgid "Quote Valid Days is not valid number."
 msgstr ""
 
 #: admin/gl_setup.php:48
 msgstr ""
 
 #: admin/gl_setup.php:48
-msgid "The past due days interval allowance must be between 0 and 100."
+msgid "Delivery Required By is not valid number."
+msgstr ""
+
+#: admin/gl_setup.php:55
+msgid "Receival Required By is not valid number."
+msgstr ""
+
+#: admin/gl_setup.php:62
+msgid "Work Order Required By After is not valid number."
+msgstr ""
+
+#: admin/gl_setup.php:69
+msgid "The delivery over-receive allowance must be between 0 and 100."
 msgstr ""
 
 msgstr ""
 
-#: admin/gl_setup.php:59
+#: admin/gl_setup.php:76
+msgid "The invoice over-charge allowance must be between 0 and 100."
+msgstr ""
+
+#: admin/gl_setup.php:94
 msgid "Before GRN Clearing Account can be changed all GRNs have to be invoiced"
 msgstr ""
 
 msgid "Before GRN Clearing Account can be changed all GRNs have to be invoiced"
 msgstr ""
 
-#: admin/gl_setup.php:66 admin/db/fiscalyears_db.inc:142
+#: admin/gl_setup.php:101 admin/db/fiscalyears_db.inc:142
 msgid ""
 "The Retained Earnings Account should be a Balance Account or the Profit and "
 "Loss Year Account should be an Expense Account (preferred the last one in "
 "the Expense Class)"
 msgstr ""
 
 msgid ""
 "The Retained Earnings Account should be a Balance Account or the Profit and "
 "Loss Year Account should be an Expense Account (preferred the last one in "
 "the Expense Class)"
 msgstr ""
 
-#: admin/gl_setup.php:89
+#: admin/gl_setup.php:124
 msgid "The general GL setup has been updated."
 msgstr ""
 
 msgid "The general GL setup has been updated."
 msgstr ""
 
-#: admin/gl_setup.php:154
+#: admin/gl_setup.php:189 themes/canvas/renderer.php:141
 msgid "General GL"
 msgstr ""
 
 msgid "General GL"
 msgstr ""
 
-#: admin/gl_setup.php:156
+#: admin/gl_setup.php:191
 msgid "Past Due Days Interval:"
 msgstr ""
 
 msgid "Past Due Days Interval:"
 msgstr ""
 
-#: admin/gl_setup.php:156 admin/gl_setup.php:174 admin/gl_setup.php:208
-#: admin/gl_setup.php:210 admin/gl_setup.php:230 admin/gl_setup.php:268
+#: admin/gl_setup.php:191 admin/gl_setup.php:209 admin/gl_setup.php:243
+#: admin/gl_setup.php:245 admin/gl_setup.php:265 admin/gl_setup.php:303
 #: admin/payment_terms.php:140
 msgid "days"
 msgstr ""
 
 #: admin/payment_terms.php:140
 msgid "days"
 msgstr ""
 
-#: admin/gl_setup.php:158
+#: admin/gl_setup.php:193
 msgid "Accounts Type:"
 msgstr ""
 
 msgid "Accounts Type:"
 msgstr ""
 
-#: admin/gl_setup.php:160
+#: admin/gl_setup.php:195
 msgid "Retained Earnings:"
 msgstr ""
 
 msgid "Retained Earnings:"
 msgstr ""
 
-#: admin/gl_setup.php:162
+#: admin/gl_setup.php:197
 msgid "Profit/Loss Year:"
 msgstr ""
 
 msgid "Profit/Loss Year:"
 msgstr ""
 
-#: admin/gl_setup.php:164
+#: admin/gl_setup.php:199
 msgid "Exchange Variances Account:"
 msgstr ""
 
 msgid "Exchange Variances Account:"
 msgstr ""
 
-#: admin/gl_setup.php:166 gl/manage/bank_accounts.php:194
+#: admin/gl_setup.php:201 gl/manage/bank_accounts.php:194
 msgid "Bank Charges Account:"
 msgstr ""
 
 msgid "Bank Charges Account:"
 msgstr ""
 
-#: admin/gl_setup.php:168
+#: admin/gl_setup.php:203
 msgid "Tax Algorithm:"
 msgstr ""
 
 msgid "Tax Algorithm:"
 msgstr ""
 
-#: admin/gl_setup.php:172
+#: admin/gl_setup.php:207
 msgid "Dimension Defaults"
 msgstr ""
 
 msgid "Dimension Defaults"
 msgstr ""
 
-#: admin/gl_setup.php:174
+#: admin/gl_setup.php:209
 msgid "Dimension Required By After:"
 msgstr ""
 
 msgid "Dimension Required By After:"
 msgstr ""
 
-#: admin/gl_setup.php:178
+#: admin/gl_setup.php:213
 msgid "Customers and Sales"
 msgstr ""
 
 msgid "Customers and Sales"
 msgstr ""
 
-#: admin/gl_setup.php:180
+#: admin/gl_setup.php:215
 msgid "Default Credit Limit:"
 msgstr ""
 
 msgid "Default Credit Limit:"
 msgstr ""
 
-#: admin/gl_setup.php:182
+#: admin/gl_setup.php:217
 msgid "Invoice Identification:"
 msgstr ""
 
 msgid "Invoice Identification:"
 msgstr ""
 
-#: admin/gl_setup.php:182 gl/manage/bank_accounts.php:110
-#: includes/ui/ui_view.inc:546
+#: admin/gl_setup.php:217 gl/manage/bank_accounts.php:110
+#: includes/ui/ui_view.inc:552
 msgid "Number"
 msgstr ""
 
 msgid "Number"
 msgstr ""
 
-#: admin/gl_setup.php:182 admin/view_print_transaction.php:127
-#: admin/void_transaction.php:181 dimensions/inquiry/search_dimensions.php:125
+#: admin/gl_setup.php:217 admin/view_print_transaction.php:127
+#: admin/void_transaction.php:187 dimensions/inquiry/search_dimensions.php:132
 #: dimensions/view/view_dimension.php:55 gl/bank_account_reconcile.php:268
 #: gl/inquiry/bank_inquiry.php:71 gl/inquiry/gl_account_inquiry.php:128
 #: dimensions/view/view_dimension.php:55 gl/bank_account_reconcile.php:268
 #: gl/inquiry/bank_inquiry.php:71 gl/inquiry/gl_account_inquiry.php:128
-#: gl/inquiry/journal_inquiry.php:112 gl/view/bank_transfer_view.php:86
+#: gl/inquiry/journal_inquiry.php:118 gl/view/bank_transfer_view.php:86
 #: gl/view/gl_deposit_view.php:80 gl/view/gl_payment_view.php:78
 #: gl/view/gl_trans_view.php:38 includes/ui/contacts_view.inc:40
 #: inventory/inquiry/stock_movements.php:104
 #: inventory/view/view_adjustment.php:43 inventory/view/view_transfer.php:36
 #: gl/view/gl_deposit_view.php:80 gl/view/gl_payment_view.php:78
 #: gl/view/gl_trans_view.php:38 includes/ui/contacts_view.inc:40
 #: inventory/inquiry/stock_movements.php:104
 #: inventory/view/view_adjustment.php:43 inventory/view/view_transfer.php:36
-#: manufacturing/search_work_orders.php:158
-#: manufacturing/view/wo_issue_view.php:42
-#: manufacturing/view/wo_production_view.php:43
+#: manufacturing/search_work_orders.php:165
 #: 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
 #: 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
+#: manufacturing/view/wo_issue_view.php:42
+#: manufacturing/view/wo_production_view.php:43
+#: purchasing/allocations/supplier_allocation_main.php:96
 #: purchasing/includes/ui/grn_ui.inc:32 purchasing/includes/ui/grn_ui.inc:64
 #: purchasing/includes/ui/grn_ui.inc:32 purchasing/includes/ui/grn_ui.inc:64
-#: purchasing/includes/ui/po_ui.inc:298 purchasing/view/view_po.php:115
+#: purchasing/includes/ui/po_ui.inc:302 purchasing/inquiry/po_search.php:118
+#: purchasing/inquiry/po_search_completed.php:120
+#: purchasing/inquiry/supplier_allocation_inquiry.php:138
+#: purchasing/inquiry/supplier_inquiry.php:176 purchasing/view/view_po.php:115
 #: purchasing/view/view_supp_credit.php:43
 #: purchasing/view/view_supp_invoice.php:47
 #: purchasing/view/view_supp_credit.php:43
 #: purchasing/view/view_supp_invoice.php:47
-#: purchasing/view/view_supp_payment.php:73
-#: purchasing/inquiry/po_search_completed.php:111
-#: purchasing/inquiry/po_search.php:118
-#: purchasing/inquiry/supplier_allocation_inquiry.php:138
-#: purchasing/inquiry/supplier_inquiry.php:175
-#: purchasing/allocations/supplier_allocation_main.php:96
-#: reporting/rep501.php:87 reporting/rep601.php:79 reporting/rep602.php:80
-#: reporting/rep702.php:53 reporting/includes/doctext.inc:220
-#: 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
+#: purchasing/view/view_supp_payment.php:73 reporting/rep501.php:87
+#: reporting/rep601.php:81 reporting/rep602.php:80 reporting/rep702.php:53
+#: reporting/includes/doctext.inc:222 sales/customer_credit_invoice.php:241
+#: sales/customer_credit_invoice.php:246 sales/customer_delivery.php:334
+#: sales/customer_delivery.php:339 sales/customer_invoice.php:446
+#: sales/customer_invoice.php:451
 #: sales/allocations/customer_allocation_main.php:94
 #: sales/allocations/customer_allocation_main.php:94
-#: sales/view/view_dispatch.php:85 sales/view/view_invoice.php:85
-#: sales/view/view_receipt.php:39 sales/view/view_sales_order.php:94
-#: sales/inquiry/customer_allocation_inquiry.php:148
-#: sales/inquiry/customer_inquiry.php:196
-#: sales/inquiry/sales_deliveries_view.php:173
 #: sales/includes/ui/sales_credit_ui.inc:81
 #: sales/includes/ui/sales_credit_ui.inc:83
 #: sales/includes/ui/sales_order_ui.inc:361
 #: sales/includes/ui/sales_credit_ui.inc:81
 #: sales/includes/ui/sales_credit_ui.inc:83
 #: sales/includes/ui/sales_order_ui.inc:361
+#: sales/inquiry/customer_allocation_inquiry.php:149
+#: sales/inquiry/customer_inquiry.php:202
+#: sales/inquiry/sales_deliveries_view.php:174 sales/view/view_dispatch.php:85
+#: sales/view/view_invoice.php:85 sales/view/view_receipt.php:39
+#: sales/view/view_sales_order.php:96
 msgid "Reference"
 msgstr ""
 
 msgid "Reference"
 msgstr ""
 
-#: admin/gl_setup.php:184
+#: admin/gl_setup.php:219
 msgid "Accumulate batch shipping:"
 msgstr ""
 
 msgid "Accumulate batch shipping:"
 msgstr ""
 
-#: admin/gl_setup.php:186
+#: admin/gl_setup.php:221
 msgid "Print Item Image on Quote:"
 msgstr ""
 
 msgid "Print Item Image on Quote:"
 msgstr ""
 
-#: admin/gl_setup.php:188
+#: admin/gl_setup.php:223
 msgid "Legal Text on Invoice:"
 msgstr ""
 
 msgid "Legal Text on Invoice:"
 msgstr ""
 
-#: admin/gl_setup.php:190
+#: admin/gl_setup.php:225
 msgid "Shipping Charged Account:"
 msgstr ""
 
 msgid "Shipping Charged Account:"
 msgstr ""
 
-#: admin/gl_setup.php:192
+#: admin/gl_setup.php:227
 msgid "Deferred Income Account:"
 msgstr ""
 
 msgid "Deferred Income Account:"
 msgstr ""
 
-#: admin/gl_setup.php:193
+#: admin/gl_setup.php:228
 msgid "Not used"
 msgstr ""
 
 msgid "Not used"
 msgstr ""
 
-#: admin/gl_setup.php:197
+#: admin/gl_setup.php:232
 msgid "Customers and Sales Defaults"
 msgstr ""
 
 msgid "Customers and Sales Defaults"
 msgstr ""
 
-#: admin/gl_setup.php:199
+#: admin/gl_setup.php:234
 msgid "Receivable Account:"
 msgstr ""
 
 msgid "Receivable Account:"
 msgstr ""
 
-#: admin/gl_setup.php:201 admin/gl_setup.php:246
-#: inventory/manage/item_categories.php:228 inventory/manage/items.php:479
+#: admin/gl_setup.php:236 admin/gl_setup.php:281 inventory/manage/items.php:489
+#: inventory/manage/item_categories.php:228
 #: sales/manage/customer_branches.php:242
 msgid "Sales Account:"
 msgstr ""
 
 #: sales/manage/customer_branches.php:242
 msgid "Sales Account:"
 msgstr ""
 
-#: admin/gl_setup.php:204 sales/manage/customer_branches.php:243
+#: admin/gl_setup.php:239 sales/manage/customer_branches.php:243
 msgid "Sales Discount Account:"
 msgstr ""
 
 msgid "Sales Discount Account:"
 msgstr ""
 
-#: admin/gl_setup.php:206 sales/manage/customer_branches.php:245
+#: admin/gl_setup.php:241 sales/manage/customer_branches.php:245
 msgid "Prompt Payment Discount Account:"
 msgstr ""
 
 msgid "Prompt Payment Discount Account:"
 msgstr ""
 
-#: admin/gl_setup.php:208
+#: admin/gl_setup.php:243
 msgid "Quote Valid Days:"
 msgstr ""
 
 msgid "Quote Valid Days:"
 msgstr ""
 
-#: admin/gl_setup.php:210
+#: admin/gl_setup.php:245
 msgid "Delivery Required By:"
 msgstr ""
 
 msgid "Delivery Required By:"
 msgstr ""
 
-#: admin/gl_setup.php:216
+#: admin/gl_setup.php:251
 msgid "Suppliers and Purchasing"
 msgstr ""
 
 msgid "Suppliers and Purchasing"
 msgstr ""
 
-#: admin/gl_setup.php:218
+#: admin/gl_setup.php:253
 msgid "Delivery Over-Receive Allowance:"
 msgstr ""
 
 msgid "Delivery Over-Receive Allowance:"
 msgstr ""
 
-#: admin/gl_setup.php:220
+#: admin/gl_setup.php:255
 msgid "Invoice Over-Charge Allowance:"
 msgstr ""
 
 msgid "Invoice Over-Charge Allowance:"
 msgstr ""
 
-#: admin/gl_setup.php:222
+#: admin/gl_setup.php:257
 msgid "Suppliers and Purchasing Defaults"
 msgstr ""
 
 msgid "Suppliers and Purchasing Defaults"
 msgstr ""
 
-#: admin/gl_setup.php:224
+#: admin/gl_setup.php:259
 msgid "Payable Account:"
 msgstr ""
 
 msgid "Payable Account:"
 msgstr ""
 
-#: admin/gl_setup.php:226 purchasing/manage/suppliers.php:131
+#: admin/gl_setup.php:261 purchasing/manage/suppliers.php:241
 msgid "Purchase Discount Account:"
 msgstr ""
 
 msgid "Purchase Discount Account:"
 msgstr ""
 
-#: admin/gl_setup.php:228
+#: admin/gl_setup.php:263
 msgid "GRN Clearing Account:"
 msgstr ""
 
 msgid "GRN Clearing Account:"
 msgstr ""
 
-#: admin/gl_setup.php:228
+#: admin/gl_setup.php:263
 msgid "No postings on GRN"
 msgstr ""
 
 msgid "No postings on GRN"
 msgstr ""
 
-#: admin/gl_setup.php:230
+#: admin/gl_setup.php:265
 msgid "Receival Required By:"
 msgstr ""
 
 msgid "Receival Required By:"
 msgstr ""
 
-#: admin/gl_setup.php:232
+#: admin/gl_setup.php:267
 msgid "Show PO item codes:"
 msgstr ""
 
 msgid "Show PO item codes:"
 msgstr ""
 
-#: admin/gl_setup.php:234 reporting/reports_main.php:208
+#: admin/gl_setup.php:269 reporting/reports_main.php:229
 msgid "Inventory"
 msgstr ""
 
 msgid "Inventory"
 msgstr ""
 
-#: admin/gl_setup.php:236
+#: admin/gl_setup.php:271
 msgid "Allow Negative Inventory:"
 msgstr ""
 
 msgid "Allow Negative Inventory:"
 msgstr ""
 
-#: admin/gl_setup.php:237
+#: admin/gl_setup.php:272
 msgid "Warning:  This may cause a delay in GL postings"
 msgstr ""
 
 msgid "Warning:  This may cause a delay in GL postings"
 msgstr ""
 
-#: admin/gl_setup.php:239
+#: admin/gl_setup.php:274
 msgid "No zero-amounts (Service):"
 msgstr ""
 
 msgid "No zero-amounts (Service):"
 msgstr ""
 
-#: admin/gl_setup.php:241
+#: admin/gl_setup.php:276
 msgid "Location Notifications:"
 msgstr ""
 
 msgid "Location Notifications:"
 msgstr ""
 
-#: admin/gl_setup.php:243
+#: admin/gl_setup.php:278
 msgid "Allow Negative Prices:"
 msgstr ""
 
 msgid "Allow Negative Prices:"
 msgstr ""
 
-#: admin/gl_setup.php:245
+#: admin/gl_setup.php:280
 msgid "Items Defaults"
 msgstr ""
 
 msgid "Items Defaults"
 msgstr ""
 
-#: admin/gl_setup.php:248 inventory/manage/item_categories.php:244
-#: inventory/manage/items.php:488
+#: admin/gl_setup.php:283 inventory/manage/items.php:498
+#: inventory/manage/item_categories.php:244
 msgid "Inventory Account:"
 msgstr ""
 
 msgid "Inventory Account:"
 msgstr ""
 
-#: admin/gl_setup.php:250 inventory/manage/item_categories.php:232
-#: inventory/manage/item_categories.php:246 inventory/manage/items.php:489
-#: inventory/manage/items.php:494
+#: admin/gl_setup.php:285 inventory/manage/items.php:499
+#: inventory/manage/items.php:504 inventory/manage/item_categories.php:232
+#: inventory/manage/item_categories.php:246
 msgid "C.O.G.S. Account:"
 msgstr ""
 
 msgid "C.O.G.S. Account:"
 msgstr ""
 
-#: admin/gl_setup.php:252 inventory/manage/item_categories.php:247
-#: inventory/manage/items.php:490
+#: admin/gl_setup.php:287 inventory/manage/items.php:500
+#: inventory/manage/item_categories.php:247
 msgid "Inventory Adjustments Account:"
 msgstr ""
 
 msgid "Inventory Adjustments Account:"
 msgstr ""
 
-#: admin/gl_setup.php:254 inventory/manage/items.php:501
+#: admin/gl_setup.php:289 inventory/manage/items.php:511
 msgid "WIP Account:"
 msgstr ""
 
 msgid "WIP Account:"
 msgstr ""
 
-#: admin/gl_setup.php:258 sql/alter2.4rc1.php:34
+#: admin/gl_setup.php:293 sql/alter2.4rc1.php:34
 msgid "Fixed Assets Defaults"
 msgstr ""
 
 msgid "Fixed Assets Defaults"
 msgstr ""
 
-#: admin/gl_setup.php:260 sql/alter2.4rc1.php:35
+#: admin/gl_setup.php:295 sql/alter2.4rc1.php:35
 msgid "Loss On Asset Disposal Account:"
 msgstr ""
 
 msgid "Loss On Asset Disposal Account:"
 msgstr ""
 
-#: admin/gl_setup.php:262
+#: admin/gl_setup.php:297
 msgid "Depreciation Period:"
 msgstr ""
 
 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
+#: admin/gl_setup.php:297 gl/accruals.php:198
+#: gl/includes/ui/gl_journal_ui.inc:69 gl/manage/gl_quick_entries.php:247
+#: sales/create_recurrent_invoices.php:209
 #: sales/manage/recurrent_invoices.php:128
 msgid "Monthly"
 msgstr ""
 
 #: 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
+#: admin/gl_setup.php:297 gl/includes/ui/gl_journal_ui.inc:69
+#: gl/manage/gl_quick_entries.php:247
 msgid "Yearly"
 msgstr ""
 
 msgid "Yearly"
 msgstr ""
 
-#: admin/gl_setup.php:266
+#: admin/gl_setup.php:301
 msgid "Manufacturing Defaults"
 msgstr ""
 
 msgid "Manufacturing Defaults"
 msgstr ""
 
-#: admin/gl_setup.php:268
+#: admin/gl_setup.php:303
 msgid "Work Order Required By After:"
 msgstr ""
 
 msgid "Work Order Required By After:"
 msgstr ""
 
@@ -1603,7 +1709,7 @@ msgstr ""
 
 #: admin/inst_chart.php:62 admin/inst_lang.php:36 admin/inst_module.php:115
 #: admin/inst_theme.php:55 inventory/inquiry/stock_status.php:75
 
 #: admin/inst_chart.php:62 admin/inst_lang.php:36 admin/inst_module.php:115
 #: admin/inst_theme.php:55 inventory/inquiry/stock_status.php:75
-#: reporting/rep303.php:113
+#: reporting/rep303.php:215
 msgid "Available"
 msgstr ""
 
 msgid "Available"
 msgstr ""
 
@@ -1613,7 +1719,7 @@ msgstr ""
 
 #: admin/inst_chart.php:79 admin/inst_chart.php:81 admin/inst_lang.php:88
 #: admin/inst_module.php:136 admin/inst_module.php:137 admin/inst_theme.php:77
 
 #: admin/inst_chart.php:79 admin/inst_chart.php:81 admin/inst_lang.php:88
 #: admin/inst_module.php:136 admin/inst_module.php:137 admin/inst_theme.php:77
-#: includes/sysnames.inc:207
+#: includes/sysnames.inc:209
 msgid "Unknown"
 msgstr ""
 
 msgid "Unknown"
 msgstr ""
 
@@ -1637,19 +1743,19 @@ msgstr ""
 msgid "Install/Update Languages"
 msgstr ""
 
 msgid "Install/Update Languages"
 msgstr ""
 
-#: admin/inst_lang.php:35 admin/printers.php:84
-#: admin/shipping_companies.php:91 dimensions/dimension_entry.php:261
-#: dimensions/inquiry/search_dimensions.php:126
+#: admin/inst_lang.php:35 admin/printers.php:84 admin/shipping_companies.php:91
+#: dimensions/dimension_entry.php:261
+#: dimensions/inquiry/search_dimensions.php:133
 #: dimensions/view/view_dimension.php:55 gl/gl_journal.php:556
 #: inventory/manage/item_categories.php:117
 #: inventory/manage/item_categories.php:121
 #: manufacturing/manage/work_centres.php:101
 #: purchasing/includes/ui/invoice_ui.inc:278
 #: purchasing/includes/ui/invoice_ui.inc:280
 #: dimensions/view/view_dimension.php:55 gl/gl_journal.php:556
 #: inventory/manage/item_categories.php:117
 #: inventory/manage/item_categories.php:121
 #: manufacturing/manage/work_centres.php:101
 #: purchasing/includes/ui/invoice_ui.inc:278
 #: purchasing/includes/ui/invoice_ui.inc:280
-#: purchasing/includes/ui/invoice_ui.inc:282 reporting/rep501.php:87
-#: reporting/rep709.php:116 reporting/rep709.php:117
-#: sales/manage/customer_branches.php:284 sales/manage/sales_people.php:99
-#: taxes/item_tax_types.php:117
+#: purchasing/includes/ui/invoice_ui.inc:282 reporting/rep115.php:164
+#: reporting/rep206.php:115 reporting/rep501.php:87 reporting/rep709.php:117
+#: reporting/rep709.php:118 sales/manage/customer_branches.php:284
+#: sales/manage/sales_people.php:99 taxes/item_tax_types.php:117
 msgid "Name"
 msgstr ""
 
 msgid "Name"
 msgstr ""
 
@@ -1746,9 +1852,10 @@ msgstr ""
 msgid "Install third-party extension."
 msgstr ""
 
 msgid "Install third-party extension."
 msgstr ""
 
-#: admin/inst_module.php:177 includes/ui/ui_lists.inc:758
-#: includes/ui/ui_lists.inc:2351 reporting/includes/excel_report.inc:229
-#: reporting/includes/pdf_report.inc:265
+#: admin/inst_module.php:177 fixed_assets/inquiry/stock_inquiry.php:114
+#: includes/ui/ui_lists.inc:763 includes/ui/ui_lists.inc:2357
+#: reporting/includes/excel_report.inc:229
+#: reporting/includes/pdf_report.inc:266
 msgid "Active"
 msgstr ""
 
 msgid "Active"
 msgstr ""
 
@@ -1857,8 +1964,8 @@ msgid "Save database and perform upgrade"
 msgstr ""
 
 #: admin/payment_terms.php:16 reporting/includes/doctext.inc:40
 msgstr ""
 
 #: admin/payment_terms.php:16 reporting/includes/doctext.inc:40
-#: sales/view/view_invoice.php:76 sales/view/view_sales_order.php:82
-#: sales/view/view_sales_order.php:90
+#: sales/view/view_invoice.php:76 sales/view/view_sales_order.php:84
+#: sales/view/view_sales_order.php:92
 msgid "Payment Terms"
 msgstr ""
 
 msgid "Payment Terms"
 msgstr ""
 
@@ -1895,31 +2002,31 @@ msgid "Selected payment terms have been deleted"
 msgstr ""
 
 #: admin/payment_terms.php:127 dimensions/dimension_entry.php:265
 msgstr ""
 
 #: admin/payment_terms.php:127 dimensions/dimension_entry.php:265
-#: dimensions/inquiry/search_dimensions.php:74
-#: dimensions/inquiry/search_dimensions.php:127
+#: dimensions/inquiry/search_dimensions.php:75
+#: dimensions/inquiry/search_dimensions.php:134
 #: dimensions/view/view_dimension.php:55 gl/bank_account_reconcile.php:266
 #: dimensions/view/view_dimension.php:55 gl/bank_account_reconcile.php:266
-#: gl/inquiry/bank_inquiry.php:71 gl/inquiry/gl_account_inquiry.php:128
-#: gl/inquiry/journal_inquiry.php:108 gl/inquiry/tax_inquiry.php:80
-#: gl/manage/bank_accounts.php:109 gl/manage/gl_quick_entries.php:190
-#: gl/view/accrual_trans.php:52 gl/includes/ui/gl_bank_ui.inc:90
-#: includes/ui/ui_view.inc:546 inventory/inquiry/stock_movements.php:104
+#: gl/includes/ui/gl_bank_ui.inc:90 gl/inquiry/bank_inquiry.php:71
+#: gl/inquiry/gl_account_inquiry.php:128 gl/inquiry/journal_inquiry.php:114
+#: gl/inquiry/tax_inquiry.php:80 gl/manage/bank_accounts.php:109
+#: gl/manage/gl_quick_entries.php:190 gl/view/accrual_trans.php:52
+#: includes/ui/ui_view.inc:552 inventory/inquiry/stock_movements.php:104
 #: inventory/manage/item_categories.php:121
 #: inventory/manage/item_categories.php:121
-#: manufacturing/search_work_orders.php:159
+#: manufacturing/search_work_orders.php:166
 #: manufacturing/includes/manufacturing_ui.inc:253
 #: manufacturing/includes/manufacturing_ui.inc:291
 #: manufacturing/includes/manufacturing_ui.inc:295
 #: manufacturing/includes/manufacturing_ui.inc:346
 #: purchasing/inquiry/supplier_allocation_inquiry.php:136
 #: 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: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: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:364 reporting/reports_main.php:526
-#: reporting/includes/doctext.inc:161 reporting/includes/doctext.inc:202
-#: reporting/includes/doctext.inc:221
-#: sales/inquiry/customer_allocation_inquiry.php:146
-#: sales/inquiry/customer_inquiry.php:193
+#: purchasing/inquiry/supplier_inquiry.php:174 reporting/rep102.php:127
+#: reporting/rep202.php:138 reporting/rep402.php:136 reporting/rep501.php:87
+#: reporting/rep601.php:81 reporting/rep602.php:80 reporting/rep702.php:60
+#: reporting/rep704.php:79 reporting/rep704.php:87 reporting/rep704.php:95
+#: reporting/rep709.php:113 reporting/rep710.php:78 reporting/rep710.php:86
+#: reporting/reports_main.php:386 reporting/reports_main.php:551
+#: reporting/includes/doctext.inc:161 reporting/includes/doctext.inc:204
+#: reporting/includes/doctext.inc:223
+#: sales/inquiry/customer_allocation_inquiry.php:147
+#: sales/inquiry/customer_inquiry.php:199
 msgid "Type"
 msgstr ""
 
 msgid "Type"
 msgstr ""
 
@@ -2107,9 +2214,10 @@ msgstr ""
 msgid "Role:"
 msgstr ""
 
 msgid "Role:"
 msgstr ""
 
-#: admin/security_roles.php:177 gl/manage/gl_accounts.php:208
-#: inventory/inquiry/stock_movements.php:67 inventory/manage/items.php:574
-#: purchasing/manage/suppliers.php:294 sales/manage/customers.php:332
+#: admin/security_roles.php:177 fixed_assets/inquiry/stock_inquiry.php:40
+#: gl/manage/gl_accounts.php:208 inventory/inquiry/stock_movements.php:67
+#: inventory/manage/items.php:565 purchasing/manage/suppliers.php:304
+#: sales/manage/customers.php:333
 msgid "Show inactive:"
 msgstr ""
 
 msgid "Show inactive:"
 msgstr ""
 
@@ -2149,28 +2257,26 @@ msgstr ""
 msgid "Delete This Role"
 msgstr ""
 
 msgid "Delete This Role"
 msgstr ""
 
-#: admin/security_roles.php:244 admin/void_transaction.php:228
-#: gl/manage/gl_quick_entries.php:61 gl/includes/ui/gl_bank_ui.inc:270
-#: gl/includes/ui/gl_journal_ui.inc:279 includes/ui/class.crud_view.inc:292
-#: includes/ui/simple_crud_class.inc:58 includes/ui/simple_crud_class.inc:229
-#: includes/ui/ui_controls.inc:645 includes/ui/ui_input.inc:230
-#: inventory/includes/item_adjustments_ui.inc:192
-#: inventory/includes/stock_transfers_ui.inc:152
-#: inventory/manage/items.php:557
+#: admin/security_roles.php:244 admin/void_transaction.php:253
+#: gl/includes/ui/gl_bank_ui.inc:267 gl/includes/ui/gl_journal_ui.inc:278
+#: gl/manage/gl_quick_entries.php:61 includes/ui/attachment.inc:171
+#: includes/ui/class.crud_view.inc:301 includes/ui/simple_crud_class.inc:58
+#: includes/ui/simple_crud_class.inc:229 includes/ui/ui_controls.inc:645
+#: includes/ui/ui_input.inc:230 inventory/includes/item_adjustments_ui.inc:214
+#: inventory/includes/stock_transfers_ui.inc:151 inventory/manage/items.php:548
 #: manufacturing/includes/work_order_issue_ui.inc:134
 #: manufacturing/includes/work_order_issue_ui.inc:134
-#: purchasing/includes/ui/po_ui.inc:438
-#: sales/create_recurrent_invoices.php:190
+#: purchasing/includes/ui/po_ui.inc:447 sales/create_recurrent_invoices.php:196
 #: sales/includes/ui/sales_credit_ui.inc:290
 #: sales/includes/ui/sales_credit_ui.inc:290
-#: sales/includes/ui/sales_order_ui.inc:550
+#: sales/includes/ui/sales_order_ui.inc:556
 msgid "Cancel"
 msgstr ""
 
 msgid "Cancel"
 msgstr ""
 
-#: admin/security_roles.php:244 inventory/manage/items.php:557
+#: admin/security_roles.php:244 inventory/manage/items.php:548
 msgid "Cancel Edition"
 msgstr ""
 
 #: admin/shipping_companies.php:15 sales/customer_credit_invoice.php:253
 msgid "Cancel Edition"
 msgstr ""
 
 #: admin/shipping_companies.php:15 sales/customer_credit_invoice.php:253
-#: sales/customer_delivery.php:356 sales/customer_invoice.php:470
+#: sales/customer_delivery.php:357 sales/customer_invoice.php:471
 #: sales/view/view_credit.php:74 sales/view/view_dispatch.php:92
 #: sales/view/view_invoice.php:92
 msgid "Shipping Company"
 #: sales/view/view_credit.php:74 sales/view/view_dispatch.php:92
 #: sales/view/view_invoice.php:92
 msgid "Shipping Company"
@@ -2217,25 +2323,24 @@ msgid "Secondary Phone"
 msgstr ""
 
 #: admin/shipping_companies.php:91 inventory/manage/locations.php:155
 msgstr ""
 
 #: admin/shipping_companies.php:91 inventory/manage/locations.php:155
-#: purchasing/inquiry/suppliers_list.php:53
-#: sales/inquiry/customers_list.php:54
+#: purchasing/inquiry/suppliers_list.php:53 sales/inquiry/customers_list.php:54
 msgid "Address"
 msgstr ""
 
 msgid "Address"
 msgstr ""
 
-#: admin/shipping_companies.php:134 gl/manage/gl_account_types.php:193
-#: gl/includes/ui/gl_bank_ui.inc:57 inventory/manage/items.php:376
+#: admin/shipping_companies.php:134 gl/includes/ui/gl_bank_ui.inc:57
+#: gl/manage/gl_account_types.php:193 inventory/manage/items.php:388
 #: manufacturing/manage/work_centres.php:137
 msgid "Name:"
 msgstr ""
 
 #: manufacturing/manage/work_centres.php:137
 msgid "Name:"
 msgstr ""
 
-#: admin/shipping_companies.php:136 purchasing/manage/suppliers.php:134
+#: admin/shipping_companies.php:136 purchasing/manage/suppliers.php:244
 #: sales/manage/customer_branches.php:252
 msgid "Contact Person:"
 msgstr ""
 
 #: admin/shipping_companies.php:140 includes/ui/contacts_view.inc:100
 #: sales/manage/customer_branches.php:252
 msgid "Contact Person:"
 msgstr ""
 
 #: admin/shipping_companies.php:140 includes/ui/contacts_view.inc:100
-#: inventory/manage/locations.php:215 purchasing/manage/suppliers.php:136
-#: sales/manage/customer_branches.php:254 sales/manage/customers.php:257
+#: inventory/manage/locations.php:215 purchasing/manage/suppliers.php:246
+#: sales/manage/customers.php:258 sales/manage/customer_branches.php:254
 msgid "Secondary Phone Number:"
 msgstr ""
 
 msgid "Secondary Phone Number:"
 msgstr ""
 
@@ -2247,11 +2352,11 @@ msgstr ""
 msgid "Unspecified tag type"
 msgstr ""
 
 msgid "Unspecified tag type"
 msgstr ""
 
-#: admin/tags.php:40 reporting/reports_main.php:385
-#: reporting/reports_main.php:394 reporting/reports_main.php:406
-#: reporting/reports_main.php:437 reporting/reports_main.php:445
-#: reporting/reports_main.php:456 reporting/reports_main.php:484
-#: reporting/reports_main.php:491 reporting/reports_main.php:501
+#: admin/tags.php:40 reporting/reports_main.php:407
+#: reporting/reports_main.php:417 reporting/reports_main.php:429
+#: reporting/reports_main.php:460 reporting/reports_main.php:469
+#: reporting/reports_main.php:480 reporting/reports_main.php:508
+#: reporting/reports_main.php:516 reporting/reports_main.php:526
 msgid "Account Tags"
 msgstr ""
 
 msgid "Account Tags"
 msgstr ""
 
@@ -2296,7 +2401,7 @@ msgstr ""
 msgid "Tag Description:"
 msgstr ""
 
 msgid "Tag Description:"
 msgstr ""
 
-#: admin/users.php:16
+#: admin/users.php:16 includes/dashboard.inc:393
 msgid "Users"
 msgstr ""
 
 msgid "Users"
 msgstr ""
 
@@ -2324,19 +2429,19 @@ msgstr ""
 msgid "User login"
 msgstr ""
 
 msgid "User login"
 msgstr ""
 
-#: admin/users.php:123 admin/users.php:207 includes/ui/contacts_view.inc:40
+#: admin/users.php:123 admin/users.php:209 includes/ui/contacts_view.inc:40
 msgid "Full Name"
 msgstr ""
 
 #: admin/users.php:123 includes/ui/contacts_view.inc:40
 msgid "Full Name"
 msgstr ""
 
 #: admin/users.php:123 includes/ui/contacts_view.inc:40
-#: inventory/manage/locations.php:155 reporting/rep106.php:94
-#: reporting/includes/header2.inc:100 sales/manage/sales_people.php:99
-#: sales/inquiry/customer_branches_list.php:49
+#: inventory/manage/locations.php:155 reporting/rep106.php:95
+#: reporting/includes/header2.inc:98
+#: sales/inquiry/customer_branches_list.php:49 sales/manage/sales_people.php:99
 msgid "Phone"
 msgstr ""
 
 #: admin/users.php:124 sales/manage/customer_branches.php:290
 msgid "Phone"
 msgstr ""
 
 #: admin/users.php:124 sales/manage/customer_branches.php:290
-#: sales/view/view_sales_order.php:96
+#: sales/view/view_sales_order.php:98
 msgid "E-mail"
 msgstr ""
 
 msgid "E-mail"
 msgstr ""
 
@@ -2348,27 +2453,27 @@ msgstr ""
 msgid "Access Level"
 msgstr ""
 
 msgid "Access Level"
 msgstr ""
 
-#: admin/users.php:193
+#: admin/users.php:195
 msgid "User Login:"
 msgstr ""
 
 msgid "User Login:"
 msgstr ""
 
-#: admin/users.php:204
+#: admin/users.php:206
 msgid "Enter a new password to change, leave empty to keep current."
 msgstr ""
 
 msgid "Enter a new password to change, leave empty to keep current."
 msgstr ""
 
-#: admin/users.php:209
+#: admin/users.php:211
 msgid "Telephone No.:"
 msgstr ""
 
 msgid "Telephone No.:"
 msgstr ""
 
-#: admin/users.php:213
+#: admin/users.php:215
 msgid "Access Level:"
 msgstr ""
 
 msgid "Access Level:"
 msgstr ""
 
-#: admin/users.php:217
+#: admin/users.php:219
 msgid "User's POS"
 msgstr ""
 
 msgid "User's POS"
 msgstr ""
 
-#: admin/users.php:222
+#: admin/users.php:224
 msgid "Use popup window for reports:"
 msgstr ""
 
 msgid "Use popup window for reports:"
 msgstr ""
 
@@ -2377,10 +2482,12 @@ msgid "View or Print Transactions"
 msgstr ""
 
 #: admin/view_print_transaction.php:43 admin/view_print_transaction.php:45
 msgstr ""
 
 #: admin/view_print_transaction.php:43 admin/view_print_transaction.php:45
-#: admin/view_print_transaction.php:129 includes/ui/ui_controls.inc:213
-#: purchasing/inquiry/po_search_completed.php:43
-#: purchasing/inquiry/po_search.php:94 sales/inquiry/customer_inquiry.php:97
-#: sales/inquiry/sales_deliveries_view.php:148
+#: admin/view_print_transaction.php:129
+#: dimensions/inquiry/search_dimensions.php:123 includes/ui/ui_controls.inc:213
+#: manufacturing/search_work_orders.php:152 purchasing/inquiry/po_search.php:94
+#: purchasing/inquiry/po_search_completed.php:52
+#: sales/inquiry/customer_inquiry.php:102
+#: sales/inquiry/sales_deliveries_view.php:149
 #: sales/inquiry/sales_orders_view.php:102
 msgid "Print"
 msgstr ""
 #: sales/inquiry/sales_orders_view.php:102
 msgid "Print"
 msgstr ""
@@ -2389,29 +2496,31 @@ msgstr ""
 msgid "Only documents can be printed."
 msgstr ""
 
 msgid "Only documents can be printed."
 msgstr ""
 
-#: admin/view_print_transaction.php:79 admin/void_transaction.php:165
+#: admin/view_print_transaction.php:79 admin/void_transaction.php:171
 msgid "from #:"
 msgstr ""
 
 msgid "from #:"
 msgstr ""
 
-#: admin/view_print_transaction.php:81 admin/void_transaction.php:167
+#: admin/view_print_transaction.php:81 admin/void_transaction.php:173
 msgid "to #:"
 msgstr ""
 
 msgid "to #:"
 msgstr ""
 
-#: admin/view_print_transaction.php:83 admin/void_transaction.php:169
-#: dimensions/inquiry/search_dimensions.php:87 gl/inquiry/accounts_list.php:40
+#: admin/view_print_transaction.php:83 admin/void_transaction.php:175
+#: dimensions/inquiry/search_dimensions.php:88
+#: fixed_assets/inquiry/stock_inquiry.php:41 gl/inquiry/accounts_list.php:40
 #: gl/inquiry/journal_inquiry.php:58 inventory/inquiry/stock_list.php:42
 #: gl/inquiry/journal_inquiry.php:58 inventory/inquiry/stock_list.php:42
-#: manufacturing/search_work_orders.php:84
+#: manufacturing/search_work_orders.php:86
 #: purchasing/includes/ui/invoice_ui.inc:483
 #: purchasing/includes/ui/invoice_ui.inc:483
-#: purchasing/inquiry/po_search_completed.php:99
 #: purchasing/inquiry/po_search.php:78
 #: purchasing/inquiry/po_search.php:78
+#: purchasing/inquiry/po_search_completed.php:108
+#: purchasing/inquiry/suppliers_list.php:42
 #: purchasing/inquiry/supplier_allocation_inquiry.php:57
 #: purchasing/inquiry/supplier_inquiry.php:147
 #: purchasing/inquiry/supplier_allocation_inquiry.php:57
 #: purchasing/inquiry/supplier_inquiry.php:147
-#: purchasing/inquiry/suppliers_list.php:42
+#: sales/inquiry/customers_list.php:42
 #: sales/inquiry/customer_allocation_inquiry.php:51
 #: sales/inquiry/customer_branches_list.php:38
 #: sales/inquiry/customer_allocation_inquiry.php:51
 #: sales/inquiry/customer_branches_list.php:38
-#: sales/inquiry/customer_inquiry.php:164 sales/inquiry/customers_list.php:42
-#: sales/inquiry/sales_deliveries_view.php:116
-#: sales/inquiry/sales_orders_view.php:236
+#: sales/inquiry/customer_inquiry.php:170
+#: sales/inquiry/sales_deliveries_view.php:117
+#: sales/inquiry/sales_orders_view.php:256
 msgid "Search"
 msgstr ""
 
 msgid "Search"
 msgstr ""
 
@@ -2427,50 +2536,52 @@ msgid ""
 "zero."
 msgstr ""
 
 "zero."
 msgstr ""
 
-#: admin/view_print_transaction.php:128 admin/void_transaction.php:182
-#: dimensions/inquiry/search_dimensions.php:128
-#: dimensions/view/view_dimension.php:55 gl/accruals.php:104
+#: admin/view_print_transaction.php:128 admin/void_transaction.php:188
+#: dimensions/inquiry/search_dimensions.php:135
+#: dimensions/view/view_dimension.php:55
+#: fixed_assets/process_depreciation.php:100 gl/accruals.php:104
 #: gl/accruals.php:211 gl/bank_account_reconcile.php:269
 #: gl/inquiry/bank_inquiry.php:71 gl/inquiry/gl_account_inquiry.php:128
 #: gl/accruals.php:211 gl/bank_account_reconcile.php:269
 #: gl/inquiry/bank_inquiry.php:71 gl/inquiry/gl_account_inquiry.php:128
-#: gl/inquiry/journal_inquiry.php:107 gl/view/accrual_trans.php:52
+#: gl/inquiry/journal_inquiry.php:113 gl/view/accrual_trans.php:52
 #: gl/view/bank_transfer_view.php:83 gl/view/gl_deposit_view.php:68
 #: gl/view/bank_transfer_view.php:83 gl/view/gl_deposit_view.php:68
-#: gl/view/gl_payment_view.php:66 includes/dashboard.inc:486
-#: includes/dashboard.inc:571 includes/ui/allocation_cart.inc:290
-#: includes/ui/ui_view.inc:546 inventory/inquiry/stock_movements.php:109
+#: gl/view/gl_payment_view.php:66 includes/dashboard.inc:1011
+#: includes/dashboard.inc:1095 includes/ui/allocation_cart.inc:311
+#: includes/ui/attachment.inc:136 includes/ui/ui_view.inc:552
+#: inventory/inquiry/stock_movements.php:109
 #: inventory/view/view_adjustment.php:44 inventory/view/view_transfer.php:37
 #: inventory/view/view_adjustment.php:44 inventory/view/view_transfer.php:37
-#: manufacturing/search_work_orders.php:164
+#: manufacturing/search_work_orders.php:171
 #: manufacturing/work_order_entry.php:399
 #: manufacturing/work_order_entry.php:405
 #: manufacturing/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: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
 #: 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
+#: manufacturing/view/wo_costs_view.php:60
+#: manufacturing/view/wo_production_view.php:44
 #: purchasing/allocations/supplier_allocation_main.php:97
 #: purchasing/allocations/supplier_allocation_main.php:97
-#: reporting/rep101.php:133 reporting/rep107.php:202 reporting/rep201.php:107
-#: reporting/rep306.php:141 reporting/rep310.php:142 reporting/rep402.php:103
-#: reporting/rep501.php:87 reporting/rep601.php:79 reporting/rep602.php:80
-#: reporting/rep704.php:82 reporting/rep704.php:85 reporting/rep704.php:88
-#: reporting/rep709.php:116 reporting/rep710.php:77
-#: reporting/includes/doctext.inc:166 reporting/includes/doctext.inc:207
-#: reporting/includes/doctext.inc:245 reporting/includes/header2.inc:137
-#: sales/customer_delivery.php:366 sales/customer_invoice.php:485
+#: purchasing/includes/ui/invoice_ui.inc:115
+#: purchasing/includes/ui/po_ui.inc:316
+#: purchasing/inquiry/supplier_allocation_inquiry.php:141
+#: purchasing/inquiry/supplier_inquiry.php:179 purchasing/view/view_po.php:140
+#: reporting/rep101.php:137 reporting/rep107.php:226 reporting/rep201.php:115
+#: reporting/rep306.php:138 reporting/rep310.php:139 reporting/rep402.php:136
+#: reporting/rep402.php:141 reporting/rep501.php:87 reporting/rep601.php:81
+#: reporting/rep602.php:80 reporting/rep704.php:79 reporting/rep704.php:87
+#: reporting/rep704.php:95 reporting/rep709.php:117 reporting/rep710.php:77
+#: reporting/includes/doctext.inc:166 reporting/includes/doctext.inc:209
+#: reporting/includes/doctext.inc:247 reporting/includes/header2.inc:135
+#: sales/customer_delivery.php:367 sales/customer_invoice.php:486
 #: sales/allocations/customer_allocation_main.php:95
 #: sales/allocations/customer_allocation_main.php:95
-#: sales/view/view_credit.php:69 sales/view/view_sales_order.php:109
-#: sales/view/view_sales_order.php:142 sales/view/view_sales_order.php:179
-#: sales/inquiry/customer_allocation_inquiry.php:150
-#: sales/inquiry/customer_inquiry.php:197
+#: sales/inquiry/customer_allocation_inquiry.php:151
+#: sales/inquiry/customer_inquiry.php:203 sales/view/view_credit.php:69
+#: sales/view/view_sales_order.php:111 sales/view/view_sales_order.php:144
+#: sales/view/view_sales_order.php:181
 msgid "Date"
 msgstr ""
 
 msgid "Date"
 msgstr ""
 
-#: admin/view_print_transaction.php:130 admin/void_transaction.php:183
+#: admin/view_print_transaction.php:130 admin/void_transaction.php:189
 #: includes/ui/ui_view.inc:51
 msgid "GL"
 msgstr ""
 #: includes/ui/ui_view.inc:51
 msgid "GL"
 msgstr ""
@@ -2479,107 +2590,123 @@ msgstr ""
 msgid "Void a Transaction"
 msgstr ""
 
 msgid "Void a Transaction"
 msgstr ""
 
-#: admin/void_transaction.php:125 admin/void_transaction.php:184
-#: gl/inquiry/accounts_list.php:63 includes/ui/ui_input.inc:152
+#: admin/void_transaction.php:125 admin/void_transaction.php:190
+#: gl/inquiry/accounts_list.php:64 includes/ui/ui_input.inc:152
 #: includes/ui/ui_input.inc:301 includes/ui/ui_lists.inc:20
 #: inventory/inquiry/stock_list.php:66 inventory/inquiry/stock_list.php:69
 #: purchasing/inquiry/suppliers_list.php:65
 #: includes/ui/ui_input.inc:301 includes/ui/ui_lists.inc:20
 #: inventory/inquiry/stock_list.php:66 inventory/inquiry/stock_list.php:69
 #: purchasing/inquiry/suppliers_list.php:65
-#: purchasing/inquiry/suppliers_list.php:68
+#: purchasing/inquiry/suppliers_list.php:68 sales/inquiry/customers_list.php:66
+#: sales/inquiry/customers_list.php:69
 #: sales/inquiry/customer_branches_list.php:60
 #: sales/inquiry/customer_branches_list.php:60
-#: sales/inquiry/customers_list.php:66 sales/inquiry/customers_list.php:69
 msgid "Select"
 msgstr ""
 
 msgid "Select"
 msgstr ""
 
-#: admin/void_transaction.php:156 includes/ui/class.reflines_crud.inc:90
+#: admin/void_transaction.php:162 includes/ui/class.reflines_crud.inc:90
 #: includes/ui/class.reflines_crud.inc:93
 msgid "Transaction Type:"
 msgstr ""
 
 #: includes/ui/class.reflines_crud.inc:93
 msgid "Transaction Type:"
 msgstr ""
 
-#: admin/void_transaction.php:203
+#: admin/void_transaction.php:194
+msgid "Marked transactions will be voided."
+msgstr ""
+
+#: admin/void_transaction.php:211
 msgid "Transaction #:"
 msgstr ""
 
 msgid "Transaction #:"
 msgstr ""
 
-#: admin/void_transaction.php:205
+#: admin/void_transaction.php:213
 msgid "Voiding Date:"
 msgstr ""
 
 msgid "Voiding Date:"
 msgstr ""
 
-#: admin/void_transaction.php:207 dimensions/dimension_entry.php:273
-#: gl/bank_transfer.php:137 gl/inquiry/gl_account_inquiry.php:84
-#: gl/inquiry/journal_inquiry.php:53 gl/manage/revaluate_currencies.php:96
-#: includes/ui/class.reflines_crud.inc:105 includes/ui/ui_view.inc:344
+#: admin/void_transaction.php:215 dimensions/dimension_entry.php:273
+#: fixed_assets/process_depreciation.php:175 gl/bank_transfer.php:152
+#: gl/inquiry/gl_account_inquiry.php:84 gl/inquiry/journal_inquiry.php:53
+#: gl/manage/revaluate_currencies.php:83
+#: includes/ui/class.reflines_crud.inc:105 includes/ui/ui_view.inc:350
 #: manufacturing/work_order_add_finished.php:196
 #: manufacturing/work_order_costs.php:147
 #: manufacturing/work_order_entry.php:429
 #: manufacturing/work_order_add_finished.php:196
 #: manufacturing/work_order_costs.php:147
 #: manufacturing/work_order_entry.php:429
-#: manufacturing/work_order_release.php:102
-#: purchasing/includes/ui/invoice_ui.inc:193
-#: purchasing/includes/ui/po_ui.inc:465 purchasing/po_entry_items.php:486
-#: purchasing/supplier_payment.php:331 sales/customer_invoice.php:658
-#: sales/customer_payments.php:380
+#: manufacturing/work_order_release.php:102 purchasing/po_entry_items.php:486
+#: purchasing/supplier_payment.php:349
+#: purchasing/includes/ui/invoice_ui.inc:192
+#: purchasing/includes/ui/po_ui.inc:474 sales/customer_invoice.php:659
+#: sales/customer_payments.php:399
 msgid "Memo:"
 msgstr ""
 
 msgid "Memo:"
 msgstr ""
 
-#: admin/void_transaction.php:212 admin/void_transaction.php:221
+#: admin/void_transaction.php:220 admin/void_transaction.php:229
 msgid "Void Transaction"
 msgstr ""
 
 msgid "Void Transaction"
 msgstr ""
 
-#: admin/void_transaction.php:217
+#: admin/void_transaction.php:225
 msgid "The entered transaction does not exist or cannot be voided."
 msgstr ""
 
 msgid "The entered transaction does not exist or cannot be voided."
 msgstr ""
 
-#: admin/void_transaction.php:225
+#: admin/void_transaction.php:240
+msgid ""
+"The void cannot be processed because there is an insufficient quantity for "
+"item:"
+msgstr ""
+
+#: admin/void_transaction.php:242 inventory/reorder_level.php:71
+#: inventory/inquiry/stock_movements.php:109
+#: inventory/inquiry/stock_status.php:74 purchasing/supplier_credit.php:230
+msgid "Quantity On Hand"
+msgstr ""
+
+#: admin/void_transaction.php:250
 msgid ""
 "Are you sure you want to void this transaction ? This action cannot be "
 "undone."
 msgstr ""
 
 msgid ""
 "Are you sure you want to void this transaction ? This action cannot be "
 "undone."
 msgstr ""
 
-#: admin/void_transaction.php:227 includes/ui/ui_controls.inc:644
+#: admin/void_transaction.php:252 includes/ui/ui_controls.inc:644
 msgid "Proceed"
 msgstr ""
 
 msgid "Proceed"
 msgstr ""
 
-#: admin/void_transaction.php:241
+#: admin/void_transaction.php:266
 msgid "The selected transaction was closed for edition and cannot be voided."
 msgstr ""
 
 msgid "The selected transaction was closed for edition and cannot be voided."
 msgstr ""
 
-#: admin/void_transaction.php:247 gl/accruals.php:42 gl/bank_transfer.php:159
+#: admin/void_transaction.php:272 gl/accruals.php:42 gl/bank_transfer.php:174
 #: gl/gl_journal.php:216 gl/gl_journal.php:228 gl/gl_journal.php:234
 #: gl/gl_journal.php:255 gl/manage/close_period.php:34
 #: gl/gl_journal.php:216 gl/gl_journal.php:228 gl/gl_journal.php:234
 #: gl/gl_journal.php:255 gl/manage/close_period.php:34
-#: gl/manage/exchange_rates.php:33 gl/manage/revaluate_currencies.php:51
+#: gl/manage/exchange_rates.php:33 gl/manage/revaluate_currencies.php:45
 #: manufacturing/work_order_add_finished.php:89
 #: manufacturing/work_order_costs.php:80 purchasing/po_receive_items.php:174
 #: manufacturing/work_order_add_finished.php:89
 #: manufacturing/work_order_costs.php:80 purchasing/po_receive_items.php:174
-#: purchasing/supplier_payment.php:194 sales/customer_credit_invoice.php:90
+#: purchasing/supplier_payment.php:191 sales/customer_credit_invoice.php:90
 #: sales/sales_order_entry.php:373 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 ""
 
 #: sales/sales_order_entry.php:373 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:253 gl/accruals.php:48 gl/bank_transfer.php:165
-#: gl/gl_bank.php:261 gl/gl_journal.php:222 gl/gl_journal.php:261
-#: gl/manage/revaluate_currencies.php:57 inventory/adjustments.php:123
+#: admin/void_transaction.php:278 gl/accruals.php:48 gl/bank_transfer.php:180
+#: gl/gl_bank.php:267 gl/gl_journal.php:222 gl/gl_journal.php:261
+#: gl/manage/revaluate_currencies.php:51 inventory/adjustments.php:123
 #: inventory/transfers.php:115 manufacturing/work_order_add_finished.php:95
 #: inventory/transfers.php:115 manufacturing/work_order_add_finished.php:95
-#: manufacturing/work_order_costs.php:86
-#: manufacturing/work_order_entry.php:151
+#: manufacturing/work_order_costs.php:86 manufacturing/work_order_entry.php:151
 #: manufacturing/work_order_issue.php:82 purchasing/po_entry_items.php:351
 #: manufacturing/work_order_issue.php:82 purchasing/po_entry_items.php:351
-#: purchasing/po_receive_items.php:179 purchasing/supplier_credit.php:186
-#: purchasing/supplier_invoice.php:193 purchasing/supplier_payment.php:200
-#: sales/create_recurrent_invoices.php:87
-#: sales/create_recurrent_invoices.php:166 sales/credit_note_entry.php:157
+#: purchasing/po_receive_items.php:179 purchasing/supplier_credit.php:196
+#: purchasing/supplier_invoice.php:200 purchasing/supplier_payment.php:197
+#: sales/create_recurrent_invoices.php:92
+#: sales/create_recurrent_invoices.php:170 sales/credit_note_entry.php:175
 #: sales/customer_credit_invoice.php:94 sales/customer_delivery.php:164
 #: sales/customer_credit_invoice.php:94 sales/customer_delivery.php:164
-#: sales/customer_invoice.php:302 sales/customer_payments.php:161
+#: sales/customer_invoice.php:303 sales/customer_payments.php:164
 #: sales/sales_order_entry.php:378
 msgid ""
 "The entered date is out of fiscal year or is closed for further data entry."
 msgstr ""
 
 #: sales/sales_order_entry.php:378
 msgid ""
 "The entered date is out of fiscal year or is closed for further data entry."
 msgstr ""
 
-#: admin/void_transaction.php:260
+#: admin/void_transaction.php:285
 msgid "The transaction number is expected to be numeric and greater than zero."
 msgstr ""
 
 msgid "The transaction number is expected to be numeric and greater than zero."
 msgstr ""
 
-#: admin/void_transaction.php:277
+#: admin/void_transaction.php:302
 msgid "The selected transaction has already been voided."
 msgstr ""
 
 msgid "The selected transaction has already been voided."
 msgstr ""
 
-#: admin/void_transaction.php:290
+#: admin/void_transaction.php:315
 msgid "Selected transaction has been voided."
 msgstr ""
 
 msgid "Selected transaction has been voided."
 msgstr ""
 
@@ -2598,8 +2725,9 @@ msgstr ""
 msgid "Closing Year"
 msgstr ""
 
 msgid "Closing Year"
 msgstr ""
 
-#: admin/db/fiscalyears_db.inc:220 reporting/rep101.php:188
-#: reporting/rep201.php:162 reporting/rep706.php:185
+#: admin/db/fiscalyears_db.inc:220 reporting/rep101.php:194
+#: reporting/rep115.php:164 reporting/rep201.php:170 reporting/rep206.php:115
+#: reporting/rep706.php:188
 msgid "Open Balance"
 msgstr ""
 
 msgid "Open Balance"
 msgstr ""
 
@@ -2634,13 +2762,13 @@ msgstr ""
 msgid "The language files folder "
 msgstr ""
 
 msgid "The language files folder "
 msgstr ""
 
-#: admin/db/maintenance_db.inc:402
+#: admin/db/maintenance_db.inc:405
 msgid ""
 "This is new format backup file which cannot be restored on database not "
 "migrated to utf8."
 msgstr ""
 
 msgid ""
 "This is new format backup file which cannot be restored on database not "
 "migrated to utf8."
 msgstr ""
 
-#: admin/db/maintenance_db.inc:486
+#: admin/db/maintenance_db.inc:489
 #, php-format
 msgid "SQL script execution failed in line %d: %s"
 msgstr ""
 #, php-format
 msgid "SQL script execution failed in line %d: %s"
 msgstr ""
@@ -2673,34 +2801,159 @@ msgstr ""
 msgid "This invoice cannot be voided because it was already credited."
 msgstr ""
 
 msgid "This invoice cannot be voided because it was already credited."
 msgstr ""
 
-#: admin/db/voiding_db.inc:58
+#: admin/db/voiding_db.inc:60
 msgid "This delivery cannot be voided because it was already invoiced."
 msgstr ""
 
 msgid "This delivery cannot be voided because it was already invoiced."
 msgstr ""
 
-#: admin/db/voiding_db.inc:76 admin/db/voiding_db.inc:119
-#: admin/db/voiding_db.inc:122
+#: admin/db/voiding_db.inc:79 admin/db/voiding_db.inc:122
+#: admin/db/voiding_db.inc:125
 msgid "This transaction type cannot be voided."
 msgstr ""
 
 msgid "This transaction type cannot be voided."
 msgstr ""
 
-#: admin/db/voiding_db.inc:81
+#: admin/db/voiding_db.inc:84
 msgid "This GRN cannot be voided because it was already invoiced."
 msgstr ""
 
 msgid "This GRN cannot be voided because it was already invoiced."
 msgstr ""
 
-#: admin/db/voiding_db.inc:83 admin/db/voiding_db.inc:92
+#: admin/db/voiding_db.inc:86 admin/db/voiding_db.inc:95
 msgid "Error encountered when voiding transaction."
 msgstr ""
 
 msgid "Error encountered when voiding transaction."
 msgstr ""
 
-#: admin/db/voiding_db.inc:105 admin/db/voiding_db.inc:113
+#: admin/db/voiding_db.inc:108 admin/db/voiding_db.inc:116
 #, php-format
 msgid ""
 "Selected document cannot be voided because related Work Order %s is already "
 "closed."
 msgstr ""
 
 #, 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:250
+#: admin/db/voiding_db.inc:130 sales/includes/db/sales_invoice_db.inc:254
 msgid "Voided."
 msgstr ""
 
 msgid "Voided."
 msgstr ""
 
+#: admin/includes/fa_patch.class.inc:98
+#, php-format
+msgid "Uncompatible extension '%s' disabled for company %d."
+msgstr ""
+
+#: admin/includes/fa_patch.class.inc:119
+#, php-format
+msgid "Upgrade started for company %s."
+msgstr ""
+
+#: admin/includes/fa_patch.class.inc:122
+msgid "Cannot connect to company database."
+msgstr ""
+
+#: admin/includes/fa_patch.class.inc:126
+#, php-format
+msgid ""
+"Cannot upgrade company %s: database version is incompatible ('%s' instead of "
+"'%s')."
+msgstr ""
+
+#: admin/includes/fa_patch.class.inc:141
+msgid "Security backup failed."
+msgstr ""
+
+#: admin/includes/fa_patch.class.inc:143
+#, php-format
+msgid "Security backup in file %s done."
+msgstr ""
+
+#: admin/includes/fa_patch.class.inc:191
+msgid "Cannot connect to company database for database restore."
+msgstr ""
+
+#: admin/includes/fa_patch.class.inc:196
+msgid "Upgrade failed. Original database content restored successfully."
+msgstr ""
+
+#: admin/includes/fa_patch.class.inc:198
+#, php-format
+msgid ""
+"Database restore operation failed. Original database content is in %s file."
+msgstr ""
+
+#: admin/includes/fa_patch.class.inc:205
+#, php-format
+msgid "Upgrade for company %s finished."
+msgstr ""
+
+#: admin/view/view_package.php:17
+msgid "Package Details"
+msgstr ""
+
+#: admin/view/view_package.php:24
+msgid ""
+"The script must be called with a valid package id to review the info for."
+msgstr ""
+
+#: admin/view/view_package.php:29
+msgid "Available version"
+msgstr ""
+
+#: admin/view/view_package.php:30
+msgid "Package type"
+msgstr ""
+
+#: admin/view/view_package.php:31
+msgid "Package content"
+msgstr ""
+
+#: admin/view/view_package.php:33
+msgid "Author"
+msgstr ""
+
+#: admin/view/view_package.php:34
+msgid "Home page"
+msgstr ""
+
+#: admin/view/view_package.php:35
+msgid "Package maintainer"
+msgstr ""
+
+#: admin/view/view_package.php:36
+msgid "Installation path"
+msgstr ""
+
+#: admin/view/view_package.php:37
+msgid "Minimal software versions"
+msgstr ""
+
+#: admin/view/view_package.php:38
+msgid "Right to left"
+msgstr ""
+
+#: admin/view/view_package.php:39
+msgid "Charset encoding"
+msgstr ""
+
+#: admin/view/view_package.php:44
+#, php-format
+msgid "Content information for package '%s'"
+msgstr ""
+
+#: admin/view/view_package.php:47
+msgid "Property"
+msgstr ""
+
+#: admin/view/view_package.php:47 includes/system_tests.inc:424
+#: reporting/rep204.php:85 reporting/rep301.php:168 reporting/rep308.php:225
+msgid "Value"
+msgstr ""
+
+#: admin/view/view_upgrade_log.php:17
+msgid "Log View"
+msgstr ""
+
+#: admin/view/view_upgrade_log.php:24
+msgid "The script must be called with a valid company number."
+msgstr ""
+
+#: admin/view/view_upgrade_log.php:28
+#, php-format
+msgid "Upgrade log for company '%s'"
+msgstr ""
+
 #: applications/customers.php:16
 msgid "&Sales"
 msgstr ""
 #: applications/customers.php:16
 msgid "&Sales"
 msgstr ""
@@ -2708,7 +2961,8 @@ 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
 #: 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
-#: applications/suppliers.php:18
+#: applications/suppliers.php:18 themes/canvas/renderer.php:88
+#: themes/canvas/renderer.php:98
 msgid "Transactions"
 msgstr ""
 
 msgid "Transactions"
 msgstr ""
 
@@ -2954,8 +3208,8 @@ msgstr ""
 msgid "Ta&x Inquiry"
 msgstr ""
 
 msgid "Ta&x Inquiry"
 msgstr ""
 
-#: applications/generalledger.php:44 reporting/reports_main.php:412
-#: reporting/reports_main.php:462 reporting/reports_main.php:507
+#: applications/generalledger.php:44 reporting/reports_main.php:435
+#: reporting/reports_main.php:486 reporting/reports_main.php:532
 msgid "Trial &Balance"
 msgstr ""
 
 msgid "Trial &Balance"
 msgstr ""
 
@@ -3063,7 +3317,7 @@ msgstr ""
 msgid "&Units of Measure"
 msgstr ""
 
 msgid "&Units of Measure"
 msgstr ""
 
-#: applications/inventory.php:45 inventory/manage/items.php:603
+#: applications/inventory.php:45 inventory/manage/items.php:594
 msgid "&Reorder Levels"
 msgstr ""
 
 msgid "&Reorder Levels"
 msgstr ""
 
@@ -3079,7 +3333,7 @@ msgstr ""
 msgid "Purchasing &Pricing"
 msgstr ""
 
 msgid "Purchasing &Pricing"
 msgstr ""
 
-#: applications/inventory.php:53 inventory/manage/items.php:602
+#: applications/inventory.php:53 inventory/manage/items.php:593
 msgid "Standard &Costs"
 msgstr ""
 
 msgid "Standard &Costs"
 msgstr ""
 
@@ -3288,7 +3542,7 @@ msgstr ""
 msgid "&Suppliers"
 msgstr ""
 
 msgid "&Suppliers"
 msgstr ""
 
-#: dimensions/dimension_entry.php:26
+#: dimensions/dimension_entry.php:26 themes/canvas/renderer.php:124
 msgid "Dimension Entry"
 msgstr ""
 
 msgid "Dimension Entry"
 msgstr ""
 
@@ -3316,10 +3570,14 @@ msgstr ""
 msgid "Enter a &new dimension"
 msgstr ""
 
 msgid "Enter a &new dimension"
 msgstr ""
 
-#: dimensions/dimension_entry.php:99
+#: dimensions/dimension_entry.php:98
 msgid "&Select an existing dimension"
 msgstr ""
 
 msgid "&Select an existing dimension"
 msgstr ""
 
+#: dimensions/dimension_entry.php:99
+msgid "&Add Attachment"
+msgstr ""
+
 #: dimensions/dimension_entry.php:121
 msgid "The dimension name must be entered."
 msgstr ""
 #: dimensions/dimension_entry.php:121
 msgid "The dimension name must be entered."
 msgstr ""
@@ -3346,20 +3604,21 @@ msgid "Dimension Reference:"
 msgstr ""
 
 #: dimensions/dimension_entry.php:267 reporting/reports_main.php:36
 msgstr ""
 
 #: dimensions/dimension_entry.php:267 reporting/reports_main.php:36
-#: reporting/reports_main.php:66 reporting/reports_main.php:82
-#: reporting/reports_main.php:91 reporting/reports_main.php:153
-#: reporting/reports_main.php:235 reporting/reports_main.php:245
-#: reporting/reports_main.php:251 reporting/reports_main.php:261
-#: reporting/reports_main.php:269 reporting/reports_main.php:277
-#: reporting/reports_main.php:284 reporting/reports_main.php:342
-#: reporting/reports_main.php:350 reporting/reports_main.php:362
-#: reporting/reports_main.php:372 reporting/reports_main.php:390
-#: reporting/reports_main.php:401 reporting/reports_main.php:413
-#: reporting/reports_main.php:426 reporting/reports_main.php:442
-#: reporting/reports_main.php:452 reporting/reports_main.php:463
-#: reporting/reports_main.php:475 reporting/reports_main.php:489
-#: reporting/reports_main.php:498 reporting/reports_main.php:508
-#: reporting/reports_main.php:517 reporting/reports_main.php:524
+#: reporting/reports_main.php:57 reporting/reports_main.php:77
+#: reporting/reports_main.php:93 reporting/reports_main.php:102
+#: reporting/reports_main.php:165 reporting/reports_main.php:186
+#: reporting/reports_main.php:256 reporting/reports_main.php:266
+#: reporting/reports_main.php:272 reporting/reports_main.php:282
+#: reporting/reports_main.php:290 reporting/reports_main.php:298
+#: reporting/reports_main.php:305 reporting/reports_main.php:364
+#: reporting/reports_main.php:372 reporting/reports_main.php:384
+#: reporting/reports_main.php:394 reporting/reports_main.php:413
+#: reporting/reports_main.php:424 reporting/reports_main.php:436
+#: reporting/reports_main.php:449 reporting/reports_main.php:466
+#: reporting/reports_main.php:476 reporting/reports_main.php:487
+#: reporting/reports_main.php:499 reporting/reports_main.php:514
+#: reporting/reports_main.php:523 reporting/reports_main.php:533
+#: reporting/reports_main.php:542 reporting/reports_main.php:549
 msgid "Start Date"
 msgstr ""
 
 msgid "Start Date"
 msgstr ""
 
@@ -3403,8 +3662,8 @@ msgstr ""
 msgid "Delete unused dimension"
 msgstr ""
 
 msgid "Delete unused dimension"
 msgstr ""
 
-#: dimensions/dimension_entry.php:292 includes/ui/class.crud_view.inc:296
-#: includes/ui/simple_crud_class.inc:223
+#: dimensions/dimension_entry.php:292 includes/ui/attachment.inc:167
+#: includes/ui/class.crud_view.inc:305 includes/ui/simple_crud_class.inc:223
 #: purchasing/includes/ui/invoice_ui.inc:219
 #: purchasing/includes/ui/invoice_ui.inc:421
 #: purchasing/includes/ui/invoice_ui.inc:423
 #: purchasing/includes/ui/invoice_ui.inc:219
 #: purchasing/includes/ui/invoice_ui.inc:421
 #: purchasing/includes/ui/invoice_ui.inc:423
@@ -3419,163 +3678,170 @@ msgstr ""
 msgid "Balance for this Dimension"
 msgstr ""
 
 msgid "Balance for this Dimension"
 msgstr ""
 
-#: dimensions/includes/dimensions_ui.inc:31 gl/accruals.php:104
-#: gl/inquiry/gl_account_inquiry.php:131 gl/inquiry/gl_trial_balance.php:215
+#: dimensions/includes/dimensions_ui.inc:31
+#: fixed_assets/process_depreciation.php:100 gl/accruals.php:104
+#: gl/inquiry/gl_account_inquiry.php:131 gl/inquiry/gl_trial_balance.php:231
 #: gl/manage/gl_quick_entries.php:248 gl/manage/gl_quick_entries.php:342
 #: gl/manage/gl_quick_entries.php:248 gl/manage/gl_quick_entries.php:342
-#: includes/dashboard.inc:606 includes/sysnames.inc:179
+#: includes/dashboard.inc:1176 includes/sysnames.inc:181
 #: 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
 #: 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/rep705.php:255 reporting/rep706.php:188 reporting/rep707.php:212
 #: reporting/rep708.php:192
 msgid "Account"
 msgstr ""
 
 #: reporting/rep708.php:192
 msgid "Account"
 msgstr ""
 
-#: dimensions/includes/dimensions_ui.inc:31 gl/accruals.php:112
-#: gl/bank_account_reconcile.php:270 gl/inquiry/bank_inquiry.php:72
-#: gl/inquiry/gl_account_inquiry.php:143 gl/inquiry/gl_account_inquiry.php:145
-#: gl/inquiry/gl_trial_balance.php:221 gl/inquiry/gl_trial_balance.php:223
-#: gl/inquiry/gl_trial_balance.php:225 gl/view/accrual_trans.php:60
-#: gl/view/gl_trans_view.php:96 gl/view/gl_trans_view.php:99
-#: gl/view/gl_trans_view.php:102 gl/includes/ui/gl_journal_ui.inc:113
+#: dimensions/includes/dimensions_ui.inc:31
+#: fixed_assets/process_depreciation.php:100 gl/accruals.php:112
+#: gl/bank_account_reconcile.php:270 gl/includes/ui/gl_journal_ui.inc:113
 #: gl/includes/ui/gl_journal_ui.inc:116 gl/includes/ui/gl_journal_ui.inc:119
 #: gl/includes/ui/gl_journal_ui.inc:116 gl/includes/ui/gl_journal_ui.inc:119
+#: gl/inquiry/bank_inquiry.php:72 gl/inquiry/gl_account_inquiry.php:143
+#: gl/inquiry/gl_account_inquiry.php:145 gl/inquiry/gl_trial_balance.php:237
+#: gl/inquiry/gl_trial_balance.php:239 gl/inquiry/gl_trial_balance.php:241
+#: gl/view/accrual_trans.php:60 gl/view/gl_trans_view.php:96
+#: gl/view/gl_trans_view.php:99 gl/view/gl_trans_view.php:102
 #: manufacturing/view/wo_costs_view.php:61
 #: purchasing/inquiry/supplier_allocation_inquiry.php:144
 #: manufacturing/view/wo_costs_view.php:61
 #: purchasing/inquiry/supplier_allocation_inquiry.php:144
-#: reporting/rep601.php:80 reporting/rep602.php:81 reporting/rep702.php:54
-#: reporting/rep704.php:83 reporting/rep704.php:86 reporting/rep704.php:89
+#: reporting/rep115.php:164 reporting/rep206.php:115 reporting/rep402.php:141
+#: reporting/rep601.php:82 reporting/rep602.php:81 reporting/rep702.php:54
+#: reporting/rep704.php:80 reporting/rep704.php:88 reporting/rep704.php:96
 #: reporting/rep708.php:192 reporting/rep708.php:193
 #: reporting/rep708.php:192 reporting/rep708.php:193
-#: sales/inquiry/customer_allocation_inquiry.php:154
+#: sales/inquiry/customer_allocation_inquiry.php:155
 msgid "Debit"
 msgstr ""
 
 msgid "Debit"
 msgstr ""
 
-#: dimensions/includes/dimensions_ui.inc:31 gl/accruals.php:112
-#: gl/bank_account_reconcile.php:271 gl/inquiry/bank_inquiry.php:72
-#: gl/inquiry/gl_account_inquiry.php:143 gl/inquiry/gl_account_inquiry.php:145
-#: gl/inquiry/gl_trial_balance.php:222 gl/inquiry/gl_trial_balance.php:224
-#: gl/inquiry/gl_trial_balance.php:226 gl/view/accrual_trans.php:60
-#: gl/view/gl_trans_view.php:96 gl/view/gl_trans_view.php:99
-#: gl/view/gl_trans_view.php:102 gl/includes/ui/gl_journal_ui.inc:113
+#: dimensions/includes/dimensions_ui.inc:31
+#: fixed_assets/process_depreciation.php:100 gl/accruals.php:112
+#: gl/bank_account_reconcile.php:271 gl/includes/ui/gl_journal_ui.inc:113
 #: gl/includes/ui/gl_journal_ui.inc:116 gl/includes/ui/gl_journal_ui.inc:119
 #: gl/includes/ui/gl_journal_ui.inc:116 gl/includes/ui/gl_journal_ui.inc:119
-#: includes/sysnames.inc:90 manufacturing/view/wo_costs_view.php:61
+#: gl/inquiry/bank_inquiry.php:72 gl/inquiry/gl_account_inquiry.php:143
+#: gl/inquiry/gl_account_inquiry.php:145 gl/inquiry/gl_trial_balance.php:238
+#: gl/inquiry/gl_trial_balance.php:240 gl/inquiry/gl_trial_balance.php:242
+#: gl/view/accrual_trans.php:60 gl/view/gl_trans_view.php:96
+#: gl/view/gl_trans_view.php:99 gl/view/gl_trans_view.php:102
+#: includes/sysnames.inc:92 manufacturing/view/wo_costs_view.php:61
 #: purchasing/inquiry/supplier_allocation_inquiry.php:145
 #: purchasing/inquiry/supplier_allocation_inquiry.php:145
-#: reporting/rep601.php:80 reporting/rep602.php:81 reporting/rep702.php:54
-#: reporting/rep704.php:83 reporting/rep704.php:86 reporting/rep704.php:89
+#: reporting/rep115.php:164 reporting/rep206.php:116 reporting/rep402.php:141
+#: reporting/rep601.php:82 reporting/rep602.php:81 reporting/rep702.php:54
+#: reporting/rep704.php:80 reporting/rep704.php:88 reporting/rep704.php:96
 #: reporting/rep708.php:192 reporting/rep708.php:193
 #: reporting/rep708.php:192 reporting/rep708.php:193
-#: sales/inquiry/customer_allocation_inquiry.php:155
+#: sales/inquiry/customer_allocation_inquiry.php:156
 msgid "Credit"
 msgstr ""
 
 #: dimensions/includes/dimensions_ui.inc:45
 msgid "Credit"
 msgstr ""
 
 #: dimensions/includes/dimensions_ui.inc:45
-#: dimensions/inquiry/search_dimensions.php:131 gl/inquiry/bank_inquiry.php:72
-#: gl/inquiry/gl_account_inquiry.php:143 gl/inquiry/gl_trial_balance.php:219
-#: includes/dashboard.inc:606
+#: dimensions/inquiry/search_dimensions.php:138 gl/inquiry/bank_inquiry.php:72
+#: gl/inquiry/gl_account_inquiry.php:143 gl/inquiry/gl_trial_balance.php:235
+#: includes/dashboard.inc:624 includes/dashboard.inc:649
+#: includes/dashboard.inc:1176
 #: purchasing/inquiry/supplier_allocation_inquiry.php:147
 #: purchasing/inquiry/supplier_allocation_inquiry.php:147
-#: purchasing/inquiry/supplier_inquiry.php:182
-#: purchasing/inquiry/supplier_inquiry.php:195 reporting/rep101.php:137
-#: reporting/rep201.php:111 reporting/rep203.php:89 reporting/rep204.php:84
-#: reporting/rep307.php:114 reporting/rep601.php:80 reporting/rep602.php:81
-#: reporting/rep701.php:110 reporting/rep704.php:83 reporting/rep704.php:86
-#: reporting/rep704.php:89 reporting/rep708.php:185
-#: sales/inquiry/customer_allocation_inquiry.php:157
-#: sales/inquiry/customer_inquiry.php:203
-#: sales/inquiry/customer_inquiry.php:216
+#: purchasing/inquiry/supplier_inquiry.php:183
+#: purchasing/inquiry/supplier_inquiry.php:196 reporting/rep101.php:141
+#: reporting/rep115.php:164 reporting/rep201.php:119 reporting/rep203.php:89
+#: reporting/rep204.php:84 reporting/rep206.php:116 reporting/rep307.php:114
+#: reporting/rep601.php:82 reporting/rep602.php:81 reporting/rep701.php:110
+#: reporting/rep704.php:80 reporting/rep704.php:88 reporting/rep704.php:96
+#: reporting/rep708.php:185 sales/inquiry/customer_allocation_inquiry.php:158
+#: sales/inquiry/customer_inquiry.php:209
+#: sales/inquiry/customer_inquiry.php:222
 msgid "Balance"
 msgstr ""
 
 msgid "Balance"
 msgstr ""
 
-#: dimensions/inquiry/search_dimensions.php:29
+#: dimensions/inquiry/search_dimensions.php:30
 msgid "Search Outstanding Dimensions"
 msgstr ""
 
 msgid "Search Outstanding Dimensions"
 msgstr ""
 
-#: dimensions/inquiry/search_dimensions.php:34
+#: dimensions/inquiry/search_dimensions.php:35
 msgid "Search Dimensions"
 msgstr ""
 
 msgid "Search Dimensions"
 msgstr ""
 
-#: dimensions/inquiry/search_dimensions.php:72 gl/bank_transfer.php:117
-#: gl/inquiry/journal_inquiry.php:45 gl/manage/revaluate_currencies.php:95
+#: dimensions/inquiry/search_dimensions.php:73 gl/bank_transfer.php:121
 #: gl/includes/ui/gl_bank_ui.inc:26 gl/includes/ui/gl_journal_ui.inc:51
 #: gl/includes/ui/gl_bank_ui.inc:26 gl/includes/ui/gl_journal_ui.inc:51
-#: includes/ui/contacts_view.inc:91
+#: gl/inquiry/journal_inquiry.php:45 includes/ui/contacts_view.inc:91
 #: inventory/includes/item_adjustments_ui.inc:39
 #: inventory/includes/item_adjustments_ui.inc:39
-#: inventory/includes/stock_transfers_ui.inc:42
-#: manufacturing/search_work_orders.php:68
+#: inventory/includes/stock_transfers_ui.inc:45
+#: manufacturing/search_work_orders.php:70
 #: manufacturing/work_order_add_finished.php:186
 #: manufacturing/work_order_costs.php:134
 #: manufacturing/work_order_entry.php:357
 #: manufacturing/work_order_entry.php:365
 #: manufacturing/includes/work_order_issue_ui.inc:161
 #: manufacturing/work_order_add_finished.php:186
 #: manufacturing/work_order_costs.php:134
 #: manufacturing/work_order_entry.php:357
 #: manufacturing/work_order_entry.php:365
 #: manufacturing/includes/work_order_issue_ui.inc:161
-#: purchasing/includes/ui/invoice_ui.inc:116
+#: purchasing/supplier_payment.php:306
+#: purchasing/includes/ui/invoice_ui.inc:117
 #: purchasing/includes/ui/po_ui.inc:156 purchasing/includes/ui/po_ui.inc:161
 #: purchasing/includes/ui/po_ui.inc:156 purchasing/includes/ui/po_ui.inc:161
-#: purchasing/supplier_payment.php:302 sales/customer_payments.php:349
+#: sales/customer_payments.php:353
 msgid "Reference:"
 msgstr ""
 
 msgid "Reference:"
 msgstr ""
 
-#: dimensions/inquiry/search_dimensions.php:74
-#: includes/ui/allocation_cart.inc:314 includes/ui/ui_lists.inc:2121
-#: reporting/rep101.php:115 reporting/rep102.php:92 reporting/rep104.php:95
+#: dimensions/inquiry/search_dimensions.php:75
+#: includes/ui/allocation_cart.inc:335 includes/ui/ui_lists.inc:2127
+#: reporting/rep101.php:116 reporting/rep102.php:89 reporting/rep104.php:95
 #: reporting/rep104.php:99 reporting/rep105.php:96 reporting/rep105.php:100
 #: reporting/rep104.php:99 reporting/rep105.php:96 reporting/rep105.php:100
-#: reporting/rep201.php:89 reporting/rep202.php:98 reporting/rep203.php:69
-#: reporting/rep204.php:77 reporting/rep301.php:151 reporting/rep301.php:158
-#: reporting/rep302.php:103 reporting/rep302.php:110 reporting/rep303.php:95
-#: reporting/rep303.php:102 reporting/rep304.php:109 reporting/rep304.php:114
-#: reporting/rep304.php:119 reporting/rep306.php:120 reporting/rep306.php:125
-#: reporting/rep306.php:130 reporting/rep306.php:135 reporting/rep307.php:103
-#: reporting/rep307.php:108 reporting/rep308.php:212 reporting/rep308.php:217
-#: reporting/rep309.php:93 reporting/rep310.php:121 reporting/rep310.php:126
-#: reporting/rep310.php:131 reporting/rep310.php:136 reporting/rep402.php:87
-#: reporting/rep402.php:95 reporting/rep451.php:67 reporting/rep451.php:74
-#: reporting/rep702.php:61 reporting/rep710.php:86 reporting/rep710.php:87
+#: reporting/rep115.php:131 reporting/rep201.php:97 reporting/rep202.php:99
+#: reporting/rep203.php:69 reporting/rep204.php:77 reporting/rep206.php:97
+#: reporting/rep301.php:155 reporting/rep301.php:162 reporting/rep302.php:103
+#: reporting/rep302.php:110 reporting/rep303.php:197 reporting/rep303.php:204
+#: reporting/rep304.php:109 reporting/rep304.php:114 reporting/rep304.php:119
+#: reporting/rep306.php:117 reporting/rep306.php:122 reporting/rep306.php:127
+#: reporting/rep306.php:132 reporting/rep307.php:103 reporting/rep307.php:108
+#: reporting/rep308.php:213 reporting/rep308.php:218 reporting/rep309.php:93
+#: reporting/rep310.php:118 reporting/rep310.php:123 reporting/rep310.php:128
+#: reporting/rep310.php:133 reporting/rep402.php:119 reporting/rep402.php:127
+#: reporting/rep451.php:67 reporting/rep451.php:74 reporting/rep702.php:61
+#: reporting/rep710.php:86 reporting/rep710.php:87
+#: reporting/includes/reports_classes.inc:284
 msgid "All"
 msgstr ""
 
 msgid "All"
 msgstr ""
 
-#: dimensions/inquiry/search_dimensions.php:75 gl/inquiry/bank_inquiry.php:50
+#: dimensions/inquiry/search_dimensions.php:76 gl/includes/ui/gl_bank_ui.inc:52
+#: gl/includes/ui/gl_bank_ui.inc:114 gl/inquiry/bank_inquiry.php:50
 #: gl/inquiry/gl_trial_balance.php:55 gl/inquiry/journal_inquiry.php:48
 #: gl/inquiry/gl_trial_balance.php:55 gl/inquiry/journal_inquiry.php:48
-#: gl/inquiry/profit_loss.php:175 gl/includes/ui/gl_bank_ui.inc:52
-#: gl/includes/ui/gl_bank_ui.inc:114 inventory/inquiry/stock_movements.php:85
+#: gl/inquiry/profit_loss.php:175 inventory/inquiry/stock_movements.php:85
 #: purchasing/inquiry/supplier_allocation_inquiry.php:50
 #: purchasing/inquiry/supplier_inquiry.php:143
 #: purchasing/inquiry/supplier_allocation_inquiry.php:50
 #: purchasing/inquiry/supplier_inquiry.php:143
-#: sales/inquiry/customer_inquiry.php:160
+#: sales/inquiry/customer_inquiry.php:165
 msgid "From:"
 msgstr ""
 
 msgid "From:"
 msgstr ""
 
-#: dimensions/inquiry/search_dimensions.php:76 gl/inquiry/bank_inquiry.php:51
+#: dimensions/inquiry/search_dimensions.php:77 gl/inquiry/bank_inquiry.php:51
 #: gl/inquiry/gl_trial_balance.php:56 gl/inquiry/journal_inquiry.php:49
 #: gl/inquiry/profit_loss.php:176 inventory/inquiry/stock_movements.php:86
 #: purchasing/inquiry/supplier_allocation_inquiry.php:51
 #: purchasing/inquiry/supplier_inquiry.php:144
 #: gl/inquiry/gl_trial_balance.php:56 gl/inquiry/journal_inquiry.php:49
 #: gl/inquiry/profit_loss.php:176 inventory/inquiry/stock_movements.php:86
 #: purchasing/inquiry/supplier_allocation_inquiry.php:51
 #: purchasing/inquiry/supplier_inquiry.php:144
-#: sales/inquiry/customer_inquiry.php:161
+#: sales/inquiry/customer_inquiry.php:166
 msgid "To:"
 msgstr ""
 
 msgid "To:"
 msgstr ""
 
-#: dimensions/inquiry/search_dimensions.php:78
-#: manufacturing/search_work_orders.php:77
+#: dimensions/inquiry/search_dimensions.php:79
+#: manufacturing/search_work_orders.php:79
 msgid "Only Overdue:"
 msgstr ""
 
 msgid "Only Overdue:"
 msgstr ""
 
-#: dimensions/inquiry/search_dimensions.php:82
-#: manufacturing/search_work_orders.php:80
+#: dimensions/inquiry/search_dimensions.php:83
+#: manufacturing/search_work_orders.php:82
 msgid "Only Open:"
 msgstr ""
 
 msgid "Only Open:"
 msgstr ""
 
-#: dimensions/inquiry/search_dimensions.php:129
-#: dimensions/view/view_dimension.php:55 includes/dashboard.inc:486
-#: includes/dashboard.inc:571 includes/ui/allocation_cart.inc:290
-#: purchasing/includes/ui/invoice_ui.inc:135
-#: purchasing/view/view_supp_credit.php:48
-#: purchasing/view/view_supp_invoice.php:52
+#: dimensions/inquiry/search_dimensions.php:136
+#: dimensions/view/view_dimension.php:55 includes/dashboard.inc:1011
+#: includes/dashboard.inc:1095 includes/ui/allocation_cart.inc:311
+#: purchasing/includes/ui/invoice_ui.inc:136
 #: purchasing/inquiry/supplier_allocation_inquiry.php:142
 #: purchasing/inquiry/supplier_allocation_inquiry.php:142
-#: purchasing/inquiry/supplier_inquiry.php:179 reporting/rep101.php:133
-#: reporting/rep201.php:107 reporting/rep203.php:88 reporting/rep501.php:87
+#: purchasing/inquiry/supplier_inquiry.php:180
+#: purchasing/view/view_supp_credit.php:48
+#: purchasing/view/view_supp_invoice.php:52 reporting/rep101.php:137
+#: reporting/rep201.php:115 reporting/rep203.php:88 reporting/rep501.php:87
 #: reporting/includes/doctext.inc:111 reporting/includes/doctext.inc:143
 #: reporting/includes/doctext.inc:164 reporting/includes/doctext.inc:166
 #: reporting/includes/doctext.inc:111 reporting/includes/doctext.inc:143
 #: reporting/includes/doctext.inc:164 reporting/includes/doctext.inc:166
-#: reporting/includes/doctext.inc:205 reporting/includes/doctext.inc:207
-#: 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:198
-#: sales/includes/ui/sales_order_ui.inc:589
+#: reporting/includes/doctext.inc:207 reporting/includes/doctext.inc:209
+#: sales/customer_invoice.php:493 sales/includes/ui/sales_order_ui.inc:595
+#: sales/inquiry/customer_allocation_inquiry.php:152
+#: sales/inquiry/customer_inquiry.php:204 sales/view/view_dispatch.php:97
+#: sales/view/view_invoice.php:96 sales/view/view_sales_order.php:71
 msgid "Due Date"
 msgstr ""
 
 msgid "Due Date"
 msgstr ""
 
-#: dimensions/inquiry/search_dimensions.php:140
+#: dimensions/inquiry/search_dimensions.php:148
 msgid "Marked dimensions are overdue."
 msgstr ""
 
 msgid "Marked dimensions are overdue."
 msgstr ""
 
@@ -3592,30 +3858,246 @@ msgid "This dimension is closed."
 msgstr ""
 
 #: dimensions/view/view_dimension.php:85 gl/inquiry/gl_account_inquiry.php:72
 msgstr ""
 
 #: dimensions/view/view_dimension.php:85 gl/inquiry/gl_account_inquiry.php:72
-#: gl/inquiry/tax_inquiry.php:61 purchasing/inquiry/po_search_completed.php:82
-#: purchasing/inquiry/po_search.php:64
+#: gl/inquiry/tax_inquiry.php:61 purchasing/inquiry/po_search.php:64
+#: purchasing/inquiry/po_search_completed.php:91
 #: sales/inquiry/customer_allocation_inquiry.php:44
 #: sales/inquiry/customer_allocation_inquiry.php:44
-#: sales/inquiry/sales_deliveries_view.php:102
-#: sales/inquiry/sales_orders_view.php:217
+#: sales/inquiry/sales_deliveries_view.php:103
+#: sales/inquiry/sales_orders_view.php:237
 msgid "from:"
 msgstr ""
 
 #: dimensions/view/view_dimension.php:86 gl/inquiry/gl_account_inquiry.php:73
 msgid "from:"
 msgstr ""
 
 #: dimensions/view/view_dimension.php:86 gl/inquiry/gl_account_inquiry.php:73
-#: gl/inquiry/tax_inquiry.php:62 purchasing/inquiry/po_search_completed.php:83
-#: purchasing/inquiry/po_search.php:65
+#: gl/inquiry/tax_inquiry.php:62 purchasing/inquiry/po_search.php:65
+#: purchasing/inquiry/po_search_completed.php:92
 #: sales/inquiry/customer_allocation_inquiry.php:45
 #: sales/inquiry/customer_allocation_inquiry.php:45
-#: sales/inquiry/sales_deliveries_view.php:103
-#: sales/inquiry/sales_orders_view.php:218
+#: sales/inquiry/sales_deliveries_view.php:104
+#: sales/inquiry/sales_orders_view.php:238
 msgid "to:"
 msgstr ""
 
 #: dimensions/view/view_dimension.php:87 gl/inquiry/balance_sheet.php:130
 #: gl/inquiry/bank_inquiry.php:53 gl/inquiry/gl_account_inquiry.php:87
 msgid "to:"
 msgstr ""
 
 #: dimensions/view/view_dimension.php:87 gl/inquiry/balance_sheet.php:130
 #: gl/inquiry/bank_inquiry.php:53 gl/inquiry/gl_account_inquiry.php:87
-#: gl/inquiry/gl_trial_balance.php:63 gl/inquiry/profit_loss.php:188
+#: gl/inquiry/gl_trial_balance.php:64 gl/inquiry/profit_loss.php:188
 #: gl/inquiry/tax_inquiry.php:63
 msgid "Show"
 msgstr ""
 
 #: gl/inquiry/tax_inquiry.php:63
 msgid "Show"
 msgstr ""
 
+#: fixed_assets/fixed_asset_classes.php:21
+msgid "Fixed asset classes"
+msgstr ""
+
+#: fixed_assets/fixed_asset_classes.php:31
+msgid "The depreciation rate can't be greater than 100%"
+msgstr ""
+
+#: fixed_assets/fixed_asset_classes.php:44
+msgid "Selected fixed asset class has been updated"
+msgstr ""
+
+#: fixed_assets/fixed_asset_classes.php:49
+msgid "New fixed asset class has been added"
+msgstr ""
+
+#: fixed_assets/fixed_asset_classes.php:60
+msgid "Cannot delete this class because it is used by some fixed asset items."
+msgstr ""
+
+#: fixed_assets/fixed_asset_classes.php:74
+msgid "Selected fixed asset class has been deleted"
+msgstr ""
+
+#: fixed_assets/fixed_asset_classes.php:89
+msgid "Fixed asset class"
+msgstr ""
+
+#: fixed_assets/fixed_asset_classes.php:89
+#: fixed_assets/fixed_asset_classes.php:139
+msgid "Basic Depreciation Rate"
+msgstr ""
+
+#: fixed_assets/fixed_asset_classes.php:128
+#: fixed_assets/fixed_asset_classes.php:133
+msgid "Parent class:"
+msgstr ""
+
+#: fixed_assets/fixed_asset_classes.php:129
+#: fixed_assets/fixed_asset_classes.php:134
+msgid "Fixed asset class:"
+msgstr ""
+
+#: fixed_assets/fixed_asset_classes.php:137 inventory/manage/items.php:390
+#: inventory/manage/item_codes.php:186 inventory/manage/sales_kits.php:206
+#: inventory/manage/sales_kits.php:230
+#: manufacturing/manage/work_centres.php:138
+#: sales/create_recurrent_invoices.php:183 sales/manage/credit_status.php:145
+#: sales/manage/recurrent_invoices.php:191 taxes/item_tax_types.php:173
+#: taxes/tax_groups.php:165 taxes/tax_types.php:158
+msgid "Description:"
+msgstr ""
+
+#: fixed_assets/fixed_asset_classes.php:138
+msgid "Long description:"
+msgstr ""
+
+#: fixed_assets/process_depreciation.php:30
+#: fixed_assets/process_depreciation.php:129
+#: fixed_assets/process_depreciation.php:180
+msgid "Process Depreciation"
+msgstr ""
+
+#: fixed_assets/process_depreciation.php:38
+msgid ""
+"The number of months is greater than the timespan between the depreciation "
+"start and the end of the fiscal year."
+msgstr ""
+
+#: fixed_assets/process_depreciation.php:75
+msgid "The fixed asset has been depreciated for this year"
+msgstr ""
+
+#: fixed_assets/process_depreciation.php:77
+msgid "View the GL &Postings for this Depreciation"
+msgstr ""
+
+#: fixed_assets/process_depreciation.php:79
+msgid "Depreciate &Another Fixed Asset"
+msgstr ""
+
+#: fixed_assets/process_depreciation.php:86
+msgid "There are no fixed assets that could be depreciated."
+msgstr ""
+
+#: fixed_assets/process_depreciation.php:100 includes/dashboard.inc:556
+#: includes/dashboard.inc:558 manufacturing/search_work_orders.php:168
+#: manufacturing/view/wo_issue_view.php:43
+#: manufacturing/view/wo_production_view.php:44
+#: purchasing/includes/ui/invoice_ui.inc:501
+#: purchasing/includes/ui/invoice_ui.inc:513 reporting/rep204.php:84
+#: reporting/rep306.php:149 reporting/rep310.php:139 reporting/rep310.php:150
+#: reporting/rep402.php:136
+msgid "Item"
+msgstr ""
+
+#: fixed_assets/process_depreciation.php:139 inventory/manage/items.php:562
+msgid "Select an item:"
+msgstr ""
+
+#: fixed_assets/process_depreciation.php:165
+msgid "Starting from month"
+msgstr ""
+
+#: fixed_assets/process_depreciation.php:168
+#: fixed_assets/process_depreciation.php:171 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:145
+#: reporting/rep105.php:119 reporting/rep106.php:99 reporting/rep114.php:90
+#: reporting/rep115.php:169 reporting/rep201.php:123 reporting/rep206.php:121
+#: reporting/rep304.php:134 reporting/rep305.php:111 reporting/rep306.php:145
+#: reporting/rep307.php:119 reporting/rep308.php:230 reporting/rep309.php:104
+#: reporting/rep310.php:146 reporting/rep601.php:94 reporting/rep602.php:86
+#: reporting/rep702.php:59 reporting/rep704.php:103 reporting/rep704.php:113
+#: reporting/rep704.php:121 reporting/rep706.php:188 reporting/rep706.php:196
+#: reporting/rep706.php:206 reporting/rep706.php:214 reporting/rep707.php:212
+#: reporting/rep707.php:219 reporting/rep707.php:229 reporting/rep707.php:237
+#: reporting/rep708.php:200 reporting/rep708.php:209 reporting/rep708.php:216
+#: reporting/rep709.php:112 reporting/rep710.php:85
+msgid "Period"
+msgstr ""
+
+#: fixed_assets/process_depreciation.php:168
+msgid "months"
+msgstr ""
+
+#: fixed_assets/process_depreciation.php:174 inventory/cost_update.php:147
+msgid "Reference line:"
+msgstr ""
+
+#: fixed_assets/process_depreciation.php:179 gl/accruals.php:232
+#: reporting/rep402.php:155 reporting/reports_main.php:327
+msgid "Show GL Rows"
+msgstr ""
+
+#: fixed_assets/includes/fixed_assets_db.inc:47
+#, php-format
+msgid "Fixed asset has been deprecated by the value of %s"
+msgstr ""
+
+#: fixed_assets/inquiry/stock_inquiry.php:26 themes/canvas/renderer.php:118
+msgid "Fixed Assets Inquiry"
+msgstr ""
+
+#: fixed_assets/inquiry/stock_inquiry.php:41
+#: 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:147
+#: sales/inquiry/customer_allocation_inquiry.php:51
+#: sales/inquiry/customer_inquiry.php:170
+msgid "Refresh Inquiry"
+msgstr ""
+
+#: fixed_assets/inquiry/stock_inquiry.php:101 inventory/manage/items.php:451
+msgid "years"
+msgstr ""
+
+#: fixed_assets/inquiry/stock_inquiry.php:110
+msgid "Disposed"
+msgstr ""
+
+#: fixed_assets/inquiry/stock_inquiry.php:112
+msgid "Purchasable"
+msgstr ""
+
+#: fixed_assets/inquiry/stock_inquiry.php:166
+#: gl/inquiry/gl_trial_balance.php:253 gl/manage/gl_account_types.php:133
+#: includes/dashboard.inc:379 includes/dashboard.inc:427
+#: reporting/rep451.php:80 reporting/rep451.php:86
+msgid "Class"
+msgstr ""
+
+#: fixed_assets/inquiry/stock_inquiry.php:167 reporting/rep104.php:109
+#: reporting/rep301.php:168 reporting/rep303.php:223 reporting/rep303.php:229
+#: reporting/rep307.php:114 reporting/rep308.php:224 reporting/rep451.php:80
+msgid "UOM"
+msgstr ""
+
+#: fixed_assets/inquiry/stock_inquiry.php:169
+msgid "Rate or Lifecycle"
+msgstr ""
+
+#: fixed_assets/inquiry/stock_inquiry.php:170
+msgid "Method"
+msgstr ""
+
+#: fixed_assets/inquiry/stock_inquiry.php:171
+msgid "Status"
+msgstr ""
+
+#: fixed_assets/inquiry/stock_inquiry.php:172 includes/sysnames.inc:174
+msgid "Purchased"
+msgstr ""
+
+#: fixed_assets/inquiry/stock_inquiry.php:173 reporting/rep451.php:80
+msgid "Initial"
+msgstr ""
+
+#: fixed_assets/inquiry/stock_inquiry.php:174 inventory/manage/items.php:528
+#: reporting/rep451.php:80 themes/canvas/renderer.php:120
+msgid "Depreciations"
+msgstr ""
+
+#: fixed_assets/inquiry/stock_inquiry.php:175 includes/dashboard.inc:819
+#: includes/dashboard.inc:875 purchasing/inquiry/supplier_inquiry.php:50
+#: reporting/rep102.php:118 reporting/rep102.php:231 reporting/rep108.php:163
+#: reporting/rep202.php:129 reporting/rep202.php:249 reporting/rep451.php:80
+#: sales/inquiry/customer_inquiry.php:126
+msgid "Current"
+msgstr ""
+
+#: fixed_assets/inquiry/stock_inquiry.php:176
+msgid "Liquidation or Sale"
+msgstr ""
+
 #: gl/accruals.php:30 includes/access_levels.inc:266
 msgid "Revenue / Cost Accruals"
 msgstr ""
 #: gl/accruals.php:30 includes/access_levels.inc:266
 msgid "Revenue / Cost Accruals"
 msgstr ""
@@ -3640,78 +4122,81 @@ msgid "Accruals for %s"
 msgstr ""
 
 #: gl/accruals.php:106 gl/accruals.php:108 gl/accruals.php:219
 msgstr ""
 
 #: gl/accruals.php:106 gl/accruals.php:108 gl/accruals.php:219
-#: gl/accruals.php:221 gl/gl_budget.php:70 gl/gl_budget.php:71
-#: gl/gl_budget.php:75 gl/inquiry/balance_sheet.php:127
-#: gl/inquiry/balance_sheet.php:129 gl/inquiry/gl_account_inquiry.php:80
-#: gl/inquiry/gl_account_inquiry.php:82 gl/inquiry/gl_account_inquiry.php:136
-#: gl/inquiry/gl_account_inquiry.php:138 gl/inquiry/gl_trial_balance.php:58
-#: gl/inquiry/gl_trial_balance.php:60 gl/inquiry/profit_loss.php:184
-#: gl/inquiry/profit_loss.php:186 gl/manage/gl_quick_entries.php:268
-#: gl/manage/gl_quick_entries.php:270 gl/manage/gl_quick_entries.php:353
-#: gl/manage/gl_quick_entries.php:355 gl/view/accrual_trans.php:54
-#: gl/view/accrual_trans.php:56 gl/view/gl_deposit_view.php:104
-#: gl/view/gl_deposit_view.php:107 gl/view/gl_payment_view.php:103
-#: gl/view/gl_payment_view.php:106 gl/view/gl_trans_view.php:95
-#: gl/view/gl_trans_view.php:98 gl/includes/ui/gl_bank_ui.inc:146
-#: gl/includes/ui/gl_bank_ui.inc:147 gl/includes/ui/gl_bank_ui.inc:149
-#: gl/includes/ui/gl_journal_ui.inc:112 gl/includes/ui/gl_journal_ui.inc:113
-#: gl/includes/ui/gl_journal_ui.inc:115 includes/dashboard.inc:134
-#: includes/dashboard.inc:336 includes/sysnames.inc:43
-#: includes/sysnames.inc:180 inventory/manage/item_categories.php:258
-#: inventory/manage/item_categories.php:260 inventory/manage/items.php:468
-#: inventory/manage/items.php:470 purchasing/includes/ui/invoice_ui.inc:140
+#: gl/accruals.php:221 gl/bank_transfer.php:125 gl/bank_transfer.php:147
+#: gl/gl_budget.php:70 gl/gl_budget.php:71 gl/gl_budget.php:75
+#: 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:112
+#: gl/includes/ui/gl_journal_ui.inc:113 gl/includes/ui/gl_journal_ui.inc:115
+#: gl/inquiry/balance_sheet.php:127 gl/inquiry/balance_sheet.php:129
+#: gl/inquiry/gl_account_inquiry.php:80 gl/inquiry/gl_account_inquiry.php:82
+#: gl/inquiry/gl_account_inquiry.php:136 gl/inquiry/gl_account_inquiry.php:138
+#: gl/inquiry/gl_trial_balance.php:58 gl/inquiry/gl_trial_balance.php:60
+#: gl/inquiry/profit_loss.php:184 gl/inquiry/profit_loss.php:186
+#: gl/manage/gl_quick_entries.php:268 gl/manage/gl_quick_entries.php:270
+#: gl/manage/gl_quick_entries.php:353 gl/manage/gl_quick_entries.php:355
+#: gl/view/accrual_trans.php:54 gl/view/accrual_trans.php:56
+#: gl/view/gl_deposit_view.php:104 gl/view/gl_deposit_view.php:107
+#: gl/view/gl_payment_view.php:103 gl/view/gl_payment_view.php:106
+#: gl/view/gl_trans_view.php:95 gl/view/gl_trans_view.php:98
+#: includes/dashboard.inc:354 includes/dashboard.inc:624
+#: includes/sysnames.inc:43 includes/sysnames.inc:182
+#: inventory/manage/items.php:478 inventory/manage/items.php:480
+#: inventory/manage/item_categories.php:258
+#: inventory/manage/item_categories.php:260 purchasing/supplier_payment.php:330
+#: purchasing/supplier_payment.php:335
+#: purchasing/includes/ui/invoice_ui.inc:141
 #: purchasing/includes/ui/invoice_ui.inc:278
 #: purchasing/includes/ui/invoice_ui.inc:280
 #: purchasing/includes/ui/invoice_ui.inc:278
 #: purchasing/includes/ui/invoice_ui.inc:280
-#: purchasing/includes/ui/po_ui.inc:172 purchasing/manage/suppliers.php:147
-#: purchasing/manage/suppliers.php:148 purchasing/manage/suppliers.php:150
+#: purchasing/includes/ui/po_ui.inc:172 purchasing/manage/suppliers.php:257
+#: purchasing/manage/suppliers.php:258 purchasing/manage/suppliers.php:260
 #: reporting/rep103.php:240 reporting/rep103.php:252 reporting/rep205.php:152
 #: reporting/rep103.php:240 reporting/rep103.php:252 reporting/rep205.php:152
-#: reporting/rep205.php:164 reporting/rep501.php:92 reporting/rep704.php:82
-#: reporting/rep704.php:85 reporting/rep704.php:96 reporting/rep704.php:98
-#: 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 reporting/rep707.php:218 reporting/rep707.php:220
-#: reporting/rep707.php:228 reporting/rep708.php:201 reporting/rep708.php:203
-#: reporting/rep708.php:210 reporting/reports_main.php:376
-#: reporting/reports_main.php:377 reporting/reports_main.php:383
-#: reporting/reports_main.php:384 reporting/reports_main.php:392
-#: reporting/reports_main.php:393 reporting/reports_main.php:404
-#: reporting/reports_main.php:405 reporting/reports_main.php:417
-#: reporting/reports_main.php:418 reporting/reports_main.php:430
-#: reporting/reports_main.php:436 reporting/reports_main.php:444
-#: reporting/reports_main.php:455 reporting/reports_main.php:467
-#: 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
+#: reporting/rep205.php:164 reporting/rep501.php:92 reporting/rep704.php:79
+#: reporting/rep704.php:87 reporting/rep704.php:105 reporting/rep704.php:107
+#: reporting/rep704.php:115 reporting/rep705.php:266 reporting/rep705.php:268
+#: reporting/rep705.php:278 reporting/rep706.php:197 reporting/rep706.php:199
+#: reporting/rep706.php:207 reporting/rep707.php:220 reporting/rep707.php:222
+#: reporting/rep707.php:230 reporting/rep708.php:201 reporting/rep708.php:203
+#: reporting/rep708.php:210 reporting/reports_main.php:398
+#: reporting/reports_main.php:399 reporting/reports_main.php:405
+#: reporting/reports_main.php:406 reporting/reports_main.php:415
+#: reporting/reports_main.php:416 reporting/reports_main.php:427
+#: reporting/reports_main.php:428 reporting/reports_main.php:440
+#: reporting/reports_main.php:441 reporting/reports_main.php:453
+#: reporting/reports_main.php:459 reporting/reports_main.php:468
+#: reporting/reports_main.php:479 reporting/reports_main.php:491
+#: sales/customer_delivery.php:384 sales/customer_delivery.php:392
+#: sales/customer_invoice.php:458 sales/customer_invoice.php:495
+#: sales/customer_payments.php:375 sales/customer_payments.php:380
 #: sales/includes/ui/sales_credit_ui.inc:128
 #: sales/includes/ui/sales_credit_ui.inc:133
 #: sales/includes/ui/sales_order_ui.inc:441
 #: sales/includes/ui/sales_credit_ui.inc:128
 #: sales/includes/ui/sales_credit_ui.inc:133
 #: sales/includes/ui/sales_order_ui.inc:441
-#: sales/includes/ui/sales_order_ui.inc:446
+#: sales/includes/ui/sales_order_ui.inc:446 sales/manage/customers.php:276
+#: sales/manage/customers.php:278
 msgid "Dimension"
 msgstr ""
 
 #: gl/accruals.php:112 gl/accruals.php:229 gl/bank_account_reconcile.php:273
 msgid "Dimension"
 msgstr ""
 
 #: gl/accruals.php:112 gl/accruals.php:229 gl/bank_account_reconcile.php:273
+#: gl/includes/ui/gl_bank_ui.inc:147 gl/includes/ui/gl_bank_ui.inc:150
+#: gl/includes/ui/gl_bank_ui.inc:153 gl/includes/ui/gl_bank_ui.inc:300
+#: gl/includes/ui/gl_journal_ui.inc:113 gl/includes/ui/gl_journal_ui.inc:116
+#: gl/includes/ui/gl_journal_ui.inc:119 gl/includes/ui/gl_journal_ui.inc:295
 #: gl/inquiry/bank_inquiry.php:72 gl/inquiry/gl_account_inquiry.php:143
 #: gl/inquiry/bank_inquiry.php:72 gl/inquiry/gl_account_inquiry.php:143
-#: gl/inquiry/gl_account_inquiry.php:145 gl/inquiry/journal_inquiry.php:114
+#: gl/inquiry/gl_account_inquiry.php:145 gl/inquiry/journal_inquiry.php:120
 #: gl/manage/gl_quick_entries.php:268 gl/manage/gl_quick_entries.php:270
 #: gl/manage/gl_quick_entries.php:272 gl/view/accrual_trans.php:60
 #: gl/view/gl_deposit_view.php:105 gl/view/gl_deposit_view.php:108
 #: gl/view/gl_deposit_view.php:111 gl/view/gl_payment_view.php:104
 #: gl/view/gl_payment_view.php:107 gl/view/gl_payment_view.php:110
 #: gl/view/gl_trans_view.php:96 gl/view/gl_trans_view.php:99
 #: gl/manage/gl_quick_entries.php:268 gl/manage/gl_quick_entries.php:270
 #: gl/manage/gl_quick_entries.php:272 gl/view/accrual_trans.php:60
 #: gl/view/gl_deposit_view.php:105 gl/view/gl_deposit_view.php:108
 #: gl/view/gl_deposit_view.php:111 gl/view/gl_payment_view.php:104
 #: gl/view/gl_payment_view.php:107 gl/view/gl_payment_view.php:110
 #: gl/view/gl_trans_view.php:96 gl/view/gl_trans_view.php:99
-#: gl/view/gl_trans_view.php:102 gl/includes/ui/gl_bank_ui.inc:147
-#: gl/includes/ui/gl_bank_ui.inc:150 gl/includes/ui/gl_bank_ui.inc:153
-#: gl/includes/ui/gl_bank_ui.inc:303 gl/includes/ui/gl_journal_ui.inc:113
-#: gl/includes/ui/gl_journal_ui.inc:116 gl/includes/ui/gl_journal_ui.inc:119
-#: gl/includes/ui/gl_journal_ui.inc:296 includes/ui/class.reflines_crud.inc:38
-#: inventory/cost_update.php:146
-#: inventory/includes/item_adjustments_ui.inc:214
-#: inventory/includes/stock_transfers_ui.inc:174
-#: manufacturing/view/wo_costs_view.php:61
+#: gl/view/gl_trans_view.php:102 includes/ui/class.reflines_crud.inc:38
+#: inventory/cost_update.php:148 inventory/includes/item_adjustments_ui.inc:236
+#: inventory/includes/stock_transfers_ui.inc:169
 #: manufacturing/includes/work_order_issue_ui.inc:169
 #: manufacturing/includes/work_order_issue_ui.inc:169
+#: manufacturing/view/wo_costs_view.php:61
 #: purchasing/includes/ui/invoice_ui.inc:278
 #: purchasing/includes/ui/invoice_ui.inc:280
 #: 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
+#: purchasing/includes/ui/invoice_ui.inc:282 reporting/rep402.php:141
+#: sales/customer_credit_invoice.php:359 sales/customer_delivery.php:524
 #: sales/includes/ui/sales_credit_ui.inc:334
 msgid "Memo"
 msgstr ""
 #: sales/includes/ui/sales_credit_ui.inc:334
 msgid "Memo"
 msgstr ""
@@ -3749,33 +4234,32 @@ msgid "Revenue / Cost Account"
 msgstr ""
 
 #: gl/accruals.php:224 gl/gl_budget.php:90 gl/gl_budget.php:92
 msgstr ""
 
 #: gl/accruals.php:224 gl/gl_budget.php:90 gl/gl_budget.php:92
-#: gl/inquiry/journal_inquiry.php:113 gl/inquiry/tax_inquiry.php:80
-#: gl/manage/gl_quick_entries.php:268 gl/manage/gl_quick_entries.php:270
-#: gl/manage/gl_quick_entries.php:272 gl/manage/gl_quick_entries.php:348
-#: gl/view/bank_transfer_view.php:70 gl/view/bank_transfer_view.php:80
-#: gl/view/gl_deposit_view.php:67 gl/view/gl_deposit_view.php:105
-#: gl/view/gl_deposit_view.php:108 gl/view/gl_deposit_view.php:111
-#: gl/view/gl_payment_view.php:65 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:147 gl/includes/ui/gl_bank_ui.inc:150
-#: gl/includes/ui/gl_bank_ui.inc:153 includes/dashboard.inc:121
-#: includes/dashboard.inc:147 includes/dashboard.inc:170
-#: includes/dashboard.inc:189 includes/dashboard.inc:226
-#: includes/dashboard.inc:294 includes/dashboard.inc:336
-#: includes/dashboard.inc:448 includes/sysnames.inc:138
-#: includes/ui/allocation_cart.inc:290 includes/ui/ui_lists.inc:1369
+#: gl/includes/ui/gl_bank_ui.inc:153 gl/inquiry/journal_inquiry.php:119
+#: gl/inquiry/tax_inquiry.php:80 gl/manage/gl_quick_entries.php:268
+#: gl/manage/gl_quick_entries.php:270 gl/manage/gl_quick_entries.php:272
+#: gl/manage/gl_quick_entries.php:348 gl/view/bank_transfer_view.php:70
+#: gl/view/bank_transfer_view.php:80 gl/view/gl_deposit_view.php:67
+#: gl/view/gl_deposit_view.php:105 gl/view/gl_deposit_view.php:108
+#: gl/view/gl_deposit_view.php:111 gl/view/gl_payment_view.php:65
+#: gl/view/gl_payment_view.php:104 gl/view/gl_payment_view.php:107
+#: gl/view/gl_payment_view.php:110 includes/dashboard.inc:444
+#: includes/dashboard.inc:486 includes/dashboard.inc:558
+#: includes/dashboard.inc:978 includes/dashboard.inc:983
+#: includes/sysnames.inc:140 includes/ui/allocation_cart.inc:311
+#: includes/ui/ui_lists.inc:1375
 #: 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
 #: 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/inquiry/supplier_inquiry.php:182
 #: purchasing/view/view_supp_payment.php:60
 #: purchasing/view/view_supp_payment.php:60
-#: purchasing/view/view_supp_payment.php:72
-#: purchasing/inquiry/supplier_inquiry.php:181 reporting/rep102.php:242
-#: reporting/rep107.php:204 reporting/rep107.php:269 reporting/rep109.php:197
-#: reporting/rep110.php:194 reporting/rep111.php:194 reporting/rep113.php:183
-#: reporting/rep202.php:250 reporting/rep209.php:199 reporting/rep706.php:308
-#: reporting/rep707.php:328 reporting/rep710.php:78
-#: sales/view/view_receipt.php:44 sales/inquiry/customer_inquiry.php:202
+#: purchasing/view/view_supp_payment.php:72 reporting/rep102.php:234
+#: reporting/rep107.php:228 reporting/rep107.php:293 reporting/rep109.php:181
+#: reporting/rep110.php:194 reporting/rep111.php:196 reporting/rep113.php:183
+#: reporting/rep202.php:253 reporting/rep209.php:196 reporting/rep706.php:314
+#: reporting/rep707.php:330 reporting/rep710.php:78
+#: sales/inquiry/customer_inquiry.php:208 sales/view/view_receipt.php:44
 msgid "Amount"
 msgstr ""
 
 msgid "Amount"
 msgstr ""
 
@@ -3791,10 +4275,6 @@ msgstr ""
 msgid "Periods"
 msgstr ""
 
 msgid "Periods"
 msgstr ""
 
-#: gl/accruals.php:232
-msgid "Show GL Rows"
-msgstr ""
-
 #: gl/accruals.php:233
 msgid "Process Accruals"
 msgstr ""
 #: gl/accruals.php:233
 msgid "Process Accruals"
 msgstr ""
@@ -3830,7 +4310,7 @@ msgstr ""
 msgid "Bank Statement:"
 msgstr ""
 
 msgid "Bank Statement:"
 msgstr ""
 
-#: gl/bank_account_reconcile.php:202 includes/ui/class.crud_view.inc:300
+#: gl/bank_account_reconcile.php:202 includes/ui/class.crud_view.inc:309
 msgid "New"
 msgstr ""
 
 msgid "New"
 msgstr ""
 
@@ -3864,9 +4344,8 @@ msgstr ""
 
 #: gl/bank_account_reconcile.php:272 gl/inquiry/bank_inquiry.php:72
 #: gl/inquiry/gl_account_inquiry.php:143 gl/inquiry/gl_account_inquiry.php:145
 
 #: gl/bank_account_reconcile.php:272 gl/inquiry/bank_inquiry.php:72
 #: gl/inquiry/gl_account_inquiry.php:143 gl/inquiry/gl_account_inquiry.php:145
-#: gl/view/accrual_trans.php:60 reporting/rep601.php:79
-#: reporting/rep602.php:80 reporting/rep704.php:83 reporting/rep704.php:85
-#: reporting/rep704.php:88
+#: gl/view/accrual_trans.php:60 reporting/rep601.php:81 reporting/rep602.php:80
+#: reporting/rep704.php:80 reporting/rep704.php:87 reporting/rep704.php:95
 msgid "Person/Item"
 msgstr ""
 
 msgid "Person/Item"
 msgstr ""
 
@@ -3886,11 +4365,11 @@ msgstr ""
 msgid "Bank Account Transfer Entry"
 msgstr ""
 
 msgid "Bank Account Transfer Entry"
 msgstr ""
 
-#: gl/bank_transfer.php:46 gl/manage/revaluate_currencies.php:35
+#: gl/bank_transfer.php:46
 msgid "Transfer has been entered"
 msgstr ""
 
 msgid "Transfer has been entered"
 msgstr ""
 
-#: gl/bank_transfer.php:48 gl/manage/revaluate_currencies.php:37
+#: gl/bank_transfer.php:48
 msgid "&View the GL Journal Entries for this Transfer"
 msgstr ""
 
 msgid "&View the GL Journal Entries for this Transfer"
 msgstr ""
 
@@ -3898,88 +4377,88 @@ msgstr ""
 msgid "Enter &Another Transfer"
 msgstr ""
 
 msgid "Enter &Another Transfer"
 msgstr ""
 
-#: gl/bank_transfer.php:104
+#: gl/bank_transfer.php:108
 msgid "From Account:"
 msgstr ""
 
 msgid "From Account:"
 msgstr ""
 
-#: gl/bank_transfer.php:108
+#: gl/bank_transfer.php:112
 msgid "To Account:"
 msgstr ""
 
 msgid "To Account:"
 msgstr ""
 
-#: gl/bank_transfer.php:115
+#: gl/bank_transfer.php:119
 msgid "Transfer Date:"
 msgstr ""
 
 msgid "Transfer Date:"
 msgstr ""
 
-#: gl/bank_transfer.php:126 gl/bank_transfer.php:133
-#: sales/customer_payments.php:378
+#: gl/bank_transfer.php:136 gl/bank_transfer.php:143
+#: sales/customer_payments.php:397
 msgid "Amount:"
 msgstr ""
 
 msgid "Amount:"
 msgstr ""
 
-#: gl/bank_transfer.php:127 gl/bank_transfer.php:134
-#: purchasing/supplier_payment.php:319 sales/customer_payments.php:364
+#: gl/bank_transfer.php:137 gl/bank_transfer.php:144
+#: purchasing/supplier_payment.php:323 sales/customer_payments.php:368
 msgid "Bank Charge:"
 msgstr ""
 
 msgid "Bank Charge:"
 msgstr ""
 
-#: gl/bank_transfer.php:129
+#: gl/bank_transfer.php:139
 msgid "Incoming Amount:"
 msgstr ""
 
 msgid "Incoming Amount:"
 msgstr ""
 
-#: gl/bank_transfer.php:143
+#: gl/bank_transfer.php:158
 msgid "Modify Transfer"
 msgstr ""
 
 msgid "Modify Transfer"
 msgstr ""
 
-#: gl/bank_transfer.php:145
+#: gl/bank_transfer.php:160
 msgid "Enter Transfer"
 msgstr ""
 
 msgid "Enter Transfer"
 msgstr ""
 
-#: gl/bank_transfer.php:172 gl/bank_transfer.php:226 gl/bank_transfer.php:250
-#: purchasing/supplier_payment.php:144 purchasing/supplier_payment.php:150
+#: gl/bank_transfer.php:187 gl/bank_transfer.php:242 gl/bank_transfer.php:266
+#: purchasing/supplier_payment.php:141 purchasing/supplier_payment.php:147
 msgid "The entered amount is invalid or less than zero."
 msgstr ""
 
 msgid "The entered amount is invalid or less than zero."
 msgstr ""
 
-#: gl/bank_transfer.php:177 gl/gl_bank.php:226
+#: gl/bank_transfer.php:192 gl/gl_bank.php:230
 msgid "The total bank amount cannot be 0."
 msgstr ""
 
 msgid "The total bank amount cannot be 0."
 msgstr ""
 
-#: gl/bank_transfer.php:193
+#: gl/bank_transfer.php:209
 #, php-format
 msgid ""
 "This bank transfer change would result in exceeding authorized overdraft "
 "limit (%s) of the account '%s'"
 msgstr ""
 
 #, php-format
 msgid ""
 "This bank transfer change would result in exceeding authorized overdraft "
 "limit (%s) of the account '%s'"
 msgstr ""
 
-#: gl/bank_transfer.php:198
+#: gl/bank_transfer.php:214
 #, php-format
 msgid ""
 "This bank transfer change would result in exceeding authorized overdraft "
 "limit on '%s' for transaction: %s #%s on %s."
 msgstr ""
 
 #, 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:210
+#: gl/bank_transfer.php:226
 #, php-format
 msgid ""
 "This bank transfer would result in exceeding authorized overdraft limit of "
 "the account (%s)"
 msgstr ""
 
 #, php-format
 msgid ""
 "This bank transfer would result in exceeding authorized overdraft limit of "
 "the account (%s)"
 msgstr ""
 
-#: gl/bank_transfer.php:215
+#: gl/bank_transfer.php:231
 #, php-format
 msgid ""
 "This bank transfer would result in exceeding authorized overdraft limit for "
 "transaction: %s #%s on %s."
 msgstr ""
 
 #, php-format
 msgid ""
 "This bank transfer would result in exceeding authorized overdraft limit for "
 "transaction: %s #%s on %s."
 msgstr ""
 
-#: gl/bank_transfer.php:231 purchasing/supplier_payment.php:158
-#: sales/customer_payments.php:185
+#: gl/bank_transfer.php:247 purchasing/supplier_payment.php:155
+#: sales/customer_payments.php:188
 msgid ""
 "The Bank Charge Account has not been set in System and General GL Setup."
 msgstr ""
 
 msgid ""
 "The Bank Charge Account has not been set in System and General GL Setup."
 msgstr ""
 
-#: gl/bank_transfer.php:243
+#: gl/bank_transfer.php:259
 msgid "The source and destination bank accouts cannot be the same."
 msgstr ""
 
 msgid "The source and destination bank accouts cannot be the same."
 msgstr ""
 
-#: gl/bank_transfer.php:255
+#: gl/bank_transfer.php:271
 msgid "The incomming bank amount cannot be 0."
 msgstr ""
 
 msgid "The incomming bank amount cannot be 0."
 msgstr ""
 
@@ -3999,124 +4478,124 @@ msgstr ""
 msgid "Modify Bank Deposit Entry"
 msgstr ""
 
 msgid "Modify Bank Deposit Entry"
 msgstr ""
 
-#: gl/gl_bank.php:77
+#: gl/gl_bank.php:81
 #, php-format
 msgid "Payment %d has been entered"
 msgstr ""
 
 #, php-format
 msgid "Payment %d has been entered"
 msgstr ""
 
-#: gl/gl_bank.php:79 gl/gl_bank.php:97
+#: gl/gl_bank.php:83 gl/gl_bank.php:101
 msgid "&View the GL Postings for this Payment"
 msgstr ""
 
 msgid "&View the GL Postings for this Payment"
 msgstr ""
 
-#: gl/gl_bank.php:81 gl/gl_bank.php:99
+#: gl/gl_bank.php:85 gl/gl_bank.php:103
 msgid "Enter Another &Payment"
 msgstr ""
 
 msgid "Enter Another &Payment"
 msgstr ""
 
-#: gl/gl_bank.php:83 gl/gl_bank.php:101
+#: gl/gl_bank.php:87 gl/gl_bank.php:105
 msgid "Enter A &Deposit"
 msgstr ""
 
 msgid "Enter A &Deposit"
 msgstr ""
 
-#: gl/gl_bank.php:85 gl/gl_journal.php:64 inventory/adjustments.php:65
+#: gl/gl_bank.php:89 gl/gl_journal.php:64 inventory/adjustments.php:65
 #: manufacturing/work_order_entry.php:67 purchasing/po_entry_items.php:117
 #: manufacturing/work_order_entry.php:67 purchasing/po_entry_items.php:117
-#: purchasing/po_entry_items.php:138 purchasing/supplier_credit.php:82
+#: purchasing/po_entry_items.php:138 purchasing/supplier_credit.php:85
 #: purchasing/supplier_invoice.php:74 sales/credit_note_entry.php:77
 #: sales/customer_credit_invoice.php:61 sales/customer_invoice.php:72
 #: sales/sales_order_entry.php:250
 msgid "Add an Attachment"
 msgstr ""
 
 #: purchasing/supplier_invoice.php:74 sales/credit_note_entry.php:77
 #: sales/customer_credit_invoice.php:61 sales/customer_invoice.php:72
 #: sales/sales_order_entry.php:250
 msgid "Add an Attachment"
 msgstr ""
 
-#: gl/gl_bank.php:95
+#: gl/gl_bank.php:99
 #, php-format
 msgid "Payment %d has been modified"
 msgstr ""
 
 #, php-format
 msgid "Payment %d has been modified"
 msgstr ""
 
-#: gl/gl_bank.php:111
+#: gl/gl_bank.php:115
 #, php-format
 msgid "Deposit %d has been entered"
 msgstr ""
 
 #, php-format
 msgid "Deposit %d has been entered"
 msgstr ""
 
-#: gl/gl_bank.php:113
+#: gl/gl_bank.php:117
 msgid "View the GL Postings for this Deposit"
 msgstr ""
 
 msgid "View the GL Postings for this Deposit"
 msgstr ""
 
-#: gl/gl_bank.php:115
+#: gl/gl_bank.php:119
 msgid "Enter Another Deposit"
 msgstr ""
 
 msgid "Enter Another Deposit"
 msgstr ""
 
-#: gl/gl_bank.php:117
+#: gl/gl_bank.php:121
 msgid "Enter A Payment"
 msgstr ""
 
 msgid "Enter A Payment"
 msgstr ""
 
-#: gl/gl_bank.php:126
+#: gl/gl_bank.php:130
 #, php-format
 msgid "Deposit %d has been modified"
 msgstr ""
 
 #, php-format
 msgid "Deposit %d has been modified"
 msgstr ""
 
-#: gl/gl_bank.php:128
+#: gl/gl_bank.php:132
 msgid "&View the GL Postings for this Deposit"
 msgstr ""
 
 msgid "&View the GL Postings for this Deposit"
 msgstr ""
 
-#: gl/gl_bank.php:130
+#: gl/gl_bank.php:134
 msgid "Enter Another &Deposit"
 msgstr ""
 
 msgid "Enter Another &Deposit"
 msgstr ""
 
-#: gl/gl_bank.php:132
+#: gl/gl_bank.php:136
 msgid "Enter A &Payment"
 msgstr ""
 
 msgid "Enter A &Payment"
 msgstr ""
 
-#: gl/gl_bank.php:220
+#: gl/gl_bank.php:224
 msgid "You must enter at least one payment line."
 msgstr ""
 
 msgid "You must enter at least one payment line."
 msgstr ""
 
-#: gl/gl_bank.php:237 purchasing/supplier_payment.php:209
+#: gl/gl_bank.php:241 purchasing/supplier_payment.php:206
 #, php-format
 msgid "The total bank amount exceeds allowed limit (%s)."
 msgstr ""
 
 #, php-format
 msgid "The total bank amount exceeds allowed limit (%s)."
 msgstr ""
 
-#: gl/gl_bank.php:243
+#: gl/gl_bank.php:248
 #, php-format
 msgid ""
 "The bank transaction would result in exceed of authorized overdraft limit "
 "for transaction: %s #%s on %s."
 msgstr ""
 
 #, php-format
 msgid ""
 "The bank transaction would result in exceed of authorized overdraft limit "
 "for transaction: %s #%s on %s."
 msgstr ""
 
-#: gl/gl_bank.php:255
+#: gl/gl_bank.php:261
 msgid "The entered date for the payment is invalid."
 msgstr ""
 
 msgid "The entered date for the payment is invalid."
 msgstr ""
 
-#: gl/gl_bank.php:267
+#: gl/gl_bank.php:273
 msgid "You have to select customer and customer branch."
 msgstr ""
 
 msgid "You have to select customer and customer branch."
 msgstr ""
 
-#: gl/gl_bank.php:271
+#: gl/gl_bank.php:277
 msgid "You have to select supplier."
 msgstr ""
 
 msgid "You have to select supplier."
 msgstr ""
 
-#: gl/gl_bank.php:279
+#: gl/gl_bank.php:285
 msgid "Settled amount have to be positive number."
 msgstr ""
 
 msgid "Settled amount have to be positive number."
 msgstr ""
 
-#: gl/gl_bank.php:325
+#: gl/gl_bank.php:331
 msgid "The amount entered is not a valid number or is less than zero."
 msgstr ""
 
 msgid "The amount entered is not a valid number or is less than zero."
 msgstr ""
 
-#: gl/gl_bank.php:331 gl/manage/exchange_rates.php:39
+#: gl/gl_bank.php:337 gl/manage/exchange_rates.php:39
 msgid "The exchange rate cannot be zero or a negative number."
 msgstr ""
 
 msgid "The exchange rate cannot be zero or a negative number."
 msgstr ""
 
-#: gl/gl_bank.php:403
+#: gl/gl_bank.php:409
 msgid "Payment Items"
 msgstr ""
 
 msgid "Payment Items"
 msgstr ""
 
-#: gl/gl_bank.php:403
+#: gl/gl_bank.php:409
 msgid "Deposit Items"
 msgstr ""
 
 msgid "Deposit Items"
 msgstr ""
 
-#: gl/gl_bank.php:411
+#: gl/gl_bank.php:417
 msgid "Process Payment"
 msgstr ""
 
 msgid "Process Payment"
 msgstr ""
 
-#: gl/gl_bank.php:411
+#: gl/gl_bank.php:417
 msgid "Process Deposit"
 msgstr ""
 
 msgid "Process Deposit"
 msgstr ""
 
@@ -4147,21 +4626,6 @@ msgstr ""
 msgid "Get"
 msgstr ""
 
 msgid "Get"
 msgstr ""
 
-#: gl/gl_budget.php:90 gl/gl_budget.php:92 gl/inquiry/profit_loss.php:237
-#: gl/manage/gl_quick_entries.php:247 reporting/rep101.php:141
-#: reporting/rep105.php:119 reporting/rep106.php:98 reporting/rep114.php:90
-#: reporting/rep201.php:115 reporting/rep304.php:134 reporting/rep305.php:111
-#: reporting/rep306.php:148 reporting/rep307.php:119 reporting/rep308.php:229
-#: reporting/rep309.php:104 reporting/rep310.php:149 reporting/rep601.php:85
-#: reporting/rep602.php:86 reporting/rep702.php:59 reporting/rep704.php:94
-#: reporting/rep704.php:104 reporting/rep704.php:112 reporting/rep706.php:185
-#: reporting/rep706.php:193 reporting/rep706.php:203 reporting/rep706.php:211
-#: reporting/rep707.php:210 reporting/rep707.php:217 reporting/rep707.php:227
-#: reporting/rep707.php:235 reporting/rep708.php:200 reporting/rep708.php:209
-#: reporting/rep708.php:216 reporting/rep709.php:111 reporting/rep710.php:85
-msgid "Period"
-msgstr ""
-
 #: gl/gl_budget.php:90
 msgid "Dim. incl."
 msgstr ""
 #: gl/gl_budget.php:90
 msgid "Dim. incl."
 msgstr ""
@@ -4170,44 +4634,43 @@ msgstr ""
 msgid "Last Year"
 msgstr ""
 
 msgid "Last Year"
 msgstr ""
 
-#: gl/gl_budget.php:126 gl/inquiry/balance_sheet.php:98
+#: gl/gl_budget.php:126 gl/includes/ui/gl_bank_ui.inc:195
+#: gl/includes/ui/gl_journal_ui.inc:179 gl/inquiry/balance_sheet.php:98
 #: gl/inquiry/balance_sheet.php:202 gl/inquiry/balance_sheet.php:233
 #: gl/inquiry/balance_sheet.php:202 gl/inquiry/balance_sheet.php:233
-#: gl/inquiry/gl_trial_balance.php:174 gl/inquiry/gl_trial_balance.php:251
+#: gl/inquiry/gl_trial_balance.php:187 gl/inquiry/gl_trial_balance.php:267
 #: 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/inquiry/profit_loss.php:120 gl/inquiry/profit_loss.php:287
 #: gl/view/gl_deposit_view.php:137 gl/view/gl_payment_view.php:136
-#: gl/view/gl_trans_view.php:144 gl/includes/ui/gl_bank_ui.inc:195
-#: gl/includes/ui/gl_journal_ui.inc:179 includes/dashboard.inc:487
-#: includes/dashboard.inc:571 inventory/includes/item_adjustments_ui.inc:60
-#: inventory/includes/item_adjustments_ui.inc:114
+#: gl/view/gl_trans_view.php:144 includes/dashboard.inc:1012
+#: includes/dashboard.inc:1095 inventory/includes/item_adjustments_ui.inc:60
+#: inventory/includes/item_adjustments_ui.inc:126
 #: manufacturing/includes/manufacturing_ui.inc:195
 #: 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/po_receive_items.php:63
 #: purchasing/allocations/supplier_allocation_main.php:100
 #: purchasing/allocations/supplier_allocation_main.php:100
-#: reporting/rep101.php:256 reporting/rep106.php:90 reporting/rep106.php:125
-#: reporting/rep106.php:172 reporting/rep114.php:161 reporting/rep201.php:222
+#: purchasing/includes/ui/invoice_ui.inc:342
+#: purchasing/includes/ui/invoice_ui.inc:504
+#: purchasing/includes/ui/invoice_ui.inc:575 purchasing/view/view_po.php:140
+#: reporting/rep101.php:262 reporting/rep106.php:91 reporting/rep106.php:126
+#: reporting/rep106.php:173 reporting/rep114.php:161 reporting/rep201.php:230
 #: reporting/rep203.php:89 reporting/rep203.php:166 reporting/rep204.php:113
 #: reporting/rep203.php:89 reporting/rep203.php:166 reporting/rep204.php:113
-#: reporting/rep204.php:141 reporting/rep301.php:192 reporting/rep301.php:240
+#: reporting/rep204.php:141 reporting/rep301.php:196 reporting/rep301.php:244
 #: reporting/rep304.php:160 reporting/rep304.php:205 reporting/rep305.php:106
 #: reporting/rep304.php:160 reporting/rep304.php:205 reporting/rep305.php:106
-#: reporting/rep305.php:132 reporting/rep305.php:188 reporting/rep306.php:141
-#: reporting/rep306.php:176 reporting/rep306.php:196 reporting/rep306.php:212
-#: reporting/rep306.php:261 reporting/rep306.php:276 reporting/rep306.php:287
-#: reporting/rep308.php:304 reporting/rep309.php:125 reporting/rep309.php:152
-#: reporting/rep451.php:120 reporting/rep451.php:155 reporting/rep702.php:142
-#: reporting/rep705.php:152 reporting/rep705.php:312 reporting/rep706.php:106
-#: reporting/rep706.php:255 reporting/rep706.php:290 reporting/rep707.php:115
-#: reporting/rep707.php:299 reporting/rep708.php:253
+#: reporting/rep305.php:132 reporting/rep305.php:188 reporting/rep306.php:138
+#: reporting/rep306.php:173 reporting/rep306.php:193 reporting/rep306.php:209
+#: reporting/rep306.php:257 reporting/rep306.php:272 reporting/rep306.php:283
+#: reporting/rep309.php:125 reporting/rep309.php:152 reporting/rep451.php:120
+#: reporting/rep451.php:155 reporting/rep702.php:136 reporting/rep705.php:155
+#: reporting/rep705.php:256 reporting/rep705.php:336 reporting/rep706.php:106
+#: reporting/rep706.php:257 reporting/rep706.php:292 reporting/rep707.php:114
+#: reporting/rep707.php:300 reporting/rep708.php:253 reporting/rep710.php:126
 #: reporting/includes/doctext.inc:32 reporting/includes/doctext.inc:191
 #: reporting/includes/doctext.inc:32 reporting/includes/doctext.inc:191
-#: sales/customer_credit_invoice.php:276 sales/customer_delivery.php:421
-#: sales/customer_invoice.php:519 sales/customer_invoice.php:522
+#: sales/customer_credit_invoice.php:276 sales/customer_delivery.php:422
+#: sales/customer_invoice.php:520 sales/customer_invoice.php:523
 #: sales/allocations/customer_allocation_main.php:98
 #: sales/allocations/customer_allocation_main.php:98
-#: sales/view/view_credit.php:91 sales/view/view_dispatch.php:113
-#: sales/view/view_invoice.php:116 sales/view/view_sales_order.php:109
-#: sales/view/view_sales_order.php:142 sales/view/view_sales_order.php:179
-#: sales/view/view_sales_order.php:220
 #: sales/includes/ui/sales_credit_ui.inc:163
 #: sales/includes/ui/sales_credit_ui.inc:163
-#: sales/includes/ui/sales_order_ui.inc:148
+#: sales/includes/ui/sales_order_ui.inc:148 sales/view/view_credit.php:91
+#: sales/view/view_dispatch.php:113 sales/view/view_invoice.php:116
+#: sales/view/view_sales_order.php:111 sales/view/view_sales_order.php:144
+#: sales/view/view_sales_order.php:181 sales/view/view_sales_order.php:222
 msgid "Total"
 msgstr ""
 
 msgid "Total"
 msgstr ""
 
@@ -4220,7 +4683,8 @@ msgstr ""
 msgid "Modifying Journal Transaction # %d."
 msgstr ""
 
 msgid "Modifying Journal Transaction # %d."
 msgstr ""
 
-#: gl/gl_journal.php:36 includes/sysnames.inc:22 includes/sysnames.inc:155
+#: gl/gl_journal.php:36 includes/sysnames.inc:22 includes/sysnames.inc:157
+#: themes/canvas/renderer.php:131
 msgid "Journal Entry"
 msgstr ""
 
 msgid "Journal Entry"
 msgstr ""
 
@@ -4303,8 +4767,8 @@ msgstr ""
 msgid "The credit amount entered is not a valid number or is less than zero."
 msgstr ""
 
 msgid "The credit amount entered is not a valid number or is less than zero."
 msgstr ""
 
-#: gl/gl_journal.php:401 includes/ui/ui_view.inc:649
-#: purchasing/supplier_credit.php:143 purchasing/supplier_invoice.php:152
+#: gl/gl_journal.php:401 includes/ui/ui_view.inc:655
+#: purchasing/supplier_credit.php:146 purchasing/supplier_invoice.php:152
 msgid "Cannot post to GL account used by more than one tax type."
 msgstr ""
 
 msgid "Cannot post to GL account used by more than one tax type."
 msgstr ""
 
@@ -4335,12 +4799,11 @@ msgid "VAT date:"
 msgstr ""
 
 #: gl/gl_journal.php:556 gl/inquiry/tax_inquiry.php:102
 msgstr ""
 
 #: gl/gl_journal.php:556 gl/inquiry/tax_inquiry.php:102
-#: reporting/rep709.php:189
+#: reporting/rep709.php:191
 msgid "Input Tax"
 msgstr ""
 
 msgid "Input Tax"
 msgstr ""
 
-#: gl/gl_journal.php:556 gl/inquiry/tax_inquiry.php:96
-#: reporting/rep709.php:189
+#: gl/gl_journal.php:556 gl/inquiry/tax_inquiry.php:96 reporting/rep709.php:191
 msgid "Output Tax"
 msgstr ""
 
 msgid "Output Tax"
 msgstr ""
 
@@ -4356,95 +4819,333 @@ msgstr ""
 msgid "Process journal entry only if debits equal to credits"
 msgstr ""
 
 msgid "Process journal entry only if debits equal to credits"
 msgstr ""
 
-#: gl/inquiry/accounts_list.php:25 inventory/manage/items.php:477
-#: sales/manage/customer_branches.php:240
-msgid "GL Accounts"
-msgstr ""
-
-#: gl/inquiry/accounts_list.php:40 includes/ui/ui_lists.inc:349
-msgid "Search GL accounts"
+#: gl/includes/db/gl_db_banking.inc:52 gl/includes/db/gl_db_banking.inc:56
+#: gl/includes/db/gl_db_banking.inc:84 gl/includes/db/gl_db_banking.inc:87
+#: gl/includes/db/gl_db_banking.inc:271
+msgid "Exchange Variance"
 msgstr ""
 
 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:112
-#: gl/includes/ui/gl_journal_ui.inc:115 gl/includes/ui/gl_journal_ui.inc:118
-#: manufacturing/view/wo_costs_view.php:60 reporting/rep701.php:110
-msgid "Account Code"
+#: gl/includes/db/gl_db_banking.inc:230 gl/view/gl_deposit_view.php:71
+#: reporting/reports_main.php:109 reporting/reports_main.php:119
+#: reporting/reports_main.php:127 reporting/reports_main.php:141
+#: reporting/reports_main.php:149 reporting/reports_main.php:156
+#: reporting/reports_main.php:215 reporting/reports_main.php:222
+#: reporting/reports_main.php:332
+msgid "From"
 msgstr ""
 
 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:120 reporting/rep301.php:164 reporting/rep301.php:170
-#: reporting/rep302.php:122 reporting/rep302.php:129 reporting/rep303.php:133
-#: reporting/rep304.php:127 reporting/rep304.php:135 reporting/rep306.php:141
-#: reporting/rep306.php:149 reporting/rep307.php:114 reporting/rep307.php:120
-#: reporting/rep308.php:223 reporting/rep308.php:230 reporting/rep309.php:105
-#: reporting/rep310.php:150
-msgid "Category"
+#: gl/includes/db/gl_db_banking.inc:230 reporting/reports_main.php:110
+#: reporting/reports_main.php:120 reporting/reports_main.php:128
+#: reporting/reports_main.php:142 reporting/reports_main.php:150
+#: reporting/reports_main.php:157 reporting/reports_main.php:216
+#: reporting/reports_main.php:223 reporting/reports_main.php:333
+msgid "To"
 msgstr ""
 
 msgstr ""
 
-#: gl/inquiry/balance_sheet.php:27
-msgid "Balance Sheet Drilldown"
+#: gl/includes/db/gl_db_banking.inc:354 gl/includes/db/gl_db_banking.inc:521
+#: gl/includes/db/gl_journal.inc:111 purchasing/includes/db/invoice_db.inc:147
+msgid "Document reentered."
 msgstr ""
 
 msgstr ""
 
-#: gl/inquiry/balance_sheet.php:125
-msgid "As at:"
+#: 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 ""
 
 msgstr ""
 
-#: gl/inquiry/balance_sheet.php:225 gl/inquiry/profit_loss.php:298
-#: includes/dashboard.inc:394 reporting/rep705.php:322
-#: reporting/rep706.php:278 reporting/rep706.php:303 reporting/rep707.php:311
-#: reporting/rep707.php:317
-msgid "Calculated Return"
+#: gl/includes/ui/gl_bank_ui.inc:24
+#: inventory/includes/item_adjustments_ui.inc:35
+#: inventory/includes/stock_transfers_ui.inc:43
+#: manufacturing/work_order_add_finished.php:185
+#: manufacturing/work_order_costs.php:133
+#: purchasing/allocations/supplier_allocate.php:56
+#: sales/allocations/customer_allocate.php:59
+#: sales/includes/ui/sales_credit_ui.inc:117
+msgid "Date:"
 msgstr ""
 
 msgstr ""
 
-#: gl/inquiry/balance_sheet.php:233 includes/sysnames.inc:126
-#: reporting/rep706.php:290
-msgid "Liabilities"
+#: gl/includes/ui/gl_bank_ui.inc:52
+msgid "Pay To:"
 msgstr ""
 
 msgstr ""
 
-#: gl/inquiry/balance_sheet.php:233 reporting/rep706.php:290
-msgid " and "
+#: gl/includes/ui/gl_bank_ui.inc:57
+msgid "To the Order of:"
 msgstr ""
 
 msgstr ""
 
-#: gl/inquiry/balance_sheet.php:233 reporting/rep706.php:290
-msgid "Equities"
+#: gl/includes/ui/gl_bank_ui.inc:61 inventory/purchasing_data.php:207
+#: inventory/purchasing_data.php:211 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 ""
 
 msgstr ""
 
-#: gl/inquiry/bank_inquiry.php:29 reporting/rep601.php:72
-msgid "Bank Statement"
+#: gl/includes/ui/gl_bank_ui.inc:64 sales/includes/ui/sales_credit_ui.inc:29
+#: sales/includes/ui/sales_order_ui.inc:267
+#: sales/manage/recurrent_invoices.php:195
+msgid "Customer:"
 msgstr ""
 
 msgstr ""
 
-#: gl/inquiry/bank_inquiry.php:79 gl/inquiry/gl_account_inquiry.php:164
-#: reporting/rep601.php:104 reporting/rep602.php:103 reporting/rep704.php:143
-msgid "Opening Balance"
+#: gl/includes/ui/gl_bank_ui.inc:68 sales/customer_payments.php:324
+#: sales/includes/ui/sales_credit_ui.inc:37
+#: sales/includes/ui/sales_order_ui.inc:274
+#: sales/manage/recurrent_invoices.php:198
+msgid "Branch:"
 msgstr ""
 
 msgstr ""
 
-#: gl/inquiry/bank_inquiry.php:130 gl/inquiry/gl_account_inquiry.php:220
-#: gl/inquiry/gl_trial_balance.php:261 reporting/rep601.php:157
-#: reporting/rep602.php:157 reporting/rep704.php:191 reporting/rep708.php:262
-msgid "Ending Balance"
+#: gl/includes/ui/gl_bank_ui.inc:82 gl/includes/ui/gl_bank_ui.inc:85
+#: sales/customer_payments.php:346
+msgid "This customer account is on hold."
 msgstr ""
 
 msgstr ""
 
-#: gl/inquiry/gl_account_inquiry.php:32
-msgid "General Ledger Inquiry"
+#: gl/includes/ui/gl_bank_ui.inc:98 gl/includes/ui/gl_journal_ui.inc:70
+#: gl/includes/ui/gl_journal_ui.inc:76
+#: purchasing/includes/ui/invoice_ui.inc:264
+msgid "Go"
 msgstr ""
 
 msgstr ""
 
-#: gl/inquiry/gl_account_inquiry.php:71
-msgid "All Accounts"
+#: gl/includes/ui/gl_bank_ui.inc:114
+msgid "Into:"
 msgstr ""
 
 msgstr ""
 
-#: gl/inquiry/gl_account_inquiry.php:84 gl/inquiry/journal_inquiry.php:53
-msgid "Enter memo fragment or leave empty"
+#: 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:112
+#: gl/includes/ui/gl_journal_ui.inc:115 gl/includes/ui/gl_journal_ui.inc:118
+#: 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
+#: manufacturing/view/wo_costs_view.php:60 reporting/rep402.php:141
+#: reporting/rep701.php:110
+msgid "Account Code"
 msgstr ""
 
 msgstr ""
 
-#: gl/inquiry/gl_account_inquiry.php:85
-msgid "Amount min:"
+#: 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:112
+#: gl/includes/ui/gl_journal_ui.inc:115 gl/includes/ui/gl_journal_ui.inc:118
+#: 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
+msgid "Account Description"
+msgstr ""
+
+#: gl/includes/ui/gl_bank_ui.inc:180 includes/ui/class.crud_view.inc:290
+#: includes/ui/simple_crud_class.inc:52
+#: inventory/includes/item_adjustments_ui.inc:106
+#: inventory/includes/stock_transfers_ui.inc:85
+#: manufacturing/includes/work_order_issue_ui.inc:62
+#: purchasing/includes/ui/invoice_ui.inc:551
+#: purchasing/includes/ui/po_ui.inc:254
+#: sales/includes/ui/sales_credit_ui.inc:193
+#: sales/includes/ui/sales_order_ui.inc:197
+msgid "Edit document line"
+msgstr ""
+
+#: gl/includes/ui/gl_bank_ui.inc:182 includes/ui/class.crud_view.inc:294
+#: includes/ui/simple_crud_class.inc:54
+#: inventory/includes/item_adjustments_ui.inc:111
+#: inventory/includes/stock_transfers_ui.inc:86
+#: manufacturing/includes/work_order_issue_ui.inc:64
+#: purchasing/includes/ui/invoice_ui.inc:318
+#: purchasing/includes/ui/po_ui.inc:256
+#: sales/includes/ui/sales_credit_ui.inc:195
+#: sales/includes/ui/sales_order_ui.inc:199
+msgid "Remove line from document"
+msgstr ""
+
+#: gl/includes/ui/gl_bank_ui.inc:266 gl/includes/ui/gl_journal_ui.inc:277
+#: includes/ui/simple_crud_class.inc:56
+#: inventory/includes/item_adjustments_ui.inc:213
+#: inventory/includes/stock_transfers_ui.inc:150
+#: manufacturing/includes/work_order_issue_ui.inc:133
+#: purchasing/includes/ui/po_ui.inc:446
+#: sales/includes/ui/sales_credit_ui.inc:289
+#: sales/includes/ui/sales_order_ui.inc:555
+msgid "Confirm changes"
+msgstr ""
+
+#: gl/includes/ui/gl_bank_ui.inc:268 gl/includes/ui/gl_journal_ui.inc:279
+#: includes/ui/class.crud_view.inc:301 includes/ui/simple_crud_class.inc:58
+#: inventory/includes/item_adjustments_ui.inc:215
+#: inventory/includes/stock_transfers_ui.inc:151
+#: manufacturing/includes/work_order_issue_ui.inc:135
+#: purchasing/includes/ui/po_ui.inc:448
+#: sales/includes/ui/sales_credit_ui.inc:291
+#: sales/includes/ui/sales_order_ui.inc:557
+msgid "Cancel changes"
+msgstr ""
+
+#: gl/includes/ui/gl_bank_ui.inc:273 gl/includes/ui/gl_journal_ui.inc:283
+#: inventory/includes/item_adjustments_ui.inc:221
+#: inventory/includes/stock_transfers_ui.inc:156
+#: manufacturing/includes/work_order_issue_ui.inc:141
+#: purchasing/includes/ui/po_ui.inc:454
+#: sales/includes/ui/sales_credit_ui.inc:297
+#: sales/includes/ui/sales_order_ui.inc:563
+msgid "Add Item"
+msgstr ""
+
+#: gl/includes/ui/gl_bank_ui.inc:274
+#: inventory/includes/item_adjustments_ui.inc:222
+#: inventory/includes/stock_transfers_ui.inc:156
+#: manufacturing/includes/work_order_issue_ui.inc:142
+#: purchasing/includes/ui/po_ui.inc:455
+#: sales/includes/ui/sales_credit_ui.inc:298
+#: sales/includes/ui/sales_order_ui.inc:564
+msgid "Add new item to document"
+msgstr ""
+
+#: gl/includes/ui/gl_bank_ui.inc:297
+msgid "Settled AR Amount:"
+msgstr ""
+
+#: gl/includes/ui/gl_bank_ui.inc:297
+msgid "Settled AP Amount:"
+msgstr ""
+
+#: gl/includes/ui/gl_journal_ui.inc:26
+msgid "Journal Date:"
+msgstr ""
+
+#: gl/includes/ui/gl_journal_ui.inc:33 inventory/prices.php:193
+msgid "Currency:"
+msgstr ""
+
+#: gl/includes/ui/gl_journal_ui.inc:43
+msgid "Document Date:"
+msgstr ""
+
+#: gl/includes/ui/gl_journal_ui.inc:44
+msgid "Event Date:"
+msgstr ""
+
+#: gl/includes/ui/gl_journal_ui.inc:45
+msgid "Source ref:"
+msgstr ""
+
+#: gl/includes/ui/gl_journal_ui.inc:57 includes/sysnames.inc:105
+msgid "Quick Entry"
+msgstr ""
+
+#: gl/includes/ui/gl_journal_ui.inc:69
+msgid "balance from account"
+msgstr ""
+
+#: gl/includes/ui/gl_journal_ui.inc:74
+msgid "Additional info:"
+msgstr ""
+
+#: gl/includes/ui/gl_journal_ui.inc:81
+msgid "Include in tax register:"
+msgstr ""
+
+#: gl/includes/ui/gl_journal_ui.inc:88
+msgid "Reconciled:"
+msgstr ""
+
+#: gl/includes/ui/gl_journal_ui.inc:123 gl/inquiry/journal_inquiry.php:116
+#: gl/view/gl_trans_view.php:44
+msgid "Counterparty"
+msgstr ""
+
+#: gl/includes/ui/gl_journal_ui.inc:161
+msgid "Edit journal line"
+msgstr ""
+
+#: gl/includes/ui/gl_journal_ui.inc:163
+msgid "Remove line from journal"
+msgstr ""
+
+#: gl/includes/ui/gl_journal_ui.inc:226 gl/includes/ui/gl_journal_ui.inc:243
+msgid "[Select account]"
+msgstr ""
+
+#: gl/includes/ui/gl_journal_ui.inc:284
+msgid "Add new line to journal"
+msgstr ""
+
+#: gl/inquiry/accounts_list.php:25 inventory/manage/items.php:487
+#: sales/manage/customer_branches.php:240 themes/canvas/renderer.php:136
+msgid "GL Accounts"
+msgstr ""
+
+#: gl/inquiry/accounts_list.php:40 includes/ui/ui_lists.inc:352
+msgid "Search GL accounts"
+msgstr ""
+
+#: gl/inquiry/accounts_list.php:52 inventory/inquiry/stock_list.php:53
+#: inventory/manage/item_codes.php:131 reporting/rep104.php:115
+#: reporting/rep105.php:120 reporting/rep301.php:168 reporting/rep301.php:174
+#: reporting/rep302.php:121 reporting/rep302.php:128 reporting/rep303.php:235
+#: reporting/rep304.php:127 reporting/rep304.php:135 reporting/rep306.php:138
+#: reporting/rep306.php:146 reporting/rep307.php:114 reporting/rep307.php:120
+#: reporting/rep308.php:224 reporting/rep308.php:231 reporting/rep309.php:105
+#: reporting/rep310.php:147
+msgid "Category"
+msgstr ""
+
+#: gl/inquiry/balance_sheet.php:27
+msgid "Balance Sheet Drilldown"
+msgstr ""
+
+#: gl/inquiry/balance_sheet.php:125
+msgid "As at:"
+msgstr ""
+
+#: gl/inquiry/balance_sheet.php:225 gl/inquiry/profit_loss.php:298
+#: includes/dashboard.inc:687 reporting/rep705.php:346 reporting/rep706.php:280
+#: reporting/rep706.php:305 reporting/rep707.php:312 reporting/rep707.php:321
+msgid "Calculated Return"
+msgstr ""
+
+#: gl/inquiry/balance_sheet.php:233 includes/sysnames.inc:128
+#: reporting/rep706.php:292
+msgid "Liabilities"
+msgstr ""
+
+#: gl/inquiry/balance_sheet.php:233 reporting/rep706.php:292
+msgid " and "
+msgstr ""
+
+#: gl/inquiry/balance_sheet.php:233 reporting/rep706.php:292
+msgid "Equities"
+msgstr ""
+
+#: gl/inquiry/balance_sheet.php:256 gl/inquiry/profit_loss.php:327
+#: includes/current_user.inc:103 includes/ui/ui_controls.inc:215
+#: includes/ui/ui_view.inc:1013
+msgid "Back"
+msgstr ""
+
+#: gl/inquiry/bank_inquiry.php:29 themes/canvas/renderer.php:132
+msgid "Bank Account Inquiry"
+msgstr ""
+
+#: gl/inquiry/bank_inquiry.php:79 gl/inquiry/gl_account_inquiry.php:164
+#: reporting/rep601.php:112 reporting/rep602.php:103 reporting/rep704.php:152
+msgid "Opening Balance"
+msgstr ""
+
+#: gl/inquiry/bank_inquiry.php:130 gl/inquiry/gl_account_inquiry.php:220
+#: gl/inquiry/gl_trial_balance.php:277 reporting/rep601.php:165
+#: reporting/rep602.php:157 reporting/rep704.php:200 reporting/rep708.php:262
+msgid "Ending Balance"
+msgstr ""
+
+#: gl/inquiry/gl_account_inquiry.php:32
+msgid "General Ledger Inquiry"
+msgstr ""
+
+#: gl/inquiry/gl_account_inquiry.php:71
+msgid "All Accounts"
+msgstr ""
+
+#: gl/inquiry/gl_account_inquiry.php:84 gl/inquiry/journal_inquiry.php:53
+msgid "Enter memo fragment or leave empty"
+msgstr ""
+
+#: gl/inquiry/gl_account_inquiry.php:85
+msgid "Amount min:"
 msgstr ""
 
 #: gl/inquiry/gl_account_inquiry.php:86
 msgstr ""
 
 #: gl/inquiry/gl_account_inquiry.php:86
@@ -4457,6 +5158,7 @@ msgid ""
 msgstr ""
 
 #: gl/inquiry/gl_trial_balance.php:28 reporting/rep708.php:219
 msgstr ""
 
 #: gl/inquiry/gl_trial_balance.php:28 reporting/rep708.php:219
+#: themes/canvas/renderer.php:134
 msgid "Trial Balance"
 msgstr ""
 
 msgid "Trial Balance"
 msgstr ""
 
@@ -4464,46 +5166,45 @@ msgstr ""
 msgid "No zero values"
 msgstr ""
 
 msgid "No zero values"
 msgstr ""
 
-#: gl/inquiry/gl_trial_balance.php:62 reporting/reports_main.php:416
-#: reporting/reports_main.php:466 reporting/reports_main.php:511
+#: gl/inquiry/gl_trial_balance.php:62 reporting/reports_main.php:439
+#: reporting/reports_main.php:490 reporting/reports_main.php:536
 msgid "Only balances"
 msgstr ""
 
 msgid "Only balances"
 msgstr ""
 
-#: gl/inquiry/gl_trial_balance.php:104 gl/inquiry/gl_trial_balance.php:165
-#: includes/dashboard.inc:526 reporting/rep706.php:307
-#: reporting/rep707.php:327 reporting/rep708.php:51 reporting/rep708.php:126
-#: sales/create_recurrent_invoices.php:203
+#: gl/inquiry/gl_trial_balance.php:63
+msgid "Group totals only"
+msgstr ""
+
+#: gl/inquiry/gl_trial_balance.php:107 gl/inquiry/gl_trial_balance.php:177
+#: includes/dashboard.inc:1051 reporting/rep706.php:313
+#: reporting/rep707.php:329 reporting/rep708.php:51 reporting/rep708.php:126
+#: sales/create_recurrent_invoices.php:209
 #: sales/manage/recurrent_invoices.php:128
 msgid "Group"
 msgstr ""
 
 #: sales/manage/recurrent_invoices.php:128
 msgid "Group"
 msgstr ""
 
-#: gl/inquiry/gl_trial_balance.php:203
+#: gl/inquiry/gl_trial_balance.php:219
 msgid "The from date cannot be bigger than the fiscal year end."
 msgstr ""
 
 msgid "The from date cannot be bigger than the fiscal year end."
 msgstr ""
 
-#: gl/inquiry/gl_trial_balance.php:216 gl/manage/bank_accounts.php:109
+#: gl/inquiry/gl_trial_balance.php:232 gl/manage/bank_accounts.php:109
 #: gl/view/gl_trans_view.php:95 gl/view/gl_trans_view.php:98
 #: gl/view/gl_trans_view.php:101 manufacturing/view/wo_costs_view.php:60
 #: gl/view/gl_trans_view.php:95 gl/view/gl_trans_view.php:98
 #: gl/view/gl_trans_view.php:101 manufacturing/view/wo_costs_view.php:60
-#: reporting/rep701.php:110 reporting/rep702.php:53 reporting/rep705.php:235
-#: reporting/rep706.php:185 reporting/rep707.php:210 reporting/rep708.php:192
+#: reporting/rep402.php:141 reporting/rep701.php:110 reporting/rep702.php:53
+#: reporting/rep705.php:255 reporting/rep706.php:188 reporting/rep707.php:212
+#: reporting/rep708.php:192
 msgid "Account Name"
 msgstr ""
 
 msgid "Account Name"
 msgstr ""
 
-#: gl/inquiry/gl_trial_balance.php:217 reporting/rep708.php:185
+#: gl/inquiry/gl_trial_balance.php:233 reporting/rep708.php:185
 msgid "Brought Forward"
 msgstr ""
 
 msgid "Brought Forward"
 msgstr ""
 
-#: gl/inquiry/gl_trial_balance.php:218 reporting/rep708.php:185
+#: gl/inquiry/gl_trial_balance.php:234 reporting/rep708.php:185
 msgid "This Period"
 msgstr ""
 
 msgid "This Period"
 msgstr ""
 
-#: gl/inquiry/gl_trial_balance.php:237 gl/manage/gl_account_types.php:133
-#: includes/dashboard.inc:147 includes/dashboard.inc:170
-#: reporting/rep451.php:80 reporting/rep451.php:86
-msgid "Class"
-msgstr ""
-
-#: gl/inquiry/gl_trial_balance.php:269 reporting/rep708.php:283
+#: gl/inquiry/gl_trial_balance.php:285 reporting/rep708.php:283
 msgid ""
 "The Opening Balance is not in balance, probably due to a non closed Previous "
 "Fiscalyear."
 msgid ""
 "The Opening Balance is not in balance, probably due to a non closed Previous "
 "Fiscalyear."
@@ -4529,29 +5230,23 @@ msgstr ""
 msgid "Show closed:"
 msgstr ""
 
 msgid "Show closed:"
 msgstr ""
 
-#: gl/inquiry/journal_inquiry.php:109
+#: gl/inquiry/journal_inquiry.php:115
 msgid "Trans #"
 msgstr ""
 
 msgid "Trans #"
 msgstr ""
 
-#: gl/inquiry/journal_inquiry.php:110 gl/view/gl_trans_view.php:44
-#: gl/includes/ui/gl_journal_ui.inc:123
-msgid "Counterparty"
-msgstr ""
-
-#: gl/inquiry/journal_inquiry.php:111 gl/inquiry/journal_inquiry.php:126
+#: gl/inquiry/journal_inquiry.php:117 gl/inquiry/journal_inquiry.php:132
 #: purchasing/includes/ui/grn_ui.inc:34 purchasing/includes/ui/grn_ui.inc:77
 #: purchasing/includes/ui/grn_ui.inc:34 purchasing/includes/ui/grn_ui.inc:77
-#: purchasing/includes/ui/po_ui.inc:328
+#: purchasing/includes/ui/po_ui.inc:332 purchasing/inquiry/po_search.php:121
+#: purchasing/inquiry/po_search_completed.php:123
+#: purchasing/inquiry/supplier_inquiry.php:178
 #: purchasing/view/view_supp_credit.php:44
 #: 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
-#: reporting/includes/doctext.inc:163 reporting/includes/doctext.inc:186
+#: purchasing/view/view_supp_invoice.php:48 reporting/includes/doctext.inc:163
+#: reporting/includes/doctext.inc:186
 msgid "Supplier's Reference"
 msgstr ""
 
 msgid "Supplier's Reference"
 msgstr ""
 
-#: gl/inquiry/journal_inquiry.php:115 reporting/rep710.php:77
-#: reporting/rep710.php:87 reporting/reports_main.php:527
+#: gl/inquiry/journal_inquiry.php:121 reporting/rep710.php:77
+#: reporting/rep710.php:87 reporting/reports_main.php:552
 msgid "User"
 msgstr ""
 
 msgid "User"
 msgstr ""
 
@@ -4559,23 +5254,23 @@ msgstr ""
 msgid "Profit & Loss Drilldown"
 msgstr ""
 
 msgid "Profit & Loss Drilldown"
 msgstr ""
 
-#: gl/inquiry/profit_loss.php:30 reporting/rep707.php:210
-#: reporting/includes/reports_classes.inc:249
+#: gl/inquiry/profit_loss.php:30 reporting/rep707.php:212
+#: reporting/includes/reports_classes.inc:251
 msgid "Accumulated"
 msgstr ""
 
 msgid "Accumulated"
 msgstr ""
 
-#: gl/inquiry/profit_loss.php:31 reporting/rep707.php:257
-#: reporting/includes/reports_classes.inc:249
+#: gl/inquiry/profit_loss.php:31 reporting/rep707.php:259
+#: reporting/includes/reports_classes.inc:251
 msgid "Period Y-1"
 msgstr ""
 
 msgid "Period Y-1"
 msgstr ""
 
-#: gl/inquiry/profit_loss.php:32 reporting/rep707.php:246
-#: reporting/includes/reports_classes.inc:249
+#: gl/inquiry/profit_loss.php:32 reporting/rep707.php:248
+#: reporting/includes/reports_classes.inc:251
 msgid "Budget"
 msgstr ""
 
 msgid "Budget"
 msgstr ""
 
-#: gl/inquiry/profit_loss.php:178 reporting/reports_main.php:403
-#: reporting/reports_main.php:454 reporting/reports_main.php:500
+#: gl/inquiry/profit_loss.php:178 reporting/reports_main.php:426
+#: reporting/reports_main.php:478 reporting/reports_main.php:525
 msgid "Compare to"
 msgstr ""
 
 msgid "Compare to"
 msgstr ""
 
@@ -4583,7 +5278,7 @@ msgstr ""
 msgid "Group/Account Name"
 msgstr ""
 
 msgid "Group/Account Name"
 msgstr ""
 
-#: gl/inquiry/profit_loss.php:239 reporting/rep707.php:210
+#: gl/inquiry/profit_loss.php:239 reporting/rep707.php:212
 msgid "Achieved %"
 msgstr ""
 
 msgid "Achieved %"
 msgstr ""
 
@@ -4591,11 +5286,11 @@ msgstr ""
 msgid "Tax Inquiry"
 msgstr ""
 
 msgid "Tax Inquiry"
 msgstr ""
 
-#: gl/inquiry/tax_inquiry.php:80 reporting/rep709.php:189
+#: gl/inquiry/tax_inquiry.php:80 reporting/rep709.php:191
 msgid "Outputs"
 msgstr ""
 
 msgid "Outputs"
 msgstr ""
 
-#: gl/inquiry/tax_inquiry.php:80 reporting/rep709.php:189
+#: gl/inquiry/tax_inquiry.php:80 reporting/rep709.php:191
 msgid "Inputs"
 msgstr ""
 
 msgid "Inputs"
 msgstr ""
 
@@ -4611,12 +5306,12 @@ msgstr ""
 msgid "Net payable or collectible"
 msgstr ""
 
 msgid "Net payable or collectible"
 msgstr ""
 
-#: gl/inquiry/tax_inquiry.php:115 reporting/rep709.php:221
+#: gl/inquiry/tax_inquiry.php:115 reporting/rep709.php:223
 msgid "Total payable or refund"
 msgstr ""
 
 msgid "Total payable or refund"
 msgstr ""
 
-#: gl/manage/bank_accounts.php:16 reporting/reports_main.php:341
-#: reporting/reports_main.php:349
+#: gl/manage/bank_accounts.php:16 reporting/reports_main.php:363
+#: reporting/reports_main.php:371
 msgid "Bank Accounts"
 msgstr ""
 
 msgid "Bank Accounts"
 msgstr ""
 
@@ -4656,37 +5351,36 @@ msgstr ""
 
 #: gl/manage/bank_accounts.php:109 gl/view/bank_transfer_view.php:69
 #: gl/view/bank_transfer_view.php:78 gl/view/gl_deposit_view.php:66
 
 #: gl/manage/bank_accounts.php:109 gl/view/bank_transfer_view.php:69
 #: gl/view/bank_transfer_view.php:78 gl/view/gl_deposit_view.php:66
-#: gl/view/gl_payment_view.php:64 includes/dashboard.inc:486
-#: includes/dashboard.inc:571 includes/dashboard.inc:606
-#: 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
+#: gl/view/gl_payment_view.php:64 includes/dashboard.inc:1011
+#: includes/dashboard.inc:1095 includes/dashboard.inc:1176
+#: inventory/prices.php:151 inventory/purchasing_data.php:151
+#: purchasing/allocations/supplier_allocation_main.php:99
+#: purchasing/allocations/supplier_allocation_main.php:107
 #: purchasing/inquiry/po_search.php:123
 #: purchasing/inquiry/po_search.php:123
+#: purchasing/inquiry/po_search_completed.php:125
 #: purchasing/inquiry/supplier_allocation_inquiry.php:143
 #: purchasing/inquiry/supplier_allocation_inquiry.php:153
 #: purchasing/inquiry/supplier_inquiry.php:50
 #: purchasing/inquiry/supplier_allocation_inquiry.php:143
 #: purchasing/inquiry/supplier_allocation_inquiry.php:153
 #: purchasing/inquiry/supplier_inquiry.php:50
-#: purchasing/inquiry/supplier_inquiry.php:180
-#: purchasing/inquiry/supplier_inquiry.php:192
-#: purchasing/allocations/supplier_allocation_main.php:99
-#: purchasing/allocations/supplier_allocation_main.php:107
-#: reporting/rep101.php:143 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:455
+#: purchasing/inquiry/supplier_inquiry.php:181
+#: purchasing/inquiry/supplier_inquiry.php:193
+#: purchasing/view/view_supp_credit.php:49
+#: purchasing/view/view_supp_invoice.php:54 reporting/rep101.php:148
+#: reporting/rep102.php:126 reporting/rep102.php:132 reporting/rep103.php:229
+#: reporting/rep104.php:114 reporting/rep115.php:173 reporting/rep201.php:125
+#: reporting/rep202.php:137 reporting/rep203.php:96 reporting/rep205.php:141
+#: reporting/rep206.php:123 sales/customer_credit_invoice.php:236
+#: sales/customer_delivery.php:329 sales/customer_invoice.php:456
 #: sales/allocations/customer_allocation_main.php:97
 #: sales/allocations/customer_allocation_main.php:105
 #: sales/allocations/customer_allocation_main.php:97
 #: sales/allocations/customer_allocation_main.php:105
-#: sales/view/view_credit.php:70 sales/view/view_dispatch.php:86
-#: sales/view/view_invoice.php:86
-#: sales/inquiry/customer_allocation_inquiry.php:153
-#: sales/inquiry/customer_allocation_inquiry.php:163
-#: sales/inquiry/customer_inquiry.php:121
-#: sales/inquiry/customer_inquiry.php:201
-#: sales/inquiry/customer_inquiry.php:213
-#: sales/inquiry/sales_deliveries_view.php:178
-#: sales/inquiry/sales_orders_view.php:262
-#: sales/inquiry/sales_orders_view.php:276
+#: sales/inquiry/customer_allocation_inquiry.php:154
+#: sales/inquiry/customer_allocation_inquiry.php:164
+#: sales/inquiry/customer_inquiry.php:126
+#: sales/inquiry/customer_inquiry.php:207
+#: sales/inquiry/customer_inquiry.php:219
+#: sales/inquiry/sales_deliveries_view.php:179
+#: sales/inquiry/sales_orders_view.php:282
+#: sales/inquiry/sales_orders_view.php:296 sales/view/view_credit.php:70
+#: sales/view/view_dispatch.php:86 sales/view/view_invoice.php:86
 msgid "Currency"
 msgstr ""
 
 msgid "Currency"
 msgstr ""
 
@@ -4694,7 +5388,7 @@ msgstr ""
 msgid "GL Account"
 msgstr ""
 
 msgid "GL Account"
 msgstr ""
 
-#: gl/manage/bank_accounts.php:110 reporting/includes/doctext.inc:259
+#: gl/manage/bank_accounts.php:110 reporting/includes/doctext.inc:261
 msgid "Bank"
 msgstr ""
 
 msgid "Bank"
 msgstr ""
 
@@ -4730,8 +5424,8 @@ msgstr ""
 msgid "Bank Name:"
 msgstr ""
 
 msgid "Bank Name:"
 msgstr ""
 
-#: gl/manage/bank_accounts.php:196 sales/manage/customer_branches.php:246
-#: sales/manage/customers.php:260
+#: gl/manage/bank_accounts.php:196 sales/manage/customers.php:261
+#: sales/manage/customer_branches.php:246
 msgid "Bank Account Number:"
 msgstr ""
 
 msgid "Bank Account Number:"
 msgstr ""
 
@@ -4887,7 +5581,7 @@ msgstr ""
 msgid "Automatic exchange rate update:"
 msgstr ""
 
 msgid "Automatic exchange rate update:"
 msgstr ""
 
-#: gl/manage/exchange_rates.php:24
+#: gl/manage/exchange_rates.php:24 themes/canvas/renderer.php:135
 msgid "Exchange Rates"
 msgstr ""
 
 msgid "Exchange Rates"
 msgstr ""
 
@@ -4899,7 +5593,7 @@ msgstr ""
 msgid "Date to Use From:"
 msgstr ""
 
 msgid "Date to Use From:"
 msgstr ""
 
-#: gl/manage/exchange_rates.php:142 includes/ui/ui_view.inc:325
+#: gl/manage/exchange_rates.php:142 includes/ui/ui_view.inc:331
 msgid "Exchange Rate:"
 msgstr ""
 
 msgid "Exchange Rate:"
 msgstr ""
 
@@ -4933,65 +5627,6 @@ msgid ""
 "for it."
 msgstr ""
 
 "for it."
 msgstr ""
 
-#: gl/manage/gl_account_classes.php:16
-msgid "GL Account Classes"
-msgstr ""
-
-#: gl/manage/gl_account_classes.php:31
-msgid "The account class ID cannot be empty."
-msgstr ""
-
-#: gl/manage/gl_account_classes.php:37
-msgid "The account class name cannot be empty."
-msgstr ""
-
-#: gl/manage/gl_account_classes.php:57
-msgid "Selected account class settings has been updated"
-msgstr ""
-
-#: gl/manage/gl_account_classes.php:62
-msgid "New account class has been added"
-msgstr ""
-
-#: gl/manage/gl_account_classes.php:77
-msgid ""
-"Cannot delete this account class because GL account types have been created "
-"referring to it."
-msgstr ""
-
-#: gl/manage/gl_account_classes.php:93
-msgid "Selected account class has been deleted"
-msgstr ""
-
-#: gl/manage/gl_account_classes.php:110
-msgid "Class ID"
-msgstr ""
-
-#: gl/manage/gl_account_classes.php:110
-msgid "Class Name"
-msgstr ""
-
-#: gl/manage/gl_account_classes.php:110
-msgid "Class Type"
-msgstr ""
-
-#: gl/manage/gl_account_classes.php:112 gl/manage/gl_account_classes.php:168
-#: reporting/rep706.php:215
-msgid "Balance Sheet"
-msgstr ""
-
-#: gl/manage/gl_account_classes.php:156 gl/manage/gl_account_classes.php:162
-msgid "Class ID:"
-msgstr ""
-
-#: gl/manage/gl_account_classes.php:165
-msgid "Class Name:"
-msgstr ""
-
-#: gl/manage/gl_account_classes.php:170
-msgid "Class Type:"
-msgstr ""
-
 #: gl/manage/gl_accounts.php:20 reporting/rep701.php:116
 msgid "Chart of Accounts"
 msgstr ""
 #: gl/manage/gl_accounts.php:20 reporting/rep701.php:116
 msgid "Chart of Accounts"
 msgstr ""
@@ -5109,11 +5744,70 @@ msgstr ""
 msgid "Delete account"
 msgstr ""
 
 msgid "Delete account"
 msgstr ""
 
-#: gl/manage/gl_account_types.php:16
-msgid "GL Account Groups"
+#: gl/manage/gl_account_classes.php:16
+msgid "GL Account Classes"
 msgstr ""
 
 msgstr ""
 
-#: gl/manage/gl_account_types.php:32
+#: gl/manage/gl_account_classes.php:31
+msgid "The account class ID cannot be empty."
+msgstr ""
+
+#: gl/manage/gl_account_classes.php:37
+msgid "The account class name cannot be empty."
+msgstr ""
+
+#: gl/manage/gl_account_classes.php:57
+msgid "Selected account class settings has been updated"
+msgstr ""
+
+#: gl/manage/gl_account_classes.php:62
+msgid "New account class has been added"
+msgstr ""
+
+#: gl/manage/gl_account_classes.php:77
+msgid ""
+"Cannot delete this account class because GL account types have been created "
+"referring to it."
+msgstr ""
+
+#: gl/manage/gl_account_classes.php:93
+msgid "Selected account class has been deleted"
+msgstr ""
+
+#: gl/manage/gl_account_classes.php:110
+msgid "Class ID"
+msgstr ""
+
+#: gl/manage/gl_account_classes.php:110
+msgid "Class Name"
+msgstr ""
+
+#: gl/manage/gl_account_classes.php:110
+msgid "Class Type"
+msgstr ""
+
+#: gl/manage/gl_account_classes.php:112 gl/manage/gl_account_classes.php:168
+#: reporting/rep706.php:218
+msgid "Balance Sheet"
+msgstr ""
+
+#: gl/manage/gl_account_classes.php:156 gl/manage/gl_account_classes.php:162
+msgid "Class ID:"
+msgstr ""
+
+#: gl/manage/gl_account_classes.php:165
+msgid "Class Name:"
+msgstr ""
+
+#: gl/manage/gl_account_classes.php:170
+msgid "Class Type:"
+msgstr ""
+
+#: gl/manage/gl_account_types.php:16
+msgid "GL Account Groups"
+msgstr ""
+
+#: gl/manage/gl_account_types.php:32
 msgid "The account group id cannot be empty."
 msgstr ""
 
 msgid "The account group id cannot be empty."
 msgstr ""
 
@@ -5181,9 +5875,9 @@ msgstr ""
 msgid "Quick Entries"
 msgstr ""
 
 msgid "Quick Entries"
 msgstr ""
 
-#: gl/manage/gl_quick_entries.php:58 includes/ui/class.crud_view.inc:296
-#: includes/ui/class.crud_view.inc:300 includes/ui/simple_crud_class.inc:219
-#: includes/ui/ui_input.inc:225
+#: gl/manage/gl_quick_entries.php:58 includes/ui/attachment.inc:163
+#: includes/ui/class.crud_view.inc:305 includes/ui/class.crud_view.inc:309
+#: includes/ui/simple_crud_class.inc:219 includes/ui/ui_input.inc:225
 msgid "Add new"
 msgstr ""
 
 msgid "Add new"
 msgstr ""
 
@@ -5269,8 +5963,8 @@ msgstr ""
 msgid "Posted"
 msgstr ""
 
 msgid "Posted"
 msgstr ""
 
-#: gl/manage/gl_quick_entries.php:338 sales/customer_delivery.php:421
-#: sales/customer_invoice.php:519 sales/customer_invoice.php:522
+#: gl/manage/gl_quick_entries.php:338 sales/customer_delivery.php:422
+#: sales/customer_invoice.php:520 sales/customer_invoice.php:523
 msgid "Tax Type"
 msgstr ""
 
 msgid "Tax Type"
 msgstr ""
 
@@ -5287,19 +5981,24 @@ msgid "Revaluation of Currency Accounts"
 msgstr ""
 
 #: gl/manage/revaluate_currencies.php:32
 msgstr ""
 
 #: gl/manage/revaluate_currencies.php:32
-msgid "No Revaluation was needed"
+#, php-format
+msgid "%d Journal Entries for Bank Accounts have been added"
 msgstr ""
 
 msgstr ""
 
-#: gl/manage/revaluate_currencies.php:40
+#: gl/manage/revaluate_currencies.php:33
 #, php-format
 msgid "%d Journal Entries for AR/AP accounts have been added"
 msgstr ""
 
 #, php-format
 msgid "%d Journal Entries for AR/AP accounts have been added"
 msgstr ""
 
-#: gl/manage/revaluate_currencies.php:94
+#: gl/manage/revaluate_currencies.php:36
+msgid "No revaluation was needed."
+msgstr ""
+
+#: gl/manage/revaluate_currencies.php:82
 msgid "Date for Revaluation:"
 msgstr ""
 
 msgid "Date for Revaluation:"
 msgstr ""
 
-#: gl/manage/revaluate_currencies.php:99
+#: gl/manage/revaluate_currencies.php:86
 msgid "Revaluate Currencies"
 msgstr ""
 
 msgid "Revaluate Currencies"
 msgstr ""
 
@@ -5342,15 +6041,6 @@ msgstr ""
 msgid "GL Deposit"
 msgstr ""
 
 msgid "GL Deposit"
 msgstr ""
 
-#: gl/view/gl_deposit_view.php:71 gl/includes/db/gl_db_banking.inc:227
-#: reporting/reports_main.php:98 reporting/reports_main.php:108
-#: reporting/reports_main.php:116 reporting/reports_main.php:130
-#: reporting/reports_main.php:138 reporting/reports_main.php:145
-#: reporting/reports_main.php:194 reporting/reports_main.php:201
-#: reporting/reports_main.php:310
-msgid "From"
-msgstr ""
-
 #: gl/view/gl_deposit_view.php:74 gl/view/gl_payment_view.php:72
 msgid "Settle currency"
 msgstr ""
 #: gl/view/gl_deposit_view.php:74 gl/view/gl_payment_view.php:72
 msgid "Settle currency"
 msgstr ""
@@ -5379,15 +6069,6 @@ msgstr ""
 msgid "Item Amounts are Shown in:"
 msgstr ""
 
 msgid "Item Amounts are Shown in:"
 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_journal_ui.inc:112
-#: gl/includes/ui/gl_journal_ui.inc:115 gl/includes/ui/gl_journal_ui.inc:118
-msgid "Account Description"
-msgstr ""
-
 #: gl/view/gl_payment_view.php:17
 msgid "View Bank Payment"
 msgstr ""
 #: gl/view/gl_payment_view.php:17
 msgid "View Bank Payment"
 msgstr ""
@@ -5426,7 +6107,7 @@ msgid "Transaction Date"
 msgstr ""
 
 #: gl/view/gl_trans_view.php:39
 msgstr ""
 
 #: gl/view/gl_trans_view.php:39
-msgid "Journal #"
+msgid "GL #"
 msgstr ""
 
 #: gl/view/gl_trans_view.php:42
 msgstr ""
 
 #: gl/view/gl_trans_view.php:42
@@ -5470,215 +6151,6 @@ msgstr ""
 msgid "This transaction has been voided."
 msgstr ""
 
 msgid "This transaction has been voided."
 msgstr ""
 
-#: 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: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:311
-msgid "To"
-msgstr ""
-
-#: gl/includes/db/gl_db_banking.inc:533 gl/includes/db/gl_journal.inc:114
-#: purchasing/includes/db/invoice_db.inc:139
-msgid "Document reentered."
-msgstr ""
-
-#: 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 ""
-
-#: 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:185
-#: manufacturing/work_order_costs.php:133
-#: purchasing/allocations/supplier_allocate.php:56
-#: sales/allocations/customer_allocate.php:59
-#: sales/includes/ui/sales_credit_ui.inc:117
-msgid "Date:"
-msgstr ""
-
-#: gl/includes/ui/gl_bank_ui.inc:52
-msgid "Pay To:"
-msgstr ""
-
-#: gl/includes/ui/gl_bank_ui.inc:57
-msgid "To the Order of:"
-msgstr ""
-
-#: 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:64 sales/manage/recurrent_invoices.php:195
-#: sales/includes/ui/sales_credit_ui.inc:29
-#: sales/includes/ui/sales_order_ui.inc:267
-msgid "Customer:"
-msgstr ""
-
-#: gl/includes/ui/gl_bank_ui.inc:68 sales/customer_payments.php:320
-#: sales/manage/recurrent_invoices.php:198
-#: sales/includes/ui/sales_credit_ui.inc:37
-#: 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
-#: sales/customer_payments.php:342
-msgid "This customer account is on hold."
-msgstr ""
-
-#: gl/includes/ui/gl_bank_ui.inc:98 gl/includes/ui/gl_journal_ui.inc:70
-#: gl/includes/ui/gl_journal_ui.inc:76
-#: purchasing/includes/ui/invoice_ui.inc:264
-msgid "Go"
-msgstr ""
-
-#: gl/includes/ui/gl_bank_ui.inc:114
-msgid "Into:"
-msgstr ""
-
-#: 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: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:182 includes/ui/class.crud_view.inc:285
-#: includes/ui/simple_crud_class.inc:54
-#: 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:269 gl/includes/ui/gl_journal_ui.inc:278
-#: includes/ui/simple_crud_class.inc:56
-#: 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:549
-msgid "Confirm changes"
-msgstr ""
-
-#: gl/includes/ui/gl_bank_ui.inc:271 gl/includes/ui/gl_journal_ui.inc:280
-#: includes/ui/class.crud_view.inc:292 includes/ui/simple_crud_class.inc:58
-#: inventory/includes/item_adjustments_ui.inc:193
-#: inventory/includes/stock_transfers_ui.inc:153
-#: 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:551
-msgid "Cancel changes"
-msgstr ""
-
-#: gl/includes/ui/gl_bank_ui.inc:276 gl/includes/ui/gl_journal_ui.inc:284
-#: 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:557
-msgid "Add Item"
-msgstr ""
-
-#: gl/includes/ui/gl_bank_ui.inc:277
-#: 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:558
-msgid "Add new item to document"
-msgstr ""
-
-#: gl/includes/ui/gl_bank_ui.inc:300
-msgid "Settled AR Amount:"
-msgstr ""
-
-#: gl/includes/ui/gl_bank_ui.inc:300
-msgid "Settled AP Amount:"
-msgstr ""
-
-#: gl/includes/ui/gl_journal_ui.inc:26
-msgid "Journal Date:"
-msgstr ""
-
-#: gl/includes/ui/gl_journal_ui.inc:33 inventory/prices.php:193
-msgid "Currency:"
-msgstr ""
-
-#: gl/includes/ui/gl_journal_ui.inc:43
-msgid "Document Date:"
-msgstr ""
-
-#: gl/includes/ui/gl_journal_ui.inc:44
-msgid "Event Date:"
-msgstr ""
-
-#: gl/includes/ui/gl_journal_ui.inc:45
-msgid "Source ref:"
-msgstr ""
-
-#: gl/includes/ui/gl_journal_ui.inc:57 includes/sysnames.inc:103
-msgid "Quick Entry"
-msgstr ""
-
-#: gl/includes/ui/gl_journal_ui.inc:69
-msgid "balance from account"
-msgstr ""
-
-#: gl/includes/ui/gl_journal_ui.inc:74
-msgid "Additional info:"
-msgstr ""
-
-#: gl/includes/ui/gl_journal_ui.inc:81
-msgid "Include in tax register:"
-msgstr ""
-
-#: gl/includes/ui/gl_journal_ui.inc:88
-msgid "Reconciled:"
-msgstr ""
-
-#: gl/includes/ui/gl_journal_ui.inc:161
-msgid "Edit journal line"
-msgstr ""
-
-#: gl/includes/ui/gl_journal_ui.inc:163
-msgid "Remove line from journal"
-msgstr ""
-
-#: gl/includes/ui/gl_journal_ui.inc:226 gl/includes/ui/gl_journal_ui.inc:244
-msgid "[Select account]"
-msgstr ""
-
-#: gl/includes/ui/gl_journal_ui.inc:285
-msgid "Add new line to journal"
-msgstr ""
-
 #: includes/access_levels.inc:60
 msgid "System administration"
 msgstr ""
 #: includes/access_levels.inc:60
 msgid "System administration"
 msgstr ""
@@ -5755,8 +6227,8 @@ msgstr ""
 msgid "Dimensions configuration"
 msgstr ""
 
 msgid "Dimensions configuration"
 msgstr ""
 
-#: includes/access_levels.inc:79 inventory/manage/items.php:466
-#: reporting/reports_main.php:328
+#: includes/access_levels.inc:79 includes/dashboard.inc:332
+#: inventory/manage/items.php:476 reporting/reports_main.php:350
 msgid "Dimensions"
 msgstr ""
 
 msgid "Dimensions"
 msgstr ""
 
@@ -6092,7 +6564,7 @@ msgstr ""
 msgid "Fixed Asset disposals"
 msgstr ""
 
 msgid "Fixed Asset disposals"
 msgstr ""
 
-#: includes/access_levels.inc:207 inventory/manage/items.php:422
+#: includes/access_levels.inc:207 inventory/manage/items.php:432
 msgid "Depreciation"
 msgstr ""
 
 msgid "Depreciation"
 msgstr ""
 
@@ -6279,22 +6751,17 @@ msgid ""
 "rate manually on Exchange Rates page."
 msgstr ""
 
 "rate manually on Exchange Rates page."
 msgstr ""
 
-#: includes/current_user.inc:101
+#: includes/current_user.inc:102
 msgid ""
 "Before software upgrade you have to include old $security_groups and "
 "$security_headings arrays from old config.php file to the new one."
 msgstr ""
 
 msgid ""
 "Before software upgrade you have to include old $security_groups and "
 "$security_headings arrays from old config.php file to the new one."
 msgstr ""
 
-#: includes/current_user.inc:102 includes/ui/ui_controls.inc:215
-#: includes/ui/ui_view.inc:985
-msgid "Back"
-msgstr ""
-
-#: includes/current_user.inc:112
+#: includes/current_user.inc:113
 msgid "System is available for site admin only until full database upgrade"
 msgstr ""
 
 msgid "System is available for site admin only until full database upgrade"
 msgstr ""
 
-#: includes/current_user.inc:162
+#: includes/current_user.inc:170
 msgid "New password for"
 msgstr ""
 
 msgid "New password for"
 msgstr ""
 
@@ -6302,275 +6769,530 @@ msgstr ""
 msgid "Requesting data..."
 msgstr ""
 
 msgid "Requesting data..."
 msgstr ""
 
-#: includes/dashboard.inc:89 includes/dashboard.inc:159
-#: includes/dashboard.inc:189 includes/dashboard.inc:486
-#: includes/dashboard.inc:526 includes/sysnames.inc:101
-#: includes/sysnames.inc:209 reporting/rep101.php:142 reporting/rep102.php:121
-#: reporting/rep102.php:128 reporting/rep105.php:110 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:96
-#: sales/allocations/customer_allocation_main.php:104
-#: sales/manage/recurrent_invoices.php:128 sales/view/view_credit.php:47
-#: sales/inquiry/customer_allocation_inquiry.php:152
-#: sales/inquiry/customer_allocation_inquiry.php:162
-#: sales/inquiry/customer_inquiry.php:199
-#: sales/inquiry/customer_inquiry.php:212 sales/inquiry/customers_list.php:41
-#: sales/inquiry/customers_list.php:54
-#: sales/inquiry/sales_deliveries_view.php:169
-#: sales/inquiry/sales_orders_view.php:254
-#: sales/inquiry/sales_orders_view.php:268
-msgid "Customer"
+#: includes/dashboard.inc:134 reporting/includes/reports_classes.inc:255
+msgid "Vertical bars"
 msgstr ""
 
 msgstr ""
 
-#: includes/dashboard.inc:89 includes/dashboard.inc:121
-#: includes/dashboard.inc:159 includes/dashboard.inc:165
-#: includes/dashboard.inc:292 includes/dashboard.inc:438
-#: reporting/rep304.php:127 reporting/rep309.php:99
-#: sales/manage/customer_branches.php:232 sales/manage/customers.php:265
-msgid "Sales"
+#: includes/dashboard.inc:134 reporting/includes/reports_classes.inc:255
+msgid "Horizontal bars"
 msgstr ""
 
 msgstr ""
 
-#: includes/dashboard.inc:103 includes/dashboard.inc:162
-#: includes/dashboard.inc:226 includes/dashboard.inc:571
-#: includes/sysnames.inc:102 includes/sysnames.inc:187
-#: includes/sysnames.inc:210 inventory/purchasing_data.php:150
-#: 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:176
-#: purchasing/inquiry/supplier_inquiry.php:191
-#: purchasing/inquiry/suppliers_list.php:41
-#: purchasing/inquiry/suppliers_list.php:53
+#: includes/dashboard.inc:134 reporting/includes/reports_classes.inc:256
+msgid "Dots"
+msgstr ""
+
+#: includes/dashboard.inc:134 reporting/includes/reports_classes.inc:256
+msgid "Lines"
+msgstr ""
+
+#: includes/dashboard.inc:134 reporting/includes/reports_classes.inc:256
+msgid "Pie"
+msgstr ""
+
+#: includes/dashboard.inc:134 reporting/includes/reports_classes.inc:256
+msgid "Donut"
+msgstr ""
+
+#: includes/dashboard.inc:134 reporting/includes/reports_classes.inc:256
+msgid "Half Donut"
+msgstr ""
+
+#: includes/dashboard.inc:134 reporting/includes/reports_classes.inc:256
+msgid "Splines"
+msgstr ""
+
+#: includes/dashboard.inc:134
+msgid "Tables"
+msgstr ""
+
+#: includes/dashboard.inc:180 includes/ui/ui_controls.inc:506
+#: sales/inquiry/customers_list.php:29 sales/manage/customers.php:23
+#: themes/canvas/renderer.php:89
+msgid "Customers"
+msgstr ""
+
+#: includes/dashboard.inc:183 includes/ui/ui_controls.inc:508
+msgid "Branches"
+msgstr ""
+
+#: includes/dashboard.inc:186
+msgid "Salesmen"
+msgstr ""
+
+#: includes/dashboard.inc:189 includes/dashboard.inc:226
+#: includes/ui/ui_lists.inc:2161
+msgid "Overdue Invoices"
+msgstr ""
+
+#: includes/dashboard.inc:200 includes/dashboard.inc:410
+#: includes/dashboard.inc:444 includes/dashboard.inc:1011
+#: includes/dashboard.inc:1051 includes/sysnames.inc:44
+#: includes/sysnames.inc:103 includes/sysnames.inc:211 reporting/rep101.php:146
+#: reporting/rep102.php:118 reporting/rep102.php:125 reporting/rep105.php:110
+#: reporting/rep106.php:90 reporting/rep114.php:95 reporting/rep115.php:170
+#: 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:59
+#: reporting/reports_main.php:115 reporting/reports_main.php:134
+#: reporting/reports_main.php:260 sales/create_recurrent_invoices.php:209
+#: sales/customer_credit_invoice.php:234 sales/customer_delivery.php:327
+#: sales/customer_invoice.php:432
+#: sales/allocations/customer_allocation_main.php:96
+#: sales/allocations/customer_allocation_main.php:104
+#: sales/inquiry/customers_list.php:41 sales/inquiry/customers_list.php:54
+#: sales/inquiry/customer_allocation_inquiry.php:153
+#: sales/inquiry/customer_allocation_inquiry.php:163
+#: sales/inquiry/customer_inquiry.php:205
+#: sales/inquiry/customer_inquiry.php:218
+#: sales/inquiry/sales_deliveries_view.php:170
+#: sales/inquiry/sales_orders_view.php:274
+#: sales/inquiry/sales_orders_view.php:288
+#: sales/manage/recurrent_invoices.php:128 sales/view/view_credit.php:47
+msgid "Customer"
+msgstr ""
+
+#: includes/dashboard.inc:202
+msgid "Sales Total"
+msgstr ""
+
+#: includes/dashboard.inc:205 includes/dashboard.inc:242
+msgid "Aging Total"
+msgstr ""
+
+#: includes/dashboard.inc:217 includes/ui/ui_controls.inc:510
+#: purchasing/inquiry/suppliers_list.php:29 purchasing/manage/suppliers.php:23
+#: themes/canvas/renderer.php:99
+msgid "Suppliers"
+msgstr ""
+
+#: includes/dashboard.inc:220
+msgid "New Orders"
+msgstr ""
+
+#: includes/dashboard.inc:223 includes/ui/ui_lists.inc:2160
+#: includes/ui/ui_lists.inc:2177
+msgid "Invoices"
+msgstr ""
+
+#: includes/dashboard.inc:237 includes/dashboard.inc:415
+#: includes/dashboard.inc:486 includes/dashboard.inc:1095
+#: includes/sysnames.inc:45 includes/sysnames.inc:104 includes/sysnames.inc:189
+#: includes/sysnames.inc:212 inventory/purchasing_data.php:151
 #: purchasing/allocations/supplier_allocation_main.php:98
 #: purchasing/allocations/supplier_allocation_main.php:106
 #: 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/rep310.php:142 reporting/rep310.php:152
-#: reporting/reports_main.php:151 reporting/reports_main.php:155
-#: reporting/reports_main.php:164 reporting/reports_main.php:175
-#: reporting/reports_main.php:182 reporting/reports_main.php:255
-#: reporting/reports_main.php:288
+#: purchasing/includes/ui/grn_ui.inc:20 purchasing/includes/ui/grn_ui.inc:52
+#: purchasing/includes/ui/po_ui.inc:304 purchasing/inquiry/po_search.php:119
+#: purchasing/inquiry/po_search_completed.php:121
+#: purchasing/inquiry/suppliers_list.php:41
+#: purchasing/inquiry/suppliers_list.php:53
+#: purchasing/inquiry/supplier_allocation_inquiry.php:139
+#: purchasing/inquiry/supplier_allocation_inquiry.php:152
+#: purchasing/inquiry/supplier_inquiry.php:177
+#: purchasing/inquiry/supplier_inquiry.php:192
+#: purchasing/view/view_supp_credit.php:42
+#: purchasing/view/view_supp_invoice.php:46 reporting/rep201.php:124
+#: reporting/rep202.php:129 reporting/rep202.php:136 reporting/rep203.php:95
+#: reporting/rep204.php:90 reporting/rep206.php:122 reporting/rep306.php:138
+#: reporting/rep306.php:148 reporting/rep310.php:139 reporting/rep310.php:149
+#: reporting/reports_main.php:163 reporting/reports_main.php:167
+#: reporting/reports_main.php:176 reporting/reports_main.php:188
+#: reporting/reports_main.php:196 reporting/reports_main.php:203
+#: reporting/reports_main.php:276 reporting/reports_main.php:309
 msgid "Supplier"
 msgstr ""
 
 msgid "Supplier"
 msgstr ""
 
-#: includes/dashboard.inc:103
-msgid "Purchase"
+#: includes/dashboard.inc:239
+msgid "Purchasable Total"
 msgstr ""
 
 msgstr ""
 
-#: includes/dashboard.inc:120 includes/dashboard.inc:165
-#: includes/ui/ui_controls.inc:512 includes/ui/ui_controls.inc:514
-#: inventory/transfers.php:231 inventory/inquiry/stock_list.php:29
-#: inventory/manage/items.php:29 reporting/rep402.php:108
-#: reporting/reports_main.php:256 reporting/reports_main.php:289
-#: reporting/reports_main.php:303
+#: includes/dashboard.inc:255 includes/dashboard.inc:319
+#: includes/dashboard.inc:420 includes/ui/ui_controls.inc:512
+#: includes/ui/ui_controls.inc:514 inventory/transfers.php:232
+#: inventory/inquiry/stock_list.php:29 inventory/manage/items.php:30
+#: reporting/rep402.php:152 reporting/reports_main.php:277
+#: reporting/reports_main.php:310 reporting/reports_main.php:324
+#: themes/canvas/renderer.php:105
 msgid "Items"
 msgstr ""
 
 msgid "Items"
 msgstr ""
 
-#: includes/dashboard.inc:122 includes/dashboard.inc:165
-#: includes/dashboard.inc:292 includes/dashboard.inc:438
-#: manufacturing/search_work_orders.php:139
-msgid "Costs"
+#: includes/dashboard.inc:258 includes/dashboard.inc:290
+msgid "Locations"
 msgstr ""
 
 msgstr ""
 
-#: includes/dashboard.inc:134
-msgid "Performance"
+#: includes/dashboard.inc:261
+msgid "Kits"
 msgstr ""
 
 msgstr ""
 
-#: includes/dashboard.inc:162
-msgid "Purchases"
+#: includes/dashboard.inc:264
+msgid "Below Reorder Level"
+msgstr ""
+
+#: includes/dashboard.inc:271
+msgid "Assembled Items"
+msgstr ""
+
+#: includes/dashboard.inc:274
+msgid "Manufactured Items"
+msgstr ""
+
+#: includes/dashboard.inc:277 manufacturing/manage/work_centres.php:16
+msgid "Work Centres"
+msgstr ""
+
+#: includes/dashboard.inc:280
+msgid "Open Workorders"
+msgstr ""
+
+#: includes/dashboard.inc:293
+msgid "Categories"
+msgstr ""
+
+#: includes/dashboard.inc:296
+msgid "Fixed Asset Classes"
+msgstr ""
+
+#: includes/dashboard.inc:307
+msgid "Total Sales"
+msgstr ""
+
+#: includes/dashboard.inc:310
+msgid "Total Costs"
+msgstr ""
+
+#: includes/dashboard.inc:321
+msgid "Total Results"
+msgstr ""
+
+#: includes/dashboard.inc:335
+msgid "Type 2 Dimensions"
+msgstr ""
+
+#: includes/dashboard.inc:340
+msgid "Dimensions Total Balance"
+msgstr ""
+
+#: includes/dashboard.inc:344
+msgid "Dimensions Total Result"
+msgstr ""
+
+#: includes/dashboard.inc:362
+msgid "Receivables"
+msgstr ""
+
+#: includes/dashboard.inc:365
+msgid "Payables"
 msgstr ""
 
 msgstr ""
 
-#: includes/dashboard.inc:187
+#: includes/dashboard.inc:368
+msgid "Todays Deposits"
+msgstr ""
+
+#: includes/dashboard.inc:371
+msgid "Todays Payments"
+msgstr ""
+
+#: includes/dashboard.inc:396
+msgid "Extensions"
+msgstr ""
+
+#: includes/dashboard.inc:399
+msgid "Languages"
+msgstr ""
+
+#: includes/dashboard.inc:402
+msgid "Database Size"
+msgstr ""
+
+#: includes/dashboard.inc:442
 #, php-format
 msgid "Top %s customers in fiscal year"
 msgstr ""
 
 #, php-format
 msgid "Top %s customers in fiscal year"
 msgstr ""
 
-#: includes/dashboard.inc:224
+#: includes/dashboard.inc:468 includes/dashboard.inc:556
+#: includes/dashboard.inc:598 includes/dashboard.inc:738
+#: includes/dashboard.inc:777 reporting/rep304.php:127 reporting/rep309.php:99
+#: sales/manage/customers.php:266 sales/manage/customer_branches.php:232
+msgid "Sales"
+msgstr ""
+
+#: includes/dashboard.inc:484
 #, php-format
 msgid "Top %s suppliers in fiscal year"
 msgstr ""
 
 #, php-format
 msgid "Top %s suppliers in fiscal year"
 msgstr ""
 
-#: includes/dashboard.inc:285
+#: includes/dashboard.inc:510
+msgid "Purchases"
+msgstr ""
+
+#: includes/dashboard.inc:549
 #, php-format
 msgid "Top %s Manufactured Items in fiscal year"
 msgstr ""
 
 #, php-format
 msgid "Top %s Manufactured Items in fiscal year"
 msgstr ""
 
-#: includes/dashboard.inc:287
+#: includes/dashboard.inc:551
 #, php-format
 msgid "Top %s Fixed Assets"
 msgstr ""
 
 #, php-format
 msgid "Top %s Fixed Assets"
 msgstr ""
 
-#: includes/dashboard.inc:289
+#: includes/dashboard.inc:553
 #, php-format
 msgid "Top %s Sold Items in fiscal year"
 msgstr ""
 
 #, php-format
 msgid "Top %s Sold Items in fiscal year"
 msgstr ""
 
-#: includes/dashboard.inc:292 includes/dashboard.inc:294
-#: 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/rep310.php:142 reporting/rep310.php:153
-#: reporting/rep402.php:103
-msgid "Item"
+#: includes/dashboard.inc:556 includes/dashboard.inc:601
+#: includes/dashboard.inc:739 includes/dashboard.inc:778
+#: manufacturing/search_work_orders.php:141
+msgid "Costs"
+msgstr ""
+
+#: includes/dashboard.inc:556 includes/dashboard.inc:602
+#: includes/dashboard.inc:740 includes/dashboard.inc:779
+msgid "Results"
 msgstr ""
 
 msgstr ""
 
-#: includes/dashboard.inc:292 includes/dashboard.inc:294
+#: includes/dashboard.inc:556 includes/dashboard.inc:558
 #: inventory/includes/item_adjustments_ui.inc:56
 #: inventory/includes/item_adjustments_ui.inc:59
 #: 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/includes/stock_transfers_ui.inc:59
+#: inventory/manage/item_codes.php:130 inventory/manage/sales_kits.php:36
 #: inventory/view/view_adjustment.php:54 inventory/view/view_transfer.php:50
 #: 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
 #: 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
+#: manufacturing/manage/bom_edit.php:44 manufacturing/view/wo_issue_view.php:76
 #: purchasing/includes/ui/invoice_ui.inc:514
 #: purchasing/includes/ui/invoice_ui.inc:514
-#: purchasing/includes/ui/po_ui.inc:214 purchasing/view/view_grn.php:40
-#: purchasing/view/view_po.php:45 reporting/rep301.php:164
-#: reporting/rep303.php:121 reporting/rep303.php:127 reporting/rep401.php:71
+#: purchasing/includes/ui/po_ui.inc:216 purchasing/view/view_grn.php:40
+#: purchasing/view/view_po.php:45 reporting/rep301.php:168
+#: reporting/rep303.php:223 reporting/rep303.php:229 reporting/rep401.php:71
 #: reporting/includes/doctext.inc:31 reporting/includes/doctext.inc:191
 #: reporting/includes/doctext.inc: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
+#: reporting/includes/doctext.inc:226 sales/customer_invoice.php:519
 #: sales/includes/ui/sales_credit_ui.inc:162
 #: sales/includes/ui/sales_credit_ui.inc:162
-#: sales/includes/ui/sales_order_ui.inc:146
+#: sales/includes/ui/sales_order_ui.inc:146 sales/view/view_credit.php:90
+#: sales/view/view_dispatch.php:112 sales/view/view_invoice.php:115
+#: sales/view/view_sales_order.php:221
 msgid "Quantity"
 msgstr ""
 
 msgid "Quantity"
 msgstr ""
 
-#: includes/dashboard.inc:334
+#: includes/dashboard.inc:622
 #, php-format
 msgid "Top %s Dimensions in fiscal year"
 msgstr ""
 
 #, php-format
 msgid "Top %s Dimensions in fiscal year"
 msgstr ""
 
-#: includes/dashboard.inc:372
+#: includes/dashboard.inc:624 includes/dashboard.inc:650
+msgid "Result"
+msgstr ""
+
+#: includes/dashboard.inc:667
 msgid "Class Balances"
 msgstr ""
 
 msgid "Class Balances"
 msgstr ""
 
-#: includes/dashboard.inc:438
+#: includes/dashboard.inc:696
+msgid "Totals"
+msgstr ""
+
+#: includes/dashboard.inc:727
+#, php-format
+msgid "Last %s weeks Performance"
+msgstr ""
+
+#: includes/dashboard.inc:741
 msgid "Week"
 msgstr ""
 
 msgid "Week"
 msgstr ""
 
-#: includes/dashboard.inc:484
-msgid " overdue Sales Invoices"
+#: includes/dashboard.inc:741
+msgid "Weeks"
 msgstr ""
 
 msgstr ""
 
-#: includes/dashboard.inc:486 includes/dashboard.inc:571
-msgid "Ref."
+#: includes/dashboard.inc:766
+#, php-format
+msgid "Last %s Months Performance"
 msgstr ""
 
 msgstr ""
 
-#: includes/dashboard.inc:486 includes/dashboard.inc:526
-#: reporting/rep105.php:110 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:200
-#: sales/inquiry/sales_deliveries_view.php:171
-#: sales/inquiry/sales_orders_view.php:255
-#: sales/inquiry/sales_orders_view.php:269
-msgid "Branch"
+#: includes/dashboard.inc:780 includes/dashboard.inc:961
+msgid "Month"
 msgstr ""
 
 msgstr ""
 
-#: includes/dashboard.inc:487 includes/dashboard.inc:572
-#: includes/sysnames.inc:137
-msgid "Remainder"
+#: includes/dashboard.inc:780 includes/dashboard.inc:961
+msgid "Months"
 msgstr ""
 
 msgstr ""
 
-#: includes/dashboard.inc:487 includes/dashboard.inc:572
+#: includes/dashboard.inc:814
+msgid "Total Customers Aged Analysis"
+msgstr ""
+
+#: includes/dashboard.inc:824 includes/dashboard.inc:880
+#: includes/dashboard.inc:960 reporting/rep102.php:230 reporting/rep202.php:250
+msgid "Balances"
+msgstr ""
+
+#: includes/dashboard.inc:825 includes/dashboard.inc:881
+#: includes/dashboard.inc:1012 includes/dashboard.inc:1096
 #: purchasing/inquiry/supplier_inquiry.php:44
 #: purchasing/inquiry/supplier_inquiry.php:45
 #: purchasing/inquiry/supplier_inquiry.php:44
 #: purchasing/inquiry/supplier_inquiry.php:45
-#: purchasing/inquiry/supplier_inquiry.php:46 reporting/rep102.php:116
-#: reporting/rep102.php:117 reporting/rep102.php:118 reporting/rep102.php:241
-#: reporting/rep108.php:151 reporting/rep108.php:152 reporting/rep108.php:153
-#: 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
+#: purchasing/inquiry/supplier_inquiry.php:46 reporting/rep102.php:113
+#: reporting/rep102.php:114 reporting/rep102.php:115 reporting/rep102.php:233
+#: reporting/rep108.php:159 reporting/rep108.php:160 reporting/rep108.php:161
+#: reporting/rep202.php:123 reporting/rep202.php:124 reporting/rep202.php:125
+#: reporting/rep202.php:157 reporting/rep202.php:158 reporting/rep202.php:159
+#: reporting/rep202.php:252 sales/create_recurrent_invoices.php:209
+#: sales/inquiry/customer_inquiry.php:121
+#: sales/inquiry/customer_inquiry.php:122
+#: sales/inquiry/customer_inquiry.php:123
 #: sales/manage/recurrent_invoices.php:128
 #: sales/manage/recurrent_invoices.php:128
-#: sales/inquiry/customer_inquiry.php:116
-#: sales/inquiry/customer_inquiry.php:117
-#: sales/inquiry/customer_inquiry.php:118
 msgid "Days"
 msgstr ""
 
 msgid "Days"
 msgstr ""
 
-#: includes/dashboard.inc:524
+#: includes/dashboard.inc:870
+msgid "Total Suppliers Aged Analysis"
+msgstr ""
+
+#: includes/dashboard.inc:957
+#, php-format
+msgid "Last %s Months Cash Flow"
+msgstr ""
+
+#: includes/dashboard.inc:972
+msgid "No Data available yet!"
+msgstr ""
+
+#: includes/dashboard.inc:1009
+msgid " overdue Sales Invoices"
+msgstr ""
+
+#: includes/dashboard.inc:1011 includes/dashboard.inc:1095
+msgid "Ref."
+msgstr ""
+
+#: includes/dashboard.inc:1011 includes/dashboard.inc:1051
+#: reporting/rep105.php:110 reporting/rep106.php:90 reporting/rep112.php:189
+#: sales/create_recurrent_invoices.php:209
+#: sales/customer_credit_invoice.php:235 sales/customer_delivery.php:328
+#: sales/customer_invoice.php:433 sales/inquiry/customer_branches_list.php:37
+#: sales/inquiry/customer_branches_list.php:49
+#: sales/inquiry/customer_inquiry.php:206
+#: sales/inquiry/sales_deliveries_view.php:172
+#: sales/inquiry/sales_orders_view.php:275
+#: sales/inquiry/sales_orders_view.php:289 sales/manage/customers.php:256
+#: sales/manage/customers.php:296 sales/manage/recurrent_invoices.php:128
+#: sales/view/view_credit.php:58 themes/canvas/renderer.php:90
+msgid "Branch"
+msgstr ""
+
+#: includes/dashboard.inc:1012 includes/dashboard.inc:1096
+#: includes/sysnames.inc:139
+msgid "Remainder"
+msgstr ""
+
+#: includes/dashboard.inc:1049
 msgid "Overdue Recurrent Invoices"
 msgstr ""
 
 msgid "Overdue Recurrent Invoices"
 msgstr ""
 
-#: includes/dashboard.inc:526 sales/create_recurrent_invoices.php:203
+#: includes/dashboard.inc:1051 sales/create_recurrent_invoices.php:209
 #: sales/manage/recurrent_invoices.php:128
 msgid "Template No"
 msgstr ""
 
 #: sales/manage/recurrent_invoices.php:128
 msgid "Template No"
 msgstr ""
 
-#: includes/dashboard.inc:526 sales/create_recurrent_invoices.php:203
+#: includes/dashboard.inc:1051 sales/create_recurrent_invoices.php:209
 msgid "Next invoice"
 msgstr ""
 
 msgid "Next invoice"
 msgstr ""
 
-#: includes/dashboard.inc:569
-msgid " overdue Purchase Invoices"
+#: includes/dashboard.inc:1093
+msgid " unpaid Purchase Invoices"
+msgstr ""
+
+#: includes/dashboard.inc:1124
+#: purchasing/inquiry/supplier_allocation_inquiry.php:158
+#: purchasing/inquiry/supplier_inquiry.php:200 purchasing/view/view_po.php:100
+#: sales/inquiry/customer_allocation_inquiry.php:168
+#: sales/inquiry/customer_inquiry.php:225
+#: sales/inquiry/sales_deliveries_view.php:196
+#: sales/inquiry/sales_orders_view.php:334
+msgid "Marked items are overdue."
+msgstr ""
+
+#: includes/dashboard.inc:1143
+msgid " items are below Reorder Level"
+msgstr ""
+
+#: includes/dashboard.inc:1145 inventory/reorder_level.php:71
+#: inventory/inquiry/stock_movements.php:107
+#: inventory/inquiry/stock_status.php:70 inventory/inquiry/stock_status.php:74
+#: manufacturing/search_work_orders.php:167
+#: manufacturing/inquiry/where_used_inquiry.php:45
+#: manufacturing/manage/bom_edit.php:43 purchasing/inquiry/po_search.php:120
+#: purchasing/inquiry/po_search.php:131
+#: purchasing/inquiry/po_search_completed.php:122
+#: purchasing/inquiry/po_search_completed.php:133 reporting/rep105.php:121
+#: reporting/rep301.php:175 reporting/rep302.php:129 reporting/rep303.php:236
+#: reporting/rep304.php:136 reporting/rep306.php:147 reporting/rep307.php:121
+#: reporting/rep308.php:232 reporting/rep310.php:139 reporting/rep310.php:148
+#: reporting/rep402.php:136 reporting/rep402.php:153 reporting/rep451.php:87
+#: reporting/reports_main.php:233 reporting/reports_main.php:240
+#: reporting/reports_main.php:246 reporting/reports_main.php:259
+#: reporting/reports_main.php:275 reporting/reports_main.php:285
+#: reporting/reports_main.php:293 reporting/reports_main.php:308
+#: reporting/reports_main.php:325 sales/manage/sales_points.php:84
+msgid "Location"
+msgstr ""
+
+#: includes/dashboard.inc:1145
+msgid "Stock Id"
+msgstr ""
+
+#: includes/dashboard.inc:1145
+msgid "Reorder"
 msgstr ""
 
 msgstr ""
 
-#: includes/dashboard.inc:604
+#: includes/dashboard.inc:1145
+msgid "qty"
+msgstr ""
+
+#: includes/dashboard.inc:1174
 msgid "Bank Account Balances"
 msgstr ""
 
 msgid "Bank Account Balances"
 msgstr ""
 
-#: includes/data_checks.inc:612
+#: includes/data_checks.inc:613
 #, php-format
 msgid "%s #%s is closed for further edition."
 msgstr ""
 
 #, php-format
 msgid "%s #%s is closed for further edition."
 msgstr ""
 
-#: includes/data_checks.inc:654
+#: includes/data_checks.inc:655
 msgid "You have no edit access to transactions created by other users."
 msgstr ""
 
 msgid "You have no edit access to transactions created by other users."
 msgstr ""
 
-#: includes/data_checks.inc:669
+#: includes/data_checks.inc:670
 msgid "The entered reference is invalid."
 msgstr ""
 
 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:364 sales/sales_order_entry.php:474
+#: includes/data_checks.inc:674 sales/credit_note_entry.php:199
+#: sales/customer_credit_invoice.php:204 sales/customer_delivery.php:299
+#: sales/customer_invoice.php:365 sales/sales_order_entry.php:478
 msgid "The entered reference is already in use."
 msgstr ""
 
 msgid "The entered reference is already in use."
 msgstr ""
 
-#: includes/errors.inc:94
+#: includes/errors.inc:96
 #, php-format
 msgid "Unhandled exception [%s]: %s."
 msgstr ""
 
 #, php-format
 msgid "Unhandled exception [%s]: %s."
 msgstr ""
 
-#: includes/errors.inc:132
+#: includes/errors.inc:134
 msgid "in file"
 msgstr ""
 
 msgid "in file"
 msgstr ""
 
-#: includes/errors.inc:132
+#: includes/errors.inc:134
 msgid "at line "
 msgstr ""
 
 msgid "at line "
 msgstr ""
 
-#: includes/errors.inc:184
+#: includes/errors.inc:186
 msgid "Debug mode database warning:"
 msgstr ""
 
 msgid "Debug mode database warning:"
 msgstr ""
 
-#: includes/errors.inc:186
+#: includes/errors.inc:188
 msgid "DATABASE ERROR :"
 msgstr ""
 
 msgid "DATABASE ERROR :"
 msgstr ""
 
-#: includes/errors.inc:218
+#: includes/errors.inc:220
 msgid ""
 "The entered information is a duplicate. Please go back and enter different "
 "values."
 msgid ""
 "The entered information is a duplicate. Please go back and enter different "
 "values."
@@ -6632,24 +7354,24 @@ msgstr ""
 msgid "Package '%s' not found."
 msgstr ""
 
 msgid "Package '%s' not found."
 msgstr ""
 
-#: includes/references.inc:103
+#: includes/references.inc:107
 msgid "Invalid refline template."
 msgstr ""
 
 msgid "Invalid refline template."
 msgstr ""
 
-#: includes/references.inc:113
+#: includes/references.inc:117
 #, php-format
 msgid "Missing refline context data: '%s'"
 msgstr ""
 
 #, php-format
 msgid "Missing refline context data: '%s'"
 msgstr ""
 
-#: includes/references.inc:156
+#: includes/references.inc:165
 msgid "Missing numeric placeholder in refline definition."
 msgstr ""
 
 msgid "Missing numeric placeholder in refline definition."
 msgstr ""
 
-#: includes/session.inc:138
+#: includes/session.inc:139
 msgid "Incorrect Password"
 msgstr ""
 
 msgid "Incorrect Password"
 msgstr ""
 
-#: includes/session.inc:139
+#: includes/session.inc:140
 msgid "The user and password combination is not valid for the system."
 msgstr ""
 
 msgid "The user and password combination is not valid for the system."
 msgstr ""
 
@@ -6659,34 +7381,34 @@ msgid ""
 "to obtain an account to enable you to use the system."
 msgstr ""
 
 "to obtain an account to enable you to use the system."
 msgstr ""
 
-#: includes/session.inc:142 includes/session.inc:157
+#: includes/session.inc:142 includes/session.inc:156
 msgid "Try again"
 msgstr ""
 
 msgid "Try again"
 msgstr ""
 
-#: includes/session.inc:153
+#: includes/session.inc:152
 msgid "Incorrect Email"
 msgstr ""
 
 msgid "Incorrect Email"
 msgstr ""
 
-#: includes/session.inc:154
+#: includes/session.inc:153
 msgid ""
 "The email address does not exist in the system, or is used by more than one "
 "user."
 msgstr ""
 
 msgid ""
 "The email address does not exist in the system, or is used by more than one "
 "user."
 msgstr ""
 
-#: includes/session.inc:156
+#: includes/session.inc:155
 msgid ""
 "Plase try again or contact your system administrator to obtain new password."
 msgstr ""
 
 msgid ""
 "Plase try again or contact your system administrator to obtain new password."
 msgstr ""
 
-#: includes/session.inc:168
+#: includes/session.inc:167
 msgid "New password sent"
 msgstr ""
 
 msgid "New password sent"
 msgstr ""
 
-#: includes/session.inc:169
+#: includes/session.inc:168
 msgid "A new password has been sent to your mailbox."
 msgstr ""
 
 msgid "A new password has been sent to your mailbox."
 msgstr ""
 
-#: includes/session.inc:171
+#: includes/session.inc:170
 msgid "Login here"
 msgstr ""
 
 msgid "Login here"
 msgstr ""
 
@@ -6729,11 +7451,11 @@ msgid ""
 "Software Upgrade page"
 msgstr ""
 
 "Software Upgrade page"
 msgstr ""
 
-#: includes/sysnames.inc:23 includes/sysnames.inc:154
+#: includes/sysnames.inc:23 includes/sysnames.inc:156
 msgid "Bank Payment"
 msgstr ""
 
 msgid "Bank Payment"
 msgstr ""
 
-#: includes/sysnames.inc:24 includes/sysnames.inc:153
+#: includes/sysnames.inc:24 includes/sysnames.inc:155
 msgid "Bank Deposit"
 msgstr ""
 
 msgid "Bank Deposit"
 msgstr ""
 
@@ -6765,17 +7487,17 @@ msgstr ""
 msgid "Inventory Adjustment"
 msgstr ""
 
 msgid "Inventory Adjustment"
 msgstr ""
 
-#: includes/sysnames.inc:32 purchasing/includes/ui/po_ui.inc:307
-#: purchasing/view/view_po.php:30
+#: includes/sysnames.inc:32 purchasing/includes/ui/po_ui.inc:311
+#: purchasing/view/view_po.php:30 themes/canvas/renderer.php:94
 msgid "Purchase Order"
 msgstr ""
 
 msgid "Purchase Order"
 msgstr ""
 
-#: includes/sysnames.inc:33
+#: includes/sysnames.inc:33 themes/canvas/renderer.php:96
 msgid "Supplier Invoice"
 msgstr ""
 
 msgid "Supplier Invoice"
 msgstr ""
 
-#: includes/sysnames.inc:34 purchasing/supplier_credit.php:55
-#: purchasing/supplier_credit.php:59
+#: includes/sysnames.inc:34 purchasing/supplier_credit.php:58
+#: purchasing/supplier_credit.php:62
 msgid "Supplier Credit Note"
 msgstr ""
 
 msgid "Supplier Credit Note"
 msgstr ""
 
@@ -6787,7 +7509,7 @@ msgstr ""
 msgid "Purchase Order Delivery"
 msgstr ""
 
 msgid "Purchase Order Delivery"
 msgstr ""
 
-#: includes/sysnames.inc:37 includes/sysnames.inc:100 includes/types.inc:133
+#: includes/sysnames.inc:37 includes/sysnames.inc:102 includes/types.inc:135
 msgid "Work Order"
 msgstr ""
 
 msgid "Work Order"
 msgstr ""
 
@@ -6799,12 +7521,12 @@ msgstr ""
 msgid "Work Order Production"
 msgstr ""
 
 msgid "Work Order Production"
 msgstr ""
 
-#: includes/sysnames.inc:40 sales/inquiry/sales_orders_view.php:126
-#: sales/inquiry/sales_orders_view.php:148
+#: includes/sysnames.inc:40 sales/inquiry/sales_orders_view.php:131
+#: sales/inquiry/sales_orders_view.php:153 themes/canvas/renderer.php:84
 msgid "Sales Order"
 msgstr ""
 
 msgid "Sales Order"
 msgstr ""
 
-#: includes/sysnames.inc:41 sales/sales_order_entry.php:655
+#: includes/sysnames.inc:41 sales/sales_order_entry.php:659
 msgid "Sales Quotation"
 msgstr ""
 
 msgid "Sales Quotation"
 msgstr ""
 
@@ -6812,409 +7534,405 @@ msgstr ""
 msgid "Cost Update"
 msgstr ""
 
 msgid "Cost Update"
 msgstr ""
 
-#: includes/sysnames.inc:47 inventory/adjustments.php:32
+#: includes/sysnames.inc:49 inventory/adjustments.php:32
 msgid "Fixed Assets Disposal"
 msgstr ""
 
 msgid "Fixed Assets Disposal"
 msgstr ""
 
-#: includes/sysnames.inc:48
+#: includes/sysnames.inc:50
 msgid "Fixed Assets Revaluation"
 msgstr ""
 
 msgid "Fixed Assets Revaluation"
 msgstr ""
 
-#: includes/sysnames.inc:52
+#: includes/sysnames.inc:54
 msgid "GJ"
 msgstr ""
 
 msgid "GJ"
 msgstr ""
 
-#: includes/sysnames.inc:53
+#: includes/sysnames.inc:55
 msgid "BP"
 msgstr ""
 
 msgid "BP"
 msgstr ""
 
-#: includes/sysnames.inc:54
+#: includes/sysnames.inc:56
 msgid "BD"
 msgstr ""
 
 msgid "BD"
 msgstr ""
 
-#: includes/sysnames.inc:55
+#: includes/sysnames.inc:57
 msgid "BT"
 msgstr ""
 
 msgid "BT"
 msgstr ""
 
-#: includes/sysnames.inc:56
+#: includes/sysnames.inc:58
 msgid "SI"
 msgstr ""
 
 msgid "SI"
 msgstr ""
 
-#: includes/sysnames.inc:57
+#: includes/sysnames.inc:59
 msgid "CN"
 msgstr ""
 
 msgid "CN"
 msgstr ""
 
-#: includes/sysnames.inc:58
+#: includes/sysnames.inc:60
 msgid "CP"
 msgstr ""
 
 msgid "CP"
 msgstr ""
 
-#: includes/sysnames.inc:59 sales/customer_invoice.php:525
+#: includes/sysnames.inc:61 sales/customer_invoice.php:526
 msgid "DN"
 msgstr ""
 
 msgid "DN"
 msgstr ""
 
-#: includes/sysnames.inc:60
+#: includes/sysnames.inc:62
 msgid "IT"
 msgstr ""
 
 msgid "IT"
 msgstr ""
 
-#: includes/sysnames.inc:61
+#: includes/sysnames.inc:63
 msgid "IA"
 msgstr ""
 
 msgid "IA"
 msgstr ""
 
-#: includes/sysnames.inc:62
+#: includes/sysnames.inc:64
 msgid "PO"
 msgstr ""
 
 msgid "PO"
 msgstr ""
 
-#: includes/sysnames.inc:63
+#: includes/sysnames.inc:65
 msgid "PI"
 msgstr ""
 
 msgid "PI"
 msgstr ""
 
-#: includes/sysnames.inc:64
+#: includes/sysnames.inc:66
 msgid "PC"
 msgstr ""
 
 msgid "PC"
 msgstr ""
 
-#: includes/sysnames.inc:65
+#: includes/sysnames.inc:67
 msgid "SP"
 msgstr ""
 
 msgid "SP"
 msgstr ""
 
-#: includes/sysnames.inc:66 reporting/rep204.php:84 reporting/rep305.php:106
+#: includes/sysnames.inc:68 reporting/rep204.php:84 reporting/rep305.php:106
 msgid "GRN"
 msgstr ""
 
 msgid "GRN"
 msgstr ""
 
-#: includes/sysnames.inc:67
+#: includes/sysnames.inc:69
 msgid "WO"
 msgstr ""
 
 msgid "WO"
 msgstr ""
 
-#: includes/sysnames.inc:68
+#: includes/sysnames.inc:70
 msgid "WI"
 msgstr ""
 
 msgid "WI"
 msgstr ""
 
-#: includes/sysnames.inc:69
+#: includes/sysnames.inc:71
 msgid "WP"
 msgstr ""
 
 msgid "WP"
 msgstr ""
 
-#: includes/sysnames.inc:70
+#: includes/sysnames.inc:72
 msgid "SO"
 msgstr ""
 
 msgid "SO"
 msgstr ""
 
-#: includes/sysnames.inc:71
+#: includes/sysnames.inc:73
 msgid "SQ"
 msgstr ""
 
 msgid "SQ"
 msgstr ""
 
-#: includes/sysnames.inc:72
+#: includes/sysnames.inc:74
 msgid "CU"
 msgstr ""
 
 msgid "CU"
 msgstr ""
 
-#: includes/sysnames.inc:73
+#: includes/sysnames.inc:75
 msgid "Dim"
 msgstr ""
 
 msgid "Dim"
 msgstr ""
 
-#: includes/sysnames.inc:81
+#: includes/sysnames.inc:83
 msgid "Savings Account"
 msgstr ""
 
 msgid "Savings Account"
 msgstr ""
 
-#: includes/sysnames.inc:82
+#: includes/sysnames.inc:84
 msgid "Chequing Account"
 msgstr ""
 
 msgid "Chequing Account"
 msgstr ""
 
-#: includes/sysnames.inc:83 manufacturing/work_order_costs.php:146
+#: includes/sysnames.inc:85 manufacturing/work_order_costs.php:146
 msgid "Credit Account"
 msgstr ""
 
 msgid "Credit Account"
 msgstr ""
 
-#: includes/sysnames.inc:84
+#: includes/sysnames.inc:86
 msgid "Cash Account"
 msgstr ""
 
 msgid "Cash Account"
 msgstr ""
 
-#: includes/sysnames.inc:88
+#: includes/sysnames.inc:90
 msgid "Transfer"
 msgstr ""
 
 msgid "Transfer"
 msgstr ""
 
-#: includes/sysnames.inc:89
+#: includes/sysnames.inc:91
 msgid "Cheque"
 msgstr ""
 
 msgid "Cheque"
 msgstr ""
 
-#: includes/sysnames.inc:91 includes/sysnames.inc:195
+#: includes/sysnames.inc:93 includes/sysnames.inc:197
 msgid "Cash"
 msgstr ""
 
 msgid "Cash"
 msgstr ""
 
-#: includes/sysnames.inc:110
+#: includes/sysnames.inc:112
 msgid "Assemble"
 msgstr ""
 
 msgid "Assemble"
 msgstr ""
 
-#: includes/sysnames.inc:111
+#: includes/sysnames.inc:113
 msgid "Unassemble"
 msgstr ""
 
 msgid "Unassemble"
 msgstr ""
 
-#: includes/sysnames.inc:112
+#: includes/sysnames.inc:114
 msgid "Advanced Manufacture"
 msgstr ""
 
 msgid "Advanced Manufacture"
 msgstr ""
 
-#: includes/sysnames.inc:116
+#: includes/sysnames.inc:118
 msgid "Labour Cost"
 msgstr ""
 
 msgid "Labour Cost"
 msgstr ""
 
-#: includes/sysnames.inc:117
+#: includes/sysnames.inc:119
 msgid "Overhead Cost"
 msgstr ""
 
 msgid "Overhead Cost"
 msgstr ""
 
-#: includes/sysnames.inc:118
+#: includes/sysnames.inc:120
 msgid "Materials"
 msgstr ""
 
 msgid "Materials"
 msgstr ""
 
-#: includes/sysnames.inc:125
+#: includes/sysnames.inc:127
 msgid "Assets"
 msgstr ""
 
 msgid "Assets"
 msgstr ""
 
-#: includes/sysnames.inc:127
+#: includes/sysnames.inc:129
 msgid "Equity"
 msgstr ""
 
 msgid "Equity"
 msgstr ""
 
-#: includes/sysnames.inc:128
+#: includes/sysnames.inc:130
 msgid "Income"
 msgstr ""
 
 msgid "Income"
 msgstr ""
 
-#: includes/sysnames.inc:129
+#: includes/sysnames.inc:131
 msgid "Cost of Goods Sold"
 msgstr ""
 
 msgid "Cost of Goods Sold"
 msgstr ""
 
-#: includes/sysnames.inc:130
+#: includes/sysnames.inc:132
 msgid "Expense"
 msgstr ""
 
 msgid "Expense"
 msgstr ""
 
-#: includes/sysnames.inc:139
+#: includes/sysnames.inc:141
 msgid "Amount, increase base"
 msgstr ""
 
 msgid "Amount, increase base"
 msgstr ""
 
-#: includes/sysnames.inc:140
+#: includes/sysnames.inc:142
 msgid "Amount, reduce base"
 msgstr ""
 
 msgid "Amount, reduce base"
 msgstr ""
 
-#: includes/sysnames.inc:141
+#: includes/sysnames.inc:143
 msgid "% amount of base"
 msgstr ""
 
 msgid "% amount of base"
 msgstr ""
 
-#: includes/sysnames.inc:142
+#: includes/sysnames.inc:144
 msgid "% amount of base, increase base"
 msgstr ""
 
 msgid "% amount of base, increase base"
 msgstr ""
 
-#: includes/sysnames.inc:143
+#: includes/sysnames.inc:145
 msgid "% amount of base, reduce base"
 msgstr ""
 
 msgid "% amount of base, reduce base"
 msgstr ""
 
-#: includes/sysnames.inc:144
+#: includes/sysnames.inc:146
 msgid "Taxes added"
 msgstr ""
 
 msgid "Taxes added"
 msgstr ""
 
-#: includes/sysnames.inc:145
+#: includes/sysnames.inc:147
 msgid "Taxes added, increase base"
 msgstr ""
 
 msgid "Taxes added, increase base"
 msgstr ""
 
-#: includes/sysnames.inc:146
+#: includes/sysnames.inc:148
 msgid "Taxes added, reduce base"
 msgstr ""
 
 msgid "Taxes added, reduce base"
 msgstr ""
 
-#: includes/sysnames.inc:147
+#: includes/sysnames.inc:149
 msgid "Taxes included"
 msgstr ""
 
 msgid "Taxes included"
 msgstr ""
 
-#: includes/sysnames.inc:148
+#: includes/sysnames.inc:150
 msgid "Taxes included, increase base"
 msgstr ""
 
 msgid "Taxes included, increase base"
 msgstr ""
 
-#: includes/sysnames.inc:149
+#: includes/sysnames.inc:151
 msgid "Taxes included, reduce base"
 msgstr ""
 
 msgid "Taxes included, reduce base"
 msgstr ""
 
-#: includes/sysnames.inc:156
+#: includes/sysnames.inc:158
 msgid "Supplier Invoice/Credit"
 msgstr ""
 
 msgid "Supplier Invoice/Credit"
 msgstr ""
 
-#: includes/sysnames.inc:162
+#: includes/sysnames.inc:164
 msgid "Declining balance"
 msgstr ""
 
 msgid "Declining balance"
 msgstr ""
 
-#: includes/sysnames.inc:163
+#: includes/sysnames.inc:165
 msgid "Straight line"
 msgstr ""
 
 msgid "Straight line"
 msgstr ""
 
-#: includes/sysnames.inc:164
+#: includes/sysnames.inc:166
 msgid "Sum of the Year Digits"
 msgstr ""
 
 msgid "Sum of the Year Digits"
 msgstr ""
 
-#: includes/sysnames.inc:165
+#: includes/sysnames.inc:167
 msgid "One-time"
 msgstr ""
 
 msgid "One-time"
 msgstr ""
 
-#: includes/sysnames.inc:171 manufacturing/search_work_orders.php:163
-#: manufacturing/includes/manufacturing_ui.inc:293 reporting/rep402.php:103
+#: includes/sysnames.inc:173 manufacturing/search_work_orders.php:170
+#: manufacturing/includes/manufacturing_ui.inc:293 reporting/rep402.php:136
 msgid "Manufactured"
 msgstr ""
 
 msgid "Manufactured"
 msgstr ""
 
-#: includes/sysnames.inc:172
-msgid "Purchased"
-msgstr ""
-
-#: includes/sysnames.inc:173
+#: includes/sysnames.inc:175
 msgid "Service"
 msgstr ""
 
 msgid "Service"
 msgstr ""
 
-#: includes/sysnames.inc:186
+#: includes/sysnames.inc:188
 msgid "Customer branch"
 msgstr ""
 
 msgid "Customer branch"
 msgstr ""
 
-#: includes/sysnames.inc:188
+#: includes/sysnames.inc:190
 msgid "Shipper"
 msgstr ""
 
 msgid "Shipper"
 msgstr ""
 
-#: includes/sysnames.inc:189
+#: includes/sysnames.inc:191
 msgid "Company internal"
 msgstr ""
 
 msgid "Company internal"
 msgstr ""
 
-#: includes/sysnames.inc:194
+#: includes/sysnames.inc:196
 msgid "Prepayment"
 msgstr ""
 
 msgid "Prepayment"
 msgstr ""
 
-#: includes/sysnames.inc:196
+#: includes/sysnames.inc:198
 msgid "After No. of Days"
 msgstr ""
 
 msgid "After No. of Days"
 msgstr ""
 
-#: includes/sysnames.inc:197
+#: includes/sysnames.inc:199
 msgid "Day In Following Month"
 msgstr ""
 
 msgid "Day In Following Month"
 msgstr ""
 
-#: includes/sysnames.inc:201
+#: includes/sysnames.inc:203
 msgid "Sum per line taxes"
 msgstr ""
 
 msgid "Sum per line taxes"
 msgstr ""
 
-#: includes/sysnames.inc:202
+#: includes/sysnames.inc:204
 msgid "Taxes from totals"
 msgstr ""
 
 msgid "Taxes from totals"
 msgstr ""
 
-#: includes/sysnames.inc:214
+#: includes/sysnames.inc:216
 msgid "Jan"
 msgstr ""
 
 msgid "Jan"
 msgstr ""
 
-#: includes/sysnames.inc:214
+#: includes/sysnames.inc:216
 msgid "Feb"
 msgstr ""
 
 msgid "Feb"
 msgstr ""
 
-#: includes/sysnames.inc:214
+#: includes/sysnames.inc:216
 msgid "Mar"
 msgstr ""
 
 msgid "Mar"
 msgstr ""
 
-#: includes/sysnames.inc:214
+#: includes/sysnames.inc:216
 msgid "Apr"
 msgstr ""
 
 msgid "Apr"
 msgstr ""
 
-#: includes/sysnames.inc:214 includes/ui/ui_view.inc:982
+#: includes/sysnames.inc:216 includes/ui/ui_view.inc:1010
 msgid "May"
 msgstr ""
 
 msgid "May"
 msgstr ""
 
-#: includes/sysnames.inc:214
+#: includes/sysnames.inc:216
 msgid "Jun"
 msgstr ""
 
 msgid "Jun"
 msgstr ""
 
-#: includes/sysnames.inc:214
+#: includes/sysnames.inc:216
 msgid "Jul"
 msgstr ""
 
 msgid "Jul"
 msgstr ""
 
-#: includes/sysnames.inc:214
+#: includes/sysnames.inc:216
 msgid "Aug"
 msgstr ""
 
 msgid "Aug"
 msgstr ""
 
-#: includes/sysnames.inc:214
+#: includes/sysnames.inc:216
 msgid "Sep"
 msgstr ""
 
 msgid "Sep"
 msgstr ""
 
-#: includes/sysnames.inc:214
+#: includes/sysnames.inc:216
 msgid "Oct"
 msgstr ""
 
 msgid "Oct"
 msgstr ""
 
-#: includes/sysnames.inc:214
+#: includes/sysnames.inc:216
 msgid "Nov"
 msgstr ""
 
 msgid "Nov"
 msgstr ""
 
-#: includes/sysnames.inc:214
+#: includes/sysnames.inc:216
 msgid "Dec"
 msgstr ""
 
 msgid "Dec"
 msgstr ""
 
-#: includes/sysnames.inc:220
+#: includes/sysnames.inc:222
 msgid "Unicode (multilanguage)"
 msgstr ""
 
 msgid "Unicode (multilanguage)"
 msgstr ""
 
-#: includes/sysnames.inc:221
+#: includes/sysnames.inc:223
 msgid "Icelandic"
 msgstr ""
 
 msgid "Icelandic"
 msgstr ""
 
-#: includes/sysnames.inc:222
+#: includes/sysnames.inc:224
 msgid "Latvian"
 msgstr ""
 
 msgid "Latvian"
 msgstr ""
 
-#: includes/sysnames.inc:223
+#: includes/sysnames.inc:225
 msgid "Romanian"
 msgstr ""
 
 msgid "Romanian"
 msgstr ""
 
-#: includes/sysnames.inc:224
+#: includes/sysnames.inc:226
 msgid "Slovenian"
 msgstr ""
 
 msgid "Slovenian"
 msgstr ""
 
-#: includes/sysnames.inc:225
+#: includes/sysnames.inc:227
 msgid "Polish"
 msgstr ""
 
 msgid "Polish"
 msgstr ""
 
-#: includes/sysnames.inc:226
+#: includes/sysnames.inc:228
 msgid "Estonian"
 msgstr ""
 
 msgid "Estonian"
 msgstr ""
 
-#: includes/sysnames.inc:227
+#: includes/sysnames.inc:229
 msgid "Spanish"
 msgstr ""
 
 msgid "Spanish"
 msgstr ""
 
-#: includes/sysnames.inc:228
+#: includes/sysnames.inc:230
 msgid "Swedish"
 msgstr ""
 
 msgid "Swedish"
 msgstr ""
 
-#: includes/sysnames.inc:229
+#: includes/sysnames.inc:231
 msgid "Turkish"
 msgstr ""
 
 msgid "Turkish"
 msgstr ""
 
-#: includes/sysnames.inc:230
+#: includes/sysnames.inc:232
 msgid "Czech"
 msgstr ""
 
 msgid "Czech"
 msgstr ""
 
-#: includes/sysnames.inc:231
+#: includes/sysnames.inc:233
 msgid "Danish"
 msgstr ""
 
 msgid "Danish"
 msgstr ""
 
-#: includes/sysnames.inc:232
+#: includes/sysnames.inc:234
 msgid "Lithuanian"
 msgstr ""
 
 msgid "Lithuanian"
 msgstr ""
 
-#: includes/sysnames.inc:233
+#: includes/sysnames.inc:235
 msgid "Slovak"
 msgstr ""
 
 msgid "Slovak"
 msgstr ""
 
-#: includes/sysnames.inc:234
+#: includes/sysnames.inc:236
 msgid "Spanish (alternative)"
 msgstr ""
 
 msgid "Spanish (alternative)"
 msgstr ""
 
-#: includes/sysnames.inc:235
+#: includes/sysnames.inc:237
 msgid "Persian"
 msgstr ""
 
 msgid "Persian"
 msgstr ""
 
-#: includes/sysnames.inc:236
+#: includes/sysnames.inc:238
 msgid "Hungarian"
 msgstr ""
 
 msgid "Hungarian"
 msgstr ""
 
-#: includes/sysnames.inc:237
+#: includes/sysnames.inc:239
 msgid "French"
 msgstr ""
 
 msgid "French"
 msgstr ""
 
-#: includes/sysnames.inc:238
+#: includes/sysnames.inc:240
 msgid "Italian"
 msgstr ""
 
 #: includes/system_tests.inc:15 includes/ui/ui_view.inc:210
 msgid "Italian"
 msgstr ""
 
 #: includes/system_tests.inc:15 includes/ui/ui_view.inc:210
-#: reporting/rep705.php:251 reporting/rep705.php:262 reporting/rep705.php:271
+#: reporting/rep705.php:271 reporting/rep705.php:281 reporting/rep705.php:289
 msgid "Info"
 msgstr ""
 
 msgid "Info"
 msgstr ""
 
@@ -7423,44 +8141,40 @@ msgstr ""
 msgid "Test type"
 msgstr ""
 
 msgid "Test type"
 msgstr ""
 
-#: includes/system_tests.inc:424 reporting/rep204.php:85
-#: reporting/rep301.php:164 reporting/rep308.php:224
-msgid "Value"
-msgstr ""
-
 #: includes/system_tests.inc:424 reporting/reports_main.php:42
 #: includes/system_tests.inc:424 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:290
-#: reporting/reports_main.php:299 reporting/reports_main.php:306
-#: reporting/reports_main.php:313 reporting/reports_main.php:324
-#: reporting/reports_main.php:335 reporting/reports_main.php:345
-#: reporting/reports_main.php:352 reporting/reports_main.php:358
-#: reporting/reports_main.php:365 reporting/reports_main.php:378
-#: reporting/reports_main.php:386 reporting/reports_main.php:397
-#: reporting/reports_main.php:409 reporting/reports_main.php:419
-#: reporting/reports_main.php:431 reporting/reports_main.php:438
-#: reporting/reports_main.php:448 reporting/reports_main.php:459
-#: reporting/reports_main.php:468 reporting/reports_main.php:479
-#: reporting/reports_main.php:485 reporting/reports_main.php:494
-#: reporting/reports_main.php:504 reporting/reports_main.php:512
-#: reporting/reports_main.php:520 reporting/reports_main.php:528
+#: reporting/reports_main.php:53 reporting/reports_main.php:64
+#: reporting/reports_main.php:73 reporting/reports_main.php:80
+#: reporting/reports_main.php:89 reporting/reports_main.php:98
+#: reporting/reports_main.php:105 reporting/reports_main.php:114
+#: reporting/reports_main.php:124 reporting/reports_main.php:131
+#: reporting/reports_main.php:138 reporting/reports_main.php:146
+#: reporting/reports_main.php:153 reporting/reports_main.php:160
+#: reporting/reports_main.php:171 reporting/reports_main.php:182
+#: reporting/reports_main.php:191 reporting/reports_main.php:199
+#: reporting/reports_main.php:204 reporting/reports_main.php:211
+#: reporting/reports_main.php:219 reporting/reports_main.php:226
+#: reporting/reports_main.php:235 reporting/reports_main.php:241
+#: reporting/reports_main.php:252 reporting/reports_main.php:262
+#: reporting/reports_main.php:268 reporting/reports_main.php:278
+#: reporting/reports_main.php:286 reporting/reports_main.php:294
+#: reporting/reports_main.php:301 reporting/reports_main.php:311
+#: reporting/reports_main.php:320 reporting/reports_main.php:328
+#: reporting/reports_main.php:335 reporting/reports_main.php:346
+#: reporting/reports_main.php:357 reporting/reports_main.php:367
+#: reporting/reports_main.php:374 reporting/reports_main.php:380
+#: reporting/reports_main.php:387 reporting/reports_main.php:400
+#: reporting/reports_main.php:408 reporting/reports_main.php:420
+#: reporting/reports_main.php:432 reporting/reports_main.php:442
+#: reporting/reports_main.php:454 reporting/reports_main.php:461
+#: reporting/reports_main.php:472 reporting/reports_main.php:483
+#: reporting/reports_main.php:492 reporting/reports_main.php:503
+#: reporting/reports_main.php:509 reporting/reports_main.php:519
+#: reporting/reports_main.php:529 reporting/reports_main.php:537
+#: reporting/reports_main.php:545 reporting/reports_main.php:553
 #: reporting/includes/excel_report.inc:292
 #: reporting/includes/excel_report.inc:425
 #: reporting/includes/excel_report.inc:292
 #: reporting/includes/excel_report.inc:425
-#: reporting/includes/pdf_report.inc:360 reporting/includes/pdf_report.inc:621
-#: sales/view/view_sales_order.php:98
+#: reporting/includes/pdf_report.inc:361 reporting/includes/pdf_report.inc:622
+#: sales/view/view_sales_order.php:100
 msgid "Comments"
 msgstr ""
 
 msgid "Comments"
 msgstr ""
 
@@ -7468,7 +8182,7 @@ msgstr ""
 msgid "Ok"
 msgstr ""
 
 msgid "Ok"
 msgstr ""
 
-#: includes/db/audit_trail_db.inc:102
+#: includes/db/audit_trail_db.inc:103
 msgid ""
 "Some transactions journal GL postings were not indexed due to lack of audit "
 "trail record."
 msgid ""
 "Some transactions journal GL postings were not indexed due to lack of audit "
 "trail record."
@@ -7580,91 +8294,158 @@ msgstr ""
 msgid "Reference line cannot be deleted because it is already in use."
 msgstr ""
 
 msgid "Reference line cannot be deleted because it is already in use."
 msgstr ""
 
-#: includes/db/inventory_db.inc:321
+#: includes/db/inventory_db.inc:324
 msgid "Cost was "
 msgstr ""
 
 msgid "Cost was "
 msgstr ""
 
-#: includes/db/inventory_db.inc:321
+#: includes/db/inventory_db.inc:324
 msgid " changed to "
 msgstr ""
 
 msgid " changed to "
 msgstr ""
 
-#: includes/db/inventory_db.inc:321
+#: includes/db/inventory_db.inc:324
 msgid " for item "
 msgstr ""
 
 msgid " for item "
 msgstr ""
 
-#: includes/db/inventory_db.inc:381
+#: includes/db/inventory_db.inc:384
 msgid "Zero/negative inventory handling"
 msgstr ""
 
 msgid "Zero/negative inventory handling"
 msgstr ""
 
-#: includes/ui/allocation_cart.inc:288
+#: includes/ui/allocation_cart.inc:309
 #, php-format
 msgid "Allocated amounts in %s:"
 msgstr ""
 
 #, php-format
 msgid "Allocated amounts in %s:"
 msgstr ""
 
-#: includes/ui/allocation_cart.inc:290
+#: includes/ui/allocation_cart.inc:311
 #: purchasing/allocations/supplier_allocation_main.php:94
 #: sales/allocations/customer_allocation_main.php:92
 msgid "Transaction Type"
 msgstr ""
 
 #: purchasing/allocations/supplier_allocation_main.php:94
 #: sales/allocations/customer_allocation_main.php:92
 msgid "Transaction Type"
 msgstr ""
 
-#: includes/ui/allocation_cart.inc:290
+#: includes/ui/allocation_cart.inc:311
 msgid "Supplier Ref"
 msgstr ""
 
 msgid "Supplier Ref"
 msgstr ""
 
-#: includes/ui/allocation_cart.inc:290 reporting/rep704.php:82
-#: reporting/rep704.php:85 reporting/rep704.php:88 reporting/rep709.php:116
-#: sales/view/view_credit.php:68 sales/view/view_sales_order.php:109
-#: sales/view/view_sales_order.php:142 sales/view/view_sales_order.php:179
+#: includes/ui/allocation_cart.inc:311 reporting/rep704.php:79
+#: reporting/rep704.php:87 reporting/rep704.php:95 reporting/rep709.php:117
 #: sales/inquiry/customer_branches_list.php:49
 #: sales/inquiry/customer_branches_list.php:49
-#: sales/inquiry/sales_orders_view.php:214
-#: sales/inquiry/sales_orders_view.php:253
-#: sales/inquiry/sales_orders_view.php:267
+#: sales/inquiry/sales_orders_view.php:234
+#: sales/inquiry/sales_orders_view.php:273
+#: sales/inquiry/sales_orders_view.php:287 sales/view/view_credit.php:68
+#: sales/view/view_sales_order.php:111 sales/view/view_sales_order.php:144
+#: sales/view/view_sales_order.php:181
 msgid "Ref"
 msgstr ""
 
 msgid "Ref"
 msgstr ""
 
-#: includes/ui/allocation_cart.inc:291
+#: includes/ui/allocation_cart.inc:312
 msgid "Other Allocations"
 msgstr ""
 
 msgid "Other Allocations"
 msgstr ""
 
-#: includes/ui/allocation_cart.inc:291 includes/ui/allocation_cart.inc:337
-#: includes/ui/ui_view.inc:547
+#: includes/ui/allocation_cart.inc:312 includes/ui/allocation_cart.inc:358
+#: includes/ui/ui_view.inc:553
 #: purchasing/allocations/supplier_allocation_main.php:101
 #: purchasing/allocations/supplier_allocation_main.php:101
-#: reporting/rep112.php:150 reporting/rep210.php:157
-#: reporting/includes/doctext.inc:166 reporting/includes/doctext.inc:207
+#: reporting/rep112.php:159 reporting/rep210.php:157
+#: reporting/includes/doctext.inc:166 reporting/includes/doctext.inc:209
 #: sales/allocations/customer_allocation_main.php:99
 msgid "Left to Allocate"
 msgstr ""
 
 #: sales/allocations/customer_allocation_main.php:99
 msgid "Left to Allocate"
 msgstr ""
 
-#: includes/ui/allocation_cart.inc:291 includes/ui/ui_view.inc:547
-#: reporting/includes/doctext.inc:166 reporting/includes/doctext.inc:207
+#: includes/ui/allocation_cart.inc:312 includes/ui/ui_view.inc:553
+#: reporting/includes/doctext.inc:166 reporting/includes/doctext.inc:209
 msgid "This Allocation"
 msgstr ""
 
 msgid "This Allocation"
 msgstr ""
 
-#: includes/ui/allocation_cart.inc:324 reporting/rep112.php:147
+#: includes/ui/allocation_cart.inc:345 reporting/rep112.php:156
 #: reporting/rep210.php:154
 msgid "Total Allocated"
 msgstr ""
 
 #: reporting/rep210.php:154
 msgid "Total Allocated"
 msgstr ""
 
-#: includes/ui/allocation_cart.inc:358
+#: includes/ui/allocation_cart.inc:379
 msgid "The entry for one or more amounts is invalid or negative."
 msgstr ""
 
 msgid "The entry for one or more amounts is invalid or negative."
 msgstr ""
 
-#: includes/ui/allocation_cart.inc:369
+#: includes/ui/allocation_cart.inc:390
 msgid "At least one transaction is overallocated."
 msgstr ""
 
 msgid "At least one transaction is overallocated."
 msgstr ""
 
-#: includes/ui/allocation_cart.inc:383
+#: includes/ui/allocation_cart.inc:402 includes/ui/allocation_cart.inc:412
+msgid "Allocated transaction allocated is not related to company selected."
+msgstr ""
+
+#: includes/ui/allocation_cart.inc:427
 msgid ""
 "These allocations cannot be processed because the amount allocated is more "
 "than the total amount left to allocate."
 msgstr ""
 
 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:225
-#: includes/ui/ui_input.inc:227
+#: includes/ui/attachment.inc:84 sales/manage/sales_groups.php:85
+#: sales/manage/sales_groups.php:120
+msgid "ID"
+msgstr ""
+
+#: includes/ui/attachment.inc:84 includes/ui/attachment.inc:137
+msgid "Docs Title"
+msgstr ""
+
+#: includes/ui/attachment.inc:84
+msgid "Date Updated"
+msgstr ""
+
+#: includes/ui/attachment.inc:112
+msgid "Attachment Detail"
+msgstr ""
+
+#: includes/ui/attachment.inc:131
+msgid "Customer ID"
+msgstr ""
+
+#: includes/ui/attachment.inc:133
+msgid "Supplier ID"
+msgstr ""
+
+#: includes/ui/attachment.inc:139
+msgid "File:"
+msgstr ""
+
+#: includes/ui/attachment.inc:139
+#, php-format
+msgid "%s [%s bytes]"
+msgstr ""
+
+#: includes/ui/attachment.inc:140
+msgid "File change"
+msgstr ""
+
+#: includes/ui/attachment.inc:140
+msgid "Select file"
+msgstr ""
+
+#: includes/ui/attachment.inc:169 includes/ui/class.crud_view.inc:298
+#: includes/ui/simple_crud_class.inc:225 includes/ui/ui_input.inc:227
 msgid "Submit changes"
 msgstr ""
 
 msgid "Submit changes"
 msgstr ""
 
-#: includes/ui/class.crud_view.inc:304 includes/ui/simple_crud_class.inc:227
+#: includes/ui/attachment.inc:171 includes/ui/simple_crud_class.inc:229
+#: includes/ui/ui_input.inc:230
+msgid "Cancel edition"
+msgstr ""
+
+#: includes/ui/attachment.inc:207 includes/ui/attachment.inc:259
+msgid "The existing Docs could not be removed"
+msgstr ""
+
+#: includes/ui/attachment.inc:224
+msgid "A New Attachment Added Successfully"
+msgstr ""
+
+#: includes/ui/attachment.inc:285
+msgid "Description cannot be empty."
+msgstr ""
+
+#: includes/ui/attachment.inc:315
+msgid "The Selected Attachment is Deleted Successfully"
+msgstr ""
+
+#: includes/ui/class.crud_view.inc:313 includes/ui/simple_crud_class.inc:227
 #: includes/ui/ui_input.inc:228
 msgid "Clone"
 msgstr ""
 #: includes/ui/ui_input.inc:228
 msgid "Clone"
 msgstr ""
@@ -7702,7 +8483,7 @@ msgid "Sec Phone"
 msgstr ""
 
 #: includes/ui/contacts_view.inc:40 reporting/rep103.php:263
 msgstr ""
 
 #: includes/ui/contacts_view.inc:40 reporting/rep103.php:263
-#: reporting/rep205.php:175 reporting/includes/header2.inc:106
+#: reporting/rep205.php:175 reporting/includes/header2.inc:104
 #: sales/manage/sales_people.php:99
 msgid "Fax"
 msgstr ""
 #: sales/manage/sales_people.php:99
 msgid "Fax"
 msgstr ""
@@ -7727,17 +8508,17 @@ msgstr ""
 msgid "Contact active for:"
 msgstr ""
 
 msgid "Contact active for:"
 msgstr ""
 
-#: includes/ui/contacts_view.inc:99 sales/manage/customers.php:256
+#: includes/ui/contacts_view.inc:99 sales/manage/customers.php:257
 msgid "Phone:"
 msgstr ""
 
 #: includes/ui/contacts_view.inc:102 inventory/manage/locations.php:217
 msgid "Phone:"
 msgstr ""
 
 #: includes/ui/contacts_view.inc:102 inventory/manage/locations.php:217
-#: purchasing/manage/suppliers.php:139 sales/manage/customer_branches.php:256
-#: sales/manage/customers.php:259 sales/manage/sales_people.php:158
+#: purchasing/manage/suppliers.php:249 sales/manage/customers.php:260
+#: sales/manage/customer_branches.php:256 sales/manage/sales_people.php:158
 msgid "E-mail:"
 msgstr ""
 
 msgid "E-mail:"
 msgstr ""
 
-#: includes/ui/contacts_view.inc:107 purchasing/manage/suppliers.php:140
+#: includes/ui/contacts_view.inc:107 purchasing/manage/suppliers.php:250
 #: sales/manage/customer_branches.php:257
 msgid "Document Language:"
 msgstr ""
 #: sales/manage/customer_branches.php:257
 msgid "Document Language:"
 msgstr ""
@@ -7762,7 +8543,7 @@ msgstr ""
 msgid "You have to select at least one category."
 msgstr ""
 
 msgid "You have to select at least one category."
 msgstr ""
 
-#: includes/ui/db_pager_view.inc:172 includes/ui/ui_input.inc:958
+#: includes/ui/db_pager_view.inc:172 includes/ui/ui_input.inc:965
 msgid "Show also Inactive"
 msgstr ""
 
 msgid "Show also Inactive"
 msgstr ""
 
@@ -7799,10 +8580,6 @@ msgstr ""
 msgid "Edit new record with current data"
 msgstr ""
 
 msgid "Edit new record with current data"
 msgstr ""
 
-#: includes/ui/simple_crud_class.inc:229 includes/ui/ui_input.inc:230
-msgid "Cancel edition"
-msgstr ""
-
 #: includes/ui/ui_controls.inc:93
 msgid "Request from outside of this page is forbidden."
 msgstr ""
 #: includes/ui/ui_controls.inc:93
 msgid "Request from outside of this page is forbidden."
 msgstr ""
@@ -7831,43 +8608,29 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
 msgid "Close"
 msgstr ""
 
-#: 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:508
-msgid "Branches"
-msgstr ""
-
-#: 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:674
 msgid ""
 "Entered data has not been saved yet.\n"
 "Do you want to abandon changes?"
 msgstr ""
 
 #: 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:655 reporting/includes/reports_classes.inc:223
+#: includes/ui/ui_input.inc:661 reporting/includes/reports_classes.inc:225
 msgid "Click Here to Pick up the date"
 msgstr ""
 
 msgid "Click Here to Pick up the date"
 msgstr ""
 
-#: includes/ui/ui_input.inc:970 includes/ui/ui_lists.inc:2351
-#: reporting/rep301.php:224 reporting/rep302.php:168 reporting/rep303.php:198
-#: reporting/rep304.php:184 reporting/rep304.php:188 reporting/rep306.php:235
-#: reporting/rep306.php:242 reporting/rep310.php:189 reporting/rep310.php:197
-#: reporting/rep451.php:143 sales/manage/customer_branches.php:292
+#: includes/ui/ui_input.inc:977 includes/ui/ui_lists.inc:2357
+#: reporting/rep301.php:228 reporting/rep302.php:167 reporting/rep303.php:300
+#: reporting/rep304.php:184 reporting/rep304.php:188 reporting/rep306.php:231
+#: reporting/rep306.php:238 reporting/rep310.php:186 reporting/rep310.php:194
+#: sales/manage/customer_branches.php:292
 msgid "Inactive"
 msgstr ""
 
 msgid "Inactive"
 msgstr ""
 
-#: includes/ui/ui_input.inc:980 includes/ui/ui_input.inc:992
+#: includes/ui/ui_input.inc:987 includes/ui/ui_input.inc:999
 msgid "Current Credit:"
 msgstr ""
 
 msgid "Current Credit:"
 msgstr ""
 
-#: includes/ui/ui_input.inc:1006
+#: includes/ui/ui_input.inc:1013
 msgid "Bank Balance:"
 msgstr ""
 
 msgid "Bank Balance:"
 msgstr ""
 
@@ -7887,179 +8650,172 @@ msgstr ""
 msgid "Enter description fragment to search or * for all"
 msgstr ""
 
 msgid "Enter description fragment to search or * for all"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:308 includes/ui/ui_lists.inc:312
-#: includes/ui/ui_lists.inc:316 includes/ui/ui_lists.inc:320
-#: includes/ui/ui_lists.inc:324 includes/ui/ui_lists.inc:329
-#: includes/ui/ui_lists.inc:333 inventory/inquiry/stock_list.php:42
+#: 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:325 includes/ui/ui_lists.inc:330
+#: includes/ui/ui_lists.inc:334 inventory/inquiry/stock_list.php:42
 msgid "Search items"
 msgstr ""
 
 msgid "Search items"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:337 sales/inquiry/customers_list.php:42
+#: includes/ui/ui_lists.inc:338 sales/inquiry/customers_list.php:42
 msgid "Search customers"
 msgstr ""
 
 msgid "Search customers"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:341 sales/inquiry/customer_branches_list.php:38
+#: includes/ui/ui_lists.inc:342 sales/inquiry/customer_branches_list.php:38
 msgid "Search branches"
 msgstr ""
 
 msgid "Search branches"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:345 purchasing/inquiry/suppliers_list.php:42
+#: includes/ui/ui_lists.inc:346 purchasing/inquiry/suppliers_list.php:42
 msgid "Search suppliers"
 msgstr ""
 
 msgid "Search suppliers"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:538 includes/ui/ui_lists.inc:1548
+#: includes/ui/ui_lists.inc:542 includes/ui/ui_lists.inc:1554
 msgid "All Suppliers"
 msgstr ""
 
 msgid "All Suppliers"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:542
+#: includes/ui/ui_lists.inc:546
 msgid "Press Space tab to filter by name fragment"
 msgstr ""
 
 msgid "Press Space tab to filter by name fragment"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:543
+#: includes/ui/ui_lists.inc:547
 msgid "Select supplier"
 msgstr ""
 
 msgid "Select supplier"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:592
+#: includes/ui/ui_lists.inc:597
 msgid "All Customers"
 msgstr ""
 
 msgid "All Customers"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:596
+#: includes/ui/ui_lists.inc:601
 msgid "Press Space tab to filter by name fragment; F2 - entry new customer"
 msgstr ""
 
 msgid "Press Space tab to filter by name fragment; F2 - entry new customer"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:597
+#: includes/ui/ui_lists.inc:602
 msgid "Select customer"
 msgstr ""
 
 msgid "Select customer"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:642
+#: includes/ui/ui_lists.inc:647
 msgid "All branches"
 msgstr ""
 
 msgid "All branches"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:645
+#: includes/ui/ui_lists.inc:650
 msgid "Select customer branch"
 msgstr ""
 
 msgid "Select customer branch"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:681
+#: includes/ui/ui_lists.inc:686
 msgid "All Locations"
 msgstr ""
 
 msgid "All Locations"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:838 includes/ui/ui_lists.inc:922
+#: includes/ui/ui_lists.inc:843 includes/ui/ui_lists.inc:927
 msgid "All Items"
 msgstr ""
 
 msgid "All Items"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:1480
+#: includes/ui/ui_lists.inc:1486
 msgid "All Sales Types"
 msgstr ""
 
 msgid "All Sales Types"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:1828
+#: includes/ui/ui_lists.inc:1834
 msgid "Use Item Sales Accounts"
 msgstr ""
 
 msgid "Use Item Sales Accounts"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2137 includes/ui/ui_lists.inc:2153
-#: includes/ui/ui_lists.inc:2169
+#: includes/ui/ui_lists.inc:2143 includes/ui/ui_lists.inc:2159
+#: includes/ui/ui_lists.inc:2175
 msgid "All Types"
 msgstr ""
 
 msgid "All Types"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2138 sales/view/view_sales_order.php:140
+#: includes/ui/ui_lists.inc:2144 sales/view/view_sales_order.php:142
 msgid "Sales Invoices"
 msgstr ""
 
 msgid "Sales Invoices"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2139 includes/ui/ui_lists.inc:2172
+#: includes/ui/ui_lists.inc:2145 includes/ui/ui_lists.inc:2178
 msgid "Unsettled transactions"
 msgstr ""
 
 msgid "Unsettled transactions"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2140 includes/ui/ui_lists.inc:2156
-#: includes/ui/ui_lists.inc:2173 includes/ui/ui_view.inc:609
-#: includes/ui/ui_view.inc:613
+#: includes/ui/ui_lists.inc:2146 includes/ui/ui_lists.inc:2162
+#: includes/ui/ui_lists.inc:2179 includes/ui/ui_view.inc:615
+#: includes/ui/ui_view.inc:619 themes/canvas/renderer.php:86
+#: themes/canvas/renderer.php:97 themes/canvas/renderer.php:129
 msgid "Payments"
 msgstr ""
 
 msgid "Payments"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2141 includes/ui/ui_lists.inc:2157
-#: includes/ui/ui_lists.inc:2174 sales/view/view_sales_order.php:176
+#: includes/ui/ui_lists.inc:2147 includes/ui/ui_lists.inc:2163
+#: includes/ui/ui_lists.inc:2180 sales/view/view_sales_order.php:178
 msgid "Credit Notes"
 msgstr ""
 
 msgid "Credit Notes"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2142 sales/view/view_sales_order.php:106
+#: includes/ui/ui_lists.inc:2148 sales/view/view_sales_order.php:108
 msgid "Delivery Notes"
 msgstr ""
 
 msgid "Delivery Notes"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2154 includes/ui/ui_lists.inc:2171
-msgid "Invoices"
-msgstr ""
-
-#: includes/ui/ui_lists.inc:2155
-msgid "Overdue Invoices"
-msgstr ""
-
-#: includes/ui/ui_lists.inc:2158 includes/ui/ui_lists.inc:2175
+#: includes/ui/ui_lists.inc:2164 includes/ui/ui_lists.inc:2181
 msgid "Overdue Credit Notes"
 msgstr ""
 
 msgid "Overdue Credit Notes"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2170
+#: includes/ui/ui_lists.inc:2176
 msgid "GRNs"
 msgstr ""
 
 msgid "GRNs"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2188
+#: includes/ui/ui_lists.inc:2194
 msgid "Automatically put balance on back order"
 msgstr ""
 
 msgid "Automatically put balance on back order"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2189
+#: includes/ui/ui_lists.inc:2195
 msgid "Cancel any quantites not delivered"
 msgstr ""
 
 msgid "Cancel any quantites not delivered"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2206
+#: includes/ui/ui_lists.inc:2212
 msgid "Items Returned to Inventory Location"
 msgstr ""
 
 msgid "Items Returned to Inventory Location"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2207
+#: includes/ui/ui_lists.inc:2213
 msgid "Items Written Off"
 msgstr ""
 
 msgid "Items Written Off"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2376
+#: includes/ui/ui_lists.inc:2382
 msgid "New role"
 msgstr ""
 
 msgid "New role"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2428
+#: includes/ui/ui_lists.inc:2434
 msgid "No tags defined."
 msgstr ""
 
 msgid "No tags defined."
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2428
+#: includes/ui/ui_lists.inc:2434
 msgid "No active tags defined."
 msgstr ""
 
 msgid "No active tags defined."
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2466
+#: includes/ui/ui_lists.inc:2472
 #, php-format
 msgid "Activated for '%s'"
 msgstr ""
 
 #, php-format
 msgid "Activated for '%s'"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2469
+#: includes/ui/ui_lists.inc:2475
 msgid "Available and/or installed"
 msgstr ""
 
 msgid "Available and/or installed"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2539
+#: includes/ui/ui_lists.inc:2545
 msgid "Standard new company American COA (4 digit)"
 msgstr ""
 
 msgid "Standard new company American COA (4 digit)"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2541
+#: includes/ui/ui_lists.inc:2547
 msgid "Standard American COA (4 digit) with demo data"
 msgstr ""
 
 msgid "Standard American COA (4 digit) with demo data"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2562
+#: includes/ui/ui_lists.inc:2568
 msgid "No payment Link"
 msgstr ""
 
 msgid "No payment Link"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2682
+#: includes/ui/ui_lists.inc:2688
 msgid "Numeric"
 msgstr ""
 
 msgid "Numeric"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2682
+#: includes/ui/ui_lists.inc:2688
 msgid "Alpha Numeric"
 msgstr ""
 
 msgid "Alpha Numeric"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2682
+#: includes/ui/ui_lists.inc:2688
 msgid "ALPHA NUMERIC"
 msgstr ""
 
 msgid "ALPHA NUMERIC"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2698
+#: includes/ui/ui_lists.inc:2704
 msgid "All users"
 msgstr ""
 
 msgid "All users"
 msgstr ""
 
@@ -8067,137 +8823,137 @@ msgstr ""
 msgid "in units of : "
 msgstr ""
 
 msgid "in units of : "
 msgstr ""
 
-#: includes/ui/ui_view.inc:301
+#: includes/ui/ui_view.inc:307
 #, php-format
 msgid ""
 "Cannot retrieve exchange rate for currency %s. Please adjust approximate "
 "rate if needed."
 msgstr ""
 
 #, php-format
 msgid ""
 "Cannot retrieve exchange rate for currency %s. Please adjust approximate "
 "rate if needed."
 msgstr ""
 
-#: includes/ui/ui_view.inc:342
+#: includes/ui/ui_view.inc:348
 msgid "Date Voided:"
 msgstr ""
 
 msgid "Date Voided:"
 msgstr ""
 
-#: includes/ui/ui_view.inc:442 reporting/rep107.php:260
-#: reporting/rep109.php:188 reporting/rep110.php:185 reporting/rep111.php:185
-#: reporting/rep113.php:174 reporting/rep209.php:190
+#: includes/ui/ui_view.inc:448 reporting/rep107.php:284
+#: reporting/rep109.php:172 reporting/rep110.php:185 reporting/rep111.php:187
+#: reporting/rep113.php:174 reporting/rep209.php:187
 msgid "Total Tax Excluded"
 msgstr ""
 
 msgid "Total Tax Excluded"
 msgstr ""
 
-#: includes/ui/ui_view.inc:448 includes/ui/ui_view.inc:467
-#: includes/ui/ui_view.inc:491 includes/ui/ui_view.inc:508
-#: reporting/rep107.php:269 reporting/rep109.php:197 reporting/rep110.php:194
-#: reporting/rep111.php:194 reporting/rep113.php:183 reporting/rep209.php:199
+#: includes/ui/ui_view.inc:454 includes/ui/ui_view.inc:473
+#: includes/ui/ui_view.inc:497 includes/ui/ui_view.inc:514
+#: reporting/rep107.php:293 reporting/rep109.php:181 reporting/rep110.php:194
+#: reporting/rep111.php:196 reporting/rep113.php:183 reporting/rep209.php:196
 msgid "Included"
 msgstr ""
 
 msgid "Included"
 msgstr ""
 
-#: includes/ui/ui_view.inc:546 reporting/rep105.php:116
-#: reporting/includes/doctext.inc:166 reporting/includes/doctext.inc:207
+#: includes/ui/ui_view.inc:552 reporting/rep105.php:116
+#: reporting/includes/doctext.inc:166 reporting/includes/doctext.inc:209
 msgid "Total Amount"
 msgstr ""
 
 msgid "Total Amount"
 msgstr ""
 
-#: includes/ui/ui_view.inc:570
+#: includes/ui/ui_view.inc:576
 msgid "Total Allocated:"
 msgstr ""
 
 msgid "Total Allocated:"
 msgstr ""
 
-#: includes/ui/ui_view.inc:576
+#: includes/ui/ui_view.inc:582
 msgid "Left to Allocate:"
 msgstr ""
 
 msgid "Left to Allocate:"
 msgstr ""
 
-#: includes/ui/ui_view.inc:592 includes/ui/ui_view.inc:596
+#: includes/ui/ui_view.inc:598 includes/ui/ui_view.inc:602
 #: purchasing/inquiry/supplier_allocation_inquiry.php:99
 msgid "Allocations"
 msgstr ""
 
 #: purchasing/inquiry/supplier_allocation_inquiry.php:99
 msgid "Allocations"
 msgstr ""
 
-#: includes/ui/ui_view.inc:609 includes/ui/ui_view.inc:613
+#: includes/ui/ui_view.inc:615 includes/ui/ui_view.inc:619
 msgid "Pre-Payments"
 msgstr ""
 
 msgid "Pre-Payments"
 msgstr ""
 
-#: includes/ui/ui_view.inc:629
+#: includes/ui/ui_view.inc:635
 msgid "No Quick Entries are defined."
 msgstr ""
 
 msgid "No Quick Entries are defined."
 msgstr ""
 
-#: includes/ui/ui_view.inc:644
+#: includes/ui/ui_view.inc:650
 msgid "No Quick Entry lines are defined."
 msgstr ""
 
 msgid "No Quick Entry lines are defined."
 msgstr ""
 
-#: includes/ui/ui_view.inc:875 purchasing/includes/ui/invoice_ui.inc:482
+#: includes/ui/ui_view.inc:881 purchasing/includes/ui/invoice_ui.inc:482
 msgid "and"
 msgstr ""
 
 msgid "and"
 msgstr ""
 
-#: includes/ui/ui_view.inc:982
+#: includes/ui/ui_view.inc:1010
 msgid "January"
 msgstr ""
 
 msgid "January"
 msgstr ""
 
-#: includes/ui/ui_view.inc:982
+#: includes/ui/ui_view.inc:1010
 msgid "February"
 msgstr ""
 
 msgid "February"
 msgstr ""
 
-#: includes/ui/ui_view.inc:982
+#: includes/ui/ui_view.inc:1010
 msgid "March"
 msgstr ""
 
 msgid "March"
 msgstr ""
 
-#: includes/ui/ui_view.inc:982
+#: includes/ui/ui_view.inc:1010
 msgid "April"
 msgstr ""
 
 msgid "April"
 msgstr ""
 
-#: includes/ui/ui_view.inc:982
+#: includes/ui/ui_view.inc:1010
 msgid "June"
 msgstr ""
 
 msgid "June"
 msgstr ""
 
-#: includes/ui/ui_view.inc:982
+#: includes/ui/ui_view.inc:1010
 msgid "July"
 msgstr ""
 
 msgid "July"
 msgstr ""
 
-#: includes/ui/ui_view.inc:982
+#: includes/ui/ui_view.inc:1010
 msgid "August"
 msgstr ""
 
 msgid "August"
 msgstr ""
 
-#: includes/ui/ui_view.inc:982
+#: includes/ui/ui_view.inc:1010
 msgid "September"
 msgstr ""
 
 msgid "September"
 msgstr ""
 
-#: includes/ui/ui_view.inc:982
+#: includes/ui/ui_view.inc:1010
 msgid "October"
 msgstr ""
 
 msgid "October"
 msgstr ""
 
-#: includes/ui/ui_view.inc:982
+#: includes/ui/ui_view.inc:1010
 msgid "November"
 msgstr ""
 
 msgid "November"
 msgstr ""
 
-#: includes/ui/ui_view.inc:982
+#: includes/ui/ui_view.inc:1010
 msgid "December"
 msgstr ""
 
 msgid "December"
 msgstr ""
 
-#: includes/ui/ui_view.inc:983
+#: includes/ui/ui_view.inc:1011
 msgid "Su"
 msgstr ""
 
 msgid "Su"
 msgstr ""
 
-#: includes/ui/ui_view.inc:983
+#: includes/ui/ui_view.inc:1011
 msgid "Mo"
 msgstr ""
 
 msgid "Mo"
 msgstr ""
 
-#: includes/ui/ui_view.inc:983
+#: includes/ui/ui_view.inc:1011
 msgid "Tu"
 msgstr ""
 
 msgid "Tu"
 msgstr ""
 
-#: includes/ui/ui_view.inc:983
+#: includes/ui/ui_view.inc:1011
 msgid "We"
 msgstr ""
 
 msgid "We"
 msgstr ""
 
-#: includes/ui/ui_view.inc:983
+#: includes/ui/ui_view.inc:1011
 msgid "Th"
 msgstr ""
 
 msgid "Th"
 msgstr ""
 
-#: includes/ui/ui_view.inc:983
+#: includes/ui/ui_view.inc:1011
 msgid "Fr"
 msgstr ""
 
 msgid "Fr"
 msgstr ""
 
-#: includes/ui/ui_view.inc:983
+#: includes/ui/ui_view.inc:1011
 msgid "Sa"
 msgstr ""
 
 msgid "Sa"
 msgstr ""
 
-#: includes/ui/ui_view.inc:984
+#: includes/ui/ui_view.inc:1012
 msgid "W"
 msgstr ""
 
 msgid "W"
 msgstr ""
 
@@ -8238,7 +8994,7 @@ msgid "Enter &Another Adjustment"
 msgstr ""
 
 #: inventory/adjustments.php:104 inventory/transfers.php:98
 msgstr ""
 
 #: inventory/adjustments.php:104 inventory/transfers.php:98
-#: sales/sales_order_entry.php:383
+#: sales/credit_note_entry.php:158 sales/sales_order_entry.php:383
 msgid "You must enter at least one non empty item line."
 msgstr ""
 
 msgid "You must enter at least one non empty item line."
 msgstr ""
 
@@ -8260,30 +9016,30 @@ msgstr ""
 msgid "The entered standard cost is negative or invalid."
 msgstr ""
 
 msgid "The entered standard cost is negative or invalid."
 msgstr ""
 
-#: inventory/adjustments.php:228 inventory/cost_update.php:42
-#: inventory/transfers.php:216 sales/sales_order_entry.php:701
+#: inventory/adjustments.php:231 inventory/cost_update.php:42
+#: inventory/transfers.php:217 sales/sales_order_entry.php:705
 msgid "There are no fixed assets defined in the system."
 msgstr ""
 
 msgid "There are no fixed assets defined in the system."
 msgstr ""
 
-#: inventory/adjustments.php:230
+#: inventory/adjustments.php:233
 msgid ""
 "There are no inventory items defined in the system which can be adjusted "
 "(Purchased or Manufactured)."
 msgstr ""
 
 msgid ""
 "There are no inventory items defined in the system which can be adjusted "
 "(Purchased or Manufactured)."
 msgstr ""
 
-#: inventory/adjustments.php:239
+#: inventory/adjustments.php:242
 msgid "Disposal Items"
 msgstr ""
 
 msgid "Disposal Items"
 msgstr ""
 
-#: inventory/adjustments.php:240
+#: inventory/adjustments.php:243
 msgid "Process Disposal"
 msgstr ""
 
 msgid "Process Disposal"
 msgstr ""
 
-#: inventory/adjustments.php:242
+#: inventory/adjustments.php:245
 msgid "Adjustment Items"
 msgstr ""
 
 msgid "Adjustment Items"
 msgstr ""
 
-#: inventory/adjustments.php:243
+#: inventory/adjustments.php:246
 msgid "Process Adjustment"
 msgstr ""
 
 msgid "Process Adjustment"
 msgstr ""
 
@@ -8324,27 +9080,23 @@ msgstr ""
 #: inventory/inquiry/stock_status.php:45 inventory/manage/item_codes.php:108
 #: manufacturing/work_order_entry.php:376
 #: manufacturing/work_order_entry.php:381 purchasing/inquiry/po_search.php:74
 #: inventory/inquiry/stock_status.php:45 inventory/manage/item_codes.php:108
 #: manufacturing/work_order_entry.php:376
 #: manufacturing/work_order_entry.php:381 purchasing/inquiry/po_search.php:74
-#: sales/inquiry/sales_deliveries_view.php:112
-#: sales/inquiry/sales_orders_view.php:229
+#: sales/inquiry/sales_deliveries_view.php:113
+#: sales/inquiry/sales_orders_view.php:249
 msgid "Item:"
 msgstr ""
 
 msgid "Item:"
 msgstr ""
 
-#: inventory/cost_update.php:133
+#: inventory/cost_update.php:135
 msgid "Unit cost"
 msgstr ""
 
 msgid "Unit cost"
 msgstr ""
 
-#: inventory/cost_update.php:137
+#: inventory/cost_update.php:139
 msgid "Standard Labour Cost Per Unit"
 msgstr ""
 
 msgid "Standard Labour Cost Per Unit"
 msgstr ""
 
-#: inventory/cost_update.php:138
+#: inventory/cost_update.php:140
 msgid "Standard Overhead Cost Per Unit"
 msgstr ""
 
 msgid "Standard Overhead Cost Per Unit"
 msgstr ""
 
-#: inventory/cost_update.php:145
-msgid "Reference line:"
-msgstr ""
-
 #: inventory/prices.php:29
 msgid "Inventory Item Sales prices"
 msgstr ""
 #: inventory/prices.php:29
 msgid "Inventory Item Sales prices"
 msgstr ""
@@ -8385,22 +9137,21 @@ msgid "The selected price has been deleted."
 msgstr ""
 
 #: inventory/prices.php:151 reporting/rep104.php:116
 msgstr ""
 
 #: 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:98
+#: sales/customer_delivery.php:344 sales/customer_invoice.php:454
+#: sales/includes/ui/sales_credit_ui.inc:98 sales/view/view_credit.php:73
+#: sales/view/view_dispatch.php:93 sales/view/view_invoice.php:93
 msgid "Sales Type"
 msgstr ""
 
 msgid "Sales Type"
 msgstr ""
 
-#: inventory/prices.php:151 inventory/purchasing_data.php:150
-#: purchasing/includes/ui/invoice_ui.inc:514
-#: purchasing/po_receive_items.php:63 purchasing/view/view_grn.php:41
-#: purchasing/view/view_po.php:45 reporting/rep104.php:109
-#: reporting/includes/doctext.inc:32 reporting/includes/doctext.inc:191
-#: sales/customer_credit_invoice.php:276 sales/customer_delivery.php:421
-#: sales/customer_invoice.php:519 sales/customer_invoice.php:522
+#: inventory/prices.php:151 inventory/purchasing_data.php:151
+#: purchasing/po_receive_items.php:63 purchasing/includes/ui/invoice_ui.inc:514
+#: purchasing/view/view_grn.php:41 purchasing/view/view_po.php:45
+#: reporting/rep104.php:109 reporting/includes/doctext.inc:32
+#: reporting/includes/doctext.inc:191 sales/customer_credit_invoice.php:276
+#: sales/customer_delivery.php:422 sales/customer_invoice.php:520
+#: sales/customer_invoice.php:523 sales/includes/ui/sales_credit_ui.inc:163
 #: sales/view/view_credit.php:91 sales/view/view_dispatch.php:113
 #: 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:163
+#: sales/view/view_invoice.php:116 sales/view/view_sales_order.php:222
 msgid "Price"
 msgstr ""
 
 msgid "Price"
 msgstr ""
 
@@ -8412,15 +9163,15 @@ msgstr ""
 msgid "Sales Type:"
 msgstr ""
 
 msgid "Sales Type:"
 msgstr ""
 
-#: inventory/prices.php:203 inventory/purchasing_data.php:213
+#: inventory/prices.php:204 inventory/purchasing_data.php:214
 msgid "Price:"
 msgstr ""
 
 msgid "Price:"
 msgstr ""
 
-#: inventory/prices.php:203
+#: inventory/prices.php:204
 msgid "per"
 msgstr ""
 
 msgid "per"
 msgstr ""
 
-#: inventory/prices.php:207
+#: inventory/prices.php:208
 msgid "The price is calculated."
 msgstr ""
 
 msgid "The price is calculated."
 msgstr ""
 
@@ -8433,7 +9184,7 @@ msgid "There are no purchasable inventory items defined in the system."
 msgstr ""
 
 #: inventory/purchasing_data.php:30 purchasing/po_entry_items.php:73
 msgstr ""
 
 #: inventory/purchasing_data.php:30 purchasing/po_entry_items.php:73
-#: purchasing/supplier_credit.php:65 purchasing/supplier_invoice.php:53
+#: purchasing/supplier_credit.php:68 purchasing/supplier_invoice.php:53
 #: purchasing/supplier_payment.php:40
 msgid "There are no suppliers defined in the system."
 msgstr ""
 #: purchasing/supplier_payment.php:40
 msgid "There are no suppliers defined in the system."
 msgstr ""
@@ -8473,31 +9224,31 @@ msgstr ""
 msgid "Entered item is not defined. Please re-enter."
 msgstr ""
 
 msgid "Entered item is not defined. Please re-enter."
 msgstr ""
 
-#: inventory/purchasing_data.php:144
+#: inventory/purchasing_data.php:145
 msgid "There is no purchasing data set up for the part selected"
 msgstr ""
 
 msgid "There is no purchasing data set up for the part selected"
 msgstr ""
 
-#: inventory/purchasing_data.php:151
+#: inventory/purchasing_data.php:152
 msgid "Supplier's Unit"
 msgstr ""
 
 msgid "Supplier's Unit"
 msgstr ""
 
-#: inventory/purchasing_data.php:151
+#: inventory/purchasing_data.php:152
 msgid "Conversion Factor"
 msgstr ""
 
 msgid "Conversion Factor"
 msgstr ""
 
-#: inventory/purchasing_data.php:151
+#: inventory/purchasing_data.php:152
 msgid "Supplier's Description"
 msgstr ""
 
 msgid "Supplier's Description"
 msgstr ""
 
-#: inventory/purchasing_data.php:214
+#: inventory/purchasing_data.php:215
 msgid "Suppliers Unit of Measure:"
 msgstr ""
 
 msgid "Suppliers Unit of Measure:"
 msgstr ""
 
-#: inventory/purchasing_data.php:220
+#: inventory/purchasing_data.php:221
 msgid "Conversion Factor (to our UOM):"
 msgstr ""
 
 msgid "Conversion Factor (to our UOM):"
 msgstr ""
 
-#: inventory/purchasing_data.php:221
+#: inventory/purchasing_data.php:222
 msgid "Supplier's Code or Description:"
 msgstr ""
 
 msgid "Supplier's Code or Description:"
 msgstr ""
 
@@ -8506,39 +9257,13 @@ msgid "Reorder Levels"
 msgstr ""
 
 #: inventory/reorder_level.php:30 inventory/transfers.php:42
 msgstr ""
 
 #: inventory/reorder_level.php:30 inventory/transfers.php:42
-#: inventory/transfers.php:218
+#: inventory/transfers.php:219
 msgid ""
 "There are no inventory items defined in the system (Purchased or "
 "manufactured items)."
 msgstr ""
 
 msgid ""
 "There are no inventory items defined in the system (Purchased or "
 "manufactured items)."
 msgstr ""
 
-#: inventory/reorder_level.php:71 inventory/inquiry/stock_movements.php:107
-#: inventory/inquiry/stock_status.php:70 inventory/inquiry/stock_status.php:74
-#: manufacturing/search_work_orders.php:160
-#: manufacturing/inquiry/where_used_inquiry.php:45
-#: manufacturing/manage/bom_edit.php:43
-#: purchasing/inquiry/po_search_completed.php:113
-#: purchasing/inquiry/po_search_completed.php:123
-#: purchasing/inquiry/po_search.php:120 purchasing/inquiry/po_search.php:131
-#: reporting/rep105.php:121 reporting/rep301.php:171 reporting/rep302.php:130
-#: reporting/rep303.php:134 reporting/rep304.php:136 reporting/rep306.php:150
-#: reporting/rep307.php:121 reporting/rep308.php:231 reporting/rep310.php:142
-#: reporting/rep310.php:151 reporting/rep402.php:103 reporting/rep402.php:109
-#: reporting/rep451.php:87 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:287 reporting/reports_main.php:304
-#: sales/manage/sales_points.php:84
-msgid "Location"
-msgstr ""
-
-#: inventory/reorder_level.php:71 inventory/inquiry/stock_movements.php:109
-#: inventory/inquiry/stock_status.php:74 purchasing/supplier_credit.php:220
-msgid "Quantity On Hand"
-msgstr ""
-
-#: inventory/reorder_level.php:71 inventory/includes/inventory_db.inc:99
+#: inventory/reorder_level.php:71 inventory/includes/inventory_db.inc:101
 #: inventory/inquiry/stock_status.php:74
 msgid "Re-Order Level"
 msgstr ""
 #: inventory/inquiry/stock_status.php:74
 msgid "Re-Order Level"
 msgstr ""
@@ -8589,24 +9314,24 @@ msgstr ""
 msgid "The quantity entered must be a positive number."
 msgstr ""
 
 msgid "The quantity entered must be a positive number."
 msgstr ""
 
-#: inventory/transfers.php:238
+#: inventory/transfers.php:239
 msgid "Process Transfer"
 msgstr ""
 
 msgid "Process Transfer"
 msgstr ""
 
-#: inventory/includes/inventory_db.inc:96
+#: inventory/includes/inventory_db.inc:98
 msgid "Stocks below Re-Order Level at "
 msgstr ""
 
 msgid "Stocks below Re-Order Level at "
 msgstr ""
 
-#: inventory/includes/inventory_db.inc:99
+#: inventory/includes/inventory_db.inc:101
 msgid "Below"
 msgstr ""
 
 msgid "Below"
 msgstr ""
 
-#: inventory/includes/inventory_db.inc:100
+#: inventory/includes/inventory_db.inc:102
 msgid "Please reorder"
 msgstr ""
 
 #: inventory/includes/item_adjustments_ui.inc:20
 msgid "Please reorder"
 msgstr ""
 
 #: inventory/includes/item_adjustments_ui.inc:20
-#: inventory/includes/stock_transfers_ui.inc:20
+#: inventory/includes/stock_transfers_ui.inc:22
 #: manufacturing/includes/work_order_issue_ui.inc:20
 #: sales/includes/ui/sales_order_ui.inc:59
 msgid "For Part :"
 #: manufacturing/includes/work_order_issue_ui.inc:20
 #: sales/includes/ui/sales_order_ui.inc:59
 msgid "For Part :"
@@ -8614,87 +9339,88 @@ msgstr ""
 
 #: inventory/includes/item_adjustments_ui.inc:34
 #: manufacturing/work_order_entry.php:200 purchasing/inquiry/po_search.php:67
 
 #: inventory/includes/item_adjustments_ui.inc:34
 #: manufacturing/work_order_entry.php:200 purchasing/inquiry/po_search.php:67
-#: sales/inquiry/sales_deliveries_view.php:105
-#: sales/inquiry/sales_orders_view.php:220
+#: sales/inquiry/sales_deliveries_view.php:106
+#: sales/inquiry/sales_orders_view.php:240
 msgid "Location:"
 msgstr ""
 
 #: inventory/includes/item_adjustments_ui.inc:56
 #: inventory/includes/item_adjustments_ui.inc:59
 msgid "Location:"
 msgstr ""
 
 #: inventory/includes/item_adjustments_ui.inc:56
 #: inventory/includes/item_adjustments_ui.inc:59
-#: inventory/includes/stock_transfers_ui.inc:57
+#: inventory/includes/stock_transfers_ui.inc:59
 #: inventory/inquiry/stock_list.php:53 inventory/view/view_adjustment.php:54
 #: inventory/view/view_transfer.php:50
 #: manufacturing/includes/work_order_issue_ui.inc:33
 #: inventory/inquiry/stock_list.php:53 inventory/view/view_adjustment.php:54
 #: inventory/view/view_transfer.php:50
 #: manufacturing/includes/work_order_issue_ui.inc:33
-#: purchasing/includes/ui/po_ui.inc:214 purchasing/po_receive_items.php:62
+#: purchasing/po_receive_items.php:62 purchasing/includes/ui/po_ui.inc:216
 #: purchasing/view/view_grn.php:40 purchasing/view/view_po.php:45
 #: reporting/includes/doctext.inc:31 reporting/includes/doctext.inc:190
 #: purchasing/view/view_grn.php:40 purchasing/view/view_po.php:45
 #: reporting/includes/doctext.inc:31 reporting/includes/doctext.inc:190
-#: reporting/includes/doctext.inc:227 sales/customer_credit_invoice.php:275
-#: sales/customer_delivery.php:419 sales/customer_invoice.php:518
-#: sales/customer_invoice.php:521 sales/view/view_credit.php:90
+#: reporting/includes/doctext.inc:229 sales/customer_credit_invoice.php:275
+#: sales/customer_delivery.php:420 sales/customer_invoice.php:519
+#: sales/customer_invoice.php:522 sales/includes/ui/sales_credit_ui.inc:162
+#: sales/includes/ui/sales_order_ui.inc:146 sales/view/view_credit.php:90
 #: sales/view/view_dispatch.php:112 sales/view/view_invoice.php:115
 #: 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
+#: sales/view/view_sales_order.php:221
 msgid "Item Code"
 msgstr ""
 
 #: inventory/includes/item_adjustments_ui.inc:56
 #: inventory/includes/item_adjustments_ui.inc:59
 msgid "Item Code"
 msgstr ""
 
 #: inventory/includes/item_adjustments_ui.inc:56
 #: inventory/includes/item_adjustments_ui.inc:59
-#: inventory/includes/stock_transfers_ui.inc:57
+#: inventory/includes/stock_transfers_ui.inc:59
 #: manufacturing/includes/work_order_issue_ui.inc:33
 #: manufacturing/includes/work_order_issue_ui.inc:33
-#: purchasing/includes/ui/po_ui.inc:214 purchasing/view/view_grn.php:40
+#: purchasing/includes/ui/po_ui.inc:216 purchasing/view/view_grn.php:40
 #: purchasing/view/view_po.php:45 reporting/includes/doctext.inc:31
 #: purchasing/view/view_po.php:45 reporting/includes/doctext.inc:31
-#: reporting/includes/doctext.inc:190 reporting/includes/doctext.inc:227
-#: sales/customer_credit_invoice.php:275 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
+#: reporting/includes/doctext.inc:190 reporting/includes/doctext.inc:229
+#: sales/customer_credit_invoice.php:275 sales/customer_delivery.php:420
+#: sales/customer_invoice.php:519 sales/customer_invoice.php:522
 #: sales/includes/ui/sales_credit_ui.inc:162
 #: sales/includes/ui/sales_credit_ui.inc:162
-#: sales/includes/ui/sales_order_ui.inc:146
+#: sales/includes/ui/sales_order_ui.inc:146 sales/view/view_credit.php:90
+#: sales/view/view_dispatch.php:112 sales/view/view_invoice.php:115
+#: sales/view/view_sales_order.php:221
 msgid "Item Description"
 msgstr ""
 
 #: inventory/includes/item_adjustments_ui.inc:57
 #: inventory/includes/item_adjustments_ui.inc:60
 msgid "Item Description"
 msgstr ""
 
 #: inventory/includes/item_adjustments_ui.inc:57
 #: inventory/includes/item_adjustments_ui.inc:60
-#: inventory/includes/stock_transfers_ui.inc:57
+#: inventory/includes/stock_transfers_ui.inc:59
 #: inventory/manage/item_units.php:94
 #: manufacturing/includes/work_order_issue_ui.inc:34
 #: inventory/manage/item_units.php:94
 #: manufacturing/includes/work_order_issue_ui.inc:34
-#: purchasing/includes/ui/po_ui.inc:215 purchasing/view/view_grn.php:41
+#: purchasing/includes/ui/po_ui.inc:217 purchasing/view/view_grn.php:41
 #: purchasing/view/view_po.php:45 reporting/includes/doctext.inc:32
 #: purchasing/view/view_po.php:45 reporting/includes/doctext.inc:32
-#: reporting/includes/doctext.inc:191 sales/view/view_credit.php:91
+#: reporting/includes/doctext.inc:191 sales/includes/ui/sales_credit_ui.inc:162
+#: sales/includes/ui/sales_order_ui.inc:148 sales/view/view_credit.php:91
 #: sales/view/view_dispatch.php:113 sales/view/view_invoice.php:116
 #: 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:162
-#: sales/includes/ui/sales_order_ui.inc:148
+#: sales/view/view_sales_order.php:221
 msgid "Unit"
 msgstr ""
 
 #: inventory/includes/item_adjustments_ui.inc:57
 #: inventory/includes/item_adjustments_ui.inc:60
 #: inventory/view/view_adjustment.php:55
 msgid "Unit"
 msgstr ""
 
 #: 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/manufacturing_ui.inc:29
-#: manufacturing/includes/work_order_issue_ui.inc:34 reporting/rep301.php:164
+#: manufacturing/includes/work_order_issue_ui.inc:34
+#: manufacturing/view/wo_issue_view.php:76 reporting/rep301.php:168
 msgid "Unit Cost"
 msgstr ""
 
 msgid "Unit Cost"
 msgstr ""
 
-#: inventory/includes/item_adjustments_ui.inc:57
-#: inventory/manage/items.php:536
+#: inventory/includes/item_adjustments_ui.inc:57 inventory/manage/items.php:527
 msgid "Initial Value"
 msgstr ""
 
 msgid "Initial Value"
 msgstr ""
 
-#: inventory/includes/item_adjustments_ui.inc:118
+#: inventory/includes/item_adjustments_ui.inc:59 reporting/rep302.php:122
+msgid "QOH"
+msgstr ""
+
+#: inventory/includes/item_adjustments_ui.inc:133
 msgid ""
 "Marked items have insufficient quantities in stock as on day of adjustment."
 msgstr ""
 
 msgid ""
 "Marked items have insufficient quantities in stock as on day of adjustment."
 msgstr ""
 
-#: inventory/includes/stock_transfers_ui.inc:35
+#: inventory/includes/stock_transfers_ui.inc:38
 #: inventory/inquiry/stock_movements.php:83
 #: manufacturing/includes/work_order_issue_ui.inc:158
 msgid "From Location:"
 msgstr ""
 
 #: inventory/inquiry/stock_movements.php:83
 #: manufacturing/includes/work_order_issue_ui.inc:158
 msgid "From Location:"
 msgstr ""
 
-#: inventory/includes/stock_transfers_ui.inc:36
+#: inventory/includes/stock_transfers_ui.inc:39
 msgid "To Location:"
 msgstr ""
 
 msgid "To Location:"
 msgstr ""
 
@@ -8703,30 +9429,30 @@ msgid ""
 "Marked items have insufficient quantities in stock as on day of transfer."
 msgstr ""
 
 "Marked items have insufficient quantities in stock as on day of transfer."
 msgstr ""
 
-#: inventory/includes/db/items_db.inc:139
+#: inventory/includes/db/items_db.inc:140
 msgid ""
 "Cannot delete this item because there are stock movements that refer to this "
 "item."
 msgstr ""
 
 msgid ""
 "Cannot delete this item because there are stock movements that refer to this "
 "item."
 msgstr ""
 
-#: inventory/includes/db/items_db.inc:142
+#: inventory/includes/db/items_db.inc:143
 msgid ""
 "Cannot delete this item record because there are bills of material that "
 "require this part as a component."
 msgstr ""
 
 msgid ""
 "Cannot delete this item record because there are bills of material that "
 "require this part as a component."
 msgstr ""
 
-#: inventory/includes/db/items_db.inc:145
+#: inventory/includes/db/items_db.inc:146
 msgid ""
 "Cannot delete this item because there are existing sales order items for it."
 msgstr ""
 
 msgid ""
 "Cannot delete this item because there are existing sales order items for it."
 msgstr ""
 
-#: inventory/includes/db/items_db.inc:148
+#: inventory/includes/db/items_db.inc:149
 msgid ""
 "Cannot delete this item because there are existing purchase order items for "
 "it."
 msgstr ""
 
 msgid ""
 "Cannot delete this item because there are existing purchase order items for "
 "it."
 msgstr ""
 
-#: inventory/includes/db/items_db.inc:166
+#: inventory/includes/db/items_db.inc:167
 msgid ""
 "This item cannot be deleted because some code aliases \n"
 "\t\t\t\tor foreign codes was entered for it, or there are kits defined \n"
 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"
@@ -8754,15 +9480,6 @@ msgstr ""
 msgid "Show Movements"
 msgstr ""
 
 msgid "Show Movements"
 msgstr ""
 
-#: 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:147
-#: sales/inquiry/customer_allocation_inquiry.php:51
-#: sales/inquiry/customer_inquiry.php:164
-msgid "Refresh Inquiry"
-msgstr ""
-
 #: inventory/inquiry/stock_movements.php:109
 msgid "Detail"
 msgstr ""
 #: inventory/inquiry/stock_movements.php:109
 msgid "Detail"
 msgstr ""
@@ -8794,389 +9511,366 @@ msgid ""
 msgstr ""
 
 #: inventory/inquiry/stock_status.php:70 inventory/inquiry/stock_status.php:75
 msgstr ""
 
 #: inventory/inquiry/stock_status.php:70 inventory/inquiry/stock_status.php:75
-#: reporting/rep303.php:121 reporting/rep303.php:127
+#: reporting/rep303.php:223 reporting/rep303.php:229
 msgid "Demand"
 msgstr ""
 
 msgid "Demand"
 msgstr ""
 
-#: inventory/inquiry/stock_status.php:75 reporting/rep303.php:121
-#: reporting/rep303.php:127
+#: inventory/inquiry/stock_status.php:75 reporting/rep303.php:223
+#: reporting/rep303.php:229
 msgid "On Order"
 msgstr ""
 
 msgid "On Order"
 msgstr ""
 
-#: inventory/manage/item_categories.php:47
-msgid "The item category description cannot be empty."
+#: inventory/manage/items.php:74
+msgid "No image"
 msgstr ""
 
 msgstr ""
 
-#: inventory/manage/item_categories.php:61
-msgid "Selected item category has been updated"
+#: inventory/manage/items.php:91
+msgid "Delete Image:"
 msgstr ""
 
 msgstr ""
 
-#: inventory/manage/item_categories.php:71
-msgid "New item category has been added"
+#: inventory/manage/items.php:133
+msgid "Error uploading file."
 msgstr ""
 
 msgstr ""
 
-#: inventory/manage/item_categories.php:85
+#: inventory/manage/items.php:150
 msgid ""
 msgid ""
-"Cannot delete this item category because items have been created using this "
-"item category."
+"Only graphics files are supported - a file extension of .jpg, .png or .gif "
+"is expected"
 msgstr ""
 
 msgstr ""
 
-#: inventory/manage/item_categories.php:90
-msgid "Selected item category has been deleted"
+#: inventory/manage/items.php:183
+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 ""
 
 msgstr ""
 
-#: inventory/manage/item_categories.php:117
-#: inventory/manage/item_categories.php:121
-msgid "Tax type"
+#: inventory/manage/items.php:184
+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 ""
 
 msgstr ""
 
-#: inventory/manage/item_categories.php:117
-#: inventory/manage/item_categories.php:121
-#: inventory/manage/item_codes.php:126 inventory/manage/sales_kits.php:36
-#: inventory/view/view_adjustment.php:55 inventory/view/view_transfer.php:50
-#: manufacturing/view/wo_issue_view.php:76
-#: manufacturing/manage/bom_edit.php:44 purchasing/po_receive_items.php:62
-#: sales/customer_credit_invoice.php:275 sales/customer_delivery.php:420
-#: sales/customer_invoice.php:518 sales/customer_invoice.php:521
-msgid "Units"
+#: inventory/manage/items.php:186
+msgid ""
+"There are no item categories defined in the system. At least one item "
+"category is required to add a item."
 msgstr ""
 
 msgstr ""
 
-#: inventory/manage/item_categories.php:117
-#: inventory/manage/item_categories.php:121
-msgid "Sales Act"
+#: inventory/manage/items.php:188
+msgid ""
+"There are no item tax types defined in the system. At least one item tax "
+"type is required to add a item."
 msgstr ""
 
 msgstr ""
 
-#: inventory/manage/item_categories.php:118
-msgid "Asset Account"
+#: inventory/manage/items.php:220
+msgid "The item name must be entered."
 msgstr ""
 
 msgstr ""
 
-#: inventory/manage/item_categories.php:118
-msgid "Deprecation Cost Account"
+#: inventory/manage/items.php:226
+msgid "The item code cannot be empty"
 msgstr ""
 
 msgstr ""
 
-#: inventory/manage/item_categories.php:119
-msgid "Depreciation/Disposal Account"
+#: inventory/manage/items.php:234
+msgid ""
+"The item code cannot contain any of the following characters -  & + OR a "
+"space OR quotes"
 msgstr ""
 
 msgstr ""
 
-#: inventory/manage/item_categories.php:122
-msgid "Inventory Account"
+#: inventory/manage/items.php:241 inventory/manage/item_codes.php:58
+#: inventory/manage/sales_kits.php:89
+msgid "This item code is already assigned to stock item or sale kit."
 msgstr ""
 
 msgstr ""
 
-#: inventory/manage/item_categories.php:122
-msgid "COGS Account"
+#: inventory/manage/items.php:254
+msgid "The depracation cannot start before the fixed asset purchase date"
 msgstr ""
 
 msgstr ""
 
-#: inventory/manage/item_categories.php:122
-msgid "Adjustment Account"
+#: inventory/manage/items.php:282
+msgid "Item has been updated."
 msgstr ""
 
 msgstr ""
 
-#: inventory/manage/item_categories.php:123
-msgid "Assembly Account"
+#: inventory/manage/items.php:297
+msgid "A new item has been added."
 msgstr ""
 
 msgstr ""
 
-#: inventory/manage/item_categories.php:208
-msgid "Category Name:"
+#: inventory/manage/items.php:339
+msgid "Selected item has been deleted."
 msgstr ""
 
 msgstr ""
 
-#: inventory/manage/item_categories.php:210
-msgid "Default values for new items"
+#: inventory/manage/items.php:356
+msgid "General Settings"
+msgstr ""
+
+#: inventory/manage/items.php:365
+msgid "Generate EAN-8 Barcode"
 msgstr ""
 
 msgstr ""
 
-#: inventory/manage/item_categories.php:212 inventory/manage/items.php:405
+#: inventory/manage/items.php:372 inventory/manage/items.php:382
+msgid "Item Code:"
+msgstr ""
+
+#: inventory/manage/items.php:392 inventory/manage/item_codes.php:187
+#: inventory/manage/sales_kits.php:207 inventory/manage/sales_kits.php:231
+msgid "Category:"
+msgstr ""
+
+#: inventory/manage/items.php:417 inventory/manage/item_categories.php:212
 msgid "Item Tax Type:"
 msgstr ""
 
 msgid "Item Tax Type:"
 msgstr ""
 
-#: inventory/manage/item_categories.php:217 inventory/manage/items.php:408
+#: inventory/manage/items.php:420 inventory/manage/item_categories.php:217
 msgid "Item Type:"
 msgstr ""
 
 msgid "Item Type:"
 msgstr ""
 
-#: inventory/manage/item_categories.php:219 inventory/manage/items.php:410
+#: inventory/manage/items.php:422 inventory/manage/item_categories.php:219
 msgid "Units of Measure:"
 msgstr ""
 
 msgid "Units of Measure:"
 msgstr ""
 
-#: inventory/manage/item_categories.php:224 inventory/manage/items.php:417
+#: inventory/manage/items.php:426
+msgid "Editable description:"
+msgstr ""
+
+#: inventory/manage/items.php:427 inventory/manage/item_categories.php:224
 msgid "Exclude from sales:"
 msgstr ""
 
 msgid "Exclude from sales:"
 msgstr ""
 
-#: inventory/manage/item_categories.php:226 inventory/manage/items.php:419
+#: inventory/manage/items.php:428 inventory/manage/item_categories.php:226
 msgid "Exclude from purchases:"
 msgstr ""
 
 msgid "Exclude from purchases:"
 msgstr ""
 
-#: inventory/manage/item_categories.php:238 inventory/manage/items.php:482
-msgid "Asset account:"
+#: inventory/manage/items.php:434
+msgid "Fixed Asset Class"
 msgstr ""
 
 msgstr ""
 
-#: inventory/manage/item_categories.php:239 inventory/manage/items.php:483
-msgid "Depreciation cost account:"
+#: inventory/manage/items.php:436
+msgid "Depreciation Method"
 msgstr ""
 
 msgstr ""
 
-#: inventory/manage/item_categories.php:240 inventory/manage/items.php:484
-msgid "Depreciation/Disposal account:"
+#: inventory/manage/items.php:447 inventory/manage/items.php:456
+msgid "Depreciation Rate"
 msgstr ""
 
 msgstr ""
 
-#: inventory/manage/item_categories.php:251
-msgid "Item Assembly Costs Account:"
+#: inventory/manage/items.php:451
+msgid "Depreciation Years"
 msgstr ""
 
 msgstr ""
 
-#: inventory/manage/item_codes.php:20
-msgid "Foreign Item Codes"
+#: inventory/manage/items.php:454
+msgid "Base Rate"
 msgstr ""
 
 msgstr ""
 
-#: inventory/manage/item_codes.php:26 sales/sales_order_entry.php:703
-msgid "There are no inventory items defined in the system."
+#: inventory/manage/items.php:459
+msgid "Rate multiplier"
 msgstr ""
 
 msgstr ""
 
-#: inventory/manage/item_codes.php:44
-msgid "The quantity entered was not positive number."
+#: inventory/manage/items.php:463 inventory/manage/items.php:466
+msgid "Depreciation Start"
 msgstr ""
 
 msgstr ""
 
-#: inventory/manage/item_codes.php:50 inventory/manage/sales_kits.php:74
-msgid "Item code description cannot be empty."
+#: inventory/manage/items.php:467
+msgid "Last Depreciation"
 msgstr ""
 
 msgstr ""
 
-#: 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:70
-msgid "New item code has been added."
-msgstr ""
-
-#: inventory/manage/item_codes.php:76
-msgid "Item code has been updated."
-msgstr ""
-
-#: inventory/manage/item_codes.php:88
-msgid "Item code has been sucessfully deleted."
-msgstr ""
-
-#: inventory/manage/item_codes.php:126
-msgid "EAN/UPC Code"
-msgstr ""
-
-#: inventory/manage/item_codes.php:180
-msgid "UPC/EAN code:"
-msgstr ""
-
-#: inventory/manage/item_codes.php:181 inventory/manage/sales_kits.php:243
-#: manufacturing/work_order_add_finished.php:194
-#: manufacturing/work_order_entry.php:404
-#: manufacturing/manage/bom_edit.php:204
-msgid "Quantity:"
-msgstr ""
-
-#: inventory/manage/item_codes.php:182 inventory/manage/items.php:378
-#: inventory/manage/sales_kits.php:206 inventory/manage/sales_kits.php:230
-#: manufacturing/manage/work_centres.php:138
-#: sales/create_recurrent_invoices.php:179 sales/manage/credit_status.php:145
-#: sales/manage/recurrent_invoices.php:191 taxes/item_tax_types.php:173
-#: taxes/tax_groups.php:165 taxes/tax_types.php:158
-msgid "Description:"
-msgstr ""
-
-#: inventory/manage/item_codes.php:183 inventory/manage/items.php:380
-#: inventory/manage/sales_kits.php:207 inventory/manage/sales_kits.php:231
-msgid "Category:"
+#: inventory/manage/items.php:492 inventory/manage/item_categories.php:238
+msgid "Asset account:"
 msgstr ""
 
 msgstr ""
 
-#: inventory/manage/items.php:87
-msgid "Error uploading file."
+#: inventory/manage/items.php:493 inventory/manage/item_categories.php:239
+msgid "Depreciation cost account:"
 msgstr ""
 
 msgstr ""
 
-#: inventory/manage/items.php:104
-msgid ""
-"Only graphics files are supported - a file extension of .jpg, .png or .gif "
-"is expected"
+#: inventory/manage/items.php:494 inventory/manage/item_categories.php:240
+msgid "Depreciation/Disposal account:"
 msgstr ""
 
 msgstr ""
 
-#: 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."
+#: inventory/manage/items.php:515
+msgid "Other"
 msgstr ""
 
 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."
+#: inventory/manage/items.php:517
+msgid "Image File (.jpg)"
 msgstr ""
 
 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."
+#: inventory/manage/items.php:521
+msgid "Item status:"
 msgstr ""
 
 msgstr ""
 
-#: 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."
+#: inventory/manage/items.php:523
+msgid "Values"
 msgstr ""
 
 msgstr ""
 
-#: inventory/manage/items.php:173
-msgid "The item name must be entered."
+#: inventory/manage/items.php:529
+msgid "Current Value"
 msgstr ""
 
 msgstr ""
 
-#: inventory/manage/items.php:179
-msgid "The item code cannot be empty"
+#: inventory/manage/items.php:538
+msgid "Insert New Item"
 msgstr ""
 
 msgstr ""
 
-#: inventory/manage/items.php:187
-msgid ""
-"The item code cannot contain any of the following characters -  & + OR a "
-"space OR quotes"
+#: inventory/manage/items.php:542
+msgid "Update Item"
 msgstr ""
 
 msgstr ""
 
-#: inventory/manage/items.php:207
-msgid "The depracation cannot start before the fixed asset purchase date"
+#: inventory/manage/items.php:545
+msgid "Select this items and return to document entry."
 msgstr ""
 
 msgstr ""
 
-#: inventory/manage/items.php:239
-msgid "Item has been updated."
+#: inventory/manage/items.php:546
+msgid "Clone This Item"
 msgstr ""
 
 msgstr ""
 
-#: inventory/manage/items.php:254
-msgid "A new item has been added."
+#: inventory/manage/items.php:547
+msgid "Delete This Item"
 msgstr ""
 
 msgstr ""
 
-#: inventory/manage/items.php:297
-msgid "Selected item has been deleted."
+#: inventory/manage/items.php:563
+msgid "New item"
 msgstr ""
 
 msgstr ""
 
-#: inventory/manage/items.php:314
-msgid "General Settings"
+#: inventory/manage/items.php:587 inventory/manage/items.php:590
+#: purchasing/manage/suppliers.php:321 sales/manage/customers.php:352
+#: sales/manage/customer_branches.php:310
+msgid "&General settings"
 msgstr ""
 
 msgstr ""
 
-#: inventory/manage/items.php:323
-msgid "Generate EAN-8 Barcode"
+#: inventory/manage/items.php:588 inventory/manage/items.php:596
+#: purchasing/manage/suppliers.php:323 sales/manage/customers.php:354
+msgid "&Transactions"
 msgstr ""
 
 msgstr ""
 
-#: inventory/manage/items.php:330 inventory/manage/items.php:370
-msgid "Item Code:"
+#: inventory/manage/items.php:591
+msgid "S&ales Pricing"
 msgstr ""
 
 msgstr ""
 
-#: inventory/manage/items.php:412
-msgid "Editable description:"
+#: inventory/manage/items.php:592
+msgid "&Purchasing Pricing"
 msgstr ""
 
 msgstr ""
 
-#: inventory/manage/items.php:424
-msgid "Fixed Asset Class"
+#: inventory/manage/items.php:598
+msgid "&Status"
 msgstr ""
 
 msgstr ""
 
-#: inventory/manage/items.php:426
-msgid "Depreciation Method"
+#: inventory/manage/item_categories.php:47
+msgid "The item category description cannot be empty."
 msgstr ""
 
 msgstr ""
 
-#: inventory/manage/items.php:437 inventory/manage/items.php:446
-msgid "Depreciation Rate"
+#: inventory/manage/item_categories.php:61
+msgid "Selected item category has been updated"
 msgstr ""
 
 msgstr ""
 
-#: inventory/manage/items.php:441
-msgid "Depreciation Years"
+#: inventory/manage/item_categories.php:71
+msgid "New item category has been added"
 msgstr ""
 
 msgstr ""
 
-#: inventory/manage/items.php:441
-msgid "years"
+#: inventory/manage/item_categories.php:85
+msgid ""
+"Cannot delete this item category because items have been created using this "
+"item category."
 msgstr ""
 
 msgstr ""
 
-#: inventory/manage/items.php:444
-msgid "Base Rate"
+#: inventory/manage/item_categories.php:90
+msgid "Selected item category has been deleted"
 msgstr ""
 
 msgstr ""
 
-#: inventory/manage/items.php:449
-msgid "Rate multiplier"
+#: inventory/manage/item_categories.php:117
+#: inventory/manage/item_categories.php:121
+msgid "Tax type"
 msgstr ""
 
 msgstr ""
 
-#: inventory/manage/items.php:453 inventory/manage/items.php:456
-msgid "Depreciation Start"
+#: inventory/manage/item_categories.php:117
+#: inventory/manage/item_categories.php:121 inventory/manage/item_codes.php:130
+#: inventory/manage/sales_kits.php:36 inventory/view/view_adjustment.php:55
+#: inventory/view/view_transfer.php:50 manufacturing/manage/bom_edit.php:44
+#: manufacturing/view/wo_issue_view.php:76 purchasing/po_receive_items.php:62
+#: sales/customer_credit_invoice.php:275 sales/customer_delivery.php:421
+#: sales/customer_invoice.php:519 sales/customer_invoice.php:522
+msgid "Units"
 msgstr ""
 
 msgstr ""
 
-#: inventory/manage/items.php:457
-msgid "Last Depreciation"
+#: inventory/manage/item_categories.php:117
+#: inventory/manage/item_categories.php:121
+msgid "Sales Act"
 msgstr ""
 
 msgstr ""
 
-#: inventory/manage/items.php:505
-msgid "Other"
+#: inventory/manage/item_categories.php:118
+msgid "Asset Account"
 msgstr ""
 
 msgstr ""
 
-#: inventory/manage/items.php:508
-msgid "Image File (.jpg)"
+#: inventory/manage/item_categories.php:118
+msgid "Deprecation Cost Account"
 msgstr ""
 
 msgstr ""
 
-#: inventory/manage/items.php:523
-msgid "No image"
+#: inventory/manage/item_categories.php:119
+msgid "Depreciation/Disposal Account"
 msgstr ""
 
 msgstr ""
 
-#: inventory/manage/items.php:528
-msgid "Delete Image:"
+#: inventory/manage/item_categories.php:122
+msgid "Inventory Account"
 msgstr ""
 
 msgstr ""
 
-#: inventory/manage/items.php:530
-msgid "Item status:"
+#: inventory/manage/item_categories.php:122
+msgid "COGS Account"
 msgstr ""
 
 msgstr ""
 
-#: inventory/manage/items.php:532
-msgid "Values"
+#: inventory/manage/item_categories.php:122
+msgid "Adjustment Account"
 msgstr ""
 
 msgstr ""
 
-#: inventory/manage/items.php:537 reporting/rep451.php:80
-msgid "Depreciations"
+#: inventory/manage/item_categories.php:123
+msgid "Assembly Account"
 msgstr ""
 
 msgstr ""
 
-#: inventory/manage/items.php:538
-msgid "Current Value"
+#: inventory/manage/item_categories.php:208
+msgid "Category Name:"
 msgstr ""
 
 msgstr ""
 
-#: inventory/manage/items.php:547
-msgid "Insert New Item"
+#: inventory/manage/item_categories.php:210
+msgid "Default values for new items"
 msgstr ""
 
 msgstr ""
 
-#: inventory/manage/items.php:551
-msgid "Update Item"
+#: inventory/manage/item_categories.php:251
+msgid "Item Assembly Costs Account:"
 msgstr ""
 
 msgstr ""
 
-#: inventory/manage/items.php:554
-msgid "Select this items and return to document entry."
+#: inventory/manage/item_codes.php:20
+msgid "Foreign Item Codes"
 msgstr ""
 
 msgstr ""
 
-#: inventory/manage/items.php:555
-msgid "Clone This Item"
+#: inventory/manage/item_codes.php:26 sales/sales_order_entry.php:707
+msgid "There are no inventory items defined in the system."
 msgstr ""
 
 msgstr ""
 
-#: inventory/manage/items.php:556
-msgid "Delete This Item"
+#: inventory/manage/item_codes.php:44
+msgid "The quantity entered was not positive number."
 msgstr ""
 
 msgstr ""
 
-#: inventory/manage/items.php:571
-msgid "Select an item:"
+#: inventory/manage/item_codes.php:50 inventory/manage/sales_kits.php:74
+msgid "Item code description cannot be empty."
 msgstr ""
 
 msgstr ""
 
-#: inventory/manage/items.php:572
-msgid "New item"
+#: inventory/manage/item_codes.php:70
+msgid "New item code has been added."
 msgstr ""
 
 msgstr ""
 
-#: inventory/manage/items.php:596 inventory/manage/items.php:599
-#: purchasing/manage/suppliers.php:311 sales/manage/customer_branches.php:310
-#: sales/manage/customers.php:351
-msgid "&General settings"
+#: inventory/manage/item_codes.php:76
+msgid "Item code has been updated."
 msgstr ""
 
 msgstr ""
 
-#: inventory/manage/items.php:597 inventory/manage/items.php:605
-#: purchasing/manage/suppliers.php:313 sales/manage/customers.php:353
-msgid "&Transactions"
+#: inventory/manage/item_codes.php:88
+msgid "Item code has been sucessfully deleted."
 msgstr ""
 
 msgstr ""
 
-#: inventory/manage/items.php:600
-msgid "S&ales Pricing"
+#: inventory/manage/item_codes.php:130
+msgid "EAN/UPC Code"
 msgstr ""
 
 msgstr ""
 
-#: inventory/manage/items.php:601
-msgid "&Purchasing Pricing"
+#: inventory/manage/item_codes.php:184
+msgid "UPC/EAN code:"
 msgstr ""
 
 msgstr ""
 
-#: inventory/manage/items.php:606
-msgid "&Status"
+#: inventory/manage/item_codes.php:185 inventory/manage/sales_kits.php:243
+#: manufacturing/work_order_add_finished.php:194
+#: manufacturing/work_order_entry.php:404 manufacturing/manage/bom_edit.php:233
+msgid "Quantity:"
 msgstr ""
 
 #: inventory/manage/item_units.php:16
 msgstr ""
 
 #: inventory/manage/item_units.php:16
@@ -9320,7 +10014,7 @@ msgstr ""
 msgid "kit"
 msgstr ""
 
 msgid "kit"
 msgstr ""
 
-#: inventory/manage/sales_kits.php:68 manufacturing/manage/bom_edit.php:74
+#: inventory/manage/sales_kits.php:68 manufacturing/manage/bom_edit.php:95
 msgid "The quantity entered must be numeric and greater than zero."
 msgstr ""
 
 msgid "The quantity entered must be numeric and greater than zero."
 msgstr ""
 
@@ -9362,7 +10056,7 @@ msgid ""
 "following kits"
 msgstr ""
 
 "following kits"
 msgstr ""
 
-#: inventory/manage/sales_kits.php:168 manufacturing/manage/bom_edit.php:126
+#: inventory/manage/sales_kits.php:168 manufacturing/manage/bom_edit.php:147
 msgid "The component item has been deleted from this bom"
 msgstr ""
 
 msgid "The component item has been deleted from this bom"
 msgstr ""
 
@@ -9382,8 +10076,8 @@ msgstr ""
 msgid "Update kit/alias name"
 msgstr ""
 
 msgid "Update kit/alias name"
 msgstr ""
 
-#: inventory/manage/sales_kits.php:223 manufacturing/manage/bom_edit.php:180
-#: manufacturing/manage/bom_edit.php:187
+#: inventory/manage/sales_kits.php:223 manufacturing/manage/bom_edit.php:209
+#: manufacturing/manage/bom_edit.php:216
 msgid "Component:"
 msgstr ""
 
 msgid "Component:"
 msgstr ""
 
@@ -9407,10 +10101,10 @@ msgstr ""
 msgid "View Inventory Transfer"
 msgstr ""
 
 msgid "View Inventory Transfer"
 msgstr ""
 
-#: inventory/view/view_transfer.php:40 manufacturing/view/wo_issue_view.php:43
+#: inventory/view/view_transfer.php:40
 #: manufacturing/includes/manufacturing_ui.inc:29
 #: manufacturing/includes/manufacturing_ui.inc:100
 #: manufacturing/includes/manufacturing_ui.inc:29
 #: manufacturing/includes/manufacturing_ui.inc:100
-#: reporting/includes/doctext.inc:228
+#: manufacturing/view/wo_issue_view.php:43 reporting/includes/doctext.inc:230
 msgid "From Location"
 msgstr ""
 
 msgid "From Location"
 msgstr ""
 
@@ -9418,63 +10112,61 @@ msgstr ""
 msgid "To Location"
 msgstr ""
 
 msgid "To Location"
 msgstr ""
 
-#: manufacturing/search_work_orders.php:26
+#: manufacturing/search_work_orders.php:28
 msgid "Search Outstanding Work Orders"
 msgstr ""
 
 msgid "Search Outstanding Work Orders"
 msgstr ""
 
-#: manufacturing/search_work_orders.php:31
+#: manufacturing/search_work_orders.php:33
 msgid "Search Work Orders"
 msgstr ""
 
 msgid "Search Work Orders"
 msgstr ""
 
-#: manufacturing/search_work_orders.php:67
-#: purchasing/inquiry/po_search_completed.php:80
-#: purchasing/inquiry/po_search.php:62
-#: sales/inquiry/sales_deliveries_view.php:101
-#: sales/inquiry/sales_orders_view.php:213
+#: manufacturing/search_work_orders.php:69 purchasing/inquiry/po_search.php:62
+#: purchasing/inquiry/po_search_completed.php:89
+#: sales/inquiry/sales_deliveries_view.php:102
+#: sales/inquiry/sales_orders_view.php:233
 msgid "#:"
 msgstr ""
 
 msgid "#:"
 msgstr ""
 
-#: manufacturing/search_work_orders.php:70
+#: manufacturing/search_work_orders.php:72
 msgid "at Location:"
 msgstr ""
 
 msgid "at Location:"
 msgstr ""
 
-#: manufacturing/search_work_orders.php:82
-#: purchasing/inquiry/po_search_completed.php:92
+#: manufacturing/search_work_orders.php:84
+#: purchasing/inquiry/po_search_completed.php:101
 msgid "for item:"
 msgstr ""
 
 msgid "for item:"
 msgstr ""
 
-#: manufacturing/search_work_orders.php:84
-#: purchasing/inquiry/po_search_completed.php:99
-#: purchasing/inquiry/po_search.php:78
-#: sales/inquiry/sales_deliveries_view.php:116
-#: sales/inquiry/sales_orders_view.php:236
+#: manufacturing/search_work_orders.php:86 purchasing/inquiry/po_search.php:78
+#: purchasing/inquiry/po_search_completed.php:108
+#: sales/inquiry/sales_deliveries_view.php:117
+#: sales/inquiry/sales_orders_view.php:256
 msgid "Select documents"
 msgstr ""
 
 msgid "Select documents"
 msgstr ""
 
-#: manufacturing/search_work_orders.php:122
+#: manufacturing/search_work_orders.php:124
 msgid "Release"
 msgstr ""
 
 msgid "Release"
 msgstr ""
 
-#: manufacturing/search_work_orders.php:125
+#: manufacturing/search_work_orders.php:127
 msgid "Issue"
 msgstr ""
 
 msgid "Issue"
 msgstr ""
 
-#: manufacturing/search_work_orders.php:132
+#: manufacturing/search_work_orders.php:134
 msgid "Produce"
 msgstr ""
 
 msgid "Produce"
 msgstr ""
 
-#: manufacturing/search_work_orders.php:162 reporting/rep402.php:103
+#: manufacturing/search_work_orders.php:169 reporting/rep402.php:136
 msgid "Required"
 msgstr ""
 
 msgid "Required"
 msgstr ""
 
-#: manufacturing/search_work_orders.php:165
+#: manufacturing/search_work_orders.php:172
 #: manufacturing/includes/manufacturing_ui.inc:292
 #: manufacturing/includes/manufacturing_ui.inc:292
-#: manufacturing/includes/manufacturing_ui.inc:296 reporting/rep402.php:103
-#: reporting/includes/doctext.inc:226 sales/inquiry/sales_orders_view.php:258
+#: manufacturing/includes/manufacturing_ui.inc:296 reporting/rep402.php:136
+#: reporting/includes/doctext.inc:228 sales/inquiry/sales_orders_view.php:278
 msgid "Required By"
 msgstr ""
 
 msgid "Required By"
 msgstr ""
 
-#: manufacturing/search_work_orders.php:174
+#: manufacturing/search_work_orders.php:182
 msgid "Marked orders are overdue."
 msgstr ""
 
 msgid "Marked orders are overdue."
 msgstr ""
 
@@ -9510,8 +10202,7 @@ msgid "Select another &Work Order to Process"
 msgstr ""
 
 #: manufacturing/work_order_add_finished.php:64
 msgstr ""
 
 #: manufacturing/work_order_add_finished.php:64
-#: manufacturing/work_order_costs.php:63
-#: manufacturing/work_order_entry.php:323
+#: manufacturing/work_order_costs.php:63 manufacturing/work_order_entry.php:323
 msgid "The order number sent is not valid."
 msgstr ""
 
 msgid "The order number sent is not valid."
 msgstr ""
 
@@ -9587,7 +10278,7 @@ msgstr ""
 msgid "Process Additional Cost"
 msgstr ""
 
 msgid "Process Additional Cost"
 msgstr ""
 
-#: manufacturing/work_order_entry.php:28
+#: manufacturing/work_order_entry.php:28 themes/canvas/renderer.php:110
 msgid "Work Order Entry"
 msgstr ""
 
 msgid "Work Order Entry"
 msgstr ""
 
@@ -9794,115 +10485,163 @@ msgstr ""
 msgid "Release Work Order"
 msgstr ""
 
 msgid "Release Work Order"
 msgstr ""
 
-#: manufacturing/view/wo_costs_view.php:20
-msgid "View Work Order Costs"
+#: manufacturing/includes/manufacturing_ui.inc:22
+msgid "The bill of material for this item is empty."
 msgstr ""
 
 msgstr ""
 
-#: manufacturing/view/wo_costs_view.php:60
-msgid "Transaction"
+#: manufacturing/includes/manufacturing_ui.inc:28
+#: manufacturing/includes/manufacturing_ui.inc:100
+#: manufacturing/view/wo_issue_view.php:76 reporting/rep401.php:71
+#: reporting/rep401.php:76
+msgid "Component"
 msgstr ""
 
 msgstr ""
 
-#: manufacturing/view/wo_costs_view.php:66
-msgid "Finished Product Requirements"
+#: manufacturing/includes/manufacturing_ui.inc:28
+#: manufacturing/includes/manufacturing_ui.inc:100
+#: manufacturing/inquiry/where_used_inquiry.php:44
+#: manufacturing/manage/bom_edit.php:44 reporting/includes/doctext.inc:230
+msgid "Work Centre"
 msgstr ""
 
 msgstr ""
 
-#: manufacturing/view/wo_costs_view.php:69
-msgid "Additional Material Issues"
+#: manufacturing/includes/manufacturing_ui.inc:29 reporting/rep304.php:127
+msgid "Cost"
 msgstr ""
 
 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"
+#: manufacturing/includes/manufacturing_ui.inc:66
+msgid "Standard Labour Cost"
 msgstr ""
 
 msgstr ""
 
-#: manufacturing/view/wo_costs_view.php:75
-msgid "Finished Product Receival"
+#: manufacturing/includes/manufacturing_ui.inc:74
+msgid "Standard Overhead Cost"
 msgstr ""
 
 msgstr ""
 
-#: manufacturing/view/wo_costs_view.php:80
-#, php-format
-msgid "Production Costs for Work Order # %d"
+#: manufacturing/includes/manufacturing_ui.inc:78
+msgid "Total Cost"
 msgstr ""
 
 msgstr ""
 
-#: manufacturing/view/wo_issue_view.php:19
-msgid "View Work Order Issue"
+#: manufacturing/includes/manufacturing_ui.inc:94
+msgid "There are no Requirements for this Order."
 msgstr ""
 
 msgstr ""
 
-#: manufacturing/view/wo_issue_view.php:42
-msgid "Issue #"
+#: manufacturing/includes/manufacturing_ui.inc:101
+#: reporting/includes/doctext.inc:230
+msgid "Unit Quantity"
 msgstr ""
 
 msgstr ""
 
-#: manufacturing/view/wo_issue_view.php:42
-#: manufacturing/view/wo_production_view.php:43
-msgid "For Work Order #"
+#: manufacturing/includes/manufacturing_ui.inc:101
+#: reporting/includes/doctext.inc:230
+msgid "Total Quantity"
 msgstr ""
 
 msgstr ""
 
-#: manufacturing/view/wo_issue_view.php:43
-msgid "To Work Centre"
+#: manufacturing/includes/manufacturing_ui.inc:101
+#: reporting/includes/doctext.inc:230
+msgid "Units Issued"
 msgstr ""
 
 msgstr ""
 
-#: manufacturing/view/wo_issue_view.php:43
-msgid "Date of Issue"
+#: manufacturing/includes/manufacturing_ui.inc:101
+msgid "On Hand"
 msgstr ""
 
 msgstr ""
 
-#: manufacturing/view/wo_issue_view.php:60
-msgid "This issue has been voided."
+#: manufacturing/includes/manufacturing_ui.inc:155
+msgid "Marked items have insufficient quantities in stock."
 msgstr ""
 
 msgstr ""
 
-#: manufacturing/view/wo_issue_view.php:71
-msgid "There are no items for this issue."
+#: manufacturing/includes/manufacturing_ui.inc:169
+msgid "There are no Productions for this Order."
 msgstr ""
 
 msgstr ""
 
-#: manufacturing/view/wo_issue_view.php:76
-#: manufacturing/includes/manufacturing_ui.inc:28
-#: manufacturing/includes/manufacturing_ui.inc:100 reporting/rep401.php:71
-#: reporting/rep401.php:76
-msgid "Component"
+#: manufacturing/includes/manufacturing_ui.inc:212
+msgid "There are no Issues for this Order."
 msgstr ""
 
 msgstr ""
 
-#: manufacturing/view/wo_issue_view.php:114
-msgid "Items for this Issue"
+#: manufacturing/includes/manufacturing_ui.inc:248
+msgid "There are no additional costs for this Order."
 msgstr ""
 
 msgstr ""
 
-#: manufacturing/view/wo_production_view.php:20
-msgid "View Work Order Production"
+#: manufacturing/includes/manufacturing_ui.inc:284
+#: manufacturing/includes/manufacturing_ui.inc:340
+msgid "The work order number sent is not valid."
 msgstr ""
 
 msgstr ""
 
-#: manufacturing/view/wo_production_view.php:43
-msgid "Production #"
+#: manufacturing/includes/manufacturing_ui.inc:291
+#: manufacturing/includes/manufacturing_ui.inc:295
+#: manufacturing/includes/manufacturing_ui.inc:346
+#: reporting/includes/doctext.inc:224
+msgid "Manufactured Item"
 msgstr ""
 
 msgstr ""
 
-#: manufacturing/view/wo_production_view.php:44
-msgid "Quantity Manufactured"
+#: manufacturing/includes/manufacturing_ui.inc:292
+#: manufacturing/includes/manufacturing_ui.inc:296
+#: manufacturing/includes/manufacturing_ui.inc:347
+#: reporting/includes/doctext.inc:225
+msgid "Into Location"
 msgstr ""
 
 msgstr ""
 
-#: manufacturing/view/wo_production_view.php:60
-msgid "This production has been voided."
+#: manufacturing/includes/manufacturing_ui.inc:292
+#: manufacturing/includes/manufacturing_ui.inc:296
+#: manufacturing/inquiry/where_used_inquiry.php:46
+msgid "Quantity Required"
 msgstr ""
 
 msgstr ""
 
-#: manufacturing/view/work_order_view.php:25
-msgid "View Work Order"
+#: manufacturing/includes/manufacturing_ui.inc:326
+#: manufacturing/includes/manufacturing_ui.inc:371
+msgid "This work order is closed."
 msgstr ""
 
 msgstr ""
 
-#: manufacturing/view/work_order_view.php:50
-msgid "BOM for item:"
+#: manufacturing/includes/work_order_issue_ui.inc:78
+msgid "Marked items have insufficient quantities in stock as on day of issue."
 msgstr ""
 
 msgstr ""
 
-#: manufacturing/view/work_order_view.php:55 reporting/rep409.php:86
-msgid "Work Order Requirements"
+#: manufacturing/includes/work_order_issue_ui.inc:157
+msgid "Issue Date:"
 msgstr ""
 
 msgstr ""
 
-#: manufacturing/view/work_order_view.php:60
-msgid "Issues"
+#: manufacturing/includes/work_order_issue_ui.inc:159
+msgid "To Work Centre:"
 msgstr ""
 
 msgstr ""
 
-#: manufacturing/view/work_order_view.php:63
-msgid "Productions"
+#: manufacturing/includes/work_order_issue_ui.inc:167
+msgid "Return Items to Location"
 msgstr ""
 
 msgstr ""
 
-#: manufacturing/view/work_order_view.php:81
-msgid "This work order has been voided."
+#: manufacturing/includes/work_order_issue_ui.inc:167
+msgid "Issue Items to Work order"
+msgstr ""
+
+#: manufacturing/includes/db/work_orders_db.inc:95
+#: purchasing/includes/db/po_db.inc:154 sales/includes/db/cust_trans_db.inc:115
+#: sales/includes/db/sales_order_db.inc:213
+msgid "Updated."
+msgstr ""
+
+#: manufacturing/includes/db/work_orders_db.inc:114
+msgid "Canceled."
+msgstr ""
+
+#: manufacturing/includes/db/work_orders_db.inc:197
+msgid "Released."
+msgstr ""
+
+#: manufacturing/includes/db/work_order_costing_db.inc:97
+#, php-format
+msgid "COGS changed from %s to %s for %d %s of '%s'"
+msgstr ""
+
+#: manufacturing/includes/db/work_order_costing_db.inc:239
+#, php-format
+msgid "Voided WO #%s"
+msgstr ""
+
+#: manufacturing/includes/db/work_order_issues_db.inc:66
+msgid "Issue of"
+msgstr ""
+
+#: manufacturing/includes/db/work_order_issues_db.inc:74
+msgid "Issue to"
+msgstr ""
+
+#: manufacturing/includes/db/work_order_produce_items_db.inc:95
+msgid "Production."
 msgstr ""
 
 #: manufacturing/inquiry/bom_cost_inquiry.php:23
 msgstr ""
 
 #: manufacturing/inquiry/bom_cost_inquiry.php:23
@@ -9911,7 +10650,7 @@ msgid "There are no manufactured or kit items defined in the system."
 msgstr ""
 
 #: manufacturing/inquiry/bom_cost_inquiry.php:34
 msgstr ""
 
 #: manufacturing/inquiry/bom_cost_inquiry.php:34
-#: manufacturing/manage/bom_edit.php:143
+#: manufacturing/manage/bom_edit.php:172
 msgid "Select a manufacturable item:"
 msgstr ""
 
 msgid "Select a manufacturable item:"
 msgstr ""
 
@@ -9931,20 +10670,6 @@ msgstr ""
 msgid "Parent Item"
 msgstr ""
 
 msgid "Parent Item"
 msgstr ""
 
-#: manufacturing/inquiry/where_used_inquiry.php:44
-#: manufacturing/manage/bom_edit.php:44
-#: manufacturing/includes/manufacturing_ui.inc:28
-#: 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:292
-#: manufacturing/includes/manufacturing_ui.inc:296
-msgid "Quantity Required"
-msgstr ""
-
 #: manufacturing/manage/bom_edit.php:16
 msgid "Bill Of Materials"
 msgstr ""
 #: manufacturing/manage/bom_edit.php:16
 msgid "Bill Of Materials"
 msgstr ""
@@ -9959,37 +10684,41 @@ msgstr ""
 msgid "Code"
 msgstr ""
 
 msgid "Code"
 msgstr ""
 
-#: manufacturing/manage/bom_edit.php:83
+#: manufacturing/manage/bom_edit.php:69
+msgid "Copy BOM to another manufacturable item"
+msgstr ""
+
+#: manufacturing/manage/bom_edit.php:104
 msgid "Selected component has been updated"
 msgstr ""
 
 msgid "Selected component has been updated"
 msgstr ""
 
-#: manufacturing/manage/bom_edit.php:103
+#: manufacturing/manage/bom_edit.php:124
 msgid ""
 "A new component part has been added to the bill of material for this item."
 msgstr ""
 
 msgid ""
 "A new component part has been added to the bill of material for this item."
 msgstr ""
 
-#: manufacturing/manage/bom_edit.php:109
+#: manufacturing/manage/bom_edit.php:130
 msgid ""
 "The selected component is already on this bom. You can modify it's quantity "
 "but it cannot appear more than once on the same bom."
 msgstr ""
 
 msgid ""
 "The selected component is already on this bom. You can modify it's quantity "
 "but it cannot appear more than once on the same bom."
 msgstr ""
 
-#: manufacturing/manage/bom_edit.php:115
+#: manufacturing/manage/bom_edit.php:136
 msgid ""
 "The selected component is a parent of the current item. Recursive BOMs are "
 "not allowed."
 msgstr ""
 
 msgid ""
 "The selected component is a parent of the current item. Recursive BOMs are "
 "not allowed."
 msgstr ""
 
-#: manufacturing/manage/bom_edit.php:200
-msgid "Location to Draw From:"
+#: manufacturing/manage/bom_edit.php:164
+msgid "BOM copied to "
 msgstr ""
 
 msgstr ""
 
-#: manufacturing/manage/bom_edit.php:201
-msgid "Work Centre Added:"
+#: manufacturing/manage/bom_edit.php:229
+msgid "Location to Draw From:"
 msgstr ""
 
 msgstr ""
 
-#: manufacturing/manage/work_centres.php:16
-msgid "Work Centres"
+#: manufacturing/manage/bom_edit.php:230
+msgid "Work Centre Added:"
 msgstr ""
 
 #: manufacturing/manage/work_centres.php:34
 msgstr ""
 
 #: manufacturing/manage/work_centres.php:34
@@ -10024,1589 +10753,1564 @@ msgstr ""
 msgid "description"
 msgstr ""
 
 msgid "description"
 msgstr ""
 
-#: manufacturing/includes/manufacturing_ui.inc:22
-msgid "The bill of material for this item is empty."
+#: manufacturing/view/work_order_view.php:25
+msgid "View Work Order"
 msgstr ""
 
 msgstr ""
 
-#: manufacturing/includes/manufacturing_ui.inc:29 reporting/rep304.php:127
-msgid "Cost"
+#: manufacturing/view/work_order_view.php:50
+msgid "BOM for item:"
 msgstr ""
 
 msgstr ""
 
-#: manufacturing/includes/manufacturing_ui.inc:66
-msgid "Standard Labour Cost"
+#: manufacturing/view/work_order_view.php:55 reporting/rep409.php:86
+msgid "Work Order Requirements"
 msgstr ""
 
 msgstr ""
 
-#: manufacturing/includes/manufacturing_ui.inc:74
-msgid "Standard Overhead Cost"
+#: manufacturing/view/work_order_view.php:60
+msgid "Issues"
 msgstr ""
 
 msgstr ""
 
-#: manufacturing/includes/manufacturing_ui.inc:78
-msgid "Total Cost"
+#: manufacturing/view/work_order_view.php:63
+msgid "Productions"
 msgstr ""
 
 msgstr ""
 
-#: manufacturing/includes/manufacturing_ui.inc:94
-msgid "There are no Requirements for this Order."
+#: manufacturing/view/work_order_view.php:66
+#: manufacturing/view/work_order_view.php:73
+#: manufacturing/view/wo_costs_view.php:72 reporting/rep402.php:194
+msgid "Additional Costs"
 msgstr ""
 
 msgstr ""
 
-#: manufacturing/includes/manufacturing_ui.inc:101
-#: reporting/includes/doctext.inc:228
-msgid "Unit Quantity"
+#: manufacturing/view/work_order_view.php:81
+msgid "This work order has been voided."
 msgstr ""
 
 msgstr ""
 
-#: manufacturing/includes/manufacturing_ui.inc:101
-#: reporting/includes/doctext.inc:228
-msgid "Total Quantity"
+#: manufacturing/view/wo_costs_view.php:20
+msgid "View Work Order Costs"
 msgstr ""
 
 msgstr ""
 
-#: manufacturing/includes/manufacturing_ui.inc:101
-#: reporting/includes/doctext.inc:228
-msgid "Units Issued"
+#: manufacturing/view/wo_costs_view.php:60 reporting/rep402.php:141
+msgid "Transaction"
 msgstr ""
 
 msgstr ""
 
-#: manufacturing/includes/manufacturing_ui.inc:101
-msgid "On Hand"
+#: manufacturing/view/wo_costs_view.php:66 reporting/rep402.php:188
+msgid "Finished Product Requirements"
 msgstr ""
 
 msgstr ""
 
-#: manufacturing/includes/manufacturing_ui.inc:155
-msgid "Marked items have insufficient quantities in stock."
+#: manufacturing/view/wo_costs_view.php:69 reporting/rep402.php:191
+msgid "Additional Material Issues"
 msgstr ""
 
 msgstr ""
 
-#: manufacturing/includes/manufacturing_ui.inc:169
-msgid "There are no Productions for this Order."
+#: manufacturing/view/wo_costs_view.php:75 reporting/rep402.php:197
+msgid "Finished Product Receival"
 msgstr ""
 
 msgstr ""
 
-#: manufacturing/includes/manufacturing_ui.inc:212
-msgid "There are no Issues for this Order."
+#: manufacturing/view/wo_costs_view.php:80
+#, php-format
+msgid "Production Costs for Work Order # %d"
 msgstr ""
 
 msgstr ""
 
-#: manufacturing/includes/manufacturing_ui.inc:248
-msgid "There are no additional costs for this Order."
+#: manufacturing/view/wo_issue_view.php:19
+msgid "View Work Order Issue"
 msgstr ""
 
 msgstr ""
 
-#: manufacturing/includes/manufacturing_ui.inc:284
-#: manufacturing/includes/manufacturing_ui.inc:340
-msgid "The work order number sent is not valid."
+#: manufacturing/view/wo_issue_view.php:42
+msgid "Issue #"
 msgstr ""
 
 msgstr ""
 
-#: 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"
+#: manufacturing/view/wo_issue_view.php:42
+#: manufacturing/view/wo_production_view.php:43
+msgid "For Work Order #"
 msgstr ""
 
 msgstr ""
 
-#: 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"
+#: manufacturing/view/wo_issue_view.php:43
+msgid "To Work Centre"
 msgstr ""
 
 msgstr ""
 
-#: manufacturing/includes/manufacturing_ui.inc:326
-#: manufacturing/includes/manufacturing_ui.inc:371
-msgid "This work order is closed."
+#: manufacturing/view/wo_issue_view.php:43
+msgid "Date of Issue"
 msgstr ""
 
 msgstr ""
 
-#: manufacturing/includes/work_order_issue_ui.inc:78
-msgid "Marked items have insufficient quantities in stock as on day of issue."
+#: manufacturing/view/wo_issue_view.php:60
+msgid "This issue has been voided."
 msgstr ""
 
 msgstr ""
 
-#: manufacturing/includes/work_order_issue_ui.inc:157
-msgid "Issue Date:"
+#: manufacturing/view/wo_issue_view.php:71
+msgid "There are no items for this issue."
 msgstr ""
 
 msgstr ""
 
-#: manufacturing/includes/work_order_issue_ui.inc:159
-msgid "To Work Centre:"
+#: manufacturing/view/wo_issue_view.php:114
+msgid "Items for this Issue"
 msgstr ""
 
 msgstr ""
 
-#: manufacturing/includes/work_order_issue_ui.inc:167
-msgid "Return Items to Location"
+#: manufacturing/view/wo_production_view.php:20
+msgid "View Work Order Production"
 msgstr ""
 
 msgstr ""
 
-#: manufacturing/includes/work_order_issue_ui.inc:167
-msgid "Issue Items to Work order"
+#: manufacturing/view/wo_production_view.php:43
+msgid "Production #"
 msgstr ""
 
 msgstr ""
 
-#: manufacturing/includes/db/work_order_costing_db.inc:98
-#, php-format
-msgid "COGS changed from %s to %s for %d %s of '%s'"
+#: manufacturing/view/wo_production_view.php:44
+msgid "Quantity Manufactured"
 msgstr ""
 
 msgstr ""
 
-#: manufacturing/includes/db/work_order_costing_db.inc:235
-#, php-format
-msgid "Voided WO #%s"
+#: manufacturing/view/wo_production_view.php:60
+msgid "This production has been voided."
 msgstr ""
 
 msgstr ""
 
-#: manufacturing/includes/db/work_order_issues_db.inc:66
-msgid "Issue of"
+#: purchasing/po_entry_items.php:41
+msgid "Modify Purchase Order #"
 msgstr ""
 
 msgstr ""
 
-#: manufacturing/includes/db/work_order_issues_db.inc:74
-msgid "Issue to"
+#: purchasing/po_entry_items.php:46
+msgid "Purchase Order Entry"
 msgstr ""
 
 msgstr ""
 
-#: manufacturing/includes/db/work_order_produce_items_db.inc:95
-msgid "Production."
+#: purchasing/po_entry_items.php:51
+msgid "Direct GRN Entry"
 msgstr ""
 
 msgstr ""
 
-#: 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."
+#: purchasing/po_entry_items.php:60
+msgid "Fixed Asset Purchase Invoice Entry"
 msgstr ""
 
 msgstr ""
 
-#: manufacturing/includes/db/work_orders_db.inc:114
-msgid "Canceled."
+#: purchasing/po_entry_items.php:63
+msgid "Direct Purchase Invoice Entry"
 msgstr ""
 
 msgstr ""
 
-#: manufacturing/includes/db/work_orders_db.inc:195
-msgid "Released."
+#: purchasing/po_entry_items.php:83
+msgid "Purchase Order has been entered"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/includes/purchasing_db.inc:216
-msgid "Payment for:"
+#: purchasing/po_entry_items.php:85
+msgid "Purchase Order has been updated"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/includes/db/invoice_db.inc:339
-msgid "Supplier invoice adjustment for zero inventory of "
+#: purchasing/po_entry_items.php:86
+msgid "&View this order"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/includes/db/invoice_db.inc:339 reporting/rep106.php:89
-#: sales/inquiry/sales_deliveries_view.php:154
-#: sales/inquiry/sales_orders_view.php:134
-msgid "Invoice"
+#: purchasing/po_entry_items.php:88 sales/sales_order_entry.php:129
+#: sales/sales_order_entry.php:149
+msgid "&Print This Order"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/includes/db/invoice_db.inc:693
-#: purchasing/includes/db/invoice_db.inc:695
-msgid "GRN Removal"
+#: purchasing/po_entry_items.php:90 sales/sales_order_entry.php:130
+#: sales/sales_order_entry.php:150
+msgid "&Email This Order"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/includes/ui/grn_ui.inc:23 purchasing/includes/ui/grn_ui.inc:55
-#: purchasing/includes/ui/po_ui.inc:303 sales/view/view_sales_order.php:74
-msgid "Order Currency"
+#: purchasing/po_entry_items.php:92
+msgid "&Receive Items on this Purchase Order"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/includes/ui/grn_ui.inc:25 purchasing/includes/ui/grn_ui.inc:57
-msgid "For Purchase Order"
+#: purchasing/po_entry_items.php:95
+msgid "Enter &Another Purchase Order"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/includes/ui/grn_ui.inc:28 purchasing/includes/ui/grn_ui.inc:59
-#: sales/view/view_sales_order.php:67
-msgid "Ordered On"
+#: purchasing/po_entry_items.php:97
+msgid "Select An &Outstanding Purchase Order"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/includes/ui/grn_ui.inc:33 purchasing/includes/ui/grn_ui.inc:69
-#: purchasing/includes/ui/po_ui.inc:318 purchasing/includes/ui/po_ui.inc:323
-msgid "Deliver Into Location"
+#: purchasing/po_entry_items.php:106
+msgid "Direct GRN has been entered"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/includes/ui/grn_ui.inc:38 purchasing/includes/ui/grn_ui.inc:79
-#: purchasing/includes/ui/po_ui.inc:332 sales/view/view_sales_order.php:92
-msgid "Delivery Address"
-msgstr ""
-
-#: purchasing/includes/ui/grn_ui.inc:41 purchasing/includes/ui/grn_ui.inc:82
-#: purchasing/includes/ui/po_ui.inc:344
-msgid "Order Comments"
-msgstr ""
-
-#: purchasing/includes/ui/grn_ui.inc:74
-msgid "Date Items Received"
-msgstr ""
-
-#: purchasing/includes/ui/invoice_ui.inc:121
-msgid "Source Invoices:"
+#: purchasing/po_entry_items.php:108
+msgid "&View this GRN"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:123
-msgid "Supplier's Ref.:"
+#: purchasing/po_entry_items.php:112 purchasing/po_receive_items.php:40
+msgid "View the GL Journal Entries for this Delivery"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:137
-msgid "Terms:"
+#: purchasing/po_entry_items.php:115 purchasing/po_receive_items.php:42
+msgid "Entry purchase &invoice for this receival"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:143
-#: purchasing/includes/ui/po_ui.inc:174
-msgid "Dimension 2"
+#: purchasing/po_entry_items.php:120
+msgid "Enter &Another GRN"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:155
-#: purchasing/manage/suppliers.php:100 purchasing/manage/suppliers.php:105
-msgid "Supplier's Currency:"
+#: purchasing/po_entry_items.php:129
+msgid "Direct Purchase Invoice has been entered"
 msgstr ""
 
 msgstr ""
 
-#: 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:"
+#: purchasing/po_entry_items.php:131
+msgid "&View this Invoice"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:177
-msgid "Sub-total:"
+#: purchasing/po_entry_items.php:133 purchasing/supplier_invoice.php:67
+msgid "View the GL Journal Entries for this Invoice"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:185
-msgid "Invoice Total:"
+#: purchasing/po_entry_items.php:135 purchasing/supplier_invoice.php:69
+msgid "Entry supplier &payment for this invoice"
 msgstr ""
 
 msgstr ""
 
-#: 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"
+#: purchasing/po_entry_items.php:141
+msgid "Enter &Another Direct Invoice"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:220
-msgid "Add GL Line"
+#: purchasing/po_entry_items.php:147
+msgid "There are no purchasable fixed assets defined in the system."
 msgstr ""
 
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:221
-msgid "Reset"
+#: purchasing/po_entry_items.php:178
+msgid ""
+"This item cannot be deleted because some of it has already been received."
 msgstr ""
 
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:222
-#: purchasing/po_receive_items.php:326
-msgid "Clear all GL entry fields"
+#: purchasing/po_entry_items.php:193
+msgid ""
+"This order cannot be cancelled because some of it has already been received."
 msgstr ""
 
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:240
-msgid "GL Items for this Invoice"
+#: 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 ""
 
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:242
-msgid "GL Items for this Credit Note"
+#: purchasing/po_entry_items.php:214
+msgid "This purchase order has been cancelled."
 msgstr ""
 
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:252
-msgid "Quick Entry:"
+#: purchasing/po_entry_items.php:216
+msgid "Enter a new purchase order"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:421
-msgid "Add to Invoice"
+#: purchasing/po_entry_items.php:228 sales/sales_order_entry.php:522
+msgid "Item description cannot be empty."
 msgstr ""
 
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:423
-msgid "Add to Credit Note"
+#: purchasing/po_entry_items.php:238
+msgid "The quantity of the order item must be numeric and not less than "
 msgstr ""
 
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:425 sales/customer_invoice.php:581
-msgid "Remove"
+#: purchasing/po_entry_items.php:245
+msgid "The price entered must be numeric and not less than zero."
 msgstr ""
 
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:425
-#: purchasing/includes/ui/invoice_ui.inc:460
+#: purchasing/po_entry_items.php:269
 msgid ""
 msgid ""
-"WARNING! Be careful with removal. The operation is executed immediately and "
-"cannot be undone !!!"
+"You are attempting to make the quantity ordered a quantity less than has "
+"already been invoiced or received.  This is prohibited."
 msgstr ""
 
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:427
-#, php-format
+#: purchasing/po_entry_items.php:270
 msgid ""
 msgid ""
-"You are about to remove all yet non-invoiced items from delivery line #%d. "
-"This operation also irreversibly changes related order line. Do you want to "
-"continue ?"
+"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 ""
 
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:458
-msgid "Items Received Yet to be Invoiced"
+#: purchasing/po_entry_items.php:298
+msgid "The selected item is already on this order."
 msgstr ""
 
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:463
-msgid "Delivery Item Selected For Adding To A Supplier Credit Note"
+#: 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 ""
 
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:468
-msgid "Received Items Charged on this Invoice"
+#: purchasing/po_entry_items.php:338 purchasing/supplier_credit.php:170
+#: purchasing/supplier_invoice.php:175 purchasing/supplier_invoice.php:391
+#: purchasing/supplier_payment.php:129
+msgid "There is no supplier selected."
 msgstr ""
 
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:470
-msgid "Received Items Credited on this Note"
+#: purchasing/po_entry_items.php:345
+msgid "The entered order date is invalid."
 msgstr ""
 
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:480
-msgid "Received between"
+#: purchasing/po_entry_items.php:358
+msgid "The entered due date is invalid."
 msgstr ""
 
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:492
-msgid "Add All Items"
+#: purchasing/po_entry_items.php:374 purchasing/supplier_credit.php:209
+#: purchasing/supplier_invoice.php:213
+msgid "You must enter a supplier's invoice reference."
 msgstr ""
 
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:501
-#: purchasing/includes/ui/invoice_ui.inc:513 reporting/rep308.php:223
-#: sales/inquiry/sales_orders_view.php:142
-msgid "Delivery"
+#: purchasing/po_entry_items.php:381 purchasing/supplier_credit.php:216
+#: purchasing/supplier_invoice.php:220
+msgid ""
+"This invoice number has already been entered. It cannot be entered again."
 msgstr ""
 
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:501
-msgid "P.O."
+#: purchasing/po_entry_items.php:387
+msgid "There is no delivery address specified."
 msgstr ""
 
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:502
-msgid "Received On"
+#: purchasing/po_entry_items.php:393
+msgid "There is no location specified to move any items into."
 msgstr ""
 
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:502 purchasing/view/view_po.php:46
-msgid "Quantity Received"
+#: purchasing/po_entry_items.php:401
+msgid ""
+"The order cannot be placed because there are no lines entered on this order."
 msgstr ""
 
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:502 purchasing/view/view_grn.php:41
-#: purchasing/view/view_po.php:46
-msgid "Quantity Invoiced"
+#: purchasing/po_entry_items.php:406
+msgid "Required prepayment is greater than total invoice value."
 msgstr ""
 
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:503
-msgid "Qty Yet To Invoice"
+#: purchasing/po_entry_items.php:483 purchasing/includes/ui/po_ui.inc:470
+#: sales/customer_invoice.php:440 sales/includes/ui/sales_order_ui.inc:396
+#: sales/includes/ui/sales_order_ui.inc:398
+msgid "Payment:"
 msgstr ""
 
 msgstr ""
 
-#: 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"
+#: purchasing/po_entry_items.php:483 purchasing/includes/ui/po_ui.inc:470
+msgid "Delayed"
 msgstr ""
 
 msgstr ""
 
-#: 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"
+#: purchasing/po_entry_items.php:491 sales/sales_order_entry.php:735
+msgid "Place Order"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:509
-msgid "Qty Yet To Credit"
+#: purchasing/po_entry_items.php:492
+msgid "Update Order"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:514
-msgid "Line Value"
+#: purchasing/po_entry_items.php:493 sales/sales_order_entry.php:734
+msgid "Cancel Order"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:582
-msgid ""
-"There are no outstanding items received from this supplier that have not "
-"been invoiced by them."
+#: purchasing/po_entry_items.php:495
+msgid "Process GRN"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:585
-msgid ""
-"There are no received items for the selected supplier that have been "
-"invoiced."
+#: purchasing/po_entry_items.php:496
+msgid "Update GRN"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:586
-msgid "Credits can only be applied to invoiced items."
+#: purchasing/po_entry_items.php:497
+msgid "Cancel GRN"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/includes/ui/po_ui.inc:135 sales/sales_order_entry.php:727
-msgid "Order Date:"
+#: purchasing/po_entry_items.php:500 sales/customer_invoice.php:665
+msgid "Process Invoice"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/includes/ui/po_ui.inc:136 sales/sales_order_entry.php:714
-msgid "Delivery Date:"
+#: purchasing/po_entry_items.php:501
+msgid "Update Invoice"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/includes/ui/po_ui.inc:136 sales/sales_order_entry.php:708
-msgid "Invoice Date:"
+#: purchasing/po_entry_items.php:502 sales/sales_order_entry.php:715
+msgid "Cancel Invoice"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/includes/ui/po_ui.inc:149
-msgid "Supplier Currency:"
+#: purchasing/po_receive_items.php:25
+msgid "Receive Purchase Order Items"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/includes/ui/po_ui.inc:167
-msgid "Due Date:"
+#: purchasing/po_receive_items.php:34
+msgid "Purchase Order Delivery has been processed"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/includes/ui/po_ui.inc:169
-msgid "Supplier's Reference:"
+#: purchasing/po_receive_items.php:36
+msgid "&View this Delivery"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/includes/ui/po_ui.inc:175
-msgid "Receive Into:"
+#: purchasing/po_receive_items.php:44
+msgid "Select a different &purchase order for receiving items against"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/includes/ui/po_ui.inc:196
+#: purchasing/po_receive_items.php:53
 msgid ""
 msgid ""
-"The default stock location set up for this user is not a currently defined "
-"stock location. Your system administrator needs to amend your user record."
-msgstr ""
-
-#: purchasing/includes/ui/po_ui.inc:200
-msgid "Deliver to:"
+"This page can only be opened if a purchase order has been selected. Please "
+"select a purchase order first."
 msgstr ""
 
 msgstr ""
 
-#: purchasing/includes/ui/po_ui.inc:209
-msgid "Order Items"
+#: purchasing/po_receive_items.php:62 reporting/rep105.php:115
+#: sales/customer_delivery.php:421
+msgid "Ordered"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/includes/ui/po_ui.inc:215 purchasing/po_receive_items.php:62
+#: purchasing/po_receive_items.php:62 purchasing/includes/ui/po_ui.inc:216
 msgid "Received"
 msgstr ""
 
 msgid "Received"
 msgstr ""
 
-#: purchasing/includes/ui/po_ui.inc:216
-#: sales/includes/ui/sales_order_ui.inc:604
-msgid "Required Delivery Date"
+#: purchasing/po_receive_items.php:63 reporting/rep101.php:138
+#: reporting/rep105.php:116 reporting/rep105.php:170 reporting/rep201.php:116
+#: reporting/includes/doctext.inc:248
+msgid "Outstanding"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/includes/ui/po_ui.inc:216 purchasing/view/view_grn.php:41
-#: purchasing/view/view_po.php:46
-msgid "Line Total"
+#: purchasing/po_receive_items.php:63 sales/customer_delivery.php:422
+msgid "This Delivery"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/includes/ui/po_ui.inc:272 purchasing/po_receive_items.php:114
-#: reporting/rep107.php:231 reporting/rep109.php:154 reporting/rep110.php:156
-#: reporting/rep111.php:151 reporting/rep113.php:145 reporting/rep209.php:166
-#: sales/customer_credit_invoice.php:317 sales/customer_delivery.php:505
-#: sales/customer_invoice.php:625 sales/view/view_dispatch.php:146
-#: sales/view/view_invoice.php:150 sales/includes/ui/sales_credit_ui.inc:212
-#: sales/includes/ui/sales_order_ui.inc:223
+#: purchasing/po_receive_items.php:114 purchasing/includes/ui/po_ui.inc:276
+#: reporting/rep107.php:255 reporting/rep109.php:138 reporting/rep110.php:156
+#: reporting/rep111.php:153 reporting/rep113.php:145 reporting/rep209.php:166
+#: sales/customer_credit_invoice.php:317 sales/customer_delivery.php:506
+#: sales/customer_invoice.php:626 sales/includes/ui/sales_credit_ui.inc:212
+#: sales/includes/ui/sales_order_ui.inc:223 sales/view/view_dispatch.php:146
+#: sales/view/view_invoice.php:150
 msgid "Sub-total"
 msgstr ""
 
 msgid "Sub-total"
 msgstr ""
 
-#: purchasing/includes/ui/po_ui.inc:281 purchasing/po_receive_items.php:122
-#: purchasing/view/view_grn.php:79 purchasing/view/view_po.php:93
-#: sales/customer_delivery.php:512 sales/view/view_sales_order.php:263
-#: sales/includes/ui/sales_order_ui.inc:230
+#: purchasing/po_receive_items.php:122 purchasing/includes/ui/po_ui.inc:285
+#: purchasing/view/view_grn.php:89 purchasing/view/view_po.php:93
+#: sales/customer_delivery.php:513 sales/includes/ui/sales_order_ui.inc:230
+#: sales/view/view_sales_order.php:265
 msgid "Amount Total"
 msgstr ""
 
 msgid "Amount Total"
 msgstr ""
 
-#: purchasing/includes/ui/po_ui.inc:283
-#: purchasing/allocations/supplier_allocate.php:74
-#: sales/allocations/customer_allocate.php:77
-#: sales/includes/ui/sales_order_ui.inc:231
-msgid "Refresh"
+#: purchasing/po_receive_items.php:168 purchasing/po_receive_items.php:214
+msgid ""
+"There is nothing to process. Please enter valid quantities greater than zero."
 msgstr ""
 
 msgstr ""
 
-#: purchasing/includes/ui/po_ui.inc:338 sales/view/view_sales_order.php:83
-msgid "Required Pre-Payment"
+#: purchasing/po_receive_items.php:219
+msgid ""
+"Entered quantities cannot be greater than the quantity entered on the "
+"purchase order including the allowed over-receive percentage"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/includes/ui/po_ui.inc:339
-msgid "Pre-Payments Allocated"
+#: purchasing/po_receive_items.php:221
+msgid ""
+"Modify the ordered items on the purchase order if you wish to increase the "
+"quantities."
 msgstr ""
 
 msgstr ""
 
-#: 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:"
+#: purchasing/po_receive_items.php:239
+msgid ""
+"This order has been changed or invoiced since this delivery was started to "
+"be actioned. Processing halted. To enter a delivery against this purchase "
+"order, it must be re-selected and re-read again to update the changes made "
+"by the other user."
 msgstr ""
 
 msgstr ""
 
-#: purchasing/includes/ui/po_ui.inc:461 purchasing/po_entry_items.php:483
-msgid "Delayed"
+#: purchasing/po_receive_items.php:242
+msgid "Select a different purchase order for receiving goods against"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/includes/ui/po_ui.inc:463
-#: sales/includes/ui/sales_order_ui.inc:615
-#: sales/includes/ui/sales_order_ui.inc:617
-msgid "Pre-Payment Required:"
+#: purchasing/po_receive_items.php:245
+msgid "Re-Read the updated purchase order for receiving goods against"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/po_entry_items.php:41
-msgid "Modify Purchase Order #"
+#: purchasing/po_receive_items.php:321
+msgid "Items to Receive"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/po_entry_items.php:46
-msgid "Purchase Order Entry"
+#: purchasing/po_receive_items.php:326
+msgid "Process Receive Items"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/po_entry_items.php:51
-msgid "Direct GRN Entry"
+#: purchasing/po_receive_items.php:326
+#: purchasing/includes/ui/invoice_ui.inc:222
+msgid "Clear all GL entry fields"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/po_entry_items.php:60
-msgid "Fixed Asset Purchase Invoice Entry"
+#: purchasing/supplier_credit.php:33
+#, php-format
+msgid "Modifying Supplier Credit # %d"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/po_entry_items.php:63
-msgid "Direct Purchase Invoice Entry"
+#: purchasing/supplier_credit.php:79
+msgid "Supplier credit note has been processed."
 msgstr ""
 
 msgstr ""
 
-#: purchasing/po_entry_items.php:83
-msgid "Purchase Order has been entered"
+#: purchasing/supplier_credit.php:80
+msgid "View this Credit Note"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/po_entry_items.php:85
-msgid "Purchase Order has been updated"
+#: purchasing/supplier_credit.php:82
+msgid "View the GL Journal Entries for this Credit Note"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/po_entry_items.php:86
-msgid "&View this order"
+#: purchasing/supplier_credit.php:84
+msgid "Enter Another Credit Note"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/po_entry_items.php:88 sales/sales_order_entry.php:129
-#: sales/sales_order_entry.php:149
-msgid "&Print This Order"
+#: purchasing/supplier_credit.php:129 purchasing/supplier_invoice.php:135
+msgid ""
+"The account code entered is not a valid code, this line cannot be added to "
+"the transaction."
 msgstr ""
 
 msgstr ""
 
-#: purchasing/po_entry_items.php:90 sales/sales_order_entry.php:130
-#: sales/sales_order_entry.php:150
-msgid "&Email This Order"
+#: purchasing/supplier_credit.php:139 purchasing/supplier_invoice.php:145
+msgid ""
+"The amount entered is not numeric. This line cannot be added to the "
+"transaction."
 msgstr ""
 
 msgstr ""
 
-#: purchasing/po_entry_items.php:92
-msgid "&Receive Items on this Purchase Order"
+#: purchasing/supplier_credit.php:177
+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 ""
 
 msgstr ""
 
-#: purchasing/po_entry_items.php:95
-msgid "Enter &Another Purchase Order"
+#: purchasing/supplier_credit.php:190
+msgid ""
+"The credit note as entered cannot be processed because the date entered is "
+"not valid."
 msgstr ""
 
 msgstr ""
 
-#: purchasing/po_entry_items.php:97
-msgid "Select An &Outstanding Purchase Order"
+#: purchasing/supplier_credit.php:202 purchasing/supplier_invoice.php:206
+msgid ""
+"The invoice as entered cannot be processed because the due date is in an "
+"incorrect format."
 msgstr ""
 
 msgstr ""
 
-#: purchasing/po_entry_items.php:106
-msgid "Direct GRN has been entered"
+#: purchasing/supplier_credit.php:228
+msgid ""
+"The return cannot be processed because there is an insufficient quantity for "
+"item:"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/po_entry_items.php:108
-msgid "&View this GRN"
+#: purchasing/supplier_credit.php:272
+msgid "The quantity to credit must be numeric and greater than zero."
 msgstr ""
 
 msgstr ""
 
-#: purchasing/po_entry_items.php:112 purchasing/po_receive_items.php:40
-msgid "View the GL Journal Entries for this Delivery"
+#: purchasing/supplier_credit.php:279
+msgid "The price is either not numeric or negative."
 msgstr ""
 
 msgstr ""
 
-#: purchasing/po_entry_items.php:115 purchasing/po_receive_items.php:42
-msgid "Entry purchase &invoice for this receival"
+#: purchasing/supplier_credit.php:381
+msgid "Enter Credit Note"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/po_entry_items.php:120
-msgid "Enter &Another GRN"
+#: purchasing/supplier_invoice.php:39
+msgid "Enter Supplier Invoice"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/po_entry_items.php:129
-msgid "Direct Purchase Invoice has been entered"
+#: purchasing/supplier_invoice.php:44
+#, php-format
+msgid "Modifying Purchase Invoice # %d"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/po_entry_items.php:131
-msgid "&View this Invoice"
+#: purchasing/supplier_invoice.php:64
+msgid "Supplier invoice has been processed."
 msgstr ""
 
 msgstr ""
 
-#: purchasing/po_entry_items.php:133 purchasing/supplier_invoice.php:67
-msgid "View the GL Journal Entries for this Invoice"
+#: purchasing/supplier_invoice.php:65
+msgid "View this Invoice"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/po_entry_items.php:135 purchasing/supplier_invoice.php:69
-msgid "Entry supplier &payment for this invoice"
+#: purchasing/supplier_invoice.php:72
+msgid "Enter Another Invoice"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/po_entry_items.php:141
-msgid "Enter &Another Direct Invoice"
+#: purchasing/supplier_invoice.php:182
+msgid ""
+"The invoice cannot be processed because the there are no items or values on "
+"the invoice.  Invoices are expected to have a charge."
 msgstr ""
 
 msgstr ""
 
-#: purchasing/po_entry_items.php:147
-msgid "There are no purchasable fixed assets defined in the system."
+#: purchasing/supplier_invoice.php:194
+msgid ""
+"The invoice as entered cannot be processed because the invoice date is in an "
+"incorrect format."
 msgstr ""
 
 msgstr ""
 
-#: purchasing/po_entry_items.php:178
-msgid ""
-"This item cannot be deleted because some of it has already been received."
+#: purchasing/supplier_invoice.php:258
+msgid "The quantity to invoice must be numeric and greater than zero."
 msgstr ""
 
 msgstr ""
 
-#: purchasing/po_entry_items.php:193
-msgid ""
-"This order cannot be cancelled because some of it has already been received."
+#: purchasing/supplier_invoice.php:265
+msgid "The price is not numeric."
 msgstr ""
 
 msgstr ""
 
-#: purchasing/po_entry_items.php:194
+#: purchasing/supplier_invoice.php:278
 msgid ""
 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."
+"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 ""
 
 msgstr ""
 
-#: purchasing/po_entry_items.php:214
-msgid "This purchase order has been cancelled."
+#: purchasing/supplier_invoice.php:279 purchasing/supplier_invoice.php:292
+msgid "The over-charge percentage allowance is :"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/po_entry_items.php:216
-msgid "Enter a new purchase order"
+#: purchasing/supplier_invoice.php:291
+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 "
+"this. See the system administrator to modify the set up parameters if "
+"necessary."
 msgstr ""
 
 msgstr ""
 
-#: purchasing/po_entry_items.php:228 sales/sales_order_entry.php:518
-msgid "Item description cannot be empty."
+#: purchasing/supplier_invoice.php:373
+#, php-format
+msgid "All yet non-invoiced items on delivery line # %d has been removed."
 msgstr ""
 
 msgstr ""
 
-#: purchasing/po_entry_items.php:238
-msgid "The quantity of the order item must be numeric and not less than "
+#: purchasing/supplier_invoice.php:415
+msgid "Enter Invoice"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/po_entry_items.php:245
-msgid "The price entered must be numeric and not less than zero."
+#: purchasing/supplier_payment.php:31
+msgid "Supplier Payment Entry"
 msgstr ""
 
 msgstr ""
 
-#: 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."
+#: purchasing/supplier_payment.php:84
+msgid "Invalid purchase invoice number."
 msgstr ""
 
 msgstr ""
 
-#: 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."
+#: purchasing/supplier_payment.php:90
+msgid "Payment has been sucessfully entered"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/po_entry_items.php:298
-msgid "The selected item is already on this order."
+#: purchasing/supplier_payment.php:92
+msgid "&Print This Remittance"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/po_entry_items.php:324
-msgid ""
-"The selected item does not exist or it is a kit part and therefore cannot be "
-"purchased."
+#: purchasing/supplier_payment.php:93
+msgid "&Email This Remittance"
+msgstr ""
+
+#: purchasing/supplier_payment.php:95
+msgid "View this Payment"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/po_entry_items.php:338 purchasing/supplier_invoice.php:380
-#: purchasing/supplier_payment.php:132
-msgid "There is no supplier selected."
+#: purchasing/supplier_payment.php:96
+msgid "View the GL &Journal Entries for this Payment"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/po_entry_items.php:345
-msgid "The entered order date is invalid."
+#: purchasing/supplier_payment.php:98
+msgid "Enter another supplier &payment"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/po_entry_items.php:358
-msgid "The entered due date is invalid."
+#: purchasing/supplier_payment.php:100
+msgid "Enter direct &Invoice"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/po_entry_items.php:374 purchasing/supplier_credit.php:199
-#: purchasing/supplier_invoice.php:206
-msgid "You must enter a supplier's invoice reference."
+#: purchasing/supplier_payment.php:102 sales/customer_payments.php:114
+msgid "Enter Other &Payment"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/po_entry_items.php:381 purchasing/supplier_credit.php:206
-#: purchasing/supplier_invoice.php:213
-msgid ""
-"This invoice number has already been entered. It cannot be entered again."
+#: purchasing/supplier_payment.php:103
+msgid "Enter &Customer Payment"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/po_entry_items.php:387
-msgid "There is no delivery address specified."
+#: purchasing/supplier_payment.php:104 sales/customer_payments.php:112
+msgid "Enter Other &Deposit"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/po_entry_items.php:393
-msgid "There is no location specified to move any items into."
+#: purchasing/supplier_payment.php:105 sales/customer_payments.php:115
+msgid "Bank Account &Transfer"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/po_entry_items.php:401
-msgid ""
-"The order cannot be placed because there are no lines entered on this order."
+#: purchasing/supplier_payment.php:168
+msgid "The entered discount is invalid or less than zero."
 msgstr ""
 
 msgstr ""
 
-#: purchasing/po_entry_items.php:406
-msgid "Required prepayment is greater than total invoice value."
+#: purchasing/supplier_payment.php:176
+msgid ""
+"The total of the amount and the discount is zero or negative. Please enter "
+"positive values."
 msgstr ""
 
 msgstr ""
 
-#: purchasing/po_entry_items.php:491 sales/sales_order_entry.php:731
-msgid "Place Order"
+#: purchasing/supplier_payment.php:183
+msgid "The entered bank amount is zero or negative."
 msgstr ""
 
 msgstr ""
 
-#: purchasing/po_entry_items.php:492
-msgid "Update Order"
+#: purchasing/supplier_payment.php:273
+msgid "Payment To:"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/po_entry_items.php:493 sales/sales_order_entry.php:730
-msgid "Cancel Order"
+#: purchasing/supplier_payment.php:298
+msgid "From Bank Account:"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/po_entry_items.php:495
-msgid "Process GRN"
+#: purchasing/supplier_payment.php:304 purchasing/view/view_supp_payment.php:55
+msgid "Date Paid"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/po_entry_items.php:496
-msgid "Update GRN"
+#: purchasing/supplier_payment.php:320
+msgid "Bank Amount:"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/po_entry_items.php:497
-msgid "Cancel GRN"
+#: purchasing/supplier_payment.php:347 sales/customer_payments.php:395
+msgid "Amount of Discount:"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/po_entry_items.php:500 sales/customer_invoice.php:664
-msgid "Process Invoice"
+#: purchasing/supplier_payment.php:348
+msgid "Amount of Payment:"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/po_entry_items.php:501
-msgid "Update Invoice"
+#: purchasing/supplier_payment.php:352
+msgid "Enter Payment"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/po_entry_items.php:502 sales/sales_order_entry.php:711
-msgid "Cancel Invoice"
+#: purchasing/allocations/supplier_allocate.php:29
+msgid "Allocate Supplier Payment or Credit Note"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/po_receive_items.php:25
-msgid "Receive Purchase Order Items"
+#: purchasing/allocations/supplier_allocate.php:52
+msgid "Allocation of"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/po_receive_items.php:34
-msgid "Purchase Order Delivery has been processed"
+#: purchasing/allocations/supplier_allocate.php:58
+#: sales/allocations/customer_allocate.php:60
+msgid "Total:"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/po_receive_items.php:36
-msgid "&View this Delivery"
+#: purchasing/allocations/supplier_allocate.php:62
+#: sales/allocations/customer_allocate.php:64
+msgid "Amount to be settled:"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/po_receive_items.php:44
-msgid "Select a different &purchase order for receiving items against"
+#: purchasing/allocations/supplier_allocate.php:74
+#: purchasing/includes/ui/invoice_ui.inc:188
+#: purchasing/includes/ui/po_ui.inc:287
+#: sales/allocations/customer_allocate.php:77
+#: sales/includes/ui/sales_order_ui.inc:231
+msgid "Refresh"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/po_receive_items.php:53
-msgid ""
-"This page can only be opened if a purchase order has been selected. Please "
-"select a purchase order first."
+#: purchasing/allocations/supplier_allocate.php:74
+#: sales/allocations/customer_allocate.php:77
+msgid "Start again allocation of selected amount"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/po_receive_items.php:62 reporting/rep105.php:115
-#: sales/customer_delivery.php:420
-msgid "Ordered"
+#: purchasing/allocations/supplier_allocate.php:75
+#: sales/allocations/customer_allocate.php:78
+msgid "Process allocations"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/po_receive_items.php:63 reporting/rep101.php:134
-#: reporting/rep105.php:116 reporting/rep105.php:170 reporting/rep201.php:108
-#: reporting/includes/doctext.inc:246
-msgid "Outstanding"
+#: purchasing/allocations/supplier_allocate.php:76
+#: purchasing/allocations/supplier_allocate.php:82
+#: sales/allocations/customer_allocate.php:79
+#: sales/allocations/customer_allocate.php:85
+msgid "Back to Allocations"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/po_receive_items.php:63 sales/customer_delivery.php:421
-msgid "This Delivery"
+#: purchasing/allocations/supplier_allocate.php:77
+#: purchasing/allocations/supplier_allocate.php:83
+#: sales/allocations/customer_allocate.php:79
+#: sales/allocations/customer_allocate.php:86
+msgid "Abandon allocations and return to selection of allocatable amounts"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/po_receive_items.php:168 purchasing/po_receive_items.php:214
-msgid ""
-"There is nothing to process. Please enter valid quantities greater than zero."
+#: purchasing/allocations/supplier_allocate.php:81
+#: sales/allocations/customer_allocate.php:83
+msgid "There are no unsettled transactions to allocate."
 msgstr ""
 
 msgstr ""
 
-#: purchasing/po_receive_items.php:219
-msgid ""
-"Entered quantities cannot be greater than the quantity entered on the "
-"purchase order including the allowed over-receive percentage"
+#: purchasing/allocations/supplier_allocation_main.php:26
+msgid "Supplier Allocations"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/po_receive_items.php:221
-msgid ""
-"Modify the ordered items on the purchase order if you wish to increase the "
-"quantities."
+#: purchasing/allocations/supplier_allocation_main.php:36
+msgid "Select a Supplier: "
 msgstr ""
 
 msgstr ""
 
-#: purchasing/po_receive_items.php:239
-msgid ""
-"This order has been changed or invoiced since this delivery was started to "
-"be actioned. Processing halted. To enter a delivery against this purchase "
-"order, it must be re-selected and re-read again to update the changes made "
-"by the other user."
+#: purchasing/allocations/supplier_allocation_main.php:39
+#: sales/allocations/customer_allocation_main.php:35
+msgid "Show Settled Items:"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/po_receive_items.php:242
-msgid "Select a different purchase order for receiving goods against"
+#: purchasing/allocations/supplier_allocation_main.php:70
+#: sales/allocations/customer_allocation_main.php:68
+msgid "Allocate"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/po_receive_items.php:245
-msgid "Re-Read the updated purchase order for receiving goods against"
+#: purchasing/allocations/supplier_allocation_main.php:111
+#: sales/allocations/customer_allocation_main.php:109
+msgid "Marked items are settled."
 msgstr ""
 
 msgstr ""
 
-#: purchasing/po_receive_items.php:321
-msgid "Items to Receive"
+#: purchasing/includes/purchasing_db.inc:219
+msgid "Payment for:"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/po_receive_items.php:326
-msgid "Process Receive Items"
+#: purchasing/includes/db/invoice_db.inc:346
+msgid "Supplier invoice adjustment for zero inventory of "
 msgstr ""
 
 msgstr ""
 
-#: purchasing/supplier_credit.php:76
-msgid "Supplier credit note has been processed."
+#: purchasing/includes/db/invoice_db.inc:346 reporting/rep106.php:90
+#: sales/inquiry/customer_inquiry.php:75
+#: sales/inquiry/sales_deliveries_view.php:155
+#: sales/inquiry/sales_orders_view.php:139
+msgid "Invoice"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/supplier_credit.php:77
-msgid "View this Credit Note"
+#: purchasing/includes/db/invoice_db.inc:703
+#: purchasing/includes/db/invoice_db.inc:705
+msgid "GRN Removal"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/supplier_credit.php:79
-msgid "View the GL Journal Entries for this Credit Note"
+#: purchasing/includes/ui/grn_ui.inc:23 purchasing/includes/ui/grn_ui.inc:55
+#: purchasing/includes/ui/po_ui.inc:307 sales/view/view_sales_order.php:76
+msgid "Order Currency"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/supplier_credit.php:81
-msgid "Enter Another Credit Note"
+#: purchasing/includes/ui/grn_ui.inc:25 purchasing/includes/ui/grn_ui.inc:57
+msgid "For Purchase Order"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/supplier_credit.php:126 purchasing/supplier_invoice.php:135
-msgid ""
-"The account code entered is not a valid code, this line cannot be added to "
-"the transaction."
+#: purchasing/includes/ui/grn_ui.inc:28 reporting/includes/doctext.inc:76
+#: reporting/includes/doctext.inc:191 reporting/includes/doctext.inc:245
+#: sales/inquiry/sales_deliveries_view.php:176
+msgid "Delivery Date"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/supplier_credit.php:136 purchasing/supplier_invoice.php:145
-msgid ""
-"The amount entered is not numeric. This line cannot be added to the "
-"transaction."
+#: purchasing/includes/ui/grn_ui.inc:33 purchasing/includes/ui/grn_ui.inc:69
+#: purchasing/includes/ui/po_ui.inc:322 purchasing/includes/ui/po_ui.inc:327
+msgid "Deliver Into Location"
 msgstr ""
 
 msgstr ""
 
-#: 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."
+#: purchasing/includes/ui/grn_ui.inc:38 purchasing/includes/ui/grn_ui.inc:79
+#: purchasing/includes/ui/po_ui.inc:336 sales/view/view_sales_order.php:94
+msgid "Delivery Address"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/supplier_credit.php:180
-msgid ""
-"The credit note as entered cannot be processed because the date entered is "
-"not valid."
+#: purchasing/includes/ui/grn_ui.inc:41 purchasing/includes/ui/grn_ui.inc:82
+#: purchasing/includes/ui/po_ui.inc:348
+msgid "Order Comments"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/supplier_credit.php:192 purchasing/supplier_invoice.php:199
-msgid ""
-"The invoice as entered cannot be processed because the due date is in an "
-"incorrect format."
+#: purchasing/includes/ui/grn_ui.inc:59 sales/view/view_sales_order.php:67
+msgid "Ordered On"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/supplier_credit.php:218
-msgid ""
-"The return cannot be processed because there is an insufficient quantity for "
-"item:"
+#: purchasing/includes/ui/grn_ui.inc:74
+msgid "Date Items Received"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/supplier_credit.php:262
-msgid "The quantity to credit must be numeric and greater than zero."
+#: purchasing/includes/ui/invoice_ui.inc:122
+msgid "Source Invoices:"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/supplier_credit.php:269
-msgid "The price is either not numeric or negative."
+#: purchasing/includes/ui/invoice_ui.inc:124
+msgid "Supplier's Ref.:"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/supplier_credit.php:372
-msgid "Enter Credit Note"
+#: purchasing/includes/ui/invoice_ui.inc:138
+msgid "Terms:"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/supplier_invoice.php:39
-msgid "Enter Supplier Invoice"
+#: purchasing/includes/ui/invoice_ui.inc:144
+#: purchasing/includes/ui/po_ui.inc:174
+msgid "Dimension 2"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/supplier_invoice.php:44
-#, php-format
-msgid "Modifying Purchase Invoice # %d"
+#: purchasing/includes/ui/invoice_ui.inc:154
+#: purchasing/manage/suppliers.php:210 purchasing/manage/suppliers.php:215
+msgid "Supplier's Currency:"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/supplier_invoice.php:64
-msgid "Supplier invoice has been processed."
+#: purchasing/includes/ui/invoice_ui.inc:158
+#: purchasing/manage/suppliers.php:217 sales/manage/customers.php:300
+#: sales/manage/customer_branches.php:238
+msgid "Tax Group:"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/supplier_invoice.php:65
-msgid "View this Invoice"
+#: purchasing/includes/ui/invoice_ui.inc:175
+msgid "Sub-total:"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/supplier_invoice.php:72
-msgid "Enter Another Invoice"
+#: purchasing/includes/ui/invoice_ui.inc:183
+msgid "Invoice Total:"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/supplier_invoice.php:175
-msgid ""
-"The invoice cannot be processed because the there are no items or values on "
-"the invoice.  Invoices are expected to have a charge."
+#: purchasing/includes/ui/invoice_ui.inc:186
+#: sales/customer_credit_invoice.php:325
+#: sales/includes/ui/sales_credit_ui.inc:228
+msgid "Credit Note Total"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/supplier_invoice.php:187
-msgid ""
-"The invoice as entered cannot be processed because the invoice date is in an "
-"incorrect format."
+#: purchasing/includes/ui/invoice_ui.inc:220
+msgid "Add GL Line"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/supplier_invoice.php:251
-msgid "The quantity to invoice must be numeric and greater than zero."
+#: purchasing/includes/ui/invoice_ui.inc:221
+msgid "Reset"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/supplier_invoice.php:258
-msgid "The price is not numeric."
+#: purchasing/includes/ui/invoice_ui.inc:240
+msgid "GL Items for this Invoice"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/supplier_invoice.php:271
-msgid ""
-"The price being invoiced is more than the purchase order price by more than "
-"the allowed over-charge percentage. The system is set up to prohibit this. "
-"See the system administrator to modify the set up parameters if necessary."
+#: purchasing/includes/ui/invoice_ui.inc:242
+msgid "GL Items for this Credit Note"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/supplier_invoice.php:272 purchasing/supplier_invoice.php:285
-msgid "The over-charge percentage allowance is :"
+#: purchasing/includes/ui/invoice_ui.inc:252
+msgid "Quick Entry:"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/supplier_invoice.php:284
-msgid ""
-"The quantity being invoiced is more than the outstanding quantity by more "
-"than the allowed over-charge percentage. The system is set up to prohibit "
-"this. See the system administrator to modify the set up parameters if "
-"necessary."
+#: purchasing/includes/ui/invoice_ui.inc:320
+msgid "Edit line from document"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/supplier_invoice.php:362
-#, php-format
-msgid "All yet non-invoiced items on delivery line # %d has been removed."
+#: purchasing/includes/ui/invoice_ui.inc:421
+msgid "Add to Invoice"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/supplier_invoice.php:404
-msgid "Enter Invoice"
+#: purchasing/includes/ui/invoice_ui.inc:423
+msgid "Add to Credit Note"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/supplier_payment.php:31
-msgid "Supplier Payment Entry"
+#: purchasing/includes/ui/invoice_ui.inc:425 sales/customer_invoice.php:582
+msgid "Remove"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/supplier_payment.php:90
-msgid "Invalid purchase invoice number."
+#: 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 ""
 
 msgstr ""
 
-#: purchasing/supplier_payment.php:96
-msgid "Payment has been sucessfully entered"
+#: purchasing/includes/ui/invoice_ui.inc:427
+#, php-format
+msgid ""
+"You are about to remove all yet non-invoiced items from delivery line #%d. "
+"This operation also irreversibly changes related order line. Do you want to "
+"continue ?"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/supplier_payment.php:98
-msgid "&Print This Remittance"
+#: purchasing/includes/ui/invoice_ui.inc:458
+msgid "Items Received Yet to be Invoiced"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/supplier_payment.php:99
-msgid "&Email This Remittance"
+#: purchasing/includes/ui/invoice_ui.inc:463
+msgid "Delivery Item Selected For Adding To A Supplier Credit Note"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/supplier_payment.php:101
-msgid "View this Payment"
+#: purchasing/includes/ui/invoice_ui.inc:468
+msgid "Received Items Charged on this Invoice"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/supplier_payment.php:102
-msgid "View the GL &Journal Entries for this Payment"
+#: purchasing/includes/ui/invoice_ui.inc:470
+msgid "Received Items Credited on this Note"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/supplier_payment.php:104
-msgid "Enter another supplier &payment"
+#: purchasing/includes/ui/invoice_ui.inc:480
+msgid "Received between"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/supplier_payment.php:105 sales/customer_payments.php:111
-msgid "Enter Other &Payment"
+#: purchasing/includes/ui/invoice_ui.inc:492
+msgid "Add All Items"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/supplier_payment.php:106
-msgid "Enter &Customer Payment"
+#: purchasing/includes/ui/invoice_ui.inc:501
+#: purchasing/includes/ui/invoice_ui.inc:513 reporting/rep308.php:224
+#: sales/inquiry/sales_orders_view.php:147
+msgid "Delivery"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/supplier_payment.php:107 sales/customer_payments.php:109
-msgid "Enter Other &Deposit"
+#: purchasing/includes/ui/invoice_ui.inc:501
+msgid "P.O."
 msgstr ""
 
 msgstr ""
 
-#: purchasing/supplier_payment.php:108 sales/customer_payments.php:112
-msgid "Bank Account &Transfer"
+#: purchasing/includes/ui/invoice_ui.inc:502
+msgid "Received On"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/supplier_payment.php:171
-msgid "The entered discount is invalid or less than zero."
+#: purchasing/includes/ui/invoice_ui.inc:502 purchasing/view/view_po.php:46
+msgid "Quantity Received"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/supplier_payment.php:179
-msgid ""
-"The total of the amount and the discount is zero or negative. Please enter "
-"positive values."
+#: purchasing/includes/ui/invoice_ui.inc:502 purchasing/view/view_grn.php:41
+#: purchasing/view/view_po.php:46
+msgid "Quantity Invoiced"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/supplier_payment.php:186
-msgid "The entered bank amount is zero or negative."
+#: purchasing/includes/ui/invoice_ui.inc:503
+msgid "Qty Yet To Invoice"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/supplier_payment.php:276
-msgid "Payment To:"
+#: purchasing/includes/ui/invoice_ui.inc:503
+#: purchasing/includes/ui/po_ui.inc:217
+#: sales/includes/ui/sales_order_ui.inc:148
+msgid "Price after Tax"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/supplier_payment.php:294
-msgid "From Bank Account:"
+#: purchasing/includes/ui/invoice_ui.inc:503
+#: purchasing/includes/ui/po_ui.inc:217
+#: sales/includes/ui/sales_order_ui.inc:148
+msgid "Price before Tax"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/supplier_payment.php:300
-#: purchasing/view/view_supp_payment.php:55
-msgid "Date Paid"
+#: purchasing/includes/ui/invoice_ui.inc:509
+msgid "Qty Yet To Credit"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/supplier_payment.php:316
-msgid "Bank Amount:"
+#: purchasing/includes/ui/invoice_ui.inc:514
+msgid "Line Value"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/supplier_payment.php:329 sales/customer_payments.php:376
-msgid "Amount of Discount:"
+#: 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 ""
 
 msgstr ""
 
-#: purchasing/supplier_payment.php:330
-msgid "Amount of Payment:"
+#: purchasing/includes/ui/invoice_ui.inc:585
+msgid ""
+"There are no received items for the selected supplier that have been "
+"invoiced."
 msgstr ""
 
 msgstr ""
 
-#: purchasing/supplier_payment.php:334
-msgid "Enter Payment"
+#: purchasing/includes/ui/invoice_ui.inc:586
+msgid "Credits can only be applied to invoiced items."
 msgstr ""
 
 msgstr ""
 
-#: purchasing/view/view_grn.php:21
-msgid "View Purchase Order Delivery"
+#: purchasing/includes/ui/po_ui.inc:135 sales/sales_order_entry.php:731
+msgid "Order Date:"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/view/view_grn.php:27
-msgid ""
-"This page must be called with a Purchase Order Delivery number to review."
+#: purchasing/includes/ui/po_ui.inc:136 sales/sales_order_entry.php:718
+msgid "Delivery Date:"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/view/view_grn.php:37 purchasing/view/view_po.php:41
-#: sales/view/view_sales_order.php:216
-msgid "Line Details"
+#: purchasing/includes/ui/po_ui.inc:136 sales/sales_order_entry.php:712
+msgid "Invoice Date:"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/view/view_grn.php:40 reporting/includes/doctext.inc:76
-#: reporting/includes/doctext.inc:191 reporting/includes/doctext.inc:243
-#: sales/inquiry/sales_deliveries_view.php:175
-msgid "Delivery Date"
+#: purchasing/includes/ui/po_ui.inc:149
+msgid "Supplier Currency:"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/view/view_grn.php:70 purchasing/view/view_po.php:84
-#: purchasing/view/view_supp_credit.php:60
-#: purchasing/view/view_supp_invoice.php:66 sales/view/view_credit.php:135
-#: sales/view/view_sales_order.php:253
-msgid "Sub Total"
+#: purchasing/includes/ui/po_ui.inc:167
+msgid "Due Date:"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/view/view_grn.php:86
-msgid "This delivery has been voided."
+#: purchasing/includes/ui/po_ui.inc:169
+msgid "Supplier's Reference:"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/view/view_po.php:22
-msgid "View Purchase Order"
+#: purchasing/includes/ui/po_ui.inc:175
+msgid "Receive Into:"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/view/view_po.php:27
-msgid "This page must be called with a purchase order number to review."
+#: purchasing/includes/ui/po_ui.inc:196
+msgid ""
+"The default stock location set up for this user is not a currently defined "
+"stock location. Your system administrator needs to amend your user record."
 msgstr ""
 
 msgstr ""
 
-#: purchasing/view/view_po.php:46
-msgid "Requested By"
+#: purchasing/includes/ui/po_ui.inc:200
+msgid "Deliver to:"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/view/view_po.php:100
-#: purchasing/inquiry/supplier_allocation_inquiry.php:158
-#: purchasing/inquiry/supplier_inquiry.php:199
-#: sales/inquiry/customer_allocation_inquiry.php:167
-#: sales/inquiry/customer_inquiry.php:219
-#: sales/inquiry/sales_deliveries_view.php:195
-#: sales/inquiry/sales_orders_view.php:311
-msgid "Marked items are overdue."
+#: purchasing/includes/ui/po_ui.inc:209
+msgid "Order Items"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/view/view_po.php:113 sales/view/view_invoice.php:98
-#: sales/view/view_sales_order.php:51
-msgid "Deliveries"
+#: purchasing/includes/ui/po_ui.inc:217
+#: sales/includes/ui/sales_order_ui.inc:610
+msgid "Required Delivery Date"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/view/view_po.php:115
-msgid "Delivered On"
+#: purchasing/includes/ui/po_ui.inc:217 purchasing/view/view_grn.php:41
+#: purchasing/view/view_po.php:46
+msgid "Line Total"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/view/view_po.php:138 sales/view/view_sales_order.php:53
-msgid "Invoices/Credits"
+#: purchasing/includes/ui/po_ui.inc:342 sales/view/view_sales_order.php:85
+msgid "Required Pre-Payment"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/view/view_supp_credit.php:23
-msgid "View Supplier Credit Note"
+#: purchasing/includes/ui/po_ui.inc:343
+msgid "Pre-Payments Allocated"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/view/view_supp_credit.php:38
-msgid "SUPPLIER CREDIT NOTE"
+#: purchasing/includes/ui/po_ui.inc:472
+#: sales/includes/ui/sales_order_ui.inc:621
+#: sales/includes/ui/sales_order_ui.inc:623
+msgid "Pre-Payment Required:"
 msgstr ""
 
 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:263 sales/view/view_invoice.php:100
-msgid "Invoice Date"
+#: purchasing/inquiry/po_search.php:25
+msgid "Search Outstanding Purchase Orders"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/view/view_supp_credit.php:66
-msgid "TOTAL CREDIT NOTE"
+#: purchasing/inquiry/po_search.php:99
+#: purchasing/inquiry/po_search_completed.php:46 themes/canvas/renderer.php:95
+msgid "Receive"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/view/view_supp_credit.php:71 sales/view/view_credit.php:150
-msgid "This credit note has been voided."
+#: purchasing/inquiry/po_search.php:122
+#: purchasing/inquiry/po_search_completed.php:124
+#: reporting/includes/doctext.inc:187 sales/inquiry/sales_orders_view.php:277
+msgid "Order Date"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/view/view_supp_invoice.php:24
-msgid "View Supplier Invoice"
+#: purchasing/inquiry/po_search.php:124
+#: purchasing/inquiry/po_search_completed.php:126
+#: sales/inquiry/sales_orders_view.php:280
+msgid "Order Total"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/view/view_supp_invoice.php:41
-msgid "SUPPLIER INVOICE"
+#: purchasing/inquiry/po_search.php:135
+msgid "Marked orders have overdue items."
 msgstr ""
 
 msgstr ""
 
-#: purchasing/view/view_supp_invoice.php:73 reporting/rep107.php:284
-#: reporting/rep107.php:290 sales/view/view_invoice.php:168
-msgid "TOTAL INVOICE"
+#: purchasing/inquiry/po_search_completed.php:25
+msgid "Search Purchase Orders"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/view/view_supp_invoice.php:77 sales/view/view_invoice.php:175
-msgid "This invoice has been voided."
+#: purchasing/inquiry/po_search_completed.php:94
+msgid "into location:"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/view/view_supp_payment.php:22
-msgid "View Payment to Supplier"
+#: purchasing/inquiry/po_search_completed.php:106
+msgid "Also closed:"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/view/view_supp_payment.php:47
-msgid "Payment to Supplier"
+#: purchasing/inquiry/suppliers_list.php:53 sales/inquiry/customers_list.php:54
+msgid "Tax ID"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/view/view_supp_payment.php:53
-msgid "To Supplier"
+#: purchasing/inquiry/supplier_allocation_inquiry.php:23
+msgid "Supplier Allocation Inquiry"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/view/view_supp_payment.php:59
-msgid "Payment Currency"
+#: purchasing/inquiry/supplier_allocation_inquiry.php:55
+#: sales/inquiry/customer_allocation_inquiry.php:49
+msgid "show settled:"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/view/view_supp_payment.php:62 reporting/rep112.php:155
-#: reporting/rep210.php:164 sales/customer_delivery.php:421
-#: sales/customer_invoice.php:519 sales/customer_invoice.php:522
-#: sales/view/view_receipt.php:45 sales/view/view_sales_order.php:220
-msgid "Discount"
+#: purchasing/inquiry/supplier_allocation_inquiry.php:108
+#: sales/inquiry/customer_allocation_inquiry.php:119
+msgid "Payment"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/view/view_supp_payment.php:69
-msgid "Supplier's Currency"
+#: purchasing/inquiry/supplier_allocation_inquiry.php:140
+msgid "Supp Reference"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/manage/suppliers.php:27 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."
+#: purchasing/inquiry/supplier_allocation_inquiry.php:146
+#: reporting/rep101.php:138 reporting/rep201.php:116
+#: reporting/includes/doctext.inc:248
+#: sales/inquiry/customer_allocation_inquiry.php:157
+msgid "Allocated"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/manage/suppliers.php:90
-msgid "Basic Data"
+#: purchasing/inquiry/supplier_inquiry.php:25
+msgid "Supplier Inquiry"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/manage/suppliers.php:92
-msgid "Supplier Name:"
+#: purchasing/inquiry/supplier_inquiry.php:46 reporting/rep102.php:115
+#: reporting/rep108.php:161 reporting/rep202.php:125 reporting/rep202.php:159
+#: sales/inquiry/customer_inquiry.php:123
+msgid "Over"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/manage/suppliers.php:93
-msgid "Supplier Short Name:"
+#: purchasing/inquiry/supplier_inquiry.php:50
+#: sales/inquiry/customer_inquiry.php:126
+msgid "Terms"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/manage/suppliers.php:96
-msgid "Website:"
+#: purchasing/inquiry/supplier_inquiry.php:51 reporting/rep102.php:119
+#: reporting/rep108.php:163 reporting/rep202.php:130
+#: sales/inquiry/customer_inquiry.php:127
+msgid "Total Balance"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/manage/suppliers.php:108
-msgid "Our Customer No:"
+#: purchasing/inquiry/supplier_inquiry.php:94
+#: sales/inquiry/customer_inquiry.php:78
+msgid "Credit This"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/manage/suppliers.php:110
-msgid "Purchasing"
+#: purchasing/inquiry/supplier_inquiry.php:109
+msgid "Print Remittance"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/manage/suppliers.php:111
-msgid "Bank Name/Account:"
+#: purchasing/inquiry/supplier_inquiry.php:137
+msgid "Select a supplier:"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/manage/suppliers.php:112 sales/manage/customers.php:269
-msgid "Credit Limit:"
+#: purchasing/manage/suppliers.php:29 sales/manage/customer_branches.php:37
+#: sales/manage/recurrent_invoices.php:42
+msgid ""
+"There are no tax groups defined in the system. At least one tax group is "
+"required before proceeding."
 msgstr ""
 
 msgstr ""
 
-#: purchasing/manage/suppliers.php:113 sales/manage/customers.php:271
-msgid "Payment Terms:"
+#: purchasing/manage/suppliers.php:47
+msgid "The supplier name must be entered."
 msgstr ""
 
 msgstr ""
 
-#: purchasing/manage/suppliers.php:119 purchasing/manage/suppliers.php:122
-msgid "Prices contain tax included:"
+#: purchasing/manage/suppliers.php:54
+msgid "The supplier short name must be entered."
 msgstr ""
 
 msgstr ""
 
-#: purchasing/manage/suppliers.php:127 reporting/rep704.php:95
-#: reporting/rep704.php:105 reporting/rep704.php:113
-msgid "Accounts"
+#: purchasing/manage/suppliers.php:80
+msgid "Supplier has been updated."
 msgstr ""
 
 msgstr ""
 
-#: purchasing/manage/suppliers.php:128
-msgid "Accounts Payable Account:"
+#: purchasing/manage/suppliers.php:98
+msgid "A new supplier has been added."
 msgstr ""
 
 msgstr ""
 
-#: purchasing/manage/suppliers.php:129
-msgid "Purchase Account:"
+#: purchasing/manage/suppliers.php:120
+msgid ""
+"Cannot delete this supplier because there are transactions that refer to "
+"this supplier."
 msgstr ""
 
 msgstr ""
 
-#: purchasing/manage/suppliers.php:130
-msgid "Use Item Inventory/COGS Account"
+#: purchasing/manage/suppliers.php:128
+msgid ""
+"Cannot delete the supplier record because purchase orders have been created "
+"against this supplier."
 msgstr ""
 
 msgstr ""
 
-#: purchasing/manage/suppliers.php:133 purchasing/manage/suppliers.php:137
-msgid "Contact Data"
+#: purchasing/manage/suppliers.php:139
+msgid "Supplier has been deleted."
 msgstr ""
 
 msgstr ""
 
-#: purchasing/manage/suppliers.php:140
-msgid "System default"
+#: purchasing/manage/suppliers.php:200
+msgid "Basic Data"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/manage/suppliers.php:159 sales/manage/customer_branches.php:259
-msgid "Addresses"
+#: purchasing/manage/suppliers.php:202
+msgid "Supplier Name:"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/manage/suppliers.php:160 reporting/rep205.php:93
-#: sales/manage/customer_branches.php:260
-msgid "Mailing Address:"
+#: purchasing/manage/suppliers.php:203
+msgid "Supplier Short Name:"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/manage/suppliers.php:161
-msgid "Physical Address:"
+#: purchasing/manage/suppliers.php:206
+msgid "Website:"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/manage/suppliers.php:163
-msgid "General"
+#: purchasing/manage/suppliers.php:218
+msgid "Our Customer No:"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/manage/suppliers.php:164 reporting/rep205.php:170
-#: sales/manage/customer_branches.php:262 sales/manage/customers.php:292
-msgid "General Notes:"
+#: purchasing/manage/suppliers.php:220
+msgid "Purchasing"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/manage/suppliers.php:166
-msgid "Supplier status:"
+#: purchasing/manage/suppliers.php:221
+msgid "Bank Name/Account:"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/manage/suppliers.php:173
-msgid "Update Supplier"
+#: purchasing/manage/suppliers.php:222 sales/manage/customers.php:270
+msgid "Credit Limit:"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/manage/suppliers.php:174
-msgid "Update supplier data"
+#: purchasing/manage/suppliers.php:223 sales/manage/customers.php:272
+msgid "Payment Terms:"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/manage/suppliers.php:175
-msgid "Select this supplier and return to document entry."
+#: purchasing/manage/suppliers.php:229 purchasing/manage/suppliers.php:232
+msgid "Prices contain tax included:"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/manage/suppliers.php:176
-msgid "Delete Supplier"
+#: purchasing/manage/suppliers.php:237 reporting/rep704.php:104
+#: reporting/rep704.php:114 reporting/rep704.php:122
+msgid "Accounts"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/manage/suppliers.php:177
-msgid "Delete supplier data if have been never used"
+#: purchasing/manage/suppliers.php:238
+msgid "Accounts Payable Account:"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/manage/suppliers.php:181
-msgid "Add New Supplier Details"
+#: purchasing/manage/suppliers.php:239
+msgid "Purchase Account:"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/manage/suppliers.php:200
-msgid "The supplier name must be entered."
+#: purchasing/manage/suppliers.php:240
+msgid "Use Item Inventory/COGS Account"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/manage/suppliers.php:207
-msgid "The supplier short name must be entered."
+#: purchasing/manage/suppliers.php:243 purchasing/manage/suppliers.php:247
+msgid "Contact Data"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/manage/suppliers.php:227
-msgid "Supplier has been updated."
+#: purchasing/manage/suppliers.php:250
+msgid "System default"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/manage/suppliers.php:245
-msgid "A new supplier has been added."
+#: purchasing/manage/suppliers.php:269 sales/manage/customer_branches.php:259
+msgid "Addresses"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/manage/suppliers.php:263
-msgid ""
-"Cannot delete this supplier because there are transactions that refer to "
-"this supplier."
+#: purchasing/manage/suppliers.php:270 reporting/rep205.php:93
+#: sales/manage/customer_branches.php:260
+msgid "Mailing Address:"
 msgstr ""
 
 #: purchasing/manage/suppliers.php:271
 msgstr ""
 
 #: purchasing/manage/suppliers.php:271
-msgid ""
-"Cannot delete the supplier record because purchase orders have been created "
-"against this supplier."
+msgid "Physical Address:"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/manage/suppliers.php:282
-msgid "Supplier has been deleted."
+#: purchasing/manage/suppliers.php:273
+msgid "General"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/manage/suppliers.php:292
-#: purchasing/inquiry/po_search_completed.php:95
-#: purchasing/inquiry/po_search.php:76
-#: purchasing/inquiry/supplier_allocation_inquiry.php:48
-msgid "Select a supplier: "
+#: purchasing/manage/suppliers.php:274 reporting/rep103.php:258
+#: reporting/rep205.php:170 sales/manage/customers.php:293
+#: sales/manage/customer_branches.php:262
+msgid "General Notes:"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/manage/suppliers.php:293
-msgid "New supplier"
+#: purchasing/manage/suppliers.php:276
+msgid "Supplier status:"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/manage/suppliers.php:312 sales/manage/customer_branches.php:311
-#: sales/manage/customers.php:352
-msgid "&Contacts"
+#: purchasing/manage/suppliers.php:283
+msgid "Update Supplier"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/manage/suppliers.php:314
-msgid "Purchase &Orders"
+#: purchasing/manage/suppliers.php:284
+msgid "Update supplier data"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/inquiry/po_search_completed.php:25
-msgid "Search Purchase Orders"
+#: purchasing/manage/suppliers.php:285
+msgid "Select this supplier and return to document entry."
 msgstr ""
 
 msgstr ""
 
-#: purchasing/inquiry/po_search_completed.php:85
-msgid "into location:"
+#: purchasing/manage/suppliers.php:286
+msgid "Delete Supplier"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/inquiry/po_search_completed.php:97
-msgid "Also closed:"
+#: purchasing/manage/suppliers.php:287
+msgid "Delete supplier data if have been never used"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/inquiry/po_search_completed.php:115
-#: purchasing/inquiry/po_search.php:122 reporting/includes/doctext.inc:187
-#: sales/inquiry/sales_orders_view.php:257
-msgid "Order Date"
+#: purchasing/manage/suppliers.php:291
+msgid "Add New Supplier Details"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/inquiry/po_search_completed.php:117
-#: purchasing/inquiry/po_search.php:124
-#: sales/inquiry/sales_orders_view.php:260
-msgid "Order Total"
+#: purchasing/manage/suppliers.php:303
+msgid "New supplier"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/inquiry/po_search.php:25
-msgid "Search Outstanding Purchase Orders"
+#: purchasing/manage/suppliers.php:322 sales/manage/customers.php:353
+#: sales/manage/customer_branches.php:311
+msgid "&Contacts"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/inquiry/po_search.php:99
-msgid "Receive"
+#: purchasing/manage/suppliers.php:324
+msgid "Purchase &Orders"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/inquiry/po_search.php:135
-msgid "Marked orders have overdue items."
+#: purchasing/manage/suppliers.php:325 sales/manage/customers.php:356
+msgid "Attachments"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/inquiry/supplier_allocation_inquiry.php:23
-msgid "Supplier Allocation Inquiry"
+#: purchasing/view/view_grn.php:21
+msgid "View Purchase Order Delivery"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/inquiry/supplier_allocation_inquiry.php:55
-#: sales/inquiry/customer_allocation_inquiry.php:49
-msgid "show settled:"
+#: purchasing/view/view_grn.php:27
+msgid ""
+"This page must be called with a Purchase Order Delivery number to review."
 msgstr ""
 
 msgstr ""
 
-#: purchasing/inquiry/supplier_allocation_inquiry.php:108
-#: sales/inquiry/customer_allocation_inquiry.php:118
-msgid "Payment"
+#: purchasing/view/view_grn.php:37 purchasing/view/view_po.php:41
+#: sales/view/view_sales_order.php:218
+msgid "Line Details"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/inquiry/supplier_allocation_inquiry.php:140
-msgid "Supp Reference"
+#: purchasing/view/view_grn.php:40
+msgid "Required by"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/inquiry/supplier_allocation_inquiry.php:146
-#: reporting/rep101.php:134 reporting/rep201.php:108
-#: reporting/includes/doctext.inc:246
-#: sales/inquiry/customer_allocation_inquiry.php:156
-msgid "Allocated"
+#: purchasing/view/view_grn.php:80 purchasing/view/view_po.php:84
+#: purchasing/view/view_supp_credit.php:60
+#: purchasing/view/view_supp_invoice.php:66 sales/view/view_credit.php:135
+#: sales/view/view_sales_order.php:255
+msgid "Sub Total"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/inquiry/supplier_inquiry.php:25
-msgid "Supplier Inquiry"
+#: purchasing/view/view_grn.php:97
+msgid "Marked items were delivered overdue."
 msgstr ""
 
 msgstr ""
 
-#: purchasing/inquiry/supplier_inquiry.php:46 reporting/rep102.php:118
-#: reporting/rep108.php:153 reporting/rep202.php:124 reporting/rep202.php:158
-#: sales/inquiry/customer_inquiry.php:118
-msgid "Over"
+#: purchasing/view/view_grn.php:99
+msgid "This delivery has been voided."
 msgstr ""
 
 msgstr ""
 
-#: purchasing/inquiry/supplier_inquiry.php:50
-#: sales/inquiry/customer_inquiry.php:121
-msgid "Terms"
+#: purchasing/view/view_po.php:22
+msgid "View Purchase Order"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/inquiry/supplier_inquiry.php:50 reporting/rep102.php:121
-#: reporting/rep102.php:239 reporting/rep108.php:155 reporting/rep202.php:128
-#: reporting/rep202.php:247 reporting/rep451.php:80
-#: sales/inquiry/customer_inquiry.php:121
-msgid "Current"
+#: purchasing/view/view_po.php:27
+msgid "This page must be called with a purchase order number to review."
 msgstr ""
 
 msgstr ""
 
-#: purchasing/inquiry/supplier_inquiry.php:51 reporting/rep102.php:122
-#: reporting/rep108.php:155 reporting/rep202.php:129
-#: sales/inquiry/customer_inquiry.php:122
-msgid "Total Balance"
+#: purchasing/view/view_po.php:46
+msgid "Requested By"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/inquiry/supplier_inquiry.php:94
-#: sales/inquiry/customer_inquiry.php:74
-msgid "Credit This"
+#: purchasing/view/view_po.php:113 sales/view/view_invoice.php:98
+#: sales/view/view_sales_order.php:51
+msgid "Deliveries"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/inquiry/supplier_inquiry.php:109
-msgid "Print Remittance"
+#: purchasing/view/view_po.php:115
+msgid "Delivered On"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/inquiry/supplier_inquiry.php:137
-msgid "Select a supplier:"
+#: purchasing/view/view_po.php:138 sales/view/view_sales_order.php:53
+msgid "Invoices/Credits"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/inquiry/suppliers_list.php:53
-#: sales/inquiry/customers_list.php:54
-msgid "Tax ID"
+#: purchasing/view/view_supp_credit.php:23
+msgid "View Supplier Credit Note"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/allocations/supplier_allocate.php:29
-msgid "Allocate Supplier Payment or Credit Note"
+#: purchasing/view/view_supp_credit.php:38
+msgid "SUPPLIER CREDIT NOTE"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/allocations/supplier_allocate.php:52
-msgid "Allocation of"
+#: purchasing/view/view_supp_credit.php:47
+#: purchasing/view/view_supp_invoice.php:51 reporting/includes/doctext.inc:140
+#: sales/customer_credit_invoice.php:263 sales/view/view_invoice.php:100
+msgid "Invoice Date"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/allocations/supplier_allocate.php:58
-#: sales/allocations/customer_allocate.php:60
-msgid "Total:"
+#: purchasing/view/view_supp_credit.php:66
+msgid "TOTAL CREDIT NOTE"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/allocations/supplier_allocate.php:62
-#: sales/allocations/customer_allocate.php:64
-msgid "Amount ot be settled:"
+#: purchasing/view/view_supp_credit.php:71 sales/view/view_credit.php:150
+msgid "This credit note has been voided."
 msgstr ""
 
 msgstr ""
 
-#: purchasing/allocations/supplier_allocate.php:74
-#: sales/allocations/customer_allocate.php:77
-msgid "Start again allocation of selected amount"
+#: purchasing/view/view_supp_invoice.php:24
+msgid "View Supplier Invoice"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/allocations/supplier_allocate.php:75
-#: sales/allocations/customer_allocate.php:78
-msgid "Process allocations"
+#: purchasing/view/view_supp_invoice.php:41
+msgid "SUPPLIER INVOICE"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/allocations/supplier_allocate.php:76
-#: purchasing/allocations/supplier_allocate.php:82
-#: sales/allocations/customer_allocate.php:79
-#: sales/allocations/customer_allocate.php:85
-msgid "Back to Allocations"
+#: purchasing/view/view_supp_invoice.php:73 reporting/rep107.php:308
+#: reporting/rep107.php:314 sales/view/view_invoice.php:168
+msgid "TOTAL INVOICE"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/allocations/supplier_allocate.php:77
-#: purchasing/allocations/supplier_allocate.php:83
-#: sales/allocations/customer_allocate.php:79
-#: sales/allocations/customer_allocate.php:86
-msgid "Abandon allocations and return to selection of allocatable amounts"
+#: purchasing/view/view_supp_invoice.php:77 sales/view/view_invoice.php:175
+msgid "This invoice has been voided."
 msgstr ""
 
 msgstr ""
 
-#: purchasing/allocations/supplier_allocate.php:81
-#: sales/allocations/customer_allocate.php:83
-msgid "There are no unsettled transactions to allocate."
+#: purchasing/view/view_supp_payment.php:22
+msgid "View Payment to Supplier"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/allocations/supplier_allocation_main.php:26
-msgid "Supplier Allocations"
+#: purchasing/view/view_supp_payment.php:47
+msgid "Payment to Supplier"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/allocations/supplier_allocation_main.php:36
-msgid "Select a Supplier: "
+#: purchasing/view/view_supp_payment.php:53
+msgid "To Supplier"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/allocations/supplier_allocation_main.php:39
-#: sales/allocations/customer_allocation_main.php:35
-msgid "Show Settled Items:"
+#: purchasing/view/view_supp_payment.php:59
+msgid "Payment Currency"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/allocations/supplier_allocation_main.php:70
-#: sales/allocations/customer_allocation_main.php:68
-msgid "Allocate"
+#: purchasing/view/view_supp_payment.php:62 reporting/rep112.php:164
+#: reporting/rep210.php:164 sales/customer_delivery.php:422
+#: sales/customer_invoice.php:520 sales/customer_invoice.php:523
+#: sales/view/view_receipt.php:45 sales/view/view_sales_order.php:222
+msgid "Discount"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/allocations/supplier_allocation_main.php:111
-#: sales/allocations/customer_allocation_main.php:109
-msgid "Marked items are settled."
+#: purchasing/view/view_supp_payment.php:69
+msgid "Supplier's Currency"
 msgstr ""
 
 msgstr ""
 
-#: reporting/rep101.php:123 reporting/rep102.php:104 reporting/rep114.php:108
-#: reporting/rep202.php:110 reporting/rep203.php:78
+#: reporting/rep101.php:127 reporting/rep102.php:101 reporting/rep114.php:108
+#: reporting/rep115.php:154 reporting/rep202.php:111 reporting/rep203.php:78
 msgid "Balances in Home Currency"
 msgstr ""
 
 msgid "Balances in Home Currency"
 msgstr ""
 
-#: reporting/rep101.php:133 reporting/rep201.php:107 reporting/rep203.php:88
-#: reporting/rep709.php:116 reporting/includes/doctext.inc:166
-#: reporting/includes/doctext.inc:207 reporting/includes/doctext.inc:245
+#: reporting/rep101.php:137 reporting/rep201.php:115 reporting/rep203.php:88
+#: reporting/rep709.php:117 reporting/includes/doctext.inc:166
+#: reporting/includes/doctext.inc:209 reporting/includes/doctext.inc:247
 msgid "Trans Type"
 msgstr ""
 
 msgid "Trans Type"
 msgstr ""
 
-#: reporting/rep101.php:133 reporting/rep201.php:107
-#: reporting/includes/doctext.inc:245
-msgid "Charges"
+#: reporting/rep101.php:137 reporting/includes/doctext.inc:247
+msgid "Debits"
 msgstr ""
 
 msgstr ""
 
-#: reporting/rep101.php:133 reporting/rep201.php:108
-#: reporting/includes/doctext.inc:246
+#: reporting/rep101.php:137 reporting/rep201.php:116
+#: reporting/includes/doctext.inc:248
 msgid "Credits"
 msgstr ""
 
 msgid "Credits"
 msgstr ""
 
-#: reporting/rep101.php:144 reporting/rep102.php:132 reporting/rep201.php:118
-#: reporting/rep202.php:139 reporting/rep203.php:97 reporting/rep303.php:136
+#: reporting/rep101.php:147 reporting/reports_main.php:39
+#: reporting/reports_main.php:168 reporting/reports_main.php:356
+msgid "Show Balance"
+msgstr ""
+
+#: reporting/rep101.php:149 reporting/rep102.php:129 reporting/rep115.php:174
+#: reporting/rep201.php:126 reporting/rep202.php:140 reporting/rep203.php:97
+#: reporting/rep206.php:124 reporting/rep303.php:238
 #: reporting/reports_main.php:41 reporting/reports_main.php:51
 #: reporting/reports_main.php:41 reporting/reports_main.php:51
-#: reporting/reports_main.php:158 reporting/reports_main.php:168
-#: reporting/reports_main.php:177 reporting/reports_main.php:229
+#: reporting/reports_main.php:63 reporting/reports_main.php:170
+#: reporting/reports_main.php:180 reporting/reports_main.php:190
+#: reporting/reports_main.php:198 reporting/reports_main.php:250
 msgid "Suppress Zeros"
 msgstr ""
 
 msgid "Suppress Zeros"
 msgstr ""
 
-#: reporting/rep101.php:146
+#: reporting/rep101.php:151
 msgid "Customer Balances"
 msgstr ""
 
 msgid "Customer Balances"
 msgstr ""
 
-#: reporting/rep101.php:263 reporting/rep102.php:226 reporting/rep105.php:177
-#: reporting/rep106.php:181 reporting/rep201.php:232 reporting/rep202.php:233
-#: reporting/rep203.php:176 reporting/rep204.php:148 reporting/rep301.php:249
-#: reporting/rep304.php:212 reporting/rep305.php:193 reporting/rep306.php:293
-#: reporting/rep309.php:157 reporting/rep451.php:164
+#: reporting/rep101.php:269 reporting/rep102.php:215 reporting/rep105.php:177
+#: reporting/rep106.php:182 reporting/rep115.php:264 reporting/rep201.php:240
+#: reporting/rep202.php:234 reporting/rep203.php:176 reporting/rep204.php:148
+#: reporting/rep206.php:227 reporting/rep301.php:253 reporting/rep304.php:212
+#: reporting/rep305.php:193 reporting/rep306.php:289 reporting/rep309.php:157
+#: reporting/rep451.php:164
 msgid "Grand Total"
 msgstr ""
 
 msgid "Grand Total"
 msgstr ""
 
-#: reporting/rep102.php:98 reporting/rep106.php:99 reporting/rep202.php:104
-#: reporting/rep709.php:100 reporting/reports_main.php:50
-#: reporting/reports_main.php:93 reporting/reports_main.php:167
-#: reporting/reports_main.php:213 reporting/reports_main.php:323
-#: reporting/reports_main.php:519
+#: reporting/rep102.php:95 reporting/rep106.php:100 reporting/rep202.php:105
+#: reporting/rep709.php:101 reporting/reports_main.php:50
+#: reporting/reports_main.php:104 reporting/reports_main.php:179
+#: reporting/reports_main.php:234 reporting/reports_main.php:345
+#: reporting/reports_main.php:544
 msgid "Summary Only"
 msgstr ""
 
 msgid "Summary Only"
 msgstr ""
 
-#: reporting/rep102.php:100 reporting/rep202.php:106 reporting/rep709.php:102
+#: reporting/rep102.php:97 reporting/rep202.php:107 reporting/rep709.php:103
 msgid "Detailed Report"
 msgstr ""
 
 msgid "Detailed Report"
 msgstr ""
 
-#: reporting/rep102.php:127 reporting/rep202.php:134 reporting/rep203.php:94
-#: reporting/rep301.php:169 reporting/rep451.php:85
+#: reporting/rep102.php:124 reporting/rep202.php:135 reporting/rep203.php:94
+#: reporting/rep301.php:173 reporting/rep451.php:85
 #: reporting/reports_main.php:37 reporting/reports_main.php:46
 #: 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:285
-#: reporting/reports_main.php:320 reporting/reports_main.php:343
-#: reporting/reports_main.php:351 reporting/reports_main.php:363
-#: reporting/reports_main.php:373 reporting/reports_main.php:391
-#: reporting/reports_main.php:402 reporting/reports_main.php:414
-#: reporting/reports_main.php:427 reporting/reports_main.php:443
-#: reporting/reports_main.php:453 reporting/reports_main.php:464
-#: reporting/reports_main.php:476 reporting/reports_main.php:490
-#: reporting/reports_main.php:499 reporting/reports_main.php:509
-#: reporting/reports_main.php:518 reporting/reports_main.php:525
+#: reporting/reports_main.php:58 reporting/reports_main.php:78
+#: reporting/reports_main.php:94 reporting/reports_main.php:103
+#: reporting/reports_main.php:166 reporting/reports_main.php:175
+#: reporting/reports_main.php:187 reporting/reports_main.php:195
+#: reporting/reports_main.php:231 reporting/reports_main.php:257
+#: reporting/reports_main.php:267 reporting/reports_main.php:273
+#: reporting/reports_main.php:283 reporting/reports_main.php:291
+#: reporting/reports_main.php:299 reporting/reports_main.php:306
+#: reporting/reports_main.php:342 reporting/reports_main.php:365
+#: reporting/reports_main.php:373 reporting/reports_main.php:385
+#: reporting/reports_main.php:395 reporting/reports_main.php:414
+#: reporting/reports_main.php:425 reporting/reports_main.php:437
+#: reporting/reports_main.php:450 reporting/reports_main.php:467
+#: reporting/reports_main.php:477 reporting/reports_main.php:488
+#: reporting/reports_main.php:500 reporting/reports_main.php:515
+#: reporting/reports_main.php:524 reporting/reports_main.php:534
+#: reporting/reports_main.php:543 reporting/reports_main.php:550
 msgid "End Date"
 msgstr ""
 
 msgid "End Date"
 msgstr ""
 
-#: reporting/rep102.php:131 reporting/rep202.php:138
-#: reporting/reports_main.php:49 reporting/reports_main.php:125
-#: reporting/reports_main.php:166
+#: reporting/rep102.php:128 reporting/rep202.php:139
+#: reporting/reports_main.php:49 reporting/reports_main.php:136
+#: reporting/reports_main.php:178
 msgid "Show Also Allocated"
 msgstr ""
 
 msgid "Show Also Allocated"
 msgstr ""
 
-#: reporting/rep102.php:136
+#: reporting/rep102.php:133
 msgid "Aged Customer Analysis"
 msgstr ""
 
 msgid "Aged Customer Analysis"
 msgstr ""
 
-#: reporting/rep103.php:131
+#: reporting/rep103.php:131 reporting/rep115.php:140
 msgid "All Areas"
 msgstr ""
 
 msgid "All Areas"
 msgstr ""
 
@@ -11639,16 +12343,18 @@ msgid "Branch Delivery Address"
 msgstr ""
 
 #: reporting/rep103.php:158 reporting/rep205.php:99
 msgstr ""
 
 #: reporting/rep103.php:158 reporting/rep205.php:99
-#: reporting/reports_main.php:57 reporting/reports_main.php:187
+#: reporting/reports_main.php:68 reporting/reports_main.php:208
 msgid "Activity Since"
 msgstr ""
 
 msgid "Activity Since"
 msgstr ""
 
-#: reporting/rep103.php:159 reporting/reports_main.php:58
+#: reporting/rep103.php:159 reporting/rep115.php:171
+#: reporting/reports_main.php:60 reporting/reports_main.php:69
 #: sales/manage/sales_areas.php:16
 msgid "Sales Areas"
 msgstr ""
 
 #: sales/manage/sales_areas.php:16
 msgid "Sales Areas"
 msgstr ""
 
-#: reporting/rep103.php:160 reporting/reports_main.php:59
+#: reporting/rep103.php:160 reporting/rep115.php:172
+#: reporting/reports_main.php:61 reporting/reports_main.php:70
 msgid "Sales Folk"
 msgstr ""
 
 msgid "Sales Folk"
 msgstr ""
 
@@ -11672,10 +12378,6 @@ msgstr ""
 msgid "Ph"
 msgstr ""
 
 msgid "Ph"
 msgstr ""
 
-#: reporting/rep103.php:258
-msgid "Gereral Notes:"
-msgstr ""
-
 #: reporting/rep103.php:267 reporting/rep205.php:93 reporting/rep205.php:179
 msgid "Turnover"
 msgstr ""
 #: reporting/rep103.php:267 reporting/rep205.php:93 reporting/rep205.php:179
 msgid "Turnover"
 msgstr ""
@@ -11684,17 +12386,11 @@ msgstr ""
 msgid "Category/Items"
 msgstr ""
 
 msgid "Category/Items"
 msgstr ""
 
-#: reporting/rep104.php:109 reporting/rep301.php:164 reporting/rep303.php:121
-#: reporting/rep303.php:127 reporting/rep307.php:114 reporting/rep308.php:223
-#: reporting/rep451.php:80
-msgid "UOM"
-msgstr ""
-
 #: reporting/rep104.php:109
 msgid "GP %"
 msgstr ""
 
 #: reporting/rep104.php:109
 msgid "GP %"
 msgstr ""
 
-#: reporting/rep104.php:117 reporting/reports_main.php:77
+#: reporting/rep104.php:117 reporting/reports_main.php:88
 msgid "Show GP %"
 msgstr ""
 
 msgid "Show GP %"
 msgstr ""
 
@@ -11710,17 +12406,17 @@ msgstr ""
 msgid "All Orders"
 msgstr ""
 
 msgid "All Orders"
 msgstr ""
 
-#: reporting/rep105.php:106 reporting/reports_main.php:86
+#: reporting/rep105.php:106 reporting/reports_main.php:97
 msgid "Back Orders Only"
 msgstr ""
 
 #: reporting/rep105.php:110 reporting/rep204.php:84
 msgid "Back Orders Only"
 msgstr ""
 
 #: reporting/rep105.php:110 reporting/rep204.php:84
-#: sales/inquiry/customer_allocation_inquiry.php:149
-#: sales/inquiry/customer_inquiry.php:195
+#: sales/inquiry/customer_allocation_inquiry.php:150
+#: sales/inquiry/customer_inquiry.php:201
 msgid "Order"
 msgstr ""
 
 msgid "Order"
 msgstr ""
 
-#: reporting/rep105.php:110 reporting/rep106.php:89
+#: reporting/rep105.php:110 reporting/rep106.php:90
 msgid "Customer Ref"
 msgstr ""
 
 msgid "Customer Ref"
 msgstr ""
 
@@ -11736,8 +12432,8 @@ msgstr ""
 msgid "Loc"
 msgstr ""
 
 msgid "Loc"
 msgstr ""
 
-#: reporting/rep105.php:115 sales/customer_delivery.php:420
-#: sales/customer_invoice.php:521 sales/includes/ui/sales_order_ui.inc:147
+#: reporting/rep105.php:115 sales/customer_delivery.php:421
+#: sales/customer_invoice.php:522 sales/includes/ui/sales_order_ui.inc:147
 msgid "Delivered"
 msgstr ""
 
 msgid "Delivered"
 msgstr ""
 
@@ -11749,89 +12445,93 @@ msgstr ""
 msgid "Order Status Listing"
 msgstr ""
 
 msgid "Order Status Listing"
 msgstr ""
 
-#: reporting/rep106.php:90
+#: reporting/rep106.php:91
 msgid "Inv Date"
 msgstr ""
 
 msgid "Inv Date"
 msgstr ""
 
-#: reporting/rep106.php:90 reporting/rep106.php:94 reporting/rep106.php:95
+#: reporting/rep106.php:91 reporting/rep106.php:95 reporting/rep106.php:96
 #: sales/manage/sales_people.php:99 sales/manage/sales_people.php:159
 #: sales/manage/sales_people.php:161
 msgid "Provision"
 msgstr ""
 
 #: sales/manage/sales_people.php:99 sales/manage/sales_people.php:159
 #: sales/manage/sales_people.php:161
 msgid "Provision"
 msgstr ""
 
-#: reporting/rep106.php:94
+#: reporting/rep106.php:95
 msgid "Salesman"
 msgstr ""
 
 msgid "Salesman"
 msgstr ""
 
-#: reporting/rep106.php:95 sales/manage/sales_people.php:99
+#: reporting/rep106.php:96 sales/manage/sales_people.php:99
 msgid "Break Pt."
 msgstr ""
 
 msgid "Break Pt."
 msgstr ""
 
-#: reporting/rep106.php:103
+#: reporting/rep106.php:104
 msgid "Salesman Listing"
 msgstr ""
 
 msgid "Salesman Listing"
 msgstr ""
 
-#: reporting/rep107.php:87 reporting/rep107.php:113
+#: reporting/rep107.php:97 reporting/rep107.php:129
 #: reporting/includes/doctext.inc:117
 msgid "INVOICE"
 msgstr ""
 
 #: reporting/includes/doctext.inc:117
 msgid "INVOICE"
 msgstr ""
 
-#: reporting/rep107.php:196
+#: reporting/rep107.php:220
 msgid "Prepayments invoiced to this order up to day:"
 msgstr ""
 
 msgid "Prepayments invoiced to this order up to day:"
 msgstr ""
 
-#: reporting/rep107.php:203
+#: reporting/rep107.php:227
 msgid "Invoice reference"
 msgstr ""
 
 msgid "Invoice reference"
 msgstr ""
 
-#: reporting/rep107.php:220
+#: reporting/rep107.php:244
 msgid "Total payments:"
 msgstr ""
 
 msgid "Total payments:"
 msgstr ""
 
-#: reporting/rep107.php:237 reporting/rep109.php:160 reporting/rep110.php:162
-#: reporting/rep111.php:157 reporting/rep113.php:151
-#: sales/view/view_credit.php:140 sales/view/view_dispatch.php:155
-#: sales/view/view_invoice.php:160 sales/view/view_sales_order.php:246
-#: sales/includes/ui/sales_credit_ui.inc:217
+#: reporting/rep107.php:261 reporting/rep109.php:144 reporting/rep110.php:162
+#: reporting/rep111.php:159 reporting/rep113.php:151
+#: sales/includes/ui/sales_credit_ui.inc:217 sales/view/view_credit.php:140
+#: sales/view/view_dispatch.php:155 sales/view/view_invoice.php:160
+#: sales/view/view_sales_order.php:248
 msgid "Shipping"
 msgstr ""
 
 msgid "Shipping"
 msgstr ""
 
-#: reporting/rep107.php:284 reporting/rep109.php:212 reporting/rep111.php:209
+#: reporting/rep107.php:308 reporting/rep109.php:196 reporting/rep111.php:211
 msgid "TOTAL ORDER VAT INCL."
 msgstr ""
 
 msgid "TOTAL ORDER VAT INCL."
 msgstr ""
 
-#: reporting/rep107.php:290
+#: reporting/rep107.php:314
 msgid "THIS INVOICE"
 msgstr ""
 
 msgid "THIS INVOICE"
 msgstr ""
 
-#: reporting/rep108.php:81 reporting/rep108.php:109
-#: reporting/includes/doctext.inc:237
+#: reporting/rep107.php:327
+#, php-format
+msgid "Invoice %s from %s"
+msgstr ""
+
+#: reporting/rep108.php:113 reporting/rep108.php:117
+#: reporting/includes/doctext.inc:239
 msgid "STATEMENT"
 msgstr ""
 
 msgid "STATEMENT"
 msgstr ""
 
-#: reporting/rep108.php:126
+#: reporting/rep108.php:134
 msgid "Outstanding Transactions"
 msgstr ""
 
 msgid "Outstanding Transactions"
 msgstr ""
 
-#: reporting/rep108.php:170
+#: reporting/rep108.php:178
 msgid "Statement"
 msgstr ""
 
 msgid "Statement"
 msgstr ""
 
-#: reporting/rep108.php:170
+#: reporting/rep108.php:178
 msgid "as of"
 msgstr ""
 
 msgid "as of"
 msgstr ""
 
-#: reporting/rep109.php:64 reporting/rep109.php:95 reporting/rep109.php:100
+#: reporting/rep109.php:74 reporting/rep109.php:82
 #: reporting/includes/doctext.inc:64
 msgid "SALES ORDER"
 msgstr ""
 
 #: reporting/includes/doctext.inc:64
 msgid "SALES ORDER"
 msgstr ""
 
-#: reporting/rep109.php:66 reporting/rep109.php:90 reporting/rep109.php:100
-#: reporting/includes/doctext.inc:64
+#: reporting/rep109.php:77 reporting/includes/doctext.inc:64
 msgid "QUOTE"
 msgstr ""
 
 msgid "QUOTE"
 msgstr ""
 
-#: reporting/rep109.php:166 reporting/rep111.php:163
+#: reporting/rep109.php:150 reporting/rep111.php:165
 msgid "TOTAL ORDER EX VAT"
 msgstr ""
 
 msgid "TOTAL ORDER EX VAT"
 msgstr ""
 
@@ -11856,31 +12556,32 @@ msgstr ""
 msgid "SALES QUOTATION"
 msgstr ""
 
 msgid "SALES QUOTATION"
 msgstr ""
 
-#: reporting/rep112.php:85 reporting/includes/doctext.inc:197
+#: reporting/rep112.php:87 reporting/rep112.php:112
+#: reporting/includes/doctext.inc:197
 msgid "RECEIPT"
 msgstr ""
 
 msgid "RECEIPT"
 msgstr ""
 
-#: reporting/rep112.php:119 reporting/rep210.php:127
+#: reporting/rep112.php:128 reporting/rep210.php:127
 msgid "As advance / full / part / payment towards:"
 msgstr ""
 
 msgid "As advance / full / part / payment towards:"
 msgstr ""
 
-#: reporting/rep112.php:160
+#: reporting/rep112.php:169
 msgid "TOTAL RECEIPT"
 msgstr ""
 
 msgid "TOTAL RECEIPT"
 msgstr ""
 
-#: reporting/rep112.php:171
+#: reporting/rep112.php:180
 msgid "Received / Sign"
 msgstr ""
 
 msgid "Received / Sign"
 msgstr ""
 
-#: reporting/rep112.php:173
+#: reporting/rep112.php:182
 msgid "By Cash / Cheque* / Draft No."
 msgstr ""
 
 msgid "By Cash / Cheque* / Draft No."
 msgstr ""
 
-#: reporting/rep112.php:175
+#: reporting/rep112.php:184
 msgid "Dated"
 msgstr ""
 
 msgid "Dated"
 msgstr ""
 
-#: reporting/rep112.php:178
+#: reporting/rep112.php:187
 msgid "Drawn on Bank"
 msgstr ""
 
 msgid "Drawn on Bank"
 msgstr ""
 
@@ -11897,7 +12598,7 @@ msgstr ""
 msgid "Sales Summary Report"
 msgstr ""
 
 msgid "Sales Summary Report"
 msgstr ""
 
-#: reporting/rep114.php:91 reporting/reports_main.php:68
+#: reporting/rep114.php:91 reporting/reports_main.php:79
 msgid "Tax Id Only"
 msgstr ""
 
 msgid "Tax Id Only"
 msgstr ""
 
@@ -11909,23 +12610,35 @@ msgstr ""
 msgid "Total ex. Tax"
 msgstr ""
 
 msgid "Total ex. Tax"
 msgstr ""
 
-#: reporting/rep114.php:95 reporting/rep709.php:117 taxes/tax_groups.php:174
+#: reporting/rep114.php:95 reporting/rep709.php:118 taxes/tax_groups.php:174
 msgid "Tax"
 msgstr ""
 
 msgid "Tax"
 msgstr ""
 
-#: reporting/rep201.php:97
+#: reporting/rep115.php:147
+msgid "All Sales Man"
+msgstr ""
+
+#: reporting/rep115.php:176 reporting/reports_main.php:56
+msgid "Customer Trial Balance"
+msgstr ""
+
+#: reporting/rep201.php:105 reporting/rep206.php:105
 msgid "Balances in Home currency"
 msgstr ""
 
 msgid "Balances in Home currency"
 msgstr ""
 
-#: reporting/rep201.php:120
+#: reporting/rep201.php:115
+msgid "Charges"
+msgstr ""
+
+#: reporting/rep201.php:128
 msgid "Supplier Balances"
 msgstr ""
 
 msgid "Supplier Balances"
 msgstr ""
 
-#: reporting/rep202.php:142
+#: reporting/rep202.php:143
 msgid "currency"
 msgstr ""
 
 msgid "currency"
 msgstr ""
 
-#: reporting/rep202.php:143
+#: reporting/rep202.php:144
 msgid "Aged Supplier Analysis"
 msgstr ""
 
 msgid "Aged Supplier Analysis"
 msgstr ""
 
@@ -11965,12 +12678,16 @@ msgstr ""
 msgid "Tax_Id"
 msgstr ""
 
 msgid "Tax_Id"
 msgstr ""
 
+#: reporting/rep206.php:126
+msgid "Supplier Trial Balance"
+msgstr ""
+
 #: reporting/rep209.php:88 reporting/rep209.php:104
 #: reporting/includes/doctext.inc:170
 msgid "PURCHASE ORDER"
 msgstr ""
 
 #: reporting/rep209.php:88 reporting/rep209.php:104
 #: reporting/includes/doctext.inc:170
 msgid "PURCHASE ORDER"
 msgstr ""
 
-#: reporting/rep209.php:213
+#: reporting/rep209.php:210
 msgid "TOTAL PO"
 msgstr ""
 
 msgid "TOTAL PO"
 msgstr ""
 
@@ -11983,52 +12700,48 @@ msgstr ""
 msgid "TOTAL REMITTANCE"
 msgstr ""
 
 msgid "TOTAL REMITTANCE"
 msgstr ""
 
-#: reporting/rep301.php:173
+#: reporting/rep301.php:177
 msgid "Inventory Valuation Report"
 msgstr ""
 
 msgid "Inventory Valuation Report"
 msgstr ""
 
-#: reporting/rep302.php:123
-msgid "QOH"
-msgstr ""
-
-#: reporting/rep302.php:123
+#: reporting/rep302.php:122
 msgid "Cust Ord"
 msgstr ""
 
 msgid "Cust Ord"
 msgstr ""
 
-#: reporting/rep302.php:123
+#: reporting/rep302.php:122
 msgid "Supp Ord"
 msgstr ""
 
 msgid "Supp Ord"
 msgstr ""
 
-#: reporting/rep302.php:123
+#: reporting/rep302.php:122
 msgid "Sugg Ord"
 msgstr ""
 
 msgid "Sugg Ord"
 msgstr ""
 
-#: reporting/rep302.php:132
+#: reporting/rep302.php:131
 msgid "Inventory Planning Report"
 msgstr ""
 
 msgid "Inventory Planning Report"
 msgstr ""
 
-#: reporting/rep303.php:108
+#: reporting/rep303.php:210
 msgid "Shortage"
 msgstr ""
 
 msgid "Shortage"
 msgstr ""
 
-#: reporting/rep303.php:121 reporting/rep303.php:127 reporting/rep305.php:106
+#: reporting/rep303.php:223 reporting/rep303.php:229 reporting/rep305.php:106
 msgid "Stock ID"
 msgstr ""
 
 msgid "Stock ID"
 msgstr ""
 
-#: reporting/rep303.php:121
+#: reporting/rep303.php:223
 msgid "Check"
 msgstr ""
 
 msgid "Check"
 msgstr ""
 
-#: reporting/rep303.php:135
+#: reporting/rep303.php:237
 msgid "Only Shortage"
 msgstr ""
 
 msgid "Only Shortage"
 msgstr ""
 
-#: reporting/rep303.php:159
+#: reporting/rep303.php:261
 msgid "Stock Check Sheets"
 msgstr ""
 
 msgid "Stock Check Sheets"
 msgstr ""
 
-#: reporting/rep304.php:127 reporting/rep305.php:106 reporting/rep306.php:141
-#: reporting/rep309.php:99 reporting/rep310.php:142
+#: reporting/rep304.php:127 reporting/rep305.php:106 reporting/rep306.php:138
+#: reporting/rep309.php:99 reporting/rep310.php:139
 msgid "Qty"
 msgstr ""
 
 msgid "Qty"
 msgstr ""
 
@@ -12036,7 +12749,7 @@ msgstr ""
 msgid "Contribution"
 msgstr ""
 
 msgid "Contribution"
 msgstr ""
 
-#: reporting/rep304.php:138 reporting/reports_main.php:240
+#: reporting/rep304.php:138 reporting/reports_main.php:261
 msgid "Show Service Items"
 msgstr ""
 
 msgid "Show Service Items"
 msgstr ""
 
@@ -12064,11 +12777,11 @@ msgstr ""
 msgid "GRN Valuation Report"
 msgstr ""
 
 msgid "GRN Valuation Report"
 msgstr ""
 
-#: reporting/rep306.php:141 reporting/rep309.php:99 reporting/rep310.php:142
+#: reporting/rep306.php:138 reporting/rep309.php:99 reporting/rep310.php:139
 msgid "Unit Price"
 msgstr ""
 
 msgid "Unit Price"
 msgstr ""
 
-#: reporting/rep306.php:154
+#: reporting/rep306.php:151
 msgid "Inventory Purchasing Report"
 msgstr ""
 
 msgid "Inventory Purchasing Report"
 msgstr ""
 
@@ -12076,35 +12789,43 @@ msgstr ""
 msgid "Opening"
 msgstr ""
 
 msgid "Opening"
 msgstr ""
 
-#: reporting/rep307.php:123
+#: reporting/rep307.php:123 themes/canvas/renderer.php:104
 msgid "Inventory Movements"
 msgstr ""
 
 msgid "Inventory Movements"
 msgstr ""
 
-#: reporting/rep308.php:223
+#: reporting/rep308.php:224
 msgid "OpeningStock"
 msgstr ""
 
 msgid "OpeningStock"
 msgstr ""
 
-#: reporting/rep308.php:223
+#: reporting/rep308.php:224
 msgid "StockIn"
 msgstr ""
 
 msgid "StockIn"
 msgstr ""
 
-#: reporting/rep308.php:223
+#: reporting/rep308.php:224
 msgid "ClosingStock"
 msgstr ""
 
 msgid "ClosingStock"
 msgstr ""
 
-#: reporting/rep308.php:224
+#: reporting/rep308.php:225
 msgid "QTY"
 msgstr ""
 
 msgid "QTY"
 msgstr ""
 
-#: reporting/rep308.php:224 reporting/rep709.php:117
+#: reporting/rep308.php:225 reporting/rep709.php:118
 #: taxes/item_tax_types.php:185
 msgid "Rate"
 msgstr ""
 
 #: taxes/item_tax_types.php:185
 msgid "Rate"
 msgstr ""
 
-#: reporting/rep308.php:233
+#: reporting/rep308.php:234
 msgid "Costed Inventory Movements"
 msgstr ""
 
 msgid "Costed Inventory Movements"
 msgstr ""
 
+#: reporting/rep308.php:305
+msgid "Total Movement"
+msgstr ""
+
+#: reporting/rep308.php:311
+msgid "Total Out"
+msgstr ""
+
 #: reporting/rep309.php:99
 msgid "Item/Category"
 msgstr ""
 #: reporting/rep309.php:99
 msgid "Item/Category"
 msgstr ""
@@ -12121,15 +12842,15 @@ msgstr ""
 msgid "Gift"
 msgstr ""
 
 msgid "Gift"
 msgstr ""
 
-#: reporting/rep310.php:154
+#: reporting/rep310.php:151
 msgid "Note"
 msgstr ""
 
 msgid "Note"
 msgstr ""
 
-#: reporting/rep310.php:154
+#: reporting/rep310.php:151
 msgid "The lines separate the transactions."
 msgstr ""
 
 msgid "The lines separate the transactions."
 msgstr ""
 
-#: reporting/rep310.php:157
+#: reporting/rep310.php:154
 msgid "Inventory Purchasing - Transaction Based"
 msgstr ""
 
 msgid "Inventory Purchasing - Transaction Based"
 msgstr ""
 
@@ -12141,23 +12862,19 @@ msgstr ""
 msgid "Bill of Material Listing"
 msgstr ""
 
 msgid "Bill of Material Listing"
 msgstr ""
 
-#: reporting/rep402.php:110
+#: reporting/rep402.php:154
 msgid "Open Only"
 msgstr ""
 
 msgid "Open Only"
 msgstr ""
 
-#: reporting/rep402.php:112
+#: reporting/rep402.php:158
 msgid "Work Order Listing"
 msgstr ""
 
 #: reporting/rep409.php:59 reporting/rep409.php:71
 msgid "Work Order Listing"
 msgstr ""
 
 #: reporting/rep409.php:59 reporting/rep409.php:71
-#: reporting/includes/doctext.inc:213
+#: reporting/includes/doctext.inc:215
 msgid "WORK ORDER"
 msgstr ""
 
 msgid "WORK ORDER"
 msgstr ""
 
-#: reporting/rep451.php:80
-msgid "Initial"
-msgstr ""
-
 #: reporting/rep451.php:89
 msgid "Fixed Assets Valuation Report"
 msgstr ""
 #: reporting/rep451.php:89
 msgid "Fixed Assets Valuation Report"
 msgstr ""
@@ -12170,16 +12887,20 @@ msgstr ""
 msgid "Dimension Summary"
 msgstr ""
 
 msgid "Dimension Summary"
 msgstr ""
 
-#: reporting/rep601.php:86 reporting/rep602.php:87
-#: reporting/includes/doctext.inc:259
+#: reporting/rep601.php:74
+msgid "Bank Statement"
+msgstr ""
+
+#: reporting/rep601.php:95 reporting/rep602.php:87
+#: reporting/includes/doctext.inc:261
 msgid "Bank Account"
 msgstr ""
 
 msgid "Bank Account"
 msgstr ""
 
-#: reporting/rep601.php:151 reporting/rep602.php:151
+#: reporting/rep601.php:159 reporting/rep602.php:151
 msgid "Total Debit / Credit"
 msgstr ""
 
 msgid "Total Debit / Credit"
 msgstr ""
 
-#: reporting/rep601.php:168 reporting/rep602.php:167
+#: reporting/rep601.php:176 reporting/rep602.php:167
 msgid "Net Change"
 msgstr ""
 
 msgid "Net Change"
 msgstr ""
 
@@ -12219,55 +12940,56 @@ msgstr ""
 msgid "GL Account Transactions"
 msgstr ""
 
 msgid "GL Account Transactions"
 msgstr ""
 
-#: reporting/rep705.php:244 reporting/rep705.php:257 reporting/rep705.php:268
-#: reporting/reports_main.php:382 reporting/reports_main.php:435
-#: reporting/reports_main.php:483
-msgid "Year"
+#: reporting/rep705.php:215 reporting/reports_main.php:410
+#: reporting/reports_main.php:463 reporting/reports_main.php:511
+msgid "Amounts in thousands"
 msgstr ""
 
 msgstr ""
 
-#: reporting/rep705.php:250 reporting/rep705.php:261 reporting/rep705.php:270
-#: reporting/rep706.php:198 reporting/rep706.php:206 reporting/rep706.php:212
-#: reporting/rep707.php:222 reporting/rep707.php:230 reporting/rep707.php:236
-msgid "Tags"
+#: reporting/rep705.php:264 reporting/rep705.php:276 reporting/rep705.php:286
+#: reporting/reports_main.php:404 reporting/reports_main.php:458
+#: reporting/reports_main.php:507
+msgid "Year"
 msgstr ""
 
 msgstr ""
 
-#: reporting/rep705.php:251 reporting/rep705.php:262 reporting/rep705.php:271
-msgid "Amounts in thousands"
+#: reporting/rep705.php:270 reporting/rep705.php:280 reporting/rep705.php:288
+#: reporting/rep706.php:201 reporting/rep706.php:209 reporting/rep706.php:215
+#: reporting/rep707.php:224 reporting/rep707.php:232 reporting/rep707.php:238
+msgid "Tags"
 msgstr ""
 
 msgstr ""
 
-#: reporting/rep705.php:275
+#: reporting/rep705.php:292
 msgid "Annual Expense Breakdown"
 msgstr ""
 
 msgid "Annual Expense Breakdown"
 msgstr ""
 
-#: reporting/rep706.php:186
+#: reporting/rep706.php:189
 msgid "Close Balance"
 msgstr ""
 
 msgid "Close Balance"
 msgstr ""
 
-#: reporting/rep707.php:260
+#: reporting/rep707.php:262
 msgid "Profit and Loss Statement"
 msgstr ""
 
 msgid "Profit and Loss Statement"
 msgstr ""
 
-#: reporting/rep709.php:98
+#: reporting/rep709.php:99
 msgid "Tax Report"
 msgstr ""
 
 msgid "Tax Report"
 msgstr ""
 
-#: reporting/rep709.php:116
+#: reporting/rep709.php:117
 msgid "Branch Name"
 msgstr ""
 
 msgid "Branch Name"
 msgstr ""
 
-#: reporting/rep709.php:117
+#: reporting/rep709.php:118
 msgid "Net"
 msgstr ""
 
 msgid "Net"
 msgstr ""
 
-#: reporting/rep709.php:189
+#: reporting/rep709.php:191
 msgid "Tax Rate"
 msgstr ""
 
 msgid "Tax Rate"
 msgstr ""
 
-#: reporting/rep709.php:189
+#: reporting/rep709.php:191
 msgid "Net Tax"
 msgstr ""
 
 msgid "Net Tax"
 msgstr ""
 
-#: reporting/rep709.php:207
+#: reporting/rep709.php:209
 msgid "Exempt"
 msgstr ""
 
 msgid "Exempt"
 msgstr ""
 
@@ -12283,15 +13005,18 @@ msgstr ""
 msgid "Action"
 msgstr ""
 
 msgid "Action"
 msgstr ""
 
-#: reporting/rep710.php:89 reporting/reports_main.php:523
+#: reporting/rep710.php:89 reporting/reports_main.php:548
 msgid "Audit Trail"
 msgstr ""
 
 msgid "Audit Trail"
 msgstr ""
 
-#: reporting/rep710.php:111
+#: reporting/rep710.php:112
 msgid "Changed"
 msgstr ""
 
 msgid "Changed"
 msgstr ""
 
-#: reporting/reports_main.php:28
+#: reporting/reports_main.php:28 themes/canvas/renderer.php:91
+#: themes/canvas/renderer.php:100 themes/canvas/renderer.php:107
+#: themes/canvas/renderer.php:114 themes/canvas/renderer.php:121
+#: themes/canvas/renderer.php:126 themes/canvas/renderer.php:137
 msgid "Reports and Analysis"
 msgstr ""
 
 msgid "Reports and Analysis"
 msgstr ""
 
@@ -12299,76 +13024,74 @@ msgstr ""
 msgid "Customer &Balances"
 msgstr ""
 
 msgid "Customer &Balances"
 msgstr ""
 
-#: reporting/reports_main.php:39 reporting/reports_main.php:156
-#: reporting/reports_main.php:334
-msgid "Show Balance"
-msgstr ""
-
 #: reporting/reports_main.php:40 reporting/reports_main.php:48
 #: reporting/reports_main.php:40 reporting/reports_main.php:48
-#: reporting/reports_main.php:73 reporting/reports_main.php:100
-#: reporting/reports_main.php:110 reporting/reports_main.php:124
-#: reporting/reports_main.php:132 reporting/reports_main.php:140
-#: reporting/reports_main.php:147 reporting/reports_main.php:157
-#: reporting/reports_main.php:165 reporting/reports_main.php:176
-#: reporting/reports_main.php:196 reporting/reports_main.php:203
+#: reporting/reports_main.php:62 reporting/reports_main.php:84
+#: reporting/reports_main.php:111 reporting/reports_main.php:121
+#: reporting/reports_main.php:135 reporting/reports_main.php:143
+#: reporting/reports_main.php:151 reporting/reports_main.php:158
+#: reporting/reports_main.php:169 reporting/reports_main.php:177
+#: reporting/reports_main.php:189 reporting/reports_main.php:197
+#: reporting/reports_main.php:217 reporting/reports_main.php:224
 msgid "Currency Filter"
 msgstr ""
 
 #: reporting/reports_main.php:43 reporting/reports_main.php:54
 msgid "Currency Filter"
 msgstr ""
 
 #: reporting/reports_main.php:43 reporting/reports_main.php:54
-#: reporting/reports_main.php:63 reporting/reports_main.php:70
-#: reporting/reports_main.php:79 reporting/reports_main.php:88
-#: reporting/reports_main.php:95 reporting/reports_main.php:105
-#: reporting/reports_main.php:114 reporting/reports_main.php:121
-#: reporting/reports_main.php:128 reporting/reports_main.php:136
-#: reporting/reports_main.php:143 reporting/reports_main.php:149
-#: reporting/reports_main.php:160 reporting/reports_main.php:171
-#: reporting/reports_main.php:179 reporting/reports_main.php:184
-#: reporting/reports_main.php:191 reporting/reports_main.php:199
-#: reporting/reports_main.php:206 reporting/reports_main.php:215
-#: reporting/reports_main.php:221 reporting/reports_main.php:232
-#: reporting/reports_main.php:242 reporting/reports_main.php:248
-#: reporting/reports_main.php:258 reporting/reports_main.php:266
-#: reporting/reports_main.php:274 reporting/reports_main.php:281
-#: reporting/reports_main.php:291 reporting/reports_main.php:300
-#: reporting/reports_main.php:307 reporting/reports_main.php:314
-#: reporting/reports_main.php:325 reporting/reports_main.php:336
-#: reporting/reports_main.php:346 reporting/reports_main.php:359
-#: reporting/reports_main.php:366 reporting/reports_main.php:379
-#: reporting/reports_main.php:387 reporting/reports_main.php:398
-#: reporting/reports_main.php:410 reporting/reports_main.php:420
-#: reporting/reports_main.php:432 reporting/reports_main.php:439
-#: reporting/reports_main.php:449 reporting/reports_main.php:460
-#: reporting/reports_main.php:469 reporting/reports_main.php:480
-#: reporting/reports_main.php:486 reporting/reports_main.php:495
-#: reporting/reports_main.php:505 reporting/reports_main.php:513
-#: reporting/reports_main.php:521 reporting/reports_main.php:529
+#: reporting/reports_main.php:65 reporting/reports_main.php:74
+#: reporting/reports_main.php:81 reporting/reports_main.php:90
+#: reporting/reports_main.php:99 reporting/reports_main.php:106
+#: reporting/reports_main.php:116 reporting/reports_main.php:125
+#: reporting/reports_main.php:132 reporting/reports_main.php:139
+#: reporting/reports_main.php:147 reporting/reports_main.php:154
+#: reporting/reports_main.php:161 reporting/reports_main.php:172
+#: reporting/reports_main.php:183 reporting/reports_main.php:192
+#: reporting/reports_main.php:200 reporting/reports_main.php:205
+#: reporting/reports_main.php:212 reporting/reports_main.php:220
+#: reporting/reports_main.php:227 reporting/reports_main.php:236
+#: reporting/reports_main.php:242 reporting/reports_main.php:253
+#: reporting/reports_main.php:263 reporting/reports_main.php:269
+#: reporting/reports_main.php:279 reporting/reports_main.php:287
+#: reporting/reports_main.php:295 reporting/reports_main.php:302
+#: reporting/reports_main.php:312 reporting/reports_main.php:321
+#: reporting/reports_main.php:329 reporting/reports_main.php:336
+#: reporting/reports_main.php:347 reporting/reports_main.php:358
+#: reporting/reports_main.php:368 reporting/reports_main.php:381
+#: reporting/reports_main.php:388 reporting/reports_main.php:401
+#: reporting/reports_main.php:409 reporting/reports_main.php:421
+#: reporting/reports_main.php:433 reporting/reports_main.php:443
+#: reporting/reports_main.php:455 reporting/reports_main.php:462
+#: reporting/reports_main.php:473 reporting/reports_main.php:484
+#: reporting/reports_main.php:493 reporting/reports_main.php:504
+#: reporting/reports_main.php:510 reporting/reports_main.php:520
+#: reporting/reports_main.php:530 reporting/reports_main.php:538
+#: reporting/reports_main.php:546 reporting/reports_main.php:554
 msgid "Orientation"
 msgstr ""
 
 #: reporting/reports_main.php:44 reporting/reports_main.php:55
 msgid "Orientation"
 msgstr ""
 
 #: reporting/reports_main.php:44 reporting/reports_main.php:55
-#: reporting/reports_main.php:64 reporting/reports_main.php:71
-#: reporting/reports_main.php:80 reporting/reports_main.php:89
-#: reporting/reports_main.php:96 reporting/reports_main.php:161
-#: reporting/reports_main.php:172 reporting/reports_main.php:180
-#: reporting/reports_main.php:185 reporting/reports_main.php:192
-#: reporting/reports_main.php:216 reporting/reports_main.php:222
-#: reporting/reports_main.php:233 reporting/reports_main.php:243
-#: reporting/reports_main.php:249 reporting/reports_main.php:259
-#: reporting/reports_main.php:267 reporting/reports_main.php:275
-#: reporting/reports_main.php:282 reporting/reports_main.php:292
-#: reporting/reports_main.php:301 reporting/reports_main.php:308
-#: reporting/reports_main.php:326 reporting/reports_main.php:337
-#: reporting/reports_main.php:347 reporting/reports_main.php:353
-#: reporting/reports_main.php:360 reporting/reports_main.php:367
-#: reporting/reports_main.php:380 reporting/reports_main.php:388
-#: reporting/reports_main.php:399 reporting/reports_main.php:411
-#: reporting/reports_main.php:421 reporting/reports_main.php:433
-#: reporting/reports_main.php:440 reporting/reports_main.php:450
-#: reporting/reports_main.php:461 reporting/reports_main.php:470
-#: reporting/reports_main.php:481 reporting/reports_main.php:487
-#: reporting/reports_main.php:496 reporting/reports_main.php:506
-#: reporting/reports_main.php:514 reporting/reports_main.php:522
-#: reporting/reports_main.php:530
+#: reporting/reports_main.php:66 reporting/reports_main.php:75
+#: reporting/reports_main.php:82 reporting/reports_main.php:91
+#: reporting/reports_main.php:100 reporting/reports_main.php:107
+#: reporting/reports_main.php:173 reporting/reports_main.php:184
+#: reporting/reports_main.php:193 reporting/reports_main.php:201
+#: reporting/reports_main.php:206 reporting/reports_main.php:213
+#: reporting/reports_main.php:237 reporting/reports_main.php:243
+#: reporting/reports_main.php:254 reporting/reports_main.php:264
+#: reporting/reports_main.php:270 reporting/reports_main.php:280
+#: reporting/reports_main.php:288 reporting/reports_main.php:296
+#: reporting/reports_main.php:303 reporting/reports_main.php:313
+#: reporting/reports_main.php:322 reporting/reports_main.php:330
+#: reporting/reports_main.php:348 reporting/reports_main.php:359
+#: reporting/reports_main.php:369 reporting/reports_main.php:375
+#: reporting/reports_main.php:382 reporting/reports_main.php:389
+#: reporting/reports_main.php:402 reporting/reports_main.php:411
+#: reporting/reports_main.php:422 reporting/reports_main.php:434
+#: reporting/reports_main.php:444 reporting/reports_main.php:456
+#: reporting/reports_main.php:464 reporting/reports_main.php:474
+#: reporting/reports_main.php:485 reporting/reports_main.php:494
+#: reporting/reports_main.php:505 reporting/reports_main.php:512
+#: reporting/reports_main.php:521 reporting/reports_main.php:531
+#: reporting/reports_main.php:539 reporting/reports_main.php:547
+#: reporting/reports_main.php:555
 msgid "Destination"
 msgstr ""
 
 msgid "Destination"
 msgstr ""
 
@@ -12376,321 +13099,330 @@ msgstr ""
 msgid "&Aged Customer Analysis"
 msgstr ""
 
 msgid "&Aged Customer Analysis"
 msgstr ""
 
-#: reporting/reports_main.php:52 reporting/reports_main.php:169
-#: reporting/reports_main.php:396 reporting/reports_main.php:408
-#: reporting/reports_main.php:447 reporting/reports_main.php:458
-#: reporting/reports_main.php:493 reporting/reports_main.php:503
+#: reporting/reports_main.php:52 reporting/reports_main.php:181
+#: reporting/reports_main.php:419 reporting/reports_main.php:431
+#: reporting/reports_main.php:471 reporting/reports_main.php:482
+#: reporting/reports_main.php:518 reporting/reports_main.php:528
 msgid "Graphics"
 msgstr ""
 
 msgid "Graphics"
 msgstr ""
 
-#: reporting/reports_main.php:56
+#: reporting/reports_main.php:67
 msgid "Customer &Detail Listing"
 msgstr ""
 
 msgid "Customer &Detail Listing"
 msgstr ""
 
-#: reporting/reports_main.php:60 reporting/reports_main.php:188
+#: reporting/reports_main.php:71 reporting/reports_main.php:209
 msgid "Activity Greater Than"
 msgstr ""
 
 msgid "Activity Greater Than"
 msgstr ""
 
-#: reporting/reports_main.php:61 reporting/reports_main.php:189
+#: reporting/reports_main.php:72 reporting/reports_main.php:210
 msgid "Activity Less Than"
 msgstr ""
 
 msgid "Activity Less Than"
 msgstr ""
 
-#: reporting/reports_main.php:65
+#: reporting/reports_main.php:76
 msgid "Sales &Summary Report"
 msgstr ""
 
 msgid "Sales &Summary Report"
 msgstr ""
 
-#: reporting/reports_main.php:72
+#: reporting/reports_main.php:83
 msgid "&Price Listing"
 msgstr ""
 
 msgid "&Price Listing"
 msgstr ""
 
-#: reporting/reports_main.php:74 reporting/reports_main.php:84
-#: reporting/reports_main.php:211 reporting/reports_main.php:218
-#: reporting/reports_main.php:224 reporting/reports_main.php:237
-#: reporting/reports_main.php:253 reporting/reports_main.php:263
-#: reporting/reports_main.php:271 reporting/reports_main.php:279
-#: reporting/reports_main.php:286
+#: reporting/reports_main.php:85 reporting/reports_main.php:95
+#: reporting/reports_main.php:232 reporting/reports_main.php:239
+#: reporting/reports_main.php:245 reporting/reports_main.php:258
+#: reporting/reports_main.php:274 reporting/reports_main.php:284
+#: reporting/reports_main.php:292 reporting/reports_main.php:300
+#: reporting/reports_main.php:307
 msgid "Inventory Category"
 msgstr ""
 
 msgid "Inventory Category"
 msgstr ""
 
-#: reporting/reports_main.php:75 sales/manage/sales_types.php:16
+#: reporting/reports_main.php:86 sales/manage/sales_types.php:16
 msgid "Sales Types"
 msgstr ""
 
 msgid "Sales Types"
 msgstr ""
 
-#: reporting/reports_main.php:76 reporting/reports_main.php:226
+#: reporting/reports_main.php:87 reporting/reports_main.php:247
 msgid "Show Pictures"
 msgstr ""
 
 msgid "Show Pictures"
 msgstr ""
 
-#: reporting/reports_main.php:81
+#: reporting/reports_main.php:92
 msgid "&Order Status Listing"
 msgstr ""
 
 msgid "&Order Status Listing"
 msgstr ""
 
-#: reporting/reports_main.php:85
+#: reporting/reports_main.php:96
 msgid "Stock Location"
 msgstr ""
 
 msgid "Stock Location"
 msgstr ""
 
-#: reporting/reports_main.php:90
+#: reporting/reports_main.php:101
 msgid "&Salesman Listing"
 msgstr ""
 
 msgid "&Salesman Listing"
 msgstr ""
 
-#: reporting/reports_main.php:97
+#: reporting/reports_main.php:108
 msgid "Print &Invoices"
 msgstr ""
 
 msgid "Print &Invoices"
 msgstr ""
 
-#: reporting/reports_main.php:101 reporting/reports_main.php:111
-#: reporting/reports_main.php:118
+#: reporting/reports_main.php:112 reporting/reports_main.php:122
+#: reporting/reports_main.php:129
 msgid "email Customers"
 msgstr ""
 
 msgid "email Customers"
 msgstr ""
 
-#: reporting/reports_main.php:102 reporting/reports_main.php:112
+#: reporting/reports_main.php:113 reporting/reports_main.php:123
 msgid "Payment Link"
 msgstr ""
 
 msgid "Payment Link"
 msgstr ""
 
-#: reporting/reports_main.php:107
+#: reporting/reports_main.php:118
 msgid "Print &Credit Notes"
 msgstr ""
 
 msgid "Print &Credit Notes"
 msgstr ""
 
-#: reporting/reports_main.php:115
+#: reporting/reports_main.php:126
 msgid "Print &Deliveries"
 msgstr ""
 
 msgid "Print &Deliveries"
 msgstr ""
 
-#: reporting/reports_main.php:119
+#: reporting/reports_main.php:130
 msgid "Print as Packing Slip"
 msgstr ""
 
 msgid "Print as Packing Slip"
 msgstr ""
 
-#: reporting/reports_main.php:122
+#: reporting/reports_main.php:133
 msgid "Print &Statements"
 msgstr ""
 
 msgid "Print &Statements"
 msgstr ""
 
-#: reporting/reports_main.php:126 reporting/reports_main.php:133
-#: reporting/reports_main.php:141
+#: reporting/reports_main.php:137 reporting/reports_main.php:144
+#: reporting/reports_main.php:152 reporting/reports_main.php:159
 msgid "Email Customers"
 msgstr ""
 
 msgid "Email Customers"
 msgstr ""
 
-#: reporting/reports_main.php:129
+#: reporting/reports_main.php:140
 msgid "&Print Sales Orders"
 msgstr ""
 
 msgid "&Print Sales Orders"
 msgstr ""
 
-#: reporting/reports_main.php:134
+#: reporting/reports_main.php:145
 msgid "Print as Quote"
 msgstr ""
 
 msgid "Print as Quote"
 msgstr ""
 
-#: reporting/reports_main.php:137
+#: reporting/reports_main.php:148
 msgid "&Print Sales Quotations"
 msgstr ""
 
 msgid "&Print Sales Quotations"
 msgstr ""
 
-#: reporting/reports_main.php:144
+#: reporting/reports_main.php:155
 msgid "Print Receipts"
 msgstr ""
 
 msgid "Print Receipts"
 msgstr ""
 
-#: reporting/reports_main.php:152
+#: reporting/reports_main.php:164
 msgid "Supplier &Balances"
 msgstr ""
 
 msgid "Supplier &Balances"
 msgstr ""
 
-#: reporting/reports_main.php:162
+#: reporting/reports_main.php:174
 msgid "&Aged Supplier Analyses"
 msgstr ""
 
 msgid "&Aged Supplier Analyses"
 msgstr ""
 
-#: reporting/reports_main.php:173
+#: reporting/reports_main.php:185
+msgid "Supplier &Trial Balances"
+msgstr ""
+
+#: reporting/reports_main.php:194
 msgid "&Payment Report"
 msgstr ""
 
 msgid "&Payment Report"
 msgstr ""
 
-#: reporting/reports_main.php:181
+#: reporting/reports_main.php:202
 msgid "Outstanding &GRNs Report"
 msgstr ""
 
 msgid "Outstanding &GRNs Report"
 msgstr ""
 
-#: reporting/reports_main.php:186
+#: reporting/reports_main.php:207
 msgid "Supplier &Detail Listing"
 msgstr ""
 
 msgid "Supplier &Detail Listing"
 msgstr ""
 
-#: reporting/reports_main.php:193
+#: reporting/reports_main.php:214
 msgid "Print Purchase &Orders"
 msgstr ""
 
 msgid "Print Purchase &Orders"
 msgstr ""
 
-#: reporting/reports_main.php:197 reporting/reports_main.php:204
+#: reporting/reports_main.php:218 reporting/reports_main.php:225
 msgid "Email Suppliers"
 msgstr ""
 
 msgid "Email Suppliers"
 msgstr ""
 
-#: reporting/reports_main.php:200
+#: reporting/reports_main.php:221
 msgid "Print Remi&ttances"
 msgstr ""
 
 msgid "Print Remi&ttances"
 msgstr ""
 
-#: reporting/reports_main.php:209
+#: reporting/reports_main.php:230
 msgid "Inventory &Valuation Report"
 msgstr ""
 
 msgid "Inventory &Valuation Report"
 msgstr ""
 
-#: reporting/reports_main.php:217
+#: reporting/reports_main.php:238
 msgid "Inventory &Planning Report"
 msgstr ""
 
 msgid "Inventory &Planning Report"
 msgstr ""
 
-#: reporting/reports_main.php:223
+#: reporting/reports_main.php:244
 msgid "Stock &Check Sheets"
 msgstr ""
 
 msgid "Stock &Check Sheets"
 msgstr ""
 
-#: reporting/reports_main.php:227
+#: reporting/reports_main.php:248
 msgid "Inventory Column"
 msgstr ""
 
 msgid "Inventory Column"
 msgstr ""
 
-#: reporting/reports_main.php:228
-msgid "Show Shortage"
+#: reporting/reports_main.php:249
+msgid "Show Only Shortages"
 msgstr ""
 
 msgstr ""
 
-#: reporting/reports_main.php:230
+#: reporting/reports_main.php:251
 msgid "Item Like"
 msgstr ""
 
 msgid "Item Like"
 msgstr ""
 
-#: reporting/reports_main.php:234
+#: reporting/reports_main.php:255
 msgid "Inventory &Sales Report"
 msgstr ""
 
 msgid "Inventory &Sales Report"
 msgstr ""
 
-#: reporting/reports_main.php:244
+#: reporting/reports_main.php:265
 msgid "&GRN Valuation Report"
 msgstr ""
 
 msgid "&GRN Valuation Report"
 msgstr ""
 
-#: reporting/reports_main.php:250
+#: reporting/reports_main.php:271
 msgid "Inventory P&urchasing Report"
 msgstr ""
 
 msgid "Inventory P&urchasing Report"
 msgstr ""
 
-#: reporting/reports_main.php:260
+#: reporting/reports_main.php:281
 msgid "Inventory &Movement Report"
 msgstr ""
 
 msgid "Inventory &Movement Report"
 msgstr ""
 
-#: reporting/reports_main.php:268
+#: reporting/reports_main.php:289
 msgid "C&osted Inventory Movement Report"
 msgstr ""
 
 msgid "C&osted Inventory Movement Report"
 msgstr ""
 
-#: reporting/reports_main.php:276
+#: reporting/reports_main.php:297
 msgid "Item &Sales Summary Report"
 msgstr ""
 
 msgid "Item &Sales Summary Report"
 msgstr ""
 
-#: reporting/reports_main.php:283
+#: reporting/reports_main.php:304
 msgid "Inventory Purchasing - &Transaction Based"
 msgstr ""
 
 msgid "Inventory Purchasing - &Transaction Based"
 msgstr ""
 
-#: reporting/reports_main.php:296
+#: reporting/reports_main.php:317
 msgid "&Bill of Material Listing"
 msgstr ""
 
 msgid "&Bill of Material Listing"
 msgstr ""
 
-#: reporting/reports_main.php:297
+#: reporting/reports_main.php:318
 msgid "From product"
 msgstr ""
 
 msgid "From product"
 msgstr ""
 
-#: reporting/reports_main.php:298
+#: reporting/reports_main.php:319
 msgid "To product"
 msgstr ""
 
 msgid "To product"
 msgstr ""
 
-#: reporting/reports_main.php:302
+#: reporting/reports_main.php:323
 msgid "Work Order &Listing"
 msgstr ""
 
 msgid "Work Order &Listing"
 msgstr ""
 
-#: reporting/reports_main.php:305
+#: reporting/reports_main.php:326
 msgid "Outstanding Only"
 msgstr ""
 
 msgid "Outstanding Only"
 msgstr ""
 
-#: reporting/reports_main.php:309
+#: reporting/reports_main.php:331
 msgid "Print &Work Orders"
 msgstr ""
 
 msgid "Print &Work Orders"
 msgstr ""
 
-#: reporting/reports_main.php:312
+#: reporting/reports_main.php:334
 msgid "Email Locations"
 msgstr ""
 
 msgid "Email Locations"
 msgstr ""
 
-#: reporting/reports_main.php:319
+#: reporting/reports_main.php:341
 msgid "&Fixed Assets Valuation"
 msgstr ""
 
 msgid "&Fixed Assets Valuation"
 msgstr ""
 
-#: reporting/reports_main.php:321
+#: reporting/reports_main.php:343
 msgid "Fixed Assets Class"
 msgstr ""
 
 msgid "Fixed Assets Class"
 msgstr ""
 
-#: reporting/reports_main.php:322
+#: reporting/reports_main.php:344
 msgid "Fixed Assets Location"
 msgstr ""
 
 msgid "Fixed Assets Location"
 msgstr ""
 
-#: reporting/reports_main.php:331
+#: reporting/reports_main.php:353
 msgid "Dimension &Summary"
 msgstr ""
 
 msgid "Dimension &Summary"
 msgstr ""
 
-#: reporting/reports_main.php:332
+#: reporting/reports_main.php:354
 msgid "From Dimension"
 msgstr ""
 
 msgid "From Dimension"
 msgstr ""
 
-#: reporting/reports_main.php:333
+#: reporting/reports_main.php:355
 msgid "To Dimension"
 msgstr ""
 
 msgid "To Dimension"
 msgstr ""
 
-#: reporting/reports_main.php:339
+#: reporting/reports_main.php:361
 msgid "Banking"
 msgstr ""
 
 msgid "Banking"
 msgstr ""
 
-#: reporting/reports_main.php:340
+#: reporting/reports_main.php:362
 msgid "Bank &Statement"
 msgstr ""
 
 msgid "Bank &Statement"
 msgstr ""
 
-#: reporting/reports_main.php:344 reporting/reports_main.php:415
-#: reporting/reports_main.php:465 reporting/reports_main.php:510
+#: reporting/reports_main.php:366 reporting/reports_main.php:438
+#: reporting/reports_main.php:489 reporting/reports_main.php:535
+#: sales/inquiry/customer_inquiry.php:168
 msgid "Zero values"
 msgstr ""
 
 msgid "Zero values"
 msgstr ""
 
-#: reporting/reports_main.php:348
+#: reporting/reports_main.php:370
 msgid "Bank Statement w/ &Reconcile"
 msgstr ""
 
 msgid "Bank Statement w/ &Reconcile"
 msgstr ""
 
-#: reporting/reports_main.php:355
+#: reporting/reports_main.php:377
 msgid "General Ledger"
 msgstr ""
 
 msgid "General Ledger"
 msgstr ""
 
-#: reporting/reports_main.php:356
+#: reporting/reports_main.php:378
 msgid "Chart of &Accounts"
 msgstr ""
 
 msgid "Chart of &Accounts"
 msgstr ""
 
-#: reporting/reports_main.php:357
+#: reporting/reports_main.php:379
 msgid "Show Balances"
 msgstr ""
 
 msgid "Show Balances"
 msgstr ""
 
-#: reporting/reports_main.php:361
+#: reporting/reports_main.php:383
 msgid "List of &Journal Entries"
 msgstr ""
 
 msgid "List of &Journal Entries"
 msgstr ""
 
-#: reporting/reports_main.php:371 reporting/reports_main.php:425
-#: reporting/reports_main.php:474
+#: reporting/reports_main.php:393 reporting/reports_main.php:448
+#: reporting/reports_main.php:498
 msgid "GL Account &Transactions"
 msgstr ""
 
 msgid "GL Account &Transactions"
 msgstr ""
 
-#: reporting/reports_main.php:374 reporting/reports_main.php:428
-#: reporting/reports_main.php:477
+#: reporting/reports_main.php:396 reporting/reports_main.php:451
+#: reporting/reports_main.php:501
 msgid "From Account"
 msgstr ""
 
 msgid "From Account"
 msgstr ""
 
-#: reporting/reports_main.php:375 reporting/reports_main.php:429
-#: reporting/reports_main.php:478
+#: reporting/reports_main.php:397 reporting/reports_main.php:452
+#: reporting/reports_main.php:502
 msgid "To Account"
 msgstr ""
 
 msgid "To Account"
 msgstr ""
 
-#: reporting/reports_main.php:381 reporting/reports_main.php:434
-#: reporting/reports_main.php:482
+#: reporting/reports_main.php:403 reporting/reports_main.php:457
+#: reporting/reports_main.php:506
 msgid "Annual &Expense Breakdown"
 msgstr ""
 
 msgid "Annual &Expense Breakdown"
 msgstr ""
 
-#: reporting/reports_main.php:389 reporting/reports_main.php:441
-#: reporting/reports_main.php:488
+#: reporting/reports_main.php:412 reporting/reports_main.php:465
+#: reporting/reports_main.php:513
 msgid "&Balance Sheet"
 msgstr ""
 
 msgid "&Balance Sheet"
 msgstr ""
 
-#: reporting/reports_main.php:395 reporting/reports_main.php:407
-#: reporting/reports_main.php:446 reporting/reports_main.php:457
-#: reporting/reports_main.php:492 reporting/reports_main.php:502
+#: reporting/reports_main.php:418 reporting/reports_main.php:430
+#: reporting/reports_main.php:470 reporting/reports_main.php:481
+#: reporting/reports_main.php:517 reporting/reports_main.php:527
 msgid "Decimal values"
 msgstr ""
 
 msgid "Decimal values"
 msgstr ""
 
-#: reporting/reports_main.php:400 reporting/reports_main.php:451
-#: reporting/reports_main.php:497
+#: reporting/reports_main.php:423 reporting/reports_main.php:475
+#: reporting/reports_main.php:522
 msgid "&Profit and Loss Statement"
 msgstr ""
 
 msgid "&Profit and Loss Statement"
 msgstr ""
 
-#: reporting/reports_main.php:516
+#: reporting/reports_main.php:541
 msgid "Ta&x Report"
 msgstr ""
 
 msgid "Ta&x Report"
 msgstr ""
 
+#: reporting/includes/tcpdf.php:187
+msgid "Unsupported image file format."
+msgstr ""
+
 #: reporting/includes/doctext.inc:20 reporting/includes/doctext.inc:155
 #: sales/view/view_dispatch.php:51 sales/view/view_invoice.php:53
 msgid "Charge To"
 #: reporting/includes/doctext.inc:20 reporting/includes/doctext.inc:155
 #: sales/view/view_dispatch.php:51 sales/view/view_invoice.php:53
 msgid "Charge To"
@@ -12701,9 +13433,9 @@ msgid "Delivered To"
 msgstr ""
 
 #: reporting/includes/doctext.inc:32 sales/customer_credit_invoice.php:276
 msgstr ""
 
 #: reporting/includes/doctext.inc:32 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:163
-#: sales/includes/ui/sales_order_ui.inc:148
+#: sales/includes/ui/sales_credit_ui.inc:163
+#: sales/includes/ui/sales_order_ui.inc:148 sales/view/view_credit.php:91
+#: sales/view/view_dispatch.php:113 sales/view/view_invoice.php:116
 msgid "Discount %"
 msgstr ""
 
 msgid "Discount %"
 msgstr ""
 
@@ -12718,23 +13450,23 @@ msgstr ""
 #: reporting/includes/doctext.inc:55 reporting/includes/doctext.inc:72
 #: reporting/includes/doctext.inc:93 reporting/includes/doctext.inc:107
 #: reporting/includes/doctext.inc:130 reporting/includes/doctext.inc:160
 #: reporting/includes/doctext.inc:55 reporting/includes/doctext.inc:72
 #: reporting/includes/doctext.inc:93 reporting/includes/doctext.inc:107
 #: reporting/includes/doctext.inc:130 reporting/includes/doctext.inc:160
-#: reporting/includes/doctext.inc:183 reporting/includes/doctext.inc:201
-#: reporting/includes/doctext.inc:239
+#: reporting/includes/doctext.inc:183 reporting/includes/doctext.inc:203
+#: reporting/includes/doctext.inc:241
 msgid "Customer's Reference"
 msgstr ""
 
 #: reporting/includes/doctext.inc:56 reporting/includes/doctext.inc:73
 #: reporting/includes/doctext.inc:94 reporting/includes/doctext.inc:108
 #: reporting/includes/doctext.inc:131 reporting/includes/doctext.inc:184
 msgid "Customer's Reference"
 msgstr ""
 
 #: reporting/includes/doctext.inc:56 reporting/includes/doctext.inc:73
 #: reporting/includes/doctext.inc:94 reporting/includes/doctext.inc:108
 #: reporting/includes/doctext.inc:131 reporting/includes/doctext.inc:184
-#: reporting/includes/doctext.inc:240 sales/manage/customer_branches.php:286
+#: reporting/includes/doctext.inc:242 sales/manage/customer_branches.php:286
 msgid "Sales Person"
 msgstr ""
 
 #: reporting/includes/doctext.inc:57 reporting/includes/doctext.inc:74
 #: reporting/includes/doctext.inc:95 reporting/includes/doctext.inc:109
 #: reporting/includes/doctext.inc:132 reporting/includes/doctext.inc:162
 msgid "Sales Person"
 msgstr ""
 
 #: reporting/includes/doctext.inc:57 reporting/includes/doctext.inc:74
 #: reporting/includes/doctext.inc:95 reporting/includes/doctext.inc:109
 #: reporting/includes/doctext.inc:132 reporting/includes/doctext.inc:162
-#: reporting/includes/doctext.inc:185 reporting/includes/doctext.inc:203
-#: reporting/includes/doctext.inc:241
+#: reporting/includes/doctext.inc:185 reporting/includes/doctext.inc:205
+#: reporting/includes/doctext.inc:243
 msgid "Your VAT no."
 msgstr ""
 
 msgid "Your VAT no."
 msgstr ""
 
@@ -12742,9 +13474,8 @@ msgstr ""
 msgid "Our Quotation No"
 msgstr ""
 
 msgid "Our Quotation No"
 msgstr ""
 
-#: reporting/includes/doctext.inc:59 sales/view/view_sales_order.php:69
-#: sales/inquiry/sales_orders_view.php:272
-#: sales/includes/ui/sales_order_ui.inc:599
+#: reporting/includes/doctext.inc:59 sales/includes/ui/sales_order_ui.inc:605
+#: sales/inquiry/sales_orders_view.php:292 sales/view/view_sales_order.php:69
 msgid "Valid until"
 msgstr ""
 
 msgid "Valid until"
 msgstr ""
 
@@ -12758,7 +13489,7 @@ msgstr ""
 
 #: reporting/includes/doctext.inc:75 reporting/includes/doctext.inc:96
 #: reporting/includes/doctext.inc:110 reporting/includes/doctext.inc:137
 
 #: reporting/includes/doctext.inc:75 reporting/includes/doctext.inc:96
 #: reporting/includes/doctext.inc:110 reporting/includes/doctext.inc:137
-#: reporting/includes/doctext.inc:204 reporting/includes/doctext.inc:242
+#: reporting/includes/doctext.inc:206 reporting/includes/doctext.inc:244
 #: sales/view/view_dispatch.php:87 sales/view/view_invoice.php:87
 msgid "Our Order No"
 msgstr ""
 #: sales/view/view_dispatch.php:87 sales/view/view_invoice.php:87
 msgid "Our Order No"
 msgstr ""
@@ -12827,1297 +13558,1587 @@ msgstr ""
 msgid "With thanks from"
 msgstr ""
 
 msgid "With thanks from"
 msgstr ""
 
-#: reporting/includes/doctext.inc:214
+#: reporting/includes/doctext.inc:216
 msgid "Work Order No."
 msgstr ""
 
 msgid "Work Order No."
 msgstr ""
 
-#: reporting/includes/doctext.inc:245
-msgid "DueDate"
+#: reporting/includes/doctext.inc:247
+msgid "DueDate"
+msgstr ""
+
+#: reporting/includes/doctext.inc:273 reporting/includes/pdf_report.inc:1023
+msgid "You can pay through"
+msgstr ""
+
+#: reporting/includes/doctext.inc:277
+msgid "* Subject to Realisation of the Cheque."
+msgstr ""
+
+#: reporting/includes/excel_report.inc:69 reporting/includes/pdf_report.inc:82
+msgid ""
+"The security settings on your account do not permit you to print this report"
+msgstr ""
+
+#: reporting/includes/excel_report.inc:259
+#: reporting/includes/pdf_report.inc:331
+msgid "Print Out Date"
+msgstr ""
+
+#: reporting/includes/excel_report.inc:265
+#: reporting/includes/pdf_report.inc:340
+msgid "Fiscal Year"
+msgstr ""
+
+#: reporting/includes/excel_report.inc:393
+msgid "Report Date"
+msgstr ""
+
+#: reporting/includes/excel_report.inc:410
+#: reporting/includes/pdf_report.inc:604
+msgid "Generated At"
+msgstr ""
+
+#: reporting/includes/excel_report.inc:416
+#: reporting/includes/pdf_report.inc:613
+msgid "Generated By"
+msgstr ""
+
+#: reporting/includes/header2.inc:122
+msgid "Our VAT No."
+msgstr ""
+
+#: reporting/includes/header2.inc:128
+msgid "Domicile"
+msgstr ""
+
+#: reporting/includes/header2.inc:144 reporting/includes/pdf_report.inc:367
+#: reporting/includes/pdf_report.inc:505 reporting/includes/pdf_report.inc:632
+msgid "Page"
+msgstr ""
+
+#: reporting/includes/pdf_report.inc:587
+msgid "Report Period"
+msgstr ""
+
+#: reporting/includes/pdf_report.inc:990 reporting/includes/pdf_report.inc:1038
+#, php-format
+msgid "You have no email contact defined for this type of document for '%s'."
+msgstr ""
+
+#: reporting/includes/pdf_report.inc:1009
+msgid "Dear"
+msgstr ""
+
+#: reporting/includes/pdf_report.inc:1010
+msgid "Attached you will find "
+msgstr ""
+
+#: reporting/includes/pdf_report.inc:1026
+msgid "Kindest regards"
+msgstr ""
+
+#: reporting/includes/pdf_report.inc:1041
+msgid "Sending document by email failed"
+msgstr ""
+
+#: reporting/includes/pdf_report.inc:1041
+#: reporting/includes/pdf_report.inc:1044
+msgid "Email:"
+msgstr ""
+
+#: reporting/includes/pdf_report.inc:1044
+msgid "has been sent by email to destination."
+msgstr ""
+
+#: reporting/includes/pdf_report.inc:1073
+msgid "Report has been sent to network printer "
+msgstr ""
+
+#: reporting/includes/printer_class.inc:39
+msgid "Cannot open connection to printer"
+msgstr ""
+
+#: reporting/includes/printer_class.inc:50
+msgid "Printer does not acept the job"
+msgstr ""
+
+#: reporting/includes/printer_class.inc:61
+msgid "Error sending print job control file"
+msgstr ""
+
+#: reporting/includes/printer_class.inc:68
+msgid "Print control file not accepted"
+msgstr ""
+
+#: reporting/includes/printer_class.inc:76
+msgid "Cannot send report to printer"
+msgstr ""
+
+#: reporting/includes/printer_class.inc:86
+msgid "No ack after report printout"
+msgstr ""
+
+#: reporting/includes/printer_class.inc:100
+msgid "Cannot flush printing queue"
+msgstr ""
+
+#: reporting/includes/reports_classes.inc:62
+msgid "Report Classes:"
+msgstr ""
+
+#: reporting/includes/reports_classes.inc:82
+msgid "Reports For Class: "
+msgstr ""
+
+#: reporting/includes/reports_classes.inc:102
+msgid "Display: "
+msgstr ""
+
+#: reporting/includes/reports_classes.inc:153
+msgid "Unknown report parameter type:"
+msgstr ""
+
+#: reporting/includes/reports_classes.inc:181
+msgid "No Currency Filter"
+msgstr ""
+
+#: reporting/includes/reports_classes.inc:255
+msgid "No Graphics"
+msgstr ""
+
+#: reporting/includes/reports_classes.inc:260
+#: reporting/includes/reports_classes.inc:263
+msgid "No Type Filter"
+msgstr ""
+
+#: reporting/includes/reports_classes.inc:273
+msgid "No Account Group Filter"
+msgstr ""
+
+#: reporting/includes/reports_classes.inc:292
+#: reporting/includes/reports_classes.inc:298
+#: reporting/includes/reports_classes.inc:304
+msgid "No Dimension Filter"
+msgstr ""
+
+#: reporting/includes/reports_classes.inc:309
+msgid "No Customer Filter"
+msgstr ""
+
+#: reporting/includes/reports_classes.inc:316
+msgid "No Supplier Filter"
+msgstr ""
+
+#: reporting/includes/reports_classes.inc:439
+#: reporting/includes/reports_classes.inc:441
+msgid "No Location Filter"
+msgstr ""
+
+#: reporting/includes/reports_classes.inc:444
+#: reporting/includes/reports_classes.inc:446
+msgid "No Category Filter"
+msgstr ""
+
+#: reporting/includes/reports_classes.inc:448
+msgid "No Class Filter"
+msgstr ""
+
+#: reporting/includes/reports_classes.inc:453
+msgid "No Areas Filter"
+msgstr ""
+
+#: reporting/includes/reports_classes.inc:456
+msgid "No Sales Folk Filter"
+msgstr ""
+
+#: reporting/includes/reports_classes.inc:463
+msgid "No Users Filter"
+msgstr ""
+
+#: sales/create_recurrent_invoices.php:26
+msgid "Create and Print Recurrent Invoices"
+msgstr ""
+
+#: sales/create_recurrent_invoices.php:147
+#, php-format
+msgid "%s recurrent invoice(s) created, # %s - # %s."
+msgstr ""
+
+#: sales/create_recurrent_invoices.php:152
+#, php-format
+msgid "&Print Recurrent Invoices # %s - # %s"
+msgstr ""
+
+#: sales/create_recurrent_invoices.php:154
+#, php-format
+msgid "&Email Recurrent Invoices # %s - # %s"
+msgstr ""
+
+#: sales/create_recurrent_invoices.php:172
+msgid ""
+"Recurrent invoice cannot be generated before last day of covered period."
+msgstr ""
+
+#: sales/create_recurrent_invoices.php:174
+msgid ""
+"Recurrent invoices cannot be generated because some items have no price "
+"defined in customer currency."
+msgstr ""
+
+#: sales/create_recurrent_invoices.php:176
+msgid ""
+"Recurrent invoices cannot be generated because selected sales order template "
+"uses prepayment sales terms. Change payment terms and try again."
+msgstr ""
+
+#: sales/create_recurrent_invoices.php:184
+#: sales/manage/recurrent_invoices.php:193
+msgid "Template:"
+msgstr ""
+
+#: sales/create_recurrent_invoices.php:185
+msgid "Number of invoices:"
+msgstr ""
+
+#: sales/create_recurrent_invoices.php:186
+msgid "Invoice date:"
+msgstr ""
+
+#: sales/create_recurrent_invoices.php:189
+msgid "Invoice notice:"
+msgstr ""
+
+#: sales/create_recurrent_invoices.php:189
+#, php-format
+msgid "Recurrent Invoice covers period %s - %s."
+msgstr ""
+
+#: sales/create_recurrent_invoices.php:195
+msgid "Create"
+msgstr ""
+
+#: sales/create_recurrent_invoices.php:195
+msgid "Create recurrent invoices"
+msgstr ""
+
+#: sales/create_recurrent_invoices.php:196
+msgid "Return to recurrent invoices"
+msgstr ""
+
+#: sales/create_recurrent_invoices.php:197
+#, php-format
+msgid ""
+"You are about to issue %s invoices.\n"
+" Do you want to continue?"
+msgstr ""
+
+#: sales/create_recurrent_invoices.php:209
+#: sales/manage/recurrent_invoices.php:128
+msgid "Begin"
+msgstr ""
+
+#: sales/create_recurrent_invoices.php:209
+#: sales/manage/recurrent_invoices.php:128
+msgid "End"
+msgstr ""
+
+#: sales/create_recurrent_invoices.php:246
+#, php-format
+msgid "Create %s Invoice(s)"
+msgstr ""
+
+#: sales/create_recurrent_invoices.php:258
+msgid "Marked items are due."
 msgstr ""
 
 msgstr ""
 
-#: reporting/includes/doctext.inc:271 reporting/includes/pdf_report.inc:1019
-msgid "You can pay through"
+#: sales/create_recurrent_invoices.php:260
+msgid "No recurrent invoices are due."
 msgstr ""
 
 msgstr ""
 
-#: reporting/includes/doctext.inc:275
-msgid "* Subject to Realisation of the Cheque."
+#: sales/credit_note_entry.php:40
+#, php-format
+msgid "Modifying Customer Credit Note #%d"
 msgstr ""
 
 msgstr ""
 
-#: reporting/includes/excel_report.inc:69 reporting/includes/pdf_report.inc:81
+#: sales/credit_note_entry.php:51 sales/sales_order_entry.php:709
 msgid ""
 msgid ""
-"The security settings on your account do not permit you to print this report"
+"There are no customers, or there are no customers with branches. Please "
+"define customers and customer branches."
 msgstr ""
 
 msgstr ""
 
-#: reporting/includes/excel_report.inc:259
-#: reporting/includes/pdf_report.inc:330
-msgid "Print Out Date"
+#: sales/credit_note_entry.php:66
+#, php-format
+msgid "Credit Note # %d has been processed"
 msgstr ""
 
 msgstr ""
 
-#: reporting/includes/excel_report.inc:265
-#: reporting/includes/pdf_report.inc:339
-msgid "Fiscal Year"
+#: sales/credit_note_entry.php:68
+msgid "&View this credit note"
 msgstr ""
 
 msgstr ""
 
-#: reporting/includes/excel_report.inc:393
-msgid "Report Date"
+#: sales/credit_note_entry.php:70
+msgid "&Print This Credit Invoice"
 msgstr ""
 
 msgstr ""
 
-#: reporting/includes/excel_report.inc:410
-#: reporting/includes/pdf_report.inc:603
-msgid "Generated At"
+#: sales/credit_note_entry.php:71
+msgid "&Email This Credit Invoice"
 msgstr ""
 
 msgstr ""
 
-#: reporting/includes/excel_report.inc:416
-#: reporting/includes/pdf_report.inc:612
-msgid "Generated By"
+#: sales/credit_note_entry.php:73 sales/customer_credit_invoice.php:59
+#: sales/customer_credit_invoice.php:76
+msgid "View the GL &Journal Entries for this Credit Note"
 msgstr ""
 
 msgstr ""
 
-#: reporting/includes/header2.inc:124
-msgid "Our VAT No."
+#: sales/credit_note_entry.php:75
+msgid "Enter Another &Credit Note"
 msgstr ""
 
 msgstr ""
 
-#: reporting/includes/header2.inc:130
-msgid "Domicile"
+#: sales/credit_note_entry.php:145 sales/customer_payments.php:147
+#: sales/sales_order_entry.php:360
+msgid "There is no customer selected."
 msgstr ""
 
 msgstr ""
 
-#: reporting/includes/header2.inc:146 reporting/includes/pdf_report.inc:366
-#: reporting/includes/pdf_report.inc:504 reporting/includes/pdf_report.inc:631
-msgid "Page"
+#: sales/credit_note_entry.php:152 sales/customer_payments.php:154
+#: sales/sales_order_entry.php:367
+msgid "This customer has no branch defined."
 msgstr ""
 
 msgstr ""
 
-#: reporting/includes/pdf_report.inc:586
-msgid "Report Period"
+#: sales/credit_note_entry.php:164 sales/customer_credit_invoice.php:101
+#: sales/customer_delivery.php:177 sales/customer_invoice.php:317
+#: sales/sales_order_entry.php:445
+msgid "You must enter a reference."
 msgstr ""
 
 msgstr ""
 
-#: reporting/includes/pdf_report.inc:986
-#: reporting/includes/pdf_report.inc:1034
-#, php-format
-msgid "You have no email contact defined for this type of document for '%s'."
+#: sales/credit_note_entry.php:171
+msgid "The entered date for the credit note is invalid."
 msgstr ""
 
 msgstr ""
 
-#: reporting/includes/pdf_report.inc:1005
-msgid "Dear"
+#: sales/credit_note_entry.php:188
+msgid ""
+"For credit notes created to write off the stock, a general ledger account is "
+"required to be selected."
 msgstr ""
 
 msgstr ""
 
-#: reporting/includes/pdf_report.inc:1006
-msgid "Attached you will find "
+#: sales/credit_note_entry.php:189
+msgid ""
+"Please select an account to write the cost of the stock off to, then click "
+"on Process again."
 msgstr ""
 
 msgstr ""
 
-#: reporting/includes/pdf_report.inc:1022
-msgid "Kindest regards"
+#: sales/credit_note_entry.php:215
+msgid "The quantity must be greater than zero."
 msgstr ""
 
 msgstr ""
 
-#: reporting/includes/pdf_report.inc:1037
-msgid "Sending document by email failed"
+#: sales/credit_note_entry.php:220
+msgid "The entered price is negative or invalid."
 msgstr ""
 
 msgstr ""
 
-#: reporting/includes/pdf_report.inc:1037
-#: reporting/includes/pdf_report.inc:1040
-msgid "Email:"
+#: sales/credit_note_entry.php:225
+msgid "The entered discount percent is negative, greater than 100 or invalid."
 msgstr ""
 
 msgstr ""
 
-#: reporting/includes/pdf_report.inc:1040
-msgid "has been sent by email to destination."
+#: sales/credit_note_entry.php:293
+msgid "Credit Note Items"
 msgstr ""
 
 msgstr ""
 
-#: reporting/includes/pdf_report.inc:1069
-msgid "Report has been sent to network printer "
+#: sales/credit_note_entry.php:303 sales/customer_credit_invoice.php:378
+msgid "Process Credit Note"
 msgstr ""
 
 msgstr ""
 
-#: reporting/includes/printer_class.inc:39
-msgid "Cannot open connection to printer"
+#: sales/customer_credit_invoice.php:37
+#, php-format
+msgid "Modifying Credit Invoice # %d."
 msgstr ""
 
 msgstr ""
 
-#: reporting/includes/printer_class.inc:50
-msgid "Printer does not acept the job"
+#: sales/customer_credit_invoice.php:41
+msgid "Credit all or part of an Invoice"
 msgstr ""
 
 msgstr ""
 
-#: reporting/includes/printer_class.inc:61
-msgid "Error sending print job control file"
+#: sales/customer_credit_invoice.php:52
+msgid "Credit Note has been processed"
 msgstr ""
 
 msgstr ""
 
-#: reporting/includes/printer_class.inc:68
-msgid "Print control file not accepted"
+#: sales/customer_credit_invoice.php:54 sales/customer_credit_invoice.php:71
+msgid "&View This Credit Note"
 msgstr ""
 
 msgstr ""
 
-#: reporting/includes/printer_class.inc:76
-msgid "Cannot send report to printer"
+#: sales/customer_credit_invoice.php:56 sales/customer_credit_invoice.php:73
+msgid "&Print This Credit Note"
 msgstr ""
 
 msgstr ""
 
-#: reporting/includes/printer_class.inc:86
-msgid "No ack after report printout"
+#: sales/customer_credit_invoice.php:57 sales/customer_credit_invoice.php:74
+msgid "&Email This Credit Note"
 msgstr ""
 
 msgstr ""
 
-#: reporting/includes/printer_class.inc:100
-msgid "Cannot flush printing queue"
+#: sales/customer_credit_invoice.php:69
+msgid "Credit Note has been updated"
 msgstr ""
 
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:62
-msgid "Report Classes:"
+#: sales/customer_credit_invoice.php:108
+msgid "The entered shipping cost is invalid or less than zero."
 msgstr ""
 
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:82
-msgid "Reports For Class: "
+#: sales/customer_credit_invoice.php:113 sales/customer_credit_invoice.php:135
+msgid ""
+"Selected quantity cannot be less than zero nor more than quantity not "
+"credited yet."
 msgstr ""
 
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:102
-msgid "Display: "
+#: sales/customer_credit_invoice.php:133
+msgid ""
+"This page can only be opened if an invoice has been selected for crediting."
 msgstr ""
 
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:153
-msgid "Unknown report parameter type:"
+#: sales/customer_credit_invoice.php:248
+msgid "Crediting Invoice"
 msgstr ""
 
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:179
-msgid "No Currency Filter"
+#: sales/customer_credit_invoice.php:265
+msgid "Credit Note Date"
 msgstr ""
 
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:253
-msgid "No Graphics"
+#: sales/customer_credit_invoice.php:275
+msgid "Invoiced Quantity"
 msgstr ""
 
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:253
-msgid "Vertical bars"
+#: sales/customer_credit_invoice.php:276
+msgid "Credit Quantity"
 msgstr ""
 
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:253
-msgid "Horizontal bars"
+#: sales/customer_credit_invoice.php:310
+msgid "Credit Shipping Cost"
 msgstr ""
 
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:254
-msgid "Dots"
+#: sales/customer_credit_invoice.php:343
+#: sales/includes/ui/sales_credit_ui.inc:318
+msgid "Credit Note Type"
 msgstr ""
 
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:254
-msgid "Lines"
+#: sales/customer_credit_invoice.php:351
+#: sales/includes/ui/sales_credit_ui.inc:326
+msgid "Items Returned to Location"
 msgstr ""
 
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:254
-msgid "Pie"
+#: sales/customer_credit_invoice.php:356
+#: sales/includes/ui/sales_credit_ui.inc:331
+msgid "Write off the cost of the items to"
 msgstr ""
 
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:254
-msgid "Donut"
+#: sales/customer_credit_invoice.php:376
+msgid "Update credit value for quantities entered"
 msgstr ""
 
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:258
-#: reporting/includes/reports_classes.inc:261
-msgid "No Type Filter"
+#: sales/customer_delivery.php:36
+#, php-format
+msgid "Modifying Delivery Note # %d."
 msgstr ""
 
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:271
-msgid "No Account Group Filter"
+#: sales/customer_delivery.php:40
+msgid "Deliver Items for a Sales Order"
 msgstr ""
 
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:286
-#: reporting/includes/reports_classes.inc:292
-#: reporting/includes/reports_classes.inc:298
-msgid "No Dimension Filter"
+#: sales/customer_delivery.php:49 sales/sales_order_entry.php:199
+#, php-format
+msgid "Delivery # %d has been entered."
 msgstr ""
 
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:304
-msgid "No Customer Filter"
+#: sales/customer_delivery.php:51 sales/sales_order_entry.php:201
+msgid "&View This Delivery"
 msgstr ""
 
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:312
-msgid "No Supplier Filter"
+#: sales/customer_delivery.php:53 sales/customer_delivery.php:75
+#: sales/sales_order_entry.php:203
+msgid "&Print Delivery Note"
 msgstr ""
 
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:419
-#: reporting/includes/reports_classes.inc:421
-msgid "No Location Filter"
+#: sales/customer_delivery.php:54 sales/customer_delivery.php:76
+#: sales/sales_order_entry.php:204
+msgid "&Email Delivery Note"
 msgstr ""
 
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:424
-#: reporting/includes/reports_classes.inc:426
-msgid "No Category Filter"
+#: sales/customer_delivery.php:55 sales/customer_delivery.php:77
+#: sales/sales_order_entry.php:205
+msgid "P&rint as Packing Slip"
 msgstr ""
 
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:428
-msgid "No Class Filter"
+#: sales/customer_delivery.php:56 sales/customer_delivery.php:78
+#: sales/sales_order_entry.php:206
+msgid "E&mail as Packing Slip"
 msgstr ""
 
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:433
-msgid "No Areas Filter"
+#: sales/customer_delivery.php:58 sales/sales_order_entry.php:209
+msgid "View the GL Journal Entries for this Dispatch"
 msgstr ""
 
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:436
-msgid "No Sales Folk Filter"
+#: sales/customer_delivery.php:61
+msgid "Invoice This Delivery"
 msgstr ""
 
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:443
-msgid "No Users Filter"
+#: sales/customer_delivery.php:63
+msgid "Select Another Order For Dispatch"
 msgstr ""
 
 msgstr ""
 
-#: sales/create_recurrent_invoices.php:26
-msgid "Create and Print Recurrent Invoices"
+#: sales/customer_delivery.php:71
+#, php-format
+msgid "Delivery Note # %d has been updated."
 msgstr ""
 
 msgstr ""
 
-#: sales/create_recurrent_invoices.php:142
-#, php-format
-msgid "%s recurrent invoice(s) created, # %s - # %s."
+#: sales/customer_delivery.php:73
+msgid "View this delivery"
 msgstr ""
 
 msgstr ""
 
-#: sales/create_recurrent_invoices.php:147
-#, php-format
-msgid "&Print Recurrent Invoices # %s - # %s"
+#: sales/customer_delivery.php:81
+msgid "Confirm Delivery and Invoice"
 msgstr ""
 
 msgstr ""
 
-#: sales/create_recurrent_invoices.php:150
-#, php-format
-msgid "&Email Recurrent Invoices # %s - # %s"
+#: sales/customer_delivery.php:83
+msgid "Select A Different Delivery"
 msgstr ""
 
 msgstr ""
 
-#: sales/create_recurrent_invoices.php:168
+#: sales/customer_delivery.php:93 sales/customer_invoice.php:148
 msgid ""
 msgid ""
-"Recurrent invoice cannot be generated before last day of covered period."
+"You have to set Deferred Income Account in GL Setup to entry prepayment "
+"invoices."
 msgstr ""
 
 msgstr ""
 
-#: sales/create_recurrent_invoices.php:170
-msgid ""
-"Recurrent invoices cannot be generated because some items have no price "
-"defined in customer currency."
+#: sales/customer_delivery.php:97 sales/customer_delivery.php:102
+msgid "Select a different sales order to delivery"
 msgstr ""
 
 msgstr ""
 
-#: sales/create_recurrent_invoices.php:172
-msgid ""
-"Recurrent invoices cannot be generated because selected sales order template "
-"uses prepayment sales terms. Change payment terms and try again."
+#: sales/customer_delivery.php:98
+msgid "This order has no items. There is nothing to delivery."
 msgstr ""
 
 msgstr ""
 
-#: sales/create_recurrent_invoices.php:180
-#: sales/manage/recurrent_invoices.php:193
-msgid "Template:"
+#: sales/customer_delivery.php:104
+msgid ""
+"This prepayment order is not yet ready for delivery due to insufficient "
+"amount received."
 msgstr ""
 
 msgstr ""
 
-#: sales/create_recurrent_invoices.php:181
-msgid "Number of invoices:"
+#: sales/customer_delivery.php:121
+msgid "Select a different delivery"
 msgstr ""
 
 msgstr ""
 
-#: sales/create_recurrent_invoices.php:182
-msgid "Invoice date:"
+#: sales/customer_delivery.php:122
+msgid "This delivery has all items invoiced. There is nothing to modify."
 msgstr ""
 
 msgstr ""
 
-#: sales/create_recurrent_invoices.php:183
-msgid "Invoice notice:"
+#: sales/customer_delivery.php:132
+msgid ""
+"This page can only be opened if an order or delivery note has been selected. "
+"Please select it first."
 msgstr ""
 
 msgstr ""
 
-#: sales/create_recurrent_invoices.php:183
-#, php-format
-msgid "Recurrent Invoice covers period %s - %s."
+#: sales/customer_delivery.php:134
+msgid "Select a Sales Order to Delivery"
 msgstr ""
 
 msgstr ""
 
-#: sales/create_recurrent_invoices.php:189
-msgid "Create"
+#: sales/customer_delivery.php:143
+msgid ""
+"Selected quantity cannot be less than quantity invoiced nor more than "
+"quantity\tnot dispatched on sales order."
 msgstr ""
 
 msgstr ""
 
-#: sales/create_recurrent_invoices.php:189
-msgid "Create recurrent invoices"
+#: sales/customer_delivery.php:146
+msgid "Freight cost cannot be less than zero"
 msgstr ""
 
 msgstr ""
 
-#: sales/create_recurrent_invoices.php:190
-msgid "Return to recurrent invoices"
+#: sales/customer_delivery.php:158
+msgid "The entered date of delivery is invalid."
 msgstr ""
 
 msgstr ""
 
-#: sales/create_recurrent_invoices.php:191
-#, php-format
-msgid ""
-"You are about to issue %s invoices.\n"
-" Do you want to continue?"
+#: sales/customer_delivery.php:170
+msgid "The entered dead-line for invoice is invalid."
 msgstr ""
 
 msgstr ""
 
-#: sales/create_recurrent_invoices.php:203
-#: sales/manage/recurrent_invoices.php:128
-msgid "Begin"
+#: sales/customer_delivery.php:187 sales/customer_invoice.php:330
+msgid "The entered shipping value is not numeric."
 msgstr ""
 
 msgstr ""
 
-#: sales/create_recurrent_invoices.php:203
-#: sales/manage/recurrent_invoices.php:128
-msgid "End"
+#: sales/customer_delivery.php:193
+msgid "There are no item quantities on this delivery note."
 msgstr ""
 
 msgstr ""
 
-#: sales/create_recurrent_invoices.php:240
-#, php-format
-msgid "Create %s Invoice(s)"
+#: sales/customer_delivery.php:205 sales/sales_order_entry.php:389
+msgid ""
+"This document cannot be processed because there is insufficient quantity for "
+"items marked."
 msgstr ""
 
 msgstr ""
 
-#: sales/create_recurrent_invoices.php:252
-msgid "Marked items are due."
+#: sales/customer_delivery.php:342
+msgid "For Sales Order"
 msgstr ""
 
 msgstr ""
 
-#: sales/create_recurrent_invoices.php:254
-msgid "No recurrent invoices are due."
+#: sales/customer_delivery.php:351
+msgid "Delivery From"
 msgstr ""
 
 msgstr ""
 
-#: sales/credit_note_entry.php:40
-#, php-format
-msgid "Modifying Customer Credit Note #%d"
+#: sales/customer_delivery.php:400
+msgid "Invoice Dead-line"
 msgstr ""
 
 msgstr ""
 
-#: sales/credit_note_entry.php:51 sales/sales_order_entry.php:705
+#: sales/customer_delivery.php:410 sales/customer_invoice.php:507
+#: sales/includes/ui/sales_order_ui.inc:83
+#: sales/includes/ui/sales_order_ui.inc:357
 msgid ""
 msgid ""
-"There are no customers, or there are no customers with branches. Please "
-"define customers and customer branches."
+"The selected customer account is currently on hold. Please contact the "
+"credit control personnel to discuss."
 msgstr ""
 
 msgstr ""
 
-#: sales/credit_note_entry.php:66
-#, php-format
-msgid "Credit Note # %d has been processed"
+#: sales/customer_delivery.php:415
+msgid "Delivery Items"
 msgstr ""
 
 msgstr ""
 
-#: sales/credit_note_entry.php:68
-msgid "&View this credit note"
+#: sales/customer_delivery.php:421
+msgid "Max. delivery"
 msgstr ""
 
 msgstr ""
 
-#: sales/credit_note_entry.php:70
-msgid "&Print This Credit Invoice"
+#: sales/customer_delivery.php:421 sales/customer_invoice.php:522
+msgid "Invoiced"
 msgstr ""
 
 msgstr ""
 
-#: sales/credit_note_entry.php:71
-msgid "&Email This Credit Invoice"
+#: sales/customer_delivery.php:498 sales/customer_invoice.php:612
+msgid "Shipping Cost"
 msgstr ""
 
 msgstr ""
 
-#: sales/credit_note_entry.php:73 sales/customer_credit_invoice.php:59
-#: sales/customer_credit_invoice.php:76
-msgid "View the GL &Journal Entries for this Credit Note"
+#: sales/customer_delivery.php:518 sales/includes/ui/sales_order_ui.inc:236
+msgid ""
+"Marked items have insufficient quantities in stock as on day of delivery."
 msgstr ""
 
 msgstr ""
 
-#: sales/credit_note_entry.php:75
-msgid "Enter Another &Credit Note"
+#: sales/customer_delivery.php:522
+msgid "Action For Balance"
 msgstr ""
 
 msgstr ""
 
-#: sales/credit_note_entry.php:147 sales/customer_credit_invoice.php:101
-#: sales/customer_delivery.php:177 sales/customer_invoice.php:316
-#: sales/sales_order_entry.php:445
-msgid "You must enter a reference."
+#: sales/customer_delivery.php:529 sales/customer_delivery.php:531
+#: sales/customer_delivery.php:534 sales/customer_invoice.php:664
+msgid "Refresh document page"
 msgstr ""
 
 msgstr ""
 
-#: sales/credit_note_entry.php:153
-msgid "The entered date for the credit note is invalid."
+#: sales/customer_delivery.php:531
+msgid "Reset quantity"
 msgstr ""
 
 msgstr ""
 
-#: sales/credit_note_entry.php:170
-msgid ""
-"For credit notes created to write off the stock, a general ledger account is "
-"required to be selected."
+#: sales/customer_delivery.php:534
+msgid "Clear quantity"
 msgstr ""
 
 msgstr ""
 
-#: sales/credit_note_entry.php:171
-msgid ""
-"Please select an account to write the cost of the stock off to, then click "
-"on Process again."
+#: sales/customer_delivery.php:536
+msgid "Process Dispatch"
 msgstr ""
 
 msgstr ""
 
-#: sales/credit_note_entry.php:197
-msgid "The quantity must be greater than zero."
+#: sales/customer_delivery.php:537 sales/customer_invoice.php:666
+#: sales/sales_order_entry.php:756
+msgid "Check entered data and save document"
 msgstr ""
 
 msgstr ""
 
-#: sales/credit_note_entry.php:202
-msgid "The entered price is negative or invalid."
+#: sales/customer_invoice.php:37
+#, php-format
+msgid "Modifying Sales Invoice # %d."
 msgstr ""
 
 msgstr ""
 
-#: sales/credit_note_entry.php:207
-msgid "The entered discount percent is negative, greater than 100 or invalid."
+#: sales/customer_invoice.php:40
+msgid "Issue an Invoice for Delivery Note"
 msgstr ""
 
 msgstr ""
 
-#: sales/credit_note_entry.php:275
-msgid "Credit Note Items"
+#: sales/customer_invoice.php:42
+msgid "Issue Batch Invoice for Delivery Notes"
 msgstr ""
 
 msgstr ""
 
-#: sales/credit_note_entry.php:285 sales/customer_credit_invoice.php:378
-msgid "Process Credit Note"
+#: sales/customer_invoice.php:44
+msgid "Prepayment or Final Invoice Entry"
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_credit_invoice.php:37
-#, php-format
-msgid "Modifying Credit Invoice # %d."
+#: sales/customer_invoice.php:57
+msgid "Selected deliveries has been processed"
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_credit_invoice.php:41
-msgid "Credit all or part of an Invoice"
+#: sales/customer_invoice.php:59 sales/customer_invoice.php:83
+#: sales/sales_order_entry.php:228
+msgid "&View This Invoice"
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_credit_invoice.php:52
-msgid "Credit Note has been processed"
+#: sales/customer_invoice.php:61 sales/customer_invoice.php:85
+msgid "&Print This Invoice"
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_credit_invoice.php:54 sales/customer_credit_invoice.php:71
-msgid "&View This Credit Note"
+#: sales/customer_invoice.php:62 sales/customer_invoice.php:86
+msgid "&Email This Invoice"
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_credit_invoice.php:56 sales/customer_credit_invoice.php:73
-msgid "&Print This Credit Note"
+#: sales/customer_invoice.php:64 sales/sales_order_entry.php:238
+msgid "View the GL &Journal Entries for this Invoice"
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_credit_invoice.php:57 sales/customer_credit_invoice.php:74
-msgid "&Email This Credit Note"
+#: sales/customer_invoice.php:66
+msgid "Select Another &Delivery For Invoicing"
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_credit_invoice.php:69
-msgid "Credit Note has been updated"
+#: sales/customer_invoice.php:69 sales/sales_order_entry.php:248
+msgid "Entry &customer payment for this invoice"
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_credit_invoice.php:108
-msgid "The entered shipping cost is invalid or less than zero."
+#: sales/customer_invoice.php:81
+#, php-format
+msgid "Sales Invoice # %d has been updated."
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_credit_invoice.php:113 sales/customer_credit_invoice.php:135
+#: sales/customer_invoice.php:88
+msgid "Select Another &Invoice to Modify"
+msgstr ""
+
+#: sales/customer_invoice.php:127
+msgid "Select a different delivery to invoice"
+msgstr ""
+
+#: sales/customer_invoice.php:128
 msgid ""
 msgid ""
-"Selected quantity cannot be less than zero nor more than quantity not "
-"credited yet."
+"There are no delivered items with a quantity left to invoice. There is "
+"nothing left to invoice."
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_credit_invoice.php:133
+#: sales/customer_invoice.php:142
 msgid ""
 msgid ""
-"This page can only be opened if an invoice has been selected for crediting."
+"All quantities on this invoice has been credited. There is nothing to modify "
+"on this invoice"
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_credit_invoice.php:248
-msgid "Crediting Invoice"
+#: sales/customer_invoice.php:156
+msgid ""
+"Please select correct Sales Order Prepayment to be invoiced and try again."
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_credit_invoice.php:265
-msgid "Credit Note Date"
+#: sales/customer_invoice.php:178
+msgid ""
+"This page can only be opened after delivery selection. Please select "
+"delivery to invoicing first."
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_credit_invoice.php:275
-msgid "Invoiced Quantity"
+#: sales/customer_invoice.php:180
+msgid "Select Delivery to Invoice"
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_credit_invoice.php:276
-msgid "Credit Quantity"
+#: sales/customer_invoice.php:185 sales/customer_invoice.php:341
+msgid ""
+"Selected quantity cannot be less than quantity credited nor more than "
+"quantity not invoiced yet."
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_credit_invoice.php:310
-msgid "Credit Shipping Cost"
+#: sales/customer_invoice.php:297
+msgid "The entered invoice date is invalid."
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_credit_invoice.php:343
-#: sales/includes/ui/sales_credit_ui.inc:318
-msgid "Credit Note Type"
+#: sales/customer_invoice.php:310
+msgid "The entered invoice due date is invalid."
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_credit_invoice.php:351
-#: sales/includes/ui/sales_credit_ui.inc:326
-msgid "Items Returned to Location"
+#: sales/customer_invoice.php:336
+msgid "There are no item quantities on this invoice."
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_credit_invoice.php:356
-#: sales/includes/ui/sales_credit_ui.inc:331
-msgid "Write off the cost of the items to"
+#: 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 ""
 
 msgstr ""
 
-#: sales/customer_credit_invoice.php:376
-msgid "Update credit value for quantities entered"
+#: sales/customer_invoice.php:437
+msgid "Payment terms:"
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_delivery.php:36
-#, php-format
-msgid "Modifying Delivery Note # %d."
+#: sales/customer_invoice.php:513 sales/sales_order_entry.php:732
+msgid "Sales Order Items"
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_delivery.php:40
-msgid "Deliver Items for a Sales Order"
+#: sales/customer_invoice.php:513
+msgid "Invoice Items"
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_delivery.php:49 sales/sales_order_entry.php:199
-#, php-format
-msgid "Delivery # %d has been entered."
+#: sales/customer_invoice.php:523
+msgid "This Invoice"
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_delivery.php:51 sales/sales_order_entry.php:201
-msgid "&View This Delivery"
+#: sales/customer_invoice.php:531
+msgid "Credited"
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_delivery.php:53 sales/customer_delivery.php:75
-#: sales/sales_order_entry.php:203
-msgid "&Print Delivery Note"
+#: sales/customer_invoice.php:633
+msgid "Invoice Total"
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_delivery.php:54 sales/customer_delivery.php:76
-#: sales/sales_order_entry.php:204
-msgid "&Email Delivery Note"
+#: sales/customer_invoice.php:642
+msgid "Sales order:"
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_delivery.php:55 sales/customer_delivery.php:77
-#: sales/sales_order_entry.php:205
-msgid "P&rint as Packing Slip"
+#: sales/customer_invoice.php:653
+msgid "Payments received:"
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_delivery.php:56 sales/customer_delivery.php:78
-#: sales/sales_order_entry.php:206
-msgid "E&mail as Packing Slip"
+#: sales/customer_invoice.php:654
+msgid "Invoiced here:"
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_delivery.php:58 sales/sales_order_entry.php:209
-msgid "View the GL Journal Entries for this Dispatch"
+#: sales/customer_invoice.php:655
+msgid "Left to be invoiced:"
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_delivery.php:61
-msgid "Invoice This Delivery"
+#: sales/customer_invoice.php:655
+msgid "Invoiced so far:"
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_delivery.php:63
-msgid "Select Another Order For Dispatch"
+#: sales/customer_payments.php:32
+msgid "Customer Payment Entry"
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_delivery.php:71
-#, php-format
-msgid "Delivery Note # %d has been updated."
+#: sales/customer_payments.php:36
+msgid "There are no customers defined in the system."
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_delivery.php:73
-msgid "View this delivery"
+#: sales/customer_payments.php:74
+msgid "Invalid sales invoice number."
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_delivery.php:81
-msgid "Confirm Delivery and Invoice"
+#: sales/customer_payments.php:104
+msgid "The customer payment has been successfully entered."
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_delivery.php:83
-msgid "Select A Different Delivery"
+#: sales/customer_payments.php:106 sales/customer_payments.php:126
+msgid "&Print This Receipt"
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_delivery.php:93 sales/customer_invoice.php:148
-msgid ""
-"You have to set Deferred Income Account in GL Setup to entry prepayment "
-"invoices."
+#: sales/customer_payments.php:107
+msgid "&Email This Receipt"
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_delivery.php:97 sales/customer_delivery.php:102
-msgid "Select a different sales order to delivery"
+#: sales/customer_payments.php:109
+msgid "&View this Customer Payment"
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_delivery.php:98
-msgid "This order has no items. There is nothing to delivery."
+#: sales/customer_payments.php:111 sales/customer_payments.php:134
+msgid "Enter Another &Customer Payment"
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_delivery.php:104
-msgid ""
-"This prepayment order is not yet ready for delivery due to insufficient "
-"amount received."
+#: sales/customer_payments.php:113
+msgid "Enter Payment to &Supplier"
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_delivery.php:121
-msgid "Select a different delivery"
+#: sales/customer_payments.php:117 sales/customer_payments.php:128
+msgid "&View the GL Journal Entries for this Customer Payment"
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_delivery.php:122
-msgid "This delivery has all items invoiced. There is nothing to modify."
+#: sales/customer_payments.php:124
+msgid "The customer payment has been successfully updated."
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_delivery.php:132
-msgid ""
-"This page can only be opened if an order or delivery note has been selected. "
-"Please select it first."
+#: sales/customer_payments.php:132
+msgid "Select Another Customer Payment for &Edition"
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_delivery.php:134
-msgid "Select a Sales Order to Delivery"
+#: sales/customer_payments.php:160
+msgid "The entered date is invalid. Please enter a valid date for the payment."
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_delivery.php:143
-msgid ""
-"Selected quantity cannot be less than quantity invoiced nor more than "
-"quantity\tnot dispatched on sales order."
+#: sales/customer_payments.php:175 sales/customer_payments.php:181
+msgid "The entered amount is invalid or negative and cannot be processed."
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_delivery.php:146
-msgid "Freight cost cannot be less than zero"
+#: sales/customer_payments.php:200
+msgid "The entered discount is not a valid number."
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_delivery.php:158
-msgid "The entered date of delivery is invalid."
+#: sales/customer_payments.php:206
+msgid ""
+"The balance of the amount and discount is zero or negative. Please enter "
+"valid amounts."
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_delivery.php:170
-msgid "The entered dead-line for invoice is invalid."
+#: sales/customer_payments.php:213
+msgid "The entered payment amount is zero or negative."
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_delivery.php:187 sales/customer_invoice.php:329
-msgid "The entered shipping value is not numeric."
+#: sales/customer_payments.php:317 sales/customer_payments.php:319
+msgid "From Customer:"
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_delivery.php:193
-msgid "There are no item quantities on this delivery note."
+#: sales/customer_payments.php:340
+msgid "Into Bank Account:"
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_delivery.php:205 sales/sales_order_entry.php:389
-msgid ""
-"This document cannot be processed because there is insufficient quantity for "
-"items marked."
+#: sales/customer_payments.php:351
+msgid "Date of Deposit:"
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_delivery.php:341
-msgid "For Sales Order"
+#: sales/customer_payments.php:365
+msgid "Payment Amount:"
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_delivery.php:350
-msgid "Delivery From"
+#: sales/customer_payments.php:393
+msgid "Customer prompt payment discount :"
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_delivery.php:399
-msgid "Invoice Dead-line"
+#: sales/customer_payments.php:403
+msgid "Add Payment"
 msgstr ""
 
 msgstr ""
 
-#: 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:357
-msgid ""
-"The selected customer account is currently on hold. Please contact the "
-"credit control personnel to discuss."
+#: sales/customer_payments.php:405
+msgid "Update Payment"
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_delivery.php:414
-msgid "Delivery Items"
+#: sales/sales_order_entry.php:64
+msgid "Direct Sales Delivery"
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_delivery.php:420
-msgid "Max. delivery"
+#: sales/sales_order_entry.php:72
+msgid "Fixed Assets Sale"
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_delivery.php:420 sales/customer_invoice.php:521
-msgid "Invoiced"
+#: sales/sales_order_entry.php:75
+msgid "Direct Sales Invoice"
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_delivery.php:497 sales/customer_invoice.php:611
-msgid "Shipping Cost"
+#: sales/sales_order_entry.php:80
+#, php-format
+msgid "Modifying Sales Order # %d"
 msgstr ""
 
 msgstr ""
 
-#: 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."
+#: sales/sales_order_entry.php:86
+#, php-format
+msgid "Modifying Sales Quotation # %d"
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_delivery.php:521
-msgid "Action For Balance"
+#: sales/sales_order_entry.php:91
+msgid "New Sales Order Entry"
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_delivery.php:528 sales/customer_delivery.php:530
-#: sales/customer_delivery.php:533 sales/customer_invoice.php:663
-msgid "Refresh document page"
+#: sales/sales_order_entry.php:95
+msgid "New Sales Quotation Entry"
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_delivery.php:530
-msgid "Reset quantity"
+#: sales/sales_order_entry.php:98
+msgid "Sales Order Entry"
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_delivery.php:533
-msgid "Clear quantity"
+#: sales/sales_order_entry.php:106
+msgid ""
+"This order cannot be edited because there are invoices or payments related "
+"to it, and prepayment terms were used."
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_delivery.php:535
-msgid "Process Dispatch"
+#: sales/sales_order_entry.php:125
+#, php-format
+msgid "Order # %d has been entered."
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_delivery.php:536 sales/customer_invoice.php:665
-#: sales/sales_order_entry.php:752
-msgid "Check entered data and save document"
+#: sales/sales_order_entry.php:127 sales/sales_order_entry.php:147
+msgid "&View This Order"
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_invoice.php:37
-#, php-format
-msgid "Modifying Sales Invoice # %d."
+#: sales/sales_order_entry.php:133
+msgid "Make &Delivery Against This Order"
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_invoice.php:40
-msgid "Issue an Invoice for Delivery Note"
+#: sales/sales_order_entry.php:138
+msgid "Enter a &New Order"
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_invoice.php:42
-msgid "Issue Batch Invoice for Delivery Notes"
+#: sales/sales_order_entry.php:145
+#, php-format
+msgid "Order # %d has been updated."
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_invoice.php:44
-msgid "Prepayment or Final Invoice Entry"
+#: sales/sales_order_entry.php:153
+msgid "Confirm Order Quantities and Make &Delivery"
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_invoice.php:57
-msgid "Selected deliveries has been processed"
+#: sales/sales_order_entry.php:156
+msgid "Select A Different &Order"
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_invoice.php:59 sales/customer_invoice.php:83
-#: sales/sales_order_entry.php:228
-msgid "&View This Invoice"
+#: sales/sales_order_entry.php:163
+#, php-format
+msgid "Quotation # %d has been entered."
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_invoice.php:61 sales/customer_invoice.php:85
-msgid "&Print This Invoice"
+#: sales/sales_order_entry.php:165 sales/sales_order_entry.php:183
+msgid "&View This Quotation"
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_invoice.php:62 sales/customer_invoice.php:86
-msgid "&Email This Invoice"
+#: sales/sales_order_entry.php:167 sales/sales_order_entry.php:185
+msgid "&Print This Quotation"
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_invoice.php:64 sales/sales_order_entry.php:238
-msgid "View the GL &Journal Entries for this Invoice"
+#: sales/sales_order_entry.php:168 sales/sales_order_entry.php:186
+msgid "&Email This Quotation"
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_invoice.php:66
-msgid "Select Another &Delivery For Invoicing"
+#: sales/sales_order_entry.php:171 sales/sales_order_entry.php:189
+msgid "Make &Sales Order Against This Quotation"
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_invoice.php:69 sales/sales_order_entry.php:248
-msgid "Entry &customer payment for this invoice"
+#: sales/sales_order_entry.php:174
+msgid "Enter a New &Quotation"
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_invoice.php:81
+#: sales/sales_order_entry.php:181
 #, php-format
 #, php-format
-msgid "Sales Invoice # %d has been updated."
+msgid "Quotation # %d has been updated."
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_invoice.php:88
-msgid "Select Another &Invoice to Modify"
+#: sales/sales_order_entry.php:192
+msgid "Select A Different &Quotation"
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_invoice.php:127
-msgid "Select a different delivery to invoice"
+#: sales/sales_order_entry.php:211
+msgid "Make &Invoice Against This Delivery"
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_invoice.php:128
-msgid ""
-"There are no delivered items with a quantity left to invoice. There is "
-"nothing left to invoice."
+#: sales/sales_order_entry.php:215
+msgid "Enter a New Template &Delivery"
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_invoice.php:142
-msgid ""
-"All quantities on this invoice has been credited. There is nothing to modify "
-"on this invoice"
+#: sales/sales_order_entry.php:218
+msgid "Enter a &New Delivery"
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_invoice.php:156
-msgid ""
-"Please select correct Sales Order Prepayment to be invoiced and try again."
+#: sales/sales_order_entry.php:226
+#, php-format
+msgid "Invoice # %d has been entered."
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_invoice.php:178
-msgid ""
-"This page can only be opened after delivery selection. Please select "
-"delivery to invoicing first."
+#: sales/sales_order_entry.php:230
+msgid "&Print Sales Invoice"
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_invoice.php:180
-msgid "Select Delivery to Invoice"
+#: sales/sales_order_entry.php:231
+msgid "&Email Sales Invoice"
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_invoice.php:185 sales/customer_invoice.php:340
-msgid ""
-"Selected quantity cannot be less than quantity credited nor more than "
-"quantity not invoiced yet."
+#: sales/sales_order_entry.php:236
+msgid "Print &Receipt"
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_invoice.php:296
-msgid "The entered invoice date is invalid."
+#: sales/sales_order_entry.php:241
+msgid "Enter a &New Template Invoice"
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_invoice.php:309
-msgid "The entered invoice due date is invalid."
+#: sales/sales_order_entry.php:244
+msgid "Enter a &New Direct Invoice"
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_invoice.php:335
-msgid "There are no item quantities on this invoice."
+#: sales/sales_order_entry.php:395
+msgid "Pre-payment required have to be positive and less than total amount."
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_invoice.php:345
+#: sales/sales_order_entry.php:400
 msgid ""
 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:436
-msgid "Payment terms:"
+"You must enter the person or company to whom delivery should be made to."
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_invoice.php:512 sales/sales_order_entry.php:728
-msgid "Sales Order Items"
+#: sales/sales_order_entry.php:406
+msgid ""
+"You should enter the street address in the box provided. Orders cannot be "
+"accepted without a valid street address."
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_invoice.php:512
-msgid "Invoice Items"
+#: sales/sales_order_entry.php:415
+msgid "The shipping cost entered is expected to be numeric."
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_invoice.php:522
-msgid "This Invoice"
+#: sales/sales_order_entry.php:421
+msgid "The Valid date is invalid."
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_invoice.php:530
-msgid "Credited"
+#: sales/sales_order_entry.php:423
+msgid "The delivery date is invalid."
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_invoice.php:632
-msgid "Invoice Total"
+#: sales/sales_order_entry.php:429
+msgid "The requested valid date is before the date of the quotation."
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_invoice.php:641
-msgid "Sales order:"
+#: sales/sales_order_entry.php:431
+msgid "The requested delivery date is before the date of the order."
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_invoice.php:653
-msgid "Payments received:"
+#: sales/sales_order_entry.php:440
+msgid "You need to define a cash account for your Sales Point."
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_invoice.php:654
-msgid "Invoiced here:"
+#: sales/sales_order_entry.php:483
+msgid ""
+"The reference number field has been increased. Please save the document "
+"again."
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_invoice.php:655
-msgid "Left to be invoiced:"
+#: sales/sales_order_entry.php:527
+msgid ""
+"The item could not be updated because you are attempting to set the quantity "
+"ordered to less than 0, or the discount percent to more than 100."
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_payments.php:32
-msgid "Customer Payment Entry"
+#: sales/sales_order_entry.php:531
+msgid "Price for inventory item must be entered and can not be less than 0"
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_payments.php:36
-msgid "There are no customers defined in the system."
+#: sales/sales_order_entry.php:538
+msgid ""
+"You attempting to make the quantity ordered a quantity less than has already "
+"been delivered. The quantity delivered cannot be modified retrospectively."
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_payments.php:72
-msgid "Invalid sales invoice number."
+#: sales/sales_order_entry.php:556
+#, php-format
+msgid "Price %s is below Standard Cost %s"
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_payments.php:102
-msgid "The customer payment has been successfully entered."
+#: sales/sales_order_entry.php:581
+msgid ""
+"This item cannot be deleted because some of it has already been delivered."
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_payments.php:104 sales/customer_payments.php:123
-msgid "&Print This Receipt"
+#: sales/sales_order_entry.php:610
+msgid "Direct delivery entry has been cancelled as requested."
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_payments.php:106
-msgid "&View this Customer Payment"
+#: sales/sales_order_entry.php:611
+msgid "Enter a New Sales Delivery"
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_payments.php:108 sales/customer_payments.php:131
-msgid "Enter Another &Customer Payment"
+#: sales/sales_order_entry.php:613
+msgid "Direct invoice entry has been cancelled as requested."
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_payments.php:110
-msgid "Enter Payment to &Supplier"
+#: sales/sales_order_entry.php:614
+msgid "Enter a New Sales Invoice"
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_payments.php:114 sales/customer_payments.php:125
-msgid "&View the GL Journal Entries for this Customer Payment"
+#: sales/sales_order_entry.php:619
+msgid "This sales quotation has been cancelled as requested."
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_payments.php:121
-msgid "The customer payment has been successfully updated."
+#: sales/sales_order_entry.php:620
+msgid "Enter a New Sales Quotation"
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_payments.php:129
-msgid "Select Another Customer Payment for &Edition"
+#: sales/sales_order_entry.php:627
+msgid "Undelivered part of order has been cancelled as requested."
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_payments.php:144 sales/sales_order_entry.php:360
-msgid "There is no customer selected."
+#: sales/sales_order_entry.php:628
+msgid "Select Another Sales Order for Edition"
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_payments.php:151 sales/sales_order_entry.php:367
-msgid "This customer has no branch defined."
+#: sales/sales_order_entry.php:632
+msgid "This sales order has been cancelled as requested."
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_payments.php:157
-msgid "The entered date is invalid. Please enter a valid date for the payment."
+#: sales/sales_order_entry.php:633
+msgid "Enter a New Sales Order"
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_payments.php:172 sales/customer_payments.php:178
-msgid "The entered amount is invalid or negative and cannot be processed."
+#: sales/sales_order_entry.php:713
+msgid "Sales Invoice Items"
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_payments.php:197
-msgid "The entered discount is not a valid number."
+#: sales/sales_order_entry.php:714
+msgid "Enter Delivery Details and Confirm Invoice"
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_payments.php:203
-msgid ""
-"The balance of the amount and discount is zero or negative. Please enter "
-"valid amounts."
+#: sales/sales_order_entry.php:716
+msgid "Place Invoice"
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_payments.php:210
-msgid "The entered payment amount is zero or negative."
+#: sales/sales_order_entry.php:719
+msgid "Delivery Note Items"
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_payments.php:313 sales/customer_payments.php:315
-msgid "From Customer:"
+#: sales/sales_order_entry.php:720
+msgid "Enter Delivery Details and Confirm Dispatch"
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_payments.php:336
-msgid "Into Bank Account:"
+#: sales/sales_order_entry.php:721
+msgid "Cancel Delivery"
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_payments.php:347
-msgid "Date of Deposit:"
+#: sales/sales_order_entry.php:722
+msgid "Place Delivery"
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_payments.php:361
-msgid "Payment Amount:"
+#: sales/sales_order_entry.php:724
+msgid "Quotation Date:"
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_payments.php:374
-msgid "Customer prompt payment discount :"
+#: sales/sales_order_entry.php:725
+msgid "Sales Quotation Items"
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_payments.php:384
-msgid "Add Payment"
+#: sales/sales_order_entry.php:726
+msgid "Enter Delivery Details and Confirm Quotation"
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_payments.php:386
-msgid "Update Payment"
+#: sales/sales_order_entry.php:727
+msgid "Cancel Quotation"
 msgstr ""
 
 msgstr ""
 
-#: sales/sales_order_entry.php:64
-msgid "Direct Sales Delivery"
+#: sales/sales_order_entry.php:728
+msgid "Place Quotation"
 msgstr ""
 
 msgstr ""
 
-#: sales/sales_order_entry.php:72
-msgid "Fixed Assets Sale"
+#: sales/sales_order_entry.php:729
+msgid "Commit Quotations Changes"
 msgstr ""
 
 msgstr ""
 
-#: sales/sales_order_entry.php:75
-msgid "Direct Sales Invoice"
+#: sales/sales_order_entry.php:733
+msgid "Enter Delivery Details and Confirm Order"
 msgstr ""
 
 msgstr ""
 
-#: sales/sales_order_entry.php:80
-#, php-format
-msgid "Modifying Sales Order # %d"
+#: sales/sales_order_entry.php:736
+msgid "Commit Order Changes"
 msgstr ""
 
 msgstr ""
 
-#: sales/sales_order_entry.php:86
-#, php-format
-msgid "Modifying Sales Quotation # %d"
+#: sales/sales_order_entry.php:758 sales/sales_order_entry.php:764
+msgid ""
+"Cancels document entry or removes sales order when editing an old document"
 msgstr ""
 
 msgstr ""
 
-#: sales/sales_order_entry.php:91
-msgid "New Sales Order Entry"
+#: sales/sales_order_entry.php:759 sales/sales_order_entry.php:768
+msgid "You are about to void this Document.\\nDo you want to continue?"
 msgstr ""
 
 msgstr ""
 
-#: sales/sales_order_entry.php:95
-msgid "New Sales Quotation Entry"
+#: sales/sales_order_entry.php:762
+msgid "Validate changes and update document"
 msgstr ""
 
 msgstr ""
 
-#: sales/sales_order_entry.php:98
-msgid "Sales Order Entry"
+#: sales/sales_order_entry.php:766
+msgid ""
+"You are about to cancel undelivered part of this order.\\nDo you want to "
+"continue?"
 msgstr ""
 
 msgstr ""
 
-#: sales/sales_order_entry.php:106
-msgid ""
-"This order cannot be edited because there are invoices or payments related "
-"to it, and prepayment terms were used."
+#: sales/allocations/customer_allocate.php:28
+msgid "Allocate Customer Payment or Credit Note"
 msgstr ""
 
 msgstr ""
 
-#: sales/sales_order_entry.php:125
+#: sales/allocations/customer_allocate.php:55
 #, php-format
 #, php-format
-msgid "Order # %d has been entered."
+msgid "Allocation of %s # %d"
 msgstr ""
 
 msgstr ""
 
-#: sales/sales_order_entry.php:127 sales/sales_order_entry.php:147
-msgid "&View This Order"
+#: sales/allocations/customer_allocation_main.php:22
+msgid "Customer Allocations"
 msgstr ""
 
 msgstr ""
 
-#: sales/sales_order_entry.php:133
-msgid "Make &Delivery Against This Order"
+#: sales/includes/cart_class.inc:407
+msgid "You have to enter valid stock code or nonempty description"
 msgstr ""
 
 msgstr ""
 
-#: sales/sales_order_entry.php:138
-msgid "Enter a &New Order"
+#: sales/includes/sales_ui.inc:50
+msgid ""
+"This edit session has been abandoned by opening sales document in another "
+"browser tab. You cannot edit more than one sales document at once."
 msgstr ""
 
 msgstr ""
 
-#: sales/sales_order_entry.php:145
+#: sales/includes/db/custalloc_db.inc:382
+msgid ""
+"Unsuspected overallocation happened due to sparse credit notes exists for "
+"this invoice.\n"
+" Check all credit notes allocated to this invoice for summarized freight "
+"charges."
+msgstr ""
+
+#: sales/includes/db/recurrent_invoices_db.inc:158
 #, php-format
 #, php-format
-msgid "Order # %d has been updated."
+msgid "Unknown %s price for '%s' in pricelist '%s'"
 msgstr ""
 
 msgstr ""
 
-#: sales/sales_order_entry.php:153
-msgid "Confirm Order Quantities and Make &Delivery"
+#: sales/includes/db/sales_credit_db.inc:188
+msgid "Return"
 msgstr ""
 
 msgstr ""
 
-#: sales/sales_order_entry.php:156
-msgid "Select A Different &Order"
+#: sales/includes/db/sales_credit_db.inc:190
+msgid "Ex Inv:"
 msgstr ""
 
 msgstr ""
 
-#: sales/sales_order_entry.php:163
-#, php-format
-msgid "Quotation # %d has been entered."
+#: sales/includes/db/sales_order_db.inc:103
+msgid "Deleted."
 msgstr ""
 
 msgstr ""
 
-#: sales/sales_order_entry.php:165 sales/sales_order_entry.php:183
-msgid "&View This Quotation"
+#: sales/includes/ui/sales_credit_ui.inc:90
+#: sales/includes/ui/sales_order_ui.inc:367
+msgid "Customer Currency:"
 msgstr ""
 
 msgstr ""
 
-#: sales/sales_order_entry.php:167 sales/sales_order_entry.php:185
-msgid "&Print This Quotation"
+#: sales/includes/ui/sales_credit_ui.inc:108
+#: sales/includes/ui/sales_order_ui.inc:646
+msgid "Shipping Company:"
 msgstr ""
 
 msgstr ""
 
-#: sales/sales_order_entry.php:168 sales/sales_order_entry.php:186
-msgid "&Email This Quotation"
+#: sales/includes/ui/sales_credit_ui.inc:110
+#: sales/includes/ui/sales_order_ui.inc:374
+msgid "Customer Discount:"
 msgstr ""
 
 msgstr ""
 
-#: sales/sales_order_entry.php:171 sales/sales_order_entry.php:189
-msgid "Make &Sales Order Against This Quotation"
+#: sales/includes/ui/sales_order_ui.inc:60
+msgid "This item is already on this document. You have been warned."
 msgstr ""
 
 msgstr ""
 
-#: sales/sales_order_entry.php:174
-msgid "Enter a New &Quotation"
+#: sales/includes/ui/sales_order_ui.inc:105
+msgid ""
+"The selected customer and branch are not valid, or the customer does not "
+"have any branches."
 msgstr ""
 
 msgstr ""
 
-#: sales/sales_order_entry.php:181
-#, php-format
-msgid "Quotation # %d has been updated."
+#: sales/includes/ui/sales_order_ui.inc:218
+msgid "Shipping Charge"
 msgstr ""
 
 msgstr ""
 
-#: sales/sales_order_entry.php:192
-msgid "Select A Different &Quotation"
+#: sales/includes/ui/sales_order_ui.inc:286
+msgid "No customer found for entered text."
 msgstr ""
 
 msgstr ""
 
-#: sales/sales_order_entry.php:211
-msgid "Make &Invoice Against This Delivery"
+#: sales/includes/ui/sales_order_ui.inc:288
+#: sales/manage/customer_branches.php:307
+msgid ""
+"The selected customer does not have any branches. Please create at least one "
+"branch."
 msgstr ""
 
 msgstr ""
 
-#: sales/sales_order_entry.php:215
-msgid "Enter a New Template &Delivery"
+#: sales/includes/ui/sales_order_ui.inc:312
+#, php-format
+msgid "Customer's payment terms '%s' cannot be selected on this POS"
 msgstr ""
 
 msgstr ""
 
-#: sales/sales_order_entry.php:218
-msgid "Enter a &New Delivery"
+#: sales/includes/ui/sales_order_ui.inc:361
+msgid "Reference number unique for this document type"
 msgstr ""
 
 msgstr ""
 
-#: sales/sales_order_entry.php:226
-#, php-format
-msgid "Invoice # %d has been entered."
+#: sales/includes/ui/sales_order_ui.inc:403
+#: sales/includes/ui/sales_order_ui.inc:405
+msgid "Price List:"
 msgstr ""
 
 msgstr ""
 
-#: sales/sales_order_entry.php:230
-msgid "&Print Sales Invoice"
+#: sales/includes/ui/sales_order_ui.inc:422
+msgid "Date of order receive"
 msgstr ""
 
 msgstr ""
 
-#: sales/sales_order_entry.php:231
-msgid "&Email Sales Invoice"
+#: sales/includes/ui/sales_order_ui.inc:503
+msgid "[Select item]"
 msgstr ""
 
 msgstr ""
 
-#: sales/sales_order_entry.php:236
-msgid "Print &Receipt"
+#: sales/includes/ui/sales_order_ui.inc:581
+msgid "Cash payment"
 msgstr ""
 
 msgstr ""
 
-#: sales/sales_order_entry.php:241
-msgid "Enter a &New Template Invoice"
+#: sales/includes/ui/sales_order_ui.inc:584
+#: sales/includes/ui/sales_order_ui.inc:616
+msgid "Deliver from Location:"
 msgstr ""
 
 msgstr ""
 
-#: sales/sales_order_entry.php:244
-msgid "Enter a &New Direct Invoice"
+#: sales/includes/ui/sales_order_ui.inc:587
+msgid "Cash account:"
 msgstr ""
 
 msgstr ""
 
-#: sales/sales_order_entry.php:395
-msgid "Pre-payment required have to be positive and less than total amount."
+#: sales/includes/ui/sales_order_ui.inc:594
+msgid "Delivery Details"
 msgstr ""
 
 msgstr ""
 
-#: sales/sales_order_entry.php:400
-msgid ""
-"You must enter the person or company to whom delivery should be made to."
+#: sales/includes/ui/sales_order_ui.inc:599
+msgid "Invoice Delivery Details"
 msgstr ""
 
 msgstr ""
 
-#: sales/sales_order_entry.php:406
-msgid ""
-"You should enter the street address in the box provided. Orders cannot be "
-"accepted without a valid street address."
+#: sales/includes/ui/sales_order_ui.inc:600
+msgid "Invoice before"
 msgstr ""
 
 msgstr ""
 
-#: sales/sales_order_entry.php:415
-msgid "The shipping cost entered is expected to be numeric."
+#: sales/includes/ui/sales_order_ui.inc:604
+msgid "Quotation Delivery Details"
 msgstr ""
 
 msgstr ""
 
-#: sales/sales_order_entry.php:421
-msgid "The Valid date is invalid."
+#: sales/includes/ui/sales_order_ui.inc:609
+msgid "Order Delivery Details"
 msgstr ""
 
 msgstr ""
 
-#: sales/sales_order_entry.php:423
-msgid "The delivery date is invalid."
+#: sales/includes/ui/sales_order_ui.inc:630
+msgid "Enter requested day of delivery"
 msgstr ""
 
 msgstr ""
 
-#: sales/sales_order_entry.php:429
-msgid "The requested valid date is before the date of the quotation."
+#: sales/includes/ui/sales_order_ui.inc:631
+msgid "Enter Valid until Date"
 msgstr ""
 
 msgstr ""
 
-#: sales/sales_order_entry.php:431
-msgid "The requested delivery date is before the date of the order."
+#: sales/includes/ui/sales_order_ui.inc:632
+msgid "Deliver To:"
 msgstr ""
 
 msgstr ""
 
-#: sales/sales_order_entry.php:440
-msgid "You need to define a cash account for your Sales Point."
+#: sales/includes/ui/sales_order_ui.inc:633
+msgid "Additional identifier for delivery e.g. name of receiving person"
 msgstr ""
 
 msgstr ""
 
-#: sales/sales_order_entry.php:479
-msgid ""
-"The reference number field has been increased. Please save the document "
-"again."
+#: sales/includes/ui/sales_order_ui.inc:636
+msgid "Delivery address. Default is address of customer branch"
 msgstr ""
 
 msgstr ""
 
-#: sales/sales_order_entry.php:523
-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."
+#: sales/includes/ui/sales_order_ui.inc:640
+msgid "Contact Phone Number:"
 msgstr ""
 
 msgstr ""
 
-#: sales/sales_order_entry.php:527
-msgid "Price for inventory item must be entered and can not be less than 0"
+#: sales/includes/ui/sales_order_ui.inc:641
+msgid "Phone number of ordering person. Defaults to branch phone number"
 msgstr ""
 
 msgstr ""
 
-#: sales/sales_order_entry.php:534
-msgid ""
-"You attempting to make the quantity ordered a quantity less than has already "
-"been delivered. The quantity delivered cannot be modified retrospectively."
+#: sales/includes/ui/sales_order_ui.inc:642
+msgid "Customer Reference:"
 msgstr ""
 
 msgstr ""
 
-#: sales/sales_order_entry.php:552
-#, php-format
-msgid "Price %s is below Standard Cost %s"
+#: sales/includes/ui/sales_order_ui.inc:643
+msgid "Customer reference number for this order (if any)"
 msgstr ""
 
 msgstr ""
 
-#: sales/sales_order_entry.php:577
-msgid ""
-"This item cannot be deleted because some of it has already been delivered."
+#: sales/inquiry/customer_allocation_inquiry.php:25
+msgid "Customer Allocation Inquiry"
 msgstr ""
 
 msgstr ""
 
-#: sales/sales_order_entry.php:606
-msgid "Direct delivery entry has been cancelled as requested."
+#: sales/inquiry/customer_allocation_inquiry.php:96
+msgid "Allocation"
 msgstr ""
 
 msgstr ""
 
-#: sales/sales_order_entry.php:607
-msgid "Enter a New Sales Delivery"
+#: sales/inquiry/customer_branches_list.php:25
+#: sales/manage/customer_branches.php:22
+msgid "Customer Branches"
 msgstr ""
 
 msgstr ""
 
-#: sales/sales_order_entry.php:609
-msgid "Direct invoice entry has been cancelled as requested."
+#: sales/inquiry/customer_branches_list.php:49
+#: sales/inquiry/sales_deliveries_view.php:173
+#: sales/manage/customer_branches.php:285
+msgid "Contact"
 msgstr ""
 
 msgstr ""
 
-#: sales/sales_order_entry.php:610
-msgid "Enter a New Sales Invoice"
+#: sales/inquiry/customer_inquiry.php:26
+msgid "Customer Transactions"
+msgstr ""
+
+#: sales/inquiry/customer_inquiry.php:98
+msgid "Print Receipt"
 msgstr ""
 
 msgstr ""
 
-#: sales/sales_order_entry.php:615
-msgid "This sales quotation has been cancelled as requested."
+#: sales/inquiry/customer_inquiry.php:118
+msgid "CUSTOMER ACCOUNT IS ON HOLD"
 msgstr ""
 
 msgstr ""
 
-#: sales/sales_order_entry.php:616
-msgid "Enter a New Sales Quotation"
+#: sales/inquiry/sales_deliveries_view.php:29
+msgid "Search Not Invoiced Deliveries"
 msgstr ""
 
 msgstr ""
 
-#: sales/sales_order_entry.php:623
-msgid "Undelivered part of order has been cancelled as requested."
+#: sales/inquiry/sales_deliveries_view.php:34
+msgid "Search All Deliveries"
 msgstr ""
 
 msgstr ""
 
-#: sales/sales_order_entry.php:624
-msgid "Select Another Sales Order for Edition"
+#: sales/inquiry/sales_deliveries_view.php:69
+msgid ""
+"For batch invoicing you should\n"
+"\t\t    select at least one delivery. All items must be dispatched to\n"
+"\t\t    the same customer branch."
 msgstr ""
 
 msgstr ""
 
-#: sales/sales_order_entry.php:628
-msgid "This sales order has been cancelled as requested."
+#: sales/inquiry/sales_deliveries_view.php:169
+msgid "Delivery #"
 msgstr ""
 
 msgstr ""
 
-#: sales/sales_order_entry.php:629
-msgid "Enter a New Sales Order"
+#: sales/inquiry/sales_deliveries_view.php:175
+msgid "Cust Ref"
 msgstr ""
 
 msgstr ""
 
-#: sales/sales_order_entry.php:709
-msgid "Sales Invoice Items"
+#: sales/inquiry/sales_deliveries_view.php:177
+msgid "Due By"
 msgstr ""
 
 msgstr ""
 
-#: sales/sales_order_entry.php:710
-msgid "Enter Delivery Details and Confirm Invoice"
+#: sales/inquiry/sales_deliveries_view.php:178
+msgid "Delivery Total"
 msgstr ""
 
 msgstr ""
 
-#: sales/sales_order_entry.php:712
-msgid "Place Invoice"
+#: sales/inquiry/sales_deliveries_view.php:180
+msgid "Batch"
 msgstr ""
 
 msgstr ""
 
-#: sales/sales_order_entry.php:715
-msgid "Delivery Note Items"
+#: sales/inquiry/sales_deliveries_view.php:180
+msgid "Batch Invoicing"
 msgstr ""
 
 msgstr ""
 
-#: sales/sales_order_entry.php:716
-msgid "Enter Delivery Details and Confirm Dispatch"
+#: sales/inquiry/sales_orders_view.php:44
+msgid "Search Outstanding Sales Orders"
 msgstr ""
 
 msgstr ""
 
-#: sales/sales_order_entry.php:717
-msgid "Cancel Delivery"
+#: sales/inquiry/sales_orders_view.php:49
+msgid "Search Template for Invoicing"
 msgstr ""
 
 msgstr ""
 
-#: sales/sales_order_entry.php:718
-msgid "Place Delivery"
+#: sales/inquiry/sales_orders_view.php:54
+msgid "Select Template for Delivery"
 msgstr ""
 
 msgstr ""
 
-#: sales/sales_order_entry.php:720
-msgid "Quotation Date:"
+#: sales/inquiry/sales_orders_view.php:59
+msgid "Invoicing Prepayment Orders"
 msgstr ""
 
 msgstr ""
 
-#: sales/sales_order_entry.php:721
-msgid "Sales Quotation Items"
+#: sales/inquiry/sales_orders_view.php:64
+msgid "Search All Sales Orders"
 msgstr ""
 
 msgstr ""
 
-#: sales/sales_order_entry.php:722
-msgid "Enter Delivery Details and Confirm Quotation"
+#: sales/inquiry/sales_orders_view.php:70
+msgid "Search All Sales Quotations"
 msgstr ""
 
 msgstr ""
 
-#: sales/sales_order_entry.php:723
-msgid "Cancel Quotation"
+#: sales/inquiry/sales_orders_view.php:125
+msgid "Dispatch"
 msgstr ""
 
 msgstr ""
 
-#: sales/sales_order_entry.php:724
-msgid "Place Quotation"
+#: sales/inquiry/sales_orders_view.php:172
+msgid "Set this order as a template for direct deliveries/invoices"
 msgstr ""
 
 msgstr ""
 
-#: sales/sales_order_entry.php:725
-msgid "Commit Quotations Changes"
+#: sales/inquiry/sales_orders_view.php:196
+msgid "Prepayment Invoice"
 msgstr ""
 
 msgstr ""
 
-#: sales/sales_order_entry.php:729
-msgid "Enter Delivery Details and Confirm Order"
+#: sales/inquiry/sales_orders_view.php:196
+msgid "Final Invoice"
 msgstr ""
 
 msgstr ""
 
-#: sales/sales_order_entry.php:732
-msgid "Commit Order Changes"
+#: sales/inquiry/sales_orders_view.php:254
+msgid "Show All:"
 msgstr ""
 
 msgstr ""
 
-#: sales/sales_order_entry.php:754 sales/sales_order_entry.php:760
-msgid ""
-"Cancels document entry or removes sales order when editing an old document"
+#: sales/inquiry/sales_orders_view.php:272
+msgid "Order #"
 msgstr ""
 
 msgstr ""
 
-#: sales/sales_order_entry.php:755 sales/sales_order_entry.php:764
-msgid "You are about to void this Document.\\nDo you want to continue?"
+#: sales/inquiry/sales_orders_view.php:276
+#: sales/inquiry/sales_orders_view.php:290
+msgid "Cust Order Ref"
 msgstr ""
 
 msgstr ""
 
-#: sales/sales_order_entry.php:758
-msgid "Validate changes and update document"
+#: sales/inquiry/sales_orders_view.php:279
+#: sales/inquiry/sales_orders_view.php:293
+msgid "Delivery To"
 msgstr ""
 
 msgstr ""
 
-#: sales/sales_order_entry.php:762
-msgid ""
-"You are about to cancel undelivered part of this order.\\nDo you want to "
-"continue?"
+#: sales/inquiry/sales_orders_view.php:286
+msgid "Quote #"
 msgstr ""
 
 msgstr ""
 
-#: sales/allocations/customer_allocate.php:28
-msgid "Allocate Customer Payment or Credit Note"
+#: sales/inquiry/sales_orders_view.php:291
+msgid "Quote Date"
 msgstr ""
 
 msgstr ""
 
-#: sales/allocations/customer_allocate.php:55
-#, php-format
-msgid "Allocation of %s # %d"
+#: sales/inquiry/sales_orders_view.php:294
+msgid "Quote Total"
 msgstr ""
 
 msgstr ""
 
-#: sales/allocations/customer_allocation_main.php:22
-msgid "Customer Allocations"
+#: sales/inquiry/sales_orders_view.php:315
+msgid "New Payments"
 msgstr ""
 
 msgstr ""
 
-#: sales/allocations/customer_allocation_main.php:32
-#: sales/manage/customer_branches.php:270 sales/manage/customers.php:330
-#: sales/inquiry/customer_allocation_inquiry.php:42
-#: sales/inquiry/customer_inquiry.php:154
-#: sales/inquiry/sales_deliveries_view.php:114
-#: sales/inquiry/sales_orders_view.php:232
-msgid "Select a customer: "
+#: sales/inquiry/sales_orders_view.php:326
+msgid "Tmpl"
 msgstr ""
 
 #: sales/manage/credit_status.php:16
 msgstr ""
 
 #: sales/manage/credit_status.php:16
@@ -14162,289 +15183,271 @@ msgstr ""
 msgid "Dissallow invoicing ?"
 msgstr ""
 
 msgid "Dissallow invoicing ?"
 msgstr ""
 
-#: sales/manage/customer_branches.php:22
-#: sales/inquiry/customer_branches_list.php:25
-msgid "Customer Branches"
+#: sales/manage/customers.php:43
+msgid "The customer name cannot be empty."
 msgstr ""
 
 msgstr ""
 
-#: sales/manage/customer_branches.php:29
-msgid ""
-"There are no customers defined in the system. Please define a customer to "
-"add customer branches."
+#: sales/manage/customers.php:50
+msgid "The customer short name cannot be empty."
 msgstr ""
 
 msgstr ""
 
-#: 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."
+#: sales/manage/customers.php:57
+msgid "The credit limit must be numeric and not less than zero."
 msgstr ""
 
 msgstr ""
 
-#: sales/manage/customer_branches.php:33
+#: sales/manage/customers.php:64
 msgid ""
 msgid ""
-"There are no sales areas defined in the system. At least one sales area is "
-"required before proceeding."
+"The payment discount must be numeric and is expected to be less than 100% "
+"and greater than or equal to 0."
 msgstr ""
 
 msgstr ""
 
-#: sales/manage/customer_branches.php:35
+#: sales/manage/customers.php:71
 msgid ""
 msgid ""
-"There are no shipping companies defined in the system. At least one shipping "
-"company is required before proceeding."
+"The discount percentage must be numeric and is expected to be less than 100% "
+"and greater than or equal to 0."
 msgstr ""
 
 msgstr ""
 
-#: sales/manage/customer_branches.php:67
-msgid "The Branch name cannot be empty."
+#: sales/manage/customers.php:99
+msgid "Customer has been updated."
 msgstr ""
 
 msgstr ""
 
-#: sales/manage/customer_branches.php:74
-msgid "The Branch short name cannot be empty."
+#: sales/manage/customers.php:131
+msgid "A new customer has been added."
 msgstr ""
 
 msgstr ""
 
-#: sales/manage/customer_branches.php:90
-msgid "Selected customer branch has been updated"
+#: sales/manage/customers.php:134
+msgid ""
+"A default Branch has been automatically created, please check default Branch "
+"values by using link below."
 msgstr ""
 
 msgstr ""
 
-#: sales/manage/customer_branches.php:108
-msgid "New customer branch has been added"
+#: sales/manage/customers.php:157
+msgid ""
+"This customer cannot be deleted because there are transactions that refer to "
+"it."
 msgstr ""
 
 msgstr ""
 
-#: sales/manage/customer_branches.php:124
+#: sales/manage/customers.php:164
 msgid ""
 msgid ""
-"Cannot delete this branch because customer transactions have been created to "
-"this branch."
+"Cannot delete the customer record because orders have been created against "
+"it."
 msgstr ""
 
 msgstr ""
 
-#: sales/manage/customer_branches.php:131
+#: sales/manage/customers.php:171
 msgid ""
 msgid ""
-"Cannot delete this branch because sales orders exist for it. Purge old sales "
-"orders first."
+"Cannot delete this customer because there are branch records set up against "
+"it."
 msgstr ""
 
 msgstr ""
 
-#: sales/manage/customer_branches.php:136
-msgid "Selected customer branch has been deleted"
+#: sales/manage/customers.php:182
+msgid "Selected customer has been deleted."
 msgstr ""
 
 msgstr ""
 
-#: sales/manage/customer_branches.php:209
-msgid "Main Branch"
+#: sales/manage/customers.php:231
+msgid "Name and Address"
 msgstr ""
 
 msgstr ""
 
-#: sales/manage/customer_branches.php:228
-msgid "Name and Contact"
+#: sales/manage/customers.php:233
+msgid "Customer Name:"
 msgstr ""
 
 msgstr ""
 
-#: sales/manage/customer_branches.php:229
-msgid "Branch Name:"
+#: sales/manage/customers.php:234
+msgid "Customer Short Name:"
 msgstr ""
 
 msgstr ""
 
-#: sales/manage/customer_branches.php:230
-msgid "Branch Short Name:"
+#: sales/manage/customers.php:243 sales/manage/customers.php:247
+msgid "Customer's Currency:"
 msgstr ""
 
 msgstr ""
 
-#: sales/manage/customer_branches.php:233 sales/manage/customers.php:261
-msgid "Sales Person:"
+#: sales/manage/customers.php:250
+msgid "Sales Type/Price List:"
 msgstr ""
 
 msgstr ""
 
-#: sales/manage/customer_branches.php:234 sales/manage/customers.php:298
-msgid "Sales Area:"
+#: sales/manage/customers.php:253
+msgid "Customer status:"
 msgstr ""
 
 msgstr ""
 
-#: sales/manage/customer_branches.php:235
-#: sales/manage/recurrent_invoices.php:200
-msgid "Sales Group:"
+#: sales/manage/customers.php:262 sales/manage/customer_branches.php:233
+msgid "Sales Person:"
 msgstr ""
 
 msgstr ""
 
-#: sales/manage/customer_branches.php:236 sales/manage/customers.php:296
-msgid "Default Inventory Location:"
+#: sales/manage/customers.php:268
+msgid "Discount Percent:"
 msgstr ""
 
 msgstr ""
 
-#: sales/manage/customer_branches.php:237 sales/manage/customers.php:297
-msgid "Default Shipping Company:"
+#: sales/manage/customers.php:269
+msgid "Prompt Payment Discount Percent:"
 msgstr ""
 
 msgstr ""
 
-#: sales/manage/customer_branches.php:244
-msgid "Accounts Receivable Account:"
+#: sales/manage/customers.php:273
+msgid "Credit Status:"
 msgstr ""
 
 msgstr ""
 
-#: sales/manage/customer_branches.php:251
-msgid "General contact data"
+#: sales/manage/customers.php:286
+msgid "Customer branches"
 msgstr ""
 
 msgstr ""
 
-#: sales/manage/customer_branches.php:261
-msgid "Billing Address:"
+#: sales/manage/customers.php:288
+msgid "Select or &Add"
 msgstr ""
 
 msgstr ""
 
-#: sales/manage/customer_branches.php:285
-#: sales/inquiry/customer_branches_list.php:49
-#: sales/inquiry/sales_deliveries_view.php:172
-msgid "Contact"
+#: sales/manage/customers.php:288
+msgid "&Add or Edit "
 msgstr ""
 
 msgstr ""
 
-#: sales/manage/customer_branches.php:287
-msgid "Area"
+#: sales/manage/customers.php:297 sales/manage/customer_branches.php:236
+msgid "Default Inventory Location:"
 msgstr ""
 
 msgstr ""
 
-#: sales/manage/customer_branches.php:288
-msgid "Phone No"
+#: sales/manage/customers.php:298 sales/manage/customer_branches.php:237
+msgid "Default Shipping Company:"
 msgstr ""
 
 msgstr ""
 
-#: sales/manage/customer_branches.php:289
-msgid "Fax No"
+#: sales/manage/customers.php:299 sales/manage/customer_branches.php:234
+msgid "Sales Area:"
 msgstr ""
 
 msgstr ""
 
-#: sales/manage/customer_branches.php:291
-msgid "Tax Group"
+#: sales/manage/customers.php:308
+msgid "Add New Customer"
 msgstr ""
 
 msgstr ""
 
-#: 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."
+#: sales/manage/customers.php:312
+msgid "Update Customer"
 msgstr ""
 
 msgstr ""
 
-#: sales/manage/customers.php:42
-msgid "The customer name cannot be empty."
+#: sales/manage/customers.php:313
+msgid "Update customer data"
 msgstr ""
 
 msgstr ""
 
-#: sales/manage/customers.php:49
-msgid "The customer short name cannot be empty."
+#: sales/manage/customers.php:314
+msgid "Select this customer and return to document entry."
 msgstr ""
 
 msgstr ""
 
-#: sales/manage/customers.php:56
-msgid "The credit limit must be numeric and not less than zero."
+#: sales/manage/customers.php:315
+msgid "Delete Customer"
 msgstr ""
 
 msgstr ""
 
-#: sales/manage/customers.php:63
-msgid ""
-"The payment discount must be numeric and is expected to be less than 100% "
-"and greater than or equal to 0."
+#: sales/manage/customers.php:316
+msgid "Delete customer data if have been never used"
 msgstr ""
 
 msgstr ""
 
-#: sales/manage/customers.php:70
+#: sales/manage/customers.php:323
 msgid ""
 msgid ""
-"The discount percentage must be numeric and is expected to be less than 100% "
-"and greater than or equal to 0."
-msgstr ""
-
-#: sales/manage/customers.php:98
-msgid "Customer has been updated."
+"There are no sales types defined. Please define at least one sales type "
+"before adding a customer."
 msgstr ""
 
 msgstr ""
 
-#: sales/manage/customers.php:130
-msgid "A new customer has been added."
+#: sales/manage/customers.php:332
+msgid "New customer"
 msgstr ""
 
 msgstr ""
 
-#: sales/manage/customers.php:133
-msgid ""
-"A default Branch has been automatically created, please check default Branch "
-"values by using link below."
+#: sales/manage/customers.php:355
+msgid "Sales &Orders"
 msgstr ""
 
 msgstr ""
 
-#: sales/manage/customers.php:156
+#: sales/manage/customer_branches.php:29
 msgid ""
 msgid ""
-"This customer cannot be deleted because there are transactions that refer to "
-"it."
+"There are no customers defined in the system. Please define a customer to "
+"add customer branches."
 msgstr ""
 
 msgstr ""
 
-#: sales/manage/customers.php:163
+#: sales/manage/customer_branches.php:31
 msgid ""
 msgid ""
-"Cannot delete the customer record because orders have been created against "
-"it."
+"There are no sales people defined in the system. At least one sales person "
+"is required before proceeding."
 msgstr ""
 
 msgstr ""
 
-#: sales/manage/customers.php:170
+#: sales/manage/customer_branches.php:33
 msgid ""
 msgid ""
-"Cannot delete this customer because there are branch records set up against "
-"it."
-msgstr ""
-
-#: sales/manage/customers.php:181
-msgid "Selected customer has been deleted."
-msgstr ""
-
-#: sales/manage/customers.php:230
-msgid "Name and Address"
+"There are no sales areas defined in the system. At least one sales area is "
+"required before proceeding."
 msgstr ""
 
 msgstr ""
 
-#: sales/manage/customers.php:232
-msgid "Customer Name:"
+#: 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 ""
 
 msgstr ""
 
-#: sales/manage/customers.php:233
-msgid "Customer Short Name:"
+#: sales/manage/customer_branches.php:67
+msgid "The Branch name cannot be empty."
 msgstr ""
 
 msgstr ""
 
-#: sales/manage/customers.php:242 sales/manage/customers.php:246
-msgid "Customer's Currency:"
+#: sales/manage/customer_branches.php:74
+msgid "The Branch short name cannot be empty."
 msgstr ""
 
 msgstr ""
 
-#: sales/manage/customers.php:249
-msgid "Sales Type/Price List:"
+#: sales/manage/customer_branches.php:90
+msgid "Selected customer branch has been updated"
 msgstr ""
 
 msgstr ""
 
-#: sales/manage/customers.php:252
-msgid "Customer status:"
+#: sales/manage/customer_branches.php:108
+msgid "New customer branch has been added"
 msgstr ""
 
 msgstr ""
 
-#: sales/manage/customers.php:267
-msgid "Discount Percent:"
+#: sales/manage/customer_branches.php:124
+msgid ""
+"Cannot delete this branch because customer transactions have been created to "
+"this branch."
 msgstr ""
 
 msgstr ""
 
-#: sales/manage/customers.php:268
-msgid "Prompt Payment Discount Percent:"
+#: sales/manage/customer_branches.php:131
+msgid ""
+"Cannot delete this branch because sales orders exist for it. Purge old sales "
+"orders first."
 msgstr ""
 
 msgstr ""
 
-#: sales/manage/customers.php:272
-msgid "Credit Status:"
+#: sales/manage/customer_branches.php:136
+msgid "Selected customer branch has been deleted"
 msgstr ""
 
 msgstr ""
 
-#: sales/manage/customers.php:285
-msgid "Customer branches"
+#: sales/manage/customer_branches.php:209
+msgid "Main Branch"
 msgstr ""
 
 msgstr ""
 
-#: sales/manage/customers.php:287
-msgid "Select or &Add"
+#: sales/manage/customer_branches.php:228
+msgid "Name and Contact"
 msgstr ""
 
 msgstr ""
 
-#: sales/manage/customers.php:287
-msgid "&Add or Edit "
+#: sales/manage/customer_branches.php:229
+msgid "Branch Name:"
 msgstr ""
 
 msgstr ""
 
-#: sales/manage/customers.php:307
-msgid "Add New Customer"
+#: sales/manage/customer_branches.php:230
+msgid "Branch Short Name:"
 msgstr ""
 
 msgstr ""
 
-#: sales/manage/customers.php:311
-msgid "Update Customer"
+#: sales/manage/customer_branches.php:235
+#: sales/manage/recurrent_invoices.php:200
+msgid "Sales Group:"
 msgstr ""
 
 msgstr ""
 
-#: sales/manage/customers.php:312
-msgid "Update customer data"
+#: sales/manage/customer_branches.php:244
+msgid "Accounts Receivable Account:"
 msgstr ""
 
 msgstr ""
 
-#: sales/manage/customers.php:313
-msgid "Select this customer and return to document entry."
+#: sales/manage/customer_branches.php:251
+msgid "General contact data"
 msgstr ""
 
 msgstr ""
 
-#: sales/manage/customers.php:314
-msgid "Delete Customer"
+#: sales/manage/customer_branches.php:261
+msgid "Billing Address:"
 msgstr ""
 
 msgstr ""
 
-#: sales/manage/customers.php:315
-msgid "Delete customer data if have been never used"
+#: sales/manage/customer_branches.php:287
+msgid "Area"
 msgstr ""
 
 msgstr ""
 
-#: sales/manage/customers.php:322
-msgid ""
-"There are no sales types defined. Please define at least one sales type "
-"before adding a customer."
+#: sales/manage/customer_branches.php:288
+msgid "Phone No"
 msgstr ""
 
 msgstr ""
 
-#: sales/manage/customers.php:331
-msgid "New customer"
+#: sales/manage/customer_branches.php:289
+msgid "Fax No"
 msgstr ""
 
 msgstr ""
 
-#: sales/manage/customers.php:354
-msgid "Sales &Orders"
+#: sales/manage/customer_branches.php:291
+msgid "Tax Group"
 msgstr ""
 
 #: sales/manage/recurrent_invoices.php:24
 msgstr ""
 
 #: sales/manage/recurrent_invoices.php:24
@@ -14565,10 +15568,6 @@ msgstr ""
 msgid "Selected sales group has been deleted"
 msgstr ""
 
 msgid "Selected sales group has been deleted"
 msgstr ""
 
-#: sales/manage/sales_groups.php:85 sales/manage/sales_groups.php:120
-msgid "ID"
-msgstr ""
-
 #: sales/manage/sales_groups.php:123
 msgid "Group Name:"
 msgstr ""
 #: sales/manage/sales_groups.php:123
 msgid "Group Name:"
 msgstr ""
@@ -14808,405 +15807,210 @@ msgstr ""
 msgid "FINAL INVOICE #%d"
 msgstr ""
 
 msgid "FINAL INVOICE #%d"
 msgstr ""
 
-#: sales/view/view_invoice.php:45
-#, php-format
-msgid "PREPAYMENT INVOICE #%d"
-msgstr ""
-
-#: sales/view/view_invoice.php:45
-#, php-format
-msgid "SALES INVOICE #%d"
-msgstr ""
-
-#: sales/view/view_invoice.php:154
-msgid "There are no line items on this invoice."
-msgstr ""
-
-#: sales/view/view_invoice.php:171
-msgid "PREPAYMENT AMOUNT INVOICED"
-msgstr ""
-
-#: sales/view/view_receipt.php:24
-msgid "View Customer Payment"
-msgstr ""
-
-#: sales/view/view_receipt.php:33
-#, php-format
-msgid "Customer Payment #%d"
-msgstr ""
-
-#: sales/view/view_receipt.php:38
-msgid "From Customer"
-msgstr ""
-
-#: sales/view/view_receipt.php:40
-msgid "Date of Deposit"
-msgstr ""
-
-#: sales/view/view_receipt.php:43
-msgid "Customer Currency"
-msgstr ""
-
-#: sales/view/view_receipt.php:48
-msgid "Into Bank Account"
-msgstr ""
-
-#: sales/view/view_receipt.php:49
-msgid "Bank Amount"
-msgstr ""
-
-#: sales/view/view_receipt.php:56
-msgid "This customer payment has been voided."
-msgstr ""
-
-#: sales/view/view_sales_order.php:28
-msgid "View Sales Quotation"
-msgstr ""
-
-#: sales/view/view_sales_order.php:29
-#, php-format
-msgid "Sales Quotation #%d"
-msgstr ""
-
-#: sales/view/view_sales_order.php:33
-msgid "View Sales Order"
-msgstr ""
-
-#: sales/view/view_sales_order.php:34
-#, php-format
-msgid "Sales Order #%d"
-msgstr ""
-
-#: sales/view/view_sales_order.php:49
-msgid "Order Information"
-msgstr ""
-
-#: sales/view/view_sales_order.php:60
-msgid "Customer Name"
-msgstr ""
-
-#: sales/view/view_sales_order.php:64
-msgid "Deliver To Branch"
-msgstr ""
-
-#: sales/view/view_sales_order.php:71
-msgid "Requested Delivery"
-msgstr ""
-
-#: sales/view/view_sales_order.php:75
-msgid "Deliver From Location"
-msgstr ""
-
-#: sales/view/view_sales_order.php:86
-msgid "Non-Invoiced Prepayments"
-msgstr ""
-
-#: sales/view/view_sales_order.php:87
-msgid "All Payments Allocated"
-msgstr ""
-
-#: sales/view/view_sales_order.php:95
-msgid "Telephone"
-msgstr ""
-
-#: sales/view/view_sales_order.php:215
-msgid "This Sales Order is used as a Template."
-msgstr ""
-
-#: sales/view/view_sales_order.php:220
-msgid "Quantity Delivered"
-msgstr ""
-
-#: sales/inquiry/customer_allocation_inquiry.php:25
-msgid "Customer Allocation Inquiry"
-msgstr ""
-
-#: sales/inquiry/customer_allocation_inquiry.php:96
-msgid "Allocation"
-msgstr ""
-
-#: sales/inquiry/customer_inquiry.php:26
-msgid "Customer Transactions"
-msgstr ""
-
-#: sales/inquiry/customer_inquiry.php:93
-msgid "Print Receipt"
-msgstr ""
-
-#: sales/inquiry/customer_inquiry.php:113
-msgid "CUSTOMER ACCOUNT IS ON HOLD"
-msgstr ""
-
-#: sales/inquiry/sales_deliveries_view.php:29
-msgid "Search Not Invoiced Deliveries"
-msgstr ""
-
-#: sales/inquiry/sales_deliveries_view.php:34
-msgid "Search All Deliveries"
-msgstr ""
-
-#: sales/inquiry/sales_deliveries_view.php:68
-msgid ""
-"For batch invoicing you should\n"
-"\t\t    select at least one delivery. All items must be dispatched to\n"
-"\t\t    the same customer branch."
-msgstr ""
-
-#: sales/inquiry/sales_deliveries_view.php:168
-msgid "Delivery #"
-msgstr ""
-
-#: sales/inquiry/sales_deliveries_view.php:174
-msgid "Cust Ref"
-msgstr ""
-
-#: sales/inquiry/sales_deliveries_view.php:176
-msgid "Due By"
-msgstr ""
-
-#: sales/inquiry/sales_deliveries_view.php:177
-msgid "Delivery Total"
-msgstr ""
-
-#: sales/inquiry/sales_deliveries_view.php:179
-msgid "Batch"
-msgstr ""
-
-#: sales/inquiry/sales_deliveries_view.php:179
-msgid "Batch Invoicing"
-msgstr ""
-
-#: sales/inquiry/sales_orders_view.php:44
-msgid "Search Outstanding Sales Orders"
-msgstr ""
-
-#: sales/inquiry/sales_orders_view.php:49
-msgid "Search Template for Invoicing"
-msgstr ""
-
-#: sales/inquiry/sales_orders_view.php:54
-msgid "Select Template for Delivery"
-msgstr ""
-
-#: sales/inquiry/sales_orders_view.php:59
-msgid "Invoicing Prepayment Orders"
-msgstr ""
-
-#: sales/inquiry/sales_orders_view.php:64
-msgid "Search All Sales Orders"
-msgstr ""
-
-#: sales/inquiry/sales_orders_view.php:70
-msgid "Search All Sales Quotations"
-msgstr ""
-
-#: sales/inquiry/sales_orders_view.php:123
-msgid "Dispatch"
+#: sales/view/view_invoice.php:45
+#, php-format
+msgid "PREPAYMENT INVOICE #%d"
 msgstr ""
 
 msgstr ""
 
-#: sales/inquiry/sales_orders_view.php:167
-msgid "Set this order as a template for direct deliveries/invoices"
+#: sales/view/view_invoice.php:45
+#, php-format
+msgid "SALES INVOICE #%d"
 msgstr ""
 
 msgstr ""
 
-#: sales/inquiry/sales_orders_view.php:176
-msgid "Prepayment Invoice"
+#: sales/view/view_invoice.php:154
+msgid "There are no line items on this invoice."
 msgstr ""
 
 msgstr ""
 
-#: sales/inquiry/sales_orders_view.php:176
-msgid "Final Invoice"
+#: sales/view/view_invoice.php:171
+msgid "PREPAYMENT AMOUNT INVOICED"
 msgstr ""
 
 msgstr ""
 
-#: sales/inquiry/sales_orders_view.php:234
-msgid "Show All:"
+#: sales/view/view_receipt.php:24
+msgid "View Customer Payment"
 msgstr ""
 
 msgstr ""
 
-#: sales/inquiry/sales_orders_view.php:252
-msgid "Order #"
+#: sales/view/view_receipt.php:33
+#, php-format
+msgid "Customer Payment #%d"
 msgstr ""
 
 msgstr ""
 
-#: sales/inquiry/sales_orders_view.php:256
-#: sales/inquiry/sales_orders_view.php:270
-msgid "Cust Order Ref"
+#: sales/view/view_receipt.php:38
+msgid "From Customer"
 msgstr ""
 
 msgstr ""
 
-#: sales/inquiry/sales_orders_view.php:259
-#: sales/inquiry/sales_orders_view.php:273
-msgid "Delivery To"
+#: sales/view/view_receipt.php:40
+msgid "Date of Deposit"
 msgstr ""
 
 msgstr ""
 
-#: sales/inquiry/sales_orders_view.php:266
-msgid "Quote #"
+#: sales/view/view_receipt.php:43
+msgid "Customer Currency"
 msgstr ""
 
 msgstr ""
 
-#: sales/inquiry/sales_orders_view.php:271
-msgid "Quote Date"
+#: sales/view/view_receipt.php:48
+msgid "Into Bank Account"
 msgstr ""
 
 msgstr ""
 
-#: sales/inquiry/sales_orders_view.php:274
-msgid "Quote Total"
+#: sales/view/view_receipt.php:49
+msgid "Bank Amount"
 msgstr ""
 
 msgstr ""
 
-#: sales/inquiry/sales_orders_view.php:304
-msgid "Tmpl"
+#: sales/view/view_receipt.php:56
+msgid "This customer payment has been voided."
 msgstr ""
 
 msgstr ""
 
-#: sales/includes/cart_class.inc:400
-msgid "You have to enter valid stock code or nonempty description"
+#: sales/view/view_sales_order.php:28
+msgid "View Sales Quotation"
 msgstr ""
 
 msgstr ""
 
-#: sales/includes/sales_ui.inc:50
-msgid ""
-"This edit session has been abandoned by opening sales document in another "
-"browser tab. You cannot edit more than one sales document at once."
+#: sales/view/view_sales_order.php:29
+#, php-format
+msgid "Sales Quotation #%d"
 msgstr ""
 
 msgstr ""
 
-#: sales/includes/db/custalloc_db.inc:382
-msgid ""
-"Unsuspected overallocation happened due to sparse credit notes exists for "
-"this invoice.\n"
-" Check all credit notes allocated to this invoice for summarized freight "
-"charges."
+#: sales/view/view_sales_order.php:33
+msgid "View Sales Order"
 msgstr ""
 
 msgstr ""
 
-#: sales/includes/db/recurrent_invoices_db.inc:158
+#: sales/view/view_sales_order.php:34
 #, php-format
 #, php-format
-msgid "Unknown %s price for '%s' in pricelist '%s'"
-msgstr ""
-
-#: sales/includes/db/sales_credit_db.inc:185
-msgid "Return"
+msgid "Sales Order #%d"
 msgstr ""
 
 msgstr ""
 
-#: sales/includes/db/sales_credit_db.inc:187
-msgid "Ex Inv:"
+#: sales/view/view_sales_order.php:49
+msgid "Order Information"
 msgstr ""
 
 msgstr ""
 
-#: sales/includes/db/sales_order_db.inc:101
-msgid "Deleted."
+#: sales/view/view_sales_order.php:60
+msgid "Customer Name"
 msgstr ""
 
 msgstr ""
 
-#: sales/includes/ui/sales_credit_ui.inc:90
-#: sales/includes/ui/sales_order_ui.inc:367
-msgid "Customer Currency:"
+#: sales/view/view_sales_order.php:64
+msgid "Deliver To Branch"
 msgstr ""
 
 msgstr ""
 
-#: sales/includes/ui/sales_credit_ui.inc:108
-#: sales/includes/ui/sales_order_ui.inc:640
-msgid "Shipping Company:"
+#: sales/view/view_sales_order.php:73
+msgid "Requested Delivery"
 msgstr ""
 
 msgstr ""
 
-#: sales/includes/ui/sales_credit_ui.inc:110
-#: sales/includes/ui/sales_order_ui.inc:374
-msgid "Customer Discount:"
+#: sales/view/view_sales_order.php:77
+msgid "Deliver From Location"
 msgstr ""
 
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:60
-msgid "This item is already on this document. You have been warned."
+#: sales/view/view_sales_order.php:88
+msgid "Non-Invoiced Prepayments"
 msgstr ""
 
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:105
-msgid ""
-"The selected customer and branch are not valid, or the customer does not "
-"have any branches."
+#: sales/view/view_sales_order.php:89
+msgid "All Payments Allocated"
 msgstr ""
 
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:218
-msgid "Shipping Charge"
+#: sales/view/view_sales_order.php:97
+msgid "Telephone"
 msgstr ""
 
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:286
-msgid "No customer found for entered text."
+#: sales/view/view_sales_order.php:217
+msgid "This Sales Order is used as a Template."
 msgstr ""
 
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:312
-#, php-format
-msgid "Customer's payment terms '%s' cannot be selected on this POS"
+#: sales/view/view_sales_order.php:222
+msgid "Quantity Delivered"
 msgstr ""
 
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:361
-msgid "Reference number unique for this document type"
+#: sql/alter2.1.php:19
+msgid "Upgrade from version 2.0 to 2.1"
 msgstr ""
 
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:403
-#: sales/includes/ui/sales_order_ui.inc:405
-msgid "Price List:"
+#: sql/alter2.1.php:37
+msgid "Cannot retrieve bank accounts codes"
 msgstr ""
 
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:422
-msgid "Date of order receive"
+#: sql/alter2.1.php:45
+msgid "Cannot update bank transactions"
 msgstr ""
 
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:503
-msgid "[Select item]"
+#: sql/alter2.1.php:54
+msgid "Cannot select stock identificators"
 msgstr ""
 
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:575
-msgid "Cash payment"
+#: sql/alter2.1.php:65
+msgid "Cannot insert stock id into item_codes"
 msgstr ""
 
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:578
-#: sales/includes/ui/sales_order_ui.inc:610
-msgid "Deliver from Location:"
+#: sql/alter2.1.php:144
+msgid ""
+"Seems that system upgrade to version 2.1 has \n"
+"\t\t\tbeen performed for this company already.<br> If something has gone \n"
+"\t\t\twrong and you want to retry upgrade process you MUST perform \n"
+"\t\t\tdatabase restore from last backup file first."
 msgstr ""
 
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:581
-msgid "Cash account:"
+#: sql/alter2.2.php:24
+msgid "Upgrade from version 2.1/2.2beta to 2.2"
 msgstr ""
 
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:588
-msgid "Delivery Details"
+#: sql/alter2.2.php:86
+msgid "Cannot query max sales order number."
 msgstr ""
 
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:593
-msgid "Invoice Delivery Details"
+#: sql/alter2.2.php:97
+msgid "Cannot store next sales order reference."
 msgstr ""
 
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:594
-msgid "Invoice before"
+#: sql/alter2.2.php:221
+msgid ""
+"Cannot upgrade extensions system: file /modules/installed_modules.php is not "
+"writeable"
 msgstr ""
 
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:598
-msgid "Quotation Delivery Details"
+#: sql/alter2.3.php:21
+msgid "Upgrade from version 2.2 to 2.3"
 msgstr ""
 
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:603
-msgid "Order Delivery Details"
+#: sql/alter2.4.php:23
+msgid "Upgrade from version 2.3 to 2.4"
 msgstr ""
 
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:624
-msgid "Enter requested day of delivery"
+#: sql/alter2.4.php:31 sql/alter2.4rc1.php:31
+msgid "Set optimal parameters and start upgrade:"
 msgstr ""
 
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:625
-msgid "Enter Valid until Date"
+#: sql/alter2.4.php:34
+msgid "Text collation optimization:"
 msgstr ""
 
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:626
-msgid "Deliver To:"
+#: sql/alter2.4.php:98
+msgid "Cannot update config_db.php file."
 msgstr ""
 
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:627
-msgid "Additional identifier for delivery e.g. name of receiving person"
+#: sql/alter2.4.php:138
+#, php-format
+msgid ""
+"Cannot update work orders costs:\n"
+"%s"
 msgstr ""
 
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:630
-msgid "Delivery address. Default is address of customer branch"
+#: sql/alter2.4.php:231
+msgid "Convertion to utf8 done."
 msgstr ""
 
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:634
-msgid "Contact Phone Number:"
+#: sql/alter2.4.php:270
+#, php-format
+msgid "Cannot drop column in %s table: %s"
 msgstr ""
 
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:635
-msgid "Phone number of ordering person. Defaults to branch phone number"
+#: sql/alter2.4rc1.php:23
+msgid "Upgrade from version 2.4beta to 2.4RC1"
 msgstr ""
 
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:636
-msgid "Customer Reference:"
+#: sql/alter2.4rc1.php:36
+msgid "None (will be set later)"
 msgstr ""
 
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:637
-msgid "Customer reference number for this order (if any)"
+#: sql/alter2.4rc1.php:71
+#, php-format
+msgid ""
+"Cannot update sys prefs setting:\n"
+"%s"
 msgstr ""
 
 #: taxes/item_tax_types.php:17
 msgstr ""
 
 #: taxes/item_tax_types.php:17
@@ -15261,7 +16065,7 @@ msgstr ""
 msgid "Is exempt"
 msgstr ""
 
 msgid "Is exempt"
 msgstr ""
 
-#: taxes/tax_groups.php:17
+#: taxes/tax_groups.php:17 themes/canvas/renderer.php:143
 msgid "Tax Groups"
 msgstr ""
 
 msgid "Tax Groups"
 msgstr ""
 
@@ -15368,115 +16172,72 @@ msgstr ""
 msgid "Purchasing GL Account:"
 msgstr ""
 
 msgid "Purchasing GL Account:"
 msgstr ""
 
-#: themes/default/renderer.php:27
+#: themes/canvas/renderer.php:17 themes/default/renderer.php:27
+#: themes/dropdown/renderer.php:59
 msgid "Main Menu"
 msgstr ""
 
 msgid "Main Menu"
 msgstr ""
 
+#: themes/canvas/renderer.php:43 themes/canvas/renderer.php:48
 #: themes/default/renderer.php:71 themes/default/renderer.php:80
 #: themes/default/renderer.php:71 themes/default/renderer.php:80
+#: themes/dropdown/renderer.php:82 themes/dropdown/renderer.php:88
 msgid "Preferences"
 msgstr ""
 
 msgid "Preferences"
 msgstr ""
 
-#: themes/default/renderer.php:72
+#: themes/canvas/renderer.php:44 themes/default/renderer.php:72
+#: themes/dropdown/renderer.php:83
 msgid "Change Password"
 msgstr ""
 
 msgid "Change Password"
 msgstr ""
 
+#: themes/canvas/renderer.php:45 themes/canvas/renderer.php:52
 #: themes/default/renderer.php:74 themes/default/renderer.php:85
 #: themes/default/renderer.php:74 themes/default/renderer.php:85
+#: themes/dropdown/renderer.php:85 themes/dropdown/renderer.php:92
 msgid "Help"
 msgstr ""
 
 msgid "Help"
 msgstr ""
 
-#: sql/alter2.1.php:19
-msgid "Upgrade from version 2.0 to 2.1"
-msgstr ""
-
-#: sql/alter2.1.php:37
-msgid "Cannot retrieve bank accounts codes"
-msgstr ""
-
-#: sql/alter2.1.php:45
-msgid "Cannot update bank transactions"
-msgstr ""
-
-#: sql/alter2.1.php:54
-msgid "Cannot select stock identificators"
-msgstr ""
-
-#: sql/alter2.1.php:65
-msgid "Cannot insert stock id into item_codes"
-msgstr ""
-
-#: sql/alter2.1.php:144
-msgid ""
-"Seems that system upgrade to version 2.1 has \n"
-"\t\t\tbeen performed for this company already.<br> If something has gone \n"
-"\t\t\twrong and you want to retry upgrade process you MUST perform \n"
-"\t\t\tdatabase restore from last backup file first."
-msgstr ""
-
-#: sql/alter2.2.php:24
-msgid "Upgrade from version 2.1/2.2beta to 2.2"
-msgstr ""
-
-#: sql/alter2.2.php:86
-msgid "Cannot query max sales order number."
-msgstr ""
-
-#: sql/alter2.2.php:97
-msgid "Cannot store next sales order reference."
-msgstr ""
-
-#: sql/alter2.2.php:221
-msgid ""
-"Cannot upgrade extensions system: file /modules/installed_modules.php is not "
-"writeable"
+#: themes/canvas/renderer.php:85
+msgid "Direct Invoice"
 msgstr ""
 
 msgstr ""
 
-#: sql/alter2.3.php:21
-msgid "Upgrade from version 2.2 to 2.3"
+#: themes/canvas/renderer.php:87
+msgid "Sales Order Inquiry"
 msgstr ""
 
 msgstr ""
 
-#: sql/alter2.4.php:23
-msgid "Upgrade from version 2.3 to 2.4"
+#: themes/canvas/renderer.php:103
+msgid "Inventory Adjustments"
 msgstr ""
 
 msgstr ""
 
-#: sql/alter2.4.php:31 sql/alter2.4rc1.php:31
-msgid "Set optimal parameters and start upgrade:"
+#: themes/canvas/renderer.php:111
+msgid "Ourstanding Work Orders"
 msgstr ""
 
 msgstr ""
 
-#: sql/alter2.4.php:34
-msgid "Text collation optimization:"
+#: themes/canvas/renderer.php:112
+msgid "Work Order Inquiry"
 msgstr ""
 
 msgstr ""
 
-#: sql/alter2.4.php:92
-msgid "Cannot update config_db.php file."
+#: themes/canvas/renderer.php:113
+msgid "Bills Of Material"
 msgstr ""
 
 msgstr ""
 
-#: sql/alter2.4.php:132
-#, php-format
-msgid ""
-"Cannot update work orders costs:\n"
-"%s"
+#: themes/canvas/renderer.php:117
+msgid "Fixed Assets Purchase"
 msgstr ""
 
 msgstr ""
 
-#: sql/alter2.4.php:225
-msgid "Convertion to utf8 done."
+#: themes/canvas/renderer.php:125
+msgid "Dimension Inquiry"
 msgstr ""
 
 msgstr ""
 
-#: sql/alter2.4.php:264
-#, php-format
-msgid "Cannot drop column in %s table: %s"
+#: themes/canvas/renderer.php:130
+msgid "Deposits"
 msgstr ""
 
 msgstr ""
 
-#: sql/alter2.4rc1.php:23
-msgid "Upgrade from version 2.4beta to 2.4RC1"
+#: themes/canvas/renderer.php:142
+msgid "Taxes"
 msgstr ""
 
 msgstr ""
 
-#: sql/alter2.4rc1.php:36
-msgid "None (will be set later)"
+#: themes/canvas/renderer.php:144
+msgid "Forms Setup"
 msgstr ""
 
 msgstr ""
 
-#: sql/alter2.4rc1.php:71
-#, php-format
-msgid ""
-"Cannot update sys prefs setting:\n"
-"%s"
+#: themes/canvas/renderer.php:145
+msgid "Backup and Restore"
 msgstr ""
 msgstr ""