Updating the empty.po language file. Files adjustment.
[fa-stable.git] / lang / new_language_template / LC_MESSAGES / empty.po
index 53b7070709f2c9c37cb6bc80bf15b76274c9bea0..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: 2022-07-12 21:41+0200\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 ""
 
@@ -85,7 +87,8 @@ msgid "Login -->"
 msgstr ""
 
 #: access/login.php:160 access/password_reset.php:106
 msgstr ""
 
 #: access/login.php:160 access/password_reset.php:106
-#: admin/display_prefs.php:125 themes/default/renderer.php:136
+#: 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 ""
 
@@ -165,18 +168,18 @@ msgid "Type:"
 msgstr ""
 
 #: admin/attachments.php:184 sales/allocations/customer_allocation_main.php:32
 msgstr ""
 
 #: admin/attachments.php:184 sales/allocations/customer_allocation_main.php:32
-#: sales/manage/customer_branches.php:270 sales/manage/customers.php:331
 #: sales/inquiry/customer_allocation_inquiry.php:42
 #: sales/inquiry/customer_inquiry.php:159
 #: sales/inquiry/sales_deliveries_view.php:115
 #: 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/inquiry/sales_orders_view.php:252 sales/manage/customers.php:331
+#: sales/manage/customer_branches.php:270
 msgid "Select a customer: "
 msgstr ""
 
 msgid "Select a customer: "
 msgstr ""
 
-#: admin/attachments.php:186 purchasing/manage/suppliers.php:302
+#: admin/attachments.php:186 purchasing/inquiry/po_search.php:76
 #: purchasing/inquiry/po_search_completed.php:104
 #: purchasing/inquiry/po_search_completed.php:104
-#: purchasing/inquiry/po_search.php:76
 #: purchasing/inquiry/supplier_allocation_inquiry.php:48
 #: purchasing/inquiry/supplier_allocation_inquiry.php:48
+#: purchasing/manage/suppliers.php:302
 msgid "Select a supplier: "
 msgstr ""
 
 msgid "Select a supplier: "
 msgstr ""
 
@@ -184,33 +187,35 @@ msgstr ""
 #: 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:155
 #: 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:155
-#: dimensions/inquiry/search_dimensions.php:117 gl/manage/bank_accounts.php:133
+#: 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
 #: gl/manage/currencies.php:164 gl/manage/exchange_rates.php:94
 #: gl/manage/gl_account_classes.php:131 gl/manage/gl_account_types.php:159
 #: gl/manage/gl_quick_entries.php:201 gl/manage/gl_quick_entries.php:303
-#: gl/includes/ui/gl_bank_ui.inc:179 gl/includes/ui/gl_journal_ui.inc:160
 #: includes/ui/attachment.inc:94 includes/ui/class.crud_view.inc:290
 #: includes/ui/contacts_view.inc:61 includes/ui/simple_crud_class.inc:52
 #: includes/ui/ui_view.inc:1583 inventory/prices.php:163
 #: inventory/purchasing_data.php:168
 #: inventory/includes/item_adjustments_ui.inc:106
 #: includes/ui/attachment.inc:94 includes/ui/class.crud_view.inc:290
 #: includes/ui/contacts_view.inc:61 includes/ui/simple_crud_class.inc:52
 #: includes/ui/ui_view.inc:1583 inventory/prices.php:163
 #: inventory/purchasing_data.php:168
 #: inventory/includes/item_adjustments_ui.inc:106
-#: inventory/includes/sav.item_adjustments_ui.inc:102
 #: inventory/includes/stock_transfers_ui.inc:85
 #: inventory/manage/item_categories.php:147 inventory/manage/item_codes.php:146
 #: inventory/manage/item_units.php:110 inventory/manage/locations.php:170
 #: 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/manage/bom_edit.php:60
-#: manufacturing/manage/work_centres.php:114
+#: 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:319
 #: purchasing/includes/ui/invoice_ui.inc:551
-#: purchasing/includes/ui/po_ui.inc:253 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 ""
 
@@ -227,38 +232,40 @@ msgstr ""
 #: 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:157
 #: 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:157
-#: gl/gl_budget.php:136 gl/manage/bank_accounts.php:134
-#: gl/manage/currencies.php:166 gl/manage/exchange_rates.php:99
-#: gl/manage/gl_account_classes.php:132 gl/manage/gl_account_types.php:160
-#: gl/manage/gl_quick_entries.php:202 gl/manage/gl_quick_entries.php:304
+#: 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/attachment.inc:98 includes/ui/class.crud_view.inc:294
-#: includes/ui/contacts_view.inc:64 includes/ui/simple_crud_class.inc:54
-#: includes/ui/ui_input.inc:305 inventory/prices.php:164
-#: inventory/purchasing_data.php:169
+#: 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
+#: inventory/prices.php:164 inventory/purchasing_data.php:169
 #: inventory/includes/item_adjustments_ui.inc:111
 #: inventory/includes/item_adjustments_ui.inc:111
-#: inventory/includes/sav.item_adjustments_ui.inc:104
 #: inventory/includes/stock_transfers_ui.inc:86
 #: inventory/manage/item_categories.php:148 inventory/manage/item_codes.php:147
 #: inventory/manage/item_units.php:111 inventory/manage/locations.php:171
 #: 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/manage/bom_edit.php:61
-#: manufacturing/manage/work_centres.php:115
+#: 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:255 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 ""
 
 #: admin/attachments.php:223 admin/view_print_transaction.php:126
 #: admin/void_transaction.php:186 dimensions/inquiry/search_dimensions.php:131
 msgid "Delete"
 msgstr ""
 
 #: 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 gl/bank_account_reconcile.php:267
+#: 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/journal_inquiry.php:112 gl/inquiry/journal_inquiry.php:127
 #: includes/ui/allocation_cart.inc:311
 #: gl/inquiry/bank_inquiry.php:71 gl/inquiry/gl_account_inquiry.php:128
 #: gl/inquiry/journal_inquiry.php:112 gl/inquiry/journal_inquiry.php:127
 #: includes/ui/allocation_cart.inc:311
@@ -270,48 +277,48 @@ msgstr ""
 #: manufacturing/includes/manufacturing_ui.inc:291
 #: manufacturing/includes/manufacturing_ui.inc:295
 #: manufacturing/includes/manufacturing_ui.inc:346
 #: 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:119
+#: 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:175
-#: purchasing/allocations/supplier_allocation_main.php:95
-#: 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
+#: 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:111 sales/view/view_sales_order.php:144
-#: sales/view/view_sales_order.php:181
 #: sales/inquiry/customer_allocation_inquiry.php:148
 #: sales/inquiry/customer_allocation_inquiry.php:148
-#: sales/inquiry/customer_inquiry.php:200
+#: 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 ""
 
 #: 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
 msgid "#"
 msgstr ""
 
 #: 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
-#: 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:1136 inventory/inquiry/stock_list.php:41
-#: inventory/inquiry/stock_list.php:53 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/view/view_transfer.php:50
-#: manufacturing/manage/bom_edit.php:43
+#: 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/manage/item_codes.php:131 inventory/manage/item_units.php:94
+#: inventory/manage/sales_kits.php:36 inventory/view/view_adjustment.php:54
+#: 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: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/manage/credit_status.php:97 sales/manage/recurrent_invoices.php:128
+#: 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:305
-#: sales/inquiry/sales_orders_view.php:309 taxes/tax_groups.php:126
+#: 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 ""
@@ -380,13 +387,13 @@ msgstr ""
 #: 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
 #: 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:247 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/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
 msgid "No"
 msgstr ""
 
 msgid "No"
 msgstr ""
 
@@ -481,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 ""
 
@@ -530,6 +538,7 @@ 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 ""
 
@@ -604,7 +613,7 @@ msgstr ""
 
 #: admin/company_preferences.php:259 admin/shipping_companies.php:142
 #: includes/ui/contacts_view.inc:106 inventory/manage/locations.php:212
 
 #: admin/company_preferences.php:259 admin/shipping_companies.php:142
 #: includes/ui/contacts_view.inc:106 inventory/manage/locations.php:212
-#: sales/manage/customers.php:235 sales/includes/ui/sales_order_ui.inc:635
+#: sales/includes/ui/sales_order_ui.inc:635 sales/manage/customers.php:235
 msgid "Address:"
 msgstr ""
 
 msgid "Address:"
 msgstr ""
 
@@ -618,8 +627,8 @@ msgid "Phone Number:"
 msgstr ""
 
 #: admin/company_preferences.php:263 includes/ui/contacts_view.inc:101
 msgstr ""
 
 #: admin/company_preferences.php:263 includes/ui/contacts_view.inc:101
-#: purchasing/manage/suppliers.php:248 sales/manage/customer_branches.php:255
-#: sales/manage/customers.php:259
+#: purchasing/manage/suppliers.php:248 sales/manage/customers.php:259
+#: sales/manage/customer_branches.php:255
 msgid "Fax Number:"
 msgstr ""
 
 msgid "Fax Number:"
 msgstr ""
 
@@ -720,7 +729,7 @@ msgstr ""
 msgid "Automatic Revaluation Currency Accounts"
 msgstr ""
 
 msgid "Automatic Revaluation Currency Accounts"
 msgstr ""
 
-#: admin/company_preferences.php:294
+#: admin/company_preferences.php:294 themes/canvas/renderer.php:106
 msgid "Sales Pricing"
 msgstr ""
 
 msgid "Sales Pricing"
 msgstr ""
 
@@ -751,7 +760,7 @@ msgstr ""
 
 #: admin/company_preferences.php:306 includes/dashboard.inc:287
 #: includes/dashboard.inc:315 inventory/manage/items.php:25
 
 #: admin/company_preferences.php:306 includes/dashboard.inc:287
 #: includes/dashboard.inc:315 inventory/manage/items.php:25
-#: reporting/reports_main.php:340
+#: reporting/reports_main.php:340 themes/canvas/renderer.php:119
 msgid "Fixed Assets"
 msgstr ""
 
 msgid "Fixed Assets"
 msgstr ""
 
@@ -804,26 +813,26 @@ msgstr ""
 #: admin/inst_module.php:146 admin/inst_module.php:164
 #: admin/inst_module.php:207 admin/inst_theme.php:81
 #: dimensions/dimension_entry.php:283 gl/gl_bank.php:415 gl/gl_budget.php:134
 #: admin/inst_module.php:146 admin/inst_module.php:164
 #: admin/inst_module.php:207 admin/inst_theme.php:81
 #: dimensions/dimension_entry.php:283 gl/gl_bank.php:415 gl/gl_budget.php:134
-#: gl/manage/gl_quick_entries.php:60 gl/includes/ui/gl_bank_ui.inc:265
-#: gl/includes/ui/gl_journal_ui.inc:276 includes/ui/attachment.inc:169
+#: 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
 #: 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/sav.item_adjustments_ui.inc:194
 #: inventory/includes/stock_transfers_ui.inc:150
 #: inventory/manage/sales_kits.php:208 manufacturing/work_order_entry.php:437
 #: manufacturing/includes/work_order_issue_ui.inc:132
 #: 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/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
 #: purchasing/includes/ui/invoice_ui.inc:188
 #: purchasing/includes/ui/po_ui.inc:287 purchasing/includes/ui/po_ui.inc:445
-#: 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:339
+#: 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_order_ui.inc:554
 #: sales/includes/ui/sales_credit_ui.inc:288
 #: sales/includes/ui/sales_order_ui.inc:231
 #: sales/includes/ui/sales_order_ui.inc:554
+#: sales/inquiry/sales_orders_view.php:339
 msgid "Update"
 msgstr ""
 
 msgid "Update"
 msgstr ""
 
@@ -960,13 +969,12 @@ msgstr ""
 #: 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
 #: 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:246 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
+#: 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"
 msgstr ""
 
 msgid "Yes"
 msgstr ""
 
@@ -1060,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 ""
 
@@ -1080,8 +1088,9 @@ msgstr ""
 msgid "Category Description:"
 msgstr ""
 
 msgid "Category Description:"
 msgstr ""
 
-#: admin/dashboard.php:34 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 ""
 
@@ -1397,7 +1406,7 @@ msgstr ""
 msgid "The general GL setup has been updated."
 msgstr ""
 
 msgid "The general GL setup has been updated."
 msgstr ""
 
-#: admin/gl_setup.php:189
+#: admin/gl_setup.php:189 themes/canvas/renderer.php:141
 msgid "General GL"
 msgstr ""
 
 msgid "General GL"
 msgstr ""
 
@@ -1470,37 +1479,36 @@ msgstr ""
 #: inventory/inquiry/stock_movements.php:104
 #: inventory/view/view_adjustment.php:43 inventory/view/view_transfer.php:36
 #: manufacturing/search_work_orders.php:165
 #: inventory/inquiry/stock_movements.php:104
 #: inventory/view/view_adjustment.php:43 inventory/view/view_transfer.php:36
 #: manufacturing/search_work_orders.php:165
-#: manufacturing/view/wo_issue_view.php:42
-#: manufacturing/view/wo_production_view.php:43
 #: manufacturing/includes/manufacturing_ui.inc:174
 #: 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:302 purchasing/view/view_po.php:115
-#: purchasing/view/view_supp_credit.php:43
-#: purchasing/view/view_supp_invoice.php:47
-#: purchasing/view/view_supp_payment.php:73
+#: purchasing/includes/ui/po_ui.inc:302 purchasing/inquiry/po_search.php:118
 #: purchasing/inquiry/po_search_completed.php:120
 #: purchasing/inquiry/po_search_completed.php:120
-#: purchasing/inquiry/po_search.php:118
 #: purchasing/inquiry/supplier_allocation_inquiry.php:138
 #: purchasing/inquiry/supplier_allocation_inquiry.php:138
-#: purchasing/inquiry/supplier_inquiry.php:176
-#: purchasing/allocations/supplier_allocation_main.php:96
-#: reporting/rep501.php:87 reporting/rep601.php:81 reporting/rep602.php:80
-#: reporting/rep702.php:53 reporting/includes/doctext.inc:222
-#: sales/customer_credit_invoice.php:241 sales/customer_credit_invoice.php:246
-#: sales/customer_delivery.php:333 sales/customer_delivery.php:338
-#: sales/customer_invoice.php:445 sales/customer_invoice.php:450
+#: 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_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:96
-#: sales/inquiry/customer_allocation_inquiry.php:149
-#: sales/inquiry/customer_inquiry.php:202
-#: sales/inquiry/sales_deliveries_view.php:174
 #: sales/includes/ui/sales_credit_ui.inc:81
 #: sales/includes/ui/sales_credit_ui.inc:83
 #: sales/includes/ui/sales_order_ui.inc:361
 #: 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 ""
 
@@ -1536,8 +1544,8 @@ msgstr ""
 msgid "Receivable Account:"
 msgstr ""
 
 msgid "Receivable Account:"
 msgstr ""
 
-#: admin/gl_setup.php:236 admin/gl_setup.php:281
-#: inventory/manage/item_categories.php:228 inventory/manage/items.php:489
+#: 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 ""
@@ -1626,19 +1634,19 @@ msgstr ""
 msgid "Items Defaults"
 msgstr ""
 
 msgid "Items Defaults"
 msgstr ""
 
-#: admin/gl_setup.php:283 inventory/manage/item_categories.php:244
-#: inventory/manage/items.php:498
+#: 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:285 inventory/manage/item_categories.php:232
-#: inventory/manage/item_categories.php:246 inventory/manage/items.php:499
-#: inventory/manage/items.php:504
+#: 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:287 inventory/manage/item_categories.php:247
-#: inventory/manage/items.php:500
+#: 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 ""
 
@@ -1659,14 +1667,14 @@ msgid "Depreciation Period:"
 msgstr ""
 
 #: admin/gl_setup.php:297 gl/accruals.php:198
 msgstr ""
 
 #: admin/gl_setup.php:297 gl/accruals.php:198
-#: gl/manage/gl_quick_entries.php:247 gl/includes/ui/gl_journal_ui.inc:69
+#: 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/create_recurrent_invoices.php:209
 #: sales/manage/recurrent_invoices.php:128
 msgid "Monthly"
 msgstr ""
 
-#: admin/gl_setup.php:297 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 ""
 
@@ -1744,11 +1752,10 @@ msgstr ""
 #: manufacturing/manage/work_centres.php:101
 #: purchasing/includes/ui/invoice_ui.inc:278
 #: purchasing/includes/ui/invoice_ui.inc:280
 #: 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/_rep115.php:252
-#: 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
+#: 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 ""
 
@@ -1845,8 +1852,9 @@ msgstr ""
 msgid "Install third-party extension."
 msgstr ""
 
 msgid "Install third-party extension."
 msgstr ""
 
-#: admin/inst_module.php:177 includes/ui/ui_lists.inc:763
-#: includes/ui/ui_lists.inc:2357 reporting/includes/excel_report.inc:229
+#: 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 ""
 #: reporting/includes/pdf_report.inc:266
 msgid "Active"
 msgstr ""
@@ -1997,10 +2005,10 @@ msgstr ""
 #: 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/inquiry/search_dimensions.php:75
 #: dimensions/inquiry/search_dimensions.php:134
 #: dimensions/view/view_dimension.php:55 gl/bank_account_reconcile.php:266
-#: gl/inquiry/bank_inquiry.php:71 gl/inquiry/gl_account_inquiry.php:128
-#: gl/inquiry/journal_inquiry.php:114 gl/inquiry/tax_inquiry.php:80
-#: gl/manage/bank_accounts.php:109 gl/manage/gl_quick_entries.php:190
-#: gl/view/accrual_trans.php:52 gl/includes/ui/gl_bank_ui.inc:90
+#: 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
 #: manufacturing/search_work_orders.php:166
 #: includes/ui/ui_view.inc:552 inventory/inquiry/stock_movements.php:104
 #: inventory/manage/item_categories.php:121
 #: manufacturing/search_work_orders.php:166
@@ -2206,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:565
-#: purchasing/manage/suppliers.php:304 sales/manage/customers.php:333
+#: 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 ""
 
@@ -2249,12 +2258,11 @@ msgid "Delete This Role"
 msgstr ""
 
 #: admin/security_roles.php:244 admin/void_transaction.php:253
 msgstr ""
 
 #: admin/security_roles.php:244 admin/void_transaction.php:253
-#: gl/manage/gl_quick_entries.php:61 gl/includes/ui/gl_bank_ui.inc:267
-#: gl/includes/ui/gl_journal_ui.inc:278 includes/ui/attachment.inc:171
+#: 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
 #: 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/sav.item_adjustments_ui.inc:196
 #: inventory/includes/stock_transfers_ui.inc:151 inventory/manage/items.php:548
 #: manufacturing/includes/work_order_issue_ui.inc:134
 #: purchasing/includes/ui/po_ui.inc:447 sales/create_recurrent_invoices.php:196
 #: inventory/includes/stock_transfers_ui.inc:151 inventory/manage/items.php:548
 #: manufacturing/includes/work_order_issue_ui.inc:134
 #: purchasing/includes/ui/po_ui.inc:447 sales/create_recurrent_invoices.php:196
@@ -2268,7 +2276,7 @@ msgid "Cancel Edition"
 msgstr ""
 
 #: admin/shipping_companies.php:15 sales/customer_credit_invoice.php:253
 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"
@@ -2319,8 +2327,8 @@ msgstr ""
 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:388
+#: 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 ""
@@ -2332,7 +2340,7 @@ msgstr ""
 
 #: admin/shipping_companies.php:140 includes/ui/contacts_view.inc:100
 #: inventory/manage/locations.php:215 purchasing/manage/suppliers.php:246
 
 #: admin/shipping_companies.php:140 includes/ui/contacts_view.inc:100
 #: inventory/manage/locations.php:215 purchasing/manage/suppliers.php:246
-#: sales/manage/customer_branches.php:254 sales/manage/customers.php:258
+#: sales/manage/customers.php:258 sales/manage/customer_branches.php:254
 msgid "Secondary Phone Number:"
 msgstr ""
 
 msgid "Secondary Phone Number:"
 msgstr ""
 
@@ -2427,8 +2435,8 @@ msgstr ""
 
 #: admin/users.php:123 includes/ui/contacts_view.inc:40
 #: inventory/manage/locations.php:155 reporting/rep106.php:95
 
 #: admin/users.php:123 includes/ui/contacts_view.inc:40
 #: inventory/manage/locations.php:155 reporting/rep106.php:95
-#: reporting/includes/header2.inc:98 sales/manage/sales_people.php:99
-#: sales/inquiry/customer_branches_list.php:49
+#: reporting/includes/header2.inc:98
+#: sales/inquiry/customer_branches_list.php:49 sales/manage/sales_people.php:99
 msgid "Phone"
 msgstr ""
 
 msgid "Phone"
 msgstr ""
 
@@ -2476,9 +2484,9 @@ msgstr ""
 #: admin/view_print_transaction.php:43 admin/view_print_transaction.php:45
 #: admin/view_print_transaction.php:129
 #: dimensions/inquiry/search_dimensions.php:123 includes/ui/ui_controls.inc:213
 #: admin/view_print_transaction.php:43 admin/view_print_transaction.php:45
 #: admin/view_print_transaction.php:129
 #: dimensions/inquiry/search_dimensions.php:123 includes/ui/ui_controls.inc:213
-#: manufacturing/search_work_orders.php:152
+#: manufacturing/search_work_orders.php:152 purchasing/inquiry/po_search.php:94
 #: purchasing/inquiry/po_search_completed.php:52
 #: purchasing/inquiry/po_search_completed.php:52
-#: purchasing/inquiry/po_search.php:94 sales/inquiry/customer_inquiry.php:102
+#: sales/inquiry/customer_inquiry.php:102
 #: sales/inquiry/sales_deliveries_view.php:149
 #: sales/inquiry/sales_orders_view.php:102
 msgid "Print"
 #: sales/inquiry/sales_deliveries_view.php:149
 #: sales/inquiry/sales_orders_view.php:102
 msgid "Print"
@@ -2497,18 +2505,20 @@ msgid "to #:"
 msgstr ""
 
 #: admin/view_print_transaction.php:83 admin/void_transaction.php:175
 msgstr ""
 
 #: admin/view_print_transaction.php:83 admin/void_transaction.php:175
-#: dimensions/inquiry/search_dimensions.php:88 gl/inquiry/accounts_list.php:40
+#: 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
 #: manufacturing/search_work_orders.php:86
 #: purchasing/includes/ui/invoice_ui.inc:483
 #: gl/inquiry/journal_inquiry.php:58 inventory/inquiry/stock_list.php:42
 #: manufacturing/search_work_orders.php:86
 #: purchasing/includes/ui/invoice_ui.inc:483
-#: purchasing/inquiry/po_search_completed.php:108
 #: 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:170 sales/inquiry/customers_list.php:42
+#: sales/inquiry/customer_inquiry.php:170
 #: sales/inquiry/sales_deliveries_view.php:117
 #: sales/inquiry/sales_orders_view.php:256
 msgid "Search"
 #: sales/inquiry/sales_deliveries_view.php:117
 #: sales/inquiry/sales_orders_view.php:256
 msgid "Search"
@@ -2528,32 +2538,33 @@ msgstr ""
 
 #: admin/view_print_transaction.php:128 admin/void_transaction.php:188
 #: dimensions/inquiry/search_dimensions.php:135
 
 #: admin/view_print_transaction.php:128 admin/void_transaction.php:188
 #: dimensions/inquiry/search_dimensions.php:135
-#: dimensions/view/view_dimension.php:55 gl/accruals.php:104
+#: 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/inquiry/journal_inquiry.php:113 gl/view/accrual_trans.php:52
 #: gl/view/bank_transfer_view.php:83 gl/view/gl_deposit_view.php:68
 #: gl/view/gl_payment_view.php:66 includes/dashboard.inc:1011
 #: gl/accruals.php:211 gl/bank_account_reconcile.php:269
 #: gl/inquiry/bank_inquiry.php:71 gl/inquiry/gl_account_inquiry.php:128
 #: gl/inquiry/journal_inquiry.php:113 gl/view/accrual_trans.php:52
 #: gl/view/bank_transfer_view.php:83 gl/view/gl_deposit_view.php:68
 #: gl/view/gl_payment_view.php:66 includes/dashboard.inc:1011
-#: includes/dashboard.inc:1096 includes/ui/allocation_cart.inc:311
+#: 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
 #: manufacturing/search_work_orders.php:171
 #: manufacturing/work_order_entry.php:399
 #: manufacturing/work_order_entry.php:405
 #: includes/ui/attachment.inc:136 includes/ui/ui_view.inc:552
 #: inventory/inquiry/stock_movements.php:109
 #: inventory/view/view_adjustment.php:44 inventory/view/view_transfer.php:37
 #: manufacturing/search_work_orders.php:171
 #: 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
+#: manufacturing/view/wo_costs_view.php:60
+#: manufacturing/view/wo_production_view.php:44
+#: purchasing/allocations/supplier_allocation_main.php:97
 #: purchasing/includes/ui/invoice_ui.inc:115
 #: purchasing/includes/ui/invoice_ui.inc:115
-#: purchasing/includes/ui/po_ui.inc:316 purchasing/view/view_po.php:140
+#: purchasing/includes/ui/po_ui.inc:316
 #: purchasing/inquiry/supplier_allocation_inquiry.php:141
 #: purchasing/inquiry/supplier_allocation_inquiry.php:141
-#: purchasing/inquiry/supplier_inquiry.php:179
-#: purchasing/allocations/supplier_allocation_main.php:97
+#: 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/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
@@ -2561,12 +2572,12 @@ msgstr ""
 #: 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
 #: 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:366 sales/customer_invoice.php:485
+#: 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:111
-#: sales/view/view_sales_order.php:144 sales/view/view_sales_order.php:181
 #: sales/inquiry/customer_allocation_inquiry.php:151
 #: sales/inquiry/customer_allocation_inquiry.php:151
-#: sales/inquiry/customer_inquiry.php:203
+#: 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 ""
 
@@ -2584,9 +2595,9 @@ msgstr ""
 #: 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 ""
 
@@ -2608,16 +2619,17 @@ msgid "Voiding Date:"
 msgstr ""
 
 #: admin/void_transaction.php:215 dimensions/dimension_entry.php:273
 msgstr ""
 
 #: admin/void_transaction.php:215 dimensions/dimension_entry.php:273
-#: gl/bank_transfer.php:152 gl/inquiry/gl_account_inquiry.php:84
-#: gl/inquiry/journal_inquiry.php:53 gl/manage/revaluate_currencies.php:83
+#: 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
 #: includes/ui/class.reflines_crud.inc:105 includes/ui/ui_view.inc:350
 #: manufacturing/work_order_add_finished.php:196
 #: manufacturing/work_order_costs.php:147
 #: manufacturing/work_order_entry.php:429
-#: manufacturing/work_order_release.php:102
+#: 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/invoice_ui.inc:192
-#: purchasing/includes/ui/po_ui.inc:474 purchasing/po_entry_items.php:486
-#: purchasing/supplier_payment.php:349 sales/customer_invoice.php:658
+#: purchasing/includes/ui/po_ui.inc:474 sales/customer_invoice.php:659
 #: sales/customer_payments.php:399
 msgid "Memo:"
 msgstr ""
 #: sales/customer_payments.php:399
 msgid "Memo:"
 msgstr ""
@@ -2638,7 +2650,7 @@ msgstr ""
 
 #: admin/void_transaction.php:242 inventory/reorder_level.php:71
 #: inventory/inquiry/stock_movements.php:109
 
 #: 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:223
+#: inventory/inquiry/stock_status.php:74 purchasing/supplier_credit.php:230
 msgid "Quantity On Hand"
 msgstr ""
 
 msgid "Quantity On Hand"
 msgstr ""
 
@@ -2675,12 +2687,12 @@ msgstr ""
 #: 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_issue.php:82 purchasing/po_entry_items.php:351
 #: 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_issue.php:82 purchasing/po_entry_items.php:351
-#: purchasing/po_receive_items.php:179 purchasing/supplier_credit.php:189
-#: purchasing/supplier_invoice.php:193 purchasing/supplier_payment.php:197
+#: 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:92
-#: sales/create_recurrent_invoices.php:170 sales/credit_note_entry.php:157
+#: 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:164
+#: 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."
 #: sales/sales_order_entry.php:378
 msgid ""
 "The entered date is out of fiscal year or is closed for further data entry."
@@ -2714,8 +2726,8 @@ msgid "Closing Year"
 msgstr ""
 
 #: admin/db/fiscalyears_db.inc:220 reporting/rep101.php:194
 msgstr ""
 
 #: admin/db/fiscalyears_db.inc:220 reporting/rep101.php:194
-#: reporting/_rep115.php:252 reporting/rep115.php:164 reporting/rep201.php:170
-#: reporting/rep206.php:115 reporting/rep706.php:188
+#: reporting/rep115.php:164 reporting/rep201.php:170 reporting/rep206.php:115
+#: reporting/rep706.php:188
 msgid "Open Balance"
 msgstr ""
 
 msgid "Open Balance"
 msgstr ""
 
@@ -2817,6 +2829,131 @@ msgstr ""
 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 ""
@@ -2824,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 ""
 
@@ -3404,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 ""
 
@@ -3540,10 +3678,11 @@ msgstr ""
 msgid "Balance for this Dimension"
 msgstr ""
 
 msgid "Balance for this Dimension"
 msgstr ""
 
-#: dimensions/includes/dimensions_ui.inc:31 gl/accruals.php:104
+#: 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/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
-#: includes/dashboard.inc:1167 includes/sysnames.inc:181
+#: 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
@@ -3552,38 +3691,40 @@ msgstr ""
 msgid "Account"
 msgstr ""
 
 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: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 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/_rep115.php:252 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/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
 #: sales/inquiry/customer_allocation_inquiry.php:155
 msgid "Debit"
 msgstr ""
 
 #: sales/inquiry/customer_allocation_inquiry.php:155
 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: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 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
+#: 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
 #: includes/sysnames.inc:92 manufacturing/view/wo_costs_view.php:61
 #: purchasing/inquiry/supplier_allocation_inquiry.php:145
-#: reporting/_rep115.php:252 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/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
 #: sales/inquiry/customer_allocation_inquiry.php:156
 msgid "Credit"
 msgstr ""
 #: sales/inquiry/customer_allocation_inquiry.php:156
 msgid "Credit"
 msgstr ""
@@ -3592,16 +3733,15 @@ msgstr ""
 #: 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
 #: 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:1167
+#: includes/dashboard.inc:1176
 #: purchasing/inquiry/supplier_allocation_inquiry.php:147
 #: purchasing/inquiry/supplier_inquiry.php:183
 #: purchasing/inquiry/supplier_inquiry.php:196 reporting/rep101.php:141
 #: purchasing/inquiry/supplier_allocation_inquiry.php:147
 #: purchasing/inquiry/supplier_inquiry.php:183
 #: purchasing/inquiry/supplier_inquiry.php:196 reporting/rep101.php:141
-#: reporting/_rep115.php:252 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
+#: 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"
 #: sales/inquiry/customer_inquiry.php:209
 #: sales/inquiry/customer_inquiry.php:222
 msgid "Balance"
@@ -3616,10 +3756,9 @@ msgid "Search Dimensions"
 msgstr ""
 
 #: dimensions/inquiry/search_dimensions.php:73 gl/bank_transfer.php:121
 msgstr ""
 
 #: dimensions/inquiry/search_dimensions.php:73 gl/bank_transfer.php:121
-#: gl/inquiry/journal_inquiry.php:45 gl/includes/ui/gl_bank_ui.inc:26
-#: gl/includes/ui/gl_journal_ui.inc:51 includes/ui/contacts_view.inc:91
+#: gl/includes/ui/gl_bank_ui.inc:26 gl/includes/ui/gl_journal_ui.inc:51
+#: 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/sav.item_adjustments_ui.inc:39
 #: inventory/includes/stock_transfers_ui.inc:45
 #: manufacturing/search_work_orders.php:70
 #: manufacturing/work_order_add_finished.php:186
 #: inventory/includes/stock_transfers_ui.inc:45
 #: manufacturing/search_work_orders.php:70
 #: manufacturing/work_order_add_finished.php:186
@@ -3627,9 +3766,10 @@ msgstr ""
 #: manufacturing/work_order_entry.php:357
 #: manufacturing/work_order_entry.php:365
 #: manufacturing/includes/work_order_issue_ui.inc:161
 #: manufacturing/work_order_entry.php:357
 #: manufacturing/work_order_entry.php:365
 #: manufacturing/includes/work_order_issue_ui.inc:161
+#: 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/invoice_ui.inc:117
 #: purchasing/includes/ui/po_ui.inc:156 purchasing/includes/ui/po_ui.inc:161
-#: purchasing/supplier_payment.php:306 sales/customer_payments.php:353
+#: sales/customer_payments.php:353
 msgid "Reference:"
 msgstr ""
 
 msgid "Reference:"
 msgstr ""
 
@@ -3637,26 +3777,26 @@ msgstr ""
 #: 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
 #: 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/_rep115.php:218 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/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 ""
 
 #: reporting/includes/reports_classes.inc:284
 msgid "All"
 msgstr ""
 
-#: dimensions/inquiry/search_dimensions.php:76 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
 #: sales/inquiry/customer_inquiry.php:165
 #: purchasing/inquiry/supplier_allocation_inquiry.php:50
 #: purchasing/inquiry/supplier_inquiry.php:143
 #: sales/inquiry/customer_inquiry.php:165
@@ -3684,21 +3824,20 @@ msgstr ""
 
 #: dimensions/inquiry/search_dimensions.php:136
 #: dimensions/view/view_dimension.php:55 includes/dashboard.inc:1011
 
 #: dimensions/inquiry/search_dimensions.php:136
 #: dimensions/view/view_dimension.php:55 includes/dashboard.inc:1011
-#: includes/dashboard.inc:1096 includes/ui/allocation_cart.inc:311
+#: includes/dashboard.inc:1095 includes/ui/allocation_cart.inc:311
 #: purchasing/includes/ui/invoice_ui.inc:136
 #: purchasing/includes/ui/invoice_ui.inc:136
-#: purchasing/view/view_supp_credit.php:48
-#: purchasing/view/view_supp_invoice.php:52
 #: purchasing/inquiry/supplier_allocation_inquiry.php:142
 #: purchasing/inquiry/supplier_allocation_inquiry.php:142
-#: purchasing/inquiry/supplier_inquiry.php:180 reporting/rep101.php:137
+#: 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:207 reporting/includes/doctext.inc:209
 #: 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:207 reporting/includes/doctext.inc:209
-#: sales/customer_invoice.php:492 sales/view/view_dispatch.php:97
-#: sales/view/view_invoice.php:96 sales/view/view_sales_order.php:71
+#: sales/customer_invoice.php:493 sales/includes/ui/sales_order_ui.inc:595
 #: sales/inquiry/customer_allocation_inquiry.php:152
 #: sales/inquiry/customer_allocation_inquiry.php:152
-#: sales/inquiry/customer_inquiry.php:204
-#: sales/includes/ui/sales_order_ui.inc:595
+#: 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 ""
 
@@ -3719,8 +3858,8 @@ 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:91
-#: 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/sales_deliveries_view.php:103
 #: sales/inquiry/sales_orders_view.php:237
 #: sales/inquiry/customer_allocation_inquiry.php:44
 #: sales/inquiry/sales_deliveries_view.php:103
 #: sales/inquiry/sales_orders_view.php:237
@@ -3728,8 +3867,8 @@ msgid "from:"
 msgstr ""
 
 #: dimensions/view/view_dimension.php:86 gl/inquiry/gl_account_inquiry.php:73
 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:92
-#: 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/sales_deliveries_view.php:104
 #: sales/inquiry/sales_orders_view.php:238
 #: sales/inquiry/customer_allocation_inquiry.php:45
 #: sales/inquiry/sales_deliveries_view.php:104
 #: sales/inquiry/sales_orders_view.php:238
@@ -3743,173 +3882,389 @@ msgstr ""
 msgid "Show"
 msgstr ""
 
 msgid "Show"
 msgstr ""
 
-#: gl/accruals.php:30 includes/access_levels.inc:266
-msgid "Revenue / Cost Accruals"
+#: fixed_assets/fixed_asset_classes.php:21
+msgid "Fixed asset classes"
 msgstr ""
 
 msgstr ""
 
-#: gl/accruals.php:54
-msgid "The amount can not be 0."
+#: fixed_assets/fixed_asset_classes.php:31
+msgid "The depreciation rate can't be greater than 100%"
 msgstr ""
 
 msgstr ""
 
-#: gl/accruals.php:60
-msgid "The periods must be greater than 0."
+#: fixed_assets/fixed_asset_classes.php:44
+msgid "Selected fixed asset class has been updated"
 msgstr ""
 
 msgstr ""
 
-#: gl/accruals.php:81
-msgid ""
-"Some of the period dates are outside the fiscal year or are closed for "
-"further data entry. Create a new fiscal year first!"
+#: fixed_assets/fixed_asset_classes.php:49
+msgid "New fixed asset class has been added"
 msgstr ""
 
 msgstr ""
 
-#: gl/accruals.php:96
-#, php-format
-msgid "Accruals for %s"
+#: fixed_assets/fixed_asset_classes.php:60
+msgid "Cannot delete this class because it is used by some fixed asset items."
 msgstr ""
 
 msgstr ""
 
-#: gl/accruals.php:106 gl/accruals.php:108 gl/accruals.php:219
-#: 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/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:354 includes/dashboard.inc:624
-#: includes/sysnames.inc:43 includes/sysnames.inc:182
-#: inventory/manage/item_categories.php:258
-#: inventory/manage/item_categories.php:260 inventory/manage/items.php:478
-#: inventory/manage/items.php:480 purchasing/includes/ui/invoice_ui.inc:141
-#: purchasing/includes/ui/invoice_ui.inc:278
-#: purchasing/includes/ui/invoice_ui.inc:280
-#: purchasing/includes/ui/po_ui.inc:172 purchasing/supplier_payment.php:330
-#: purchasing/supplier_payment.php:335 purchasing/manage/suppliers.php:257
-#: purchasing/manage/suppliers.php:258 purchasing/manage/suppliers.php:260
-#: reporting/rep103.php:240 reporting/rep103.php:252 reporting/rep205.php:152
-#: reporting/rep205.php:164 reporting/rep501.php:92 reporting/rep704.php: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:383 sales/customer_delivery.php:391
-#: sales/customer_invoice.php:457 sales/customer_invoice.php:494
-#: sales/customer_payments.php:375 sales/customer_payments.php:380
-#: sales/manage/customers.php:276 sales/manage/customers.php:278
-#: sales/includes/ui/sales_credit_ui.inc:128
-#: sales/includes/ui/sales_credit_ui.inc:133
-#: sales/includes/ui/sales_order_ui.inc:441
-#: sales/includes/ui/sales_order_ui.inc:446
-msgid "Dimension"
+#: fixed_assets/fixed_asset_classes.php:74
+msgid "Selected fixed asset class has been deleted"
 msgstr ""
 
 msgstr ""
 
-#: gl/accruals.php:112 gl/accruals.php:229 gl/bank_account_reconcile.php:273
-#: gl/inquiry/bank_inquiry.php:72 gl/inquiry/gl_account_inquiry.php:143
-#: gl/inquiry/gl_account_inquiry.php:145 gl/inquiry/journal_inquiry.php:120
-#: gl/manage/gl_quick_entries.php:268 gl/manage/gl_quick_entries.php:270
-#: gl/manage/gl_quick_entries.php:272 gl/view/accrual_trans.php:60
-#: gl/view/gl_deposit_view.php:105 gl/view/gl_deposit_view.php:108
-#: gl/view/gl_deposit_view.php:111 gl/view/gl_payment_view.php:104
-#: gl/view/gl_payment_view.php:107 gl/view/gl_payment_view.php:110
-#: gl/view/gl_trans_view.php:96 gl/view/gl_trans_view.php:99
-#: gl/view/gl_trans_view.php:102 gl/includes/ui/gl_bank_ui.inc:147
-#: gl/includes/ui/gl_bank_ui.inc:150 gl/includes/ui/gl_bank_ui.inc:153
-#: gl/includes/ui/gl_bank_ui.inc:300 gl/includes/ui/gl_journal_ui.inc:113
-#: gl/includes/ui/gl_journal_ui.inc:116 gl/includes/ui/gl_journal_ui.inc:119
-#: gl/includes/ui/gl_journal_ui.inc:295 includes/ui/class.reflines_crud.inc:38
-#: inventory/cost_update.php:148 inventory/includes/item_adjustments_ui.inc:236
-#: inventory/includes/sav.item_adjustments_ui.inc:218
-#: inventory/includes/stock_transfers_ui.inc:169
-#: manufacturing/view/wo_costs_view.php:61
-#: manufacturing/includes/work_order_issue_ui.inc:169
-#: purchasing/includes/ui/invoice_ui.inc:278
-#: purchasing/includes/ui/invoice_ui.inc:280
-#: purchasing/includes/ui/invoice_ui.inc:282 reporting/rep402.php:141
-#: sales/customer_credit_invoice.php:359 sales/customer_delivery.php:523
-#: sales/includes/ui/sales_credit_ui.inc:334
-msgid "Memo"
+#: fixed_assets/fixed_asset_classes.php:89
+msgid "Fixed asset class"
 msgstr ""
 
 msgstr ""
 
-#: gl/accruals.php:178
-msgid "Revenue / Cost Accruals have been processed."
+#: fixed_assets/fixed_asset_classes.php:89
+#: fixed_assets/fixed_asset_classes.php:139
+msgid "Basic Depreciation Rate"
 msgstr ""
 
 msgstr ""
 
-#: gl/accruals.php:184
-msgid "Showing GL Transactions."
+#: fixed_assets/fixed_asset_classes.php:128
+#: fixed_assets/fixed_asset_classes.php:133
+msgid "Parent class:"
 msgstr ""
 
 msgstr ""
 
-#: gl/accruals.php:196
-msgid "Weekly"
+#: fixed_assets/fixed_asset_classes.php:129
+#: fixed_assets/fixed_asset_classes.php:134
+msgid "Fixed asset class:"
 msgstr ""
 
 msgstr ""
 
-#: gl/accruals.php:197
-msgid "Bi-weekly"
+#: 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 ""
 
 msgstr ""
 
-#: gl/accruals.php:199
-msgid "Quarterly"
+#: fixed_assets/fixed_asset_classes.php:138
+msgid "Long description:"
 msgstr ""
 
 msgstr ""
 
-#: gl/accruals.php:211
-msgid "First date of Accruals"
+#: fixed_assets/process_depreciation.php:30
+#: fixed_assets/process_depreciation.php:129
+#: fixed_assets/process_depreciation.php:180
+msgid "Process Depreciation"
 msgstr ""
 
 msgstr ""
 
-#: gl/accruals.php:213
-msgid "Accrued Balance Account"
+#: 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 ""
 
 msgstr ""
 
-#: gl/accruals.php:216
-msgid "Revenue / Cost Account"
+#: fixed_assets/process_depreciation.php:75
+msgid "The fixed asset has been depreciated for this year"
 msgstr ""
 
 msgstr ""
 
-#: gl/accruals.php:224 gl/gl_budget.php:90 gl/gl_budget.php:92
-#: 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
-#: 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: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
-#: purchasing/view/view_supp_payment.php:60
-#: purchasing/view/view_supp_payment.php:72
-#: purchasing/inquiry/supplier_inquiry.php:182 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/view/view_receipt.php:44 sales/inquiry/customer_inquiry.php:208
-msgid "Amount"
+#: fixed_assets/process_depreciation.php:77
+msgid "View the GL &Postings for this Depreciation"
 msgstr ""
 
 msgstr ""
 
-#: gl/accruals.php:224
-msgid "Search Amount"
+#: 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:54
+msgid "The amount can not be 0."
+msgstr ""
+
+#: gl/accruals.php:60
+msgid "The periods must be greater than 0."
+msgstr ""
+
+#: gl/accruals.php:81
+msgid ""
+"Some of the period dates are outside the fiscal year or are closed for "
+"further data entry. Create a new fiscal year first!"
+msgstr ""
+
+#: gl/accruals.php:96
+#, php-format
+msgid "Accruals for %s"
+msgstr ""
+
+#: gl/accruals.php:106 gl/accruals.php:108 gl/accruals.php:219
+#: 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/po_ui.inc:172 purchasing/manage/suppliers.php:257
+#: purchasing/manage/suppliers.php:258 purchasing/manage/suppliers.php:260
+#: reporting/rep103.php:240 reporting/rep103.php:252 reporting/rep205.php:152
+#: reporting/rep205.php:164 reporting/rep501.php:92 reporting/rep704.php: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_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
+#: 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/gl_account_inquiry.php:145 gl/inquiry/journal_inquiry.php:120
+#: gl/manage/gl_quick_entries.php:268 gl/manage/gl_quick_entries.php:270
+#: gl/manage/gl_quick_entries.php:272 gl/view/accrual_trans.php:60
+#: gl/view/gl_deposit_view.php:105 gl/view/gl_deposit_view.php:108
+#: gl/view/gl_deposit_view.php:111 gl/view/gl_payment_view.php:104
+#: gl/view/gl_payment_view.php:107 gl/view/gl_payment_view.php:110
+#: gl/view/gl_trans_view.php:96 gl/view/gl_trans_view.php:99
+#: gl/view/gl_trans_view.php:102 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/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: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 ""
+
+#: gl/accruals.php:178
+msgid "Revenue / Cost Accruals have been processed."
+msgstr ""
+
+#: gl/accruals.php:184
+msgid "Showing GL Transactions."
+msgstr ""
+
+#: gl/accruals.php:196
+msgid "Weekly"
+msgstr ""
+
+#: gl/accruals.php:197
+msgid "Bi-weekly"
+msgstr ""
+
+#: gl/accruals.php:199
+msgid "Quarterly"
+msgstr ""
+
+#: gl/accruals.php:211
+msgid "First date of Accruals"
+msgstr ""
+
+#: gl/accruals.php:213
+msgid "Accrued Balance Account"
+msgstr ""
+
+#: gl/accruals.php:216
+msgid "Revenue / Cost Account"
+msgstr ""
+
+#: gl/accruals.php:224 gl/gl_budget.php:90 gl/gl_budget.php:92
+#: 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/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
+#: purchasing/inquiry/supplier_inquiry.php:182
+#: purchasing/view/view_supp_payment.php:60
+#: 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 ""
+
+#: gl/accruals.php:224
+msgid "Search Amount"
 msgstr ""
 
 #: gl/accruals.php:226
 msgstr ""
 
 #: gl/accruals.php:226
@@ -3920,10 +4275,6 @@ msgstr ""
 msgid "Periods"
 msgstr ""
 
 msgid "Periods"
 msgstr ""
 
-#: gl/accruals.php:232 reporting/rep402.php:155 reporting/reports_main.php:327
-msgid "Show GL Rows"
-msgstr ""
-
 #: gl/accruals.php:233
 msgid "Process Accruals"
 msgstr ""
 #: gl/accruals.php:233
 msgid "Process Accruals"
 msgstr ""
@@ -4275,22 +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:145
-#: reporting/rep105.php:119 reporting/rep106.php:99 reporting/rep114.php:90
-#: reporting/_rep115.php:257 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 ""
-
 #: gl/gl_budget.php:90
 msgid "Dim. incl."
 msgstr ""
 #: gl/gl_budget.php:90
 msgid "Dim. incl."
 msgstr ""
@@ -4299,23 +4634,21 @@ 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/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/balance_sheet.php:202 gl/inquiry/balance_sheet.php:233
 #: 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/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:1012
-#: includes/dashboard.inc:1096 inventory/includes/item_adjustments_ui.inc:60
+#: 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
 #: inventory/includes/item_adjustments_ui.inc:126
-#: inventory/includes/sav.item_adjustments_ui.inc:60
-#: inventory/includes/sav.item_adjustments_ui.inc:116
 #: manufacturing/includes/manufacturing_ui.inc:195
 #: manufacturing/includes/manufacturing_ui.inc:195
+#: purchasing/po_receive_items.php:63
+#: purchasing/allocations/supplier_allocation_main.php:100
 #: purchasing/includes/ui/invoice_ui.inc:342
 #: purchasing/includes/ui/invoice_ui.inc:504
 #: purchasing/includes/ui/invoice_ui.inc:342
 #: purchasing/includes/ui/invoice_ui.inc:504
-#: purchasing/includes/ui/invoice_ui.inc:575 purchasing/po_receive_items.php:63
-#: purchasing/view/view_po.php:140
-#: purchasing/allocations/supplier_allocation_main.php:100
+#: 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/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
@@ -4330,15 +4663,14 @@ msgstr ""
 #: 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/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
-#: 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:111
-#: sales/view/view_sales_order.php:144 sales/view/view_sales_order.php:181
-#: sales/view/view_sales_order.php:222
 #: sales/includes/ui/sales_credit_ui.inc:163
 #: sales/includes/ui/sales_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 ""
 
@@ -4352,6 +4684,7 @@ msgid "Modifying Journal Transaction # %d."
 msgstr ""
 
 #: gl/gl_journal.php:36 includes/sysnames.inc:22 includes/sysnames.inc:157
 msgstr ""
 
 #: 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 ""
 
@@ -4486,28 +4819,260 @@ 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:487
-#: sales/manage/customer_branches.php:240
-msgid "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:40 includes/ui/ui_lists.inc:352
-msgid "Search GL accounts"
+#: 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/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 ""
+
+#: 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 ""
+
+#: 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: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 ""
+
+#: 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: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 ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: 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: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
 #: 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/rep402.php:141
 #: reporting/rep701.php:110
 msgid "Account Code"
 msgstr ""
 
 #: manufacturing/view/wo_costs_view.php:60 reporting/rep402.php:141
 #: reporting/rep701.php:110
 msgid "Account Code"
 msgstr ""
 
+#: 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
 #: 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
@@ -4552,7 +5117,7 @@ msgstr ""
 msgid "Back"
 msgstr ""
 
 msgid "Back"
 msgstr ""
 
-#: gl/inquiry/bank_inquiry.php:29
+#: gl/inquiry/bank_inquiry.php:29 themes/canvas/renderer.php:132
 msgid "Bank Account Inquiry"
 msgstr ""
 
 msgid "Bank Account Inquiry"
 msgstr ""
 
@@ -4593,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 ""
 
@@ -4638,12 +5204,6 @@ msgstr ""
 msgid "This Period"
 msgstr ""
 
 msgid "This Period"
 msgstr ""
 
-#: 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 ""
-
 #: 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 "
 #: 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 "
@@ -4674,19 +5234,14 @@ msgstr ""
 msgid "Trans #"
 msgstr ""
 
 msgid "Trans #"
 msgstr ""
 
-#: gl/inquiry/journal_inquiry.php:116 gl/view/gl_trans_view.php:44
-#: gl/includes/ui/gl_journal_ui.inc:123
-msgid "Counterparty"
-msgstr ""
-
 #: gl/inquiry/journal_inquiry.php:117 gl/inquiry/journal_inquiry.php:132
 #: purchasing/includes/ui/grn_ui.inc:34 purchasing/includes/ui/grn_ui.inc:77
 #: gl/inquiry/journal_inquiry.php:117 gl/inquiry/journal_inquiry.php:132
 #: purchasing/includes/ui/grn_ui.inc:34 purchasing/includes/ui/grn_ui.inc:77
-#: purchasing/includes/ui/po_ui.inc:332 purchasing/view/view_supp_credit.php:44
-#: purchasing/view/view_supp_invoice.php:48
+#: purchasing/includes/ui/po_ui.inc:332 purchasing/inquiry/po_search.php:121
 #: purchasing/inquiry/po_search_completed.php:123
 #: purchasing/inquiry/po_search_completed.php:123
-#: purchasing/inquiry/po_search.php:121
 #: purchasing/inquiry/supplier_inquiry.php:178
 #: purchasing/inquiry/supplier_inquiry.php:178
-#: reporting/includes/doctext.inc:163 reporting/includes/doctext.inc:186
+#: purchasing/view/view_supp_credit.php:44
+#: 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 ""
 
@@ -4797,29 +5352,26 @@ 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/view/gl_payment_view.php:64 includes/dashboard.inc:1011
 #: 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:1011
-#: includes/dashboard.inc:1096 includes/dashboard.inc:1167
+#: includes/dashboard.inc:1095 includes/dashboard.inc:1176
 #: inventory/prices.php:151 inventory/purchasing_data.php:151
 #: inventory/prices.php:151 inventory/purchasing_data.php:151
-#: purchasing/view/view_supp_credit.php:49
-#: purchasing/view/view_supp_invoice.php:54
-#: purchasing/inquiry/po_search_completed.php:125
+#: 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_inquiry.php:181
 #: purchasing/inquiry/supplier_inquiry.php:193
 #: 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:181
 #: purchasing/inquiry/supplier_inquiry.php:193
-#: purchasing/allocations/supplier_allocation_main.php:99
-#: purchasing/allocations/supplier_allocation_main.php:107
-#: reporting/rep101.php:148 reporting/rep102.php:126 reporting/rep102.php:132
-#: reporting/rep103.php:229 reporting/rep104.php:114 reporting/_rep115.php:261
-#: 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:328
-#: sales/customer_invoice.php:455
+#: 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:154
 #: sales/inquiry/customer_allocation_inquiry.php:164
 #: sales/inquiry/customer_inquiry.php:126
 #: sales/inquiry/customer_allocation_inquiry.php:154
 #: sales/inquiry/customer_allocation_inquiry.php:164
 #: sales/inquiry/customer_inquiry.php:126
@@ -4827,7 +5379,8 @@ msgstr ""
 #: sales/inquiry/customer_inquiry.php:219
 #: sales/inquiry/sales_deliveries_view.php:179
 #: sales/inquiry/sales_orders_view.php:282
 #: 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/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 ""
 
@@ -4871,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:261
+#: 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 ""
 
@@ -5028,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 ""
 
@@ -5074,75 +5627,16 @@ msgid ""
 "for it."
 msgstr ""
 
 "for it."
 msgstr ""
 
-#: gl/manage/gl_account_classes.php:16
-msgid "GL Account Classes"
+#: gl/manage/gl_accounts.php:20 reporting/rep701.php:116
+msgid "Chart of Accounts"
 msgstr ""
 
 msgstr ""
 
-#: gl/manage/gl_account_classes.php:31
-msgid "The account class ID cannot be empty."
+#: gl/manage/gl_accounts.php:60
+msgid "The account code must be entered."
 msgstr ""
 
 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_accounts.php:20 reporting/rep701.php:116
-msgid "Chart of Accounts"
-msgstr ""
-
-#: gl/manage/gl_accounts.php:60
-msgid "The account code must be entered."
-msgstr ""
-
-#: gl/manage/gl_accounts.php:66
-msgid "The account name cannot be empty."
+#: gl/manage/gl_accounts.php:66
+msgid "The account name cannot be empty."
 msgstr ""
 
 #: gl/manage/gl_accounts.php:72
 msgstr ""
 
 #: gl/manage/gl_accounts.php:72
@@ -5250,6 +5744,65 @@ msgstr ""
 msgid "Delete account"
 msgstr ""
 
 msgid "Delete account"
 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: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:16
 msgid "GL Account Groups"
 msgstr ""
@@ -5410,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 ""
 
@@ -5488,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:230
-#: 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 ""
-
 #: 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 ""
@@ -5525,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 ""
@@ -5616,284 +6151,68 @@ 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:84 gl/includes/db/gl_db_banking.inc:87
-#: gl/includes/db/gl_db_banking.inc:271
-msgid "Exchange Variance"
+#: includes/access_levels.inc:60
+msgid "System administration"
 msgstr ""
 
 msgstr ""
 
-#: 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"
+#: includes/access_levels.inc:61
+msgid "Company setup"
 msgstr ""
 
 msgstr ""
 
-#: 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."
+#: includes/access_levels.inc:62
+msgid "Special maintenance"
 msgstr ""
 
 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"
+#: includes/access_levels.inc:63
+msgid "Sales configuration"
 msgstr ""
 
 msgstr ""
 
-#: gl/includes/ui/gl_bank_ui.inc:24
-#: inventory/includes/item_adjustments_ui.inc:35
-#: inventory/includes/sav.item_adjustments_ui.inc:35
-#: inventory/includes/stock_transfers_ui.inc:43
-#: manufacturing/work_order_add_finished.php:185
-#: manufacturing/work_order_costs.php:133
-#: purchasing/allocations/supplier_allocate.php:56
-#: sales/allocations/customer_allocate.php:59
-#: sales/includes/ui/sales_credit_ui.inc:117
-msgid "Date:"
+#: includes/access_levels.inc:64
+msgid "Sales transactions"
 msgstr ""
 
 msgstr ""
 
-#: gl/includes/ui/gl_bank_ui.inc:52
-msgid "Pay To:"
+#: includes/access_levels.inc:65
+msgid "Sales related reports"
 msgstr ""
 
 msgstr ""
 
-#: gl/includes/ui/gl_bank_ui.inc:57
-msgid "To the Order of:"
+#: includes/access_levels.inc:66
+msgid "Purchase configuration"
 msgstr ""
 
 msgstr ""
 
-#: 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:"
+#: includes/access_levels.inc:67
+msgid "Purchase transactions"
 msgstr ""
 
 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:"
+#: includes/access_levels.inc:68
+msgid "Purchase analytics"
 msgstr ""
 
 msgstr ""
 
-#: gl/includes/ui/gl_bank_ui.inc:68 sales/customer_payments.php:324
-#: sales/manage/recurrent_invoices.php:198
-#: sales/includes/ui/sales_credit_ui.inc:37
-#: sales/includes/ui/sales_order_ui.inc:274
-msgid "Branch:"
+#: includes/access_levels.inc:69
+msgid "Inventory configuration"
 msgstr ""
 
 msgstr ""
 
-#: 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."
+#: includes/access_levels.inc:70
+msgid "Inventory operations"
 msgstr ""
 
 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"
+#: includes/access_levels.inc:71
+msgid "Inventory analytics"
 msgstr ""
 
 msgstr ""
 
-#: gl/includes/ui/gl_bank_ui.inc:114
-msgid "Into:"
+#: includes/access_levels.inc:72
+msgid "Fixed Assets configuration"
 msgstr ""
 
 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/sav.item_adjustments_ui.inc:102
-#: inventory/includes/stock_transfers_ui.inc:85
-#: manufacturing/includes/work_order_issue_ui.inc:62
-#: purchasing/includes/ui/invoice_ui.inc:551
-#: purchasing/includes/ui/po_ui.inc:254
-#: sales/includes/ui/sales_credit_ui.inc:193
-#: sales/includes/ui/sales_order_ui.inc:197
-msgid "Edit document line"
+#: includes/access_levels.inc:73
+msgid "Fixed Assets operations"
 msgstr ""
 
 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/sav.item_adjustments_ui.inc:104
-#: inventory/includes/stock_transfers_ui.inc:86
-#: manufacturing/includes/work_order_issue_ui.inc:64
-#: purchasing/includes/ui/invoice_ui.inc:318
-#: purchasing/includes/ui/po_ui.inc:256
-#: sales/includes/ui/sales_credit_ui.inc:195
-#: sales/includes/ui/sales_order_ui.inc:199
-msgid "Remove line from document"
+#: includes/access_levels.inc:74
+msgid "Fixed Assets analytics"
 msgstr ""
 
 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/sav.item_adjustments_ui.inc:195
-#: inventory/includes/stock_transfers_ui.inc:150
-#: manufacturing/includes/work_order_issue_ui.inc:133
-#: purchasing/includes/ui/po_ui.inc: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/sav.item_adjustments_ui.inc:197
-#: inventory/includes/stock_transfers_ui.inc:151
-#: manufacturing/includes/work_order_issue_ui.inc:135
-#: purchasing/includes/ui/po_ui.inc: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/sav.item_adjustments_ui.inc:203
-#: inventory/includes/stock_transfers_ui.inc:156
-#: manufacturing/includes/work_order_issue_ui.inc:141
-#: purchasing/includes/ui/po_ui.inc: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/sav.item_adjustments_ui.inc:204
-#: inventory/includes/stock_transfers_ui.inc:156
-#: manufacturing/includes/work_order_issue_ui.inc:142
-#: purchasing/includes/ui/po_ui.inc: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: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 ""
-
-#: includes/access_levels.inc:60
-msgid "System administration"
-msgstr ""
-
-#: includes/access_levels.inc:61
-msgid "Company setup"
-msgstr ""
-
-#: includes/access_levels.inc:62
-msgid "Special maintenance"
-msgstr ""
-
-#: includes/access_levels.inc:63
-msgid "Sales configuration"
-msgstr ""
-
-#: includes/access_levels.inc:64
-msgid "Sales transactions"
-msgstr ""
-
-#: includes/access_levels.inc:65
-msgid "Sales related reports"
-msgstr ""
-
-#: includes/access_levels.inc:66
-msgid "Purchase configuration"
-msgstr ""
-
-#: includes/access_levels.inc:67
-msgid "Purchase transactions"
-msgstr ""
-
-#: includes/access_levels.inc:68
-msgid "Purchase analytics"
-msgstr ""
-
-#: includes/access_levels.inc:69
-msgid "Inventory configuration"
-msgstr ""
-
-#: includes/access_levels.inc:70
-msgid "Inventory operations"
-msgstr ""
-
-#: includes/access_levels.inc:71
-msgid "Inventory analytics"
-msgstr ""
-
-#: includes/access_levels.inc:72
-msgid "Fixed Assets configuration"
-msgstr ""
-
-#: includes/access_levels.inc:73
-msgid "Fixed Assets operations"
-msgstr ""
-
-#: includes/access_levels.inc:74
-msgid "Fixed Assets analytics"
-msgstr ""
-
-#: includes/access_levels.inc:75
-msgid "Manufacturing configuration"
+#: includes/access_levels.inc:75
+msgid "Manufacturing configuration"
 msgstr ""
 
 #: includes/access_levels.inc:76
 msgstr ""
 
 #: includes/access_levels.inc:76
@@ -6487,7 +6806,8 @@ msgid "Tables"
 msgstr ""
 
 #: includes/dashboard.inc:180 includes/ui/ui_controls.inc:506
 msgstr ""
 
 #: includes/dashboard.inc:180 includes/ui/ui_controls.inc:506
-#: sales/manage/customers.php:23 sales/inquiry/customers_list.php:29
+#: sales/inquiry/customers_list.php:29 sales/manage/customers.php:23
+#: themes/canvas/renderer.php:89
 msgid "Customers"
 msgstr ""
 
 msgid "Customers"
 msgstr ""
 
@@ -6509,25 +6829,25 @@ msgstr ""
 #: 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
 #: 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:258
-#: reporting/rep115.php:170 reporting/rep304.php:127 reporting/rep304.php:137
+#: 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
 #: 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:326
-#: sales/customer_invoice.php:431
+#: 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/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/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_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/customers_list.php:41
-#: sales/inquiry/customers_list.php:54
+#: 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/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 ""
 
 msgid "Customer"
 msgstr ""
 
@@ -6540,7 +6860,8 @@ msgid "Aging Total"
 msgstr ""
 
 #: includes/dashboard.inc:217 includes/ui/ui_controls.inc:510
 msgstr ""
 
 #: includes/dashboard.inc:217 includes/ui/ui_controls.inc:510
-#: purchasing/manage/suppliers.php:23 purchasing/inquiry/suppliers_list.php:29
+#: purchasing/inquiry/suppliers_list.php:29 purchasing/manage/suppliers.php:23
+#: themes/canvas/renderer.php:99
 msgid "Suppliers"
 msgstr ""
 
 msgid "Suppliers"
 msgstr ""
 
@@ -6554,30 +6875,29 @@ msgid "Invoices"
 msgstr ""
 
 #: includes/dashboard.inc:237 includes/dashboard.inc:415
 msgstr ""
 
 #: includes/dashboard.inc:237 includes/dashboard.inc:415
-#: includes/dashboard.inc:486 includes/dashboard.inc:1096
+#: 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
 #: 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/includes/ui/grn_ui.inc:20 purchasing/includes/ui/grn_ui.inc:52
 #: purchasing/includes/ui/grn_ui.inc:20 purchasing/includes/ui/grn_ui.inc:52
-#: purchasing/includes/ui/po_ui.inc:304 purchasing/view/view_supp_credit.php:42
-#: purchasing/view/view_supp_invoice.php:46
+#: purchasing/includes/ui/po_ui.inc:304 purchasing/inquiry/po_search.php:119
 #: purchasing/inquiry/po_search_completed.php:121
 #: purchasing/inquiry/po_search_completed.php:121
-#: purchasing/inquiry/po_search.php:119
+#: 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/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/inquiry/suppliers_list.php:41
-#: purchasing/inquiry/suppliers_list.php:53
-#: purchasing/allocations/supplier_allocation_main.php:98
-#: purchasing/allocations/supplier_allocation_main.php:106
-#: reporting/rep201.php: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
+#: 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 ""
 
@@ -6591,6 +6911,7 @@ msgstr ""
 #: 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
 #: 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 ""
 
@@ -6690,7 +7011,7 @@ msgstr ""
 #: 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
 #: 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/customer_branches.php:232 sales/manage/customers.php:266
+#: sales/manage/customers.php:266 sales/manage/customer_branches.php:232
 msgid "Sales"
 msgstr ""
 
 msgid "Sales"
 msgstr ""
 
@@ -6718,17 +7039,6 @@ msgstr ""
 msgid "Top %s Sold Items in fiscal year"
 msgstr ""
 
 msgid "Top %s Sold Items in fiscal year"
 msgstr ""
 
-#: 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 ""
-
 #: includes/dashboard.inc:556 includes/dashboard.inc:601
 #: includes/dashboard.inc:739 includes/dashboard.inc:778
 #: manufacturing/search_work_orders.php:141
 #: includes/dashboard.inc:556 includes/dashboard.inc:601
 #: includes/dashboard.inc:739 includes/dashboard.inc:778
 #: manufacturing/search_work_orders.php:141
@@ -6743,26 +7053,24 @@ msgstr ""
 #: includes/dashboard.inc:556 includes/dashboard.inc:558
 #: inventory/includes/item_adjustments_ui.inc:56
 #: inventory/includes/item_adjustments_ui.inc:59
 #: includes/dashboard.inc:556 includes/dashboard.inc:558
 #: inventory/includes/item_adjustments_ui.inc:56
 #: inventory/includes/item_adjustments_ui.inc:59
-#: inventory/includes/sav.item_adjustments_ui.inc:56
-#: inventory/includes/sav.item_adjustments_ui.inc:59
 #: inventory/includes/stock_transfers_ui.inc:59
 #: inventory/manage/item_codes.php:130 inventory/manage/sales_kits.php:36
 #: inventory/view/view_adjustment.php:54 inventory/view/view_transfer.php:50
 #: 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
-#: 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/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
 #: purchasing/includes/ui/invoice_ui.inc:514
 #: 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:226 sales/customer_invoice.php:518
-#: sales/view/view_credit.php:90 sales/view/view_dispatch.php:112
-#: sales/view/view_invoice.php:115 sales/view/view_sales_order.php:221
+#: 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 ""
 
@@ -6813,21 +7121,13 @@ msgstr ""
 msgid "Total Customers Aged Analysis"
 msgstr ""
 
 msgid "Total Customers Aged Analysis"
 msgstr ""
 
-#: 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 ""
-
 #: 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: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:1097
+#: 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:46 reporting/rep102.php:113
 #: purchasing/inquiry/supplier_inquiry.php:44
 #: purchasing/inquiry/supplier_inquiry.php:45
 #: purchasing/inquiry/supplier_inquiry.php:46 reporting/rep102.php:113
@@ -6836,10 +7136,10 @@ msgstr ""
 #: 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
 #: 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/manage/recurrent_invoices.php:128
 #: sales/inquiry/customer_inquiry.php:121
 #: sales/inquiry/customer_inquiry.php:122
 #: sales/inquiry/customer_inquiry.php:123
 #: sales/inquiry/customer_inquiry.php:121
 #: sales/inquiry/customer_inquiry.php:122
 #: sales/inquiry/customer_inquiry.php:123
+#: sales/manage/recurrent_invoices.php:128
 msgid "Days"
 msgstr ""
 
 msgid "Days"
 msgstr ""
 
@@ -6860,26 +7160,26 @@ msgstr ""
 msgid " overdue Sales Invoices"
 msgstr ""
 
 msgid " overdue Sales Invoices"
 msgstr ""
 
-#: includes/dashboard.inc:1011 includes/dashboard.inc:1096
+#: 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
 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:327
-#: sales/customer_invoice.php:432 sales/manage/customers.php:256
-#: sales/manage/customers.php:296 sales/manage/recurrent_invoices.php:128
-#: sales/view/view_credit.php:58 sales/inquiry/customer_branches_list.php:37
+#: sales/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/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/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 ""
 
 msgid "Branch"
 msgstr ""
 
-#: includes/dashboard.inc:1012 includes/dashboard.inc:1097
+#: includes/dashboard.inc:1012 includes/dashboard.inc:1096
 #: includes/sysnames.inc:139
 msgid "Remainder"
 msgstr ""
 #: includes/sysnames.inc:139
 msgid "Remainder"
 msgstr ""
@@ -6897,49 +7197,58 @@ msgstr ""
 msgid "Next invoice"
 msgstr ""
 
 msgid "Next invoice"
 msgstr ""
 
-#: includes/dashboard.inc:1094
-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 ""
 
 msgstr ""
 
-#: includes/dashboard.inc:1134
+#: includes/dashboard.inc:1143
 msgid " items are below Reorder Level"
 msgstr ""
 
 msgid " items are below Reorder Level"
 msgstr ""
 
-#: includes/dashboard.inc:1136 inventory/reorder_level.php:71
+#: 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
 #: 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
+#: 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:122
-#: purchasing/inquiry/po_search_completed.php:133
-#: purchasing/inquiry/po_search.php:120 purchasing/inquiry/po_search.php:131
-#: 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
+#: 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 ""
 
 msgid "Location"
 msgstr ""
 
-#: includes/dashboard.inc:1136
+#: includes/dashboard.inc:1145
 msgid "Stock Id"
 msgstr ""
 
 msgid "Stock Id"
 msgstr ""
 
-#: includes/dashboard.inc:1136
+#: includes/dashboard.inc:1145
 msgid "Reorder"
 msgstr ""
 
 msgid "Reorder"
 msgstr ""
 
-#: includes/dashboard.inc:1136
+#: includes/dashboard.inc:1145
 msgid "qty"
 msgstr ""
 
 msgid "qty"
 msgstr ""
 
-#: includes/dashboard.inc:1165
+#: includes/dashboard.inc:1174
 msgid "Bank Account Balances"
 msgstr ""
 
 msgid "Bank Account Balances"
 msgstr ""
 
@@ -6956,9 +7265,9 @@ msgstr ""
 msgid "The entered reference is invalid."
 msgstr ""
 
 msgid "The entered reference is invalid."
 msgstr ""
 
-#: includes/data_checks.inc:674 sales/credit_note_entry.php:181
-#: sales/customer_credit_invoice.php:204 sales/customer_delivery.php:298
-#: sales/customer_invoice.php:364 sales/sales_order_entry.php:478
+#: 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 ""
 
@@ -7179,11 +7488,11 @@ msgid "Inventory Adjustment"
 msgstr ""
 
 #: includes/sysnames.inc:32 purchasing/includes/ui/po_ui.inc:311
 msgstr ""
 
 #: includes/sysnames.inc:32 purchasing/includes/ui/po_ui.inc:311
-#: purchasing/view/view_po.php:30
+#: 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 ""
 
@@ -7213,7 +7522,7 @@ msgid "Work Order Production"
 msgstr ""
 
 #: includes/sysnames.inc:40 sales/inquiry/sales_orders_view.php:131
 msgstr ""
 
 #: includes/sysnames.inc:40 sales/inquiry/sales_orders_view.php:131
-#: sales/inquiry/sales_orders_view.php:153
+#: sales/inquiry/sales_orders_view.php:153 themes/canvas/renderer.php:84
 msgid "Sales Order"
 msgstr ""
 
 msgid "Sales Order"
 msgstr ""
 
@@ -7261,7 +7570,7 @@ msgstr ""
 msgid "CP"
 msgstr ""
 
 msgid "CP"
 msgstr ""
 
-#: includes/sysnames.inc:61 sales/customer_invoice.php:525
+#: includes/sysnames.inc:61 sales/customer_invoice.php:526
 msgid "DN"
 msgstr ""
 
 msgid "DN"
 msgstr ""
 
@@ -7462,10 +7771,6 @@ msgstr ""
 msgid "Manufactured"
 msgstr ""
 
 msgid "Manufactured"
 msgstr ""
 
-#: includes/sysnames.inc:174
-msgid "Purchased"
-msgstr ""
-
 #: includes/sysnames.inc:175
 msgid "Service"
 msgstr ""
 #: includes/sysnames.inc:175
 msgid "Service"
 msgstr ""
@@ -7836,11 +8141,6 @@ msgstr ""
 msgid "Test type"
 msgstr ""
 
 msgid "Test type"
 msgstr ""
 
-#: includes/system_tests.inc:424 reporting/rep204.php:85
-#: reporting/rep301.php:168 reporting/rep308.php:225
-msgid "Value"
-msgstr ""
-
 #: includes/system_tests.inc:424 reporting/reports_main.php:42
 #: reporting/reports_main.php:53 reporting/reports_main.php:64
 #: reporting/reports_main.php:73 reporting/reports_main.php:80
 #: includes/system_tests.inc:424 reporting/reports_main.php:42
 #: reporting/reports_main.php:53 reporting/reports_main.php:64
 #: reporting/reports_main.php:73 reporting/reports_main.php:80
@@ -8027,12 +8327,12 @@ msgstr ""
 
 #: includes/ui/allocation_cart.inc:311 reporting/rep704.php:79
 #: reporting/rep704.php:87 reporting/rep704.php:95 reporting/rep709.php:117
 
 #: includes/ui/allocation_cart.inc:311 reporting/rep704.php:79
 #: reporting/rep704.php:87 reporting/rep704.php:95 reporting/rep709.php:117
-#: sales/view/view_credit.php:68 sales/view/view_sales_order.php:111
-#: sales/view/view_sales_order.php:144 sales/view/view_sales_order.php:181
 #: sales/inquiry/customer_branches_list.php:49
 #: sales/inquiry/sales_orders_view.php:234
 #: sales/inquiry/sales_orders_view.php:273
 #: sales/inquiry/customer_branches_list.php:49
 #: sales/inquiry/sales_orders_view.php:234
 #: sales/inquiry/sales_orders_view.php:273
-#: sales/inquiry/sales_orders_view.php:287
+#: 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 ""
 
@@ -8213,8 +8513,8 @@ msgid "Phone:"
 msgstr ""
 
 #: includes/ui/contacts_view.inc:102 inventory/manage/locations.php:217
 msgstr ""
 
 #: includes/ui/contacts_view.inc:102 inventory/manage/locations.php:217
-#: purchasing/manage/suppliers.php:249 sales/manage/customer_branches.php:256
-#: sales/manage/customers.php:260 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 ""
 
@@ -8432,7 +8732,8 @@ msgstr ""
 
 #: 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_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
+#: 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 ""
 
@@ -8693,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 ""
 
@@ -8796,10 +9097,6 @@ msgstr ""
 msgid "Standard Overhead Cost Per Unit"
 msgstr ""
 
 msgid "Standard Overhead Cost Per Unit"
 msgstr ""
 
-#: inventory/cost_update.php:147
-msgid "Reference line:"
-msgstr ""
-
 #: inventory/prices.php:29
 msgid "Inventory Item Sales prices"
 msgstr ""
 #: inventory/prices.php:29
 msgid "Inventory Item Sales prices"
 msgstr ""
@@ -8840,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 ""
 
 #: inventory/prices.php:151 inventory/purchasing_data.php:151
 msgid "Sales Type"
 msgstr ""
 
 #: inventory/prices.php:151 inventory/purchasing_data.php:151
-#: purchasing/includes/ui/invoice_ui.inc:514 purchasing/po_receive_items.php:63
+#: 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
 #: purchasing/view/view_grn.php:41 purchasing/view/view_po.php:45
 #: reporting/rep104.php:109 reporting/includes/doctext.inc:32
 #: reporting/includes/doctext.inc:191 sales/customer_credit_invoice.php:276
-#: sales/customer_delivery.php:421 sales/customer_invoice.php:519
-#: sales/customer_invoice.php:522 sales/view/view_credit.php:91
-#: sales/view/view_dispatch.php:113 sales/view/view_invoice.php:116
-#: sales/view/view_sales_order.php:222
-#: sales/includes/ui/sales_credit_ui.inc:163
+#: 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_invoice.php:116 sales/view/view_sales_order.php:222
 msgid "Price"
 msgstr ""
 
 msgid "Price"
 msgstr ""
 
@@ -9035,7 +9331,6 @@ msgid "Please reorder"
 msgstr ""
 
 #: inventory/includes/item_adjustments_ui.inc:20
 msgstr ""
 
 #: inventory/includes/item_adjustments_ui.inc:20
-#: inventory/includes/sav.item_adjustments_ui.inc:20
 #: inventory/includes/stock_transfers_ui.inc:22
 #: manufacturing/includes/work_order_issue_ui.inc:20
 #: sales/includes/ui/sales_order_ui.inc:59
 #: inventory/includes/stock_transfers_ui.inc:22
 #: manufacturing/includes/work_order_issue_ui.inc:20
 #: sales/includes/ui/sales_order_ui.inc:59
@@ -9043,7 +9338,6 @@ msgid "For Part :"
 msgstr ""
 
 #: inventory/includes/item_adjustments_ui.inc:34
 msgstr ""
 
 #: inventory/includes/item_adjustments_ui.inc:34
-#: inventory/includes/sav.item_adjustments_ui.inc:34
 #: manufacturing/work_order_entry.php:200 purchasing/inquiry/po_search.php:67
 #: sales/inquiry/sales_deliveries_view.php:106
 #: sales/inquiry/sales_orders_view.php:240
 #: manufacturing/work_order_entry.php:200 purchasing/inquiry/po_search.php:67
 #: sales/inquiry/sales_deliveries_view.php:106
 #: sales/inquiry/sales_orders_view.php:240
@@ -9052,74 +9346,62 @@ msgstr ""
 
 #: 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/sav.item_adjustments_ui.inc:56
-#: inventory/includes/sav.item_adjustments_ui.inc:59
 #: inventory/includes/stock_transfers_ui.inc:59
 #: inventory/inquiry/stock_list.php:53 inventory/view/view_adjustment.php:54
 #: inventory/view/view_transfer.php:50
 #: manufacturing/includes/work_order_issue_ui.inc:33
 #: inventory/includes/stock_transfers_ui.inc:59
 #: inventory/inquiry/stock_list.php:53 inventory/view/view_adjustment.php:54
 #: inventory/view/view_transfer.php:50
 #: manufacturing/includes/work_order_issue_ui.inc:33
-#: purchasing/includes/ui/po_ui.inc:216 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
 #: reporting/includes/doctext.inc:229 sales/customer_credit_invoice.php:275
 #: 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:229 sales/customer_credit_invoice.php:275
-#: sales/customer_delivery.php:419 sales/customer_invoice.php:518
-#: sales/customer_invoice.php:521 sales/view/view_credit.php:90
+#: sales/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_sales_order.php:221
 #: sales/view/view_dispatch.php:112 sales/view/view_invoice.php:115
 #: sales/view/view_sales_order.php:221
-#: sales/includes/ui/sales_credit_ui.inc:162
-#: sales/includes/ui/sales_order_ui.inc:146
 msgid "Item 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/sav.item_adjustments_ui.inc:56
-#: inventory/includes/sav.item_adjustments_ui.inc:59
 #: inventory/includes/stock_transfers_ui.inc:59
 #: manufacturing/includes/work_order_issue_ui.inc:33
 #: purchasing/includes/ui/po_ui.inc:216 purchasing/view/view_grn.php:40
 #: purchasing/view/view_po.php:45 reporting/includes/doctext.inc:31
 #: reporting/includes/doctext.inc:190 reporting/includes/doctext.inc:229
 #: inventory/includes/stock_transfers_ui.inc:59
 #: manufacturing/includes/work_order_issue_ui.inc:33
 #: purchasing/includes/ui/po_ui.inc:216 purchasing/view/view_grn.php:40
 #: purchasing/view/view_po.php:45 reporting/includes/doctext.inc:31
 #: reporting/includes/doctext.inc:190 reporting/includes/doctext.inc:229
-#: sales/customer_credit_invoice.php:275 sales/customer_delivery.php:419
-#: sales/customer_invoice.php:518 sales/customer_invoice.php:521
-#: sales/view/view_credit.php:90 sales/view/view_dispatch.php:112
-#: sales/view/view_invoice.php:115 sales/view/view_sales_order.php:221
+#: 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/sav.item_adjustments_ui.inc:57
-#: inventory/includes/sav.item_adjustments_ui.inc:60
 #: inventory/includes/stock_transfers_ui.inc:59
 #: inventory/manage/item_units.php:94
 #: manufacturing/includes/work_order_issue_ui.inc:34
 #: purchasing/includes/ui/po_ui.inc:217 purchasing/view/view_grn.php:41
 #: purchasing/view/view_po.php:45 reporting/includes/doctext.inc:32
 #: inventory/includes/stock_transfers_ui.inc:59
 #: inventory/manage/item_units.php:94
 #: manufacturing/includes/work_order_issue_ui.inc:34
 #: purchasing/includes/ui/po_ui.inc:217 purchasing/view/view_grn.php:41
 #: purchasing/view/view_po.php:45 reporting/includes/doctext.inc:32
-#: reporting/includes/doctext.inc:191 sales/view/view_credit.php:91
+#: 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_sales_order.php:221
 #: sales/view/view_dispatch.php:113 sales/view/view_invoice.php:116
 #: sales/view/view_sales_order.php:221
-#: sales/includes/ui/sales_credit_ui.inc:162
-#: sales/includes/ui/sales_order_ui.inc:148
 msgid "Unit"
 msgstr ""
 
 #: inventory/includes/item_adjustments_ui.inc:57
 #: inventory/includes/item_adjustments_ui.inc:60
 msgid "Unit"
 msgstr ""
 
 #: inventory/includes/item_adjustments_ui.inc:57
 #: inventory/includes/item_adjustments_ui.inc:60
-#: inventory/includes/sav.item_adjustments_ui.inc:57
-#: inventory/includes/sav.item_adjustments_ui.inc:60
 #: inventory/view/view_adjustment.php:55
 #: 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:168
+#: 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/includes/sav.item_adjustments_ui.inc:57
-#: inventory/manage/items.php:527
+#: inventory/includes/item_adjustments_ui.inc:57 inventory/manage/items.php:527
 msgid "Initial Value"
 msgstr ""
 
 msgid "Initial Value"
 msgstr ""
 
@@ -9128,7 +9410,6 @@ msgid "QOH"
 msgstr ""
 
 #: inventory/includes/item_adjustments_ui.inc:133
 msgstr ""
 
 #: inventory/includes/item_adjustments_ui.inc:133
-#: inventory/includes/sav.item_adjustments_ui.inc:120
 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 ""
@@ -9199,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:170
-msgid "Refresh Inquiry"
-msgstr ""
-
 #: inventory/inquiry/stock_movements.php:109
 msgid "Detail"
 msgstr ""
 #: inventory/inquiry/stock_movements.php:109
 msgid "Detail"
 msgstr ""
@@ -9248,209 +9520,34 @@ msgstr ""
 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"
-msgstr ""
-
-#: 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/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"
-msgstr ""
-
-#: inventory/manage/item_categories.php:117
-#: inventory/manage/item_categories.php:121
-msgid "Sales Act"
-msgstr ""
-
-#: inventory/manage/item_categories.php:118
-msgid "Asset Account"
-msgstr ""
-
-#: inventory/manage/item_categories.php:118
-msgid "Deprecation Cost Account"
-msgstr ""
-
-#: inventory/manage/item_categories.php:119
-msgid "Depreciation/Disposal Account"
-msgstr ""
-
-#: inventory/manage/item_categories.php:122
-msgid "Inventory Account"
-msgstr ""
-
-#: inventory/manage/item_categories.php:122
-msgid "COGS Account"
-msgstr ""
-
-#: inventory/manage/item_categories.php:122
-msgid "Adjustment Account"
-msgstr ""
-
-#: inventory/manage/item_categories.php:123
-msgid "Assembly Account"
-msgstr ""
-
-#: inventory/manage/item_categories.php:208
-msgid "Category Name:"
-msgstr ""
-
-#: inventory/manage/item_categories.php:210
-msgid "Default values for new items"
-msgstr ""
-
-#: inventory/manage/item_categories.php:212 inventory/manage/items.php:417
-msgid "Item Tax Type:"
-msgstr ""
-
-#: inventory/manage/item_categories.php:217 inventory/manage/items.php:420
-msgid "Item Type:"
-msgstr ""
-
-#: inventory/manage/item_categories.php:219 inventory/manage/items.php:422
-msgid "Units of Measure:"
-msgstr ""
-
-#: inventory/manage/item_categories.php:224 inventory/manage/items.php:427
-msgid "Exclude from sales:"
-msgstr ""
-
-#: inventory/manage/item_categories.php:226 inventory/manage/items.php:428
-msgid "Exclude from purchases:"
-msgstr ""
-
-#: inventory/manage/item_categories.php:238 inventory/manage/items.php:492
-msgid "Asset account:"
-msgstr ""
-
-#: inventory/manage/item_categories.php:239 inventory/manage/items.php:493
-msgid "Depreciation cost account:"
-msgstr ""
-
-#: inventory/manage/item_categories.php:240 inventory/manage/items.php:494
-msgid "Depreciation/Disposal account:"
-msgstr ""
-
-#: inventory/manage/item_categories.php:251
-msgid "Item Assembly Costs Account:"
-msgstr ""
-
-#: inventory/manage/item_codes.php:20
-msgid "Foreign Item Codes"
-msgstr ""
-
-#: inventory/manage/item_codes.php:26 sales/sales_order_entry.php:707
-msgid "There are no inventory items defined in the system."
-msgstr ""
-
-#: inventory/manage/item_codes.php:44
-msgid "The quantity entered was not positive number."
-msgstr ""
-
-#: inventory/manage/item_codes.php:50 inventory/manage/sales_kits.php:74
-msgid "Item code description cannot be empty."
-msgstr ""
-
-#: inventory/manage/item_codes.php:58 inventory/manage/items.php:241
-#: 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:130
-msgid "EAN/UPC Code"
-msgstr ""
-
-#: inventory/manage/item_codes.php:184
-msgid "UPC/EAN code:"
-msgstr ""
-
-#: 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_codes.php:186 inventory/manage/items.php:390
-#: 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 ""
-
-#: inventory/manage/item_codes.php:187 inventory/manage/items.php:392
-#: inventory/manage/sales_kits.php:207 inventory/manage/sales_kits.php:231
-msgid "Category:"
-msgstr ""
-
-#: inventory/manage/items.php:74
-msgid "No image"
-msgstr ""
-
-#: inventory/manage/items.php:91
-msgid "Delete Image:"
-msgstr ""
-
-#: inventory/manage/items.php:133
-msgid "Error uploading file."
-msgstr ""
-
-#: inventory/manage/items.php:150
-msgid ""
-"Only graphics files are supported - a file extension of .jpg, .png or .gif "
-"is expected"
-msgstr ""
-
-#: 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 ""
-
-#: 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."
+#: 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 ""
 
 #: inventory/manage/items.php:186
 msgstr ""
 
 #: inventory/manage/items.php:186
@@ -9479,6 +9576,11 @@ msgid ""
 "space OR quotes"
 msgstr ""
 
 "space OR quotes"
 msgstr ""
 
+#: 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 ""
+
 #: inventory/manage/items.php:254
 msgid "The depracation cannot start before the fixed asset purchase date"
 msgstr ""
 #: inventory/manage/items.php:254
 msgid "The depracation cannot start before the fixed asset purchase date"
 msgstr ""
@@ -9507,10 +9609,35 @@ msgstr ""
 msgid "Item Code:"
 msgstr ""
 
 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 ""
+
+#: inventory/manage/items.php:420 inventory/manage/item_categories.php:217
+msgid "Item Type:"
+msgstr ""
+
+#: inventory/manage/items.php:422 inventory/manage/item_categories.php:219
+msgid "Units of Measure:"
+msgstr ""
+
 #: inventory/manage/items.php:426
 msgid "Editable description:"
 msgstr ""
 
 #: 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 ""
+
+#: inventory/manage/items.php:428 inventory/manage/item_categories.php:226
+msgid "Exclude from purchases:"
+msgstr ""
+
 #: inventory/manage/items.php:434
 msgid "Fixed Asset Class"
 msgstr ""
 #: inventory/manage/items.php:434
 msgid "Fixed Asset Class"
 msgstr ""
@@ -9527,10 +9654,6 @@ msgstr ""
 msgid "Depreciation Years"
 msgstr ""
 
 msgid "Depreciation Years"
 msgstr ""
 
-#: inventory/manage/items.php:451
-msgid "years"
-msgstr ""
-
 #: inventory/manage/items.php:454
 msgid "Base Rate"
 msgstr ""
 #: inventory/manage/items.php:454
 msgid "Base Rate"
 msgstr ""
@@ -9547,6 +9670,18 @@ msgstr ""
 msgid "Last Depreciation"
 msgstr ""
 
 msgid "Last Depreciation"
 msgstr ""
 
+#: inventory/manage/items.php:492 inventory/manage/item_categories.php:238
+msgid "Asset account:"
+msgstr ""
+
+#: inventory/manage/items.php:493 inventory/manage/item_categories.php:239
+msgid "Depreciation cost account:"
+msgstr ""
+
+#: inventory/manage/items.php:494 inventory/manage/item_categories.php:240
+msgid "Depreciation/Disposal account:"
+msgstr ""
+
 #: inventory/manage/items.php:515
 msgid "Other"
 msgstr ""
 #: inventory/manage/items.php:515
 msgid "Other"
 msgstr ""
@@ -9563,10 +9698,6 @@ msgstr ""
 msgid "Values"
 msgstr ""
 
 msgid "Values"
 msgstr ""
 
-#: inventory/manage/items.php:528 reporting/rep451.php:80
-msgid "Depreciations"
-msgstr ""
-
 #: inventory/manage/items.php:529
 msgid "Current Value"
 msgstr ""
 #: inventory/manage/items.php:529
 msgid "Current Value"
 msgstr ""
@@ -9591,17 +9722,13 @@ msgstr ""
 msgid "Delete This Item"
 msgstr ""
 
 msgid "Delete This Item"
 msgstr ""
 
-#: inventory/manage/items.php:562
-msgid "Select an item:"
-msgstr ""
-
 #: inventory/manage/items.php:563
 msgid "New item"
 msgstr ""
 
 #: inventory/manage/items.php:587 inventory/manage/items.php:590
 #: inventory/manage/items.php:563
 msgid "New item"
 msgstr ""
 
 #: inventory/manage/items.php:587 inventory/manage/items.php:590
-#: purchasing/manage/suppliers.php:321 sales/manage/customer_branches.php:310
-#: sales/manage/customers.php:352
+#: purchasing/manage/suppliers.php:321 sales/manage/customers.php:352
+#: sales/manage/customer_branches.php:310
 msgid "&General settings"
 msgstr ""
 
 msgid "&General settings"
 msgstr ""
 
@@ -9622,51 +9749,175 @@ msgstr ""
 msgid "&Status"
 msgstr ""
 
 msgid "&Status"
 msgstr ""
 
-#: inventory/manage/item_units.php:16
-msgid "Units of Measure"
+#: inventory/manage/item_categories.php:47
+msgid "The item category description cannot be empty."
 msgstr ""
 
 msgstr ""
 
-#: inventory/manage/item_units.php:34
-msgid "The unit of measure code cannot be empty."
+#: inventory/manage/item_categories.php:61
+msgid "Selected item category has been updated"
 msgstr ""
 
 msgstr ""
 
-#: inventory/manage/item_units.php:40
-msgid "The unit of measure code is too long."
+#: inventory/manage/item_categories.php:71
+msgid "New item category has been added"
 msgstr ""
 
 msgstr ""
 
-#: inventory/manage/item_units.php:46
-msgid "The unit of measure description cannot be empty."
+#: 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/item_units.php:53
-msgid "Selected unit has been updated"
+#: inventory/manage/item_categories.php:90
+msgid "Selected item category has been deleted"
 msgstr ""
 
 msgstr ""
 
-#: inventory/manage/item_units.php:55
-msgid "New unit has been added"
+#: inventory/manage/item_categories.php:117
+#: inventory/manage/item_categories.php:121
+msgid "Tax type"
 msgstr ""
 
 msgstr ""
 
-#: inventory/manage/item_units.php:69
-msgid ""
-"Cannot delete this unit of measure because items have been created using "
-"this unit."
+#: 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/item_units.php:75
-msgid "Selected unit has been deleted"
+#: inventory/manage/item_categories.php:117
+#: inventory/manage/item_categories.php:121
+msgid "Sales Act"
 msgstr ""
 
 msgstr ""
 
-#: inventory/manage/item_units.php:94
-msgid "Decimals"
+#: inventory/manage/item_categories.php:118
+msgid "Asset Account"
 msgstr ""
 
 msgstr ""
 
-#: inventory/manage/item_units.php:107 inventory/manage/item_units.php:142
-msgid "User Quantity Decimals"
+#: inventory/manage/item_categories.php:118
+msgid "Deprecation Cost Account"
 msgstr ""
 
 msgstr ""
 
-#: inventory/manage/item_units.php:136 inventory/manage/item_units.php:139
-msgid "Unit Abbreviation:"
-msgstr ""
+#: inventory/manage/item_categories.php:119
+msgid "Depreciation/Disposal Account"
+msgstr ""
+
+#: inventory/manage/item_categories.php:122
+msgid "Inventory Account"
+msgstr ""
+
+#: inventory/manage/item_categories.php:122
+msgid "COGS Account"
+msgstr ""
+
+#: inventory/manage/item_categories.php:122
+msgid "Adjustment Account"
+msgstr ""
+
+#: inventory/manage/item_categories.php:123
+msgid "Assembly Account"
+msgstr ""
+
+#: inventory/manage/item_categories.php:208
+msgid "Category Name:"
+msgstr ""
+
+#: inventory/manage/item_categories.php:210
+msgid "Default values for new items"
+msgstr ""
+
+#: inventory/manage/item_categories.php:251
+msgid "Item Assembly Costs Account:"
+msgstr ""
+
+#: inventory/manage/item_codes.php:20
+msgid "Foreign Item Codes"
+msgstr ""
+
+#: inventory/manage/item_codes.php:26 sales/sales_order_entry.php:707
+msgid "There are no inventory items defined in the system."
+msgstr ""
+
+#: inventory/manage/item_codes.php:44
+msgid "The quantity entered was not positive number."
+msgstr ""
+
+#: inventory/manage/item_codes.php:50 inventory/manage/sales_kits.php:74
+msgid "Item code description cannot be empty."
+msgstr ""
+
+#: inventory/manage/item_codes.php: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:130
+msgid "EAN/UPC Code"
+msgstr ""
+
+#: inventory/manage/item_codes.php:184
+msgid "UPC/EAN code:"
+msgstr ""
+
+#: 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
+msgid "Units of Measure"
+msgstr ""
+
+#: inventory/manage/item_units.php:34
+msgid "The unit of measure code cannot be empty."
+msgstr ""
+
+#: inventory/manage/item_units.php:40
+msgid "The unit of measure code is too long."
+msgstr ""
+
+#: inventory/manage/item_units.php:46
+msgid "The unit of measure description cannot be empty."
+msgstr ""
+
+#: inventory/manage/item_units.php:53
+msgid "Selected unit has been updated"
+msgstr ""
+
+#: inventory/manage/item_units.php:55
+msgid "New unit has been added"
+msgstr ""
+
+#: inventory/manage/item_units.php:69
+msgid ""
+"Cannot delete this unit of measure because items have been created using "
+"this unit."
+msgstr ""
+
+#: inventory/manage/item_units.php:75
+msgid "Selected unit has been deleted"
+msgstr ""
+
+#: inventory/manage/item_units.php:94
+msgid "Decimals"
+msgstr ""
+
+#: inventory/manage/item_units.php:107 inventory/manage/item_units.php:142
+msgid "User Quantity Decimals"
+msgstr ""
+
+#: inventory/manage/item_units.php:136 inventory/manage/item_units.php:139
+msgid "Unit Abbreviation:"
+msgstr ""
 
 #: inventory/manage/item_units.php:140
 msgid "Descriptive Name:"
 
 #: inventory/manage/item_units.php:140
 msgid "Descriptive Name:"
@@ -9850,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:230
+#: manufacturing/view/wo_issue_view.php:43 reporting/includes/doctext.inc:230
 msgid "From Location"
 msgstr ""
 
 msgid "From Location"
 msgstr ""
 
@@ -9869,9 +10120,8 @@ msgstr ""
 msgid "Search Work Orders"
 msgstr ""
 
 msgid "Search Work Orders"
 msgstr ""
 
-#: manufacturing/search_work_orders.php:69
+#: manufacturing/search_work_orders.php:69 purchasing/inquiry/po_search.php:62
 #: purchasing/inquiry/po_search_completed.php:89
 #: purchasing/inquiry/po_search_completed.php:89
-#: purchasing/inquiry/po_search.php:62
 #: sales/inquiry/sales_deliveries_view.php:102
 #: sales/inquiry/sales_orders_view.php:233
 msgid "#:"
 #: sales/inquiry/sales_deliveries_view.php:102
 #: sales/inquiry/sales_orders_view.php:233
 msgid "#:"
@@ -9886,9 +10136,8 @@ msgstr ""
 msgid "for item:"
 msgstr ""
 
 msgid "for item:"
 msgstr ""
 
-#: manufacturing/search_work_orders.php:86
+#: manufacturing/search_work_orders.php:86 purchasing/inquiry/po_search.php:78
 #: purchasing/inquiry/po_search_completed.php:108
 #: purchasing/inquiry/po_search_completed.php:108
-#: purchasing/inquiry/po_search.php:78
 #: sales/inquiry/sales_deliveries_view.php:117
 #: sales/inquiry/sales_orders_view.php:256
 msgid "Select documents"
 #: sales/inquiry/sales_deliveries_view.php:117
 #: sales/inquiry/sales_orders_view.php:256
 msgid "Select documents"
@@ -10029,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 ""
 
@@ -10236,125 +10485,173 @@ 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 reporting/rep402.php:141
-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 reporting/rep402.php:188
-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 reporting/rep402.php:191
-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 reporting/rep402.php:194
-msgid "Additional Costs"
+#: manufacturing/includes/manufacturing_ui.inc:66
+msgid "Standard Labour Cost"
 msgstr ""
 
 msgstr ""
 
-#: manufacturing/view/wo_costs_view.php:75 reporting/rep402.php:197
-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 ""
 
 msgstr ""
 
-#: manufacturing/inquiry/bom_cost_inquiry.php:23
-#: manufacturing/manage/bom_edit.php:22
-msgid "There are no manufactured or kit items defined in the system."
+#: 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 ""
 
 msgstr ""
 
-#: manufacturing/inquiry/bom_cost_inquiry.php:34
-#: manufacturing/manage/bom_edit.php:172
-msgid "Select a manufacturable item:"
+#: 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
+#: manufacturing/manage/bom_edit.php:22
+msgid "There are no manufactured or kit items defined in the system."
+msgstr ""
+
+#: manufacturing/inquiry/bom_cost_inquiry.php:34
+#: manufacturing/manage/bom_edit.php:172
+msgid "Select a manufacturable item:"
 msgstr ""
 
 #: manufacturing/inquiry/bom_cost_inquiry.php:37
 msgstr ""
 
 #: manufacturing/inquiry/bom_cost_inquiry.php:37
@@ -10373,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:230
-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 ""
@@ -10470,1199 +10753,1201 @@ 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:230
-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:230
-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:230
-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:224
-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:225
-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:97
-#, 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:239
-#, 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:154 sales/includes/db/cust_trans_db.inc:115
-#: sales/includes/db/sales_order_db.inc:213
-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:197
-msgid "Released."
+#: purchasing/po_entry_items.php:83
+msgid "Purchase Order has been entered"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/includes/purchasing_db.inc:219
-msgid "Payment for:"
+#: purchasing/po_entry_items.php:85
+msgid "Purchase Order has been updated"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/includes/db/invoice_db.inc:347
-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:347 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"
+#: 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:704
-#: purchasing/includes/db/invoice_db.inc:706
-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:307 sales/view/view_sales_order.php:76
-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 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"
+#: 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:322 purchasing/includes/ui/po_ui.inc:327
-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:336 sales/view/view_sales_order.php:94
-msgid "Delivery Address"
+#: purchasing/po_entry_items.php:108
+msgid "&View this GRN"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/includes/ui/grn_ui.inc:41 purchasing/includes/ui/grn_ui.inc:82
-#: purchasing/includes/ui/po_ui.inc:348
-msgid "Order Comments"
+#: 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/grn_ui.inc:59 sales/view/view_sales_order.php:67
-msgid "Ordered On"
+#: purchasing/po_entry_items.php:115 purchasing/po_receive_items.php:42
+msgid "Entry purchase &invoice for this receival"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/includes/ui/grn_ui.inc:74
-msgid "Date Items Received"
+#: purchasing/po_entry_items.php:120
+msgid "Enter &Another GRN"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:122
-msgid "Source Invoices:"
+#: purchasing/po_entry_items.php:129
+msgid "Direct Purchase Invoice has been entered"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:124
-msgid "Supplier's Ref.:"
+#: purchasing/po_entry_items.php:131
+msgid "&View this Invoice"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:138
-msgid "Terms:"
-msgstr ""
-
-#: purchasing/includes/ui/invoice_ui.inc:144
-#: purchasing/includes/ui/po_ui.inc:174
-msgid "Dimension 2"
-msgstr ""
-
-#: purchasing/includes/ui/invoice_ui.inc:154
-#: purchasing/manage/suppliers.php:210 purchasing/manage/suppliers.php:215
-msgid "Supplier's Currency:"
-msgstr ""
-
-#: purchasing/includes/ui/invoice_ui.inc:158
-#: purchasing/manage/suppliers.php:217 sales/manage/customer_branches.php:238
-#: sales/manage/customers.php:300
-msgid "Tax Group:"
-msgstr ""
-
-#: purchasing/includes/ui/invoice_ui.inc:175
-msgid "Sub-total:"
-msgstr ""
-
-#: purchasing/includes/ui/invoice_ui.inc:183
-msgid "Invoice Total:"
-msgstr ""
-
-#: 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"
+#: 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:188
-#: purchasing/includes/ui/po_ui.inc:287
-#: purchasing/allocations/supplier_allocate.php:74
-#: sales/allocations/customer_allocate.php:77
-#: sales/includes/ui/sales_order_ui.inc:231
-msgid "Refresh"
+#: 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:220
-msgid "Add GL Line"
+#: purchasing/po_entry_items.php:141
+msgid "Enter &Another Direct Invoice"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:221
-msgid "Reset"
+#: 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:222
-#: purchasing/po_receive_items.php:326
-msgid "Clear all GL entry fields"
+#: 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:240
-msgid "GL Items for this Invoice"
+#: 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:242
-msgid "GL Items for this Credit Note"
+#: 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:252
-msgid "Quick Entry:"
+#: purchasing/po_entry_items.php:214
+msgid "This purchase order has been cancelled."
 msgstr ""
 
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:320
-msgid "Edit line from document"
+#: 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:224
-#: sales/inquiry/sales_orders_view.php:147
-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:217
-#: 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:217
-#: 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:731
-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:718
-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:712
-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:216 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:217
-#: sales/includes/ui/sales_order_ui.inc:610
-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:217 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:276 purchasing/po_receive_items.php:114
+#: 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
 #: 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: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
+#: 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:285 purchasing/po_receive_items.php:122
+#: 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
 #: purchasing/view/view_grn.php:89 purchasing/view/view_po.php:93
-#: sales/customer_delivery.php:512 sales/view/view_sales_order.php:265
-#: sales/includes/ui/sales_order_ui.inc:230
+#: 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:342 sales/view/view_sales_order.php:85
-msgid "Required Pre-Payment"
+#: 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:343
-msgid "Pre-Payments Allocated"
+#: 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:470 purchasing/po_entry_items.php:483
-#: sales/customer_invoice.php:439 sales/includes/ui/sales_order_ui.inc:396
-#: sales/includes/ui/sales_order_ui.inc:398
-msgid "Payment:"
-msgstr ""
-
-#: purchasing/includes/ui/po_ui.inc:470 purchasing/po_entry_items.php:483
-msgid "Delayed"
+#: 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:472
-#: sales/includes/ui/sales_order_ui.inc:621
-#: sales/includes/ui/sales_order_ui.inc:623
-msgid "Pre-Payment Required:"
+#: 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/po_entry_items.php:41
-msgid "Modify Purchase Order #"
+#: purchasing/po_receive_items.php:242
+msgid "Select a different purchase order for receiving goods against"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/po_entry_items.php:46
-msgid "Purchase Order Entry"
+#: purchasing/po_receive_items.php:245
+msgid "Re-Read the updated purchase order for receiving goods against"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/po_entry_items.php:51
-msgid "Direct GRN Entry"
+#: purchasing/po_receive_items.php:321
+msgid "Items to Receive"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/po_entry_items.php:60
-msgid "Fixed Asset Purchase Invoice Entry"
+#: purchasing/po_receive_items.php:326
+msgid "Process Receive Items"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/po_entry_items.php:63
-msgid "Direct Purchase Invoice 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:83
-msgid "Purchase Order has been entered"
+#: purchasing/supplier_credit.php:33
+#, php-format
+msgid "Modifying Supplier Credit # %d"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/po_entry_items.php:85
-msgid "Purchase Order has been updated"
+#: purchasing/supplier_credit.php:79
+msgid "Supplier credit note has been processed."
 msgstr ""
 
 msgstr ""
 
-#: purchasing/po_entry_items.php:86
-msgid "&View this order"
+#: purchasing/supplier_credit.php:80
+msgid "View this 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:82
+msgid "View the GL Journal Entries for this Credit Note"
 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:84
+msgid "Enter Another Credit Note"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/po_entry_items.php:92
-msgid "&Receive Items on this Purchase 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:95
-msgid "Enter &Another Purchase 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:97
-msgid "Select An &Outstanding 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:106
-msgid "Direct GRN has been entered"
+#: 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:108
-msgid "&View this GRN"
+#: 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:112 purchasing/po_receive_items.php:40
-msgid "View the GL Journal Entries for this Delivery"
+#: 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:115 purchasing/po_receive_items.php:42
-msgid "Entry purchase &invoice for this receival"
+#: purchasing/supplier_credit.php:272
+msgid "The quantity to credit must be numeric and greater than zero."
 msgstr ""
 
 msgstr ""
 
-#: purchasing/po_entry_items.php:120
-msgid "Enter &Another GRN"
+#: purchasing/supplier_credit.php:279
+msgid "The price is either not numeric or negative."
 msgstr ""
 
 msgstr ""
 
-#: purchasing/po_entry_items.php:129
-msgid "Direct Purchase Invoice has been entered"
+#: purchasing/supplier_credit.php:381
+msgid "Enter Credit Note"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/po_entry_items.php:131
-msgid "&View this Invoice"
+#: purchasing/supplier_invoice.php:39
+msgid "Enter Supplier Invoice"
 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:44
+#, php-format
+msgid "Modifying Purchase Invoice # %d"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/po_entry_items.php:135 purchasing/supplier_invoice.php:69
-msgid "Entry supplier &payment for this invoice"
+#: purchasing/supplier_invoice.php:64
+msgid "Supplier invoice has been processed."
 msgstr ""
 
 msgstr ""
 
-#: purchasing/po_entry_items.php:141
-msgid "Enter &Another Direct Invoice"
+#: purchasing/supplier_invoice.php:65
+msgid "View this Invoice"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/po_entry_items.php:147
-msgid "There are no purchasable fixed assets defined in the system."
+#: purchasing/supplier_invoice.php:72
+msgid "Enter Another Invoice"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/po_entry_items.php:178
+#: purchasing/supplier_invoice.php:182
 msgid ""
 msgid ""
-"This item cannot be deleted because some of it has already been received."
+"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:193
+#: purchasing/supplier_invoice.php:194
 msgid ""
 msgid ""
-"This order cannot be cancelled because some of it has already been received."
+"The invoice as entered cannot be processed because the invoice date is in an "
+"incorrect format."
 msgstr ""
 
 msgstr ""
 
-#: 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."
+#: purchasing/supplier_invoice.php:258
+msgid "The quantity to invoice must be numeric and greater than zero."
 msgstr ""
 
 msgstr ""
 
-#: purchasing/po_entry_items.php:214
-msgid "This purchase order has been cancelled."
+#: purchasing/supplier_invoice.php:265
+msgid "The price is not numeric."
 msgstr ""
 
 msgstr ""
 
-#: purchasing/po_entry_items.php:216
-msgid "Enter a new purchase order"
+#: purchasing/supplier_invoice.php:278
+msgid ""
+"The price being invoiced is more than the purchase order price by more than "
+"the allowed over-charge percentage. The system is set up to prohibit this. "
+"See the system administrator to modify the set up parameters if necessary."
 msgstr ""
 
 msgstr ""
 
-#: purchasing/po_entry_items.php:228 sales/sales_order_entry.php:522
-msgid "Item description cannot be empty."
+#: purchasing/supplier_invoice.php:279 purchasing/supplier_invoice.php:292
+msgid "The over-charge percentage allowance is :"
 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: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:245
-msgid "The price entered must be numeric and not less than zero."
+#: 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: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_invoice.php:415
+msgid "Enter Invoice"
 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:31
+msgid "Supplier Payment Entry"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/po_entry_items.php:298
-msgid "The selected item is already on this order."
+#: purchasing/supplier_payment.php:84
+msgid "Invalid purchase invoice number."
 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:90
+msgid "Payment has been sucessfully entered"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/po_entry_items.php:338 purchasing/supplier_invoice.php:384
-#: purchasing/supplier_payment.php:129
-msgid "There is no supplier selected."
+#: purchasing/supplier_payment.php:92
+msgid "&Print This Remittance"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/po_entry_items.php:345
-msgid "The entered order date is invalid."
+#: purchasing/supplier_payment.php:93
+msgid "&Email This Remittance"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/po_entry_items.php:358
-msgid "The entered due date is invalid."
+#: purchasing/supplier_payment.php:95
+msgid "View this Payment"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/po_entry_items.php:374 purchasing/supplier_credit.php:202
-#: purchasing/supplier_invoice.php:206
-msgid "You must enter a supplier's invoice reference."
+#: purchasing/supplier_payment.php:96
+msgid "View the GL &Journal Entries for this Payment"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/po_entry_items.php:381 purchasing/supplier_credit.php:209
-#: purchasing/supplier_invoice.php:213
-msgid ""
-"This invoice number has already been entered. It cannot be entered again."
+#: purchasing/supplier_payment.php:98
+msgid "Enter another supplier &payment"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/po_entry_items.php:387
-msgid "There is no delivery address specified."
+#: purchasing/supplier_payment.php:100
+msgid "Enter direct &Invoice"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/po_entry_items.php:393
-msgid "There is no location specified to move any items into."
+#: purchasing/supplier_payment.php:102 sales/customer_payments.php:114
+msgid "Enter Other &Payment"
 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:103
+msgid "Enter &Customer Payment"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/po_entry_items.php:406
-msgid "Required prepayment is greater than total invoice value."
+#: purchasing/supplier_payment.php:104 sales/customer_payments.php:112
+msgid "Enter Other &Deposit"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/po_entry_items.php:491 sales/sales_order_entry.php:735
-msgid "Place Order"
+#: purchasing/supplier_payment.php:105 sales/customer_payments.php:115
+msgid "Bank Account &Transfer"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/po_entry_items.php:492
-msgid "Update Order"
+#: purchasing/supplier_payment.php:168
+msgid "The entered discount is invalid or less than zero."
 msgstr ""
 
 msgstr ""
 
-#: purchasing/po_entry_items.php:493 sales/sales_order_entry.php:734
-msgid "Cancel Order"
+#: 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:495
-msgid "Process GRN"
+#: purchasing/supplier_payment.php:183
+msgid "The entered bank amount is zero or negative."
 msgstr ""
 
 msgstr ""
 
-#: purchasing/po_entry_items.php:496
-msgid "Update GRN"
+#: purchasing/supplier_payment.php:273
+msgid "Payment To:"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/po_entry_items.php:497
-msgid "Cancel GRN"
+#: purchasing/supplier_payment.php:298
+msgid "From Bank Account:"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/po_entry_items.php:500 sales/customer_invoice.php:664
-msgid "Process Invoice"
+#: purchasing/supplier_payment.php:304 purchasing/view/view_supp_payment.php:55
+msgid "Date Paid"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/po_entry_items.php:501
-msgid "Update Invoice"
+#: purchasing/supplier_payment.php:320
+msgid "Bank Amount:"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/po_entry_items.php:502 sales/sales_order_entry.php:715
-msgid "Cancel Invoice"
-msgstr ""
-
-#: purchasing/po_receive_items.php:25
-msgid "Receive Purchase Order Items"
-msgstr ""
-
-#: purchasing/po_receive_items.php:34
-msgid "Purchase Order Delivery has been processed"
+#: purchasing/supplier_payment.php:347 sales/customer_payments.php:395
+msgid "Amount of Discount:"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/po_receive_items.php:36
-msgid "&View this Delivery"
+#: purchasing/supplier_payment.php:348
+msgid "Amount of Payment:"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/po_receive_items.php:44
-msgid "Select a different &purchase order for receiving items against"
+#: purchasing/supplier_payment.php:352
+msgid "Enter Payment"
 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:29
+msgid "Allocate Supplier Payment or Credit Note"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/po_receive_items.php:62 reporting/rep105.php:115
-#: sales/customer_delivery.php:420
-msgid "Ordered"
+#: purchasing/allocations/supplier_allocate.php:52
+msgid "Allocation of"
 msgstr ""
 
 msgstr ""
 
-#: 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"
+#: purchasing/allocations/supplier_allocate.php:58
+#: sales/allocations/customer_allocate.php:60
+msgid "Total:"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/po_receive_items.php:63 sales/customer_delivery.php:421
-msgid "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: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: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:219
-msgid ""
-"Entered quantities cannot be greater than the quantity entered on the "
-"purchase order including the allowed over-receive percentage"
+#: 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:221
-msgid ""
-"Modify the ordered items on the purchase order if you wish to increase the "
-"quantities."
+#: purchasing/allocations/supplier_allocate.php:75
+#: sales/allocations/customer_allocate.php:78
+msgid "Process allocations"
 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_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:242
-msgid "Select a different purchase order for receiving goods against"
+#: 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:245
-msgid "Re-Read the updated purchase order for receiving goods against"
+#: 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:321
-msgid "Items to Receive"
+#: purchasing/allocations/supplier_allocation_main.php:26
+msgid "Supplier Allocations"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/po_receive_items.php:326
-msgid "Process Receive Items"
+#: purchasing/allocations/supplier_allocation_main.php:36
+msgid "Select a Supplier: "
 msgstr ""
 
 msgstr ""
 
-#: purchasing/supplier_credit.php:33
-#, php-format
-msgid "Modifying Supplier Credit # %d"
+#: purchasing/allocations/supplier_allocation_main.php:39
+#: sales/allocations/customer_allocation_main.php:35
+msgid "Show Settled Items:"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/supplier_credit.php:79
-msgid "Supplier credit note has been processed."
+#: purchasing/allocations/supplier_allocation_main.php:70
+#: sales/allocations/customer_allocation_main.php:68
+msgid "Allocate"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/supplier_credit.php:80
-msgid "View this Credit Note"
+#: purchasing/allocations/supplier_allocation_main.php:111
+#: sales/allocations/customer_allocation_main.php:109
+msgid "Marked items are settled."
 msgstr ""
 
 msgstr ""
 
-#: purchasing/supplier_credit.php:82
-msgid "View the GL Journal Entries for this Credit Note"
+#: purchasing/includes/purchasing_db.inc:219
+msgid "Payment for:"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/supplier_credit.php:84
-msgid "Enter Another Credit Note"
+#: purchasing/includes/db/invoice_db.inc:346
+msgid "Supplier invoice adjustment for zero inventory of "
 msgstr ""
 
 msgstr ""
 
-#: 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."
+#: 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:139 purchasing/supplier_invoice.php:145
-msgid ""
-"The amount entered is not numeric. This line cannot be added to the "
-"transaction."
+#: purchasing/includes/db/invoice_db.inc:703
+#: purchasing/includes/db/invoice_db.inc:705
+msgid "GRN Removal"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/supplier_credit.php:170
-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: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:183
-msgid ""
-"The credit note as entered cannot be processed because the date entered is "
-"not valid."
+#: purchasing/includes/ui/grn_ui.inc:25 purchasing/includes/ui/grn_ui.inc:57
+msgid "For Purchase Order"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/supplier_credit.php:195 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: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:221
-msgid ""
-"The return cannot be processed because there is an insufficient quantity for "
-"item:"
+#: 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:265
-msgid "The quantity to credit must be numeric and greater than zero."
+#: 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:272
-msgid "The price is either not numeric or negative."
+#: 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:374
-msgid "Enter Credit Note"
+#: purchasing/includes/ui/grn_ui.inc:59 sales/view/view_sales_order.php:67
+msgid "Ordered On"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/supplier_invoice.php:39
-msgid "Enter Supplier Invoice"
+#: purchasing/includes/ui/grn_ui.inc:74
+msgid "Date Items Received"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/supplier_invoice.php:44
-#, php-format
-msgid "Modifying Purchase Invoice # %d"
+#: purchasing/includes/ui/invoice_ui.inc:122
+msgid "Source Invoices:"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/supplier_invoice.php:64
-msgid "Supplier invoice has been processed."
+#: purchasing/includes/ui/invoice_ui.inc:124
+msgid "Supplier's Ref.:"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/supplier_invoice.php:65
-msgid "View this Invoice"
+#: purchasing/includes/ui/invoice_ui.inc:138
+msgid "Terms:"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/supplier_invoice.php:72
-msgid "Enter Another Invoice"
+#: purchasing/includes/ui/invoice_ui.inc:144
+#: purchasing/includes/ui/po_ui.inc:174
+msgid "Dimension 2"
 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:154
+#: purchasing/manage/suppliers.php:210 purchasing/manage/suppliers.php:215
+msgid "Supplier's Currency:"
 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: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:251
-msgid "The quantity to invoice must be numeric and greater than zero."
+#: purchasing/includes/ui/invoice_ui.inc:175
+msgid "Sub-total:"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/supplier_invoice.php:258
-msgid "The price is not numeric."
+#: purchasing/includes/ui/invoice_ui.inc:183
+msgid "Invoice Total:"
 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: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:272 purchasing/supplier_invoice.php:285
-msgid "The over-charge percentage allowance is :"
+#: purchasing/includes/ui/invoice_ui.inc:220
+msgid "Add GL Line"
 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:221
+msgid "Reset"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/supplier_invoice.php:366
-#, php-format
-msgid "All yet non-invoiced items on delivery line # %d has been removed."
+#: purchasing/includes/ui/invoice_ui.inc:240
+msgid "GL Items for this Invoice"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/supplier_invoice.php:408
-msgid "Enter Invoice"
+#: purchasing/includes/ui/invoice_ui.inc:242
+msgid "GL Items for this Credit Note"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/supplier_payment.php:31
-msgid "Supplier Payment Entry"
+#: purchasing/includes/ui/invoice_ui.inc:252
+msgid "Quick Entry:"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/supplier_payment.php:84
-msgid "Invalid purchase invoice number."
+#: purchasing/includes/ui/invoice_ui.inc:320
+msgid "Edit line from document"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/supplier_payment.php:90
-msgid "Payment has been sucessfully entered"
+#: purchasing/includes/ui/invoice_ui.inc:421
+msgid "Add to Invoice"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/supplier_payment.php:92
-msgid "&Print This Remittance"
+#: purchasing/includes/ui/invoice_ui.inc:423
+msgid "Add to Credit Note"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/supplier_payment.php:93
-msgid "&Email This Remittance"
+#: purchasing/includes/ui/invoice_ui.inc:425 sales/customer_invoice.php:582
+msgid "Remove"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/supplier_payment.php:95
-msgid "View this Payment"
+#: 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 "View the GL &Journal Entries for this Payment"
+#: 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 "Enter another supplier &payment"
+#: purchasing/includes/ui/invoice_ui.inc:458
+msgid "Items Received Yet to be Invoiced"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/supplier_payment.php:100
-msgid "Enter direct &Invoice"
+#: purchasing/includes/ui/invoice_ui.inc:463
+msgid "Delivery Item Selected For Adding To A Supplier Credit Note"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/supplier_payment.php:102 sales/customer_payments.php:114
-msgid "Enter Other &Payment"
+#: purchasing/includes/ui/invoice_ui.inc:468
+msgid "Received Items Charged on this Invoice"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/supplier_payment.php:103
-msgid "Enter &Customer Payment"
+#: purchasing/includes/ui/invoice_ui.inc:470
+msgid "Received Items Credited on this Note"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/supplier_payment.php:104 sales/customer_payments.php:112
-msgid "Enter Other &Deposit"
+#: purchasing/includes/ui/invoice_ui.inc:480
+msgid "Received between"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/supplier_payment.php:105 sales/customer_payments.php:115
-msgid "Bank Account &Transfer"
+#: purchasing/includes/ui/invoice_ui.inc:492
+msgid "Add All Items"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/supplier_payment.php:168
-msgid "The entered discount is invalid or less than zero."
+#: 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:176
-msgid ""
-"The total of the amount and the discount is zero or negative. Please enter "
-"positive values."
+#: purchasing/includes/ui/invoice_ui.inc:501
+msgid "P.O."
 msgstr ""
 
 msgstr ""
 
-#: purchasing/supplier_payment.php:183
-msgid "The entered bank amount is zero or negative."
+#: purchasing/includes/ui/invoice_ui.inc:502
+msgid "Received On"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/supplier_payment.php:273
-msgid "Payment To:"
+#: purchasing/includes/ui/invoice_ui.inc:502 purchasing/view/view_po.php:46
+msgid "Quantity Received"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/supplier_payment.php:298
-msgid "From Bank Account:"
+#: 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:304 purchasing/view/view_supp_payment.php:55
-msgid "Date Paid"
+#: purchasing/includes/ui/invoice_ui.inc:503
+msgid "Qty Yet To Invoice"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/supplier_payment.php:320
-msgid "Bank Amount:"
+#: 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:347 sales/customer_payments.php:395
-msgid "Amount of Discount:"
+#: 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:348
-msgid "Amount of Payment:"
+#: purchasing/includes/ui/invoice_ui.inc:509
+msgid "Qty Yet To Credit"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/supplier_payment.php:352
-msgid "Enter Payment"
+#: purchasing/includes/ui/invoice_ui.inc:514
+msgid "Line Value"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/view/view_grn.php:21
-msgid "View Purchase Order Delivery"
+#: 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/view/view_grn.php:27
+#: purchasing/includes/ui/invoice_ui.inc:585
 msgid ""
 msgid ""
-"This page must be called with a Purchase Order Delivery number to review."
+"There are no received items for the selected supplier that have been "
+"invoiced."
 msgstr ""
 
 msgstr ""
 
-#: purchasing/view/view_grn.php:37 purchasing/view/view_po.php:41
-#: sales/view/view_sales_order.php:218
-msgid "Line Details"
+#: purchasing/includes/ui/invoice_ui.inc:586
+msgid "Credits can only be applied to invoiced items."
 msgstr ""
 
 msgstr ""
 
-#: purchasing/view/view_grn.php:40
-msgid "Required by"
+#: purchasing/includes/ui/po_ui.inc:135 sales/sales_order_entry.php:731
+msgid "Order Date:"
 msgstr ""
 
 msgstr ""
 
-#: 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"
+#: purchasing/includes/ui/po_ui.inc:136 sales/sales_order_entry.php:718
+msgid "Delivery Date:"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/view/view_grn.php:97
-msgid "Marked items were delivered overdue."
+#: purchasing/includes/ui/po_ui.inc:136 sales/sales_order_entry.php:712
+msgid "Invoice Date:"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/view/view_grn.php:99
-msgid "This delivery has been voided."
+#: purchasing/includes/ui/po_ui.inc:149
+msgid "Supplier Currency:"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/view/view_po.php:22
-msgid "View Purchase Order"
+#: purchasing/includes/ui/po_ui.inc:167
+msgid "Due Date:"
 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:169
+msgid "Supplier's Reference:"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/view/view_po.php:46
-msgid "Requested By"
+#: purchasing/includes/ui/po_ui.inc:175
+msgid "Receive Into:"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/view/view_po.php:100
-#: purchasing/inquiry/supplier_allocation_inquiry.php:158
-#: purchasing/inquiry/supplier_inquiry.php:200
-#: 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."
+#: 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:113 sales/view/view_invoice.php:98
-#: sales/view/view_sales_order.php:51
-msgid "Deliveries"
+#: purchasing/includes/ui/po_ui.inc:200
+msgid "Deliver to:"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/view/view_po.php:115
-msgid "Delivered On"
+#: purchasing/includes/ui/po_ui.inc:209
+msgid "Order Items"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/view/view_po.php:138 sales/view/view_sales_order.php:53
-msgid "Invoices/Credits"
+#: purchasing/includes/ui/po_ui.inc:217
+#: sales/includes/ui/sales_order_ui.inc:610
+msgid "Required Delivery Date"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/view/view_supp_credit.php:23
-msgid "View Supplier Credit Note"
+#: 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_supp_credit.php:38
-msgid "SUPPLIER CREDIT NOTE"
+#: 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: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/includes/ui/po_ui.inc:343
+msgid "Pre-Payments Allocated"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/view/view_supp_credit.php:66
-msgid "TOTAL 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:71 sales/view/view_credit.php:150
-msgid "This credit note has been voided."
+#: purchasing/inquiry/po_search.php:25
+msgid "Search Outstanding Purchase Orders"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/view/view_supp_invoice.php:24
-msgid "View Supplier Invoice"
+#: 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_invoice.php:41
-msgid "SUPPLIER INVOICE"
+#: 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:73 reporting/rep107.php:308
-#: reporting/rep107.php:314 sales/view/view_invoice.php:168
-msgid "TOTAL 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:77 sales/view/view_invoice.php:175
-msgid "This invoice has been voided."
+#: purchasing/inquiry/po_search.php:135
+msgid "Marked orders have overdue items."
 msgstr ""
 
 msgstr ""
 
-#: purchasing/view/view_supp_payment.php:22
-msgid "View Payment to Supplier"
+#: purchasing/inquiry/po_search_completed.php:25
+msgid "Search Purchase Orders"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/view/view_supp_payment.php:47
-msgid "Payment to Supplier"
+#: purchasing/inquiry/po_search_completed.php:94
+msgid "into location:"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/view/view_supp_payment.php:53
-msgid "To Supplier"
+#: purchasing/inquiry/po_search_completed.php:106
+msgid "Also closed:"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/view/view_supp_payment.php:59
-msgid "Payment Currency"
+#: purchasing/inquiry/suppliers_list.php:53 sales/inquiry/customers_list.php:54
+msgid "Tax ID"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/view/view_supp_payment.php:62 reporting/rep112.php:164
-#: reporting/rep210.php:164 sales/customer_delivery.php:421
-#: sales/customer_invoice.php:519 sales/customer_invoice.php:522
-#: sales/view/view_receipt.php:45 sales/view/view_sales_order.php:222
-msgid "Discount"
+#: purchasing/inquiry/supplier_allocation_inquiry.php:23
+msgid "Supplier Allocation Inquiry"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/view/view_supp_payment.php:69
-msgid "Supplier's Currency"
+#: purchasing/inquiry/supplier_allocation_inquiry.php:55
+#: sales/inquiry/customer_allocation_inquiry.php:49
+msgid "show settled:"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/manage/suppliers.php:29 sales/manage/customer_branches.php:37
-#: sales/manage/recurrent_invoices.php:42
-msgid ""
-"There are no tax groups defined in the system. At least one tax group is "
-"required before proceeding."
+#: purchasing/inquiry/supplier_allocation_inquiry.php:108
+#: sales/inquiry/customer_allocation_inquiry.php:119
+msgid "Payment"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/manage/suppliers.php:47
-msgid "The supplier name must be entered."
+#: purchasing/inquiry/supplier_allocation_inquiry.php:140
+msgid "Supp Reference"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/manage/suppliers.php:54
-msgid "The supplier short name must be entered."
+#: 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:80
-msgid "Supplier has been updated."
+#: purchasing/inquiry/supplier_inquiry.php:25
+msgid "Supplier Inquiry"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/manage/suppliers.php:98
-msgid "A new supplier has been added."
+#: 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:120
-msgid ""
-"Cannot delete this supplier because there are transactions that refer to "
-"this supplier."
+#: purchasing/inquiry/supplier_inquiry.php:50
+#: sales/inquiry/customer_inquiry.php:126
+msgid "Terms"
+msgstr ""
+
+#: 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 ""
+
+#: purchasing/inquiry/supplier_inquiry.php:94
+#: sales/inquiry/customer_inquiry.php:78
+msgid "Credit This"
+msgstr ""
+
+#: purchasing/inquiry/supplier_inquiry.php:109
+msgid "Print Remittance"
+msgstr ""
+
+#: purchasing/inquiry/supplier_inquiry.php:137
+msgid "Select a supplier:"
+msgstr ""
+
+#: purchasing/manage/suppliers.php:29 sales/manage/customer_branches.php:37
+#: sales/manage/recurrent_invoices.php:42
+msgid ""
+"There are no tax groups defined in the system. At least one tax group is "
+"required before proceeding."
+msgstr ""
+
+#: purchasing/manage/suppliers.php:47
+msgid "The supplier name must be entered."
+msgstr ""
+
+#: purchasing/manage/suppliers.php:54
+msgid "The supplier short name must be entered."
+msgstr ""
+
+#: purchasing/manage/suppliers.php:80
+msgid "Supplier has been updated."
+msgstr ""
+
+#: purchasing/manage/suppliers.php:98
+msgid "A new supplier has been added."
+msgstr ""
+
+#: purchasing/manage/suppliers.php:120
+msgid ""
+"Cannot delete this supplier because there are transactions that refer to "
+"this supplier."
 msgstr ""
 
 #: purchasing/manage/suppliers.php:128
 msgstr ""
 
 #: purchasing/manage/suppliers.php:128
@@ -11758,8 +12043,8 @@ msgid "General"
 msgstr ""
 
 #: purchasing/manage/suppliers.php:274 reporting/rep103.php:258
 msgstr ""
 
 #: purchasing/manage/suppliers.php:274 reporting/rep103.php:258
-#: reporting/rep205.php:170 sales/manage/customer_branches.php:262
-#: sales/manage/customers.php:293
+#: reporting/rep205.php:170 sales/manage/customers.php:293
+#: sales/manage/customer_branches.php:262
 msgid "General Notes:"
 msgstr ""
 
 msgid "General Notes:"
 msgstr ""
 
@@ -11795,8 +12080,8 @@ msgstr ""
 msgid "New supplier"
 msgstr ""
 
 msgid "New supplier"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:322 sales/manage/customer_branches.php:311
-#: sales/manage/customers.php:353
+#: purchasing/manage/suppliers.php:322 sales/manage/customers.php:353
+#: sales/manage/customer_branches.php:311
 msgid "&Contacts"
 msgstr ""
 
 msgid "&Contacts"
 msgstr ""
 
@@ -11808,178 +12093,132 @@ msgstr ""
 msgid "Attachments"
 msgstr ""
 
 msgid "Attachments"
 msgstr ""
 
-#: purchasing/inquiry/po_search_completed.php:25
-msgid "Search Purchase Orders"
-msgstr ""
-
-#: purchasing/inquiry/po_search_completed.php:46
-#: purchasing/inquiry/po_search.php:99
-msgid "Receive"
-msgstr ""
-
-#: purchasing/inquiry/po_search_completed.php:94
-msgid "into location:"
-msgstr ""
-
-#: purchasing/inquiry/po_search_completed.php:106
-msgid "Also closed:"
-msgstr ""
-
-#: purchasing/inquiry/po_search_completed.php:124
-#: purchasing/inquiry/po_search.php:122 reporting/includes/doctext.inc:187
-#: sales/inquiry/sales_orders_view.php:277
-msgid "Order Date"
-msgstr ""
-
-#: purchasing/inquiry/po_search_completed.php:126
-#: purchasing/inquiry/po_search.php:124 sales/inquiry/sales_orders_view.php:280
-msgid "Order Total"
-msgstr ""
-
-#: purchasing/inquiry/po_search.php:25
-msgid "Search Outstanding Purchase Orders"
-msgstr ""
-
-#: purchasing/inquiry/po_search.php:135
-msgid "Marked orders have overdue items."
+#: purchasing/view/view_grn.php:21
+msgid "View Purchase Order Delivery"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/inquiry/supplier_allocation_inquiry.php:23
-msgid "Supplier Allocation Inquiry"
+#: 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:55
-#: sales/inquiry/customer_allocation_inquiry.php:49
-msgid "show settled:"
+#: 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:108
-#: sales/inquiry/customer_allocation_inquiry.php:119
-msgid "Payment"
+#: purchasing/view/view_grn.php:40
+msgid "Required by"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/inquiry/supplier_allocation_inquiry.php:140
-msgid "Supp Reference"
+#: 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_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"
+#: purchasing/view/view_grn.php:97
+msgid "Marked items were delivered overdue."
 msgstr ""
 
 msgstr ""
 
-#: purchasing/inquiry/supplier_inquiry.php:25
-msgid "Supplier Inquiry"
+#: purchasing/view/view_grn.php:99
+msgid "This delivery has been voided."
 msgstr ""
 
 msgstr ""
 
-#: 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"
+#: purchasing/view/view_po.php:22
+msgid "View Purchase Order"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/inquiry/supplier_inquiry.php:50
-#: sales/inquiry/customer_inquiry.php:126
-msgid "Terms"
+#: 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:119
-#: reporting/rep108.php:163 reporting/rep202.php:130
-#: sales/inquiry/customer_inquiry.php:127
-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:78
-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 to 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 ""
 
 #: reporting/rep101.php:127 reporting/rep102.php:101 reporting/rep114.php:108
 msgstr ""
 
 #: reporting/rep101.php:127 reporting/rep102.php:101 reporting/rep114.php:108
-#: reporting/_rep115.php:241 reporting/rep115.php:154 reporting/rep202.php:111
-#: reporting/rep203.php:78
+#: reporting/rep115.php:154 reporting/rep202.php:111 reporting/rep203.php:78
 msgid "Balances in Home Currency"
 msgstr ""
 
 msgid "Balances in Home Currency"
 msgstr ""
 
@@ -12003,9 +12242,9 @@ msgstr ""
 msgid "Show Balance"
 msgstr ""
 
 msgid "Show Balance"
 msgstr ""
 
-#: reporting/rep101.php:149 reporting/rep102.php:129 reporting/_rep115.php:262
-#: 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/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:63 reporting/reports_main.php:170
 #: reporting/reports_main.php:180 reporting/reports_main.php:190
 #: reporting/reports_main.php:41 reporting/reports_main.php:51
 #: reporting/reports_main.php:63 reporting/reports_main.php:170
 #: reporting/reports_main.php:180 reporting/reports_main.php:190
@@ -12018,11 +12257,11 @@ msgid "Customer Balances"
 msgstr ""
 
 #: reporting/rep101.php:269 reporting/rep102.php:215 reporting/rep105.php:177
 msgstr ""
 
 #: reporting/rep101.php:269 reporting/rep102.php:215 reporting/rep105.php:177
-#: reporting/rep106.php:182 reporting/_rep115.php:366 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
+#: 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 ""
 
@@ -12071,7 +12310,7 @@ msgstr ""
 msgid "Aged Customer Analysis"
 msgstr ""
 
 msgid "Aged Customer Analysis"
 msgstr ""
 
-#: reporting/rep103.php:131 reporting/_rep115.php:227 reporting/rep115.php:140
+#: reporting/rep103.php:131 reporting/rep115.php:140
 msgid "All Areas"
 msgstr ""
 
 msgid "All Areas"
 msgstr ""
 
@@ -12108,13 +12347,13 @@ msgstr ""
 msgid "Activity Since"
 msgstr ""
 
 msgid "Activity Since"
 msgstr ""
 
-#: reporting/rep103.php:159 reporting/_rep115.php:259 reporting/rep115.php:171
+#: 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 ""
 
 #: reporting/reports_main.php:60 reporting/reports_main.php:69
 #: sales/manage/sales_areas.php:16
 msgid "Sales Areas"
 msgstr ""
 
-#: reporting/rep103.php:160 reporting/_rep115.php:260 reporting/rep115.php:172
+#: reporting/rep103.php:160 reporting/rep115.php:172
 #: reporting/reports_main.php:61 reporting/reports_main.php:70
 msgid "Sales Folk"
 msgstr ""
 #: reporting/reports_main.php:61 reporting/reports_main.php:70
 msgid "Sales Folk"
 msgstr ""
@@ -12147,12 +12386,6 @@ msgstr ""
 msgid "Category/Items"
 msgstr ""
 
 msgid "Category/Items"
 msgstr ""
 
-#: 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 ""
-
 #: reporting/rep104.php:109
 msgid "GP %"
 msgstr ""
 #: reporting/rep104.php:109
 msgid "GP %"
 msgstr ""
@@ -12199,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 ""
 
@@ -12253,9 +12486,9 @@ msgstr ""
 
 #: reporting/rep107.php:261 reporting/rep109.php:144 reporting/rep110.php:162
 #: reporting/rep111.php:159 reporting/rep113.php:151
 
 #: reporting/rep107.php:261 reporting/rep109.php:144 reporting/rep110.php:162
 #: reporting/rep111.php:159 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:248
-#: sales/includes/ui/sales_credit_ui.inc:217
+#: 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 ""
 
@@ -12381,12 +12614,11 @@ msgstr ""
 msgid "Tax"
 msgstr ""
 
 msgid "Tax"
 msgstr ""
 
-#: reporting/_rep115.php:234 reporting/rep115.php:147
+#: reporting/rep115.php:147
 msgid "All Sales Man"
 msgstr ""
 
 msgid "All Sales Man"
 msgstr ""
 
-#: reporting/_rep115.php:264 reporting/rep115.php:176
-#: reporting/reports_main.php:56
+#: reporting/rep115.php:176 reporting/reports_main.php:56
 msgid "Customer Trial Balance"
 msgstr ""
 
 msgid "Customer Trial Balance"
 msgstr ""
 
@@ -12557,7 +12789,7 @@ 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 ""
 
@@ -12643,10 +12875,6 @@ msgstr ""
 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 ""
@@ -12785,7 +13013,10 @@ msgstr ""
 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 ""
 
@@ -13062,1533 +13293,1852 @@ msgstr ""
 msgid "Inventory Purchasing - &Transaction Based"
 msgstr ""
 
 msgid "Inventory Purchasing - &Transaction Based"
 msgstr ""
 
-#: reporting/reports_main.php:317
-msgid "&Bill of Material Listing"
+#: reporting/reports_main.php:317
+msgid "&Bill of Material Listing"
+msgstr ""
+
+#: reporting/reports_main.php:318
+msgid "From product"
+msgstr ""
+
+#: reporting/reports_main.php:319
+msgid "To product"
+msgstr ""
+
+#: reporting/reports_main.php:323
+msgid "Work Order &Listing"
+msgstr ""
+
+#: reporting/reports_main.php:326
+msgid "Outstanding Only"
+msgstr ""
+
+#: reporting/reports_main.php:331
+msgid "Print &Work Orders"
+msgstr ""
+
+#: reporting/reports_main.php:334
+msgid "Email Locations"
+msgstr ""
+
+#: reporting/reports_main.php:341
+msgid "&Fixed Assets Valuation"
+msgstr ""
+
+#: reporting/reports_main.php:343
+msgid "Fixed Assets Class"
+msgstr ""
+
+#: reporting/reports_main.php:344
+msgid "Fixed Assets Location"
+msgstr ""
+
+#: reporting/reports_main.php:353
+msgid "Dimension &Summary"
+msgstr ""
+
+#: reporting/reports_main.php:354
+msgid "From Dimension"
+msgstr ""
+
+#: reporting/reports_main.php:355
+msgid "To Dimension"
+msgstr ""
+
+#: reporting/reports_main.php:361
+msgid "Banking"
+msgstr ""
+
+#: reporting/reports_main.php:362
+msgid "Bank &Statement"
+msgstr ""
+
+#: 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 ""
+
+#: reporting/reports_main.php:370
+msgid "Bank Statement w/ &Reconcile"
+msgstr ""
+
+#: reporting/reports_main.php:377
+msgid "General Ledger"
+msgstr ""
+
+#: reporting/reports_main.php:378
+msgid "Chart of &Accounts"
+msgstr ""
+
+#: reporting/reports_main.php:379
+msgid "Show Balances"
+msgstr ""
+
+#: reporting/reports_main.php:383
+msgid "List of &Journal Entries"
+msgstr ""
+
+#: reporting/reports_main.php:393 reporting/reports_main.php:448
+#: reporting/reports_main.php:498
+msgid "GL Account &Transactions"
+msgstr ""
+
+#: reporting/reports_main.php:396 reporting/reports_main.php:451
+#: reporting/reports_main.php:501
+msgid "From Account"
+msgstr ""
+
+#: reporting/reports_main.php:397 reporting/reports_main.php:452
+#: reporting/reports_main.php:502
+msgid "To Account"
+msgstr ""
+
+#: reporting/reports_main.php:403 reporting/reports_main.php:457
+#: reporting/reports_main.php:506
+msgid "Annual &Expense Breakdown"
+msgstr ""
+
+#: reporting/reports_main.php:412 reporting/reports_main.php:465
+#: reporting/reports_main.php:513
+msgid "&Balance Sheet"
+msgstr ""
+
+#: 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 ""
+
+#: reporting/reports_main.php:423 reporting/reports_main.php:475
+#: reporting/reports_main.php:522
+msgid "&Profit and Loss Statement"
+msgstr ""
+
+#: reporting/reports_main.php:541
+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"
+msgstr ""
+
+#: reporting/includes/doctext.inc:25 sales/view/view_dispatch.php:74
+msgid "Delivered To"
+msgstr ""
+
+#: reporting/includes/doctext.inc:32 sales/customer_credit_invoice.php:276
+#: 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 ""
+
+#: reporting/includes/doctext.inc:35
+msgid "All amounts stated in"
+msgstr ""
+
+#: reporting/includes/doctext.inc:50
+msgid "Quotation No."
+msgstr ""
+
+#: reporting/includes/doctext.inc:55 reporting/includes/doctext.inc:72
+#: reporting/includes/doctext.inc:93 reporting/includes/doctext.inc:107
+#: reporting/includes/doctext.inc:130 reporting/includes/doctext.inc:160
+#: reporting/includes/doctext.inc:183 reporting/includes/doctext.inc:203
+#: reporting/includes/doctext.inc:241
+msgid "Customer's Reference"
+msgstr ""
+
+#: reporting/includes/doctext.inc:56 reporting/includes/doctext.inc:73
+#: reporting/includes/doctext.inc:94 reporting/includes/doctext.inc:108
+#: reporting/includes/doctext.inc:131 reporting/includes/doctext.inc:184
+#: reporting/includes/doctext.inc:242 sales/manage/customer_branches.php:286
+msgid "Sales Person"
+msgstr ""
+
+#: reporting/includes/doctext.inc:57 reporting/includes/doctext.inc:74
+#: reporting/includes/doctext.inc:95 reporting/includes/doctext.inc:109
+#: reporting/includes/doctext.inc:132 reporting/includes/doctext.inc:162
+#: reporting/includes/doctext.inc:185 reporting/includes/doctext.inc:205
+#: reporting/includes/doctext.inc:243
+msgid "Your VAT no."
+msgstr ""
+
+#: reporting/includes/doctext.inc:58
+msgid "Our Quotation No"
+msgstr ""
+
+#: 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 ""
+
+#: reporting/includes/doctext.inc:64
+msgid "PREPAYMENT ORDER"
+msgstr ""
+
+#: reporting/includes/doctext.inc:65
+msgid "Order No."
+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:206 reporting/includes/doctext.inc:244
+#: sales/view/view_dispatch.php:87 sales/view/view_invoice.php:87
+msgid "Our Order No"
+msgstr ""
+
+#: reporting/includes/doctext.inc:82
+msgid "Delivery Note No."
+msgstr ""
+
+#: reporting/includes/doctext.inc:97
+msgid "To Be Invoiced Before"
+msgstr ""
+
+#: reporting/includes/doctext.inc:103
+msgid "Credit No."
+msgstr ""
+
+#: reporting/includes/doctext.inc:104
+msgid "Please quote Credit no. when paying. All amounts stated in"
+msgstr ""
+
+#: reporting/includes/doctext.inc:116
+msgid "PREPAYMENT INVOICE"
+msgstr ""
+
+#: reporting/includes/doctext.inc:117
+msgid "FINAL INVOICE"
+msgstr ""
+
+#: reporting/includes/doctext.inc:118
+msgid "Invoice No."
+msgstr ""
+
+#: reporting/includes/doctext.inc:120
+msgid "Please quote Invoice no. when paying. All amounts stated in"
+msgstr ""
+
+#: reporting/includes/doctext.inc:136
+msgid "Date of Payment"
+msgstr ""
+
+#: reporting/includes/doctext.inc:142
+msgid "Date of Sale"
+msgstr ""
+
+#: reporting/includes/doctext.inc:151
+msgid "Remittance No."
+msgstr ""
+
+#: reporting/includes/doctext.inc:152 reporting/includes/doctext.inc:172
+msgid "Order To"
+msgstr ""
+
+#: reporting/includes/doctext.inc:171
+msgid "Purchase Order No."
+msgstr ""
+
+#: reporting/includes/doctext.inc:175
+msgid "Deliver To"
+msgstr ""
+
+#: reporting/includes/doctext.inc:198
+msgid "Receipt No."
+msgstr ""
+
+#: reporting/includes/doctext.inc:199
+msgid "With thanks from"
+msgstr ""
+
+#: reporting/includes/doctext.inc:216
+msgid "Work Order No."
+msgstr ""
+
+#: 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 ""
 
 msgstr ""
 
-#: reporting/reports_main.php:318
-msgid "From product"
+#: reporting/includes/pdf_report.inc:1009
+msgid "Dear"
 msgstr ""
 
 msgstr ""
 
-#: reporting/reports_main.php:319
-msgid "To product"
+#: reporting/includes/pdf_report.inc:1010
+msgid "Attached you will find "
 msgstr ""
 
 msgstr ""
 
-#: reporting/reports_main.php:323
-msgid "Work Order &Listing"
+#: reporting/includes/pdf_report.inc:1026
+msgid "Kindest regards"
 msgstr ""
 
 msgstr ""
 
-#: reporting/reports_main.php:326
-msgid "Outstanding Only"
+#: reporting/includes/pdf_report.inc:1041
+msgid "Sending document by email failed"
 msgstr ""
 
 msgstr ""
 
-#: reporting/reports_main.php:331
-msgid "Print &Work Orders"
+#: reporting/includes/pdf_report.inc:1041
+#: reporting/includes/pdf_report.inc:1044
+msgid "Email:"
 msgstr ""
 
 msgstr ""
 
-#: reporting/reports_main.php:334
-msgid "Email Locations"
+#: reporting/includes/pdf_report.inc:1044
+msgid "has been sent by email to destination."
 msgstr ""
 
 msgstr ""
 
-#: reporting/reports_main.php:341
-msgid "&Fixed Assets Valuation"
+#: reporting/includes/pdf_report.inc:1073
+msgid "Report has been sent to network printer "
 msgstr ""
 
 msgstr ""
 
-#: reporting/reports_main.php:343
-msgid "Fixed Assets Class"
+#: reporting/includes/printer_class.inc:39
+msgid "Cannot open connection to printer"
 msgstr ""
 
 msgstr ""
 
-#: reporting/reports_main.php:344
-msgid "Fixed Assets Location"
+#: reporting/includes/printer_class.inc:50
+msgid "Printer does not acept the job"
 msgstr ""
 
 msgstr ""
 
-#: reporting/reports_main.php:353
-msgid "Dimension &Summary"
+#: reporting/includes/printer_class.inc:61
+msgid "Error sending print job control file"
 msgstr ""
 
 msgstr ""
 
-#: reporting/reports_main.php:354
-msgid "From Dimension"
+#: reporting/includes/printer_class.inc:68
+msgid "Print control file not accepted"
 msgstr ""
 
 msgstr ""
 
-#: reporting/reports_main.php:355
-msgid "To Dimension"
+#: reporting/includes/printer_class.inc:76
+msgid "Cannot send report to printer"
 msgstr ""
 
 msgstr ""
 
-#: reporting/reports_main.php:361
-msgid "Banking"
+#: reporting/includes/printer_class.inc:86
+msgid "No ack after report printout"
 msgstr ""
 
 msgstr ""
 
-#: reporting/reports_main.php:362
-msgid "Bank &Statement"
+#: reporting/includes/printer_class.inc:100
+msgid "Cannot flush printing queue"
 msgstr ""
 
 msgstr ""
 
-#: 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"
+#: reporting/includes/reports_classes.inc:62
+msgid "Report Classes:"
 msgstr ""
 
 msgstr ""
 
-#: reporting/reports_main.php:370
-msgid "Bank Statement w/ &Reconcile"
+#: reporting/includes/reports_classes.inc:82
+msgid "Reports For Class: "
 msgstr ""
 
 msgstr ""
 
-#: reporting/reports_main.php:377
-msgid "General Ledger"
+#: reporting/includes/reports_classes.inc:102
+msgid "Display: "
 msgstr ""
 
 msgstr ""
 
-#: reporting/reports_main.php:378
-msgid "Chart of &Accounts"
+#: reporting/includes/reports_classes.inc:153
+msgid "Unknown report parameter type:"
 msgstr ""
 
 msgstr ""
 
-#: reporting/reports_main.php:379
-msgid "Show Balances"
+#: reporting/includes/reports_classes.inc:181
+msgid "No Currency Filter"
 msgstr ""
 
 msgstr ""
 
-#: reporting/reports_main.php:383
-msgid "List of &Journal Entries"
+#: reporting/includes/reports_classes.inc:255
+msgid "No Graphics"
 msgstr ""
 
 msgstr ""
 
-#: reporting/reports_main.php:393 reporting/reports_main.php:448
-#: reporting/reports_main.php:498
-msgid "GL Account &Transactions"
+#: reporting/includes/reports_classes.inc:260
+#: reporting/includes/reports_classes.inc:263
+msgid "No Type Filter"
 msgstr ""
 
 msgstr ""
 
-#: reporting/reports_main.php:396 reporting/reports_main.php:451
-#: reporting/reports_main.php:501
-msgid "From Account"
+#: reporting/includes/reports_classes.inc:273
+msgid "No Account Group Filter"
 msgstr ""
 
 msgstr ""
 
-#: reporting/reports_main.php:397 reporting/reports_main.php:452
-#: reporting/reports_main.php:502
-msgid "To Account"
+#: reporting/includes/reports_classes.inc:292
+#: reporting/includes/reports_classes.inc:298
+#: reporting/includes/reports_classes.inc:304
+msgid "No Dimension Filter"
 msgstr ""
 
 msgstr ""
 
-#: reporting/reports_main.php:403 reporting/reports_main.php:457
-#: reporting/reports_main.php:506
-msgid "Annual &Expense Breakdown"
+#: reporting/includes/reports_classes.inc:309
+msgid "No Customer Filter"
 msgstr ""
 
 msgstr ""
 
-#: reporting/reports_main.php:412 reporting/reports_main.php:465
-#: reporting/reports_main.php:513
-msgid "&Balance Sheet"
+#: reporting/includes/reports_classes.inc:316
+msgid "No Supplier Filter"
 msgstr ""
 
 msgstr ""
 
-#: 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"
+#: reporting/includes/reports_classes.inc:439
+#: reporting/includes/reports_classes.inc:441
+msgid "No Location Filter"
 msgstr ""
 
 msgstr ""
 
-#: reporting/reports_main.php:423 reporting/reports_main.php:475
-#: reporting/reports_main.php:522
-msgid "&Profit and Loss Statement"
+#: reporting/includes/reports_classes.inc:444
+#: reporting/includes/reports_classes.inc:446
+msgid "No Category Filter"
 msgstr ""
 
 msgstr ""
 
-#: reporting/reports_main.php:541
-msgid "Ta&x Report"
+#: reporting/includes/reports_classes.inc:448
+msgid "No Class Filter"
 msgstr ""
 
 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/reports_classes.inc:453
+msgid "No Areas Filter"
 msgstr ""
 
 msgstr ""
 
-#: reporting/includes/doctext.inc:25 sales/view/view_dispatch.php:74
-msgid "Delivered To"
+#: reporting/includes/reports_classes.inc:456
+msgid "No Sales Folk Filter"
 msgstr ""
 
 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
-msgid "Discount %"
+#: reporting/includes/reports_classes.inc:463
+msgid "No Users Filter"
 msgstr ""
 
 msgstr ""
 
-#: reporting/includes/doctext.inc:35
-msgid "All amounts stated in"
+#: sales/create_recurrent_invoices.php:26
+msgid "Create and Print Recurrent Invoices"
 msgstr ""
 
 msgstr ""
 
-#: reporting/includes/doctext.inc:50
-msgid "Quotation No."
+#: sales/create_recurrent_invoices.php:147
+#, php-format
+msgid "%s recurrent invoice(s) created, # %s - # %s."
 msgstr ""
 
 msgstr ""
 
-#: reporting/includes/doctext.inc:55 reporting/includes/doctext.inc:72
-#: reporting/includes/doctext.inc:93 reporting/includes/doctext.inc:107
-#: reporting/includes/doctext.inc:130 reporting/includes/doctext.inc:160
-#: reporting/includes/doctext.inc:183 reporting/includes/doctext.inc:203
-#: reporting/includes/doctext.inc:241
-msgid "Customer's Reference"
+#: sales/create_recurrent_invoices.php:152
+#, php-format
+msgid "&Print Recurrent Invoices # %s - # %s"
 msgstr ""
 
 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:242 sales/manage/customer_branches.php:286
-msgid "Sales Person"
+#: sales/create_recurrent_invoices.php:154
+#, php-format
+msgid "&Email Recurrent Invoices # %s - # %s"
 msgstr ""
 
 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:205
-#: reporting/includes/doctext.inc:243
-msgid "Your VAT no."
+#: sales/create_recurrent_invoices.php:172
+msgid ""
+"Recurrent invoice cannot be generated before last day of covered period."
 msgstr ""
 
 msgstr ""
 
-#: reporting/includes/doctext.inc:58
-msgid "Our Quotation No"
+#: sales/create_recurrent_invoices.php:174
+msgid ""
+"Recurrent invoices cannot be generated because some items have no price "
+"defined in customer currency."
 msgstr ""
 
 msgstr ""
 
-#: reporting/includes/doctext.inc:59 sales/view/view_sales_order.php:69
-#: sales/inquiry/sales_orders_view.php:292
-#: sales/includes/ui/sales_order_ui.inc:605
-msgid "Valid until"
+#: 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 ""
 
 msgstr ""
 
-#: reporting/includes/doctext.inc:64
-msgid "PREPAYMENT ORDER"
+#: sales/create_recurrent_invoices.php:184
+#: sales/manage/recurrent_invoices.php:193
+msgid "Template:"
 msgstr ""
 
 msgstr ""
 
-#: reporting/includes/doctext.inc:65
-msgid "Order No."
+#: sales/create_recurrent_invoices.php:185
+msgid "Number of invoices:"
 msgstr ""
 
 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:206 reporting/includes/doctext.inc:244
-#: sales/view/view_dispatch.php:87 sales/view/view_invoice.php:87
-msgid "Our Order No"
+#: sales/create_recurrent_invoices.php:186
+msgid "Invoice date:"
 msgstr ""
 
 msgstr ""
 
-#: reporting/includes/doctext.inc:82
-msgid "Delivery Note No."
+#: sales/create_recurrent_invoices.php:189
+msgid "Invoice notice:"
 msgstr ""
 
 msgstr ""
 
-#: reporting/includes/doctext.inc:97
-msgid "To Be Invoiced Before"
+#: sales/create_recurrent_invoices.php:189
+#, php-format
+msgid "Recurrent Invoice covers period %s - %s."
 msgstr ""
 
 msgstr ""
 
-#: reporting/includes/doctext.inc:103
-msgid "Credit No."
+#: sales/create_recurrent_invoices.php:195
+msgid "Create"
 msgstr ""
 
 msgstr ""
 
-#: reporting/includes/doctext.inc:104
-msgid "Please quote Credit no. when paying. All amounts stated in"
+#: sales/create_recurrent_invoices.php:195
+msgid "Create recurrent invoices"
 msgstr ""
 
 msgstr ""
 
-#: reporting/includes/doctext.inc:116
-msgid "PREPAYMENT INVOICE"
+#: sales/create_recurrent_invoices.php:196
+msgid "Return to recurrent invoices"
 msgstr ""
 
 msgstr ""
 
-#: reporting/includes/doctext.inc:117
-msgid "FINAL INVOICE"
+#: sales/create_recurrent_invoices.php:197
+#, php-format
+msgid ""
+"You are about to issue %s invoices.\n"
+" Do you want to continue?"
 msgstr ""
 
 msgstr ""
 
-#: reporting/includes/doctext.inc:118
-msgid "Invoice No."
+#: sales/create_recurrent_invoices.php:209
+#: sales/manage/recurrent_invoices.php:128
+msgid "Begin"
 msgstr ""
 
 msgstr ""
 
-#: reporting/includes/doctext.inc:120
-msgid "Please quote Invoice no. when paying. All amounts stated in"
+#: sales/create_recurrent_invoices.php:209
+#: sales/manage/recurrent_invoices.php:128
+msgid "End"
 msgstr ""
 
 msgstr ""
 
-#: reporting/includes/doctext.inc:136
-msgid "Date of Payment"
+#: sales/create_recurrent_invoices.php:246
+#, php-format
+msgid "Create %s Invoice(s)"
 msgstr ""
 
 msgstr ""
 
-#: reporting/includes/doctext.inc:142
-msgid "Date of Sale"
+#: sales/create_recurrent_invoices.php:258
+msgid "Marked items are due."
 msgstr ""
 
 msgstr ""
 
-#: reporting/includes/doctext.inc:151
-msgid "Remittance No."
+#: sales/create_recurrent_invoices.php:260
+msgid "No recurrent invoices are due."
 msgstr ""
 
 msgstr ""
 
-#: reporting/includes/doctext.inc:152 reporting/includes/doctext.inc:172
-msgid "Order To"
+#: sales/credit_note_entry.php:40
+#, php-format
+msgid "Modifying Customer Credit Note #%d"
 msgstr ""
 
 msgstr ""
 
-#: reporting/includes/doctext.inc:171
-msgid "Purchase Order No."
+#: sales/credit_note_entry.php:51 sales/sales_order_entry.php:709
+msgid ""
+"There are no customers, or there are no customers with branches. Please "
+"define customers and customer branches."
 msgstr ""
 
 msgstr ""
 
-#: reporting/includes/doctext.inc:175
-msgid "Deliver To"
+#: sales/credit_note_entry.php:66
+#, php-format
+msgid "Credit Note # %d has been processed"
 msgstr ""
 
 msgstr ""
 
-#: reporting/includes/doctext.inc:198
-msgid "Receipt No."
+#: sales/credit_note_entry.php:68
+msgid "&View this credit note"
 msgstr ""
 
 msgstr ""
 
-#: reporting/includes/doctext.inc:199
-msgid "With thanks from"
+#: sales/credit_note_entry.php:70
+msgid "&Print This Credit Invoice"
 msgstr ""
 
 msgstr ""
 
-#: reporting/includes/doctext.inc:216
-msgid "Work Order No."
+#: sales/credit_note_entry.php:71
+msgid "&Email This Credit Invoice"
 msgstr ""
 
 msgstr ""
 
-#: reporting/includes/doctext.inc:247
-msgid "DueDate"
+#: 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/doctext.inc:273 reporting/includes/pdf_report.inc:1023
-msgid "You can pay through"
+#: sales/credit_note_entry.php:75
+msgid "Enter Another &Credit Note"
 msgstr ""
 
 msgstr ""
 
-#: reporting/includes/doctext.inc:277
-msgid "* Subject to Realisation of the Cheque."
+#: 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/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"
+#: 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/excel_report.inc:259
-#: reporting/includes/pdf_report.inc:331
-msgid "Print Out Date"
+#: 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/excel_report.inc:265
-#: reporting/includes/pdf_report.inc:340
-msgid "Fiscal Year"
+#: sales/credit_note_entry.php:171
+msgid "The entered date for the credit note is invalid."
 msgstr ""
 
 msgstr ""
 
-#: reporting/includes/excel_report.inc:393
-msgid "Report Date"
+#: 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/excel_report.inc:410
-#: reporting/includes/pdf_report.inc:604
-msgid "Generated At"
+#: 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/excel_report.inc:416
-#: reporting/includes/pdf_report.inc:613
-msgid "Generated By"
+#: sales/credit_note_entry.php:215
+msgid "The quantity must be greater than zero."
 msgstr ""
 
 msgstr ""
 
-#: reporting/includes/header2.inc:122
-msgid "Our VAT No."
+#: sales/credit_note_entry.php:220
+msgid "The entered price is negative or invalid."
 msgstr ""
 
 msgstr ""
 
-#: reporting/includes/header2.inc:128
-msgid "Domicile"
+#: sales/credit_note_entry.php:225
+msgid "The entered discount percent is negative, greater than 100 or invalid."
 msgstr ""
 
 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"
+#: sales/credit_note_entry.php:293
+msgid "Credit Note Items"
 msgstr ""
 
 msgstr ""
 
-#: reporting/includes/pdf_report.inc:587
-msgid "Report Period"
+#: sales/credit_note_entry.php:303 sales/customer_credit_invoice.php:378
+msgid "Process Credit Note"
 msgstr ""
 
 msgstr ""
 
-#: reporting/includes/pdf_report.inc:990 reporting/includes/pdf_report.inc:1038
+#: sales/customer_credit_invoice.php:37
 #, php-format
 #, php-format
-msgid "You have no email contact defined for this type of document for '%s'."
+msgid "Modifying Credit Invoice # %d."
 msgstr ""
 
 msgstr ""
 
-#: reporting/includes/pdf_report.inc:1009
-msgid "Dear"
+#: sales/customer_credit_invoice.php:41
+msgid "Credit all or part of an Invoice"
 msgstr ""
 
 msgstr ""
 
-#: reporting/includes/pdf_report.inc:1010
-msgid "Attached you will find "
+#: sales/customer_credit_invoice.php:52
+msgid "Credit Note has been processed"
 msgstr ""
 
 msgstr ""
 
-#: reporting/includes/pdf_report.inc:1026
-msgid "Kindest regards"
+#: sales/customer_credit_invoice.php:54 sales/customer_credit_invoice.php:71
+msgid "&View This Credit Note"
 msgstr ""
 
 msgstr ""
 
-#: reporting/includes/pdf_report.inc:1041
-msgid "Sending document by email failed"
+#: sales/customer_credit_invoice.php:56 sales/customer_credit_invoice.php:73
+msgid "&Print This Credit Note"
 msgstr ""
 
 msgstr ""
 
-#: reporting/includes/pdf_report.inc:1041
-#: reporting/includes/pdf_report.inc:1044
-msgid "Email:"
+#: sales/customer_credit_invoice.php:57 sales/customer_credit_invoice.php:74
+msgid "&Email This Credit Note"
 msgstr ""
 
 msgstr ""
 
-#: reporting/includes/pdf_report.inc:1044
-msgid "has been sent by email to destination."
+#: sales/customer_credit_invoice.php:69
+msgid "Credit Note has been updated"
 msgstr ""
 
 msgstr ""
 
-#: reporting/includes/pdf_report.inc:1073
-msgid "Report has been sent to network printer "
+#: sales/customer_credit_invoice.php:108
+msgid "The entered shipping cost is invalid or less than zero."
 msgstr ""
 
 msgstr ""
 
-#: reporting/includes/printer_class.inc:39
-msgid "Cannot open connection to printer"
+#: 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/printer_class.inc:50
-msgid "Printer does not acept the job"
+#: 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/printer_class.inc:61
-msgid "Error sending print job control file"
+#: sales/customer_credit_invoice.php:248
+msgid "Crediting Invoice"
 msgstr ""
 
 msgstr ""
 
-#: reporting/includes/printer_class.inc:68
-msgid "Print control file not accepted"
+#: sales/customer_credit_invoice.php:265
+msgid "Credit Note Date"
 msgstr ""
 
 msgstr ""
 
-#: reporting/includes/printer_class.inc:76
-msgid "Cannot send report to printer"
+#: sales/customer_credit_invoice.php:275
+msgid "Invoiced Quantity"
 msgstr ""
 
 msgstr ""
 
-#: reporting/includes/printer_class.inc:86
-msgid "No ack after report printout"
+#: sales/customer_credit_invoice.php:276
+msgid "Credit Quantity"
 msgstr ""
 
 msgstr ""
 
-#: reporting/includes/printer_class.inc:100
-msgid "Cannot flush printing queue"
+#: sales/customer_credit_invoice.php:310
+msgid "Credit Shipping Cost"
 msgstr ""
 
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:62
-msgid "Report Classes:"
+#: 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:82
-msgid "Reports For Class: "
+#: 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:102
-msgid "Display: "
+#: 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:153
-msgid "Unknown report parameter type:"
+#: sales/customer_credit_invoice.php:376
+msgid "Update credit value for quantities entered"
 msgstr ""
 
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:181
-msgid "No Currency Filter"
+#: sales/customer_delivery.php:36
+#, php-format
+msgid "Modifying Delivery Note # %d."
 msgstr ""
 
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:255
-msgid "No Graphics"
+#: sales/customer_delivery.php:40
+msgid "Deliver Items for a Sales Order"
 msgstr ""
 
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:260
-#: reporting/includes/reports_classes.inc:263
-msgid "No Type 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:273
-msgid "No Account Group Filter"
+#: sales/customer_delivery.php:51 sales/sales_order_entry.php:201
+msgid "&View This Delivery"
 msgstr ""
 
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:292
-#: reporting/includes/reports_classes.inc:298
-#: reporting/includes/reports_classes.inc:304
-msgid "No Dimension 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:309
-msgid "No Customer 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:316
-msgid "No Supplier 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:439
-#: reporting/includes/reports_classes.inc:441
-msgid "No Location 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:444
-#: reporting/includes/reports_classes.inc:446
-msgid "No Category 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:448
-msgid "No Class Filter"
+#: sales/customer_delivery.php:61
+msgid "Invoice This Delivery"
 msgstr ""
 
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:453
-msgid "No Areas Filter"
+#: sales/customer_delivery.php:63
+msgid "Select Another Order For Dispatch"
 msgstr ""
 
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:456
-msgid "No Sales Folk Filter"
+#: sales/customer_delivery.php:71
+#, php-format
+msgid "Delivery Note # %d has been updated."
 msgstr ""
 
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:463
-msgid "No Users Filter"
+#: sales/customer_delivery.php:73
+msgid "View this delivery"
 msgstr ""
 
 msgstr ""
 
-#: sales/create_recurrent_invoices.php:26
-msgid "Create and Print Recurrent Invoices"
+#: sales/customer_delivery.php:81
+msgid "Confirm Delivery and Invoice"
 msgstr ""
 
 msgstr ""
 
-#: sales/create_recurrent_invoices.php:147
-#, php-format
-msgid "%s recurrent invoice(s) created, # %s - # %s."
+#: sales/customer_delivery.php:83
+msgid "Select A Different Delivery"
 msgstr ""
 
 msgstr ""
 
-#: sales/create_recurrent_invoices.php:152
-#, php-format
-msgid "&Print Recurrent Invoices # %s - # %s"
+#: 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."
 msgstr ""
 
 msgstr ""
 
-#: sales/create_recurrent_invoices.php:154
-#, php-format
-msgid "&Email Recurrent Invoices # %s - # %s"
+#: 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 invoice cannot be generated before last day of covered period."
+#: sales/customer_delivery.php:98
+msgid "This order has no items. There is nothing to delivery."
 msgstr ""
 
 msgstr ""
 
-#: sales/create_recurrent_invoices.php:174
+#: sales/customer_delivery.php:104
 msgid ""
 msgid ""
-"Recurrent invoices cannot be generated because some items have no price "
-"defined in customer currency."
+"This prepayment order is not yet ready for delivery due to insufficient "
+"amount received."
 msgstr ""
 
 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."
+#: sales/customer_delivery.php:121
+msgid "Select a different delivery"
 msgstr ""
 
 msgstr ""
 
-#: sales/create_recurrent_invoices.php:184
-#: sales/manage/recurrent_invoices.php:193
-msgid "Template:"
+#: sales/customer_delivery.php:122
+msgid "This delivery has all items invoiced. There is nothing to modify."
 msgstr ""
 
 msgstr ""
 
-#: sales/create_recurrent_invoices.php:185
-msgid "Number of invoices:"
+#: 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:186
-msgid "Invoice date:"
+#: sales/customer_delivery.php:134
+msgid "Select a Sales Order to Delivery"
 msgstr ""
 
 msgstr ""
 
-#: sales/create_recurrent_invoices.php:189
-msgid "Invoice notice:"
+#: 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
-#, php-format
-msgid "Recurrent Invoice covers period %s - %s."
+#: sales/customer_delivery.php:146
+msgid "Freight cost cannot be less than zero"
 msgstr ""
 
 msgstr ""
 
-#: sales/create_recurrent_invoices.php:195
-msgid "Create"
+#: sales/customer_delivery.php:158
+msgid "The entered date of delivery is invalid."
 msgstr ""
 
 msgstr ""
 
-#: sales/create_recurrent_invoices.php:195
-msgid "Create recurrent invoices"
+#: sales/customer_delivery.php:170
+msgid "The entered dead-line for invoice is invalid."
 msgstr ""
 
 msgstr ""
 
-#: sales/create_recurrent_invoices.php:196
-msgid "Return to recurrent invoices"
+#: 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:197
-#, php-format
-msgid ""
-"You are about to issue %s invoices.\n"
-" Do you want to continue?"
+#: sales/customer_delivery.php:193
+msgid "There are no item quantities on this delivery note."
 msgstr ""
 
 msgstr ""
 
-#: sales/create_recurrent_invoices.php:209
-#: sales/manage/recurrent_invoices.php:128
-msgid "Begin"
+#: 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:209
-#: sales/manage/recurrent_invoices.php:128
-msgid "End"
+#: sales/customer_delivery.php:342
+msgid "For Sales Order"
 msgstr ""
 
 msgstr ""
 
-#: sales/create_recurrent_invoices.php:246
-#, php-format
-msgid "Create %s Invoice(s)"
+#: sales/customer_delivery.php:351
+msgid "Delivery From"
 msgstr ""
 
 msgstr ""
 
-#: sales/create_recurrent_invoices.php:258
-msgid "Marked items are due."
+#: sales/customer_delivery.php:400
+msgid "Invoice Dead-line"
 msgstr ""
 
 msgstr ""
 
-#: sales/create_recurrent_invoices.php:260
-msgid "No recurrent invoices are due."
+#: 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 ""
+"The selected customer account is currently on hold. Please contact the "
+"credit control personnel to discuss."
 msgstr ""
 
 msgstr ""
 
-#: sales/credit_note_entry.php:40
-#, php-format
-msgid "Modifying Customer Credit Note #%d"
+#: sales/customer_delivery.php:415
+msgid "Delivery Items"
 msgstr ""
 
 msgstr ""
 
-#: sales/credit_note_entry.php:51 sales/sales_order_entry.php:709
-msgid ""
-"There are no customers, or there are no customers with branches. Please "
-"define customers and customer branches."
+#: sales/customer_delivery.php:421
+msgid "Max. delivery"
 msgstr ""
 
 msgstr ""
 
-#: sales/credit_note_entry.php:66
-#, php-format
-msgid "Credit Note # %d has been processed"
+#: sales/customer_delivery.php:421 sales/customer_invoice.php:522
+msgid "Invoiced"
 msgstr ""
 
 msgstr ""
 
-#: sales/credit_note_entry.php:68
-msgid "&View this credit note"
+#: sales/customer_delivery.php:498 sales/customer_invoice.php:612
+msgid "Shipping Cost"
 msgstr ""
 
 msgstr ""
 
-#: sales/credit_note_entry.php:70
-msgid "&Print This Credit Invoice"
+#: 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:71
-msgid "&Email This Credit Invoice"
+#: sales/customer_delivery.php:522
+msgid "Action For Balance"
 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: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:75
-msgid "Enter Another &Credit Note"
+#: sales/customer_delivery.php:531
+msgid "Reset quantity"
 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:534
+msgid "Clear quantity"
 msgstr ""
 
 msgstr ""
 
-#: sales/credit_note_entry.php:153
-msgid "The entered date for the credit note is invalid."
+#: sales/customer_delivery.php:536
+msgid "Process Dispatch"
 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: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:171
-msgid ""
-"Please select an account to write the cost of the stock off to, then click "
-"on Process again."
+#: sales/customer_invoice.php:37
+#, php-format
+msgid "Modifying Sales Invoice # %d."
 msgstr ""
 
 msgstr ""
 
-#: sales/credit_note_entry.php:197
-msgid "The quantity must be greater than zero."
+#: sales/customer_invoice.php:40
+msgid "Issue an Invoice for Delivery Note"
 msgstr ""
 
 msgstr ""
 
-#: sales/credit_note_entry.php:202
-msgid "The entered price is negative or invalid."
+#: sales/customer_invoice.php:42
+msgid "Issue Batch Invoice for Delivery Notes"
 msgstr ""
 
 msgstr ""
 
-#: sales/credit_note_entry.php:207
-msgid "The entered discount percent is negative, greater than 100 or invalid."
+#: sales/customer_invoice.php:44
+msgid "Prepayment or Final Invoice Entry"
 msgstr ""
 
 msgstr ""
 
-#: sales/credit_note_entry.php:275
-msgid "Credit Note Items"
+#: sales/customer_invoice.php:57
+msgid "Selected deliveries has been processed"
 msgstr ""
 
 msgstr ""
 
-#: sales/credit_note_entry.php:285 sales/customer_credit_invoice.php:378
-msgid "Process Credit Note"
+#: 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:37
-#, php-format
-msgid "Modifying Credit Invoice # %d."
+#: sales/customer_invoice.php:61 sales/customer_invoice.php:85
+msgid "&Print This Invoice"
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_credit_invoice.php:41
-msgid "Credit all or part of an Invoice"
+#: sales/customer_invoice.php:62 sales/customer_invoice.php:86
+msgid "&Email This Invoice"
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_credit_invoice.php:52
-msgid "Credit Note has been processed"
+#: 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:54 sales/customer_credit_invoice.php:71
-msgid "&View This Credit Note"
+#: sales/customer_invoice.php:66
+msgid "Select Another &Delivery For Invoicing"
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_credit_invoice.php:56 sales/customer_credit_invoice.php:73
-msgid "&Print This Credit Note"
+#: 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:57 sales/customer_credit_invoice.php:74
-msgid "&Email This Credit Note"
+#: sales/customer_invoice.php:81
+#, php-format
+msgid "Sales Invoice # %d has been updated."
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_credit_invoice.php:69
-msgid "Credit Note has been updated"
+#: sales/customer_invoice.php:88
+msgid "Select Another &Invoice to Modify"
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_credit_invoice.php:108
-msgid "The entered shipping cost is invalid or less than zero."
+#: sales/customer_invoice.php:127
+msgid "Select a different delivery to invoice"
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_credit_invoice.php:113 sales/customer_credit_invoice.php:135
+#: 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:756
-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."
+"You must enter the person or company to whom delivery should be made to."
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_invoice.php:436
-msgid "Payment terms:"
+#: 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 sales/sales_order_entry.php:732
-msgid "Sales Order Items"
+#: sales/sales_order_entry.php:415
+msgid "The shipping cost entered is expected to be numeric."
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_invoice.php:512
-msgid "Invoice Items"
+#: sales/sales_order_entry.php:421
+msgid "The Valid date is invalid."
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_invoice.php:522
-msgid "This Invoice"
+#: sales/sales_order_entry.php:423
+msgid "The delivery date is invalid."
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_invoice.php:530
-msgid "Credited"
+#: sales/sales_order_entry.php:429
+msgid "The requested valid date is before the date of the quotation."
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_invoice.php:632
-msgid "Invoice Total"
+#: sales/sales_order_entry.php:431
+msgid "The requested delivery date is before the date of the order."
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_invoice.php:641
-msgid "Sales order:"
+#: sales/sales_order_entry.php:440
+msgid "You need to define a cash account for your Sales Point."
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_invoice.php:652
-msgid "Payments received:"
+#: 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:653
-msgid "Invoiced here:"
+#: 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_invoice.php:654
-msgid "Left to be invoiced:"
+#: 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_invoice.php:654
-msgid "Invoiced so far:"
+#: 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:32
-msgid "Customer Payment Entry"
+#: sales/sales_order_entry.php:556
+#, php-format
+msgid "Price %s is below Standard Cost %s"
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_payments.php:36
-msgid "There are no customers defined in the system."
+#: 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:74
-msgid "Invalid sales invoice number."
+#: sales/sales_order_entry.php:610
+msgid "Direct delivery entry has been cancelled as requested."
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_payments.php:104
-msgid "The customer payment has been successfully entered."
+#: sales/sales_order_entry.php:611
+msgid "Enter a New Sales Delivery"
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_payments.php:106 sales/customer_payments.php:126
-msgid "&Print This Receipt"
+#: sales/sales_order_entry.php:613
+msgid "Direct invoice entry has been cancelled as requested."
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_payments.php:107
-msgid "&Email This Receipt"
+#: sales/sales_order_entry.php:614
+msgid "Enter a New Sales Invoice"
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_payments.php:109
-msgid "&View this Customer Payment"
+#: sales/sales_order_entry.php:619
+msgid "This sales quotation has been cancelled as requested."
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_payments.php:111 sales/customer_payments.php:134
-msgid "Enter Another &Customer Payment"
+#: sales/sales_order_entry.php:620
+msgid "Enter a New Sales Quotation"
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_payments.php:113
-msgid "Enter Payment to &Supplier"
+#: sales/sales_order_entry.php:627
+msgid "Undelivered part of order has been cancelled as requested."
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_payments.php:117 sales/customer_payments.php:128
-msgid "&View the GL Journal Entries for this Customer Payment"
+#: sales/sales_order_entry.php:628
+msgid "Select Another Sales Order for Edition"
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_payments.php:124
-msgid "The customer payment has been successfully updated."
+#: sales/sales_order_entry.php:632
+msgid "This sales order has been cancelled as requested."
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_payments.php:132
-msgid "Select Another Customer Payment for &Edition"
+#: sales/sales_order_entry.php:633
+msgid "Enter a New Sales Order"
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_payments.php:147 sales/sales_order_entry.php:360
-msgid "There is no customer selected."
+#: sales/sales_order_entry.php:713
+msgid "Sales Invoice Items"
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_payments.php:154 sales/sales_order_entry.php:367
-msgid "This customer has no branch defined."
+#: sales/sales_order_entry.php:714
+msgid "Enter Delivery Details and Confirm Invoice"
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_payments.php:160
-msgid "The entered date is invalid. Please enter a valid date for the payment."
+#: sales/sales_order_entry.php:716
+msgid "Place Invoice"
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_payments.php:175 sales/customer_payments.php:181
-msgid "The entered amount is invalid or negative and cannot be processed."
+#: sales/sales_order_entry.php:719
+msgid "Delivery Note Items"
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_payments.php:200
-msgid "The entered discount is not a valid number."
+#: sales/sales_order_entry.php:720
+msgid "Enter Delivery Details and Confirm Dispatch"
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_payments.php:206
-msgid ""
-"The balance of the amount and discount is zero or negative. Please enter "
-"valid amounts."
+#: sales/sales_order_entry.php:721
+msgid "Cancel Delivery"
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_payments.php:213
-msgid "The entered payment amount is zero or negative."
+#: sales/sales_order_entry.php:722
+msgid "Place Delivery"
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_payments.php:317 sales/customer_payments.php:319
-msgid "From Customer:"
+#: sales/sales_order_entry.php:724
+msgid "Quotation Date:"
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_payments.php:340
-msgid "Into Bank Account:"
+#: sales/sales_order_entry.php:725
+msgid "Sales Quotation Items"
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_payments.php:351
-msgid "Date of Deposit:"
+#: sales/sales_order_entry.php:726
+msgid "Enter Delivery Details and Confirm Quotation"
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_payments.php:365
-msgid "Payment Amount:"
+#: sales/sales_order_entry.php:727
+msgid "Cancel Quotation"
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_payments.php:393
-msgid "Customer prompt payment discount :"
+#: sales/sales_order_entry.php:728
+msgid "Place Quotation"
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_payments.php:403
-msgid "Add Payment"
+#: sales/sales_order_entry.php:729
+msgid "Commit Quotations Changes"
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_payments.php:405
-msgid "Update Payment"
+#: sales/sales_order_entry.php:733
+msgid "Enter Delivery Details and Confirm Order"
 msgstr ""
 
 msgstr ""
 
-#: sales/sales_order_entry.php:64
-msgid "Direct Sales Delivery"
+#: sales/sales_order_entry.php:736
+msgid "Commit Order Changes"
 msgstr ""
 
 msgstr ""
 
-#: sales/sales_order_entry.php:72
-msgid "Fixed Assets Sale"
+#: 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:75
-msgid "Direct Sales Invoice"
+#: 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:80
-#, php-format
-msgid "Modifying Sales Order # %d"
+#: sales/sales_order_entry.php:762
+msgid "Validate changes and update document"
 msgstr ""
 
 msgstr ""
 
-#: sales/sales_order_entry.php:86
-#, php-format
-msgid "Modifying Sales Quotation # %d"
+#: 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:91
-msgid "New Sales Order Entry"
+#: sales/allocations/customer_allocate.php:28
+msgid "Allocate Customer Payment or Credit Note"
 msgstr ""
 
 msgstr ""
 
-#: sales/sales_order_entry.php:95
-msgid "New Sales Quotation Entry"
+#: sales/allocations/customer_allocate.php:55
+#, php-format
+msgid "Allocation of %s # %d"
 msgstr ""
 
 msgstr ""
 
-#: sales/sales_order_entry.php:98
-msgid "Sales Order Entry"
+#: sales/allocations/customer_allocation_main.php:22
+msgid "Customer Allocations"
 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/includes/cart_class.inc:407
+msgid "You have to enter valid stock code or nonempty description"
 msgstr ""
 
 msgstr ""
 
-#: sales/sales_order_entry.php:125
-#, php-format
-msgid "Order # %d has been entered."
+#: 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:127 sales/sales_order_entry.php:147
-msgid "&View This Order"
+#: 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 ""
 
 msgstr ""
 
-#: sales/sales_order_entry.php:133
-msgid "Make &Delivery Against This Order"
+#: sales/includes/db/recurrent_invoices_db.inc:158
+#, php-format
+msgid "Unknown %s price for '%s' in pricelist '%s'"
 msgstr ""
 
 msgstr ""
 
-#: sales/sales_order_entry.php:138
-msgid "Enter a &New Order"
+#: sales/includes/db/sales_credit_db.inc:188
+msgid "Return"
 msgstr ""
 
 msgstr ""
 
-#: sales/sales_order_entry.php:145
-#, php-format
-msgid "Order # %d has been updated."
+#: sales/includes/db/sales_credit_db.inc:190
+msgid "Ex Inv:"
 msgstr ""
 
 msgstr ""
 
-#: sales/sales_order_entry.php:153
-msgid "Confirm Order Quantities and Make &Delivery"
+#: sales/includes/db/sales_order_db.inc:103
+msgid "Deleted."
 msgstr ""
 
 msgstr ""
 
-#: sales/sales_order_entry.php:156
-msgid "Select A Different &Order"
+#: 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:163
-#, php-format
-msgid "Quotation # %d has been entered."
+#: 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:165 sales/sales_order_entry.php:183
-msgid "&View 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:167 sales/sales_order_entry.php:185
-msgid "&Print 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:168 sales/sales_order_entry.php:186
-msgid "&Email This 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:171 sales/sales_order_entry.php:189
-msgid "Make &Sales Order Against This Quotation"
+#: sales/includes/ui/sales_order_ui.inc:218
+msgid "Shipping Charge"
 msgstr ""
 
 msgstr ""
 
-#: sales/sales_order_entry.php:174
-msgid "Enter a New &Quotation"
+#: sales/includes/ui/sales_order_ui.inc:286
+msgid "No customer found for entered text."
 msgstr ""
 
 msgstr ""
 
-#: sales/sales_order_entry.php:181
-#, php-format
-msgid "Quotation # %d has been updated."
+#: 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:192
-msgid "Select A Different &Quotation"
+#: 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:211
-msgid "Make &Invoice Against This Delivery"
+#: sales/includes/ui/sales_order_ui.inc:361
+msgid "Reference number unique for this document type"
 msgstr ""
 
 msgstr ""
 
-#: sales/sales_order_entry.php:215
-msgid "Enter a New Template &Delivery"
+#: 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:218
-msgid "Enter a &New Delivery"
+#: sales/includes/ui/sales_order_ui.inc:422
+msgid "Date of order receive"
 msgstr ""
 
 msgstr ""
 
-#: sales/sales_order_entry.php:226
-#, php-format
-msgid "Invoice # %d has been entered."
+#: sales/includes/ui/sales_order_ui.inc:503
+msgid "[Select item]"
 msgstr ""
 
 msgstr ""
 
-#: sales/sales_order_entry.php:230
-msgid "&Print Sales Invoice"
+#: sales/includes/ui/sales_order_ui.inc:581
+msgid "Cash payment"
 msgstr ""
 
 msgstr ""
 
-#: sales/sales_order_entry.php:231
-msgid "&Email Sales 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:236
-msgid "Print &Receipt"
+#: sales/includes/ui/sales_order_ui.inc:587
+msgid "Cash account:"
 msgstr ""
 
 msgstr ""
 
-#: sales/sales_order_entry.php:241
-msgid "Enter a &New Template Invoice"
+#: sales/includes/ui/sales_order_ui.inc:594
+msgid "Delivery Details"
 msgstr ""
 
 msgstr ""
 
-#: sales/sales_order_entry.php:244
-msgid "Enter a &New Direct Invoice"
+#: sales/includes/ui/sales_order_ui.inc:599
+msgid "Invoice Delivery Details"
 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:600
+msgid "Invoice before"
 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:604
+msgid "Quotation 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:609
+msgid "Order Delivery Details"
 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:630
+msgid "Enter requested day of delivery"
 msgstr ""
 
 msgstr ""
 
-#: sales/sales_order_entry.php:421
-msgid "The Valid date is invalid."
+#: sales/includes/ui/sales_order_ui.inc:631
+msgid "Enter Valid until Date"
 msgstr ""
 
 msgstr ""
 
-#: sales/sales_order_entry.php:423
-msgid "The delivery date is invalid."
+#: sales/includes/ui/sales_order_ui.inc:632
+msgid "Deliver To:"
 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:633
+msgid "Additional identifier for delivery e.g. name of receiving person"
 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:636
+msgid "Delivery address. Default is address of customer branch"
 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:640
+msgid "Contact Phone Number:"
 msgstr ""
 
 msgstr ""
 
-#: sales/sales_order_entry.php:483
-msgid ""
-"The reference number field has been increased. Please save the document "
-"again."
+#: 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: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."
+#: sales/includes/ui/sales_order_ui.inc:642
+msgid "Customer Reference:"
 msgstr ""
 
 msgstr ""
 
-#: sales/sales_order_entry.php:531
-msgid "Price for inventory item must be entered and can not be less than 0"
+#: sales/includes/ui/sales_order_ui.inc:643
+msgid "Customer reference number for this order (if any)"
 msgstr ""
 
 msgstr ""
 
-#: 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."
+#: sales/inquiry/customer_allocation_inquiry.php:25
+msgid "Customer Allocation Inquiry"
 msgstr ""
 
 msgstr ""
 
-#: sales/sales_order_entry.php:556
-#, php-format
-msgid "Price %s is below Standard Cost %s"
+#: sales/inquiry/customer_allocation_inquiry.php:96
+msgid "Allocation"
 msgstr ""
 
 msgstr ""
 
-#: sales/sales_order_entry.php:581
-msgid ""
-"This item cannot be deleted because some of it has already been delivered."
+#: sales/inquiry/customer_branches_list.php:25
+#: sales/manage/customer_branches.php:22
+msgid "Customer Branches"
 msgstr ""
 
 msgstr ""
 
-#: sales/sales_order_entry.php:610
-msgid "Direct delivery 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:611
-msgid "Enter a New Sales Delivery"
+#: sales/inquiry/customer_inquiry.php:26
+msgid "Customer Transactions"
 msgstr ""
 
 msgstr ""
 
-#: sales/sales_order_entry.php:613
-msgid "Direct invoice entry has been cancelled as requested."
+#: sales/inquiry/customer_inquiry.php:98
+msgid "Print Receipt"
 msgstr ""
 
 msgstr ""
 
-#: sales/sales_order_entry.php:614
-msgid "Enter a New Sales Invoice"
+#: sales/inquiry/customer_inquiry.php:118
+msgid "CUSTOMER ACCOUNT IS ON HOLD"
 msgstr ""
 
 msgstr ""
 
-#: sales/sales_order_entry.php:619
-msgid "This sales quotation has been cancelled as requested."
+#: sales/inquiry/sales_deliveries_view.php:29
+msgid "Search Not Invoiced Deliveries"
 msgstr ""
 
 msgstr ""
 
-#: sales/sales_order_entry.php:620
-msgid "Enter a New Sales Quotation"
+#: sales/inquiry/sales_deliveries_view.php:34
+msgid "Search All Deliveries"
 msgstr ""
 
 msgstr ""
 
-#: sales/sales_order_entry.php:627
-msgid "Undelivered part of order has been cancelled as requested."
+#: 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 "Select Another Sales Order for Edition"
+#: sales/inquiry/sales_deliveries_view.php:169
+msgid "Delivery #"
 msgstr ""
 
 msgstr ""
 
-#: sales/sales_order_entry.php:632
-msgid "This sales order has been cancelled as requested."
+#: sales/inquiry/sales_deliveries_view.php:175
+msgid "Cust Ref"
 msgstr ""
 
 msgstr ""
 
-#: sales/sales_order_entry.php:633
-msgid "Enter a New Sales Order"
+#: sales/inquiry/sales_deliveries_view.php:177
+msgid "Due By"
 msgstr ""
 
 msgstr ""
 
-#: sales/sales_order_entry.php:713
-msgid "Sales Invoice Items"
+#: sales/inquiry/sales_deliveries_view.php:178
+msgid "Delivery Total"
 msgstr ""
 
 msgstr ""
 
-#: sales/sales_order_entry.php:714
-msgid "Enter Delivery Details and Confirm Invoice"
+#: sales/inquiry/sales_deliveries_view.php:180
+msgid "Batch"
 msgstr ""
 
 msgstr ""
 
-#: sales/sales_order_entry.php:716
-msgid "Place Invoice"
+#: sales/inquiry/sales_deliveries_view.php:180
+msgid "Batch Invoicing"
 msgstr ""
 
 msgstr ""
 
-#: sales/sales_order_entry.php:719
-msgid "Delivery Note Items"
+#: sales/inquiry/sales_orders_view.php:44
+msgid "Search Outstanding Sales Orders"
 msgstr ""
 
 msgstr ""
 
-#: sales/sales_order_entry.php:720
-msgid "Enter Delivery Details and Confirm Dispatch"
+#: sales/inquiry/sales_orders_view.php:49
+msgid "Search Template for Invoicing"
 msgstr ""
 
 msgstr ""
 
-#: sales/sales_order_entry.php:721
-msgid "Cancel Delivery"
+#: sales/inquiry/sales_orders_view.php:54
+msgid "Select Template for Delivery"
 msgstr ""
 
 msgstr ""
 
-#: sales/sales_order_entry.php:722
-msgid "Place Delivery"
+#: sales/inquiry/sales_orders_view.php:59
+msgid "Invoicing Prepayment Orders"
 msgstr ""
 
 msgstr ""
 
-#: sales/sales_order_entry.php:724
-msgid "Quotation Date:"
+#: sales/inquiry/sales_orders_view.php:64
+msgid "Search All Sales Orders"
 msgstr ""
 
 msgstr ""
 
-#: sales/sales_order_entry.php:725
-msgid "Sales Quotation Items"
+#: sales/inquiry/sales_orders_view.php:70
+msgid "Search All Sales Quotations"
 msgstr ""
 
 msgstr ""
 
-#: sales/sales_order_entry.php:726
-msgid "Enter Delivery Details and Confirm Quotation"
+#: sales/inquiry/sales_orders_view.php:125
+msgid "Dispatch"
 msgstr ""
 
 msgstr ""
 
-#: sales/sales_order_entry.php:727
-msgid "Cancel 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:728
-msgid "Place Quotation"
+#: sales/inquiry/sales_orders_view.php:196
+msgid "Prepayment Invoice"
 msgstr ""
 
 msgstr ""
 
-#: sales/sales_order_entry.php:729
-msgid "Commit Quotations Changes"
+#: sales/inquiry/sales_orders_view.php:196
+msgid "Final Invoice"
 msgstr ""
 
 msgstr ""
 
-#: sales/sales_order_entry.php:733
-msgid "Enter Delivery Details and Confirm Order"
+#: sales/inquiry/sales_orders_view.php:254
+msgid "Show All:"
 msgstr ""
 
 msgstr ""
 
-#: sales/sales_order_entry.php:736
-msgid "Commit Order Changes"
+#: sales/inquiry/sales_orders_view.php:272
+msgid "Order #"
 msgstr ""
 
 msgstr ""
 
-#: 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"
+#: 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:759 sales/sales_order_entry.php:768
-msgid "You are about to void this Document.\\nDo you want to continue?"
+#: 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 "Validate changes and update document"
+#: sales/inquiry/sales_orders_view.php:286
+msgid "Quote #"
 msgstr ""
 
 msgstr ""
 
-#: sales/sales_order_entry.php:766
-msgid ""
-"You are about to cancel undelivered part of this order.\\nDo you want to "
-"continue?"
+#: sales/inquiry/sales_orders_view.php:291
+msgid "Quote Date"
 msgstr ""
 
 msgstr ""
 
-#: sales/allocations/customer_allocate.php:28
-msgid "Allocate Customer Payment or Credit Note"
+#: sales/inquiry/sales_orders_view.php:294
+msgid "Quote Total"
 msgstr ""
 
 msgstr ""
 
-#: sales/allocations/customer_allocate.php:55
-#, php-format
-msgid "Allocation of %s # %d"
+#: sales/inquiry/sales_orders_view.php:315
+msgid "New Payments"
 msgstr ""
 
 msgstr ""
 
-#: sales/allocations/customer_allocation_main.php:22
-msgid "Customer Allocations"
+#: sales/inquiry/sales_orders_view.php:326
+msgid "Tmpl"
 msgstr ""
 
 #: sales/manage/credit_status.php:16
 msgstr ""
 
 #: sales/manage/credit_status.php:16
@@ -14633,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:262
-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:299
-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:297
-msgid "Default Inventory Location:"
+#: sales/manage/customers.php:268
+msgid "Discount Percent:"
 msgstr ""
 
 msgstr ""
 
-#: sales/manage/customer_branches.php:237 sales/manage/customers.php:298
-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:173
-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:43
-msgid "The customer name cannot be empty."
+#: sales/manage/customers.php:313
+msgid "Update customer data"
 msgstr ""
 
 msgstr ""
 
-#: sales/manage/customers.php:50
-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:57
-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:64
-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:71
+#: 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."
+"There are no sales types defined. Please define at least one sales type "
+"before adding a customer."
 msgstr ""
 
 msgstr ""
 
-#: sales/manage/customers.php:99
-msgid "Customer has been updated."
+#: sales/manage/customers.php:332
+msgid "New customer"
 msgstr ""
 
 msgstr ""
 
-#: sales/manage/customers.php:131
-msgid "A new customer has been added."
+#: sales/manage/customers.php:355
+msgid "Sales &Orders"
 msgstr ""
 
 msgstr ""
 
-#: sales/manage/customers.php:134
+#: sales/manage/customer_branches.php:29
 msgid ""
 msgid ""
-"A default Branch has been automatically created, please check default Branch "
-"values by using link below."
+"There are no customers defined in the system. Please define a customer to "
+"add customer branches."
 msgstr ""
 
 msgstr ""
 
-#: sales/manage/customers.php:157
+#: sales/manage/customer_branches.php:31
 msgid ""
 msgid ""
-"This customer cannot be deleted because there are transactions that refer to "
-"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:164
+#: sales/manage/customer_branches.php:33
 msgid ""
 msgid ""
-"Cannot delete the customer record because orders have been created against "
-"it."
+"There are no sales areas defined in the system. At least one sales area is "
+"required before proceeding."
 msgstr ""
 
 msgstr ""
 
-#: sales/manage/customers.php:171
+#: sales/manage/customer_branches.php:35
 msgid ""
 msgid ""
-"Cannot delete this customer because there are branch records set up against "
-"it."
-msgstr ""
-
-#: sales/manage/customers.php:182
-msgid "Selected customer has been deleted."
-msgstr ""
-
-#: sales/manage/customers.php:231
-msgid "Name and Address"
-msgstr ""
-
-#: sales/manage/customers.php:233
-msgid "Customer Name:"
+"There are no shipping companies defined in the system. At least one shipping "
+"company is required before proceeding."
 msgstr ""
 
 msgstr ""
 
-#: sales/manage/customers.php:234
-msgid "Customer Short Name:"
+#: sales/manage/customer_branches.php:67
+msgid "The Branch name cannot be empty."
 msgstr ""
 
 msgstr ""
 
-#: sales/manage/customers.php:243 sales/manage/customers.php:247
-msgid "Customer's Currency:"
+#: sales/manage/customer_branches.php:74
+msgid "The Branch short name cannot be empty."
 msgstr ""
 
 msgstr ""
 
-#: sales/manage/customers.php:250
-msgid "Sales Type/Price List:"
+#: sales/manage/customer_branches.php:90
+msgid "Selected customer branch has been updated"
 msgstr ""
 
 msgstr ""
 
-#: sales/manage/customers.php:253
-msgid "Customer status:"
+#: sales/manage/customer_branches.php:108
+msgid "New customer branch has been added"
 msgstr ""
 
 msgstr ""
 
-#: sales/manage/customers.php:268
-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:269
-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:273
-msgid "Credit Status:"
+#: sales/manage/customer_branches.php:136
+msgid "Selected customer branch has been deleted"
 msgstr ""
 
 msgstr ""
 
-#: sales/manage/customers.php:286
-msgid "Customer branches"
+#: sales/manage/customer_branches.php:209
+msgid "Main Branch"
 msgstr ""
 
 msgstr ""
 
-#: sales/manage/customers.php:288
-msgid "Select or &Add"
+#: sales/manage/customer_branches.php:228
+msgid "Name and Contact"
 msgstr ""
 
 msgstr ""
 
-#: sales/manage/customers.php:288
-msgid "&Add or Edit "
+#: sales/manage/customer_branches.php:229
+msgid "Branch Name:"
 msgstr ""
 
 msgstr ""
 
-#: sales/manage/customers.php:308
-msgid "Add New Customer"
+#: sales/manage/customer_branches.php:230
+msgid "Branch Short Name:"
 msgstr ""
 
 msgstr ""
 
-#: sales/manage/customers.php:312
-msgid "Update Customer"
+#: sales/manage/customer_branches.php:235
+#: sales/manage/recurrent_invoices.php:200
+msgid "Sales Group:"
 msgstr ""
 
 msgstr ""
 
-#: sales/manage/customers.php:313
-msgid "Update customer data"
+#: sales/manage/customer_branches.php:244
+msgid "Accounts Receivable Account:"
 msgstr ""
 
 msgstr ""
 
-#: sales/manage/customers.php:314
-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:315
-msgid "Delete Customer"
+#: sales/manage/customer_branches.php:261
+msgid "Billing Address:"
 msgstr ""
 
 msgstr ""
 
-#: sales/manage/customers.php:316
-msgid "Delete customer data if have been never used"
+#: sales/manage/customer_branches.php:287
+msgid "Area"
 msgstr ""
 
 msgstr ""
 
-#: sales/manage/customers.php:323
-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:332
-msgid "New customer"
+#: sales/manage/customer_branches.php:289
+msgid "Fax No"
 msgstr ""
 
 msgstr ""
 
-#: sales/manage/customers.php:355
-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
@@ -15311,373 +15843,174 @@ msgid "Date of Deposit"
 msgstr ""
 
 #: sales/view/view_receipt.php:43
 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:73
-msgid "Requested Delivery"
-msgstr ""
-
-#: sales/view/view_sales_order.php:77
-msgid "Deliver From Location"
-msgstr ""
-
-#: sales/view/view_sales_order.php:88
-msgid "Non-Invoiced Prepayments"
-msgstr ""
-
-#: sales/view/view_sales_order.php:89
-msgid "All Payments Allocated"
-msgstr ""
-
-#: sales/view/view_sales_order.php:97
-msgid "Telephone"
-msgstr ""
-
-#: sales/view/view_sales_order.php:217
-msgid "This Sales Order is used as a Template."
-msgstr ""
-
-#: sales/view/view_sales_order.php:222
-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:98
-msgid "Print Receipt"
-msgstr ""
-
-#: sales/inquiry/customer_inquiry.php:118
-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:69
-msgid ""
-"For batch invoicing you should\n"
-"\t\t    select at least one delivery. All items must be dispatched to\n"
-"\t\t    the same customer branch."
-msgstr ""
-
-#: sales/inquiry/sales_deliveries_view.php:169
-msgid "Delivery #"
-msgstr ""
-
-#: sales/inquiry/sales_deliveries_view.php:175
-msgid "Cust Ref"
-msgstr ""
-
-#: sales/inquiry/sales_deliveries_view.php:177
-msgid "Due By"
-msgstr ""
-
-#: sales/inquiry/sales_deliveries_view.php:178
-msgid "Delivery Total"
-msgstr ""
-
-#: sales/inquiry/sales_deliveries_view.php:180
-msgid "Batch"
-msgstr ""
-
-#: sales/inquiry/sales_deliveries_view.php:180
-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:125
-msgid "Dispatch"
-msgstr ""
-
-#: sales/inquiry/sales_orders_view.php:172
-msgid "Set this order as a template for direct deliveries/invoices"
-msgstr ""
-
-#: sales/inquiry/sales_orders_view.php:196
-msgid "Prepayment Invoice"
-msgstr ""
-
-#: sales/inquiry/sales_orders_view.php:196
-msgid "Final Invoice"
-msgstr ""
-
-#: sales/inquiry/sales_orders_view.php:254
-msgid "Show All:"
-msgstr ""
-
-#: sales/inquiry/sales_orders_view.php:272
-msgid "Order #"
-msgstr ""
-
-#: sales/inquiry/sales_orders_view.php:276
-#: sales/inquiry/sales_orders_view.php:290
-msgid "Cust Order Ref"
-msgstr ""
-
-#: sales/inquiry/sales_orders_view.php:279
-#: sales/inquiry/sales_orders_view.php:293
-msgid "Delivery To"
-msgstr ""
-
-#: sales/inquiry/sales_orders_view.php:286
-msgid "Quote #"
-msgstr ""
-
-#: sales/inquiry/sales_orders_view.php:291
-msgid "Quote Date"
-msgstr ""
-
-#: sales/inquiry/sales_orders_view.php:294
-msgid "Quote Total"
+msgid "Customer Currency"
 msgstr ""
 
 msgstr ""
 
-#: sales/inquiry/sales_orders_view.php:315
-msgid "New Payments"
+#: sales/view/view_receipt.php:48
+msgid "Into Bank Account"
 msgstr ""
 
 msgstr ""
 
-#: sales/inquiry/sales_orders_view.php:326
-msgid "Tmpl"
+#: sales/view/view_receipt.php:49
+msgid "Bank Amount"
 msgstr ""
 
 msgstr ""
 
-#: sales/includes/cart_class.inc:407
-msgid "You have to enter valid stock code or nonempty description"
+#: sales/view/view_receipt.php:56
+msgid "This customer payment has been voided."
 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:28
+msgid "View Sales Quotation"
 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:29
+#, php-format
+msgid "Sales Quotation #%d"
 msgstr ""
 
 msgstr ""
 
-#: sales/includes/db/recurrent_invoices_db.inc:158
-#, php-format
-msgid "Unknown %s price for '%s' in pricelist '%s'"
+#: sales/view/view_sales_order.php:33
+msgid "View Sales Order"
 msgstr ""
 
 msgstr ""
 
-#: sales/includes/db/sales_credit_db.inc:188
-msgid "Return"
+#: sales/view/view_sales_order.php:34
+#, php-format
+msgid "Sales Order #%d"
 msgstr ""
 
 msgstr ""
 
-#: sales/includes/db/sales_credit_db.inc:190
-msgid "Ex Inv:"
+#: sales/view/view_sales_order.php:49
+msgid "Order Information"
 msgstr ""
 
 msgstr ""
 
-#: sales/includes/db/sales_order_db.inc:103
-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:646
-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:581
-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:584
-#: sales/includes/ui/sales_order_ui.inc:616
-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:587
-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:594
-msgid "Delivery Details"
+#: sql/alter2.2.php:86
+msgid "Cannot query max sales order number."
 msgstr ""
 
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:599
-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:600
-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:604
-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:609
-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:630
-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:631
-msgid "Enter Valid until Date"
+#: sql/alter2.4.php:34
+msgid "Text collation optimization:"
 msgstr ""
 
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:632
-msgid "Deliver To:"
+#: sql/alter2.4.php:98
+msgid "Cannot update config_db.php file."
 msgstr ""
 
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:633
-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:636
-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:640
-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:641
-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:642
-msgid "Customer Reference:"
+#: sql/alter2.4rc1.php:36
+msgid "None (will be set later)"
 msgstr ""
 
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:643
-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
@@ -15732,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 ""
 
@@ -15839,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:98
-msgid "Cannot update config_db.php file."
+#: themes/canvas/renderer.php:113
+msgid "Bills Of Material"
 msgstr ""
 
 msgstr ""
 
-#: sql/alter2.4.php:138
-#, 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:231
-msgid "Convertion to utf8 done."
+#: themes/canvas/renderer.php:125
+msgid "Dimension Inquiry"
 msgstr ""
 
 msgstr ""
 
-#: sql/alter2.4.php:270
-#, 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 ""