Updated gettext template.
[fa-stable.git] / lang / new_language_template / LC_MESSAGES / empty.po
index 2b0d5ccdcf6b562d27d5aa7082932504f325fd2a..1c0e018cc1152bd7d482d9617d3e59ec83790bf4 100644 (file)
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-27 20:21+0200\n"
+"POT-Creation-Date: 2021-12-03 22:40+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: frontaccounting.php:75 frontaccounting.php:76
+#: frontaccounting.php:72 frontaccounting.php:73
 msgid "Main  Menu"
 msgstr ""
 
 msgid "Main  Menu"
 msgstr ""
 
-#: frontaccounting.php:77 access/logout.php:21 themes/default/renderer.php:73
+#: frontaccounting.php:74 access/logout.php:21 themes/default/renderer.php:73
 #: themes/default/renderer.php:87
 msgid "Logout"
 msgstr ""
 #: themes/default/renderer.php:87
 msgid "Logout"
 msgstr ""
@@ -30,59 +30,62 @@ msgstr ""
 msgid "Restricted access"
 msgstr ""
 
 msgid "Restricted access"
 msgstr ""
 
-#: access/login.php:27
+#: access/login.php:28
 msgid "Login as user: demouser and password: password"
 msgstr ""
 
 msgid "Login as user: demouser and password: password"
 msgstr ""
 
-#: access/login.php:31
+#: access/login.php:32
 msgid "Please login here"
 msgstr ""
 
 msgid "Please login here"
 msgstr ""
 
-#: access/login.php:33
+#: access/login.php:34
 msgid "or"
 msgstr ""
 
 msgid "or"
 msgstr ""
 
-#: access/login.php:33
+#: access/login.php:34
 msgid "request new password"
 msgstr ""
 
 msgid "request new password"
 msgstr ""
 
-#: access/login.php:39
+#: access/login.php:45
 msgid "Too many failed login attempts.<br>Please wait a while or try later."
 msgstr ""
 
 msgid "Too many failed login attempts.<br>Please wait a while or try later."
 msgstr ""
 
-#: access/login.php:53 access/login.php:84
+#: access/login.php:47
+msgid "Invalid password or username. Please, try again."
+msgstr ""
+
+#: access/login.php:57 access/login.php:89
 msgid "Authorization timeout"
 msgstr ""
 
 msgid "Authorization timeout"
 msgstr ""
 
-#: access/login.php:53 access/login.php:90
+#: access/login.php:57 access/login.php:94
 msgid "Login"
 msgstr ""
 
 msgid "Login"
 msgstr ""
 
-#: access/login.php:90 access/password_reset.php:61
+#: access/login.php:94 access/password_reset.php:61
 msgid "Version"
 msgstr ""
 
 msgid "Version"
 msgstr ""
 
-#: access/login.php:93
+#: access/login.php:98
 msgid "User name"
 msgstr ""
 
 msgid "User name"
 msgstr ""
 
-#: access/login.php:97 admin/users.php:200
+#: access/login.php:102 admin/users.php:202
 msgid "Password:"
 msgstr ""
 
 msgid "Password:"
 msgstr ""
 
-#: access/login.php:106 access/login.php:112 access/password_reset.php:69
+#: access/login.php:111 access/login.php:117 access/password_reset.php:69
 #: access/password_reset.php:75 admin/create_coy.php:247
 #: access/password_reset.php:75 admin/create_coy.php:247
-#: admin/create_coy.php:327 admin/inst_upgrade.php:63
-#: includes/sysnames.inc:208
+#: admin/create_coy.php:327 admin/inst_upgrade.php:63 includes/sysnames.inc:210
 msgid "Company"
 msgstr ""
 
 msgid "Company"
 msgstr ""
 
-#: access/login.php:120
+#: access/login.php:125
 msgid "Login -->"
 msgstr ""
 
 msgid "Login -->"
 msgstr ""
 
-#: access/login.php:155 access/password_reset.php:106
-#: admin/display_prefs.php:123 themes/default/renderer.php:136
+#: access/login.php:160 access/password_reset.php:106
+#: admin/display_prefs.php:125 themes/default/renderer.php:136
 msgid "Theme:"
 msgstr ""
 
 msgid "Theme:"
 msgstr ""
 
@@ -99,8 +102,8 @@ msgid "Password reset"
 msgstr ""
 
 #: access/password_reset.php:63 reporting/rep103.php:274
 msgstr ""
 
 #: access/password_reset.php:63 reporting/rep103.php:274
-#: reporting/rep106.php:94 reporting/rep205.php:186
-#: reporting/includes/header2.inc:112 sales/manage/sales_people.php:99
+#: reporting/rep106.php:95 reporting/rep205.php:186
+#: reporting/includes/header2.inc:110 sales/manage/sales_people.php:99
 msgid "Email"
 msgstr ""
 
 msgid "Email"
 msgstr ""
 
@@ -112,7 +115,7 @@ msgstr ""
 msgid "Attach Documents"
 msgstr ""
 
 msgid "Attach Documents"
 msgstr ""
 
-#: admin/attachments.php:83 admin/db/voiding_db.inc:28
+#: admin/attachments.php:85 admin/db/voiding_db.inc:28
 #: admin/db/voiding_db.inc:40 admin/db/voiding_db.inc:53
 #: admin/db/voiding_db.inc:65 admin/db/voiding_db.inc:71
 #: admin/db/voiding_db.inc:90 admin/db/voiding_db.inc:97
 #: admin/db/voiding_db.inc:40 admin/db/voiding_db.inc:53
 #: admin/db/voiding_db.inc:65 admin/db/voiding_db.inc:71
 #: admin/db/voiding_db.inc:90 admin/db/voiding_db.inc:97
@@ -120,28 +123,37 @@ msgstr ""
 msgid "Selected transaction does not exists."
 msgstr ""
 
 msgid "Selected transaction does not exists."
 msgstr ""
 
-#: admin/attachments.php:85 admin/attachments.php:90
+#: admin/attachments.php:88
+msgid "Only graphics,pdf,doc and odt files are supported."
+msgstr ""
+
+#: admin/attachments.php:90 admin/attachments.php:95
 msgid "Select attachment file."
 msgstr ""
 
 msgid "Select attachment file."
 msgstr ""
 
-#: admin/attachments.php:88 admin/company_preferences.php:42
-#: inventory/manage/items.php:83
+#: admin/attachments.php:93 admin/company_preferences.php:73
+#: inventory/manage/items.php:129
 msgid "The file size is over the maximum allowed."
 msgstr ""
 
 msgid "The file size is over the maximum allowed."
 msgstr ""
 
-#: admin/attachments.php:131
+#: admin/attachments.php:97
+msgid ""
+"File name exceeds maximum of 60 chars. Please change filename and try again."
+msgstr ""
+
+#: admin/attachments.php:136
 msgid "Attachment has been inserted."
 msgstr ""
 
 msgid "Attachment has been inserted."
 msgstr ""
 
-#: admin/attachments.php:137
+#: admin/attachments.php:142
 msgid "Attachment has been updated."
 msgstr ""
 
 msgid "Attachment has been updated."
 msgstr ""
 
-#: admin/attachments.php:152
+#: admin/attachments.php:157
 msgid "Attachment has been deleted."
 msgstr ""
 
 msgid "Attachment has been deleted."
 msgstr ""
 
-#: admin/attachments.php:170 admin/view_print_transaction.php:72
+#: admin/attachments.php:179 admin/view_print_transaction.php:72
 #: gl/inquiry/journal_inquiry.php:47
 #: manufacturing/work_order_add_finished.php:191
 #: manufacturing/work_order_costs.php:136
 #: gl/inquiry/journal_inquiry.php:47
 #: manufacturing/work_order_add_finished.php:191
 #: manufacturing/work_order_costs.php:136
@@ -152,29 +164,46 @@ msgstr ""
 msgid "Type:"
 msgstr ""
 
 msgid "Type:"
 msgstr ""
 
-#: admin/attachments.php:186 admin/create_coy.php:269
+#: admin/attachments.php:184 sales/allocations/customer_allocation_main.php:32
+#: sales/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/sales_orders_view.php:237
+msgid "Select a customer: "
+msgstr ""
+
+#: admin/attachments.php:186 purchasing/manage/suppliers.php:302
+#: purchasing/inquiry/po_search_completed.php:104
+#: purchasing/inquiry/po_search.php:76
+#: purchasing/inquiry/supplier_allocation_inquiry.php:48
+msgid "Select a supplier: "
+msgstr ""
+
+#: admin/attachments.php:201 admin/create_coy.php:269
 #: admin/crm_categories.php:106 admin/fiscalyears.php:164
 #: admin/inst_lang.php:100 admin/payment_terms.php:142 admin/printers.php:96
 #: admin/crm_categories.php:106 admin/fiscalyears.php:164
 #: admin/inst_lang.php:100 admin/payment_terms.php:142 admin/printers.php:96
-#: admin/shipping_companies.php:106 admin/tags.php:140 admin/users.php:153
-#: dimensions/inquiry/search_dimensions.php:116
-#: gl/manage/bank_accounts.php:133 gl/manage/currencies.php:164
-#: gl/manage/exchange_rates.php:94 gl/manage/gl_account_classes.php:131
-#: gl/manage/gl_account_types.php:153 gl/manage/gl_quick_entries.php:201
-#: gl/manage/gl_quick_entries.php:303 gl/includes/ui/gl_bank_ui.inc:179
-#: gl/includes/ui/gl_journal_ui.inc:150 includes/ui/class.crud_view.inc:281
+#: admin/shipping_companies.php:106 admin/tags.php:140 admin/users.php:155
+#: dimensions/inquiry/search_dimensions.php:117 gl/manage/bank_accounts.php:133
+#: gl/manage/currencies.php:164 gl/manage/exchange_rates.php:94
+#: gl/manage/gl_account_classes.php:131 gl/manage/gl_account_types.php:159
+#: gl/manage/gl_quick_entries.php:201 gl/manage/gl_quick_entries.php:303
+#: gl/includes/ui/gl_bank_ui.inc:179 gl/includes/ui/gl_journal_ui.inc:160
+#: includes/ui/attachment.inc:94 includes/ui/class.crud_view.inc:290
 #: includes/ui/contacts_view.inc:61 includes/ui/simple_crud_class.inc:52
 #: includes/ui/contacts_view.inc:61 includes/ui/simple_crud_class.inc:52
-#: includes/ui/ui_view.inc:1547 inventory/prices.php:163
-#: inventory/purchasing_data.php:167
-#: inventory/includes/item_adjustments_ui.inc:100
-#: inventory/includes/stock_transfers_ui.inc:83
-#: inventory/manage/item_categories.php:147
-#: inventory/manage/item_codes.php:142 inventory/manage/item_units.php:110
-#: inventory/manage/locations.php:170 inventory/manage/sales_kits.php:51
-#: manufacturing/manage/bom_edit.php:59
+#: 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/manage/sales_kits.php:51 manufacturing/manage/bom_edit.php:60
 #: manufacturing/manage/work_centres.php:114
 #: manufacturing/includes/work_order_issue_ui.inc:61
 #: manufacturing/manage/work_centres.php:114
 #: manufacturing/includes/work_order_issue_ui.inc:61
+#: purchasing/includes/ui/invoice_ui.inc:319
 #: purchasing/includes/ui/invoice_ui.inc:551
 #: purchasing/includes/ui/invoice_ui.inc:551
-#: purchasing/includes/ui/po_ui.inc:249 sales/manage/credit_status.php:119
+#: purchasing/includes/ui/po_ui.inc:253 sales/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/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
@@ -185,37 +214,38 @@ msgstr ""
 msgid "Edit"
 msgstr ""
 
 msgid "Edit"
 msgstr ""
 
-#: admin/attachments.php:191 gl/inquiry/journal_inquiry.php:116
+#: admin/attachments.php:206 gl/inquiry/journal_inquiry.php:122
 msgid "View"
 msgstr ""
 
 msgid "View"
 msgstr ""
 
-#: admin/attachments.php:196
+#: admin/attachments.php:211 includes/ui/attachment.inc:96
 msgid "Download"
 msgstr ""
 
 msgid "Download"
 msgstr ""
 
-#: admin/attachments.php:201 admin/create_coy.php:272
+#: admin/attachments.php:216 admin/create_coy.php:272
 #: admin/crm_categories.php:110 admin/fiscalyears.php:166
 #: admin/crm_categories.php:110 admin/fiscalyears.php:166
-#: admin/inst_chart.php:83 admin/inst_lang.php:109 admin/inst_module.php:142
+#: admin/inst_chart.php:90 admin/inst_lang.php:109 admin/inst_module.php:152
 #: admin/inst_theme.php:87 admin/payment_terms.php:143 admin/printers.php:97
 #: admin/inst_theme.php:87 admin/payment_terms.php:143 admin/printers.php:97
-#: admin/shipping_companies.php:107 admin/tags.php:141 admin/users.php:155
+#: admin/shipping_companies.php:107 admin/tags.php:141 admin/users.php:157
 #: gl/gl_budget.php:136 gl/manage/bank_accounts.php:134
 #: gl/manage/currencies.php:166 gl/manage/exchange_rates.php:99
 #: gl/gl_budget.php:136 gl/manage/bank_accounts.php:134
 #: gl/manage/currencies.php:166 gl/manage/exchange_rates.php:99
-#: gl/manage/gl_account_classes.php:132 gl/manage/gl_account_types.php:154
+#: gl/manage/gl_account_classes.php:132 gl/manage/gl_account_types.php:160
 #: gl/manage/gl_quick_entries.php:202 gl/manage/gl_quick_entries.php:304
 #: gl/manage/gl_quick_entries.php:202 gl/manage/gl_quick_entries.php:304
-#: gl/includes/ui/gl_bank_ui.inc:181 gl/includes/ui/gl_journal_ui.inc:152
-#: includes/ui/class.crud_view.inc:285 includes/ui/contacts_view.inc:64
-#: includes/ui/simple_crud_class.inc:54 includes/ui/ui_input.inc:304
-#: inventory/prices.php:164 inventory/purchasing_data.php:168
-#: inventory/includes/item_adjustments_ui.inc:102
-#: inventory/includes/stock_transfers_ui.inc:84
-#: inventory/manage/item_categories.php:148
-#: inventory/manage/item_codes.php:143 inventory/manage/item_units.php:111
-#: inventory/manage/locations.php:171 inventory/manage/sales_kits.php:52
-#: manufacturing/manage/bom_edit.php:60
+#: gl/includes/ui/gl_bank_ui.inc:181 gl/includes/ui/gl_journal_ui.inc:162
+#: includes/ui/attachment.inc:98 includes/ui/class.crud_view.inc:294
+#: includes/ui/contacts_view.inc:64 includes/ui/simple_crud_class.inc:54
+#: includes/ui/ui_input.inc:305 inventory/prices.php:164
+#: inventory/purchasing_data.php:169
+#: 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/manage/sales_kits.php:52 manufacturing/manage/bom_edit.php:61
 #: manufacturing/manage/work_centres.php:115
 #: manufacturing/includes/work_order_issue_ui.inc:63
 #: purchasing/includes/ui/invoice_ui.inc:317
 #: manufacturing/manage/work_centres.php:115
 #: manufacturing/includes/work_order_issue_ui.inc:63
 #: purchasing/includes/ui/invoice_ui.inc:317
-#: purchasing/includes/ui/po_ui.inc:251 sales/manage/credit_status.php:120
+#: purchasing/includes/ui/po_ui.inc:255 sales/manage/credit_status.php:120
 #: sales/manage/customer_branches.php:162
 #: sales/manage/recurrent_invoices.php:157 sales/manage/sales_areas.php:104
 #: sales/manage/sales_groups.php:100 sales/manage/sales_people.php:120
 #: sales/manage/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
@@ -226,14 +256,14 @@ msgstr ""
 msgid "Delete"
 msgstr ""
 
 msgid "Delete"
 msgstr ""
 
-#: admin/attachments.php:208 admin/view_print_transaction.php:126
-#: admin/void_transaction.php:180 dimensions/inquiry/search_dimensions.php:124
-#: dimensions/view/view_dimension.php:55 gl/bank_account_reconcile.php:231
-#: gl/inquiry/bank_inquiry.php:71 gl/inquiry/gl_account_inquiry.php:126
-#: gl/inquiry/journal_inquiry.php:106 gl/inquiry/journal_inquiry.php:121
-#: includes/ui/allocation_cart.inc:290
+#: 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
+#: 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
 #: inventory/inquiry/stock_movements.php:104
 #: inventory/inquiry/stock_movements.php:104
-#: manufacturing/search_work_orders.php:157
+#: manufacturing/search_work_orders.php:164
 #: manufacturing/includes/manufacturing_ui.inc:174
 #: manufacturing/includes/manufacturing_ui.inc:217
 #: manufacturing/includes/manufacturing_ui.inc:253
 #: manufacturing/includes/manufacturing_ui.inc:174
 #: manufacturing/includes/manufacturing_ui.inc:217
 #: manufacturing/includes/manufacturing_ui.inc:253
@@ -241,209 +271,212 @@ msgstr ""
 #: manufacturing/includes/manufacturing_ui.inc:295
 #: manufacturing/includes/manufacturing_ui.inc:346
 #: purchasing/view/view_po.php:115 purchasing/view/view_po.php:140
 #: manufacturing/includes/manufacturing_ui.inc:295
 #: manufacturing/includes/manufacturing_ui.inc:346
 #: purchasing/view/view_po.php:115 purchasing/view/view_po.php:140
-#: purchasing/inquiry/po_search_completed.php:110
+#: purchasing/inquiry/po_search_completed.php:119
 #: purchasing/inquiry/po_search.php:117
 #: purchasing/inquiry/supplier_allocation_inquiry.php:137
 #: purchasing/inquiry/po_search.php:117
 #: purchasing/inquiry/supplier_allocation_inquiry.php:137
-#: purchasing/inquiry/supplier_inquiry.php:171
+#: purchasing/inquiry/supplier_inquiry.php:174
 #: purchasing/allocations/supplier_allocation_main.php:95
 #: purchasing/allocations/supplier_allocation_main.php:95
-#: reporting/rep101.php:132 reporting/rep201.php:107 reporting/rep203.php:88
-#: reporting/rep306.php:141 reporting/rep601.php:79 reporting/rep602.php:80
-#: reporting/rep704.php:82 reporting/rep704.php:85 reporting/rep704.php:88
-#: reporting/rep710.php:78 reporting/includes/doctext.inc:166
-#: reporting/includes/doctext.inc:207 reporting/includes/doctext.inc:245
-#: sales/allocations/customer_allocation_main.php:88
-#: sales/view/view_sales_order.php:109 sales/view/view_sales_order.php:142
-#: sales/view/view_sales_order.php:179
-#: sales/inquiry/customer_allocation_inquiry.php:147
-#: sales/inquiry/customer_inquiry.php:193
+#: reporting/rep101.php:136 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/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_inquiry.php:200
 msgid "#"
 msgstr ""
 
 msgid "#"
 msgstr ""
 
-#: admin/attachments.php:209 admin/attachments.php:253
+#: admin/attachments.php:224 admin/attachments.php:276
 #: admin/crm_categories.php:88 admin/payment_terms.php:127
 #: admin/printers.php:84 admin/print_profiles.php:147
 #: 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
 #: admin/crm_categories.php:88 admin/payment_terms.php:127
 #: admin/printers.php:84 admin/print_profiles.php:147
 #: gl/inquiry/accounts_list.php:39 gl/inquiry/accounts_list.php:52
 #: gl/inquiry/tax_inquiry.php:80 gl/manage/gl_quick_entries.php:190
-#: gl/manage/gl_quick_entries.php:230 includes/dashboard.inc:526
-#: inventory/inquiry/stock_list.php:41 inventory/inquiry/stock_list.php:53
-#: inventory/manage/item_codes.php:127 inventory/manage/item_units.php:94
-#: inventory/manage/sales_kits.php:36 inventory/view/view_adjustment.php:54
-#: inventory/view/view_transfer.php:50 manufacturing/manage/bom_edit.php:43
+#: gl/manage/gl_quick_entries.php:230 includes/dashboard.inc:1062
+#: includes/dashboard.inc:1147 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
 #: manufacturing/includes/manufacturing_ui.inc:28
 #: purchasing/includes/ui/invoice_ui.inc:501
 #: manufacturing/includes/manufacturing_ui.inc:28
 #: purchasing/includes/ui/invoice_ui.inc:501
-#: purchasing/includes/ui/invoice_ui.inc:513
-#: purchasing/po_receive_items.php:62 reporting/rep104.php:109
-#: reporting/rep105.php:114 reporting/rep204.php:84 reporting/rep303.php:120
-#: reporting/rep303.php:126 reporting/rep304.php:127 reporting/rep305.php:106
-#: reporting/rep306.php:141 reporting/rep307.php:114 reporting/rep308.php:223
-#: reporting/rep309.php:99 reporting/rep401.php:71
-#: sales/create_recurrent_invoices.php:203 sales/manage/credit_status.php:97
-#: sales/manage/recurrent_invoices.php:128
-#: sales/inquiry/sales_orders_view.php:284
-#: sales/inquiry/sales_orders_view.php:288 taxes/tax_groups.php:126
+#: 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:207
+#: sales/manage/credit_status.php:97 sales/manage/recurrent_invoices.php:128
+#: sales/inquiry/sales_orders_view.php:290
+#: sales/inquiry/sales_orders_view.php:294 taxes/tax_groups.php:126
 #: taxes/tax_types.php:115
 msgid "Description"
 msgstr ""
 
 #: taxes/tax_types.php:115
 msgid "Description"
 msgstr ""
 
-#: admin/attachments.php:210 admin/backups.php:67 admin/backups.php:152
+#: admin/attachments.php:225 admin/backups.php:74 admin/backups.php:160
+#: includes/ui/attachment.inc:84
 msgid "Filename"
 msgstr ""
 
 msgid "Filename"
 msgstr ""
 
-#: admin/attachments.php:211
+#: admin/attachments.php:226 includes/ui/attachment.inc:84
 msgid "Size"
 msgstr ""
 
 msgid "Size"
 msgstr ""
 
-#: admin/attachments.php:212
+#: admin/attachments.php:227 includes/ui/attachment.inc:84
 msgid "Filetype"
 msgstr ""
 
 msgid "Filetype"
 msgstr ""
 
-#: admin/attachments.php:213
+#: admin/attachments.php:228
 msgid "Date Uploaded"
 msgstr ""
 
 msgid "Date Uploaded"
 msgstr ""
 
-#: admin/attachments.php:247 admin/attachments.php:252
+#: admin/attachments.php:268 admin/attachments.php:274
 msgid "Transaction #"
 msgstr ""
 
 msgid "Transaction #"
 msgstr ""
 
-#: admin/attachments.php:254
+#: admin/attachments.php:277
 msgid "Attached File"
 msgstr ""
 
 msgid "Attached File"
 msgstr ""
 
-#: admin/backups.php:21 admin/backups.php:40 admin/backups.php:118
-#: admin/backups.php:145 admin/backups.php:158 admin/backups.php:178
+#: admin/backups.php:21 admin/backups.php:47 admin/backups.php:125
+#: admin/backups.php:153 admin/backups.php:166 admin/backups.php:186
 msgid "Select backup file first."
 msgstr ""
 
 msgid "Select backup file first."
 msgstr ""
 
-#: admin/backups.php:43
+#: admin/backups.php:50
 msgid "Backup and Restore Database"
 msgstr ""
 
 msgid "Backup and Restore Database"
 msgstr ""
 
-#: admin/backups.php:52
+#: admin/backups.php:59
 msgid "Backup paths have not been set correctly."
 msgstr ""
 
 msgid "Backup paths have not been set correctly."
 msgstr ""
 
-#: admin/backups.php:53
+#: admin/backups.php:60
 msgid "Please contact System Administrator."
 msgstr ""
 
 msgid "Please contact System Administrator."
 msgstr ""
 
-#: admin/backups.php:54
+#: admin/backups.php:61
 msgid "cannot find backup directory"
 msgstr ""
 
 msgid "cannot find backup directory"
 msgstr ""
 
-#: admin/backups.php:66
+#: admin/backups.php:73
 msgid "Backup successfully generated."
 msgstr ""
 
 msgid "Backup successfully generated."
 msgstr ""
 
-#: admin/backups.php:69
+#: admin/backups.php:76
 msgid "Database backup failed."
 msgstr ""
 
 msgid "Database backup failed."
 msgstr ""
 
-#: admin/backups.php:102 admin/create_coy.php:268 admin/fiscalyears.php:155
+#: admin/backups.php:109 admin/create_coy.php:268 admin/fiscalyears.php:155
 #: admin/inst_lang.php:85 admin/inst_lang.php:97
 #: admin/inst_lang.php:85 admin/inst_lang.php:97
-#: dimensions/inquiry/search_dimensions.php:106
-#: gl/manage/bank_accounts.php:130 gl/manage/currencies.php:162
-#: gl/manage/gl_account_classes.php:126 gl/manage/gl_quick_entries.php:237
-#: includes/system_tests.inc:38 includes/system_tests.inc:113
-#: includes/system_tests.inc:126 includes/ui/class.reflines_crud.inc:56
-#: includes/ui/ui_lists.inc:1852 purchasing/manage/suppliers.php:122
-#: reporting/rep101.php:128 reporting/rep102.php:110 reporting/rep102.php:112
-#: reporting/rep104.php:103 reporting/rep106.php:81 reporting/rep114.php:74
-#: reporting/rep201.php:103 reporting/rep202.php:116 reporting/rep202.php:118
-#: reporting/rep203.php:84 reporting/rep303.php:112 reporting/rep303.php:116
-#: reporting/rep304.php:123 reporting/rep402.php:99 reporting/rep402.php:134
+#: dimensions/inquiry/search_dimensions.php:107 gl/manage/bank_accounts.php:130
+#: gl/manage/currencies.php:162 gl/manage/gl_account_classes.php:126
+#: gl/manage/gl_quick_entries.php:237 includes/system_tests.inc:41
+#: includes/system_tests.inc:116 includes/system_tests.inc:129
+#: includes/ui/class.reflines_crud.inc:56 includes/ui/ui_lists.inc:1877
+#: purchasing/manage/suppliers.php:232 reporting/rep101.php:121
+#: reporting/rep101.php:132 reporting/rep102.php:110 reporting/rep102.php:112
+#: reporting/rep104.php:103 reporting/rep106.php:82 reporting/rep114.php:74
+#: reporting/rep115.php:156 reporting/rep201.php:111 reporting/rep202.php: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 ""
 
 #: reporting/rep501.php:113 sales/manage/sales_points.php:94
 #: sales/manage/sales_points.php:95 sales/manage/sales_types.php:119
 #: taxes/item_tax_types.php:129
 msgid "No"
 msgstr ""
 
-#: admin/backups.php:142
+#: admin/backups.php:150
 msgid "Restore backup completed."
 msgstr ""
 
 msgid "Restore backup completed."
 msgstr ""
 
-#: admin/backups.php:151
+#: admin/backups.php:159
 msgid "File successfully deleted."
 msgstr ""
 
 msgid "File successfully deleted."
 msgstr ""
 
-#: admin/backups.php:156
+#: admin/backups.php:164
 msgid "Can't delete backup file."
 msgstr ""
 
 msgid "Can't delete backup file."
 msgstr ""
 
-#: admin/backups.php:168
+#: admin/backups.php:176
 msgid "You can only upload *.sql backup files"
 msgstr ""
 
 msgid "You can only upload *.sql backup files"
 msgstr ""
 
-#: admin/backups.php:170
+#: admin/backups.php:178
 msgid "Filename contains forbidden chars. Please rename file and try again."
 msgstr ""
 
 msgid "Filename contains forbidden chars. Please rename file and try again."
 msgstr ""
 
-#: admin/backups.php:173
+#: admin/backups.php:181
 msgid "File uploaded to backup directory"
 msgstr ""
 
 msgid "File uploaded to backup directory"
 msgstr ""
 
-#: admin/backups.php:176
+#: admin/backups.php:184
 msgid "File was not uploaded into the system."
 msgstr ""
 
 msgid "File was not uploaded into the system."
 msgstr ""
 
-#: admin/backups.php:185
+#: admin/backups.php:193
 msgid "Create backup"
 msgstr ""
 
 msgid "Create backup"
 msgstr ""
 
-#: admin/backups.php:186 sales/includes/ui/sales_order_ui.inc:581
-#: sales/includes/ui/sales_order_ui.inc:637
+#: admin/backups.php:194 sales/includes/ui/sales_order_ui.inc:588
+#: sales/includes/ui/sales_order_ui.inc:644
 msgid "Comments:"
 msgstr ""
 
 msgid "Comments:"
 msgstr ""
 
-#: admin/backups.php:187
+#: admin/backups.php:195
 msgid "Compression:"
 msgstr ""
 
 msgid "Compression:"
 msgstr ""
 
-#: admin/backups.php:189
+#: admin/backups.php:197
 msgid "Create Backup"
 msgstr ""
 
 msgid "Create Backup"
 msgstr ""
 
-#: admin/backups.php:191
+#: admin/backups.php:199
 msgid "Backup scripts maintenance"
 msgstr ""
 
 msgid "Backup scripts maintenance"
 msgstr ""
 
-#: admin/backups.php:197
+#: admin/backups.php:205
 msgid "View Backup"
 msgstr ""
 
 msgid "View Backup"
 msgstr ""
 
-#: admin/backups.php:198
+#: admin/backups.php:206
 msgid "Download Backup"
 msgstr ""
 
 msgid "Download Backup"
 msgstr ""
 
-#: admin/backups.php:199
+#: admin/backups.php:207
 msgid "Restore Backup"
 msgstr ""
 
 msgid "Restore Backup"
 msgstr ""
 
-#: admin/backups.php:200
+#: admin/backups.php:208
 msgid ""
 "You are about to restore database from backup file.\n"
 "Do you want to continue?"
 msgstr ""
 
 msgid ""
 "You are about to restore database from backup file.\n"
 "Do you want to continue?"
 msgstr ""
 
-#: admin/backups.php:202
+#: admin/backups.php:210
 msgid "Delete Backup"
 msgstr ""
 
 msgid "Delete Backup"
 msgstr ""
 
-#: admin/backups.php:204
+#: admin/backups.php:212
 #, php-format
 msgid ""
 "You are about to remove selected backup file.\n"
 "Do you want to continue ?"
 msgstr ""
 
 #, php-format
 msgid ""
 "You are about to remove selected backup file.\n"
 "Do you want to continue ?"
 msgstr ""
 
-#: admin/backups.php:210
+#: admin/backups.php:218
 msgid "Update security settings"
 msgstr ""
 
 msgid "Update security settings"
 msgstr ""
 
-#: admin/backups.php:211
+#: admin/backups.php:219
 msgid "Protect security settings"
 msgstr ""
 
 msgid "Protect security settings"
 msgstr ""
 
-#: admin/backups.php:215
+#: admin/backups.php:223
 msgid "Upload file"
 msgstr ""
 
 msgid "Upload file"
 msgstr ""
 
@@ -476,7 +509,7 @@ msgstr ""
 msgid "Your password has been updated."
 msgstr ""
 
 msgid "Your password has been updated."
 msgstr ""
 
-#: admin/change_current_user_password.php:85 admin/users.php:189
+#: admin/change_current_user_password.php:85 admin/users.php:191
 msgid "User login:"
 msgstr ""
 
 msgid "User login:"
 msgstr ""
 
@@ -500,237 +533,297 @@ msgstr ""
 msgid "Company Setup"
 msgstr ""
 
 msgid "Company Setup"
 msgstr ""
 
-#: admin/company_preferences.php:29
+#: admin/company_preferences.php:30
 msgid "Login timeout must be positive number not less than 10."
 msgstr ""
 
 msgid "Login timeout must be positive number not less than 10."
 msgstr ""
 
-#: admin/company_preferences.php:36
+#: admin/company_preferences.php:37
 msgid "The company name must be entered."
 msgstr ""
 
 msgid "The company name must be entered."
 msgstr ""
 
-#: admin/company_preferences.php:46
-msgid "Error uploading logo file."
+#: admin/company_preferences.php:42
+msgid "Tax Periods must be positive number."
+msgstr ""
+
+#: admin/company_preferences.php:48
+msgid "Tax Last Periods must be positive number."
+msgstr ""
+
+#: admin/company_preferences.php:54
+msgid "Round Calculated field must be a positive number."
 msgstr ""
 
 #: admin/company_preferences.php:60
 msgstr ""
 
 #: admin/company_preferences.php:60
+msgid "Max day range in Documents must be a positive number."
+msgstr ""
+
+#: admin/company_preferences.php:66
+msgid "Add Price from Std Cost field must be number."
+msgstr ""
+
+#: admin/company_preferences.php:77
+msgid "Error uploading logo file."
+msgstr ""
+
+#: admin/company_preferences.php:91
 msgid ""
 "Only jpg and png files are supported - a file extension of .jpg or .png is "
 "expected"
 msgstr ""
 
 msgid ""
 "Only jpg and png files are supported - a file extension of .jpg or .png is "
 "expected"
 msgstr ""
 
-#: admin/company_preferences.php:65 inventory/manage/items.php:109
+#: admin/company_preferences.php:96 inventory/manage/items.php:155
 msgid ""
 "The file size is over the maximum allowed. The maximum size allowed in KB is"
 msgstr ""
 
 msgid ""
 "The file size is over the maximum allowed. The maximum size allowed in KB is"
 msgstr ""
 
-#: admin/company_preferences.php:70 inventory/manage/items.php:99
-#: inventory/manage/items.php:114
+#: admin/company_preferences.php:101 inventory/manage/items.php:145
+#: inventory/manage/items.php:160
 msgid "Only graphics files can be uploaded"
 msgstr ""
 
 msgid "Only graphics files can be uploaded"
 msgstr ""
 
-#: admin/company_preferences.php:78 admin/company_preferences.php:99
-#: inventory/manage/items.php:122
+#: admin/company_preferences.php:109 admin/company_preferences.php:138
+#: inventory/manage/items.php:165
 msgid "The existing image could not be removed"
 msgstr ""
 
 msgid "The existing image could not be removed"
 msgstr ""
 
-#: admin/company_preferences.php:88
+#: admin/company_preferences.php:118
 msgid "Error uploading logo file"
 msgstr ""
 
 msgid "Error uploading logo file"
 msgstr ""
 
-#: admin/company_preferences.php:123
+#: admin/company_preferences.php:162
 msgid "Company setup has been updated."
 msgstr ""
 
 msgid "Company setup has been updated."
 msgstr ""
 
-#: admin/company_preferences.php:169
+#: admin/company_preferences.php:256
 msgid "General settings"
 msgstr ""
 
 msgid "General settings"
 msgstr ""
 
-#: admin/company_preferences.php:171
+#: admin/company_preferences.php:258
 msgid "Name (to appear on reports):"
 msgstr ""
 
 msgid "Name (to appear on reports):"
 msgstr ""
 
-#: admin/company_preferences.php:172 admin/shipping_companies.php:142
+#: admin/company_preferences.php:259 admin/shipping_companies.php:142
 #: includes/ui/contacts_view.inc:106 inventory/manage/locations.php:212
 #: includes/ui/contacts_view.inc:106 inventory/manage/locations.php:212
-#: sales/manage/customers.php:234 sales/includes/ui/sales_order_ui.inc:628
+#: sales/manage/customers.php:235 sales/includes/ui/sales_order_ui.inc:635
 msgid "Address:"
 msgstr ""
 
 msgid "Address:"
 msgstr ""
 
-#: admin/company_preferences.php:173
+#: admin/company_preferences.php:260
 msgid "Domicile:"
 msgstr ""
 
 msgid "Domicile:"
 msgstr ""
 
-#: admin/company_preferences.php:175 admin/shipping_companies.php:138
-#: purchasing/manage/suppliers.php:135 sales/manage/customer_branches.php:253
+#: admin/company_preferences.php:262 admin/shipping_companies.php:138
+#: purchasing/manage/suppliers.php:245 sales/manage/customer_branches.php:253
 msgid "Phone Number:"
 msgstr ""
 
 msgid "Phone Number:"
 msgstr ""
 
-#: admin/company_preferences.php:176 includes/ui/contacts_view.inc:101
-#: purchasing/manage/suppliers.php:138 sales/manage/customer_branches.php:255
-#: sales/manage/customers.php:258
+#: admin/company_preferences.php:263 includes/ui/contacts_view.inc:101
+#: purchasing/manage/suppliers.php:248 sales/manage/customer_branches.php:255
+#: sales/manage/customers.php:259
 msgid "Fax Number:"
 msgstr ""
 
 msgid "Fax Number:"
 msgstr ""
 
-#: admin/company_preferences.php:177 admin/users.php:211
+#: admin/company_preferences.php:264 admin/users.php:213
 msgid "Email Address:"
 msgstr ""
 
 msgid "Email Address:"
 msgstr ""
 
-#: admin/company_preferences.php:179
+#: admin/company_preferences.php:266
 msgid "BCC Address for all outgoing mails:"
 msgstr ""
 
 msgid "BCC Address for all outgoing mails:"
 msgstr ""
 
-#: admin/company_preferences.php:181
+#: admin/company_preferences.php:268
 msgid "Official Company Number:"
 msgstr ""
 
 msgid "Official Company Number:"
 msgstr ""
 
-#: admin/company_preferences.php:182 purchasing/manage/suppliers.php:95
-#: sales/manage/customers.php:236
+#: admin/company_preferences.php:269 purchasing/manage/suppliers.php:205
+#: sales/manage/customers.php:237
 msgid "GSTNo:"
 msgstr ""
 
 msgid "GSTNo:"
 msgstr ""
 
-#: admin/company_preferences.php:183
+#: admin/company_preferences.php:270
 msgid "Home Currency:"
 msgstr ""
 
 msgid "Home Currency:"
 msgstr ""
 
-#: admin/company_preferences.php:185
+#: admin/company_preferences.php:272
 msgid "Company Logo:"
 msgstr ""
 
 msgid "Company Logo:"
 msgstr ""
 
-#: admin/company_preferences.php:186
+#: admin/company_preferences.php:273
 msgid "New Company Logo (.jpg)"
 msgstr ""
 
 msgid "New Company Logo (.jpg)"
 msgstr ""
 
-#: admin/company_preferences.php:187
+#: admin/company_preferences.php:274
 msgid "Delete Company Logo:"
 msgstr ""
 
 msgid "Delete Company Logo:"
 msgstr ""
 
-#: admin/company_preferences.php:189
-msgid "Automatic Revaluation Currency Accounts"
+#: admin/company_preferences.php:276
+msgid "Time Zone on Reports"
 msgstr ""
 
 msgstr ""
 
-#: admin/company_preferences.php:190
-msgid "Time Zone on Reports"
+#: admin/company_preferences.php:277
+msgid "Company Logo on Reports"
 msgstr ""
 
 msgstr ""
 
-#: admin/company_preferences.php:191
+#: admin/company_preferences.php:278
+msgid "Use Barcodes on Stocks"
+msgstr ""
+
+#: admin/company_preferences.php:279
+msgid "Auto Increase of Document References"
+msgstr ""
+
+#: admin/company_preferences.php:280
+msgid "Use Dimensions on Recurrent Invoices"
+msgstr ""
+
+#: admin/company_preferences.php:281
+msgid "Use Long Descriptions on Invoices"
+msgstr ""
+
+#: admin/company_preferences.php:282
 msgid "Database Scheme Version"
 msgstr ""
 
 msgid "Database Scheme Version"
 msgstr ""
 
-#: admin/company_preferences.php:195
+#: admin/company_preferences.php:286
 msgid "General Ledger Settings"
 msgstr ""
 
 msgid "General Ledger Settings"
 msgstr ""
 
-#: admin/company_preferences.php:196 gl/gl_budget.php:62
+#: admin/company_preferences.php:287 gl/gl_budget.php:62
 msgid "Fiscal Year:"
 msgstr ""
 
 msgid "Fiscal Year:"
 msgstr ""
 
-#: admin/company_preferences.php:197
+#: admin/company_preferences.php:288
 msgid "Tax Periods:"
 msgstr ""
 
 msgid "Tax Periods:"
 msgstr ""
 
-#: admin/company_preferences.php:197
+#: admin/company_preferences.php:288
 msgid "Months."
 msgstr ""
 
 msgid "Months."
 msgstr ""
 
-#: admin/company_preferences.php:198
+#: admin/company_preferences.php:289
 msgid "Tax Last Period:"
 msgstr ""
 
 msgid "Tax Last Period:"
 msgstr ""
 
-#: admin/company_preferences.php:198
+#: admin/company_preferences.php:289
 msgid "Months back."
 msgstr ""
 
 msgid "Months back."
 msgstr ""
 
-#: admin/company_preferences.php:199
+#: admin/company_preferences.php:290
 msgid "Put alternative Tax Include on Docs"
 msgstr ""
 
 msgid "Put alternative Tax Include on Docs"
 msgstr ""
 
-#: admin/company_preferences.php:200
+#: admin/company_preferences.php:291
 msgid "Suppress Tax Rates on Docs"
 msgstr ""
 
 msgid "Suppress Tax Rates on Docs"
 msgstr ""
 
-#: admin/company_preferences.php:202
+#: admin/company_preferences.php:292
+msgid "Automatic Revaluation Currency Accounts"
+msgstr ""
+
+#: admin/company_preferences.php:294
 msgid "Sales Pricing"
 msgstr ""
 
 msgid "Sales Pricing"
 msgstr ""
 
-#: admin/company_preferences.php:203
+#: admin/company_preferences.php:295
 msgid "Base for auto price calculations:"
 msgstr ""
 
 msgid "Base for auto price calculations:"
 msgstr ""
 
-#: admin/company_preferences.php:204
+#: admin/company_preferences.php:296
 msgid "No base price list"
 msgstr ""
 
 msgid "No base price list"
 msgstr ""
 
-#: admin/company_preferences.php:206
+#: admin/company_preferences.php:298
 msgid "Add Price from Std Cost:"
 msgstr ""
 
 msgid "Add Price from Std Cost:"
 msgstr ""
 
-#: admin/company_preferences.php:208
+#: admin/company_preferences.php:300
 msgid "Round calculated prices to nearest:"
 msgstr ""
 
 msgid "Round calculated prices to nearest:"
 msgstr ""
 
-#: admin/company_preferences.php:212
+#: admin/company_preferences.php:304
 msgid "Optional Modules"
 msgstr ""
 
 msgid "Optional Modules"
 msgstr ""
 
-#: admin/company_preferences.php:213 includes/dashboard.inc:118
-#: reporting/reports_main.php:285
+#: admin/company_preferences.php:305 includes/dashboard.inc:317
+#: reporting/reports_main.php:316
 msgid "Manufacturing"
 msgstr ""
 
 msgid "Manufacturing"
 msgstr ""
 
-#: admin/company_preferences.php:214 includes/dashboard.inc:116
-#: inventory/manage/items.php:24 reporting/reports_main.php:308
+#: admin/company_preferences.php:306 includes/dashboard.inc:287
+#: includes/dashboard.inc:315 inventory/manage/items.php:25
+#: reporting/reports_main.php:340
 msgid "Fixed Assets"
 msgstr ""
 
 msgid "Fixed Assets"
 msgstr ""
 
-#: admin/company_preferences.php:215
+#: admin/company_preferences.php:307
 msgid "Use Dimensions:"
 msgstr ""
 
 msgid "Use Dimensions:"
 msgstr ""
 
-#: admin/company_preferences.php:217
+#: admin/company_preferences.php:309
 msgid "User Interface Options"
 msgstr ""
 
 msgid "User Interface Options"
 msgstr ""
 
-#: admin/company_preferences.php:219
+#: admin/company_preferences.php:311
+msgid "Short Name and Name in List"
+msgstr ""
+
+#: admin/company_preferences.php:312
+msgid "Open Print Dialog Direct on Reports"
+msgstr ""
+
+#: admin/company_preferences.php:313
 msgid "Search Item List"
 msgstr ""
 
 msgid "Search Item List"
 msgstr ""
 
-#: admin/company_preferences.php:220
+#: admin/company_preferences.php:314
 msgid "Search Customer List"
 msgstr ""
 
 msgid "Search Customer List"
 msgstr ""
 
-#: admin/company_preferences.php:221
+#: admin/company_preferences.php:315
 msgid "Search Supplier List"
 msgstr ""
 
 msgid "Search Supplier List"
 msgstr ""
 
-#: admin/company_preferences.php:222
+#: admin/company_preferences.php:316
 msgid "Login Timeout:"
 msgstr ""
 
 msgid "Login Timeout:"
 msgstr ""
 
-#: admin/company_preferences.php:222
+#: admin/company_preferences.php:316
 msgid "seconds"
 msgstr ""
 
 msgid "seconds"
 msgstr ""
 
-#: admin/company_preferences.php:227 admin/display_prefs.php:160
-#: admin/gl_setup.php:274 admin/inst_chart.php:77 admin/inst_lang.php:103
-#: admin/inst_module.php:136 admin/inst_module.php:154
-#: admin/inst_module.php:197 admin/inst_theme.php:81
-#: dimensions/dimension_entry.php:283 gl/gl_bank.php:409 gl/gl_budget.php:134
-#: gl/manage/gl_quick_entries.php:60 gl/includes/ui/gl_bank_ui.inc:267
-#: gl/includes/ui/gl_journal_ui.inc:267 includes/ui/class.crud_view.inc:289
-#: includes/ui/db_pager_view.inc:180 includes/ui/simple_crud_class.inc:56
-#: includes/ui/simple_crud_class.inc:225 includes/ui/ui_input.inc:226
-#: includes/ui/ui_input.inc:961 inventory/adjustments.php:255
-#: inventory/cost_update.php:150 inventory/reorder_level.php:111
-#: inventory/transfers.php:237 inventory/includes/item_adjustments_ui.inc:190
+#: admin/company_preferences.php:317
+msgid "Max day range in documents"
+msgstr ""
+
+#: admin/company_preferences.php:317
+msgid "days."
+msgstr ""
+
+#: admin/company_preferences.php:322 admin/display_prefs.php:162
+#: admin/gl_setup.php:309 admin/inst_chart.php:84 admin/inst_lang.php:103
+#: admin/inst_module.php:146 admin/inst_module.php:164
+#: admin/inst_module.php:207 admin/inst_theme.php:81
+#: dimensions/dimension_entry.php:283 gl/gl_bank.php:415 gl/gl_budget.php:134
+#: gl/manage/gl_quick_entries.php:60 gl/includes/ui/gl_bank_ui.inc:265
+#: gl/includes/ui/gl_journal_ui.inc:278 includes/ui/attachment.inc:169
+#: includes/ui/class.crud_view.inc:298 includes/ui/db_pager_view.inc:180
+#: includes/ui/simple_crud_class.inc:56 includes/ui/simple_crud_class.inc:225
+#: includes/ui/ui_input.inc:227 includes/ui/ui_input.inc: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/includes/ui/po_ui.inc:283 purchasing/includes/ui/po_ui.inc:436
+#: 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
 #: purchasing/po_receive_items.php:325 sales/credit_note_entry.php:284
 #: sales/customer_credit_invoice.php:376 sales/customer_delivery.php:527
-#: sales/customer_invoice.php:662 sales/inquiry/sales_orders_view.php:316
+#: sales/customer_invoice.php:662 sales/inquiry/sales_orders_view.php:323
 #: sales/includes/ui/sales_credit_ui.inc:288
 #: sales/includes/ui/sales_order_ui.inc:231
 #: sales/includes/ui/sales_credit_ui.inc:288
 #: sales/includes/ui/sales_order_ui.inc:231
-#: sales/includes/ui/sales_order_ui.inc:547
+#: sales/includes/ui/sales_order_ui.inc:554
 msgid "Update"
 msgstr ""
 
 msgid "Update"
 msgstr ""
 
@@ -848,28 +941,29 @@ msgstr ""
 msgid "Charset"
 msgstr ""
 
 msgid "Charset"
 msgstr ""
 
-#: admin/create_coy.php:248 admin/inst_lang.php:36
-#: admin/print_profiles.php:161 includes/ui/class.reflines_crud.inc:38
-#: purchasing/includes/ui/invoice_ui.inc:140
-#: purchasing/includes/ui/invoice_ui.inc:143
+#: admin/create_coy.php:248 admin/inst_lang.php:36 admin/print_profiles.php:161
+#: includes/ui/class.reflines_crud.inc:38
+#: purchasing/includes/ui/invoice_ui.inc:141
+#: purchasing/includes/ui/invoice_ui.inc:144
 #: purchasing/includes/ui/po_ui.inc:172 purchasing/includes/ui/po_ui.inc:174
 msgid "Default"
 msgstr ""
 
 #: admin/create_coy.php:268 admin/create_coy.php:351 admin/fiscalyears.php:159
 #: admin/inst_lang.php:85 admin/inst_lang.php:97
 #: purchasing/includes/ui/po_ui.inc:172 purchasing/includes/ui/po_ui.inc:174
 msgid "Default"
 msgstr ""
 
 #: admin/create_coy.php:268 admin/create_coy.php:351 admin/fiscalyears.php:159
 #: admin/inst_lang.php:85 admin/inst_lang.php:97
-#: dimensions/inquiry/search_dimensions.php:106
-#: gl/manage/bank_accounts.php:128 gl/manage/currencies.php:162
-#: gl/manage/gl_account_classes.php:126 gl/manage/gl_quick_entries.php:237
-#: includes/system_tests.inc:38 includes/system_tests.inc:113
-#: includes/system_tests.inc:126 includes/ui/class.reflines_crud.inc:56
-#: includes/ui/class.reflines_crud.inc:101 includes/ui/ui_lists.inc:1853
-#: purchasing/manage/suppliers.php:122 reporting/rep101.php:127
-#: reporting/rep102.php:109 reporting/rep102.php:111 reporting/rep104.php:105
-#: reporting/rep106.php:83 reporting/rep114.php:76 reporting/rep201.php:102
-#: reporting/rep202.php:115 reporting/rep202.php:117 reporting/rep203.php:83
-#: reporting/rep303.php:107 reporting/rep303.php:115 reporting/rep304.php:122
-#: reporting/rep402.php:99 reporting/rep501.php:111
+#: dimensions/inquiry/search_dimensions.php:107 gl/manage/bank_accounts.php:128
+#: gl/manage/currencies.php:162 gl/manage/gl_account_classes.php:126
+#: gl/manage/gl_quick_entries.php:237 includes/system_tests.inc:41
+#: includes/system_tests.inc:116 includes/system_tests.inc:129
+#: includes/ui/class.reflines_crud.inc:56
+#: includes/ui/class.reflines_crud.inc:101 includes/ui/ui_lists.inc:1878
+#: purchasing/manage/suppliers.php:232 reporting/rep101.php:120
+#: reporting/rep101.php:131 reporting/rep102.php:109 reporting/rep102.php:111
+#: reporting/rep104.php:105 reporting/rep106.php:84 reporting/rep114.php:76
+#: reporting/rep115.php:155 reporting/rep201.php:110 reporting/rep202.php:116
+#: reporting/rep202.php:118 reporting/rep203.php:83 reporting/rep206.php:110
+#: reporting/rep303.php:209 reporting/rep303.php:218 reporting/rep304.php:122
+#: reporting/rep402.php:131 reporting/rep402.php:132 reporting/rep501.php:111
 #: sales/manage/sales_points.php:94 sales/manage/sales_points.php:95
 #: sales/manage/sales_types.php:119 taxes/item_tax_types.php:133
 msgid "Yes"
 #: sales/manage/sales_points.php:94 sales/manage/sales_points.php:95
 #: sales/manage/sales_types.php:119 taxes/item_tax_types.php:133
 msgid "Yes"
@@ -912,11 +1006,11 @@ msgstr ""
 msgid "Database Collation:"
 msgstr ""
 
 msgid "Database Collation:"
 msgstr ""
 
-#: admin/create_coy.php:337 admin/inst_chart.php:71 admin/inst_chart.php:73
-#: admin/inst_lang.php:87 admin/inst_lang.php:90 admin/inst_module.php:125
+#: admin/create_coy.php:337 admin/inst_chart.php:78 admin/inst_chart.php:80
+#: admin/inst_lang.php:87 admin/inst_lang.php:90 admin/inst_module.php:135
 #: admin/inst_theme.php:76 admin/inst_theme.php:78
 #: admin/inst_theme.php:76 admin/inst_theme.php:78
-#: gl/manage/gl_account_types.php:189 includes/db/audit_trail_db.inc:127
-#: includes/ui/allocation_cart.inc:316 inventory/manage/items.php:446
+#: gl/manage/gl_account_types.php:195 includes/db/audit_trail_db.inc:128
+#: includes/ui/allocation_cart.inc:337 inventory/manage/items.php:467
 msgid "None"
 msgstr ""
 
 msgid "None"
 msgstr ""
 
@@ -985,7 +1079,7 @@ msgstr ""
 msgid "Category Description:"
 msgstr ""
 
 msgid "Category Description:"
 msgstr ""
 
-#: admin/dashboard.php:27 themes/default/renderer.php:70
+#: admin/dashboard.php:34 themes/default/renderer.php:70
 #: themes/default/renderer.php:78
 msgid "Dashboard"
 msgstr ""
 #: themes/default/renderer.php:78
 msgid "Dashboard"
 msgstr ""
@@ -998,164 +1092,164 @@ msgstr ""
 msgid "Query size must be integer and greater than zero."
 msgstr ""
 
 msgid "Query size must be integer and greater than zero."
 msgstr ""
 
-#: admin/display_prefs.php:61
+#: admin/display_prefs.php:63
 msgid ""
 "Display settings have been updated. Keep in mind that changed settings are "
 "restored on every login in demo mode."
 msgstr ""
 
 msgid ""
 "Display settings have been updated. Keep in mind that changed settings are "
 "restored on every login in demo mode."
 msgstr ""
 
-#: admin/display_prefs.php:63
+#: admin/display_prefs.php:65
 msgid "Display settings have been updated."
 msgstr ""
 
 msgid "Display settings have been updated."
 msgstr ""
 
-#: admin/display_prefs.php:72
+#: admin/display_prefs.php:74
 msgid "Decimal Places"
 msgstr ""
 
 msgid "Decimal Places"
 msgstr ""
 
-#: admin/display_prefs.php:74
+#: admin/display_prefs.php:76
 msgid "Prices/Amounts:"
 msgstr ""
 
 msgid "Prices/Amounts:"
 msgstr ""
 
-#: admin/display_prefs.php:75
+#: admin/display_prefs.php:77
 msgid "Quantities:"
 msgstr ""
 
 msgid "Quantities:"
 msgstr ""
 
-#: admin/display_prefs.php:76
+#: admin/display_prefs.php:78
 msgid "Exchange Rates:"
 msgstr ""
 
 msgid "Exchange Rates:"
 msgstr ""
 
-#: admin/display_prefs.php:77
+#: admin/display_prefs.php:79
 msgid "Percentages:"
 msgstr ""
 
 msgid "Percentages:"
 msgstr ""
 
-#: admin/display_prefs.php:79
+#: admin/display_prefs.php:81
 msgid "Date Format and Separators"
 msgstr ""
 
 msgid "Date Format and Separators"
 msgstr ""
 
-#: admin/display_prefs.php:81
+#: admin/display_prefs.php:83
 msgid "Date Format:"
 msgstr ""
 
 msgid "Date Format:"
 msgstr ""
 
-#: admin/display_prefs.php:83
+#: admin/display_prefs.php:85
 msgid "Date Separator:"
 msgstr ""
 
 msgid "Date Separator:"
 msgstr ""
 
-#: admin/display_prefs.php:88
+#: admin/display_prefs.php:90
 msgid "Thousand Separator:"
 msgstr ""
 
 msgid "Thousand Separator:"
 msgstr ""
 
-#: admin/display_prefs.php:93
+#: admin/display_prefs.php:95
 msgid "Decimal Separator:"
 msgstr ""
 
 msgid "Decimal Separator:"
 msgstr ""
 
-#: admin/display_prefs.php:98
+#: admin/display_prefs.php:100
 msgid "Use Date Picker"
 msgstr ""
 
 msgid "Use Date Picker"
 msgstr ""
 
-#: admin/display_prefs.php:103
+#: admin/display_prefs.php:105
 msgid "Reports"
 msgstr ""
 
 msgid "Reports"
 msgstr ""
 
-#: admin/display_prefs.php:105
+#: admin/display_prefs.php:107
 msgid "Save Report Selection Days:"
 msgstr ""
 
 msgid "Save Report Selection Days:"
 msgstr ""
 
-#: admin/display_prefs.php:107
+#: admin/display_prefs.php:109
 msgid "Default Report Destination:"
 msgstr ""
 
 msgid "Default Report Destination:"
 msgstr ""
 
-#: admin/display_prefs.php:108
+#: admin/display_prefs.php:110
 msgid "Excel"
 msgstr ""
 
 msgid "Excel"
 msgstr ""
 
-#: admin/display_prefs.php:108 reporting/includes/reports_classes.inc:235
+#: admin/display_prefs.php:110 reporting/includes/reports_classes.inc:237
 msgid "PDF/Printer"
 msgstr ""
 
 msgid "PDF/Printer"
 msgstr ""
 
-#: admin/display_prefs.php:110
+#: admin/display_prefs.php:112
 msgid "Default Report Orientation:"
 msgstr ""
 
 msgid "Default Report Orientation:"
 msgstr ""
 
-#: admin/display_prefs.php:111 reporting/includes/reports_classes.inc:242
+#: admin/display_prefs.php:113 reporting/includes/reports_classes.inc:244
 msgid "Landscape"
 msgstr ""
 
 msgid "Landscape"
 msgstr ""
 
-#: admin/display_prefs.php:111 reporting/includes/reports_classes.inc:242
+#: admin/display_prefs.php:113 reporting/includes/reports_classes.inc:244
 msgid "Portrait"
 msgstr ""
 
 msgid "Portrait"
 msgstr ""
 
-#: admin/display_prefs.php:115 applications/setup.php:42
-#: includes/sysnames.inc:99
+#: admin/display_prefs.php:117 applications/setup.php:42
+#: includes/sysnames.inc:101
 msgid "Miscellaneous"
 msgstr ""
 
 msgid "Miscellaneous"
 msgstr ""
 
-#: admin/display_prefs.php:117
+#: admin/display_prefs.php:119
 msgid "Show hints for new users:"
 msgstr ""
 
 msgid "Show hints for new users:"
 msgstr ""
 
-#: admin/display_prefs.php:119
+#: admin/display_prefs.php:121
 msgid "Show GL Information:"
 msgstr ""
 
 msgid "Show GL Information:"
 msgstr ""
 
-#: admin/display_prefs.php:121
+#: admin/display_prefs.php:123
 msgid "Show Item Codes:"
 msgstr ""
 
 msgid "Show Item Codes:"
 msgstr ""
 
-#: admin/display_prefs.php:128
+#: admin/display_prefs.php:130
 msgid "Page Size:"
 msgstr ""
 
 msgid "Page Size:"
 msgstr ""
 
-#: admin/display_prefs.php:130
+#: admin/display_prefs.php:132
 msgid "Start-up Tab"
 msgstr ""
 
 msgid "Start-up Tab"
 msgstr ""
 
-#: admin/display_prefs.php:138 admin/users.php:219
+#: admin/display_prefs.php:140 admin/users.php:221
 msgid "Printing profile"
 msgstr ""
 
 msgid "Printing profile"
 msgstr ""
 
-#: admin/display_prefs.php:139 admin/users.php:220
+#: admin/display_prefs.php:141 admin/users.php:222
 msgid "Browser printing support"
 msgstr ""
 
 msgid "Browser printing support"
 msgstr ""
 
-#: admin/display_prefs.php:141
+#: admin/display_prefs.php:143
 msgid "Use popup window to display reports:"
 msgstr ""
 
 msgid "Use popup window to display reports:"
 msgstr ""
 
-#: admin/display_prefs.php:142 admin/users.php:223
+#: admin/display_prefs.php:144 admin/users.php:225
 msgid "Set this option to on if your browser directly supports pdf files"
 msgstr ""
 
 msgid "Set this option to on if your browser directly supports pdf files"
 msgstr ""
 
-#: admin/display_prefs.php:144
+#: admin/display_prefs.php:146
 msgid "Use icons instead of text links:"
 msgstr ""
 
 msgid "Use icons instead of text links:"
 msgstr ""
 
-#: admin/display_prefs.php:145
+#: admin/display_prefs.php:147
 msgid "Set this option to on for using icons instead of text links"
 msgstr ""
 
 msgid "Set this option to on for using icons instead of text links"
 msgstr ""
 
-#: admin/display_prefs.php:147
+#: admin/display_prefs.php:149
 msgid "Remember last document date:"
 msgstr ""
 
 msgid "Remember last document date:"
 msgstr ""
 
-#: admin/display_prefs.php:148
+#: admin/display_prefs.php:150
 msgid ""
 "If set document date is remembered on subsequent documents, otherwise "
 "default is current date"
 msgstr ""
 
 msgid ""
 "If set document date is remembered on subsequent documents, otherwise "
 "default is current date"
 msgstr ""
 
-#: admin/display_prefs.php:150
+#: admin/display_prefs.php:152
 msgid "Query page size:"
 msgstr ""
 
 msgid "Query page size:"
 msgstr ""
 
-#: admin/display_prefs.php:152
+#: admin/display_prefs.php:154
 msgid "Transaction days:"
 msgstr ""
 
 msgid "Transaction days:"
 msgstr ""
 
-#: admin/display_prefs.php:154 admin/inst_lang.php:35
+#: admin/display_prefs.php:156 admin/inst_lang.php:35
 msgid "Language"
 msgstr ""
 
 msgid "Language"
 msgstr ""
 
-#: admin/display_prefs.php:156 admin/users.php:215
+#: admin/display_prefs.php:158 admin/users.php:217
 msgid "Language:"
 msgstr ""
 
 msgid "Language:"
 msgstr ""
 
@@ -1218,12 +1312,12 @@ msgstr ""
 msgid "Fiscal Year End"
 msgstr ""
 
 msgid "Fiscal Year End"
 msgstr ""
 
-#: admin/fiscalyears.php:138 dimensions/inquiry/search_dimensions.php:130
-#: dimensions/inquiry/search_dimensions.php:136 includes/ui/ui_lists.inc:743
-#: includes/ui/ui_view.inc:1546 manufacturing/search_work_orders.php:114
-#: reporting/rep402.php:103 reporting/rep501.php:87 reporting/rep710.php:113
+#: admin/fiscalyears.php:138 dimensions/inquiry/search_dimensions.php:137
+#: dimensions/inquiry/search_dimensions.php:144 includes/ui/ui_lists.inc:761
+#: includes/ui/ui_view.inc:1582 manufacturing/search_work_orders.php:116
+#: reporting/rep402.php:136 reporting/rep501.php:87 reporting/rep710.php:114
 #: reporting/includes/excel_report.inc:231
 #: reporting/includes/excel_report.inc:231
-#: reporting/includes/pdf_report.inc:267
+#: reporting/includes/pdf_report.inc:268
 msgid "Closed"
 msgstr ""
 
 msgid "Closed"
 msgstr ""
 
@@ -1259,105 +1353,122 @@ msgstr ""
 msgid "System and General GL Setup"
 msgstr ""
 
 msgid "System and General GL Setup"
 msgstr ""
 
-#: admin/gl_setup.php:34
-msgid "The delivery over-receive allowance must be between 0 and 100."
+#: admin/gl_setup.php:34 admin/gl_setup.php:83
+msgid "The past due days interval allowance must be between 0 and 100."
 msgstr ""
 
 #: admin/gl_setup.php:41
 msgstr ""
 
 #: admin/gl_setup.php:41
-msgid "The invoice over-charge allowance must be between 0 and 100."
+msgid "Quote Valid Days is not valid number."
 msgstr ""
 
 #: admin/gl_setup.php:48
 msgstr ""
 
 #: admin/gl_setup.php:48
-msgid "The past due days interval allowance must be between 0 and 100."
+msgid "Delivery Required By is not valid number."
+msgstr ""
+
+#: admin/gl_setup.php:55
+msgid "Receival Required By is not valid number."
+msgstr ""
+
+#: admin/gl_setup.php:62
+msgid "Work Order Required By After is not valid number."
+msgstr ""
+
+#: admin/gl_setup.php:69
+msgid "The delivery over-receive allowance must be between 0 and 100."
 msgstr ""
 
 msgstr ""
 
-#: admin/gl_setup.php:59
+#: admin/gl_setup.php:76
+msgid "The invoice over-charge allowance must be between 0 and 100."
+msgstr ""
+
+#: admin/gl_setup.php:94
 msgid "Before GRN Clearing Account can be changed all GRNs have to be invoiced"
 msgstr ""
 
 msgid "Before GRN Clearing Account can be changed all GRNs have to be invoiced"
 msgstr ""
 
-#: admin/gl_setup.php:66 admin/db/fiscalyears_db.inc:142
+#: admin/gl_setup.php:101 admin/db/fiscalyears_db.inc:142
 msgid ""
 "The Retained Earnings Account should be a Balance Account or the Profit and "
 "Loss Year Account should be an Expense Account (preferred the last one in "
 "the Expense Class)"
 msgstr ""
 
 msgid ""
 "The Retained Earnings Account should be a Balance Account or the Profit and "
 "Loss Year Account should be an Expense Account (preferred the last one in "
 "the Expense Class)"
 msgstr ""
 
-#: admin/gl_setup.php:89
+#: admin/gl_setup.php:124
 msgid "The general GL setup has been updated."
 msgstr ""
 
 msgid "The general GL setup has been updated."
 msgstr ""
 
-#: admin/gl_setup.php:154
+#: admin/gl_setup.php:189
 msgid "General GL"
 msgstr ""
 
 msgid "General GL"
 msgstr ""
 
-#: admin/gl_setup.php:156
+#: admin/gl_setup.php:191
 msgid "Past Due Days Interval:"
 msgstr ""
 
 msgid "Past Due Days Interval:"
 msgstr ""
 
-#: admin/gl_setup.php:156 admin/gl_setup.php:174 admin/gl_setup.php:208
-#: admin/gl_setup.php:210 admin/gl_setup.php:230 admin/gl_setup.php:268
+#: admin/gl_setup.php:191 admin/gl_setup.php:209 admin/gl_setup.php:243
+#: admin/gl_setup.php:245 admin/gl_setup.php:265 admin/gl_setup.php:303
 #: admin/payment_terms.php:140
 msgid "days"
 msgstr ""
 
 #: admin/payment_terms.php:140
 msgid "days"
 msgstr ""
 
-#: admin/gl_setup.php:158
+#: admin/gl_setup.php:193
 msgid "Accounts Type:"
 msgstr ""
 
 msgid "Accounts Type:"
 msgstr ""
 
-#: admin/gl_setup.php:160
+#: admin/gl_setup.php:195
 msgid "Retained Earnings:"
 msgstr ""
 
 msgid "Retained Earnings:"
 msgstr ""
 
-#: admin/gl_setup.php:162
+#: admin/gl_setup.php:197
 msgid "Profit/Loss Year:"
 msgstr ""
 
 msgid "Profit/Loss Year:"
 msgstr ""
 
-#: admin/gl_setup.php:164
+#: admin/gl_setup.php:199
 msgid "Exchange Variances Account:"
 msgstr ""
 
 msgid "Exchange Variances Account:"
 msgstr ""
 
-#: admin/gl_setup.php:166 gl/manage/bank_accounts.php:194
+#: admin/gl_setup.php:201 gl/manage/bank_accounts.php:194
 msgid "Bank Charges Account:"
 msgstr ""
 
 msgid "Bank Charges Account:"
 msgstr ""
 
-#: admin/gl_setup.php:168
+#: admin/gl_setup.php:203
 msgid "Tax Algorithm:"
 msgstr ""
 
 msgid "Tax Algorithm:"
 msgstr ""
 
-#: admin/gl_setup.php:172
+#: admin/gl_setup.php:207
 msgid "Dimension Defaults"
 msgstr ""
 
 msgid "Dimension Defaults"
 msgstr ""
 
-#: admin/gl_setup.php:174
+#: admin/gl_setup.php:209
 msgid "Dimension Required By After:"
 msgstr ""
 
 msgid "Dimension Required By After:"
 msgstr ""
 
-#: admin/gl_setup.php:178
+#: admin/gl_setup.php:213
 msgid "Customers and Sales"
 msgstr ""
 
 msgid "Customers and Sales"
 msgstr ""
 
-#: admin/gl_setup.php:180
+#: admin/gl_setup.php:215
 msgid "Default Credit Limit:"
 msgstr ""
 
 msgid "Default Credit Limit:"
 msgstr ""
 
-#: admin/gl_setup.php:182
+#: admin/gl_setup.php:217
 msgid "Invoice Identification:"
 msgstr ""
 
 msgid "Invoice Identification:"
 msgstr ""
 
-#: admin/gl_setup.php:182 gl/manage/bank_accounts.php:110
-#: includes/ui/ui_view.inc:546
+#: admin/gl_setup.php:217 gl/manage/bank_accounts.php:110
+#: includes/ui/ui_view.inc:552
 msgid "Number"
 msgstr ""
 
 msgid "Number"
 msgstr ""
 
-#: admin/gl_setup.php:182 admin/view_print_transaction.php:127
-#: admin/void_transaction.php:181 dimensions/inquiry/search_dimensions.php:125
-#: dimensions/view/view_dimension.php:55 gl/bank_account_reconcile.php:232
-#: gl/inquiry/bank_inquiry.php:71 gl/inquiry/journal_inquiry.php:112
-#: gl/view/bank_transfer_view.php:86 gl/view/gl_deposit_view.php:80
-#: gl/view/gl_payment_view.php:78 gl/view/gl_trans_view.php:38
-#: includes/ui/contacts_view.inc:40 inventory/inquiry/stock_movements.php:104
+#: admin/gl_setup.php:217 admin/view_print_transaction.php:127
+#: admin/void_transaction.php:187 dimensions/inquiry/search_dimensions.php:132
+#: dimensions/view/view_dimension.php:55 gl/bank_account_reconcile.php:268
+#: gl/inquiry/bank_inquiry.php:71 gl/inquiry/gl_account_inquiry.php:128
+#: gl/inquiry/journal_inquiry.php:118 gl/view/bank_transfer_view.php:86
+#: gl/view/gl_deposit_view.php:80 gl/view/gl_payment_view.php:78
+#: gl/view/gl_trans_view.php:38 includes/ui/contacts_view.inc:40
+#: inventory/inquiry/stock_movements.php:104
 #: inventory/view/view_adjustment.php:43 inventory/view/view_transfer.php:36
 #: inventory/view/view_adjustment.php:43 inventory/view/view_transfer.php:36
-#: manufacturing/search_work_orders.php:158
+#: manufacturing/search_work_orders.php:165
 #: manufacturing/view/wo_issue_view.php:42
 #: manufacturing/view/wo_production_view.php:43
 #: manufacturing/includes/manufacturing_ui.inc:174
 #: manufacturing/view/wo_issue_view.php:42
 #: manufacturing/view/wo_production_view.php:43
 #: manufacturing/includes/manufacturing_ui.inc:174
@@ -1366,203 +1477,203 @@ msgstr ""
 #: manufacturing/includes/manufacturing_ui.inc:295
 #: manufacturing/includes/manufacturing_ui.inc:346
 #: purchasing/includes/ui/grn_ui.inc:32 purchasing/includes/ui/grn_ui.inc:64
 #: manufacturing/includes/manufacturing_ui.inc:295
 #: manufacturing/includes/manufacturing_ui.inc:346
 #: purchasing/includes/ui/grn_ui.inc:32 purchasing/includes/ui/grn_ui.inc:64
-#: purchasing/includes/ui/po_ui.inc:298 purchasing/view/view_po.php:115
+#: purchasing/includes/ui/po_ui.inc:302 purchasing/view/view_po.php:115
 #: purchasing/view/view_supp_credit.php:43
 #: purchasing/view/view_supp_invoice.php:47
 #: purchasing/view/view_supp_payment.php:73
 #: purchasing/view/view_supp_credit.php:43
 #: purchasing/view/view_supp_invoice.php:47
 #: purchasing/view/view_supp_payment.php:73
-#: purchasing/inquiry/po_search_completed.php:111
+#: purchasing/inquiry/po_search_completed.php:120
 #: purchasing/inquiry/po_search.php:118
 #: purchasing/inquiry/supplier_allocation_inquiry.php:138
 #: purchasing/inquiry/po_search.php:118
 #: purchasing/inquiry/supplier_allocation_inquiry.php:138
-#: purchasing/inquiry/supplier_inquiry.php:172
+#: purchasing/inquiry/supplier_inquiry.php:175
 #: purchasing/allocations/supplier_allocation_main.php:96
 #: purchasing/allocations/supplier_allocation_main.php:96
-#: reporting/rep501.php:87 reporting/rep601.php:79 reporting/rep602.php:80
-#: reporting/rep702.php:53 reporting/includes/doctext.inc:220
+#: reporting/rep501.php:87 reporting/rep601.php:81 reporting/rep602.php:80
+#: reporting/rep702.php:53 reporting/includes/doctext.inc:222
 #: sales/customer_credit_invoice.php:241 sales/customer_credit_invoice.php:246
 #: sales/customer_delivery.php:333 sales/customer_delivery.php:338
 #: sales/customer_invoice.php:445 sales/customer_invoice.php:450
 #: sales/customer_credit_invoice.php:241 sales/customer_credit_invoice.php:246
 #: sales/customer_delivery.php:333 sales/customer_delivery.php:338
 #: sales/customer_invoice.php:445 sales/customer_invoice.php:450
-#: sales/allocations/customer_allocation_main.php:89
+#: sales/allocations/customer_allocation_main.php:94
 #: sales/view/view_dispatch.php:85 sales/view/view_invoice.php:85
 #: sales/view/view_dispatch.php:85 sales/view/view_invoice.php:85
-#: sales/view/view_receipt.php:39 sales/view/view_sales_order.php:94
-#: sales/inquiry/customer_allocation_inquiry.php:148
-#: sales/inquiry/customer_inquiry.php:195
-#: sales/inquiry/sales_deliveries_view.php:173
+#: 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
 msgid "Reference"
 msgstr ""
 
 #: sales/includes/ui/sales_credit_ui.inc:81
 #: sales/includes/ui/sales_credit_ui.inc:83
 #: sales/includes/ui/sales_order_ui.inc:361
 msgid "Reference"
 msgstr ""
 
-#: admin/gl_setup.php:184
+#: admin/gl_setup.php:219
 msgid "Accumulate batch shipping:"
 msgstr ""
 
 msgid "Accumulate batch shipping:"
 msgstr ""
 
-#: admin/gl_setup.php:186
+#: admin/gl_setup.php:221
 msgid "Print Item Image on Quote:"
 msgstr ""
 
 msgid "Print Item Image on Quote:"
 msgstr ""
 
-#: admin/gl_setup.php:188
+#: admin/gl_setup.php:223
 msgid "Legal Text on Invoice:"
 msgstr ""
 
 msgid "Legal Text on Invoice:"
 msgstr ""
 
-#: admin/gl_setup.php:190
+#: admin/gl_setup.php:225
 msgid "Shipping Charged Account:"
 msgstr ""
 
 msgid "Shipping Charged Account:"
 msgstr ""
 
-#: admin/gl_setup.php:192
+#: admin/gl_setup.php:227
 msgid "Deferred Income Account:"
 msgstr ""
 
 msgid "Deferred Income Account:"
 msgstr ""
 
-#: admin/gl_setup.php:193
+#: admin/gl_setup.php:228
 msgid "Not used"
 msgstr ""
 
 msgid "Not used"
 msgstr ""
 
-#: admin/gl_setup.php:197
+#: admin/gl_setup.php:232
 msgid "Customers and Sales Defaults"
 msgstr ""
 
 msgid "Customers and Sales Defaults"
 msgstr ""
 
-#: admin/gl_setup.php:199
+#: admin/gl_setup.php:234
 msgid "Receivable Account:"
 msgstr ""
 
 msgid "Receivable Account:"
 msgstr ""
 
-#: admin/gl_setup.php:201 admin/gl_setup.php:246
-#: inventory/manage/item_categories.php:228 inventory/manage/items.php:468
+#: admin/gl_setup.php:236 admin/gl_setup.php:281
+#: inventory/manage/item_categories.php:228 inventory/manage/items.php:489
 #: sales/manage/customer_branches.php:242
 msgid "Sales Account:"
 msgstr ""
 
 #: sales/manage/customer_branches.php:242
 msgid "Sales Account:"
 msgstr ""
 
-#: admin/gl_setup.php:204 sales/manage/customer_branches.php:243
+#: admin/gl_setup.php:239 sales/manage/customer_branches.php:243
 msgid "Sales Discount Account:"
 msgstr ""
 
 msgid "Sales Discount Account:"
 msgstr ""
 
-#: admin/gl_setup.php:206 sales/manage/customer_branches.php:245
+#: admin/gl_setup.php:241 sales/manage/customer_branches.php:245
 msgid "Prompt Payment Discount Account:"
 msgstr ""
 
 msgid "Prompt Payment Discount Account:"
 msgstr ""
 
-#: admin/gl_setup.php:208
+#: admin/gl_setup.php:243
 msgid "Quote Valid Days:"
 msgstr ""
 
 msgid "Quote Valid Days:"
 msgstr ""
 
-#: admin/gl_setup.php:210
+#: admin/gl_setup.php:245
 msgid "Delivery Required By:"
 msgstr ""
 
 msgid "Delivery Required By:"
 msgstr ""
 
-#: admin/gl_setup.php:216
+#: admin/gl_setup.php:251
 msgid "Suppliers and Purchasing"
 msgstr ""
 
 msgid "Suppliers and Purchasing"
 msgstr ""
 
-#: admin/gl_setup.php:218
+#: admin/gl_setup.php:253
 msgid "Delivery Over-Receive Allowance:"
 msgstr ""
 
 msgid "Delivery Over-Receive Allowance:"
 msgstr ""
 
-#: admin/gl_setup.php:220
+#: admin/gl_setup.php:255
 msgid "Invoice Over-Charge Allowance:"
 msgstr ""
 
 msgid "Invoice Over-Charge Allowance:"
 msgstr ""
 
-#: admin/gl_setup.php:222
+#: admin/gl_setup.php:257
 msgid "Suppliers and Purchasing Defaults"
 msgstr ""
 
 msgid "Suppliers and Purchasing Defaults"
 msgstr ""
 
-#: admin/gl_setup.php:224
+#: admin/gl_setup.php:259
 msgid "Payable Account:"
 msgstr ""
 
 msgid "Payable Account:"
 msgstr ""
 
-#: admin/gl_setup.php:226 purchasing/manage/suppliers.php:131
+#: admin/gl_setup.php:261 purchasing/manage/suppliers.php:241
 msgid "Purchase Discount Account:"
 msgstr ""
 
 msgid "Purchase Discount Account:"
 msgstr ""
 
-#: admin/gl_setup.php:228
+#: admin/gl_setup.php:263
 msgid "GRN Clearing Account:"
 msgstr ""
 
 msgid "GRN Clearing Account:"
 msgstr ""
 
-#: admin/gl_setup.php:228
+#: admin/gl_setup.php:263
 msgid "No postings on GRN"
 msgstr ""
 
 msgid "No postings on GRN"
 msgstr ""
 
-#: admin/gl_setup.php:230
+#: admin/gl_setup.php:265
 msgid "Receival Required By:"
 msgstr ""
 
 msgid "Receival Required By:"
 msgstr ""
 
-#: admin/gl_setup.php:232
+#: admin/gl_setup.php:267
 msgid "Show PO item codes:"
 msgstr ""
 
 msgid "Show PO item codes:"
 msgstr ""
 
-#: admin/gl_setup.php:234 reporting/reports_main.php:208
+#: admin/gl_setup.php:269 reporting/reports_main.php:229
 msgid "Inventory"
 msgstr ""
 
 msgid "Inventory"
 msgstr ""
 
-#: admin/gl_setup.php:236
+#: admin/gl_setup.php:271
 msgid "Allow Negative Inventory:"
 msgstr ""
 
 msgid "Allow Negative Inventory:"
 msgstr ""
 
-#: admin/gl_setup.php:237
+#: admin/gl_setup.php:272
 msgid "Warning:  This may cause a delay in GL postings"
 msgstr ""
 
 msgid "Warning:  This may cause a delay in GL postings"
 msgstr ""
 
-#: admin/gl_setup.php:239
+#: admin/gl_setup.php:274
 msgid "No zero-amounts (Service):"
 msgstr ""
 
 msgid "No zero-amounts (Service):"
 msgstr ""
 
-#: admin/gl_setup.php:241
+#: admin/gl_setup.php:276
 msgid "Location Notifications:"
 msgstr ""
 
 msgid "Location Notifications:"
 msgstr ""
 
-#: admin/gl_setup.php:243
+#: admin/gl_setup.php:278
 msgid "Allow Negative Prices:"
 msgstr ""
 
 msgid "Allow Negative Prices:"
 msgstr ""
 
-#: admin/gl_setup.php:245
+#: admin/gl_setup.php:280
 msgid "Items Defaults"
 msgstr ""
 
 msgid "Items Defaults"
 msgstr ""
 
-#: admin/gl_setup.php:248 inventory/manage/item_categories.php:244
-#: inventory/manage/items.php:477
+#: admin/gl_setup.php:283 inventory/manage/item_categories.php:244
+#: inventory/manage/items.php:498
 msgid "Inventory Account:"
 msgstr ""
 
 msgid "Inventory Account:"
 msgstr ""
 
-#: admin/gl_setup.php:250 inventory/manage/item_categories.php:232
-#: inventory/manage/item_categories.php:246 inventory/manage/items.php:478
-#: inventory/manage/items.php:483
+#: admin/gl_setup.php:285 inventory/manage/item_categories.php:232
+#: inventory/manage/item_categories.php:246 inventory/manage/items.php:499
+#: inventory/manage/items.php:504
 msgid "C.O.G.S. Account:"
 msgstr ""
 
 msgid "C.O.G.S. Account:"
 msgstr ""
 
-#: admin/gl_setup.php:252 inventory/manage/item_categories.php:247
-#: inventory/manage/items.php:479
+#: admin/gl_setup.php:287 inventory/manage/item_categories.php:247
+#: inventory/manage/items.php:500
 msgid "Inventory Adjustments Account:"
 msgstr ""
 
 msgid "Inventory Adjustments Account:"
 msgstr ""
 
-#: admin/gl_setup.php:254 inventory/manage/items.php:490
+#: admin/gl_setup.php:289 inventory/manage/items.php:511
 msgid "WIP Account:"
 msgstr ""
 
 msgid "WIP Account:"
 msgstr ""
 
-#: admin/gl_setup.php:258 sql/alter2.4rc1.php:34
+#: admin/gl_setup.php:293 sql/alter2.4rc1.php:34
 msgid "Fixed Assets Defaults"
 msgstr ""
 
 msgid "Fixed Assets Defaults"
 msgstr ""
 
-#: admin/gl_setup.php:260 sql/alter2.4rc1.php:35
+#: admin/gl_setup.php:295 sql/alter2.4rc1.php:35
 msgid "Loss On Asset Disposal Account:"
 msgstr ""
 
 msgid "Loss On Asset Disposal Account:"
 msgstr ""
 
-#: admin/gl_setup.php:262
+#: admin/gl_setup.php:297
 msgid "Depreciation Period:"
 msgstr ""
 
 msgid "Depreciation Period:"
 msgstr ""
 
-#: admin/gl_setup.php:262 gl/accruals.php:198
+#: 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/manage/gl_quick_entries.php:247 gl/includes/ui/gl_journal_ui.inc:69
-#: sales/create_recurrent_invoices.php:203
+#: sales/create_recurrent_invoices.php:207
 #: sales/manage/recurrent_invoices.php:128
 msgid "Monthly"
 msgstr ""
 
 #: sales/manage/recurrent_invoices.php:128
 msgid "Monthly"
 msgstr ""
 
-#: admin/gl_setup.php:262 gl/manage/gl_quick_entries.php:247
+#: admin/gl_setup.php:297 gl/manage/gl_quick_entries.php:247
 #: gl/includes/ui/gl_journal_ui.inc:69
 msgid "Yearly"
 msgstr ""
 
 #: gl/includes/ui/gl_journal_ui.inc:69
 msgid "Yearly"
 msgstr ""
 
-#: admin/gl_setup.php:266
+#: admin/gl_setup.php:301
 msgid "Manufacturing Defaults"
 msgstr ""
 
 msgid "Manufacturing Defaults"
 msgstr ""
 
-#: admin/gl_setup.php:268
+#: admin/gl_setup.php:303
 msgid "Work Order Required By After:"
 msgstr ""
 
 msgid "Work Order Required By After:"
 msgstr ""
 
@@ -1574,45 +1685,45 @@ msgstr ""
 msgid "Selected chart has been successfully deleted"
 msgstr ""
 
 msgid "Selected chart has been successfully deleted"
 msgstr ""
 
-#: admin/inst_chart.php:52
+#: admin/inst_chart.php:57
 msgid "No optional chart of accounts is currently available."
 msgstr ""
 
 msgid "No optional chart of accounts is currently available."
 msgstr ""
 
-#: admin/inst_chart.php:55
+#: admin/inst_chart.php:62
 msgid "Chart"
 msgstr ""
 
 msgid "Chart"
 msgstr ""
 
-#: admin/inst_chart.php:55 admin/inst_lang.php:36 admin/inst_module.php:105
+#: admin/inst_chart.php:62 admin/inst_lang.php:36 admin/inst_module.php:115
 #: admin/inst_theme.php:55
 msgid "Installed"
 msgstr ""
 
 #: admin/inst_theme.php:55
 msgid "Installed"
 msgstr ""
 
-#: admin/inst_chart.php:55 admin/inst_lang.php:36 admin/inst_module.php:105
+#: admin/inst_chart.php:62 admin/inst_lang.php:36 admin/inst_module.php:115
 #: admin/inst_theme.php:55 inventory/inquiry/stock_status.php:75
 #: admin/inst_theme.php:55 inventory/inquiry/stock_status.php:75
-#: reporting/rep303.php:113
+#: reporting/rep303.php:215
 msgid "Available"
 msgstr ""
 
 msgid "Available"
 msgstr ""
 
-#: admin/inst_chart.php:55 admin/inst_lang.php:35 admin/inst_lang.php:220
+#: admin/inst_chart.php:62 admin/inst_lang.php:35 admin/inst_lang.php:220
 msgid "Encoding"
 msgstr ""
 
 msgid "Encoding"
 msgstr ""
 
-#: admin/inst_chart.php:72 admin/inst_chart.php:74 admin/inst_lang.php:88
-#: admin/inst_module.php:126 admin/inst_module.php:127 admin/inst_theme.php:77
-#: includes/sysnames.inc:207
+#: admin/inst_chart.php:79 admin/inst_chart.php:81 admin/inst_lang.php:88
+#: admin/inst_module.php:136 admin/inst_module.php:137 admin/inst_theme.php:77
+#: includes/sysnames.inc:209
 msgid "Unknown"
 msgstr ""
 
 msgid "Unknown"
 msgstr ""
 
-#: admin/inst_chart.php:77 admin/inst_lang.php:103 admin/inst_module.php:131
-#: admin/inst_module.php:136 admin/inst_theme.php:81
+#: admin/inst_chart.php:84 admin/inst_lang.php:103 admin/inst_module.php:141
+#: admin/inst_module.php:146 admin/inst_theme.php:81
 msgid "Install"
 msgstr ""
 
 msgid "Install"
 msgstr ""
 
-#: admin/inst_chart.php:78 admin/inst_module.php:137 admin/inst_theme.php:82
+#: admin/inst_chart.php:85 admin/inst_module.php:147 admin/inst_theme.php:82
 msgid "Upload and install latest extension package"
 msgstr ""
 
 msgid "Upload and install latest extension package"
 msgstr ""
 
-#: admin/inst_chart.php:85 admin/inst_module.php:144 admin/inst_theme.php:89
+#: admin/inst_chart.php:92 admin/inst_module.php:154 admin/inst_theme.php:89
 #, php-format
 msgid ""
 "You are about to remove package \\'%s\\'.\n"
 #, php-format
 msgid ""
 "You are about to remove package \\'%s\\'.\n"
@@ -1623,19 +1734,19 @@ msgstr ""
 msgid "Install/Update Languages"
 msgstr ""
 
 msgid "Install/Update Languages"
 msgstr ""
 
-#: admin/inst_lang.php:35 admin/printers.php:84
-#: admin/shipping_companies.php:91 dimensions/dimension_entry.php:261
-#: dimensions/inquiry/search_dimensions.php:126
-#: dimensions/view/view_dimension.php:55 gl/gl_journal.php:546
+#: admin/inst_lang.php:35 admin/printers.php:84 admin/shipping_companies.php:91
+#: dimensions/dimension_entry.php:261
+#: dimensions/inquiry/search_dimensions.php:133
+#: dimensions/view/view_dimension.php:55 gl/gl_journal.php:556
 #: inventory/manage/item_categories.php:117
 #: inventory/manage/item_categories.php:121
 #: manufacturing/manage/work_centres.php:101
 #: purchasing/includes/ui/invoice_ui.inc:278
 #: purchasing/includes/ui/invoice_ui.inc:280
 #: inventory/manage/item_categories.php:117
 #: inventory/manage/item_categories.php:121
 #: manufacturing/manage/work_centres.php:101
 #: purchasing/includes/ui/invoice_ui.inc:278
 #: purchasing/includes/ui/invoice_ui.inc:280
-#: purchasing/includes/ui/invoice_ui.inc:282 reporting/rep501.php:87
-#: reporting/rep709.php:116 reporting/rep709.php:117
-#: sales/manage/customer_branches.php:284 sales/manage/sales_people.php:99
-#: taxes/item_tax_types.php:117
+#: purchasing/includes/ui/invoice_ui.inc:282 reporting/rep115.php:161
+#: 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 ""
 
@@ -1712,57 +1823,57 @@ msgstr ""
 msgid "Install/Activate extensions"
 msgstr ""
 
 msgid "Install/Activate extensions"
 msgstr ""
 
-#: admin/inst_module.php:78
+#: admin/inst_module.php:88
 msgid "Selected extension has been successfully deleted"
 msgstr ""
 
 msgid "Selected extension has been successfully deleted"
 msgstr ""
 
-#: admin/inst_module.php:104 admin/inst_module.php:167
+#: admin/inst_module.php:114 admin/inst_module.php:177
 msgid "Extension"
 msgstr ""
 
 msgid "Extension"
 msgstr ""
 
-#: admin/inst_module.php:104 admin/inst_module.php:167
+#: admin/inst_module.php:114 admin/inst_module.php:177
 msgid "Modules provided"
 msgstr ""
 
 msgid "Modules provided"
 msgstr ""
 
-#: admin/inst_module.php:104 admin/inst_module.php:167
+#: admin/inst_module.php:114 admin/inst_module.php:177
 msgid "Options provided"
 msgstr ""
 
 msgid "Options provided"
 msgstr ""
 
-#: admin/inst_module.php:131
+#: admin/inst_module.php:141
 msgid "Install third-party extension."
 msgstr ""
 
 msgid "Install third-party extension."
 msgstr ""
 
-#: admin/inst_module.php:167 includes/ui/ui_lists.inc:743
-#: includes/ui/ui_lists.inc:2330 reporting/includes/excel_report.inc:229
-#: reporting/includes/pdf_report.inc:265
+#: admin/inst_module.php:177 includes/ui/ui_lists.inc:761
+#: includes/ui/ui_lists.inc:2355 reporting/includes/excel_report.inc:229
+#: reporting/includes/pdf_report.inc:266
 msgid "Active"
 msgstr ""
 
 msgid "Active"
 msgstr ""
 
-#: admin/inst_module.php:217
+#: admin/inst_module.php:227
 #, php-format
 msgid ""
 "Package '%s' is incompatible with current application version and cannot be "
 "activated.\n"
 msgstr ""
 
 #, php-format
 msgid ""
 "Package '%s' is incompatible with current application version and cannot be "
 "activated.\n"
 msgstr ""
 
-#: admin/inst_module.php:218
+#: admin/inst_module.php:228
 #, php-format
 msgid "Check Install/Activate page for newer package version."
 msgstr ""
 
 #, php-format
 msgid "Check Install/Activate page for newer package version."
 msgstr ""
 
-#: admin/inst_module.php:234
+#: admin/inst_module.php:244
 msgid "Status change for some extensions failed."
 msgstr ""
 
 msgid "Status change for some extensions failed."
 msgstr ""
 
-#: admin/inst_module.php:237
+#: admin/inst_module.php:247
 msgid "Current active extensions set has been saved."
 msgstr ""
 
 msgid "Current active extensions set has been saved."
 msgstr ""
 
-#: admin/inst_module.php:259
+#: admin/inst_module.php:269
 msgid "Extensions:"
 msgstr ""
 
 msgid "Extensions:"
 msgstr ""
 
-#: admin/inst_module.php:267
+#: admin/inst_module.php:277
 msgid "No optional extension module is currently available."
 msgstr ""
 
 msgid "No optional extension module is currently available."
 msgstr ""
 
@@ -1843,8 +1954,8 @@ msgid "Save database and perform upgrade"
 msgstr ""
 
 #: admin/payment_terms.php:16 reporting/includes/doctext.inc:40
 msgstr ""
 
 #: admin/payment_terms.php:16 reporting/includes/doctext.inc:40
-#: sales/view/view_invoice.php:76 sales/view/view_sales_order.php:82
-#: sales/view/view_sales_order.php:90
+#: sales/view/view_invoice.php:76 sales/view/view_sales_order.php:84
+#: sales/view/view_sales_order.php:92
 msgid "Payment Terms"
 msgstr ""
 
 msgid "Payment Terms"
 msgstr ""
 
@@ -1881,31 +1992,31 @@ msgid "Selected payment terms have been deleted"
 msgstr ""
 
 #: admin/payment_terms.php:127 dimensions/dimension_entry.php:265
 msgstr ""
 
 #: admin/payment_terms.php:127 dimensions/dimension_entry.php:265
-#: dimensions/inquiry/search_dimensions.php:74
-#: dimensions/inquiry/search_dimensions.php:127
-#: dimensions/view/view_dimension.php:55 gl/bank_account_reconcile.php:230
-#: gl/inquiry/bank_inquiry.php:71 gl/inquiry/gl_account_inquiry.php:126
-#: gl/inquiry/journal_inquiry.php:108 gl/inquiry/tax_inquiry.php:80
+#: dimensions/inquiry/search_dimensions.php:75
+#: dimensions/inquiry/search_dimensions.php:134
+#: dimensions/view/view_dimension.php:55 gl/bank_account_reconcile.php:266
+#: gl/inquiry/bank_inquiry.php:71 gl/inquiry/gl_account_inquiry.php:128
+#: gl/inquiry/journal_inquiry.php:114 gl/inquiry/tax_inquiry.php:80
 #: gl/manage/bank_accounts.php:109 gl/manage/gl_quick_entries.php:190
 #: gl/view/accrual_trans.php:52 gl/includes/ui/gl_bank_ui.inc:90
 #: gl/manage/bank_accounts.php:109 gl/manage/gl_quick_entries.php:190
 #: gl/view/accrual_trans.php:52 gl/includes/ui/gl_bank_ui.inc:90
-#: includes/ui/ui_view.inc:546 inventory/inquiry/stock_movements.php:104
+#: includes/ui/ui_view.inc:552 inventory/inquiry/stock_movements.php:104
 #: inventory/manage/item_categories.php:121
 #: inventory/manage/item_categories.php:121
-#: manufacturing/search_work_orders.php:159
+#: manufacturing/search_work_orders.php:166
 #: manufacturing/includes/manufacturing_ui.inc:253
 #: manufacturing/includes/manufacturing_ui.inc:291
 #: manufacturing/includes/manufacturing_ui.inc:295
 #: manufacturing/includes/manufacturing_ui.inc:346
 #: purchasing/inquiry/supplier_allocation_inquiry.php:136
 #: manufacturing/includes/manufacturing_ui.inc:253
 #: manufacturing/includes/manufacturing_ui.inc:291
 #: manufacturing/includes/manufacturing_ui.inc:295
 #: manufacturing/includes/manufacturing_ui.inc:346
 #: purchasing/inquiry/supplier_allocation_inquiry.php:136
-#: purchasing/inquiry/supplier_inquiry.php:170 reporting/rep102.php:130
-#: reporting/rep202.php:137 reporting/rep402.php:103 reporting/rep501.php:87
-#: reporting/rep601.php:79 reporting/rep602.php:80 reporting/rep702.php:60
-#: reporting/rep704.php:82 reporting/rep704.php:85 reporting/rep704.php:88
-#: reporting/rep709.php:112 reporting/rep710.php:78 reporting/rep710.php:86
-#: reporting/reports_main.php:354 reporting/reports_main.php:516
-#: reporting/includes/doctext.inc:161 reporting/includes/doctext.inc:202
-#: reporting/includes/doctext.inc:221
-#: sales/inquiry/customer_allocation_inquiry.php:146
-#: sales/inquiry/customer_inquiry.php:192
+#: purchasing/inquiry/supplier_inquiry.php:173 reporting/rep102.php:130
+#: reporting/rep202.php:138 reporting/rep402.php:136 reporting/rep501.php:87
+#: reporting/rep601.php:81 reporting/rep602.php:80 reporting/rep702.php:60
+#: reporting/rep704.php:79 reporting/rep704.php:87 reporting/rep704.php:95
+#: reporting/rep709.php:113 reporting/rep710.php:78 reporting/rep710.php:86
+#: reporting/reports_main.php:386 reporting/reports_main.php:551
+#: reporting/includes/doctext.inc:161 reporting/includes/doctext.inc:204
+#: reporting/includes/doctext.inc:223
+#: sales/inquiry/customer_allocation_inquiry.php:147
+#: sales/inquiry/customer_inquiry.php:199
 msgid "Type"
 msgstr ""
 
 msgid "Type"
 msgstr ""
 
@@ -2093,9 +2204,9 @@ msgstr ""
 msgid "Role:"
 msgstr ""
 
 msgid "Role:"
 msgstr ""
 
-#: admin/security_roles.php:177 gl/manage/gl_accounts.php:202
-#: inventory/inquiry/stock_movements.php:67 inventory/manage/items.php:562
-#: purchasing/manage/suppliers.php:292 sales/manage/customers.php:331
+#: admin/security_roles.php:177 gl/manage/gl_accounts.php:208
+#: inventory/inquiry/stock_movements.php:67 inventory/manage/items.php:565
+#: purchasing/manage/suppliers.php:304 sales/manage/customers.php:333
 msgid "Show inactive:"
 msgstr ""
 
 msgid "Show inactive:"
 msgstr ""
 
@@ -2135,23 +2246,22 @@ msgstr ""
 msgid "Delete This Role"
 msgstr ""
 
 msgid "Delete This Role"
 msgstr ""
 
-#: admin/security_roles.php:244 admin/void_transaction.php:228
-#: gl/manage/gl_quick_entries.php:61 gl/includes/ui/gl_bank_ui.inc:269
-#: gl/includes/ui/gl_journal_ui.inc:269 includes/ui/class.crud_view.inc:292
-#: includes/ui/simple_crud_class.inc:58 includes/ui/simple_crud_class.inc:229
-#: includes/ui/ui_controls.inc:645 includes/ui/ui_input.inc:229
-#: inventory/includes/item_adjustments_ui.inc:192
-#: inventory/includes/stock_transfers_ui.inc:152
-#: inventory/manage/items.php:545
+#: admin/security_roles.php:244 admin/void_transaction.php:253
+#: gl/manage/gl_quick_entries.php:61 gl/includes/ui/gl_bank_ui.inc:267
+#: gl/includes/ui/gl_journal_ui.inc:280 includes/ui/attachment.inc:171
+#: includes/ui/class.crud_view.inc:301 includes/ui/simple_crud_class.inc:58
+#: includes/ui/simple_crud_class.inc:229 includes/ui/ui_controls.inc:645
+#: includes/ui/ui_input.inc:230 inventory/includes/item_adjustments_ui.inc: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
 #: manufacturing/includes/work_order_issue_ui.inc:134
-#: purchasing/includes/ui/po_ui.inc:438
-#: sales/create_recurrent_invoices.php:190
+#: purchasing/includes/ui/po_ui.inc:447 sales/create_recurrent_invoices.php:194
 #: sales/includes/ui/sales_credit_ui.inc:290
 #: sales/includes/ui/sales_credit_ui.inc:290
-#: sales/includes/ui/sales_order_ui.inc:549
+#: sales/includes/ui/sales_order_ui.inc:556
 msgid "Cancel"
 msgstr ""
 
 msgid "Cancel"
 msgstr ""
 
-#: admin/security_roles.php:244 inventory/manage/items.php:545
+#: admin/security_roles.php:244 inventory/manage/items.php:548
 msgid "Cancel Edition"
 msgstr ""
 
 msgid "Cancel Edition"
 msgstr ""
 
@@ -2203,25 +2313,24 @@ msgid "Secondary Phone"
 msgstr ""
 
 #: admin/shipping_companies.php:91 inventory/manage/locations.php:155
 msgstr ""
 
 #: admin/shipping_companies.php:91 inventory/manage/locations.php:155
-#: purchasing/inquiry/suppliers_list.php:53
-#: sales/inquiry/customers_list.php:54
+#: purchasing/inquiry/suppliers_list.php:53 sales/inquiry/customers_list.php:54
 msgid "Address"
 msgstr ""
 
 msgid "Address"
 msgstr ""
 
-#: admin/shipping_companies.php:134 gl/manage/gl_account_types.php:187
-#: gl/includes/ui/gl_bank_ui.inc:57 inventory/manage/items.php:366
+#: admin/shipping_companies.php:134 gl/manage/gl_account_types.php:193
+#: gl/includes/ui/gl_bank_ui.inc:57 inventory/manage/items.php:388
 #: manufacturing/manage/work_centres.php:137
 msgid "Name:"
 msgstr ""
 
 #: manufacturing/manage/work_centres.php:137
 msgid "Name:"
 msgstr ""
 
-#: admin/shipping_companies.php:136 purchasing/manage/suppliers.php:134
+#: admin/shipping_companies.php:136 purchasing/manage/suppliers.php:244
 #: sales/manage/customer_branches.php:252
 msgid "Contact Person:"
 msgstr ""
 
 #: admin/shipping_companies.php:140 includes/ui/contacts_view.inc:100
 #: sales/manage/customer_branches.php:252
 msgid "Contact Person:"
 msgstr ""
 
 #: admin/shipping_companies.php:140 includes/ui/contacts_view.inc:100
-#: inventory/manage/locations.php:215 purchasing/manage/suppliers.php:136
-#: sales/manage/customer_branches.php:254 sales/manage/customers.php:257
+#: inventory/manage/locations.php:215 purchasing/manage/suppliers.php:246
+#: sales/manage/customer_branches.php:254 sales/manage/customers.php:258
 msgid "Secondary Phone Number:"
 msgstr ""
 
 msgid "Secondary Phone Number:"
 msgstr ""
 
@@ -2233,11 +2342,11 @@ msgstr ""
 msgid "Unspecified tag type"
 msgstr ""
 
 msgid "Unspecified tag type"
 msgstr ""
 
-#: admin/tags.php:40 reporting/reports_main.php:375
-#: reporting/reports_main.php:384 reporting/reports_main.php:396
-#: reporting/reports_main.php:427 reporting/reports_main.php:435
-#: reporting/reports_main.php:446 reporting/reports_main.php:474
-#: reporting/reports_main.php:481 reporting/reports_main.php:491
+#: admin/tags.php:40 reporting/reports_main.php:407
+#: reporting/reports_main.php:417 reporting/reports_main.php:429
+#: reporting/reports_main.php:460 reporting/reports_main.php:469
+#: reporting/reports_main.php:480 reporting/reports_main.php:508
+#: reporting/reports_main.php:516 reporting/reports_main.php:526
 msgid "Account Tags"
 msgstr ""
 
 msgid "Account Tags"
 msgstr ""
 
@@ -2282,7 +2391,7 @@ msgstr ""
 msgid "Tag Description:"
 msgstr ""
 
 msgid "Tag Description:"
 msgstr ""
 
-#: admin/users.php:16
+#: admin/users.php:16 includes/dashboard.inc:393
 msgid "Users"
 msgstr ""
 
 msgid "Users"
 msgstr ""
 
@@ -2310,19 +2419,19 @@ msgstr ""
 msgid "User login"
 msgstr ""
 
 msgid "User login"
 msgstr ""
 
-#: admin/users.php:123 admin/users.php:207 includes/ui/contacts_view.inc:40
+#: admin/users.php:123 admin/users.php:209 includes/ui/contacts_view.inc:40
 msgid "Full Name"
 msgstr ""
 
 #: admin/users.php:123 includes/ui/contacts_view.inc:40
 msgid "Full Name"
 msgstr ""
 
 #: admin/users.php:123 includes/ui/contacts_view.inc:40
-#: inventory/manage/locations.php:155 reporting/rep106.php:94
-#: reporting/includes/header2.inc:100 sales/manage/sales_people.php:99
+#: 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
 msgid "Phone"
 msgstr ""
 
 #: admin/users.php:124 sales/manage/customer_branches.php:290
 #: sales/inquiry/customer_branches_list.php:49
 msgid "Phone"
 msgstr ""
 
 #: admin/users.php:124 sales/manage/customer_branches.php:290
-#: sales/view/view_sales_order.php:96
+#: sales/view/view_sales_order.php:98
 msgid "E-mail"
 msgstr ""
 
 msgid "E-mail"
 msgstr ""
 
@@ -2334,27 +2443,27 @@ msgstr ""
 msgid "Access Level"
 msgstr ""
 
 msgid "Access Level"
 msgstr ""
 
-#: admin/users.php:193
+#: admin/users.php:195
 msgid "User Login:"
 msgstr ""
 
 msgid "User Login:"
 msgstr ""
 
-#: admin/users.php:204
+#: admin/users.php:206
 msgid "Enter a new password to change, leave empty to keep current."
 msgstr ""
 
 msgid "Enter a new password to change, leave empty to keep current."
 msgstr ""
 
-#: admin/users.php:209
+#: admin/users.php:211
 msgid "Telephone No.:"
 msgstr ""
 
 msgid "Telephone No.:"
 msgstr ""
 
-#: admin/users.php:213
+#: admin/users.php:215
 msgid "Access Level:"
 msgstr ""
 
 msgid "Access Level:"
 msgstr ""
 
-#: admin/users.php:217
+#: admin/users.php:219
 msgid "User's POS"
 msgstr ""
 
 msgid "User's POS"
 msgstr ""
 
-#: admin/users.php:222
+#: admin/users.php:224
 msgid "Use popup window for reports:"
 msgstr ""
 
 msgid "Use popup window for reports:"
 msgstr ""
 
@@ -2363,10 +2472,12 @@ msgid "View or Print Transactions"
 msgstr ""
 
 #: admin/view_print_transaction.php:43 admin/view_print_transaction.php:45
 msgstr ""
 
 #: admin/view_print_transaction.php:43 admin/view_print_transaction.php:45
-#: admin/view_print_transaction.php:129 includes/ui/ui_controls.inc:213
-#: purchasing/inquiry/po_search_completed.php:43
-#: purchasing/inquiry/po_search.php:94 sales/inquiry/customer_inquiry.php:176
-#: sales/inquiry/sales_deliveries_view.php:148
+#: admin/view_print_transaction.php:129
+#: dimensions/inquiry/search_dimensions.php:123 includes/ui/ui_controls.inc:213
+#: manufacturing/search_work_orders.php:152
+#: purchasing/inquiry/po_search_completed.php:52
+#: purchasing/inquiry/po_search.php:94 sales/inquiry/customer_inquiry.php:102
+#: sales/inquiry/sales_deliveries_view.php:149
 #: sales/inquiry/sales_orders_view.php:102
 msgid "Print"
 msgstr ""
 #: sales/inquiry/sales_orders_view.php:102
 msgid "Print"
 msgstr ""
@@ -2375,29 +2486,29 @@ msgstr ""
 msgid "Only documents can be printed."
 msgstr ""
 
 msgid "Only documents can be printed."
 msgstr ""
 
-#: admin/view_print_transaction.php:79 admin/void_transaction.php:165
+#: admin/view_print_transaction.php:79 admin/void_transaction.php:171
 msgid "from #:"
 msgstr ""
 
 msgid "from #:"
 msgstr ""
 
-#: admin/view_print_transaction.php:81 admin/void_transaction.php:167
+#: admin/view_print_transaction.php:81 admin/void_transaction.php:173
 msgid "to #:"
 msgstr ""
 
 msgid "to #:"
 msgstr ""
 
-#: admin/view_print_transaction.php:83 admin/void_transaction.php:169
-#: dimensions/inquiry/search_dimensions.php:87 gl/inquiry/accounts_list.php:40
+#: admin/view_print_transaction.php:83 admin/void_transaction.php:175
+#: dimensions/inquiry/search_dimensions.php:88 gl/inquiry/accounts_list.php:40
 #: gl/inquiry/journal_inquiry.php:58 inventory/inquiry/stock_list.php:42
 #: gl/inquiry/journal_inquiry.php:58 inventory/inquiry/stock_list.php:42
-#: manufacturing/search_work_orders.php:84
+#: manufacturing/search_work_orders.php:86
 #: purchasing/includes/ui/invoice_ui.inc:483
 #: purchasing/includes/ui/invoice_ui.inc:483
-#: purchasing/inquiry/po_search_completed.php:99
+#: purchasing/inquiry/po_search_completed.php:108
 #: purchasing/inquiry/po_search.php:78
 #: purchasing/inquiry/supplier_allocation_inquiry.php:57
 #: purchasing/inquiry/po_search.php:78
 #: purchasing/inquiry/supplier_allocation_inquiry.php:57
-#: purchasing/inquiry/supplier_inquiry.php:56
+#: purchasing/inquiry/supplier_inquiry.php:147
 #: purchasing/inquiry/suppliers_list.php:42
 #: sales/inquiry/customer_allocation_inquiry.php:51
 #: sales/inquiry/customer_branches_list.php:38
 #: purchasing/inquiry/suppliers_list.php:42
 #: sales/inquiry/customer_allocation_inquiry.php:51
 #: sales/inquiry/customer_branches_list.php:38
-#: sales/inquiry/customer_inquiry.php:54 sales/inquiry/customers_list.php:42
-#: sales/inquiry/sales_deliveries_view.php:116
-#: sales/inquiry/sales_orders_view.php:236
+#: sales/inquiry/customer_inquiry.php:170 sales/inquiry/customers_list.php:42
+#: sales/inquiry/sales_deliveries_view.php:117
+#: sales/inquiry/sales_orders_view.php:241
 msgid "Search"
 msgstr ""
 
 msgid "Search"
 msgstr ""
 
@@ -2413,18 +2524,19 @@ msgid ""
 "zero."
 msgstr ""
 
 "zero."
 msgstr ""
 
-#: admin/view_print_transaction.php:128 admin/void_transaction.php:182
-#: dimensions/inquiry/search_dimensions.php:128
+#: admin/view_print_transaction.php:128 admin/void_transaction.php:188
+#: dimensions/inquiry/search_dimensions.php:135
 #: dimensions/view/view_dimension.php:55 gl/accruals.php:104
 #: dimensions/view/view_dimension.php:55 gl/accruals.php:104
-#: gl/accruals.php:211 gl/bank_account_reconcile.php:233
-#: gl/inquiry/bank_inquiry.php:71 gl/inquiry/gl_account_inquiry.php:126
-#: gl/inquiry/journal_inquiry.php:107 gl/view/accrual_trans.php:52
+#: gl/accruals.php:211 gl/bank_account_reconcile.php:269
+#: gl/inquiry/bank_inquiry.php:71 gl/inquiry/gl_account_inquiry.php:128
+#: gl/inquiry/journal_inquiry.php:113 gl/view/accrual_trans.php:52
 #: gl/view/bank_transfer_view.php:83 gl/view/gl_deposit_view.php:68
 #: gl/view/bank_transfer_view.php:83 gl/view/gl_deposit_view.php:68
-#: gl/view/gl_payment_view.php:66 includes/dashboard.inc:486
-#: includes/dashboard.inc:571 includes/ui/allocation_cart.inc:290
-#: includes/ui/ui_view.inc:546 inventory/inquiry/stock_movements.php:109
+#: gl/view/gl_payment_view.php:66 includes/dashboard.inc:1022
+#: includes/dashboard.inc:1107 includes/ui/allocation_cart.inc:311
+#: includes/ui/attachment.inc:136 includes/ui/ui_view.inc:552
+#: inventory/inquiry/stock_movements.php:109
 #: inventory/view/view_adjustment.php:44 inventory/view/view_transfer.php:37
 #: inventory/view/view_adjustment.php:44 inventory/view/view_transfer.php:37
-#: manufacturing/search_work_orders.php:164
+#: manufacturing/search_work_orders.php:171
 #: manufacturing/work_order_entry.php:399
 #: manufacturing/work_order_entry.php:405
 #: manufacturing/view/wo_costs_view.php:60
 #: manufacturing/work_order_entry.php:399
 #: manufacturing/work_order_entry.php:405
 #: manufacturing/view/wo_costs_view.php:60
@@ -2435,28 +2547,28 @@ msgstr ""
 #: manufacturing/includes/manufacturing_ui.inc:292
 #: manufacturing/includes/manufacturing_ui.inc:296
 #: manufacturing/includes/manufacturing_ui.inc:347
 #: manufacturing/includes/manufacturing_ui.inc:292
 #: manufacturing/includes/manufacturing_ui.inc:296
 #: manufacturing/includes/manufacturing_ui.inc:347
-#: purchasing/includes/ui/invoice_ui.inc:114
-#: purchasing/includes/ui/po_ui.inc:312 purchasing/view/view_po.php:140
+#: purchasing/includes/ui/invoice_ui.inc:115
+#: purchasing/includes/ui/po_ui.inc:316 purchasing/view/view_po.php:140
 #: purchasing/inquiry/supplier_allocation_inquiry.php:141
 #: purchasing/inquiry/supplier_allocation_inquiry.php:141
-#: purchasing/inquiry/supplier_inquiry.php:175
+#: purchasing/inquiry/supplier_inquiry.php:178
 #: purchasing/allocations/supplier_allocation_main.php:97
 #: purchasing/allocations/supplier_allocation_main.php:97
-#: reporting/rep101.php:132 reporting/rep107.php:203 reporting/rep201.php:107
-#: reporting/rep306.php:141 reporting/rep402.php:103 reporting/rep501.php:87
-#: reporting/rep601.php:79 reporting/rep602.php:80 reporting/rep704.php:82
-#: reporting/rep704.php:85 reporting/rep704.php:88 reporting/rep709.php:116
-#: reporting/rep710.php:77 reporting/includes/doctext.inc:166
-#: reporting/includes/doctext.inc:207 reporting/includes/doctext.inc:245
-#: reporting/includes/header2.inc:137 sales/customer_delivery.php:366
-#: sales/customer_invoice.php:485
-#: sales/allocations/customer_allocation_main.php:90
-#: sales/view/view_credit.php:69 sales/view/view_sales_order.php:109
-#: sales/view/view_sales_order.php:142 sales/view/view_sales_order.php:179
-#: sales/inquiry/customer_allocation_inquiry.php:150
-#: sales/inquiry/customer_inquiry.php:196
+#: reporting/rep101.php:136 reporting/rep107.php:225 reporting/rep201.php:115
+#: reporting/rep306.php:138 reporting/rep310.php:139 reporting/rep402.php:136
+#: reporting/rep402.php:141 reporting/rep501.php:87 reporting/rep601.php:81
+#: reporting/rep602.php:80 reporting/rep704.php:79 reporting/rep704.php:87
+#: reporting/rep704.php:95 reporting/rep709.php:117 reporting/rep710.php:77
+#: reporting/includes/doctext.inc:166 reporting/includes/doctext.inc:209
+#: reporting/includes/doctext.inc:247 reporting/includes/header2.inc:135
+#: sales/customer_delivery.php:366 sales/customer_invoice.php:485
+#: sales/allocations/customer_allocation_main.php:95
+#: sales/view/view_credit.php:69 sales/view/view_sales_order.php:111
+#: sales/view/view_sales_order.php:144 sales/view/view_sales_order.php:181
+#: sales/inquiry/customer_allocation_inquiry.php:151
+#: sales/inquiry/customer_inquiry.php:203
 msgid "Date"
 msgstr ""
 
 msgid "Date"
 msgstr ""
 
-#: admin/view_print_transaction.php:130 admin/void_transaction.php:183
+#: admin/view_print_transaction.php:130 admin/void_transaction.php:189
 #: includes/ui/ui_view.inc:51
 msgid "GL"
 msgstr ""
 #: includes/ui/ui_view.inc:51
 msgid "GL"
 msgstr ""
@@ -2465,9 +2577,9 @@ msgstr ""
 msgid "Void a Transaction"
 msgstr ""
 
 msgid "Void a Transaction"
 msgstr ""
 
-#: admin/void_transaction.php:125 admin/void_transaction.php:184
-#: gl/inquiry/accounts_list.php:63 includes/ui/ui_input.inc:152
-#: includes/ui/ui_input.inc:300 includes/ui/ui_lists.inc:20
+#: admin/void_transaction.php:125 admin/void_transaction.php:190
+#: gl/inquiry/accounts_list.php:64 includes/ui/ui_input.inc:152
+#: includes/ui/ui_input.inc:301 includes/ui/ui_lists.inc:20
 #: inventory/inquiry/stock_list.php:66 inventory/inquiry/stock_list.php:69
 #: purchasing/inquiry/suppliers_list.php:65
 #: purchasing/inquiry/suppliers_list.php:68
 #: inventory/inquiry/stock_list.php:66 inventory/inquiry/stock_list.php:69
 #: purchasing/inquiry/suppliers_list.php:65
 #: purchasing/inquiry/suppliers_list.php:68
@@ -2476,96 +2588,111 @@ msgstr ""
 msgid "Select"
 msgstr ""
 
 msgid "Select"
 msgstr ""
 
-#: admin/void_transaction.php:156 includes/ui/class.reflines_crud.inc:90
+#: admin/void_transaction.php:162 includes/ui/class.reflines_crud.inc:90
 #: includes/ui/class.reflines_crud.inc:93
 msgid "Transaction Type:"
 msgstr ""
 
 #: includes/ui/class.reflines_crud.inc:93
 msgid "Transaction Type:"
 msgstr ""
 
-#: admin/void_transaction.php:203
+#: admin/void_transaction.php:194
+msgid "Marked transactions will be voided."
+msgstr ""
+
+#: admin/void_transaction.php:211
 msgid "Transaction #:"
 msgstr ""
 
 msgid "Transaction #:"
 msgstr ""
 
-#: admin/void_transaction.php:205
+#: admin/void_transaction.php:213
 msgid "Voiding Date:"
 msgstr ""
 
 msgid "Voiding Date:"
 msgstr ""
 
-#: admin/void_transaction.php:207 dimensions/dimension_entry.php:273
-#: gl/bank_transfer.php:137 gl/inquiry/journal_inquiry.php:53
-#: gl/manage/revaluate_currencies.php:96
-#: includes/ui/class.reflines_crud.inc:105 includes/ui/ui_view.inc:344
+#: admin/void_transaction.php:215 dimensions/dimension_entry.php:273
+#: gl/bank_transfer.php:137 gl/inquiry/gl_account_inquiry.php:84
+#: gl/inquiry/journal_inquiry.php:53 gl/manage/revaluate_currencies.php:83
+#: includes/ui/class.reflines_crud.inc:105 includes/ui/ui_view.inc:350
 #: manufacturing/work_order_add_finished.php:196
 #: manufacturing/work_order_costs.php:147
 #: manufacturing/work_order_entry.php:429
 #: manufacturing/work_order_release.php:102
 #: manufacturing/work_order_add_finished.php:196
 #: manufacturing/work_order_costs.php:147
 #: manufacturing/work_order_entry.php:429
 #: manufacturing/work_order_release.php:102
-#: purchasing/includes/ui/invoice_ui.inc:193
-#: purchasing/includes/ui/po_ui.inc:465 purchasing/po_entry_items.php:486
-#: purchasing/supplier_payment.php:331 sales/customer_invoice.php:658
-#: sales/customer_payments.php:378
+#: purchasing/includes/ui/invoice_ui.inc:192
+#: purchasing/includes/ui/po_ui.inc:474 purchasing/po_entry_items.php:486
+#: purchasing/supplier_payment.php:346 sales/customer_invoice.php:658
+#: sales/customer_payments.php:399
 msgid "Memo:"
 msgstr ""
 
 msgid "Memo:"
 msgstr ""
 
-#: admin/void_transaction.php:212 admin/void_transaction.php:221
+#: admin/void_transaction.php:220 admin/void_transaction.php:229
 msgid "Void Transaction"
 msgstr ""
 
 msgid "Void Transaction"
 msgstr ""
 
-#: admin/void_transaction.php:217
+#: admin/void_transaction.php:225
 msgid "The entered transaction does not exist or cannot be voided."
 msgstr ""
 
 msgid "The entered transaction does not exist or cannot be voided."
 msgstr ""
 
-#: admin/void_transaction.php:225
+#: admin/void_transaction.php:240
+msgid ""
+"The void cannot be processed because there is an insufficient quantity for "
+"item:"
+msgstr ""
+
+#: admin/void_transaction.php:242 inventory/reorder_level.php:71
+#: inventory/inquiry/stock_movements.php:109
+#: inventory/inquiry/stock_status.php:74 purchasing/supplier_credit.php:223
+msgid "Quantity On Hand"
+msgstr ""
+
+#: admin/void_transaction.php:250
 msgid ""
 "Are you sure you want to void this transaction ? This action cannot be "
 "undone."
 msgstr ""
 
 msgid ""
 "Are you sure you want to void this transaction ? This action cannot be "
 "undone."
 msgstr ""
 
-#: admin/void_transaction.php:227 includes/ui/ui_controls.inc:644
+#: admin/void_transaction.php:252 includes/ui/ui_controls.inc:644
 msgid "Proceed"
 msgstr ""
 
 msgid "Proceed"
 msgstr ""
 
-#: admin/void_transaction.php:241
+#: admin/void_transaction.php:266
 msgid "The selected transaction was closed for edition and cannot be voided."
 msgstr ""
 
 msgid "The selected transaction was closed for edition and cannot be voided."
 msgstr ""
 
-#: admin/void_transaction.php:247 gl/accruals.php:42 gl/bank_transfer.php:159
-#: gl/gl_journal.php:217 gl/gl_journal.php:229 gl/gl_journal.php:235
-#: gl/gl_journal.php:256 gl/manage/close_period.php:34
-#: gl/manage/exchange_rates.php:33 gl/manage/revaluate_currencies.php:51
+#: admin/void_transaction.php:272 gl/accruals.php:42 gl/bank_transfer.php:159
+#: gl/gl_journal.php:216 gl/gl_journal.php:228 gl/gl_journal.php:234
+#: gl/gl_journal.php:255 gl/manage/close_period.php:34
+#: gl/manage/exchange_rates.php:33 gl/manage/revaluate_currencies.php:45
 #: manufacturing/work_order_add_finished.php:89
 #: manufacturing/work_order_costs.php:80 purchasing/po_receive_items.php:174
 #: manufacturing/work_order_add_finished.php:89
 #: manufacturing/work_order_costs.php:80 purchasing/po_receive_items.php:174
-#: purchasing/supplier_payment.php:194 sales/customer_credit_invoice.php:90
+#: purchasing/supplier_payment.php:188 sales/customer_credit_invoice.php:90
 #: sales/sales_order_entry.php:373 sales/manage/recurrent_invoices.php:60
 #: sales/manage/recurrent_invoices.php:66
 #: sales/manage/recurrent_invoices.php:71
 msgid "The entered date is invalid."
 msgstr ""
 
 #: sales/sales_order_entry.php:373 sales/manage/recurrent_invoices.php:60
 #: sales/manage/recurrent_invoices.php:66
 #: sales/manage/recurrent_invoices.php:71
 msgid "The entered date is invalid."
 msgstr ""
 
-#: admin/void_transaction.php:253 gl/accruals.php:48 gl/bank_transfer.php:165
-#: gl/gl_bank.php:261 gl/gl_journal.php:223 gl/gl_journal.php:262
-#: gl/manage/revaluate_currencies.php:57 inventory/adjustments.php:123
+#: admin/void_transaction.php:278 gl/accruals.php:48 gl/bank_transfer.php:165
+#: gl/gl_bank.php:267 gl/gl_journal.php:222 gl/gl_journal.php:261
+#: gl/manage/revaluate_currencies.php:51 inventory/adjustments.php:123
 #: inventory/transfers.php:115 manufacturing/work_order_add_finished.php:95
 #: inventory/transfers.php:115 manufacturing/work_order_add_finished.php:95
-#: manufacturing/work_order_costs.php:86
-#: manufacturing/work_order_entry.php:151
+#: manufacturing/work_order_costs.php:86 manufacturing/work_order_entry.php:151
 #: manufacturing/work_order_issue.php:82 purchasing/po_entry_items.php:351
 #: manufacturing/work_order_issue.php:82 purchasing/po_entry_items.php:351
-#: purchasing/po_receive_items.php:179 purchasing/supplier_credit.php:186
-#: purchasing/supplier_invoice.php:195 purchasing/supplier_payment.php:200
-#: sales/create_recurrent_invoices.php:87
-#: sales/create_recurrent_invoices.php:166 sales/credit_note_entry.php:157
+#: purchasing/po_receive_items.php:179 purchasing/supplier_credit.php:189
+#: purchasing/supplier_invoice.php:193 purchasing/supplier_payment.php:194
+#: sales/create_recurrent_invoices.php:90
+#: sales/create_recurrent_invoices.php:168 sales/credit_note_entry.php:157
 #: 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:157
+#: sales/customer_invoice.php:302 sales/customer_payments.php:164
 #: sales/sales_order_entry.php:378
 msgid ""
 "The entered date is out of fiscal year or is closed for further data entry."
 msgstr ""
 
 #: sales/sales_order_entry.php:378
 msgid ""
 "The entered date is out of fiscal year or is closed for further data entry."
 msgstr ""
 
-#: admin/void_transaction.php:260
+#: admin/void_transaction.php:285
 msgid "The transaction number is expected to be numeric and greater than zero."
 msgstr ""
 
 msgid "The transaction number is expected to be numeric and greater than zero."
 msgstr ""
 
-#: admin/void_transaction.php:277
+#: admin/void_transaction.php:302
 msgid "The selected transaction has already been voided."
 msgstr ""
 
 msgid "The selected transaction has already been voided."
 msgstr ""
 
-#: admin/void_transaction.php:290
+#: admin/void_transaction.php:315
 msgid "Selected transaction has been voided."
 msgstr ""
 
 msgid "Selected transaction has been voided."
 msgstr ""
 
@@ -2584,8 +2711,9 @@ msgstr ""
 msgid "Closing Year"
 msgstr ""
 
 msgid "Closing Year"
 msgstr ""
 
-#: admin/db/fiscalyears_db.inc:220 reporting/rep101.php:187
-#: reporting/rep201.php:162 reporting/rep706.php:185
+#: admin/db/fiscalyears_db.inc:220 reporting/rep101.php:196
+#: reporting/rep115.php:161 reporting/rep201.php:174 reporting/rep206.php:115
+#: reporting/rep706.php:188
 msgid "Open Balance"
 msgstr ""
 
 msgid "Open Balance"
 msgstr ""
 
@@ -2620,13 +2748,13 @@ msgstr ""
 msgid "The language files folder "
 msgstr ""
 
 msgid "The language files folder "
 msgstr ""
 
-#: admin/db/maintenance_db.inc:402
+#: admin/db/maintenance_db.inc:405
 msgid ""
 "This is new format backup file which cannot be restored on database not "
 "migrated to utf8."
 msgstr ""
 
 msgid ""
 "This is new format backup file which cannot be restored on database not "
 "migrated to utf8."
 msgstr ""
 
-#: admin/db/maintenance_db.inc:486
+#: admin/db/maintenance_db.inc:489
 #, php-format
 msgid "SQL script execution failed in line %d: %s"
 msgstr ""
 #, php-format
 msgid "SQL script execution failed in line %d: %s"
 msgstr ""
@@ -2683,7 +2811,7 @@ msgid ""
 "closed."
 msgstr ""
 
 "closed."
 msgstr ""
 
-#: admin/db/voiding_db.inc:127 sales/includes/db/sales_invoice_db.inc:250
+#: admin/db/voiding_db.inc:127 sales/includes/db/sales_invoice_db.inc:255
 msgid "Voided."
 msgstr ""
 
 msgid "Voided."
 msgstr ""
 
@@ -2940,8 +3068,8 @@ msgstr ""
 msgid "Ta&x Inquiry"
 msgstr ""
 
 msgid "Ta&x Inquiry"
 msgstr ""
 
-#: applications/generalledger.php:44 reporting/reports_main.php:402
-#: reporting/reports_main.php:452 reporting/reports_main.php:497
+#: applications/generalledger.php:44 reporting/reports_main.php:435
+#: reporting/reports_main.php:486 reporting/reports_main.php:532
 msgid "Trial &Balance"
 msgstr ""
 
 msgid "Trial &Balance"
 msgstr ""
 
@@ -3049,7 +3177,7 @@ msgstr ""
 msgid "&Units of Measure"
 msgstr ""
 
 msgid "&Units of Measure"
 msgstr ""
 
-#: applications/inventory.php:45 inventory/manage/items.php:591
+#: applications/inventory.php:45 inventory/manage/items.php:594
 msgid "&Reorder Levels"
 msgstr ""
 
 msgid "&Reorder Levels"
 msgstr ""
 
@@ -3065,7 +3193,7 @@ msgstr ""
 msgid "Purchasing &Pricing"
 msgstr ""
 
 msgid "Purchasing &Pricing"
 msgstr ""
 
-#: applications/inventory.php:53 inventory/manage/items.php:590
+#: applications/inventory.php:53 inventory/manage/items.php:593
 msgid "Standard &Costs"
 msgstr ""
 
 msgid "Standard &Costs"
 msgstr ""
 
@@ -3302,10 +3430,14 @@ msgstr ""
 msgid "Enter a &new dimension"
 msgstr ""
 
 msgid "Enter a &new dimension"
 msgstr ""
 
-#: dimensions/dimension_entry.php:99
+#: dimensions/dimension_entry.php:98
 msgid "&Select an existing dimension"
 msgstr ""
 
 msgid "&Select an existing dimension"
 msgstr ""
 
+#: dimensions/dimension_entry.php:99
+msgid "&Add Attachment"
+msgstr ""
+
 #: dimensions/dimension_entry.php:121
 msgid "The dimension name must be entered."
 msgstr ""
 #: dimensions/dimension_entry.php:121
 msgid "The dimension name must be entered."
 msgstr ""
@@ -3332,20 +3464,21 @@ msgid "Dimension Reference:"
 msgstr ""
 
 #: dimensions/dimension_entry.php:267 reporting/reports_main.php:36
 msgstr ""
 
 #: dimensions/dimension_entry.php:267 reporting/reports_main.php:36
-#: reporting/reports_main.php:66 reporting/reports_main.php:82
-#: reporting/reports_main.php:91 reporting/reports_main.php:153
-#: reporting/reports_main.php:235 reporting/reports_main.php:245
-#: reporting/reports_main.php:251 reporting/reports_main.php:261
-#: reporting/reports_main.php:269 reporting/reports_main.php:277
-#: reporting/reports_main.php:332 reporting/reports_main.php:340
-#: reporting/reports_main.php:352 reporting/reports_main.php:362
-#: reporting/reports_main.php:380 reporting/reports_main.php:391
-#: reporting/reports_main.php:403 reporting/reports_main.php:416
-#: reporting/reports_main.php:432 reporting/reports_main.php:442
-#: reporting/reports_main.php:453 reporting/reports_main.php:465
-#: reporting/reports_main.php:479 reporting/reports_main.php:488
-#: reporting/reports_main.php:498 reporting/reports_main.php:507
-#: reporting/reports_main.php:514
+#: reporting/reports_main.php:57 reporting/reports_main.php:77
+#: reporting/reports_main.php:93 reporting/reports_main.php:102
+#: reporting/reports_main.php:165 reporting/reports_main.php:186
+#: reporting/reports_main.php:256 reporting/reports_main.php:266
+#: reporting/reports_main.php:272 reporting/reports_main.php:282
+#: reporting/reports_main.php:290 reporting/reports_main.php:298
+#: reporting/reports_main.php:305 reporting/reports_main.php:364
+#: reporting/reports_main.php:372 reporting/reports_main.php:384
+#: reporting/reports_main.php:394 reporting/reports_main.php:413
+#: reporting/reports_main.php:424 reporting/reports_main.php:436
+#: reporting/reports_main.php:449 reporting/reports_main.php:466
+#: reporting/reports_main.php:476 reporting/reports_main.php:487
+#: reporting/reports_main.php:499 reporting/reports_main.php:514
+#: reporting/reports_main.php:523 reporting/reports_main.php:533
+#: reporting/reports_main.php:542 reporting/reports_main.php:549
 msgid "Start Date"
 msgstr ""
 
 msgid "Start Date"
 msgstr ""
 
@@ -3389,8 +3522,8 @@ msgstr ""
 msgid "Delete unused dimension"
 msgstr ""
 
 msgid "Delete unused dimension"
 msgstr ""
 
-#: dimensions/dimension_entry.php:292 includes/ui/class.crud_view.inc:296
-#: includes/ui/simple_crud_class.inc:223
+#: dimensions/dimension_entry.php:292 includes/ui/attachment.inc:167
+#: includes/ui/class.crud_view.inc:305 includes/ui/simple_crud_class.inc:223
 #: purchasing/includes/ui/invoice_ui.inc:219
 #: purchasing/includes/ui/invoice_ui.inc:421
 #: purchasing/includes/ui/invoice_ui.inc:423
 #: purchasing/includes/ui/invoice_ui.inc:219
 #: purchasing/includes/ui/invoice_ui.inc:421
 #: purchasing/includes/ui/invoice_ui.inc:423
@@ -3406,157 +3539,167 @@ msgid "Balance for this Dimension"
 msgstr ""
 
 #: dimensions/includes/dimensions_ui.inc:31 gl/accruals.php:104
 msgstr ""
 
 #: dimensions/includes/dimensions_ui.inc:31 gl/accruals.php:104
-#: gl/inquiry/gl_account_inquiry.php:129 gl/inquiry/gl_trial_balance.php:184
+#: gl/inquiry/gl_account_inquiry.php:131 gl/inquiry/gl_trial_balance.php:231
 #: gl/manage/gl_quick_entries.php:248 gl/manage/gl_quick_entries.php:342
 #: gl/manage/gl_quick_entries.php:248 gl/manage/gl_quick_entries.php:342
-#: includes/dashboard.inc:606 includes/sysnames.inc:179
+#: includes/dashboard.inc:1178 includes/sysnames.inc:181
 #: purchasing/includes/ui/invoice_ui.inc:278
 #: purchasing/includes/ui/invoice_ui.inc:280
 #: purchasing/includes/ui/invoice_ui.inc:282 reporting/rep701.php:110
 #: purchasing/includes/ui/invoice_ui.inc:278
 #: purchasing/includes/ui/invoice_ui.inc:280
 #: purchasing/includes/ui/invoice_ui.inc:282 reporting/rep701.php:110
-#: reporting/rep705.php:235 reporting/rep706.php:185 reporting/rep707.php:210
+#: reporting/rep705.php:255 reporting/rep706.php:188 reporting/rep707.php:212
 #: reporting/rep708.php:192
 msgid "Account"
 msgstr ""
 
 #: dimensions/includes/dimensions_ui.inc:31 gl/accruals.php:112
 #: reporting/rep708.php:192
 msgid "Account"
 msgstr ""
 
 #: dimensions/includes/dimensions_ui.inc:31 gl/accruals.php:112
-#: gl/bank_account_reconcile.php:234 gl/inquiry/bank_inquiry.php:72
-#: gl/inquiry/gl_account_inquiry.php:141 gl/inquiry/gl_account_inquiry.php:143
-#: gl/inquiry/gl_trial_balance.php:190 gl/inquiry/gl_trial_balance.php:192
-#: gl/inquiry/gl_trial_balance.php:194 gl/view/accrual_trans.php:60
+#: gl/bank_account_reconcile.php:270 gl/inquiry/bank_inquiry.php:72
+#: gl/inquiry/gl_account_inquiry.php:143 gl/inquiry/gl_account_inquiry.php:145
+#: gl/inquiry/gl_trial_balance.php: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:96 gl/view/gl_trans_view.php:99
-#: gl/view/gl_trans_view.php:102 gl/includes/ui/gl_journal_ui.inc:103
-#: gl/includes/ui/gl_journal_ui.inc:106 gl/includes/ui/gl_journal_ui.inc:109
+#: gl/view/gl_trans_view.php:102 gl/includes/ui/gl_journal_ui.inc:113
+#: gl/includes/ui/gl_journal_ui.inc:116 gl/includes/ui/gl_journal_ui.inc:119
 #: manufacturing/view/wo_costs_view.php:61
 #: purchasing/inquiry/supplier_allocation_inquiry.php:144
 #: manufacturing/view/wo_costs_view.php:61
 #: purchasing/inquiry/supplier_allocation_inquiry.php:144
-#: reporting/rep601.php:80 reporting/rep602.php:81 reporting/rep702.php:54
-#: reporting/rep704.php:83 reporting/rep704.php:86 reporting/rep704.php:89
+#: reporting/rep115.php:161 reporting/rep206.php:115 reporting/rep402.php:141
+#: reporting/rep601.php:82 reporting/rep602.php:81 reporting/rep702.php:54
+#: reporting/rep704.php:80 reporting/rep704.php:88 reporting/rep704.php:96
 #: reporting/rep708.php:192 reporting/rep708.php:193
 #: reporting/rep708.php:192 reporting/rep708.php:193
-#: sales/inquiry/customer_allocation_inquiry.php:154
+#: sales/inquiry/customer_allocation_inquiry.php:155
 msgid "Debit"
 msgstr ""
 
 #: dimensions/includes/dimensions_ui.inc:31 gl/accruals.php:112
 msgid "Debit"
 msgstr ""
 
 #: dimensions/includes/dimensions_ui.inc:31 gl/accruals.php:112
-#: gl/bank_account_reconcile.php:235 gl/inquiry/bank_inquiry.php:72
-#: gl/inquiry/gl_account_inquiry.php:141 gl/inquiry/gl_account_inquiry.php:143
-#: gl/inquiry/gl_trial_balance.php:191 gl/inquiry/gl_trial_balance.php:193
-#: gl/inquiry/gl_trial_balance.php:195 gl/view/accrual_trans.php:60
+#: gl/bank_account_reconcile.php:271 gl/inquiry/bank_inquiry.php:72
+#: gl/inquiry/gl_account_inquiry.php:143 gl/inquiry/gl_account_inquiry.php:145
+#: gl/inquiry/gl_trial_balance.php: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:96 gl/view/gl_trans_view.php:99
-#: gl/view/gl_trans_view.php:102 gl/includes/ui/gl_journal_ui.inc:103
-#: gl/includes/ui/gl_journal_ui.inc:106 gl/includes/ui/gl_journal_ui.inc:109
-#: includes/sysnames.inc:90 manufacturing/view/wo_costs_view.php:61
+#: gl/view/gl_trans_view.php:102 gl/includes/ui/gl_journal_ui.inc:113
+#: gl/includes/ui/gl_journal_ui.inc:116 gl/includes/ui/gl_journal_ui.inc:119
+#: includes/sysnames.inc:92 manufacturing/view/wo_costs_view.php:61
 #: purchasing/inquiry/supplier_allocation_inquiry.php:145
 #: purchasing/inquiry/supplier_allocation_inquiry.php:145
-#: reporting/rep601.php:80 reporting/rep602.php:81 reporting/rep702.php:54
-#: reporting/rep704.php:83 reporting/rep704.php:86 reporting/rep704.php:89
+#: reporting/rep115.php:161 reporting/rep206.php:116 reporting/rep402.php:141
+#: reporting/rep601.php:82 reporting/rep602.php:81 reporting/rep702.php:54
+#: reporting/rep704.php:80 reporting/rep704.php:88 reporting/rep704.php:96
 #: reporting/rep708.php:192 reporting/rep708.php:193
 #: reporting/rep708.php:192 reporting/rep708.php:193
-#: sales/inquiry/customer_allocation_inquiry.php:155
+#: sales/inquiry/customer_allocation_inquiry.php:156
 msgid "Credit"
 msgstr ""
 
 #: dimensions/includes/dimensions_ui.inc:45
 msgid "Credit"
 msgstr ""
 
 #: dimensions/includes/dimensions_ui.inc:45
-#: dimensions/inquiry/search_dimensions.php:131 gl/inquiry/bank_inquiry.php:72
-#: gl/inquiry/gl_account_inquiry.php:141 gl/inquiry/gl_trial_balance.php:188
-#: includes/dashboard.inc:606
+#: dimensions/inquiry/search_dimensions.php:138 gl/inquiry/bank_inquiry.php:72
+#: gl/inquiry/gl_account_inquiry.php:143 gl/inquiry/gl_trial_balance.php:235
+#: includes/dashboard.inc:636 includes/dashboard.inc:661
+#: includes/dashboard.inc:1178
 #: purchasing/inquiry/supplier_allocation_inquiry.php:147
 #: purchasing/inquiry/supplier_allocation_inquiry.php:147
-#: reporting/rep101.php:136 reporting/rep201.php:111 reporting/rep203.php:89
-#: reporting/rep204.php:84 reporting/rep307.php:114 reporting/rep601.php:80
-#: reporting/rep602.php:81 reporting/rep701.php:110 reporting/rep704.php:83
-#: reporting/rep704.php:86 reporting/rep704.php:89 reporting/rep708.php:185
-#: sales/inquiry/customer_allocation_inquiry.php:157
+#: purchasing/inquiry/supplier_inquiry.php:182
+#: purchasing/inquiry/supplier_inquiry.php:195 reporting/rep101.php:140
+#: reporting/rep115.php:161 reporting/rep201.php:119 reporting/rep203.php:89
+#: reporting/rep204.php:84 reporting/rep206.php:116 reporting/rep307.php:114
+#: reporting/rep601.php:82 reporting/rep602.php:81 reporting/rep701.php:110
+#: reporting/rep704.php:80 reporting/rep704.php:88 reporting/rep704.php:96
+#: reporting/rep708.php:185 sales/inquiry/customer_allocation_inquiry.php:158
+#: sales/inquiry/customer_inquiry.php:209
+#: sales/inquiry/customer_inquiry.php:222
 msgid "Balance"
 msgstr ""
 
 msgid "Balance"
 msgstr ""
 
-#: dimensions/inquiry/search_dimensions.php:29
+#: dimensions/inquiry/search_dimensions.php:30
 msgid "Search Outstanding Dimensions"
 msgstr ""
 
 msgid "Search Outstanding Dimensions"
 msgstr ""
 
-#: dimensions/inquiry/search_dimensions.php:34
+#: dimensions/inquiry/search_dimensions.php:35
 msgid "Search Dimensions"
 msgstr ""
 
 msgid "Search Dimensions"
 msgstr ""
 
-#: dimensions/inquiry/search_dimensions.php:72 gl/bank_transfer.php:117
-#: gl/inquiry/journal_inquiry.php:45 gl/manage/revaluate_currencies.php:95
-#: gl/includes/ui/gl_bank_ui.inc:26 gl/includes/ui/gl_journal_ui.inc:51
-#: includes/ui/contacts_view.inc:91
+#: dimensions/inquiry/search_dimensions.php:73 gl/bank_transfer.php:117
+#: 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
 #: inventory/includes/item_adjustments_ui.inc:39
 #: inventory/includes/item_adjustments_ui.inc:39
-#: inventory/includes/stock_transfers_ui.inc:42
-#: manufacturing/search_work_orders.php:68
-#: manufacturing/work_order_add_finished.php:185
+#: inventory/includes/sav.item_adjustments_ui.inc:39
+#: inventory/includes/stock_transfers_ui.inc:45
+#: manufacturing/search_work_orders.php:70
+#: manufacturing/work_order_add_finished.php:186
 #: manufacturing/work_order_costs.php:134
 #: manufacturing/work_order_entry.php:357
 #: manufacturing/work_order_entry.php:365
 #: manufacturing/includes/work_order_issue_ui.inc:161
 #: manufacturing/work_order_costs.php:134
 #: manufacturing/work_order_entry.php:357
 #: manufacturing/work_order_entry.php:365
 #: manufacturing/includes/work_order_issue_ui.inc:161
-#: purchasing/includes/ui/invoice_ui.inc:116
+#: purchasing/includes/ui/invoice_ui.inc:117
 #: purchasing/includes/ui/po_ui.inc:156 purchasing/includes/ui/po_ui.inc:161
 #: purchasing/includes/ui/po_ui.inc:156 purchasing/includes/ui/po_ui.inc:161
-#: purchasing/supplier_payment.php:302 sales/customer_payments.php:347
+#: purchasing/supplier_payment.php:303 sales/customer_payments.php:353
 msgid "Reference:"
 msgstr ""
 
 msgid "Reference:"
 msgstr ""
 
-#: dimensions/inquiry/search_dimensions.php:74
-#: includes/ui/allocation_cart.inc:314 includes/ui/ui_lists.inc:2100
-#: reporting/rep101.php:114 reporting/rep102.php:92 reporting/rep104.php:95
-#: reporting/rep104.php:99 reporting/rep105.php:95 reporting/rep105.php:99
-#: reporting/rep201.php:89 reporting/rep202.php:98 reporting/rep203.php:69
-#: reporting/rep204.php:77 reporting/rep301.php:151 reporting/rep301.php:158
-#: reporting/rep302.php:103 reporting/rep302.php:110 reporting/rep303.php:95
-#: reporting/rep303.php:102 reporting/rep304.php:109 reporting/rep304.php:114
-#: reporting/rep304.php:119 reporting/rep306.php:120 reporting/rep306.php:125
-#: reporting/rep306.php:130 reporting/rep306.php:135 reporting/rep307.php:103
-#: reporting/rep307.php:108 reporting/rep308.php:212 reporting/rep308.php:217
-#: reporting/rep309.php:93 reporting/rep402.php:87 reporting/rep402.php:95
+#: dimensions/inquiry/search_dimensions.php:75
+#: includes/ui/allocation_cart.inc:335 includes/ui/ui_lists.inc:2125
+#: reporting/rep101.php:115 reporting/rep102.php:92 reporting/rep104.php:95
+#: reporting/rep104.php:99 reporting/rep105.php:96 reporting/rep105.php:100
+#: reporting/rep115.php:127 reporting/rep201.php:97 reporting/rep202.php: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/rep451.php:67 reporting/rep451.php:74 reporting/rep702.php:61
 #: reporting/rep710.php:86 reporting/rep710.php:87
+#: reporting/includes/reports_classes.inc:284
 msgid "All"
 msgstr ""
 
 msgid "All"
 msgstr ""
 
-#: dimensions/inquiry/search_dimensions.php:75 gl/inquiry/bank_inquiry.php:50
-#: gl/inquiry/gl_trial_balance.php:54 gl/inquiry/journal_inquiry.php:48
+#: dimensions/inquiry/search_dimensions.php:76 gl/inquiry/bank_inquiry.php:50
+#: gl/inquiry/gl_trial_balance.php:55 gl/inquiry/journal_inquiry.php:48
 #: gl/inquiry/profit_loss.php:175 gl/includes/ui/gl_bank_ui.inc:52
 #: gl/includes/ui/gl_bank_ui.inc:114 inventory/inquiry/stock_movements.php:85
 #: purchasing/inquiry/supplier_allocation_inquiry.php:50
 #: gl/inquiry/profit_loss.php:175 gl/includes/ui/gl_bank_ui.inc:52
 #: gl/includes/ui/gl_bank_ui.inc:114 inventory/inquiry/stock_movements.php:85
 #: purchasing/inquiry/supplier_allocation_inquiry.php:50
-#: purchasing/inquiry/supplier_inquiry.php:51
-#: sales/inquiry/customer_inquiry.php:46
+#: purchasing/inquiry/supplier_inquiry.php:143
+#: sales/inquiry/customer_inquiry.php:165
 msgid "From:"
 msgstr ""
 
 msgid "From:"
 msgstr ""
 
-#: dimensions/inquiry/search_dimensions.php:76 gl/inquiry/bank_inquiry.php:51
-#: gl/inquiry/gl_trial_balance.php:55 gl/inquiry/journal_inquiry.php:49
+#: dimensions/inquiry/search_dimensions.php:77 gl/inquiry/bank_inquiry.php:51
+#: gl/inquiry/gl_trial_balance.php:56 gl/inquiry/journal_inquiry.php:49
 #: gl/inquiry/profit_loss.php:176 inventory/inquiry/stock_movements.php:86
 #: purchasing/inquiry/supplier_allocation_inquiry.php:51
 #: gl/inquiry/profit_loss.php:176 inventory/inquiry/stock_movements.php:86
 #: purchasing/inquiry/supplier_allocation_inquiry.php:51
-#: purchasing/inquiry/supplier_inquiry.php:52
-#: sales/inquiry/customer_inquiry.php:47
+#: purchasing/inquiry/supplier_inquiry.php:144
+#: sales/inquiry/customer_inquiry.php:166
 msgid "To:"
 msgstr ""
 
 msgid "To:"
 msgstr ""
 
-#: dimensions/inquiry/search_dimensions.php:78
-#: manufacturing/search_work_orders.php:77
+#: dimensions/inquiry/search_dimensions.php:79
+#: manufacturing/search_work_orders.php:79
 msgid "Only Overdue:"
 msgstr ""
 
 msgid "Only Overdue:"
 msgstr ""
 
-#: dimensions/inquiry/search_dimensions.php:82
-#: manufacturing/search_work_orders.php:80
+#: dimensions/inquiry/search_dimensions.php:83
+#: manufacturing/search_work_orders.php:82
 msgid "Only Open:"
 msgstr ""
 
 msgid "Only Open:"
 msgstr ""
 
-#: dimensions/inquiry/search_dimensions.php:129
-#: dimensions/view/view_dimension.php:55 includes/dashboard.inc:486
-#: includes/dashboard.inc:571 includes/ui/allocation_cart.inc:290
-#: purchasing/includes/ui/invoice_ui.inc:135
+#: dimensions/inquiry/search_dimensions.php:136
+#: dimensions/view/view_dimension.php:55 includes/dashboard.inc:1022
+#: includes/dashboard.inc:1107 includes/ui/allocation_cart.inc:311
+#: 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/view/view_supp_credit.php:48
 #: purchasing/view/view_supp_invoice.php:52
 #: purchasing/inquiry/supplier_allocation_inquiry.php:142
-#: purchasing/inquiry/supplier_inquiry.php:176 reporting/rep101.php:132
-#: reporting/rep201.php:107 reporting/rep203.php:88 reporting/rep501.php:87
+#: purchasing/inquiry/supplier_inquiry.php:179 reporting/rep101.php:136
+#: reporting/rep201.php:115 reporting/rep203.php:88 reporting/rep501.php:87
 #: reporting/includes/doctext.inc:111 reporting/includes/doctext.inc:143
 #: reporting/includes/doctext.inc:164 reporting/includes/doctext.inc:166
 #: reporting/includes/doctext.inc:111 reporting/includes/doctext.inc:143
 #: reporting/includes/doctext.inc:164 reporting/includes/doctext.inc:166
-#: reporting/includes/doctext.inc:205 reporting/includes/doctext.inc:207
+#: reporting/includes/doctext.inc:207 reporting/includes/doctext.inc:209
 #: sales/customer_invoice.php:492 sales/view/view_dispatch.php:97
 #: sales/customer_invoice.php:492 sales/view/view_dispatch.php:97
-#: sales/view/view_invoice.php:96
-#: sales/inquiry/customer_allocation_inquiry.php:151
-#: sales/inquiry/customer_inquiry.php:197
-#: sales/includes/ui/sales_order_ui.inc:588
+#: sales/view/view_invoice.php:96 sales/view/view_sales_order.php:71
+#: sales/inquiry/customer_allocation_inquiry.php:152
+#: sales/inquiry/customer_inquiry.php:204
+#: sales/includes/ui/sales_order_ui.inc:595
 msgid "Due Date"
 msgstr ""
 
 msgid "Due Date"
 msgstr ""
 
-#: dimensions/inquiry/search_dimensions.php:140
+#: dimensions/inquiry/search_dimensions.php:148
 msgid "Marked dimensions are overdue."
 msgstr ""
 
 msgid "Marked dimensions are overdue."
 msgstr ""
 
@@ -3572,27 +3715,27 @@ msgstr ""
 msgid "This dimension is closed."
 msgstr ""
 
 msgid "This dimension is closed."
 msgstr ""
 
-#: dimensions/view/view_dimension.php:85 gl/inquiry/gl_account_inquiry.php:71
-#: gl/inquiry/tax_inquiry.php:61 purchasing/inquiry/po_search_completed.php:82
+#: dimensions/view/view_dimension.php:85 gl/inquiry/gl_account_inquiry.php:72
+#: gl/inquiry/tax_inquiry.php:61 purchasing/inquiry/po_search_completed.php:91
 #: purchasing/inquiry/po_search.php:64
 #: sales/inquiry/customer_allocation_inquiry.php:44
 #: purchasing/inquiry/po_search.php:64
 #: sales/inquiry/customer_allocation_inquiry.php:44
-#: sales/inquiry/sales_deliveries_view.php:102
-#: sales/inquiry/sales_orders_view.php:217
+#: sales/inquiry/sales_deliveries_view.php:103
+#: sales/inquiry/sales_orders_view.php:222
 msgid "from:"
 msgstr ""
 
 msgid "from:"
 msgstr ""
 
-#: dimensions/view/view_dimension.php:86 gl/inquiry/gl_account_inquiry.php:72
-#: gl/inquiry/tax_inquiry.php:62 purchasing/inquiry/po_search_completed.php:83
+#: dimensions/view/view_dimension.php:86 gl/inquiry/gl_account_inquiry.php:73
+#: gl/inquiry/tax_inquiry.php:62 purchasing/inquiry/po_search_completed.php:92
 #: purchasing/inquiry/po_search.php:65
 #: sales/inquiry/customer_allocation_inquiry.php:45
 #: purchasing/inquiry/po_search.php:65
 #: sales/inquiry/customer_allocation_inquiry.php:45
-#: sales/inquiry/sales_deliveries_view.php:103
-#: sales/inquiry/sales_orders_view.php:218
+#: sales/inquiry/sales_deliveries_view.php:104
+#: sales/inquiry/sales_orders_view.php:223
 msgid "to:"
 msgstr ""
 
 #: dimensions/view/view_dimension.php:87 gl/inquiry/balance_sheet.php:130
 msgid "to:"
 msgstr ""
 
 #: dimensions/view/view_dimension.php:87 gl/inquiry/balance_sheet.php:130
-#: gl/inquiry/bank_inquiry.php:53 gl/inquiry/gl_account_inquiry.php:85
-#: gl/inquiry/gl_trial_balance.php:63 gl/inquiry/profit_loss.php:188
+#: gl/inquiry/bank_inquiry.php:53 gl/inquiry/gl_account_inquiry.php:87
+#: gl/inquiry/gl_trial_balance.php:64 gl/inquiry/profit_loss.php:188
 #: gl/inquiry/tax_inquiry.php:63
 msgid "Show"
 msgstr ""
 #: gl/inquiry/tax_inquiry.php:63
 msgid "Show"
 msgstr ""
@@ -3623,10 +3766,10 @@ msgstr ""
 #: gl/accruals.php:106 gl/accruals.php:108 gl/accruals.php:219
 #: gl/accruals.php:221 gl/gl_budget.php:70 gl/gl_budget.php:71
 #: gl/gl_budget.php:75 gl/inquiry/balance_sheet.php:127
 #: gl/accruals.php:106 gl/accruals.php:108 gl/accruals.php:219
 #: gl/accruals.php:221 gl/gl_budget.php:70 gl/gl_budget.php:71
 #: gl/gl_budget.php:75 gl/inquiry/balance_sheet.php:127
-#: gl/inquiry/balance_sheet.php:129 gl/inquiry/gl_account_inquiry.php:79
-#: gl/inquiry/gl_account_inquiry.php:81 gl/inquiry/gl_account_inquiry.php:134
-#: gl/inquiry/gl_account_inquiry.php:136 gl/inquiry/gl_trial_balance.php:57
-#: gl/inquiry/gl_trial_balance.php:59 gl/inquiry/profit_loss.php:184
+#: gl/inquiry/balance_sheet.php:129 gl/inquiry/gl_account_inquiry.php:80
+#: gl/inquiry/gl_account_inquiry.php:82 gl/inquiry/gl_account_inquiry.php:136
+#: gl/inquiry/gl_account_inquiry.php:138 gl/inquiry/gl_trial_balance.php:58
+#: gl/inquiry/gl_trial_balance.php:60 gl/inquiry/profit_loss.php:184
 #: gl/inquiry/profit_loss.php:186 gl/manage/gl_quick_entries.php:268
 #: gl/manage/gl_quick_entries.php:270 gl/manage/gl_quick_entries.php:353
 #: gl/manage/gl_quick_entries.php:355 gl/view/accrual_trans.php:54
 #: 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
@@ -3635,34 +3778,36 @@ msgstr ""
 #: gl/view/gl_payment_view.php:106 gl/view/gl_trans_view.php:95
 #: gl/view/gl_trans_view.php:98 gl/includes/ui/gl_bank_ui.inc:146
 #: gl/includes/ui/gl_bank_ui.inc:147 gl/includes/ui/gl_bank_ui.inc:149
 #: gl/view/gl_payment_view.php:106 gl/view/gl_trans_view.php:95
 #: gl/view/gl_trans_view.php:98 gl/includes/ui/gl_bank_ui.inc:146
 #: gl/includes/ui/gl_bank_ui.inc:147 gl/includes/ui/gl_bank_ui.inc:149
-#: gl/includes/ui/gl_journal_ui.inc:102 gl/includes/ui/gl_journal_ui.inc:103
-#: gl/includes/ui/gl_journal_ui.inc:105 includes/dashboard.inc:134
-#: includes/dashboard.inc:336 includes/sysnames.inc:43
-#: includes/sysnames.inc:180 inventory/manage/item_categories.php:258
-#: inventory/manage/item_categories.php:260 inventory/manage/items.php:457
-#: inventory/manage/items.php:459 purchasing/includes/ui/invoice_ui.inc:140
+#: 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:636 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/invoice_ui.inc:278
 #: purchasing/includes/ui/invoice_ui.inc:280
-#: purchasing/includes/ui/po_ui.inc:172 purchasing/manage/suppliers.php:147
-#: purchasing/manage/suppliers.php:148 purchasing/manage/suppliers.php:150
+#: purchasing/includes/ui/po_ui.inc:172 purchasing/supplier_payment.php:327
+#: purchasing/supplier_payment.php:332 purchasing/manage/suppliers.php:257
+#: purchasing/manage/suppliers.php:258 purchasing/manage/suppliers.php:260
 #: reporting/rep103.php:240 reporting/rep103.php:252 reporting/rep205.php:152
 #: reporting/rep103.php:240 reporting/rep103.php:252 reporting/rep205.php:152
-#: reporting/rep205.php:164 reporting/rep501.php:92 reporting/rep704.php:82
-#: reporting/rep704.php:85 reporting/rep704.php:96 reporting/rep704.php:98
-#: reporting/rep704.php:106 reporting/rep705.php:246 reporting/rep705.php:248
-#: reporting/rep705.php:259 reporting/rep706.php:194 reporting/rep706.php:196
-#: reporting/rep706.php:204 reporting/rep707.php:218 reporting/rep707.php:220
-#: reporting/rep707.php:228 reporting/rep708.php:201 reporting/rep708.php:203
-#: reporting/rep708.php:210 reporting/reports_main.php:366
-#: reporting/reports_main.php:367 reporting/reports_main.php:373
-#: reporting/reports_main.php:374 reporting/reports_main.php:382
-#: reporting/reports_main.php:383 reporting/reports_main.php:394
-#: reporting/reports_main.php:395 reporting/reports_main.php:407
-#: reporting/reports_main.php:408 reporting/reports_main.php:420
-#: reporting/reports_main.php:426 reporting/reports_main.php:434
-#: reporting/reports_main.php:445 reporting/reports_main.php:457
+#: reporting/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_delivery.php:383 sales/customer_delivery.php:391
 #: sales/customer_invoice.php:457 sales/customer_invoice.php:494
-#: sales/manage/customers.php:275 sales/manage/customers.php:277
+#: sales/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_credit_ui.inc:128
 #: sales/includes/ui/sales_credit_ui.inc:133
 #: sales/includes/ui/sales_order_ui.inc:441
@@ -3670,27 +3815,28 @@ msgstr ""
 msgid "Dimension"
 msgstr ""
 
 msgid "Dimension"
 msgstr ""
 
-#: gl/accruals.php:112 gl/accruals.php:229 gl/inquiry/bank_inquiry.php:72
-#: gl/inquiry/gl_account_inquiry.php:141 gl/inquiry/gl_account_inquiry.php:143
-#: gl/inquiry/journal_inquiry.php:114 gl/manage/gl_quick_entries.php:268
-#: gl/manage/gl_quick_entries.php:270 gl/manage/gl_quick_entries.php:272
-#: gl/view/accrual_trans.php:60 gl/view/gl_deposit_view.php:105
-#: gl/view/gl_deposit_view.php:108 gl/view/gl_deposit_view.php:111
-#: gl/view/gl_payment_view.php:104 gl/view/gl_payment_view.php:107
-#: gl/view/gl_payment_view.php:110 gl/view/gl_trans_view.php:96
-#: gl/view/gl_trans_view.php:99 gl/view/gl_trans_view.php:102
-#: gl/includes/ui/gl_bank_ui.inc:147 gl/includes/ui/gl_bank_ui.inc:150
-#: gl/includes/ui/gl_bank_ui.inc:153 gl/includes/ui/gl_bank_ui.inc:302
-#: gl/includes/ui/gl_journal_ui.inc:103 gl/includes/ui/gl_journal_ui.inc:106
-#: gl/includes/ui/gl_journal_ui.inc:109 gl/includes/ui/gl_journal_ui.inc:286
-#: includes/ui/class.reflines_crud.inc:38 inventory/cost_update.php:146
-#: inventory/includes/item_adjustments_ui.inc:214
-#: inventory/includes/stock_transfers_ui.inc:174
+#: gl/accruals.php:112 gl/accruals.php:229 gl/bank_account_reconcile.php:273
+#: gl/inquiry/bank_inquiry.php:72 gl/inquiry/gl_account_inquiry.php:143
+#: gl/inquiry/gl_account_inquiry.php:145 gl/inquiry/journal_inquiry.php:120
+#: gl/manage/gl_quick_entries.php:268 gl/manage/gl_quick_entries.php:270
+#: gl/manage/gl_quick_entries.php:272 gl/view/accrual_trans.php:60
+#: gl/view/gl_deposit_view.php:105 gl/view/gl_deposit_view.php:108
+#: gl/view/gl_deposit_view.php:111 gl/view/gl_payment_view.php:104
+#: gl/view/gl_payment_view.php:107 gl/view/gl_payment_view.php:110
+#: gl/view/gl_trans_view.php:96 gl/view/gl_trans_view.php:99
+#: gl/view/gl_trans_view.php:102 gl/includes/ui/gl_bank_ui.inc:147
+#: gl/includes/ui/gl_bank_ui.inc:150 gl/includes/ui/gl_bank_ui.inc:153
+#: gl/includes/ui/gl_bank_ui.inc:300 gl/includes/ui/gl_journal_ui.inc:113
+#: gl/includes/ui/gl_journal_ui.inc:116 gl/includes/ui/gl_journal_ui.inc:119
+#: gl/includes/ui/gl_journal_ui.inc:297 includes/ui/class.reflines_crud.inc:38
+#: inventory/cost_update.php: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
 #: manufacturing/view/wo_costs_view.php:61
 #: manufacturing/includes/work_order_issue_ui.inc:169
 #: purchasing/includes/ui/invoice_ui.inc:278
 #: purchasing/includes/ui/invoice_ui.inc:280
-#: purchasing/includes/ui/invoice_ui.inc:282
+#: purchasing/includes/ui/invoice_ui.inc: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"
 #: sales/customer_credit_invoice.php:359 sales/customer_delivery.php:523
 #: sales/includes/ui/sales_credit_ui.inc:334
 msgid "Memo"
@@ -3729,7 +3875,7 @@ msgid "Revenue / Cost Account"
 msgstr ""
 
 #: gl/accruals.php:224 gl/gl_budget.php:90 gl/gl_budget.php:92
 msgstr ""
 
 #: gl/accruals.php:224 gl/gl_budget.php:90 gl/gl_budget.php:92
-#: gl/inquiry/journal_inquiry.php:113 gl/inquiry/tax_inquiry.php:80
+#: gl/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/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
@@ -3738,24 +3884,23 @@ msgstr ""
 #: 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/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:121
-#: includes/dashboard.inc:147 includes/dashboard.inc:170
-#: includes/dashboard.inc:189 includes/dashboard.inc:226
-#: includes/dashboard.inc:294 includes/dashboard.inc:336
-#: includes/dashboard.inc:448 includes/sysnames.inc:138
-#: includes/ui/allocation_cart.inc:290 includes/ui/ui_lists.inc:1349
+#: gl/includes/ui/gl_bank_ui.inc:153 includes/dashboard.inc:444
+#: includes/dashboard.inc:490 includes/dashboard.inc:566
+#: includes/dashboard.inc:989 includes/dashboard.inc:994
+#: includes/sysnames.inc:140 includes/ui/allocation_cart.inc:311
+#: includes/ui/ui_lists.inc:1373
 #: manufacturing/includes/manufacturing_ui.inc:253
 #: purchasing/includes/ui/invoice_ui.inc:278
 #: purchasing/includes/ui/invoice_ui.inc:280
 #: purchasing/includes/ui/invoice_ui.inc:282
 #: purchasing/view/view_supp_payment.php:60
 #: purchasing/view/view_supp_payment.php:72
 #: 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:178 reporting/rep102.php:242
-#: reporting/rep107.php:205 reporting/rep107.php:270 reporting/rep109.php:197
+#: purchasing/inquiry/supplier_inquiry.php:181 reporting/rep102.php:245
+#: reporting/rep107.php:227 reporting/rep107.php:292 reporting/rep109.php:181
 #: reporting/rep110.php:194 reporting/rep111.php:194 reporting/rep113.php:183
 #: reporting/rep110.php:194 reporting/rep111.php:194 reporting/rep113.php:183
-#: reporting/rep202.php:250 reporting/rep209.php:199 reporting/rep706.php:308
-#: reporting/rep707.php:326 reporting/rep710.php:78
-#: sales/view/view_receipt.php:44 sales/inquiry/customer_inquiry.php:201
+#: 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"
 msgstr ""
 
 msgid "Amount"
 msgstr ""
 
@@ -3771,7 +3916,7 @@ msgstr ""
 msgid "Periods"
 msgstr ""
 
 msgid "Periods"
 msgstr ""
 
-#: gl/accruals.php:232
+#: gl/accruals.php:232 reporting/rep402.php:155 reporting/reports_main.php:327
 msgid "Show GL Rows"
 msgstr ""
 
 msgid "Show GL Rows"
 msgstr ""
 
@@ -3801,59 +3946,62 @@ msgstr ""
 msgid "Reconcile this transaction"
 msgstr ""
 
 msgid "Reconcile this transaction"
 msgstr ""
 
-#: gl/bank_account_reconcile.php:163 gl/inquiry/bank_inquiry.php:48
-#: gl/inquiry/gl_account_inquiry.php:70
+#: gl/bank_account_reconcile.php:199 gl/inquiry/bank_inquiry.php:48
+#: gl/inquiry/gl_account_inquiry.php:71
 msgid "Account:"
 msgstr ""
 
 msgid "Account:"
 msgstr ""
 
-#: gl/bank_account_reconcile.php:165
+#: gl/bank_account_reconcile.php:201
 msgid "Bank Statement:"
 msgstr ""
 
 msgid "Bank Statement:"
 msgstr ""
 
-#: gl/bank_account_reconcile.php:166 includes/ui/class.crud_view.inc:300
+#: gl/bank_account_reconcile.php:202 includes/ui/class.crud_view.inc:309
 msgid "New"
 msgstr ""
 
 msgid "New"
 msgstr ""
 
-#: gl/bank_account_reconcile.php:195
+#: gl/bank_account_reconcile.php:231
 msgid "Reconcile Date"
 msgstr ""
 
 msgid "Reconcile Date"
 msgstr ""
 
-#: gl/bank_account_reconcile.php:195
+#: gl/bank_account_reconcile.php:231
 msgid "Beginning<br>Balance"
 msgstr ""
 
 msgid "Beginning<br>Balance"
 msgstr ""
 
-#: gl/bank_account_reconcile.php:196
+#: gl/bank_account_reconcile.php:232
 msgid "Ending<br>Balance"
 msgstr ""
 
 msgid "Ending<br>Balance"
 msgstr ""
 
-#: gl/bank_account_reconcile.php:196
+#: gl/bank_account_reconcile.php:232
 msgid "Account<br>Total"
 msgstr ""
 
 msgid "Account<br>Total"
 msgstr ""
 
-#: gl/bank_account_reconcile.php:196
+#: gl/bank_account_reconcile.php:232
 msgid "Reconciled<br>Amount"
 msgstr ""
 
 msgid "Reconciled<br>Amount"
 msgstr ""
 
-#: gl/bank_account_reconcile.php:196 reporting/rep602.php:205
+#: gl/bank_account_reconcile.php:232 reporting/rep602.php:205
 msgid "Difference"
 msgstr ""
 
 msgid "Difference"
 msgstr ""
 
-#: gl/bank_account_reconcile.php:200
+#: gl/bank_account_reconcile.php:236
 msgid "Date of bank statement to reconcile"
 msgstr ""
 
 msgid "Date of bank statement to reconcile"
 msgstr ""
 
-#: gl/bank_account_reconcile.php:236 gl/inquiry/bank_inquiry.php:72
-#: gl/inquiry/gl_account_inquiry.php:141 gl/inquiry/gl_account_inquiry.php:143
-#: gl/view/accrual_trans.php:60 reporting/rep601.php:79
-#: reporting/rep602.php:80 reporting/rep704.php:83 reporting/rep704.php:85
-#: reporting/rep704.php:88
+#: gl/bank_account_reconcile.php:272 gl/inquiry/bank_inquiry.php:72
+#: gl/inquiry/gl_account_inquiry.php:143 gl/inquiry/gl_account_inquiry.php:145
+#: gl/view/accrual_trans.php:60 reporting/rep601.php:81 reporting/rep602.php:80
+#: reporting/rep704.php:80 reporting/rep704.php:87 reporting/rep704.php:95
 msgid "Person/Item"
 msgstr ""
 
 msgid "Person/Item"
 msgstr ""
 
-#: gl/bank_account_reconcile.php:246
+#: gl/bank_account_reconcile.php:284
 msgid "Reconcile"
 msgstr ""
 
 msgid "Reconcile"
 msgstr ""
 
+#: gl/bank_account_reconcile.php:285
+msgid "Reconcile All"
+msgstr ""
+
 #: gl/bank_transfer.php:30
 msgid "Modify Bank Account Transfer"
 msgstr ""
 #: gl/bank_transfer.php:30
 msgid "Modify Bank Account Transfer"
 msgstr ""
@@ -3862,11 +4010,11 @@ msgstr ""
 msgid "Bank Account Transfer Entry"
 msgstr ""
 
 msgid "Bank Account Transfer Entry"
 msgstr ""
 
-#: gl/bank_transfer.php:46 gl/manage/revaluate_currencies.php:35
+#: gl/bank_transfer.php:46
 msgid "Transfer has been entered"
 msgstr ""
 
 msgid "Transfer has been entered"
 msgstr ""
 
-#: gl/bank_transfer.php:48 gl/manage/revaluate_currencies.php:37
+#: gl/bank_transfer.php:48
 msgid "&View the GL Journal Entries for this Transfer"
 msgstr ""
 
 msgid "&View the GL Journal Entries for this Transfer"
 msgstr ""
 
@@ -3887,12 +4035,12 @@ msgid "Transfer Date:"
 msgstr ""
 
 #: gl/bank_transfer.php:126 gl/bank_transfer.php:133
 msgstr ""
 
 #: gl/bank_transfer.php:126 gl/bank_transfer.php:133
-#: sales/customer_payments.php:376
+#: sales/customer_payments.php:397
 msgid "Amount:"
 msgstr ""
 
 #: gl/bank_transfer.php:127 gl/bank_transfer.php:134
 msgid "Amount:"
 msgstr ""
 
 #: gl/bank_transfer.php:127 gl/bank_transfer.php:134
-#: purchasing/supplier_payment.php:319 sales/customer_payments.php:362
+#: purchasing/supplier_payment.php:320 sales/customer_payments.php:368
 msgid "Bank Charge:"
 msgstr ""
 
 msgid "Bank Charge:"
 msgstr ""
 
@@ -3908,54 +4056,54 @@ msgstr ""
 msgid "Enter Transfer"
 msgstr ""
 
 msgid "Enter Transfer"
 msgstr ""
 
-#: gl/bank_transfer.php:172 gl/bank_transfer.php:226 gl/bank_transfer.php:250
-#: purchasing/supplier_payment.php:144 purchasing/supplier_payment.php:150
+#: gl/bank_transfer.php:172 gl/bank_transfer.php:227 gl/bank_transfer.php:251
+#: purchasing/supplier_payment.php:138 purchasing/supplier_payment.php:144
 msgid "The entered amount is invalid or less than zero."
 msgstr ""
 
 msgid "The entered amount is invalid or less than zero."
 msgstr ""
 
-#: gl/bank_transfer.php:177 gl/gl_bank.php:226
+#: gl/bank_transfer.php:177 gl/gl_bank.php:230
 msgid "The total bank amount cannot be 0."
 msgstr ""
 
 msgid "The total bank amount cannot be 0."
 msgstr ""
 
-#: gl/bank_transfer.php:193
+#: gl/bank_transfer.php:194
 #, php-format
 msgid ""
 "This bank transfer change would result in exceeding authorized overdraft "
 "limit (%s) of the account '%s'"
 msgstr ""
 
 #, php-format
 msgid ""
 "This bank transfer change would result in exceeding authorized overdraft "
 "limit (%s) of the account '%s'"
 msgstr ""
 
-#: gl/bank_transfer.php:198
+#: gl/bank_transfer.php:199
 #, php-format
 msgid ""
 "This bank transfer change would result in exceeding authorized overdraft "
 "limit on '%s' for transaction: %s #%s on %s."
 msgstr ""
 
 #, php-format
 msgid ""
 "This bank transfer change would result in exceeding authorized overdraft "
 "limit on '%s' for transaction: %s #%s on %s."
 msgstr ""
 
-#: gl/bank_transfer.php:210
+#: gl/bank_transfer.php:211
 #, php-format
 msgid ""
 "This bank transfer would result in exceeding authorized overdraft limit of "
 "the account (%s)"
 msgstr ""
 
 #, php-format
 msgid ""
 "This bank transfer would result in exceeding authorized overdraft limit of "
 "the account (%s)"
 msgstr ""
 
-#: gl/bank_transfer.php:215
+#: gl/bank_transfer.php:216
 #, php-format
 msgid ""
 "This bank transfer would result in exceeding authorized overdraft limit for "
 "transaction: %s #%s on %s."
 msgstr ""
 
 #, php-format
 msgid ""
 "This bank transfer would result in exceeding authorized overdraft limit for "
 "transaction: %s #%s on %s."
 msgstr ""
 
-#: gl/bank_transfer.php:231 purchasing/supplier_payment.php:158
-#: sales/customer_payments.php:181
+#: gl/bank_transfer.php:232 purchasing/supplier_payment.php:152
+#: sales/customer_payments.php:188
 msgid ""
 "The Bank Charge Account has not been set in System and General GL Setup."
 msgstr ""
 
 msgid ""
 "The Bank Charge Account has not been set in System and General GL Setup."
 msgstr ""
 
-#: gl/bank_transfer.php:243
+#: gl/bank_transfer.php:244
 msgid "The source and destination bank accouts cannot be the same."
 msgstr ""
 
 msgid "The source and destination bank accouts cannot be the same."
 msgstr ""
 
-#: gl/bank_transfer.php:255
+#: gl/bank_transfer.php:256
 msgid "The incomming bank amount cannot be 0."
 msgstr ""
 
 msgid "The incomming bank amount cannot be 0."
 msgstr ""
 
@@ -3975,124 +4123,124 @@ msgstr ""
 msgid "Modify Bank Deposit Entry"
 msgstr ""
 
 msgid "Modify Bank Deposit Entry"
 msgstr ""
 
-#: gl/gl_bank.php:77
+#: gl/gl_bank.php:81
 #, php-format
 msgid "Payment %d has been entered"
 msgstr ""
 
 #, php-format
 msgid "Payment %d has been entered"
 msgstr ""
 
-#: gl/gl_bank.php:79 gl/gl_bank.php:97
+#: gl/gl_bank.php:83 gl/gl_bank.php:101
 msgid "&View the GL Postings for this Payment"
 msgstr ""
 
 msgid "&View the GL Postings for this Payment"
 msgstr ""
 
-#: gl/gl_bank.php:81 gl/gl_bank.php:99
+#: gl/gl_bank.php:85 gl/gl_bank.php:103
 msgid "Enter Another &Payment"
 msgstr ""
 
 msgid "Enter Another &Payment"
 msgstr ""
 
-#: gl/gl_bank.php:83 gl/gl_bank.php:101
+#: gl/gl_bank.php:87 gl/gl_bank.php:105
 msgid "Enter A &Deposit"
 msgstr ""
 
 msgid "Enter A &Deposit"
 msgstr ""
 
-#: gl/gl_bank.php:85 gl/gl_journal.php:64 inventory/adjustments.php:65
+#: gl/gl_bank.php:89 gl/gl_journal.php:64 inventory/adjustments.php:65
 #: manufacturing/work_order_entry.php:67 purchasing/po_entry_items.php:117
 #: manufacturing/work_order_entry.php:67 purchasing/po_entry_items.php:117
-#: purchasing/po_entry_items.php:138 purchasing/supplier_credit.php:82
-#: purchasing/supplier_invoice.php:76 sales/credit_note_entry.php:77
+#: purchasing/po_entry_items.php:138 purchasing/supplier_credit.php:85
+#: purchasing/supplier_invoice.php:74 sales/credit_note_entry.php:77
 #: sales/customer_credit_invoice.php:61 sales/customer_invoice.php:72
 #: sales/sales_order_entry.php:250
 msgid "Add an Attachment"
 msgstr ""
 
 #: sales/customer_credit_invoice.php:61 sales/customer_invoice.php:72
 #: sales/sales_order_entry.php:250
 msgid "Add an Attachment"
 msgstr ""
 
-#: gl/gl_bank.php:95
+#: gl/gl_bank.php:99
 #, php-format
 msgid "Payment %d has been modified"
 msgstr ""
 
 #, php-format
 msgid "Payment %d has been modified"
 msgstr ""
 
-#: gl/gl_bank.php:111
+#: gl/gl_bank.php:115
 #, php-format
 msgid "Deposit %d has been entered"
 msgstr ""
 
 #, php-format
 msgid "Deposit %d has been entered"
 msgstr ""
 
-#: gl/gl_bank.php:113
+#: gl/gl_bank.php:117
 msgid "View the GL Postings for this Deposit"
 msgstr ""
 
 msgid "View the GL Postings for this Deposit"
 msgstr ""
 
-#: gl/gl_bank.php:115
+#: gl/gl_bank.php:119
 msgid "Enter Another Deposit"
 msgstr ""
 
 msgid "Enter Another Deposit"
 msgstr ""
 
-#: gl/gl_bank.php:117
+#: gl/gl_bank.php:121
 msgid "Enter A Payment"
 msgstr ""
 
 msgid "Enter A Payment"
 msgstr ""
 
-#: gl/gl_bank.php:126
+#: gl/gl_bank.php:130
 #, php-format
 msgid "Deposit %d has been modified"
 msgstr ""
 
 #, php-format
 msgid "Deposit %d has been modified"
 msgstr ""
 
-#: gl/gl_bank.php:128
+#: gl/gl_bank.php:132
 msgid "&View the GL Postings for this Deposit"
 msgstr ""
 
 msgid "&View the GL Postings for this Deposit"
 msgstr ""
 
-#: gl/gl_bank.php:130
+#: gl/gl_bank.php:134
 msgid "Enter Another &Deposit"
 msgstr ""
 
 msgid "Enter Another &Deposit"
 msgstr ""
 
-#: gl/gl_bank.php:132
+#: gl/gl_bank.php:136
 msgid "Enter A &Payment"
 msgstr ""
 
 msgid "Enter A &Payment"
 msgstr ""
 
-#: gl/gl_bank.php:220
+#: gl/gl_bank.php:224
 msgid "You must enter at least one payment line."
 msgstr ""
 
 msgid "You must enter at least one payment line."
 msgstr ""
 
-#: gl/gl_bank.php:237 purchasing/supplier_payment.php:209
+#: gl/gl_bank.php:241 purchasing/supplier_payment.php:203
 #, php-format
 msgid "The total bank amount exceeds allowed limit (%s)."
 msgstr ""
 
 #, php-format
 msgid "The total bank amount exceeds allowed limit (%s)."
 msgstr ""
 
-#: gl/gl_bank.php:243
+#: gl/gl_bank.php:248
 #, php-format
 msgid ""
 "The bank transaction would result in exceed of authorized overdraft limit "
 "for transaction: %s #%s on %s."
 msgstr ""
 
 #, php-format
 msgid ""
 "The bank transaction would result in exceed of authorized overdraft limit "
 "for transaction: %s #%s on %s."
 msgstr ""
 
-#: gl/gl_bank.php:255
+#: gl/gl_bank.php:261
 msgid "The entered date for the payment is invalid."
 msgstr ""
 
 msgid "The entered date for the payment is invalid."
 msgstr ""
 
-#: gl/gl_bank.php:267
+#: gl/gl_bank.php:273
 msgid "You have to select customer and customer branch."
 msgstr ""
 
 msgid "You have to select customer and customer branch."
 msgstr ""
 
-#: gl/gl_bank.php:271
+#: gl/gl_bank.php:277
 msgid "You have to select supplier."
 msgstr ""
 
 msgid "You have to select supplier."
 msgstr ""
 
-#: gl/gl_bank.php:279
+#: gl/gl_bank.php:285
 msgid "Settled amount have to be positive number."
 msgstr ""
 
 msgid "Settled amount have to be positive number."
 msgstr ""
 
-#: gl/gl_bank.php:325
+#: gl/gl_bank.php:331
 msgid "The amount entered is not a valid number or is less than zero."
 msgstr ""
 
 msgid "The amount entered is not a valid number or is less than zero."
 msgstr ""
 
-#: gl/gl_bank.php:331 gl/manage/exchange_rates.php:39
+#: gl/gl_bank.php:337 gl/manage/exchange_rates.php:39
 msgid "The exchange rate cannot be zero or a negative number."
 msgstr ""
 
 msgid "The exchange rate cannot be zero or a negative number."
 msgstr ""
 
-#: gl/gl_bank.php:403
+#: gl/gl_bank.php:409
 msgid "Payment Items"
 msgstr ""
 
 msgid "Payment Items"
 msgstr ""
 
-#: gl/gl_bank.php:403
+#: gl/gl_bank.php:409
 msgid "Deposit Items"
 msgstr ""
 
 msgid "Deposit Items"
 msgstr ""
 
-#: gl/gl_bank.php:411
+#: gl/gl_bank.php:417
 msgid "Process Payment"
 msgstr ""
 
 msgid "Process Payment"
 msgstr ""
 
-#: gl/gl_bank.php:411
+#: gl/gl_bank.php:417
 msgid "Process Deposit"
 msgstr ""
 
 msgid "Process Deposit"
 msgstr ""
 
@@ -4114,8 +4262,8 @@ msgstr ""
 msgid "The Budget has been deleted."
 msgstr ""
 
 msgid "The Budget has been deleted."
 msgstr ""
 
-#: gl/gl_budget.php:63 gl/manage/gl_accounts.php:234
-#: gl/manage/gl_accounts.php:244
+#: gl/gl_budget.php:63 gl/manage/gl_accounts.php:240
+#: gl/manage/gl_accounts.php:251
 msgid "Account Code:"
 msgstr ""
 
 msgid "Account Code:"
 msgstr ""
 
@@ -4124,17 +4272,18 @@ msgid "Get"
 msgstr ""
 
 #: gl/gl_budget.php:90 gl/gl_budget.php:92 gl/inquiry/profit_loss.php:237
 msgstr ""
 
 #: gl/gl_budget.php:90 gl/gl_budget.php:92 gl/inquiry/profit_loss.php:237
-#: gl/manage/gl_quick_entries.php:247 reporting/rep101.php:140
-#: reporting/rep105.php:118 reporting/rep106.php:98 reporting/rep114.php:90
-#: reporting/rep201.php:115 reporting/rep304.php:134 reporting/rep305.php:111
-#: reporting/rep306.php:148 reporting/rep307.php:119 reporting/rep308.php:229
-#: reporting/rep309.php:104 reporting/rep601.php:85 reporting/rep602.php:86
-#: reporting/rep702.php:59 reporting/rep704.php:94 reporting/rep704.php:104
-#: reporting/rep704.php:112 reporting/rep706.php:185 reporting/rep706.php:193
-#: reporting/rep706.php:203 reporting/rep706.php:211 reporting/rep707.php:210
-#: reporting/rep707.php:217 reporting/rep707.php:227 reporting/rep707.php:235
+#: gl/manage/gl_quick_entries.php:247 reporting/rep101.php:144
+#: reporting/rep105.php:119 reporting/rep106.php:99 reporting/rep114.php:90
+#: reporting/rep115.php:166 reporting/rep201.php:123 reporting/rep206.php:121
+#: reporting/rep304.php:134 reporting/rep305.php:111 reporting/rep306.php: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/rep708.php:200 reporting/rep708.php:209 reporting/rep708.php:216
-#: reporting/rep709.php:111 reporting/rep710.php:85
+#: reporting/rep709.php:112 reporting/rep710.php:85
 msgid "Period"
 msgstr ""
 
 msgid "Period"
 msgstr ""
 
@@ -4148,40 +4297,42 @@ msgstr ""
 
 #: gl/gl_budget.php:126 gl/inquiry/balance_sheet.php:98
 #: gl/inquiry/balance_sheet.php:202 gl/inquiry/balance_sheet.php:233
 
 #: gl/gl_budget.php:126 gl/inquiry/balance_sheet.php:98
 #: gl/inquiry/balance_sheet.php:202 gl/inquiry/balance_sheet.php:233
-#: gl/inquiry/gl_trial_balance.php:220 gl/inquiry/profit_loss.php:120
-#: gl/inquiry/profit_loss.php:287 gl/view/gl_deposit_view.php:137
-#: gl/view/gl_payment_view.php:136 gl/view/gl_trans_view.php:144
-#: gl/includes/ui/gl_bank_ui.inc:195 gl/includes/ui/gl_journal_ui.inc:169
-#: includes/dashboard.inc:487 includes/dashboard.inc:571
-#: inventory/includes/item_adjustments_ui.inc:60
-#: inventory/includes/item_adjustments_ui.inc:114
+#: gl/inquiry/gl_trial_balance.php: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:1023
+#: includes/dashboard.inc:1107 inventory/includes/item_adjustments_ui.inc:60
+#: 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/includes/ui/invoice_ui.inc:341
+#: purchasing/includes/ui/invoice_ui.inc:342
 #: purchasing/includes/ui/invoice_ui.inc:504
 #: purchasing/includes/ui/invoice_ui.inc:504
-#: purchasing/includes/ui/invoice_ui.inc:575
-#: purchasing/po_receive_items.php:63 purchasing/view/view_po.php:140
+#: purchasing/includes/ui/invoice_ui.inc:575 purchasing/po_receive_items.php:63
+#: purchasing/view/view_po.php:140
 #: purchasing/allocations/supplier_allocation_main.php:100
 #: purchasing/allocations/supplier_allocation_main.php:100
-#: reporting/rep101.php:249 reporting/rep106.php:90 reporting/rep106.php:125
-#: reporting/rep106.php:172 reporting/rep114.php:161 reporting/rep201.php:222
+#: reporting/rep101.php:264 reporting/rep106.php:91 reporting/rep106.php:126
+#: reporting/rep106.php:173 reporting/rep114.php:161 reporting/rep201.php:234
 #: reporting/rep203.php:89 reporting/rep203.php:166 reporting/rep204.php:113
 #: reporting/rep203.php:89 reporting/rep203.php:166 reporting/rep204.php:113
-#: reporting/rep204.php:141 reporting/rep301.php:192 reporting/rep301.php:240
+#: reporting/rep204.php:141 reporting/rep301.php:196 reporting/rep301.php:244
 #: reporting/rep304.php:160 reporting/rep304.php:205 reporting/rep305.php:106
 #: reporting/rep304.php:160 reporting/rep304.php:205 reporting/rep305.php:106
-#: reporting/rep305.php:132 reporting/rep305.php:188 reporting/rep306.php:141
-#: reporting/rep306.php:176 reporting/rep306.php:196 reporting/rep306.php:212
-#: reporting/rep306.php:261 reporting/rep306.php:276 reporting/rep306.php:287
-#: reporting/rep308.php:304 reporting/rep309.php:125 reporting/rep309.php:152
-#: reporting/rep451.php:120 reporting/rep451.php:155 reporting/rep702.php:142
-#: reporting/rep705.php:152 reporting/rep705.php:312 reporting/rep706.php:106
-#: reporting/rep706.php:255 reporting/rep706.php:290 reporting/rep707.php:115
-#: reporting/rep707.php:297 reporting/rep708.php:253
+#: reporting/rep305.php:132 reporting/rep305.php:188 reporting/rep306.php:138
+#: reporting/rep306.php:173 reporting/rep306.php:193 reporting/rep306.php:209
+#: reporting/rep306.php:257 reporting/rep306.php:272 reporting/rep306.php:283
+#: reporting/rep309.php:125 reporting/rep309.php:152 reporting/rep451.php:120
+#: reporting/rep451.php:155 reporting/rep702.php:136 reporting/rep705.php:155
+#: reporting/rep705.php:256 reporting/rep705.php:336 reporting/rep706.php:106
+#: reporting/rep706.php:257 reporting/rep706.php:292 reporting/rep707.php:114
+#: reporting/rep707.php:300 reporting/rep708.php:253 reporting/rep710.php:126
 #: reporting/includes/doctext.inc:32 reporting/includes/doctext.inc:191
 #: sales/customer_credit_invoice.php:276 sales/customer_delivery.php:421
 #: sales/customer_invoice.php:519 sales/customer_invoice.php:522
 #: reporting/includes/doctext.inc:32 reporting/includes/doctext.inc:191
 #: sales/customer_credit_invoice.php:276 sales/customer_delivery.php:421
 #: sales/customer_invoice.php:519 sales/customer_invoice.php:522
-#: sales/allocations/customer_allocation_main.php:93
+#: sales/allocations/customer_allocation_main.php:98
 #: sales/view/view_credit.php:91 sales/view/view_dispatch.php:113
 #: sales/view/view_credit.php:91 sales/view/view_dispatch.php:113
-#: sales/view/view_invoice.php:116 sales/view/view_sales_order.php:109
-#: sales/view/view_sales_order.php:142 sales/view/view_sales_order.php:179
-#: sales/view/view_sales_order.php:220
+#: sales/view/view_invoice.php:116 sales/view/view_sales_order.php:111
+#: sales/view/view_sales_order.php:144 sales/view/view_sales_order.php:181
+#: sales/view/view_sales_order.php:222
 #: sales/includes/ui/sales_credit_ui.inc:163
 #: sales/includes/ui/sales_order_ui.inc:148
 msgid "Total"
 #: sales/includes/ui/sales_credit_ui.inc:163
 #: sales/includes/ui/sales_order_ui.inc:148
 msgid "Total"
@@ -4196,7 +4347,7 @@ msgstr ""
 msgid "Modifying Journal Transaction # %d."
 msgstr ""
 
 msgid "Modifying Journal Transaction # %d."
 msgstr ""
 
-#: gl/gl_journal.php:36 includes/sysnames.inc:22 includes/sysnames.inc:155
+#: gl/gl_journal.php:36 includes/sysnames.inc:22 includes/sysnames.inc:157
 msgid "Journal Entry"
 msgstr ""
 
 msgid "Journal Entry"
 msgstr ""
 
@@ -4229,119 +4380,114 @@ msgstr ""
 msgid "Entry &New Journal Entry"
 msgstr ""
 
 msgid "Entry &New Journal Entry"
 msgstr ""
 
-#: gl/gl_journal.php:204
+#: gl/gl_journal.php:203
 msgid "You must enter at least one journal line."
 msgstr ""
 
 msgid "You must enter at least one journal line."
 msgstr ""
 
-#: gl/gl_journal.php:210
+#: gl/gl_journal.php:209
 msgid ""
 "The journal must balance (debits equal to credits) before it can be "
 "processed."
 msgstr ""
 
 msgid ""
 "The journal must balance (debits equal to credits) before it can be "
 "processed."
 msgstr ""
 
-#: gl/gl_journal.php:247
+#: gl/gl_journal.php:246
 msgid "The exchange rate must be numeric and greater than zero."
 msgstr ""
 
 msgid "The exchange rate must be numeric and greater than zero."
 msgstr ""
 
-#: gl/gl_journal.php:273
+#: gl/gl_journal.php:272
 msgid ""
 "Check tax register records before processing transaction or switch off "
 "'Include in tax register' option."
 msgstr ""
 
 msgid ""
 "Check tax register records before processing transaction or switch off "
 "'Include in tax register' option."
 msgstr ""
 
-#: gl/gl_journal.php:287
+#: gl/gl_journal.php:286
 msgid ""
 "Cannot determine tax register to be used. You have to make at least one "
 "posting either to tax or customer/supplier account to use tax register."
 msgstr ""
 
 msgid ""
 "Cannot determine tax register to be used. You have to make at least one "
 "posting either to tax or customer/supplier account to use tax register."
 msgstr ""
 
-#: gl/gl_journal.php:347 gl/manage/gl_quick_entries.php:121
+#: gl/gl_journal.php:355 gl/manage/gl_quick_entries.php:121
 msgid "You must select GL account."
 msgstr ""
 
 msgid "You must select GL account."
 msgstr ""
 
-#: gl/gl_journal.php:353
+#: gl/gl_journal.php:361
 msgid "You must select subledger account."
 msgstr ""
 
 msgid "You must select subledger account."
 msgstr ""
 
-#: gl/gl_journal.php:361 gl/gl_journal.php:368
+#: gl/gl_journal.php:369 gl/gl_journal.php:376
 msgid "Dimension is closed."
 msgstr ""
 
 msgid "Dimension is closed."
 msgstr ""
 
-#: gl/gl_journal.php:375
+#: gl/gl_journal.php:383
 msgid "You must enter either a debit amount or a credit amount."
 msgstr ""
 
 msgid "You must enter either a debit amount or a credit amount."
 msgstr ""
 
-#: gl/gl_journal.php:382
+#: gl/gl_journal.php:390
 msgid "The debit amount entered is not a valid number or is less than zero."
 msgstr ""
 
 msgid "The debit amount entered is not a valid number or is less than zero."
 msgstr ""
 
-#: gl/gl_journal.php:387
+#: gl/gl_journal.php:395
 msgid "The credit amount entered is not a valid number or is less than zero."
 msgstr ""
 
 msgid "The credit amount entered is not a valid number or is less than zero."
 msgstr ""
 
-#: gl/gl_journal.php:393 includes/ui/ui_view.inc:649
-#: purchasing/supplier_credit.php:143 purchasing/supplier_invoice.php:154
+#: gl/gl_journal.php:401 includes/ui/ui_view.inc:655
+#: purchasing/supplier_credit.php:146 purchasing/supplier_invoice.php:152
 msgid "Cannot post to GL account used by more than one tax type."
 msgstr ""
 
 msgid "Cannot post to GL account used by more than one tax type."
 msgstr ""
 
-#: gl/gl_journal.php:400
+#: gl/gl_journal.php:408
 msgid ""
 "You cannot make a journal entry for a bank account. Please use one of the "
 "banking functions for bank transactions."
 msgstr ""
 
 msgid ""
 "You cannot make a journal entry for a bank account. Please use one of the "
 "banking functions for bank transactions."
 msgstr ""
 
-#: gl/gl_journal.php:520
+#: gl/gl_journal.php:528
 msgid "&GL postings"
 msgstr ""
 
 msgid "&GL postings"
 msgstr ""
 
-#: gl/gl_journal.php:521
+#: gl/gl_journal.php:529
 msgid "&Tax register"
 msgstr ""
 
 msgid "&Tax register"
 msgstr ""
 
-#: gl/gl_journal.php:530
+#: gl/gl_journal.php:538
 msgid "Rows"
 msgstr ""
 
 msgid "Rows"
 msgstr ""
 
-#: gl/gl_journal.php:539
+#: gl/gl_journal.php:548
 msgid "Tax register record"
 msgstr ""
 
 msgid "Tax register record"
 msgstr ""
 
-#: gl/gl_journal.php:541
+#: gl/gl_journal.php:551
 msgid "VAT date:"
 msgstr ""
 
 msgid "VAT date:"
 msgstr ""
 
-#: gl/gl_journal.php:542
-msgid "Tax group:"
-msgstr ""
-
-#: gl/gl_journal.php:546 gl/inquiry/tax_inquiry.php:102
-#: reporting/rep709.php:189
+#: gl/gl_journal.php:556 gl/inquiry/tax_inquiry.php:102
+#: reporting/rep709.php:191
 msgid "Input Tax"
 msgstr ""
 
 msgid "Input Tax"
 msgstr ""
 
-#: gl/gl_journal.php:546 gl/inquiry/tax_inquiry.php:96
-#: reporting/rep709.php:189
+#: gl/gl_journal.php:556 gl/inquiry/tax_inquiry.php:96 reporting/rep709.php:191
 msgid "Output Tax"
 msgstr ""
 
 msgid "Output Tax"
 msgstr ""
 
-#: gl/gl_journal.php:546
+#: gl/gl_journal.php:556
 msgid "Net amount"
 msgstr ""
 
 msgid "Net amount"
 msgstr ""
 
-#: gl/gl_journal.php:561
+#: gl/gl_journal.php:571
 msgid "Process Journal Entry"
 msgstr ""
 
 msgid "Process Journal Entry"
 msgstr ""
 
-#: gl/gl_journal.php:562
+#: gl/gl_journal.php:572
 msgid "Process journal entry only if debits equal to credits"
 msgstr ""
 
 msgid "Process journal entry only if debits equal to credits"
 msgstr ""
 
-#: gl/inquiry/accounts_list.php:25 inventory/manage/items.php:466
+#: gl/inquiry/accounts_list.php:25 inventory/manage/items.php:487
 #: sales/manage/customer_branches.php:240
 msgid "GL Accounts"
 msgstr ""
 
 #: sales/manage/customer_branches.php:240
 msgid "GL Accounts"
 msgstr ""
 
-#: gl/inquiry/accounts_list.php:40 includes/ui/ui_lists.inc:346
+#: gl/inquiry/accounts_list.php:40 includes/ui/ui_lists.inc:351
 msgid "Search GL accounts"
 msgstr ""
 
 msgid "Search GL accounts"
 msgstr ""
 
@@ -4351,19 +4497,21 @@ msgstr ""
 #: gl/view/gl_payment_view.php:109 gl/view/gl_trans_view.php:95
 #: gl/view/gl_trans_view.php:98 gl/view/gl_trans_view.php:101
 #: gl/includes/ui/gl_bank_ui.inc:146 gl/includes/ui/gl_bank_ui.inc:149
 #: gl/view/gl_payment_view.php:109 gl/view/gl_trans_view.php:95
 #: gl/view/gl_trans_view.php:98 gl/view/gl_trans_view.php:101
 #: gl/includes/ui/gl_bank_ui.inc:146 gl/includes/ui/gl_bank_ui.inc:149
-#: gl/includes/ui/gl_bank_ui.inc:152 gl/includes/ui/gl_journal_ui.inc:102
-#: gl/includes/ui/gl_journal_ui.inc:105 gl/includes/ui/gl_journal_ui.inc:108
-#: manufacturing/view/wo_costs_view.php:60 reporting/rep701.php:110
+#: gl/includes/ui/gl_bank_ui.inc:152 gl/includes/ui/gl_journal_ui.inc:112
+#: gl/includes/ui/gl_journal_ui.inc:115 gl/includes/ui/gl_journal_ui.inc:118
+#: manufacturing/view/wo_costs_view.php:60 reporting/rep402.php:141
+#: reporting/rep701.php:110
 msgid "Account Code"
 msgstr ""
 
 #: gl/inquiry/accounts_list.php:52 inventory/inquiry/stock_list.php:53
 msgid "Account Code"
 msgstr ""
 
 #: gl/inquiry/accounts_list.php:52 inventory/inquiry/stock_list.php:53
-#: inventory/manage/item_codes.php:127 reporting/rep104.php:115
-#: reporting/rep105.php:119 reporting/rep301.php:164 reporting/rep301.php:170
-#: reporting/rep302.php:122 reporting/rep302.php:129 reporting/rep303.php:132
-#: reporting/rep304.php:127 reporting/rep304.php:135 reporting/rep306.php:141
-#: reporting/rep306.php:149 reporting/rep307.php:114 reporting/rep307.php:120
-#: reporting/rep308.php:223 reporting/rep308.php:230 reporting/rep309.php:105
+#: inventory/manage/item_codes.php:131 reporting/rep104.php:115
+#: reporting/rep105.php:120 reporting/rep301.php:168 reporting/rep301.php:174
+#: reporting/rep302.php:122 reporting/rep302.php:129 reporting/rep303.php:235
+#: reporting/rep304.php:127 reporting/rep304.php:135 reporting/rep306.php:138
+#: reporting/rep306.php:146 reporting/rep307.php:114 reporting/rep307.php:120
+#: reporting/rep308.php:224 reporting/rep308.php:231 reporting/rep309.php:105
+#: reporting/rep310.php:147
 msgid "Category"
 msgstr ""
 
 msgid "Category"
 msgstr ""
 
@@ -4376,57 +4524,66 @@ msgid "As at:"
 msgstr ""
 
 #: gl/inquiry/balance_sheet.php:225 gl/inquiry/profit_loss.php:298
 msgstr ""
 
 #: gl/inquiry/balance_sheet.php:225 gl/inquiry/profit_loss.php:298
-#: includes/dashboard.inc:394 reporting/rep705.php:322
-#: reporting/rep706.php:278 reporting/rep706.php:303 reporting/rep707.php:309
-#: reporting/rep707.php:315
+#: includes/dashboard.inc:699 reporting/rep705.php:346 reporting/rep706.php:280
+#: reporting/rep706.php:305 reporting/rep707.php:312 reporting/rep707.php:321
 msgid "Calculated Return"
 msgstr ""
 
 msgid "Calculated Return"
 msgstr ""
 
-#: gl/inquiry/balance_sheet.php:233 includes/sysnames.inc:126
-#: reporting/rep706.php:290
+#: gl/inquiry/balance_sheet.php:233 includes/sysnames.inc:128
+#: reporting/rep706.php:292
 msgid "Liabilities"
 msgstr ""
 
 msgid "Liabilities"
 msgstr ""
 
-#: gl/inquiry/balance_sheet.php:233 reporting/rep706.php:290
+#: gl/inquiry/balance_sheet.php:233 reporting/rep706.php:292
 msgid " and "
 msgstr ""
 
 msgid " and "
 msgstr ""
 
-#: gl/inquiry/balance_sheet.php:233 reporting/rep706.php:290
+#: gl/inquiry/balance_sheet.php:233 reporting/rep706.php:292
 msgid "Equities"
 msgstr ""
 
 msgid "Equities"
 msgstr ""
 
-#: gl/inquiry/bank_inquiry.php:29 reporting/rep601.php:72
-msgid "Bank Statement"
+#: gl/inquiry/balance_sheet.php:256 gl/inquiry/profit_loss.php:327
+#: includes/current_user.inc:103 includes/ui/ui_controls.inc:215
+#: includes/ui/ui_view.inc:1013
+msgid "Back"
+msgstr ""
+
+#: gl/inquiry/bank_inquiry.php:29
+msgid "Bank Account Inquiry"
 msgstr ""
 
 msgstr ""
 
-#: gl/inquiry/bank_inquiry.php:79 gl/inquiry/gl_account_inquiry.php:162
-#: reporting/rep601.php:104 reporting/rep602.php:103 reporting/rep704.php:143
+#: gl/inquiry/bank_inquiry.php:79 gl/inquiry/gl_account_inquiry.php:164
+#: reporting/rep601.php:112 reporting/rep602.php:103 reporting/rep704.php:152
 msgid "Opening Balance"
 msgstr ""
 
 msgid "Opening Balance"
 msgstr ""
 
-#: gl/inquiry/bank_inquiry.php:130 gl/inquiry/gl_account_inquiry.php:213
-#: gl/inquiry/gl_trial_balance.php:230 reporting/rep601.php:157
-#: reporting/rep602.php:157 reporting/rep704.php:191 reporting/rep708.php:262
+#: gl/inquiry/bank_inquiry.php:130 gl/inquiry/gl_account_inquiry.php:220
+#: gl/inquiry/gl_trial_balance.php:277 reporting/rep601.php:165
+#: reporting/rep602.php:157 reporting/rep704.php:200 reporting/rep708.php:262
 msgid "Ending Balance"
 msgstr ""
 
 msgid "Ending Balance"
 msgstr ""
 
-#: gl/inquiry/gl_account_inquiry.php:31
+#: gl/inquiry/gl_account_inquiry.php:32
 msgid "General Ledger Inquiry"
 msgstr ""
 
 msgid "General Ledger Inquiry"
 msgstr ""
 
-#: gl/inquiry/gl_account_inquiry.php:70
+#: gl/inquiry/gl_account_inquiry.php:71
 msgid "All Accounts"
 msgstr ""
 
 msgid "All Accounts"
 msgstr ""
 
-#: gl/inquiry/gl_account_inquiry.php:83
+#: gl/inquiry/gl_account_inquiry.php:84 gl/inquiry/journal_inquiry.php:53
+msgid "Enter memo fragment or leave empty"
+msgstr ""
+
+#: gl/inquiry/gl_account_inquiry.php:85
 msgid "Amount min:"
 msgstr ""
 
 msgid "Amount min:"
 msgstr ""
 
-#: gl/inquiry/gl_account_inquiry.php:84
+#: gl/inquiry/gl_account_inquiry.php:86
 msgid "Amount max:"
 msgstr ""
 
 msgid "Amount max:"
 msgstr ""
 
-#: gl/inquiry/gl_account_inquiry.php:222
+#: gl/inquiry/gl_account_inquiry.php:229
 msgid ""
 "No general ledger transactions have been created for the specified criteria."
 msgstr ""
 msgid ""
 "No general ledger transactions have been created for the specified criteria."
 msgstr ""
@@ -4435,50 +4592,55 @@ msgstr ""
 msgid "Trial Balance"
 msgstr ""
 
 msgid "Trial Balance"
 msgstr ""
 
-#: gl/inquiry/gl_trial_balance.php:60
+#: gl/inquiry/gl_trial_balance.php:61
 msgid "No zero values"
 msgstr ""
 
 msgid "No zero values"
 msgstr ""
 
-#: gl/inquiry/gl_trial_balance.php:61 reporting/reports_main.php:406
-#: reporting/reports_main.php:456 reporting/reports_main.php:501
+#: gl/inquiry/gl_trial_balance.php:62 reporting/reports_main.php:439
+#: reporting/reports_main.php:490 reporting/reports_main.php:536
 msgid "Only balances"
 msgstr ""
 
 msgid "Only balances"
 msgstr ""
 
-#: gl/inquiry/gl_trial_balance.php:93 gl/inquiry/gl_trial_balance.php:154
-#: includes/dashboard.inc:526 reporting/rep706.php:307
-#: reporting/rep707.php:325 reporting/rep708.php:51 reporting/rep708.php:126
-#: sales/create_recurrent_invoices.php:203
+#: gl/inquiry/gl_trial_balance.php:63
+msgid "Group totals only"
+msgstr ""
+
+#: gl/inquiry/gl_trial_balance.php:107 gl/inquiry/gl_trial_balance.php:177
+#: includes/dashboard.inc:1062 reporting/rep706.php:313
+#: reporting/rep707.php:329 reporting/rep708.php:51 reporting/rep708.php:126
+#: sales/create_recurrent_invoices.php:207
 #: sales/manage/recurrent_invoices.php:128
 msgid "Group"
 msgstr ""
 
 #: sales/manage/recurrent_invoices.php:128
 msgid "Group"
 msgstr ""
 
-#: gl/inquiry/gl_trial_balance.php:172
+#: gl/inquiry/gl_trial_balance.php:219
 msgid "The from date cannot be bigger than the fiscal year end."
 msgstr ""
 
 msgid "The from date cannot be bigger than the fiscal year end."
 msgstr ""
 
-#: gl/inquiry/gl_trial_balance.php:185 gl/manage/bank_accounts.php:109
+#: gl/inquiry/gl_trial_balance.php:232 gl/manage/bank_accounts.php:109
 #: gl/view/gl_trans_view.php:95 gl/view/gl_trans_view.php:98
 #: gl/view/gl_trans_view.php:101 manufacturing/view/wo_costs_view.php:60
 #: gl/view/gl_trans_view.php:95 gl/view/gl_trans_view.php:98
 #: gl/view/gl_trans_view.php:101 manufacturing/view/wo_costs_view.php:60
-#: reporting/rep701.php:110 reporting/rep702.php:53 reporting/rep705.php:235
-#: reporting/rep706.php:185 reporting/rep707.php:210 reporting/rep708.php:192
+#: reporting/rep402.php:141 reporting/rep701.php:110 reporting/rep702.php:53
+#: reporting/rep705.php:255 reporting/rep706.php:188 reporting/rep707.php:212
+#: reporting/rep708.php:192
 msgid "Account Name"
 msgstr ""
 
 msgid "Account Name"
 msgstr ""
 
-#: gl/inquiry/gl_trial_balance.php:186 reporting/rep708.php:185
+#: gl/inquiry/gl_trial_balance.php:233 reporting/rep708.php:185
 msgid "Brought Forward"
 msgstr ""
 
 msgid "Brought Forward"
 msgstr ""
 
-#: gl/inquiry/gl_trial_balance.php:187 reporting/rep708.php:185
+#: gl/inquiry/gl_trial_balance.php:234 reporting/rep708.php:185
 msgid "This Period"
 msgstr ""
 
 msgid "This Period"
 msgstr ""
 
-#: gl/inquiry/gl_trial_balance.php:206 gl/manage/gl_account_types.php:127
-#: includes/dashboard.inc:147 includes/dashboard.inc:170
+#: 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 ""
 
 #: reporting/rep451.php:80 reporting/rep451.php:86
 msgid "Class"
 msgstr ""
 
-#: gl/inquiry/gl_trial_balance.php:238 reporting/rep708.php:283
+#: gl/inquiry/gl_trial_balance.php:285 reporting/rep708.php:283
 msgid ""
 "The Opening Balance is not in balance, probably due to a non closed Previous "
 "Fiscalyear."
 msgid ""
 "The Opening Balance is not in balance, probably due to a non closed Previous "
 "Fiscalyear."
@@ -4492,10 +4654,6 @@ msgstr ""
 msgid "Enter reference fragment or leave empty"
 msgstr ""
 
 msgid "Enter reference fragment or leave empty"
 msgstr ""
 
-#: gl/inquiry/journal_inquiry.php:53
-msgid "Enter memo fragment or leave empty"
-msgstr ""
-
 #: gl/inquiry/journal_inquiry.php:54
 msgid "User:"
 msgstr ""
 #: gl/inquiry/journal_inquiry.php:54
 msgid "User:"
 msgstr ""
@@ -4508,29 +4666,28 @@ msgstr ""
 msgid "Show closed:"
 msgstr ""
 
 msgid "Show closed:"
 msgstr ""
 
-#: gl/inquiry/journal_inquiry.php:109
+#: gl/inquiry/journal_inquiry.php:115
 msgid "Trans #"
 msgstr ""
 
 msgid "Trans #"
 msgstr ""
 
-#: gl/inquiry/journal_inquiry.php:110 gl/view/gl_trans_view.php:44
-#: gl/includes/ui/gl_journal_ui.inc:113
+#: gl/inquiry/journal_inquiry.php:116 gl/view/gl_trans_view.php:44
+#: gl/includes/ui/gl_journal_ui.inc:123
 msgid "Counterparty"
 msgstr ""
 
 msgid "Counterparty"
 msgstr ""
 
-#: gl/inquiry/journal_inquiry.php:111 gl/inquiry/journal_inquiry.php:126
+#: gl/inquiry/journal_inquiry.php:117 gl/inquiry/journal_inquiry.php:132
 #: purchasing/includes/ui/grn_ui.inc:34 purchasing/includes/ui/grn_ui.inc:77
 #: purchasing/includes/ui/grn_ui.inc:34 purchasing/includes/ui/grn_ui.inc:77
-#: purchasing/includes/ui/po_ui.inc:328
-#: purchasing/view/view_supp_credit.php:44
+#: purchasing/includes/ui/po_ui.inc:332 purchasing/view/view_supp_credit.php:44
 #: purchasing/view/view_supp_invoice.php:48
 #: purchasing/view/view_supp_invoice.php:48
-#: purchasing/inquiry/po_search_completed.php:114
+#: purchasing/inquiry/po_search_completed.php:123
 #: purchasing/inquiry/po_search.php:121
 #: purchasing/inquiry/po_search.php:121
-#: purchasing/inquiry/supplier_inquiry.php:174
+#: purchasing/inquiry/supplier_inquiry.php:177
 #: reporting/includes/doctext.inc:163 reporting/includes/doctext.inc:186
 msgid "Supplier's Reference"
 msgstr ""
 
 #: reporting/includes/doctext.inc:163 reporting/includes/doctext.inc:186
 msgid "Supplier's Reference"
 msgstr ""
 
-#: gl/inquiry/journal_inquiry.php:115 reporting/rep710.php:77
-#: reporting/rep710.php:87 reporting/reports_main.php:517
+#: gl/inquiry/journal_inquiry.php:121 reporting/rep710.php:77
+#: reporting/rep710.php:87 reporting/reports_main.php:552
 msgid "User"
 msgstr ""
 
 msgid "User"
 msgstr ""
 
@@ -4538,23 +4695,23 @@ msgstr ""
 msgid "Profit & Loss Drilldown"
 msgstr ""
 
 msgid "Profit & Loss Drilldown"
 msgstr ""
 
-#: gl/inquiry/profit_loss.php:30 reporting/rep707.php:210
-#: reporting/includes/reports_classes.inc:249
+#: gl/inquiry/profit_loss.php:30 reporting/rep707.php:212
+#: reporting/includes/reports_classes.inc:251
 msgid "Accumulated"
 msgstr ""
 
 msgid "Accumulated"
 msgstr ""
 
-#: gl/inquiry/profit_loss.php:31 reporting/rep707.php:255
-#: reporting/includes/reports_classes.inc:249
+#: gl/inquiry/profit_loss.php:31 reporting/rep707.php:259
+#: reporting/includes/reports_classes.inc:251
 msgid "Period Y-1"
 msgstr ""
 
 msgid "Period Y-1"
 msgstr ""
 
-#: gl/inquiry/profit_loss.php:32 reporting/rep707.php:246
-#: reporting/includes/reports_classes.inc:249
+#: gl/inquiry/profit_loss.php:32 reporting/rep707.php:248
+#: reporting/includes/reports_classes.inc:251
 msgid "Budget"
 msgstr ""
 
 msgid "Budget"
 msgstr ""
 
-#: gl/inquiry/profit_loss.php:178 reporting/reports_main.php:393
-#: reporting/reports_main.php:444 reporting/reports_main.php:490
+#: gl/inquiry/profit_loss.php:178 reporting/reports_main.php:426
+#: reporting/reports_main.php:478 reporting/reports_main.php:525
 msgid "Compare to"
 msgstr ""
 
 msgid "Compare to"
 msgstr ""
 
@@ -4562,7 +4719,7 @@ msgstr ""
 msgid "Group/Account Name"
 msgstr ""
 
 msgid "Group/Account Name"
 msgstr ""
 
-#: gl/inquiry/profit_loss.php:239 reporting/rep707.php:210
+#: gl/inquiry/profit_loss.php:239 reporting/rep707.php:212
 msgid "Achieved %"
 msgstr ""
 
 msgid "Achieved %"
 msgstr ""
 
@@ -4570,11 +4727,11 @@ msgstr ""
 msgid "Tax Inquiry"
 msgstr ""
 
 msgid "Tax Inquiry"
 msgstr ""
 
-#: gl/inquiry/tax_inquiry.php:80 reporting/rep709.php:189
+#: gl/inquiry/tax_inquiry.php:80 reporting/rep709.php:191
 msgid "Outputs"
 msgstr ""
 
 msgid "Outputs"
 msgstr ""
 
-#: gl/inquiry/tax_inquiry.php:80 reporting/rep709.php:189
+#: gl/inquiry/tax_inquiry.php:80 reporting/rep709.php:191
 msgid "Inputs"
 msgstr ""
 
 msgid "Inputs"
 msgstr ""
 
@@ -4590,12 +4747,12 @@ msgstr ""
 msgid "Net payable or collectible"
 msgstr ""
 
 msgid "Net payable or collectible"
 msgstr ""
 
-#: gl/inquiry/tax_inquiry.php:115 reporting/rep709.php:221
+#: gl/inquiry/tax_inquiry.php:115 reporting/rep709.php:223
 msgid "Total payable or refund"
 msgstr ""
 
 msgid "Total payable or refund"
 msgstr ""
 
-#: gl/manage/bank_accounts.php:16 reporting/reports_main.php:331
-#: reporting/reports_main.php:339
+#: gl/manage/bank_accounts.php:16 reporting/reports_main.php:363
+#: reporting/reports_main.php:371
 msgid "Bank Accounts"
 msgstr ""
 
 msgid "Bank Accounts"
 msgstr ""
 
@@ -4635,37 +4792,38 @@ msgstr ""
 
 #: gl/manage/bank_accounts.php:109 gl/view/bank_transfer_view.php:69
 #: gl/view/bank_transfer_view.php:78 gl/view/gl_deposit_view.php:66
 
 #: gl/manage/bank_accounts.php:109 gl/view/bank_transfer_view.php:69
 #: gl/view/bank_transfer_view.php:78 gl/view/gl_deposit_view.php:66
-#: gl/view/gl_payment_view.php:64 includes/dashboard.inc:486
-#: includes/dashboard.inc:571 includes/dashboard.inc:606
-#: inventory/prices.php:151 inventory/purchasing_data.php:150
+#: gl/view/gl_payment_view.php:64 includes/dashboard.inc:1022
+#: includes/dashboard.inc:1107 includes/dashboard.inc:1178
+#: inventory/prices.php:151 inventory/purchasing_data.php:151
 #: purchasing/view/view_supp_credit.php:49
 #: purchasing/view/view_supp_invoice.php:54
 #: purchasing/view/view_supp_credit.php:49
 #: purchasing/view/view_supp_invoice.php:54
-#: purchasing/inquiry/po_search_completed.php:116
+#: purchasing/inquiry/po_search_completed.php:125
 #: purchasing/inquiry/po_search.php:123
 #: purchasing/inquiry/supplier_allocation_inquiry.php:143
 #: purchasing/inquiry/supplier_allocation_inquiry.php:153
 #: purchasing/inquiry/po_search.php:123
 #: purchasing/inquiry/supplier_allocation_inquiry.php:143
 #: purchasing/inquiry/supplier_allocation_inquiry.php:153
-#: purchasing/inquiry/supplier_inquiry.php:74
-#: purchasing/inquiry/supplier_inquiry.php:177
-#: purchasing/inquiry/supplier_inquiry.php:188
+#: purchasing/inquiry/supplier_inquiry.php:50
+#: purchasing/inquiry/supplier_inquiry.php:180
+#: purchasing/inquiry/supplier_inquiry.php:192
 #: purchasing/allocations/supplier_allocation_main.php:99
 #: purchasing/allocations/supplier_allocation_main.php:107
 #: purchasing/allocations/supplier_allocation_main.php:99
 #: purchasing/allocations/supplier_allocation_main.php:107
-#: reporting/rep101.php:142 reporting/rep102.php:129 reporting/rep102.php:135
-#: reporting/rep103.php:229 reporting/rep104.php:114 reporting/rep201.php:117
-#: reporting/rep202.php:136 reporting/rep203.php:96 reporting/rep205.php:141
+#: reporting/rep101.php:147 reporting/rep102.php:129 reporting/rep102.php:135
+#: reporting/rep103.php:229 reporting/rep104.php:114 reporting/rep115.php:170
+#: reporting/rep201.php:125 reporting/rep202.php: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
 #: sales/customer_credit_invoice.php:236 sales/customer_delivery.php:328
 #: sales/customer_invoice.php:455
-#: sales/allocations/customer_allocation_main.php:92
-#: sales/allocations/customer_allocation_main.php:100
+#: sales/allocations/customer_allocation_main.php:97
+#: sales/allocations/customer_allocation_main.php:105
 #: sales/view/view_credit.php:70 sales/view/view_dispatch.php:86
 #: sales/view/view_invoice.php:86
 #: sales/view/view_credit.php:70 sales/view/view_dispatch.php:86
 #: sales/view/view_invoice.php:86
-#: sales/inquiry/customer_allocation_inquiry.php:153
-#: sales/inquiry/customer_allocation_inquiry.php:163
-#: sales/inquiry/customer_inquiry.php:76
-#: sales/inquiry/customer_inquiry.php:200
-#: sales/inquiry/customer_inquiry.php:212
-#: sales/inquiry/sales_deliveries_view.php:178
-#: sales/inquiry/sales_orders_view.php:262
-#: sales/inquiry/sales_orders_view.php:276
+#: sales/inquiry/customer_allocation_inquiry.php:154
+#: sales/inquiry/customer_allocation_inquiry.php:164
+#: sales/inquiry/customer_inquiry.php:126
+#: sales/inquiry/customer_inquiry.php:207
+#: sales/inquiry/customer_inquiry.php:219
+#: sales/inquiry/sales_deliveries_view.php:179
+#: sales/inquiry/sales_orders_view.php:267
+#: sales/inquiry/sales_orders_view.php:281
 msgid "Currency"
 msgstr ""
 
 msgid "Currency"
 msgstr ""
 
@@ -4673,7 +4831,7 @@ msgstr ""
 msgid "GL Account"
 msgstr ""
 
 msgid "GL Account"
 msgstr ""
 
-#: gl/manage/bank_accounts.php:110 reporting/includes/doctext.inc:259
+#: gl/manage/bank_accounts.php:110 reporting/includes/doctext.inc:261
 msgid "Bank"
 msgstr ""
 
 msgid "Bank"
 msgstr ""
 
@@ -4710,7 +4868,7 @@ msgid "Bank Name:"
 msgstr ""
 
 #: gl/manage/bank_accounts.php:196 sales/manage/customer_branches.php:246
 msgstr ""
 
 #: gl/manage/bank_accounts.php:196 sales/manage/customer_branches.php:246
-#: sales/manage/customers.php:260
+#: sales/manage/customers.php:261
 msgid "Bank Account Number:"
 msgstr ""
 
 msgid "Bank Account Number:"
 msgstr ""
 
@@ -4878,7 +5036,7 @@ msgstr ""
 msgid "Date to Use From:"
 msgstr ""
 
 msgid "Date to Use From:"
 msgstr ""
 
-#: gl/manage/exchange_rates.php:142 includes/ui/ui_view.inc:325
+#: gl/manage/exchange_rates.php:142 includes/ui/ui_view.inc:331
 msgid "Exchange Rate:"
 msgstr ""
 
 msgid "Exchange Rate:"
 msgstr ""
 
@@ -4955,7 +5113,7 @@ msgid "Class Type"
 msgstr ""
 
 #: gl/manage/gl_account_classes.php:112 gl/manage/gl_account_classes.php:168
 msgstr ""
 
 #: gl/manage/gl_account_classes.php:112 gl/manage/gl_account_classes.php:168
-#: reporting/rep706.php:215
+#: reporting/rep706.php:218
 msgid "Balance Sheet"
 msgstr ""
 
 msgid "Balance Sheet"
 msgstr ""
 
@@ -4975,116 +5133,116 @@ msgstr ""
 msgid "Chart of Accounts"
 msgstr ""
 
 msgid "Chart of Accounts"
 msgstr ""
 
-#: gl/manage/gl_accounts.php:57
+#: gl/manage/gl_accounts.php:60
 msgid "The account code must be entered."
 msgstr ""
 
 msgid "The account code must be entered."
 msgstr ""
 
-#: gl/manage/gl_accounts.php:63
+#: gl/manage/gl_accounts.php:66
 msgid "The account name cannot be empty."
 msgstr ""
 
 msgid "The account name cannot be empty."
 msgstr ""
 
-#: gl/manage/gl_accounts.php:69
+#: gl/manage/gl_accounts.php:72
 msgid "The account code must be numeric."
 msgstr ""
 
 msgid "The account code must be numeric."
 msgstr ""
 
-#: gl/manage/gl_accounts.php:84
+#: gl/manage/gl_accounts.php:87
 msgid "The account belongs to a bank account and cannot be inactivated."
 msgstr ""
 
 msgid "The account belongs to a bank account and cannot be inactivated."
 msgstr ""
 
-#: gl/manage/gl_accounts.php:93
+#: gl/manage/gl_accounts.php:96
 msgid "Account data has been updated."
 msgstr ""
 
 msgid "Account data has been updated."
 msgstr ""
 
-#: gl/manage/gl_accounts.php:102
+#: gl/manage/gl_accounts.php:105
 msgid "New account has been added."
 msgstr ""
 
 msgid "New account has been added."
 msgstr ""
 
-#: gl/manage/gl_accounts.php:106
+#: gl/manage/gl_accounts.php:109
 msgid "Account not added, possible duplicate Account Code."
 msgstr ""
 
 msgid "Account not added, possible duplicate Account Code."
 msgstr ""
 
-#: gl/manage/gl_accounts.php:121
+#: gl/manage/gl_accounts.php:124
 msgid ""
 "Cannot delete this account because transactions have been created using this "
 "account."
 msgstr ""
 
 msgid ""
 "Cannot delete this account because transactions have been created using this "
 "account."
 msgstr ""
 
-#: gl/manage/gl_accounts.php:127
+#: gl/manage/gl_accounts.php:130
 msgid ""
 "Cannot delete this account because it is used as one of the company default "
 "GL accounts."
 msgstr ""
 
 msgid ""
 "Cannot delete this account because it is used as one of the company default "
 "GL accounts."
 msgstr ""
 
-#: gl/manage/gl_accounts.php:133
+#: gl/manage/gl_accounts.php:136
 msgid "Cannot delete this account because it is used by a bank account."
 msgstr ""
 
 msgid "Cannot delete this account because it is used by a bank account."
 msgstr ""
 
-#: gl/manage/gl_accounts.php:139
+#: gl/manage/gl_accounts.php:142
 msgid ""
 "Cannot delete this account because it is used by one or more Item Categories."
 msgstr ""
 
 msgid ""
 "Cannot delete this account because it is used by one or more Item Categories."
 msgstr ""
 
-#: gl/manage/gl_accounts.php:145
+#: gl/manage/gl_accounts.php:148
 msgid "Cannot delete this account because it is used by one or more Items."
 msgstr ""
 
 msgid "Cannot delete this account because it is used by one or more Items."
 msgstr ""
 
-#: gl/manage/gl_accounts.php:151
+#: gl/manage/gl_accounts.php:154
 msgid "Cannot delete this account because it is used by one or more Taxes."
 msgstr ""
 
 msgid "Cannot delete this account because it is used by one or more Taxes."
 msgstr ""
 
-#: gl/manage/gl_accounts.php:157
+#: gl/manage/gl_accounts.php:160
 msgid ""
 "Cannot delete this account because it is used by one or more Customer "
 "Branches."
 msgstr ""
 
 msgid ""
 "Cannot delete this account because it is used by one or more Customer "
 "Branches."
 msgstr ""
 
-#: gl/manage/gl_accounts.php:162
+#: gl/manage/gl_accounts.php:165
 msgid "Cannot delete this account because it is used by one or more suppliers."
 msgstr ""
 
 msgid "Cannot delete this account because it is used by one or more suppliers."
 msgstr ""
 
-#: gl/manage/gl_accounts.php:168
+#: gl/manage/gl_accounts.php:171
 msgid ""
 "Cannot delete this account because it is used by one or more Quick Entry "
 "Lines."
 msgstr ""
 
 msgid ""
 "Cannot delete this account because it is used by one or more Quick Entry "
 "Lines."
 msgstr ""
 
-#: gl/manage/gl_accounts.php:186
+#: gl/manage/gl_accounts.php:189
 msgid "Selected account has been deleted"
 msgstr ""
 
 msgid "Selected account has been deleted"
 msgstr ""
 
-#: gl/manage/gl_accounts.php:201
+#: gl/manage/gl_accounts.php:205 gl/manage/gl_accounts.php:207
 msgid "New account"
 msgstr ""
 
 msgid "New account"
 msgstr ""
 
-#: gl/manage/gl_accounts.php:247
+#: gl/manage/gl_accounts.php:254
 msgid "Account Code 2:"
 msgstr ""
 
 msgid "Account Code 2:"
 msgstr ""
 
-#: gl/manage/gl_accounts.php:249
+#: gl/manage/gl_accounts.php:256
 msgid "Account Name:"
 msgstr ""
 
 msgid "Account Name:"
 msgstr ""
 
-#: gl/manage/gl_accounts.php:251
+#: gl/manage/gl_accounts.php:258
 msgid "Account Group:"
 msgstr ""
 
 msgid "Account Group:"
 msgstr ""
 
-#: gl/manage/gl_accounts.php:253
+#: gl/manage/gl_accounts.php:260
 msgid "Account Tags:"
 msgstr ""
 
 msgid "Account Tags:"
 msgstr ""
 
-#: gl/manage/gl_accounts.php:255
+#: gl/manage/gl_accounts.php:262
 msgid "Account status:"
 msgstr ""
 
 msgid "Account status:"
 msgstr ""
 
-#: gl/manage/gl_accounts.php:260
+#: gl/manage/gl_accounts.php:267
 msgid "Add Account"
 msgstr ""
 
 msgid "Add Account"
 msgstr ""
 
-#: gl/manage/gl_accounts.php:264
+#: gl/manage/gl_accounts.php:271
 msgid "Update Account"
 msgstr ""
 
 msgid "Update Account"
 msgstr ""
 
-#: gl/manage/gl_accounts.php:265
+#: gl/manage/gl_accounts.php:272
 msgid "Delete account"
 msgstr ""
 
 msgid "Delete account"
 msgstr ""
 
@@ -5092,67 +5250,67 @@ msgstr ""
 msgid "GL Account Groups"
 msgstr ""
 
 msgid "GL Account Groups"
 msgstr ""
 
-#: gl/manage/gl_account_types.php:29
+#: gl/manage/gl_account_types.php:32
 msgid "The account group id cannot be empty."
 msgstr ""
 
 msgid "The account group id cannot be empty."
 msgstr ""
 
-#: gl/manage/gl_account_types.php:35
+#: gl/manage/gl_account_types.php:38
 msgid "The account group name cannot be empty."
 msgstr ""
 
 msgid "The account group name cannot be empty."
 msgstr ""
 
-#: gl/manage/gl_account_types.php:42
+#: gl/manage/gl_account_types.php:45
 msgid "This account group id is already in use."
 msgstr ""
 
 msgid "This account group id is already in use."
 msgstr ""
 
-#: gl/manage/gl_account_types.php:49
+#: gl/manage/gl_account_types.php:52
 msgid "You cannot set an account group to be a subgroup of itself."
 msgstr ""
 
 msgid "You cannot set an account group to be a subgroup of itself."
 msgstr ""
 
-#: gl/manage/gl_account_types.php:67
+#: gl/manage/gl_account_types.php:70
 msgid "Selected account type has been updated"
 msgstr ""
 
 msgid "Selected account type has been updated"
 msgstr ""
 
-#: gl/manage/gl_account_types.php:72
+#: gl/manage/gl_account_types.php:75
 msgid "New account type has been added"
 msgstr ""
 
 msgid "New account type has been added"
 msgstr ""
 
-#: gl/manage/gl_account_types.php:88
+#: gl/manage/gl_account_types.php:91
 msgid ""
 "Cannot delete this account group because GL accounts have been created "
 "referring to it."
 msgstr ""
 
 msgid ""
 "Cannot delete this account group because GL accounts have been created "
 "referring to it."
 msgstr ""
 
-#: gl/manage/gl_account_types.php:94
+#: gl/manage/gl_account_types.php:97
 msgid ""
 "Cannot delete this account group because GL account groups have been created "
 "referring to it."
 msgstr ""
 
 msgid ""
 "Cannot delete this account group because GL account groups have been created "
 "referring to it."
 msgstr ""
 
-#: gl/manage/gl_account_types.php:110
+#: gl/manage/gl_account_types.php:113
 msgid "Selected account group has been deleted"
 msgstr ""
 
 msgid "Selected account group has been deleted"
 msgstr ""
 
-#: gl/manage/gl_account_types.php:127
+#: gl/manage/gl_account_types.php:133
 msgid "Group ID"
 msgstr ""
 
 msgid "Group ID"
 msgstr ""
 
-#: gl/manage/gl_account_types.php:127 sales/manage/sales_groups.php:85
+#: gl/manage/gl_account_types.php:133 sales/manage/sales_groups.php:85
 msgid "Group Name"
 msgstr ""
 
 msgid "Group Name"
 msgstr ""
 
-#: gl/manage/gl_account_types.php:127
+#: gl/manage/gl_account_types.php:133
 msgid "Subgroup Of"
 msgstr ""
 
 msgid "Subgroup Of"
 msgstr ""
 
-#: gl/manage/gl_account_types.php:186
+#: gl/manage/gl_account_types.php:192
 msgid "ID:"
 msgstr ""
 
 msgid "ID:"
 msgstr ""
 
-#: gl/manage/gl_account_types.php:189
+#: gl/manage/gl_account_types.php:195
 msgid "Subgroup Of:"
 msgstr ""
 
 msgid "Subgroup Of:"
 msgstr ""
 
-#: gl/manage/gl_account_types.php:191
+#: gl/manage/gl_account_types.php:198 gl/manage/gl_account_types.php:200
 msgid "Class:"
 msgstr ""
 
 msgid "Class:"
 msgstr ""
 
@@ -5160,9 +5318,9 @@ msgstr ""
 msgid "Quick Entries"
 msgstr ""
 
 msgid "Quick Entries"
 msgstr ""
 
-#: gl/manage/gl_quick_entries.php:58 includes/ui/class.crud_view.inc:296
-#: includes/ui/class.crud_view.inc:300 includes/ui/simple_crud_class.inc:219
-#: includes/ui/ui_input.inc:224
+#: gl/manage/gl_quick_entries.php:58 includes/ui/attachment.inc:163
+#: includes/ui/class.crud_view.inc:305 includes/ui/class.crud_view.inc:309
+#: includes/ui/simple_crud_class.inc:219 includes/ui/ui_input.inc:225
 msgid "Add new"
 msgstr ""
 
 msgid "Add new"
 msgstr ""
 
@@ -5266,19 +5424,24 @@ msgid "Revaluation of Currency Accounts"
 msgstr ""
 
 #: gl/manage/revaluate_currencies.php:32
 msgstr ""
 
 #: gl/manage/revaluate_currencies.php:32
-msgid "No Revaluation was needed"
+#, php-format
+msgid "%d Journal Entries for Bank Accounts have been added"
 msgstr ""
 
 msgstr ""
 
-#: gl/manage/revaluate_currencies.php:40
+#: gl/manage/revaluate_currencies.php:33
 #, php-format
 msgid "%d Journal Entries for AR/AP accounts have been added"
 msgstr ""
 
 #, php-format
 msgid "%d Journal Entries for AR/AP accounts have been added"
 msgstr ""
 
-#: gl/manage/revaluate_currencies.php:94
+#: gl/manage/revaluate_currencies.php:36
+msgid "No revaluation was needed."
+msgstr ""
+
+#: gl/manage/revaluate_currencies.php:82
 msgid "Date for Revaluation:"
 msgstr ""
 
 msgid "Date for Revaluation:"
 msgstr ""
 
-#: gl/manage/revaluate_currencies.php:99
+#: gl/manage/revaluate_currencies.php:86
 msgid "Revaluate Currencies"
 msgstr ""
 
 msgid "Revaluate Currencies"
 msgstr ""
 
@@ -5321,12 +5484,12 @@ msgstr ""
 msgid "GL Deposit"
 msgstr ""
 
 msgid "GL Deposit"
 msgstr ""
 
-#: gl/view/gl_deposit_view.php:71 gl/includes/db/gl_db_banking.inc:227
-#: reporting/reports_main.php:98 reporting/reports_main.php:108
-#: reporting/reports_main.php:116 reporting/reports_main.php:130
-#: reporting/reports_main.php:138 reporting/reports_main.php:145
-#: reporting/reports_main.php:194 reporting/reports_main.php:201
-#: reporting/reports_main.php:300
+#: 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 ""
 
 msgid "From"
 msgstr ""
 
@@ -5362,8 +5525,8 @@ msgstr ""
 #: gl/view/gl_deposit_view.php:110 gl/view/gl_payment_view.php:103
 #: gl/view/gl_payment_view.php:106 gl/view/gl_payment_view.php:109
 #: gl/includes/ui/gl_bank_ui.inc:146 gl/includes/ui/gl_bank_ui.inc:149
 #: gl/view/gl_deposit_view.php:110 gl/view/gl_payment_view.php:103
 #: gl/view/gl_payment_view.php:106 gl/view/gl_payment_view.php:109
 #: gl/includes/ui/gl_bank_ui.inc:146 gl/includes/ui/gl_bank_ui.inc:149
-#: gl/includes/ui/gl_bank_ui.inc:152 gl/includes/ui/gl_journal_ui.inc:102
-#: gl/includes/ui/gl_journal_ui.inc:105 gl/includes/ui/gl_journal_ui.inc:108
+#: gl/includes/ui/gl_bank_ui.inc:152 gl/includes/ui/gl_journal_ui.inc:112
+#: gl/includes/ui/gl_journal_ui.inc:115 gl/includes/ui/gl_journal_ui.inc:118
 msgid "Account Description"
 msgstr ""
 
 msgid "Account Description"
 msgstr ""
 
@@ -5405,7 +5568,7 @@ msgid "Transaction Date"
 msgstr ""
 
 #: gl/view/gl_trans_view.php:39
 msgstr ""
 
 #: gl/view/gl_trans_view.php:39
-msgid "Journal #"
+msgid "GL #"
 msgstr ""
 
 #: gl/view/gl_trans_view.php:42
 msgstr ""
 
 #: gl/view/gl_trans_view.php:42
@@ -5450,21 +5613,21 @@ msgid "This transaction has been voided."
 msgstr ""
 
 #: gl/includes/db/gl_db_banking.inc:52 gl/includes/db/gl_db_banking.inc:56
 msgstr ""
 
 #: gl/includes/db/gl_db_banking.inc:52 gl/includes/db/gl_db_banking.inc:56
-#: gl/includes/db/gl_db_banking.inc:77 gl/includes/db/gl_db_banking.inc:80
-#: gl/includes/db/gl_db_banking.inc:270
+#: 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 ""
 
 msgid "Exchange Variance"
 msgstr ""
 
-#: gl/includes/db/gl_db_banking.inc:227 reporting/reports_main.php:99
-#: reporting/reports_main.php:109 reporting/reports_main.php:117
-#: reporting/reports_main.php:131 reporting/reports_main.php:139
-#: reporting/reports_main.php:146 reporting/reports_main.php:195
-#: reporting/reports_main.php:202 reporting/reports_main.php:301
+#: gl/includes/db/gl_db_banking.inc: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 ""
 
 msgid "To"
 msgstr ""
 
-#: gl/includes/db/gl_db_banking.inc:533 gl/includes/db/gl_journal.inc:114
-#: purchasing/includes/db/invoice_db.inc:139
+#: gl/includes/db/gl_db_banking.inc: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 ""
 
 msgid "Document reentered."
 msgstr ""
 
@@ -5475,11 +5638,12 @@ msgstr ""
 
 #: gl/includes/ui/gl_bank_ui.inc:24
 #: inventory/includes/item_adjustments_ui.inc:35
 
 #: gl/includes/ui/gl_bank_ui.inc:24
 #: inventory/includes/item_adjustments_ui.inc:35
-#: inventory/includes/stock_transfers_ui.inc:40
-#: manufacturing/work_order_add_finished.php:186
+#: inventory/includes/sav.item_adjustments_ui.inc:35
+#: inventory/includes/stock_transfers_ui.inc:43
+#: manufacturing/work_order_add_finished.php:185
 #: manufacturing/work_order_costs.php:133
 #: purchasing/allocations/supplier_allocate.php:56
 #: manufacturing/work_order_costs.php:133
 #: purchasing/allocations/supplier_allocate.php:56
-#: sales/allocations/customer_allocate.php:54
+#: sales/allocations/customer_allocate.php:59
 #: sales/includes/ui/sales_credit_ui.inc:117
 msgid "Date:"
 msgstr ""
 #: sales/includes/ui/sales_credit_ui.inc:117
 msgid "Date:"
 msgstr ""
@@ -5492,8 +5656,8 @@ msgstr ""
 msgid "To the Order of:"
 msgstr ""
 
 msgid "To the Order of:"
 msgstr ""
 
-#: gl/includes/ui/gl_bank_ui.inc:61 inventory/purchasing_data.php:206
-#: inventory/purchasing_data.php:210 purchasing/includes/ui/invoice_ui.inc:90
+#: 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
 #: 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
@@ -5514,7 +5678,7 @@ msgid "Branch:"
 msgstr ""
 
 #: gl/includes/ui/gl_bank_ui.inc:82 gl/includes/ui/gl_bank_ui.inc:85
 msgstr ""
 
 #: gl/includes/ui/gl_bank_ui.inc:82 gl/includes/ui/gl_bank_ui.inc:85
-#: sales/customer_payments.php:340
+#: sales/customer_payments.php:346
 msgid "This customer account is on hold."
 msgstr ""
 
 msgid "This customer account is on hold."
 msgstr ""
 
@@ -5528,77 +5692,83 @@ msgstr ""
 msgid "Into:"
 msgstr ""
 
 msgid "Into:"
 msgstr ""
 
-#: gl/includes/ui/gl_bank_ui.inc:180 includes/ui/class.crud_view.inc:281
+#: gl/includes/ui/gl_bank_ui.inc:180 includes/ui/class.crud_view.inc:290
 #: includes/ui/simple_crud_class.inc:52
 #: includes/ui/simple_crud_class.inc:52
-#: inventory/includes/item_adjustments_ui.inc:100
-#: inventory/includes/stock_transfers_ui.inc:83
+#: 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
 #: manufacturing/includes/work_order_issue_ui.inc:62
 #: purchasing/includes/ui/invoice_ui.inc:551
-#: purchasing/includes/ui/po_ui.inc:250
+#: purchasing/includes/ui/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 ""
 
 #: sales/includes/ui/sales_credit_ui.inc:193
 #: sales/includes/ui/sales_order_ui.inc:197
 msgid "Edit document line"
 msgstr ""
 
-#: gl/includes/ui/gl_bank_ui.inc:182 includes/ui/class.crud_view.inc:285
+#: gl/includes/ui/gl_bank_ui.inc:182 includes/ui/class.crud_view.inc:294
 #: includes/ui/simple_crud_class.inc:54
 #: includes/ui/simple_crud_class.inc:54
-#: inventory/includes/item_adjustments_ui.inc:102
-#: inventory/includes/stock_transfers_ui.inc:84
+#: inventory/includes/item_adjustments_ui.inc: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
 #: manufacturing/includes/work_order_issue_ui.inc:64
 #: purchasing/includes/ui/invoice_ui.inc:318
-#: purchasing/includes/ui/po_ui.inc:252
+#: purchasing/includes/ui/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 ""
 
 #: sales/includes/ui/sales_credit_ui.inc:195
 #: sales/includes/ui/sales_order_ui.inc:199
 msgid "Remove line from document"
 msgstr ""
 
-#: gl/includes/ui/gl_bank_ui.inc:268 gl/includes/ui/gl_journal_ui.inc:268
+#: gl/includes/ui/gl_bank_ui.inc:266 gl/includes/ui/gl_journal_ui.inc:279
 #: includes/ui/simple_crud_class.inc:56
 #: includes/ui/simple_crud_class.inc:56
-#: inventory/includes/item_adjustments_ui.inc:191
-#: inventory/includes/stock_transfers_ui.inc:151
+#: inventory/includes/item_adjustments_ui.inc:213
+#: inventory/includes/sav.item_adjustments_ui.inc:195
+#: inventory/includes/stock_transfers_ui.inc:150
 #: manufacturing/includes/work_order_issue_ui.inc:133
 #: manufacturing/includes/work_order_issue_ui.inc:133
-#: purchasing/includes/ui/po_ui.inc:437
+#: purchasing/includes/ui/po_ui.inc:446
 #: sales/includes/ui/sales_credit_ui.inc:289
 #: sales/includes/ui/sales_credit_ui.inc:289
-#: sales/includes/ui/sales_order_ui.inc:548
+#: sales/includes/ui/sales_order_ui.inc:555
 msgid "Confirm changes"
 msgstr ""
 
 msgid "Confirm changes"
 msgstr ""
 
-#: gl/includes/ui/gl_bank_ui.inc:270 gl/includes/ui/gl_journal_ui.inc:270
-#: includes/ui/class.crud_view.inc:292 includes/ui/simple_crud_class.inc:58
-#: inventory/includes/item_adjustments_ui.inc:193
-#: inventory/includes/stock_transfers_ui.inc:153
+#: gl/includes/ui/gl_bank_ui.inc:268 gl/includes/ui/gl_journal_ui.inc:281
+#: includes/ui/class.crud_view.inc:301 includes/ui/simple_crud_class.inc:58
+#: inventory/includes/item_adjustments_ui.inc:215
+#: inventory/includes/sav.item_adjustments_ui.inc:197
+#: inventory/includes/stock_transfers_ui.inc:151
 #: manufacturing/includes/work_order_issue_ui.inc:135
 #: manufacturing/includes/work_order_issue_ui.inc:135
-#: purchasing/includes/ui/po_ui.inc:439
+#: purchasing/includes/ui/po_ui.inc:448
 #: sales/includes/ui/sales_credit_ui.inc:291
 #: sales/includes/ui/sales_credit_ui.inc:291
-#: sales/includes/ui/sales_order_ui.inc:550
+#: sales/includes/ui/sales_order_ui.inc:557
 msgid "Cancel changes"
 msgstr ""
 
 msgid "Cancel changes"
 msgstr ""
 
-#: gl/includes/ui/gl_bank_ui.inc:275 gl/includes/ui/gl_journal_ui.inc:274
-#: inventory/includes/item_adjustments_ui.inc:199
-#: inventory/includes/stock_transfers_ui.inc:159
+#: gl/includes/ui/gl_bank_ui.inc:273 gl/includes/ui/gl_journal_ui.inc:285
+#: inventory/includes/item_adjustments_ui.inc:221
+#: inventory/includes/sav.item_adjustments_ui.inc:203
+#: inventory/includes/stock_transfers_ui.inc:156
 #: manufacturing/includes/work_order_issue_ui.inc:141
 #: manufacturing/includes/work_order_issue_ui.inc:141
-#: purchasing/includes/ui/po_ui.inc:445
+#: purchasing/includes/ui/po_ui.inc:454
 #: sales/includes/ui/sales_credit_ui.inc:297
 #: sales/includes/ui/sales_credit_ui.inc:297
-#: sales/includes/ui/sales_order_ui.inc:556
+#: sales/includes/ui/sales_order_ui.inc:563
 msgid "Add Item"
 msgstr ""
 
 msgid "Add Item"
 msgstr ""
 
-#: gl/includes/ui/gl_bank_ui.inc:276
-#: inventory/includes/item_adjustments_ui.inc:200
-#: inventory/includes/stock_transfers_ui.inc:160
+#: gl/includes/ui/gl_bank_ui.inc:274
+#: inventory/includes/item_adjustments_ui.inc:222
+#: inventory/includes/sav.item_adjustments_ui.inc:204
+#: inventory/includes/stock_transfers_ui.inc:156
 #: manufacturing/includes/work_order_issue_ui.inc:142
 #: manufacturing/includes/work_order_issue_ui.inc:142
-#: purchasing/includes/ui/po_ui.inc:446
+#: purchasing/includes/ui/po_ui.inc:455
 #: sales/includes/ui/sales_credit_ui.inc:298
 #: sales/includes/ui/sales_credit_ui.inc:298
-#: sales/includes/ui/sales_order_ui.inc:557
+#: sales/includes/ui/sales_order_ui.inc:564
 msgid "Add new item to document"
 msgstr ""
 
 msgid "Add new item to document"
 msgstr ""
 
-#: gl/includes/ui/gl_bank_ui.inc:299
+#: gl/includes/ui/gl_bank_ui.inc:297
 msgid "Settled AR Amount:"
 msgstr ""
 
 msgid "Settled AR Amount:"
 msgstr ""
 
-#: gl/includes/ui/gl_bank_ui.inc:299
+#: gl/includes/ui/gl_bank_ui.inc:297
 msgid "Settled AP Amount:"
 msgstr ""
 
 msgid "Settled AP Amount:"
 msgstr ""
 
@@ -5622,7 +5792,7 @@ msgstr ""
 msgid "Source ref:"
 msgstr ""
 
 msgid "Source ref:"
 msgstr ""
 
-#: gl/includes/ui/gl_journal_ui.inc:57 includes/sysnames.inc:103
+#: gl/includes/ui/gl_journal_ui.inc:57 includes/sysnames.inc:105
 msgid "Quick Entry"
 msgstr ""
 
 msgid "Quick Entry"
 msgstr ""
 
@@ -5638,19 +5808,23 @@ msgstr ""
 msgid "Include in tax register:"
 msgstr ""
 
 msgid "Include in tax register:"
 msgstr ""
 
-#: gl/includes/ui/gl_journal_ui.inc:151
+#: gl/includes/ui/gl_journal_ui.inc:88
+msgid "Reconciled:"
+msgstr ""
+
+#: gl/includes/ui/gl_journal_ui.inc:161
 msgid "Edit journal line"
 msgstr ""
 
 msgid "Edit journal line"
 msgstr ""
 
-#: gl/includes/ui/gl_journal_ui.inc:153
+#: gl/includes/ui/gl_journal_ui.inc:163
 msgid "Remove line from journal"
 msgstr ""
 
 msgid "Remove line from journal"
 msgstr ""
 
-#: gl/includes/ui/gl_journal_ui.inc:216 gl/includes/ui/gl_journal_ui.inc:234
+#: gl/includes/ui/gl_journal_ui.inc:226 gl/includes/ui/gl_journal_ui.inc:244
 msgid "[Select account]"
 msgstr ""
 
 msgid "[Select account]"
 msgstr ""
 
-#: gl/includes/ui/gl_journal_ui.inc:275
+#: gl/includes/ui/gl_journal_ui.inc:286
 msgid "Add new line to journal"
 msgstr ""
 
 msgid "Add new line to journal"
 msgstr ""
 
@@ -5730,8 +5904,8 @@ msgstr ""
 msgid "Dimensions configuration"
 msgstr ""
 
 msgid "Dimensions configuration"
 msgstr ""
 
-#: includes/access_levels.inc:79 inventory/manage/items.php:455
-#: reporting/reports_main.php:318
+#: includes/access_levels.inc:79 includes/dashboard.inc:332
+#: inventory/manage/items.php:476 reporting/reports_main.php:350
 msgid "Dimensions"
 msgstr ""
 
 msgid "Dimensions"
 msgstr ""
 
@@ -6067,7 +6241,7 @@ msgstr ""
 msgid "Fixed Asset disposals"
 msgstr ""
 
 msgid "Fixed Asset disposals"
 msgstr ""
 
-#: includes/access_levels.inc:207 inventory/manage/items.php:411
+#: includes/access_levels.inc:207 inventory/manage/items.php:432
 msgid "Depreciation"
 msgstr ""
 
 msgid "Depreciation"
 msgstr ""
 
@@ -6254,289 +6428,558 @@ msgid ""
 "rate manually on Exchange Rates page."
 msgstr ""
 
 "rate manually on Exchange Rates page."
 msgstr ""
 
-#: includes/current_user.inc:101
+#: includes/current_user.inc:102
 msgid ""
 "Before software upgrade you have to include old $security_groups and "
 "$security_headings arrays from old config.php file to the new one."
 msgstr ""
 
 msgid ""
 "Before software upgrade you have to include old $security_groups and "
 "$security_headings arrays from old config.php file to the new one."
 msgstr ""
 
-#: includes/current_user.inc:102 includes/ui/ui_controls.inc:215
-#: includes/ui/ui_view.inc:985
-msgid "Back"
-msgstr ""
-
-#: includes/current_user.inc:112
+#: includes/current_user.inc:113
 msgid "System is available for site admin only until full database upgrade"
 msgstr ""
 
 msgid "System is available for site admin only until full database upgrade"
 msgstr ""
 
-#: includes/current_user.inc:162
+#: includes/current_user.inc:170
 msgid "New password for"
 msgstr ""
 
 msgid "New password for"
 msgstr ""
 
-#: includes/current_user.inc:616
+#: includes/current_user.inc:618
 msgid "Requesting data..."
 msgstr ""
 
 msgid "Requesting data..."
 msgstr ""
 
-#: includes/dashboard.inc:89 includes/dashboard.inc:159
-#: includes/dashboard.inc:189 includes/dashboard.inc:486
-#: includes/dashboard.inc:526 includes/sysnames.inc:101
-#: includes/sysnames.inc:209 reporting/rep101.php:141 reporting/rep102.php:121
-#: reporting/rep102.php:128 reporting/rep105.php:109 reporting/rep106.php:89
-#: reporting/rep114.php:95 reporting/rep304.php:127 reporting/rep304.php:137
+#: includes/dashboard.inc:134 reporting/includes/reports_classes.inc:255
+msgid "Vertical bars"
+msgstr ""
+
+#: includes/dashboard.inc:134 reporting/includes/reports_classes.inc:255
+msgid "Horizontal bars"
+msgstr ""
+
+#: includes/dashboard.inc:134 reporting/includes/reports_classes.inc:256
+msgid "Dots"
+msgstr ""
+
+#: includes/dashboard.inc:134 reporting/includes/reports_classes.inc:256
+msgid "Lines"
+msgstr ""
+
+#: includes/dashboard.inc:134 reporting/includes/reports_classes.inc:256
+msgid "Pie"
+msgstr ""
+
+#: includes/dashboard.inc:134 reporting/includes/reports_classes.inc:256
+msgid "Donut"
+msgstr ""
+
+#: includes/dashboard.inc:134 reporting/includes/reports_classes.inc:256
+msgid "Half Donut"
+msgstr ""
+
+#: includes/dashboard.inc:134 reporting/includes/reports_classes.inc:256
+msgid "Splines"
+msgstr ""
+
+#: includes/dashboard.inc:134
+msgid "Tables"
+msgstr ""
+
+#: includes/dashboard.inc:180 includes/ui/ui_controls.inc:506
+#: sales/manage/customers.php:23 sales/inquiry/customers_list.php:29
+msgid "Customers"
+msgstr ""
+
+#: includes/dashboard.inc:183 includes/ui/ui_controls.inc:508
+msgid "Branches"
+msgstr ""
+
+#: includes/dashboard.inc:186
+msgid "Salesmen"
+msgstr ""
+
+#: includes/dashboard.inc:189 includes/dashboard.inc:226
+#: includes/ui/ui_lists.inc:2159
+msgid "Overdue Invoices"
+msgstr ""
+
+#: includes/dashboard.inc:200 includes/dashboard.inc:410
+#: includes/dashboard.inc:444 includes/dashboard.inc:1022
+#: includes/dashboard.inc:1062 includes/sysnames.inc:44
+#: includes/sysnames.inc:103 includes/sysnames.inc:211 reporting/rep101.php:145
+#: reporting/rep102.php:121 reporting/rep102.php:128 reporting/rep105.php:110
+#: reporting/rep106.php:90 reporting/rep114.php:95 reporting/rep115.php:167
+#: reporting/rep304.php:127 reporting/rep304.php:137
 #: reporting/reports_main.php:34 reporting/reports_main.php:38
 #: reporting/reports_main.php:34 reporting/reports_main.php:38
-#: reporting/reports_main.php:47 reporting/reports_main.php:104
-#: reporting/reports_main.php:123 reporting/reports_main.php:239
-#: sales/create_recurrent_invoices.php:203
+#: reporting/reports_main.php:47 reporting/reports_main.php:59
+#: reporting/reports_main.php:115 reporting/reports_main.php:134
+#: reporting/reports_main.php:260 sales/create_recurrent_invoices.php:207
 #: 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:326
 #: sales/customer_invoice.php:431
-#: sales/allocations/customer_allocation_main.php:91
-#: sales/allocations/customer_allocation_main.php:99
+#: sales/allocations/customer_allocation_main.php:96
+#: sales/allocations/customer_allocation_main.php:104
 #: sales/manage/recurrent_invoices.php:128 sales/view/view_credit.php:47
 #: sales/manage/recurrent_invoices.php:128 sales/view/view_credit.php:47
-#: sales/inquiry/customer_allocation_inquiry.php:152
-#: sales/inquiry/customer_allocation_inquiry.php:162
-#: sales/inquiry/customer_inquiry.php:198
-#: sales/inquiry/customer_inquiry.php:211 sales/inquiry/customers_list.php:41
+#: 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/customers_list.php:54
-#: sales/inquiry/sales_deliveries_view.php:169
-#: sales/inquiry/sales_orders_view.php:254
-#: sales/inquiry/sales_orders_view.php:268
+#: sales/inquiry/sales_deliveries_view.php:170
+#: sales/inquiry/sales_orders_view.php:259
+#: sales/inquiry/sales_orders_view.php:273
 msgid "Customer"
 msgstr ""
 
 msgid "Customer"
 msgstr ""
 
-#: includes/dashboard.inc:89 includes/dashboard.inc:121
-#: includes/dashboard.inc:159 includes/dashboard.inc:165
-#: includes/dashboard.inc:292 includes/dashboard.inc:438
-#: reporting/rep304.php:127 reporting/rep309.php:99
-#: sales/manage/customer_branches.php:232 sales/manage/customers.php:265
-msgid "Sales"
+#: includes/dashboard.inc:202
+msgid "Sales Total"
+msgstr ""
+
+#: includes/dashboard.inc:205 includes/dashboard.inc:242
+msgid "Aging Total"
 msgstr ""
 
 msgstr ""
 
-#: includes/dashboard.inc:103 includes/dashboard.inc:162
-#: includes/dashboard.inc:226 includes/dashboard.inc:571
-#: includes/sysnames.inc:102 includes/sysnames.inc:187
-#: includes/sysnames.inc:210 inventory/purchasing_data.php:150
+#: includes/dashboard.inc:217 includes/ui/ui_controls.inc:510
+#: purchasing/manage/suppliers.php:23 purchasing/inquiry/suppliers_list.php:29
+msgid "Suppliers"
+msgstr ""
+
+#: includes/dashboard.inc:220
+msgid "New Orders"
+msgstr ""
+
+#: includes/dashboard.inc:223 includes/ui/ui_lists.inc:2158
+#: includes/ui/ui_lists.inc:2175
+msgid "Invoices"
+msgstr ""
+
+#: includes/dashboard.inc:237 includes/dashboard.inc:415
+#: includes/dashboard.inc:490 includes/dashboard.inc:1107
+#: includes/sysnames.inc:45 includes/sysnames.inc:104 includes/sysnames.inc:189
+#: includes/sysnames.inc:212 inventory/purchasing_data.php:151
 #: 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:300
-#: purchasing/view/view_supp_credit.php:42
+#: purchasing/includes/ui/po_ui.inc:304 purchasing/view/view_supp_credit.php:42
 #: purchasing/view/view_supp_invoice.php:46
 #: purchasing/view/view_supp_invoice.php:46
-#: purchasing/inquiry/po_search_completed.php:112
+#: purchasing/inquiry/po_search_completed.php:121
 #: purchasing/inquiry/po_search.php:119
 #: purchasing/inquiry/supplier_allocation_inquiry.php:139
 #: purchasing/inquiry/supplier_allocation_inquiry.php:152
 #: purchasing/inquiry/po_search.php:119
 #: purchasing/inquiry/supplier_allocation_inquiry.php:139
 #: purchasing/inquiry/supplier_allocation_inquiry.php:152
-#: purchasing/inquiry/supplier_inquiry.php:173
-#: purchasing/inquiry/supplier_inquiry.php:187
+#: purchasing/inquiry/supplier_inquiry.php:176
+#: purchasing/inquiry/supplier_inquiry.php:191
 #: purchasing/inquiry/suppliers_list.php:41
 #: purchasing/inquiry/suppliers_list.php:53
 #: purchasing/allocations/supplier_allocation_main.php:98
 #: purchasing/allocations/supplier_allocation_main.php:106
 #: purchasing/inquiry/suppliers_list.php:41
 #: purchasing/inquiry/suppliers_list.php:53
 #: purchasing/allocations/supplier_allocation_main.php:98
 #: purchasing/allocations/supplier_allocation_main.php:106
-#: reporting/rep201.php:116 reporting/rep202.php:128 reporting/rep202.php:135
-#: reporting/rep203.php:95 reporting/rep204.php:90 reporting/rep306.php:141
-#: reporting/rep306.php:151 reporting/reports_main.php:151
-#: reporting/reports_main.php:155 reporting/reports_main.php:164
-#: reporting/reports_main.php:175 reporting/reports_main.php:182
-#: reporting/reports_main.php:255
+#: reporting/rep201.php:124 reporting/rep202.php:129 reporting/rep202.php:136
+#: reporting/rep203.php:95 reporting/rep204.php:90 reporting/rep206.php:122
+#: reporting/rep306.php:138 reporting/rep306.php:148 reporting/rep310.php:139
+#: reporting/rep310.php:149 reporting/reports_main.php:163
+#: reporting/reports_main.php:167 reporting/reports_main.php:176
+#: reporting/reports_main.php:188 reporting/reports_main.php:196
+#: reporting/reports_main.php:203 reporting/reports_main.php:276
+#: reporting/reports_main.php:309
 msgid "Supplier"
 msgstr ""
 
 msgid "Supplier"
 msgstr ""
 
-#: includes/dashboard.inc:103
-msgid "Purchase"
+#: includes/dashboard.inc:239
+msgid "Purchable Total"
 msgstr ""
 
 msgstr ""
 
-#: includes/dashboard.inc:120 includes/dashboard.inc:165
-#: includes/ui/ui_controls.inc:512 includes/ui/ui_controls.inc:514
-#: inventory/transfers.php:231 inventory/inquiry/stock_list.php:29
-#: inventory/manage/items.php:29 reporting/rep402.php:108
-#: reporting/reports_main.php:256 reporting/reports_main.php:293
+#: includes/dashboard.inc:255 includes/dashboard.inc:319
+#: includes/dashboard.inc:420 includes/ui/ui_controls.inc:512
+#: includes/ui/ui_controls.inc:514 inventory/transfers.php:232
+#: inventory/inquiry/stock_list.php:29 inventory/manage/items.php:30
+#: reporting/rep402.php:152 reporting/reports_main.php:277
+#: reporting/reports_main.php:310 reporting/reports_main.php:324
 msgid "Items"
 msgstr ""
 
 msgid "Items"
 msgstr ""
 
-#: includes/dashboard.inc:122 includes/dashboard.inc:165
-#: includes/dashboard.inc:292 includes/dashboard.inc:438
-#: manufacturing/search_work_orders.php:139
-msgid "Costs"
+#: includes/dashboard.inc:258 includes/dashboard.inc:290
+msgid "Locations"
 msgstr ""
 
 msgstr ""
 
-#: includes/dashboard.inc:134
-msgid "Performance"
+#: includes/dashboard.inc:261
+msgid "Kits"
 msgstr ""
 
 msgstr ""
 
-#: includes/dashboard.inc:162
-msgid "Purchases"
+#: includes/dashboard.inc:264
+msgid "Below Reorder Level"
+msgstr ""
+
+#: includes/dashboard.inc:271
+msgid "Assembled Items"
+msgstr ""
+
+#: includes/dashboard.inc:274
+msgid "Manufactured Items"
 msgstr ""
 
 msgstr ""
 
-#: includes/dashboard.inc:187
+#: includes/dashboard.inc:277 manufacturing/manage/work_centres.php:16
+msgid "Work Centres"
+msgstr ""
+
+#: includes/dashboard.inc:280
+msgid "Open Workorders"
+msgstr ""
+
+#: includes/dashboard.inc:293
+msgid "Categories"
+msgstr ""
+
+#: includes/dashboard.inc:296
+msgid "Fixed Asset Classes"
+msgstr ""
+
+#: includes/dashboard.inc:307
+msgid "Total Sales"
+msgstr ""
+
+#: includes/dashboard.inc:310
+msgid "Total Costs"
+msgstr ""
+
+#: includes/dashboard.inc:321
+msgid "Total Results"
+msgstr ""
+
+#: includes/dashboard.inc:335
+msgid "Type 2 Dimensions"
+msgstr ""
+
+#: includes/dashboard.inc:340
+msgid "Dimensions Total Balance"
+msgstr ""
+
+#: includes/dashboard.inc:344
+msgid "Dimensions Total Result"
+msgstr ""
+
+#: includes/dashboard.inc:362
+msgid "Receivables"
+msgstr ""
+
+#: includes/dashboard.inc:365
+msgid "Payables"
+msgstr ""
+
+#: includes/dashboard.inc:368
+msgid "Todays Deposits"
+msgstr ""
+
+#: includes/dashboard.inc:371
+msgid "Todays Payments"
+msgstr ""
+
+#: includes/dashboard.inc:396
+msgid "Extensions"
+msgstr ""
+
+#: includes/dashboard.inc:399
+msgid "Languages"
+msgstr ""
+
+#: includes/dashboard.inc:402
+msgid "Database Size"
+msgstr ""
+
+#: includes/dashboard.inc:442
 #, php-format
 msgid "Top %s customers in fiscal year"
 msgstr ""
 
 #, php-format
 msgid "Top %s customers in fiscal year"
 msgstr ""
 
-#: includes/dashboard.inc:224
+#: includes/dashboard.inc:472 includes/dashboard.inc:564
+#: includes/dashboard.inc:610 includes/dashboard.inc:750
+#: includes/dashboard.inc:789 reporting/rep304.php:127 reporting/rep309.php:99
+#: sales/manage/customer_branches.php:232 sales/manage/customers.php:266
+msgid "Sales"
+msgstr ""
+
+#: includes/dashboard.inc:488
 #, php-format
 msgid "Top %s suppliers in fiscal year"
 msgstr ""
 
 #, php-format
 msgid "Top %s suppliers in fiscal year"
 msgstr ""
 
-#: includes/dashboard.inc:285
+#: includes/dashboard.inc:518
+msgid "Purchases"
+msgstr ""
+
+#: includes/dashboard.inc:557
 #, php-format
 msgid "Top %s Manufactured Items in fiscal year"
 msgstr ""
 
 #, php-format
 msgid "Top %s Manufactured Items in fiscal year"
 msgstr ""
 
-#: includes/dashboard.inc:287
+#: includes/dashboard.inc:559
 #, php-format
 msgid "Top %s Fixed Assets"
 msgstr ""
 
 #, php-format
 msgid "Top %s Fixed Assets"
 msgstr ""
 
-#: includes/dashboard.inc:289
+#: includes/dashboard.inc:561
 #, php-format
 msgid "Top %s Sold Items in fiscal year"
 msgstr ""
 
 #, php-format
 msgid "Top %s Sold Items in fiscal year"
 msgstr ""
 
-#: includes/dashboard.inc:292 includes/dashboard.inc:294
-#: manufacturing/search_work_orders.php:161
+#: includes/dashboard.inc:564 includes/dashboard.inc:566
+#: 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
 #: manufacturing/view/wo_issue_view.php:43
 #: manufacturing/view/wo_production_view.php:44
 #: purchasing/includes/ui/invoice_ui.inc:501
 #: purchasing/includes/ui/invoice_ui.inc:513 reporting/rep204.php:84
-#: reporting/rep306.php:152 reporting/rep402.php:103
+#: reporting/rep306.php:149 reporting/rep310.php:139 reporting/rep310.php:150
+#: reporting/rep402.php:136
 msgid "Item"
 msgstr ""
 
 msgid "Item"
 msgstr ""
 
-#: includes/dashboard.inc:292 includes/dashboard.inc:294
+#: includes/dashboard.inc:564 includes/dashboard.inc:613
+#: includes/dashboard.inc:751 includes/dashboard.inc:790
+#: manufacturing/search_work_orders.php:141
+msgid "Costs"
+msgstr ""
+
+#: includes/dashboard.inc:564 includes/dashboard.inc:614
+#: includes/dashboard.inc:752 includes/dashboard.inc:791
+msgid "Results"
+msgstr ""
+
+#: includes/dashboard.inc:564 includes/dashboard.inc:566
 #: inventory/includes/item_adjustments_ui.inc:56
 #: inventory/includes/item_adjustments_ui.inc:59
 #: inventory/includes/item_adjustments_ui.inc:56
 #: inventory/includes/item_adjustments_ui.inc:59
-#: inventory/includes/stock_transfers_ui.inc:57
-#: inventory/manage/item_codes.php:126 inventory/manage/sales_kits.php:36
+#: inventory/includes/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/view/view_adjustment.php:54 inventory/view/view_transfer.php:50
-#: manufacturing/view/wo_issue_view.php:76
-#: manufacturing/manage/bom_edit.php:44
+#: manufacturing/view/wo_issue_view.php:76 manufacturing/manage/bom_edit.php:44
 #: manufacturing/includes/manufacturing_ui.inc:29
 #: manufacturing/includes/manufacturing_ui.inc:174
 #: manufacturing/includes/manufacturing_ui.inc:347
 #: manufacturing/includes/work_order_issue_ui.inc:33
 #: purchasing/includes/ui/invoice_ui.inc:514
 #: manufacturing/includes/manufacturing_ui.inc:29
 #: manufacturing/includes/manufacturing_ui.inc:174
 #: manufacturing/includes/manufacturing_ui.inc:347
 #: manufacturing/includes/work_order_issue_ui.inc:33
 #: purchasing/includes/ui/invoice_ui.inc:514
-#: purchasing/includes/ui/po_ui.inc:214 purchasing/view/view_grn.php:40
-#: purchasing/view/view_po.php:45 reporting/rep301.php:164
-#: reporting/rep303.php:120 reporting/rep303.php:126 reporting/rep401.php:71
+#: purchasing/includes/ui/po_ui.inc:216 purchasing/view/view_grn.php:40
+#: purchasing/view/view_po.php:45 reporting/rep301.php:168
+#: reporting/rep303.php:223 reporting/rep303.php:229 reporting/rep401.php:71
 #: reporting/includes/doctext.inc:31 reporting/includes/doctext.inc:191
 #: reporting/includes/doctext.inc:31 reporting/includes/doctext.inc:191
-#: reporting/includes/doctext.inc:224 sales/customer_invoice.php:518
+#: 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_credit.php:90 sales/view/view_dispatch.php:112
-#: sales/view/view_invoice.php:115 sales/view/view_sales_order.php:219
+#: sales/view/view_invoice.php:115 sales/view/view_sales_order.php:221
 #: sales/includes/ui/sales_credit_ui.inc:162
 #: sales/includes/ui/sales_order_ui.inc:146
 msgid "Quantity"
 msgstr ""
 
 #: sales/includes/ui/sales_credit_ui.inc:162
 #: sales/includes/ui/sales_order_ui.inc:146
 msgid "Quantity"
 msgstr ""
 
-#: includes/dashboard.inc:334
+#: includes/dashboard.inc:634
 #, php-format
 msgid "Top %s Dimensions in fiscal year"
 msgstr ""
 
 #, php-format
 msgid "Top %s Dimensions in fiscal year"
 msgstr ""
 
-#: includes/dashboard.inc:372
+#: includes/dashboard.inc:636 includes/dashboard.inc:662
+msgid "Result"
+msgstr ""
+
+#: includes/dashboard.inc:679
 msgid "Class Balances"
 msgstr ""
 
 msgid "Class Balances"
 msgstr ""
 
-#: includes/dashboard.inc:438
+#: includes/dashboard.inc:708
+msgid "Totals"
+msgstr ""
+
+#: includes/dashboard.inc:739
+#, php-format
+msgid "Last %s weeks Performance"
+msgstr ""
+
+#: includes/dashboard.inc:753
 msgid "Week"
 msgstr ""
 
 msgid "Week"
 msgstr ""
 
-#: includes/dashboard.inc:484
+#: includes/dashboard.inc:753
+msgid "Weeks"
+msgstr ""
+
+#: includes/dashboard.inc:778
+#, php-format
+msgid "Last %s Months Performance"
+msgstr ""
+
+#: includes/dashboard.inc:792 includes/dashboard.inc:972
+msgid "Month"
+msgstr ""
+
+#: includes/dashboard.inc:792 includes/dashboard.inc:972
+msgid "Months"
+msgstr ""
+
+#: includes/dashboard.inc:824
+msgid "Total Customers Aged Analysis"
+msgstr ""
+
+#: includes/dashboard.inc:829 includes/dashboard.inc:886
+#: purchasing/inquiry/supplier_inquiry.php:50 reporting/rep102.php:121
+#: reporting/rep102.php:242 reporting/rep108.php:162 reporting/rep202.php:129
+#: reporting/rep202.php:249 reporting/rep451.php:80
+#: sales/inquiry/customer_inquiry.php:126
+msgid "Current"
+msgstr ""
+
+#: includes/dashboard.inc:834 includes/dashboard.inc:891
+#: includes/dashboard.inc:971 reporting/rep102.php:241 reporting/rep202.php:250
+msgid "Balances"
+msgstr ""
+
+#: includes/dashboard.inc:835 includes/dashboard.inc:892
+#: includes/dashboard.inc:1023 includes/dashboard.inc:1108
+#: purchasing/inquiry/supplier_inquiry.php:44
+#: purchasing/inquiry/supplier_inquiry.php:45
+#: purchasing/inquiry/supplier_inquiry.php:46 reporting/rep102.php:116
+#: reporting/rep102.php:117 reporting/rep102.php:118 reporting/rep102.php:244
+#: reporting/rep108.php:158 reporting/rep108.php:159 reporting/rep108.php:160
+#: 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:207
+#: sales/manage/recurrent_invoices.php:128
+#: sales/inquiry/customer_inquiry.php:121
+#: sales/inquiry/customer_inquiry.php:122
+#: sales/inquiry/customer_inquiry.php:123
+msgid "Days"
+msgstr ""
+
+#: includes/dashboard.inc:881
+msgid "Total Suppliers Aged Analysis"
+msgstr ""
+
+#: includes/dashboard.inc:968
+#, php-format
+msgid "Last %s Months Cash Flow"
+msgstr ""
+
+#: includes/dashboard.inc:983
+msgid "No Data available yet!"
+msgstr ""
+
+#: includes/dashboard.inc:1020
 msgid " overdue Sales Invoices"
 msgstr ""
 
 msgid " overdue Sales Invoices"
 msgstr ""
 
-#: includes/dashboard.inc:486 includes/dashboard.inc:571
+#: includes/dashboard.inc:1022 includes/dashboard.inc:1107
 msgid "Ref."
 msgstr ""
 
 msgid "Ref."
 msgstr ""
 
-#: includes/dashboard.inc:486 includes/dashboard.inc:526
-#: reporting/rep105.php:109 reporting/rep106.php:89 reporting/rep112.php:180
-#: sales/create_recurrent_invoices.php:203
+#: includes/dashboard.inc:1022 includes/dashboard.inc:1062
+#: reporting/rep105.php:110 reporting/rep106.php:90 reporting/rep112.php:189
+#: sales/create_recurrent_invoices.php:207
 #: sales/customer_credit_invoice.php:235 sales/customer_delivery.php:327
 #: sales/customer_credit_invoice.php:235 sales/customer_delivery.php:327
-#: sales/customer_invoice.php:432 sales/manage/customers.php:255
-#: sales/manage/customers.php:295 sales/manage/recurrent_invoices.php:128
+#: sales/customer_invoice.php:432 sales/manage/customers.php:256
+#: sales/manage/customers.php:296 sales/manage/recurrent_invoices.php:128
 #: sales/view/view_credit.php:58 sales/inquiry/customer_branches_list.php:37
 #: sales/inquiry/customer_branches_list.php:49
 #: sales/view/view_credit.php:58 sales/inquiry/customer_branches_list.php:37
 #: sales/inquiry/customer_branches_list.php:49
-#: sales/inquiry/customer_inquiry.php:199
-#: sales/inquiry/sales_deliveries_view.php:171
-#: sales/inquiry/sales_orders_view.php:255
-#: sales/inquiry/sales_orders_view.php:269
+#: sales/inquiry/customer_inquiry.php:206
+#: sales/inquiry/sales_deliveries_view.php:172
+#: sales/inquiry/sales_orders_view.php:260
+#: sales/inquiry/sales_orders_view.php:274
 msgid "Branch"
 msgstr ""
 
 msgid "Branch"
 msgstr ""
 
-#: includes/dashboard.inc:487 includes/dashboard.inc:572
-#: includes/sysnames.inc:137
+#: includes/dashboard.inc:1023 includes/dashboard.inc:1108
+#: includes/sysnames.inc:139
 msgid "Remainder"
 msgstr ""
 
 msgid "Remainder"
 msgstr ""
 
-#: includes/dashboard.inc:487 includes/dashboard.inc:572
-#: purchasing/inquiry/supplier_inquiry.php:68
-#: purchasing/inquiry/supplier_inquiry.php:69
-#: purchasing/inquiry/supplier_inquiry.php:70 reporting/rep102.php:116
-#: reporting/rep102.php:117 reporting/rep102.php:118 reporting/rep102.php:241
-#: reporting/rep108.php:150 reporting/rep108.php:151 reporting/rep108.php:152
-#: reporting/rep202.php:122 reporting/rep202.php:123 reporting/rep202.php:124
-#: reporting/rep202.php:156 reporting/rep202.php:157 reporting/rep202.php:158
-#: reporting/rep202.php:249 sales/create_recurrent_invoices.php:203
-#: sales/manage/recurrent_invoices.php:128
-#: sales/inquiry/customer_inquiry.php:71 sales/inquiry/customer_inquiry.php:72
-#: sales/inquiry/customer_inquiry.php:73
-msgid "Days"
-msgstr ""
-
-#: includes/dashboard.inc:524
+#: includes/dashboard.inc:1060
 msgid "Overdue Recurrent Invoices"
 msgstr ""
 
 msgid "Overdue Recurrent Invoices"
 msgstr ""
 
-#: includes/dashboard.inc:526 sales/create_recurrent_invoices.php:203
+#: includes/dashboard.inc:1062 sales/create_recurrent_invoices.php:207
 #: sales/manage/recurrent_invoices.php:128
 msgid "Template No"
 msgstr ""
 
 #: sales/manage/recurrent_invoices.php:128
 msgid "Template No"
 msgstr ""
 
-#: includes/dashboard.inc:526 sales/create_recurrent_invoices.php:203
+#: includes/dashboard.inc:1062 sales/create_recurrent_invoices.php:207
 msgid "Next invoice"
 msgstr ""
 
 msgid "Next invoice"
 msgstr ""
 
-#: includes/dashboard.inc:569
+#: includes/dashboard.inc:1105
 msgid " overdue Purchase Invoices"
 msgstr ""
 
 msgid " overdue Purchase Invoices"
 msgstr ""
 
-#: includes/dashboard.inc:604
+#: includes/dashboard.inc:1145
+msgid " items are below Reorder Level"
+msgstr ""
+
+#: includes/dashboard.inc:1147 inventory/reorder_level.php:71
+#: inventory/inquiry/stock_movements.php:107
+#: inventory/inquiry/stock_status.php:70 inventory/inquiry/stock_status.php:74
+#: manufacturing/search_work_orders.php:167
+#: manufacturing/inquiry/where_used_inquiry.php:45
+#: manufacturing/manage/bom_edit.php:43
+#: purchasing/inquiry/po_search_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:130
+#: reporting/rep303.php:236 reporting/rep304.php:136 reporting/rep306.php:147
+#: reporting/rep307.php:121 reporting/rep308.php:232 reporting/rep310.php:139
+#: reporting/rep310.php:148 reporting/rep402.php:136 reporting/rep402.php:153
+#: reporting/rep451.php:87 reporting/reports_main.php:233
+#: reporting/reports_main.php:240 reporting/reports_main.php:246
+#: reporting/reports_main.php:259 reporting/reports_main.php:275
+#: reporting/reports_main.php:285 reporting/reports_main.php:293
+#: reporting/reports_main.php:308 reporting/reports_main.php:325
+#: sales/manage/sales_points.php:84
+msgid "Location"
+msgstr ""
+
+#: includes/dashboard.inc:1147
+msgid "Stock Id"
+msgstr ""
+
+#: includes/dashboard.inc:1147
+msgid "Reorder"
+msgstr ""
+
+#: includes/dashboard.inc:1147
+msgid "qty"
+msgstr ""
+
+#: includes/dashboard.inc:1176
 msgid "Bank Account Balances"
 msgstr ""
 
 msgid "Bank Account Balances"
 msgstr ""
 
-#: includes/data_checks.inc:612
+#: includes/data_checks.inc:613
 #, php-format
 msgid "%s #%s is closed for further edition."
 msgstr ""
 
 #, php-format
 msgid "%s #%s is closed for further edition."
 msgstr ""
 
-#: includes/data_checks.inc:654
+#: includes/data_checks.inc:655
 msgid "You have no edit access to transactions created by other users."
 msgstr ""
 
 msgid "You have no edit access to transactions created by other users."
 msgstr ""
 
-#: includes/data_checks.inc:669
+#: includes/data_checks.inc:670
 msgid "The entered reference is invalid."
 msgstr ""
 
 msgid "The entered reference is invalid."
 msgstr ""
 
-#: includes/data_checks.inc:673 sales/credit_note_entry.php:181
+#: includes/data_checks.inc:674 sales/credit_note_entry.php:181
 #: sales/customer_credit_invoice.php:204 sales/customer_delivery.php:298
 #: sales/customer_credit_invoice.php:204 sales/customer_delivery.php:298
-#: sales/customer_invoice.php:364 sales/sales_order_entry.php:474
+#: sales/customer_invoice.php:364 sales/sales_order_entry.php:478
 msgid "The entered reference is already in use."
 msgstr ""
 
 msgid "The entered reference is already in use."
 msgstr ""
 
-#: includes/errors.inc:124
+#: includes/errors.inc:96
+#, php-format
+msgid "Unhandled exception [%s]: %s."
+msgstr ""
+
+#: includes/errors.inc:134
 msgid "in file"
 msgstr ""
 
 msgid "in file"
 msgstr ""
 
-#: includes/errors.inc:124
+#: includes/errors.inc:134
 msgid "at line "
 msgstr ""
 
 msgid "at line "
 msgstr ""
 
-#: includes/errors.inc:176
+#: includes/errors.inc:186
 msgid "Debug mode database warning:"
 msgstr ""
 
 msgid "Debug mode database warning:"
 msgstr ""
 
-#: includes/errors.inc:178
+#: includes/errors.inc:188
 msgid "DATABASE ERROR :"
 msgstr ""
 
 msgid "DATABASE ERROR :"
 msgstr ""
 
-#: includes/errors.inc:210
+#: includes/errors.inc:220
 msgid ""
 "The entered information is a duplicate. Please go back and enter different "
 "values."
 msgid ""
 "The entered information is a duplicate. Please go back and enter different "
 "values."
@@ -6546,80 +6989,86 @@ msgstr ""
 msgid "This page is usable only with javascript enabled browsers."
 msgstr ""
 
 msgid "This page is usable only with javascript enabled browsers."
 msgstr ""
 
-#: includes/packages.inc:189
+#: includes/packages.inc:190
 #, php-format
 msgid "No key field '%s' in file '%s'"
 msgstr ""
 
 #, php-format
 msgid "No key field '%s' in file '%s'"
 msgstr ""
 
-#: includes/packages.inc:294
+#: includes/packages.inc:295
 msgid "Cannot download repo index file."
 msgstr ""
 
 msgid "Cannot download repo index file."
 msgstr ""
 
-#: includes/packages.inc:306 includes/packages.inc:343
+#: includes/packages.inc:304 includes/system_tests.inc:401
+msgid ""
+"OpenSSL have to be available on your server to use extension repository "
+"system."
+msgstr ""
+
+#: includes/packages.inc:311 includes/packages.inc:348
 #, php-format
 msgid "Cannot delete outdated '%s' file."
 msgstr ""
 
 #, php-format
 msgid "Cannot delete outdated '%s' file."
 msgstr ""
 
-#: includes/packages.inc:310
+#: includes/packages.inc:315
 msgid "Release file in repository is invalid, or public key is outdated."
 msgstr ""
 
 msgid "Release file in repository is invalid, or public key is outdated."
 msgstr ""
 
-#: includes/packages.inc:327
+#: includes/packages.inc:332
 msgid "Repository version does not match application version."
 msgstr ""
 
 msgid "Repository version does not match application version."
 msgstr ""
 
-#: includes/packages.inc:335 includes/packages.inc:377
+#: includes/packages.inc:340 includes/packages.inc:382
 #, php-format
 msgid "Cannot download '%s' file."
 msgstr ""
 
 #, php-format
 msgid "Cannot download '%s' file."
 msgstr ""
 
-#: includes/packages.inc:347
+#: includes/packages.inc:352
 #, php-format
 msgid ""
 "Security alert: broken index file in repository '%s'. Please inform "
 "repository administrator about this issue."
 msgstr ""
 
 #, php-format
 msgid ""
 "Security alert: broken index file in repository '%s'. Please inform "
 "repository administrator about this issue."
 msgstr ""
 
-#: includes/packages.inc:383
+#: includes/packages.inc:388
 #, php-format
 msgid ""
 "Security alert: broken package '%s' in repository. Please inform repository "
 "administrator about this issue."
 msgstr ""
 
 #, php-format
 msgid ""
 "Security alert: broken package '%s' in repository. Please inform repository "
 "administrator about this issue."
 msgstr ""
 
-#: includes/packages.inc:641 includes/packages.inc:696
+#: includes/packages.inc:646 includes/packages.inc:701
 #, php-format
 msgid "Package '%s' not found."
 msgstr ""
 
 #, php-format
 msgid "Package '%s' not found."
 msgstr ""
 
-#: includes/references.inc:103
+#: includes/references.inc:107
 msgid "Invalid refline template."
 msgstr ""
 
 msgid "Invalid refline template."
 msgstr ""
 
-#: includes/references.inc:113
+#: includes/references.inc:117
 #, php-format
 msgid "Missing refline context data: '%s'"
 msgstr ""
 
 #, php-format
 msgid "Missing refline context data: '%s'"
 msgstr ""
 
-#: includes/references.inc:156
+#: includes/references.inc:165
 msgid "Missing numeric placeholder in refline definition."
 msgstr ""
 
 msgid "Missing numeric placeholder in refline definition."
 msgstr ""
 
-#: includes/session.inc:136
+#: includes/session.inc:138
 msgid "Incorrect Password"
 msgstr ""
 
 msgid "Incorrect Password"
 msgstr ""
 
-#: includes/session.inc:137
+#: includes/session.inc:139
 msgid "The user and password combination is not valid for the system."
 msgstr ""
 
 msgid "The user and password combination is not valid for the system."
 msgstr ""
 
-#: includes/session.inc:139
+#: includes/session.inc:140
 msgid ""
 "If you are not an authorized user, please contact your system administrator "
 "to obtain an account to enable you to use the system."
 msgstr ""
 
 msgid ""
 "If you are not an authorized user, please contact your system administrator "
 "to obtain an account to enable you to use the system."
 msgstr ""
 
-#: includes/session.inc:140 includes/session.inc:155
+#: includes/session.inc:141 includes/session.inc:155
 msgid "Try again"
 msgstr ""
 
 msgid "Try again"
 msgstr ""
 
@@ -6650,50 +7099,50 @@ msgstr ""
 msgid "Login here"
 msgstr ""
 
 msgid "Login here"
 msgstr ""
 
-#: includes/session.inc:219
+#: includes/session.inc:220
 #, php-format
 msgid ""
 "Brute force attack on account '%s' detected. Access for non-logged users "
 "temporarily blocked."
 msgstr ""
 
 #, php-format
 msgid ""
 "Brute force attack on account '%s' detected. Access for non-logged users "
 "temporarily blocked."
 msgstr ""
 
-#: includes/session.inc:251
+#: includes/session.inc:252
 msgid "Security settings have not been defined for your user account."
 msgstr ""
 
 msgid "Security settings have not been defined for your user account."
 msgstr ""
 
-#: includes/session.inc:252
+#: includes/session.inc:253
 msgid "Please contact your system administrator."
 msgstr ""
 
 msgid "Please contact your system administrator."
 msgstr ""
 
-#: includes/session.inc:253
+#: includes/session.inc:254
 msgid ""
 "Please remove $security_groups and $security_headings arrays from config.php "
 "file!"
 msgstr ""
 
 msgid ""
 "Please remove $security_groups and $security_headings arrays from config.php "
 "file!"
 msgstr ""
 
-#: includes/session.inc:256
+#: includes/session.inc:257
 msgid ""
 "Access to application has been blocked until database upgrade is completed "
 "by system administrator."
 msgstr ""
 
 msgid ""
 "Access to application has been blocked until database upgrade is completed "
 "by system administrator."
 msgstr ""
 
-#: includes/session.inc:270
+#: includes/session.inc:271
 msgid ""
 "The security settings on your account do not permit you to access this "
 "function"
 msgstr ""
 
 msgid ""
 "The security settings on your account do not permit you to access this "
 "function"
 msgstr ""
 
-#: includes/session.inc:279
+#: includes/session.inc:280
 msgid ""
 "System is blocked after source upgrade until database is updated on System/"
 "Software Upgrade page"
 msgstr ""
 
 msgid ""
 "System is blocked after source upgrade until database is updated on System/"
 "Software Upgrade page"
 msgstr ""
 
-#: includes/sysnames.inc:23 includes/sysnames.inc:154
+#: includes/sysnames.inc:23 includes/sysnames.inc:156
 msgid "Bank Payment"
 msgstr ""
 
 msgid "Bank Payment"
 msgstr ""
 
-#: includes/sysnames.inc:24 includes/sysnames.inc:153
+#: includes/sysnames.inc:24 includes/sysnames.inc:155
 msgid "Bank Deposit"
 msgstr ""
 
 msgid "Bank Deposit"
 msgstr ""
 
@@ -6725,7 +7174,7 @@ msgstr ""
 msgid "Inventory Adjustment"
 msgstr ""
 
 msgid "Inventory Adjustment"
 msgstr ""
 
-#: includes/sysnames.inc:32 purchasing/includes/ui/po_ui.inc:307
+#: includes/sysnames.inc:32 purchasing/includes/ui/po_ui.inc:311
 #: purchasing/view/view_po.php:30
 msgid "Purchase Order"
 msgstr ""
 #: purchasing/view/view_po.php:30
 msgid "Purchase Order"
 msgstr ""
@@ -6734,8 +7183,8 @@ msgstr ""
 msgid "Supplier Invoice"
 msgstr ""
 
 msgid "Supplier Invoice"
 msgstr ""
 
-#: includes/sysnames.inc:34 purchasing/supplier_credit.php:57
-#: purchasing/supplier_credit.php:61
+#: includes/sysnames.inc:34 purchasing/supplier_credit.php:58
+#: purchasing/supplier_credit.php:62
 msgid "Supplier Credit Note"
 msgstr ""
 
 msgid "Supplier Credit Note"
 msgstr ""
 
@@ -6747,7 +7196,7 @@ msgstr ""
 msgid "Purchase Order Delivery"
 msgstr ""
 
 msgid "Purchase Order Delivery"
 msgstr ""
 
-#: includes/sysnames.inc:37 includes/sysnames.inc:100 includes/types.inc:133
+#: includes/sysnames.inc:37 includes/sysnames.inc:102 includes/types.inc:135
 msgid "Work Order"
 msgstr ""
 
 msgid "Work Order"
 msgstr ""
 
@@ -6759,12 +7208,12 @@ msgstr ""
 msgid "Work Order Production"
 msgstr ""
 
 msgid "Work Order Production"
 msgstr ""
 
-#: includes/sysnames.inc:40 sales/inquiry/sales_orders_view.php:126
-#: sales/inquiry/sales_orders_view.php:148
+#: includes/sysnames.inc:40 sales/inquiry/sales_orders_view.php:131
+#: sales/inquiry/sales_orders_view.php:153
 msgid "Sales Order"
 msgstr ""
 
 msgid "Sales Order"
 msgstr ""
 
-#: includes/sysnames.inc:41 sales/sales_order_entry.php:656
+#: includes/sysnames.inc:41 sales/sales_order_entry.php:659
 msgid "Sales Quotation"
 msgstr ""
 
 msgid "Sales Quotation"
 msgstr ""
 
@@ -6772,409 +7221,409 @@ msgstr ""
 msgid "Cost Update"
 msgstr ""
 
 msgid "Cost Update"
 msgstr ""
 
-#: includes/sysnames.inc:47 inventory/adjustments.php:32
+#: includes/sysnames.inc:49 inventory/adjustments.php:32
 msgid "Fixed Assets Disposal"
 msgstr ""
 
 msgid "Fixed Assets Disposal"
 msgstr ""
 
-#: includes/sysnames.inc:48
+#: includes/sysnames.inc:50
 msgid "Fixed Assets Revaluation"
 msgstr ""
 
 msgid "Fixed Assets Revaluation"
 msgstr ""
 
-#: includes/sysnames.inc:52
+#: includes/sysnames.inc:54
 msgid "GJ"
 msgstr ""
 
 msgid "GJ"
 msgstr ""
 
-#: includes/sysnames.inc:53
+#: includes/sysnames.inc:55
 msgid "BP"
 msgstr ""
 
 msgid "BP"
 msgstr ""
 
-#: includes/sysnames.inc:54
+#: includes/sysnames.inc:56
 msgid "BD"
 msgstr ""
 
 msgid "BD"
 msgstr ""
 
-#: includes/sysnames.inc:55
+#: includes/sysnames.inc:57
 msgid "BT"
 msgstr ""
 
 msgid "BT"
 msgstr ""
 
-#: includes/sysnames.inc:56
+#: includes/sysnames.inc:58
 msgid "SI"
 msgstr ""
 
 msgid "SI"
 msgstr ""
 
-#: includes/sysnames.inc:57
+#: includes/sysnames.inc:59
 msgid "CN"
 msgstr ""
 
 msgid "CN"
 msgstr ""
 
-#: includes/sysnames.inc:58
+#: includes/sysnames.inc:60
 msgid "CP"
 msgstr ""
 
 msgid "CP"
 msgstr ""
 
-#: includes/sysnames.inc:59 sales/customer_invoice.php:525
+#: includes/sysnames.inc:61 sales/customer_invoice.php:525
 msgid "DN"
 msgstr ""
 
 msgid "DN"
 msgstr ""
 
-#: includes/sysnames.inc:60
+#: includes/sysnames.inc:62
 msgid "IT"
 msgstr ""
 
 msgid "IT"
 msgstr ""
 
-#: includes/sysnames.inc:61
+#: includes/sysnames.inc:63
 msgid "IA"
 msgstr ""
 
 msgid "IA"
 msgstr ""
 
-#: includes/sysnames.inc:62
+#: includes/sysnames.inc:64
 msgid "PO"
 msgstr ""
 
 msgid "PO"
 msgstr ""
 
-#: includes/sysnames.inc:63
+#: includes/sysnames.inc:65
 msgid "PI"
 msgstr ""
 
 msgid "PI"
 msgstr ""
 
-#: includes/sysnames.inc:64
+#: includes/sysnames.inc:66
 msgid "PC"
 msgstr ""
 
 msgid "PC"
 msgstr ""
 
-#: includes/sysnames.inc:65
+#: includes/sysnames.inc:67
 msgid "SP"
 msgstr ""
 
 msgid "SP"
 msgstr ""
 
-#: includes/sysnames.inc:66 reporting/rep204.php:84 reporting/rep305.php:106
+#: includes/sysnames.inc:68 reporting/rep204.php:84 reporting/rep305.php:106
 msgid "GRN"
 msgstr ""
 
 msgid "GRN"
 msgstr ""
 
-#: includes/sysnames.inc:67
+#: includes/sysnames.inc:69
 msgid "WO"
 msgstr ""
 
 msgid "WO"
 msgstr ""
 
-#: includes/sysnames.inc:68
+#: includes/sysnames.inc:70
 msgid "WI"
 msgstr ""
 
 msgid "WI"
 msgstr ""
 
-#: includes/sysnames.inc:69
+#: includes/sysnames.inc:71
 msgid "WP"
 msgstr ""
 
 msgid "WP"
 msgstr ""
 
-#: includes/sysnames.inc:70
+#: includes/sysnames.inc:72
 msgid "SO"
 msgstr ""
 
 msgid "SO"
 msgstr ""
 
-#: includes/sysnames.inc:71
+#: includes/sysnames.inc:73
 msgid "SQ"
 msgstr ""
 
 msgid "SQ"
 msgstr ""
 
-#: includes/sysnames.inc:72
+#: includes/sysnames.inc:74
 msgid "CU"
 msgstr ""
 
 msgid "CU"
 msgstr ""
 
-#: includes/sysnames.inc:73
+#: includes/sysnames.inc:75
 msgid "Dim"
 msgstr ""
 
 msgid "Dim"
 msgstr ""
 
-#: includes/sysnames.inc:81
+#: includes/sysnames.inc:83
 msgid "Savings Account"
 msgstr ""
 
 msgid "Savings Account"
 msgstr ""
 
-#: includes/sysnames.inc:82
+#: includes/sysnames.inc:84
 msgid "Chequing Account"
 msgstr ""
 
 msgid "Chequing Account"
 msgstr ""
 
-#: includes/sysnames.inc:83 manufacturing/work_order_costs.php:146
+#: includes/sysnames.inc:85 manufacturing/work_order_costs.php:146
 msgid "Credit Account"
 msgstr ""
 
 msgid "Credit Account"
 msgstr ""
 
-#: includes/sysnames.inc:84
+#: includes/sysnames.inc:86
 msgid "Cash Account"
 msgstr ""
 
 msgid "Cash Account"
 msgstr ""
 
-#: includes/sysnames.inc:88
+#: includes/sysnames.inc:90
 msgid "Transfer"
 msgstr ""
 
 msgid "Transfer"
 msgstr ""
 
-#: includes/sysnames.inc:89
+#: includes/sysnames.inc:91
 msgid "Cheque"
 msgstr ""
 
 msgid "Cheque"
 msgstr ""
 
-#: includes/sysnames.inc:91 includes/sysnames.inc:195
+#: includes/sysnames.inc:93 includes/sysnames.inc:197
 msgid "Cash"
 msgstr ""
 
 msgid "Cash"
 msgstr ""
 
-#: includes/sysnames.inc:110
+#: includes/sysnames.inc:112
 msgid "Assemble"
 msgstr ""
 
 msgid "Assemble"
 msgstr ""
 
-#: includes/sysnames.inc:111
+#: includes/sysnames.inc:113
 msgid "Unassemble"
 msgstr ""
 
 msgid "Unassemble"
 msgstr ""
 
-#: includes/sysnames.inc:112
+#: includes/sysnames.inc:114
 msgid "Advanced Manufacture"
 msgstr ""
 
 msgid "Advanced Manufacture"
 msgstr ""
 
-#: includes/sysnames.inc:116
+#: includes/sysnames.inc:118
 msgid "Labour Cost"
 msgstr ""
 
 msgid "Labour Cost"
 msgstr ""
 
-#: includes/sysnames.inc:117
+#: includes/sysnames.inc:119
 msgid "Overhead Cost"
 msgstr ""
 
 msgid "Overhead Cost"
 msgstr ""
 
-#: includes/sysnames.inc:118
+#: includes/sysnames.inc:120
 msgid "Materials"
 msgstr ""
 
 msgid "Materials"
 msgstr ""
 
-#: includes/sysnames.inc:125
+#: includes/sysnames.inc:127
 msgid "Assets"
 msgstr ""
 
 msgid "Assets"
 msgstr ""
 
-#: includes/sysnames.inc:127
+#: includes/sysnames.inc:129
 msgid "Equity"
 msgstr ""
 
 msgid "Equity"
 msgstr ""
 
-#: includes/sysnames.inc:128
+#: includes/sysnames.inc:130
 msgid "Income"
 msgstr ""
 
 msgid "Income"
 msgstr ""
 
-#: includes/sysnames.inc:129
+#: includes/sysnames.inc:131
 msgid "Cost of Goods Sold"
 msgstr ""
 
 msgid "Cost of Goods Sold"
 msgstr ""
 
-#: includes/sysnames.inc:130
+#: includes/sysnames.inc:132
 msgid "Expense"
 msgstr ""
 
 msgid "Expense"
 msgstr ""
 
-#: includes/sysnames.inc:139
+#: includes/sysnames.inc:141
 msgid "Amount, increase base"
 msgstr ""
 
 msgid "Amount, increase base"
 msgstr ""
 
-#: includes/sysnames.inc:140
+#: includes/sysnames.inc:142
 msgid "Amount, reduce base"
 msgstr ""
 
 msgid "Amount, reduce base"
 msgstr ""
 
-#: includes/sysnames.inc:141
+#: includes/sysnames.inc:143
 msgid "% amount of base"
 msgstr ""
 
 msgid "% amount of base"
 msgstr ""
 
-#: includes/sysnames.inc:142
+#: includes/sysnames.inc:144
 msgid "% amount of base, increase base"
 msgstr ""
 
 msgid "% amount of base, increase base"
 msgstr ""
 
-#: includes/sysnames.inc:143
+#: includes/sysnames.inc:145
 msgid "% amount of base, reduce base"
 msgstr ""
 
 msgid "% amount of base, reduce base"
 msgstr ""
 
-#: includes/sysnames.inc:144
+#: includes/sysnames.inc:146
 msgid "Taxes added"
 msgstr ""
 
 msgid "Taxes added"
 msgstr ""
 
-#: includes/sysnames.inc:145
+#: includes/sysnames.inc:147
 msgid "Taxes added, increase base"
 msgstr ""
 
 msgid "Taxes added, increase base"
 msgstr ""
 
-#: includes/sysnames.inc:146
+#: includes/sysnames.inc:148
 msgid "Taxes added, reduce base"
 msgstr ""
 
 msgid "Taxes added, reduce base"
 msgstr ""
 
-#: includes/sysnames.inc:147
+#: includes/sysnames.inc:149
 msgid "Taxes included"
 msgstr ""
 
 msgid "Taxes included"
 msgstr ""
 
-#: includes/sysnames.inc:148
+#: includes/sysnames.inc:150
 msgid "Taxes included, increase base"
 msgstr ""
 
 msgid "Taxes included, increase base"
 msgstr ""
 
-#: includes/sysnames.inc:149
+#: includes/sysnames.inc:151
 msgid "Taxes included, reduce base"
 msgstr ""
 
 msgid "Taxes included, reduce base"
 msgstr ""
 
-#: includes/sysnames.inc:156
+#: includes/sysnames.inc:158
 msgid "Supplier Invoice/Credit"
 msgstr ""
 
 msgid "Supplier Invoice/Credit"
 msgstr ""
 
-#: includes/sysnames.inc:162
+#: includes/sysnames.inc:164
 msgid "Declining balance"
 msgstr ""
 
 msgid "Declining balance"
 msgstr ""
 
-#: includes/sysnames.inc:163
+#: includes/sysnames.inc:165
 msgid "Straight line"
 msgstr ""
 
 msgid "Straight line"
 msgstr ""
 
-#: includes/sysnames.inc:164
+#: includes/sysnames.inc:166
 msgid "Sum of the Year Digits"
 msgstr ""
 
 msgid "Sum of the Year Digits"
 msgstr ""
 
-#: includes/sysnames.inc:165
+#: includes/sysnames.inc:167
 msgid "One-time"
 msgstr ""
 
 msgid "One-time"
 msgstr ""
 
-#: includes/sysnames.inc:171 manufacturing/search_work_orders.php:163
-#: manufacturing/includes/manufacturing_ui.inc:293 reporting/rep402.php:103
+#: includes/sysnames.inc:173 manufacturing/search_work_orders.php:170
+#: manufacturing/includes/manufacturing_ui.inc:293 reporting/rep402.php:136
 msgid "Manufactured"
 msgstr ""
 
 msgid "Manufactured"
 msgstr ""
 
-#: includes/sysnames.inc:172
+#: includes/sysnames.inc:174
 msgid "Purchased"
 msgstr ""
 
 msgid "Purchased"
 msgstr ""
 
-#: includes/sysnames.inc:173
+#: includes/sysnames.inc:175
 msgid "Service"
 msgstr ""
 
 msgid "Service"
 msgstr ""
 
-#: includes/sysnames.inc:186
+#: includes/sysnames.inc:188
 msgid "Customer branch"
 msgstr ""
 
 msgid "Customer branch"
 msgstr ""
 
-#: includes/sysnames.inc:188
+#: includes/sysnames.inc:190
 msgid "Shipper"
 msgstr ""
 
 msgid "Shipper"
 msgstr ""
 
-#: includes/sysnames.inc:189
+#: includes/sysnames.inc:191
 msgid "Company internal"
 msgstr ""
 
 msgid "Company internal"
 msgstr ""
 
-#: includes/sysnames.inc:194
+#: includes/sysnames.inc:196
 msgid "Prepayment"
 msgstr ""
 
 msgid "Prepayment"
 msgstr ""
 
-#: includes/sysnames.inc:196
+#: includes/sysnames.inc:198
 msgid "After No. of Days"
 msgstr ""
 
 msgid "After No. of Days"
 msgstr ""
 
-#: includes/sysnames.inc:197
+#: includes/sysnames.inc:199
 msgid "Day In Following Month"
 msgstr ""
 
 msgid "Day In Following Month"
 msgstr ""
 
-#: includes/sysnames.inc:201
+#: includes/sysnames.inc:203
 msgid "Sum per line taxes"
 msgstr ""
 
 msgid "Sum per line taxes"
 msgstr ""
 
-#: includes/sysnames.inc:202
+#: includes/sysnames.inc:204
 msgid "Taxes from totals"
 msgstr ""
 
 msgid "Taxes from totals"
 msgstr ""
 
-#: includes/sysnames.inc:214
+#: includes/sysnames.inc:216
 msgid "Jan"
 msgstr ""
 
 msgid "Jan"
 msgstr ""
 
-#: includes/sysnames.inc:214
+#: includes/sysnames.inc:216
 msgid "Feb"
 msgstr ""
 
 msgid "Feb"
 msgstr ""
 
-#: includes/sysnames.inc:214
+#: includes/sysnames.inc:216
 msgid "Mar"
 msgstr ""
 
 msgid "Mar"
 msgstr ""
 
-#: includes/sysnames.inc:214
+#: includes/sysnames.inc:216
 msgid "Apr"
 msgstr ""
 
 msgid "Apr"
 msgstr ""
 
-#: includes/sysnames.inc:214 includes/ui/ui_view.inc:982
+#: includes/sysnames.inc:216 includes/ui/ui_view.inc:1010
 msgid "May"
 msgstr ""
 
 msgid "May"
 msgstr ""
 
-#: includes/sysnames.inc:214
+#: includes/sysnames.inc:216
 msgid "Jun"
 msgstr ""
 
 msgid "Jun"
 msgstr ""
 
-#: includes/sysnames.inc:214
+#: includes/sysnames.inc:216
 msgid "Jul"
 msgstr ""
 
 msgid "Jul"
 msgstr ""
 
-#: includes/sysnames.inc:214
+#: includes/sysnames.inc:216
 msgid "Aug"
 msgstr ""
 
 msgid "Aug"
 msgstr ""
 
-#: includes/sysnames.inc:214
+#: includes/sysnames.inc:216
 msgid "Sep"
 msgstr ""
 
 msgid "Sep"
 msgstr ""
 
-#: includes/sysnames.inc:214
+#: includes/sysnames.inc:216
 msgid "Oct"
 msgstr ""
 
 msgid "Oct"
 msgstr ""
 
-#: includes/sysnames.inc:214
+#: includes/sysnames.inc:216
 msgid "Nov"
 msgstr ""
 
 msgid "Nov"
 msgstr ""
 
-#: includes/sysnames.inc:214
+#: includes/sysnames.inc:216
 msgid "Dec"
 msgstr ""
 
 msgid "Dec"
 msgstr ""
 
-#: includes/sysnames.inc:220
+#: includes/sysnames.inc:222
 msgid "Unicode (multilanguage)"
 msgstr ""
 
 msgid "Unicode (multilanguage)"
 msgstr ""
 
-#: includes/sysnames.inc:221
+#: includes/sysnames.inc:223
 msgid "Icelandic"
 msgstr ""
 
 msgid "Icelandic"
 msgstr ""
 
-#: includes/sysnames.inc:222
+#: includes/sysnames.inc:224
 msgid "Latvian"
 msgstr ""
 
 msgid "Latvian"
 msgstr ""
 
-#: includes/sysnames.inc:223
+#: includes/sysnames.inc:225
 msgid "Romanian"
 msgstr ""
 
 msgid "Romanian"
 msgstr ""
 
-#: includes/sysnames.inc:224
+#: includes/sysnames.inc:226
 msgid "Slovenian"
 msgstr ""
 
 msgid "Slovenian"
 msgstr ""
 
-#: includes/sysnames.inc:225
+#: includes/sysnames.inc:227
 msgid "Polish"
 msgstr ""
 
 msgid "Polish"
 msgstr ""
 
-#: includes/sysnames.inc:226
+#: includes/sysnames.inc:228
 msgid "Estonian"
 msgstr ""
 
 msgid "Estonian"
 msgstr ""
 
-#: includes/sysnames.inc:227
+#: includes/sysnames.inc:229
 msgid "Spanish"
 msgstr ""
 
 msgid "Spanish"
 msgstr ""
 
-#: includes/sysnames.inc:228
+#: includes/sysnames.inc:230
 msgid "Swedish"
 msgstr ""
 
 msgid "Swedish"
 msgstr ""
 
-#: includes/sysnames.inc:229
+#: includes/sysnames.inc:231
 msgid "Turkish"
 msgstr ""
 
 msgid "Turkish"
 msgstr ""
 
-#: includes/sysnames.inc:230
+#: includes/sysnames.inc:232
 msgid "Czech"
 msgstr ""
 
 msgid "Czech"
 msgstr ""
 
-#: includes/sysnames.inc:231
+#: includes/sysnames.inc:233
 msgid "Danish"
 msgstr ""
 
 msgid "Danish"
 msgstr ""
 
-#: includes/sysnames.inc:232
+#: includes/sysnames.inc:234
 msgid "Lithuanian"
 msgstr ""
 
 msgid "Lithuanian"
 msgstr ""
 
-#: includes/sysnames.inc:233
+#: includes/sysnames.inc:235
 msgid "Slovak"
 msgstr ""
 
 msgid "Slovak"
 msgstr ""
 
-#: includes/sysnames.inc:234
+#: includes/sysnames.inc:236
 msgid "Spanish (alternative)"
 msgstr ""
 
 msgid "Spanish (alternative)"
 msgstr ""
 
-#: includes/sysnames.inc:235
+#: includes/sysnames.inc:237
 msgid "Persian"
 msgstr ""
 
 msgid "Persian"
 msgstr ""
 
-#: includes/sysnames.inc:236
+#: includes/sysnames.inc:238
 msgid "Hungarian"
 msgstr ""
 
 msgid "Hungarian"
 msgstr ""
 
-#: includes/sysnames.inc:237
+#: includes/sysnames.inc:239
 msgid "French"
 msgstr ""
 
 msgid "French"
 msgstr ""
 
-#: includes/sysnames.inc:238
+#: includes/sysnames.inc:240
 msgid "Italian"
 msgstr ""
 
 #: includes/system_tests.inc:15 includes/ui/ui_view.inc:210
 msgid "Italian"
 msgstr ""
 
 #: includes/system_tests.inc:15 includes/ui/ui_view.inc:210
-#: reporting/rep705.php:251 reporting/rep705.php:262 reporting/rep705.php:271
+#: reporting/rep705.php:271 reporting/rep705.php:281 reporting/rep705.php:289
 msgid "Info"
 msgstr ""
 
 msgid "Info"
 msgstr ""
 
@@ -7194,246 +7643,242 @@ msgstr ""
 msgid "MySQL version"
 msgstr ""
 
 msgid "MySQL version"
 msgstr ""
 
-#: includes/system_tests.inc:28
+#: includes/system_tests.inc:31
 msgid "Upgrade MySQL server to version at least 4.1"
 msgstr ""
 
 msgid "Upgrade MySQL server to version at least 4.1"
 msgstr ""
 
-#: includes/system_tests.inc:35
+#: includes/system_tests.inc:38
 msgid "PHP MySQL extension"
 msgstr ""
 
 msgid "PHP MySQL extension"
 msgstr ""
 
-#: includes/system_tests.inc:40
+#: includes/system_tests.inc:43
 msgid "Your PHP has to have MySQL extension enabled."
 msgstr ""
 
 msgid "Your PHP has to have MySQL extension enabled."
 msgstr ""
 
-#: includes/system_tests.inc:46
+#: includes/system_tests.inc:49
 msgid "PHP version"
 msgstr ""
 
 msgid "PHP version"
 msgstr ""
 
-#: includes/system_tests.inc:50
+#: includes/system_tests.inc:53
 msgid "Upgrade PHP to version at least 5.0.0"
 msgstr ""
 
 msgid "Upgrade PHP to version at least 5.0.0"
 msgstr ""
 
-#: includes/system_tests.inc:57
+#: includes/system_tests.inc:60
 msgid "Server system"
 msgstr ""
 
 msgid "Server system"
 msgstr ""
 
-#: includes/system_tests.inc:67
+#: includes/system_tests.inc:70
 msgid "Session save path"
 msgstr ""
 
 msgid "Session save path"
 msgstr ""
 
-#: includes/system_tests.inc:79
+#: includes/system_tests.inc:82
 msgid "Removed install wizard folder"
 msgstr ""
 
 msgid "Removed install wizard folder"
 msgstr ""
 
-#: includes/system_tests.inc:82
+#: includes/system_tests.inc:85
 msgid "Not removed"
 msgstr ""
 
 msgid "Not removed"
 msgstr ""
 
-#: includes/system_tests.inc:83
+#: includes/system_tests.inc:86
 msgid "Remove or rename install wizard folder for security reasons."
 msgstr ""
 
 msgid "Remove or rename install wizard folder for security reasons."
 msgstr ""
 
-#: includes/system_tests.inc:90
+#: includes/system_tests.inc:93
 msgid "Browser type"
 msgstr ""
 
 msgid "Browser type"
 msgstr ""
 
-#: includes/system_tests.inc:94
+#: includes/system_tests.inc:97
 msgid "Any browser is supported"
 msgstr ""
 
 msgid "Any browser is supported"
 msgstr ""
 
-#: includes/system_tests.inc:101
+#: includes/system_tests.inc:104
 msgid "Http server type"
 msgstr ""
 
 msgid "Http server type"
 msgstr ""
 
-#: includes/system_tests.inc:105
+#: includes/system_tests.inc:108
 msgid "Any server is supported"
 msgstr ""
 
 msgid "Any server is supported"
 msgstr ""
 
-#: includes/system_tests.inc:112
+#: includes/system_tests.inc:115
 msgid "Native gettext"
 msgstr ""
 
 msgid "Native gettext"
 msgstr ""
 
-#: includes/system_tests.inc:116
+#: includes/system_tests.inc:119
 msgid "In case of no gettext support, php emulation is used"
 msgstr ""
 
 msgid "In case of no gettext support, php emulation is used"
 msgstr ""
 
-#: includes/system_tests.inc:124
+#: includes/system_tests.inc:127
 msgid "Debugging mode"
 msgstr ""
 
 msgid "Debugging mode"
 msgstr ""
 
-#: includes/system_tests.inc:128
+#: includes/system_tests.inc:131
 msgid "To switch debugging on set $go_debug>0 in config.php file"
 msgstr ""
 
 msgid "To switch debugging on set $go_debug>0 in config.php file"
 msgstr ""
 
-#: includes/system_tests.inc:138
+#: includes/system_tests.inc:141
 msgid "Error logging"
 msgstr ""
 
 msgid "Error logging"
 msgstr ""
 
-#: includes/system_tests.inc:146
+#: includes/system_tests.inc:149
 msgid "Disabled"
 msgstr ""
 
 msgid "Disabled"
 msgstr ""
 
-#: includes/system_tests.inc:149
+#: includes/system_tests.inc:152
 msgid "To switch error logging set $error_logging in config.php file"
 msgstr ""
 
 msgid "To switch error logging set $error_logging in config.php file"
 msgstr ""
 
-#: includes/system_tests.inc:152
+#: includes/system_tests.inc:155
 msgid "Log file is not writeable"
 msgstr ""
 
 msgid "Log file is not writeable"
 msgstr ""
 
-#: includes/system_tests.inc:162
+#: includes/system_tests.inc:165
 msgid "Current database version"
 msgstr ""
 
 msgid "Current database version"
 msgstr ""
 
-#: includes/system_tests.inc:166
+#: includes/system_tests.inc:169
 msgid "Database structure seems to be not upgraded to current version"
 msgstr ""
 
 msgid "Database structure seems to be not upgraded to current version"
 msgstr ""
 
-#: includes/system_tests.inc:181
+#: includes/system_tests.inc:184
 msgid "Company subdirectories consistency"
 msgstr ""
 
 msgid "Company subdirectories consistency"
 msgstr ""
 
-#: includes/system_tests.inc:194 includes/system_tests.inc:201
-#: includes/system_tests.inc:209 includes/system_tests.inc:226
-#: includes/system_tests.inc:341 includes/system_tests.inc:350
-#: includes/system_tests.inc:359 includes/system_tests.inc:367
+#: includes/system_tests.inc:197 includes/system_tests.inc:204
+#: includes/system_tests.inc:212 includes/system_tests.inc:229
+#: includes/system_tests.inc:344 includes/system_tests.inc:353
+#: includes/system_tests.inc:362 includes/system_tests.inc:370
 #, php-format
 msgid "'%s' is not writeable"
 msgstr ""
 
 #, php-format
 msgid "'%s' is not writeable"
 msgstr ""
 
-#: includes/system_tests.inc:222
+#: includes/system_tests.inc:225
 msgid "Temporary directory"
 msgstr ""
 
 msgid "Temporary directory"
 msgstr ""
 
-#: includes/system_tests.inc:234
+#: includes/system_tests.inc:237
 msgid "Language configuration consistency"
 msgstr ""
 
 msgid "Language configuration consistency"
 msgstr ""
 
-#: includes/system_tests.inc:243
+#: includes/system_tests.inc:246
 msgid "Languages folder should be writeable."
 msgstr ""
 
 msgid "Languages folder should be writeable."
 msgstr ""
 
-#: includes/system_tests.inc:252
+#: includes/system_tests.inc:255
 msgid "Languages configuration file should be writeable."
 msgstr ""
 
 msgid "Languages configuration file should be writeable."
 msgstr ""
 
-#: includes/system_tests.inc:271
+#: includes/system_tests.inc:274
 #, php-format
 msgid "Missing %s translation file."
 msgstr ""
 
 #, php-format
 msgid "Missing %s translation file."
 msgstr ""
 
-#: includes/system_tests.inc:276
+#: includes/system_tests.inc:279
 #, php-format
 msgid "Missing system locale: %s"
 msgstr ""
 
 #, php-format
 msgid "Missing system locale: %s"
 msgstr ""
 
-#: includes/system_tests.inc:289
+#: includes/system_tests.inc:292
 msgid "Main config file"
 msgstr ""
 
 msgid "Main config file"
 msgstr ""
 
-#: includes/system_tests.inc:296 includes/system_tests.inc:318
+#: includes/system_tests.inc:299 includes/system_tests.inc:321
 #, php-format
 msgid "Can't write '%s' file. Check FA directory write permissions."
 msgstr ""
 
 #, php-format
 msgid "Can't write '%s' file. Check FA directory write permissions."
 msgstr ""
 
-#: includes/system_tests.inc:297 includes/system_tests.inc:319
+#: includes/system_tests.inc:300 includes/system_tests.inc:322
 #, php-format
 msgid "'%s' file exists."
 msgstr ""
 
 #, php-format
 msgid "'%s' file exists."
 msgstr ""
 
-#: includes/system_tests.inc:301
+#: includes/system_tests.inc:304
 #, php-format
 msgid "'%s' file should be read-only"
 msgstr ""
 
 #, php-format
 msgid "'%s' file should be read-only"
 msgstr ""
 
-#: includes/system_tests.inc:310
+#: includes/system_tests.inc:313
 msgid "Database auth file"
 msgstr ""
 
 msgid "Database auth file"
 msgstr ""
 
-#: includes/system_tests.inc:323
+#: includes/system_tests.inc:326
 #, php-format
 msgid ""
 "'%s' file should be read-only if you do not plan to add or change companies"
 msgstr ""
 
 #, php-format
 msgid ""
 "'%s' file should be read-only if you do not plan to add or change companies"
 msgstr ""
 
-#: includes/system_tests.inc:334
+#: includes/system_tests.inc:337
 msgid "Extensions system"
 msgstr ""
 
 msgid "Extensions system"
 msgstr ""
 
-#: includes/system_tests.inc:372
+#: includes/system_tests.inc:375
 msgid "Extensions configuration files and directories should be writeable"
 msgstr ""
 
 msgid "Extensions configuration files and directories should be writeable"
 msgstr ""
 
-#: includes/system_tests.inc:385
+#: includes/system_tests.inc:388
 #, php-format
 msgid "Non-standard theme directory '%s' is not writable"
 msgstr ""
 
 #, php-format
 msgid "Non-standard theme directory '%s' is not writable"
 msgstr ""
 
-#: includes/system_tests.inc:395
-msgid ""
-"OpenSSL PHP extension have to be enabled to use extension repository system."
-msgstr ""
-
 #: includes/system_tests.inc:398
 msgid ""
 #: includes/system_tests.inc:398
 msgid ""
-"OpenSSL have to be available on your server to use extension repository "
-"system."
+"OpenSSL PHP extension have to be enabled to use extension repository system."
 msgstr ""
 
 msgstr ""
 
-#: includes/system_tests.inc:421
+#: includes/system_tests.inc:424
 msgid "Test"
 msgstr ""
 
 msgid "Test"
 msgstr ""
 
-#: includes/system_tests.inc:421
+#: includes/system_tests.inc:424
 msgid "Test type"
 msgstr ""
 
 msgid "Test type"
 msgstr ""
 
-#: includes/system_tests.inc:421 reporting/rep204.php:85
-#: reporting/rep301.php:164 reporting/rep308.php:224
+#: includes/system_tests.inc:424 reporting/rep204.php:85
+#: reporting/rep301.php:168 reporting/rep308.php:225
 msgid "Value"
 msgstr ""
 
 msgid "Value"
 msgstr ""
 
-#: includes/system_tests.inc:421 reporting/reports_main.php:42
-#: reporting/reports_main.php:53 reporting/reports_main.php:62
-#: reporting/reports_main.php:69 reporting/reports_main.php:78
-#: reporting/reports_main.php:87 reporting/reports_main.php:94
-#: reporting/reports_main.php:103 reporting/reports_main.php:113
-#: reporting/reports_main.php:120 reporting/reports_main.php:127
-#: reporting/reports_main.php:135 reporting/reports_main.php:142
-#: reporting/reports_main.php:148 reporting/reports_main.php:159
-#: reporting/reports_main.php:170 reporting/reports_main.php:178
-#: reporting/reports_main.php:183 reporting/reports_main.php:190
-#: reporting/reports_main.php:198 reporting/reports_main.php:205
-#: reporting/reports_main.php:214 reporting/reports_main.php:220
-#: reporting/reports_main.php:231 reporting/reports_main.php:241
-#: reporting/reports_main.php:247 reporting/reports_main.php:257
-#: reporting/reports_main.php:265 reporting/reports_main.php:273
-#: reporting/reports_main.php:280 reporting/reports_main.php:289
-#: reporting/reports_main.php:296 reporting/reports_main.php:303
-#: reporting/reports_main.php:314 reporting/reports_main.php:325
-#: reporting/reports_main.php:335 reporting/reports_main.php:342
-#: reporting/reports_main.php:348 reporting/reports_main.php:355
-#: reporting/reports_main.php:368 reporting/reports_main.php:376
-#: reporting/reports_main.php:387 reporting/reports_main.php:399
-#: reporting/reports_main.php:409 reporting/reports_main.php:421
-#: reporting/reports_main.php:428 reporting/reports_main.php:438
-#: reporting/reports_main.php:449 reporting/reports_main.php:458
-#: reporting/reports_main.php:469 reporting/reports_main.php:475
-#: reporting/reports_main.php:484 reporting/reports_main.php:494
-#: reporting/reports_main.php:502 reporting/reports_main.php:510
-#: reporting/reports_main.php:518 reporting/includes/excel_report.inc:292
+#: includes/system_tests.inc:424 reporting/reports_main.php:42
+#: reporting/reports_main.php:53 reporting/reports_main.php:64
+#: reporting/reports_main.php:73 reporting/reports_main.php:80
+#: reporting/reports_main.php:89 reporting/reports_main.php:98
+#: reporting/reports_main.php:105 reporting/reports_main.php:114
+#: reporting/reports_main.php:124 reporting/reports_main.php:131
+#: reporting/reports_main.php:138 reporting/reports_main.php:146
+#: reporting/reports_main.php:153 reporting/reports_main.php:160
+#: reporting/reports_main.php:171 reporting/reports_main.php:182
+#: reporting/reports_main.php:191 reporting/reports_main.php:199
+#: reporting/reports_main.php:204 reporting/reports_main.php:211
+#: reporting/reports_main.php:219 reporting/reports_main.php:226
+#: reporting/reports_main.php:235 reporting/reports_main.php:241
+#: reporting/reports_main.php:252 reporting/reports_main.php:262
+#: reporting/reports_main.php:268 reporting/reports_main.php:278
+#: reporting/reports_main.php:286 reporting/reports_main.php:294
+#: reporting/reports_main.php:301 reporting/reports_main.php:311
+#: reporting/reports_main.php:320 reporting/reports_main.php:328
+#: reporting/reports_main.php:335 reporting/reports_main.php:346
+#: reporting/reports_main.php:357 reporting/reports_main.php:367
+#: reporting/reports_main.php:374 reporting/reports_main.php:380
+#: reporting/reports_main.php:387 reporting/reports_main.php:400
+#: reporting/reports_main.php:408 reporting/reports_main.php:420
+#: reporting/reports_main.php:432 reporting/reports_main.php:442
+#: reporting/reports_main.php:454 reporting/reports_main.php:461
+#: reporting/reports_main.php:472 reporting/reports_main.php:483
+#: reporting/reports_main.php:492 reporting/reports_main.php:503
+#: reporting/reports_main.php:509 reporting/reports_main.php:519
+#: reporting/reports_main.php:529 reporting/reports_main.php:537
+#: reporting/reports_main.php:545 reporting/reports_main.php:553
+#: reporting/includes/excel_report.inc:292
 #: reporting/includes/excel_report.inc:425
 #: reporting/includes/excel_report.inc:425
-#: reporting/includes/pdf_report.inc:347 reporting/includes/pdf_report.inc:608
-#: sales/view/view_sales_order.php:98
+#: reporting/includes/pdf_report.inc:361 reporting/includes/pdf_report.inc:622
+#: sales/view/view_sales_order.php:100
 msgid "Comments"
 msgstr ""
 
 msgid "Comments"
 msgstr ""
 
-#: includes/system_tests.inc:445
+#: includes/system_tests.inc:448
 msgid "Ok"
 msgstr ""
 
 msgid "Ok"
 msgstr ""
 
-#: includes/db/audit_trail_db.inc:102
+#: includes/db/audit_trail_db.inc:103
 msgid ""
 "Some transactions journal GL postings were not indexed due to lack of audit "
 "trail record."
 msgid ""
 "Some transactions journal GL postings were not indexed due to lack of audit "
 "trail record."
@@ -7545,92 +7990,159 @@ msgstr ""
 msgid "Reference line cannot be deleted because it is already in use."
 msgstr ""
 
 msgid "Reference line cannot be deleted because it is already in use."
 msgstr ""
 
-#: includes/db/inventory_db.inc:321
+#: includes/db/inventory_db.inc:324
 msgid "Cost was "
 msgstr ""
 
 msgid "Cost was "
 msgstr ""
 
-#: includes/db/inventory_db.inc:321
+#: includes/db/inventory_db.inc:324
 msgid " changed to "
 msgstr ""
 
 msgid " changed to "
 msgstr ""
 
-#: includes/db/inventory_db.inc:321
+#: includes/db/inventory_db.inc:324
 msgid " for item "
 msgstr ""
 
 msgid " for item "
 msgstr ""
 
-#: includes/db/inventory_db.inc:381
+#: includes/db/inventory_db.inc:384
 msgid "Zero/negative inventory handling"
 msgstr ""
 
 msgid "Zero/negative inventory handling"
 msgstr ""
 
-#: includes/ui/allocation_cart.inc:288
+#: includes/ui/allocation_cart.inc:309
 #, php-format
 msgid "Allocated amounts in %s:"
 msgstr ""
 
 #, php-format
 msgid "Allocated amounts in %s:"
 msgstr ""
 
-#: includes/ui/allocation_cart.inc:290
+#: includes/ui/allocation_cart.inc:311
 #: purchasing/allocations/supplier_allocation_main.php:94
 #: purchasing/allocations/supplier_allocation_main.php:94
-#: sales/allocations/customer_allocation_main.php:87
+#: sales/allocations/customer_allocation_main.php:92
 msgid "Transaction Type"
 msgstr ""
 
 msgid "Transaction Type"
 msgstr ""
 
-#: includes/ui/allocation_cart.inc:290
+#: includes/ui/allocation_cart.inc:311
 msgid "Supplier Ref"
 msgstr ""
 
 msgid "Supplier Ref"
 msgstr ""
 
-#: includes/ui/allocation_cart.inc:290 reporting/rep704.php:82
-#: reporting/rep704.php:85 reporting/rep704.php:88 reporting/rep709.php:116
-#: sales/view/view_credit.php:68 sales/view/view_sales_order.php:109
-#: sales/view/view_sales_order.php:142 sales/view/view_sales_order.php:179
+#: includes/ui/allocation_cart.inc:311 reporting/rep704.php:79
+#: reporting/rep704.php:87 reporting/rep704.php:95 reporting/rep709.php:117
+#: sales/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/customer_branches_list.php:49
-#: sales/inquiry/sales_orders_view.php:214
-#: sales/inquiry/sales_orders_view.php:253
-#: sales/inquiry/sales_orders_view.php:267
+#: sales/inquiry/sales_orders_view.php:219
+#: sales/inquiry/sales_orders_view.php:258
+#: sales/inquiry/sales_orders_view.php:272
 msgid "Ref"
 msgstr ""
 
 msgid "Ref"
 msgstr ""
 
-#: includes/ui/allocation_cart.inc:291
+#: includes/ui/allocation_cart.inc:312
 msgid "Other Allocations"
 msgstr ""
 
 msgid "Other Allocations"
 msgstr ""
 
-#: includes/ui/allocation_cart.inc:291 includes/ui/allocation_cart.inc:337
-#: includes/ui/ui_view.inc:547
+#: includes/ui/allocation_cart.inc:312 includes/ui/allocation_cart.inc:358
+#: includes/ui/ui_view.inc:553
 #: purchasing/allocations/supplier_allocation_main.php:101
 #: purchasing/allocations/supplier_allocation_main.php:101
-#: reporting/rep112.php:150 reporting/rep210.php:157
-#: reporting/includes/doctext.inc:166 reporting/includes/doctext.inc:207
-#: sales/allocations/customer_allocation_main.php:94
+#: reporting/rep112.php:159 reporting/rep210.php:157
+#: reporting/includes/doctext.inc:166 reporting/includes/doctext.inc:209
+#: sales/allocations/customer_allocation_main.php:99
 msgid "Left to Allocate"
 msgstr ""
 
 msgid "Left to Allocate"
 msgstr ""
 
-#: includes/ui/allocation_cart.inc:291 includes/ui/ui_view.inc:547
-#: reporting/includes/doctext.inc:166 reporting/includes/doctext.inc:207
+#: includes/ui/allocation_cart.inc:312 includes/ui/ui_view.inc:553
+#: reporting/includes/doctext.inc:166 reporting/includes/doctext.inc:209
 msgid "This Allocation"
 msgstr ""
 
 msgid "This Allocation"
 msgstr ""
 
-#: includes/ui/allocation_cart.inc:324 reporting/rep112.php:147
+#: includes/ui/allocation_cart.inc:345 reporting/rep112.php:156
 #: reporting/rep210.php:154
 msgid "Total Allocated"
 msgstr ""
 
 #: reporting/rep210.php:154
 msgid "Total Allocated"
 msgstr ""
 
-#: includes/ui/allocation_cart.inc:358
+#: includes/ui/allocation_cart.inc:379
 msgid "The entry for one or more amounts is invalid or negative."
 msgstr ""
 
 msgid "The entry for one or more amounts is invalid or negative."
 msgstr ""
 
-#: includes/ui/allocation_cart.inc:369
+#: includes/ui/allocation_cart.inc:390
 msgid "At least one transaction is overallocated."
 msgstr ""
 
 msgid "At least one transaction is overallocated."
 msgstr ""
 
-#: includes/ui/allocation_cart.inc:383
+#: includes/ui/allocation_cart.inc:402 includes/ui/allocation_cart.inc:412
+msgid "Allocated transaction allocated is not related to company selected."
+msgstr ""
+
+#: includes/ui/allocation_cart.inc:427
 msgid ""
 "These allocations cannot be processed because the amount allocated is more "
 "than the total amount left to allocate."
 msgstr ""
 
 msgid ""
 "These allocations cannot be processed because the amount allocated is more "
 "than the total amount left to allocate."
 msgstr ""
 
-#: includes/ui/class.crud_view.inc:289 includes/ui/simple_crud_class.inc:225
-#: includes/ui/ui_input.inc:226
+#: includes/ui/attachment.inc:84 sales/manage/sales_groups.php:85
+#: sales/manage/sales_groups.php:120
+msgid "ID"
+msgstr ""
+
+#: includes/ui/attachment.inc:84 includes/ui/attachment.inc:137
+msgid "Docs Title"
+msgstr ""
+
+#: includes/ui/attachment.inc:84
+msgid "Date Updated"
+msgstr ""
+
+#: includes/ui/attachment.inc:112
+msgid "Attachment Detail"
+msgstr ""
+
+#: includes/ui/attachment.inc:131
+msgid "Customer ID"
+msgstr ""
+
+#: includes/ui/attachment.inc:133
+msgid "Supplier ID"
+msgstr ""
+
+#: includes/ui/attachment.inc:139
+msgid "File:"
+msgstr ""
+
+#: includes/ui/attachment.inc:139
+#, php-format
+msgid "%s [%s bytes]"
+msgstr ""
+
+#: includes/ui/attachment.inc:140
+msgid "File change"
+msgstr ""
+
+#: includes/ui/attachment.inc:140
+msgid "Select file"
+msgstr ""
+
+#: includes/ui/attachment.inc:169 includes/ui/class.crud_view.inc:298
+#: includes/ui/simple_crud_class.inc:225 includes/ui/ui_input.inc:227
 msgid "Submit changes"
 msgstr ""
 
 msgid "Submit changes"
 msgstr ""
 
-#: includes/ui/class.crud_view.inc:304 includes/ui/simple_crud_class.inc:227
-#: includes/ui/ui_input.inc:227
+#: includes/ui/attachment.inc:171 includes/ui/simple_crud_class.inc:229
+#: includes/ui/ui_input.inc:230
+msgid "Cancel edition"
+msgstr ""
+
+#: includes/ui/attachment.inc:207 includes/ui/attachment.inc:259
+msgid "The existing Docs could not be removed"
+msgstr ""
+
+#: includes/ui/attachment.inc:224
+msgid "A New Attachment Added Successfully"
+msgstr ""
+
+#: includes/ui/attachment.inc:285
+msgid "Description cannot be empty."
+msgstr ""
+
+#: includes/ui/attachment.inc:315
+msgid "The Selected Attachment is Deleted Successfully"
+msgstr ""
+
+#: includes/ui/class.crud_view.inc:313 includes/ui/simple_crud_class.inc:227
+#: includes/ui/ui_input.inc:228
 msgid "Clone"
 msgstr ""
 
 msgid "Clone"
 msgstr ""
 
@@ -7667,7 +8179,7 @@ msgid "Sec Phone"
 msgstr ""
 
 #: includes/ui/contacts_view.inc:40 reporting/rep103.php:263
 msgstr ""
 
 #: includes/ui/contacts_view.inc:40 reporting/rep103.php:263
-#: reporting/rep205.php:175 reporting/includes/header2.inc:106
+#: reporting/rep205.php:175 reporting/includes/header2.inc:104
 #: sales/manage/sales_people.php:99
 msgid "Fax"
 msgstr ""
 #: sales/manage/sales_people.php:99
 msgid "Fax"
 msgstr ""
@@ -7692,17 +8204,17 @@ msgstr ""
 msgid "Contact active for:"
 msgstr ""
 
 msgid "Contact active for:"
 msgstr ""
 
-#: includes/ui/contacts_view.inc:99 sales/manage/customers.php:256
+#: includes/ui/contacts_view.inc:99 sales/manage/customers.php:257
 msgid "Phone:"
 msgstr ""
 
 #: includes/ui/contacts_view.inc:102 inventory/manage/locations.php:217
 msgid "Phone:"
 msgstr ""
 
 #: includes/ui/contacts_view.inc:102 inventory/manage/locations.php:217
-#: purchasing/manage/suppliers.php:139 sales/manage/customer_branches.php:256
-#: sales/manage/customers.php:259 sales/manage/sales_people.php:158
+#: purchasing/manage/suppliers.php:249 sales/manage/customer_branches.php:256
+#: sales/manage/customers.php:260 sales/manage/sales_people.php:158
 msgid "E-mail:"
 msgstr ""
 
 msgid "E-mail:"
 msgstr ""
 
-#: includes/ui/contacts_view.inc:107 purchasing/manage/suppliers.php:140
+#: includes/ui/contacts_view.inc:107 purchasing/manage/suppliers.php:250
 #: sales/manage/customer_branches.php:257
 msgid "Document Language:"
 msgstr ""
 #: sales/manage/customer_branches.php:257
 msgid "Document Language:"
 msgstr ""
@@ -7727,7 +8239,7 @@ msgstr ""
 msgid "You have to select at least one category."
 msgstr ""
 
 msgid "You have to select at least one category."
 msgstr ""
 
-#: includes/ui/db_pager_view.inc:172 includes/ui/ui_input.inc:959
+#: includes/ui/db_pager_view.inc:172 includes/ui/ui_input.inc:965
 msgid "Show also Inactive"
 msgstr ""
 
 msgid "Show also Inactive"
 msgstr ""
 
@@ -7760,14 +8272,10 @@ msgstr ""
 msgid "Exchange rate roundings"
 msgstr ""
 
 msgid "Exchange rate roundings"
 msgstr ""
 
-#: includes/ui/simple_crud_class.inc:227 includes/ui/ui_input.inc:228
+#: includes/ui/simple_crud_class.inc:227 includes/ui/ui_input.inc:229
 msgid "Edit new record with current data"
 msgstr ""
 
 msgid "Edit new record with current data"
 msgstr ""
 
-#: includes/ui/simple_crud_class.inc:229 includes/ui/ui_input.inc:229
-msgid "Cancel edition"
-msgstr ""
-
 #: includes/ui/ui_controls.inc:93
 msgid "Request from outside of this page is forbidden."
 msgstr ""
 #: includes/ui/ui_controls.inc:93
 msgid "Request from outside of this page is forbidden."
 msgstr ""
@@ -7796,43 +8304,29 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
 msgid "Close"
 msgstr ""
 
-#: includes/ui/ui_controls.inc:506 sales/manage/customers.php:23
-#: sales/inquiry/customers_list.php:29
-msgid "Customers"
-msgstr ""
-
-#: includes/ui/ui_controls.inc:508
-msgid "Branches"
-msgstr ""
-
-#: includes/ui/ui_controls.inc:510 purchasing/manage/suppliers.php:22
-#: purchasing/inquiry/suppliers_list.php:29
-msgid "Suppliers"
-msgstr ""
-
 #: includes/ui/ui_controls.inc:674
 msgid ""
 "Entered data has not been saved yet.\n"
 "Do you want to abandon changes?"
 msgstr ""
 
 #: includes/ui/ui_controls.inc:674
 msgid ""
 "Entered data has not been saved yet.\n"
 "Do you want to abandon changes?"
 msgstr ""
 
-#: includes/ui/ui_input.inc:656 reporting/includes/reports_classes.inc:223
+#: includes/ui/ui_input.inc:661 reporting/includes/reports_classes.inc:225
 msgid "Click Here to Pick up the date"
 msgstr ""
 
 msgid "Click Here to Pick up the date"
 msgstr ""
 
-#: includes/ui/ui_input.inc:971 includes/ui/ui_lists.inc:2330
-#: reporting/rep301.php:224 reporting/rep302.php:168 reporting/rep303.php:178
-#: reporting/rep304.php:184 reporting/rep304.php:188 reporting/rep306.php:235
-#: reporting/rep306.php:242 reporting/rep451.php:143
+#: includes/ui/ui_input.inc:977 includes/ui/ui_lists.inc:2355
+#: reporting/rep301.php:228 reporting/rep302.php:168 reporting/rep303.php:300
+#: reporting/rep304.php:184 reporting/rep304.php:188 reporting/rep306.php:231
+#: reporting/rep306.php:238 reporting/rep310.php:186 reporting/rep310.php:194
 #: sales/manage/customer_branches.php:292
 msgid "Inactive"
 msgstr ""
 
 #: sales/manage/customer_branches.php:292
 msgid "Inactive"
 msgstr ""
 
-#: includes/ui/ui_input.inc:981 includes/ui/ui_input.inc:993
+#: includes/ui/ui_input.inc:987 includes/ui/ui_input.inc:999
 msgid "Current Credit:"
 msgstr ""
 
 msgid "Current Credit:"
 msgstr ""
 
-#: includes/ui/ui_input.inc:1007
+#: includes/ui/ui_input.inc:1013
 msgid "Bank Balance:"
 msgstr ""
 
 msgid "Bank Balance:"
 msgstr ""
 
@@ -7852,176 +8346,171 @@ msgstr ""
 msgid "Enter description fragment to search or * for all"
 msgstr ""
 
 msgid "Enter description fragment to search or * for all"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:305 includes/ui/ui_lists.inc:309
-#: includes/ui/ui_lists.inc:313 includes/ui/ui_lists.inc:317
-#: includes/ui/ui_lists.inc:321 includes/ui/ui_lists.inc:326
-#: includes/ui/ui_lists.inc:330 inventory/inquiry/stock_list.php:42
+#: includes/ui/ui_lists.inc:308 includes/ui/ui_lists.inc:312
+#: includes/ui/ui_lists.inc:316 includes/ui/ui_lists.inc:320
+#: includes/ui/ui_lists.inc:324 includes/ui/ui_lists.inc:329
+#: includes/ui/ui_lists.inc:333 inventory/inquiry/stock_list.php:42
 msgid "Search items"
 msgstr ""
 
 msgid "Search items"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:334 sales/inquiry/customers_list.php:42
+#: includes/ui/ui_lists.inc:337 sales/inquiry/customers_list.php:42
 msgid "Search customers"
 msgstr ""
 
 msgid "Search customers"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:338 sales/inquiry/customer_branches_list.php:38
+#: includes/ui/ui_lists.inc:341 sales/inquiry/customer_branches_list.php:38
 msgid "Search branches"
 msgstr ""
 
 msgid "Search branches"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:342 purchasing/inquiry/suppliers_list.php:42
+#: includes/ui/ui_lists.inc:345 purchasing/inquiry/suppliers_list.php:42
 msgid "Search suppliers"
 msgstr ""
 
 msgid "Search suppliers"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:526 includes/ui/ui_lists.inc:1528
+#: includes/ui/ui_lists.inc:540 includes/ui/ui_lists.inc:1552
 msgid "All Suppliers"
 msgstr ""
 
 msgid "All Suppliers"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:530
+#: includes/ui/ui_lists.inc:544
 msgid "Press Space tab to filter by name fragment"
 msgstr ""
 
 msgid "Press Space tab to filter by name fragment"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:531
+#: includes/ui/ui_lists.inc:545
 msgid "Select supplier"
 msgstr ""
 
 msgid "Select supplier"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:577
+#: includes/ui/ui_lists.inc:595
 msgid "All Customers"
 msgstr ""
 
 msgid "All Customers"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:581
+#: includes/ui/ui_lists.inc:599
 msgid "Press Space tab to filter by name fragment; F2 - entry new customer"
 msgstr ""
 
 msgid "Press Space tab to filter by name fragment; F2 - entry new customer"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:582
+#: includes/ui/ui_lists.inc:600
 msgid "Select customer"
 msgstr ""
 
 msgid "Select customer"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:627
+#: includes/ui/ui_lists.inc:645
 msgid "All branches"
 msgstr ""
 
 msgid "All branches"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:630
+#: includes/ui/ui_lists.inc:648
 msgid "Select customer branch"
 msgstr ""
 
 msgid "Select customer branch"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:666
+#: includes/ui/ui_lists.inc:684
 msgid "All Locations"
 msgstr ""
 
 msgid "All Locations"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:823 includes/ui/ui_lists.inc:907
+#: includes/ui/ui_lists.inc:841 includes/ui/ui_lists.inc:925
 msgid "All Items"
 msgstr ""
 
 msgid "All Items"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:1460
+#: includes/ui/ui_lists.inc:1484
 msgid "All Sales Types"
 msgstr ""
 
 msgid "All Sales Types"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:1807
+#: includes/ui/ui_lists.inc:1832
 msgid "Use Item Sales Accounts"
 msgstr ""
 
 msgid "Use Item Sales Accounts"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2116 includes/ui/ui_lists.inc:2132
-#: includes/ui/ui_lists.inc:2148
+#: includes/ui/ui_lists.inc:2141 includes/ui/ui_lists.inc:2157
+#: includes/ui/ui_lists.inc:2173
 msgid "All Types"
 msgstr ""
 
 msgid "All Types"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2117 sales/view/view_sales_order.php:140
+#: includes/ui/ui_lists.inc:2142 sales/view/view_sales_order.php:142
 msgid "Sales Invoices"
 msgstr ""
 
 msgid "Sales Invoices"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2118 includes/ui/ui_lists.inc:2134
-#: includes/ui/ui_lists.inc:2151
-msgid "Overdue Invoices"
+#: includes/ui/ui_lists.inc:2143 includes/ui/ui_lists.inc:2176
+msgid "Unsettled transactions"
 msgstr ""
 
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2119 includes/ui/ui_lists.inc:2135
-#: includes/ui/ui_lists.inc:2152 includes/ui/ui_view.inc:609
-#: includes/ui/ui_view.inc:613
+#: includes/ui/ui_lists.inc:2144 includes/ui/ui_lists.inc:2160
+#: includes/ui/ui_lists.inc:2177 includes/ui/ui_view.inc:615
+#: includes/ui/ui_view.inc:619
 msgid "Payments"
 msgstr ""
 
 msgid "Payments"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2120 includes/ui/ui_lists.inc:2136
-#: includes/ui/ui_lists.inc:2153 sales/view/view_sales_order.php:176
+#: includes/ui/ui_lists.inc:2145 includes/ui/ui_lists.inc:2161
+#: includes/ui/ui_lists.inc:2178 sales/view/view_sales_order.php:178
 msgid "Credit Notes"
 msgstr ""
 
 msgid "Credit Notes"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2121 sales/view/view_sales_order.php:106
+#: includes/ui/ui_lists.inc:2146 sales/view/view_sales_order.php:108
 msgid "Delivery Notes"
 msgstr ""
 
 msgid "Delivery Notes"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2133 includes/ui/ui_lists.inc:2150
-msgid "Invoices"
-msgstr ""
-
-#: includes/ui/ui_lists.inc:2137 includes/ui/ui_lists.inc:2154
+#: includes/ui/ui_lists.inc:2162 includes/ui/ui_lists.inc:2179
 msgid "Overdue Credit Notes"
 msgstr ""
 
 msgid "Overdue Credit Notes"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2149
+#: includes/ui/ui_lists.inc:2174
 msgid "GRNs"
 msgstr ""
 
 msgid "GRNs"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2167
+#: includes/ui/ui_lists.inc:2192
 msgid "Automatically put balance on back order"
 msgstr ""
 
 msgid "Automatically put balance on back order"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2168
+#: includes/ui/ui_lists.inc:2193
 msgid "Cancel any quantites not delivered"
 msgstr ""
 
 msgid "Cancel any quantites not delivered"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2185
+#: includes/ui/ui_lists.inc:2210
 msgid "Items Returned to Inventory Location"
 msgstr ""
 
 msgid "Items Returned to Inventory Location"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2186
+#: includes/ui/ui_lists.inc:2211
 msgid "Items Written Off"
 msgstr ""
 
 msgid "Items Written Off"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2355
+#: includes/ui/ui_lists.inc:2380
 msgid "New role"
 msgstr ""
 
 msgid "New role"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2407
+#: includes/ui/ui_lists.inc:2432
 msgid "No tags defined."
 msgstr ""
 
 msgid "No tags defined."
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2407
+#: includes/ui/ui_lists.inc:2432
 msgid "No active tags defined."
 msgstr ""
 
 msgid "No active tags defined."
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2445
+#: includes/ui/ui_lists.inc:2470
 #, php-format
 msgid "Activated for '%s'"
 msgstr ""
 
 #, php-format
 msgid "Activated for '%s'"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2448
+#: includes/ui/ui_lists.inc:2473
 msgid "Available and/or installed"
 msgstr ""
 
 msgid "Available and/or installed"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2518
+#: includes/ui/ui_lists.inc:2543
 msgid "Standard new company American COA (4 digit)"
 msgstr ""
 
 msgid "Standard new company American COA (4 digit)"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2520
+#: includes/ui/ui_lists.inc:2545
 msgid "Standard American COA (4 digit) with demo data"
 msgstr ""
 
 msgid "Standard American COA (4 digit) with demo data"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2541
+#: includes/ui/ui_lists.inc:2566
 msgid "No payment Link"
 msgstr ""
 
 msgid "No payment Link"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2661
+#: includes/ui/ui_lists.inc:2686
 msgid "Numeric"
 msgstr ""
 
 msgid "Numeric"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2661
+#: includes/ui/ui_lists.inc:2686
 msgid "Alpha Numeric"
 msgstr ""
 
 msgid "Alpha Numeric"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2661
+#: includes/ui/ui_lists.inc:2686
 msgid "ALPHA NUMERIC"
 msgstr ""
 
 msgid "ALPHA NUMERIC"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2677
+#: includes/ui/ui_lists.inc:2702
 msgid "All users"
 msgstr ""
 
 msgid "All users"
 msgstr ""
 
@@ -8029,137 +8518,137 @@ msgstr ""
 msgid "in units of : "
 msgstr ""
 
 msgid "in units of : "
 msgstr ""
 
-#: includes/ui/ui_view.inc:301
+#: includes/ui/ui_view.inc:307
 #, php-format
 msgid ""
 "Cannot retrieve exchange rate for currency %s. Please adjust approximate "
 "rate if needed."
 msgstr ""
 
 #, php-format
 msgid ""
 "Cannot retrieve exchange rate for currency %s. Please adjust approximate "
 "rate if needed."
 msgstr ""
 
-#: includes/ui/ui_view.inc:342
+#: includes/ui/ui_view.inc:348
 msgid "Date Voided:"
 msgstr ""
 
 msgid "Date Voided:"
 msgstr ""
 
-#: includes/ui/ui_view.inc:442 reporting/rep107.php:261
-#: reporting/rep109.php:188 reporting/rep110.php:185 reporting/rep111.php:185
-#: reporting/rep113.php:174 reporting/rep209.php:190
+#: includes/ui/ui_view.inc:448 reporting/rep107.php:283
+#: reporting/rep109.php:172 reporting/rep110.php:185 reporting/rep111.php:185
+#: reporting/rep113.php:174 reporting/rep209.php:187
 msgid "Total Tax Excluded"
 msgstr ""
 
 msgid "Total Tax Excluded"
 msgstr ""
 
-#: includes/ui/ui_view.inc:448 includes/ui/ui_view.inc:467
-#: includes/ui/ui_view.inc:491 includes/ui/ui_view.inc:508
-#: reporting/rep107.php:270 reporting/rep109.php:197 reporting/rep110.php:194
-#: reporting/rep111.php:194 reporting/rep113.php:183 reporting/rep209.php:199
+#: includes/ui/ui_view.inc:454 includes/ui/ui_view.inc:473
+#: includes/ui/ui_view.inc:497 includes/ui/ui_view.inc:514
+#: reporting/rep107.php:292 reporting/rep109.php:181 reporting/rep110.php:194
+#: reporting/rep111.php:194 reporting/rep113.php:183 reporting/rep209.php:196
 msgid "Included"
 msgstr ""
 
 msgid "Included"
 msgstr ""
 
-#: includes/ui/ui_view.inc:546 reporting/includes/doctext.inc:166
-#: reporting/includes/doctext.inc:207
+#: includes/ui/ui_view.inc:552 reporting/rep105.php:116
+#: reporting/includes/doctext.inc:166 reporting/includes/doctext.inc:209
 msgid "Total Amount"
 msgstr ""
 
 msgid "Total Amount"
 msgstr ""
 
-#: includes/ui/ui_view.inc:570
+#: includes/ui/ui_view.inc:576
 msgid "Total Allocated:"
 msgstr ""
 
 msgid "Total Allocated:"
 msgstr ""
 
-#: includes/ui/ui_view.inc:576
+#: includes/ui/ui_view.inc:582
 msgid "Left to Allocate:"
 msgstr ""
 
 msgid "Left to Allocate:"
 msgstr ""
 
-#: includes/ui/ui_view.inc:592 includes/ui/ui_view.inc:596
+#: includes/ui/ui_view.inc:598 includes/ui/ui_view.inc:602
 #: purchasing/inquiry/supplier_allocation_inquiry.php:99
 msgid "Allocations"
 msgstr ""
 
 #: purchasing/inquiry/supplier_allocation_inquiry.php:99
 msgid "Allocations"
 msgstr ""
 
-#: includes/ui/ui_view.inc:609 includes/ui/ui_view.inc:613
+#: includes/ui/ui_view.inc:615 includes/ui/ui_view.inc:619
 msgid "Pre-Payments"
 msgstr ""
 
 msgid "Pre-Payments"
 msgstr ""
 
-#: includes/ui/ui_view.inc:629
+#: includes/ui/ui_view.inc:635
 msgid "No Quick Entries are defined."
 msgstr ""
 
 msgid "No Quick Entries are defined."
 msgstr ""
 
-#: includes/ui/ui_view.inc:644
+#: includes/ui/ui_view.inc:650
 msgid "No Quick Entry lines are defined."
 msgstr ""
 
 msgid "No Quick Entry lines are defined."
 msgstr ""
 
-#: includes/ui/ui_view.inc:875 purchasing/includes/ui/invoice_ui.inc:482
+#: includes/ui/ui_view.inc:881 purchasing/includes/ui/invoice_ui.inc:482
 msgid "and"
 msgstr ""
 
 msgid "and"
 msgstr ""
 
-#: includes/ui/ui_view.inc:982
+#: includes/ui/ui_view.inc:1010
 msgid "January"
 msgstr ""
 
 msgid "January"
 msgstr ""
 
-#: includes/ui/ui_view.inc:982
+#: includes/ui/ui_view.inc:1010
 msgid "February"
 msgstr ""
 
 msgid "February"
 msgstr ""
 
-#: includes/ui/ui_view.inc:982
+#: includes/ui/ui_view.inc:1010
 msgid "March"
 msgstr ""
 
 msgid "March"
 msgstr ""
 
-#: includes/ui/ui_view.inc:982
+#: includes/ui/ui_view.inc:1010
 msgid "April"
 msgstr ""
 
 msgid "April"
 msgstr ""
 
-#: includes/ui/ui_view.inc:982
+#: includes/ui/ui_view.inc:1010
 msgid "June"
 msgstr ""
 
 msgid "June"
 msgstr ""
 
-#: includes/ui/ui_view.inc:982
+#: includes/ui/ui_view.inc:1010
 msgid "July"
 msgstr ""
 
 msgid "July"
 msgstr ""
 
-#: includes/ui/ui_view.inc:982
+#: includes/ui/ui_view.inc:1010
 msgid "August"
 msgstr ""
 
 msgid "August"
 msgstr ""
 
-#: includes/ui/ui_view.inc:982
+#: includes/ui/ui_view.inc:1010
 msgid "September"
 msgstr ""
 
 msgid "September"
 msgstr ""
 
-#: includes/ui/ui_view.inc:982
+#: includes/ui/ui_view.inc:1010
 msgid "October"
 msgstr ""
 
 msgid "October"
 msgstr ""
 
-#: includes/ui/ui_view.inc:982
+#: includes/ui/ui_view.inc:1010
 msgid "November"
 msgstr ""
 
 msgid "November"
 msgstr ""
 
-#: includes/ui/ui_view.inc:982
+#: includes/ui/ui_view.inc:1010
 msgid "December"
 msgstr ""
 
 msgid "December"
 msgstr ""
 
-#: includes/ui/ui_view.inc:983
+#: includes/ui/ui_view.inc:1011
 msgid "Su"
 msgstr ""
 
 msgid "Su"
 msgstr ""
 
-#: includes/ui/ui_view.inc:983
+#: includes/ui/ui_view.inc:1011
 msgid "Mo"
 msgstr ""
 
 msgid "Mo"
 msgstr ""
 
-#: includes/ui/ui_view.inc:983
+#: includes/ui/ui_view.inc:1011
 msgid "Tu"
 msgstr ""
 
 msgid "Tu"
 msgstr ""
 
-#: includes/ui/ui_view.inc:983
+#: includes/ui/ui_view.inc:1011
 msgid "We"
 msgstr ""
 
 msgid "We"
 msgstr ""
 
-#: includes/ui/ui_view.inc:983
+#: includes/ui/ui_view.inc:1011
 msgid "Th"
 msgstr ""
 
 msgid "Th"
 msgstr ""
 
-#: includes/ui/ui_view.inc:983
+#: includes/ui/ui_view.inc:1011
 msgid "Fr"
 msgstr ""
 
 msgid "Fr"
 msgstr ""
 
-#: includes/ui/ui_view.inc:983
+#: includes/ui/ui_view.inc:1011
 msgid "Sa"
 msgstr ""
 
 msgid "Sa"
 msgstr ""
 
-#: includes/ui/ui_view.inc:984
+#: includes/ui/ui_view.inc:1012
 msgid "W"
 msgstr ""
 
 msgid "W"
 msgstr ""
 
@@ -8222,30 +8711,30 @@ msgstr ""
 msgid "The entered standard cost is negative or invalid."
 msgstr ""
 
 msgid "The entered standard cost is negative or invalid."
 msgstr ""
 
-#: inventory/adjustments.php:228 inventory/cost_update.php:42
-#: inventory/transfers.php:216 sales/sales_order_entry.php:702
+#: inventory/adjustments.php:231 inventory/cost_update.php:42
+#: inventory/transfers.php:217 sales/sales_order_entry.php:705
 msgid "There are no fixed assets defined in the system."
 msgstr ""
 
 msgid "There are no fixed assets defined in the system."
 msgstr ""
 
-#: inventory/adjustments.php:230
+#: inventory/adjustments.php:233
 msgid ""
 "There are no inventory items defined in the system which can be adjusted "
 "(Purchased or Manufactured)."
 msgstr ""
 
 msgid ""
 "There are no inventory items defined in the system which can be adjusted "
 "(Purchased or Manufactured)."
 msgstr ""
 
-#: inventory/adjustments.php:239
+#: inventory/adjustments.php:242
 msgid "Disposal Items"
 msgstr ""
 
 msgid "Disposal Items"
 msgstr ""
 
-#: inventory/adjustments.php:240
+#: inventory/adjustments.php:243
 msgid "Process Disposal"
 msgstr ""
 
 msgid "Process Disposal"
 msgstr ""
 
-#: inventory/adjustments.php:242
+#: inventory/adjustments.php:245
 msgid "Adjustment Items"
 msgstr ""
 
 msgid "Adjustment Items"
 msgstr ""
 
-#: inventory/adjustments.php:243
+#: inventory/adjustments.php:246
 msgid "Process Adjustment"
 msgstr ""
 
 msgid "Process Adjustment"
 msgstr ""
 
@@ -8286,24 +8775,24 @@ msgstr ""
 #: inventory/inquiry/stock_status.php:45 inventory/manage/item_codes.php:108
 #: manufacturing/work_order_entry.php:376
 #: manufacturing/work_order_entry.php:381 purchasing/inquiry/po_search.php:74
 #: inventory/inquiry/stock_status.php:45 inventory/manage/item_codes.php:108
 #: manufacturing/work_order_entry.php:376
 #: manufacturing/work_order_entry.php:381 purchasing/inquiry/po_search.php:74
-#: sales/inquiry/sales_deliveries_view.php:112
-#: sales/inquiry/sales_orders_view.php:229
+#: sales/inquiry/sales_deliveries_view.php:113
+#: sales/inquiry/sales_orders_view.php:234
 msgid "Item:"
 msgstr ""
 
 msgid "Item:"
 msgstr ""
 
-#: inventory/cost_update.php:133
+#: inventory/cost_update.php:135
 msgid "Unit cost"
 msgstr ""
 
 msgid "Unit cost"
 msgstr ""
 
-#: inventory/cost_update.php:137
+#: inventory/cost_update.php:139
 msgid "Standard Labour Cost Per Unit"
 msgstr ""
 
 msgid "Standard Labour Cost Per Unit"
 msgstr ""
 
-#: inventory/cost_update.php:138
+#: inventory/cost_update.php:140
 msgid "Standard Overhead Cost Per Unit"
 msgstr ""
 
 msgid "Standard Overhead Cost Per Unit"
 msgstr ""
 
-#: inventory/cost_update.php:145
+#: inventory/cost_update.php:147
 msgid "Reference line:"
 msgstr ""
 
 msgid "Reference line:"
 msgstr ""
 
@@ -8353,15 +8842,15 @@ msgstr ""
 msgid "Sales Type"
 msgstr ""
 
 msgid "Sales Type"
 msgstr ""
 
-#: inventory/prices.php:151 inventory/purchasing_data.php:150
-#: purchasing/includes/ui/invoice_ui.inc:514
-#: purchasing/po_receive_items.php:63 purchasing/view/view_grn.php:41
-#: purchasing/view/view_po.php:45 reporting/rep104.php:109
-#: reporting/includes/doctext.inc:32 reporting/includes/doctext.inc:191
-#: sales/customer_credit_invoice.php:276 sales/customer_delivery.php:421
-#: sales/customer_invoice.php:519 sales/customer_invoice.php:522
-#: sales/view/view_credit.php:91 sales/view/view_dispatch.php:113
-#: sales/view/view_invoice.php:116 sales/view/view_sales_order.php:220
+#: inventory/prices.php:151 inventory/purchasing_data.php:151
+#: purchasing/includes/ui/invoice_ui.inc:514 purchasing/po_receive_items.php:63
+#: purchasing/view/view_grn.php:41 purchasing/view/view_po.php:45
+#: reporting/rep104.php:109 reporting/includes/doctext.inc:32
+#: reporting/includes/doctext.inc:191 sales/customer_credit_invoice.php:276
+#: sales/customer_delivery.php:421 sales/customer_invoice.php:519
+#: sales/customer_invoice.php:522 sales/view/view_credit.php:91
+#: sales/view/view_dispatch.php:113 sales/view/view_invoice.php:116
+#: sales/view/view_sales_order.php:222
 #: sales/includes/ui/sales_credit_ui.inc:163
 msgid "Price"
 msgstr ""
 #: sales/includes/ui/sales_credit_ui.inc:163
 msgid "Price"
 msgstr ""
@@ -8374,15 +8863,15 @@ msgstr ""
 msgid "Sales Type:"
 msgstr ""
 
 msgid "Sales Type:"
 msgstr ""
 
-#: inventory/prices.php:203 inventory/purchasing_data.php:213
+#: inventory/prices.php:204 inventory/purchasing_data.php:214
 msgid "Price:"
 msgstr ""
 
 msgid "Price:"
 msgstr ""
 
-#: inventory/prices.php:203
+#: inventory/prices.php:204
 msgid "per"
 msgstr ""
 
 msgid "per"
 msgstr ""
 
-#: inventory/prices.php:207
+#: inventory/prices.php:208
 msgid "The price is calculated."
 msgstr ""
 
 msgid "The price is calculated."
 msgstr ""
 
@@ -8395,7 +8884,7 @@ msgid "There are no purchasable inventory items defined in the system."
 msgstr ""
 
 #: inventory/purchasing_data.php:30 purchasing/po_entry_items.php:73
 msgstr ""
 
 #: inventory/purchasing_data.php:30 purchasing/po_entry_items.php:73
-#: purchasing/supplier_credit.php:31 purchasing/supplier_invoice.php:30
+#: purchasing/supplier_credit.php:68 purchasing/supplier_invoice.php:53
 #: purchasing/supplier_payment.php:40
 msgid "There are no suppliers defined in the system."
 msgstr ""
 #: purchasing/supplier_payment.php:40
 msgid "There are no suppliers defined in the system."
 msgstr ""
@@ -8435,31 +8924,31 @@ msgstr ""
 msgid "Entered item is not defined. Please re-enter."
 msgstr ""
 
 msgid "Entered item is not defined. Please re-enter."
 msgstr ""
 
-#: inventory/purchasing_data.php:144
+#: inventory/purchasing_data.php:145
 msgid "There is no purchasing data set up for the part selected"
 msgstr ""
 
 msgid "There is no purchasing data set up for the part selected"
 msgstr ""
 
-#: inventory/purchasing_data.php:151
+#: inventory/purchasing_data.php:152
 msgid "Supplier's Unit"
 msgstr ""
 
 msgid "Supplier's Unit"
 msgstr ""
 
-#: inventory/purchasing_data.php:151
+#: inventory/purchasing_data.php:152
 msgid "Conversion Factor"
 msgstr ""
 
 msgid "Conversion Factor"
 msgstr ""
 
-#: inventory/purchasing_data.php:151
+#: inventory/purchasing_data.php:152
 msgid "Supplier's Description"
 msgstr ""
 
 msgid "Supplier's Description"
 msgstr ""
 
-#: inventory/purchasing_data.php:214
+#: inventory/purchasing_data.php:215
 msgid "Suppliers Unit of Measure:"
 msgstr ""
 
 msgid "Suppliers Unit of Measure:"
 msgstr ""
 
-#: inventory/purchasing_data.php:220
+#: inventory/purchasing_data.php:221
 msgid "Conversion Factor (to our UOM):"
 msgstr ""
 
 msgid "Conversion Factor (to our UOM):"
 msgstr ""
 
-#: inventory/purchasing_data.php:221
+#: inventory/purchasing_data.php:222
 msgid "Supplier's Code or Description:"
 msgstr ""
 
 msgid "Supplier's Code or Description:"
 msgstr ""
 
@@ -8468,38 +8957,13 @@ msgid "Reorder Levels"
 msgstr ""
 
 #: inventory/reorder_level.php:30 inventory/transfers.php:42
 msgstr ""
 
 #: inventory/reorder_level.php:30 inventory/transfers.php:42
-#: inventory/transfers.php:218
+#: inventory/transfers.php:219
 msgid ""
 "There are no inventory items defined in the system (Purchased or "
 "manufactured items)."
 msgstr ""
 
 msgid ""
 "There are no inventory items defined in the system (Purchased or "
 "manufactured items)."
 msgstr ""
 
-#: inventory/reorder_level.php:71 inventory/inquiry/stock_movements.php:107
-#: inventory/inquiry/stock_status.php:70 inventory/inquiry/stock_status.php:74
-#: manufacturing/search_work_orders.php:160
-#: manufacturing/inquiry/where_used_inquiry.php:45
-#: manufacturing/manage/bom_edit.php:43
-#: purchasing/inquiry/po_search_completed.php:113
-#: purchasing/inquiry/po_search_completed.php:123
-#: purchasing/inquiry/po_search.php:120 purchasing/inquiry/po_search.php:131
-#: reporting/rep105.php:120 reporting/rep301.php:171 reporting/rep302.php:130
-#: reporting/rep303.php:133 reporting/rep304.php:136 reporting/rep306.php:150
-#: reporting/rep307.php:121 reporting/rep308.php:231 reporting/rep402.php:103
-#: reporting/rep402.php:109 reporting/rep451.php:87
-#: reporting/reports_main.php:212 reporting/reports_main.php:219
-#: reporting/reports_main.php:225 reporting/reports_main.php:238
-#: reporting/reports_main.php:254 reporting/reports_main.php:264
-#: reporting/reports_main.php:272 reporting/reports_main.php:294
-#: sales/manage/sales_points.php:84
-msgid "Location"
-msgstr ""
-
-#: inventory/reorder_level.php:71 inventory/inquiry/stock_movements.php:109
-#: inventory/inquiry/stock_status.php:74 purchasing/supplier_credit.php:220
-msgid "Quantity On Hand"
-msgstr ""
-
-#: inventory/reorder_level.php:71 inventory/includes/inventory_db.inc:99
+#: inventory/reorder_level.php:71 inventory/includes/inventory_db.inc:101
 #: inventory/inquiry/stock_status.php:74
 msgid "Re-Order Level"
 msgstr ""
 #: inventory/inquiry/stock_status.php:74
 msgid "Re-Order Level"
 msgstr ""
@@ -8550,50 +9014,54 @@ msgstr ""
 msgid "The quantity entered must be a positive number."
 msgstr ""
 
 msgid "The quantity entered must be a positive number."
 msgstr ""
 
-#: inventory/transfers.php:238
+#: inventory/transfers.php:239
 msgid "Process Transfer"
 msgstr ""
 
 msgid "Process Transfer"
 msgstr ""
 
-#: inventory/includes/inventory_db.inc:96
+#: inventory/includes/inventory_db.inc:98
 msgid "Stocks below Re-Order Level at "
 msgstr ""
 
 msgid "Stocks below Re-Order Level at "
 msgstr ""
 
-#: inventory/includes/inventory_db.inc:99
+#: inventory/includes/inventory_db.inc:101
 msgid "Below"
 msgstr ""
 
 msgid "Below"
 msgstr ""
 
-#: inventory/includes/inventory_db.inc:100
+#: inventory/includes/inventory_db.inc:102
 msgid "Please reorder"
 msgstr ""
 
 #: inventory/includes/item_adjustments_ui.inc:20
 msgid "Please reorder"
 msgstr ""
 
 #: inventory/includes/item_adjustments_ui.inc:20
-#: inventory/includes/stock_transfers_ui.inc:20
+#: inventory/includes/sav.item_adjustments_ui.inc:20
+#: inventory/includes/stock_transfers_ui.inc:22
 #: manufacturing/includes/work_order_issue_ui.inc:20
 #: sales/includes/ui/sales_order_ui.inc:59
 msgid "For Part :"
 msgstr ""
 
 #: inventory/includes/item_adjustments_ui.inc:34
 #: manufacturing/includes/work_order_issue_ui.inc:20
 #: sales/includes/ui/sales_order_ui.inc:59
 msgid "For Part :"
 msgstr ""
 
 #: inventory/includes/item_adjustments_ui.inc:34
+#: inventory/includes/sav.item_adjustments_ui.inc:34
 #: manufacturing/work_order_entry.php:200 purchasing/inquiry/po_search.php:67
 #: manufacturing/work_order_entry.php:200 purchasing/inquiry/po_search.php:67
-#: sales/inquiry/sales_deliveries_view.php:105
-#: sales/inquiry/sales_orders_view.php:220
+#: sales/inquiry/sales_deliveries_view.php:106
+#: sales/inquiry/sales_orders_view.php:225
 msgid "Location:"
 msgstr ""
 
 #: inventory/includes/item_adjustments_ui.inc:56
 #: inventory/includes/item_adjustments_ui.inc:59
 msgid "Location:"
 msgstr ""
 
 #: inventory/includes/item_adjustments_ui.inc:56
 #: inventory/includes/item_adjustments_ui.inc:59
-#: inventory/includes/stock_transfers_ui.inc:57
+#: inventory/includes/sav.item_adjustments_ui.inc:56
+#: inventory/includes/sav.item_adjustments_ui.inc:59
+#: inventory/includes/stock_transfers_ui.inc:59
 #: inventory/inquiry/stock_list.php:53 inventory/view/view_adjustment.php:54
 #: inventory/view/view_transfer.php:50
 #: manufacturing/includes/work_order_issue_ui.inc:33
 #: inventory/inquiry/stock_list.php:53 inventory/view/view_adjustment.php:54
 #: inventory/view/view_transfer.php:50
 #: manufacturing/includes/work_order_issue_ui.inc:33
-#: purchasing/includes/ui/po_ui.inc:214 purchasing/po_receive_items.php:62
+#: purchasing/includes/ui/po_ui.inc:216 purchasing/po_receive_items.php:62
 #: purchasing/view/view_grn.php:40 purchasing/view/view_po.php:45
 #: reporting/includes/doctext.inc:31 reporting/includes/doctext.inc:190
 #: purchasing/view/view_grn.php:40 purchasing/view/view_po.php:45
 #: reporting/includes/doctext.inc:31 reporting/includes/doctext.inc:190
-#: reporting/includes/doctext.inc:227 sales/customer_credit_invoice.php:275
+#: reporting/includes/doctext.inc:229 sales/customer_credit_invoice.php:275
 #: sales/customer_delivery.php:419 sales/customer_invoice.php:518
 #: sales/customer_invoice.php:521 sales/view/view_credit.php:90
 #: sales/view/view_dispatch.php:112 sales/view/view_invoice.php:115
 #: sales/customer_delivery.php:419 sales/customer_invoice.php:518
 #: sales/customer_invoice.php:521 sales/view/view_credit.php:90
 #: sales/view/view_dispatch.php:112 sales/view/view_invoice.php:115
-#: sales/view/view_sales_order.php:219
+#: sales/view/view_sales_order.php:221
 #: sales/includes/ui/sales_credit_ui.inc:162
 #: sales/includes/ui/sales_order_ui.inc:146
 msgid "Item Code"
 #: sales/includes/ui/sales_credit_ui.inc:162
 #: sales/includes/ui/sales_order_ui.inc:146
 msgid "Item Code"
@@ -8601,15 +9069,17 @@ 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/stock_transfers_ui.inc:57
+#: inventory/includes/sav.item_adjustments_ui.inc:56
+#: inventory/includes/sav.item_adjustments_ui.inc:59
+#: inventory/includes/stock_transfers_ui.inc:59
 #: manufacturing/includes/work_order_issue_ui.inc:33
 #: manufacturing/includes/work_order_issue_ui.inc:33
-#: purchasing/includes/ui/po_ui.inc:214 purchasing/view/view_grn.php:40
+#: purchasing/includes/ui/po_ui.inc:216 purchasing/view/view_grn.php:40
 #: purchasing/view/view_po.php:45 reporting/includes/doctext.inc:31
 #: purchasing/view/view_po.php:45 reporting/includes/doctext.inc:31
-#: reporting/includes/doctext.inc:190 reporting/includes/doctext.inc:227
+#: 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/customer_credit_invoice.php:275 sales/customer_delivery.php:419
 #: sales/customer_invoice.php:518 sales/customer_invoice.php:521
 #: sales/view/view_credit.php:90 sales/view/view_dispatch.php:112
-#: sales/view/view_invoice.php:115 sales/view/view_sales_order.php:219
+#: sales/view/view_invoice.php:115 sales/view/view_sales_order.php:221
 #: sales/includes/ui/sales_credit_ui.inc:162
 #: sales/includes/ui/sales_order_ui.inc:146
 msgid "Item Description"
 #: sales/includes/ui/sales_credit_ui.inc:162
 #: sales/includes/ui/sales_order_ui.inc:146
 msgid "Item Description"
@@ -8617,14 +9087,16 @@ msgstr ""
 
 #: inventory/includes/item_adjustments_ui.inc:57
 #: inventory/includes/item_adjustments_ui.inc:60
 
 #: inventory/includes/item_adjustments_ui.inc:57
 #: inventory/includes/item_adjustments_ui.inc:60
-#: inventory/includes/stock_transfers_ui.inc:57
+#: inventory/includes/sav.item_adjustments_ui.inc:57
+#: inventory/includes/sav.item_adjustments_ui.inc:60
+#: inventory/includes/stock_transfers_ui.inc:59
 #: inventory/manage/item_units.php:94
 #: manufacturing/includes/work_order_issue_ui.inc:34
 #: inventory/manage/item_units.php:94
 #: manufacturing/includes/work_order_issue_ui.inc:34
-#: purchasing/includes/ui/po_ui.inc:215 purchasing/view/view_grn.php:41
+#: purchasing/includes/ui/po_ui.inc:217 purchasing/view/view_grn.php:41
 #: purchasing/view/view_po.php:45 reporting/includes/doctext.inc:32
 #: reporting/includes/doctext.inc:191 sales/view/view_credit.php:91
 #: sales/view/view_dispatch.php:113 sales/view/view_invoice.php:116
 #: purchasing/view/view_po.php:45 reporting/includes/doctext.inc:32
 #: reporting/includes/doctext.inc:191 sales/view/view_credit.php:91
 #: sales/view/view_dispatch.php:113 sales/view/view_invoice.php:116
-#: sales/view/view_sales_order.php:219
+#: sales/view/view_sales_order.php:221
 #: sales/includes/ui/sales_credit_ui.inc:162
 #: sales/includes/ui/sales_order_ui.inc:148
 msgid "Unit"
 #: sales/includes/ui/sales_credit_ui.inc:162
 #: sales/includes/ui/sales_order_ui.inc:148
 msgid "Unit"
@@ -8632,30 +9104,38 @@ msgstr ""
 
 #: inventory/includes/item_adjustments_ui.inc:57
 #: inventory/includes/item_adjustments_ui.inc:60
 
 #: inventory/includes/item_adjustments_ui.inc:57
 #: inventory/includes/item_adjustments_ui.inc:60
+#: inventory/includes/sav.item_adjustments_ui.inc:57
+#: inventory/includes/sav.item_adjustments_ui.inc:60
 #: inventory/view/view_adjustment.php:55
 #: manufacturing/view/wo_issue_view.php:76
 #: manufacturing/includes/manufacturing_ui.inc:29
 #: inventory/view/view_adjustment.php:55
 #: manufacturing/view/wo_issue_view.php:76
 #: manufacturing/includes/manufacturing_ui.inc:29
-#: manufacturing/includes/work_order_issue_ui.inc:34 reporting/rep301.php:164
+#: manufacturing/includes/work_order_issue_ui.inc:34 reporting/rep301.php:168
 msgid "Unit Cost"
 msgstr ""
 
 #: inventory/includes/item_adjustments_ui.inc:57
 msgid "Unit Cost"
 msgstr ""
 
 #: inventory/includes/item_adjustments_ui.inc:57
-#: inventory/manage/items.php:525
+#: inventory/includes/sav.item_adjustments_ui.inc:57
+#: inventory/manage/items.php:527
 msgid "Initial Value"
 msgstr ""
 
 msgid "Initial Value"
 msgstr ""
 
-#: inventory/includes/item_adjustments_ui.inc:118
+#: inventory/includes/item_adjustments_ui.inc:59 reporting/rep302.php:123
+msgid "QOH"
+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 ""
 
-#: inventory/includes/stock_transfers_ui.inc:35
+#: inventory/includes/stock_transfers_ui.inc:38
 #: inventory/inquiry/stock_movements.php:83
 #: manufacturing/includes/work_order_issue_ui.inc:158
 msgid "From Location:"
 msgstr ""
 
 #: inventory/inquiry/stock_movements.php:83
 #: manufacturing/includes/work_order_issue_ui.inc:158
 msgid "From Location:"
 msgstr ""
 
-#: inventory/includes/stock_transfers_ui.inc:36
+#: inventory/includes/stock_transfers_ui.inc:39
 msgid "To Location:"
 msgstr ""
 
 msgid "To Location:"
 msgstr ""
 
@@ -8664,26 +9144,30 @@ msgid ""
 "Marked items have insufficient quantities in stock as on day of transfer."
 msgstr ""
 
 "Marked items have insufficient quantities in stock as on day of transfer."
 msgstr ""
 
-#: inventory/includes/db/items_db.inc:139
+#: inventory/includes/db/items_db.inc:140
 msgid ""
 "Cannot delete this item because there are stock movements that refer to this "
 "item."
 msgstr ""
 
 msgid ""
 "Cannot delete this item because there are stock movements that refer to this "
 "item."
 msgstr ""
 
-#: inventory/includes/db/items_db.inc:142
+#: inventory/includes/db/items_db.inc:143
 msgid ""
 "Cannot delete this item record because there are bills of material that "
 "require this part as a component."
 msgstr ""
 
 msgid ""
 "Cannot delete this item record because there are bills of material that "
 "require this part as a component."
 msgstr ""
 
-#: inventory/includes/db/items_db.inc:145
-#: inventory/includes/db/items_db.inc:148
+#: inventory/includes/db/items_db.inc:146
+msgid ""
+"Cannot delete this item because there are existing sales order items for it."
+msgstr ""
+
+#: inventory/includes/db/items_db.inc:149
 msgid ""
 "Cannot delete this item because there are existing purchase order items for "
 "it."
 msgstr ""
 
 msgid ""
 "Cannot delete this item because there are existing purchase order items for "
 "it."
 msgstr ""
 
-#: inventory/includes/db/items_db.inc:166
+#: inventory/includes/db/items_db.inc:167
 msgid ""
 "This item cannot be deleted because some code aliases \n"
 "\t\t\t\tor foreign codes was entered for it, or there are kits defined \n"
 msgid ""
 "This item cannot be deleted because some code aliases \n"
 "\t\t\t\tor foreign codes was entered for it, or there are kits defined \n"
@@ -8714,9 +9198,9 @@ msgstr ""
 #: inventory/inquiry/stock_movements.php:88
 #: purchasing/includes/ui/invoice_ui.inc:483
 #: purchasing/inquiry/supplier_allocation_inquiry.php:57
 #: 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:56
+#: purchasing/inquiry/supplier_inquiry.php:147
 #: sales/inquiry/customer_allocation_inquiry.php:51
 #: sales/inquiry/customer_allocation_inquiry.php:51
-#: sales/inquiry/customer_inquiry.php:54
+#: sales/inquiry/customer_inquiry.php:170
 msgid "Refresh Inquiry"
 msgstr ""
 
 msgid "Refresh Inquiry"
 msgstr ""
 
@@ -8751,12 +9235,12 @@ msgid ""
 msgstr ""
 
 #: inventory/inquiry/stock_status.php:70 inventory/inquiry/stock_status.php:75
 msgstr ""
 
 #: inventory/inquiry/stock_status.php:70 inventory/inquiry/stock_status.php:75
-#: reporting/rep303.php:120 reporting/rep303.php:126
+#: reporting/rep303.php:223 reporting/rep303.php:229
 msgid "Demand"
 msgstr ""
 
 msgid "Demand"
 msgstr ""
 
-#: inventory/inquiry/stock_status.php:75 reporting/rep303.php:120
-#: reporting/rep303.php:126
+#: inventory/inquiry/stock_status.php:75 reporting/rep303.php:223
+#: reporting/rep303.php:229
 msgid "On Order"
 msgstr ""
 
 msgid "On Order"
 msgstr ""
 
@@ -8788,10 +9272,9 @@ msgid "Tax type"
 msgstr ""
 
 #: inventory/manage/item_categories.php:117
 msgstr ""
 
 #: inventory/manage/item_categories.php:117
-#: inventory/manage/item_categories.php:121
-#: inventory/manage/item_codes.php:126 inventory/manage/sales_kits.php:36
-#: inventory/view/view_adjustment.php:55 inventory/view/view_transfer.php:50
-#: manufacturing/view/wo_issue_view.php:76
+#: inventory/manage/item_categories.php:121 inventory/manage/item_codes.php: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
 #: 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
@@ -8839,35 +9322,35 @@ msgstr ""
 msgid "Default values for new items"
 msgstr ""
 
 msgid "Default values for new items"
 msgstr ""
 
-#: inventory/manage/item_categories.php:212 inventory/manage/items.php:394
+#: inventory/manage/item_categories.php:212 inventory/manage/items.php:417
 msgid "Item Tax Type:"
 msgstr ""
 
 msgid "Item Tax Type:"
 msgstr ""
 
-#: inventory/manage/item_categories.php:217 inventory/manage/items.php:397
+#: inventory/manage/item_categories.php:217 inventory/manage/items.php:420
 msgid "Item Type:"
 msgstr ""
 
 msgid "Item Type:"
 msgstr ""
 
-#: inventory/manage/item_categories.php:219 inventory/manage/items.php:399
+#: inventory/manage/item_categories.php:219 inventory/manage/items.php:422
 msgid "Units of Measure:"
 msgstr ""
 
 msgid "Units of Measure:"
 msgstr ""
 
-#: inventory/manage/item_categories.php:224 inventory/manage/items.php:406
+#: inventory/manage/item_categories.php:224 inventory/manage/items.php:427
 msgid "Exclude from sales:"
 msgstr ""
 
 msgid "Exclude from sales:"
 msgstr ""
 
-#: inventory/manage/item_categories.php:226 inventory/manage/items.php:408
+#: inventory/manage/item_categories.php:226 inventory/manage/items.php:428
 msgid "Exclude from purchases:"
 msgstr ""
 
 msgid "Exclude from purchases:"
 msgstr ""
 
-#: inventory/manage/item_categories.php:238 inventory/manage/items.php:471
+#: inventory/manage/item_categories.php:238 inventory/manage/items.php:492
 msgid "Asset account:"
 msgstr ""
 
 msgid "Asset account:"
 msgstr ""
 
-#: inventory/manage/item_categories.php:239 inventory/manage/items.php:472
+#: inventory/manage/item_categories.php:239 inventory/manage/items.php:493
 msgid "Depreciation cost account:"
 msgstr ""
 
 msgid "Depreciation cost account:"
 msgstr ""
 
-#: inventory/manage/item_categories.php:240 inventory/manage/items.php:473
+#: inventory/manage/item_categories.php:240 inventory/manage/items.php:494
 msgid "Depreciation/Disposal account:"
 msgstr ""
 
 msgid "Depreciation/Disposal account:"
 msgstr ""
 
@@ -8879,7 +9362,7 @@ msgstr ""
 msgid "Foreign Item Codes"
 msgstr ""
 
 msgid "Foreign Item Codes"
 msgstr ""
 
-#: inventory/manage/item_codes.php:26 sales/sales_order_entry.php:704
+#: inventory/manage/item_codes.php:26 sales/sales_order_entry.php:707
 msgid "There are no inventory items defined in the system."
 msgstr ""
 
 msgid "There are no inventory items defined in the system."
 msgstr ""
 
@@ -8891,7 +9374,7 @@ msgstr ""
 msgid "Item code description cannot be empty."
 msgstr ""
 
 msgid "Item code description cannot be empty."
 msgstr ""
 
-#: inventory/manage/item_codes.php:58 inventory/manage/items.php:194
+#: inventory/manage/item_codes.php:58 inventory/manage/items.php:241
 #: inventory/manage/sales_kits.php:89
 msgid "This item code is already assigned to stock item or sale kit."
 msgstr ""
 #: inventory/manage/sales_kits.php:89
 msgid "This item code is already assigned to stock item or sale kit."
 msgstr ""
@@ -8908,227 +9391,230 @@ msgstr ""
 msgid "Item code has been sucessfully deleted."
 msgstr ""
 
 msgid "Item code has been sucessfully deleted."
 msgstr ""
 
-#: inventory/manage/item_codes.php:126
+#: inventory/manage/item_codes.php:130
 msgid "EAN/UPC Code"
 msgstr ""
 
 msgid "EAN/UPC Code"
 msgstr ""
 
-#: inventory/manage/item_codes.php:180
+#: inventory/manage/item_codes.php:184
 msgid "UPC/EAN code:"
 msgstr ""
 
 msgid "UPC/EAN code:"
 msgstr ""
 
-#: inventory/manage/item_codes.php:181 inventory/manage/sales_kits.php:243
+#: inventory/manage/item_codes.php:185 inventory/manage/sales_kits.php:243
 #: manufacturing/work_order_add_finished.php:194
 #: manufacturing/work_order_add_finished.php:194
-#: manufacturing/work_order_entry.php:404
-#: manufacturing/manage/bom_edit.php:204
+#: manufacturing/work_order_entry.php:404 manufacturing/manage/bom_edit.php:233
 msgid "Quantity:"
 msgstr ""
 
 msgid "Quantity:"
 msgstr ""
 
-#: inventory/manage/item_codes.php:182 inventory/manage/items.php:368
+#: 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
 #: inventory/manage/sales_kits.php:206 inventory/manage/sales_kits.php:230
 #: manufacturing/manage/work_centres.php:138
-#: sales/create_recurrent_invoices.php:179 sales/manage/credit_status.php:145
+#: sales/create_recurrent_invoices.php:181 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 ""
 
 #: sales/manage/recurrent_invoices.php:191 taxes/item_tax_types.php:173
 #: taxes/tax_groups.php:165 taxes/tax_types.php:158
 msgid "Description:"
 msgstr ""
 
-#: inventory/manage/item_codes.php:183 inventory/manage/items.php:370
+#: 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/sales_kits.php:207 inventory/manage/sales_kits.php:231
 msgid "Category:"
 msgstr ""
 
-#: inventory/manage/items.php:87
+#: 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 ""
 
 msgid "Error uploading file."
 msgstr ""
 
-#: inventory/manage/items.php:104
+#: inventory/manage/items.php:150
 msgid ""
 "Only graphics files are supported - a file extension of .jpg, .png or .gif "
 "is expected"
 msgstr ""
 
 msgid ""
 "Only graphics files are supported - a file extension of .jpg, .png or .gif "
 "is expected"
 msgstr ""
 
-#: inventory/manage/items.php:136
+#: inventory/manage/items.php: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 ""
 
 msgid ""
 "There are no fixed asset categories defined in the system. At least one "
 "fixed asset category is required to add a fixed asset."
 msgstr ""
 
-#: inventory/manage/items.php:137
+#: inventory/manage/items.php: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 ""
 
 msgid ""
 "There are no fixed asset classes defined in the system. At least one fixed "
 "asset class is required to add a fixed asset."
 msgstr ""
 
-#: inventory/manage/items.php:139
+#: inventory/manage/items.php:186
 msgid ""
 "There are no item categories defined in the system. At least one item "
 "category is required to add a item."
 msgstr ""
 
 msgid ""
 "There are no item categories defined in the system. At least one item "
 "category is required to add a item."
 msgstr ""
 
-#: inventory/manage/items.php:141
+#: inventory/manage/items.php:188
 msgid ""
 "There are no item tax types defined in the system. At least one item tax "
 "type is required to add a item."
 msgstr ""
 
 msgid ""
 "There are no item tax types defined in the system. At least one item tax "
 "type is required to add a item."
 msgstr ""
 
-#: inventory/manage/items.php:173
+#: inventory/manage/items.php:220
 msgid "The item name must be entered."
 msgstr ""
 
 msgid "The item name must be entered."
 msgstr ""
 
-#: inventory/manage/items.php:179
+#: inventory/manage/items.php:226
 msgid "The item code cannot be empty"
 msgstr ""
 
 msgid "The item code cannot be empty"
 msgstr ""
 
-#: inventory/manage/items.php:187
+#: inventory/manage/items.php:234
 msgid ""
 "The item code cannot contain any of the following characters -  & + OR a "
 "space OR quotes"
 msgstr ""
 
 msgid ""
 "The item code cannot contain any of the following characters -  & + OR a "
 "space OR quotes"
 msgstr ""
 
-#: inventory/manage/items.php:207
+#: inventory/manage/items.php:254
 msgid "The depracation cannot start before the fixed asset purchase date"
 msgstr ""
 
 msgid "The depracation cannot start before the fixed asset purchase date"
 msgstr ""
 
-#: inventory/manage/items.php:239
+#: inventory/manage/items.php:282
 msgid "Item has been updated."
 msgstr ""
 
 msgid "Item has been updated."
 msgstr ""
 
-#: inventory/manage/items.php:254
+#: inventory/manage/items.php:297
 msgid "A new item has been added."
 msgstr ""
 
 msgid "A new item has been added."
 msgstr ""
 
-#: inventory/manage/items.php:297
+#: inventory/manage/items.php:339
 msgid "Selected item has been deleted."
 msgstr ""
 
 msgid "Selected item has been deleted."
 msgstr ""
 
-#: inventory/manage/items.php:314
+#: inventory/manage/items.php:356
 msgid "General Settings"
 msgstr ""
 
 msgid "General Settings"
 msgstr ""
 
-#: inventory/manage/items.php:319 inventory/manage/items.php:360
+#: inventory/manage/items.php:365
+msgid "Generate EAN-8 Barcode"
+msgstr ""
+
+#: inventory/manage/items.php:372 inventory/manage/items.php:382
 msgid "Item Code:"
 msgstr ""
 
 msgid "Item Code:"
 msgstr ""
 
-#: inventory/manage/items.php:401
+#: inventory/manage/items.php:426
 msgid "Editable description:"
 msgstr ""
 
 msgid "Editable description:"
 msgstr ""
 
-#: inventory/manage/items.php:413
+#: inventory/manage/items.php:434
 msgid "Fixed Asset Class"
 msgstr ""
 
 msgid "Fixed Asset Class"
 msgstr ""
 
-#: inventory/manage/items.php:415
+#: inventory/manage/items.php:436
 msgid "Depreciation Method"
 msgstr ""
 
 msgid "Depreciation Method"
 msgstr ""
 
-#: inventory/manage/items.php:426 inventory/manage/items.php:435
+#: inventory/manage/items.php:447 inventory/manage/items.php:456
 msgid "Depreciation Rate"
 msgstr ""
 
 msgid "Depreciation Rate"
 msgstr ""
 
-#: inventory/manage/items.php:430
+#: inventory/manage/items.php:451
 msgid "Depreciation Years"
 msgstr ""
 
 msgid "Depreciation Years"
 msgstr ""
 
-#: inventory/manage/items.php:430
+#: inventory/manage/items.php:451
 msgid "years"
 msgstr ""
 
 msgid "years"
 msgstr ""
 
-#: inventory/manage/items.php:433
+#: inventory/manage/items.php:454
 msgid "Base Rate"
 msgstr ""
 
 msgid "Base Rate"
 msgstr ""
 
-#: inventory/manage/items.php:438
+#: inventory/manage/items.php:459
 msgid "Rate multiplier"
 msgstr ""
 
 msgid "Rate multiplier"
 msgstr ""
 
-#: inventory/manage/items.php:442 inventory/manage/items.php:445
+#: inventory/manage/items.php:463 inventory/manage/items.php:466
 msgid "Depreciation Start"
 msgstr ""
 
 msgid "Depreciation Start"
 msgstr ""
 
-#: inventory/manage/items.php:446
+#: inventory/manage/items.php:467
 msgid "Last Depreciation"
 msgstr ""
 
 msgid "Last Depreciation"
 msgstr ""
 
-#: inventory/manage/items.php:494
+#: inventory/manage/items.php:515
 msgid "Other"
 msgstr ""
 
 msgid "Other"
 msgstr ""
 
-#: inventory/manage/items.php:497
-msgid "Image File (.jpg)"
-msgstr ""
-
-#: inventory/manage/items.php:512
-msgid "No image"
-msgstr ""
-
 #: inventory/manage/items.php:517
 #: inventory/manage/items.php:517
-msgid "Delete Image:"
+msgid "Image File (.jpg)"
 msgstr ""
 
 msgstr ""
 
-#: inventory/manage/items.php:519
+#: inventory/manage/items.php:521
 msgid "Item status:"
 msgstr ""
 
 msgid "Item status:"
 msgstr ""
 
-#: inventory/manage/items.php:521
+#: inventory/manage/items.php:523
 msgid "Values"
 msgstr ""
 
 msgid "Values"
 msgstr ""
 
-#: inventory/manage/items.php:526 reporting/rep451.php:80
+#: inventory/manage/items.php:528 reporting/rep451.php:80
 msgid "Depreciations"
 msgstr ""
 
 msgid "Depreciations"
 msgstr ""
 
-#: inventory/manage/items.php:527
+#: inventory/manage/items.php:529
 msgid "Current Value"
 msgstr ""
 
 msgid "Current Value"
 msgstr ""
 
-#: inventory/manage/items.php:535
+#: inventory/manage/items.php:538
 msgid "Insert New Item"
 msgstr ""
 
 msgid "Insert New Item"
 msgstr ""
 
-#: inventory/manage/items.php:539
+#: inventory/manage/items.php:542
 msgid "Update Item"
 msgstr ""
 
 msgid "Update Item"
 msgstr ""
 
-#: inventory/manage/items.php:542
+#: inventory/manage/items.php:545
 msgid "Select this items and return to document entry."
 msgstr ""
 
 msgid "Select this items and return to document entry."
 msgstr ""
 
-#: inventory/manage/items.php:543
+#: inventory/manage/items.php:546
 msgid "Clone This Item"
 msgstr ""
 
 msgid "Clone This Item"
 msgstr ""
 
-#: inventory/manage/items.php:544
+#: inventory/manage/items.php:547
 msgid "Delete This Item"
 msgstr ""
 
 msgid "Delete This Item"
 msgstr ""
 
-#: inventory/manage/items.php:559
+#: inventory/manage/items.php:562
 msgid "Select an item:"
 msgstr ""
 
 msgid "Select an item:"
 msgstr ""
 
-#: inventory/manage/items.php:560
+#: inventory/manage/items.php:563
 msgid "New item"
 msgstr ""
 
 msgid "New item"
 msgstr ""
 
-#: inventory/manage/items.php:584 inventory/manage/items.php:587
-#: purchasing/manage/suppliers.php:309 sales/manage/customer_branches.php:310
-#: sales/manage/customers.php:350
+#: inventory/manage/items.php:587 inventory/manage/items.php:590
+#: purchasing/manage/suppliers.php:321 sales/manage/customer_branches.php:310
+#: sales/manage/customers.php:352
 msgid "&General settings"
 msgstr ""
 
 msgid "&General settings"
 msgstr ""
 
-#: inventory/manage/items.php:585 inventory/manage/items.php:593
-#: purchasing/manage/suppliers.php:311 sales/manage/customers.php:352
+#: inventory/manage/items.php:588 inventory/manage/items.php:596
+#: purchasing/manage/suppliers.php:323 sales/manage/customers.php:354
 msgid "&Transactions"
 msgstr ""
 
 msgid "&Transactions"
 msgstr ""
 
-#: inventory/manage/items.php:588
+#: inventory/manage/items.php:591
 msgid "S&ales Pricing"
 msgstr ""
 
 msgid "S&ales Pricing"
 msgstr ""
 
-#: inventory/manage/items.php:589
+#: inventory/manage/items.php:592
 msgid "&Purchasing Pricing"
 msgstr ""
 
 msgid "&Purchasing Pricing"
 msgstr ""
 
-#: inventory/manage/items.php:594
+#: inventory/manage/items.php:598
 msgid "&Status"
 msgstr ""
 
 msgid "&Status"
 msgstr ""
 
@@ -9273,7 +9759,7 @@ msgstr ""
 msgid "kit"
 msgstr ""
 
 msgid "kit"
 msgstr ""
 
-#: inventory/manage/sales_kits.php:68 manufacturing/manage/bom_edit.php:74
+#: inventory/manage/sales_kits.php:68 manufacturing/manage/bom_edit.php:95
 msgid "The quantity entered must be numeric and greater than zero."
 msgstr ""
 
 msgid "The quantity entered must be numeric and greater than zero."
 msgstr ""
 
@@ -9315,7 +9801,7 @@ msgid ""
 "following kits"
 msgstr ""
 
 "following kits"
 msgstr ""
 
-#: inventory/manage/sales_kits.php:168 manufacturing/manage/bom_edit.php:126
+#: inventory/manage/sales_kits.php:168 manufacturing/manage/bom_edit.php:147
 msgid "The component item has been deleted from this bom"
 msgstr ""
 
 msgid "The component item has been deleted from this bom"
 msgstr ""
 
@@ -9335,8 +9821,8 @@ msgstr ""
 msgid "Update kit/alias name"
 msgstr ""
 
 msgid "Update kit/alias name"
 msgstr ""
 
-#: inventory/manage/sales_kits.php:223 manufacturing/manage/bom_edit.php:180
-#: manufacturing/manage/bom_edit.php:187
+#: inventory/manage/sales_kits.php:223 manufacturing/manage/bom_edit.php:209
+#: manufacturing/manage/bom_edit.php:216
 msgid "Component:"
 msgstr ""
 
 msgid "Component:"
 msgstr ""
 
@@ -9363,7 +9849,7 @@ msgstr ""
 #: inventory/view/view_transfer.php:40 manufacturing/view/wo_issue_view.php:43
 #: manufacturing/includes/manufacturing_ui.inc:29
 #: manufacturing/includes/manufacturing_ui.inc:100
 #: inventory/view/view_transfer.php:40 manufacturing/view/wo_issue_view.php:43
 #: manufacturing/includes/manufacturing_ui.inc:29
 #: manufacturing/includes/manufacturing_ui.inc:100
-#: reporting/includes/doctext.inc:228
+#: reporting/includes/doctext.inc:230
 msgid "From Location"
 msgstr ""
 
 msgid "From Location"
 msgstr ""
 
@@ -9371,63 +9857,63 @@ msgstr ""
 msgid "To Location"
 msgstr ""
 
 msgid "To Location"
 msgstr ""
 
-#: manufacturing/search_work_orders.php:26
+#: manufacturing/search_work_orders.php:28
 msgid "Search Outstanding Work Orders"
 msgstr ""
 
 msgid "Search Outstanding Work Orders"
 msgstr ""
 
-#: manufacturing/search_work_orders.php:31
+#: manufacturing/search_work_orders.php:33
 msgid "Search Work Orders"
 msgstr ""
 
 msgid "Search Work Orders"
 msgstr ""
 
-#: manufacturing/search_work_orders.php:67
-#: purchasing/inquiry/po_search_completed.php:80
+#: manufacturing/search_work_orders.php:69
+#: purchasing/inquiry/po_search_completed.php:89
 #: purchasing/inquiry/po_search.php:62
 #: purchasing/inquiry/po_search.php:62
-#: sales/inquiry/sales_deliveries_view.php:101
-#: sales/inquiry/sales_orders_view.php:213
+#: sales/inquiry/sales_deliveries_view.php:102
+#: sales/inquiry/sales_orders_view.php:218
 msgid "#:"
 msgstr ""
 
 msgid "#:"
 msgstr ""
 
-#: manufacturing/search_work_orders.php:70
+#: manufacturing/search_work_orders.php:72
 msgid "at Location:"
 msgstr ""
 
 msgid "at Location:"
 msgstr ""
 
-#: manufacturing/search_work_orders.php:82
-#: purchasing/inquiry/po_search_completed.php:92
+#: manufacturing/search_work_orders.php:84
+#: purchasing/inquiry/po_search_completed.php:101
 msgid "for item:"
 msgstr ""
 
 msgid "for item:"
 msgstr ""
 
-#: manufacturing/search_work_orders.php:84
-#: purchasing/inquiry/po_search_completed.php:99
+#: manufacturing/search_work_orders.php:86
+#: purchasing/inquiry/po_search_completed.php:108
 #: purchasing/inquiry/po_search.php:78
 #: purchasing/inquiry/po_search.php:78
-#: sales/inquiry/sales_deliveries_view.php:116
-#: sales/inquiry/sales_orders_view.php:236
+#: sales/inquiry/sales_deliveries_view.php:117
+#: sales/inquiry/sales_orders_view.php:241
 msgid "Select documents"
 msgstr ""
 
 msgid "Select documents"
 msgstr ""
 
-#: manufacturing/search_work_orders.php:122
+#: manufacturing/search_work_orders.php:124
 msgid "Release"
 msgstr ""
 
 msgid "Release"
 msgstr ""
 
-#: manufacturing/search_work_orders.php:125
+#: manufacturing/search_work_orders.php:127
 msgid "Issue"
 msgstr ""
 
 msgid "Issue"
 msgstr ""
 
-#: manufacturing/search_work_orders.php:132
+#: manufacturing/search_work_orders.php:134
 msgid "Produce"
 msgstr ""
 
 msgid "Produce"
 msgstr ""
 
-#: manufacturing/search_work_orders.php:162 reporting/rep402.php:103
+#: manufacturing/search_work_orders.php:169 reporting/rep402.php:136
 msgid "Required"
 msgstr ""
 
 msgid "Required"
 msgstr ""
 
-#: manufacturing/search_work_orders.php:165
+#: manufacturing/search_work_orders.php:172
 #: manufacturing/includes/manufacturing_ui.inc:292
 #: manufacturing/includes/manufacturing_ui.inc:292
-#: manufacturing/includes/manufacturing_ui.inc:296 reporting/rep402.php:103
-#: reporting/includes/doctext.inc:226 sales/inquiry/sales_orders_view.php:258
+#: manufacturing/includes/manufacturing_ui.inc:296 reporting/rep402.php:136
+#: reporting/includes/doctext.inc:228 sales/inquiry/sales_orders_view.php:263
 msgid "Required By"
 msgstr ""
 
 msgid "Required By"
 msgstr ""
 
-#: manufacturing/search_work_orders.php:174
+#: manufacturing/search_work_orders.php:182
 msgid "Marked orders are overdue."
 msgstr ""
 
 msgid "Marked orders are overdue."
 msgstr ""
 
@@ -9463,8 +9949,7 @@ msgid "Select another &Work Order to Process"
 msgstr ""
 
 #: manufacturing/work_order_add_finished.php:64
 msgstr ""
 
 #: manufacturing/work_order_add_finished.php:64
-#: manufacturing/work_order_costs.php:63
-#: manufacturing/work_order_entry.php:323
+#: manufacturing/work_order_costs.php:63 manufacturing/work_order_entry.php:323
 msgid "The order number sent is not valid."
 msgstr ""
 
 msgid "The order number sent is not valid."
 msgstr ""
 
@@ -9503,7 +9988,7 @@ msgstr ""
 
 #: manufacturing/work_order_add_finished.php:200
 #: purchasing/allocations/supplier_allocate.php:75
 
 #: manufacturing/work_order_add_finished.php:200
 #: purchasing/allocations/supplier_allocate.php:75
-#: sales/allocations/customer_allocate.php:73
+#: sales/allocations/customer_allocate.php:78
 msgid "Process"
 msgstr ""
 
 msgid "Process"
 msgstr ""
 
@@ -9751,25 +10236,25 @@ msgstr ""
 msgid "View Work Order Costs"
 msgstr ""
 
 msgid "View Work Order Costs"
 msgstr ""
 
-#: manufacturing/view/wo_costs_view.php:60
+#: manufacturing/view/wo_costs_view.php:60 reporting/rep402.php:141
 msgid "Transaction"
 msgstr ""
 
 msgid "Transaction"
 msgstr ""
 
-#: manufacturing/view/wo_costs_view.php:66
+#: manufacturing/view/wo_costs_view.php:66 reporting/rep402.php:188
 msgid "Finished Product Requirements"
 msgstr ""
 
 msgid "Finished Product Requirements"
 msgstr ""
 
-#: manufacturing/view/wo_costs_view.php:69
+#: manufacturing/view/wo_costs_view.php:69 reporting/rep402.php:191
 msgid "Additional Material Issues"
 msgstr ""
 
 #: manufacturing/view/wo_costs_view.php:72
 #: manufacturing/view/work_order_view.php:66
 msgid "Additional Material Issues"
 msgstr ""
 
 #: manufacturing/view/wo_costs_view.php:72
 #: manufacturing/view/work_order_view.php:66
-#: manufacturing/view/work_order_view.php:73
+#: manufacturing/view/work_order_view.php:73 reporting/rep402.php:194
 msgid "Additional Costs"
 msgstr ""
 
 msgid "Additional Costs"
 msgstr ""
 
-#: manufacturing/view/wo_costs_view.php:75
+#: manufacturing/view/wo_costs_view.php:75 reporting/rep402.php:197
 msgid "Finished Product Receival"
 msgstr ""
 
 msgid "Finished Product Receival"
 msgstr ""
 
@@ -9864,7 +10349,7 @@ msgid "There are no manufactured or kit items defined in the system."
 msgstr ""
 
 #: manufacturing/inquiry/bom_cost_inquiry.php:34
 msgstr ""
 
 #: manufacturing/inquiry/bom_cost_inquiry.php:34
-#: manufacturing/manage/bom_edit.php:143
+#: manufacturing/manage/bom_edit.php:172
 msgid "Select a manufacturable item:"
 msgstr ""
 
 msgid "Select a manufacturable item:"
 msgstr ""
 
@@ -9888,7 +10373,7 @@ msgstr ""
 #: manufacturing/manage/bom_edit.php:44
 #: manufacturing/includes/manufacturing_ui.inc:28
 #: manufacturing/includes/manufacturing_ui.inc:100
 #: manufacturing/manage/bom_edit.php:44
 #: manufacturing/includes/manufacturing_ui.inc:28
 #: manufacturing/includes/manufacturing_ui.inc:100
-#: reporting/includes/doctext.inc:228
+#: reporting/includes/doctext.inc:230
 msgid "Work Centre"
 msgstr ""
 
 msgid "Work Centre"
 msgstr ""
 
@@ -9908,41 +10393,45 @@ msgid ""
 "work centre be defined."
 msgstr ""
 
 "work centre be defined."
 msgstr ""
 
-#: manufacturing/manage/bom_edit.php:43 reporting/rep105.php:114
+#: manufacturing/manage/bom_edit.php:43 reporting/rep105.php:115
 msgid "Code"
 msgstr ""
 
 msgid "Code"
 msgstr ""
 
-#: manufacturing/manage/bom_edit.php:83
+#: manufacturing/manage/bom_edit.php:69
+msgid "Copy BOM to another manufacturable item"
+msgstr ""
+
+#: manufacturing/manage/bom_edit.php:104
 msgid "Selected component has been updated"
 msgstr ""
 
 msgid "Selected component has been updated"
 msgstr ""
 
-#: manufacturing/manage/bom_edit.php:103
+#: manufacturing/manage/bom_edit.php:124
 msgid ""
 "A new component part has been added to the bill of material for this item."
 msgstr ""
 
 msgid ""
 "A new component part has been added to the bill of material for this item."
 msgstr ""
 
-#: manufacturing/manage/bom_edit.php:109
+#: manufacturing/manage/bom_edit.php:130
 msgid ""
 "The selected component is already on this bom. You can modify it's quantity "
 "but it cannot appear more than once on the same bom."
 msgstr ""
 
 msgid ""
 "The selected component is already on this bom. You can modify it's quantity "
 "but it cannot appear more than once on the same bom."
 msgstr ""
 
-#: manufacturing/manage/bom_edit.php:115
+#: manufacturing/manage/bom_edit.php:136
 msgid ""
 "The selected component is a parent of the current item. Recursive BOMs are "
 "not allowed."
 msgstr ""
 
 msgid ""
 "The selected component is a parent of the current item. Recursive BOMs are "
 "not allowed."
 msgstr ""
 
-#: manufacturing/manage/bom_edit.php:200
-msgid "Location to Draw From:"
+#: manufacturing/manage/bom_edit.php:164
+msgid "BOM copied to "
 msgstr ""
 
 msgstr ""
 
-#: manufacturing/manage/bom_edit.php:201
-msgid "Work Centre Added:"
+#: manufacturing/manage/bom_edit.php:229
+msgid "Location to Draw From:"
 msgstr ""
 
 msgstr ""
 
-#: manufacturing/manage/work_centres.php:16
-msgid "Work Centres"
+#: manufacturing/manage/bom_edit.php:230
+msgid "Work Centre Added:"
 msgstr ""
 
 #: manufacturing/manage/work_centres.php:34
 msgstr ""
 
 #: manufacturing/manage/work_centres.php:34
@@ -10002,17 +10491,17 @@ msgid "There are no Requirements for this Order."
 msgstr ""
 
 #: manufacturing/includes/manufacturing_ui.inc:101
 msgstr ""
 
 #: manufacturing/includes/manufacturing_ui.inc:101
-#: reporting/includes/doctext.inc:228
+#: reporting/includes/doctext.inc:230
 msgid "Unit Quantity"
 msgstr ""
 
 #: manufacturing/includes/manufacturing_ui.inc:101
 msgid "Unit Quantity"
 msgstr ""
 
 #: manufacturing/includes/manufacturing_ui.inc:101
-#: reporting/includes/doctext.inc:228
+#: reporting/includes/doctext.inc:230
 msgid "Total Quantity"
 msgstr ""
 
 #: manufacturing/includes/manufacturing_ui.inc:101
 msgid "Total Quantity"
 msgstr ""
 
 #: manufacturing/includes/manufacturing_ui.inc:101
-#: reporting/includes/doctext.inc:228
+#: reporting/includes/doctext.inc:230
 msgid "Units Issued"
 msgstr ""
 
 msgid "Units Issued"
 msgstr ""
 
@@ -10044,14 +10533,14 @@ 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
-#: reporting/includes/doctext.inc:222
+#: reporting/includes/doctext.inc:224
 msgid "Manufactured Item"
 msgstr ""
 
 #: manufacturing/includes/manufacturing_ui.inc:292
 #: manufacturing/includes/manufacturing_ui.inc:296
 #: manufacturing/includes/manufacturing_ui.inc:347
 msgid "Manufactured Item"
 msgstr ""
 
 #: manufacturing/includes/manufacturing_ui.inc:292
 #: manufacturing/includes/manufacturing_ui.inc:296
 #: manufacturing/includes/manufacturing_ui.inc:347
-#: reporting/includes/doctext.inc:223
+#: reporting/includes/doctext.inc:225
 msgid "Into Location"
 msgstr ""
 
 msgid "Into Location"
 msgstr ""
 
@@ -10080,12 +10569,12 @@ msgstr ""
 msgid "Issue Items to Work order"
 msgstr ""
 
 msgid "Issue Items to Work order"
 msgstr ""
 
-#: manufacturing/includes/db/work_order_costing_db.inc:98
+#: manufacturing/includes/db/work_order_costing_db.inc:97
 #, php-format
 msgid "COGS changed from %s to %s for %d %s of '%s'"
 msgstr ""
 
 #, php-format
 msgid "COGS changed from %s to %s for %d %s of '%s'"
 msgstr ""
 
-#: manufacturing/includes/db/work_order_costing_db.inc:235
+#: manufacturing/includes/db/work_order_costing_db.inc:239
 #, php-format
 msgid "Voided WO #%s"
 msgstr ""
 #, php-format
 msgid "Voided WO #%s"
 msgstr ""
@@ -10098,14 +10587,13 @@ msgstr ""
 msgid "Issue to"
 msgstr ""
 
 msgid "Issue to"
 msgstr ""
 
-#: manufacturing/includes/db/work_order_produce_items_db.inc:94
+#: manufacturing/includes/db/work_order_produce_items_db.inc:95
 msgid "Production."
 msgstr ""
 
 #: manufacturing/includes/db/work_orders_db.inc:95
 msgid "Production."
 msgstr ""
 
 #: manufacturing/includes/db/work_orders_db.inc:95
-#: purchasing/includes/db/po_db.inc:153
-#: sales/includes/db/cust_trans_db.inc:115
-#: sales/includes/db/sales_order_db.inc:211
+#: 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 ""
 
 msgid "Updated."
 msgstr ""
 
@@ -10113,31 +10601,32 @@ msgstr ""
 msgid "Canceled."
 msgstr ""
 
 msgid "Canceled."
 msgstr ""
 
-#: manufacturing/includes/db/work_orders_db.inc:195
+#: manufacturing/includes/db/work_orders_db.inc:197
 msgid "Released."
 msgstr ""
 
 msgid "Released."
 msgstr ""
 
-#: purchasing/includes/purchasing_db.inc:216
+#: purchasing/includes/purchasing_db.inc:219
 msgid "Payment for:"
 msgstr ""
 
 msgid "Payment for:"
 msgstr ""
 
-#: purchasing/includes/db/invoice_db.inc:339
+#: purchasing/includes/db/invoice_db.inc:347
 msgid "Supplier invoice adjustment for zero inventory of "
 msgstr ""
 
 msgid "Supplier invoice adjustment for zero inventory of "
 msgstr ""
 
-#: purchasing/includes/db/invoice_db.inc:339 reporting/rep106.php:89
-#: sales/inquiry/sales_deliveries_view.php:154
-#: sales/inquiry/sales_orders_view.php:134
+#: purchasing/includes/db/invoice_db.inc: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"
 msgstr ""
 
 msgid "Invoice"
 msgstr ""
 
-#: purchasing/includes/db/invoice_db.inc:693
-#: purchasing/includes/db/invoice_db.inc:695
+#: purchasing/includes/db/invoice_db.inc:704
+#: purchasing/includes/db/invoice_db.inc:706
 msgid "GRN Removal"
 msgstr ""
 
 #: purchasing/includes/ui/grn_ui.inc:23 purchasing/includes/ui/grn_ui.inc:55
 msgid "GRN Removal"
 msgstr ""
 
 #: purchasing/includes/ui/grn_ui.inc:23 purchasing/includes/ui/grn_ui.inc:55
-#: purchasing/includes/ui/po_ui.inc:303 sales/view/view_sales_order.php:74
+#: purchasing/includes/ui/po_ui.inc:307 sales/view/view_sales_order.php:76
 msgid "Order Currency"
 msgstr ""
 
 msgid "Order Currency"
 msgstr ""
 
@@ -10145,72 +10634,85 @@ msgstr ""
 msgid "For Purchase Order"
 msgstr ""
 
 msgid "For Purchase Order"
 msgstr ""
 
-#: purchasing/includes/ui/grn_ui.inc:28 purchasing/includes/ui/grn_ui.inc:59
-#: sales/view/view_sales_order.php:67
-msgid "Ordered On"
+#: purchasing/includes/ui/grn_ui.inc:28 reporting/includes/doctext.inc:76
+#: reporting/includes/doctext.inc:191 reporting/includes/doctext.inc:245
+#: sales/inquiry/sales_deliveries_view.php:176
+msgid "Delivery Date"
 msgstr ""
 
 #: purchasing/includes/ui/grn_ui.inc:33 purchasing/includes/ui/grn_ui.inc:69
 msgstr ""
 
 #: purchasing/includes/ui/grn_ui.inc:33 purchasing/includes/ui/grn_ui.inc:69
-#: purchasing/includes/ui/po_ui.inc:318 purchasing/includes/ui/po_ui.inc:323
+#: purchasing/includes/ui/po_ui.inc:322 purchasing/includes/ui/po_ui.inc:327
 msgid "Deliver Into Location"
 msgstr ""
 
 #: purchasing/includes/ui/grn_ui.inc:38 purchasing/includes/ui/grn_ui.inc:79
 msgid "Deliver Into Location"
 msgstr ""
 
 #: purchasing/includes/ui/grn_ui.inc:38 purchasing/includes/ui/grn_ui.inc:79
-#: purchasing/includes/ui/po_ui.inc:332 sales/view/view_sales_order.php:92
+#: purchasing/includes/ui/po_ui.inc:336 sales/view/view_sales_order.php:94
 msgid "Delivery Address"
 msgstr ""
 
 #: purchasing/includes/ui/grn_ui.inc:41 purchasing/includes/ui/grn_ui.inc:82
 msgid "Delivery Address"
 msgstr ""
 
 #: purchasing/includes/ui/grn_ui.inc:41 purchasing/includes/ui/grn_ui.inc:82
-#: purchasing/includes/ui/po_ui.inc:344
+#: purchasing/includes/ui/po_ui.inc:348
 msgid "Order Comments"
 msgstr ""
 
 msgid "Order Comments"
 msgstr ""
 
+#: purchasing/includes/ui/grn_ui.inc:59 sales/view/view_sales_order.php:67
+msgid "Ordered On"
+msgstr ""
+
 #: purchasing/includes/ui/grn_ui.inc:74
 msgid "Date Items Received"
 msgstr ""
 
 #: purchasing/includes/ui/grn_ui.inc:74
 msgid "Date Items Received"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:121
+#: purchasing/includes/ui/invoice_ui.inc:122
 msgid "Source Invoices:"
 msgstr ""
 
 msgid "Source Invoices:"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:123
+#: purchasing/includes/ui/invoice_ui.inc:124
 msgid "Supplier's Ref.:"
 msgstr ""
 
 msgid "Supplier's Ref.:"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:137
+#: purchasing/includes/ui/invoice_ui.inc:138
 msgid "Terms:"
 msgstr ""
 
 msgid "Terms:"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:143
+#: purchasing/includes/ui/invoice_ui.inc:144
 #: purchasing/includes/ui/po_ui.inc:174
 msgid "Dimension 2"
 msgstr ""
 
 #: purchasing/includes/ui/po_ui.inc:174
 msgid "Dimension 2"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:155
-#: purchasing/manage/suppliers.php:100 purchasing/manage/suppliers.php:105
+#: purchasing/includes/ui/invoice_ui.inc:154
+#: purchasing/manage/suppliers.php:210 purchasing/manage/suppliers.php:215
 msgid "Supplier's Currency:"
 msgstr ""
 
 msgid "Supplier's Currency:"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:159
-#: purchasing/manage/suppliers.php:107 sales/manage/customer_branches.php:238
-#: sales/manage/customers.php:299
+#: purchasing/includes/ui/invoice_ui.inc:158
+#: purchasing/manage/suppliers.php:217 sales/manage/customer_branches.php:238
+#: sales/manage/customers.php:300
 msgid "Tax Group:"
 msgstr ""
 
 msgid "Tax Group:"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:177
+#: purchasing/includes/ui/invoice_ui.inc:175
 msgid "Sub-total:"
 msgstr ""
 
 msgid "Sub-total:"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:185
+#: purchasing/includes/ui/invoice_ui.inc:183
 msgid "Invoice Total:"
 msgstr ""
 
 msgid "Invoice Total:"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:188
+#: purchasing/includes/ui/invoice_ui.inc:186
 #: sales/customer_credit_invoice.php:325
 #: sales/includes/ui/sales_credit_ui.inc:228
 msgid "Credit Note Total"
 msgstr ""
 
 #: sales/customer_credit_invoice.php:325
 #: sales/includes/ui/sales_credit_ui.inc:228
 msgid "Credit Note Total"
 msgstr ""
 
+#: purchasing/includes/ui/invoice_ui.inc: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"
+msgstr ""
+
 #: purchasing/includes/ui/invoice_ui.inc:220
 msgid "Add GL Line"
 msgstr ""
 #: purchasing/includes/ui/invoice_ui.inc:220
 msgid "Add GL Line"
 msgstr ""
@@ -10236,6 +10738,10 @@ msgstr ""
 msgid "Quick Entry:"
 msgstr ""
 
 msgid "Quick Entry:"
 msgstr ""
 
+#: purchasing/includes/ui/invoice_ui.inc:320
+msgid "Edit line from document"
+msgstr ""
+
 #: purchasing/includes/ui/invoice_ui.inc:421
 msgid "Add to Invoice"
 msgstr ""
 #: purchasing/includes/ui/invoice_ui.inc:421
 msgid "Add to Invoice"
 msgstr ""
@@ -10288,8 +10794,8 @@ msgid "Add All Items"
 msgstr ""
 
 #: purchasing/includes/ui/invoice_ui.inc:501
 msgstr ""
 
 #: purchasing/includes/ui/invoice_ui.inc:501
-#: purchasing/includes/ui/invoice_ui.inc:513 reporting/rep308.php:223
-#: sales/inquiry/sales_orders_view.php:142
+#: purchasing/includes/ui/invoice_ui.inc:513 reporting/rep308.php:224
+#: sales/inquiry/sales_orders_view.php:147
 msgid "Delivery"
 msgstr ""
 
 msgid "Delivery"
 msgstr ""
 
@@ -10315,13 +10821,13 @@ msgid "Qty Yet To Invoice"
 msgstr ""
 
 #: purchasing/includes/ui/invoice_ui.inc:503
 msgstr ""
 
 #: purchasing/includes/ui/invoice_ui.inc:503
-#: purchasing/includes/ui/po_ui.inc:216
+#: purchasing/includes/ui/po_ui.inc:217
 #: sales/includes/ui/sales_order_ui.inc:148
 msgid "Price after Tax"
 msgstr ""
 
 #: purchasing/includes/ui/invoice_ui.inc:503
 #: sales/includes/ui/sales_order_ui.inc:148
 msgid "Price after Tax"
 msgstr ""
 
 #: purchasing/includes/ui/invoice_ui.inc:503
-#: purchasing/includes/ui/po_ui.inc:216
+#: purchasing/includes/ui/po_ui.inc:217
 #: sales/includes/ui/sales_order_ui.inc:148
 msgid "Price before Tax"
 msgstr ""
 #: sales/includes/ui/sales_order_ui.inc:148
 msgid "Price before Tax"
 msgstr ""
@@ -10350,15 +10856,15 @@ msgstr ""
 msgid "Credits can only be applied to invoiced items."
 msgstr ""
 
 msgid "Credits can only be applied to invoiced items."
 msgstr ""
 
-#: purchasing/includes/ui/po_ui.inc:135 sales/sales_order_entry.php:728
+#: purchasing/includes/ui/po_ui.inc:135 sales/sales_order_entry.php:731
 msgid "Order Date:"
 msgstr ""
 
 msgid "Order Date:"
 msgstr ""
 
-#: purchasing/includes/ui/po_ui.inc:136 sales/sales_order_entry.php:715
+#: purchasing/includes/ui/po_ui.inc:136 sales/sales_order_entry.php:718
 msgid "Delivery Date:"
 msgstr ""
 
 msgid "Delivery Date:"
 msgstr ""
 
-#: purchasing/includes/ui/po_ui.inc:136 sales/sales_order_entry.php:709
+#: purchasing/includes/ui/po_ui.inc:136 sales/sales_order_entry.php:712
 msgid "Invoice Date:"
 msgstr ""
 
 msgid "Invoice Date:"
 msgstr ""
 
@@ -10392,22 +10898,22 @@ msgstr ""
 msgid "Order Items"
 msgstr ""
 
 msgid "Order Items"
 msgstr ""
 
-#: purchasing/includes/ui/po_ui.inc:215 purchasing/po_receive_items.php:62
+#: purchasing/includes/ui/po_ui.inc:216 purchasing/po_receive_items.php:62
 msgid "Received"
 msgstr ""
 
 msgid "Received"
 msgstr ""
 
-#: purchasing/includes/ui/po_ui.inc:216
-#: sales/includes/ui/sales_order_ui.inc:603
+#: purchasing/includes/ui/po_ui.inc:217
+#: sales/includes/ui/sales_order_ui.inc:610
 msgid "Required Delivery Date"
 msgstr ""
 
 msgid "Required Delivery Date"
 msgstr ""
 
-#: purchasing/includes/ui/po_ui.inc:216 purchasing/view/view_grn.php:41
+#: purchasing/includes/ui/po_ui.inc:217 purchasing/view/view_grn.php:41
 #: purchasing/view/view_po.php:46
 msgid "Line Total"
 msgstr ""
 
 #: purchasing/view/view_po.php:46
 msgid "Line Total"
 msgstr ""
 
-#: purchasing/includes/ui/po_ui.inc:272 purchasing/po_receive_items.php:114
-#: reporting/rep107.php:232 reporting/rep109.php:154 reporting/rep110.php:156
+#: purchasing/includes/ui/po_ui.inc:276 purchasing/po_receive_items.php:114
+#: reporting/rep107.php:254 reporting/rep109.php:138 reporting/rep110.php:156
 #: reporting/rep111.php:151 reporting/rep113.php:145 reporting/rep209.php:166
 #: sales/customer_credit_invoice.php:317 sales/customer_delivery.php:505
 #: sales/customer_invoice.php:625 sales/view/view_dispatch.php:146
 #: reporting/rep111.php:151 reporting/rep113.php:145 reporting/rep209.php:166
 #: sales/customer_credit_invoice.php:317 sales/customer_delivery.php:505
 #: sales/customer_invoice.php:625 sales/view/view_dispatch.php:146
@@ -10416,41 +10922,34 @@ msgstr ""
 msgid "Sub-total"
 msgstr ""
 
 msgid "Sub-total"
 msgstr ""
 
-#: purchasing/includes/ui/po_ui.inc:281 purchasing/po_receive_items.php:122
-#: purchasing/view/view_grn.php:79 purchasing/view/view_po.php:93
-#: sales/customer_delivery.php:512 sales/view/view_sales_order.php:263
+#: purchasing/includes/ui/po_ui.inc:285 purchasing/po_receive_items.php:122
+#: purchasing/view/view_grn.php:89 purchasing/view/view_po.php:93
+#: sales/customer_delivery.php:512 sales/view/view_sales_order.php:265
 #: sales/includes/ui/sales_order_ui.inc:230
 msgid "Amount Total"
 msgstr ""
 
 #: sales/includes/ui/sales_order_ui.inc:230
 msgid "Amount Total"
 msgstr ""
 
-#: purchasing/includes/ui/po_ui.inc:283
-#: purchasing/allocations/supplier_allocate.php:74
-#: sales/allocations/customer_allocate.php:72
-#: sales/includes/ui/sales_order_ui.inc:231
-msgid "Refresh"
-msgstr ""
-
-#: purchasing/includes/ui/po_ui.inc:338 sales/view/view_sales_order.php:83
+#: purchasing/includes/ui/po_ui.inc:342 sales/view/view_sales_order.php:85
 msgid "Required Pre-Payment"
 msgstr ""
 
 msgid "Required Pre-Payment"
 msgstr ""
 
-#: purchasing/includes/ui/po_ui.inc:339
+#: purchasing/includes/ui/po_ui.inc:343
 msgid "Pre-Payments Allocated"
 msgstr ""
 
 msgid "Pre-Payments Allocated"
 msgstr ""
 
-#: purchasing/includes/ui/po_ui.inc:461 purchasing/po_entry_items.php:483
+#: 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 ""
 
 #: sales/customer_invoice.php:439 sales/includes/ui/sales_order_ui.inc:396
 #: sales/includes/ui/sales_order_ui.inc:398
 msgid "Payment:"
 msgstr ""
 
-#: purchasing/includes/ui/po_ui.inc:461 purchasing/po_entry_items.php:483
+#: purchasing/includes/ui/po_ui.inc:470 purchasing/po_entry_items.php:483
 msgid "Delayed"
 msgstr ""
 
 msgid "Delayed"
 msgstr ""
 
-#: purchasing/includes/ui/po_ui.inc:463
-#: sales/includes/ui/sales_order_ui.inc:614
-#: sales/includes/ui/sales_order_ui.inc:616
+#: purchasing/includes/ui/po_ui.inc:472
+#: sales/includes/ui/sales_order_ui.inc:621
+#: sales/includes/ui/sales_order_ui.inc:623
 msgid "Pre-Payment Required:"
 msgstr ""
 
 msgid "Pre-Payment Required:"
 msgstr ""
 
@@ -10536,11 +11035,11 @@ msgstr ""
 msgid "&View this Invoice"
 msgstr ""
 
 msgid "&View this Invoice"
 msgstr ""
 
-#: purchasing/po_entry_items.php:133 purchasing/supplier_invoice.php:69
+#: purchasing/po_entry_items.php:133 purchasing/supplier_invoice.php:67
 msgid "View the GL Journal Entries for this Invoice"
 msgstr ""
 
 msgid "View the GL Journal Entries for this Invoice"
 msgstr ""
 
-#: purchasing/po_entry_items.php:135 purchasing/supplier_invoice.php:71
+#: purchasing/po_entry_items.php:135 purchasing/supplier_invoice.php:69
 msgid "Entry supplier &payment for this invoice"
 msgstr ""
 
 msgid "Entry supplier &payment for this invoice"
 msgstr ""
 
@@ -10577,7 +11076,7 @@ msgstr ""
 msgid "Enter a new purchase order"
 msgstr ""
 
 msgid "Enter a new purchase order"
 msgstr ""
 
-#: purchasing/po_entry_items.php:228 sales/sales_order_entry.php:519
+#: purchasing/po_entry_items.php:228 sales/sales_order_entry.php:522
 msgid "Item description cannot be empty."
 msgstr ""
 
 msgid "Item description cannot be empty."
 msgstr ""
 
@@ -10612,8 +11111,8 @@ msgid ""
 "purchased."
 msgstr ""
 
 "purchased."
 msgstr ""
 
-#: purchasing/po_entry_items.php:338 purchasing/supplier_invoice.php:382
-#: purchasing/supplier_payment.php:132
+#: purchasing/po_entry_items.php:338 purchasing/supplier_invoice.php:384
+#: purchasing/supplier_payment.php:126
 msgid "There is no supplier selected."
 msgstr ""
 
 msgid "There is no supplier selected."
 msgstr ""
 
@@ -10625,13 +11124,13 @@ msgstr ""
 msgid "The entered due date is invalid."
 msgstr ""
 
 msgid "The entered due date is invalid."
 msgstr ""
 
-#: purchasing/po_entry_items.php:374 purchasing/supplier_credit.php:199
-#: purchasing/supplier_invoice.php:208
+#: purchasing/po_entry_items.php:374 purchasing/supplier_credit.php:202
+#: purchasing/supplier_invoice.php:206
 msgid "You must enter a supplier's invoice reference."
 msgstr ""
 
 msgid "You must enter a supplier's invoice reference."
 msgstr ""
 
-#: purchasing/po_entry_items.php:381 purchasing/supplier_credit.php:206
-#: purchasing/supplier_invoice.php:215
+#: purchasing/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."
 msgstr ""
 msgid ""
 "This invoice number has already been entered. It cannot be entered again."
 msgstr ""
@@ -10653,7 +11152,7 @@ msgstr ""
 msgid "Required prepayment is greater than total invoice value."
 msgstr ""
 
 msgid "Required prepayment is greater than total invoice value."
 msgstr ""
 
-#: purchasing/po_entry_items.php:491 sales/sales_order_entry.php:732
+#: purchasing/po_entry_items.php:491 sales/sales_order_entry.php:735
 msgid "Place Order"
 msgstr ""
 
 msgid "Place Order"
 msgstr ""
 
@@ -10661,7 +11160,7 @@ msgstr ""
 msgid "Update Order"
 msgstr ""
 
 msgid "Update Order"
 msgstr ""
 
-#: purchasing/po_entry_items.php:493 sales/sales_order_entry.php:731
+#: purchasing/po_entry_items.php:493 sales/sales_order_entry.php:734
 msgid "Cancel Order"
 msgstr ""
 
 msgid "Cancel Order"
 msgstr ""
 
@@ -10685,7 +11184,7 @@ msgstr ""
 msgid "Update Invoice"
 msgstr ""
 
 msgid "Update Invoice"
 msgstr ""
 
-#: purchasing/po_entry_items.php:502 sales/sales_order_entry.php:712
+#: purchasing/po_entry_items.php:502 sales/sales_order_entry.php:715
 msgid "Cancel Invoice"
 msgstr ""
 
 msgid "Cancel Invoice"
 msgstr ""
 
@@ -10711,14 +11210,14 @@ msgid ""
 "select a purchase order first."
 msgstr ""
 
 "select a purchase order first."
 msgstr ""
 
-#: purchasing/po_receive_items.php:62 reporting/rep105.php:114
+#: purchasing/po_receive_items.php:62 reporting/rep105.php:115
 #: sales/customer_delivery.php:420
 msgid "Ordered"
 msgstr ""
 
 #: sales/customer_delivery.php:420
 msgid "Ordered"
 msgstr ""
 
-#: purchasing/po_receive_items.php:63 reporting/rep101.php:133
-#: reporting/rep105.php:115 reporting/rep105.php:166 reporting/rep201.php:108
-#: reporting/includes/doctext.inc:246
+#: purchasing/po_receive_items.php:63 reporting/rep101.php:137
+#: reporting/rep105.php:116 reporting/rep105.php:170 reporting/rep201.php:116
+#: reporting/includes/doctext.inc:248
 msgid "Outstanding"
 msgstr ""
 
 msgid "Outstanding"
 msgstr ""
 
@@ -10767,123 +11266,128 @@ msgstr ""
 msgid "Process Receive Items"
 msgstr ""
 
 msgid "Process Receive Items"
 msgstr ""
 
-#: purchasing/supplier_credit.php:76
+#: purchasing/supplier_credit.php:33
+#, php-format
+msgid "Modifying Supplier Credit # %d"
+msgstr ""
+
+#: purchasing/supplier_credit.php:79
 msgid "Supplier credit note has been processed."
 msgstr ""
 
 msgid "Supplier credit note has been processed."
 msgstr ""
 
-#: purchasing/supplier_credit.php:77
+#: purchasing/supplier_credit.php:80
 msgid "View this Credit Note"
 msgstr ""
 
 msgid "View this Credit Note"
 msgstr ""
 
-#: purchasing/supplier_credit.php:79
+#: purchasing/supplier_credit.php:82
 msgid "View the GL Journal Entries for this Credit Note"
 msgstr ""
 
 msgid "View the GL Journal Entries for this Credit Note"
 msgstr ""
 
-#: purchasing/supplier_credit.php:81
+#: purchasing/supplier_credit.php:84
 msgid "Enter Another Credit Note"
 msgstr ""
 
 msgid "Enter Another Credit Note"
 msgstr ""
 
-#: purchasing/supplier_credit.php:126 purchasing/supplier_invoice.php:137
+#: 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 ""
 
 msgid ""
 "The account code entered is not a valid code, this line cannot be added to "
 "the transaction."
 msgstr ""
 
-#: purchasing/supplier_credit.php:136 purchasing/supplier_invoice.php:147
+#: purchasing/supplier_credit.php:139 purchasing/supplier_invoice.php:145
 msgid ""
 "The amount entered is not numeric. This line cannot be added to the "
 "transaction."
 msgstr ""
 
 msgid ""
 "The amount entered is not numeric. This line cannot be added to the "
 "transaction."
 msgstr ""
 
-#: purchasing/supplier_credit.php:167
+#: 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."
 msgstr ""
 
 msgid ""
 "The credit note cannot be processed because the there are no items or values "
 "on the invoice.  Credit notes are expected to have a charge."
 msgstr ""
 
-#: purchasing/supplier_credit.php:180
+#: purchasing/supplier_credit.php:183
 msgid ""
 "The credit note as entered cannot be processed because the date entered is "
 "not valid."
 msgstr ""
 
 msgid ""
 "The credit note as entered cannot be processed because the date entered is "
 "not valid."
 msgstr ""
 
-#: purchasing/supplier_credit.php:192 purchasing/supplier_invoice.php:201
+#: 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."
 msgstr ""
 
 msgid ""
 "The invoice as entered cannot be processed because the due date is in an "
 "incorrect format."
 msgstr ""
 
-#: purchasing/supplier_credit.php:218
+#: purchasing/supplier_credit.php:221
 msgid ""
 "The return cannot be processed because there is an insufficient quantity for "
 "item:"
 msgstr ""
 
 msgid ""
 "The return cannot be processed because there is an insufficient quantity for "
 "item:"
 msgstr ""
 
-#: purchasing/supplier_credit.php:262
+#: purchasing/supplier_credit.php:265
 msgid "The quantity to credit must be numeric and greater than zero."
 msgstr ""
 
 msgid "The quantity to credit must be numeric and greater than zero."
 msgstr ""
 
-#: purchasing/supplier_credit.php:269
+#: purchasing/supplier_credit.php:272
 msgid "The price is either not numeric or negative."
 msgstr ""
 
 msgid "The price is either not numeric or negative."
 msgstr ""
 
-#: purchasing/supplier_credit.php:372
+#: purchasing/supplier_credit.php:374
 msgid "Enter Credit Note"
 msgstr ""
 
 msgid "Enter Credit Note"
 msgstr ""
 
-#: purchasing/supplier_invoice.php:43
+#: purchasing/supplier_invoice.php:39
 msgid "Enter Supplier Invoice"
 msgstr ""
 
 msgid "Enter Supplier Invoice"
 msgstr ""
 
-#: purchasing/supplier_invoice.php:48
+#: purchasing/supplier_invoice.php:44
 #, php-format
 msgid "Modifying Purchase Invoice # %d"
 msgstr ""
 
 #, php-format
 msgid "Modifying Purchase Invoice # %d"
 msgstr ""
 
-#: purchasing/supplier_invoice.php:66
+#: purchasing/supplier_invoice.php:64
 msgid "Supplier invoice has been processed."
 msgstr ""
 
 msgid "Supplier invoice has been processed."
 msgstr ""
 
-#: purchasing/supplier_invoice.php:67
+#: purchasing/supplier_invoice.php:65
 msgid "View this Invoice"
 msgstr ""
 
 msgid "View this Invoice"
 msgstr ""
 
-#: purchasing/supplier_invoice.php:74
+#: purchasing/supplier_invoice.php:72
 msgid "Enter Another Invoice"
 msgstr ""
 
 msgid "Enter Another Invoice"
 msgstr ""
 
-#: purchasing/supplier_invoice.php:177
+#: purchasing/supplier_invoice.php:175
 msgid ""
 "The invoice cannot be processed because the there are no items or values on "
 "the invoice.  Invoices are expected to have a charge."
 msgstr ""
 
 msgid ""
 "The invoice cannot be processed because the there are no items or values on "
 "the invoice.  Invoices are expected to have a charge."
 msgstr ""
 
-#: purchasing/supplier_invoice.php:189
+#: purchasing/supplier_invoice.php:187
 msgid ""
 "The invoice as entered cannot be processed because the invoice date is in an "
 "incorrect format."
 msgstr ""
 
 msgid ""
 "The invoice as entered cannot be processed because the invoice date is in an "
 "incorrect format."
 msgstr ""
 
-#: purchasing/supplier_invoice.php:253
+#: purchasing/supplier_invoice.php:251
 msgid "The quantity to invoice must be numeric and greater than zero."
 msgstr ""
 
 msgid "The quantity to invoice must be numeric and greater than zero."
 msgstr ""
 
-#: purchasing/supplier_invoice.php:260
+#: purchasing/supplier_invoice.php:258
 msgid "The price is not numeric."
 msgstr ""
 
 msgid "The price is not numeric."
 msgstr ""
 
-#: purchasing/supplier_invoice.php:273
+#: purchasing/supplier_invoice.php:271
 msgid ""
 "The price being invoiced is more than the purchase order price by more than "
 "the allowed over-charge percentage. The system is set up to prohibit this. "
 "See the system administrator to modify the set up parameters if necessary."
 msgstr ""
 
 msgid ""
 "The price being invoiced is more than the purchase order price by more than "
 "the allowed over-charge percentage. The system is set up to prohibit this. "
 "See the system administrator to modify the set up parameters if necessary."
 msgstr ""
 
-#: purchasing/supplier_invoice.php:274 purchasing/supplier_invoice.php:287
+#: purchasing/supplier_invoice.php:272 purchasing/supplier_invoice.php:285
 msgid "The over-charge percentage allowance is :"
 msgstr ""
 
 msgid "The over-charge percentage allowance is :"
 msgstr ""
 
-#: purchasing/supplier_invoice.php:286
+#: purchasing/supplier_invoice.php:284
 msgid ""
 "The quantity being invoiced is more than the outstanding quantity by more "
 "than the allowed over-charge percentage. The system is set up to prohibit "
 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 "
@@ -10891,12 +11395,12 @@ msgid ""
 "necessary."
 msgstr ""
 
 "necessary."
 msgstr ""
 
-#: purchasing/supplier_invoice.php:364
+#: purchasing/supplier_invoice.php:366
 #, php-format
 msgid "All yet non-invoiced items on delivery line # %d has been removed."
 msgstr ""
 
 #, php-format
 msgid "All yet non-invoiced items on delivery line # %d has been removed."
 msgstr ""
 
-#: purchasing/supplier_invoice.php:406
+#: purchasing/supplier_invoice.php:408
 msgid "Enter Invoice"
 msgstr ""
 
 msgid "Enter Invoice"
 msgstr ""
 
@@ -10904,90 +11408,89 @@ msgstr ""
 msgid "Supplier Payment Entry"
 msgstr ""
 
 msgid "Supplier Payment Entry"
 msgstr ""
 
-#: purchasing/supplier_payment.php:90
+#: purchasing/supplier_payment.php:84
 msgid "Invalid purchase invoice number."
 msgstr ""
 
 msgid "Invalid purchase invoice number."
 msgstr ""
 
-#: purchasing/supplier_payment.php:96
+#: purchasing/supplier_payment.php:90
 msgid "Payment has been sucessfully entered"
 msgstr ""
 
 msgid "Payment has been sucessfully entered"
 msgstr ""
 
-#: purchasing/supplier_payment.php:98
+#: purchasing/supplier_payment.php:92
 msgid "&Print This Remittance"
 msgstr ""
 
 msgid "&Print This Remittance"
 msgstr ""
 
-#: purchasing/supplier_payment.php:99
+#: purchasing/supplier_payment.php:93
 msgid "&Email This Remittance"
 msgstr ""
 
 msgid "&Email This Remittance"
 msgstr ""
 
-#: purchasing/supplier_payment.php:101
+#: purchasing/supplier_payment.php:95
 msgid "View this Payment"
 msgstr ""
 
 msgid "View this Payment"
 msgstr ""
 
-#: purchasing/supplier_payment.php:102
+#: purchasing/supplier_payment.php:96
 msgid "View the GL &Journal Entries for this Payment"
 msgstr ""
 
 msgid "View the GL &Journal Entries for this Payment"
 msgstr ""
 
-#: purchasing/supplier_payment.php:104
+#: purchasing/supplier_payment.php:98
 msgid "Enter another supplier &payment"
 msgstr ""
 
 msgid "Enter another supplier &payment"
 msgstr ""
 
-#: purchasing/supplier_payment.php:105 sales/customer_payments.php:107
+#: purchasing/supplier_payment.php:99 sales/customer_payments.php:114
 msgid "Enter Other &Payment"
 msgstr ""
 
 msgid "Enter Other &Payment"
 msgstr ""
 
-#: purchasing/supplier_payment.php:106
+#: purchasing/supplier_payment.php:100
 msgid "Enter &Customer Payment"
 msgstr ""
 
 msgid "Enter &Customer Payment"
 msgstr ""
 
-#: purchasing/supplier_payment.php:107 sales/customer_payments.php:105
+#: purchasing/supplier_payment.php:101 sales/customer_payments.php:112
 msgid "Enter Other &Deposit"
 msgstr ""
 
 msgid "Enter Other &Deposit"
 msgstr ""
 
-#: purchasing/supplier_payment.php:108 sales/customer_payments.php:108
+#: purchasing/supplier_payment.php:102 sales/customer_payments.php:115
 msgid "Bank Account &Transfer"
 msgstr ""
 
 msgid "Bank Account &Transfer"
 msgstr ""
 
-#: purchasing/supplier_payment.php:171
+#: purchasing/supplier_payment.php:165
 msgid "The entered discount is invalid or less than zero."
 msgstr ""
 
 msgid "The entered discount is invalid or less than zero."
 msgstr ""
 
-#: purchasing/supplier_payment.php:179
+#: purchasing/supplier_payment.php:173
 msgid ""
 "The total of the amount and the discount is zero or negative. Please enter "
 "positive values."
 msgstr ""
 
 msgid ""
 "The total of the amount and the discount is zero or negative. Please enter "
 "positive values."
 msgstr ""
 
-#: purchasing/supplier_payment.php:186
+#: purchasing/supplier_payment.php:180
 msgid "The entered bank amount is zero or negative."
 msgstr ""
 
 msgid "The entered bank amount is zero or negative."
 msgstr ""
 
-#: purchasing/supplier_payment.php:276
+#: purchasing/supplier_payment.php:270
 msgid "Payment To:"
 msgstr ""
 
 msgid "Payment To:"
 msgstr ""
 
-#: purchasing/supplier_payment.php:294
+#: purchasing/supplier_payment.php:295
 msgid "From Bank Account:"
 msgstr ""
 
 msgid "From Bank Account:"
 msgstr ""
 
-#: purchasing/supplier_payment.php:300
-#: purchasing/view/view_supp_payment.php:55
+#: purchasing/supplier_payment.php:301 purchasing/view/view_supp_payment.php:55
 msgid "Date Paid"
 msgstr ""
 
 msgid "Date Paid"
 msgstr ""
 
-#: purchasing/supplier_payment.php:316
+#: purchasing/supplier_payment.php:317
 msgid "Bank Amount:"
 msgstr ""
 
 msgid "Bank Amount:"
 msgstr ""
 
-#: purchasing/supplier_payment.php:329 sales/customer_payments.php:374
+#: purchasing/supplier_payment.php:344 sales/customer_payments.php:395
 msgid "Amount of Discount:"
 msgstr ""
 
 msgid "Amount of Discount:"
 msgstr ""
 
-#: purchasing/supplier_payment.php:330
+#: purchasing/supplier_payment.php:345
 msgid "Amount of Payment:"
 msgstr ""
 
 msgid "Amount of Payment:"
 msgstr ""
 
-#: purchasing/supplier_payment.php:334
+#: purchasing/supplier_payment.php:349
 msgid "Enter Payment"
 msgstr ""
 
 msgid "Enter Payment"
 msgstr ""
 
@@ -11001,24 +11504,26 @@ msgid ""
 msgstr ""
 
 #: purchasing/view/view_grn.php:37 purchasing/view/view_po.php:41
 msgstr ""
 
 #: purchasing/view/view_grn.php:37 purchasing/view/view_po.php:41
-#: sales/view/view_sales_order.php:216
+#: sales/view/view_sales_order.php:218
 msgid "Line Details"
 msgstr ""
 
 msgid "Line Details"
 msgstr ""
 
-#: purchasing/view/view_grn.php:40 reporting/includes/doctext.inc:76
-#: reporting/includes/doctext.inc:191 reporting/includes/doctext.inc:243
-#: sales/inquiry/sales_deliveries_view.php:175
-msgid "Delivery Date"
+#: purchasing/view/view_grn.php:40
+msgid "Required by"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/view/view_grn.php:70 purchasing/view/view_po.php:84
+#: purchasing/view/view_grn.php:80 purchasing/view/view_po.php:84
 #: purchasing/view/view_supp_credit.php:60
 #: purchasing/view/view_supp_invoice.php:66 sales/view/view_credit.php:135
 #: purchasing/view/view_supp_credit.php:60
 #: purchasing/view/view_supp_invoice.php:66 sales/view/view_credit.php:135
-#: sales/view/view_sales_order.php:253
+#: sales/view/view_sales_order.php:255
 msgid "Sub Total"
 msgstr ""
 
 msgid "Sub Total"
 msgstr ""
 
-#: purchasing/view/view_grn.php:86
+#: purchasing/view/view_grn.php:97
+msgid "Marked items were delivered overdue."
+msgstr ""
+
+#: purchasing/view/view_grn.php:99
 msgid "This delivery has been voided."
 msgstr ""
 
 msgid "This delivery has been voided."
 msgstr ""
 
@@ -11036,11 +11541,11 @@ msgstr ""
 
 #: purchasing/view/view_po.php:100
 #: purchasing/inquiry/supplier_allocation_inquiry.php:158
 
 #: purchasing/view/view_po.php:100
 #: purchasing/inquiry/supplier_allocation_inquiry.php:158
-#: purchasing/inquiry/supplier_inquiry.php:193
-#: sales/inquiry/customer_allocation_inquiry.php:167
-#: sales/inquiry/customer_inquiry.php:218
-#: sales/inquiry/sales_deliveries_view.php:195
-#: sales/inquiry/sales_orders_view.php:311
+#: purchasing/inquiry/supplier_inquiry.php:199
+#: 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:318
 msgid "Marked items are overdue."
 msgstr ""
 
 msgid "Marked items are overdue."
 msgstr ""
 
@@ -11087,12 +11592,12 @@ msgstr ""
 msgid "SUPPLIER INVOICE"
 msgstr ""
 
 msgid "SUPPLIER INVOICE"
 msgstr ""
 
-#: purchasing/view/view_supp_invoice.php:73 reporting/rep107.php:285
-#: reporting/rep107.php:291 sales/view/view_invoice.php:168
+#: purchasing/view/view_supp_invoice.php:73 reporting/rep107.php:307
+#: reporting/rep107.php:313 sales/view/view_invoice.php:168
 msgid "TOTAL INVOICE"
 msgstr ""
 
 msgid "TOTAL INVOICE"
 msgstr ""
 
-#: purchasing/view/view_supp_invoice.php:77 sales/view/view_invoice.php:172
+#: purchasing/view/view_supp_invoice.php:77 sales/view/view_invoice.php:175
 msgid "This invoice has been voided."
 msgstr ""
 
 msgid "This invoice has been voided."
 msgstr ""
 
@@ -11112,10 +11617,10 @@ msgstr ""
 msgid "Payment Currency"
 msgstr ""
 
 msgid "Payment Currency"
 msgstr ""
 
-#: purchasing/view/view_supp_payment.php:62 reporting/rep112.php:155
+#: 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
 #: reporting/rep210.php:164 sales/customer_delivery.php:421
 #: sales/customer_invoice.php:519 sales/customer_invoice.php:522
-#: sales/view/view_receipt.php:45 sales/view/view_sales_order.php:220
+#: sales/view/view_receipt.php:45 sales/view/view_sales_order.php:222
 msgid "Discount"
 msgstr ""
 
 msgid "Discount"
 msgstr ""
 
@@ -11123,197 +11628,203 @@ msgstr ""
 msgid "Supplier's Currency"
 msgstr ""
 
 msgid "Supplier's Currency"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:27 sales/manage/customer_branches.php:37
+#: 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 ""
 
 #: 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:90
+#: 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
+msgid ""
+"Cannot delete the supplier record because purchase orders have been created "
+"against this supplier."
+msgstr ""
+
+#: purchasing/manage/suppliers.php:139
+msgid "Supplier has been deleted."
+msgstr ""
+
+#: purchasing/manage/suppliers.php:200
 msgid "Basic Data"
 msgstr ""
 
 msgid "Basic Data"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:92
+#: purchasing/manage/suppliers.php:202
 msgid "Supplier Name:"
 msgstr ""
 
 msgid "Supplier Name:"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:93
+#: purchasing/manage/suppliers.php:203
 msgid "Supplier Short Name:"
 msgstr ""
 
 msgid "Supplier Short Name:"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:96
+#: purchasing/manage/suppliers.php:206
 msgid "Website:"
 msgstr ""
 
 msgid "Website:"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:108
+#: purchasing/manage/suppliers.php:218
 msgid "Our Customer No:"
 msgstr ""
 
 msgid "Our Customer No:"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:110
+#: purchasing/manage/suppliers.php:220
 msgid "Purchasing"
 msgstr ""
 
 msgid "Purchasing"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:111
+#: purchasing/manage/suppliers.php:221
 msgid "Bank Name/Account:"
 msgstr ""
 
 msgid "Bank Name/Account:"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:112 sales/manage/customers.php:269
+#: purchasing/manage/suppliers.php:222 sales/manage/customers.php:270
 msgid "Credit Limit:"
 msgstr ""
 
 msgid "Credit Limit:"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:113 sales/manage/customers.php:271
+#: purchasing/manage/suppliers.php:223 sales/manage/customers.php:272
 msgid "Payment Terms:"
 msgstr ""
 
 msgid "Payment Terms:"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:119 purchasing/manage/suppliers.php:122
+#: purchasing/manage/suppliers.php:229 purchasing/manage/suppliers.php:232
 msgid "Prices contain tax included:"
 msgstr ""
 
 msgid "Prices contain tax included:"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:127 reporting/rep704.php:95
-#: reporting/rep704.php:105 reporting/rep704.php:113
+#: purchasing/manage/suppliers.php:237 reporting/rep704.php:104
+#: reporting/rep704.php:114 reporting/rep704.php:122
 msgid "Accounts"
 msgstr ""
 
 msgid "Accounts"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:128
+#: purchasing/manage/suppliers.php:238
 msgid "Accounts Payable Account:"
 msgstr ""
 
 msgid "Accounts Payable Account:"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:129
+#: purchasing/manage/suppliers.php:239
 msgid "Purchase Account:"
 msgstr ""
 
 msgid "Purchase Account:"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:130
+#: purchasing/manage/suppliers.php:240
 msgid "Use Item Inventory/COGS Account"
 msgstr ""
 
 msgid "Use Item Inventory/COGS Account"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:133 purchasing/manage/suppliers.php:137
+#: purchasing/manage/suppliers.php:243 purchasing/manage/suppliers.php:247
 msgid "Contact Data"
 msgstr ""
 
 msgid "Contact Data"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:140
+#: purchasing/manage/suppliers.php:250
 msgid "System default"
 msgstr ""
 
 msgid "System default"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:159 sales/manage/customer_branches.php:259
+#: purchasing/manage/suppliers.php:269 sales/manage/customer_branches.php:259
 msgid "Addresses"
 msgstr ""
 
 msgid "Addresses"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:160 reporting/rep205.php:93
+#: purchasing/manage/suppliers.php:270 reporting/rep205.php:93
 #: sales/manage/customer_branches.php:260
 msgid "Mailing Address:"
 msgstr ""
 
 #: sales/manage/customer_branches.php:260
 msgid "Mailing Address:"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:161
+#: purchasing/manage/suppliers.php:271
 msgid "Physical Address:"
 msgstr ""
 
 msgid "Physical Address:"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:163
+#: purchasing/manage/suppliers.php:273
 msgid "General"
 msgstr ""
 
 msgid "General"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:164 reporting/rep205.php:170
-#: sales/manage/customer_branches.php:262 sales/manage/customers.php:292
+#: purchasing/manage/suppliers.php:274 reporting/rep103.php:258
+#: reporting/rep205.php:170 sales/manage/customer_branches.php:262
+#: sales/manage/customers.php:293
 msgid "General Notes:"
 msgstr ""
 
 msgid "General Notes:"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:166
+#: purchasing/manage/suppliers.php:276
 msgid "Supplier status:"
 msgstr ""
 
 msgid "Supplier status:"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:172
+#: purchasing/manage/suppliers.php:283
 msgid "Update Supplier"
 msgstr ""
 
 msgid "Update Supplier"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:173
-msgid "Update supplier data"
-msgstr ""
-
-#: purchasing/manage/suppliers.php:174
-msgid "Select this supplier and return to document entry."
-msgstr ""
-
-#: purchasing/manage/suppliers.php:175
-msgid "Delete Supplier"
-msgstr ""
-
-#: purchasing/manage/suppliers.php:176
-msgid "Delete supplier data if have been never used"
-msgstr ""
-
-#: purchasing/manage/suppliers.php:180
-msgid "Add New Supplier Details"
-msgstr ""
-
-#: purchasing/manage/suppliers.php:199
-msgid "The supplier name must be entered."
-msgstr ""
-
-#: purchasing/manage/suppliers.php:206
-msgid "The supplier short name must be entered."
-msgstr ""
-
-#: purchasing/manage/suppliers.php:226
-msgid "Supplier has been updated."
+#: purchasing/manage/suppliers.php:284
+msgid "Update supplier data"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/manage/suppliers.php:244
-msgid "A new supplier has been added."
+#: purchasing/manage/suppliers.php:285
+msgid "Select this supplier and return to document entry."
 msgstr ""
 
 msgstr ""
 
-#: purchasing/manage/suppliers.php:262
-msgid ""
-"Cannot delete this supplier because there are transactions that refer to "
-"this supplier."
+#: purchasing/manage/suppliers.php:286
+msgid "Delete Supplier"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/manage/suppliers.php:270
-msgid ""
-"Cannot delete the supplier record because purchase orders have been created "
-"against this supplier."
+#: purchasing/manage/suppliers.php:287
+msgid "Delete supplier data if have been never used"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/manage/suppliers.php:290
-#: purchasing/inquiry/po_search_completed.php:95
-#: purchasing/inquiry/po_search.php:76
-#: purchasing/inquiry/supplier_allocation_inquiry.php:48
-msgid "Select a supplier: "
+#: purchasing/manage/suppliers.php:291
+msgid "Add New Supplier Details"
 msgstr ""
 
 msgstr ""
 
-#: purchasing/manage/suppliers.php:291
+#: purchasing/manage/suppliers.php:303
 msgid "New supplier"
 msgstr ""
 
 msgid "New supplier"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:310 sales/manage/customer_branches.php:311
-#: sales/manage/customers.php:351
+#: purchasing/manage/suppliers.php:322 sales/manage/customer_branches.php:311
+#: sales/manage/customers.php:353
 msgid "&Contacts"
 msgstr ""
 
 msgid "&Contacts"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:312
+#: purchasing/manage/suppliers.php:324
 msgid "Purchase &Orders"
 msgstr ""
 
 msgid "Purchase &Orders"
 msgstr ""
 
+#: purchasing/manage/suppliers.php:325 sales/manage/customers.php:356
+msgid "Attachments"
+msgstr ""
+
 #: purchasing/inquiry/po_search_completed.php:25
 msgid "Search Purchase Orders"
 msgstr ""
 
 #: purchasing/inquiry/po_search_completed.php:25
 msgid "Search Purchase Orders"
 msgstr ""
 
-#: purchasing/inquiry/po_search_completed.php:85
+#: purchasing/inquiry/po_search_completed.php:46
+#: purchasing/inquiry/po_search.php:99
+msgid "Receive"
+msgstr ""
+
+#: purchasing/inquiry/po_search_completed.php:94
 msgid "into location:"
 msgstr ""
 
 msgid "into location:"
 msgstr ""
 
-#: purchasing/inquiry/po_search_completed.php:97
+#: purchasing/inquiry/po_search_completed.php:106
 msgid "Also closed:"
 msgstr ""
 
 msgid "Also closed:"
 msgstr ""
 
-#: purchasing/inquiry/po_search_completed.php:115
+#: purchasing/inquiry/po_search_completed.php:124
 #: purchasing/inquiry/po_search.php:122 reporting/includes/doctext.inc:187
 #: purchasing/inquiry/po_search.php:122 reporting/includes/doctext.inc:187
-#: sales/inquiry/sales_orders_view.php:257
+#: sales/inquiry/sales_orders_view.php:262
 msgid "Order Date"
 msgstr ""
 
 msgid "Order Date"
 msgstr ""
 
-#: purchasing/inquiry/po_search_completed.php:117
-#: purchasing/inquiry/po_search.php:124
-#: sales/inquiry/sales_orders_view.php:260
+#: purchasing/inquiry/po_search_completed.php:126
+#: purchasing/inquiry/po_search.php:124 sales/inquiry/sales_orders_view.php:265
 msgid "Order Total"
 msgstr ""
 
 msgid "Order Total"
 msgstr ""
 
@@ -11321,10 +11832,6 @@ msgstr ""
 msgid "Search Outstanding Purchase Orders"
 msgstr ""
 
 msgid "Search Outstanding Purchase Orders"
 msgstr ""
 
-#: purchasing/inquiry/po_search.php:99
-msgid "Receive"
-msgstr ""
-
 #: purchasing/inquiry/po_search.php:135
 msgid "Marked orders have overdue items."
 msgstr ""
 #: purchasing/inquiry/po_search.php:135
 msgid "Marked orders have overdue items."
 msgstr ""
@@ -11339,7 +11846,7 @@ msgid "show settled:"
 msgstr ""
 
 #: purchasing/inquiry/supplier_allocation_inquiry.php:108
 msgstr ""
 
 #: purchasing/inquiry/supplier_allocation_inquiry.php:108
-#: sales/inquiry/customer_allocation_inquiry.php:118
+#: sales/inquiry/customer_allocation_inquiry.php:119
 msgid "Payment"
 msgstr ""
 
 msgid "Payment"
 msgstr ""
 
@@ -11348,9 +11855,9 @@ msgid "Supp Reference"
 msgstr ""
 
 #: purchasing/inquiry/supplier_allocation_inquiry.php:146
 msgstr ""
 
 #: purchasing/inquiry/supplier_allocation_inquiry.php:146
-#: reporting/rep101.php:133 reporting/rep201.php:108
-#: reporting/includes/doctext.inc:246
-#: sales/inquiry/customer_allocation_inquiry.php:156
+#: reporting/rep101.php:137 reporting/rep201.php:116
+#: reporting/includes/doctext.inc:248
+#: sales/inquiry/customer_allocation_inquiry.php:157
 msgid "Allocated"
 msgstr ""
 
 msgid "Allocated"
 msgstr ""
 
@@ -11358,45 +11865,37 @@ msgstr ""
 msgid "Supplier Inquiry"
 msgstr ""
 
 msgid "Supplier Inquiry"
 msgstr ""
 
-#: purchasing/inquiry/supplier_inquiry.php:49
-msgid "Select a supplier:"
-msgstr ""
-
-#: purchasing/inquiry/supplier_inquiry.php:70 reporting/rep102.php:118
-#: reporting/rep108.php:152 reporting/rep202.php:124 reporting/rep202.php:158
-#: sales/inquiry/customer_inquiry.php:73
+#: purchasing/inquiry/supplier_inquiry.php:46 reporting/rep102.php:118
+#: reporting/rep108.php:160 reporting/rep202.php:125 reporting/rep202.php:159
+#: sales/inquiry/customer_inquiry.php:123
 msgid "Over"
 msgstr ""
 
 msgid "Over"
 msgstr ""
 
-#: purchasing/inquiry/supplier_inquiry.php:74
-#: sales/inquiry/customer_inquiry.php:76
+#: purchasing/inquiry/supplier_inquiry.php:50
+#: sales/inquiry/customer_inquiry.php:126
 msgid "Terms"
 msgstr ""
 
 msgid "Terms"
 msgstr ""
 
-#: purchasing/inquiry/supplier_inquiry.php:74 reporting/rep102.php:121
-#: reporting/rep102.php:239 reporting/rep108.php:154 reporting/rep202.php:128
-#: reporting/rep202.php:247 reporting/rep451.php:80
-#: sales/inquiry/customer_inquiry.php:76
-msgid "Current"
-msgstr ""
-
-#: purchasing/inquiry/supplier_inquiry.php:75 reporting/rep102.php:122
-#: reporting/rep108.php:154 reporting/rep202.php:129
-#: sales/inquiry/customer_inquiry.php:77
+#: purchasing/inquiry/supplier_inquiry.php:51 reporting/rep102.php:122
+#: reporting/rep108.php:162 reporting/rep202.php:130
+#: sales/inquiry/customer_inquiry.php:127
 msgid "Total Balance"
 msgstr ""
 
 msgid "Total Balance"
 msgstr ""
 
-#: purchasing/inquiry/supplier_inquiry.php:133
-#: sales/inquiry/customer_inquiry.php:153
+#: purchasing/inquiry/supplier_inquiry.php:94
+#: sales/inquiry/customer_inquiry.php:78
 msgid "Credit This"
 msgstr ""
 
 msgid "Credit This"
 msgstr ""
 
-#: purchasing/inquiry/supplier_inquiry.php:148
+#: purchasing/inquiry/supplier_inquiry.php:109
 msgid "Print Remittance"
 msgstr ""
 
 msgid "Print Remittance"
 msgstr ""
 
-#: purchasing/inquiry/suppliers_list.php:53
-#: sales/inquiry/customers_list.php:54
+#: purchasing/inquiry/supplier_inquiry.php:137
+msgid "Select a supplier:"
+msgstr ""
+
+#: purchasing/inquiry/suppliers_list.php:53 sales/inquiry/customers_list.php:54
 msgid "Tax ID"
 msgstr ""
 
 msgid "Tax ID"
 msgstr ""
 
@@ -11409,41 +11908,40 @@ msgid "Allocation of"
 msgstr ""
 
 #: purchasing/allocations/supplier_allocate.php:58
 msgstr ""
 
 #: purchasing/allocations/supplier_allocate.php:58
-#: sales/allocations/customer_allocate.php:55
+#: sales/allocations/customer_allocate.php:60
 msgid "Total:"
 msgstr ""
 
 #: purchasing/allocations/supplier_allocate.php:62
 msgid "Total:"
 msgstr ""
 
 #: purchasing/allocations/supplier_allocate.php:62
-#: sales/allocations/customer_allocate.php:59
 msgid "Amount ot be settled:"
 msgstr ""
 
 #: purchasing/allocations/supplier_allocate.php:74
 msgid "Amount ot be settled:"
 msgstr ""
 
 #: purchasing/allocations/supplier_allocate.php:74
-#: sales/allocations/customer_allocate.php:72
+#: sales/allocations/customer_allocate.php:77
 msgid "Start again allocation of selected amount"
 msgstr ""
 
 #: purchasing/allocations/supplier_allocate.php:75
 msgid "Start again allocation of selected amount"
 msgstr ""
 
 #: purchasing/allocations/supplier_allocate.php:75
-#: sales/allocations/customer_allocate.php:73
+#: sales/allocations/customer_allocate.php:78
 msgid "Process allocations"
 msgstr ""
 
 #: purchasing/allocations/supplier_allocate.php:76
 #: purchasing/allocations/supplier_allocate.php:82
 msgid "Process allocations"
 msgstr ""
 
 #: purchasing/allocations/supplier_allocate.php:76
 #: purchasing/allocations/supplier_allocate.php:82
-#: sales/allocations/customer_allocate.php:74
-#: sales/allocations/customer_allocate.php:80
+#: sales/allocations/customer_allocate.php:79
+#: sales/allocations/customer_allocate.php:85
 msgid "Back to Allocations"
 msgstr ""
 
 #: purchasing/allocations/supplier_allocate.php:77
 #: purchasing/allocations/supplier_allocate.php:83
 msgid "Back to Allocations"
 msgstr ""
 
 #: purchasing/allocations/supplier_allocate.php:77
 #: purchasing/allocations/supplier_allocate.php:83
-#: sales/allocations/customer_allocate.php:74
-#: sales/allocations/customer_allocate.php:81
+#: sales/allocations/customer_allocate.php:79
+#: sales/allocations/customer_allocate.php:86
 msgid "Abandon allocations and return to selection of allocatable amounts"
 msgstr ""
 
 #: purchasing/allocations/supplier_allocate.php:81
 msgid "Abandon allocations and return to selection of allocatable amounts"
 msgstr ""
 
 #: purchasing/allocations/supplier_allocate.php:81
-#: sales/allocations/customer_allocate.php:78
+#: sales/allocations/customer_allocate.php:83
 msgid "There are no unsettled transactions to allocate."
 msgstr ""
 
 msgid "There are no unsettled transactions to allocate."
 msgstr ""
 
@@ -11466,88 +11964,97 @@ msgid "Allocate"
 msgstr ""
 
 #: purchasing/allocations/supplier_allocation_main.php:111
 msgstr ""
 
 #: purchasing/allocations/supplier_allocation_main.php:111
-#: sales/allocations/customer_allocation_main.php:104
+#: sales/allocations/customer_allocation_main.php:109
 msgid "Marked items are settled."
 msgstr ""
 
 msgid "Marked items are settled."
 msgstr ""
 
-#: reporting/rep101.php:122 reporting/rep102.php:104 reporting/rep114.php:108
-#: reporting/rep202.php:110 reporting/rep203.php:78
+#: reporting/rep101.php:126 reporting/rep102.php:104 reporting/rep114.php:108
+#: reporting/rep115.php:150 reporting/rep202.php:111 reporting/rep203.php:78
 msgid "Balances in Home Currency"
 msgstr ""
 
 msgid "Balances in Home Currency"
 msgstr ""
 
-#: reporting/rep101.php:132 reporting/rep201.php:107 reporting/rep203.php:88
-#: reporting/rep709.php:116 reporting/includes/doctext.inc:166
-#: reporting/includes/doctext.inc:207 reporting/includes/doctext.inc:245
+#: reporting/rep101.php:136 reporting/rep201.php:115 reporting/rep203.php:88
+#: reporting/rep709.php:117 reporting/includes/doctext.inc:166
+#: reporting/includes/doctext.inc:209 reporting/includes/doctext.inc:247
 msgid "Trans Type"
 msgstr ""
 
 msgid "Trans Type"
 msgstr ""
 
-#: reporting/rep101.php:132 reporting/rep201.php:107
-#: reporting/includes/doctext.inc:245
+#: reporting/rep101.php:136 reporting/rep201.php:115
+#: reporting/includes/doctext.inc:247
 msgid "Charges"
 msgstr ""
 
 msgid "Charges"
 msgstr ""
 
-#: reporting/rep101.php:132 reporting/rep201.php:108
-#: reporting/includes/doctext.inc:246
+#: reporting/rep101.php:136 reporting/rep201.php:116
+#: reporting/includes/doctext.inc:248
 msgid "Credits"
 msgstr ""
 
 msgid "Credits"
 msgstr ""
 
-#: reporting/rep101.php:143 reporting/rep102.php:132 reporting/rep201.php:118
-#: reporting/rep202.php:139 reporting/rep203.php:97 reporting/rep303.php:135
+#: reporting/rep101.php:146 reporting/reports_main.php:39
+#: reporting/reports_main.php:168 reporting/reports_main.php:356
+msgid "Show Balance"
+msgstr ""
+
+#: reporting/rep101.php:148 reporting/rep102.php:132 reporting/rep115.php:171
+#: reporting/rep201.php:126 reporting/rep202.php:140 reporting/rep203.php:97
+#: reporting/rep206.php:124 reporting/rep303.php:238
 #: reporting/reports_main.php:41 reporting/reports_main.php:51
 #: reporting/reports_main.php:41 reporting/reports_main.php:51
-#: reporting/reports_main.php:158 reporting/reports_main.php:168
-#: reporting/reports_main.php:177 reporting/reports_main.php:229
+#: reporting/reports_main.php:63 reporting/reports_main.php:170
+#: reporting/reports_main.php:180 reporting/reports_main.php:190
+#: reporting/reports_main.php:198 reporting/reports_main.php:250
 msgid "Suppress Zeros"
 msgstr ""
 
 msgid "Suppress Zeros"
 msgstr ""
 
-#: reporting/rep101.php:145
+#: reporting/rep101.php:150
 msgid "Customer Balances"
 msgstr ""
 
 msgid "Customer Balances"
 msgstr ""
 
-#: reporting/rep101.php:256 reporting/rep102.php:226 reporting/rep106.php:181
-#: reporting/rep201.php:232 reporting/rep202.php:233 reporting/rep203.php:176
-#: reporting/rep204.php:148 reporting/rep301.php:249 reporting/rep304.php:212
-#: reporting/rep305.php:193 reporting/rep306.php:293 reporting/rep309.php:157
+#: reporting/rep101.php:271 reporting/rep102.php:226 reporting/rep105.php:177
+#: reporting/rep106.php:182 reporting/rep115.php:296 reporting/rep201.php:244
+#: reporting/rep202.php:234 reporting/rep203.php:176 reporting/rep204.php:148
+#: reporting/rep206.php:231 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 ""
 
 #: reporting/rep451.php:164
 msgid "Grand Total"
 msgstr ""
 
-#: reporting/rep102.php:98 reporting/rep106.php:99 reporting/rep202.php:104
-#: reporting/rep709.php:100 reporting/reports_main.php:50
-#: reporting/reports_main.php:93 reporting/reports_main.php:167
-#: reporting/reports_main.php:213 reporting/reports_main.php:313
-#: reporting/reports_main.php:509
+#: reporting/rep102.php:98 reporting/rep106.php:100 reporting/rep202.php:105
+#: reporting/rep709.php:101 reporting/reports_main.php:50
+#: reporting/reports_main.php:104 reporting/reports_main.php:179
+#: reporting/reports_main.php:234 reporting/reports_main.php:345
+#: reporting/reports_main.php:544
 msgid "Summary Only"
 msgstr ""
 
 msgid "Summary Only"
 msgstr ""
 
-#: reporting/rep102.php:100 reporting/rep202.php:106 reporting/rep709.php:102
+#: reporting/rep102.php:100 reporting/rep202.php:107 reporting/rep709.php:103
 msgid "Detailed Report"
 msgstr ""
 
 msgid "Detailed Report"
 msgstr ""
 
-#: reporting/rep102.php:127 reporting/rep202.php:134 reporting/rep203.php:94
-#: reporting/rep301.php:169 reporting/rep451.php:85
+#: reporting/rep102.php:127 reporting/rep202.php:135 reporting/rep203.php:94
+#: reporting/rep301.php:173 reporting/rep451.php:85
 #: reporting/reports_main.php:37 reporting/reports_main.php:46
 #: reporting/reports_main.php:37 reporting/reports_main.php:46
-#: reporting/reports_main.php:67 reporting/reports_main.php:83
-#: reporting/reports_main.php:92 reporting/reports_main.php:154
-#: reporting/reports_main.php:163 reporting/reports_main.php:174
-#: reporting/reports_main.php:210 reporting/reports_main.php:236
-#: reporting/reports_main.php:246 reporting/reports_main.php:252
-#: reporting/reports_main.php:262 reporting/reports_main.php:270
-#: reporting/reports_main.php:278 reporting/reports_main.php:310
-#: reporting/reports_main.php:333 reporting/reports_main.php:341
-#: reporting/reports_main.php:353 reporting/reports_main.php:363
-#: reporting/reports_main.php:381 reporting/reports_main.php:392
-#: reporting/reports_main.php:404 reporting/reports_main.php:417
-#: reporting/reports_main.php:433 reporting/reports_main.php:443
-#: reporting/reports_main.php:454 reporting/reports_main.php:466
-#: reporting/reports_main.php:480 reporting/reports_main.php:489
-#: reporting/reports_main.php:499 reporting/reports_main.php:508
-#: reporting/reports_main.php:515
+#: reporting/reports_main.php:58 reporting/reports_main.php:78
+#: reporting/reports_main.php:94 reporting/reports_main.php:103
+#: reporting/reports_main.php:166 reporting/reports_main.php:175
+#: reporting/reports_main.php:187 reporting/reports_main.php:195
+#: reporting/reports_main.php:231 reporting/reports_main.php:257
+#: reporting/reports_main.php:267 reporting/reports_main.php:273
+#: reporting/reports_main.php:283 reporting/reports_main.php:291
+#: reporting/reports_main.php:299 reporting/reports_main.php:306
+#: reporting/reports_main.php:342 reporting/reports_main.php:365
+#: reporting/reports_main.php:373 reporting/reports_main.php:385
+#: reporting/reports_main.php:395 reporting/reports_main.php:414
+#: reporting/reports_main.php:425 reporting/reports_main.php:437
+#: reporting/reports_main.php:450 reporting/reports_main.php:467
+#: reporting/reports_main.php:477 reporting/reports_main.php:488
+#: reporting/reports_main.php:500 reporting/reports_main.php:515
+#: reporting/reports_main.php:524 reporting/reports_main.php:534
+#: reporting/reports_main.php:543 reporting/reports_main.php:550
 msgid "End Date"
 msgstr ""
 
 msgid "End Date"
 msgstr ""
 
-#: reporting/rep102.php:131 reporting/rep202.php:138
-#: reporting/reports_main.php:49 reporting/reports_main.php:125
-#: reporting/reports_main.php:166
+#: reporting/rep102.php:131 reporting/rep202.php:139
+#: reporting/reports_main.php:49 reporting/reports_main.php:136
+#: reporting/reports_main.php:178
 msgid "Show Also Allocated"
 msgstr ""
 
 msgid "Show Also Allocated"
 msgstr ""
 
@@ -11555,7 +12062,7 @@ msgstr ""
 msgid "Aged Customer Analysis"
 msgstr ""
 
 msgid "Aged Customer Analysis"
 msgstr ""
 
-#: reporting/rep103.php:131
+#: reporting/rep103.php:131 reporting/rep115.php:136
 msgid "All Areas"
 msgstr ""
 
 msgid "All Areas"
 msgstr ""
 
@@ -11588,16 +12095,18 @@ msgid "Branch Delivery Address"
 msgstr ""
 
 #: reporting/rep103.php:158 reporting/rep205.php:99
 msgstr ""
 
 #: reporting/rep103.php:158 reporting/rep205.php:99
-#: reporting/reports_main.php:57 reporting/reports_main.php:187
+#: reporting/reports_main.php:68 reporting/reports_main.php:208
 msgid "Activity Since"
 msgstr ""
 
 msgid "Activity Since"
 msgstr ""
 
-#: reporting/rep103.php:159 reporting/reports_main.php:58
+#: reporting/rep103.php:159 reporting/rep115.php:168
+#: reporting/reports_main.php:60 reporting/reports_main.php:69
 #: sales/manage/sales_areas.php:16
 msgid "Sales Areas"
 msgstr ""
 
 #: sales/manage/sales_areas.php:16
 msgid "Sales Areas"
 msgstr ""
 
-#: reporting/rep103.php:160 reporting/reports_main.php:59
+#: reporting/rep103.php:160 reporting/rep115.php:169
+#: reporting/reports_main.php:61 reporting/reports_main.php:70
 msgid "Sales Folk"
 msgstr ""
 
 msgid "Sales Folk"
 msgstr ""
 
@@ -11621,10 +12130,6 @@ msgstr ""
 msgid "Ph"
 msgstr ""
 
 msgid "Ph"
 msgstr ""
 
-#: reporting/rep103.php:258
-msgid "Gereral Notes:"
-msgstr ""
-
 #: reporting/rep103.php:267 reporting/rep205.php:93 reporting/rep205.php:179
 msgid "Turnover"
 msgstr ""
 #: reporting/rep103.php:267 reporting/rep205.php:93 reporting/rep205.php:179
 msgid "Turnover"
 msgstr ""
@@ -11633,8 +12138,8 @@ msgstr ""
 msgid "Category/Items"
 msgstr ""
 
 msgid "Category/Items"
 msgstr ""
 
-#: reporting/rep104.php:109 reporting/rep301.php:164 reporting/rep303.php:120
-#: reporting/rep303.php:126 reporting/rep307.php:114 reporting/rep308.php:223
+#: reporting/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/rep451.php:80
 msgid "UOM"
 msgstr ""
@@ -11643,7 +12148,7 @@ msgstr ""
 msgid "GP %"
 msgstr ""
 
 msgid "GP %"
 msgstr ""
 
-#: reporting/rep104.php:117 reporting/reports_main.php:77
+#: reporting/rep104.php:117 reporting/reports_main.php:88
 msgid "Show GP %"
 msgstr ""
 
 msgid "Show GP %"
 msgstr ""
 
@@ -11655,132 +12160,136 @@ msgstr ""
 msgid "Sales Kits"
 msgstr ""
 
 msgid "Sales Kits"
 msgstr ""
 
-#: reporting/rep105.php:103
+#: reporting/rep105.php:104
 msgid "All Orders"
 msgstr ""
 
 msgid "All Orders"
 msgstr ""
 
-#: reporting/rep105.php:105 reporting/reports_main.php:86
+#: reporting/rep105.php:106 reporting/reports_main.php:97
 msgid "Back Orders Only"
 msgstr ""
 
 msgid "Back Orders Only"
 msgstr ""
 
-#: reporting/rep105.php:109 reporting/rep204.php:84
-#: sales/inquiry/customer_allocation_inquiry.php:149
-#: sales/inquiry/customer_inquiry.php:194
+#: reporting/rep105.php:110 reporting/rep204.php:84
+#: sales/inquiry/customer_allocation_inquiry.php:150
+#: sales/inquiry/customer_inquiry.php:201
 msgid "Order"
 msgstr ""
 
 msgid "Order"
 msgstr ""
 
-#: reporting/rep105.php:109 reporting/rep106.php:89
+#: reporting/rep105.php:110 reporting/rep106.php:90
 msgid "Customer Ref"
 msgstr ""
 
 msgid "Customer Ref"
 msgstr ""
 
-#: reporting/rep105.php:110
+#: reporting/rep105.php:111
 msgid "Ord Date"
 msgstr ""
 
 msgid "Ord Date"
 msgstr ""
 
-#: reporting/rep105.php:110
+#: reporting/rep105.php:111
 msgid "Del Date"
 msgstr ""
 
 msgid "Del Date"
 msgstr ""
 
-#: reporting/rep105.php:110 reporting/rep401.php:71
+#: reporting/rep105.php:111 reporting/rep401.php:71
 msgid "Loc"
 msgstr ""
 
 msgid "Loc"
 msgstr ""
 
-#: reporting/rep105.php:114 sales/customer_delivery.php:420
+#: reporting/rep105.php:115 sales/customer_delivery.php:420
 #: sales/customer_invoice.php:521 sales/includes/ui/sales_order_ui.inc:147
 msgid "Delivered"
 msgstr ""
 
 #: sales/customer_invoice.php:521 sales/includes/ui/sales_order_ui.inc:147
 msgid "Delivered"
 msgstr ""
 
-#: reporting/rep105.php:121
+#: reporting/rep105.php:122
 msgid "Selection"
 msgstr ""
 
 msgid "Selection"
 msgstr ""
 
-#: reporting/rep105.php:125
+#: reporting/rep105.php:126
 msgid "Order Status Listing"
 msgstr ""
 
 msgid "Order Status Listing"
 msgstr ""
 
-#: reporting/rep106.php:90
+#: reporting/rep106.php:91
 msgid "Inv Date"
 msgstr ""
 
 msgid "Inv Date"
 msgstr ""
 
-#: reporting/rep106.php:90 reporting/rep106.php:94 reporting/rep106.php:95
+#: reporting/rep106.php:91 reporting/rep106.php:95 reporting/rep106.php:96
 #: sales/manage/sales_people.php:99 sales/manage/sales_people.php:159
 #: sales/manage/sales_people.php:161
 msgid "Provision"
 msgstr ""
 
 #: sales/manage/sales_people.php:99 sales/manage/sales_people.php:159
 #: sales/manage/sales_people.php:161
 msgid "Provision"
 msgstr ""
 
-#: reporting/rep106.php:94
+#: reporting/rep106.php:95
 msgid "Salesman"
 msgstr ""
 
 msgid "Salesman"
 msgstr ""
 
-#: reporting/rep106.php:95 sales/manage/sales_people.php:99
+#: reporting/rep106.php:96 sales/manage/sales_people.php:99
 msgid "Break Pt."
 msgstr ""
 
 msgid "Break Pt."
 msgstr ""
 
-#: reporting/rep106.php:103
+#: reporting/rep106.php:104
 msgid "Salesman Listing"
 msgstr ""
 
 msgid "Salesman Listing"
 msgstr ""
 
-#: reporting/rep107.php:88 reporting/rep107.php:114
+#: reporting/rep107.php:99 reporting/rep107.php:131
 #: reporting/includes/doctext.inc:117
 msgid "INVOICE"
 msgstr ""
 
 #: reporting/includes/doctext.inc:117
 msgid "INVOICE"
 msgstr ""
 
-#: reporting/rep107.php:197
+#: reporting/rep107.php:219
 msgid "Prepayments invoiced to this order up to day:"
 msgstr ""
 
 msgid "Prepayments invoiced to this order up to day:"
 msgstr ""
 
-#: reporting/rep107.php:204
+#: reporting/rep107.php:226
 msgid "Invoice reference"
 msgstr ""
 
 msgid "Invoice reference"
 msgstr ""
 
-#: reporting/rep107.php:221
+#: reporting/rep107.php:243
 msgid "Total payments:"
 msgstr ""
 
 msgid "Total payments:"
 msgstr ""
 
-#: reporting/rep107.php:238 reporting/rep109.php:160 reporting/rep110.php:162
+#: reporting/rep107.php:260 reporting/rep109.php:144 reporting/rep110.php:162
 #: reporting/rep111.php:157 reporting/rep113.php:151
 #: sales/view/view_credit.php:140 sales/view/view_dispatch.php:155
 #: reporting/rep111.php:157 reporting/rep113.php:151
 #: sales/view/view_credit.php:140 sales/view/view_dispatch.php:155
-#: sales/view/view_invoice.php:160 sales/view/view_sales_order.php:246
+#: sales/view/view_invoice.php:160 sales/view/view_sales_order.php:248
 #: sales/includes/ui/sales_credit_ui.inc:217
 msgid "Shipping"
 msgstr ""
 
 #: sales/includes/ui/sales_credit_ui.inc:217
 msgid "Shipping"
 msgstr ""
 
-#: reporting/rep107.php:285 reporting/rep109.php:212 reporting/rep111.php:209
+#: reporting/rep107.php:307 reporting/rep109.php:196 reporting/rep111.php:209
 msgid "TOTAL ORDER VAT INCL."
 msgstr ""
 
 msgid "TOTAL ORDER VAT INCL."
 msgstr ""
 
-#: reporting/rep107.php:291
+#: reporting/rep107.php:313
 msgid "THIS INVOICE"
 msgstr ""
 
 msgid "THIS INVOICE"
 msgstr ""
 
-#: reporting/rep108.php:81 reporting/rep108.php:109
-#: reporting/includes/doctext.inc:237
+#: reporting/rep107.php:326
+#, php-format
+msgid "Invoice %d from %s"
+msgstr ""
+
+#: reporting/rep108.php:112 reporting/rep108.php:116
+#: reporting/includes/doctext.inc:239
 msgid "STATEMENT"
 msgstr ""
 
 msgid "STATEMENT"
 msgstr ""
 
-#: reporting/rep108.php:126
+#: reporting/rep108.php:133
 msgid "Outstanding Transactions"
 msgstr ""
 
 msgid "Outstanding Transactions"
 msgstr ""
 
-#: reporting/rep108.php:169
+#: reporting/rep108.php:177
 msgid "Statement"
 msgstr ""
 
 msgid "Statement"
 msgstr ""
 
-#: reporting/rep108.php:169
+#: reporting/rep108.php:177
 msgid "as of"
 msgstr ""
 
 msgid "as of"
 msgstr ""
 
-#: reporting/rep109.php:64 reporting/rep109.php:95 reporting/rep109.php:100
+#: reporting/rep109.php:74 reporting/rep109.php:82
 #: reporting/includes/doctext.inc:64
 msgid "SALES ORDER"
 msgstr ""
 
 #: reporting/includes/doctext.inc:64
 msgid "SALES ORDER"
 msgstr ""
 
-#: reporting/rep109.php:66 reporting/rep109.php:90 reporting/rep109.php:100
-#: reporting/includes/doctext.inc:64
+#: reporting/rep109.php:77 reporting/includes/doctext.inc:64
 msgid "QUOTE"
 msgstr ""
 
 msgid "QUOTE"
 msgstr ""
 
-#: reporting/rep109.php:166 reporting/rep111.php:163
+#: reporting/rep109.php:150 reporting/rep111.php:163
 msgid "TOTAL ORDER EX VAT"
 msgstr ""
 
 msgid "TOTAL ORDER EX VAT"
 msgstr ""
 
@@ -11805,31 +12314,32 @@ msgstr ""
 msgid "SALES QUOTATION"
 msgstr ""
 
 msgid "SALES QUOTATION"
 msgstr ""
 
-#: reporting/rep112.php:85 reporting/includes/doctext.inc:197
+#: reporting/rep112.php:87 reporting/rep112.php:112
+#: reporting/includes/doctext.inc:197
 msgid "RECEIPT"
 msgstr ""
 
 msgid "RECEIPT"
 msgstr ""
 
-#: reporting/rep112.php:119 reporting/rep210.php:127
+#: reporting/rep112.php:128 reporting/rep210.php:127
 msgid "As advance / full / part / payment towards:"
 msgstr ""
 
 msgid "As advance / full / part / payment towards:"
 msgstr ""
 
-#: reporting/rep112.php:160
+#: reporting/rep112.php:169
 msgid "TOTAL RECEIPT"
 msgstr ""
 
 msgid "TOTAL RECEIPT"
 msgstr ""
 
-#: reporting/rep112.php:171
+#: reporting/rep112.php:180
 msgid "Received / Sign"
 msgstr ""
 
 msgid "Received / Sign"
 msgstr ""
 
-#: reporting/rep112.php:173
+#: reporting/rep112.php:182
 msgid "By Cash / Cheque* / Draft No."
 msgstr ""
 
 msgid "By Cash / Cheque* / Draft No."
 msgstr ""
 
-#: reporting/rep112.php:175
+#: reporting/rep112.php:184
 msgid "Dated"
 msgstr ""
 
 msgid "Dated"
 msgstr ""
 
-#: reporting/rep112.php:178
+#: reporting/rep112.php:187
 msgid "Drawn on Bank"
 msgstr ""
 
 msgid "Drawn on Bank"
 msgstr ""
 
@@ -11846,7 +12356,7 @@ msgstr ""
 msgid "Sales Summary Report"
 msgstr ""
 
 msgid "Sales Summary Report"
 msgstr ""
 
-#: reporting/rep114.php:91 reporting/reports_main.php:68
+#: reporting/rep114.php:91 reporting/reports_main.php:79
 msgid "Tax Id Only"
 msgstr ""
 
 msgid "Tax Id Only"
 msgstr ""
 
@@ -11858,23 +12368,31 @@ msgstr ""
 msgid "Total ex. Tax"
 msgstr ""
 
 msgid "Total ex. Tax"
 msgstr ""
 
-#: reporting/rep114.php:95 reporting/rep709.php:117 taxes/tax_groups.php:174
+#: reporting/rep114.php:95 reporting/rep709.php:118 taxes/tax_groups.php:174
 msgid "Tax"
 msgstr ""
 
 msgid "Tax"
 msgstr ""
 
-#: reporting/rep201.php:97
+#: reporting/rep115.php:143
+msgid "All Sales Man"
+msgstr ""
+
+#: reporting/rep115.php:173 reporting/reports_main.php:56
+msgid "Customer Trial Balance"
+msgstr ""
+
+#: reporting/rep201.php:105 reporting/rep206.php:105
 msgid "Balances in Home currency"
 msgstr ""
 
 msgid "Balances in Home currency"
 msgstr ""
 
-#: reporting/rep201.php:120
+#: reporting/rep201.php:128
 msgid "Supplier Balances"
 msgstr ""
 
 msgid "Supplier Balances"
 msgstr ""
 
-#: reporting/rep202.php:142
+#: reporting/rep202.php:143
 msgid "currency"
 msgstr ""
 
 msgid "currency"
 msgstr ""
 
-#: reporting/rep202.php:143
+#: reporting/rep202.php:144
 msgid "Aged Supplier Analysis"
 msgstr ""
 
 msgid "Aged Supplier Analysis"
 msgstr ""
 
@@ -11914,12 +12432,16 @@ msgstr ""
 msgid "Tax_Id"
 msgstr ""
 
 msgid "Tax_Id"
 msgstr ""
 
+#: reporting/rep206.php:126
+msgid "Supplier Trial Balance"
+msgstr ""
+
 #: reporting/rep209.php:88 reporting/rep209.php:104
 #: reporting/includes/doctext.inc:170
 msgid "PURCHASE ORDER"
 msgstr ""
 
 #: reporting/rep209.php:88 reporting/rep209.php:104
 #: reporting/includes/doctext.inc:170
 msgid "PURCHASE ORDER"
 msgstr ""
 
-#: reporting/rep209.php:213
+#: reporting/rep209.php:210
 msgid "TOTAL PO"
 msgstr ""
 
 msgid "TOTAL PO"
 msgstr ""
 
@@ -11932,14 +12454,10 @@ msgstr ""
 msgid "TOTAL REMITTANCE"
 msgstr ""
 
 msgid "TOTAL REMITTANCE"
 msgstr ""
 
-#: reporting/rep301.php:173
+#: reporting/rep301.php:177
 msgid "Inventory Valuation Report"
 msgstr ""
 
 msgid "Inventory Valuation Report"
 msgstr ""
 
-#: reporting/rep302.php:123
-msgid "QOH"
-msgstr ""
-
 #: reporting/rep302.php:123
 msgid "Cust Ord"
 msgstr ""
 #: reporting/rep302.php:123
 msgid "Cust Ord"
 msgstr ""
@@ -11956,28 +12474,28 @@ msgstr ""
 msgid "Inventory Planning Report"
 msgstr ""
 
 msgid "Inventory Planning Report"
 msgstr ""
 
-#: reporting/rep303.php:108
+#: reporting/rep303.php:210
 msgid "Shortage"
 msgstr ""
 
 msgid "Shortage"
 msgstr ""
 
-#: reporting/rep303.php:120 reporting/rep303.php:126 reporting/rep305.php:106
+#: reporting/rep303.php:223 reporting/rep303.php:229 reporting/rep305.php:106
 msgid "Stock ID"
 msgstr ""
 
 msgid "Stock ID"
 msgstr ""
 
-#: reporting/rep303.php:120
+#: reporting/rep303.php:223
 msgid "Check"
 msgstr ""
 
 msgid "Check"
 msgstr ""
 
-#: reporting/rep303.php:134
+#: reporting/rep303.php:237
 msgid "Only Shortage"
 msgstr ""
 
 msgid "Only Shortage"
 msgstr ""
 
-#: reporting/rep303.php:137
+#: reporting/rep303.php:261
 msgid "Stock Check Sheets"
 msgstr ""
 
 msgid "Stock Check Sheets"
 msgstr ""
 
-#: reporting/rep304.php:127 reporting/rep305.php:106 reporting/rep306.php:141
-#: reporting/rep309.php:99
+#: reporting/rep304.php:127 reporting/rep305.php:106 reporting/rep306.php:138
+#: reporting/rep309.php:99 reporting/rep310.php:139
 msgid "Qty"
 msgstr ""
 
 msgid "Qty"
 msgstr ""
 
@@ -11985,7 +12503,7 @@ msgstr ""
 msgid "Contribution"
 msgstr ""
 
 msgid "Contribution"
 msgstr ""
 
-#: reporting/rep304.php:138 reporting/reports_main.php:240
+#: reporting/rep304.php:138 reporting/reports_main.php:261
 msgid "Show Service Items"
 msgstr ""
 
 msgid "Show Service Items"
 msgstr ""
 
@@ -12013,11 +12531,11 @@ msgstr ""
 msgid "GRN Valuation Report"
 msgstr ""
 
 msgid "GRN Valuation Report"
 msgstr ""
 
-#: reporting/rep306.php:141 reporting/rep309.php:99
+#: reporting/rep306.php:138 reporting/rep309.php:99 reporting/rep310.php:139
 msgid "Unit Price"
 msgstr ""
 
 msgid "Unit Price"
 msgstr ""
 
-#: reporting/rep306.php:154
+#: reporting/rep306.php:151
 msgid "Inventory Purchasing Report"
 msgstr ""
 
 msgid "Inventory Purchasing Report"
 msgstr ""
 
@@ -12029,31 +12547,39 @@ msgstr ""
 msgid "Inventory Movements"
 msgstr ""
 
 msgid "Inventory Movements"
 msgstr ""
 
-#: reporting/rep308.php:223
+#: reporting/rep308.php:224
 msgid "OpeningStock"
 msgstr ""
 
 msgid "OpeningStock"
 msgstr ""
 
-#: reporting/rep308.php:223
+#: reporting/rep308.php:224
 msgid "StockIn"
 msgstr ""
 
 msgid "StockIn"
 msgstr ""
 
-#: reporting/rep308.php:223
+#: reporting/rep308.php:224
 msgid "ClosingStock"
 msgstr ""
 
 msgid "ClosingStock"
 msgstr ""
 
-#: reporting/rep308.php:224
+#: reporting/rep308.php:225
 msgid "QTY"
 msgstr ""
 
 msgid "QTY"
 msgstr ""
 
-#: reporting/rep308.php:224 reporting/rep709.php:117
+#: reporting/rep308.php:225 reporting/rep709.php:118
 #: taxes/item_tax_types.php:185
 msgid "Rate"
 msgstr ""
 
 #: taxes/item_tax_types.php:185
 msgid "Rate"
 msgstr ""
 
-#: reporting/rep308.php:233
+#: reporting/rep308.php:234
 msgid "Costed Inventory Movements"
 msgstr ""
 
 msgid "Costed Inventory Movements"
 msgstr ""
 
+#: reporting/rep308.php:305
+msgid "Total Movement"
+msgstr ""
+
+#: reporting/rep308.php:311
+msgid "Total Out"
+msgstr ""
+
 #: reporting/rep309.php:99
 msgid "Item/Category"
 msgstr ""
 #: reporting/rep309.php:99
 msgid "Item/Category"
 msgstr ""
@@ -12070,6 +12596,18 @@ msgstr ""
 msgid "Gift"
 msgstr ""
 
 msgid "Gift"
 msgstr ""
 
+#: reporting/rep310.php:151
+msgid "Note"
+msgstr ""
+
+#: reporting/rep310.php:151
+msgid "The lines separate the transactions."
+msgstr ""
+
+#: reporting/rep310.php:154
+msgid "Inventory Purchasing - Transaction Based"
+msgstr ""
+
 #: reporting/rep401.php:71
 msgid "Wrk Ctr"
 msgstr ""
 #: reporting/rep401.php:71
 msgid "Wrk Ctr"
 msgstr ""
@@ -12078,16 +12616,16 @@ msgstr ""
 msgid "Bill of Material Listing"
 msgstr ""
 
 msgid "Bill of Material Listing"
 msgstr ""
 
-#: reporting/rep402.php:110
+#: reporting/rep402.php:154
 msgid "Open Only"
 msgstr ""
 
 msgid "Open Only"
 msgstr ""
 
-#: reporting/rep402.php:112
+#: reporting/rep402.php:158
 msgid "Work Order Listing"
 msgstr ""
 
 #: reporting/rep409.php:59 reporting/rep409.php:71
 msgid "Work Order Listing"
 msgstr ""
 
 #: reporting/rep409.php:59 reporting/rep409.php:71
-#: reporting/includes/doctext.inc:213
+#: reporting/includes/doctext.inc:215
 msgid "WORK ORDER"
 msgstr ""
 
 msgid "WORK ORDER"
 msgstr ""
 
@@ -12107,16 +12645,20 @@ msgstr ""
 msgid "Dimension Summary"
 msgstr ""
 
 msgid "Dimension Summary"
 msgstr ""
 
-#: reporting/rep601.php:86 reporting/rep602.php:87
-#: reporting/includes/doctext.inc:259
+#: reporting/rep601.php:74
+msgid "Bank Statement"
+msgstr ""
+
+#: reporting/rep601.php:95 reporting/rep602.php:87
+#: reporting/includes/doctext.inc:261
 msgid "Bank Account"
 msgstr ""
 
 msgid "Bank Account"
 msgstr ""
 
-#: reporting/rep601.php:151 reporting/rep602.php:151
+#: reporting/rep601.php:159 reporting/rep602.php:151
 msgid "Total Debit / Credit"
 msgstr ""
 
 msgid "Total Debit / Credit"
 msgstr ""
 
-#: reporting/rep601.php:168 reporting/rep602.php:167
+#: reporting/rep601.php:176 reporting/rep602.php:167
 msgid "Net Change"
 msgstr ""
 
 msgid "Net Change"
 msgstr ""
 
@@ -12156,55 +12698,56 @@ msgstr ""
 msgid "GL Account Transactions"
 msgstr ""
 
 msgid "GL Account Transactions"
 msgstr ""
 
-#: reporting/rep705.php:244 reporting/rep705.php:257 reporting/rep705.php:268
-#: reporting/reports_main.php:372 reporting/reports_main.php:425
-#: reporting/reports_main.php:473
-msgid "Year"
+#: reporting/rep705.php:215 reporting/reports_main.php:410
+#: reporting/reports_main.php:463 reporting/reports_main.php:511
+msgid "Amounts in thousands"
 msgstr ""
 
 msgstr ""
 
-#: reporting/rep705.php:250 reporting/rep705.php:261 reporting/rep705.php:270
-#: reporting/rep706.php:198 reporting/rep706.php:206 reporting/rep706.php:212
-#: reporting/rep707.php:222 reporting/rep707.php:230 reporting/rep707.php:236
-msgid "Tags"
+#: reporting/rep705.php:264 reporting/rep705.php:276 reporting/rep705.php:286
+#: reporting/reports_main.php:404 reporting/reports_main.php:458
+#: reporting/reports_main.php:507
+msgid "Year"
 msgstr ""
 
 msgstr ""
 
-#: reporting/rep705.php:251 reporting/rep705.php:262 reporting/rep705.php:271
-msgid "Amounts in thousands"
+#: reporting/rep705.php:270 reporting/rep705.php:280 reporting/rep705.php:288
+#: reporting/rep706.php:201 reporting/rep706.php:209 reporting/rep706.php:215
+#: reporting/rep707.php:224 reporting/rep707.php:232 reporting/rep707.php:238
+msgid "Tags"
 msgstr ""
 
 msgstr ""
 
-#: reporting/rep705.php:275
+#: reporting/rep705.php:292
 msgid "Annual Expense Breakdown"
 msgstr ""
 
 msgid "Annual Expense Breakdown"
 msgstr ""
 
-#: reporting/rep706.php:186
+#: reporting/rep706.php:189
 msgid "Close Balance"
 msgstr ""
 
 msgid "Close Balance"
 msgstr ""
 
-#: reporting/rep707.php:258
+#: reporting/rep707.php:262
 msgid "Profit and Loss Statement"
 msgstr ""
 
 msgid "Profit and Loss Statement"
 msgstr ""
 
-#: reporting/rep709.php:98
+#: reporting/rep709.php:99
 msgid "Tax Report"
 msgstr ""
 
 msgid "Tax Report"
 msgstr ""
 
-#: reporting/rep709.php:116
+#: reporting/rep709.php:117
 msgid "Branch Name"
 msgstr ""
 
 msgid "Branch Name"
 msgstr ""
 
-#: reporting/rep709.php:117
+#: reporting/rep709.php:118
 msgid "Net"
 msgstr ""
 
 msgid "Net"
 msgstr ""
 
-#: reporting/rep709.php:189
+#: reporting/rep709.php:191
 msgid "Tax Rate"
 msgstr ""
 
 msgid "Tax Rate"
 msgstr ""
 
-#: reporting/rep709.php:189
+#: reporting/rep709.php:191
 msgid "Net Tax"
 msgstr ""
 
 msgid "Net Tax"
 msgstr ""
 
-#: reporting/rep709.php:207
+#: reporting/rep709.php:209
 msgid "Exempt"
 msgstr ""
 
 msgid "Exempt"
 msgstr ""
 
@@ -12220,11 +12763,11 @@ msgstr ""
 msgid "Action"
 msgstr ""
 
 msgid "Action"
 msgstr ""
 
-#: reporting/rep710.php:89 reporting/reports_main.php:513
+#: reporting/rep710.php:89 reporting/reports_main.php:548
 msgid "Audit Trail"
 msgstr ""
 
 msgid "Audit Trail"
 msgstr ""
 
-#: reporting/rep710.php:111
+#: reporting/rep710.php:112
 msgid "Changed"
 msgstr ""
 
 msgid "Changed"
 msgstr ""
 
@@ -12236,75 +12779,74 @@ msgstr ""
 msgid "Customer &Balances"
 msgstr ""
 
 msgid "Customer &Balances"
 msgstr ""
 
-#: reporting/reports_main.php:39 reporting/reports_main.php:156
-#: reporting/reports_main.php:324
-msgid "Show Balance"
-msgstr ""
-
 #: reporting/reports_main.php:40 reporting/reports_main.php:48
 #: reporting/reports_main.php:40 reporting/reports_main.php:48
-#: reporting/reports_main.php:73 reporting/reports_main.php:100
-#: reporting/reports_main.php:110 reporting/reports_main.php:124
-#: reporting/reports_main.php:132 reporting/reports_main.php:140
-#: reporting/reports_main.php:147 reporting/reports_main.php:157
-#: reporting/reports_main.php:165 reporting/reports_main.php:176
-#: reporting/reports_main.php:196 reporting/reports_main.php:203
+#: reporting/reports_main.php:62 reporting/reports_main.php:84
+#: reporting/reports_main.php:111 reporting/reports_main.php:121
+#: reporting/reports_main.php:135 reporting/reports_main.php:143
+#: reporting/reports_main.php:151 reporting/reports_main.php:158
+#: reporting/reports_main.php:169 reporting/reports_main.php:177
+#: reporting/reports_main.php:189 reporting/reports_main.php:197
+#: reporting/reports_main.php:217 reporting/reports_main.php:224
 msgid "Currency Filter"
 msgstr ""
 
 #: reporting/reports_main.php:43 reporting/reports_main.php:54
 msgid "Currency Filter"
 msgstr ""
 
 #: reporting/reports_main.php:43 reporting/reports_main.php:54
-#: reporting/reports_main.php:63 reporting/reports_main.php:70
-#: reporting/reports_main.php:79 reporting/reports_main.php:88
-#: reporting/reports_main.php:95 reporting/reports_main.php:105
-#: reporting/reports_main.php:114 reporting/reports_main.php:121
-#: reporting/reports_main.php:128 reporting/reports_main.php:136
-#: reporting/reports_main.php:143 reporting/reports_main.php:149
-#: reporting/reports_main.php:160 reporting/reports_main.php:171
-#: reporting/reports_main.php:179 reporting/reports_main.php:184
-#: reporting/reports_main.php:191 reporting/reports_main.php:199
-#: reporting/reports_main.php:206 reporting/reports_main.php:215
-#: reporting/reports_main.php:221 reporting/reports_main.php:232
-#: reporting/reports_main.php:242 reporting/reports_main.php:248
-#: reporting/reports_main.php:258 reporting/reports_main.php:266
-#: reporting/reports_main.php:274 reporting/reports_main.php:281
-#: reporting/reports_main.php:290 reporting/reports_main.php:297
-#: reporting/reports_main.php:304 reporting/reports_main.php:315
-#: reporting/reports_main.php:326 reporting/reports_main.php:336
-#: reporting/reports_main.php:349 reporting/reports_main.php:356
-#: reporting/reports_main.php:369 reporting/reports_main.php:377
-#: reporting/reports_main.php:388 reporting/reports_main.php:400
-#: reporting/reports_main.php:410 reporting/reports_main.php:422
-#: reporting/reports_main.php:429 reporting/reports_main.php:439
-#: reporting/reports_main.php:450 reporting/reports_main.php:459
-#: reporting/reports_main.php:470 reporting/reports_main.php:476
-#: reporting/reports_main.php:485 reporting/reports_main.php:495
-#: reporting/reports_main.php:503 reporting/reports_main.php:511
-#: reporting/reports_main.php:519
+#: reporting/reports_main.php:65 reporting/reports_main.php:74
+#: reporting/reports_main.php:81 reporting/reports_main.php:90
+#: reporting/reports_main.php:99 reporting/reports_main.php:106
+#: reporting/reports_main.php:116 reporting/reports_main.php:125
+#: reporting/reports_main.php:132 reporting/reports_main.php:139
+#: reporting/reports_main.php:147 reporting/reports_main.php:154
+#: reporting/reports_main.php:161 reporting/reports_main.php:172
+#: reporting/reports_main.php:183 reporting/reports_main.php:192
+#: reporting/reports_main.php:200 reporting/reports_main.php:205
+#: reporting/reports_main.php:212 reporting/reports_main.php:220
+#: reporting/reports_main.php:227 reporting/reports_main.php:236
+#: reporting/reports_main.php:242 reporting/reports_main.php:253
+#: reporting/reports_main.php:263 reporting/reports_main.php:269
+#: reporting/reports_main.php:279 reporting/reports_main.php:287
+#: reporting/reports_main.php:295 reporting/reports_main.php:302
+#: reporting/reports_main.php:312 reporting/reports_main.php:321
+#: reporting/reports_main.php:329 reporting/reports_main.php:336
+#: reporting/reports_main.php:347 reporting/reports_main.php:358
+#: reporting/reports_main.php:368 reporting/reports_main.php:381
+#: reporting/reports_main.php:388 reporting/reports_main.php:401
+#: reporting/reports_main.php:409 reporting/reports_main.php:421
+#: reporting/reports_main.php:433 reporting/reports_main.php:443
+#: reporting/reports_main.php:455 reporting/reports_main.php:462
+#: reporting/reports_main.php:473 reporting/reports_main.php:484
+#: reporting/reports_main.php:493 reporting/reports_main.php:504
+#: reporting/reports_main.php:510 reporting/reports_main.php:520
+#: reporting/reports_main.php:530 reporting/reports_main.php:538
+#: reporting/reports_main.php:546 reporting/reports_main.php:554
 msgid "Orientation"
 msgstr ""
 
 #: reporting/reports_main.php:44 reporting/reports_main.php:55
 msgid "Orientation"
 msgstr ""
 
 #: reporting/reports_main.php:44 reporting/reports_main.php:55
-#: reporting/reports_main.php:64 reporting/reports_main.php:71
-#: reporting/reports_main.php:80 reporting/reports_main.php:89
-#: reporting/reports_main.php:96 reporting/reports_main.php:161
-#: reporting/reports_main.php:172 reporting/reports_main.php:180
-#: reporting/reports_main.php:185 reporting/reports_main.php:192
-#: reporting/reports_main.php:216 reporting/reports_main.php:222
-#: reporting/reports_main.php:233 reporting/reports_main.php:243
-#: reporting/reports_main.php:249 reporting/reports_main.php:259
-#: reporting/reports_main.php:267 reporting/reports_main.php:275
-#: reporting/reports_main.php:282 reporting/reports_main.php:291
-#: reporting/reports_main.php:298 reporting/reports_main.php:316
-#: reporting/reports_main.php:327 reporting/reports_main.php:337
-#: reporting/reports_main.php:343 reporting/reports_main.php:350
-#: reporting/reports_main.php:357 reporting/reports_main.php:370
-#: reporting/reports_main.php:378 reporting/reports_main.php:389
-#: reporting/reports_main.php:401 reporting/reports_main.php:411
-#: reporting/reports_main.php:423 reporting/reports_main.php:430
-#: reporting/reports_main.php:440 reporting/reports_main.php:451
-#: reporting/reports_main.php:460 reporting/reports_main.php:471
-#: reporting/reports_main.php:477 reporting/reports_main.php:486
-#: reporting/reports_main.php:496 reporting/reports_main.php:504
-#: reporting/reports_main.php:512 reporting/reports_main.php:520
+#: reporting/reports_main.php:66 reporting/reports_main.php:75
+#: reporting/reports_main.php:82 reporting/reports_main.php:91
+#: reporting/reports_main.php:100 reporting/reports_main.php:107
+#: reporting/reports_main.php:173 reporting/reports_main.php:184
+#: reporting/reports_main.php:193 reporting/reports_main.php:201
+#: reporting/reports_main.php:206 reporting/reports_main.php:213
+#: reporting/reports_main.php:237 reporting/reports_main.php:243
+#: reporting/reports_main.php:254 reporting/reports_main.php:264
+#: reporting/reports_main.php:270 reporting/reports_main.php:280
+#: reporting/reports_main.php:288 reporting/reports_main.php:296
+#: reporting/reports_main.php:303 reporting/reports_main.php:313
+#: reporting/reports_main.php:322 reporting/reports_main.php:330
+#: reporting/reports_main.php:348 reporting/reports_main.php:359
+#: reporting/reports_main.php:369 reporting/reports_main.php:375
+#: reporting/reports_main.php:382 reporting/reports_main.php:389
+#: reporting/reports_main.php:402 reporting/reports_main.php:411
+#: reporting/reports_main.php:422 reporting/reports_main.php:434
+#: reporting/reports_main.php:444 reporting/reports_main.php:456
+#: reporting/reports_main.php:464 reporting/reports_main.php:474
+#: reporting/reports_main.php:485 reporting/reports_main.php:494
+#: reporting/reports_main.php:505 reporting/reports_main.php:512
+#: reporting/reports_main.php:521 reporting/reports_main.php:531
+#: reporting/reports_main.php:539 reporting/reports_main.php:547
+#: reporting/reports_main.php:555
 msgid "Destination"
 msgstr ""
 
 msgid "Destination"
 msgstr ""
 
@@ -12312,313 +12854,323 @@ msgstr ""
 msgid "&Aged Customer Analysis"
 msgstr ""
 
 msgid "&Aged Customer Analysis"
 msgstr ""
 
-#: reporting/reports_main.php:52 reporting/reports_main.php:169
-#: reporting/reports_main.php:386 reporting/reports_main.php:398
-#: reporting/reports_main.php:437 reporting/reports_main.php:448
-#: reporting/reports_main.php:483 reporting/reports_main.php:493
+#: reporting/reports_main.php:52 reporting/reports_main.php:181
+#: reporting/reports_main.php:419 reporting/reports_main.php:431
+#: reporting/reports_main.php:471 reporting/reports_main.php:482
+#: reporting/reports_main.php:518 reporting/reports_main.php:528
 msgid "Graphics"
 msgstr ""
 
 msgid "Graphics"
 msgstr ""
 
-#: reporting/reports_main.php:56
+#: reporting/reports_main.php:67
 msgid "Customer &Detail Listing"
 msgstr ""
 
 msgid "Customer &Detail Listing"
 msgstr ""
 
-#: reporting/reports_main.php:60 reporting/reports_main.php:188
+#: reporting/reports_main.php:71 reporting/reports_main.php:209
 msgid "Activity Greater Than"
 msgstr ""
 
 msgid "Activity Greater Than"
 msgstr ""
 
-#: reporting/reports_main.php:61 reporting/reports_main.php:189
+#: reporting/reports_main.php:72 reporting/reports_main.php:210
 msgid "Activity Less Than"
 msgstr ""
 
 msgid "Activity Less Than"
 msgstr ""
 
-#: reporting/reports_main.php:65
+#: reporting/reports_main.php:76
 msgid "Sales &Summary Report"
 msgstr ""
 
 msgid "Sales &Summary Report"
 msgstr ""
 
-#: reporting/reports_main.php:72
+#: reporting/reports_main.php:83
 msgid "&Price Listing"
 msgstr ""
 
 msgid "&Price Listing"
 msgstr ""
 
-#: reporting/reports_main.php:74 reporting/reports_main.php:84
-#: reporting/reports_main.php:211 reporting/reports_main.php:218
-#: reporting/reports_main.php:224 reporting/reports_main.php:237
-#: reporting/reports_main.php:253 reporting/reports_main.php:263
-#: reporting/reports_main.php:271 reporting/reports_main.php:279
+#: reporting/reports_main.php:85 reporting/reports_main.php:95
+#: reporting/reports_main.php:232 reporting/reports_main.php:239
+#: reporting/reports_main.php:245 reporting/reports_main.php:258
+#: reporting/reports_main.php:274 reporting/reports_main.php:284
+#: reporting/reports_main.php:292 reporting/reports_main.php:300
+#: reporting/reports_main.php:307
 msgid "Inventory Category"
 msgstr ""
 
 msgid "Inventory Category"
 msgstr ""
 
-#: reporting/reports_main.php:75 sales/manage/sales_types.php:16
+#: reporting/reports_main.php:86 sales/manage/sales_types.php:16
 msgid "Sales Types"
 msgstr ""
 
 msgid "Sales Types"
 msgstr ""
 
-#: reporting/reports_main.php:76 reporting/reports_main.php:226
+#: reporting/reports_main.php:87 reporting/reports_main.php:247
 msgid "Show Pictures"
 msgstr ""
 
 msgid "Show Pictures"
 msgstr ""
 
-#: reporting/reports_main.php:81
+#: reporting/reports_main.php:92
 msgid "&Order Status Listing"
 msgstr ""
 
 msgid "&Order Status Listing"
 msgstr ""
 
-#: reporting/reports_main.php:85
+#: reporting/reports_main.php:96
 msgid "Stock Location"
 msgstr ""
 
 msgid "Stock Location"
 msgstr ""
 
-#: reporting/reports_main.php:90
+#: reporting/reports_main.php:101
 msgid "&Salesman Listing"
 msgstr ""
 
 msgid "&Salesman Listing"
 msgstr ""
 
-#: reporting/reports_main.php:97
+#: reporting/reports_main.php:108
 msgid "Print &Invoices"
 msgstr ""
 
 msgid "Print &Invoices"
 msgstr ""
 
-#: reporting/reports_main.php:101 reporting/reports_main.php:111
-#: reporting/reports_main.php:118
+#: reporting/reports_main.php:112 reporting/reports_main.php:122
+#: reporting/reports_main.php:129
 msgid "email Customers"
 msgstr ""
 
 msgid "email Customers"
 msgstr ""
 
-#: reporting/reports_main.php:102 reporting/reports_main.php:112
+#: reporting/reports_main.php:113 reporting/reports_main.php:123
 msgid "Payment Link"
 msgstr ""
 
 msgid "Payment Link"
 msgstr ""
 
-#: reporting/reports_main.php:107
+#: reporting/reports_main.php:118
 msgid "Print &Credit Notes"
 msgstr ""
 
 msgid "Print &Credit Notes"
 msgstr ""
 
-#: reporting/reports_main.php:115
+#: reporting/reports_main.php:126
 msgid "Print &Deliveries"
 msgstr ""
 
 msgid "Print &Deliveries"
 msgstr ""
 
-#: reporting/reports_main.php:119
+#: reporting/reports_main.php:130
 msgid "Print as Packing Slip"
 msgstr ""
 
 msgid "Print as Packing Slip"
 msgstr ""
 
-#: reporting/reports_main.php:122
+#: reporting/reports_main.php:133
 msgid "Print &Statements"
 msgstr ""
 
 msgid "Print &Statements"
 msgstr ""
 
-#: reporting/reports_main.php:126 reporting/reports_main.php:133
-#: reporting/reports_main.php:141
+#: reporting/reports_main.php:137 reporting/reports_main.php:144
+#: reporting/reports_main.php:152 reporting/reports_main.php:159
 msgid "Email Customers"
 msgstr ""
 
 msgid "Email Customers"
 msgstr ""
 
-#: reporting/reports_main.php:129
+#: reporting/reports_main.php:140
 msgid "&Print Sales Orders"
 msgstr ""
 
 msgid "&Print Sales Orders"
 msgstr ""
 
-#: reporting/reports_main.php:134
+#: reporting/reports_main.php:145
 msgid "Print as Quote"
 msgstr ""
 
 msgid "Print as Quote"
 msgstr ""
 
-#: reporting/reports_main.php:137
+#: reporting/reports_main.php:148
 msgid "&Print Sales Quotations"
 msgstr ""
 
 msgid "&Print Sales Quotations"
 msgstr ""
 
-#: reporting/reports_main.php:144
+#: reporting/reports_main.php:155
 msgid "Print Receipts"
 msgstr ""
 
 msgid "Print Receipts"
 msgstr ""
 
-#: reporting/reports_main.php:152
+#: reporting/reports_main.php:164
 msgid "Supplier &Balances"
 msgstr ""
 
 msgid "Supplier &Balances"
 msgstr ""
 
-#: reporting/reports_main.php:162
+#: reporting/reports_main.php:174
 msgid "&Aged Supplier Analyses"
 msgstr ""
 
 msgid "&Aged Supplier Analyses"
 msgstr ""
 
-#: reporting/reports_main.php:173
+#: reporting/reports_main.php:185
+msgid "Supplier &Trial Balances"
+msgstr ""
+
+#: reporting/reports_main.php:194
 msgid "&Payment Report"
 msgstr ""
 
 msgid "&Payment Report"
 msgstr ""
 
-#: reporting/reports_main.php:181
+#: reporting/reports_main.php:202
 msgid "Outstanding &GRNs Report"
 msgstr ""
 
 msgid "Outstanding &GRNs Report"
 msgstr ""
 
-#: reporting/reports_main.php:186
+#: reporting/reports_main.php:207
 msgid "Supplier &Detail Listing"
 msgstr ""
 
 msgid "Supplier &Detail Listing"
 msgstr ""
 
-#: reporting/reports_main.php:193
+#: reporting/reports_main.php:214
 msgid "Print Purchase &Orders"
 msgstr ""
 
 msgid "Print Purchase &Orders"
 msgstr ""
 
-#: reporting/reports_main.php:197 reporting/reports_main.php:204
+#: reporting/reports_main.php:218 reporting/reports_main.php:225
 msgid "Email Suppliers"
 msgstr ""
 
 msgid "Email Suppliers"
 msgstr ""
 
-#: reporting/reports_main.php:200
+#: reporting/reports_main.php:221
 msgid "Print Remi&ttances"
 msgstr ""
 
 msgid "Print Remi&ttances"
 msgstr ""
 
-#: reporting/reports_main.php:209
+#: reporting/reports_main.php:230
 msgid "Inventory &Valuation Report"
 msgstr ""
 
 msgid "Inventory &Valuation Report"
 msgstr ""
 
-#: reporting/reports_main.php:217
+#: reporting/reports_main.php:238
 msgid "Inventory &Planning Report"
 msgstr ""
 
 msgid "Inventory &Planning Report"
 msgstr ""
 
-#: reporting/reports_main.php:223
+#: reporting/reports_main.php:244
 msgid "Stock &Check Sheets"
 msgstr ""
 
 msgid "Stock &Check Sheets"
 msgstr ""
 
-#: reporting/reports_main.php:227
+#: reporting/reports_main.php:248
 msgid "Inventory Column"
 msgstr ""
 
 msgid "Inventory Column"
 msgstr ""
 
-#: reporting/reports_main.php:228
-msgid "Show Shortage"
+#: reporting/reports_main.php:249
+msgid "Show Only Shortages"
 msgstr ""
 
 msgstr ""
 
-#: reporting/reports_main.php:230
+#: reporting/reports_main.php:251
 msgid "Item Like"
 msgstr ""
 
 msgid "Item Like"
 msgstr ""
 
-#: reporting/reports_main.php:234
+#: reporting/reports_main.php:255
 msgid "Inventory &Sales Report"
 msgstr ""
 
 msgid "Inventory &Sales Report"
 msgstr ""
 
-#: reporting/reports_main.php:244
+#: reporting/reports_main.php:265
 msgid "&GRN Valuation Report"
 msgstr ""
 
 msgid "&GRN Valuation Report"
 msgstr ""
 
-#: reporting/reports_main.php:250
+#: reporting/reports_main.php:271
 msgid "Inventory P&urchasing Report"
 msgstr ""
 
 msgid "Inventory P&urchasing Report"
 msgstr ""
 
-#: reporting/reports_main.php:260
+#: reporting/reports_main.php:281
 msgid "Inventory &Movement Report"
 msgstr ""
 
 msgid "Inventory &Movement Report"
 msgstr ""
 
-#: reporting/reports_main.php:268
+#: reporting/reports_main.php:289
 msgid "C&osted Inventory Movement Report"
 msgstr ""
 
 msgid "C&osted Inventory Movement Report"
 msgstr ""
 
-#: reporting/reports_main.php:276
+#: reporting/reports_main.php:297
 msgid "Item &Sales Summary Report"
 msgstr ""
 
 msgid "Item &Sales Summary Report"
 msgstr ""
 
-#: reporting/reports_main.php:286
+#: reporting/reports_main.php:304
+msgid "Inventory Purchasing - &Transaction Based"
+msgstr ""
+
+#: reporting/reports_main.php:317
 msgid "&Bill of Material Listing"
 msgstr ""
 
 msgid "&Bill of Material Listing"
 msgstr ""
 
-#: reporting/reports_main.php:287
+#: reporting/reports_main.php:318
 msgid "From product"
 msgstr ""
 
 msgid "From product"
 msgstr ""
 
-#: reporting/reports_main.php:288
+#: reporting/reports_main.php:319
 msgid "To product"
 msgstr ""
 
 msgid "To product"
 msgstr ""
 
-#: reporting/reports_main.php:292
+#: reporting/reports_main.php:323
 msgid "Work Order &Listing"
 msgstr ""
 
 msgid "Work Order &Listing"
 msgstr ""
 
-#: reporting/reports_main.php:295
+#: reporting/reports_main.php:326
 msgid "Outstanding Only"
 msgstr ""
 
 msgid "Outstanding Only"
 msgstr ""
 
-#: reporting/reports_main.php:299
+#: reporting/reports_main.php:331
 msgid "Print &Work Orders"
 msgstr ""
 
 msgid "Print &Work Orders"
 msgstr ""
 
-#: reporting/reports_main.php:302
+#: reporting/reports_main.php:334
 msgid "Email Locations"
 msgstr ""
 
 msgid "Email Locations"
 msgstr ""
 
-#: reporting/reports_main.php:309
+#: reporting/reports_main.php:341
 msgid "&Fixed Assets Valuation"
 msgstr ""
 
 msgid "&Fixed Assets Valuation"
 msgstr ""
 
-#: reporting/reports_main.php:311
+#: reporting/reports_main.php:343
 msgid "Fixed Assets Class"
 msgstr ""
 
 msgid "Fixed Assets Class"
 msgstr ""
 
-#: reporting/reports_main.php:312
+#: reporting/reports_main.php:344
 msgid "Fixed Assets Location"
 msgstr ""
 
 msgid "Fixed Assets Location"
 msgstr ""
 
-#: reporting/reports_main.php:321
+#: reporting/reports_main.php:353
 msgid "Dimension &Summary"
 msgstr ""
 
 msgid "Dimension &Summary"
 msgstr ""
 
-#: reporting/reports_main.php:322
+#: reporting/reports_main.php:354
 msgid "From Dimension"
 msgstr ""
 
 msgid "From Dimension"
 msgstr ""
 
-#: reporting/reports_main.php:323
+#: reporting/reports_main.php:355
 msgid "To Dimension"
 msgstr ""
 
 msgid "To Dimension"
 msgstr ""
 
-#: reporting/reports_main.php:329
+#: reporting/reports_main.php:361
 msgid "Banking"
 msgstr ""
 
 msgid "Banking"
 msgstr ""
 
-#: reporting/reports_main.php:330
+#: reporting/reports_main.php:362
 msgid "Bank &Statement"
 msgstr ""
 
 msgid "Bank &Statement"
 msgstr ""
 
-#: reporting/reports_main.php:334 reporting/reports_main.php:405
-#: reporting/reports_main.php:455 reporting/reports_main.php:500
+#: reporting/reports_main.php:366 reporting/reports_main.php:438
+#: reporting/reports_main.php:489 reporting/reports_main.php:535
+#: sales/inquiry/customer_inquiry.php:168
 msgid "Zero values"
 msgstr ""
 
 msgid "Zero values"
 msgstr ""
 
-#: reporting/reports_main.php:338
+#: reporting/reports_main.php:370
 msgid "Bank Statement w/ &Reconcile"
 msgstr ""
 
 msgid "Bank Statement w/ &Reconcile"
 msgstr ""
 
-#: reporting/reports_main.php:345
+#: reporting/reports_main.php:377
 msgid "General Ledger"
 msgstr ""
 
 msgid "General Ledger"
 msgstr ""
 
-#: reporting/reports_main.php:346
+#: reporting/reports_main.php:378
 msgid "Chart of &Accounts"
 msgstr ""
 
 msgid "Chart of &Accounts"
 msgstr ""
 
-#: reporting/reports_main.php:347
+#: reporting/reports_main.php:379
 msgid "Show Balances"
 msgstr ""
 
 msgid "Show Balances"
 msgstr ""
 
-#: reporting/reports_main.php:351
+#: reporting/reports_main.php:383
 msgid "List of &Journal Entries"
 msgstr ""
 
 msgid "List of &Journal Entries"
 msgstr ""
 
-#: reporting/reports_main.php:361 reporting/reports_main.php:415
-#: reporting/reports_main.php:464
+#: reporting/reports_main.php:393 reporting/reports_main.php:448
+#: reporting/reports_main.php:498
 msgid "GL Account &Transactions"
 msgstr ""
 
 msgid "GL Account &Transactions"
 msgstr ""
 
-#: reporting/reports_main.php:364 reporting/reports_main.php:418
-#: reporting/reports_main.php:467
+#: reporting/reports_main.php:396 reporting/reports_main.php:451
+#: reporting/reports_main.php:501
 msgid "From Account"
 msgstr ""
 
 msgid "From Account"
 msgstr ""
 
-#: reporting/reports_main.php:365 reporting/reports_main.php:419
-#: reporting/reports_main.php:468
+#: reporting/reports_main.php:397 reporting/reports_main.php:452
+#: reporting/reports_main.php:502
 msgid "To Account"
 msgstr ""
 
 msgid "To Account"
 msgstr ""
 
-#: reporting/reports_main.php:371 reporting/reports_main.php:424
-#: reporting/reports_main.php:472
+#: reporting/reports_main.php:403 reporting/reports_main.php:457
+#: reporting/reports_main.php:506
 msgid "Annual &Expense Breakdown"
 msgstr ""
 
 msgid "Annual &Expense Breakdown"
 msgstr ""
 
-#: reporting/reports_main.php:379 reporting/reports_main.php:431
-#: reporting/reports_main.php:478
+#: reporting/reports_main.php:412 reporting/reports_main.php:465
+#: reporting/reports_main.php:513
 msgid "&Balance Sheet"
 msgstr ""
 
 msgid "&Balance Sheet"
 msgstr ""
 
-#: reporting/reports_main.php:385 reporting/reports_main.php:397
-#: reporting/reports_main.php:436 reporting/reports_main.php:447
-#: reporting/reports_main.php:482 reporting/reports_main.php:492
+#: reporting/reports_main.php:418 reporting/reports_main.php:430
+#: reporting/reports_main.php:470 reporting/reports_main.php:481
+#: reporting/reports_main.php:517 reporting/reports_main.php:527
 msgid "Decimal values"
 msgstr ""
 
 msgid "Decimal values"
 msgstr ""
 
-#: reporting/reports_main.php:390 reporting/reports_main.php:441
-#: reporting/reports_main.php:487
+#: reporting/reports_main.php:423 reporting/reports_main.php:475
+#: reporting/reports_main.php:522
 msgid "&Profit and Loss Statement"
 msgstr ""
 
 msgid "&Profit and Loss Statement"
 msgstr ""
 
-#: reporting/reports_main.php:506
+#: reporting/reports_main.php:541
 msgid "Ta&x Report"
 msgstr ""
 
 msgid "Ta&x Report"
 msgstr ""
 
@@ -12649,23 +13201,23 @@ msgstr ""
 #: reporting/includes/doctext.inc:55 reporting/includes/doctext.inc:72
 #: reporting/includes/doctext.inc:93 reporting/includes/doctext.inc:107
 #: reporting/includes/doctext.inc:130 reporting/includes/doctext.inc:160
 #: reporting/includes/doctext.inc:55 reporting/includes/doctext.inc:72
 #: reporting/includes/doctext.inc:93 reporting/includes/doctext.inc:107
 #: reporting/includes/doctext.inc:130 reporting/includes/doctext.inc:160
-#: reporting/includes/doctext.inc:183 reporting/includes/doctext.inc:201
-#: reporting/includes/doctext.inc:239
+#: reporting/includes/doctext.inc:183 reporting/includes/doctext.inc:203
+#: reporting/includes/doctext.inc:241
 msgid "Customer's Reference"
 msgstr ""
 
 #: reporting/includes/doctext.inc:56 reporting/includes/doctext.inc:73
 #: reporting/includes/doctext.inc:94 reporting/includes/doctext.inc:108
 #: reporting/includes/doctext.inc:131 reporting/includes/doctext.inc:184
 msgid "Customer's Reference"
 msgstr ""
 
 #: reporting/includes/doctext.inc:56 reporting/includes/doctext.inc:73
 #: reporting/includes/doctext.inc:94 reporting/includes/doctext.inc:108
 #: reporting/includes/doctext.inc:131 reporting/includes/doctext.inc:184
-#: reporting/includes/doctext.inc:240 sales/manage/customer_branches.php:286
+#: reporting/includes/doctext.inc:242 sales/manage/customer_branches.php:286
 msgid "Sales Person"
 msgstr ""
 
 #: reporting/includes/doctext.inc:57 reporting/includes/doctext.inc:74
 #: reporting/includes/doctext.inc:95 reporting/includes/doctext.inc:109
 #: reporting/includes/doctext.inc:132 reporting/includes/doctext.inc:162
 msgid "Sales Person"
 msgstr ""
 
 #: reporting/includes/doctext.inc:57 reporting/includes/doctext.inc:74
 #: reporting/includes/doctext.inc:95 reporting/includes/doctext.inc:109
 #: reporting/includes/doctext.inc:132 reporting/includes/doctext.inc:162
-#: reporting/includes/doctext.inc:185 reporting/includes/doctext.inc:203
-#: reporting/includes/doctext.inc:241
+#: reporting/includes/doctext.inc:185 reporting/includes/doctext.inc:205
+#: reporting/includes/doctext.inc:243
 msgid "Your VAT no."
 msgstr ""
 
 msgid "Your VAT no."
 msgstr ""
 
@@ -12674,8 +13226,8 @@ msgid "Our Quotation No"
 msgstr ""
 
 #: reporting/includes/doctext.inc:59 sales/view/view_sales_order.php:69
 msgstr ""
 
 #: reporting/includes/doctext.inc:59 sales/view/view_sales_order.php:69
-#: sales/inquiry/sales_orders_view.php:272
-#: sales/includes/ui/sales_order_ui.inc:598
+#: sales/inquiry/sales_orders_view.php:277
+#: sales/includes/ui/sales_order_ui.inc:605
 msgid "Valid until"
 msgstr ""
 
 msgid "Valid until"
 msgstr ""
 
@@ -12689,7 +13241,7 @@ msgstr ""
 
 #: reporting/includes/doctext.inc:75 reporting/includes/doctext.inc:96
 #: reporting/includes/doctext.inc:110 reporting/includes/doctext.inc:137
 
 #: reporting/includes/doctext.inc:75 reporting/includes/doctext.inc:96
 #: reporting/includes/doctext.inc:110 reporting/includes/doctext.inc:137
-#: reporting/includes/doctext.inc:204 reporting/includes/doctext.inc:242
+#: reporting/includes/doctext.inc:206 reporting/includes/doctext.inc:244
 #: sales/view/view_dispatch.php:87 sales/view/view_invoice.php:87
 msgid "Our Order No"
 msgstr ""
 #: sales/view/view_dispatch.php:87 sales/view/view_invoice.php:87
 msgid "Our Order No"
 msgstr ""
@@ -12758,34 +13310,34 @@ msgstr ""
 msgid "With thanks from"
 msgstr ""
 
 msgid "With thanks from"
 msgstr ""
 
-#: reporting/includes/doctext.inc:214
+#: reporting/includes/doctext.inc:216
 msgid "Work Order No."
 msgstr ""
 
 msgid "Work Order No."
 msgstr ""
 
-#: reporting/includes/doctext.inc:245
+#: reporting/includes/doctext.inc:247
 msgid "DueDate"
 msgstr ""
 
 msgid "DueDate"
 msgstr ""
 
-#: reporting/includes/doctext.inc:271 reporting/includes/pdf_report.inc:1006
+#: reporting/includes/doctext.inc:273 reporting/includes/pdf_report.inc:1023
 msgid "You can pay through"
 msgstr ""
 
 msgid "You can pay through"
 msgstr ""
 
-#: reporting/includes/doctext.inc:275
+#: reporting/includes/doctext.inc:277
 msgid "* Subject to Realisation of the Cheque."
 msgstr ""
 
 msgid "* Subject to Realisation of the Cheque."
 msgstr ""
 
-#: reporting/includes/excel_report.inc:69 reporting/includes/pdf_report.inc:81
+#: 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
 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:317
+#: reporting/includes/pdf_report.inc:331
 msgid "Print Out Date"
 msgstr ""
 
 #: reporting/includes/excel_report.inc:265
 msgid "Print Out Date"
 msgstr ""
 
 #: reporting/includes/excel_report.inc:265
-#: reporting/includes/pdf_report.inc:326
+#: reporting/includes/pdf_report.inc:340
 msgid "Fiscal Year"
 msgstr ""
 
 msgid "Fiscal Year"
 msgstr ""
 
@@ -12794,64 +13346,63 @@ msgid "Report Date"
 msgstr ""
 
 #: reporting/includes/excel_report.inc:410
 msgstr ""
 
 #: reporting/includes/excel_report.inc:410
-#: reporting/includes/pdf_report.inc:590
+#: reporting/includes/pdf_report.inc:604
 msgid "Generated At"
 msgstr ""
 
 #: reporting/includes/excel_report.inc:416
 msgid "Generated At"
 msgstr ""
 
 #: reporting/includes/excel_report.inc:416
-#: reporting/includes/pdf_report.inc:599
+#: reporting/includes/pdf_report.inc:613
 msgid "Generated By"
 msgstr ""
 
 msgid "Generated By"
 msgstr ""
 
-#: reporting/includes/header2.inc:124
+#: reporting/includes/header2.inc:122
 msgid "Our VAT No."
 msgstr ""
 
 msgid "Our VAT No."
 msgstr ""
 
-#: reporting/includes/header2.inc:130
+#: reporting/includes/header2.inc:128
 msgid "Domicile"
 msgstr ""
 
 msgid "Domicile"
 msgstr ""
 
-#: reporting/includes/header2.inc:146 reporting/includes/pdf_report.inc:353
-#: reporting/includes/pdf_report.inc:491 reporting/includes/pdf_report.inc:618
+#: reporting/includes/header2.inc:144 reporting/includes/pdf_report.inc:367
+#: reporting/includes/pdf_report.inc:505 reporting/includes/pdf_report.inc:632
 msgid "Page"
 msgstr ""
 
 msgid "Page"
 msgstr ""
 
-#: reporting/includes/pdf_report.inc:573
+#: reporting/includes/pdf_report.inc:587
 msgid "Report Period"
 msgstr ""
 
 msgid "Report Period"
 msgstr ""
 
-#: reporting/includes/pdf_report.inc:973
-#: reporting/includes/pdf_report.inc:1021
+#: 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 ""
 
 #, php-format
 msgid "You have no email contact defined for this type of document for '%s'."
 msgstr ""
 
-#: reporting/includes/pdf_report.inc:992
+#: reporting/includes/pdf_report.inc:1009
 msgid "Dear"
 msgstr ""
 
 msgid "Dear"
 msgstr ""
 
-#: reporting/includes/pdf_report.inc:993
+#: reporting/includes/pdf_report.inc:1010
 msgid "Attached you will find "
 msgstr ""
 
 msgid "Attached you will find "
 msgstr ""
 
-#: reporting/includes/pdf_report.inc:1009
+#: reporting/includes/pdf_report.inc:1026
 msgid "Kindest regards"
 msgstr ""
 
 msgid "Kindest regards"
 msgstr ""
 
-#: reporting/includes/pdf_report.inc:1024
+#: reporting/includes/pdf_report.inc:1041
 msgid "Sending document by email failed"
 msgstr ""
 
 msgid "Sending document by email failed"
 msgstr ""
 
-#: reporting/includes/pdf_report.inc:1024
-#: reporting/includes/pdf_report.inc:1027
+#: reporting/includes/pdf_report.inc:1041
+#: reporting/includes/pdf_report.inc:1044
 msgid "Email:"
 msgstr ""
 
 msgid "Email:"
 msgstr ""
 
-#: reporting/includes/pdf_report.inc:1027
+#: reporting/includes/pdf_report.inc:1044
 msgid "has been sent by email to destination."
 msgstr ""
 
 msgid "has been sent by email to destination."
 msgstr ""
 
-#: reporting/includes/pdf_report.inc:1056
+#: reporting/includes/pdf_report.inc:1073
 msgid "Report has been sent to network printer "
 msgstr ""
 
 msgid "Report has been sent to network printer "
 msgstr ""
 
@@ -12899,80 +13450,60 @@ msgstr ""
 msgid "Unknown report parameter type:"
 msgstr ""
 
 msgid "Unknown report parameter type:"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:179
+#: reporting/includes/reports_classes.inc:181
 msgid "No Currency Filter"
 msgstr ""
 
 msgid "No Currency Filter"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:253
+#: reporting/includes/reports_classes.inc:255
 msgid "No Graphics"
 msgstr ""
 
 msgid "No Graphics"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:253
-msgid "Vertical bars"
-msgstr ""
-
-#: reporting/includes/reports_classes.inc:253
-msgid "Horizontal bars"
-msgstr ""
-
-#: reporting/includes/reports_classes.inc:254
-msgid "Dots"
-msgstr ""
-
-#: reporting/includes/reports_classes.inc:254
-msgid "Lines"
-msgstr ""
-
-#: reporting/includes/reports_classes.inc:254
-msgid "Pie"
-msgstr ""
-
-#: reporting/includes/reports_classes.inc:254
-msgid "Donut"
-msgstr ""
-
-#: reporting/includes/reports_classes.inc:258
-#: reporting/includes/reports_classes.inc:261
+#: reporting/includes/reports_classes.inc:260
+#: reporting/includes/reports_classes.inc:263
 msgid "No Type Filter"
 msgstr ""
 
 msgid "No Type Filter"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:271
+#: reporting/includes/reports_classes.inc:273
 msgid "No Account Group Filter"
 msgstr ""
 
 msgid "No Account Group Filter"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:286
 #: reporting/includes/reports_classes.inc:292
 #: reporting/includes/reports_classes.inc:298
 #: reporting/includes/reports_classes.inc:292
 #: reporting/includes/reports_classes.inc:298
+#: reporting/includes/reports_classes.inc:304
 msgid "No Dimension Filter"
 msgstr ""
 
 msgid "No Dimension Filter"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:304
+#: reporting/includes/reports_classes.inc:309
 msgid "No Customer Filter"
 msgstr ""
 
 msgid "No Customer Filter"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:312
+#: reporting/includes/reports_classes.inc:316
 msgid "No Supplier Filter"
 msgstr ""
 
 msgid "No Supplier Filter"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:419
-#: reporting/includes/reports_classes.inc:421
+#: reporting/includes/reports_classes.inc:439
+#: reporting/includes/reports_classes.inc:441
 msgid "No Location Filter"
 msgstr ""
 
 msgid "No Location Filter"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:424
-#: reporting/includes/reports_classes.inc:426
+#: reporting/includes/reports_classes.inc:444
+#: reporting/includes/reports_classes.inc:446
 msgid "No Category Filter"
 msgstr ""
 
 msgid "No Category Filter"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:428
+#: reporting/includes/reports_classes.inc:448
 msgid "No Class Filter"
 msgstr ""
 
 msgid "No Class Filter"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:436
+#: reporting/includes/reports_classes.inc:453
+msgid "No Areas Filter"
+msgstr ""
+
+#: reporting/includes/reports_classes.inc:456
 msgid "No Sales Folk Filter"
 msgstr ""
 
 msgid "No Sales Folk Filter"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:443
+#: reporting/includes/reports_classes.inc:463
 msgid "No Users Filter"
 msgstr ""
 
 msgid "No Users Filter"
 msgstr ""
 
@@ -12980,99 +13511,99 @@ msgstr ""
 msgid "Create and Print Recurrent Invoices"
 msgstr ""
 
 msgid "Create and Print Recurrent Invoices"
 msgstr ""
 
-#: sales/create_recurrent_invoices.php:142
+#: sales/create_recurrent_invoices.php:145
 #, php-format
 msgid "%s recurrent invoice(s) created, # %s - # %s."
 msgstr ""
 
 #, php-format
 msgid "%s recurrent invoice(s) created, # %s - # %s."
 msgstr ""
 
-#: sales/create_recurrent_invoices.php:147
+#: sales/create_recurrent_invoices.php:150
 #, php-format
 msgid "&Print Recurrent Invoices # %s - # %s"
 msgstr ""
 
 #, php-format
 msgid "&Print Recurrent Invoices # %s - # %s"
 msgstr ""
 
-#: sales/create_recurrent_invoices.php:150
+#: sales/create_recurrent_invoices.php:152
 #, php-format
 msgid "&Email Recurrent Invoices # %s - # %s"
 msgstr ""
 
 #, php-format
 msgid "&Email Recurrent Invoices # %s - # %s"
 msgstr ""
 
-#: sales/create_recurrent_invoices.php:168
+#: sales/create_recurrent_invoices.php:170
 msgid ""
 "Recurrent invoice cannot be generated before last day of covered period."
 msgstr ""
 
 msgid ""
 "Recurrent invoice cannot be generated before last day of covered period."
 msgstr ""
 
-#: sales/create_recurrent_invoices.php:170
+#: sales/create_recurrent_invoices.php:172
 msgid ""
 "Recurrent invoices cannot be generated because some items have no price "
 "defined in customer currency."
 msgstr ""
 
 msgid ""
 "Recurrent invoices cannot be generated because some items have no price "
 "defined in customer currency."
 msgstr ""
 
-#: sales/create_recurrent_invoices.php:172
+#: sales/create_recurrent_invoices.php:174
 msgid ""
 "Recurrent invoices cannot be generated because selected sales order template "
 "uses prepayment sales terms. Change payment terms and try again."
 msgstr ""
 
 msgid ""
 "Recurrent invoices cannot be generated because selected sales order template "
 "uses prepayment sales terms. Change payment terms and try again."
 msgstr ""
 
-#: sales/create_recurrent_invoices.php:180
+#: sales/create_recurrent_invoices.php:182
 #: sales/manage/recurrent_invoices.php:193
 msgid "Template:"
 msgstr ""
 
 #: sales/manage/recurrent_invoices.php:193
 msgid "Template:"
 msgstr ""
 
-#: sales/create_recurrent_invoices.php:181
+#: sales/create_recurrent_invoices.php:183
 msgid "Number of invoices:"
 msgstr ""
 
 msgid "Number of invoices:"
 msgstr ""
 
-#: sales/create_recurrent_invoices.php:182
+#: sales/create_recurrent_invoices.php:184
 msgid "Invoice date:"
 msgstr ""
 
 msgid "Invoice date:"
 msgstr ""
 
-#: sales/create_recurrent_invoices.php:183
+#: sales/create_recurrent_invoices.php:187
 msgid "Invoice notice:"
 msgstr ""
 
 msgid "Invoice notice:"
 msgstr ""
 
-#: sales/create_recurrent_invoices.php:183
+#: sales/create_recurrent_invoices.php:187
 #, php-format
 msgid "Recurrent Invoice covers period %s - %s."
 msgstr ""
 
 #, php-format
 msgid "Recurrent Invoice covers period %s - %s."
 msgstr ""
 
-#: sales/create_recurrent_invoices.php:189
+#: sales/create_recurrent_invoices.php:193
 msgid "Create"
 msgstr ""
 
 msgid "Create"
 msgstr ""
 
-#: sales/create_recurrent_invoices.php:189
+#: sales/create_recurrent_invoices.php:193
 msgid "Create recurrent invoices"
 msgstr ""
 
 msgid "Create recurrent invoices"
 msgstr ""
 
-#: sales/create_recurrent_invoices.php:190
+#: sales/create_recurrent_invoices.php:194
 msgid "Return to recurrent invoices"
 msgstr ""
 
 msgid "Return to recurrent invoices"
 msgstr ""
 
-#: sales/create_recurrent_invoices.php:191
+#: sales/create_recurrent_invoices.php:195
 #, php-format
 msgid ""
 "You are about to issue %s invoices.\n"
 " Do you want to continue?"
 msgstr ""
 
 #, php-format
 msgid ""
 "You are about to issue %s invoices.\n"
 " Do you want to continue?"
 msgstr ""
 
-#: sales/create_recurrent_invoices.php:203
+#: sales/create_recurrent_invoices.php:207
 #: sales/manage/recurrent_invoices.php:128
 msgid "Begin"
 msgstr ""
 
 #: sales/manage/recurrent_invoices.php:128
 msgid "Begin"
 msgstr ""
 
-#: sales/create_recurrent_invoices.php:203
+#: sales/create_recurrent_invoices.php:207
 #: sales/manage/recurrent_invoices.php:128
 msgid "End"
 msgstr ""
 
 #: sales/manage/recurrent_invoices.php:128
 msgid "End"
 msgstr ""
 
-#: sales/create_recurrent_invoices.php:240
+#: sales/create_recurrent_invoices.php:244
 #, php-format
 msgid "Create %s Invoice(s)"
 msgstr ""
 
 #, php-format
 msgid "Create %s Invoice(s)"
 msgstr ""
 
-#: sales/create_recurrent_invoices.php:252
+#: sales/create_recurrent_invoices.php:256
 msgid "Marked items are due."
 msgstr ""
 
 msgid "Marked items are due."
 msgstr ""
 
-#: sales/create_recurrent_invoices.php:254
+#: sales/create_recurrent_invoices.php:258
 msgid "No recurrent invoices are due."
 msgstr ""
 
 msgid "No recurrent invoices are due."
 msgstr ""
 
@@ -13081,7 +13612,7 @@ msgstr ""
 msgid "Modifying Customer Credit Note #%d"
 msgstr ""
 
 msgid "Modifying Customer Credit Note #%d"
 msgstr ""
 
-#: sales/credit_note_entry.php:51 sales/sales_order_entry.php:706
+#: sales/credit_note_entry.php:51 sales/sales_order_entry.php:709
 msgid ""
 "There are no customers, or there are no customers with branches. Please "
 "define customers and customer branches."
 msgid ""
 "There are no customers, or there are no customers with branches. Please "
 "define customers and customer branches."
@@ -13438,7 +13969,7 @@ msgid "Process Dispatch"
 msgstr ""
 
 #: sales/customer_delivery.php:536 sales/customer_invoice.php:665
 msgstr ""
 
 #: sales/customer_delivery.php:536 sales/customer_invoice.php:665
-#: sales/sales_order_entry.php:753
+#: sales/sales_order_entry.php:756
 msgid "Check entered data and save document"
 msgstr ""
 
 msgid "Check entered data and save document"
 msgstr ""
 
@@ -13556,7 +14087,7 @@ msgstr ""
 msgid "Payment terms:"
 msgstr ""
 
 msgid "Payment terms:"
 msgstr ""
 
-#: sales/customer_invoice.php:512 sales/sales_order_entry.php:729
+#: sales/customer_invoice.php:512 sales/sales_order_entry.php:732
 msgid "Sales Order Items"
 msgstr ""
 
 msgid "Sales Order Items"
 msgstr ""
 
@@ -13600,97 +14131,101 @@ msgstr ""
 msgid "There are no customers defined in the system."
 msgstr ""
 
 msgid "There are no customers defined in the system."
 msgstr ""
 
-#: sales/customer_payments.php:71
+#: sales/customer_payments.php:74
 msgid "Invalid sales invoice number."
 msgstr ""
 
 msgid "Invalid sales invoice number."
 msgstr ""
 
-#: sales/customer_payments.php:98
+#: sales/customer_payments.php:104
 msgid "The customer payment has been successfully entered."
 msgstr ""
 
 msgid "The customer payment has been successfully entered."
 msgstr ""
 
-#: sales/customer_payments.php:100 sales/customer_payments.php:119
+#: sales/customer_payments.php:106 sales/customer_payments.php:126
 msgid "&Print This Receipt"
 msgstr ""
 
 msgid "&Print This Receipt"
 msgstr ""
 
-#: sales/customer_payments.php:102
+#: sales/customer_payments.php:107
+msgid "&Email This Receipt"
+msgstr ""
+
+#: sales/customer_payments.php:109
 msgid "&View this Customer Payment"
 msgstr ""
 
 msgid "&View this Customer Payment"
 msgstr ""
 
-#: sales/customer_payments.php:104 sales/customer_payments.php:127
+#: sales/customer_payments.php:111 sales/customer_payments.php:134
 msgid "Enter Another &Customer Payment"
 msgstr ""
 
 msgid "Enter Another &Customer Payment"
 msgstr ""
 
-#: sales/customer_payments.php:106
+#: sales/customer_payments.php:113
 msgid "Enter Payment to &Supplier"
 msgstr ""
 
 msgid "Enter Payment to &Supplier"
 msgstr ""
 
-#: sales/customer_payments.php:110 sales/customer_payments.php:121
+#: sales/customer_payments.php:117 sales/customer_payments.php:128
 msgid "&View the GL Journal Entries for this Customer Payment"
 msgstr ""
 
 msgid "&View the GL Journal Entries for this Customer Payment"
 msgstr ""
 
-#: sales/customer_payments.php:117
+#: sales/customer_payments.php:124
 msgid "The customer payment has been successfully updated."
 msgstr ""
 
 msgid "The customer payment has been successfully updated."
 msgstr ""
 
-#: sales/customer_payments.php:125
+#: sales/customer_payments.php:132
 msgid "Select Another Customer Payment for &Edition"
 msgstr ""
 
 msgid "Select Another Customer Payment for &Edition"
 msgstr ""
 
-#: sales/customer_payments.php:140 sales/sales_order_entry.php:360
+#: sales/customer_payments.php:147 sales/sales_order_entry.php:360
 msgid "There is no customer selected."
 msgstr ""
 
 msgid "There is no customer selected."
 msgstr ""
 
-#: sales/customer_payments.php:147 sales/sales_order_entry.php:367
+#: sales/customer_payments.php:154 sales/sales_order_entry.php:367
 msgid "This customer has no branch defined."
 msgstr ""
 
 msgid "This customer has no branch defined."
 msgstr ""
 
-#: sales/customer_payments.php:153
+#: sales/customer_payments.php:160
 msgid "The entered date is invalid. Please enter a valid date for the payment."
 msgstr ""
 
 msgid "The entered date is invalid. Please enter a valid date for the payment."
 msgstr ""
 
-#: sales/customer_payments.php:168 sales/customer_payments.php:174
+#: sales/customer_payments.php:175 sales/customer_payments.php:181
 msgid "The entered amount is invalid or negative and cannot be processed."
 msgstr ""
 
 msgid "The entered amount is invalid or negative and cannot be processed."
 msgstr ""
 
-#: sales/customer_payments.php:193
+#: sales/customer_payments.php:200
 msgid "The entered discount is not a valid number."
 msgstr ""
 
 msgid "The entered discount is not a valid number."
 msgstr ""
 
-#: sales/customer_payments.php:199
+#: sales/customer_payments.php:206
 msgid ""
 "The balance of the amount and discount is zero or negative. Please enter "
 "valid amounts."
 msgstr ""
 
 msgid ""
 "The balance of the amount and discount is zero or negative. Please enter "
 "valid amounts."
 msgstr ""
 
-#: sales/customer_payments.php:206
+#: sales/customer_payments.php:213
 msgid "The entered payment amount is zero or negative."
 msgstr ""
 
 msgid "The entered payment amount is zero or negative."
 msgstr ""
 
-#: sales/customer_payments.php:308
-msgid "Into Bank Account:"
+#: sales/customer_payments.php:317 sales/customer_payments.php:319
+msgid "From Customer:"
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_payments.php:311 sales/customer_payments.php:313
-msgid "From Customer:"
+#: sales/customer_payments.php:340
+msgid "Into Bank Account:"
 msgstr ""
 
 msgstr ""
 
-#: sales/customer_payments.php:345
+#: sales/customer_payments.php:351
 msgid "Date of Deposit:"
 msgstr ""
 
 msgid "Date of Deposit:"
 msgstr ""
 
-#: sales/customer_payments.php:359
+#: sales/customer_payments.php:365
 msgid "Payment Amount:"
 msgstr ""
 
 msgid "Payment Amount:"
 msgstr ""
 
-#: sales/customer_payments.php:372
+#: sales/customer_payments.php:393
 msgid "Customer prompt payment discount :"
 msgstr ""
 
 msgid "Customer prompt payment discount :"
 msgstr ""
 
-#: sales/customer_payments.php:382
+#: sales/customer_payments.php:403
 msgid "Add Payment"
 msgstr ""
 
 msgid "Add Payment"
 msgstr ""
 
-#: sales/customer_payments.php:384
+#: sales/customer_payments.php:405
 msgid "Update Payment"
 msgstr ""
 
 msgid "Update Payment"
 msgstr ""
 
@@ -13874,152 +14409,152 @@ msgstr ""
 msgid "You need to define a cash account for your Sales Point."
 msgstr ""
 
 msgid "You need to define a cash account for your Sales Point."
 msgstr ""
 
-#: sales/sales_order_entry.php:478
+#: sales/sales_order_entry.php:483
 msgid ""
 "The reference number field has been increased. Please save the document "
 "again."
 msgstr ""
 
 msgid ""
 "The reference number field has been increased. Please save the document "
 "again."
 msgstr ""
 
-#: sales/sales_order_entry.php:524
+#: sales/sales_order_entry.php:527
 msgid ""
 "The item could not be updated because you are attempting to set the quantity "
 "ordered to less than 0, or the discount percent to more than 100."
 msgstr ""
 
 msgid ""
 "The item could not be updated because you are attempting to set the quantity "
 "ordered to less than 0, or the discount percent to more than 100."
 msgstr ""
 
-#: sales/sales_order_entry.php:528
+#: sales/sales_order_entry.php:531
 msgid "Price for inventory item must be entered and can not be less than 0"
 msgstr ""
 
 msgid "Price for inventory item must be entered and can not be less than 0"
 msgstr ""
 
-#: sales/sales_order_entry.php:535
+#: sales/sales_order_entry.php:538
 msgid ""
 "You attempting to make the quantity ordered a quantity less than has already "
 "been delivered. The quantity delivered cannot be modified retrospectively."
 msgstr ""
 
 msgid ""
 "You attempting to make the quantity ordered a quantity less than has already "
 "been delivered. The quantity delivered cannot be modified retrospectively."
 msgstr ""
 
-#: sales/sales_order_entry.php:553
+#: sales/sales_order_entry.php:556
 #, php-format
 msgid "Price %s is below Standard Cost %s"
 msgstr ""
 
 #, php-format
 msgid "Price %s is below Standard Cost %s"
 msgstr ""
 
-#: sales/sales_order_entry.php:578
+#: sales/sales_order_entry.php:581
 msgid ""
 "This item cannot be deleted because some of it has already been delivered."
 msgstr ""
 
 msgid ""
 "This item cannot be deleted because some of it has already been delivered."
 msgstr ""
 
-#: sales/sales_order_entry.php:607
+#: sales/sales_order_entry.php:610
 msgid "Direct delivery entry has been cancelled as requested."
 msgstr ""
 
 msgid "Direct delivery entry has been cancelled as requested."
 msgstr ""
 
-#: sales/sales_order_entry.php:608
+#: sales/sales_order_entry.php:611
 msgid "Enter a New Sales Delivery"
 msgstr ""
 
 msgid "Enter a New Sales Delivery"
 msgstr ""
 
-#: sales/sales_order_entry.php:610
+#: sales/sales_order_entry.php:613
 msgid "Direct invoice entry has been cancelled as requested."
 msgstr ""
 
 msgid "Direct invoice entry has been cancelled as requested."
 msgstr ""
 
-#: sales/sales_order_entry.php:611
+#: sales/sales_order_entry.php:614
 msgid "Enter a New Sales Invoice"
 msgstr ""
 
 msgid "Enter a New Sales Invoice"
 msgstr ""
 
-#: sales/sales_order_entry.php:616
+#: sales/sales_order_entry.php:619
 msgid "This sales quotation has been cancelled as requested."
 msgstr ""
 
 msgid "This sales quotation has been cancelled as requested."
 msgstr ""
 
-#: sales/sales_order_entry.php:617
+#: sales/sales_order_entry.php:620
 msgid "Enter a New Sales Quotation"
 msgstr ""
 
 msgid "Enter a New Sales Quotation"
 msgstr ""
 
-#: sales/sales_order_entry.php:624
+#: sales/sales_order_entry.php:627
 msgid "Undelivered part of order has been cancelled as requested."
 msgstr ""
 
 msgid "Undelivered part of order has been cancelled as requested."
 msgstr ""
 
-#: sales/sales_order_entry.php:625
+#: sales/sales_order_entry.php:628
 msgid "Select Another Sales Order for Edition"
 msgstr ""
 
 msgid "Select Another Sales Order for Edition"
 msgstr ""
 
-#: sales/sales_order_entry.php:629
+#: sales/sales_order_entry.php:632
 msgid "This sales order has been cancelled as requested."
 msgstr ""
 
 msgid "This sales order has been cancelled as requested."
 msgstr ""
 
-#: sales/sales_order_entry.php:630
+#: sales/sales_order_entry.php:633
 msgid "Enter a New Sales Order"
 msgstr ""
 
 msgid "Enter a New Sales Order"
 msgstr ""
 
-#: sales/sales_order_entry.php:710
+#: sales/sales_order_entry.php:713
 msgid "Sales Invoice Items"
 msgstr ""
 
 msgid "Sales Invoice Items"
 msgstr ""
 
-#: sales/sales_order_entry.php:711
+#: sales/sales_order_entry.php:714
 msgid "Enter Delivery Details and Confirm Invoice"
 msgstr ""
 
 msgid "Enter Delivery Details and Confirm Invoice"
 msgstr ""
 
-#: sales/sales_order_entry.php:713
+#: sales/sales_order_entry.php:716
 msgid "Place Invoice"
 msgstr ""
 
 msgid "Place Invoice"
 msgstr ""
 
-#: sales/sales_order_entry.php:716
+#: sales/sales_order_entry.php:719
 msgid "Delivery Note Items"
 msgstr ""
 
 msgid "Delivery Note Items"
 msgstr ""
 
-#: sales/sales_order_entry.php:717
+#: sales/sales_order_entry.php:720
 msgid "Enter Delivery Details and Confirm Dispatch"
 msgstr ""
 
 msgid "Enter Delivery Details and Confirm Dispatch"
 msgstr ""
 
-#: sales/sales_order_entry.php:718
+#: sales/sales_order_entry.php:721
 msgid "Cancel Delivery"
 msgstr ""
 
 msgid "Cancel Delivery"
 msgstr ""
 
-#: sales/sales_order_entry.php:719
+#: sales/sales_order_entry.php:722
 msgid "Place Delivery"
 msgstr ""
 
 msgid "Place Delivery"
 msgstr ""
 
-#: sales/sales_order_entry.php:721
+#: sales/sales_order_entry.php:724
 msgid "Quotation Date:"
 msgstr ""
 
 msgid "Quotation Date:"
 msgstr ""
 
-#: sales/sales_order_entry.php:722
+#: sales/sales_order_entry.php:725
 msgid "Sales Quotation Items"
 msgstr ""
 
 msgid "Sales Quotation Items"
 msgstr ""
 
-#: sales/sales_order_entry.php:723
+#: sales/sales_order_entry.php:726
 msgid "Enter Delivery Details and Confirm Quotation"
 msgstr ""
 
 msgid "Enter Delivery Details and Confirm Quotation"
 msgstr ""
 
-#: sales/sales_order_entry.php:724
+#: sales/sales_order_entry.php:727
 msgid "Cancel Quotation"
 msgstr ""
 
 msgid "Cancel Quotation"
 msgstr ""
 
-#: sales/sales_order_entry.php:725
+#: sales/sales_order_entry.php:728
 msgid "Place Quotation"
 msgstr ""
 
 msgid "Place Quotation"
 msgstr ""
 
-#: sales/sales_order_entry.php:726
+#: sales/sales_order_entry.php:729
 msgid "Commit Quotations Changes"
 msgstr ""
 
 msgid "Commit Quotations Changes"
 msgstr ""
 
-#: sales/sales_order_entry.php:730
+#: sales/sales_order_entry.php:733
 msgid "Enter Delivery Details and Confirm Order"
 msgstr ""
 
 msgid "Enter Delivery Details and Confirm Order"
 msgstr ""
 
-#: sales/sales_order_entry.php:733
+#: sales/sales_order_entry.php:736
 msgid "Commit Order Changes"
 msgstr ""
 
 msgid "Commit Order Changes"
 msgstr ""
 
-#: sales/sales_order_entry.php:755 sales/sales_order_entry.php:761
+#: sales/sales_order_entry.php:758 sales/sales_order_entry.php:764
 msgid ""
 "Cancels document entry or removes sales order when editing an old document"
 msgstr ""
 
 msgid ""
 "Cancels document entry or removes sales order when editing an old document"
 msgstr ""
 
-#: sales/sales_order_entry.php:756 sales/sales_order_entry.php:765
+#: sales/sales_order_entry.php:759 sales/sales_order_entry.php:768
 msgid "You are about to void this Document.\\nDo you want to continue?"
 msgstr ""
 
 msgid "You are about to void this Document.\\nDo you want to continue?"
 msgstr ""
 
-#: sales/sales_order_entry.php:759
+#: sales/sales_order_entry.php:762
 msgid "Validate changes and update document"
 msgstr ""
 
 msgid "Validate changes and update document"
 msgstr ""
 
-#: sales/sales_order_entry.php:763
+#: sales/sales_order_entry.php:766
 msgid ""
 "You are about to cancel undelivered part of this order.\\nDo you want to "
 "continue?"
 msgid ""
 "You are about to cancel undelivered part of this order.\\nDo you want to "
 "continue?"
@@ -14029,22 +14564,17 @@ msgstr ""
 msgid "Allocate Customer Payment or Credit Note"
 msgstr ""
 
 msgid "Allocate Customer Payment or Credit Note"
 msgstr ""
 
-#: sales/allocations/customer_allocate.php:50
+#: sales/allocations/customer_allocate.php:55
 #, php-format
 msgid "Allocation of %s # %d"
 msgstr ""
 
 #, php-format
 msgid "Allocation of %s # %d"
 msgstr ""
 
-#: sales/allocations/customer_allocation_main.php:22
-msgid "Customer Allocations"
+#: sales/allocations/customer_allocate.php:64
+msgid "Amount to be settled:"
 msgstr ""
 
 msgstr ""
 
-#: sales/allocations/customer_allocation_main.php:32
-#: sales/manage/customer_branches.php:270 sales/manage/customers.php:329
-#: sales/inquiry/customer_allocation_inquiry.php:42
-#: sales/inquiry/customer_inquiry.php:44
-#: sales/inquiry/sales_deliveries_view.php:114
-#: sales/inquiry/sales_orders_view.php:232
-msgid "Select a customer: "
+#: sales/allocations/customer_allocation_main.php:22
+msgid "Customer Allocations"
 msgstr ""
 
 #: sales/manage/credit_status.php:16
 msgstr ""
 
 #: sales/manage/credit_status.php:16
@@ -14166,11 +14696,11 @@ msgstr ""
 msgid "Branch Short Name:"
 msgstr ""
 
 msgid "Branch Short Name:"
 msgstr ""
 
-#: sales/manage/customer_branches.php:233 sales/manage/customers.php:261
+#: sales/manage/customer_branches.php:233 sales/manage/customers.php:262
 msgid "Sales Person:"
 msgstr ""
 
 msgid "Sales Person:"
 msgstr ""
 
-#: sales/manage/customer_branches.php:234 sales/manage/customers.php:298
+#: sales/manage/customer_branches.php:234 sales/manage/customers.php:299
 msgid "Sales Area:"
 msgstr ""
 
 msgid "Sales Area:"
 msgstr ""
 
@@ -14179,11 +14709,11 @@ msgstr ""
 msgid "Sales Group:"
 msgstr ""
 
 msgid "Sales Group:"
 msgstr ""
 
-#: sales/manage/customer_branches.php:236 sales/manage/customers.php:296
+#: sales/manage/customer_branches.php:236 sales/manage/customers.php:297
 msgid "Default Inventory Location:"
 msgstr ""
 
 msgid "Default Inventory Location:"
 msgstr ""
 
-#: sales/manage/customer_branches.php:237 sales/manage/customers.php:297
+#: sales/manage/customer_branches.php:237 sales/manage/customers.php:298
 msgid "Default Shipping Company:"
 msgstr ""
 
 msgid "Default Shipping Company:"
 msgstr ""
 
@@ -14201,7 +14731,7 @@ msgstr ""
 
 #: sales/manage/customer_branches.php:285
 #: sales/inquiry/customer_branches_list.php:49
 
 #: sales/manage/customer_branches.php:285
 #: sales/inquiry/customer_branches_list.php:49
-#: sales/inquiry/sales_deliveries_view.php:172
+#: sales/inquiry/sales_deliveries_view.php:173
 msgid "Contact"
 msgstr ""
 
 msgid "Contact"
 msgstr ""
 
@@ -14228,149 +14758,149 @@ msgid ""
 "branch."
 msgstr ""
 
 "branch."
 msgstr ""
 
-#: sales/manage/customers.php:42
+#: sales/manage/customers.php:43
 msgid "The customer name cannot be empty."
 msgstr ""
 
 msgid "The customer name cannot be empty."
 msgstr ""
 
-#: sales/manage/customers.php:49
+#: sales/manage/customers.php:50
 msgid "The customer short name cannot be empty."
 msgstr ""
 
 msgid "The customer short name cannot be empty."
 msgstr ""
 
-#: sales/manage/customers.php:56
+#: sales/manage/customers.php:57
 msgid "The credit limit must be numeric and not less than zero."
 msgstr ""
 
 msgid "The credit limit must be numeric and not less than zero."
 msgstr ""
 
-#: sales/manage/customers.php:63
+#: sales/manage/customers.php:64
 msgid ""
 "The payment discount must be numeric and is expected to be less than 100% "
 "and greater than or equal to 0."
 msgstr ""
 
 msgid ""
 "The payment discount must be numeric and is expected to be less than 100% "
 "and greater than or equal to 0."
 msgstr ""
 
-#: sales/manage/customers.php:70
+#: sales/manage/customers.php:71
 msgid ""
 "The discount percentage must be numeric and is expected to be less than 100% "
 "and greater than or equal to 0."
 msgstr ""
 
 msgid ""
 "The discount percentage must be numeric and is expected to be less than 100% "
 "and greater than or equal to 0."
 msgstr ""
 
-#: sales/manage/customers.php:98
+#: sales/manage/customers.php:99
 msgid "Customer has been updated."
 msgstr ""
 
 msgid "Customer has been updated."
 msgstr ""
 
-#: sales/manage/customers.php:130
+#: sales/manage/customers.php:131
 msgid "A new customer has been added."
 msgstr ""
 
 msgid "A new customer has been added."
 msgstr ""
 
-#: sales/manage/customers.php:133
+#: sales/manage/customers.php:134
 msgid ""
 "A default Branch has been automatically created, please check default Branch "
 "values by using link below."
 msgstr ""
 
 msgid ""
 "A default Branch has been automatically created, please check default Branch "
 "values by using link below."
 msgstr ""
 
-#: sales/manage/customers.php:156
+#: sales/manage/customers.php:157
 msgid ""
 "This customer cannot be deleted because there are transactions that refer to "
 "it."
 msgstr ""
 
 msgid ""
 "This customer cannot be deleted because there are transactions that refer to "
 "it."
 msgstr ""
 
-#: sales/manage/customers.php:163
+#: sales/manage/customers.php:164
 msgid ""
 "Cannot delete the customer record because orders have been created against "
 "it."
 msgstr ""
 
 msgid ""
 "Cannot delete the customer record because orders have been created against "
 "it."
 msgstr ""
 
-#: sales/manage/customers.php:170
+#: sales/manage/customers.php:171
 msgid ""
 "Cannot delete this customer because there are branch records set up against "
 "it."
 msgstr ""
 
 msgid ""
 "Cannot delete this customer because there are branch records set up against "
 "it."
 msgstr ""
 
-#: sales/manage/customers.php:181
+#: sales/manage/customers.php:182
 msgid "Selected customer has been deleted."
 msgstr ""
 
 msgid "Selected customer has been deleted."
 msgstr ""
 
-#: sales/manage/customers.php:230
+#: sales/manage/customers.php:231
 msgid "Name and Address"
 msgstr ""
 
 msgid "Name and Address"
 msgstr ""
 
-#: sales/manage/customers.php:232
+#: sales/manage/customers.php:233
 msgid "Customer Name:"
 msgstr ""
 
 msgid "Customer Name:"
 msgstr ""
 
-#: sales/manage/customers.php:233
+#: sales/manage/customers.php:234
 msgid "Customer Short Name:"
 msgstr ""
 
 msgid "Customer Short Name:"
 msgstr ""
 
-#: sales/manage/customers.php:242 sales/manage/customers.php:246
+#: sales/manage/customers.php:243 sales/manage/customers.php:247
 msgid "Customer's Currency:"
 msgstr ""
 
 msgid "Customer's Currency:"
 msgstr ""
 
-#: sales/manage/customers.php:249
+#: sales/manage/customers.php:250
 msgid "Sales Type/Price List:"
 msgstr ""
 
 msgid "Sales Type/Price List:"
 msgstr ""
 
-#: sales/manage/customers.php:252
+#: sales/manage/customers.php:253
 msgid "Customer status:"
 msgstr ""
 
 msgid "Customer status:"
 msgstr ""
 
-#: sales/manage/customers.php:267
+#: sales/manage/customers.php:268
 msgid "Discount Percent:"
 msgstr ""
 
 msgid "Discount Percent:"
 msgstr ""
 
-#: sales/manage/customers.php:268
+#: sales/manage/customers.php:269
 msgid "Prompt Payment Discount Percent:"
 msgstr ""
 
 msgid "Prompt Payment Discount Percent:"
 msgstr ""
 
-#: sales/manage/customers.php:272
+#: sales/manage/customers.php:273
 msgid "Credit Status:"
 msgstr ""
 
 msgid "Credit Status:"
 msgstr ""
 
-#: sales/manage/customers.php:285
+#: sales/manage/customers.php:286
 msgid "Customer branches"
 msgstr ""
 
 msgid "Customer branches"
 msgstr ""
 
-#: sales/manage/customers.php:287
+#: sales/manage/customers.php:288
 msgid "Select or &Add"
 msgstr ""
 
 msgid "Select or &Add"
 msgstr ""
 
-#: sales/manage/customers.php:287
+#: sales/manage/customers.php:288
 msgid "&Add or Edit "
 msgstr ""
 
 msgid "&Add or Edit "
 msgstr ""
 
-#: sales/manage/customers.php:306
+#: sales/manage/customers.php:308
 msgid "Add New Customer"
 msgstr ""
 
 msgid "Add New Customer"
 msgstr ""
 
-#: sales/manage/customers.php:310
+#: sales/manage/customers.php:312
 msgid "Update Customer"
 msgstr ""
 
 msgid "Update Customer"
 msgstr ""
 
-#: sales/manage/customers.php:311
+#: sales/manage/customers.php:313
 msgid "Update customer data"
 msgstr ""
 
 msgid "Update customer data"
 msgstr ""
 
-#: sales/manage/customers.php:312
+#: sales/manage/customers.php:314
 msgid "Select this customer and return to document entry."
 msgstr ""
 
 msgid "Select this customer and return to document entry."
 msgstr ""
 
-#: sales/manage/customers.php:313
+#: sales/manage/customers.php:315
 msgid "Delete Customer"
 msgstr ""
 
 msgid "Delete Customer"
 msgstr ""
 
-#: sales/manage/customers.php:314
+#: sales/manage/customers.php:316
 msgid "Delete customer data if have been never used"
 msgstr ""
 
 msgid "Delete customer data if have been never used"
 msgstr ""
 
-#: sales/manage/customers.php:321
+#: sales/manage/customers.php:323
 msgid ""
 "There are no sales types defined. Please define at least one sales type "
 "before adding a customer."
 msgstr ""
 
 msgid ""
 "There are no sales types defined. Please define at least one sales type "
 "before adding a customer."
 msgstr ""
 
-#: sales/manage/customers.php:330
+#: sales/manage/customers.php:332
 msgid "New customer"
 msgstr ""
 
 msgid "New customer"
 msgstr ""
 
-#: sales/manage/customers.php:353
+#: sales/manage/customers.php:355
 msgid "Sales &Orders"
 msgstr ""
 
 msgid "Sales &Orders"
 msgstr ""
 
@@ -14492,10 +15022,6 @@ msgstr ""
 msgid "Selected sales group has been deleted"
 msgstr ""
 
 msgid "Selected sales group has been deleted"
 msgstr ""
 
-#: sales/manage/sales_groups.php:85 sales/manage/sales_groups.php:120
-msgid "ID"
-msgstr ""
-
 #: sales/manage/sales_groups.php:123
 msgid "Group Name:"
 msgstr ""
 #: sales/manage/sales_groups.php:123
 msgid "Group Name:"
 msgstr ""
@@ -14749,6 +15275,10 @@ msgstr ""
 msgid "There are no line items on this invoice."
 msgstr ""
 
 msgid "There are no line items on this invoice."
 msgstr ""
 
+#: sales/view/view_invoice.php:171
+msgid "PREPAYMENT AMOUNT INVOICED"
+msgstr ""
+
 #: sales/view/view_receipt.php:24
 msgid "View Customer Payment"
 msgstr ""
 #: sales/view/view_receipt.php:24
 msgid "View Customer Payment"
 msgstr ""
@@ -14812,31 +15342,31 @@ msgstr ""
 msgid "Deliver To Branch"
 msgstr ""
 
 msgid "Deliver To Branch"
 msgstr ""
 
-#: sales/view/view_sales_order.php:71
+#: sales/view/view_sales_order.php:73
 msgid "Requested Delivery"
 msgstr ""
 
 msgid "Requested Delivery"
 msgstr ""
 
-#: sales/view/view_sales_order.php:75
+#: sales/view/view_sales_order.php:77
 msgid "Deliver From Location"
 msgstr ""
 
 msgid "Deliver From Location"
 msgstr ""
 
-#: sales/view/view_sales_order.php:86
+#: sales/view/view_sales_order.php:88
 msgid "Non-Invoiced Prepayments"
 msgstr ""
 
 msgid "Non-Invoiced Prepayments"
 msgstr ""
 
-#: sales/view/view_sales_order.php:87
+#: sales/view/view_sales_order.php:89
 msgid "All Payments Allocated"
 msgstr ""
 
 msgid "All Payments Allocated"
 msgstr ""
 
-#: sales/view/view_sales_order.php:95
+#: sales/view/view_sales_order.php:97
 msgid "Telephone"
 msgstr ""
 
 msgid "Telephone"
 msgstr ""
 
-#: sales/view/view_sales_order.php:215
+#: sales/view/view_sales_order.php:217
 msgid "This Sales Order is used as a Template."
 msgstr ""
 
 msgid "This Sales Order is used as a Template."
 msgstr ""
 
-#: sales/view/view_sales_order.php:220
+#: sales/view/view_sales_order.php:222
 msgid "Quantity Delivered"
 msgstr ""
 
 msgid "Quantity Delivered"
 msgstr ""
 
@@ -14852,17 +15382,12 @@ msgstr ""
 msgid "Customer Transactions"
 msgstr ""
 
 msgid "Customer Transactions"
 msgstr ""
 
-#: sales/inquiry/customer_inquiry.php:68
-msgid "CUSTOMER ACCOUNT IS ON HOLD"
-msgstr ""
-
-#: sales/inquiry/customer_inquiry.php:172
+#: sales/inquiry/customer_inquiry.php:98
 msgid "Print Receipt"
 msgstr ""
 
 msgid "Print Receipt"
 msgstr ""
 
-#: sales/inquiry/customer_inquiry.php:202
-#: sales/inquiry/customer_inquiry.php:215
-msgid "RB"
+#: sales/inquiry/customer_inquiry.php:118
+msgid "CUSTOMER ACCOUNT IS ON HOLD"
 msgstr ""
 
 #: sales/inquiry/sales_deliveries_view.php:29
 msgstr ""
 
 #: sales/inquiry/sales_deliveries_view.php:29
@@ -14873,34 +15398,34 @@ msgstr ""
 msgid "Search All Deliveries"
 msgstr ""
 
 msgid "Search All Deliveries"
 msgstr ""
 
-#: sales/inquiry/sales_deliveries_view.php:68
+#: sales/inquiry/sales_deliveries_view.php:69
 msgid ""
 "For batch invoicing you should\n"
 "\t\t    select at least one delivery. All items must be dispatched to\n"
 "\t\t    the same customer branch."
 msgstr ""
 
 msgid ""
 "For batch invoicing you should\n"
 "\t\t    select at least one delivery. All items must be dispatched to\n"
 "\t\t    the same customer branch."
 msgstr ""
 
-#: sales/inquiry/sales_deliveries_view.php:168
+#: sales/inquiry/sales_deliveries_view.php:169
 msgid "Delivery #"
 msgstr ""
 
 msgid "Delivery #"
 msgstr ""
 
-#: sales/inquiry/sales_deliveries_view.php:174
+#: sales/inquiry/sales_deliveries_view.php:175
 msgid "Cust Ref"
 msgstr ""
 
 msgid "Cust Ref"
 msgstr ""
 
-#: sales/inquiry/sales_deliveries_view.php:176
+#: sales/inquiry/sales_deliveries_view.php:177
 msgid "Due By"
 msgstr ""
 
 msgid "Due By"
 msgstr ""
 
-#: sales/inquiry/sales_deliveries_view.php:177
+#: sales/inquiry/sales_deliveries_view.php:178
 msgid "Delivery Total"
 msgstr ""
 
 msgid "Delivery Total"
 msgstr ""
 
-#: sales/inquiry/sales_deliveries_view.php:179
+#: sales/inquiry/sales_deliveries_view.php:180
 msgid "Batch"
 msgstr ""
 
 msgid "Batch"
 msgstr ""
 
-#: sales/inquiry/sales_deliveries_view.php:179
+#: sales/inquiry/sales_deliveries_view.php:180
 msgid "Batch Invoicing"
 msgstr ""
 
 msgid "Batch Invoicing"
 msgstr ""
 
@@ -14928,57 +15453,57 @@ msgstr ""
 msgid "Search All Sales Quotations"
 msgstr ""
 
 msgid "Search All Sales Quotations"
 msgstr ""
 
-#: sales/inquiry/sales_orders_view.php:123
+#: sales/inquiry/sales_orders_view.php:125
 msgid "Dispatch"
 msgstr ""
 
 msgid "Dispatch"
 msgstr ""
 
-#: sales/inquiry/sales_orders_view.php:167
+#: sales/inquiry/sales_orders_view.php:172
 msgid "Set this order as a template for direct deliveries/invoices"
 msgstr ""
 
 msgid "Set this order as a template for direct deliveries/invoices"
 msgstr ""
 
-#: sales/inquiry/sales_orders_view.php:176
+#: sales/inquiry/sales_orders_view.php:181
 msgid "Prepayment Invoice"
 msgstr ""
 
 msgid "Prepayment Invoice"
 msgstr ""
 
-#: sales/inquiry/sales_orders_view.php:176
+#: sales/inquiry/sales_orders_view.php:181
 msgid "Final Invoice"
 msgstr ""
 
 msgid "Final Invoice"
 msgstr ""
 
-#: sales/inquiry/sales_orders_view.php:234
+#: sales/inquiry/sales_orders_view.php:239
 msgid "Show All:"
 msgstr ""
 
 msgid "Show All:"
 msgstr ""
 
-#: sales/inquiry/sales_orders_view.php:252
+#: sales/inquiry/sales_orders_view.php:257
 msgid "Order #"
 msgstr ""
 
 msgid "Order #"
 msgstr ""
 
-#: sales/inquiry/sales_orders_view.php:256
-#: sales/inquiry/sales_orders_view.php:270
+#: sales/inquiry/sales_orders_view.php:261
+#: sales/inquiry/sales_orders_view.php:275
 msgid "Cust Order Ref"
 msgstr ""
 
 msgid "Cust Order Ref"
 msgstr ""
 
-#: sales/inquiry/sales_orders_view.php:259
-#: sales/inquiry/sales_orders_view.php:273
+#: sales/inquiry/sales_orders_view.php:264
+#: sales/inquiry/sales_orders_view.php:278
 msgid "Delivery To"
 msgstr ""
 
 msgid "Delivery To"
 msgstr ""
 
-#: sales/inquiry/sales_orders_view.php:266
+#: sales/inquiry/sales_orders_view.php:271
 msgid "Quote #"
 msgstr ""
 
 msgid "Quote #"
 msgstr ""
 
-#: sales/inquiry/sales_orders_view.php:271
+#: sales/inquiry/sales_orders_view.php:276
 msgid "Quote Date"
 msgstr ""
 
 msgid "Quote Date"
 msgstr ""
 
-#: sales/inquiry/sales_orders_view.php:274
+#: sales/inquiry/sales_orders_view.php:279
 msgid "Quote Total"
 msgstr ""
 
 msgid "Quote Total"
 msgstr ""
 
-#: sales/inquiry/sales_orders_view.php:304
+#: sales/inquiry/sales_orders_view.php:310
 msgid "Tmpl"
 msgstr ""
 
 msgid "Tmpl"
 msgstr ""
 
-#: sales/includes/cart_class.inc:400
+#: sales/includes/cart_class.inc:407
 msgid "You have to enter valid stock code or nonempty description"
 msgstr ""
 
 msgid "You have to enter valid stock code or nonempty description"
 msgstr ""
 
@@ -14988,7 +15513,7 @@ msgid ""
 "browser tab. You cannot edit more than one sales document at once."
 msgstr ""
 
 "browser tab. You cannot edit more than one sales document at once."
 msgstr ""
 
-#: sales/includes/db/custalloc_db.inc:381
+#: sales/includes/db/custalloc_db.inc:382
 msgid ""
 "Unsuspected overallocation happened due to sparse credit notes exists for "
 "this invoice.\n"
 msgid ""
 "Unsuspected overallocation happened due to sparse credit notes exists for "
 "this invoice.\n"
@@ -15001,19 +15526,15 @@ msgstr ""
 msgid "Unknown %s price for '%s' in pricelist '%s'"
 msgstr ""
 
 msgid "Unknown %s price for '%s' in pricelist '%s'"
 msgstr ""
 
-#: sales/includes/db/sales_credit_db.inc:185
+#: sales/includes/db/sales_credit_db.inc:188
 msgid "Return"
 msgstr ""
 
 msgid "Return"
 msgstr ""
 
-#: sales/includes/db/sales_credit_db.inc:187
+#: sales/includes/db/sales_credit_db.inc:190
 msgid "Ex Inv:"
 msgstr ""
 
 msgid "Ex Inv:"
 msgstr ""
 
-#: sales/includes/db/sales_invoice_db.inc:206
-msgid "Cash invoice"
-msgstr ""
-
-#: sales/includes/db/sales_order_db.inc:101
+#: sales/includes/db/sales_order_db.inc:103
 msgid "Deleted."
 msgstr ""
 
 msgid "Deleted."
 msgstr ""
 
@@ -15023,7 +15544,7 @@ msgid "Customer Currency:"
 msgstr ""
 
 #: sales/includes/ui/sales_credit_ui.inc:108
 msgstr ""
 
 #: sales/includes/ui/sales_credit_ui.inc:108
-#: sales/includes/ui/sales_order_ui.inc:639
+#: sales/includes/ui/sales_order_ui.inc:646
 msgid "Shipping Company:"
 msgstr ""
 
 msgid "Shipping Company:"
 msgstr ""
 
@@ -15072,72 +15593,72 @@ msgstr ""
 msgid "[Select item]"
 msgstr ""
 
 msgid "[Select item]"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:574
+#: sales/includes/ui/sales_order_ui.inc:581
 msgid "Cash payment"
 msgstr ""
 
 msgid "Cash payment"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:577
-#: sales/includes/ui/sales_order_ui.inc:609
+#: sales/includes/ui/sales_order_ui.inc:584
+#: sales/includes/ui/sales_order_ui.inc:616
 msgid "Deliver from Location:"
 msgstr ""
 
 msgid "Deliver from Location:"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:580
+#: sales/includes/ui/sales_order_ui.inc:587
 msgid "Cash account:"
 msgstr ""
 
 msgid "Cash account:"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:587
+#: sales/includes/ui/sales_order_ui.inc:594
 msgid "Delivery Details"
 msgstr ""
 
 msgid "Delivery Details"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:592
+#: sales/includes/ui/sales_order_ui.inc:599
 msgid "Invoice Delivery Details"
 msgstr ""
 
 msgid "Invoice Delivery Details"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:593
+#: sales/includes/ui/sales_order_ui.inc:600
 msgid "Invoice before"
 msgstr ""
 
 msgid "Invoice before"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:597
+#: sales/includes/ui/sales_order_ui.inc:604
 msgid "Quotation Delivery Details"
 msgstr ""
 
 msgid "Quotation Delivery Details"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:602
+#: sales/includes/ui/sales_order_ui.inc:609
 msgid "Order Delivery Details"
 msgstr ""
 
 msgid "Order Delivery Details"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:623
+#: sales/includes/ui/sales_order_ui.inc:630
 msgid "Enter requested day of delivery"
 msgstr ""
 
 msgid "Enter requested day of delivery"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:624
+#: sales/includes/ui/sales_order_ui.inc:631
 msgid "Enter Valid until Date"
 msgstr ""
 
 msgid "Enter Valid until Date"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:625
+#: sales/includes/ui/sales_order_ui.inc:632
 msgid "Deliver To:"
 msgstr ""
 
 msgid "Deliver To:"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:626
+#: sales/includes/ui/sales_order_ui.inc:633
 msgid "Additional identifier for delivery e.g. name of receiving person"
 msgstr ""
 
 msgid "Additional identifier for delivery e.g. name of receiving person"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:629
+#: sales/includes/ui/sales_order_ui.inc:636
 msgid "Delivery address. Default is address of customer branch"
 msgstr ""
 
 msgid "Delivery address. Default is address of customer branch"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:633
+#: sales/includes/ui/sales_order_ui.inc:640
 msgid "Contact Phone Number:"
 msgstr ""
 
 msgid "Contact Phone Number:"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:634
+#: sales/includes/ui/sales_order_ui.inc:641
 msgid "Phone number of ordering person. Defaults to branch phone number"
 msgstr ""
 
 msgid "Phone number of ordering person. Defaults to branch phone number"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:635
+#: sales/includes/ui/sales_order_ui.inc:642
 msgid "Customer Reference:"
 msgstr ""
 
 msgid "Customer Reference:"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:636
+#: sales/includes/ui/sales_order_ui.inc:643
 msgid "Customer reference number for this order (if any)"
 msgstr ""
 
 msgid "Customer reference number for this order (if any)"
 msgstr ""
 
@@ -15367,7 +15888,7 @@ msgid "Upgrade from version 2.2 to 2.3"
 msgstr ""
 
 #: sql/alter2.4.php:23
 msgstr ""
 
 #: sql/alter2.4.php:23
-msgid "Upgrade from version 2.3 to 2.4RC1"
+msgid "Upgrade from version 2.3 to 2.4"
 msgstr ""
 
 #: sql/alter2.4.php:31 sql/alter2.4rc1.php:31
 msgstr ""
 
 #: sql/alter2.4.php:31 sql/alter2.4rc1.php:31
@@ -15378,22 +15899,22 @@ msgstr ""
 msgid "Text collation optimization:"
 msgstr ""
 
 msgid "Text collation optimization:"
 msgstr ""
 
-#: sql/alter2.4.php:83
+#: sql/alter2.4.php:98
 msgid "Cannot update config_db.php file."
 msgstr ""
 
 msgid "Cannot update config_db.php file."
 msgstr ""
 
-#: sql/alter2.4.php:122
+#: sql/alter2.4.php:138
 #, php-format
 msgid ""
 "Cannot update work orders costs:\n"
 "%s"
 msgstr ""
 
 #, php-format
 msgid ""
 "Cannot update work orders costs:\n"
 "%s"
 msgstr ""
 
-#: sql/alter2.4.php:215
+#: sql/alter2.4.php:231
 msgid "Convertion to utf8 done."
 msgstr ""
 
 msgid "Convertion to utf8 done."
 msgstr ""
 
-#: sql/alter2.4.php:254
+#: sql/alter2.4.php:270
 #, php-format
 msgid "Cannot drop column in %s table: %s"
 msgstr ""
 #, php-format
 msgid "Cannot drop column in %s table: %s"
 msgstr ""